gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-libs
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
343 files changed, 5726 insertions, 2713 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 797be9a20e49..e46ed913a4ef 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 9e3b9a4c323b..0b7cc6b2d2ac 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +1,5 @@
 DIST appstream-glib-0.6.13.tar.xz 1974864 BLAKE2B e9e0967b7657250659b3597bc2f6b049a20750e6dc66ee3672f3794b8c50f5060e48c7d4cd76d16e9e7d7cbc7d3364b7600e1c20fe24b33538c66d2a80cf0888 SHA512 d7e95a31d3f6fba974af2fab423282c7b0291d1325a634d8040fe2c2c2fcde49981be18900415251b3d71f20bb9e945e16d7c00fa830b27deac2e5547ec4c8b0
 DIST appstream-glib-0.7.9.tar.xz 2245728 BLAKE2B fb6f54329bed91f1acaa6218b111fd4527dff7ed412a89cb44a6e4f6cdfb7e0fe4e6f9fb37b6cdc2efa75164dccef323b6d7428a63b08369b941d36b0b9071f0 SHA512 d78cb6f11cad01d67cb33f16e987485177d20b78a8b21cfbabb64ce7b18b813c0d2d1de2faeea199fdc31d12633e899a5596a6cf133cb831a4377d641f79eb7d
-EBUILD appstream-glib-0.6.13.ebuild 1608 BLAKE2B a9962fcdcc67adb507d3ebf22d4ea9cb168d1cb6d8f8bf818b4d9794b7d952d0c7965e58e26935908284caf16f5db5ce62d2fe8ba0b1e61b925238e34ee38ee9 SHA512 e5a83f1b4cec3ebf9447620f1c41faecf3f9b0c7996122dff5769eddb0a0d8c37ebf13f0f829c8f8ba8352c1d702e3832a10635c4add19ff8ad67510fda1c190
-EBUILD appstream-glib-0.7.9.ebuild 1519 BLAKE2B 3c5173223fa2d8cc05de604df571de589f71c0ffdd82c54bf21b164386ff366f23c894f6b7cd448b7d64d7ba4073208d253c9d048409eef353eeae090a7f3b2a SHA512 829f338699671b681e82bd7544e3112827c439229f8345a94239fa5d1b994323c41697bc7c5eaace01b9ae8cc2c625488d8c4f0060d181b1f4e9202b7eb53ddc
+EBUILD appstream-glib-0.6.13.ebuild 1607 BLAKE2B eea0a1a10bee741ee4692f82f2ea336b4deaac8cd37c5896be32494b9a9bfec0d05398abaaec44b1bb877ad7d7b3cb6cf7ae13fd4f0d6f7679fe0c15271a31e9 SHA512 64debcba99dbc1659ff1f102ac603c54c883b13a5e9700cb99470bc0028bbf5d9445791daca0b68918d2c57dc9f7af8774979c6437bdae7305300788c3533924
+EBUILD appstream-glib-0.7.9.ebuild 1513 BLAKE2B 895924fa0c8d34ef7a5add4786756bb7b4064a5d702e15697b2d19e91245c8f2b85366ff4b19d7a368823a2177d6be69355ca1f15b7e28a1774503188791357f SHA512 6b3b0c93ed738216bce3b092bc0927f917ea538a5d3ced93cafda9bd12fd12f4a55f4619530480e6f815226846716ccd343ce2557b158312a504f70c43c7967f
 MISC metadata.xml 352 BLAKE2B 2d04b5c85e8a4e5a62ddf862b7dc1d757896d4f7a5aa052b9139cb050d16aedf9b571b543484b91d3795a979703b4bebb6c42695f8238939a4179a613110053f SHA512 491790151594360b57d05b217381b3b6c6f3d3a72e8066d923230060a4b05d0e2ff1e31cdcb94eb8b1ac077a011d695f33b857bf049c04292a9e324c065895d9
diff --git a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
index a7707c71c57e..d3214a7ab0d3 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="+introspection nls stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
index b236a3784d33..fd209d0b9ce0 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="doc +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index a36af2349b3d..9e42efb89f00 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,8 +1,3 @@
-AUX appstream-0.12.2-gcc-7.3.patch 630 BLAKE2B 5ca478b25aa712a5450d405ca34aaf0c07887dacf7fbe3301c694eaa69303871120e0ba4269d4b1c2499db8e2c20a3700359d3c7868c5f1d9c568dda75ffeb05 SHA512 83bdeb2d8f92a510c1530cf65df0baae9ce4b70be0a1f880b99d02ce0a8212fecc193de07167ab8d7a30061c8a3fd84b2ba492a60cdf8f96a77b2cdd742d2382
-DIST AppStream-0.12.2.tar.xz 1938868 BLAKE2B 968853e9d5f87ca2c1f894a6ffe5439f7fce611459243cd96d3859a15e225243585a1a43e90d8eca8271b91e1237d94eb4615b5c3c0543d9a37646b5fbd7d2fe SHA512 d5c95309d4fddb961f4a5b9ac460840e34d4bae0e256bd0be09ceeab0d45a3ac5254c9e9c183a1e6cb3983ce0a9d6d0e519908f612a5b135ed578ec26556e53d
 DIST AppStream-0.12.3.tar.xz 1940064 BLAKE2B a0160c4a922abfe315bdbfe6b7b32fea8d5eda5631347be4a39dcf102660ad26a3f40c5fed9dd0bdfb1b91956780ff7cf58e61d7f38b03d2f48a5bf67f2871f6 SHA512 3d54bb499e4056d341ffde2878549011708e6699b3ec58756ef2e4080864279ff5e5003224fcbad601007fd9296bb9ed062da7843e3e02272837ecc5d4c802f9
-DIST appstream-0.10.6.tar.gz 1821879 BLAKE2B 49e0476ef41c37d2e9bb12a7c046fcbb2cd8fcb1f521321dce4cda15e504a966cf59a1cbf56fc7359a82f677c54906ba041ad37eeb7f639ad69691e8d2ccd24c SHA512 9f8b4ddc39d580c62b166df0d9a2c5e4caac1b433d25a4e9118b7c73ceea5c7b1ff78f02d682a68cdfeb8da29e806a4838cfc11637fca2982f436af333605256
-EBUILD appstream-0.10.6-r1.ebuild 1490 BLAKE2B cf0ea93f614715937e74088b70502574a644c641f8853bd359eea753f0376c8ba1f846990f95e927865e5f1c6479e450fcf4f3b292b1ec0b13743acfbfd2ad5d SHA512 b4f43642d9648bc9956ae4212e3d5b7fc7bb5f5c86293b5c9fd1196acf6fb37e5a2553ff3ae789f50ab9cd75c94a92cf46957a4d19e9d3aecc43036628abb0f3
-EBUILD appstream-0.12.2.ebuild 1502 BLAKE2B ce7c0ba0602029ae4a243d38bff98f67942479fed417af55cbad840d69cbfb2c5f806ffb05d10205f70abaaa8292b32e05eaa63a4e7b26fe99e9a917393fbc30 SHA512 0149dad2ade3d6d70efba1f8ad9a4b39fcb3e76d5779568dbb26b42eb04b0e8b95cd27bbcd5f5bbc41dbca4813cc43bdcafe8b0ea6eaddbeb391d92281165e41
-EBUILD appstream-0.12.3.ebuild 1456 BLAKE2B a7aaed498184987107ca5436235ca9401dc573f3fc937d16743f2bea1b8e21a2c237711f5d0ac8b06c64a338a28060b5e5a15b2fdf3204fdee8e8312f1097291 SHA512 bd50cab254590ceffe6bb7b47663b9f9534cf049c82a219dfa4aa501b3a71c54c024fd8f69ec56463ec9fa7bb8b06ee33f1eb5b49029a846aabf7d0089fb4106
+EBUILD appstream-0.12.3.ebuild 1454 BLAKE2B f8bed2ff11275869ee9658151aa92d1b96ef3fa140a976d62ba417537c5b7fa2030f9189253f084f754bb42442e4b673a325fa7c75290e9652e8d543f2d7dd66 SHA512 82d1b5f662065ba4d14a0b065324cd99335d2fa7a8ef6aed20256ffe8b88207cf989cc604cc2459cefca4a02836c127fcfba150287fdb30af3a456552e7a8293
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.10.6-r1.ebuild b/dev-libs/appstream/appstream-0.10.6-r1.ebuild
deleted file mode 100644
index 02eef9f850b9..000000000000
--- a/dev-libs/appstream/appstream-0.10.6-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	inherit versionator
-	MY_PV="$(replace_all_version_separators '_')"
-	MY_P="APPSTREAM_${MY_PV}"
-	SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S="${WORKDIR}/${PN}-${MY_P}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check APPSTREAM_LIB_API_LEVEL
-SLOT="0/4"
-IUSE="apt doc qt5 test"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	dev-util/itstool
-	sys-devel/gettext
-	test? (
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use test; then
-		pushd qt > /dev/null || die
-		cmake_comment_add_subdirectory tests
-		popd > /dev/null || die
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DSTEMMING=ON
-		-DL18N=ON
-		-DVAPI=OFF
-		-DMAINTAINER=OFF
-		-DSANITIZERS=OFF
-		-DDOCUMENTATION=OFF
-		-DAPT_SUPPORT=$(usex apt)
-		-DINSTALL_PREBUILT_DOCS=$(usex doc)
-		-DQT=$(usex qt5)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/appstream/appstream-0.12.2.ebuild b/dev-libs/appstream/appstream-0.12.2.ebuild
deleted file mode 100644
index ff514c29496c..000000000000
--- a/dev-libs/appstream/appstream-0.12.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson xdg-utils
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	MY_PN="AppStream"
-	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/4"
-IUSE="apt +introspection qt5 test"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=dev-util/meson-0.42.0
-	>=sys-devel/gettext-0.19.8
-	qt5? (
-		dev-qt/linguist-tools:5
-		test? ( dev-qt/qttest:5 )
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-7.3.patch" )
-
-src_prepare() {
-	default
-	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local emesonargs=(
-		-Dapidocs=false
-		-Ddocs=false
-		-Dmaintainer=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt true false)
-		-Dgir=$(usex introspection true false)
-		-Dqt=$(usex qt5 true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/appstream/appstream-0.12.3.ebuild b/dev-libs/appstream/appstream-0.12.3.ebuild
index f2aa30c08f78..71095f75c025 100644
--- a/dev-libs/appstream/appstream-0.12.3.ebuild
+++ b/dev-libs/appstream/appstream-0.12.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	MY_PN="AppStream"
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch b/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch
deleted file mode 100644
index 3eb8b0db877d..000000000000
--- a/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9252de815e4443d1b617211f38685afe7c0f6b0e Mon Sep 17 00:00:00 2001
-From: Matthias Klumpp <matthias@tenstral.net>
-Date: Sat, 20 Oct 2018 20:20:09 +0200
-Subject: [PATCH] Explicitly include string.h in as-tag.c
-
-This apparently is necessary to fix an FTBFS issue with older GCC
-releases. Resolves #207
----
- src/as-tag.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/as-tag.c b/src/as-tag.c
-index 6afba621..91076e69 100644
---- a/src/as-tag.c
-+++ b/src/as-tag.c
-@@ -32,6 +32,8 @@
- 
- #include "as-tag.h"
- 
-+#include <string.h>
-+
- #ifdef __clang__
- #pragma clang diagnostic ignored "-Wmissing-field-initializers"
- #endif
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index e94740e554fd..09f12cb81001 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -10,5 +10,5 @@ DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f14
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 EBUILD apr-1.5.2.ebuild 4077 BLAKE2B f9bdb8503c2101780f101db394a12040118f8f91a6ebc7a3d08899eff715d4065291b07fb9b662edc586807305edfa64ed2b0983efbdb074cb8733a91acc4e09 SHA512 4d5b178bff085c61704037f87d00b28fd51b588928d870a61670e2b171891316ac29584b2afaac38d0237a301d156eb0ebc316010f1695e5b8a8f268a68b1b3d
 EBUILD apr-1.6.3-r3.ebuild 4399 BLAKE2B 8646209fbbf771c4344a24a19c85e4db85e6ed3f0cba15adb44ccb05d0b72a3993b78ac2424bf2b3caeca962b981d2bd131306192a55e6fd040dff91addd60d0 SHA512 116a9e292e31bb98b925b0db929bc33c2f250c17a7b7c1fa2f079f1146ff7427408f4bb8640e2b8531f5ab3deb312d6b04277739bfbe41247403589a32851840
-EBUILD apr-1.6.5.ebuild 4335 BLAKE2B f3be006cb58a55576409acd9d458a685c2147cab2e4a4c197a8d66f72ac0c332ce1cfdf835141d7a24c87b0ad1ee1401740fd2f2f36bcd335068d84e4e187cbd SHA512 33264f492b9a3237bed5c55f379b3c23e5a3d903f283fd6bfd0ba29a2865ff23ad955063cece5dd8529255f8493dca713df1e627c14729376847862e011fe32e
+EBUILD apr-1.6.5.ebuild 4344 BLAKE2B 9ce9356d89d4433ceb9f987f8f13d152d0bdec5d9f3e733c71ae2ede16deacf29e6cc9a84fcd7c5773edbcc3f3963c03248b1c14ad5ede26ec393a858b338503 SHA512 9d18249bda4c4bd1d10de424bfea14b5a2b998279745010aa937be31519a8e7407434f53537af6616e48b97915d604bc4312c21eb3b715c99fc1d3c3cc4ed3f5
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.6.5.ebuild b/dev-libs/apr/apr-1.6.5.ebuild
index 40fc1cbca280..904427dc046c 100644
--- a/dev-libs/apr/apr-1.6.5.ebuild
+++ b/dev-libs/apr/apr-1.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ src_configure() {
 		--enable-posix-shm
 		--enable-threads
 		$(use_enable static-libs static)
-		--with-installbuilddir=/usr/share/${PN}/build
+		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
 	)
 
 	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 08e182b6c7fb..314c9cb782af 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -3,5 +3,5 @@ DIST atk-2.24.0.tar.xz 748972 BLAKE2B f9db7e35322cf4a1df5171c812c83eb935ba44b016
 DIST atk-2.28.1.tar.xz 712508 BLAKE2B 71aee8bc937e1e37d40e6a9820d0002bcc763dbf87385ede2484ec6fe17a9924d5753d74dc3a769602746c915d0c46da8eea78cc80c706e3c38faca2e5050364 SHA512 aa61e7718b3f4d9c33ec2b4747e35f894a51550ef39ecc4a7af5705811c029645bd3c728071f446b075a0b7aef0c35c1b73406a210cd30171838f24a8dfc0abb
 EBUILD atk-2.22.0.ebuild 1417 BLAKE2B 934ad34cb4e2e90422a8f885a7da073f3e153a9ff6c21f2ab1862a550fb2be483a286593346b8ca1f17f885cc1fcf6eae3cfb8dc6363f42226f8d318d7f23211 SHA512 12bb3647b4393dec7c50360c74530286a8063ee1db6c63e27024ee3d7cdba0388535bab36b072b8f35c0b06b4597d0358f26ea0b6a0b998f06c11ed4df1344c0
 EBUILD atk-2.24.0.ebuild 1418 BLAKE2B 5401d1d1637b38c85b693232bb01306cf458138adbe9bacdfc4750f398a27ee94e8cedc7b159a048e4f2c52dddf411f800a0ee97d72bd68ad2c8c41ce69a58a1 SHA512 9a2925a00a45d270d34f107676b69c99d6806cca8b75a24d2ff66df5ee7ca21886efccdfb44cf0f46324a2c423241fb42d15b157fca908a0f729b2940ceef9fa
-EBUILD atk-2.28.1.ebuild 1451 BLAKE2B cf0326878baa03da5548bf477d4621438d6741fe347ef5d29f9a5ef11c907f81bc5a906838ef549cd132d77275d86d544d8264e6c6ad0d87548aeb6c4decba24 SHA512 977a73429296558eaca0642ed896b10e6f3d68e2453499230f4f698ab4e64bbcaab342fe81649bec802db3ff387be8d6d0ce83318ae7f2982d4872e3eeb811e7
+EBUILD atk-2.28.1.ebuild 1444 BLAKE2B 31fbbf70c084bdf59cf798ea41c5126a36e19223da30e494f77e79d13ae0d5f20d56d5f68dd2b513dbf34dd41f74ee50815db0d311ae6e004450aad74b4f5fb2 SHA512 f2adf761d3610dce83a4eb511235d6fd053db645e28ef3ed689f4b34bb929fed9ee6961b173e0343b76cd8d1c84678f2895f15a661b5c6b51ef6c3bf4e069f93
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.28.1.ebuild b/dev-libs/atk/atk-2.28.1.ebuild
index 29092c6b1001..ccd48374e18b 100644
--- a/dev-libs/atk/atk-2.28.1.ebuild
+++ b/dev-libs/atk/atk-2.28.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"
 
 RDEPEND="
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 0c715afeb225..d5a3bad41635 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -4,6 +4,7 @@ AUX boost-1.56.0-build-auto_index-tool.patch 412 BLAKE2B 4449dbe600547f339eba9af
 AUX boost-1.63.0-fix-python.patch 4210 BLAKE2B f39a501c9a2718ff77300d97ec8d1ec0a99e90b6f4f2f4ef970a5daaebe1065a870d98f759c0e946707251a93bda0c54f3f864b1e4189f915226d638738e7dca SHA512 0f390cae5a53f48f548e65149aaca4b1191ca6610863e7e471686556107c8ac398eb4bcad71a92849e941cad031cec9cbd543c646ee122238579ca881c420aad
 AUX boost-1.65.0-fix-python.patch 9210 BLAKE2B 31e32cfbc8fa0c4e8a5c142f56a4a7b1d06173b6a5b7b4bc1c2fcc64e645eac22e9e4f85c8b278a1fcefcb15e389a38d82ec90facdbb1e7812f9f4cc77d2fe93 SHA512 df2e8841b3415724b2920230da36e3e3aa610a5d7ee7dcada847cb4d6c921405ef4f0c034f96d1ac078d33bb3f32408b748cf7835f173b6e7692c76c6135e2f2
 AUX boost-1.67.0-fix-python.patch 6017 BLAKE2B e249ea8f387bb2b87f58bb2a538992ea20c12ad2a127da940bc86f1b6f5231a5d8b77b46cd8e946b723b2e0a2d05240e1bbf66ab738980f95f2407e325bc6bc5 SHA512 bcd0c5fad2dc5ca4964f6b366fb5bb2d5e016b0d67480a3abebee03743d337c8514b580d610e9cbe215bd1602a6846963aeab7f04ac72cbc0ed146c7869b4f32
+AUX boost-1.67.0-lockfree-next.patch 661 BLAKE2B fa81c2d9628645e3980dcf66019c74c47163e19c27680200695fed8273bb40f137e612d835413dccb7301e004440096cb30601c28921af9515c9d54e5ca0b4ac SHA512 9c11e719679262b071195474c8595ae0c324d5a046df89637c5636f8b3e0fcefd4e32c28c2d18ac2a620a5bde46750372b6295d84b55283d48033eb42a0fcb6c
 DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
@@ -11,5 +12,5 @@ DIST boost_1_67_0.tar.bz2 87336566 BLAKE2B 85ea00fc2197b1bbfc35d69427c87f23ea43d
 EBUILD boost-1.63.0.ebuild 12466 BLAKE2B 7aedf34bbef100bb52457e3906422ae22435a34486a921f60a7b0a5a4f48f251228331f1cebb9317c1c43355a8dffb4f9f555e4477136fc4cfc51f057b118c0f SHA512 215acc04fd1fc80271bb1d64c5e508a1c9162613ea526aabf291445f58a6f547155c0d000987a3a98c8dde8387db012978c42b140d03352b52f91df33d18aa5a
 EBUILD boost-1.65.0.ebuild 12440 BLAKE2B 777d2025ef7319680d49995f9570250d9a9305e20e1553451e8f4b802debe147a5631ebf29a75a44c53bc044fea57b5c167401c333f2599c583c66ca212e4855 SHA512 34414d084369ef1d225881a44dbf187141aebb689b8d06d4ee0a34952f58447fbb0ef44683ed1d87305305599c86275ebbb38e844e54bfa70d99ee32fa7de8c9
 EBUILD boost-1.66.0.ebuild 12459 BLAKE2B 6653ddd8bc307f9c91166bac312ee146e174bf09cfbc28afb3dbb8aff8bf286bb37f766bc2735f0cedd5cb113bd26637a3116bdeb6be0afca93d6bd80a89c093 SHA512 6ccbd309c502220afb9da6abedb36fb52791dcaee848acc102c1fcf69f538e3477939b14c0a1892fd31babf3002307adae2b310503d1f9bd17d2393611b2ce6a
-EBUILD boost-1.67.0.ebuild 12358 BLAKE2B 5d420ea8d2209632e8fb7a0a49fdf31b24ab07e4986ef4d5f7ec9c08ef239d9b06c9d4e4fd61efdd73aa211566a664cddc76f48b2af0482ac5ebd83de2f46e41 SHA512 649f9d15de4c8c6d614fe1103cf7357c7b96ad37a2fa18679ee3640a3e174299d40489f8497876ec68118fca4c11765c8ff6b287b916375958a5419ce7f6a9c8
+EBUILD boost-1.67.0-r1.ebuild 12403 BLAKE2B f3087055657b4541f6a1c8bdec9dd4128fbd77092971b402c33f7edc56a2cb91ae5f60eb198497eabad302e476fdc35943057906aab04b2ff7b47eb1fec2a4ff SHA512 14ef3c29398e5b4e1a034af93ed4789c8a76a85e7fb177d44f6b6a7845595892dadfe9ea72c06506a810c36ecbef06a19472f32999a799c931e81b8b268f3bd6
 MISC metadata.xml 1526 BLAKE2B 11c2e9eb5b41e3fa0b100d58d672acefe4a949d0fa428b4ce1d100cc8f95eec7c1279c725741033ca50f61cb258b388270c18361a5b714a684398cc3ae1a445c SHA512 4ba131f2492ae41f642a28dd69e5bd1d5d79c013e42a6c18ba135b36d470990ea20c8aa7cec6e3cb1d6ea8d7f6b6a5b45efb4b3dcba198bcf43809eff0f65ae6
diff --git a/dev-libs/boost/boost-1.67.0.ebuild b/dev-libs/boost/boost-1.67.0-r1.ebuild
index 7eb5c945be41..1c9de953032d 100644
--- a/dev-libs/boost/boost-1.67.0.ebuild
+++ b/dev-libs/boost/boost-1.67.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,6 +49,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.55.0-context-x32.patch"
 	"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
 	"${FILESDIR}/${PN}-1.67.0-fix-python.patch"
+	"${FILESDIR}/${PN}-1.67.0-lockfree-next.patch"
 )
 
 python_bindings_needed() {
diff --git a/dev-libs/boost/files/boost-1.67.0-lockfree-next.patch b/dev-libs/boost/files/boost-1.67.0-lockfree-next.patch
new file mode 100644
index 000000000000..acf9a96777e5
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.67.0-lockfree-next.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/671724
+
+From 12726cda009a855073b9bedbdce57b6ce7763da2 Mon Sep 17 00:00:00 2001
+From: Peter Dimov <pdimov@pdimov.com>
+Date: Sat, 2 Dec 2017 04:10:46 +0200
+Subject: [PATCH] Add #include <boost/next_prior.hpp>; no longer in utility.hpp
+
+---
+ include/boost/lockfree/spsc_queue.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/boost/lockfree/spsc_queue.hpp
++++ b/boost/lockfree/spsc_queue.hpp
+@@ -17,6 +17,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/static_assert.hpp>
+ #include <boost/utility.hpp>
++#include <boost/next_prior.hpp>
+ #include <boost/utility/enable_if.hpp>
+ #include <boost/config.hpp> // for BOOST_LIKELY
+ 
+-- 
+2.19.2
+
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 033bc570af64..4c21c788c774 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,6 +1,11 @@
 AUX capstone-3.0.5_rc2-CVE-2017-6952.patch 1565 BLAKE2B cd3436d2eba405b354baa2289538c9563f66595cf3a9f0d0a510a70af82bcafd5b4145676e627ab491562b10304c6fe2927bda0135d67123c18173ad871af739 SHA512 1f4f24bdede4439811b077502b227474827a455921eb183455c31e7de142d3f3f7e9f19869aac87b92a768be34a7e5ad040f0d68e8125b590d14dfec7af5b407
 AUX capstone-3.0.5_rc2-FLAGS.patch 398 BLAKE2B 40cdebbdd64e057982af6d7b4cce44821eba5799666c626d8a4afb8a798ebca7c6e211e7956b2824411deae671fd917f3d4c01ec903f47b514ac6cb5d0c9726a SHA512 95fb22a680e20f5b19936bd65ceadb9e29a8ed1f3de831379cfc0e650bfd4af7214b97efa97ed894a10d83541e0e49c60ff1a0cb501cd63a9af8f40460909975
+AUX capstone-4.0-FLAGS.patch 418 BLAKE2B 425d12eeeca7d4ca2d350d0ec821c6861c0fd7df7021be44c3c371837ab27e22af83d0af1627ae6c920628619d780608863d6f4d41ec6f79a18ea37251b82915 SHA512 c423d0f827afd4b11979ac6fbf4f8972df10670dec113f4a08f1860229cd3e1c5b61f3f6fc7195f457f29eeb46580e18213e9195acae821ca57b63372af07564
+AUX capstone-4.0-double-DESTDIR.patch 307 BLAKE2B 91fad2475b7289311c8eeceaec962a9b1cf735cb13835de19eeed208a20c2b4f8b3cf59683ff72bc726b83ca41d696f3889b7019e2751d79c8d4fba48f736018 SHA512 92d839aad1a576ae550c618ffda3cd070419b72b105583f3861d47df0a57f29fbf8b4e1727c7768199fa650e1c734726f7cc8bd0ef913da336ed16d6d77feda4
+AUX capstone-4.0-no-fuzz-tests.patch 367 BLAKE2B 890047c65669c6d323fa5f8bb80df449ea6a8fe9e6e58c43438f37c63edce46d4f64db953322ac74c54fc1077f35b0d86d732685533cfe7d495a235afebc40ef SHA512 2abc022678214a09869c728e1cb83a4a69213d977d1ad752cda415e5861b83d4af2ca2fa80377dee1322d8bfad6fb5d1d12e23cdc30285ebe83c3eca91110279
 DIST capstone-3.0.5_rc2.tar.gz 2829338 BLAKE2B dd35fc6c31ec008f78840410ea0d20de56ea8f01c3af1d28488beaceee7fa06ce03c8cd0f56d834eb738d23f528d240693586122b9c1e353365f7348fb6f8362 SHA512 31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
+DIST capstone-4.0.tar.gz 3411532 BLAKE2B 3e60a946e81f6d6ea88c314ad066e1855e2401cd9e8e61a67d48071b0fe4b705b2276b0d2b52d0979f472895a69cbe7609f6a2c60b79be668730f41ea98bf92e SHA512 5a10c67e88b246ad905364c62c56b4741df242c22f1b62bdea171e4d1d43e484f42f30b33e17324be6cff4c6fb10365528a9c3f4b2a5339ad24b0564fdd40bdb
 EBUILD capstone-3.0.5_rc2-r1.ebuild 1444 BLAKE2B d1be427a65e94ba5651b0097e32bc087a9b93790f996e6c966bba8f12114723e16ad0cf3892f3caee7fe5bece69093343e07d4cf05cd93c659be8988cd3ae027 SHA512 abf20572bd401faab86e3ffb8ca03945e7665328c0b66f3946249513bec5fb6fcb13f98c5239ec468c414924768aaa4b73a648d304b28a3eda6450bfa607b01d
 EBUILD capstone-3.0.5_rc2.ebuild 849 BLAKE2B 8954f0ab824ca3532d0fba48e7b41abcc2b463a26bd7795553d8299f64f3b27e850c79bb04f210c3eeb4b27263390e2a0990be5ca76e4774bdfb16aa2921f748 SHA512 7896e5759c146a82b47239bf0fede1c67f49ec9970d3ca82ff1db6d4c53c7c8f3a3a657491ed12a8ca5de585ffcdaf032f3c3d1b9db6db0d4c75e613ef4dfc70
+EBUILD capstone-4.0.ebuild 1482 BLAKE2B a58f57f87f1d03efe7ea2335ee3073a43f36a7ac41b01aea3f65f1cc036d16094707aeb1a7f9a2fcf26a57e7e78fe0555cee8513690f1dadba69cc46534b49de SHA512 403ad9a8f467376fc00c4648895c9def8b48f98b406f294ba474f94cbc85b2b99cd16399c736cc280e66df6626dc254751564ab87a93d37033890893e52fe166
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-4.0.ebuild b/dev-libs/capstone/capstone-4.0.ebuild
new file mode 100644
index 000000000000..78213838489a
--- /dev/null
+++ b/dev-libs/capstone/capstone-4.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/"
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/4" # libcapstone.so.4
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="python"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-FLAGS.patch
+	"${FILESDIR}"/${P}-no-fuzz-tests.patch
+	"${FILESDIR}"/${P}-double-DESTDIR.patch
+)
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+	if use python; then
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${1} "$@"
+		popd >/dev/null
+	fi
+}
+
+src_prepare() {
+	default
+
+	wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+	{
+		cat <<-EOF
+		# Gentoo overrides:
+		#   verbose build
+		V = 1
+		#   toolchain
+		AR = $(tc-getAR)
+		CC = $(tc-getCC)
+		RANLIB = $(tc-getRANLIB)
+		#  toolchain flags
+		CFLAGS = ${CFLAGS}
+		LDFLAGS = ${LDFLAGS}
+		#  libs
+		LIBDIRARCH = $(get_libdir)
+		EOF
+	} >> config.mk || die
+
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	default
+
+	wrap_python ${FUNCNAME}
+}
+
+src_test() {
+	default
+
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	default
+
+	wrap_python ${FUNCNAME}
+}
diff --git a/dev-libs/capstone/files/capstone-4.0-FLAGS.patch b/dev-libs/capstone/files/capstone-4.0-FLAGS.patch
new file mode 100644
index 000000000000..66e855c0c34d
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-4.0-FLAGS.patch
@@ -0,0 +1,20 @@
+Drop -O3 and allow user to specify their optimizations.
+
+--- a/cstool/Makefile
++++ b/cstool/Makefile
+@@ -1,13 +1,14 @@
+ # Makefile for Cstool of Capstone Disassembly Engine
+ 
+ include ../functions.mk
++include ../config.mk
+ 
+ .PHONY: clean all
+ 
+ LIBNAME = capstone
+ 
+ CFLAGS += -I../include -I.
+-LDFLAGS += -O3 -Wall -L.. -l$(LIBNAME)
++LDFLAGS += -Wall -L.. -l$(LIBNAME)
+ 
+ TARGET = cstool
+ SOURCES := $(wildcard *.c)
diff --git a/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch b/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch
new file mode 100644
index 000000000000..46aca725e40c
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch
@@ -0,0 +1,12 @@
+https://github.com/aquynh/capstone/issues/1311
+
+Avoid double DESTDIR in install.
+--- a/Makefile
++++ b/Makefile
+@@ -75,4 +75,4 @@ LIBDIRARCH ?= lib
+ #LIBDIRARCH ?= lib64
+-LIBDIR = $(DESTDIR)$(PREFIX)/$(LIBDIRARCH)
+-BINDIR = $(DESTDIR)$(PREFIX)/bin
++LIBDIR = $(PREFIX)/$(LIBDIRARCH)
++BINDIR = $(PREFIX)/bin
+ 
diff --git a/dev-libs/capstone/files/capstone-4.0-no-fuzz-tests.patch b/dev-libs/capstone/files/capstone-4.0-no-fuzz-tests.patch
new file mode 100644
index 000000000000..ae412e9b233c
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-4.0-no-fuzz-tests.patch
@@ -0,0 +1,10 @@
+https://github.com/aquynh/capstone/issues/1310
+
+fuzz tests are missing
+--- a/Makefile
++++ b/Makefile
+@@ -463,3 +463,3 @@ TESTS += test_systemz.static test_x86.static test_xcore.static test_m680x.static
+ TESTS += test_skipdata test_skipdata.static test_iter.static test_evm.static
+-check: $(TESTS) fuzztest fuzzallcorp
++check: $(TESTS) fuzztest # fuzzallcorp
+ test_%:
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 8af575fc928e..acdbb27ded75 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,5 +1,5 @@
 DIST confuse-3.0.tar.xz 449144 BLAKE2B c8e913aa8b074d55535c35ddce7de1a0f21dade78839f66723272780345d4b5c5f265c2040a4abc9b473a09e221b50450382dff60103198f72384d28d1ab068e SHA512 12279045b772e94d2e29201ab1d7aef1ef8e698780a22d6a282d12f51ccd9a437e7817a4dd5e39bdfc8dae79700b72aa0783b4b983a935d751403d2cffd1161e
-DIST confuse-3.2.1.tar.xz 470260 BLAKE2B 5327f7e71379b50620a6c44f1a9f88a0833d4b648874129a1d4eae6ec97a9ca748e80e902b74ba4c7669e2fda0d0bcd603ff95b5f096ca77b3ec7fe67263f0c6 SHA512 738bacf6a3abb9c64666fec103eb18c8456b994e7ba3562bdb090ef4eb33f0330da844de14d658ef44e74f90104f67ceaf408d21ddf0d251f4c6ddd80e0b387c
+DIST confuse-3.2.2.tar.xz 473912 BLAKE2B d8df03f4543291afa6d46a36c48f78d25aee7cdcd0fab7a37a639a73cd0562b52a70057075f83f7e4e56bb542a27561a65e3217c458d757345c46a29203e6187 SHA512 c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9
 EBUILD confuse-3.0.ebuild 1147 BLAKE2B b093e1e0ae54d28daacf0f44053c03e028dff3e39a584105a0a98089afa064876ae733838eae4eea571fbf5045dc96ebfcff02509ca3d239ab7e492aa0bba91b SHA512 a25765ee079b156f33aedd4e9ba0c76a497452ab993c373e67b2d5eee1b74999ff88bd1741c4b5b7383d7d8d71ec720bb69d779e79758479c27bef2d9fb08416
-EBUILD confuse-3.2.1.ebuild 1138 BLAKE2B f1adc2966681c85ba997ea7d05ac34204fa22b0a6df5e23a59558fcb22f6ae7ced3aa668a3512642208add199ad449894648c8b14cb2f45e868139db56129950 SHA512 52c1aaa4f261dbaa2d9898cba7ab553dc3b4ebbfabaa6562931283775b51ba7b5a63ae6a62d0e0c0709952300005b784ab67646d80f44ef0fdde9c100ef938cf
+EBUILD confuse-3.2.2.ebuild 1150 BLAKE2B 33cee78b5b6865bf6940f361a04ca418fea536787068de368e8ee83abbfffbf303b0ef04f0bebbe55de1f9d5e16d1326f9526a40f37d3c22379953bb35d79e37 SHA512 19118efc8f0649dca8f5603df541a3c9d255b7a107113abd0d12694dc920084ba4889ab6432d48d0278b6d7a4137ad42d9583f7c96e11f2c113b727db9a084be
 MISC metadata.xml 330 BLAKE2B 91be3657843f0a430fe8002a9496e3831c4f6d3d9ac0a04a549835403f01c216ecc95802e023695158ed60a0f194baac91cb75c0f856978aad97e31d2ef5eb12 SHA512 240e353d9f2dc60b40eab3def6e661a9a40e22bf9cdb3e3d0bdc351cc26f45a8104dd5ab487d0248087b6be702640bafc8851c6dddaa315a6260fb61858d790c
diff --git a/dev-libs/confuse/confuse-3.2.1.ebuild b/dev-libs/confuse/confuse-3.2.2.ebuild
index 576798947c01..52a38f545bfb 100644
--- a/dev-libs/confuse/confuse-3.2.1.ebuild
+++ b/dev-libs/confuse/confuse-3.2.2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit eutils multilib-minimal
+EAPI=7
+inherit multilib-minimal
 
 DESCRIPTION="a configuration file parser library"
 HOMEPAGE="https://github.com/martinh/libconfuse"
@@ -15,16 +14,20 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x
 
 IUSE="nls static-libs"
 
-DEPEND="sys-devel/flex
+BDEPEND="
+	sys-devel/flex
 	sys-devel/libtool
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl[${MULTILIB_USEDEP}] )"
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+"
 
 DOCS=( AUTHORS )
 
 src_prepare() {
-	eapply_user
+	default
 	multilib_copy_sources
 }
 
@@ -40,11 +43,11 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
-
 	doman doc/man/man3/*.3
 	dodoc -r doc/html
 
 	docinto examples
 	dodoc examples/*.{c,conf}
+
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index 506b16f70d01..3a488e794ae4 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -1,7 +1,9 @@
+DIST cudnn-10.0-linux-x64-v7.4.1.5.tgz 422699128 BLAKE2B e13b22428f011a4ad6532bfa35d836f23ea6298ad220eaea6c3a6fac7694f1c6b6920255690fac10d84388fb2bec7cc60a0319bd1816b20eac134c7b112822b9 SHA512 fd065c23b27416e2ace5f0eee854ea4a5e04f6ab4cf3a38cf806bb37a45d29756c3f138dfa01b991e96410de3668e0bb9d3cfc19cb7da7113c1f10d4147fcf67
 DIST cudnn-8.0-linux-x64-v6.0.tgz 201134139 BLAKE2B a7e616c671272a3a0f0c51b93646c8c60302c3dec85b71144e011bc3460d0ce80ff75d39869c05c4ef183d2d09aff31bb470a3fd3fd3d79b581a7a2d5a349279 SHA512 ddeeacb5b449920d942a26b98c353d78fd6f7d7fb3b3ce42a078626473efdda25c7ae641232702d62eb5749e39ecfd03e88346119c920c19348ac3ee82d3ff47
 DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749
 DIST cudnn-9.2-linux-x64-v7.1.tgz 421083972 BLAKE2B 1a1dd6708132d6ad6f8f541694b1406de4a26b7bb78b6198bc8ec5ddde2172d0cc0dc540c7c446a2f941ad11cfafa562235d17129ab8e6aa641433c35c8d31d6 SHA512 2f67c905976eb041512eb012a7cc98e1f408ec867f6a1d9d440afbcddc622c03c40de10386e44e4ab138c1a4ad040d39b0e9243f68e22975ca27ec297be25c5d
 EBUILD cudnn-6.0.ebuild 504 BLAKE2B ed456c8cadcbe6320286e4f668d60a883cccbdf4292b39cc83a50634415022a7e81ff22f49cc42e064f96520508dd91d61dcad620a7cafd3e25afa7f2d59ee12 SHA512 ea1658e2dd8344203f767010b35a0b4a84d313498da7d37075b669f77cd22f80a8d111f7ffb18b9ed216aa4e87727275cf398e87c34790e27f2525dae5c9acd4
 EBUILD cudnn-7.0.5-r1.ebuild 565 BLAKE2B 883ccb932c1f725857ed0dbf411455074aee04e2d451e2d9854ac34b4bf96b406fabf4f6c14b886dd290e05c780c8c1bf070f5c12f5b7c2089826e157df8afe8 SHA512 9033ffec0923335865f04c6e4ada3bc4266bf59a458dba2230f583ba900ff13499c26f01ef6d3f41941916b0a4ec5d2321077f3a7382fc116bbe8770cc4c898e
 EBUILD cudnn-7.1.4.ebuild 554 BLAKE2B 3e7bc00ebb9dd2c01e26148f213cedb9b047bff89084bc63dd631ab70d0bb795a7afd525f155815d83a63441b3ae349bce2c0697d964629d022330d90832fb60 SHA512 c255e5c3fa2aa8f10cb022489e7384a4f80888270214bebb18d695e031cbd4cef3ff11921a0b82d555073a5cccaa9a191aa43f92f4f4674f2db9eaa05dc33785
+EBUILD cudnn-7.4.1.5.ebuild 543 BLAKE2B b040a2b17939e30b7c76bdb04dce006e861f5dab16acd048cdc08dc6b7a1fd94b247c0a681a4e263633af7c9d04e5f193e725df37b3b33f305ee94b29ecbf428 SHA512 80126c7fc9f55fadc1fbce58997a1f5daad803af3335fd429c70dd126b4f2a2f6b105b25488613ec3fe20624f1d5758f2b67de0112d8d4930a2b05b24a0e1315
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-libs/cudnn/cudnn-7.4.1.5.ebuild b/dev-libs/cudnn/cudnn-7.4.1.5.ebuild
new file mode 100644
index 000000000000..12b9a675c0be
--- /dev/null
+++ b/dev-libs/cudnn/cudnn-7.4.1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CUDA_PV=10.0
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cuDNN"
+
+MY_PV_MAJOR=$(ver_cut 1-2)
+SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
+
+SLOT="0/7"
+KEYWORDS="~amd64 ~amd64-linux"
+RESTRICT="fetch"
+LICENSE="NVIDIA-cuDNN"
+QA_PREBUILT="*"
+
+S="${WORKDIR}"
+
+DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt
+	doins -r *
+}
diff --git a/dev-libs/cygwin/Manifest b/dev-libs/cygwin/Manifest
index 891636075ada..112586756a63 100644
--- a/dev-libs/cygwin/Manifest
+++ b/dev-libs/cygwin/Manifest
@@ -1,5 +1,5 @@
 DIST cygwin-1.5.25-15-src.tar.bz2 11486150 BLAKE2B 0fb9119396fc609dc243026a1a706a2a9ff87d34184581802d284a138e575dedce62f176cf31b02ab1bd9c1e218588b4f35e4a72cc554c95fc84af1f5f5bb47a SHA512 464553b06f74ffad464361b0bddb2eacc581abfb68f2154bba8f70334274ec63901b1f46f73cf930b05256467196e1b1ab8003215bb12ea6a42ad73fd9ac229a
 DIST cygwin-1.5.25-15.tar.bz2 1427096 BLAKE2B 7a6a2a5be6eaec21660a8f4ffa3e76f5390f9893a057d2d22ff888989c2fa11137b5516d7dd9698c17a92f5296a11d2c0c5ad8f594196ee29232508d29e10641 SHA512 72f677cd9140d4f61808203a56234e47b8e3a6e18438ff2c8d47d45472d6cc671e4dc42603967e62a1b2293d4bd9d4e1d95652746f939a6d5e1f1ec2f6c96105
 DIST w32api-3.12-1.tar.bz2 1229076 BLAKE2B 1e182fc23c01fa58fb63510351a9aa76aa046dc4971a9cdf402be0100c8765323afbd207a5ba9a92e8f906bcedbbcbf1888685092554bab0238066d490009dee SHA512 739f1f71163cac83ed892dda157f25bb30e70f2c1b134df069a6ece5fb5784e4394d597b078a8a913b8b66fb0f617495aeb94ceab2f1e5a25dab712a010f3f29
-EBUILD cygwin-1.5.25.15.ebuild 2200 BLAKE2B e18a91ee8a8c023ee05a25e528d7f00db71016ae9bac12ed5278187dfd52d398f83652715391b0323c552283f8e47c338ba9d37b488255db4570fecd9c2555ad SHA512 30b746b84dae6e7061c305e50337f3cb1f89baca01cc23b2b5c0af5df2540b6dac0335e2498f6d8c991447fd5b24ea84fe759bf3429b56859fb02f25958da5b7
+EBUILD cygwin-1.5.25.15.ebuild 2150 BLAKE2B 1c8fdf1228fd10f69e411842a7b3edd6b9cffc80666d19cc116c58fb928180348aff02d69df2743f8098d33ee91d54e7bba634d3391e733eecfe88d51d6fa397 SHA512 66c2f425a79ca563a8d202e7da740ac4c0186fd57983f17f5388e9738e7eadacfe5a5d220a90eb8cd4419e38acd93754b0fd2f45ad535abeb3863bfaf0007896
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/cygwin/cygwin-1.5.25.15.ebuild b/dev-libs/cygwin/cygwin-1.5.25.15.ebuild
index 876ce11981bc..433361029fd4 100644
--- a/dev-libs/cygwin/cygwin-1.5.25.15.ebuild
+++ b/dev-libs/cygwin/cygwin-1.5.25.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -88,6 +88,5 @@ src_install() {
 	else
 		cd "${WORKDIR}"/build
 		emake install DESTDIR="${D}" || die
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
 	fi
 }
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 271837e6510d..bbc7ae58afb1 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -23,7 +23,7 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
-EBUILD cyrus-sasl-2.1.26-r10.ebuild 7747 BLAKE2B 5e383d83fb1c6b42ba883367fbefe368f3cd641069218677439da70a8b94e7c9b5830abf633f99543d19fa5804f3f7ea77c7af92045a6e4240ac6847dfac3e77 SHA512 e9dba81cf8cda149e444d3fb3b44ac72c9fb5d3266f02bbb983cbbc158475d93cd3b29e5dd2db71b34714cfd582f39c12d0573724b550a279ec7a6d9d5103f82
+EBUILD cyrus-sasl-2.1.26-r10.ebuild 7743 BLAKE2B 26b36b8f68ae6af768e41dba4b7946c814411c70fab471dc9c93dc1487d39079306a1e3eb768920720dc7369883804a0b2a92b8a3c1ed6c997879001ea198eb6 SHA512 2b3f5221dfd76f463642ba9fee1d983c383bd9e490dda8cf41ab63e1f63723866faba25bb2042bc35ab954fb4021d9e2450c99da778185c92aa1527dd53eb9e7
 EBUILD cyrus-sasl-2.1.26-r12.ebuild 8431 BLAKE2B 0b769d0f97c9607da49eb82b57203513d7f3c8a82c410085c487f39a54706741700025164188dcef9a8b4622c7491ea995e8c33f374b893044a4a608dca3e1c3 SHA512 741e51ddbe4393927fd637ef84d953126c5fc2c5a877077113e36973239cfd3b0879d20c69dafc74a8b108ba363bc8e87db8bfd533da818ede78f20010efdc5e
 EBUILD cyrus-sasl-2.1.26-r9.ebuild 7662 BLAKE2B 8a7b96ca43d133164a9818727486f2d15bd6f66d66e083dee2ac0a8d83c921a86e3e1f34dfa04689c81b5227cf80f06d1fea3c1da74b48c828e4a31f51b67c9e SHA512 6515a66682bc8c0d18b13a3cc540d00f07d26374a6bbefdcb6c974b3184164cfcce80e965b29bc10e81345e2abb8c04eb7edb21adf4097af741d5df1557ae04d
 MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
index f9ffb2f314ba..ab28a3dd43bd 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
 srp ssl static-libs urandom"
 
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index fc6b9b8a33a0..84e680f4a9f8 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,4 +1,6 @@
 AUX dietlibc-0.34_pre20140729-dyn-lib.patch 580 BLAKE2B 0f4364bbeae48a42c77314975ba202bcd79f88fa02ee820be4b94896c2217f7eee22b36d6a196b63183d2ad80994c9f3095da9fdc917f2dece2ca9a7e2430cba SHA512 7dfcad992f97c3923402dde1c55c8249c5fd4c88b3291fff15d41010036eec83656b009968f0af67daa94de43d4ef4f0f476ba42dd41a17217edd5f9f4f576cc
+DIST dietlibc-0.34.tar.xz 662732 BLAKE2B ac709f19f98c298ee424f8320cbc7bca997156323e64d3a219251146b4257185f27519262914d3df044638ecfcf06e1e3680d8af226704dca65d6e4be20b3dc4 SHA512 2b38528c0ccf50e426f587b6448fed997fab1147eecc9e1af2f3fb3efe3d8f3997656d8e66e7cf1045ceb1f602cef43456c62ba83ff494f9c9816721bdb4d6c6
 DIST dietlibc-0.34_pre20140729.tar.bz2 670195 BLAKE2B 9479c97c09b0c8c7e5d85536afd962613e9f5fbcb1aff3ef9b2aace19d246b2d0b637f00c3abee0a2c06f170263e85ffba94247171afc47e40c8ab0e95fe5191 SHA512 a0bb5465f7fc985fd074dfcc4039003ec26b6b5fde5f2ccc53322067bd1a6459e742c9debeffda0b5146e287baa8e49f74f4a8ffafdf1daacacec4768d13db36
+EBUILD dietlibc-0.34.ebuild 1947 BLAKE2B 10ecc9832de3feb37ebfee2021d17dd30428f6aaa23f65b61cadac1ff89b8768770f81e69fa52ef80323b6ad2719b4495f63d2cf40d9beab1a3ef7d9d0442da4 SHA512 925ad454ea7ad1530f77355af878957afef90e63545ea560fbfc6397f8933c0f3b437ba2cf658024b46843368c5d7b3a893e2c8ae478f1ad69e0003e0c8ad8bf
 EBUILD dietlibc-0.34_pre20140729-r1.ebuild 1696 BLAKE2B 27b3d38a08153c4fe971f1b5a7c0f5d6efa0b375d70d091495b15d03f9b3339b23367b62260b2fd64108ab44ce349ecb6411d48663483473cddf6f75889130b2 SHA512 b1f73f641a5972b96b4a527247715aa608485f3fb05613b92e70eb1e5f5f7de9b64a91fcaeebc74625f33a56294335c79240d48f65287986dcc96ebb203812bd
 MISC metadata.xml 416 BLAKE2B 1484805b8b75b745a2cb7409aeab9f5d934f3c6f92cae880c650a34e0d05e4e97a889a9390a9c0a25da93458f8f74349006737307dfe86382d5b07cfc9fb9be4 SHA512 7d39c127ffecbfc46fc6987189f2d28e92b35effbd71d4aadc465ac5fe1e47d088574700b26bb0bc27f1fd17b3487de85317f34a87393597f99b38a9be3c0c0d
diff --git a/dev-libs/dietlibc/dietlibc-0.34.ebuild b/dev-libs/dietlibc/dietlibc-0.34.ebuild
new file mode 100644
index 000000000000..4a35f612fa6d
--- /dev/null
+++ b/dev-libs/dietlibc/dietlibc-0.34.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A libc optimized for small size"
+HOMEPAGE="https://www.fefe.de/dietlibc/"
+SRC_URI="https://www.fefe.de/dietlibc/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DIETHOME="/usr/diet"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if $(tc-getLD) --version | grep -q "2.31.1"; then
+			ewarn "${PN} does not work with unpatched binutils-2.31.1,"
+			ewarn "see \"${S}/FAQ\""
+			ewarn "and https://bugs.gentoo.org/672126 for details."
+			ewarn "In the meanwhile you can install another binutils version"
+			ewarn "and use binutils-config to switch version."
+			sleep 10
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
+	use sparc && replace-sparc64-flags
+
+	# gcc-hppa suffers support for SSP, compilation will fail
+	use hppa && strip-unsupported-flags
+
+	# Makefile does not append CFLAGS
+	append-flags -W -Wall -Wchar-subscripts \
+		-Wmissing-prototypes -Wmissing-declarations -Wno-switch \
+		-Wno-unused -Wredundant-decls -fno-strict-aliasing
+
+	# Disable ssp for we default to it on >=gcc-4.8.3
+	append-flags $(test-flags -fno-stack-protector)
+
+	# only use -nopie on archs that support it
+	tc-enables-pie && append-flags -no-pie
+
+	sed -i -e 's:strip::' Makefile || die
+	append-flags -Wa,--noexecstack
+}
+
+src_compile() {
+	emake -j1 prefix="${EPREFIX}"${DIETHOME} \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		STRIP=":"
+}
+
+src_install() {
+	emake -j1 prefix="${EPREFIX}"${DIETHOME} \
+		DESTDIR="${D}" \
+		install-bin \
+		install-headers \
+		install-profiling
+
+	dobin "${ED}"${DIETHOME}/bin/*
+	doman "${ED}"${DIETHOME}/man/*/*
+	rm -r "${ED}"${DIETHOME}/{man,bin} || die
+
+	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
+}
diff --git a/dev-libs/distorm64/Manifest b/dev-libs/distorm64/Manifest
index 9d2afa3bc93b..ced9f302a84b 100644
--- a/dev-libs/distorm64/Manifest
+++ b/dev-libs/distorm64/Manifest
@@ -1,7 +1,5 @@
-DIST distorm-3.3.3.tar.gz 220254 BLAKE2B 2f3cad53365d0ba305de0da5c45fdebbecea2eda1428cc370230c9607608fcc4cbfcd3be364f3421db2bf678e1ca9e8501d645fe365275f3a00846e7aa1c8d27 SHA512 abc37d050efcb7fd7c6e0f1ef055537f06059528fb48a07d159621adca8d905ee3a44b394d75e10aa69f2429fb1023e9282b349281acb3a9474148f195306fbf
-DIST distorm-3.3.4.tar.gz 220334 BLAKE2B 6fb534630a43bf7b9c23added8fc8101a6811ea4630b09948e3774b49508f3dd25a7acd1ffb87e0503cf17bd7ce5300053c9196c7dd754094c4a6ee5dbbc430f SHA512 172bb1a9a3f92089daf140fd019c94cf3b63f646b78e7aa527640819f418b1e3df2e2d727a76863a7800e6e3735c404054aeb48fceeec7a94f95480b89883b90
 DIST distorm-3.3.8.tar.gz 219869 BLAKE2B 91be3a56f1ffcff96ab345c8dd42a4f17b22f40299c5c16b77b3074ba2e071d747aa2e91adeea3cb78e3787cc42d5ad4544b89c3ed5b7940d9156168acc8da62 SHA512 bf65fe500089b4aa38d6430eb985f1dc3494b43c829379c56f91b5b4b25d19504fa3781a2fb2b03946f541962f6e564e46d6ec464c469ee21ecb773303b8494e
-EBUILD distorm64-3.3.3.ebuild 537 BLAKE2B e864b95ade7fdd827e2d7610ab92c28ebb7206934f697c65a5393e8a888a6d5a91cfd15e769beda06d15e86814fa3e6a9f57cecde88fe253096286ad92c6b2e5 SHA512 19067c36461cf72c0b2823b36d1cfd1c698f99a8fd40c6e9bb32dabb481c9d99b14555e36587a9101ea800b81557e72b21aa5ab86046fae203b36e5ff3e5bf25
-EBUILD distorm64-3.3.4.ebuild 553 BLAKE2B a455d2b011d0e221baaf6e1f1549d5bade4871798a5d677abd2f36954447968d1b616bc7b46972f1db3ec30d9d4a95b3d96d3bf39cd35ecbf7e5bae1147df04a SHA512 f1d673ea1f60797879d6680129833658865a02b5f87a536fe3298a8e147bfbd1fbdf97a80c72909f8b3cfd4bbc97b77a537edb517d79da4975daa81eab632d51
+DIST distorm-3.4.1.tar.gz 220042 BLAKE2B a845fb3b5a3c98c1b25601896785273668b48c8477dd29c5db4c4ddcf3cdfe73095e3c4c883ca0909820430989a412d9b47c87471450eba2a4d969a9a03d32c1 SHA512 0e9f8b62bc190ef7d516f1902b6003adef9c7d5d4a5f985fb0bdfc5d4838b2805e2b8836b02d5eccdb3401e814417de615dec675aed9e606c93122ca8a0d2083
 EBUILD distorm64-3.3.8.ebuild 550 BLAKE2B f71c0b181fbe93a299fd54fc1452e18da3b34b5e2cc157f520fcb6e14dd33c0917787606e481b592ddf2a09b8f418fee165223903577edc5b3e0c3f7f3d0a427 SHA512 d3ecc5fd272ff2cad173e58b5fd92c6967df5a6c12b0de33219714da28b001ed447249c183002dc69cd65d1cccae042bf4e5e6f10fa5933fcc6d8c4bea5d3b2f
+EBUILD distorm64-3.4.1.ebuild 513 BLAKE2B c440e7e48e82941ae968080eaabdc4a7d6d1d62ad89e5b011b56e1e92396eca0d5692295aa1bdf5e0d89f0d82ace9ade89a2c2a1ed78ecc432f15c4f563c9218 SHA512 c931b5a2aec707bebb7310177d5bc012cae136bff46fbd7b45f11771b91cb39729d639807e200c1878dc89a622789dbaf6840f49b6f11bda45449129029f419a
 MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
diff --git a/dev-libs/distorm64/distorm64-3.3.3.ebuild b/dev-libs/distorm64/distorm64-3.3.3.ebuild
deleted file mode 100644
index 74d0bdc5ef7f..000000000000
--- a/dev-libs/distorm64/distorm64-3.3.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# does not work with python3_4 as-is
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
-HOMEPAGE="http://www.ragestorm.net/distorm/"
-
-MY_PN=distorm
-MY_P=${MY_PN}-${PV}
-
-SRC_URI="https://github.com/gdabah/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-DEPEND=""
-RDEPEND=""
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-libs/distorm64/distorm64-3.3.4.ebuild b/dev-libs/distorm64/distorm64-3.4.1.ebuild
index bdb8f39dca4b..7b6289f97eac 100644
--- a/dev-libs/distorm64/distorm64-3.3.4.ebuild
+++ b/dev-libs/distorm64/distorm64-3.4.1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# does not work with python3_4 as-is
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 103201fade94..54399974d382 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,5 +1,6 @@
+AUX efl-1.21.1-fix_evas_preload_segfault.patch 381 BLAKE2B a4b8afbe06cd44154a41766fcf12775369c2243325eab17647423a3d2b78cc3646361c0a4884de71fd876698defb9816f50343c46690b595c3701a6295a95040 SHA512 90901ab26915a6d2aba80deb610eb8bb873cd4cc7210888a4f062057891024d4e0b3f051be2fda39680d2267301251abbfbfc47072cb5c22ba6eba8f9d9567fc
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
-EBUILD efl-1.20.7-r1.ebuild 7790 BLAKE2B 8949614b2b22abd64583b987f5b2bbfa50f87575951833899c19245f191acc4fa08244307af6a23c9b8a2d4179f8cbf7a8cdc69698bb29897a9ea6ff80f85e17 SHA512 d4e847eac0d3f36aea057a7596d7277966343c80bd90338a4043cf0ad52d3ec7ac2aaa42fdcb4e94a750f81cd5cc712271c1631bf3e778354fb93d40a26eb773
-EBUILD efl-1.21.1.ebuild 6587 BLAKE2B 3d0eac3de903e7e01d5cf0299504bfe1db128080a9fe12995bd61fc85facd8e9a70310aff74d9fa50c6e09de01386dde00a1b8d92c760d2985118db0b492e61c SHA512 7eddc1df3186324e52cc3336c1207f5c4c46dfe7bfb69824e94ca313c510e2b9fb11de376d72ded9b2f9131cd95a77b93bcc33395cb23a4d111c7ef9ce719394
+EBUILD efl-1.20.7-r2.ebuild 7801 BLAKE2B ae7c174c2df99540483b1b0de1bb89e661e2f4441a743701555628aad39c5f5b6f7e1a6ddbb4dac0831878b5ba67e38fbd6163a60fbfc6e6481e87ca4378e185 SHA512 49bd3450f13a4f772d2f05635eaddaa952dde536b47eafe90eb427c9edde12eae2b6177b81c9fb14459a303d82bb7e1948f4124cfccb53c6aade83794cb0b8fa
+EBUILD efl-1.21.1-r2.ebuild 6685 BLAKE2B 05b5ef33a7b5341593d0a8d4f873e96b6e8a2dc080cf39ef1795b5da5410f5425b21b4d29299aba69839439ec45bb246a43e93a79aa0d2e468a924cc090d4668 SHA512 99c02c9ef63fa6319b3d8d359dadde7c671daaf0d42246264b7e3ecddc0be4f6aa5958f62759cb723c211198754a3d473285235b6961fedf083298059580db70
 MISC metadata.xml 2169 BLAKE2B 884096e54342ea876d8c6aaad16ac3f1928fbf2b791dcbf6ca5913fbc62800f63db5a1672a2b053f103e502fe581d6eaed7f978e02682f977688a3f038037b3f SHA512 2aa1f3dd9e121ec9f321329d4a209d671b8195cc1bdf41b70c4dfd3b0ba8a64c8b23231f11b3097023bfae013c49ded5eb1cfcafeeccd81ab81631757b8b2974
diff --git a/dev-libs/efl/efl-1.20.7-r1.ebuild b/dev-libs/efl/efl-1.20.7-r2.ebuild
index 69bf06a886f0..e340440bf9b2 100644
--- a/dev-libs/efl/efl-1.20.7-r1.ebuild
+++ b/dev-libs/efl/efl-1.20.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ IUSE="avahi +bmp dds connman debug doc drm +eet egl examples fbcon +fontconfig f
 REQUIRED_USE="
 	?? ( opengl egl )
 	?? ( opengl gles )
+	egl ( gles )
 	fbcon? ( !tslib )
 	gles? (
 		|| ( X wayland )
diff --git a/dev-libs/efl/efl-1.21.1.ebuild b/dev-libs/efl/efl-1.21.1-r2.ebuild
index c627b1a33b84..609c8e0bae66 100644
--- a/dev-libs/efl/efl-1.21.1.ebuild
+++ b/dev-libs/efl/efl-1.21.1-r2.ebuild
@@ -11,12 +11,13 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="avahi +bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
 
 REQUIRED_USE="
 	?? ( opengl egl )
 	?? ( opengl gles )
+	egl ( gles )
 	fbcon? ( !tslib )
 	gles? (
 		|| ( X wayland )
@@ -40,7 +41,6 @@ RDEPEND="
 	sys-apps/util-linux
 	sys-libs/zlib:=
 	virtual/jpeg:0=
-	avahi? ( net-dns/avahi )
 	connman? ( net-misc/connman )
 	drm? (
 		dev-libs/libinput
@@ -52,8 +52,8 @@ RDEPEND="
 	fontconfig? ( media-libs/fontconfig )
 	fribidi? ( dev-libs/fribidi )
 	gif? ( media-libs/giflib:= )
-	glib? ( dev-libs/glib:2 )
 	gles? ( media-libs/mesa[gles2] )
+	glib? ( dev-libs/glib:2 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -61,7 +61,7 @@ RDEPEND="
 	harfbuzz? ( media-libs/harfbuzz )
 	hyphen? ( dev-libs/hyphen )
 	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:0= )
+	jpeg2k? ( media-libs/openjpeg:= )
 	libuv? ( dev-libs/libuv )
 	luajit? ( dev-lang/luajit:= )
 	!luajit? ( dev-lang/lua:* )
@@ -115,12 +115,12 @@ RDEPEND="
 		x11-libs/libXrender
 		x11-libs/libXtst
 		x11-libs/libXScrnSaver
-		opengl? (
+		gles? (
 			x11-libs/libX11
 			x11-libs/libXrender
 			virtual/opengl
 		)
-		gles? (
+		opengl? (
 			x11-libs/libX11
 			x11-libs/libXrender
 			virtual/opengl
@@ -129,6 +129,7 @@ RDEPEND="
 	xine? ( media-libs/xine-lib )
 	xpm? ( x11-libs/libXpm )
 	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
 "
 
 DEPEND="
@@ -136,6 +137,10 @@ DEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix_evas_preload_segfault.patch"
+)
+
 src_prepare() {
 	default
 
@@ -166,7 +171,6 @@ src_configure() {
 		--disable-tizen
 		--disable-wayland-ivi-shell
 
-		$(use_enable avahi)
 		$(use_enable bmp image-loader-bmp)
 		$(use_enable bmp image-loader-wbmp)
 		$(use_enable dds image-loader-dds)
@@ -217,6 +221,7 @@ src_configure() {
 		$(use_enable xine)
 		$(use_enable xpm image-loader-xpm)
 		$(use_enable xpresent)
+		$(use_enable zeroconf avahi)
 
 		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
 		--with-glib=$(usex glib)
diff --git a/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch b/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch
new file mode 100644
index 000000000000..8d42cbb0f250
--- /dev/null
+++ b/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch
@@ -0,0 +1,10 @@
+--- a/src/lib/evas/cache/evas_cache_image.c 14:09:44.971119099 +0100
++++ b/src/lib/evas/cache/evas_cache_image.c 14:10:21.521226043 +0100
+@@ -361,6 +361,7 @@
+    cache = current->cache;
+ 
+    if ((!current->flags.loaded) &&
++       (current->info.loader) &&
+        current->info.loader->threadable)
+      {
+         evas_module_task_register(evas_cache_image_cancelled, current);
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 3c5b33ecdf8b..e41c1ead10ee 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,7 +2,9 @@ AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b33
 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
 DIST elfutils-0.172.tar.bz2 8601066 BLAKE2B 7d4cb9944bfc258ba46312e8a4dde491f9d8fb4fa27837f6df0993107256f76e79ce02ea5872475a70ff9ebe9093e39bddf1c807be2af4bf0f6f5429f446a1ce SHA512 b2f491e976ef3067fe33ad22b3ef1952c47557571747899e94aee601bfeb95e8e1a91daad80a7950bee7feb42192769663db32eb65734ea5ffbc0b87cdad76b2
 DIST elfutils-0.173.tar.bz2 8684782 BLAKE2B c5905bb864059bdfb2699a0681a0ec576b6b8da444b0641e8184f58735084588910930bcca14583db6be75b24a0e374413911ded5ba2ca893798404fbe7374eb SHA512 7f38e4ce2098b685f15030bf01f0a66a74aa32fbfcead0304c1d0e0a929b348a72f99e685cd4605465f4337393382112f64b8847e6c2f7cc1a57a4fd03d03eb3
+DIST elfutils-0.175.tar.bz2 8786600 BLAKE2B d6d4ade37741da788c6c2eec9688c6f8ac9707e0b17e0518398972dab3cf77a70cc82346c2e37b41f0ea414b9a1e925a7567567fcf43d504d75c92971ab25f5d SHA512 2c3168a34bbc8f22425faa263fc24ec50df39258a4f9ace4e6cd88e9764c435fee70c1a82db8273dbab70a75e5216a200bebf05af1d3ea77e444e35d71a4ed84
 EBUILD elfutils-0.170-r1.ebuild 1790 BLAKE2B 2581434109a567bc3c57d6ebaf6b1416377d2fbfcc1cadc51efbefa02caab505dcdfa22e58b33c80ce37637c5abb1559ebdb117999eb5f552095f85da8f0dafc SHA512 22d72fdb2e2c1e8d4e1d47113a8c0d6aeb2e8e7b9f0759d445e32509c7bce9cc6dc8edd38e12ffa556447981fc60c7a04df76fd6d529b79d07d28cb10314f6ce
 EBUILD elfutils-0.172.ebuild 1813 BLAKE2B e364165c42a078dfeea283efdd0268261a57862dcd98f26f10c363edb54f1c12990148b9ac2d6c1170e719e81c902953f1212d4a43a61d5fb6839205ac836190 SHA512 21afb93206de176856703f5ba64ba990a108160e004f66251a3557b110063414cc4d9b90558ea2be6c38b676fbd15b9cb5f03b49681ac52d723dd7ee6add14a4
 EBUILD elfutils-0.173.ebuild 1813 BLAKE2B e364165c42a078dfeea283efdd0268261a57862dcd98f26f10c363edb54f1c12990148b9ac2d6c1170e719e81c902953f1212d4a43a61d5fb6839205ac836190 SHA512 21afb93206de176856703f5ba64ba990a108160e004f66251a3557b110063414cc4d9b90558ea2be6c38b676fbd15b9cb5f03b49681ac52d723dd7ee6add14a4
+EBUILD elfutils-0.175.ebuild 1844 BLAKE2B c5b5e64fc50418a8f3efb3fb3fd460956823ce1a13d07fbd04b16d5553c5319f2972ab31893329b99ab632dab6391911031c2c3ab60484c66edca91d167049c8 SHA512 e61d24695145a99999d779a063f99d56a093ad9baf474739ea27b21a23638a304b19087c55db0d00fce949ee13e2f80b817f394d6131d8ce5c968d358c76ce89
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.175.ebuild b/dev-libs/elfutils/elfutils-0.175.ebuild
new file mode 100644
index 000000000000..39a57eb90c12
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.175.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+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 ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4"
+
+PATCHES=("${FILESDIR}"/${PN}-0.118-PaX-support.patch)
+
+src_prepare() {
+	default
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		--program-prefix="eu-" \
+		--with-zlib \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma)
+}
+
+multilib_src_test() {
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index fa6a245a531f..30f0c8d8c8c4 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,7 +1,7 @@
-DIST ell-0.13.tar.xz 402484 BLAKE2B 0a738595942e26a288cffde476e9dc5fdb861fb6c8e1718be1ba5a1791c56dae6e307d705f9409226dd989e29674672286a8b910222f86acd0a9dabf5abbd206 SHA512 62e685bf9631dfc815d4b65db489ef133f3ba78211ff0c00bc65957c086c39c2454be98e3989f06925b17a5ace30de2a008382d0e5b05ef12192d02b5e1c785f
 DIST ell-0.14.tar.xz 404352 BLAKE2B 23033445957d1e3e5cc3231a090c68dbafb2d1bdafb5400889f811a1764e16a7bf59170321f0b7ac124039e7fb292e1d035ce88722a7d03ca08b91ad07345428 SHA512 f1f4abd7cddf1b230144e2e13adbc74b86954cf5e91166ebbec53fd97010280999bd17380993d3501aaade5f094fef0dacaf557198e5ac7da298226f36e8fbaf
+DIST ell-0.15.tar.xz 403812 BLAKE2B 428e999a1d761a97f5ed26c080e40d6c0f8297ed373d31721200d37141249f6b5aa57005689d85c92531c33e067840b130e3ce41a9fd4b05e25d49f978278dc7 SHA512 42ba7a6049b4751ee8876dbb26caf8289541e68079314ec299e83c97acc546eadb5254d35e354468d906b4185fd6f08b22f2979d5f0f20321135055b38b26fc4
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
-EBUILD ell-0.13.ebuild 774 BLAKE2B 0aad3afe87ad07413b33bf1b37c3b10db5c54ea14a07702fb8291556c70dfceafe20c07e0ca9ff3940afa4b305f2d1cdbf27191a557bafeceed36b028303eb9d SHA512 bb9f7f5041ba54bb900a42f783ae2359fd2237d9c8facd22c3f9c246810d3cff436b522c7e85066f9257ca787fe6dead888378db1c1e1a47084e14214d51c679
 EBUILD ell-0.14.ebuild 774 BLAKE2B 0aad3afe87ad07413b33bf1b37c3b10db5c54ea14a07702fb8291556c70dfceafe20c07e0ca9ff3940afa4b305f2d1cdbf27191a557bafeceed36b028303eb9d SHA512 bb9f7f5041ba54bb900a42f783ae2359fd2237d9c8facd22c3f9c246810d3cff436b522c7e85066f9257ca787fe6dead888378db1c1e1a47084e14214d51c679
+EBUILD ell-0.15.ebuild 774 BLAKE2B 0aad3afe87ad07413b33bf1b37c3b10db5c54ea14a07702fb8291556c70dfceafe20c07e0ca9ff3940afa4b305f2d1cdbf27191a557bafeceed36b028303eb9d SHA512 bb9f7f5041ba54bb900a42f783ae2359fd2237d9c8facd22c3f9c246810d3cff436b522c7e85066f9257ca787fe6dead888378db1c1e1a47084e14214d51c679
 EBUILD ell-0.9.ebuild 768 BLAKE2B 1d8bb3eb2ac59821d47058c5d6e3244db2b66240710b2c2bbd2b27715b9f48740f91ca58cab9749890b82231a461ed60875cb4ca8b8e6015fd917262e819b334 SHA512 c2313d3629b3ea728432e28b6a2a94d57237b062d659cc6ee2b7e6097da03ccff3afb2a34e556c9b259daf18ea8fed6a23862bdd576adc8b0eda9a985367313f
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.13.ebuild b/dev-libs/ell/ell-0.15.ebuild
index 69fc97dbb17b..69fc97dbb17b 100644
--- a/dev-libs/ell/ell-0.13.ebuild
+++ b/dev-libs/ell/ell-0.15.ebuild
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index d9b9715dec44..b2a10a71d57e 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,3 +1,3 @@
 DIST flatbuffers-1.10.0.tar.gz 817750 BLAKE2B 1896b01afbdb8527836fa684980169890b1d5f1213d64cc88310f819c5fe7bc2a7e0a87e1abc2565ca165a0406dee9c814af382d2c8f08718ae5d9173530f98a SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2
-EBUILD flatbuffers-1.10.0.ebuild 712 BLAKE2B e5e97b969d4922308b25676e36917f7cf34666e29dc4b4c1072fff9adeb9adfded161479dd5c726d04303b63db84997b0209f9fc8c9ce8f07ad9f2e39cea321d SHA512 6a850e30d2fc5c8f293f4319c4d19368163632b25229fa2f33a97b9407cdad84c4ea6e41866f7835073e172a3d7ae28bf176b42623f81d638a82a78b54bf5262
+EBUILD flatbuffers-1.10.0.ebuild 710 BLAKE2B 51608ad4b42cfc506656c5289a869e23c254c8b97d12c39aa7e0549c330d260cd7e0523af380da6ab3b3e3b1592049eea736fddea1f847f154a2fdcf9be11a99 SHA512 763f697f453ef44323228f32b01d237ab8c240f51614c1665aad5bea4716e04cc885f2ba76af8607c4eb5fa7acb8cfffc5a0f8feb51700b0e36d89b4c61e9b14
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild
index 0f9711c74450..8ee23dc4fa10 100644
--- a/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs test"
 
 src_configure() {
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 995f6c5d333b..fad665b98bc0 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,3 +1,4 @@
 DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
+EBUILD folks-0.11.4-r1.ebuild 2423 BLAKE2B 1f58106f9395204dc114c7f0773d18ea4b7a2c2d2eebe51ddc8cc079af8d6dd9bdf62baa6bb4d2af971dfce092921d268fd26827afc155e91aa10f9f4b543d26 SHA512 0467bd85c89c02609f15bb88db1989bbdb284bb6efaf1c6b013e9b57564bbdefef95414ada4778d4d5776ee689e24cb74d4dbcfddba0963714801586b63f805b
 EBUILD folks-0.11.4.ebuild 2287 BLAKE2B 88ff4471bda2f64b67215049dedba5241370b992b0d59abdbc7411d9bda0ccfaa22072c7ec5d4fa1f09685f8be2908a9ae4742eadb77c520833389089817848b SHA512 8cd137238de0aa09e5467b76afddf18885cfc66561dc3b6c78f3783ad876a52687f71b45ba9845a1c5ab21b8fdffac58001dd0d8bc2cebad81a392c119f71d9f
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
new file mode 100644
index 000000000000..821d24168b25
--- /dev/null
+++ b/dev-libs/folks/folks-0.11.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/25" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+# TODO: --enable-profiling
+# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
+IUSE="bluetooth debug eds +telepathy test tracker utils"
+REQUIRED_USE="bluetooth? ( eds )"
+
+COMMON_DEPEND="
+	$(vala_depend)
+	>=dev-libs/glib-2.40:2
+	dev-libs/dbus-glib
+	>=dev-libs/gobject-introspection-1.30:=
+	>=dev-libs/libgee-0.10:0.8[introspection]
+	dev-libs/libxml2
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+
+	bluetooth? ( >=net-wireless/bluez-5 )
+	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
+	telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
+	tracker? ( >=app-misc/tracker-1:0= )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${COMMON_DEPEND}
+	net-im/telepathy-mission-control
+"
+# folks socialweb backend requires that libsocialweb be built with USE=vala,
+# even when building folks with --disable-vala.
+#
+# FIXME:
+# test? ( bluetooth? ( dbusmock is missing in the tree ) )
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50.0
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	test? (
+		sys-apps/dbus
+		bluetooth? (
+			>=gnome-extra/evolution-data-server-3.9.1
+			>=dev-libs/glib-2.40:2 ) )
+"
+
+src_prepare() {
+	# Force re-generation of introspection files, otherwise it does not match installed libs
+	find -name "*.vala" -exec touch {} \; || die
+
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Rebuilding docs needs valadoc, which has no release
+	gnome2_src_configure \
+		$(use_enable bluetooth bluez-backend) \
+		$(use_enable debug) \
+		$(use_enable eds eds-backend) \
+		$(use_enable eds ofono-backend) \
+		$(use_enable telepathy telepathy-backend) \
+		$(use_enable tracker tracker-backend) \
+		$(use_enable utils inspect-tool) \
+		$(use_enable test modular-tests) \
+		--enable-vala \
+		--enable-import-tool \
+		--disable-docs \
+		--disable-fatal-warnings \
+		--disable-libsocialweb-backend
+}
+
+src_test() {
+	dbus-launch virtx emake check
+}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index c7c81b89a599..423d9d2dd74b 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,5 @@
 DIST fribidi-0.19.7.tar.bz2 648299 BLAKE2B 496d010f29dd8fc3d349ad3f89d60a596dfceaa5350663442d5965cb09bc7a23e2ab8a876d7ca5b05ec3f4c5e178060cae2b493ccc46a6cdfc022d139e778259 SHA512 4bfdda43d961030a8a2ae2c98d2ca5d43c1b59633fa0987920c5537ec69f3f624204ceacc4c474d878cbb417ee2d9e708dfe169cfce6ad584d2f2d5122678b63
 DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2
 EBUILD fribidi-0.19.7.ebuild 1206 BLAKE2B 69477c5d99446c25db1abc77cffb07ea695e3e57b1474311038e1991c3c6ae387752cd18f5b0a24d9e022e95aadab597baa38f9fe9350a796a45f852286019a5 SHA512 c49e9a76d0a3c41bb03c74ad9af627969ea5c462cd837366a7df52343d7f02a3fc05bd62e2ffcdb57ded1a58c20bd9426469e0ef736ea0210db43e34512ba024
-EBUILD fribidi-1.0.5.ebuild 949 BLAKE2B ad1334baf489e77b060aa19fcdf9b9c76fc2ec07833e178eea7688ee9dbab946a3701616b4f2bdd07d7e07bf2300482eeb283c2c4b2220a4e72ee2693fe985a0 SHA512 9869a4a22c8b2e4ef59bd52090199f1a52701eb446e57a1e513eaa49e1eab78f81bfc5d85b7ba70b727218c96ae72cde6e97888a26af36948fec7ee3b20ceef1
+EBUILD fribidi-1.0.5.ebuild 942 BLAKE2B 4257173da79df01b3299fad960d859399947394c3e90e49a4da9381c22b8715ded60e7f4d787d8154d9be3bc7518a8966af42367e3f27e79661a94aa48e3ab1e SHA512 ba3cc76da7dce98d48e53cf956e139579049c8b6ea26454d612264ca06512a5fb1e2907bb5e32d3f35979a0987ed58350b3d45df22462eb2ca2d9d9a1c59de59
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-libs/fribidi/fribidi-1.0.5.ebuild b/dev-libs/fribidi/fribidi-1.0.5.ebuild
index c3a09cd54191..195aac1146bc 100644
--- a/dev-libs/fribidi/fribidi-1.0.5.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index e00056a60601..d8a1976dfff6 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,5 +1,5 @@
 DIST gdl-3.22.0.tar.xz 529072 BLAKE2B 7215c53051dc3ec467c97615fa7e8059bf6c610cd166bea28ba256bf26b4de75fc63ab1e627acdeb8228257844ae1b47bb5d88cef24c7efcbd5bfbe508928eae SHA512 408fd75627497c658b65e9cd39b8779ad0db2fdc1f780e369237fbdd3f0ccc035cd86456ff72e1581c524f1d35673d3b31ebb074290babf025596d08d823833d
 DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471
 EBUILD gdl-3.22.0.ebuild 699 BLAKE2B b497476365878d4091df1b297ca87acb5e78537b32acefc6d28eed4bf03fda0c33ff14b07c66156330c555dfb42780fc7e844630204ecec0c4ad06e2f60769a3 SHA512 68e75de4dc853f09c7cb43f4533592c64ff6fbbcdf9bb4fb77e40fdf48958b78029b57edadd90f65e1194b08d3a7003e5e5a5dada30543a68f7b59b0b805c8d6
-EBUILD gdl-3.28.0.ebuild 728 BLAKE2B c968480bced21d97f5b16ac33d8aca5f87fa75dfe2ed038ec7311f7f281163632bf536e047d0fdef3fbeee6edc01421a8d8ebc39471595b8848ea7370faaefad SHA512 62c37d4eb12fe4f1299659463a927ac43ce0de4601ef63270529c8e828bf5ae9c4472cdc5999a33b9f9fb8f4082c10a8bdd3e13806dff78a80451564e07f8f66
+EBUILD gdl-3.28.0.ebuild 723 BLAKE2B bf4fec64d725f469dabf30586c75eec182cda8ad4bd1d7596bc8bca6075555d8aa781dd60b40491716243f61d476c0ecf2c9049fe8eaab866ce88798dd0362ef SHA512 c434572fee9b871cd189fb0109d30c1f7e98806cbdf082c58905c1b9de275b00824975d031d7f73593e98efb13eb6b5c3949ec4e0e1ada35723a49d0b285948b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gdl/gdl-3.28.0.ebuild b/dev-libs/gdl/gdl-3.28.0.ebuild
index aa4f6208eff9..5d411e0cfe9f 100644
--- a/dev-libs/gdl/gdl-3.28.0.ebuild
+++ b/dev-libs/gdl/gdl-3.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index f06d33d58bb5..14a2e5788172 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,4 @@
-DIST girara-0.2.8.tar.gz 73646 BLAKE2B 08a3fea194922cfb84793d14905f15aac6e73daf3c4304842b88e7f517046daa287deaef770176bc06358b37c52418f1e42204df302c2c7d4f82c2f4a10a44a9 SHA512 d853f8337a63ae2ed319547a2daa2ccd3ce6f31b3dbb52522705c78dbbb94da1dc1efc4ac62d3c2af94531d4dea309323b878619ea0c9778c37960791ca0cb4e
 DIST girara-0.3.1.tar.xz 58148 BLAKE2B 7945ca0b417bf09a37f4ce7cc6603adc93cd224d7e449c7f4dae00a4abf254b251230fb40e2f985c293bad95c0bd05ff646418bb5f8e0a1c6d5d2df832900256 SHA512 5c4b2972bfb0296cd1b984c9426b67b50e29e2928fb0e9a3aa3f9bc21aebc28dcc93570e888060e0bb02561022b379cdfcfa3317b52e78cac04e7fc1ba476107
-EBUILD girara-0.2.8.ebuild 1411 BLAKE2B 572289bb28e3150c8b4b67b2d7da7b47a413a408e968cdf04b3821e32f15f6e51266cb24a030f626d86355ee66cfae5ce696351c07056a6d1cfdb5a977ffadb8 SHA512 e55455523f3f92870d93ef1dd54796b61d14c4b8bf875da6b67c88611f20a55d623e6263852e9f88001c6725d7488f000eca2ae8332be60dd0a737807dee7125
-EBUILD girara-0.3.1.ebuild 1087 BLAKE2B efa80fdf6c283fa3b3c30dfca4e12ba71cd5890a216ee8f7aeb6e991874404085fbe30aedc601b5ab28f42600e1a762b4d474a8739ff622e6ef8669028e3694b SHA512 393eb4191dc13efa6c690fa9321b16a3245c9c4de91832eac40731ad186f830f6832f185429c79230c30b2c28439748dbe1b3b2a4f8b6d98ca4b522128b2c05d
+EBUILD girara-0.3.1.ebuild 1085 BLAKE2B 03b0b6355af3d1d3233bb2289715e3ca201e3b3ca0d4831fbf6d427fb07cf699294dc644d7f8815b164407339cab07de5b3952134148721bc56f2d0e3f7d402e SHA512 7f99122c66d8112cd04411cdaef5ef9071dd9de9857f51fab19328b262c768ed8e300cde29c331cdbc42679fac45850ac737bc465b669cef51cb6a9630f6211a
 EBUILD girara-9999.ebuild 1088 BLAKE2B d8a7b3d6df62bd55c8986aa7ad8211a9b724bce56564fea857119707ffbac4f0ddf4c22bf2f789d140ff743807db14a69d7b6e597513f3cb2ceebbddd1a9c685 SHA512 73978f226c851a22414e3d5a5be70a0315acf4acaa995e30ea03a393beef3cf8533937225e6262297ab39f7095129421c97904c8439b15b4510fe04f85388a3a
-MISC metadata.xml 700 BLAKE2B a40c7ce11c9e6ccee885e8da21856f4b74b9845b358f560e7cbd597a87cdc70942fbdc2a4a30c0ad156a964c4c07754ccd03be8be9a98021813dabc12c5483e1 SHA512 96d4e1a4d9d59be1e2613ae45def5357af5a20d2f9511f1f56418bf2eb3e41198a062ff3af741cfca9b644201703a2e7979cb533c4e00fc9b85336844b10e5c2
+MISC metadata.xml 661 BLAKE2B 23e1208a22b54c7301973769a1b00adc8a2bc79cc7c4e5743e4bfd4f8e99933842466aa853510156f14020657954f35d89466888f03e515e9dbb00bd948845a4 SHA512 fb995def4c0b05dcc8bfc77ced8283bbc8e872586f7eed834291510f037215480fa38cdd4a4ff930337ef3e759e65ab55b417e531c8ff0c058c93cd15b630f59
diff --git a/dev-libs/girara/girara-0.2.8.ebuild b/dev-libs/girara/girara-0.2.8.ebuild
deleted file mode 100644
index 1098c77dd33e..000000000000
--- a/dev-libs/girara/girara-0.2.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs virtualx
-[[ ${PV} == 9999* ]] && inherit git-2
-
-DESCRIPTION="UI library that focuses on simplicity and minimalism"
-HOMEPAGE="https://pwmt.org/projects/girara/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="https://pwmt.org/projects/${PN}/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
-
-LICENSE="ZLIB"
-SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="libnotify static-libs test"
-
-RDEPEND=">=dev-libs/glib-2.28
-	>=x11-libs/gtk+-3.4:3
-	dev-libs/json-c
-	!<${CATEGORY}/${PN}-0.1.6
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( x11-apps/xhost
-		dev-libs/check )"
-
-pkg_setup() {
-	mygiraraconf=(
-		WITH_LIBNOTIFY=$(usex libnotify 1 0)
-		PREFIX="${EPREFIX}"/usr
-		LIBDIR='${PREFIX}'/$(get_libdir)
-		CC="$(tc-getCC)"
-		SFLAGS=''
-		VERBOSE=1
-		DESTDIR="${D}"
-		)
-}
-
-src_prepare() {
-	# Remove 'static' and 'install-static' targets
-	if ! use static-libs; then
-		sed -i \
-			-e '/^${PROJECT}:/s:static::' \
-			-e '/^install:/s:install-static::' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	emake "${mygiraraconf[@]}"
-}
-
-src_test() {
-	virtx default
-}
-
-src_install() {
-	emake "${mygiraraconf[@]}" install
-	dodoc AUTHORS
-}
diff --git a/dev-libs/girara/girara-0.3.1.ebuild b/dev-libs/girara/girara-0.3.1.ebuild
index 3ecb3fb1fda6..9cb982d862bd 100644
--- a/dev-libs/girara/girara-0.3.1.ebuild
+++ b/dev-libs/girara/girara-0.3.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/girara/metadata.xml b/dev-libs/girara/metadata.xml
index 6e22fb2f495e..235fd8541a77 100644
--- a/dev-libs/girara/metadata.xml
+++ b/dev-libs/girara/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mlq@pwmt.org</email>
-      <name>Moritz Lipp</name>
-    </maintainer>
-    <maintainer status="active">
-      <email>sebastian+dev@ramacher.at</email>
-      <name>Sebastian Ramacher</name>
-    </maintainer>
-    <changelog>http://pwmt.org/projects/girara/download/</changelog>
-    <doc lang="en">http://pwmt.org/projects/girara/</doc>
-    <bugs-to>http://bugs.pwmt.org/</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+		<email>mlq@pwmt.org</email>
+		<name>Moritz Lipp</name>
+	</maintainer>
+	<maintainer status="active">
+		<email>sebastian+dev@ramacher.at</email>
+		<name>Sebastian Ramacher</name>
+		</maintainer>
+	<changelog>http://pwmt.org/projects/girara/download/</changelog>
+	<doc lang="en">http://pwmt.org/projects/girara/</doc>
+	<bugs-to>http://bugs.pwmt.org/</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index c7191a9d0f53..46acbd891c8e 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -5,6 +5,6 @@ DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.50.4.tar.xz 612260 BLAKE2B c5731dd9f0703a3c6fa8e407fdba888629f7f0ad197ad60a433bc9eb315a6f633e9f192cf3ef51d17dd3529f66dc4c291f302e5dd57873e6f274047af46c2647 SHA512 d95aed6ec8001ccc5f70abad8e2c6dcee8d62f54500f19f5acb25096b398b03a932afeb226d27c0bd6c5c57d9685403f7b77b06ee7b861648402a9137446fcbb
 EBUILD gjs-1.46.0.ebuild 1558 BLAKE2B 035abf83ae724d27a06ee1973ccd28afc29bedea4e5720fe5b3758bfda79e5c33718dce56fe938698ee58b7c48b1737767b1facfcea6fa6be97b093b92c7c70a SHA512 f6fb1dafb934f9b5296195e8a651dc410b061d0a1cba8b066547043c50090e1c101fde253d08312a0f0b98658f624e3513b4d9fdeddd99ad8893749e23ca43a6
-EBUILD gjs-1.48.7.ebuild 1550 BLAKE2B 1eab7ab879fc148e8c1a09b9b627f3d06b4c0e80cca096ee93c5268b7b7d7b1822b48f2537e7bfb390ebfd2724da9b1974e2d40bbf1f6e5f5a8ed9e12c63d2ff SHA512 2713ac130bccd430323cfc8331b1d71fd689b42965ed29169f438912c8dddbec9186e9bf0058b60611ed65c6df610dc84923d8b815cf22f382776aed44e32299
+EBUILD gjs-1.48.7.ebuild 1549 BLAKE2B 8ee4cfb9bc4717075eb05cb5c8cb3434c927a90c780c9db4cc38b083864407284e490909dab2713c0dc8fa1ef0691bcfb733981ace846e78547012e46b978c45 SHA512 e957ed75af0c4d2fa6408a1c9e468fb32b104ce12cf061749f19673ce3103bef89630e54d9049c4b283f8fd6eb9178e9181de107382dea6d0644b5eeee78a9fd
 EBUILD gjs-1.50.4.ebuild 1426 BLAKE2B 7e0935809f042ae3078234aec4958a916f6d0d72fb02a2618f7e83e55b98aed3c74463314c6061f006170225350f854771ba2b7e5689bcabf14273880560c662 SHA512 b3c1c9390ba0be0958e4eb5eb811bfd97999894f6520b1aafa6e8f8aa2db2685c31bb2955c1cd224d9439d188a76c33a1c9687628211534326bb96ccf8b236ff
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index 257b11cc9611..05b6ca3ead4f 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.52.1
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 0d6542420e53..fe3687348bd6 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,11 +1,21 @@
+AUX 2.56.2-network-monitor-race-test-iterations.patch 1128 BLAKE2B c34bbf557917c3ab21ffb083cd1bb161dac888215a6ccbc121886e7b6798ac3227954952af42236b5ea80913702cefad5af29d1e28752b14f18a0e8d66157709 SHA512 b2650628b90545fbc16cc21bef81ad6e36ad30e69df13129553191bb6ef86cd9d37286f018aed2d2c01342465b7f43c9f3afe0911cebacb18c9b782da6e27dff
 AUX glib-2.50.0-external-gdbus-codegen.patch 3854 BLAKE2B 87d6a4f372f557a9d861d0d637ec9289688999dea65e9ccc5ca595a0a139e286d0f9d84d864eba45e9c931ba486ce6ab342f6e247ed86b9ab79886ec91d1dd7e SHA512 dd5fb2f7f82be85326c37851cbb5d41307f7efcdd214b523f8ab0adc4e30830234f69b08dfbaa50bf7ace78bb0f07e7d7a6c5f87a2d06d2c11e0ed6f2d1d2045
 AUX glib-2.54.3-external-gdbus-codegen.patch 3233 BLAKE2B 6b96851b7485164ef6c94da1847152a87064eb5c9f9b0ae6996eca84e89c7807bea5cb7c58b8d42dee07eee96647d2439b8c62af023b37849d4465e0c013eca6 SHA512 70d942086f6181532b5f95c5a3e0d8bfc7d204ca2d4ee68850af82062b572cc146ac4a5516547011ef39386e10bc291deea32a19fe518e649f4f8ac60271b69c
+AUX glib-2.58.2-external-gdbus-codegen.patch 5452 BLAKE2B caf66af10958c1e6672a615965ec45f76d4fe9f58599f3d09ecee543e1b5e47a49014f7ef7a6f4e0030370935c4f82ab11b3a81ca42fc09153f02e355400dd55 SHA512 d36ac5d4fa810524795d099c218604b0db22dbc7fe9ba57821fdad292725d9c159b24cc224d1bd68824dc24ddb1f1e7c6878dbc36a3b0a8188f9e01a4b6c5ea0
+AUX glib-2.58.2-gvariant-test-fix.patch 3423 BLAKE2B b0dd08cf1629da3c8e42e43e4f9b64be07116c836d1c218368ab1dd312d06313845c70f21b54db95b068816171b268d35192a3521c5856e410ba5b99f1d0943e SHA512 af8fd3cd431d1bc3aef4447ce26911b107a57903f66cc5e1825c3a26386084838500f2f6f250552f96d93bea18b5412ad338e84f2ff3783573161a2d0a336337
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942
 DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
+DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
+DIST glib-2.58.1-patchset.tar.xz 17292 BLAKE2B c95de62f61f9dac8acbf20f83e95bced99f566c512ec43d46b1ad08356b86c9f5d75a96faa971ed89ae23c9534b03a85058751a40421f2b216612e94493bc9a2 SHA512 08833e58cce26412545e380d5c92448f77651c466b236108d5ee9451e30ad6e6bd796ddd30c3c81ca2d5219ea0f6269f9738f57a7438ed0db18c5c1f04a18e10
+DIST glib-2.58.1.tar.xz 4906444 BLAKE2B 022da8624a8ae2ec7fdc45777556a518d056e7389158d96db36baccdb238ed6fbdb6f224ec8b1c1bfec78001aa0348d3fc1fd43d20908a8c4690a0e03038bf61 SHA512 115b74fcd43241e3c4b4babfb8170453b2a002ff02d5996f3c097876199cadccc1cf67b017c10c14c0d2a1bb4228027b743f4926bda0ef7d74012ed712ccd155
+DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 EBUILD glib-2.52.3.ebuild 9535 BLAKE2B aadf3d0845d85d7466b05c24cb9fca72b737cce6825ab6e685f809814fefe452995e8b7705045afd3a5172733ef756ab59314fe8318a03bc9bee5de288052cf6 SHA512 3edf2ce2a54cce35781b65332398eddac3b7956624cb02fa384f616b79979f3df54ec73a949a391d607bcb25a639fd60d90e3aa487584b871f06d2052815707b
 EBUILD glib-2.54.3-r6.ebuild 9986 BLAKE2B 4eca2dcc09586f88ee9e08451e915c83c2a7fd54e0e78e23cd8ff25502896ab56c99cce5f8314686099ab74cebed7c3685b77c70644caf2706a4007ea92ed43e SHA512 a27606f1dc6c4d6b76504d9f7310ad6f6c2f9ab4dbd160a0ac9721b9be085e5144747607184ef179bc742d8616fa58cb031ce127c04e2c1443a55b46daaf2282
-EBUILD glib-2.56.2.ebuild 9674 BLAKE2B 50dec0bfd0df3f47e55d8590c2ccf8a9b948c86455df757a7f624535a28d4126c8b204d27bd905fac1d5248f66e00ce48a8bf3acafdaa15382c312395286ea10 SHA512 0a8de40147c9accf1ce24b6f77530c44d59d20dfbda2d255368eefb4bbb9d5f7423b8f11b2f5f8b1797a3d3ee6b5f30fffa185a93ef092cd29be5b0d11d44ddf
+EBUILD glib-2.56.2.ebuild 9838 BLAKE2B f56bc9cfdfed984fe95b2457a659650cff24d5863810bc817673883f0efd7b7b5ef908e41194598fde0ee72dac72eaed2a606761fb03d260d6261bf8da7362fe SHA512 4068eb62fb85ceb1b517bdda34c1a035310767a9f7c9a2b0c6bd0fcdbbfd01b4d5b2b0a3c80de70b13e5e71ddedca5e94164e4cc3cc8c8b33854375b1e16a035
+EBUILD glib-2.56.4.ebuild 9953 BLAKE2B 30200389bcb14699b60f4932158003b7c410bea013c2d6ff11065ad890b068fa0eeb8254fd63fa87fe0390946ac7404edbece7e221607d48f1ffb118282c886c SHA512 efbbcb742332da96d67aab55aeb6f875b80b3cdc2597f08f106c7edfa1b3aae7cb4ba949fe382c49f83362a409758bfa0b0820fe0b81a803ef3c3c1a41ed9438
+EBUILD glib-2.58.1.ebuild 10972 BLAKE2B de3f33f944a061538bd68daa9761abd39956b3be7f0a2c305a339a7101cfe019fe322ace4c3d18bb21f45eafae84284e36935174d24039cc6a274a2821d41b31 SHA512 aeaa4eb65451cf952f2d14f04df7809734e7da8d6b217234a1cf281c920c421d28d73e68cd92a6757de5859b35d3cba76f11d6280827a038a8c171bcce379681
+EBUILD glib-2.58.2.ebuild 10788 BLAKE2B d264b9ecc154bdb41593bbe1c9c32181499be6edad3660113dc98f5b252eb5a701854eca9822549d0d767066c594f6f771fa0391e495589a74309a8ca4a14f4a SHA512 4af70f9db60e55918e29c4e6af7e373a9532276fd061c77b91ba66b96cc61d10978aa8e47abdd76d225706a0c12d8aa2e645a4c2c403557514dc22862e93d0d3
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch b/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch
new file mode 100644
index 000000000000..1ddec6db9467
--- /dev/null
+++ b/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch
@@ -0,0 +1,36 @@
+From a90c578952219e740f24d9f2560f54f19ae7e906 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <withnall@endlessm.com>
+Date: Wed, 11 Apr 2018 15:45:10 +0100
+Subject: [PATCH] tests: Lower number of iterations in network-monitor-race
+
+While 333 runs is very likely to reproduce the bug, Milan has previously
+reproduced it with as few as 9 runs. Since this test will be run by the
+CI machinery quite often, a lower number of runs each CI run will still
+probably catch any regressions over time.
+
+This reduces the total test runtime from 33s to 2s.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=793727
+
+Signed-off-by: Philip Withnall <withnall@endlessm.com>
+Reviewed-by: nobody
+---
+ gio/tests/network-monitor-race.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/tests/network-monitor-race.c b/gio/tests/network-monitor-race.c
+index 4b92c87a5..cadd62cee 100644
+--- a/gio/tests/network-monitor-race.c
++++ b/gio/tests/network-monitor-race.c
+@@ -18,7 +18,7 @@
+ #include <glib/glib.h>
+ #include <gio/gio.h>
+ 
+-#define MAX_RUNS 333
++#define MAX_RUNS 20
+ 
+ static gboolean
+ quit_loop (gpointer user_data)
+-- 
+2.17.0
+
diff --git a/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch
new file mode 100644
index 000000000000..7615dbb248bd
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch
@@ -0,0 +1,124 @@
+From 69da419c33c24a05126d21fb3098139d30ba9093 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 19 Dec 2018 14:01:43 +0200
+Subject: [PATCH] build: don't build gdbus-codegen and rely on external
+ gdbus-codegen for tests
+
+---
+ configure.ac                                  |  1 -
+ docs/reference/gio/Makefile.am                |  1 -
+ gio/Makefile.am                               |  2 +-
+ gio/tests/Makefile.am                         | 22 ++++++-------------
+ .../gdbus-object-manager-example/Makefile.am  |  6 ++---
+ 5 files changed, 10 insertions(+), 22 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4b15b69b8..9187a12bb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3481,7 +3481,6 @@ gobject/glib-mkenums
+ gobject/tests/Makefile
+ gthread/Makefile
+ gio/Makefile
+-gio/gdbus-2.0/codegen/Makefile
+ gio/gdbus-2.0/codegen/config.py
+ gio/gnetworking.h
+ gio/xdgmime/Makefile
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 08093e8a0..9ce11f824 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -212,7 +212,6 @@ man_MANS +=				\
+ 	gsettings.1			\
+ 	gresource.1			\
+ 	gdbus.1				\
+-	gdbus-codegen.1			\
+ 	gio.1				\
+ 	$(NULL)
+ 
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 05b20cdef..ed5d7d4cb 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/glib.mk
+ 
+-SUBDIRS = gdbus-2.0/codegen
++SUBDIRS = 
+ 
+ if OS_UNIX
+ SUBDIRS += xdgmime
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index c4e7a9257..4b538b1e9 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -253,9 +253,7 @@ gdbus-daemon-impl.c: $(top_srcdir)/gio/gdbusdaemon.c
+ # These files are only generated on Windows builds inside GIO,
+ # but we want them on non-Windows builds for the tests
+ gdbus-daemon-generated.h gdbus-daemon-generated.c: $(top_srcdir)/gio/dbus-daemon.xml $(GDBUS_PYTHON_DEPS)
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_srcdir)/gio/gdbus-2.0/codegen/gdbus-codegen.in \
++	$(AM_V_GEN) gdbus-codegen \
+ 		--interface-prefix org. \
+ 		--generate-c-code gdbus-daemon-generated \
+ 		--c-namespace _G \
+@@ -494,10 +492,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
+ 
+ BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h gdbus-test-codegen-generated-interface-info.c gdbus-test-codegen-generated-interface-info.h
+ gdbus-test-codegen.o: gdbus-test-codegen-generated.h gdbus-test-codegen-generated-interface-info.h
+-gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++gdbus-test-codegen-generated.h: test-codegen.xml Makefile
++	$(AM_V_GEN) gdbus-codegen \
+ 		--interface-prefix org.project. \
+ 		--generate-c-code gdbus-test-codegen-generated \
+ 		--c-generate-object-manager \
+@@ -516,10 +512,8 @@ gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gd
+ 		$(NULL)
+ gdbus-test-codegen-generated.c: gdbus-test-codegen-generated.h
+ 	@: # Generated as side-effect of .h
+-gdbus-test-codegen-generated-interface-info.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++gdbus-test-codegen-generated-interface-info.h: test-codegen.xml Makefile
++	$(AM_V_GEN) gdbus-codegen \
+ 		--interface-info-header \
+ 		--annotate "org.project.Bar" Key1 Value1 \
+ 		--annotate "org.project.Bar" org.gtk.GDBus.Internal Value2 \
+@@ -532,10 +526,8 @@ gdbus-test-codegen-generated-interface-info.h: test-codegen.xml Makefile $(top_b
+ 		--output $@ \
+ 		$(srcdir)/test-codegen.xml \
+ 		$(NULL)
+-gdbus-test-codegen-generated-interface-info.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++gdbus-test-codegen-generated-interface-info.c: test-codegen.xml Makefile
++	$(AM_V_GEN) gdbus-codegen \
+ 		--interface-info-body \
+ 		--annotate "org.project.Bar" Key1 Value1 \
+ 		--annotate "org.project.Bar" org.gtk.GDBus.Internal Value2 \
+diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
+index 1d0464c5c..0603d9b0a 100644
+--- a/gio/tests/gdbus-object-manager-example/Makefile.am
++++ b/gio/tests/gdbus-object-manager-example/Makefile.am
+@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
+ 	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml	\
+ 	$(NULL)
+ 
+-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
++$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
++	$(AM_V_GEN) gdbus-codegen \
+ 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
+ 		--c-namespace Example \
+ 		--c-generate-object-manager \
+-- 
+2.17.0
+
diff --git a/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch b/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch
new file mode 100644
index 000000000000..0bd3a85b018c
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch
@@ -0,0 +1,96 @@
+From 8a028c250a82b667562efcfdf51d35506383adbb Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 19 Dec 2018 16:22:21 +0200
+Subject: [PATCH] tests: Allocate gvariant data from the heap to guarantee
+ alignment
+
+On glib-2-58 branch we don't have !455, thus we need aligned data
+for the gvariant tests to not fail on i686.
+
+Fixes #1626
+---
+ glib/tests/gvariant.c | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c
+index 8047ef5e8..5ca7b964e 100644
+--- a/glib/tests/gvariant.c
++++ b/glib/tests/gvariant.c
+@@ -4770,6 +4770,7 @@ test_stack_dict_init (void)
+ static void
+ test_normal_checking_tuples (void)
+ {
++  gpointer aligned_data;
+   const guint8 data[] = {
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
+     'a', '(', 'a', 'o', 'a', 'o', 'a', 'a', 'o', 'a', 'a', 'o', ')'
+@@ -4778,13 +4779,15 @@ test_normal_checking_tuples (void)
+   GVariant *variant = NULL;
+   GVariant *normal_variant = NULL;
+ 
+-  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size,
++  aligned_data = g_memdup (data, size); /* guarantee alignment */
++  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size,
+                                      FALSE, NULL, NULL);
+   g_assert_nonnull (variant);
+ 
+   normal_variant = g_variant_get_normal_form (variant);
+   g_assert_nonnull (normal_variant);
+ 
++  g_free (aligned_data);
+   g_variant_unref (normal_variant);
+   g_variant_unref (variant);
+ }
+@@ -4896,6 +4899,7 @@ test_recursion_limits_array_in_variant (void)
+ static void
+ test_normal_checking_array_offsets (void)
+ {
++  gpointer aligned_data;
+   const guint8 data[] = {
+     0x07, 0xe5, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+     'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'g',
+@@ -4904,13 +4908,15 @@ test_normal_checking_array_offsets (void)
+   GVariant *variant = NULL;
+   GVariant *normal_variant = NULL;
+ 
+-  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size,
++  aligned_data = g_memdup (data, size); /* guarantee alignment */
++  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size,
+                                      FALSE, NULL, NULL);
+   g_assert_nonnull (variant);
+ 
+   normal_variant = g_variant_get_normal_form (variant);
+   g_assert_nonnull (normal_variant);
+ 
++  g_free (aligned_data);
+   g_variant_unref (normal_variant);
+   g_variant_unref (variant);
+ }
+@@ -4944,6 +4950,7 @@ test_normal_checking_tuple_offsets (void)
+ static void
+ test_normal_checking_empty_object_path (void)
+ {
++  gpointer aligned_data;
+   const guint8 data[] = {
+     0x20, 0x20, 0x00, 0x00, 0x00, 0x00,
+     '(', 'h', '(', 'a', 'i', 'a', 'b', 'i', 'o', ')', ')',
+@@ -4952,13 +4959,15 @@ test_normal_checking_empty_object_path (void)
+   GVariant *variant = NULL;
+   GVariant *normal_variant = NULL;
+ 
+-  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size,
++  aligned_data = g_memdup (data, size); /* guarantee alignment */
++  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size,
+                                      FALSE, NULL, NULL);
+   g_assert_nonnull (variant);
+ 
+   normal_variant = g_variant_get_normal_form (variant);
+   g_assert_nonnull (normal_variant);
+ 
++  g_free (aligned_data);
+   g_variant_unref (normal_variant);
+   g_variant_unref (variant);
+ }
+-- 
+2.17.0
+
diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild
index d8adde6c4e2a..9ccdbdf98d32 100644
--- a/dev-libs/glib/glib-2.56.2.ebuild
+++ b/dev-libs/glib/glib-2.56.2.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
@@ -115,6 +115,9 @@ src_prepare() {
 		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
 	fi
 
+	# Less max runs in network monitor race test to avoid hitting timeout limits
+	eapply "${FILESDIR}"/${PV}-network-monitor-race-test-iterations.patch # included in 2.57.1
+
 	# gdbus-codegen is a separate package
 	eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
 
diff --git a/dev-libs/glib/glib-2.56.4.ebuild b/dev-libs/glib/glib-2.56.4.ebuild
new file mode 100644
index 000000000000..ba4b01cf675e
--- /dev/null
+++ b/dev-libs/glib/glib-2.56.4.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+GNOME2_EAUTORECONF=yes
+
+inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
+	multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# Added util-linux multilib dependency to have libmount support (which
+# is always turned on on linux systems, unless explicitly disabled, but
+# this ebuild does not do that anyway) (bug #599586)
+
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	utils? (
+		>=dev-util/gdbus-codegen-${PV}
+		virtual/libelf:0=
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-libs/libxslt-1.0
+	>=sys-devel/gettext-0.11
+	>=dev-util/gtk-doc-am-1.20
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/gdb
+		>=dev-util/gdbus-codegen-${PV}
+		>=sys-apps/dbus-1.2.14 )
+	!<dev-util/gtk-doc-1.15-r2
+"
+# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate
+# python depending package, which can be buildtime depended in packages that
+# need these tools, without pulling in python at runtime.
+RDEPEND="${RDEPEND}
+	>=dev-util/glib-utils-${PV}"
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+	if use test; then
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+			ewarn "Some tests will be skipped due to missing terminal program"
+			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+	fi
+
+	# Less max runs in network monitor race test to avoid hitting timeout limits
+	eapply "${FILESDIR}"/2.56.2-network-monitor-race-test-iterations.patch # included in 2.57.1
+
+	# https://gitlab.gnome.org/GNOME/glib/issues/1626
+	eapply "${FILESDIR}"/${PN}-2.58.2-gvariant-test-fix.patch
+
+	# gdbus-codegen is a separate package
+	eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
+
+	gnome2_src_prepare
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+		if has_version sys-apps/dbus; then
+			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
+		export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
+		export PCRE_LIBS="-lpcre"
+	fi
+
+	# These configure tests don't work when cross-compiling.
+	if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		case ${CHOST} in
+		hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		*)            export glib_cv_stack_grows=no ;;
+		esac
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
+		export glib_cv_uscore=no
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
+		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
+	fi
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# libelf used only by the gresource bin
+	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable xattr) \
+		$(use_enable fam) \
+		$(use_enable kernel_linux libmount) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		$(multilib_native_use_enable utils libelf) \
+		--with-python=${EPYTHON} \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=system \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+	if multilib_is_native_abi; then
+		local d
+		for d in glib gio gobject; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	# Hardened: gdb needs this, bug #338891
+	if host-is-pax ; then
+		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	virtx emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson
+	rm "${ED}usr/bin/glib-genmarshal" || die
+	rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}usr/bin/glib-mkenums" || die
+	rm "${ED}usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}usr/bin/gtester-report" || die
+	rm "${ED}usr/share/man/man1/gtester-report.1" || die
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${ED}/usr/$(get_libdir)/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+
+	# Completely useless with or without USE static-libs, people need to use pkg-config
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	# force (re)generation of gschemas.compiled
+	GNOME2_ECLASS_GLIB_SCHEMAS="force"
+
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/glib/glib-2.58.1.ebuild b/dev-libs/glib/glib-2.58.1.ebuild
new file mode 100644
index 000000000000..c9d5bdbbe0ff
--- /dev/null
+++ b/dev-libs/glib/glib-2.58.1.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+GNOME2_EAUTORECONF=yes
+
+inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
+	multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz
+	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# Added util-linux multilib dependency to have libmount support (which
+# is always turned on on linux systems, unless explicitly disabled, but
+# this ebuild does not do that anyway) (bug #599586)
+
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	utils? (
+		>=dev-util/gdbus-codegen-${PV}
+		virtual/libelf:0=
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	>=dev-libs/libxslt-1.0
+	>=sys-devel/gettext-0.11
+	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/gdb
+		>=dev-util/gdbus-codegen-${PV}
+		>=sys-apps/dbus-1.2.14 )
+"
+# configure.ac has gtk-doc-am stuff behind m4_ifdef, so we don't need a gtk-doc-am build dep
+
+# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate
+# python depending package, which can be buildtime depended in packages that
+# need these tools, without pulling in python at runtime.
+RDEPEND="${RDEPEND}
+	>=dev-util/glib-utils-${PV}"
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+	if use test; then
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+	fi
+
+	# Various cherry-picked patches from glib-2-58 branch (will be part of 2.58.2)
+	# Also patch to keep gtimezone working right on non-symlinked /etc/localtime on Gentoo (might get into 2.58.2, might not)
+	eapply "${WORKDIR}"/patches
+
+	# gdbus-codegen is a separate package
+	eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
+
+	# Tarball doesn't come with gtk-doc.make and we can't unconditionally depend on dev-util/gtk-doc due
+	# to circular deps during bootstramp. If actually not building gtk-doc, an almost empty file will do
+	# fine as well - this is also what upstream autogen.sh does if gtkdocize is not found. If gtk-doc is
+	# installed, eautoreconf will call gtkdocize, which overwrites the empty gtk-doc.make with a full copy.
+	cat > gtk-doc.make << EOF
+EXTRA_DIST =
+CLEANFILES =
+EOF
+
+	gnome2_src_prepare
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+		if has_version sys-apps/dbus; then
+			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
+		export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
+		export PCRE_LIBS="-lpcre"
+	fi
+
+	# These configure tests don't work when cross-compiling.
+	if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		case ${CHOST} in
+		hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		*)            export glib_cv_stack_grows=no ;;
+		esac
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
+		export glib_cv_uscore=no
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
+		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
+	fi
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# libelf used only by the gresource bin
+	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable xattr) \
+		$(use_enable fam) \
+		$(multilib_native_use_enable gtk-doc) \
+		$(use_enable kernel_linux libmount) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		$(multilib_native_use_enable utils libelf) \
+		--with-python=${EPYTHON} \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=system \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+	if multilib_is_native_abi; then
+		local d
+		for d in glib gio gobject; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	# Hardened: gdb needs this, bug #338891
+	if host-is-pax ; then
+		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	virtx emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson
+	rm "${ED}usr/bin/glib-genmarshal" || die
+	rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}usr/bin/glib-mkenums" || die
+	rm "${ED}usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}usr/bin/gtester-report" || die
+	rm "${ED}usr/share/man/man1/gtester-report.1" || die
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${ED}/usr/$(get_libdir)/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+
+	# Completely useless with or without USE static-libs, people need to use pkg-config
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	# force (re)generation of gschemas.compiled
+	GNOME2_ECLASS_GLIB_SCHEMAS="force"
+
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/glib/glib-2.58.2.ebuild b/dev-libs/glib/glib-2.58.2.ebuild
new file mode 100644
index 000000000000..e8e80b9e3e48
--- /dev/null
+++ b/dev-libs/glib/glib-2.58.2.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+GNOME2_EAUTORECONF=yes
+
+inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
+	multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# Added util-linux multilib dependency to have libmount support (which
+# is always turned on on linux systems, unless explicitly disabled, but
+# this ebuild does not do that anyway) (bug #599586)
+
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	utils? (
+		>=dev-util/gdbus-codegen-${PV}
+		virtual/libelf:0=
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	>=dev-libs/libxslt-1.0
+	>=sys-devel/gettext-0.11
+	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/gdb
+		>=dev-util/gdbus-codegen-${PV}
+		>=sys-apps/dbus-1.2.14 )
+"
+# configure.ac has gtk-doc-am stuff behind m4_ifdef, so we don't need a gtk-doc-am build dep
+
+# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate
+# python depending package, which can be buildtime depended in packages that
+# need these tools, without pulling in python at runtime.
+RDEPEND="${RDEPEND}
+	>=dev-util/glib-utils-${PV}"
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+	if use test; then
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+	fi
+
+	# gdbus-codegen is a separate package
+	eapply "${FILESDIR}"/${PN}-2.58.2-external-gdbus-codegen.patch
+
+	# https://gitlab.gnome.org/GNOME/glib/issues/1626
+	eapply "${FILESDIR}"/${P}-gvariant-test-fix.patch
+
+	# Tarball doesn't come with gtk-doc.make and we can't unconditionally depend on dev-util/gtk-doc due
+	# to circular deps during bootstramp. If actually not building gtk-doc, an almost empty file will do
+	# fine as well - this is also what upstream autogen.sh does if gtkdocize is not found. If gtk-doc is
+	# installed, eautoreconf will call gtkdocize, which overwrites the empty gtk-doc.make with a full copy.
+	cat > gtk-doc.make << EOF
+EXTRA_DIST =
+CLEANFILES =
+EOF
+
+	gnome2_src_prepare
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+		if has_version sys-apps/dbus; then
+			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
+		export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
+		export PCRE_LIBS="-lpcre"
+	fi
+
+	# These configure tests don't work when cross-compiling.
+	if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		case ${CHOST} in
+		hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		*)            export glib_cv_stack_grows=no ;;
+		esac
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
+		export glib_cv_uscore=no
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
+		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
+	fi
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# libelf used only by the gresource bin
+	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable xattr) \
+		$(use_enable fam) \
+		$(multilib_native_use_enable gtk-doc) \
+		$(use_enable kernel_linux libmount) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		$(multilib_native_use_enable utils libelf) \
+		--with-python=${EPYTHON} \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=system \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+	if multilib_is_native_abi; then
+		local d
+		for d in glib gio gobject; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	# Hardened: gdb needs this, bug #338891
+	if host-is-pax ; then
+		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	virtx emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson
+	rm "${ED}usr/bin/glib-genmarshal" || die
+	rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}usr/bin/glib-mkenums" || die
+	rm "${ED}usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}usr/bin/gtester-report" || die
+	rm "${ED}usr/share/man/man1/gtester-report.1" || die
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${ED}/usr/$(get_libdir)/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+
+	# Completely useless with or without USE static-libs, people need to use pkg-config
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	# force (re)generation of gschemas.compiled
+	GNOME2_ECLASS_GLIB_SCHEMAS="force"
+
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 9dc91e7ad407..9b00a5a42de1 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -3,5 +3,5 @@ DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93
 DIST gobject-introspection-1.56.1.tar.xz 1397812 BLAKE2B 070597f3bd6e4e58d1ae1964cf6e8d7881daa68aeeddc5e9b64bc410fad6d435f2041171f4dfc2a6b477d39f2d7e9181b9917d1244fcb45b3a37491726381649 SHA512 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
 EBUILD gobject-introspection-common-1.50.0.ebuild 1021 BLAKE2B 7577ed238cee2ddcea22796fd8968438bb57ceea23590b74a6a89b1559326bac672b3a5d8afaf5cd042a640da2714f13bc497963155842b97fe3e8ebfa64c337 SHA512 ab4e5c309321e83eb4912cd64281f0b096acbc66de5cb4c37a759b1d9fd028b1aa2dbe5a895669385e836c26170e61a710d5ca7bf633cb59dc5cd21c5fc3d23b
 EBUILD gobject-introspection-common-1.52.1.ebuild 1023 BLAKE2B d5341bb90b541590d630dda04d62aef2cdd42b31d993bfcd10015432edf47f38d587f688bbd6d8440d1f28052cc220c36fea508c7740f0f16e0d28d7b9cf4761 SHA512 a183f7bd90ea9b0cbaac76e633a4e43d59ceb7eb35c9ee434a6309ad8bd5892ed580745ef848f9759dc1f6bedca5fa067b858b8eeecb3c5478c3508c64f0c073
-EBUILD gobject-introspection-common-1.56.1.ebuild 1029 BLAKE2B 0e1015c0ede0e9a02c58666ef4c8b5b2bbd4f9ee5e5ae9fa9169584ff98ea5d2744ae364c9946619e0c56f7dbfe3c15f61b04cfa3476a690b809c7a9bc928fbd SHA512 b16c970fde5dc54ff9e4b4c4298d8d4e498563a8ebcb395ce1cf7a914d9a74456b7c87d26717a743b1a79803aea2f580c9f32d76e128a998586f6fb025085a3c
+EBUILD gobject-introspection-common-1.56.1.ebuild 1022 BLAKE2B c57888d641b31c5d5ad09e2f643affd1e7c25ff843baa53861d3c9051081664b3fe34eb20c595c3ee1e48f8f36fb4d42e2b8582d67a9c0471016e212c82bbe8f SHA512 66ebe974054515630dfe00a60f1b413a6558285042852b6a9964f24786bf27a8c5d32826cd6d1e209f37a626459ee150191c7c03e3786cda8bbcc40b548c5c09
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild
index 43b74af8a409..d964019bab22 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 2138bff8dfc4..93ffffdda4ad 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -3,5 +3,5 @@ DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93
 DIST gobject-introspection-1.56.1.tar.xz 1397812 BLAKE2B 070597f3bd6e4e58d1ae1964cf6e8d7881daa68aeeddc5e9b64bc410fad6d435f2041171f4dfc2a6b477d39f2d7e9181b9917d1244fcb45b3a37491726381649 SHA512 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
 EBUILD gobject-introspection-1.50.0.ebuild 2081 BLAKE2B 2a42307c51587ad61e972d3d68157abd585535fdef31dd049290a6a6910b6e0f5c9bce0ddf0a64e085d8388559ae3cc522993cb620ebe3a4f56d062d1bf4d518 SHA512 75202082c2ba498db9433d772822a44544c78aa67692274325b123744d6ebb73fb6a58169f6d7ce9253972836fa97dd36b8ea01c2a9fcd83a83025ef853c116c
 EBUILD gobject-introspection-1.52.1.ebuild 2092 BLAKE2B d442af8ead29ef58a66bee45888b03af487ba7af6497703c1d5519d6ef14a7dfc063acf6ea10294597a3ad85dc4f8fbfd4dbc1c80cca5840959f2395ce76f0ea SHA512 6146e60515db67590400d53d9204d4f6d5a396dad583b48e0ce05c3c7237784dc292d039be371ca879d42235cefa2b22043a44c8eae368d56b9e71b68ac60c6c
-EBUILD gobject-introspection-1.56.1.ebuild 2137 BLAKE2B ea7e6265cba43fda234cc276f5c55f2cc93ee25d7188ebaba23aebd3e9722b5dee151f462ad7ff633b7ca7688cb56580a70c519f44601190ae6b7ed20322bc4b SHA512 2224fd826e98e78e5b6355cb4ded4054da858f6ce9d3ae827cd95cc7267cb81b43fb2ee96231cf2f0364564e871205ebd730b2fdcc2d20b5d1eaa9c05ba9bc9b
+EBUILD gobject-introspection-1.56.1.ebuild 2130 BLAKE2B dd18e216f34595ebcf19c1d7d8854cef1786263e7f7c59897dde1f2ec88f4994222d8efa8fb08fd3b23651d3bd125a7fc85d00253dbfb1b742782827ffd3701d SHA512 a8290f046f47b5778c78cc1e958f56eae54fc5db55f7f0f603d29606faf0141f559f39a19f61da12f4af054ebd0a991f141a3bb6046561f6b4d4d5b9bcb83c52
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
index 1bb77a16c56a..b92cc627d850 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and g-i to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index b2576dd984ba..49330a905e79 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,5 +1,5 @@
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
 EBUILD ivykis-0.42.2.ebuild 402 BLAKE2B 9fe4f5097ce2060c52b99c925cd12a9e79742396c7bb3ae84a7a89a1d7d082fc88152a4e06032ad988366f4323a2c10a329f6ff690a2278d0f6bfa4c3f5a6c09 SHA512 ca5974208c11a02c33f7a66c2336e64e054be78b9ed1bad43b55de065ab9a4b939f893c3286544dd87965dcc9a0b1e02a1435b36d02f8b657c41fc0a7c4e7da0
-EBUILD ivykis-0.42.3-r1.ebuild 555 BLAKE2B eb2a99cc4e640b3fbe3278dd460db3dbb5ff96655b4c9f761565bb8315785563ae2f4aae8439a04e0192a7256ddd7dca12bbdf01f26c563198a5c1ae4ad1f856 SHA512 9a2c94958f58b6ab85b99817034f68e5057f3531895701f847d9c20798a7f65ad319ede9b37376d2824c5cc97c68a99893748daf38312407c0a3c1faf8a09ff5
+EBUILD ivykis-0.42.3-r1.ebuild 549 BLAKE2B e5318164c5f5914856683eb5983531e1817605b984f6a2f0b4a2905b470b1e66e701c46398221d5ef65787516c2f8b944bf99eb802541d0ddb7f99aca27d26b9 SHA512 a51c129669dda6211b33edf136dbcfdc6ef6f7f0dc5757c4d9770853e29a458e58ede0b7d06ea586988be2753a10f842d2713003d3648443be1162a78f50727d
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
index 6b83df596c1c..b4a2c42b7422 100644
--- a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 6139fec96e0d..47dbb5c6e0a4 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -9,7 +9,7 @@ DIST jemalloc-4.4.0.tar.bz2 440144 BLAKE2B 6acb91c5be6c5b17c209341dd08e6973e3ad5
 DIST jemalloc-4.5.0.tar.bz2 449992 BLAKE2B 6141c71f7f5f9cee91a59eeed9c69b0a69b3cc39666aa608445073c11ee3ca9b4777a851c5cb5adac80d42bfbf10a6726e5dc1340ffe85ea1ee884d87c7865da SHA512 76953363fe1007952232220afa1a91da4c1c33c02369b5ad239d8dd1d0792141197c15e8489a8f4cd301b08494e65cadd8ecd34d025cb0285700dd78d7248821
 DIST jemalloc-5.0.1.tar.bz2 499300 BLAKE2B 551933fcd93315968cbf89bfadc40313717ff216141af8a131f2333d10090438ddf36fbfdc0ee831cbec6f930ae15aa9cfaafae72ed4f38dd97b00712ca918e8 SHA512 8cb5957a5724eb2bbad120cf0028ea8b2b14b4a416c1751b7c967351a7fd51135058ea0d3c4dc1d127c86f3aa7e9fd5ef101857110aabfdb7789427791c432c3
 DIST jemalloc-5.1.0.tar.bz2 515622 BLAKE2B 3c8b35d30fca0018e3e32452e6fa41c7ac59f9f2f7d4bc243237fde95025ab5a7562fb86b5afe2ca9b7bb072f7baf6ac7589a4862d9ebaafddae187d93e20da0 SHA512 d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f
-EBUILD jemalloc-3.6.0.ebuild 1907 BLAKE2B 798433f1866bc808756d99cc69e34081671ef537e1c428f6d03dbe9266bdebab79e7d5852ae5b73fa7b3127eb5805ff197a623aba5515f20376de7f19d2fd048 SHA512 f13a892b9457ab2e13e13654dda6ec372bc8e3d30e0c625a5f67546c56608beb1d16ba1a1d17c10ca8f4145e2536100406d2afb45767e87fe3a99b4c873506bd
+EBUILD jemalloc-3.6.0.ebuild 1903 BLAKE2B 16c2fb0e1ade011c05cd06fc4d5b2e07cad582d563509690950980b05927f98c2d6ce6d0702db83bfcb7b18543f2846ffc3de1807b57189fb191d6e140071ae4 SHA512 2e48b580adbf9d05b1b0abc21af41e7f9ac830856dd5e5dea3ad2353432cc797c78861698537e99dd8b89f60a3b1ecc86cb0501ce81d1f974dcc7f0017899732
 EBUILD jemalloc-4.4.0.ebuild 1751 BLAKE2B e39f6707e796afe8ea28e055d994f17e5f683e1bf1ab4ac67d492740cca2490553bf88685e8458dfaeb197a5b98ee6b58f242afee337d9cf73e9435c84f8931e SHA512 5d3a5d490de405548f193e29178cb41c876e093fb56af071bef0a8fd330c740b826127ea314e844583652380d02364729e3f8a0ab6ed76a97058ee93103e2712
 EBUILD jemalloc-4.5.0.ebuild 1787 BLAKE2B 06f3036d060df40707bb79c6520b62c13c55c3753d6f40fad5d82509baf76446de952b418c5fed71160a29331398167ceb7c199a872e553555ad6611506e5a4a SHA512 2fbf17ce207095a1948d0180b0769294fb90e5500297152629dc8c666fae1f8c6d182d1d823a2efeaf8b36cd9f9016cc036c9ed3f4be52bc371ab858f9dbcd2e
 EBUILD jemalloc-5.0.1.ebuild 1915 BLAKE2B 7ece59bb02fb7a809814e4925bdc3934660aeddd5ce9f28f51e545b79d0794e3861114cf48bfdf35f56a5e23453655cded7858a1f634f662b6a328273129b2db SHA512 fff3e8afea78b30f2ec4a4675c218779426d93c1437521c9532acf1f1cc3c417758a49765616a30d9b54c5dc8c51f7a8f66bb7fd5db4362c8a3c6bcfcf5496b5
diff --git a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild b/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
index 2940dc6db76a..aed756dbaa7f 100644
--- a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="debug static-libs stats"
 
 HTML_DOCS=( doc/jemalloc.html )
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 2b52efaab0fc..43109a5f83dd 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,5 +1,5 @@
 DIST json-glib-1.2.8.tar.xz 604336 BLAKE2B c85b7dcdb8d409afc1c0261e97e271f5be67a4dbc21d1ac2f6ace656106ca437f3330fda90f5add8371118b0c233f2dcd2bb9b6bc20c6452c1f85a44895eb008 SHA512 85d8ad431363b8698d71684927b8aa38749d99ea7236334ec09fd81482489f1ab9cb12dabcbe13f6b6ffd7e5d70ade47a36b511e275915d4aa858af647db90ba
 DIST json-glib-1.4.4.tar.xz 165584 BLAKE2B 0cdb518cd139b8dbdbf31c9bc00ddedca6385d7132843455a7898f3544fb43b62d6626d49944e83ef10ab9a555cf21c7e4548df7d784bcb4020f4026e0f3045e SHA512 cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f
 EBUILD json-glib-1.2.8.ebuild 1412 BLAKE2B 6b259fac66dc2810bcaf401dbf42c27f3acbc3aa9300d4b8e5e762c4f795bc1b2e74f96606307de871c310b3b837a8ace55bb76a5ad3c36fa1544204d17bc65c SHA512 bef69e80ebe43f4e84d6e1a0a0da1285dbb2538d680bbe9c27e4b780ecbf99a9454309cd1c244ccf3736ac7f82ddf6e69c2bd1b27a1b590b8db7d31e71e2614a
-EBUILD json-glib-1.4.4.ebuild 1563 BLAKE2B 1279a4726d21ef53b8889c1dbef35f2666f9e9484f8601e01d5c14bae8c74b203c02d7f597a015bc7cebc742c99a6a15df32212f8b09a310b966fa5473e598d0 SHA512 183110de7bc8068df88707419e9540f59fc8940709d7179c84acd3cf090f31beeddce34884062aa1d3f5fa2e26f36909c0283b9e5b4cbc74365f1ed13bf31a02
+EBUILD json-glib-1.4.4.ebuild 1556 BLAKE2B 9c26137d773a42bb6e830b5a65de43e6540362bd3fe76b22dcf46d0e5d34c07a389e45a0879d436c1eee57d0cce6c68d16aa080efcc19e919679f289e059fe7d SHA512 56531d9fc5627e1b386cc9348fe9e91b571ad1d38744a273cd3b2e08643b80129bf639943bc30a01a21ab8c4c060181e3e0ff73b29028ed08a875ea252b96379
 MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
diff --git a/dev-libs/json-glib/json-glib-1.4.4.ebuild b/dev-libs/json-glib/json-glib-1.4.4.ebuild
index a762358642e8..c614bde7a32a 100644
--- a/dev-libs/json-glib/json-glib-1.4.4.ebuild
+++ b/dev-libs/json-glib/json-glib-1.4.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index 23ee23d5ccc9..f8b441e152ef 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,3 +1,5 @@
 DIST jsonrpc-glib-3.28.1.tar.xz 40328 BLAKE2B 36b512e27c46836fc8285bf4d6a6f8e39bdd748a09475af151d9a07f05e92dafe269d7675f8ff0253b21485405776d9348b38b067d73f75d6bdc3203fb876ea1 SHA512 874791c898d8fd6f8c6401b8ae219dc08e34e207ba214add1f14bb28b407581dc372487398d276395ddbe2f349d5b04f2ffb78fc73398d85975df40d3409f352
+DIST jsonrpc-glib-3.30.1.tar.xz 41516 BLAKE2B c0b73c06682fd0a1bca2fb000d7909460c496e73364c24905e1a4c88cce64252ac024825ab89650ee0b3b5de1cd1686fc7a231ffb5b0bb7e1c66262eafce026f SHA512 f1ae34faf9b3902b45b01bfafc87fd8d30051bbb11cf247cf8af9dc2bae8b2f3c93564a17a9f047dbb61240662a0ffbc2c2b764f8e254305c7aee1b32fd8a86b
 EBUILD jsonrpc-glib-3.28.1.ebuild 944 BLAKE2B c3a3820e9797b8ea53801c3c628a9bb41129dc362759a59f95a4894b0f5f41cbc45284601d4c37e5eba9502824db278b37c1f7a05230ebbb189e8976eef5ae11 SHA512 ad0c1b0e4967c9c8ec9967c75f76cf9e65b28203341058ca4e82a027c85957a17a3e5a894f395fb8eb2e24a2ddbf02c2da948f6fcd2b0902688a4360b0a6f843
+EBUILD jsonrpc-glib-3.30.1.ebuild 941 BLAKE2B 829c371ba63e8012ff682d0c39fcca99d074e88d50b5fe1378e1caab2edffdb952d6b492ec221eeaed4dccf87eefa43517303aa0d1312311519d9ca93149ce19 SHA512 3bb42941b86e0354935ea5876e8972c2e64777d1914d66c86d7112aa26c6db24ee3b0a01f563b8f73858b6c9bb856d04dbee422efb1fc10c45e1cc8484b6fef1
 MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.30.1.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.30.1.ebuild
new file mode 100644
index 000000000000..577aa2a9c1a1
--- /dev/null
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.30.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org meson xdg vala
+
+DESCRIPTION="JSON-RPC library for GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_profiling=false # -pg passing
+		$(meson_use introspection with_introspection)
+		$(meson_use vala with_vapi)
+		$(meson_use gtk-doc enable_gtk_doc)
+		$(meson_use test enable_tests)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 824f22fe2335..fb2d2cb2fd94 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,8 +3,10 @@ DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba
 DIST leatherman-1.4.4.tar.gz 814289 BLAKE2B d53ff660e28eaea1c11f95cc70348a2a5883e0dc5ae56482b0afe96e61938e4d15688f8abf9783976443c00b6a69e9037b5080194babb97200e25e2c548b9153 SHA512 a1955a3f7a7fd190f7d85ad07e30dee74b0f4b7ed670a4a9a7613317d2898faf776cbed0c5c7b6da25ddd5099c9638e9abb2aca16aec61c568fc2f8c9789ffe4
 DIST leatherman-1.5.2.tar.gz 814349 BLAKE2B 1bc2d85426683e9f82d31ba9e3b63b4c9185b0bfa5ae832ea252ecbd922b44dfa67b6011145489d5c5809a76011aef8b143f6b705ea0436d914fc0d8ca8091a2 SHA512 9cef854fd7a95c54fcfc2e639e469dfaa4625757ea8aceeb9ac2162bfc89cbcbc1d5e8217af5f1fad4f31d98528475e22157ca6b1046a36e0928074f866ddafd
 DIST leatherman-1.5.3.tar.gz 814340 BLAKE2B 7dec42f1a62511a4f63ca197212f3b81f5baa862b0a7f825c2caa7e9af6bdd15e7b5aad39649d7e5dbb6bd62df19895bbf851421f9aa2795ced785c2e28bcdcf SHA512 e2616a42c6879755f338f9f0291bf28c7465d51caa3326be521ae3e0d5d79e82099c8720dc19223ad9112cde81c4579faf28a2b467f802baefc99dd59212b818
+DIST leatherman-1.5.4.tar.gz 814395 BLAKE2B 251cacad45e1571d54e7b78201bb0b3578d983022267bfd3438e921f93ba466995629759d9657c71938a5866fc13d1b70dabe2f3a43137ef52164f67da3a8aa5 SHA512 67a3a0a946024d0cee44ccb314d13abb3df83d7c7d0bfe58d5e966d57ef26240dc011a8e6865f017674a00043429379ae9e033a9197c4173c3fa173918d0b0f9
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
 EBUILD leatherman-1.4.4.ebuild 1150 BLAKE2B 57977d3e1690caf8fd64c78e9c765e5bbe8f8d21faf82a53994a70a89d9f9667adfd8850784029b151b158dc8391edc97e6e875543bd43eeba0165ac717c100f SHA512 5c3e73bcbfdbc1f334b38ede1855e673e9d403c00b5352522844c7b25644212f31c1bf9d1e40e103d197b08a008f90c378acc9eabe90815309c5c19b0b57c160
 EBUILD leatherman-1.5.2.ebuild 1150 BLAKE2B 57977d3e1690caf8fd64c78e9c765e5bbe8f8d21faf82a53994a70a89d9f9667adfd8850784029b151b158dc8391edc97e6e875543bd43eeba0165ac717c100f SHA512 5c3e73bcbfdbc1f334b38ede1855e673e9d403c00b5352522844c7b25644212f31c1bf9d1e40e103d197b08a008f90c378acc9eabe90815309c5c19b0b57c160
-EBUILD leatherman-1.5.3.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
+EBUILD leatherman-1.5.3.ebuild 1150 BLAKE2B 57977d3e1690caf8fd64c78e9c765e5bbe8f8d21faf82a53994a70a89d9f9667adfd8850784029b151b158dc8391edc97e6e875543bd43eeba0165ac717c100f SHA512 5c3e73bcbfdbc1f334b38ede1855e673e9d403c00b5352522844c7b25644212f31c1bf9d1e40e103d197b08a008f90c378acc9eabe90815309c5c19b0b57c160
+EBUILD leatherman-1.5.4.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.5.3.ebuild b/dev-libs/leatherman/leatherman-1.5.3.ebuild
index cc7a76208a23..29a1dceafddd 100644
--- a/dev-libs/leatherman/leatherman-1.5.3.ebuild
+++ b/dev-libs/leatherman/leatherman-1.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/leatherman/leatherman-1.5.4.ebuild b/dev-libs/leatherman/leatherman-1.5.4.ebuild
new file mode 100644
index 000000000000..cc7a76208a23
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.5.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+IUSE="debug static-libs test"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/${PV}"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.54:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libIDL/Manifest b/dev-libs/libIDL/Manifest
index 153c805f7c35..9c9cf4954cb0 100644
--- a/dev-libs/libIDL/Manifest
+++ b/dev-libs/libIDL/Manifest
@@ -1,4 +1,4 @@
 DIST libIDL-0.8.14.tar.bz2 427149 BLAKE2B c4fc6e4da9d581ddcaeab492586406902b07f964e70b84352b1436e8bc214986141f0a3d40506a7f408a1919c31275e89039978b09c496d5164e673ec236fe9a SHA512 906dde087908acd64b209fe466a89ae52a6ea23601cb30092063a6e062b1b6640fc2d5f422efcdd52b2b36ce20e6c244da6205fde0bdcec787fe64058be7adac
-EBUILD libIDL-0.8.14-r2.ebuild 695 BLAKE2B 01351cac41c622bb36e78493bf793e90ca88eb44c0ad7def2055306ff6f18091d80a43ca432524de4bfb3e4bcf87444423e0d1742c4bcc3048c26f77a110b244 SHA512 ea800e9ae7c8df8231f98ab3a49d145ebedec8f6e22dcee1daf83f497730e65af6e3a7c63eca44b6cb35d27811f79ce870b08e464f7e9546ae7718947df4b4b6
+EBUILD libIDL-0.8.14-r2.ebuild 827 BLAKE2B 7bdddab4617ae33c3f7d75fb25dad5d66b8d210798968ad2ab8870730ba8b29271fa4766be901a80092199de5f8b2c39d29cdeb6429ba88ff415030461a90754 SHA512 109e2c77c798931f46e27c86dff927e1bb11f2a4c0c7c48f1f9ca4276ae6c04e5b94b65465ba95bdfdb0995759edc81bc7acb8c7523a12a207778dc5a5804271
 EBUILD libIDL-0.8.14.ebuild 564 BLAKE2B 53c36fb99de8a153163720f477e45e8bf95883f97a7d96c76d18411f5fa1ef34adb66d6bca600261c83806d34738af7b926337ed521d1e1694734f2c9262d9e6 SHA512 3d07c9fd36a285496cb747e86acda7d8f8fce2aa8db0e52df13c30dc21a6ab9edd7137ac3d8527b883739fdb2b335d6ffd6642a902a304ac212661a4bda6006b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
index aa649a61d9a1..3c1dfb2b048f 100644
--- a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
+++ b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index bf91439928f3..6ce423d8eb3e 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,5 +1,7 @@
 DIST libarcus-3.3.0.tar.gz 29695 BLAKE2B a63ca06133cf7db556fe82cc7ea060badd7838d697822d64e09c52aaa81a8509bfa6010037004593da3b1e66dde510767a992524f8e1719e614932b88b9393fe SHA512 a911fb5784ceb835ba2c175ce42cc10544bdd0834e987d8ac1be2517293f00e596f94910d8bf5f37f61e63246ba6e78d28a23bc061809e70b1bb6ad1a21107c9
 DIST libarcus-3.4.1.tar.gz 29699 BLAKE2B 73f132ff9d908468f1d67c54b7430ac84c0aebb5dd12282dc894b877a91da3f9822e4db8bf16cb53f313396598d3890be9e06e50737b0a50edfc84543285f251 SHA512 63ed8d8da389641b91ed955624c04ca5488f98d3ef409c4a94ad1962155d6aedd8d61ca0231543cfe4e92ae10beb00001f957eb48f74b0c21447a1bd9b66d85d
+DIST libarcus-3.5.1.tar.gz 28935 BLAKE2B ae850a0923e45446f248fb9944cd795cfa07e05ae4a1c0c91089fd60711603cb1c7b6c3ec81e71496e1a5a2752abb215cbcf725be65a0f8ca92dd0c9d24ed3f1 SHA512 a3cf8599aee83aa080d23849c2c9760e1342fd738db58f4e4bb974a9c3f3dfa34dab1fead6292aa6e27ad9a659fda7b92f031c141039bc3118df8f97cc4b8712
 EBUILD libarcus-3.3.0.ebuild 1085 BLAKE2B 9d15a9454356b09eb8f05a4548bf49ee8d9ce710d47ec89baf5d11cfbc8b1c9dcc2db503e491f3558eb9da4e5456e823a51fbf7aec33d7ef68b6906d572d5d99 SHA512 95709735d9f791bb344442964ca877d480060ea8fe13c82941a30fbcdc84da2ab9c055570f37f6dd757c5347dd1451759558c73f8a02f7fd22215cd5c9f54a77
 EBUILD libarcus-3.4.1.ebuild 1085 BLAKE2B 9d15a9454356b09eb8f05a4548bf49ee8d9ce710d47ec89baf5d11cfbc8b1c9dcc2db503e491f3558eb9da4e5456e823a51fbf7aec33d7ef68b6906d572d5d99 SHA512 95709735d9f791bb344442964ca877d480060ea8fe13c82941a30fbcdc84da2ab9c055570f37f6dd757c5347dd1451759558c73f8a02f7fd22215cd5c9f54a77
+EBUILD libarcus-3.5.1.ebuild 1082 BLAKE2B 733d32a831ac633bf7c16381686b9dadee78308180dece9d442e6c1b52a0ac650c6c074331d7e3cce7c7fcca028aa1f534adec2947ed9abef06164442c94c71b SHA512 5b73e47eed0860fe6fea6be6c442a5e1129bebca414dee7f053ba896cc920a53f059947da785324d00e0c01d9ecfd2cc9b5b89c0b12428b4945e14b9941d9419
 MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e
diff --git a/dev-libs/libarcus/libarcus-3.5.1.ebuild b/dev-libs/libarcus/libarcus-3.5.1.ebuild
new file mode 100644
index 000000000000..3714aa3353b2
--- /dev/null
+++ b/dev-libs/libarcus/libarcus-3.5.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit cmake-utils python-single-r1
+
+MY_PN="libArcus"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libArcus"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/sip[${PYTHON_USEDEP}]
+	dev-libs/protobuf
+	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_EXAMPLES=$(usex examples ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index c5d32cfd5426..dd3983d4c6ae 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,6 +1,6 @@
 AUX libatomic_ops-7.6.4-gcc7.patch 1669 BLAKE2B b37d7940e2a793fcda7f20d509e326fd002260294ae90726a7c23262e97d2f27cf985ce3f2a7e0038441b1d6e2fa39202d800d774d44b8dd69662acc8a35aa7b SHA512 a7e2efa8feb5c8e9f4468f6a74a4191c1e95112a5f646dd9635e76790899504242f94500a1599fa72b781159166b61c39e88da6c01e7febab91afad6f099bcf8
-DIST libatomic_ops-7.6.4.tar.gz 497571 BLAKE2B 151cd518a346dcf2540c2e8229c2309aa83a7cecc3d66e3e8bab3d09c8688d725e26b27c836c0a3a3a46cde40fedfe26b0cca53cf2b2017f67e72d4a4993371f SHA512 2e6ef0bfd4b77e9260383feb2865c96388fb1ebed9d37605eeb83ac87e3b6a565495d588808129ac7b3ee5f6a58a37440da7784b680cc6590842b09c2625983b
 DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
-EBUILD libatomic_ops-7.6.4.ebuild 777 BLAKE2B 0f1a533dd9fe6603a0b8b4b02263d67830c3751aa31e4b12fcee2eb9c0f93af9f0cad132d2ae7705ccee3645c333ee893f9763aa6f949dbcc3a3a14c0c4b4c26 SHA512 a5ce9721e64aaeb642587edcb6219f0f4ef64448bd995c96b90bd69e75ef390b462ae58f773fc808068797416693ec81bc0e758fd36b79006ef4d6ae15c9c0be
-EBUILD libatomic_ops-7.6.6.ebuild 732 BLAKE2B a99096ddbd682442ef8c2eefe2b9398cb5329cb9027360c86d1ffe550c2781ba8fe658e9ba277013741f429920e517c2309e6411e698c6fe3f8f6db3efb82ca5 SHA512 39af1cfb4290e4282f05e7a8ce44cbdb8b75d3c25794473c304411ec2aac3c57cc62b327b97d7e52bc82bc01ef4a0df1ade947bdc41dcd115d9ed0c2c307af14
+DIST libatomic_ops-7.6.8.tar.gz 503550 BLAKE2B ce8e8757cd20fc5d8e5b62fae0a619f3866e496f552e04c1cca6c63a6d954bf256927fe1fe62192cb24b9f7a9fd1727e108098b09d0f22e0987983ccce035274 SHA512 bc448fadcf8e2936fa933a5872d5550ecdff04b0df27120d3182dcbb2147a6594ec6bfc5b214e21b37ffa1b5100c1c56d301ba9cae7df26cee5e6b999dcda14c
+EBUILD libatomic_ops-7.6.6.ebuild 731 BLAKE2B 38802fab9bde60ad696c1212d51bee17287b47fb1af0219f8a897a241ab9d3c48e73a3503d4b939b811488f9db8e76df4c349380c32b9e5016539c0680a9ce3b SHA512 02090cb3d33b1cc769d99c42f18953585bd266278d7f946d8a8e93607bd1fe0aa3597300a3d639aef3824be04ca8dc489f0bd47ea2a2ce36ca91f1f9e438e5e5
+EBUILD libatomic_ops-7.6.8.ebuild 805 BLAKE2B 675194b70deb4dd61eeedade79b38968b24540ae52161141168d7f72eb91ebe9878bd4981ae45faefdbec8fee95baa23e7e6d208d3f0698f946356799b75e308 SHA512 58f0b86e937c085af0a284875ecde173053597929248ac8a24da7d03861be58dbea360f4fb3667633cb372bd1384be4c1c67a4e4083eed94ea3dab8a1e96af0d
 MISC metadata.xml 347 BLAKE2B c8fa80a777d85e172d52bd7eae6523981b9fcc79fa8d6cb7378960adda45dd6489def86930704bb845e64437ff33b39f5401cda0d11ed021342235c7020759e5 SHA512 7a4acee1ccb58c4694e9100d556046c55f508050f6e09dc3d4dd509db9eb747b94eca152e1e98c2ebacd8b8c9c75c362426ad9545cac490f959ec16464f809e5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
index ff63e5777ddb..e52cef0612a4 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.8.ebuild
index 7dba50603caf..7b63fe4a844d 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit multilib-minimal
 
@@ -11,16 +11,17 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
-
 multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
+	local myeconfargs=(
+		--enable-shared
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 7a426f6877a1..40d058ba51b7 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -1,9 +1,11 @@
+AUX libbson-1.13.0-no-uninstall.patch 866 BLAKE2B de38a7659be91d293b33c03036c14607bc3f6214a5970d28b8cbc02d77ee32a04f077e082cb7bf9ae126d13d5537a634c29e31230d444cfb72734fc417b0d604 SHA512 ccfca1aafb4b918a14950ccd99ca6b4f4a3d7d0178a726f6c9de7096a5e5ed700953672ae457a43064b61595df4e955774a4836e5d653d6d73b50cd5772f87d9
 DIST libbson-0.98.0.tar.gz 4451923 BLAKE2B 2d53cdc0cf1afa189eb1597ccc46a604c98011cc54b6f77c5848e10f044bf5edb9fd57f6a3dce6907ddcec76de043def6d488c8e1b7eda42d7b420b1026c58f5 SHA512 9bae7593198c8ac358978bd6a065d65fb872a15fd43d11839ad5dff1ffbe0362b06cd4bde08032a2c11e8633789328b5d504cd032b7636dc525f6df3e6fd641d
 DIST libbson-1.1.10.tar.gz 4431658 BLAKE2B 1e542797c6617296c0ca7cb6dbbd34be5b31789a39130fb61000f11dfce6f7e3584f884c9350234b9704143d6a3280635cd32572b35e83010a7e9ddcc3f86ff8 SHA512 636178bafb19e7b103b5192866dbda0c70b8d7173560b0466f88b3a85cce3292a7caac9521808fa8c09d187f8c96564dcd9fb787e855d1619610f813583379bc
 DIST libbson-1.1.2.tar.gz 4492014 BLAKE2B 684c5053faf5a7f3afe6063e34247cfe7709afe0c17e8f387cfb337e6cc62e7b79c3cbf018e245bc189899e094858e1caff156344e126ba889964b1112820d21 SHA512 03e2ee337445286c14b846cd7545707959b1d351fa466c6292379a85e48ea1a171dae37dd7aff092212239ad59aac6f1ab216ee5de74ef00a8a2a124559e34da
 DIST libbson-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
 DIST libbson-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4 SHA512 d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e
 DIST libbson-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
+DIST libbson-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0da7129cd1fcf1dce7222df4d25ca109b1bfbb545c755abf8e4cc39dd40dde7ba4c50dd51dcfc67c970e2b8eb278bd543fc SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
 DIST libbson-1.3.5.tar.gz 4547720 BLAKE2B e5e258344aea0969ac74d88d040a464b72d460a13776c5c8c639e569ed3208fabd2641e850bf035c6889b466ddcc33d487da0aeab58f308bee7446b5fd0a31a1 SHA512 b55ae1d424f786aabed6567a77cd09aa26c74ab0a09392e88faef8c156b1650c026f86f245bc8431a0ebcf404c4f80eb1b22e978a24289d32692c84375a66596
 DIST libbson-1.3.6.tar.gz 4546329 BLAKE2B fa9102cd02e40e0ddb7518d34502f6ff63109b91af18a2285422530dae8c6cc04041b7589f340f2e6ed7a80e2474fea2684001b7ced5e8c911d4ba51e1a6edcc SHA512 a7da914ed0f03212d4fb01879543f0b2c7629923e33200fe30335a9a90a1082ffa2566c7a556b90a6c7ffbef5665a45ec67f87ffff2a5fcb89830769b1df5130
 DIST libbson-1.6.2.tar.gz 4835257 BLAKE2B ebe20a6c9ac8a4fcbd8e838d1a7cd319a6b31956690aa2dfca2be42eaafb646405ea01fe2bf20b2dc21bf933c0eafc330fd45409f7c902a7bf0c0641cfe0891d SHA512 f95f5bb829cff3aac6c1d95a159e38396d8fccef66d3026dac8085ba13ec376274cddeb92277d711ac4d40cafd8b89b73e9a9d1cf29e22f7f79aa9422c69488b
@@ -15,9 +17,10 @@ EBUILD libbson-1.1.2.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abb
 EBUILD libbson-1.10.3.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
 EBUILD libbson-1.11.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
 EBUILD libbson-1.12.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
+EBUILD libbson-1.13.0.ebuild 949 BLAKE2B 66d9d8d61397c5c09ae66f01fddf9f200a893beda6fc42d7de9d64bdffbae75daac11a40520a0cd228c7c41c2607985962f67007d689f771ecc54e82bf28e3c5 SHA512 efd6fa747afce9dffde09f23475f944a8df869ef4f997712f0ebb536d77c074a198955eea663f16de138684df5601298a9046e8fec1d4e6f17fc3e533b1b62c6
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1127 BLAKE2B c712b6aa9fc634c293446adeacdd8c7d97056a2c219bbf2bd2954f911778b7001c091e2044c3ab607e576d4a3124121576aaad528d0f1a5c9f2b549c43008117 SHA512 0b814d017de2a19d79dc7502e9b25d924b20d4358c88b5a8180695b2559b9ffde1bd906180614548551c7e5cea2fc528485dd5460989d14cce8ba0f61c6b6ee3
 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
-EBUILD libbson-1.8.2.ebuild 774 BLAKE2B ab3fd5c073414eebd7d2a13112b3433ab9aa6910b4227c23c2ffdc903c38ec739795ad6c8ef3192b8d84a4b9df5da5454a262432f6f4cbef43b48cccf9c5b62e SHA512 27a985090071f8e8084681dc82d310d7a7259a32a3715aac00914e4ee934049e1369b90484b5bd70bd936273fd1ef1314ee568c41f29b188d4f4e7c917cfcd3d
+EBUILD libbson-1.8.2.ebuild 778 BLAKE2B 28b05b77bf0305041d0cff10085f90709540100447232632bbfd3850df4aef8f17eece96182099592e7cac8a819c0c3c168c7338753c4da53bba0b03bd3805b4 SHA512 f5630bbcaacf9fbaed58c072eaa57ad01a919488bc4db66e34d2c5ea08c6442d42cb30f1cdb30e8bdfb1e71f1b363a2c9493ee3d7ba3482a172e92e979ed68a7
 EBUILD libbson-1.9.3.ebuild 777 BLAKE2B cd5fe3826c1fdf263b86a1e7d4f4247cc5839497c04c88cfe70036a0a33a2c468f8118b1fbd5ea4248b84db948176564db724bdd3eb7951b1464a61def9c9607 SHA512 d847c9bf88596c69f281041dd6bff7b4bf9ee88e5e92f8b2fe4b16105d56ca826bb5fcd9d7f7b33ade37edb74e3c161b6b85c6060b91a7d73332d404214fb463
 MISC metadata.xml 404 BLAKE2B 09f99f8595c089c30e13406a3dfe969c444b325dd1fbbd8ced6c9f3e257556dfe5ef762bd97cc16067c9691dba04fe38e855280c2058d90e7970a01474324a98 SHA512 081d2001bcf61d7cb00a36ddaa1869cdce615fa706693efa907676e4224c297871cb65a3dbc64397f87b29c751125735b35ba595e4344a654f2682092411e8c9
diff --git a/dev-libs/libbson/files/libbson-1.13.0-no-uninstall.patch b/dev-libs/libbson/files/libbson-1.13.0-no-uninstall.patch
new file mode 100644
index 000000000000..64a90bbe3ece
--- /dev/null
+++ b/dev-libs/libbson/files/libbson-1.13.0-no-uninstall.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f7a0dfe..22d1f4f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -271,7 +271,6 @@ if (ENABLE_MONGOC)
+       VERSION_CURRENT
+       VERSION_RELEASED
+       # This sub-directory is added later, so manually include here
+-      generate_uninstall/CMakeLists.txt
+    )
+ 
+    set_local_dist (top_DIST ${top_DIST_local})
+@@ -341,14 +340,8 @@ if (WIN32)
+ else ()
+    set (UNINSTALL_PROG "uninstall.sh")
+ endif ()
+-set (UNINSTALL_PROG_DIR "${CMAKE_INSTALL_FULL_DATADIR}/mongo-c-driver")
+ 
+ # Create uninstall program and associated uninstall target
+ #
+ # This needs to be last (after all other add_subdirectory calls) to ensure that
+ # the generated uninstall program is complete and correct
+-add_subdirectory (generate_uninstall)
+-
+-add_custom_target (uninstall
+-   COMMAND "${UNINSTALL_PROG_DIR}/${UNINSTALL_PROG}"
+-)
diff --git a/dev-libs/libbson/libbson-1.13.0.ebuild b/dev-libs/libbson/libbson-1.13.0.ebuild
new file mode 100644
index 000000000000..2ea5452eeaca
--- /dev/null
+++ b/dev-libs/libbson/libbson-1.13.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc x86"
+IUSE="examples static-libs"
+
+DEPEND="dev-python/sphinx"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-uninstall.patch"
+)
+
+S="${WORKDIR}/mongo-c-driver-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BSON=ON
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libbson/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libbson/libbson-1.8.2.ebuild b/dev-libs/libbson/libbson-1.8.2.ebuild
index 2a781b8d31cf..d730cc35cea7 100644
--- a/dev-libs/libbson/libbson-1.8.2.ebuild
+++ b/dev-libs/libbson/libbson-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86"
 IUSE="debug examples static-libs"
 
 src_configure() {
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index 25dfc2956411..4fd281308467 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -8,5 +8,5 @@ EBUILD libcdio-paranoia-0.90_p1-r1.ebuild 1574 BLAKE2B dbc8b3712c4e67372d2d53291
 EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1762 BLAKE2B c43f64a13e6aec5229d0d774478e4c29719b6a9055aa314a56d11b7b3b00161674b85ceef8693f713f11436ce19c730ce502a4e2c5274d2c5d015790f7c3dc6a SHA512 a243098fd587b73e37cd71794618dd56a4351fb2391a63b5f2a7c817f4636c091abce590d6fdef8bb575bb275e06142202d22c93b3ca837a9972d27a6659640e
 EBUILD libcdio-paranoia-0.93_p1.ebuild 1754 BLAKE2B 5f61c570e2dc7e958893cfaa5ef3617c597de277e81fbd2c084efeaee47f0876f2657d4a0b298c201e9e66bf0fef16a86b5f6f82b87f25445c4257bc7e5e6bf5 SHA512 1243a48a69fea0103a7782c741148f7a5901541976907eb8ce948374cf691110be9a94c685bd7a7ec80fb297250f5f1d600db2a8bd851ce2317078308a54e39a
 EBUILD libcdio-paranoia-0.94_p1-r1.ebuild 1996 BLAKE2B cdcc9c4af325236f037f8746b30accb3ac3ba9b243db868d43aa80657a09bf23b3d6fbe83fe355b77fd572dda0d638df8781b4c1354cb12ba225940d1159ed84 SHA512 2da677ab4afc41ec79202dccb1482758da48d34e496b4b82010d0b3248e52794667841cba837ee639ed8debff363c30b67861ad9a9ff67744072bf99d5765daa
-EBUILD libcdio-paranoia-0.94_p2.ebuild 1993 BLAKE2B 91b862846445245a8efab6b6ffb9c03175c0839a84eee5ff38d529247f064c3177b94e15455d37e4a545c855e727b187a1429ab3c2b4c243cbd6fe3b89c0cb07 SHA512 4d33bffa64d781a9032fb428a6ecbcafeac541f9817e4d2678d7e4b7d886f149510c271828c09f1902b76c4a1b67b78ccd5423fde47fe84639415aa41ff96463
+EBUILD libcdio-paranoia-0.94_p2.ebuild 1985 BLAKE2B 3e3630645405acc2172a3f996bba47e3b0b550c281d761a1928939eb08162a695ab6baf756143120a6344f1d277bd7db7b0d4b2e7b0b93f649084ee0ec737ecd SHA512 2c7eae0fa97b3e3d34c4bff97065e1d33682219b30504efe8998f52cafd9296f5019a64cf71895caaac354fe64a3c5216a381c730a073d6640e644ef55a3434a
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
index 086fc986f701..37b882db5432 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 61197f5d28b4..2c149f94fafe 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -10,6 +10,6 @@ EBUILD libcdio-0.93.ebuild 1757 BLAKE2B 1149aead21159668e3f89c703b67e0e21520d75e
 EBUILD libcdio-0.94-r1.ebuild 1766 BLAKE2B a04ab2d78db793aff7738da80db945b159e367c47ddd88b3d1bcd3d8ef108d79074952d58f90a737589a246b55d03c8c57b1d77a2f9b25cbacdbdb7c9e460411 SHA512 0baafcfb707d39df24a23da80356415aa450637c0a70751c08ce7ce1eae2180bbd39e6cfe58c28359cee86c0ed54fa132f0a84efaafbe8130696b5aff5494bf3
 EBUILD libcdio-1.0.0-r1.ebuild 1867 BLAKE2B 6c5c7e85d381822cb8ab25d4e0c69b59160588d98e68e038e09816b686c7d57766d9bc9ed4697400f1fd8c06ddfcd3a2515e8896d4d5f09d251b354a34b87dea SHA512 af06569b609761255605ddc89fae69fe1e9a4e831023f8e5219de2ee19c6247d53e468e79d530f7935661fccf51cea1fac2f70d7b814abfaa396327248a15f0b
 EBUILD libcdio-1.1.0.ebuild 1790 BLAKE2B 1a0ddc06dff2c7a3f42f07f6877b0a76fd4ee4e6c32297c7d606afee07a3e78bdd77886c4ff07a783fadbcbc805427cff41d47211195b353212b6f3f0341dff9 SHA512 20f6efba15c4b0b9b86b54bd720e69cc25a9e87e54963f6c431b25634fd1624ea5277797fa5a2080341b55fea6de4cd0fc15c3e412e1ac70e1f6b8adf7af8456
-EBUILD libcdio-2.0.0-r1.ebuild 1850 BLAKE2B 8bb98ff3b62086dfebf8144b3fd142916dffae14cfef11dce3d0a7c7080073342455f4fa9b1d6f175275fb2dfbd3a151490073f03e7d3e0be331382d5acb3f28 SHA512 bd55f79e107c712b76f8713e9b4bd30654160a001b0f139b1e50e1686ff6c77f1f4e2a84b0f6e2d09715e6ff9d9728af91bf59cb85dddd793b911a5fbf07a20e
+EBUILD libcdio-2.0.0-r1.ebuild 1838 BLAKE2B 7c0f3100156395d729a2e0f045c1c5d2d49509257c94c640b9ab2db3f887445548229d83552bf814f1a94eed4828dca959670e0a2e5125dcce859277dd5eecc0 SHA512 c4a412398d1c8c604e8b1a74a2baf6caf3146f9279d7d361338a4b342793afcd4a999a6b1840663db76f6591f4928178a2f51821f31435c6b8ecb288d762bbca
 EBUILD libcdio-2.0.0.ebuild 1789 BLAKE2B bd3747ef0f97375640f5a81ab756492564687a97292d74c75946b4f08ef22ab1e1f590f9db7d89ef4a98f4c4ca49afa1a306a1919da593b33f3e97ad0bd17037 SHA512 20bee0c8ef079f8597b7aa9a1b8dab14e5ca03423e5990fe89abbd7a9e0dd09d6d377e72158031df890ce9361e8067337e82db74d6459be1d7d9b1be86cdc611
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
index 62bcbab5b554..3e15b8530167 100644
--- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/18" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index b28bfc69e2c8..18a4066eea77 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,5 +1,7 @@
 DIST libcharon-3.3.0.tar.gz 141001 BLAKE2B 80d880ac274a53dc6673d9993ef8474091a036e6faac8fa44df3ace0f4b2fcf0102229b0f407acf9f7df7c56fb08a60c7ac3b7078e5e5daf86e1f0fe3fa453fa SHA512 92e7a33c77d05224f0b07c92f105d66010e727f67ec51e6dc314c001953e14047a7d59e2e0887950dcd38d25595df5186161ff1c0272a1193bcd8ccd64b0033b
 DIST libcharon-3.4.1.tar.gz 143489 BLAKE2B e8eb5317c708b808981cf8cb53614b54a34abca284457716b7997633a86e3cc2101f788b5c39b9292944d884985f3c342459626282695be484be5adf32b53501 SHA512 9aa269e477ce6c5c563986fcfd0061032dc58df30a7bd687a243db06ef071e888d45cc2c47cfeaac0837672529d6b3150a0a60d0cb357cea5035e47ba16115f3
+DIST libcharon-3.5.1.tar.gz 143496 BLAKE2B bffbe111b6d671d4c2b636e3f708555ba98acafb0d0475c07e0658bca7a557a678097a0daa600dd59f71628802a5c2b995683a25965da200681373b9184e9a1f SHA512 d8cf3b95e09fe9f046e7b2c3a2163f8d125e25c2b5c13c286fd8144bda865457bd730a01f8ac83b3b4eb68ff4b7d1a59e030e99f92f5bea612845380c71ff772
 EBUILD libcharon-3.3.0.ebuild 504 BLAKE2B 188e3bfd6a13b1525123e03a0280de11a4b7a2b67d5cae076e42451fea4ff5e8b2a8d4f5d4a75c3dd92f0d64afa16998fa470d160e42df06dc344ba090953772 SHA512 dfa8d0be05a34962782ca993312882155f1b945e35d2ba4257825639e13b3b1fece2b97cee65bf3595ff38d6424f59c680adab0ddb06e796b076d571e1f1f7c8
 EBUILD libcharon-3.4.1.ebuild 512 BLAKE2B b5594e176423627d35f1371ffba5c29495fc824d11c3b6b25a698bab2765bcb7c01c30c23a8811e64cb9434a0bb0dc5098612aa103619ae53ee73f349002d2f3 SHA512 44f8c7fbdf5392cec38dce8873c6ffe118fff658e8fd9309db2021b81eed827b23de7038168f1654273782c13d67562bbc1150a5c58a604458f12c2ad061e851
+EBUILD libcharon-3.5.1.ebuild 509 BLAKE2B ac239e495d601ce824933e0d142f524bd0434d4ef4cee4467c35d43d794e4436671cdd4813f93c9ebba4b7993ce17c2f70a4e85b12cfafb0d3ee28f27c0cb8d0 SHA512 0e8586d08199572067904c6df2b736a854276e376368c1f647268a0eb14ce9a976b19d68980a65b5972ef94f068a79117c32d5b2634de4d719520f0890947dae
 MISC metadata.xml 861 BLAKE2B dd8d5bdc3a7e48870daffb19659eba707b1c43c6682fbd5cadf52babd3282315419451c1d5352f0a2e044e60d6fc16c19d546b1dc32ec9da7dceeef4deb45eca SHA512 15a172c082a1cbcdbd0ecd93f475f9a193d3bb0707980904d8f7d6adde745297f64b906134c0c338cdd088f6f54e736b29ee3df39638ffc941dd5eda5f15f735
diff --git a/dev-libs/libcharon/libcharon-3.5.1.ebuild b/dev-libs/libcharon/libcharon-3.5.1.ebuild
new file mode 100644
index 000000000000..503dd3878a83
--- /dev/null
+++ b/dev-libs/libcharon/libcharon-3.5.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils python-single-r1
+
+MY_PN="libCharon"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libCharon"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libcli/Manifest b/dev-libs/libcli/Manifest
index 655f9162e5a1..fb767497e622 100644
--- a/dev-libs/libcli/Manifest
+++ b/dev-libs/libcli/Manifest
@@ -4,4 +4,4 @@ DIST libcli-1.9.4.tar.gz 27960 BLAKE2B 1a58dc2ebc7174c9bb790f73ad10bb4aef2cb6bf0
 DIST libcli-1.9.7.tar.gz 29557 BLAKE2B a53a8db720fd4ecc047ac6ca111cc8ba1d05067af4dc56b640a0bafd30e6d6b4ccfdbf79b251f1eb6927c7d81675de492a52280ccfab0b48854173650acaacfe SHA512 b2dacfd40bc068ddcc0dc3d60576ef2f7d7e2af80b93c6e7ae899d654afca6f0f8d2df2b33c9c8e760bdbea9aa2eaf757029d46032dcf307341f78f1a8f4f66f
 EBUILD libcli-1.9.4-r1.ebuild 904 BLAKE2B 21ff7a20ee94c700d38a629559b02c5019aaf4a0222da3f542e87ef48e08de0593814c487dd02a0b3453a9bfcee73a34de1d68dbfa8253674930d7bdd50a31f9 SHA512 a8f74e3aa4a3d451bb8e960d225ef418fb679527784cc5cb916680648d4272c1f9abaf9e07df2a3a147a0f2743c2e2d5b2772ecf9a0866c32bb8636b72000e44
 EBUILD libcli-1.9.7.ebuild 761 BLAKE2B ae7b7943999cd44183fdfc846592aadb8a32aa08bb698f255445288ae56f68c9dc378c069145c5e506aacf2b913f7b3b98b04aa4f9287500189200f6e0a4e41e SHA512 f29e833b83a79a909d0a3714f73200420ca7a2df20ce694bea7170c724dc8f38e6acf2fbed7702c0a009c076bff2972c0f7c8666bbc697aeef3a405977681d86
-MISC metadata.xml 614 BLAKE2B ccc45c5ce653762acf53a66db26371efb30c2911efc5ee2e20f1d5567428a00a124e74ddd7d6adbf89556d3ef6f1e4632bd5ad957dd3c47ba6bebb23c2ce22f7 SHA512 570f4816b7997fa5d75cad35999de186c9d97c3b8e2e69708b5a1f6695aa1b89ef28586be2bfaa8c8aaea60eeee8b4a698528c50d57c25806553572db8443037
+MISC metadata.xml 538 BLAKE2B a8407bbf3dcbe24ea08f1d590a0929caec1de6463afabb68c6cf96a75b72a54605ad390c79cd6ad2508cc9a7f9de9e2920ec760dc7757249dd9240235239a722 SHA512 e96312c4c077df84c2f183b1e833cb53aa6134be66d1f0dc7a6c9ca495f354c5da7e28a1f4524670bb9f11e7d3ae093463ae6177837c7791b13e5f3c3d23130c
diff --git a/dev-libs/libcli/metadata.xml b/dev-libs/libcli/metadata.xml
index 121529505d15..a31d2d70c48a 100644
--- a/dev-libs/libcli/metadata.xml
+++ b/dev-libs/libcli/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">libcli provides a shared library for including a Cisco-like command-line
 		interface into other software. It's a telnet interface which supports
 		command-line editing, history, authentication and callbacks for a
diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index 3758d94c693c..8d810ff92948 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,3 +1,3 @@
 DIST libcss-0.8.0-src.tar.gz 516474 BLAKE2B 937adc65f68fecece189e0f06cfd601ae2d76f0b4dcdbcb8a67f3f058c4355c19c12c088fb50ecf1e6bcd8436c867b1845b3da27bb44b5d1a009bd946bf5e53e SHA512 fb52920ce462f442dfafa7b0061fa465e6c04827d26186e8468855c2a40e8f34e6f0689d5eb58cb0b2ee0759d083fcff5c8c583e1d98693755003c352a22a4be
 EBUILD libcss-0.8.0-r1.ebuild 1125 BLAKE2B 88f3b0afc6891cb87da7f98bf7e0b3214e452645d01c7b1ed2dbbb86b1ca51894c4e1393c1d10de5f289ba75e243479775add2ec4846295636470a73e3214f83 SHA512 e1598e4dc81878d51a5ce29e2ae50dc292de44053ebfe64214139721929a45d5c5aabb439d3726ffc3bccdb48f67590a815fb4a0df6cecf84f1eed88d1346ed0
-MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
+MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libcss/metadata.xml b/dev-libs/libcss/metadata.xml
index 68674fe1b802..88de5fc462b1 100644
--- a/dev-libs/libcss/metadata.xml
+++ b/dev-libs/libcss/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
diff --git a/dev-libs/libcxml/Manifest b/dev-libs/libcxml/Manifest
index 7cfdedd26942..dd3d56745f00 100644
--- a/dev-libs/libcxml/Manifest
+++ b/dev-libs/libcxml/Manifest
@@ -7,4 +7,4 @@ EBUILD libcxml-0.15.1.ebuild 779 BLAKE2B c32bbf98b5fd273e23c5dfe4b537880e3344750
 EBUILD libcxml-0.15.4.ebuild 804 BLAKE2B 39a3a91b32ed489b6f7143e7a20fcf9cd5191952e88d7d60fc7fcf06cd174fbca95f71acd86266b8bc61b081a26e7ad63add9374b8b705700c34acb579a3aac2 SHA512 f0a95a26021ee3286b370e198510e33669df19db59555a87ac951a995af73f1e0506c334c6f2b2f77ef49a21b21b59e330cc5eedd65b09deec2386151236cdab
 EBUILD libcxml-0.15.5.ebuild 804 BLAKE2B 6b1695a937aeb219dcba2b036e0a0ca965c07d90d02651324c9b16804a2b584b581384c3ae9c3126ab57002f2eb7f69c13d70153a933789131e25137a829291e SHA512 1a93e6c7e61ca568039b95fd20fbaa151be2fedcbfcde2c0711741e9d1fc8932d3680549ea81f4a868f9779dc4f8002974e8250ab72f0772d77c68fd3b3c8923
 EBUILD libcxml-9999.ebuild 801 BLAKE2B 2f9c019504ac3cac3046691f13595f65f3af29a4480b6973b46b56b0495a4f902a1cbde3638c2a706add772d07e19394e1eec2f231b05c8aa141b6225c28fa07 SHA512 db6177930a1e05cb8709be9c919fa84c3a02698d65a95778be86bf4ae207a5f80a7d66013cf17a67ca8fcb403b57308a77be76d42c043d7d875b03e4eca31dd2
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libcxml/metadata.xml b/dev-libs/libcxml/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/dev-libs/libcxml/metadata.xml
+++ b/dev-libs/libcxml/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 833ecbff84aa..0f260b04dfa6 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,3 +1,6 @@
+AUX 3.30.2-leak-fix.patch 820 BLAKE2B 42fa64e28ba3c94e4ff759bb6abaacc6046eb3e6b68d7090fe961d36ce9c0ca06f85acad67fef1102952bca991b1f7b5886c1a9a421b4bcc7ce146a74b645f98 SHA512 a8df67b6793cecda6787dcf8023f6cbf50066ebb282c94ff1c22f5e51ed331df841b33627bd0116a73fc38522bda0071a353a2bad807d599acc672e029a499ed
 DIST libdazzle-3.28.5.tar.xz 422792 BLAKE2B 65b994798c2f9c7ec0d5ec5b3506896ba3fe09e8e563f1c03246684837a876d0918763f8589deccfc1477071434acda56973097904c3ad5469aa4374a56d1914 SHA512 e4616994226a7e755913343487a2850030dc13816c94dd0de166bb617a001097f6b849fa45ee546e75a15ad3357bd5a61a0caf436c4e3656eaa3480ed4b7f903
-EBUILD libdazzle-3.28.5.ebuild 1316 BLAKE2B fea311b5e322a68509d784e3c0bb4923f737c892c108efb06a245868014bb61ada0232acbc37f61f923025426f5b18c04efd706ca30006075506c80f465f7afd SHA512 948fe1592b4ca032d193f4c1758ada180fcd0dc9b600a3874f793c97980f023edc2e13eb1e94f9b5cecdc9f1598200f3034502b633bbf87b1c371182fe79cd63
+DIST libdazzle-3.30.2.tar.xz 432192 BLAKE2B 4c31b74b0a5c972b5c86bbacf50862a0c2db5c9ed1e67124671e2ece75d72de4c3605c6ecc81bde10cf2566ae06cbd7f14fccaff5d154c1bd9e53a9f8b2dc2eb SHA512 591c3bb9dd65ae02e6234a1599497dce78d843ee6ca47e8d50656b9f98bab91c7b89424c23eb387184bdb28132e1fbe11ee7c01d4a7f0598bcef92739aa8bff6
+EBUILD libdazzle-3.28.5.ebuild 1333 BLAKE2B f96e034c10cf9142ead418a0b86980e5450c9529ce4d408317ed9ebabe80821596b5b4cee3a422e80aeb66e515e2c0e6cce0f20ce0dff46ade2f3a369d2ece1d SHA512 43e1def81a4f3e09fa7a91617216c3e989e8fe2019e65bc712010942c93753018c9783b15b203480cd69c811ac267eba215ad676ba1d882c58cd35983aa48a37
+EBUILD libdazzle-3.30.2.ebuild 1420 BLAKE2B 866e53e83f16edc934c2d6e19c0afe0ff55fbc75a44925510768b99e1ccc30e194a61f5beb6f7bfc84f983218cf505a69679f0bb332ba92704ff9dd141b95792 SHA512 92d8cab32919018da9fc50fedc8d86126e4804a1952ae2999799471ed384fffe88e8e9b9ba9fedd6f0ddca7fb09707d254b03b1d4787768b52b36a11d86a3e21
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/files/3.30.2-leak-fix.patch b/dev-libs/libdazzle/files/3.30.2-leak-fix.patch
new file mode 100644
index 000000000000..b3a1debf605e
--- /dev/null
+++ b/dev-libs/libdazzle/files/3.30.2-leak-fix.patch
@@ -0,0 +1,27 @@
+From 6f8436709430fd5ebaebd90dd55885636030940d Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Mon, 19 Nov 2018 17:43:24 -0800
+Subject: [PATCH] three-grid: don't leak values from hashtable
+
+We are responsible for freeing the GList chain, so ensure we do that at
+the end of size-allocate.
+---
+ src/widgets/dzl-three-grid.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/widgets/dzl-three-grid.c b/src/widgets/dzl-three-grid.c
+index 0de5484..d00d0b1 100644
+--- a/src/widgets/dzl-three-grid.c
++++ b/src/widgets/dzl-three-grid.c
+@@ -569,6 +569,8 @@ dzl_three_grid_size_allocate (GtkWidget     *widget,
+       area.y += child_alloc.height + priv->row_spacing;
+       area.height -= child_alloc.height + priv->row_spacing;
+     }
++
++  g_list_free (values);
+ }
+ 
+ static void
+-- 
+2.17.0
+
diff --git a/dev-libs/libdazzle/libdazzle-3.28.5.ebuild b/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
index 221853d5f5ed..bd629ecc4e4e 100644
--- a/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdazzle/libdazzle-3.30.2.ebuild b/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
new file mode 100644
index 000000000000..635275f8d6e3
--- /dev/null
+++ b/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Experimental new features for GTK+ and GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.24.0:3[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-leak-fix.patch # from libdazzle-3-30 branch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_tracing=false # extra trace debugging that would make things slower
+		-Denable_profiling=false # -pg passing
+		# -Denable_rdtscp=false # TODO: CPU_FLAGS_X86 for it?
+		-Denable_tools=true # /usr/bin/dazzle-list-counters
+		$(meson_use introspection with_introspection)
+		$(meson_use vala with_vapi)
+		$(meson_use gtk-doc enable_gtk_doc)
+		$(meson_use test enable_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/libdivsufsort/Manifest b/dev-libs/libdivsufsort/Manifest
index 5ccfd281d516..5d022b2a3cea 100644
--- a/dev-libs/libdivsufsort/Manifest
+++ b/dev-libs/libdivsufsort/Manifest
@@ -1,4 +1,4 @@
 DIST libdivsufsort-2.0.1.tar.gz 31290 BLAKE2B cf8d5259adbef828dc1650d57969001f23b65d064658af4333d6bd86ec2ca0618f92d21e50e135eec7102b142ead15c3cc53bdba0d9d336507578db36b92edc4 SHA512 c82299adbd49995145872cd67e03b1c8762de99043acca48964b16c66a39347fb6211b17c9b5f6e12878983ea7cafa65991179f67e3a4cb5e5e14bb57775487e
-EBUILD libdivsufsort-2.0.1.ebuild 550 BLAKE2B f2b3424d4fbef0a1c6a43cb150a6c834ec316892ccd9c154d997b17de88bbd9f006b57cf0953489060f34e63c8203c9165ea514127913df1f7956b0f39f3ce92 SHA512 f1a785a2b7f1398f872a72dc556b3250c6abd3467426e08af579c09bc9915ba1d72a132677fba1db6cf03b2b60c1efa32308efd8eb91b78ea66d74c215a3b493
-EBUILD libdivsufsort-9999.ebuild 527 BLAKE2B 129107c4844bc055213ddbedb330646cdbe2896812fea90419c66b0c3bb6dc71477b24d2b390434d6442381252081145ffb911f8c1819753c628eb62059fd2f7 SHA512 f77d3a8450c9bbe13a866b8dc0b81320b985862de33387d69886c2448656013b877d0f1c308bf07a20c27de05b72e8900d881984ed09bbb88a2151a0a8686fc5
+EBUILD libdivsufsort-2.0.1-r1.ebuild 858 BLAKE2B bba0375c678c9f37a27407d2a5b12ad09c6970bb8d44e2b63faf562b444389c6f8732ad4f310c4f7a788f9a2f582a357391b91873e07ff3e5af67b3e72abd1a5 SHA512 a86da249e621d74c84e8f0d11cd94f871821e3bfe3b14c062448e53f32c7b5d06e4b8acbb93e115670b941845cbcc76d3ad047acb932b01a63036b8040f3b443
+EBUILD libdivsufsort-9999.ebuild 835 BLAKE2B 0ee21199dab9722495b7e9d783c14d4748c1153fa103efa3eaaaf9e60ba528862beaad3eaf552e6b6a0a7d297e4304ad20ad483331ea697015dd1aed1a6a320d SHA512 08f1703d1b5f3bfc1dbf380a4f14b86ebd70480f6ec93fd27d74fd2b310132ce4596aae566478314d7ac5a9dbca19b372f122c0ff49d9bc426835bccd1965e9b
 MISC metadata.xml 331 BLAKE2B aeb4281b9559ab0e91ed011c9a695e8af8bb2613a54b6b49a6629f952c26607704995d274033132726e21a51a296fd4efee6d090cc022d0db08476003d1a6529 SHA512 44257e79147e95579eff4b63be25a6ec673f8a2a09e7b2240163260c3f13161585746bf9967f479aaf6094271669f1b16202a1c5766c3c638a4f9054dd9408fc
diff --git a/dev-libs/libdivsufsort/libdivsufsort-2.0.1.ebuild b/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
index f507682f32d4..644a49823e32 100644
--- a/dev-libs/libdivsufsort/libdivsufsort-2.0.1.ebuild
+++ b/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils multilib
+inherit cmake-utils multilib toolchain-funcs
 
 DESCRIPTION="Suffix-sorting library (for BWT)"
 HOMEPAGE="https://github.com/y-256/libdivsufsort"
@@ -11,7 +11,15 @@ SRC_URI="https://github.com/y-256/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="openmp"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -20,3 +28,8 @@ src_prepare() {
 	sed -i -e "s:\(DESTINATION \)lib:\1$(get_libdir):" \
 		*/CMakeLists.txt || die
 }
+
+src_configure() {
+	local mycmakeargs=("-DBUILD_DIVSUFSORT64=ON" "-DUSE_OPENMP=$(usex openmp)")
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild b/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild
index 9dcaf6470b58..d6c33d70a4c5 100644
--- a/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild
+++ b/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 EGIT_REPO_URI="https://github.com/y-256/${PN}"
-inherit cmake-utils multilib git-r3
+inherit cmake-utils multilib toolchain-funcs git-r3
 
 DESCRIPTION="Suffix-sorting library (for BWT)"
 HOMEPAGE="https://github.com/y-256/libdivsufsort"
@@ -12,7 +12,15 @@ SRC_URI=""
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="openmp"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -21,3 +29,8 @@ src_prepare() {
 	sed -i -e "s:\(DESTINATION \)lib:\1$(get_libdir):" \
 		*/CMakeLists.txt || die
 }
+
+src_configure() {
+	local mycmakeargs=("-DBUILD_DIVSUFSORT64=ON" "-DUSE_OPENMP=$(usex openmp)")
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 292794a1a32d..3b11151340c6 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,5 +1,7 @@
 DIST libebml-1.3.4.tar.bz2 606205 BLAKE2B d13c33777e9afbc4d370e0b8e68fdcb42597fbd62f61197a4aa72e2b229ef06819efc0864f9783c87c90f8fcfa572b02d9b1767b57c31c6bc22a020b9eace94e SHA512 ebf5b71afe725e40ee6415463e51ca14810eecc2fef186caacd0269077f5febeb62623fd48674b21ea732f43a620d0c91603fa48d3f8d163284d1cf204642194
 DIST libebml-1.3.5.tar.xz 274184 BLAKE2B 954411bba6fc9ff3893a17a5147babff18352ac2c436523eecafac8e2921dd968e83f5672428f4f22e61cee97f7ce1a4f905781b4468cfd9f3ea7d8cd15d961f SHA512 cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24
+DIST libebml-1.3.6.tar.xz 57764 BLAKE2B 554f9d4d162d02ba05e2b1eecd688a6c25a4c727ee1a2a93cd6c4ceec94c5628ec20306dc5fa41a2dfcf189afb7a3add33b09a3bcf62f8b5f8fb2ac6657916d3 SHA512 6a31a56dcde39642848f25353a462f4621d6cfd3bc9ef62add1b00d098c6a80b3c2b50ecf4d6dd50650c609eb39a6150c6d1b69ea3a77a3928bd3300af7dd91f
 EBUILD libebml-1.3.4.ebuild 834 BLAKE2B 11fe2d8ebf1fa93a7fd9c866a9bd556d00ce6da0553be6e39b85c61e711a8277eb3f27e212c00609cb092f16e7fb403285ad29623f7e8941a7bc7c96443becd7 SHA512 edc8bf5f0137d8fb44335b0ceb64a66c98d2eb88bde15b93f7350fdc2b80077006c5e31c8ea567b0ef6050f08789a1566ccdeafb8f6ef98e3559d344f85047b4
 EBUILD libebml-1.3.5.ebuild 833 BLAKE2B 63ffb0503ef6995d4317638ddb15d27fc3a29acc173db763fb792ffc240c9678b787f6bf6cc9e50575e47ff682d262163268a80cd3c8ae40cf5ec12dc384e778 SHA512 e4157e6a8d7b5b4c1ed559a474cb9b9511ab7eb76d8238eca97278bf694a37fa00114b0ddd881984886636e2ef65becff655374a4d91b8e66297e91e1b65852e
+EBUILD libebml-1.3.6.ebuild 635 BLAKE2B 9374b1ffd2ca8bbbdd9bb95fa623d19066b2e5206c04e1d97de2b1fd6bf3942c9135ef9b6f49e6c730aadd01503d31ffd6089847c6b82e3d1c0cb28ee6751fff SHA512 4429474674e25851d9e5f56f3ff0a438c4b4667e3865b1a71bc6456786a65748b8972627a72e516481109f57ed4e38a2577b32a2c97d8ddfe73a9104340faf01
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.6.ebuild b/dev-libs/libebml/libebml-1.3.6.ebuild
new file mode 100644
index 000000000000..690f07b22151
--- /dev/null
+++ b/dev-libs/libebml/libebml-1.3.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Extensible binary format library (kinda like XML)"
+HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
+SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libestr/Manifest b/dev-libs/libestr/Manifest
index aa1524854325..9f692f051ec1 100644
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@@ -1,5 +1,5 @@
 DIST libestr-0.1.10.tar.gz 336122 BLAKE2B 7a157d030415bbdc8c289061c4ce1ddac4fdfd7356e82857afbf9a8d6ff4bee0a0b98f2e39c4adb69a0349c33a29f1cdd90ec901c3501c0fcafb45faecbfea7c SHA512 477b06e2b6ea9b2e34fe0d91328c9191a678b173751e595359c05772db50a4d348ac132bec0c926fba91ceccc013e15cd4cc57a6b734874c06073bf23151bac7
 DIST libestr-0.1.11.tar.gz 355544 BLAKE2B c165212c4a56ee577a76dbb95dfe9d08d84087d490422d4fb7c29cadc5b5d0eed97234369331286433e2d860d3cfa8af3117d3ff94e8833df91f6586905ad2c8 SHA512 0ab98c2fa4b58cf6fee89c88602725b8b5e8e5a171a6976cdd8cff4dfc1cd3e5b747868da74fccd1bca66b9fa524ceae1c4f1ad5ee653a44ff81df6916ab5328
 EBUILD libestr-0.1.10.ebuild 695 BLAKE2B 61c95d400c72a1eb15ac704941d275a5ab57dfbd589ebcee9450088ad5c019c4bc3982b937b972d03232b63b58ea51a1b20cb8b918052fa1613d7cdf8dcb5b09 SHA512 a408d345bdb13b504264d0ef514e2c858c134ccda3cb3b20a0393666362af43e7ac6f2aab66067a592fc01c84863513281bc3d8ebaf06e2a6939896866ef6747
-EBUILD libestr-0.1.11.ebuild 702 BLAKE2B ec4c99c45386ef108a7a45471b5d7da50d434e179fcf3d46218be91a170e7472389929ae5442bbb40974bf91a53ecb40a5963b67d82477effeb452bb2745e4bb SHA512 d441c5df41a12e62e74abe872c085acae6d6cff68ada8131abcf74c8edc0da3badf14ba3a66fc1fb9162e3891804d962208d3dee9ee1d1fd8edb752640e0cd07
+EBUILD libestr-0.1.11.ebuild 700 BLAKE2B af3503b398afd06719a21ae4fe8109f75b7642f0b66fe836c49a06a5c8797788cc20598700291ae26c40da26795502edd6c97781604eec6c18a58ad2050af70c SHA512 869a9c24e9ee8796ca08e34a0a7c9bcb73a2110fbadd5875b27f110c4b24fd6217ae72b2dbe0f6e345ac43485bc3a88e452c6257f79d7f1652f5d9458549c9a9
 MISC metadata.xml 504 BLAKE2B 9be3182332c3b6e62b74573534d7c1099b5bfab19cad517322c1a03df1909afbfc973cc10fa525b6383ba385d9669c86a2bf309a841bfa70cf35faef40b2493c SHA512 7eefcd09976509a7fcefd342543158a06524eaaaa6e2bcd81b1373cbfd43eed1457b5f240be6f38242dc3236d392a5c3691c0f0889d6a71c302b86c8abe5e8f3
diff --git a/dev-libs/libestr/libestr-0.1.11.ebuild b/dev-libs/libestr/libestr-0.1.11.ebuild
index 719c5dac2533..6cd8dd678c6b 100644
--- a/dev-libs/libestr/libestr-0.1.11.ebuild
+++ b/dev-libs/libestr/libestr-0.1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libestr.adiscon.com/files/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
 IUSE="debug static-libs test"
 
 DEPEND=""
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index f3955b2323df..f06ff5b6ff90 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.5.9.tar.xz 408200 BLAKE2B b99974eab572693c9e2a915b21adf2e6c09e26af70011ce661084ac9add51cb6257f36bcfeb89d76c8987cf8724e69b027d30eda17c4457a40f3e047302efa19 SHA512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c
 DIST libevdev-1.6.0.tar.xz 411512 BLAKE2B 0e9190fd4c28b36bcf325953aa634c0d8c604cef7f56e46679fc88351536d78b0bddedbbdfffe4164e0039c7d56ef604b143e23de2c4bb9a66653a03d6844fa9 SHA512 73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060
 EBUILD libevdev-1.5.9-r1.ebuild 1056 BLAKE2B 2e4ea381cd4e29845cc5109716cc657ef499329b9d9ddfd9c8b7bf9ab703ae404f2c62fe94c904c31905292f0848adfe51efce67990768dda9f298ce67a62bf4 SHA512 22b4f94635dc0cf44c75c4926d02c1efd3e18e8ae1f533f46faff30d40c3c1d0947518e5783af47d0678401a52fd987c86b0947911877c79c9b08b46655c25fc
-EBUILD libevdev-1.6.0.ebuild 1066 BLAKE2B 204149dd3eea3aa65af01c1d9af0621e734f083febdcc1ec58cc98279c1bca348f1196b668612d6cb6b43c8a2417be12ce18d2122c2f4b650b87dcdc5e407ac3 SHA512 b53e29f31aa98864889d4e5410ab1d0f05f8f5053ae767b7fb3b595edebbf2b85609b70237d832bf986b93ba1bcd5e408df68c0c37e8e26d6924c12bf94a2b33
-EBUILD libevdev-9999.ebuild 1066 BLAKE2B 204149dd3eea3aa65af01c1d9af0621e734f083febdcc1ec58cc98279c1bca348f1196b668612d6cb6b43c8a2417be12ce18d2122c2f4b650b87dcdc5e407ac3 SHA512 b53e29f31aa98864889d4e5410ab1d0f05f8f5053ae767b7fb3b595edebbf2b85609b70237d832bf986b93ba1bcd5e408df68c0c37e8e26d6924c12bf94a2b33
+EBUILD libevdev-1.6.0.ebuild 1070 BLAKE2B 19f6c9c38fafeac9484b236f0dfaeacf1fbad2d36f991e870db4651e20ddbdee765bd503991691f0d2f8e7091d33b5e1e6b473d74a4caaf22ad13a80a69cdb7f SHA512 1263c46fa3771c1c924b4efef99ad1c3b368317838df9feab79536befeea850cb5ed03dad42b66c6144b5d026991363982a01ffba11de7740b05567771a5a147
+EBUILD libevdev-9999.ebuild 1070 BLAKE2B 19f6c9c38fafeac9484b236f0dfaeacf1fbad2d36f991e870db4651e20ddbdee765bd503991691f0d2f8e7091d33b5e1e6b473d74a4caaf22ad13a80a69cdb7f SHA512 1263c46fa3771c1c924b4efef99ad1c3b368317838df9feab79536befeea850cb5ed03dad42b66c6144b5d026991363982a01ffba11de7740b05567771a5a147
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.6.0.ebuild b/dev-libs/libevdev/libevdev-1.6.0.ebuild
index 2f3e3b8ac97a..5ad289f73408 100644
--- a/dev-libs/libevdev/libevdev-1.6.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index 2f3e3b8ac97a..5ad289f73408 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 81e94890b475..ac16cc66396d 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -6,10 +6,11 @@ AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e96979
 AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761de8194a5fff6dc0c32be843e15e3da089ccd3819b656843844475199eb5ecc53312f4ad5c1b26d896df464d077ce15ee32eb13 SHA512 202b0685ecbf058a0414e1f2e673e4c793f5381b5714e5e8f025307068eb48f5c7eb85081859194b4500cbc5b6981f07fb4b6efc866071ea0e64f9231852444c
+AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 DIST libffi-3.3-rc0.tar.gz 1084854 BLAKE2B 2c38d60f17ef52bcf270178c13c218f6ee320c9785091621d4689bcf6cee31d07eaaca12790965e1ae3ad71ad2c408342743968bf1d23f81a07fbdf6cfd55b90 SHA512 e6e695d32cd6eb7d65983f32986fccdfc786a593d2ea18af30ce741f58cfa1eb264b1a8d09df5084cb916001aea15187b005c2149a0620a44397a4453b6137d4
 EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c2e5fd3cbda307bd24ae63573a8ab27459ed0b73177bd969232be7640b737a35bae7f5be69876b92de4351dfcbff SHA512 1f27cd306112d3de8762f0cfab1f6196819a6793585c477027b3e0a48fdf0259f764d87b8cb221c5b32aabd5ae47d8535f040d0960256064d14a4d78a67bcfb9
 EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189
 EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7
-EBUILD libffi-3.3_rc0.ebuild 2022 BLAKE2B bfa0038c2730f125a3754a8c5e52895d2163ff7748235082112e8dc5316b7e7ed43b3bc8eb0726513dda7058aa0f5fb1a9b4be0c18f205eba2c48f8144ae4061 SHA512 134ee21346f8b308cdeb05c3f72ad541f846eadfa786c188dfb050916c2703ea8c282b9b59ba008ffb18a125df9f195b127a252b9839c964cb8411f4846f4252
+EBUILD libffi-3.3_rc0.ebuild 2070 BLAKE2B 7d53ad6fa9507d557f3daeca835517b2eca33d422f4f7f2500edeec9522e581c7b4b6c8224c478ed23f80de83274dbfa0889a4805368d533a50aef67117296bc SHA512 39c967836885558ac90b7779e69b180c08ea007f06bd628881f44f7a5d574ef19886734a1b17e71f0bb161a55c633eb59336e15aca82fc8bef463fe9e53cd1e6
 MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90
diff --git a/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch b/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch
new file mode 100644
index 000000000000..88f9b4557657
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch
@@ -0,0 +1,79 @@
+ffi_darwin: use FFI_GO_CLOSURES guard to avoid unsolvable dependencies
+
+The go calls depend on compilation and link-time signatures and symbols
+which are missing because they aren't build due to FFO_GO_CLOSURES not
+being set.
+
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+
+--- a/src/powerpc/ffi_darwin.c	2018-04-02 14:21:51.000000000 +0200
++++ b/src/powerpc/ffi_darwin.c	2018-12-10 13:57:26.000000000 +0100
+@@ -909,8 +909,10 @@
+ extern void ffi_call_AIX(extended_cif *, long, unsigned, unsigned *,
+ 			 void (*fn)(void), void (*fn2)(void));
+ 
++#if FFI_GO_CLOSURES
+ extern void ffi_call_go_AIX(extended_cif *, long, unsigned, unsigned *,
+ 			    void (*fn)(void), void (*fn2)(void), void *closure);
++#endif
+ 
+ extern void ffi_call_DARWIN(extended_cif *, long, unsigned, unsigned *,
+ 			    void (*fn)(void), void (*fn2)(void), ffi_type*);
+@@ -950,6 +952,7 @@
+     }
+ }
+ 
++#if FFI_GO_CLOSURES
+ void
+ ffi_call_go (ffi_cif *cif, void (*fn) (void), void *rvalue, void **avalue,
+ 	     void *closure)
+@@ -981,6 +984,7 @@
+       break;
+     }
+ }
++#endif
+ 
+ static void flush_icache(char *);
+ static void flush_range(char *, int);
+@@ -1110,6 +1114,7 @@
+   return FFI_OK;
+ }
+ 
++#if FFI_GO_CLOSURES
+ ffi_status
+ ffi_prep_go_closure (ffi_go_closure* closure,
+ 		     ffi_cif* cif,
+@@ -1133,6 +1138,7 @@
+     }
+   return FFI_OK;
+ }
++#endif
+ 
+ static void
+ flush_icache(char *addr)
+@@ -1168,9 +1174,11 @@
+ ffi_closure_helper_DARWIN (ffi_closure *, void *,
+ 			   unsigned long *, ffi_dblfl *);
+ 
++#if FFI_GO_CLOSURES
+ ffi_type *
+ ffi_go_closure_helper_DARWIN (ffi_go_closure*, void *,
+ 			      unsigned long *, ffi_dblfl *);
++#endif
+ 
+ /* Basically the trampoline invokes ffi_closure_ASM, and on
+    entry, r11 holds the address of the closure.
+@@ -1430,6 +1438,7 @@
+ 				    closure->user_data, rvalue, pgr, pfr);
+ }
+ 
++#if FFI_GO_CLOSURES
+ ffi_type *
+ ffi_go_closure_helper_DARWIN (ffi_go_closure *closure, void *rvalue,
+ 			      unsigned long *pgr, ffi_dblfl *pfr)
+@@ -1437,4 +1446,5 @@
+   return ffi_closure_helper_common (closure->cif, closure->fun,
+ 				    closure, rvalue, pgr, pfr);
+ }
++#endif
+ 
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index 0a31487e51f1..5f56796bb879 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -25,6 +25,7 @@ DOCS="ChangeLog* README.md"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
 	"${FILESDIR}"/${PN}-3.3_rc0-hppa-no-TEXTREL.patch
+	"${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch
 )
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 9014ec1cbae2..a50800df4ddf 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,7 +1,9 @@
 DIST libfilezilla-0.12.3.tar.bz2 398275 BLAKE2B 0ba30e64b6aeae0bed58913248992b7152b389fc560291174388196a02a583dcbc485c9fb9680e0541e788c2d6691a6050f465e8719c2c3e7974eb5fd293bf8a SHA512 a08343a418b4147b42d38afd04c66a26c405770109818b48a291c127a5fde6c98515b716990fb056b319c3be859f44060d4ee83e96ec5c4bfa40c755ddc01bba
 DIST libfilezilla-0.14.0.tar.bz2 399398 BLAKE2B 25c1397769adaf532823f85abcc8bec0a885f5c92af49219a1aa9379c12692bdcc94d223ac2ddeefbb221f0ce0d709b058b7018f3c358a40cc046e7c45c4ee82 SHA512 f20932e14ab81df9562e030ce10009b9ab55b6798f7bfff7249e9f472fc8cae4278eb142a655dffb63fec53894783874973eb33444bfdacdb06fa682c2dd66a6
 DIST libfilezilla-0.15.0.tar.bz2 404535 BLAKE2B 9390025ef14553ce6ce9494ba84c888efbf78799b681eb6d6f6ae3f3a626026587eca1898aef907adbbbe970ef6f1cd30aef66a94fc287331e6e29f66761ff3e SHA512 64b0e2a8dd4dd06a1c2daf52f3036fcaed60b95240672f28032ec390361ddb1a59cd26a91b7b7c525cfc8262381db09a081a29c723f487cc5b41454ce4e9d47e
-EBUILD libfilezilla-0.12.3.ebuild 921 BLAKE2B ddbbfbb499653641009d4ce494b7308bc92d6ffb58ae13888dfe892761c993fe03b5ead34638b238e96a171310d21f794981051d321d01f1d4b64ef63a47afa4 SHA512 7d04b1cd40129c05ffef86da072ef5da8fc91420ebe5444c6e5f8c471c0627502ee0575d19d3de2903e7bf8dc2a256aaaf7369cf165f62b868d35b54baa0f34e
-EBUILD libfilezilla-0.14.0.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
-EBUILD libfilezilla-0.15.0.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
+DIST libfilezilla-0.15.1.tar.bz2 404746 BLAKE2B 644f4b8949670d5b07f9e7b861d388ce70eae6612e34bf938cb628b65724a527e33c1f039087fd8381c06a15c12cc2b4fc6f616cc5949bf325e2eebf41abdf2d SHA512 d557f7636bfc3958b8558fab3384b0ea84caea594566d39c051f20f02dfd71213369c50df282a3f7d2dd757038bd26e9722214839dab965cb7cde9733d59883a
+EBUILD libfilezilla-0.12.3.ebuild 874 BLAKE2B 2631c5551944aae099a94b6a8cee77dfe92ccb797fb3c2ea91481e11aaa3c08488ddef545cd00195f6f121f3cab6c2d7502de29fe5cc1fc0afe9b46d4d27fd3d SHA512 1dad84e48c21388f5625235a30210f50ab9c38e3fccc6ab58b074b8ef8c2c0bf62944f764003331a99272ce1bafe12b14d2f20e3c3f9a3bea1b60d5ab854775c
+EBUILD libfilezilla-0.14.0.ebuild 876 BLAKE2B dd08708af0aa4c5095132079a38c39b6534265529fd3950c4f96f5464f933b89b963ecaa37058932933485fbf011ee45a6b719210d29f0c43a2928fd5b1395db SHA512 cab062baf1c2630553f70f66635bc59388686d2388a917baa381e00ab734aa97c49f4851b65191155105a93d744d32847d45739e607310f06f43a4aa44c0f180
+EBUILD libfilezilla-0.15.0.ebuild 876 BLAKE2B dd08708af0aa4c5095132079a38c39b6534265529fd3950c4f96f5464f933b89b963ecaa37058932933485fbf011ee45a6b719210d29f0c43a2928fd5b1395db SHA512 cab062baf1c2630553f70f66635bc59388686d2388a917baa381e00ab734aa97c49f4851b65191155105a93d744d32847d45739e607310f06f43a4aa44c0f180
+EBUILD libfilezilla-0.15.1.ebuild 876 BLAKE2B dd08708af0aa4c5095132079a38c39b6534265529fd3950c4f96f5464f933b89b963ecaa37058932933485fbf011ee45a6b719210d29f0c43a2928fd5b1395db SHA512 cab062baf1c2630553f70f66635bc59388686d2388a917baa381e00ab734aa97c49f4851b65191155105a93d744d32847d45739e607310f06f43a4aa44c0f180
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild b/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild
index ebf7bc6c8964..b9c70e99b795 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,7 @@ inherit flag-o-matic
 
 DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
 HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
-	http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-libs/libfilezilla/libfilezilla-0.14.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.14.0.ebuild
index 5fcb3b82864e..5088d4edb82d 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.14.0.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.14.0.ebuild
@@ -6,8 +6,7 @@ inherit flag-o-matic
 
 DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
 HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
-	http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-libs/libfilezilla/libfilezilla-0.15.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.15.0.ebuild
index 5fcb3b82864e..5088d4edb82d 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.15.0.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.15.0.ebuild
@@ -6,8 +6,7 @@ inherit flag-o-matic
 
 DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
 HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
-	http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
new file mode 100644
index 000000000000..5088d4edb82d
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index a96a8cc2fe64..5819dc972dbf 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -4,7 +4,7 @@ DIST libfmt-5.2.0.tar.gz 648061 BLAKE2B a2ffe84277097f3cd5bfa163fa12e352349ab823
 DIST libfmt-5.2.1.tar.gz 648668 BLAKE2B 516522d4e75e7ccdf95a43bfe1b5f95b8ce8ef0174d6b82d6b7be9985f084228a69e70ecba7f57788d536501699b584cb4eb51d7894b416ea857727b776b3823 SHA512 2b63a741df4df9c3cbf04098c6548bb3d0f9836fe912325542298df57c888f43e72159469fb87685b423694e43e4418545377d5ee6393f2709955be2c13780a8
 EBUILD libfmt-4.1.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
 EBUILD libfmt-5.1.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
-EBUILD libfmt-5.2.0.ebuild 756 BLAKE2B 0cd7c7b64d0394572010f987344d9061b7337752fe149f23b60341bf0d651bbae1b6fc225666f851b091c13c8aa64bb133e7f2b0d9b50f0a391ae672f733eb25 SHA512 fcab1c07d5127f7f10ee7a50b8e566c8c81ac3f67cbfc6799638553d2ae81b1bf0313a2a8fd3d18d20c06d64b36c42cd5134095d164c00ebfd7299fcf3ef6300
+EBUILD libfmt-5.2.0.ebuild 755 BLAKE2B 2ceb89cf2e1db3ef548990b964342d5a9eff64c1aae76fba5f51b4500e220aa7fdf01e82932e4c81c76f0d7f60197ebce6d2314d8c6615432a6ac50a94184219 SHA512 6f4f4e1517a8ac5fee554e9128eeaa2695d8c65e72c57791910ff559c90023d68878d9af1966073bbcfd32c84ae596de05a6e4f6b3832eec2b927c04ebe9f9bd
 EBUILD libfmt-5.2.1.ebuild 760 BLAKE2B 353e6f862d50c681961f7a2dd7c3f8ab9abd04fc8189fb6b26bbdb698d652cdd4ed089b26e6421701108fa84e9585f1e329e175b097c366e13836c8d037ddfe9 SHA512 54007b3096d54918868e21a9f7f15706855b16f29df8a63793e5b740178a087872121989abc00f3c411e6192f9570bbca8ba10d6d78074b0edf8e6025e7ea479
 EBUILD libfmt-9999.ebuild 760 BLAKE2B 353e6f862d50c681961f7a2dd7c3f8ab9abd04fc8189fb6b26bbdb698d652cdd4ed089b26e6421701108fa84e9585f1e329e175b097c366e13836c8d037ddfe9 SHA512 54007b3096d54918868e21a9f7f15706855b16f29df8a63793e5b740178a087872121989abc00f3c411e6192f9570bbca8ba10d6d78074b0edf8e6025e7ea479
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-5.2.0.ebuild b/dev-libs/libfmt/libfmt-5.2.0.ebuild
index ca59fede2eff..9620f7502597 100644
--- a/dev-libs/libfmt/libfmt-5.2.0.ebuild
+++ b/dev-libs/libfmt/libfmt-5.2.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libfstrcmp/Manifest b/dev-libs/libfstrcmp/Manifest
index c0dea242b47e..0c176bd4e99a 100644
--- a/dev-libs/libfstrcmp/Manifest
+++ b/dev-libs/libfstrcmp/Manifest
@@ -1,3 +1,3 @@
 DIST libfstrcmp-0.7.tar.gz 394845 BLAKE2B a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e SHA512 aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c
-EBUILD libfstrcmp-0.7.ebuild 724 BLAKE2B b98d5ad213988637cda9a73c182f7fc20c259530466e17cabe05f50896224a075d508d2ab6bc7a73d221f7865915941128a0980144f20246bd216299f957ad0b SHA512 7c79e9215466f1adcfb96126513653bf405c39f8a0f48c6f84442ccf42604e443d83b167dd9087be6bb2623250e20131b556c22962f1198ce05722a720b7c072
+EBUILD libfstrcmp-0.7.ebuild 798 BLAKE2B 6b0fa888e5ecbad92001c73cc21a2371719b044e1054d79160b7f0ace9fd3706b60b623240555c99f60c6c139e91a8c97017df5c6350895e769786302fb32a14 SHA512 b2ba229672a48f925bf39d0d6246cb5e958f7290b8eecd226084875e9d8dbc0c71d656dd034da0e31b39531fbf7e0d4f836b7f41e2789c14eab2575f55172683
 MISC metadata.xml 325 BLAKE2B cc27381f0071006c05af2fe95a2dbbc481fbb8457976c4c4eec7c3321df75ca4957b7a626ebc1d20aa524bedae4730ca05bf0fb36f8e2b0177429993d73d5237 SHA512 f9baf25481af2a997d7f05610c68b7a3fb376d4bdf1526e59b172d2e3c4e4a2008b1fce9c66247bf01b488db4932872dc58eb0e1fffb9e6a2cc769023f7c75d6
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
index f4d6bb2c005f..91ebc6ed8a52 100644
--- a/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
+++ b/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,11 +14,14 @@ SLOT="0"
 
 SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/fstrcmp-0.7.D001"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
+	sys-apps/groff
 	doc? ( app-text/ghostscript-gpl )
+	test? ( app-text/ghostscript-gpl )
 "
+RESTRICT="!test? ( test )"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 4bb531b28399..6838372ffc6b 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -3,15 +3,9 @@ AUX libgcrypt-1.5.4-clang-arm.patch 4189 BLAKE2B 39fb88e752a544232c4c48aa8b8df44
 AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
-DIST libgcrypt-1.8.1.tar.bz2 2967344 BLAKE2B f259d08427f76238576e3897a821d457b6ff47c99716301b54b20a21ae7574a7ef1f4aa62947c443efb8274d5cb3d64dc1d9c4ea45568f6df6f29c2c1717860b SHA512 27c9d2fd9cba5afca71d421c9299d6942463975fae0bd10d4ff42cda2d7ea213e6b73c071a40fcf23ff52a93394cc7505ab332f8a4a3321826460e471eda5b4e
-DIST libgcrypt-1.8.2.tar.bz2 2966534 BLAKE2B 1a0768dc1c4fc64913256575ec9ebe77fe8c4297c648972c93865271f0a18e60954d2f37c264bad5f1941b5e80753f34349ded9626e5c26ab469cc076da9ac2e SHA512 1e8c414f95bf6b50e778102ca7c1b3b1f30d8320826d9fff747a0a098ef85499cdc3e6de736853b9cd4e5dadda35c7c0a291e13643dcac5eaef44f2ddc7a6c09
 DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0
 DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
 EBUILD libgcrypt-1.5.6-r101.ebuild 1668 BLAKE2B 1b8591c2613fd7d281b69718e296724b297b218357d334d79a70e85a2c088ea1dbdc38b3206290dee728e43393c0f8ed9f53b86a2758c9cd07acf2ad8b7c8424 SHA512 1479228533afab05f4e90413b9c5134452c0a041d27cdb05bf2e5e878f883c9a488140dd84d07e772aa52316ed543e29a76a40e0be202a98022f05b541ecd58a
-EBUILD libgcrypt-1.8.1.ebuild 2087 BLAKE2B 3fef7833b394d4adc5a21b6e725029e222d5b8d824d082e4bc4a1cfbadc3731e8e485c4b00953d9d3e459030d53187ba944b2f1db628d2e68fb1d3b004929c57 SHA512 907ac75b859a782ab48814c12ce47b8d36157f91c10e9824b805efe791fdd28c61b08ce6fe10fe2b7e37ba69867a652bd7695c13e83411afce7354c468806efb
-EBUILD libgcrypt-1.8.2-r1.ebuild 2134 BLAKE2B 337e99d2b43af15fcacf52bfc1dc2f58ffcebdc1d9ddb5441afa887dc14d0ef3c01129862133cd9d1cbc589985822bca6aa48a6527ae624e8d5c51183e1ac066 SHA512 81266f185d38869b311ee901a476e001d4d08ad49dbc789a6c196145b3203439398eb31dac171490340146aab09b69b9b01183a404506f3a42b57745819b604f
-EBUILD libgcrypt-1.8.2-r2.ebuild 2199 BLAKE2B d89c6479ecfe6ba8aefa19e8a3a93acfc1b36f96b3d24442918c9265829623564e11fbb447f953677c68ee88512705bd760e72a66265b2f4f65712372916d7fb SHA512 fd32c5982155cd59683efe845834c861048135330b1a6677c04780be1545183865a2880ef712e2f68a38fe130efe8b6f9f39268b0ffa147edb1ee608750d9f46
-EBUILD libgcrypt-1.8.2.ebuild 2100 BLAKE2B f5b19c9a2df7e882a440b8efcad581bc20df60805ced3ac31e289a36095008d6d89167d89780185a2313516779938d0a151714d06f6d12f93cb5456ea695b6c0 SHA512 c9966023f681b53bf9d2c9b9f0da01f888e14b15c360e4b565e752c0013883b4a91a08dbb06aedd75678930376a8aef240e2cfa193b2b7978d4a15d84acd060d
 EBUILD libgcrypt-1.8.3-r1.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99fce2f075d17f043b97640c73ef147184fa832576a5dd57c40b59d2b7f4c2559f7bbb03576eafd9d64dadb9ce17b68c SHA512 1ac41888cea18aa75e5cd3190c89999ce1ec4dcbf4376890c9a8cdabf414fe8022644976d7c75f6ef26a883f7a0863d5363f9979af45f68e5eb539db890a776a
 EBUILD libgcrypt-1.8.3.ebuild 2186 BLAKE2B d1c56ad5f0182fcac6ab2fa237e5205818a0f61a7edea666b1f0f1fc4fe1f95fc6ad4a410262b293fb6e47f3e570d71f552a717887a9efb921bf902bb4f12061 SHA512 8f902c37512a01fcbc83026281e8ce9f5a8dc18d975c180f4f4206c38538dad8192ff15fc3782bcb6475e37c4bfcb4b3a96ab5321e79268a91a623f890aebbae
 EBUILD libgcrypt-1.8.4.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99fce2f075d17f043b97640c73ef147184fa832576a5dd57c40b59d2b7f4c2559f7bbb03576eafd9d64dadb9ce17b68c SHA512 1ac41888cea18aa75e5cd3190c89999ce1ec4dcbf4376890c9a8cdabf414fe8022644976d7c75f6ef26a883f7a0863d5363f9979af45f68e5eb539db890a776a
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
deleted file mode 100644
index 4e99d101735f..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic ltprune multilib-minimal
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( virtual/texi2dvi )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libgcrypt-config
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	if [[ ${CHOST} == *86*-solaris* ]] ; then
-		# ASM code uses GNU ELF syntax, divide in particular, we need to
-		# allow this via ASFLAGS, since we don't have a flag-o-matic
-		# function for that, we'll have to abuse cflags for this
-		append-cflags -Wa,--divide
-	fi
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--enable-noexecstack
-		--disable-O-flag-munging
-		$(use_enable static-libs static)
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
deleted file mode 100644
index b9fe59106f5d..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic ltprune multilib-minimal
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc o-flag-munging static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( virtual/texi2dvi )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libgcrypt-config
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	if [[ ${CHOST} == *86*-solaris* ]] ; then
-		# ASM code uses GNU ELF syntax, divide in particular, we need to
-		# allow this via ASFLAGS, since we don't have a flag-o-matic
-		# function for that, we'll have to abuse cflags for this
-		append-cflags -Wa,--divide
-	fi
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--enable-noexecstack
-		$(use_enable o-flag-munging O-flag-munging)
-		$(use_enable static-libs static)
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
deleted file mode 100644
index c4007a6d0360..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic ltprune multilib-minimal
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc o-flag-munging static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( virtual/texi2dvi )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libgcrypt-config
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	if [[ ${CHOST} == *86*-solaris* ]] ; then
-		# ASM code uses GNU ELF syntax, divide in particular, we need to
-		# allow this via ASFLAGS, since we don't have a flag-o-matic
-		# function for that, we'll have to abuse cflags for this
-		append-cflags -Wa,--divide
-	fi
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--enable-noexecstack
-		$(use_enable o-flag-munging O-flag-munging)
-		$(use_enable static-libs static)
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
deleted file mode 100644
index f9de0223b8df..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic ltprune multilib-minimal
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( virtual/texi2dvi )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libgcrypt-config
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	if [[ ${CHOST} == *86*-solaris* ]] ; then
-		# ASM code uses GNU ELF syntax, divide in particular, we need to
-		# allow this via ASFLAGS, since we don't have a flag-o-matic
-		# function for that, we'll have to abuse cflags for this
-		append-cflags -Wa,--divide
-	fi
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--enable-noexecstack
-		--disable-O-flag-munging
-		$(use_enable static-libs static)
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 37f6b46cecbc..64c80b578849 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,5 +1,5 @@
 DIST libgee-0.20.1.tar.xz 681464 BLAKE2B 5e7d6d9fb9c2833bd7334f5fb38dd1ff151ee4e5ebc3414d904b9c0dc57d3c3fe56ea2194828f9bc1eec57413058cb6866156a5e3da76381cf71fe98102d9c52 SHA512 b991acfea965e0afa007adac0df1763c3b97b31bf2832c0408128d02f4bb237a03c583b4dd107de1ed877ef042614352c845b6ba5f8b6fb535f43e2400746d7f
 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a
-EBUILD libgee-0.20.1.ebuild 680 BLAKE2B 040bf44158fcf434acb0611eeed2a8eb7a57ae1e303b1cf1be12f656d67b6ccc6c178d2155f64bef21a1e3b12625b907f4b80b9209ed905cc0099240a46bd08d SHA512 087478f03b4f6fe81250f8a66e5742a7dabddbc7ba922475be6f97ace599d1014a02ce0f0853c649786ffe22a7f37e03fbb31c01b1ca1b4820087ae1c74af81a
+EBUILD libgee-0.20.1.ebuild 679 BLAKE2B 56a9571229a501d6116c9c4de19620e8323caf7d5d96402b180ea1b82108fd04445f4e8694fdc9db522c873e956daed754fd974f8f481afcbb363f8e4103dfa2 SHA512 b852c9bb102daeb8bfcafda5c5200861c155ca7635061f5b136cd9a340102cccc8351344f1d7657545a2f0b411fdfe2737cc1f59bb76e6ad0561fab2ce6ef3ec
 EBUILD libgee-0.6.8.ebuild 659 BLAKE2B aae1527a96cc83f1408aac93b27aa67f82fa8f2c772fc026b5f4a14e41434ff9381aaca40f4f8fe7127e56d332048badae59eee7eec69e6cff5c1412ea3f7b51 SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e
 MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
diff --git a/dev-libs/libgee/libgee-0.20.1.ebuild b/dev-libs/libgee/libgee-0.20.1.ebuild
index d5a7aa7ca3a4..132fc9e7b59a 100644
--- a/dev-libs/libgee/libgee-0.20.1.ebuild
+++ b/dev-libs/libgee/libgee-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,6 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	gnome2_src_configure \
-		$(use_enable introspection)
+		$(use_enable introspection) \
 		VALAC="$(type -P false)"
 }
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index e1775962c369..494948356892 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -1,3 +1,3 @@
 DIST libgpiod-1.1.1.tar.xz 302672 BLAKE2B 71c624f923118b7c50970beb737f2c813d1470a34f95798f9ce821211e16f15e2a3fd42d0054e25529ddc9846725c0935d915784f22d2509b844a0bac61b66b6 SHA512 a1d902ce8e1c94d5550ade2fb4889ebe28b86523505b92ab907f58c8e6903eaf07ce16278126989462956b879f591b42ddd50fbc4537c1b5af459f23a4dfc12f
-EBUILD libgpiod-1.1.1.ebuild 746 BLAKE2B c35a375420b540aff415ea750129477918ac8093a26b09842f08865847bd4b6527fa6a47384d548d127052dcb002b3e3a29d06ba08633ea313c52cb02bc477ef SHA512 98207ab4ae374ddaabdca9ee0d7a05b9849053f736f9c6956d3a6c2c4c303dd5f7e95b067756927de011dbd47034828cc82639353af53a56403abf310808a4b4
+EBUILD libgpiod-1.1.1.ebuild 748 BLAKE2B 6c9c3ce00259782d2245159ec01deefd14cbe86e4fb2fdce7a9c56f4e1606226e3919249e6600f271479e4ce58c65c2f9fe6f7d3aa8fae63ebe487ba597cb4af SHA512 643c411539bb4ef1e5072a22425bdc1a7cc79470798d2f6121bf77d53d6b3e624e5fbbfe7cad2d37696c8a1040a0d6b297d3b4e9234855614bc2133537101b15
 MISC metadata.xml 343 BLAKE2B fc70cc41ae2770c509013c4d1a5d8aaa441b6d52d1259b9e2f5cb2e8928e146f5451e399d1345901e88b1b488095990e8c9f9b296b43b38f91b38a22b3507c90 SHA512 051b47fa59f992bf8347e89d17eecf645d4a20457ac1d9db931982c9efa4a61d777df4e215a790d518ac77b2baa7497862fc724fbd581dccfa404bfd232d749b
diff --git a/dev-libs/libgpiod/libgpiod-1.1.1.ebuild b/dev-libs/libgpiod/libgpiod-1.1.1.ebuild
index 7cbe28bf2d35..c08b952a7278 100644
--- a/dev-libs/libgpiod/libgpiod-1.1.1.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.1
 LICENSE="LGPL-2.1"
 # Reflects the ABI of libgpiod.so
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs +tools"
 
 multilib_src_configure() {
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 7003bfae40f8..70f8fe5b0f8d 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,9 +3,11 @@ DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545
 DIST libinput-1.12.1.tar.xz 520072 BLAKE2B 2d2b2d82f27ac01ff25b3bf6fd7b77ca56467ab818cdc5d4a641629fed623ef5042915889f54f71b1881595af1d85770bbf4ecfd798c079878efa0a0546c4a36 SHA512 de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68
 DIST libinput-1.12.2.tar.xz 517712 BLAKE2B 3a8b1e5120334d44dcd14461fef4d20d51ec2f910c95bf10e54201dcd8b6ef2913a284940f05f0088ed810c0841b7e3cbfd1b33d7bcce3a81031330cb42bfe18 SHA512 f7122a1d18dd2d0072a34fd9897ebe25a065100b3754052d7ec133bddb56d5c2a5a94950cfc8366ef5d117180c28b3ff99b1a62f3ab95df5ac22f86721fbdc67
 DIST libinput-1.12.3.tar.xz 519496 BLAKE2B 15cd2aa14b6ad754534bceb6b99e05fc911666493f38e1c92097f5e08a06b751a17a4b0546176d5450ca8fde205bcb0dc5d7eaffe41739ae1bc6527205d8349b SHA512 cdc512cb53442ae85d5a23e10db9dd3548bcca0de24d7fcc48954a60773563d84d9b10278b6a693ade95d0789bb5d42bbb8b7cf1c178fe85401cb09a5402ff02
+DIST libinput-1.12.4.tar.xz 519596 BLAKE2B 87802d2eb841360ada3216a4064cdf750f43f3bf85377f08d35b4e9144319dc0115b03bf9a67f819c708763c677650100ffb783e8432d3c1a42cfb2355e7acaa SHA512 4e43ed5213059a481e5a73549c8325e5729d08512c4f580b924d4338a1b69dabd77fb612bec418f294c1da96c738ce26e45f8de8fbc222ab1af71a1535b3240f
 EBUILD libinput-1.10.7.ebuild 1440 BLAKE2B 203a9e8e20785cb93d221d8614aec3488a316d301672d3bbacbd223cd959c31edae176c17d1d575426cec24bd6e89c82b80244bcb7273a4531743555c4ba3b42 SHA512 c0e320acdb66994bcb5fe11b60ac4dc88955cae25da1dc3de028738bfb86c57eba90d23f258ed076ddba0da2737af9027ccde6a73705e6ff4feb8beffb591f0b
-EBUILD libinput-1.11.3.ebuild 1439 BLAKE2B cc85d565853414eccf8252139a4e2cfeef5c09ecdd783de11093049dc11ce16dd1a631a1ef23016cc15fe3732914362b63c1fc27641859ea33d66802440d2083 SHA512 834a1701ff87843527c772ffb43b194c0fb8d1cde5a6409026cab3a58eedf3cad0d17a749610a2dd48b697a2d22eee8f3abd1a5849bb3c08e0ad5e37618cc81d
+EBUILD libinput-1.11.3.ebuild 1433 BLAKE2B 5293314559fa67cda95f95da20976006df453e9f885a04604d1a36c17f48b0f2320c557b401bdbd3b5f39a85fc942fd62a1176740878d114140db95393c98bc4 SHA512 d83cbb01493572f1af045005aaae934e8dc4d33e5198dbbd1d006fa92d9d2696dc45ed9ffce4a3cbb34de1c3a3bcff524d6774edce06d58062cee20ddd8c6be6
 EBUILD libinput-1.12.1.ebuild 1460 BLAKE2B 066dfe5ee976f24475f2572d040c685b2a429cc27d22d2199bcaaa0e92886a9e76b2dc489457e5657f8b4ac6a0e61af75cd7041af96647bc1dd911d5c84e3585 SHA512 3bd9c1fb51fee929bcf85349996e679b202d2e064bcb88926a4d0cda0453f82c7ec9f8bd0ba0e4870781fc936a36da034b91e23223ad3f9764b4781468bf8b19
 EBUILD libinput-1.12.2.ebuild 1860 BLAKE2B 10a278346e6f1acf237b68be86537244b72621a32e3a806e1c8141638d9e4e7049377fbb7d04801a1793c0d5c5c254521564a7e116a9f9891d6caf1d052a83be SHA512 87930976319b00b134ae86bdc48d0ef2885bebf8bdb321f2f07eeeb5894ce41d7057d7c1c5fb0093984ab3b5d68f015724d061fd8b5cbec35eba30e19ebeebe3
-EBUILD libinput-1.12.3.ebuild 1860 BLAKE2B 10a278346e6f1acf237b68be86537244b72621a32e3a806e1c8141638d9e4e7049377fbb7d04801a1793c0d5c5c254521564a7e116a9f9891d6caf1d052a83be SHA512 87930976319b00b134ae86bdc48d0ef2885bebf8bdb321f2f07eeeb5894ce41d7057d7c1c5fb0093984ab3b5d68f015724d061fd8b5cbec35eba30e19ebeebe3
+EBUILD libinput-1.12.3.ebuild 2023 BLAKE2B d76d9b71d668379ade2dd7d251343224a10272c3772f99a614f03e234123e475155cf38222ee9c25daa69a0ea29f58a4978a802415fe22600ff78828fcbdbcd2 SHA512 03f2517d8298708ec6e7f9360f48e6f90559844fdb3c3a4cd0c45c21ff8a369f5a54d157a142c61ff1239f8362a78cc61ed206722b4c7eb8f29914eaf5341f97
+EBUILD libinput-1.12.4.ebuild 2023 BLAKE2B d76d9b71d668379ade2dd7d251343224a10272c3772f99a614f03e234123e475155cf38222ee9c25daa69a0ea29f58a4978a802415fe22600ff78828fcbdbcd2 SHA512 03f2517d8298708ec6e7f9360f48e6f90559844fdb3c3a4cd0c45c21ff8a369f5a54d157a142c61ff1239f8362a78cc61ed206722b4c7eb8f29914eaf5341f97
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.11.3.ebuild b/dev-libs/libinput/libinput-1.11.3.ebuild
index 5b7aa4ac4014..888c136cad46 100644
--- a/dev-libs/libinput/libinput-1.11.3.ebuild
+++ b/dev-libs/libinput/libinput-1.11.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libinput/libinput-1.12.3.ebuild b/dev-libs/libinput/libinput-1.12.3.ebuild
index 20a7cf9b8399..fd569fa961e8 100644
--- a/dev-libs/libinput/libinput-1.12.3.ebuild
+++ b/dev-libs/libinput/libinput-1.12.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 			dev-python/commonmark[${PYTHON_USEDEP}]
 			dev-python/recommonmark[${PYTHON_USEDEP}]
 			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
 		')
 		>=app-doc/doxygen-1.8.3
 		>=media-gfx/graphviz-2.38.0
@@ -45,7 +46,8 @@ DEPEND="${RDEPEND}
 python_check_deps() {
 	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
 	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/dev-libs/libinput/libinput-1.12.4.ebuild b/dev-libs/libinput/libinput-1.12.4.ebuild
new file mode 100644
index 000000000000..fd569fa961e8
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.12.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc input_devices_wacom"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT%/}"
+}
diff --git a/dev-libs/liblinebreak/Manifest b/dev-libs/liblinebreak/Manifest
deleted file mode 100644
index 5669eeec2691..000000000000
--- a/dev-libs/liblinebreak/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST liblinebreak-2.1.tar.gz 390922 BLAKE2B a121375a29a060bbd28db317bac86a7b65257ee972406abbc75ee58239212723d8bc0fad4f20cd52870e17f89c42a95f2f1bfc3e5ae7a7bc95d3fb6fa22024cb SHA512 063cef3bf2d5266387c00a5f5adce883b6ae9c33e153f5cda5475652a45fe5e3a0b609a56ec1093cfe988869cf3164285756e3b7a7428a02ee7184f683c7eb3a
-EBUILD liblinebreak-2.1.ebuild 468 BLAKE2B 70573292fc11d424b6940f819d245bfb42de46dc0c479330dd4def2d598f737c59a88805b9f1092da2fb253dcff7d4143643962a0c21f36645b43e88607b2cc0 SHA512 3ba3d310116da4492b58618f31beb8fb0f007fc0f1cd28778ce1754aa14f97d2fa1d19b8cedb1696a68404a18440b9695fd7b1f88ce3fd275f02233e750df160
-MISC metadata.xml 532 BLAKE2B e572a11fc01a782062dbc30d37aaee8d77d549228a022ff0404f1e8193288cf2b8a512364e174d039cc13f52bd7da0c06e3a003ecad2ff6376e2c2b76fffe4ff SHA512 2cb16fdef82adc23e5acf339cba68301dcaca275f8e79e0d33f6cb16ed1f823de76f76ede7986849de4c98d29f8ffce27db6837d7f85a2b8e1e5340fc081e650
diff --git a/dev-libs/liblinebreak/liblinebreak-2.1.ebuild b/dev-libs/liblinebreak/liblinebreak-2.1.ebuild
deleted file mode 100644
index ecdf854b2ec3..000000000000
--- a/dev-libs/liblinebreak/liblinebreak-2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Line breaking library"
-HOMEPAGE="http://vimgadgets.sourceforge.net/liblinebreak/"
-SRC_URI="mirror://sourceforge/vimgadgets/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="static-libs"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/liblinebreak/metadata.xml b/dev-libs/liblinebreak/metadata.xml
deleted file mode 100644
index 807d441a36f6..000000000000
--- a/dev-libs/liblinebreak/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Liblinebreak is an implementation of the line breaking algorithm as described
-		in Unicode 5.1.0 Standard Annex 14, Revision 22. It breaks lines that contain
-		Unicode characters. It is designed to be used in a generic text renderer.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">vimgadgets</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index ee2a91c9a07b..05d190748eb1 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,5 +1,5 @@
 DIST liblognorm-2.0.5.tar.gz 667709 BLAKE2B 9f2a774c2378caa460a1f11e21570e719f83e782c5731a35921099b1b31397495ea2a4baebd489d186526eb2d011f2ab30d971713a8083c1ae02168d3f632ce8 SHA512 2b36fabfa8b751127d47f307833414d339ae43bad5b687ce6ac42a961021f9a515703ca0c4808e098ef49be3a943abdbf307f90995a2331c6e266167ef041d00
 DIST liblognorm-2.0.6.tar.gz 666712 BLAKE2B 4c3e46fbd9a3eaf6c429872d30c0fe93f1255dbf3cc14efc82ab94d70ef45c5560c50644e0e23dc63777ddbc405d0f3fb911975d06fd6f6cdee6f7b98ff10b74 SHA512 0b4ee55eb54920dd096fdd6d6dcc2263bc52e74442d86503bfebf26b31492a8c1b67cb3b709ecc8b96cc53252151515719027306b2b6f7ba3404adc5a48cf125
 EBUILD liblognorm-2.0.5.ebuild 1494 BLAKE2B e650f9f6e067624d25834012df2b15c53290d36f49eaba52b020ef37eaf785f1e6c5c1c06dd4b4508535ef0c678fd6f51b0e0fad2d1a47d956dd742b474501c8 SHA512 7a525f0e554b45fe8087d6e9ef4949bedd50d81daf128aff6b0afbeeb64d9dac8d8cdc9e1c668a44b0ef09381067dce436a470f35dd81ccb4666ea7d5545e7a4
-EBUILD liblognorm-2.0.6.ebuild 1495 BLAKE2B 88f5ac10cee18a519eedd3f53627d6a1996df2ec255cffd40710f3e5a015223fa30d3b39deef7cb913568b5f09260a71e00fca9a9e55fa21d9adf47e991f5f16 SHA512 41944413c63a83d634bd053eb1e0adf91054077e8e4e603a66c0cf124725616050288eb2690ee1c6e7785db21070ad488a9ccdd12cc6df4e0f0efdcbcd9f8838
+EBUILD liblognorm-2.0.6.ebuild 1493 BLAKE2B edeb152fa3ef264d1d94e666ca9b5d01d074e0914accd06903c3cbaac9e22726748bffaa637c63a714bedf7d4037be03cea8bf5e50f56f6d46bfa372f1edb323 SHA512 fddf246c51b3b1aa40fd7e272d61860c6f81d303a60719e0e0e8f1e3fa7080c0f5c433c4ab7d0e76564cbd74b82187e50f97b6db877da73331a7d4c2b1f2593c
 MISC metadata.xml 582 BLAKE2B 59408e460cb8208149a93cbe049867d8cc202272aea9cd113a7f282eeb6f57b967abf7379241c8dd987e58f66f1efb36c29809176db34cdb3b2127a5ebe02f0c SHA512 7df1432cf2ddfe55c6a449d0179b771652a051d75fa34b8d3ea42d201bc64b3b18b2410ace68c263f14eb692661846a25cb0220de43abcaef13401e87f1173e2
diff --git a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
index 8351fc5d119a..7cfe54fb623a 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux"
 fi
 
 LICENSE="LGPL-2.1 Apache-2.0"
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index da123cbe80b4..0be891076e71 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,5 +1,5 @@
 DIST libmaxminddb-1.2.1.tar.gz 614448 BLAKE2B 6ab92e0313cf745d8820db7239c5760b9fe8a813a14008e415068a263954d48c99c3d3d771d746959c85a5ff6cec28a0b287b15ced83697c8594761599b99fa9 SHA512 c77e2714c30dbd9d83a755d7e4d24016534510f4cc7213fe9549d610bf79aaeb28f761a9fb769270d9043b1baab537c5a4b3a9994b525d48f395fe94c104b5b3
 DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
-EBUILD libmaxminddb-1.2.1.ebuild 529 BLAKE2B cbb023ba38c29ce12dca5b5e042644d8f0e018db0c97928053464669d18292c64d887695ae663fa7d9a501b174b3c42eab05eb4af360452771397476a131401c SHA512 ffe85db04d5f371643718764c5866612878999f0eb6aa2f3c2974f9d8419d75e892d09950426d142873876e4ffa0bf2d3c9dded4f4858e2c83768cbcb4bfc4cc
+EBUILD libmaxminddb-1.2.1.ebuild 528 BLAKE2B 27cadd7c4012b049e7c4ffe15561f054f7274fa9ddf6343457c9480af02cb584ddc1245ca00d0eee2ecd8734f9e7725db7015533db70aac4b594d9c893ddd374 SHA512 8e251d236b38e83172dcf04c3d18b0841131ed40282e3426f28a5ea6e3533d9c4a6f74e6e69e3ea4357e844788246b03a3e3ed1a724c1a5466caf899274b8b5b
 EBUILD libmaxminddb-1.3.2.ebuild 540 BLAKE2B 73542768c732d7b68cf3066c27f214d0d7445db964fe8cb5e1f116b9589edf5288c1865f290092e69964989dc33c13a0b4831ba9f224856ee42533e2363836fc SHA512 f5ba49ea4a9d0247f9764c67b91224c5f775f768dc02759c510be68742fcc1ac1324f99b5fddaf7502c788414d8067b69eb86931d157a49b5b817a95fa3da81f
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild
index 5f657caf7b74..ca2f1e5693a8 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libmodbus/Manifest b/dev-libs/libmodbus/Manifest
index e41f1f74457f..d9314e5f1d26 100644
--- a/dev-libs/libmodbus/Manifest
+++ b/dev-libs/libmodbus/Manifest
@@ -3,4 +3,4 @@ DIST libmodbus-3.1.2.tar.gz 428224 BLAKE2B d1e91f2e0f5392e3fdcd6da942cc1e8ef8c30
 DIST libmodbus-3.1.4.tar.gz 471576 BLAKE2B 4fc57abd784e2cfb65d19cd55a31f4b778a209141cc13b9c969dbd6052f187ba0de0031105be748aa2113f345bdb16c2b582b53635b5334f06dfdb34c5992a18 SHA512 63f73894b27704f5e5b3ca0a364cc366c5b5d24903bb24384155890cf06c0f8e5c707a435a38129402ff6628ef3d611dd0db82f840b79cf1d205ebed2ac5681c
 EBUILD libmodbus-3.1.2.ebuild 593 BLAKE2B 93c696139c5e3718a3f47559b3fbcfca9b0df51688fd8e58b6660617cce5d66047c56bc47699c19af2d85e63833bd3cf4e30851447ed5cf809a2d4705fb976a1 SHA512 d773f1c3d2d830b537b8434a9079043b8eaa8383f375d6bfadb2cdf558753846345411122b4a456a9a4eca114aafa58ef72d56bb63a44db7f0db9cd56e8c4955
 EBUILD libmodbus-3.1.4.ebuild 713 BLAKE2B ab6bc6c59e9f18ad2c1d2323162805901fd6cbd92d20b866a8240893b3ab66c469e7f37187cad690fba3351536ada92dcda566d922a26508ae5956285ebcbb22 SHA512 4e6f8918c5afc8f3982390db4b43b39dfa4d958fdb1574417d6bed7e4f76e8da323bf39e96b85076e1b5bcf3c8d31c2bfac2493ce1bd1dd1d7aba7fdd7ae1ab5
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmodbus/metadata.xml b/dev-libs/libmodbus/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/dev-libs/libmodbus/metadata.xml
+++ b/dev-libs/libmodbus/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index f03081bcc92a..66bd9c1ca6cf 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,12 +1,13 @@
 AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd432fd679ab61620aeaf654041cfb6c39a18f3be475bf7e0a93c004d7c953d6f2ed66e4528d3b546e9d22b28e1e666c6d9caeb SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda
 AUX libmspack-0.7.1_alpha-fix-parallel-build.patch 954 BLAKE2B 545d90548a32c296d6bcbcd9e880574ba76bbb2d06a0ed41446b1632e8fdcf32c61dbdb6455cf9d9080d49840a1739983f9746614be0f08532c4db70ab16cf0e SHA512 251d7dd86f44f06bea8b1589b860e126e849743c4433703b4420da85737373af4b52c3f55dd8dab94e3bfb4a5e9626eee341f19f1ad649573727b7613170f2ef
+AUX libmspack-0.9.1_alpha-fix-bigendian.patch 444 BLAKE2B bc62193205d7d96b8e2b535236463d0695dfb1a3cc4b2290d172873c11f9d3184550426e10bd1457282531f27a22585365e5b1537f1b9f85eeed4fd31afa5748 SHA512 c2e138e19c7e8b8f90e1dcc35d32f655ccd7a1930eab7a0b49686e9d2be26cefba48bc895ef1ebcb1959c0422e824779f7e31940bbde0c8bfd8a2828c2ad6c3c
 DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
 DIST libmspack-0.7.1alpha.tar.gz 486840 BLAKE2B f97abba7b261cced6e5c500c50243920c44ae8bc245e54386c4568e17989f2bad2c3316d83ebbd75220b50b09ed4ded156965e9aa430bd207aaa6b7c6218d800 SHA512 e903629a34c29099a261a108e4eb9cda485ab999bbc3383e3cd6a39715077d00b26a1c641b0f3df0eef60d2e15a7ef623379df0cfe25b99d4eda080529ffec7b
 DIST libmspack-0.8alpha.tar.gz 488869 BLAKE2B 346609f86e1668f012794c89704991d9e1c206f73f47febcc6c32b6523819f00bf13aeafb250611b73ab8eb25764a6ada0cecaf138452ece64674784aeaeaedd SHA512 d178afc4d2eded204594c81af1c91be17d3be4f1a09829e08c103023aa7badc6b2595e9ec13cc7f77e3262d2cd874ed40ce6da01695c5c839682562740d2bf0a
-DIST libmspack-0.9alpha.tar.gz 489861 BLAKE2B cebb8a0b985ed5efcd7ce9ef75241cec0529f1e2e5bf6ee1479bd36aa2b75dd5c2eae1e13ed6947cfc929174e4c420aecd2f1ab906017d84b67946cb260bc006 SHA512 19f3a39626f2fb54512acc6b18e8a8ccbff0bbfeacb852807bb307c5a18ccf8e955d6d3b652d68bdcded7b545dc476aa8412150645cce124ac2649a67faf117b
-EBUILD libmspack-0.6_alpha.ebuild 1185 BLAKE2B decc95044aeab67c2031bccf940a2c00f71263b4321d58e58ad8753aae67578b37d75964bad79457943be49e821d99c8d7bef56dcff383f02a23483c633adb97 SHA512 47ea82678d2701d15391697a498c8099b88742c82772bb79270d0c5138ea1061e5112a3609cfa4724517ce13790084e680deb385d48cc065bb9abd508ad6a50f
+DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a
+EBUILD libmspack-0.6_alpha.ebuild 1181 BLAKE2B 6ce72cf323c65a4f42ab61ec19e0924e1423e61f117da0e4aee90bd9acf0d54ec68b96256dab9c4af13941bb0f5ff483b3df86a7605858f987fa609343f2e2d5 SHA512 17a9f9f04c6b4c5dae20b9f4f3011a871493a23141808102bac3a0ac4a912dd16d5a843da9862e2c92b09765f291ce8c42f5b92c926cbbafc7e8cb15364d93ed
 EBUILD libmspack-0.7.1_alpha.ebuild 1350 BLAKE2B 2547d6a0d39530f7e019ea0073cd809c563094fc4ae8198f7b0c27c29d714b34c8f5f2a308d6a8df3a3cd5c847715e97a3d154483a90c3314e32a9761d0a3d4c SHA512 c4bd1afc5c42640541b70140295a860412beabfc7f90407acc2dc7263f711531bd3cd00b4f1280841a2fd556c7e4e32d554519e5a54ea258f5e24b963d08a274
 EBUILD libmspack-0.8_alpha.ebuild 1298 BLAKE2B b62b3be7492625949a8fa1e25c536c27fa4781c07c8eac0cf3e503981d7b66be8d3223be02eccf7b37a9dfa75bd6bff4fb8f9da408098e2596deed6d0a6e0445 SHA512 5a9ba806bd8973788c6839ea19cf7b69fc2cc7fb7b35156b59e58ea78bb8d619a3fdb95363d88ef9f640c0326cc2b35f6cc5f41e66707febaeec74f7c1e0712b
-EBUILD libmspack-0.9_alpha.ebuild 1604 BLAKE2B 819646287446d328beea50adf239a4dae6898f07a8cc4c3d025b78a07023bdcc603536f7d3d5d8e3d2f4091f5d422adb109797a670d35d68f7d512ceefe16d75 SHA512 86aa7a47250f6c89679d8c9a6b28a66fc652c2a2495474d615f1e52d3c9c6decfe9a19e64127feb3a7ed59352ab4b0b008ed9c7c735003274a323586343e4cd9
+EBUILD libmspack-0.9.1_alpha-r1.ebuild 1665 BLAKE2B 5def6830d49146ae9b1c72587f89cd9f29589e3d6fa77d4289eb3289d6ef28efd8b6c6a981105be05e79686c1e8d0408a36eb4aca7fabf14316955f87eb6189c SHA512 2a1769d33c733571141f5f65358ec2757e03a3bd15765132d4823d64c70647c736f783c9d03d11fb8ea41285e20a67e6bfb7e69343e711edb52d521d54b4fbd8
 EBUILD libmspack-9999.ebuild 1606 BLAKE2B 54a39c3d22d8cfd335eab023702e83e0a3f05c1ec9c96890e4c0f622aab2a88bfd9216678127126ab0ee33965fe51a821d4c32636a5050b68830bda83a2ea828 SHA512 71ad3f2118af448b402b2d674015fa2f92ed7005bf11bd8d951416f7d92d6dfdab285f68a29a23f9fa6fa1d75e8d07109f27e7707b91d067b96ee8870a926ec9
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
diff --git a/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch b/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch
new file mode 100644
index 000000000000..c134fa0760d0
--- /dev/null
+++ b/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch
@@ -0,0 +1,17 @@
+https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6
+
+---
+ configure.ac  | 1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/libmspack/configure.ac b/libmspack/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h])
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
++AC_C_BIGENDIAN
+ AC_TYPE_MODE_T
+ AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
index dbb66269d83f..d7c6bfb768c0 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="debug doc static-libs utils"
 
 DEPEND=""
diff --git a/dev-libs/libmspack/libmspack-0.9_alpha.ebuild b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
index 6fcd67a73334..f4d3def76642 100644
--- a/dev-libs/libmspack/libmspack-0.9_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86 ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
@@ -26,6 +26,8 @@ IUSE="debug doc static-libs"
 DEPEND=""
 RDEPEND=""
 
+PATCHES=( "${FILESDIR}"/${P}-fix-bigendian.patch )
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index 14000a173801..14bd23db6627 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,4 +1,4 @@
 AUX libnsfb-0.1.0-autodetect.patch 734 BLAKE2B bba90c622e559b8238672068792a558ac408954b85cc9798b12163564837e4fb44ec80eca33ca856e5344fafeb862a3eff43bddca27a9ae7603478505982a440 SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993
 DIST libnsfb-0.2.0-src.tar.gz 82322 BLAKE2B d805478728015663b4bf9c8de018bda33dcd84a7ace7246c450a7c31cc3358f834ade21ac1df9f0ca0e4dcea1138369cc3cd9ac468ebb484cce139d4bc89441e SHA512 b90eca76c8dcb22e554e13b5bea4268e5c9fc6e4711bafa5acbed92cc83513c3a3965208b3956de250fb3013cc3db6a33922ded471fa7a24bde97f748d2212c5
 EBUILD libnsfb-0.2.0-r1.ebuild 1166 BLAKE2B eb61cf1101c01f6c514df7718820bdbc2f4e8413a0918b5e026d9a9536e0bfea5052703cef01abdc8ad08f9e6ae69f4b7a653febbe446d569155e043fa5debc2 SHA512 6f343e2aefc87d14f2ec90b0a6a73c3f3238f4babc79671904b107c07c11cb37e8e36cd61da1828a8a225c4e577949a6a64ae86ab010f79100adb0b5030362f5
-MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
+MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libnsfb/metadata.xml b/dev-libs/libnsfb/metadata.xml
index 68674fe1b802..88de5fc462b1 100644
--- a/dev-libs/libnsfb/metadata.xml
+++ b/dev-libs/libnsfb/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
diff --git a/dev-libs/libnsutils/Manifest b/dev-libs/libnsutils/Manifest
index e808bb469036..a2a67b6d1c05 100644
--- a/dev-libs/libnsutils/Manifest
+++ b/dev-libs/libnsutils/Manifest
@@ -1,3 +1,3 @@
 DIST libnsutils-0.0.5-src.tar.gz 7653 BLAKE2B 4f7810f436f5ffd33084bc67095f3cb48a7744ef6f9ab0d632cd7b87467ff8bca54809de5a8ea837a00429c951d4e701909bd5f185e1c600a7323393017596cb SHA512 b9611db39adf11aa4e29387614bf55e241c075a223c687f5520e5b6808cc392c847be1a1d74559928e385a93886c4a67158504342384a1b200cf9ce13c00db50
 EBUILD libnsutils-0.0.5-r1.ebuild 650 BLAKE2B 4ef8570d9b12b473d9dfb0128763ec91f44f866599838ff710c23c4f085f3ede6de55d5e2a85fe70ad0e2961ac88fa97504498dd60a8a2c1e6ef2fb293b80643 SHA512 47418aefc8f01a7243e27126cb43bb8ffb48a8ab271f462f9c5ce543b561b09f2f06f7a7021d611f35669bd83dfed45fce21b7bbef74f3eb13550c46f0b0ed0e
-MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
+MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libnsutils/metadata.xml b/dev-libs/libnsutils/metadata.xml
index 68674fe1b802..88de5fc462b1 100644
--- a/dev-libs/libnsutils/metadata.xml
+++ b/dev-libs/libnsutils/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 436ef97951db..9d32dc7d6b71 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,3 +1,5 @@
 DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8b499b226fb02d4f38833747e5e709054473267a1e139e1bef29222220e7f60cf2f472ac58ca67b52dca2c5661 SHA512 b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5
-EBUILD libowfat-0.31-r1.ebuild 985 BLAKE2B 3e4c3b77cc9ffb62e67412ca0dcc6464172c48dbd98244b473e5230e061abeecd9378a0be856eed0da91d4c3e19541714d7be851cd77a1f0d81de21634b1a6a0 SHA512 07d14b09e2339548f9434cf2a200437f93fe596c3535e83d68dfb4665cb9f17b8de864982da32c229b5013c5faee777abeaac5536a7bf2ef10b2d1c42cfa4d16
+DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
+EBUILD libowfat-0.31-r1.ebuild 994 BLAKE2B e93ab5d7746de5c071b55a8dee7d2415f64f623aa98c543cdebc0a6007dff1b6eb362197f5143e7ec2f0ff97ff07e46d6298afe255af0a9ad2d2e5db1d626ab0 SHA512 070b2af23d5f88a2295c34674f86af39c68ca88480ca5882f79bc4c9a4b75f3a6f7a99ddc4deb85e4d3d20f8ae7dd04c336aced617eee63417f128378b1d05fc
+EBUILD libowfat-0.32-r1.ebuild 1052 BLAKE2B 7cb4aeaa6ac53a4aef91964d519a64d3196588806b8675f16cfa9835cac7aeb4043e5f40a769873686ce6ac7f832060f6a9202c80e9b6e8d31c324c022a33c02 SHA512 40a3cb4cf15343121e9e040a33bcc26b9d66a9bcddb7c83b29098e97aa26327dc736aa6c1d786b69b84c0e4e19be7ba37546e16024a676d5d1b567844e857d20
 MISC metadata.xml 430 BLAKE2B 16b95e09cd79b1b22a0b391fbd70b3ef51b08dd5d92449613f21e8e1ac85f16fdb5e0bde3a298aa7b2c740439c909836a3a71dc55022a1322746f2078522ed78 SHA512 83ef95906f9aa9e0a88eb9241dd1245cd6628a24acc06fc99d97028ef9d82e4369fbed5643d88d51ae514dedf70dde032443a1523d335ea0fb1f96cdd9149a79
diff --git a/dev-libs/libowfat/libowfat-0.31-r1.ebuild b/dev-libs/libowfat/libowfat-0.31-r1.ebuild
index f0993d6aaeac..9bd8cf6f80af 100644
--- a/dev-libs/libowfat/libowfat-0.31-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.fefe.de/libowfat/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 hppa sparc x86"
 IUSE="diet"
 
 RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
diff --git a/dev-libs/libowfat/libowfat-0.32-r1.ebuild b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
new file mode 100644
index 000000000000..116551cefe17
--- /dev/null
+++ b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
+SRC_URI="https://www.fefe.de/${PN}/${P}.tar.xz"
+HOMEPAGE="https://www.fefe.de/libowfat/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="diet"
+
+RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+pkg_setup() {
+	# Required for mult/umult64.c to be usable
+	append-flags -fomit-frame-pointer
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="-I. ${CFLAGS}" \
+		DIET="${EPREFIX%/}/usr/bin/diet -Os" \
+		prefix="${EPREFIX%/}/usr" \
+		INCLUDEDIR="${EPREFIX%/}/usr/include" \
+		$( use diet || echo 'DIET=' )
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D%/}" \
+		LIBDIR="${EPREFIX%/}/usr/$(get_libdir)" \
+		MAN3DIR="${EPREFIX%/}/usr/share/man/man3" \
+		INCLUDEDIR="${EPREFIX%/}/usr/include" \
+		install
+
+	mv "${ED%/}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
+}
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 9ad079d3e615..e84cbb6a4a97 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -3,4 +3,4 @@ DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
 EBUILD libparserutils-0.2.3.ebuild 570 BLAKE2B 831f0a7473a068b051550eb316c096dcd4b7e5007210eb86d23136967cf7be7769964ceedf1caa77065c1e9e0b3f9f8af2d03cc3274c12e0e29e2d0085d2c1e1 SHA512 cd4cf38173e2231dd443c3c534cf1470566e6ffb8645341d9679fed0d469125141a52a6bc4078035b6f81c6fcc5eaa8521217e6864584a0df1edbe956f0a870b
 EBUILD libparserutils-0.2.4-r1.ebuild 891 BLAKE2B bb8e0a6de6934ea05c806aaa3dd5f93ab54d8eebfecbbc9aee71628177e532cbadeb430f05b64b1f45a6e75a2bcdb4c2659b4fab5c4e878fe43f3ff4b093efa3 SHA512 c41f072d51ec61d63f69f2c9c48dfdf724014e7c17010aeb2d7c4b8cb4ceaa66cd02f8330d338a6149191ebeb2a5a12494bc97b9ff89cca1dc138cb84e0376a9
-MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
+MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libparserutils/metadata.xml b/dev-libs/libparserutils/metadata.xml
index 68674fe1b802..88de5fc462b1 100644
--- a/dev-libs/libparserutils/metadata.xml
+++ b/dev-libs/libparserutils/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index fdbdee33ab40..7c8d29b5ba65 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,6 +1,4 @@
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
-DIST libpeas-1.20.0.tar.xz 557872 BLAKE2B c10cd85ff6f15f2124541aba3b437e3216322647e36f93a2202df14aebda7c35896a5f77a40ddcd5a5f0300df11c274334cc3a8dfba3fe2745e0b364cb7eac4c SHA512 b3ddebf65e1a76493b5cd5150f60c13597c90398eea16c002e51d25449a595f7591bd0ccd1214ca3a8cbce724eb10f38a316e8c95092442034c048bc95cfdbf4
 DIST libpeas-1.22.0.tar.xz 561332 BLAKE2B 219918f8663cd60c9353f477ef905ce0d1e21bf5b7c09661c4cb3c8adbba3af9f5e93b9de8a1b098dab09b1f4071854a871c8ea1db878bda8fe9e51aa45e5f87 SHA512 9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91
-EBUILD libpeas-1.20.0-r1.ebuild 2212 BLAKE2B 94369c4abc1588f29d6a110b9214b25ccc43f4726c91ebb007f1e72b46716bd7dc99ffc18e4c4586e342ff520b124fdaa7909c83c29b294379f8e4a892fadfda SHA512 8be3b2b79b1c7f6adb3ead0aaedbf190723a4526a453553e975f87d9d9cafc66e8e8ba56e4ff4023a3504bd80c3eea03f2a298aaff143cc63bc42dae870d3e90
-EBUILD libpeas-1.22.0.ebuild 2214 BLAKE2B a46dee4e46b038bdb23673db638f532b35d8c1306a3acecfc132d57380894ae249965a624b4c6b3bf0ff9b4806af50e9c5103d3e2ede4926fac2efa193be8e92 SHA512 ccfb81db1a18863d8f639a9b76c48543165f89bb2202d16b0354395d72f7cf188f5102d49bbbbfb7d89a4cf0d3b21ed63656fe92597af38aef05a056ee31ed40
+EBUILD libpeas-1.22.0.ebuild 2212 BLAKE2B 94369c4abc1588f29d6a110b9214b25ccc43f4726c91ebb007f1e72b46716bd7dc99ffc18e4c4586e342ff520b124fdaa7909c83c29b294379f8e4a892fadfda SHA512 8be3b2b79b1c7f6adb3ead0aaedbf190723a4526a453553e975f87d9d9cafc66e8e8ba56e4ff4023a3504bd80c3eea03f2a298aaff143cc63bc42dae870d3e90
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
deleted file mode 100644
index 347976db785f..000000000000
--- a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
-
-inherit autotools eutils gnome2 multilib python-single-r1 virtualx
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="+gtk glade lua luajit +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.39:=
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
-	lua? (
-		>=dev-lua/lgi-0.9.0
-		luajit? ( >=dev-lang/luajit-2:2 )
-		!luajit? ( =dev-lang/lua-5.1*:0 ) )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf needs gobject-introspection-common, gnome-common
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Gentoo uses unversioned lua - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
-	eapply "${FILESDIR}"/${PN}-1.14.0-lua.pc.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
-	# What do we do about gdb, valgrind, gcov, etc?
-	local myconf=(
-		$(use_enable glade glade-catalog)
-		$(use_enable gtk)
-		--disable-static
-
-		# py2 not supported anymore
-		--disable-python2
-		$(use_enable python python3)
-
-		# lua
-		$(use_enable lua lua5.1)
-		$(use_enable $(usex luajit lua luajit) luajit)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_test() {
-	# This looks fixed since 1.18.0:
-	#
-	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
-	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
-	# To reproduce:
-	# >>> from gi.repository import Gtk
-	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
-	# This should return True, it returns False for Xvfb
-	virtx emake check
-}
diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0.ebuild
index 943446685b42..347976db785f 100644
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.22.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="+gtk glade lua luajit +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index 86de8affc99b..60114b946f2f 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,7 +1,9 @@
+DIST libpfm-4.10.1.tar.gz 1005988 BLAKE2B 7bdc64540cdf0404bfab0a631e506f37a79ca090d68c798fe4943f627ebc3e15e01f6c4530d4eec2c82a6f759845af518cbf34b3ad19ecc5fa48a874611aaa16 SHA512 33d99824216b4d83784e0db9f1aae3b39f84c2ba42dee64dde0b3c43cc5ee3a18c206d9044e75bf10867768add7cb9967c6318f7aa196f178f334271fa05e1aa
 DIST libpfm-4.4.0.tar.gz 649910 BLAKE2B f74246d1ee23c7793e89db5d96f7abca581932273e3b0c8669c4e0ae54907e3bf53c3c1a5d09cee93458802263159f0ab808ff62774a422257a7f781c6ce454a SHA512 e7f9b50d0c71c08697283d043231234b39695fda6796ad1e2c48fdd67e2936a3cf5d864b5e1b9c68a34f1d726f2b273eb1267adec3060085f3a51e9886f5704a
 DIST libpfm-4.6.0.tar.gz 767447 BLAKE2B 2374abdbc9d886d4e0101a2dc77e699a47abdbd67c0f490706ae78032b89b5ecf9d577ab8f0ca297841ddb3b39da6994e833fea8659cfd21b5fbcdc53f2f84c3 SHA512 73bd11bd0c11c0ec2fa71935c967f36431a00b548b8b47575e00e8cc3e1f8ef3fc2d449d493f51a198eaba5b1629cdf79330cbe2a8ca8867e15fddbfdbf571dc
 DIST libpfm-4.8.0.tar.gz 828853 BLAKE2B e6caa0ffa4584dab805ef08ce5318bf73fda906afddb30b1490a34ec62e522a6bb713563c5ffecb22596e6c5c1c06c245c5b9bc59fea74face90a9edcbfb4eac SHA512 a06f3713c70fb4fe694154057604ae42627ad764486a3d3e28b0ef2e46fdd0a0431ec1a3c52ebc711ae174a1fbd7b3ddd0c736a568f57d4606ecf8064ff38228
-EBUILD libpfm-4.4.0.ebuild 820 BLAKE2B b1d97a6687053317895ba1d0b12f3211eab121e057052093d9b6265d030e2dead3051388abf845a95d4686346e27b6e9fd9e31f92c454b6182cd2ddf2e9deae5 SHA512 efcfc3bbafe4564440d7150d888a186f4f09de77ff3f76e48a4ef9a9986b8842769a3ee7a923f40c387dd618437af213a45d9f07fb85131559760fb67ba3d93b
-EBUILD libpfm-4.6.0.ebuild 826 BLAKE2B 9d1e0b514517d527d19cc40e0e7c6bb51d2d66edaec14dc95a11438bbca48640247cc215314155ff68ed225abea21107c15292eaafecdacadcac96d0ebcaf37f SHA512 f66f67e9e7fb3a8f43321a68e327a77c0e6c374739c6d479faeb5e1b2b0650ea77de7669edcae307d8392699438e6809fece773807c589a2026c8e83e7f3ab5a
-EBUILD libpfm-4.8.0.ebuild 826 BLAKE2B 6a654c3b18ceecb42370c725053e5bdbd56d861d797f566518ee1b4c3725f316ba089a16b142972b2db7f004626380ac08fd98364fee8265a919dca6ce4ed9b9 SHA512 34180c8b1d68561324fba3ce5106967ead7d9936f9f978be9219d0f0e6f7b3cd59132b9ab6ffe3bf12fd75ef15770edde401fb146fc12f276c730494bc96173b
+EBUILD libpfm-4.10.1.ebuild 909 BLAKE2B bd990fd7d864946fd37075d3e799b043cd07c46f117887f9c095d8331d2497891e3337ea1329d50c2e161e631cb11281f7f5056a296175c003fa215abe440d4a SHA512 f4a028332023231ab8ca19dc3b28a0f601be52f99022d4f5715ca5c9df037fc38c2f821896c58fe5cfb0b67f5e3e20656e080ed7cdb238903ec41d422630800c
+EBUILD libpfm-4.4.0.ebuild 887 BLAKE2B 6e3b57d6d5bb98aee5f3072020306b329e0e2b8979d8b81d889c81ab1823c9388f8f22034ff5c501fb349266ca53b3c708619d58ace567e1b25435a9578dcf11 SHA512 3db81f6920687de1f1fe33c6eaa3c5129b2ce1c6191c68be789035799099124cd34f49010f019f637fd867cf47c759ae75d7c17ed0abfdfc2674f633d2d217d5
+EBUILD libpfm-4.6.0.ebuild 893 BLAKE2B 17221f8f7813320e8a99bdd01b9e2694ff425ef1496c74668fb04fa315236fce95ff1745df357f46b1d9f959097cd808aa47d99b0de000d5d56c363723005aeb SHA512 60e921666e7a19741cb764126f608944ce197c426e401d11d42f60a4f4950b16b6a8b5d0ac27ad3fd91ce7d0650cdb05f9538e10be770610c66639b3ce097bf0
+EBUILD libpfm-4.8.0.ebuild 898 BLAKE2B b79cdfe8c62e3634ac02c0afa16ba44eac579d4bc3203403dde17ae5a2358d3bc5b770a80236cc96b73126c7ce43a34321657e307418d6b3a1d1ab6f21dba9b7 SHA512 840fde6e1bf8617aea290687304538a981f7b2f8d87b5f005913d8408fd051f1367a5b2ffe7943e7439ff906c15ed98a78cd83a0c4b98c2ba95ac8f96af4cc50
 MISC metadata.xml 293 BLAKE2B 20f01d36bbc220393d8a0e310655f60faac94a4080c46c700c60d713befaa80ab12e8b7791c5737b519c5f3e7d5255d69385f4550c9be7e2e24ce2cd033475e1 SHA512 e604cc185018211df6e9072ac3bff2effaab07189f11ebf5292df2f9e5645d9ca7bcadeeaeeaa8c3bcbef333ff6bc5a65f79caa6414e786826ff91409db05782
diff --git a/dev-libs/libpfm/libpfm-4.10.1.ebuild b/dev-libs/libpfm/libpfm-4.10.1.ebuild
new file mode 100644
index 000000000000..171f7b33de9f
--- /dev/null
+++ b/dev-libs/libpfm/libpfm-4.10.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Hardware-based performance monitoring interface for Linux"
+HOMEPAGE="http://perfmon2.sourceforge.net"
+SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \
+		-i lib/Makefile || die
+	sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \
+		-i config.mk || die
+}
+
+src_compile() {
+	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
+	emake CC=$(tc-getCC) DBG=
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr"  install
+	use static-libs || find "${ED}" -name '*.a' -exec rm -f '{}' +
+	dodoc README
+}
diff --git a/dev-libs/libpfm/libpfm-4.4.0.ebuild b/dev-libs/libpfm/libpfm-4.4.0.ebuild
index e23abfa0d621..608bb97fd700 100644
--- a/dev-libs/libpfm/libpfm-4.4.0.ebuild
+++ b/dev-libs/libpfm/libpfm-4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,8 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
+	emake CC=$(tc-getCC) DBG=
 }
 
 src_install() {
diff --git a/dev-libs/libpfm/libpfm-4.6.0.ebuild b/dev-libs/libpfm/libpfm-4.6.0.ebuild
index 08b3bfaa5671..5224fe87b8ed 100644
--- a/dev-libs/libpfm/libpfm-4.6.0.ebuild
+++ b/dev-libs/libpfm/libpfm-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,8 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
+	emake CC=$(tc-getCC) DBG=
 }
 
 src_install() {
diff --git a/dev-libs/libpfm/libpfm-4.8.0.ebuild b/dev-libs/libpfm/libpfm-4.8.0.ebuild
index d51431364840..3609c441e6da 100644
--- a/dev-libs/libpfm/libpfm-4.8.0.ebuild
+++ b/dev-libs/libpfm/libpfm-4.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ppc64 ~x86"
 IUSE="static-libs"
 
 DEPEND=""
@@ -25,7 +25,8 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
+	emake CC=$(tc-getCC) DBG=
 }
 
 src_install() {
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 7356a618e0d4..d2568c7b2121 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,7 +1,5 @@
-DIST librdkafka-0.11.4.tar.gz 1900117 BLAKE2B 3e755c91d6a2e12829ba841749977f8c05c9f243d79db64247547e4a49790e67d07f7d82633f45689dcc5f88caaef200027e6af3866de283c1de6120d7f98467 SHA512 6b34e7c476d328a2f8e8321f6ddcaeaf43730284bb3aaddac81c3cd9a1fa5d7f7ef7481f1093b36d89edde7b766da6cd27a9eb9a635b12b640e8a46a269bafc8
 DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
 DIST librdkafka-0.11.6.tar.gz 1994337 BLAKE2B 7b61e6ba02c5ed58c20e604d6765f6a57ff63ab0c61f2a4c64eff55bfb6c854ef089ac9eea9acc6d44b6abdb6d1425ff23e9d4e6037c733bc5719d6b69c74ae0 SHA512 9657dc53220bbff3eb44941cff2f50ab7f71a82f7486d64ea14f67eabd4abe8c67f225a752cc1f0339439a1cc512e99ade6536d087857979cd198c0102015718
-EBUILD librdkafka-0.11.4.ebuild 1251 BLAKE2B 27576a7d2421373ed2d13d9f0ec566d6575c137372f08000271ad0e7f492c22d19a817d803816b2aacd9ceeda28a5f2c4307f56b7302efa8734a52b3b0b2db37 SHA512 9cdeeee1606f1108e4ad3e203ddcb4f99dace5768e4fa37bfade9b4630e60e7fe6899b17d231c8fdbda9d1ef513a2f5f3868fd7153348f386090db3bc3f94e1c
-EBUILD librdkafka-0.11.5.ebuild 1251 BLAKE2B 7f395b4ae2c92b1ff4a0c110cebb46a30379b0bce1994bcf2e0038fb81c2408f6bd2ac3e902fbcf3018dbd249be3c65f0b334cd4d27d93963a03554292cb1875 SHA512 83a55f1104a0f7061e377358b040f86ce932f469de90ab4296ecf5229e8b9883d236ce785695277ad4dae84aa7dc0a731e48110502d8aafc461566c003925fee
-EBUILD librdkafka-0.11.6.ebuild 1253 BLAKE2B cb931d8cf04fee7b97182eb268c1a76bfb3d302d19ed58e1bcc11f3febd584c437d1e2c69ae81891b328b9a1138dbeb0a392784b87e2059ddb97c79b50d8f0a2 SHA512 eda212f59c06a0ac273b9872faabc856421e5524081015df5919ebe77650df798b02e096b4d2663fafcd187bf084b1a02c1c87c44d6dc28abdc88a1922064891
+EBUILD librdkafka-0.11.5.ebuild 1249 BLAKE2B e10b7391be22a1b2fa32af02872ffa2e813ae0a387e7a31005900b63c9d2d3ada9cd47ca2e7a155f6178267b3a2b258f7eb9f8c7a2470be8ad61256d7d207a38 SHA512 41f0086bfe66d0a12f2ab448d842119bb3afe4e3008662b0fb0ca5bc99ef36fe81c4c4d0c8de46ff4eeb6594cd4253ef5f0895beb45235f99b195d3b13476953
+EBUILD librdkafka-0.11.6.ebuild 1251 BLAKE2B 7f395b4ae2c92b1ff4a0c110cebb46a30379b0bce1994bcf2e0038fb81c2408f6bd2ac3e902fbcf3018dbd249be3c65f0b334cd4d27d93963a03554292cb1875 SHA512 83a55f1104a0f7061e377358b040f86ce932f469de90ab4296ecf5229e8b9883d236ce785695277ad4dae84aa7dc0a731e48110502d8aafc461566c003925fee
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-0.11.4.ebuild b/dev-libs/librdkafka/librdkafka-0.11.4.ebuild
deleted file mode 100644
index 4e975e7bdf02..000000000000
--- a/dev-libs/librdkafka/librdkafka-0.11.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Apache Kafka C/C++ client library"
-HOMEPAGE="https://github.com/edenhill/librdkafka"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 hppa ~ppc x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs"
-
-RDEPEND="
-	lz4? ( app-arch/lz4:=[static-libs(-)?] )
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? ( dev-libs/openssl:0= )
-	sys-libs/zlib
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
-
-	local myeconf=(
-		--no-cache
-		--no-download
-		--disable-debug-symbols
-		$(use_enable lz4)
-		$(use_enable sasl)
-		$(usex static-libs '--enable-static' '')
-		$(use_enable ssl)
-	)
-
-	econf ${myeconf[@]}
-}
-
-src_test() {
-	emake -C tests run_local
-}
-
-src_install() {
-	local DOCS=(
-		README.md
-		CONFIGURATION.md
-		INTRODUCTION.md
-	)
-
-	default
-
-	if ! use static-libs; then
-		find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
-	fi
-}
diff --git a/dev-libs/librdkafka/librdkafka-0.11.5.ebuild b/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
index cbd1e8fd3d24..8d19079df92e 100644
--- a/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86"
+	KEYWORDS="amd64 arm ~arm64 hppa ~ppc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librdkafka/librdkafka-0.11.6.ebuild b/dev-libs/librdkafka/librdkafka-0.11.6.ebuild
index b0cc10771fde..cbd1e8fd3d24 100644
--- a/dev-libs/librdkafka/librdkafka-0.11.6.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.11.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 30334dc8a384..9a82d701d931 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,9 +1,6 @@
-AUX librelp-1.2.16-add-new-test-certificate.patch 18257 BLAKE2B 43721265838e3d691215bb638ec75f887a72b4251d8445dd00cb7222f048be818d14ae793b1d8cb4ef7ed9d380f63985c63b967cd1a56bc356390f900f158af1 SHA512 97caf803ca7b75f9a5c08356dbb04d90771c9dcc9015fad20dace04d09a157845dd0704a969fdd966262f1662fd34ea32c74aba2a065a36a900a327b36e00b6e
-AUX librelp-1.2.16-fix-valgrind-usage.patch 988 BLAKE2B 410abca2c3b323a8f896768c3c721e03063506dcee4529553d279aee1f37badfe881b536799ececb82b8390f49d6ba93f3cc3fa25ed8d7ed9c0478080ff050cb SHA512 bb43c8b0b046209bcb649f205537b55cef8393f5a59ecd91520eebc343aac5aa0606194a5fd8f43f1ad007e77c298fc3b02cba3c27ea474f2174dac6a723df2c
-DIST librelp-1.2.16.tar.gz 474456 BLAKE2B b528aaa66e9d52d5304510f86400067e1baea44be487f8cb176aeb146924bc35af24a403e849376e74614fb060093b48a3afe9d6c5da56bbf4dc37a6740478cc SHA512 54c101281c94046e4f8d6f77e73ab52874408e62c77f3dfa29ec0b294f39c216637674cc0bf1b7e04173557b3f21bfa74b7be1aafa3ff2771acd41d1d067d3a3
-DIST librelp-1.2.17.tar.gz 506426 BLAKE2B 998d2845263655a43d0cb002c4538663047f2e07f62d6a870bf93e435c4b2d100a3cc9e4ab711233e9c1f73aedd8771e116b7c7139d2ad6d1baa7c483b2867a1 SHA512 4f69d3e4bc3052c0488a01def49dab16b54fc4a092e06f8776415cb1eca2282702a37497e43baf98fc038853d373116d6b58515c9ad91fae91fb3eb84706890f
+AUX librelp-1.3.0-dummyclient.py-Py3-compatibility.patch 857 BLAKE2B 7729a27955c40dccf7f86c426e8bcb28ff00b65dd35c0be6100c48c42308e6948d3f9cc2d52915d462829abb42a7df60c88d29cca978904c3743f93951a91cc8 SHA512 a7d855f97c271ea324a10f3dae5251d1c74d91c9685e5dbb1b55a4895b260151326dcc42400d63949a3fc4e14e82dbdf43a9b4efefe18afaba4415964c45e72b
 DIST librelp-1.2.18.tar.gz 506766 BLAKE2B 939bd2279e03a6431fbdfb787aa3d62b3f622ec3248dfc7c0a0a141294c27319081092a624c328374cdba0cbd51659301a77ad41bed27ba13f47601f7a607944 SHA512 7193438238b7019e7a4944d6d900a1fa5a369ff8a6b97a6dca7e82b6637c0f391ec3554eeeaa285881457cb2abe72fa1a893244ec9a36cc9d2e2592d58c5462a
-EBUILD librelp-1.2.16.ebuild 1121 BLAKE2B d273b6b565f873de81b7e9f4ef5898b27b9e89a8b6f55f34af56d9a1ec4fd737906124449192ca1a34964f1f83392d8f31260bda8788f408fed0f21698d13a5a SHA512 1c97eca0f18370667f0d9efd30d42e8d1e047cf146c505731a6005da2492a10e1cb9dd5c26e210e76018c0763f6be2ea5996ec8d7b3c0277396b81f44f772df8
-EBUILD librelp-1.2.17.ebuild 1453 BLAKE2B 0340264d4d63c0b46fdc82716e3232355131121204108f247ade16c6ff5bc194ca0b9fa2e5d69b928c8793af537310d19fcc31e8b154226ff7bdde14bbde8f74 SHA512 0aaf5db558d22b5b79b36df0a32cc88c9b649a6d0457002e5553a414b8c058af68efe18570c0822f95708f69acec2fefcb131957e40bb775b55570c376ec29d0
-EBUILD librelp-1.2.18.ebuild 1448 BLAKE2B 0b4ab1fa9a6cbf0c8ce6292ab91532696097188da64f3fdf89817ebd8dc356ec1c2b8215aad30c56ae575fe1d2dbc3d8db388b0724236d494783847611966908 SHA512 0ec2fa4e69440f21b6784e068366c4805f37109226f9a53633b6dee17df5be95c3243690082a17e2f6ee108d2c1163c2f50c7a3b86023da98fade0982ca7b56c
+DIST librelp-1.3.0.tar.gz 514470 BLAKE2B 3e8d844d3cccd4c148036191f376ba49b3851a2c7e95361bb31a1a172ca0813caa96eb3753b2285a2547c85e073de3237a749bc64fc0fead69ab170656dcb200 SHA512 6e60398c68a78f4b4202a697e144f1516ff3bbb32192f745b52c77d107954febf8cb31d2e166efa96c00122f6807860ecd01084f1d3d4005336f2cb75e6461c9
+EBUILD librelp-1.2.18.ebuild 1445 BLAKE2B ac565231d635024c869cf9d2f8ea43b6ffed96a94d0fa1445167c6b8c60facc8987193ccb5a0ac76ae34a019866b84d7bbc4dbf6264f47acb7a3d7d01a35ed4a SHA512 8f6275b915b3c228465d38badb43c2fcbf1928100d7cc3f46e33c0cd17df34d5136315257b28ef8cfff2ee3f1f52168085cce7b9cd4b062d18acf8dbf866ec81
+EBUILD librelp-1.3.0.ebuild 1692 BLAKE2B f187c1cba35e7daf2d998ca034c1ac383151cba65b3e6e2d6e558128ea5ed8d5f7cf9a046bdc0d47c9305a921cc671f47f94c972ded142415461bb0c48cac461 SHA512 e201a383785ee9f8ca66ebee8ece43d64905e7fbccf65363f27cc0e7f0db7488a2d5f8acda02825394f2b5d102ead9013b9903076f6faf89c33642357db968d8
 MISC metadata.xml 503 BLAKE2B 987b40e4f9b5e33e1f293023237b7d0cb614ea36113d6d5becb780fddc729a2a2a033cab8e41b64a0465d0f14e220c96787e30b7b133979e36ad86a1273ad0a8 SHA512 31f5e4ece41aab561a70c7b9af6119bce8c3cb7fb6720be754dd925ee656faa75ee953cd3d296d1b8bb5f48368d015ec5d2768d217b349f1689e767424786e3a
diff --git a/dev-libs/librelp/files/librelp-1.2.16-add-new-test-certificate.patch b/dev-libs/librelp/files/librelp-1.2.16-add-new-test-certificate.patch
deleted file mode 100644
index e08ee1a8049c..000000000000
--- a/dev-libs/librelp/files/librelp-1.2.16-add-new-test-certificate.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-Backport of
-
-commit 8491c8a0bcbb89c03875f128ed29baf9c05c4e79
-Author:     Andre Lorbach <alorbach@adiscon.com>
-AuthorDate: Mon Jun 18 09:42:26 2018 +0200
-Commit:     Andre Lorbach <alorbach@adiscon.com>
-CommitDate: Mon Jun 18 09:54:37 2018 +0200
-
-    testbench: added new ssl test certs (100+ years valid)
-
-diff --git a/tests/tls-basic-vg.sh b/tests/tls-basic-vg.sh
-index 2e005bc..e73a900 100755
---- a/tests/tls-basic-vg.sh
-+++ b/tests/tls-basic-vg.sh
-@@ -12,13 +12,13 @@ fi
- 
- TESTPORT=20514
- echo 'Start Receiver...'
--valgrind ./receive -p $TESTPORT -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog" > librelp.out.log &
-+valgrind ./receive -p $TESTPORT -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog-client" > librelp.out.log &
- PID=$!
- 
- sleep 1
- 
- echo 'Send Message...'
--valgrind ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog"
-+valgrind ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog-client"
- 
- echo 'Stop Receiver...'
- kill $PID
-diff --git a/tests/tls-basic.sh b/tests/tls-basic.sh
-index 8b53b1e..b4128c3 100755
---- a/tests/tls-basic.sh
-+++ b/tests/tls-basic.sh
-@@ -1,9 +1,9 @@
- #!/bin/bash
- . ${srcdir}/test-framework.sh
--startup_receiver -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog"
-+startup_receiver -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog-client"
- 
- echo 'Send Message...'
--./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog"
-+./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog-client"
- 
- stop_receiver
- check_output "testmessage"
-diff --git a/tests/tls-certs/ca.pem b/tests/tls-certs/ca.pem
-index 6324c7d..99925c4 100644
---- a/tests/tls-certs/ca.pem
-+++ b/tests/tls-certs/ca.pem
-@@ -1,15 +1,29 @@
- -----BEGIN CERTIFICATE-----
--MIICYjCCAc2gAwIBAgIBATALBgkqhkiG9w0BAQUwWDELMAkGA1UEBhMCREUxHTAb
--BgNVBAoTFHJzeXNsb2cgdGVzdCByb290IENBMQswCQYDVQQLEwJDQTEdMBsGA1UE
--AxMUcnN5c2xvZy10ZXN0LXJvb3QtY2EwHhcNMDgwNTIwMTI1ODEyWhcNMTgwNTE4
--MTI1ODI0WjBYMQswCQYDVQQGEwJERTEdMBsGA1UEChMUcnN5c2xvZyB0ZXN0IHJv
--b3QgQ0ExCzAJBgNVBAsTAkNBMR0wGwYDVQQDExRyc3lzbG9nLXRlc3Qtcm9vdC1j
--YTCBnDALBgkqhkiG9w0BAQEDgYwAMIGIAoGAw2s+V+WCK7jx9MLpDD4pO8SCqq6Q
--nK/BptvKM+YeBrV9ud3lq6YgbpNmv3/wig43rqpolqk7PdDxTW/mdXPmM72oKr/N
--Fc2cAyOEXK8JTWiqwc//V4qMAnKFfLOxr1dr7WRD0k4Tc8+BWJMQjL2zmGXiSGEF
--YWYIFHLmnX4ZgyMCAwEAAaNDMEEwDwYDVR0TAQH/BAUwAwEB/zAPBgNVHQ8BAf8E
--BQMDBwYAMB0GA1UdDgQWBBQzYQQgUm0YLNdarJnc2c1LxYVClDALBgkqhkiG9w0B
--AQUDgYEAuGWtH7Jkpa0n/izqQ5ddDQP/LT6taivCwlpEYEU9aumpQPWWxtYywKaP
--RfM1JTMLAiYd8MS7TJ8TYRvvR32Y02Y+OhXn11xERkWvBT2M9yzqX6hDfRueN7RT
--fPWsfm/NBTVojzjaECcTFenZid7PC5JiFbcU6PSUMZ49/JPhxAo=
-+MIIE9jCCA16gAwIBAgIIWxfM+RyuD1EwDQYJKoZIhvcNAQELBQAwgYsxEzARBgNV
-+BAMTCnJzeXNsb2cgY2ExEDAOBgNVBAsTB0FkaXNjb24xFTATBgNVBAoTDEFkaXNj
-+b24gR21iSDEYMBYGA1UEBxMPR3Jvc3NyaW5kZXJmZWxkMQswCQYDVQQIEwJCVzEL
-+MAkGA1UEBhMCREUxFzAVBgoJkiaJk/IsZAEZFgdyc3lzbG9nMCAXDTE4MDYwNjEy
-+MDA1OFoYDzIxMTgwNTEzMTIwMTA1WjCBizETMBEGA1UEAxMKcnN5c2xvZyBjYTEQ
-+MA4GA1UECxMHQWRpc2NvbjEVMBMGA1UEChMMQWRpc2NvbiBHbWJIMRgwFgYDVQQH
-+Ew9Hcm9zc3JpbmRlcmZlbGQxCzAJBgNVBAgTAkJXMQswCQYDVQQGEwJERTEXMBUG
-+CgmSJomT8ixkARkWB3JzeXNsb2cwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
-+AoIBgQDHA1CeNI30en7OKGJ/pWyNSH9rnw8z6egDxdTjtOIichA2/LVPaGZYecI0
-+GH/UtkRgM69kFuo6dRaWvr0yp+XPfGlAcFcPg6cYKEoYyb18HsTReyuAcdBcYQYg
-+2ZdmAqtqeHAqcb7wSEB8XuXLdD2Flsco3GaT3zFNv7t7QFDW1b2tT/92w+QGtI1T
-+r5LCMVbISRGSQzhCv29l3UtWt4SKA9W8yhg5zMJkMExaUJVtViRFlAFzKrUVKFqZ
-+8sszy2yXIcTLskJJc5if8o5cpWCrbcXSb5TsHA+4FHOB6ou0z7/s3LwYjof056Zy
-+ixj0LM4sTYIEttDuLERRvYTIhtLhlA2BWfAfuW9bGuog0C9xGpt99vniHJlKmMms
-+qz5hEDLYziUEfj5qzSxKMcA2VCeO1DgajSedh13VN/sWUyk5aKA71i40Cnp4oK/u
-+zeYW7vWl/ttCEFc6x8pzeMdoBjv1Jd9hC0Z2UgttC/KnMTKX3y6NR1PVFjDQ3MIA
-+7Bhxj50CAwEAAaNaMFgwDwYDVR0TAQH/BAUwAwEB/zAVBgNVHREEDjAMggpyc3lz
-+bG9nIGNhMA8GA1UdDwEB/wQFAwMHBAAwHQYDVR0OBBYEFAwRNp2wnAVEZKyXJkDA
-+KFMjnY6aMA0GCSqGSIb3DQEBCwUAA4IBgQCOv2kyg8vZ3jncZuZ4i2k0QbXztZoO
-+jMDNqFX2935lK6WrVZ6u1InZzsaqrXXOJions3EvmmAqrdTBW6dyw6V2/lic1gGz
-+MhlafAPe0DyQCaXp9iFCH91Hzo94YhuPbne1qdga9jrVTiQIHdIKqVtbiUv7i7mN
-+43GssOm4a1guf+Qs5rkuHG4YwiJZhjzhmixfXCerHXykJkpSvBUb6EeKA+p5/w+I
-+Wjm9sAkJgqcvrNvOwwBZInU1I56zmM0ZwWucSydf0hgOImpgO5F6KGVQRoZsO9IA
-+Iju2RQ1y9qVTNp8evVjIMuqXh5ZtU9ti/buZrjr5Zb601jFLZCMrpDVUcVyHUfOB
-+rb3nkUFDcFcrKlfovwp/fvlISKM0bp6pFas5X0FXg3sVVI+iIokmHsmqRUHhjdLX
-+t27+/TYpyEkjF1cH3acd7MOcw33KxE/4+qUHT2QU9COPkGu7oPS24qDYnmGPLkev
-+ZSmpz4jLTmbCBSRcoOB0Q4K36WnegzVtvd8=
- -----END CERTIFICATE-----
-diff --git a/tests/tls-certs/cert.pem b/tests/tls-certs/cert.pem
-index 6b5b13c..58cdec3 100644
---- a/tests/tls-certs/cert.pem
-+++ b/tests/tls-certs/cert.pem
-@@ -1,16 +1,31 @@
- -----BEGIN CERTIFICATE-----
--MIIChjCCAfGgAwIBAgIBADALBgkqhkiG9w0BAQUwWDELMAkGA1UEBhMCREUxHTAb
--BgNVBAoTFHJzeXNsb2cgdGVzdCByb290IENBMQswCQYDVQQLEwJDQTEdMBsGA1UE
--AxMUcnN5c2xvZy10ZXN0LXJvb3QtY2EwHhcNMDgwNTIwMTMwNDE5WhcNMTgwNTE4
--MTMwNDI2WjA6MQswCQYDVQQGEwJERTEQMA4GA1UEChMHcnN5c2xvZzEZMBcGA1UE
--CxMQdGVzdCBjZXJ0aWZpY2F0ZTCBnDALBgkqhkiG9w0BAQEDgYwAMIGIAoGAxmHe
--fztJgaGxFYEceiUg0hdMlRVWBqoZelJ8BeXTDnXcu/5F2HtM+l+QDyDaGjKlx+NI
--K4rkj7d6Wd3AKPgOYS0VSDZe3a1xf9rRYzOthWTv7tYi4/LTqPXqN5lKE71dgrB/
--/gOmvV/1YD776FIxVGCSAT0hHwkFC3slmpJSwD8CAwEAAaOBhDCBgTAMBgNVHRMB
--Af8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATASBgNVHREECzAJ
--ggdyc3lzbG9nMB0GA1UdDgQWBBQYu6eC9UALvC+5K5VOnFRi5OC98TAfBgNVHSME
--GDAWgBQzYQQgUm0YLNdarJnc2c1LxYVClDALBgkqhkiG9w0BAQUDgYEAXaymqsG9
--PNBhhWIRFvXCDMaDM71vUtgSFoNUbxIV607ua2HQosPPM4EHIda6N6hdBK1bMQoG
--yqBwhvw0JVaVaO70Kbs2m2Ypk3YcpJtRqyp8q8+2y/w1Mk1QazFZC29aYgX2iNVf
--X4/x38YEL7Gu5vqPrTn++agnV4ZXECKuvLQ=
-+MIIFVzCCA7+gAwIBAgIIWxfNMhQmuncwDQYJKoZIhvcNAQELBQAwgYsxEzARBgNV
-+BAMTCnJzeXNsb2cgY2ExEDAOBgNVBAsTB0FkaXNjb24xFTATBgNVBAoTDEFkaXNj
-+b24gR21iSDEYMBYGA1UEBxMPR3Jvc3NyaW5kZXJmZWxkMQswCQYDVQQIEwJCVzEL
-+MAkGA1UEBhMCREUxFzAVBgoJkiaJk/IsZAEZFgdyc3lzbG9nMCAXDTE4MDYwNjEy
-+MDE1NVoYDzIxMTgwNTEzMTIwMjAxWjCBmDEXMBUGA1UEAxMOcnN5c2xvZy1jbGll
-+bnQxFTATBgNVBAsTDEFkaXNjb24gR21iSDEVMBMGA1UEChMMQWRpc2NvbiBHbWJI
-+MRgwFgYDVQQHEw9Hcm9zc3JpbmRlcmZlbGQxCzAJBgNVBAgTAkJXMQswCQYDVQQG
-+EwJERTEbMBkGCgmSJomT8ixkARkWC3JzeXNsb2cuY29tMIIBojANBgkqhkiG9w0B
-+AQEFAAOCAY8AMIIBigKCAYEA8nNWVoZwi7fYKSYxm+lidTbMQEHh9pLXV8P1N2FD
-+wqhNc6Z71VqQw6gIDyzxBjZf3ldyPb6xAcxikvk2XCxVGqDaP7E1rfnCDSqxcgLG
-+r1/TlRH3fFMFPqzMgs0GbDoKi7WuhcNMH1yIRk4uPVSUY3IclcE9sNvMpNVY77c9
-+tYeLyoLgG8A2ljlSjbHXDmR8E1C+WcOvjFKQunpv29zIOvfp3Wuw0g3C6E26RyvY
-+OnNNq6bmDHXdyIkxYNPwxyfBDGq/WhnrFqQTyEqulVLVVIpK+3fIdtmH/4OpOwxz
-+KM0q2k9CzL+AI1JqlFoePeIKYQYAOssUBwB0VBDbhyo8f7txBs6OB1phPcmbkAo2
-+bJfL01UT315omqlGWjvvDRjDEeRAfXnWu/UVLIs1MNn09l2+fKwgZyOZIQEk5gGg
-+b+xO7pZp5W1IuLxB1DMatQjYK1L1MG8KUebovTyumAj8kOaCJaqa+EWcPvsH2wJb
-+zp7JZV7xAMnNQGLHHccY9Iv9AgMBAAGjga0wgaowDAYDVR0TAQH/BAIwADAnBgNV
-+HSUEIDAeBggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMRMCAGA1UdEQQZMBeC
-+FXRlc3RiZW5jaC5yc3lzbG9nLmNvbTAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQW
-+BBTFQ9rF9eWMeqNtrDMOGb1fZ54EYTAfBgNVHSMEGDAWgBQMETadsJwFRGSslyZA
-+wChTI52OmjANBgkqhkiG9w0BAQsFAAOCAYEAG9hahjpm74U85pP7/zngEJ5P5nnM
-+3aC8u4lDM7kodtnxJWoisbv/EBr6SihpDtfWA6+bAJGGu+4UBUaMyUg8w/FjylHc
-+INtljbalRuu7YguL2uLdlDNCxQa1XkWugYMObR6r6OvTPUwK0QakTsZuibRbWBDz
-+lWKOoM7ZSxZi9DaeChe3yNSGxJSC9xHZbYYBOP5RjChXTZTKtYZemF2wx6EtWRtc
-+vXK3TbnJtDy7SPm60EoFnLXUyywmo5mCUSlx85HinS1DzYo7I1yksWQgdW4XgWId
-+9RgwPtP0iZSjrZ1TwKqcvo5jvn96LNCoob+JyhpL+9mFvPc6C3vLOxyG7JZOb7Dn
-+IpJf52KeBnLRUoIpp+x1XYptoy1ti7r8YqPYn5EHmPxCDVoujskRSX7ncP3SV1qY
-+eEgr94Tw/l8GyiaGyixVl2pAMbzYJtgrzQ9UvZurhSPjApGlm87X5KHHXN/CJTY5
-+8t59+qvjESRJk74JNpm1L6X/N7HpAsqcsYjP
- -----END CERTIFICATE-----
-diff --git a/tests/tls-certs/key.pem b/tests/tls-certs/key.pem
-index 3ff507f..4d63250 100644
---- a/tests/tls-certs/key.pem
-+++ b/tests/tls-certs/key.pem
-@@ -1,15 +1,190 @@
-+Public Key Info:
-+	Public Key Algorithm: RSA
-+	Key Security Level: High (3072 bits)
-+
-+modulus:
-+	00:f2:73:56:56:86:70:8b:b7:d8:29:26:31:9b:e9:62
-+	75:36:cc:40:41:e1:f6:92:d7:57:c3:f5:37:61:43:c2
-+	a8:4d:73:a6:7b:d5:5a:90:c3:a8:08:0f:2c:f1:06:36
-+	5f:de:57:72:3d:be:b1:01:cc:62:92:f9:36:5c:2c:55
-+	1a:a0:da:3f:b1:35:ad:f9:c2:0d:2a:b1:72:02:c6:af
-+	5f:d3:95:11:f7:7c:53:05:3e:ac:cc:82:cd:06:6c:3a
-+	0a:8b:b5:ae:85:c3:4c:1f:5c:88:46:4e:2e:3d:54:94
-+	63:72:1c:95:c1:3d:b0:db:cc:a4:d5:58:ef:b7:3d:b5
-+	87:8b:ca:82:e0:1b:c0:36:96:39:52:8d:b1:d7:0e:64
-+	7c:13:50:be:59:c3:af:8c:52:90:ba:7a:6f:db:dc:c8
-+	3a:f7:e9:dd:6b:b0:d2:0d:c2:e8:4d:ba:47:2b:d8:3a
-+	73:4d:ab:a6:e6:0c:75:dd:c8:89:31:60:d3:f0:c7:27
-+	c1:0c:6a:bf:5a:19:eb:16:a4:13:c8:4a:ae:95:52:d5
-+	54:8a:4a:fb:77:c8:76:d9:87:ff:83:a9:3b:0c:73:28
-+	cd:2a:da:4f:42:cc:bf:80:23:52:6a:94:5a:1e:3d:e2
-+	0a:61:06:00:3a:cb:14:07:00:74:54:10:db:87:2a:3c
-+	7f:bb:71:06:ce:8e:07:5a:61:3d:c9:9b:90:0a:36:6c
-+	97:cb:d3:55:13:df:5e:68:9a:a9:46:5a:3b:ef:0d:18
-+	c3:11:e4:40:7d:79:d6:bb:f5:15:2c:8b:35:30:d9:f4
-+	f6:5d:be:7c:ac:20:67:23:99:21:01:24:e6:01:a0:6f
-+	ec:4e:ee:96:69:e5:6d:48:b8:bc:41:d4:33:1a:b5:08
-+	d8:2b:52:f5:30:6f:0a:51:e6:e8:bd:3c:ae:98:08:fc
-+	90:e6:82:25:aa:9a:f8:45:9c:3e:fb:07:db:02:5b:ce
-+	9e:c9:65:5e:f1:00:c9:cd:40:62:c7:1d:c7:18:f4:8b
-+	fd:
-+
-+public exponent:
-+	01:00:01:
-+
-+private exponent:
-+	63:aa:b0:3a:5f:87:d2:97:df:df:82:98:f0:2b:ef:d2
-+	99:95:3b:71:19:ef:e0:0b:70:43:d9:01:4c:15:ab:e6
-+	bd:f8:25:df:50:24:ab:d0:12:ba:45:6a:c7:26:33:a2
-+	13:67:c5:49:c6:a3:43:46:fe:da:c6:61:e7:60:3e:17
-+	f5:39:e2:e6:f9:57:2c:8d:ee:15:b7:de:53:6f:d3:d6
-+	43:c7:4b:1c:7e:da:2e:14:c6:ba:47:a6:fa:d5:f0:c2
-+	37:0e:97:d0:db:28:e6:d7:86:19:c8:b7:cf:74:7e:8f
-+	a6:f0:43:4b:ae:0d:8f:3d:c0:21:08:2f:7b:17:7e:11
-+	5b:91:03:5e:17:6a:5b:c6:43:88:41:41:73:53:b2:51
-+	23:2b:95:24:97:82:09:e0:43:28:b5:7e:58:56:99:65
-+	4c:56:b2:34:3b:fb:0d:b7:2b:02:10:ea:83:06:9f:78
-+	98:dc:50:7e:cf:6e:80:9e:98:6f:59:0b:a7:36:67:8b
-+	72:ad:75:96:9c:13:a4:8e:17:07:6d:45:30:b1:55:03
-+	81:65:6b:02:e1:30:fe:9c:6b:63:80:ae:9d:47:b1:33
-+	ea:b6:1c:6d:14:2f:ff:29:71:e2:9c:dd:40:62:34:04
-+	44:3d:8d:71:6b:d1:ea:8d:46:63:37:12:26:8f:94:1c
-+	f5:6a:d1:66:7f:a9:d6:dd:59:27:79:ce:ea:ad:b3:47
-+	62:b9:f6:1c:36:0a:c0:fe:f3:f6:e1:c2:86:12:97:f9
-+	f2:7e:62:b4:33:3e:ad:43:05:95:1d:14:fe:be:76:c6
-+	44:38:80:a4:25:08:5b:5c:76:4e:a9:bd:aa:7f:f1:05
-+	8b:49:81:a0:40:4b:1a:98:d1:c9:cf:98:e1:ba:71:12
-+	fc:1f:53:aa:57:5c:65:3a:e0:72:24:d5:8f:27:21:9c
-+	fc:b6:d6:f7:c8:07:5c:c2:42:5d:cb:ba:bf:0d:f2:13
-+	9b:07:6b:73:ae:1b:f0:b7:1a:6a:fd:20:cf:b2:72:01
-+	
-+
-+prime1:
-+	00:fe:14:cf:31:a0:d8:e0:f5:49:35:22:2c:14:13:aa
-+	55:d6:26:92:c2:fa:63:02:72:dd:d1:05:d1:0f:b0:a4
-+	ae:e4:0e:99:a0:35:e3:84:24:06:aa:27:4d:ce:6f:33
-+	6d:8a:96:3e:54:bd:51:92:e9:3f:9b:f2:6e:9d:7d:1e
-+	2f:e1:11:bc:db:34:c8:2f:ab:07:ee:4a:5d:96:05:54
-+	1c:48:f0:3c:83:99:3a:9f:5d:fe:31:48:0c:b3:0c:ab
-+	e3:5c:2d:e7:06:43:91:5c:62:21:76:0a:4f:00:ec:a3
-+	95:85:b0:fe:3b:61:8b:07:c7:21:bb:b4:ef:0d:d1:67
-+	01:dd:bd:9b:e8:56:eb:ca:22:83:c1:e8:89:3b:fa:17
-+	23:e9:de:fd:62:04:73:1f:2a:89:66:d7:d1:16:99:7f
-+	98:a0:e0:c2:9b:11:22:23:b9:55:cb:a0:4b:eb:81:a4
-+	a8:82:5d:e0:0a:cb:19:fd:18:5d:e2:17:cc:13:2b:19
-+	81:
-+
-+prime2:
-+	00:f4:48:0b:16:38:e8:d9:94:7e:38:29:71:d4:2a:fa
-+	7c:cd:d8:b5:d2:db:d1:a6:3f:1f:3f:39:2f:f2:af:3d
-+	ae:8c:c9:fd:01:32:83:cf:48:f4:f5:25:95:3f:0a:83
-+	90:21:75:60:52:01:9a:5e:95:d2:ed:4c:6e:8c:f9:93
-+	9a:40:24:b5:91:eb:e6:b4:96:6a:6a:51:1b:9b:18:fd
-+	24:c8:c3:68:52:e3:55:f5:23:e0:97:4d:4b:4b:cd:83
-+	04:b9:e1:70:b6:4c:42:a6:a0:0c:2e:0d:f0:a1:c0:04
-+	08:57:0f:da:0e:0e:ee:32:7c:20:e6:03:ee:35:41:22
-+	01:b0:f3:6e:ee:0d:d7:91:1d:ed:98:d4:ef:e6:03:f1
-+	39:96:dd:a0:1f:6c:3a:3d:d9:d2:ac:f0:13:73:31:cf
-+	b1:fb:13:d3:55:55:1b:6c:bd:39:49:e0:7a:b7:ef:ec
-+	3d:5c:dd:7d:bf:a0:11:69:8f:66:fc:45:29:b3:05:18
-+	7d:
-+
-+coefficient:
-+	00:9b:0b:66:d7:fe:dd:69:d2:9a:5b:d5:4e:36:f0:c8
-+	67:4e:68:ff:d5:21:a1:92:50:27:97:47:6e:82:3d:b3
-+	c5:87:d2:c0:15:09:c1:9e:dc:2d:74:5a:cc:2b:ca:82
-+	0a:5d:3b:82:93:31:ce:12:bd:5b:7d:54:87:c0:8a:0e
-+	df:86:d6:6f:62:ca:4a:41:5f:6c:8e:cb:ac:6e:37:c0
-+	b8:26:20:c3:59:37:ce:1f:e7:eb:a5:08:8a:b0:96:f3
-+	e0:3d:fc:66:c4:6b:66:14:91:76:2c:22:e4:6a:56:20
-+	41:51:6a:77:f1:bf:4c:5b:e8:fa:af:41:09:a8:77:5a
-+	6a:66:6d:12:83:54:c1:e8:ff:b7:3a:db:9f:46:e2:ce
-+	d8:60:a8:03:23:78:41:5f:fb:ea:16:62:20:24:8d:8b
-+	49:64:e4:cb:ca:83:e8:c4:60:97:fb:bf:e7:dc:2c:10
-+	ba:03:67:76:ea:4d:00:6c:06:f8:d2:83:fb:26:fe:dc
-+	e1:
-+
-+exp1:
-+	00:db:9c:94:f1:ea:7b:4b:05:f8:3e:ea:c8:7a:99:fc
-+	d2:b0:85:2a:b9:48:be:a7:71:2d:74:eb:b8:25:fd:a2
-+	7a:60:38:96:64:b9:ef:6b:59:d0:40:e6:34:04:48:6d
-+	85:33:12:65:d1:cc:c9:63:58:24:58:e0:94:e7:9f:2b
-+	a6:6a:bd:70:25:70:5b:cf:87:df:15:02:46:1d:d3:81
-+	3d:e9:75:6c:78:ba:ca:c6:d0:f1:53:1b:59:8e:b1:57
-+	28:ef:95:e5:67:ae:a3:47:dc:b1:db:5b:51:aa:14:df
-+	d7:ef:74:6a:6a:5d:07:54:b3:b3:de:90:a7:47:a4:45
-+	8a:81:64:d0:0b:64:85:ed:73:23:bb:49:08:c5:44:87
-+	17:cd:9f:a6:17:40:8d:58:d4:e5:6a:75:04:0e:aa:a2
-+	75:04:29:01:4c:12:e5:15:47:ae:76:90:98:ce:78:82
-+	1f:fc:7e:b3:95:e0:b3:17:e6:25:cf:b4:8d:f9:cb:79
-+	01:
-+
-+exp2:
-+	00:ad:d1:a9:99:e9:6a:be:8f:ab:f4:78:81:17:90:71
-+	66:66:ee:a2:0a:65:01:db:c2:a4:90:4f:37:ef:fe:83
-+	ec:75:1f:b1:18:ae:02:1e:77:f2:5d:91:9d:8e:1b:04
-+	1c:85:c2:48:84:71:c1:8f:36:1a:bd:61:9a:74:53:8e
-+	94:be:b9:a0:3d:31:d7:9a:7e:41:40:5f:70:3e:3f:5c
-+	b9:54:e5:be:90:e4:54:a0:b7:23:b3:65:7b:83:77:bb
-+	97:9c:50:6e:ec:38:7d:60:a5:17:a5:99:a3:b4:e4:b5
-+	b9:dd:81:59:0e:91:cf:2a:3b:2b:09:a0:98:5a:6a:7b
-+	31:2a:e1:3c:f8:c4:fe:b3:b2:d1:02:e3:d9:c4:18:e0
-+	07:b3:73:05:e1:f6:17:c7:34:fc:74:b3:eb:93:17:49
-+	8b:82:75:cb:f5:b7:36:69:7c:87:8c:2a:e0:07:8b:ff
-+	d4:76:04:e0:da:7e:a2:85:33:55:fb:81:97:37:5c:13
-+	dd:
-+
-+
-+Public Key ID: C5:43:DA:C5:F5:E5:8C:7A:A3:6D:AC:33:0E:19:BD:5F:67:9E:04:61
-+Public key's random art:
-++--[ RSA 3072]----+
-+|          ..... .|
-+|         = ..  =.|
-+|        . =  E. +|
-+|         . o...  |
-+|        S . o.o  |
-+|           o *.. |
-+|          o o +.+|
-+|           .o+.+o|
-+|           .oo...|
-++-----------------+
-+
- -----BEGIN RSA PRIVATE KEY-----
--MIICWwIBAAKBgQDGYd5/O0mBobEVgRx6JSDSF0yVFVYGqhl6UnwF5dMOddy7/kXY
--e0z6X5APINoaMqXH40griuSPt3pZ3cAo+A5hLRVINl7drXF/2tFjM62FZO/u1iLj
--8tOo9eo3mUoTvV2CsH/+A6a9X/VgPvvoUjFUYJIBPSEfCQULeyWaklLAPwIDAQAB
--AoGARIwKqmHc+0rYenq7UUVE+vMMBjNyHyllVkvsCMmpzMRS+i5ZCf1I0vZ0O5X5
--ZrX7bH8PL+R1J2eZgjXKMR3NMZBuyKHewItD9t2rIC0eD/ITlwq3VybbaMsw666e
--INxSmax+dS5CEcLevHHP3c+Q7S7QAFiWV43TdFUGXWJktIkCQQDPQ5WAZ+/Tvv0Q
--vtRjXMeTVaw/bSuKNUeDzFkmGyePnFeCReNFtJLE9PFSQWcPuYcbZgU59JTfA5ac
--Un+cHm31AkEA9Qek+q7PcJ+kON9E6SNodCZn6gLyHjnWrq4tf8pZO3NvoX2QiuD4
--rwF7KWjr6q1JzADpLtwXnuYEhyiLFjJA4wJAcElMCEnG2y+ASH8p7z7HfKGQdLg/
--O1wMB3JA5e0WLK5lllUogI4IaZ3N02NNY25+rLBDqpc/w+ZcxQnIypqNtQJATs9p
--ofON5wSB1oUBbhckZo9fxuWxqEUkJsUA/2Q+9R843XE8h166vdc1HOmRT8bywHne
--hmLl+gazmCFTMw1wzwJAHng+3zGUl4D8Ov3MPFD6hwYYK6/pEdtz/NUsCSazF7eK
--XuuP+DXPHNhXOuF1A3tP74pfc/fC1uCUH2G5z3Fy0Q==
-+MIIG5QIBAAKCAYEA8nNWVoZwi7fYKSYxm+lidTbMQEHh9pLXV8P1N2FDwqhNc6Z7
-+1VqQw6gIDyzxBjZf3ldyPb6xAcxikvk2XCxVGqDaP7E1rfnCDSqxcgLGr1/TlRH3
-+fFMFPqzMgs0GbDoKi7WuhcNMH1yIRk4uPVSUY3IclcE9sNvMpNVY77c9tYeLyoLg
-+G8A2ljlSjbHXDmR8E1C+WcOvjFKQunpv29zIOvfp3Wuw0g3C6E26RyvYOnNNq6bm
-+DHXdyIkxYNPwxyfBDGq/WhnrFqQTyEqulVLVVIpK+3fIdtmH/4OpOwxzKM0q2k9C
-+zL+AI1JqlFoePeIKYQYAOssUBwB0VBDbhyo8f7txBs6OB1phPcmbkAo2bJfL01UT
-+315omqlGWjvvDRjDEeRAfXnWu/UVLIs1MNn09l2+fKwgZyOZIQEk5gGgb+xO7pZp
-+5W1IuLxB1DMatQjYK1L1MG8KUebovTyumAj8kOaCJaqa+EWcPvsH2wJbzp7JZV7x
-+AMnNQGLHHccY9Iv9AgMBAAECggGAY6qwOl+H0pff34KY8Cvv0pmVO3EZ7+ALcEPZ
-+AUwVq+a9+CXfUCSr0BK6RWrHJjOiE2fFScajQ0b+2sZh52A+F/U54ub5VyyN7hW3
-+3lNv09ZDx0scftouFMa6R6b61fDCNw6X0Nso5teGGci3z3R+j6bwQ0uuDY89wCEI
-+L3sXfhFbkQNeF2pbxkOIQUFzU7JRIyuVJJeCCeBDKLV+WFaZZUxWsjQ7+w23KwIQ
-+6oMGn3iY3FB+z26AnphvWQunNmeLcq11lpwTpI4XB21FMLFVA4FlawLhMP6ca2OA
-+rp1HsTPqthxtFC//KXHinN1AYjQERD2NcWvR6o1GYzcSJo+UHPVq0WZ/qdbdWSd5
-+zuqts0diufYcNgrA/vP24cKGEpf58n5itDM+rUMFlR0U/r52xkQ4gKQlCFtcdk6p
-+vap/8QWLSYGgQEsamNHJz5jhunES/B9TqldcZTrgciTVjychnPy21vfIB1zCQl3L
-+ur8N8hObB2tzrhvwtxpq/SDPsnIBAoHBAP4UzzGg2OD1STUiLBQTqlXWJpLC+mMC
-+ct3RBdEPsKSu5A6ZoDXjhCQGqidNzm8zbYqWPlS9UZLpP5vybp19Hi/hEbzbNMgv
-+qwfuSl2WBVQcSPA8g5k6n13+MUgMswyr41wt5wZDkVxiIXYKTwDso5WFsP47YYsH
-+xyG7tO8N0WcB3b2b6FbryiKDweiJO/oXI+ne/WIEcx8qiWbX0RaZf5ig4MKbESIj
-+uVXLoEvrgaSogl3gCssZ/Rhd4hfMEysZgQKBwQD0SAsWOOjZlH44KXHUKvp8zdi1
-+0tvRpj8fPzkv8q89rozJ/QEyg89I9PUllT8Kg5AhdWBSAZpeldLtTG6M+ZOaQCS1
-+kevmtJZqalEbmxj9JMjDaFLjVfUj4JdNS0vNgwS54XC2TEKmoAwuDfChwAQIVw/a
-+Dg7uMnwg5gPuNUEiAbDzbu4N15Ed7ZjU7+YD8TmW3aAfbDo92dKs8BNzMc+x+xPT
-+VVUbbL05SeB6t+/sPVzdfb+gEWmPZvxFKbMFGH0CgcEA25yU8ep7SwX4PurIepn8
-+0rCFKrlIvqdxLXTruCX9onpgOJZkue9rWdBA5jQESG2FMxJl0czJY1gkWOCU558r
-+pmq9cCVwW8+H3xUCRh3TgT3pdWx4usrG0PFTG1mOsVco75XlZ66jR9yx21tRqhTf
-+1+90ampdB1Szs96Qp0ekRYqBZNALZIXtcyO7SQjFRIcXzZ+mF0CNWNTlanUEDqqi
-+dQQpAUwS5RVHrnaQmM54gh/8frOV4LMX5iXPtI35y3kBAoHBAK3RqZnpar6Pq/R4
-+gReQcWZm7qIKZQHbwqSQTzfv/oPsdR+xGK4CHnfyXZGdjhsEHIXCSIRxwY82Gr1h
-+mnRTjpS+uaA9MdeafkFAX3A+P1y5VOW+kORUoLcjs2V7g3e7l5xQbuw4fWClF6WZ
-+o7TktbndgVkOkc8qOysJoJhaansxKuE8+MT+s7LRAuPZxBjgB7NzBeH2F8c0/HSz
-+65MXSYuCdcv1tzZpfIeMKuAHi//UdgTg2n6ihTNV+4GXN1wT3QKBwQCbC2bX/t1p
-+0ppb1U428MhnTmj/1SGhklAnl0dugj2zxYfSwBUJwZ7cLXRazCvKggpdO4KTMc4S
-+vVt9VIfAig7fhtZvYspKQV9sjsusbjfAuCYgw1k3zh/n66UIirCW8+A9/GbEa2YU
-+kXYsIuRqViBBUWp38b9MW+j6r0EJqHdaamZtEoNUwej/tzrbn0bizthgqAMjeEFf
-+++oWYiAkjYtJZOTLyoPoxGCX+7/n3CwQugNndupNAGwG+NKD+yb+3OE=
- -----END RSA PRIVATE KEY-----
-diff --git a/tests/tls-wrong-permittedPeer.sh b/tests/tls-wrong-permittedPeer.sh
-index 709e35f..f6287e7 100755
---- a/tests/tls-wrong-permittedPeer.sh
-+++ b/tests/tls-wrong-permittedPeer.sh
-@@ -6,5 +6,5 @@ echo 'Send Message...'
- ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "wrong name" -v 2>&1 | tee librelp.out.log
- 
- stop_receiver
--check_output "librelp: auth error: authdata:'DNSname: rsyslog; ', ecode 10034, emsg 'no permited name found'"
-+check_output "librelp: auth error: authdata:'DNSname: testbench.rsyslog.com; DNSname: rsyslog-client; ', ecode 10034, emsg 'no permited name found'"
- terminate
diff --git a/dev-libs/librelp/files/librelp-1.2.16-fix-valgrind-usage.patch b/dev-libs/librelp/files/librelp-1.2.16-fix-valgrind-usage.patch
deleted file mode 100644
index 15f605dd4825..000000000000
--- a/dev-libs/librelp/files/librelp-1.2.16-fix-valgrind-usage.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream bug: https://github.com/rsyslog/librelp/issues/100
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -176,16 +176,20 @@ fi
- 
- # valgrind
- AC_ARG_ENABLE(valgrind,
--        [AS_HELP_STRING([--enable-valgrind],[Enable valgrind tests@<:@default=yes@:>@])],
-+        [AS_HELP_STRING([--enable-valgrind],[Enable valgrind tests@<:@default=no@:>@])],
-         [case "${enableval}" in
-          yes) enable_valgrind="yes" ;;
-           no) enable_valgrind="no" ;;
-            *) AC_MSG_ERROR(bad value ${enableval} for --enable-valgrind) ;;
-          esac],
--        [enable_valgrind="yes"]
-+        [enable_valgrind="no"]
- )
- if test "$enable_valgrind" = "yes"; then
-         AC_CHECK_PROG(VALGRIND, [valgrind], [valgrind], [no])
-+
-+        if test "x$VALGRIND" = "xno"; then
-+                AC_MSG_ERROR([valgrind is missing but forced with --enable-valgrind. Either install valgrind or remove the option!])
-+        fi
- fi
- AM_CONDITIONAL([HAVE_VALGRIND], test "$enable_valgrind" == "yes")
- 
diff --git a/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch b/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch
new file mode 100644
index 000000000000..99ac9887f739
--- /dev/null
+++ b/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch
@@ -0,0 +1,24 @@
+From 93c7ab4284f0609abab7cf2f9b8bdefe21fe0038 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@whissi.de>
+Date: Tue, 11 Dec 2018 16:50:12 +0100
+Subject: [PATCH] tests: make dummyclient.py compatible with Python2 and
+ Python3
+
+Closes: https://github.com/rsyslog/librelp/issues/163
+---
+ tests/dummyclient.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/dummyclient.py b/tests/dummyclient.py
+index 6f99c79..8b0041e 100755
+--- a/tests/dummyclient.py
++++ b/tests/dummyclient.py
+@@ -4,7 +4,7 @@
+ import os
+ 
+ port = int(os.environ['TESTPORT'])
+-print "dummyclient info: opening and closing port " + str(port) + " without sending data"
++print("dummyclient info: opening and closing port " + str(port) + " without sending data")
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ s.connect(("127.0.0.1", port))
+ s.close()
diff --git a/dev-libs/librelp/librelp-1.2.16.ebuild b/dev-libs/librelp/librelp-1.2.16.ebuild
deleted file mode 100644
index 1e8dff837fec..000000000000
--- a/dev-libs/librelp/librelp-1.2.16.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="http://www.librelp.com/"
-SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.4.0"
-
-KEYWORDS="amd64 arm arm64 hppa sparc x86"
-IUSE="debug doc +ssl static-libs"
-
-RDEPEND="
-	ssl? ( >=net-libs/gnutls-3.3.17.1:0= )
-"
-
-DEPEND="
-	ssl? ( >=net-libs/gnutls-3.3.17.1:0= )
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-valgrind-usage.patch
-	"${FILESDIR}"/${P}-add-new-test-certificate.patch
-)
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable ssl tls)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/librelp/librelp-1.2.18.ebuild b/dev-libs/librelp/librelp-1.2.18.ebuild
index d6002e114922..bd8997fcf000 100644
--- a/dev-libs/librelp/librelp-1.2.18.ebuild
+++ b/dev-libs/librelp/librelp-1.2.18.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.4.0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa sparc x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )
 	gnutls? ( ssl )
diff --git a/dev-libs/librelp/librelp-1.2.17.ebuild b/dev-libs/librelp/librelp-1.3.0.ebuild
index ccdcf011fa23..188faec8adc6 100644
--- a/dev-libs/librelp/librelp-1.2.17.ebuild
+++ b/dev-libs/librelp/librelp-1.3.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
-inherit autotools
+inherit autotools python-any-r1
 
 DESCRIPTION="An easy to use library for the RELP protocol"
 HOMEPAGE="http://www.librelp.com/"
@@ -14,8 +15,8 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.4.0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="debug doc +ssl +gnutls libressl openssl static-libs"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
+IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )
 	gnutls? ( ssl )
 	openssl? ( ssl )
@@ -36,8 +37,17 @@ DEPEND="ssl? (
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)
+	test? ( ${PYTHON_DEPS} )
 	virtual/pkgconfig"
 
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${P}-dummyclient.py-Py3-compatibility.patch )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	sed -i \
 		-e 's/ -g"/"/g' \
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index d17a5d32d318..f3f76b17fa4a 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -6,5 +6,5 @@ AUX libreport-2.0.7-uploader_event-syntax.patch 610 BLAKE2B 5bdd1835310125c3addd
 DIST libreport-2.0.13.tar.gz 1190147 BLAKE2B fe79d924fbf7bd11cc3fd23956a137fb296baf9c40f12f3ecfefe68c82281f62299887511a096196b4fdcdc9245ab268592dace4e728c2c34af47581e52f5132 SHA512 cfe963db8091b245f8ceb7d8501466f4f9464c28d298faeafc9f6e57deafdfdc6501d468bf5ffd83703adb67bc1e05e06c56b5c0e0028bb2e0134788ddbb2181
 DIST libreport-2.9.5.tar.gz 2271742 BLAKE2B e74d694c0012e984aab8044e99fee8e12a197c0a2edb933e78f045260043d40557509056b1093bc13cbe983976d5525cde1f7596a942760df10c857e99d6b56e SHA512 f207710d88f39870d08e3a5fdfa3e1d5a808625bd36b1dcce363cefd39e582bad6be6dc4224db5e1df4404734c3dd69c437c377303fe978ae21b608fceb833ce
 EBUILD libreport-2.0.13-r1.ebuild 2141 BLAKE2B b49f76f03adeaefd952003d1e7bb561b10d7af1b7b399748f0209cd33ea9a40f49e3861e95500a781eaa940735b6d387cb6d168411672d234173e15edd4b8979 SHA512 c0666dd82fcec73ef563886376a6d1449e505239308417e8145e2ce5b394dcc9b4811e9cc3f166a61898b6c7877831b66a1c0d8ef8c76d39e4b5024a54ac4ce7
-EBUILD libreport-2.9.5.ebuild 1942 BLAKE2B 77208961ecd909a18a95cec2ab1ae5468370a93397083b9bb15bde1637b0855eade8a27219f277f0683a7560258a0ad46580925b4b4c2fd7c06ad87e16fb6542 SHA512 fea36a756e7e50ae20aa67f9c8a9a168f3bd15779f663a08b9cd04852fd9fe4ad626117223bfa0156f7aa4961235c27ac5c6ba64f868c80c97afb9fc92841b15
+EBUILD libreport-2.9.5.ebuild 1937 BLAKE2B 421edf2bfde7925bc4ef8bc46df0c70881e2fc4302c3a1af4353424ad2273db74fafffeb5c8022bbfca65b0f6715c0ab477c9ae112296ba52d7144680c0b2f27 SHA512 a54888e680c0ebc85ebc47839da5864c91c7933dc03bed5f349a2c1d88e7fe7a67456e35a0cb66126c9e19968f67ab28f3e5da320eba57b971733f5aec71fa8a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libreport/libreport-2.9.5.ebuild b/dev-libs/libreport/libreport-2.9.5.ebuild
index 9d1da641fb02..7c31200a613e 100644
--- a/dev-libs/libreport/libreport-2.9.5.ebuild
+++ b/dev-libs/libreport/libreport-2.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+gtk python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index e52da73c3b0a..681d39206539 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,16 +1,18 @@
 AUX libressl-2.6.4-hppa-asm.patch 2236 BLAKE2B 508555aa87f763c7cc39cf1cbd2ae5692d7c33315b08e4527db61a878cb5373e6856669e8185b7c49ab82e3f7c01034c1496c639d3a46d605c39170f3f1ce32d SHA512 b49da63109f4b0d471402c07df927b1aba60f94e263376919206fac9a4dddb9a10c4c0004836b2c00a560eb59dcde71bd6b4aba45d966a3e0b2fba79f7277a3e
-DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246
 DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d
-DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
 DIST libressl-2.7.4.tar.gz 3359012 BLAKE2B 07b98fdc6bcdf9d888fb1b1d301c95ab6f998fb7ff2c6dfd2ecf4558768e200dfa96c394e5b321bc27ba390e92646c319ef5be5915872a7c086de8017ff8f855 SHA512 1cd82a1bff4f655251b5feb0c850f4164e0fd548e4b404407370f74dcc75c205f42efc7787a157eecac84cbbe46af48cb63f46b3fef75f4a0a9ea19a5863a691
+DIST libressl-2.7.5.tar.gz 3539591 BLAKE2B 0cda7307f01cea21584b3e814a20053ab128016f0b639856eb04b52f91156c74b8fdba485401e099f472ae7d9a35e9be54d169e3ddf743540595c2ffa0f979ff SHA512 00828dd115f6395186ce4c9cadb604612763f67f2ad2236a331062add8115f6494a655cbec237ae069e373ffb915ed4025c993e06456c3da69b279e5f7e2b8d4
 DIST libressl-2.8.0.tar.gz 3377310 BLAKE2B 2a2027d86e99a09a349f3f123223a8544f49410ae53dbf4b97f898895758d00b1e8f73889f0b0ad8cec6f7ba5e85f033080d0e4af92b0fd10d048136337a0213 SHA512 3004cd78a9d52dece9f24272389778d6afca549de245852004ddd57b01a0c3a6fa1cee2d56980d067d23b3ead7f7a4aa6bcf4e0c57a56f5f7d9fd3f8d23f3ca2
 DIST libressl-2.8.1.tar.gz 3375642 BLAKE2B 39b550e09cfe286e92c6b1168525bac927b37ed7c03db159e456e71abba1d411a78c7a3ad9084b28d41a3f132a959ea82e877ed159daa2c69fa59fef67fec1b8 SHA512 57af2c7a1a8522dca25c4e6371cb44f5ab074be1aded153e6e5fca4fa0844518710f7ce834d4dd309086686c492f10fca83f4d45c084eb49607cb5861f07ac99
 DIST libressl-2.8.2.tar.gz 3373599 BLAKE2B 61b774129ef93081b4a7c94a66fe696520a3f2922d58950e907ad9f047c9fa6495d7753c71d0bb3aec6aa266f16b75fd1d8d485fc3988b97d3d67893dd3db319 SHA512 bfcc55904efbb591c9edd56169d611e735108dfc6a49f771a64ad1ddd028d3a658f5593116c379911edc77f95eba475daec9c0adea0549e8b4b94d1072adf733
-EBUILD libressl-2.6.4.ebuild 1454 BLAKE2B 9c0b73409f09cc0148f30c1b5464892f5ec66b275c571163c79798af7ca20600d4a1803870019cd5f3d80f31edd408c92db70129a74fcbfc104689ac7a749f24 SHA512 ad98eb1ae5dd53874030af1ddf9b813ff42fe07f3158987f314e5faecc1cabd83c5d454b0c4d5eb4fec2645959fe0eb37912046045c21b65080a4d99d1ed4190
+DIST libressl-2.8.3.tar.gz 3366196 BLAKE2B e32c097b31998d68a31266fbbf3624d5ab8ca716f8c53e423bcf09b3a8ab3542c92a99e259ded7b86f99b45cc199cd44791520a609f18c35d150365de5768eec SHA512 3967e08b3dc2277bf77057ea1f11148df7f96a2203cd21cf841902f2a1ec11320384a001d01fa58154d35612f7981bf89d5b1a60a2387713d5657677f76cc682
+DIST libressl-2.9.0.tar.gz 3400383 BLAKE2B 652ac9ff962fd187563f2f6f9ea423d682f743c8443954ad3a8adc810530711482705f0cac1a805e2f85697ed1fed156c80da913dc07c8c13cd6ce78e44b6c4d SHA512 db7fec664bef8d76204ca691c11df236abce3c85b2a51011eec5bd302e273b62fa3cfce0430980915c3f3ce34176d5ef9c187902f0b39d7fc151e69e552b499c
 EBUILD libressl-2.6.5.ebuild 1454 BLAKE2B 9c0b73409f09cc0148f30c1b5464892f5ec66b275c571163c79798af7ca20600d4a1803870019cd5f3d80f31edd408c92db70129a74fcbfc104689ac7a749f24 SHA512 ad98eb1ae5dd53874030af1ddf9b813ff42fe07f3158987f314e5faecc1cabd83c5d454b0c4d5eb4fec2645959fe0eb37912046045c21b65080a4d99d1ed4190
-EBUILD libressl-2.7.3.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 EBUILD libressl-2.7.4.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
+EBUILD libressl-2.7.5.ebuild 1376 BLAKE2B 755a25008f025bfd1878894cd39ba97a7ed9f1da0ef42c615dc3d1052d30a3df38c1f8fd651feb529a580ffe95740385b77a72713c17a12fec50b48798bee697 SHA512 af5cf1ba81fe2824e18e0e3c328ee441c7a12df3078f635192835b1d7b880d13073ad7f72f297fc25a6a68029aa7b02be7ae7aa25e315416edef9375105b8293
 EBUILD libressl-2.8.0.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 EBUILD libressl-2.8.1.ebuild 1379 BLAKE2B a86a70b97ca897d22a9fc2d704ded84ef17e16835a27a80c10eb2e6c430e99583d6661ad726fb0a3331033b1d9ac5e7ba715a897f2d3ab7a94044678623a7056 SHA512 0e22d04b2d5f4bcbc519c07472d3b9d24f1c67323d256afa2e4f9fd43b45a92058cfc0f750a2b1aed4f3f4e388e7a6e0310cd8730ff545104e8081691a4b151d
 EBUILD libressl-2.8.2.ebuild 1376 BLAKE2B b5d260eac077e536dad5d1ff7e00961d1f1c9bfdb86d4b06877dbf6de0d73a7ab580ec71b66a944ac181626416508644e670a9d1f9fa4fa125b768ff60d9b6e0 SHA512 c2ff0a0bbc4b08110ac0bb73bf88c3c38b6b7cb44bd3c81ab76f6816b9d96e595d77ef0207327d743a5cc1d01ad4f96391c4610b5e766695f5b9f663055cd036
+EBUILD libressl-2.8.3.ebuild 1376 BLAKE2B b5d260eac077e536dad5d1ff7e00961d1f1c9bfdb86d4b06877dbf6de0d73a7ab580ec71b66a944ac181626416508644e670a9d1f9fa4fa125b768ff60d9b6e0 SHA512 c2ff0a0bbc4b08110ac0bb73bf88c3c38b6b7cb44bd3c81ab76f6816b9d96e595d77ef0207327d743a5cc1d01ad4f96391c4610b5e766695f5b9f663055cd036
+EBUILD libressl-2.9.0.ebuild 1376 BLAKE2B 087f9f59d459ed0867cb42001fd2b309812f59f666c82eebb3a1c5ce2cdc828a7b5d91e39edbae769594bdf8e01b784b002b5df898f28fef919baffab7a3546e SHA512 c6ff81451f2d48a46ec063cc1775e5a4eabd8ae389e89a4bbf47f3a0cba261f2d9968a248fc47b08e8fdb36e95d3be0a77c90a7f5dc68fe6fb996b2b60d9e967
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.7.3.ebuild b/dev-libs/libressl/libressl-2.7.5.ebuild
index 1c15a09a5faa..ca91bdfc137e 100644
--- a/dev-libs/libressl/libressl-2.7.3.ebuild
+++ b/dev-libs/libressl/libressl-2.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/libressl/libressl-2.6.4.ebuild b/dev-libs/libressl/libressl-2.8.3.ebuild
index 89d0ddacb56c..4ca27fb26c11 100644
--- a/dev-libs/libressl/libressl-2.6.4.ebuild
+++ b/dev-libs/libressl/libressl-2.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/"
@@ -13,8 +13,8 @@ LICENSE="ISC openssl"
 # Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/44"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+SLOT="0/46"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
@@ -22,8 +22,6 @@ RDEPEND="!dev-libs/openssl:0"
 DEPEND="${RDEPEND}"
 PDEPEND="app-misc/ca-certificates"
 
-PATCHES=( "${FILESDIR}/libressl-2.6.4-hppa-asm.patch" )
-
 src_prepare() {
 	touch crypto/Makefile.in
 
@@ -36,8 +34,7 @@ src_prepare() {
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
 		configure || die "fixing CFLAGS failed"
 
-	default
-	eautoreconf
+	eapply_user
 }
 
 multilib_src_configure() {
diff --git a/dev-libs/libressl/libressl-2.9.0.ebuild b/dev-libs/libressl/libressl-2.9.0.ebuild
new file mode 100644
index 000000000000..93eb44feabd4
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/47"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	eapply_user
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 72513c048ccd..3f0e0432a3d5 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,6 +1,8 @@
 AUX libsavitar-3.3.0-remove-packaged-pugixml.patch 3294 BLAKE2B aa31da750cf1adcba252560a9160b96d7289a4d5fbc417396cb3c01e655e48f8014bc99b65554c8b03d28f0d00f99dfaad47a8fa0c2d3364221ae2971a42e4ec SHA512 5f944f2e32ca0b6b9bf161802816a32e9835198923a5ff5dc0f483df3ce41a69d08c1eb49c2e932c4cf5347aafeba0f29c88dfc091c06ca2057f7f92ed55d21c
 DIST libsavitar-3.3.0.tar.gz 92460 BLAKE2B 7b68e42b41092986452684f5778873a2636741fcd5659d2ff543b3a81fbe1e9fc7a216b77506873e08e9a1c76dfa8d365d7524a83b974db864ca60727a6a8d4e SHA512 9b64e18496dac00f521294ae2401002b0cca1249a80426ac0c1a1edb0d41984aba957a0c2e9acbd1ac1678307f2778617dab3c88db5d244bd746314d1a991eba
 DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35
+DIST libsavitar-3.5.1.tar.gz 92456 BLAKE2B 6b7b533af744d3e9c59aae2338cb050cc44240969f07184d311fc1778487e230459cee4684d863a582c52ced34aa5e42bc6b7816ad5d8560f107ae6373f2aebb SHA512 740c3df1a0ae5bc406d1ac555d5952f9d1d49089d8b0eda9c4fafdf3c902f44b7a137906aa5a00ef0ea46d9f76409baf62a26c269d8401abcc642d36a2f7b524
 EBUILD libsavitar-3.3.0-r1.ebuild 1034 BLAKE2B b82848b61888ced896ee8c6a4aa4e121db0aa75303fd1470f52cc8ed9777d8544bd14ad4e2a172734b71550a15241073a7d3bd97934951f95c2c56ed4308dc1f SHA512 f1fec09df09fb5629de89ea3804119286dd1b2c81ee374671aa820cce89f5e74e2ede83ef6cce6d8830b17468949c06131f3b4517024352c50b874c8ff431b97
 EBUILD libsavitar-3.4.1.ebuild 1039 BLAKE2B a6b6119d55bcc19b7cccf71e143cdee21798f0e60c6177c1fb43aec4bc707441746cf4517009e544e0bb9ba2a90177a5a422de3cf6512bded01d4194d83ab1f7 SHA512 fbee3ebe2af9fae1622428b260cbc937482000bf5e4e15430bd3041cf41d84a074422bd59f7fc6bf0254839025493b11aeb8abaaee7fda06eef2a0cb5e098a13
+EBUILD libsavitar-3.5.1.ebuild 1036 BLAKE2B fae964502773685bccc2379288b7767c89f1cb5fdb893b7248050d87b3a324a503d890e80d5b9116484db0b4774e0d7cf5c89574bdc3ce4b1d657733715011ee SHA512 1b06c9d885ab9a29f0b4239b3412b4ba276d948881178ded503d1708aec19383c2846ff95dd860b77c89be64644fea735560a3c8462143695d31fca9877bc615
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/libsavitar-3.5.1.ebuild b/dev-libs/libsavitar/libsavitar-3.5.1.ebuild
new file mode 100644
index 000000000000..939a582d09b2
--- /dev/null
+++ b/dev-libs/libsavitar/libsavitar-3.5.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils python-single-r1
+
+MY_PN="libSavitar"
+
+DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
+HOMEPAGE="https://github.com/Ultimaker/libSavitar"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/pugixml
+	dev-python/sip[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.3.0-remove-packaged-pugixml.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libsolv/Manifest b/dev-libs/libsolv/Manifest
deleted file mode 100644
index cc85e5fa6b5c..000000000000
--- a/dev-libs/libsolv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libsolv-0.6.22.tar.gz 609489 BLAKE2B 985a80a4f45bedac310c76fe3557064b7c42fdcab5fb753109c12503084938f0fe72903fd2faa01fd8978015269522b8512cf4a08d95bec82be61f766264c887 SHA512 9f5a3fd7c8716a7313c8205edd9906973577f63340667674a5cbba29991bb159d9d1e2444bcd09debadbb23dc2a8e8f2b44a1575685dbb1031b5920c5eb6cbc1
-EBUILD libsolv-0.6.22.ebuild 2604 BLAKE2B c473bca2de0741b0eba4b8a5f32532e29130f5d1e2fbd35eba889a4f60b43daccaa65403d001ec87f0c3d058511268f9863de0961e8c994b6ddbc0afb5ef2ca3 SHA512 4786d6b46566451e759ceaca0fb6fbce3b4f95d8aa22a80057775c3f49b82368e967e104315812763e2a39f9d366eeae188918d8693369399a2d43a601aeec9f
-MISC metadata.xml 318 BLAKE2B 12795487a958e334b54fa2d6ac8c2c2b7f87a9647c4479196ea4f09f911145d1ab570c3ec7d2b051f4c3fa28dd1fec4b0fb8a6d954de6c23adb14c817a75a5b8 SHA512 10ac96e2ff96a625c6c37d040fec0f093bffa2e02c014fa1a06253516bfe78c0ffc26065aa697220830cc9aa25874e54eac2b8c7131558f2c59106d1cfbab75e
diff --git a/dev-libs/libsolv/libsolv-0.6.22.ebuild b/dev-libs/libsolv/libsolv-0.6.22.ebuild
deleted file mode 100644
index 4c701eeb131f..000000000000
--- a/dev-libs/libsolv/libsolv-0.6.22.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-USE_RUBY=( ruby23 )
-RUBY_OPTIONAL=yes
-
-inherit cmake-utils python-r1 ruby-ng perl-module multilib
-
-DESCRIPTION="Library for solving packages and reading repositories"
-HOMEPAGE="https://doc.opensuse.org/projects/libzypp/HEAD/ https://github.com/openSUSE/libsolv"
-SRC_URI="https://github.com/openSUSE/libsolv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bzip2 lzma perl python rpm ruby tcl"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/expat
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rpm? ( app-arch/rpm )
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig:0 )
-	python? ( dev-lang/swig:0 )
-	ruby? ( dev-lang/swig:0 )
-	tcl? ( dev-lang/swig:0 )
-	sys-devel/gettext"
-
-# The ruby-ng eclass is stupid and breaks this for no good reason.
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	use perl && perl_set_version
-	use ruby && ruby-ng_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The python bindings are tightly integrated w/cmake.
-	sed -i \
-		-e 's: libsolv: -lsolv:g' \
-		bindings/python/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_VENDORDIRS=1
-		-DLIB="$(get_libdir)"
-		-DENABLE_PYTHON=0
-		$(cmake-utils_use_enable bzip2 BZIP2_COMPRESSION)
-		$(cmake-utils_use_enable lzma LZMA_COMPRESSION)
-		$(cmake-utils_use_enable perl PERL)
-		$(cmake-utils_use_enable rpm RPMDB)
-		$(cmake-utils_use_enable rpm RPMMD)
-		$(cmake-utils_use_enable ruby RUBY)
-		$(cmake-utils_use_enable tcl TCL)
-	)
-
-	cmake-utils_src_configure
-
-	if use python ; then
-		# python_foreach_impl will create a unique BUILD_DIR for
-		# us to run inside of, so no need to manage it ourselves.
-		mycmakeargs+=(
-			# Rework the bindings for a minor configure speedup.
-			-DENABLE_PYTHON=1
-			-DENABLE_{PERL,RUBY,TCL}=0
-		)
-		# Link against the common library so the bindings don't
-		# have to rebuild it.
-		LDFLAGS="-L${BUILD_DIR}/src ${LDFLAGS}" \
-		python_foreach_impl cmake-utils_src_configure
-	fi
-}
-
-pysolv_phase_func() {
-	BUILD_DIR="${BUILD_DIR}/bindings/python" \
-	cmake-utils_${EBUILD_PHASE_FUNC}
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use python && python_foreach_impl pysolv_phase_func
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use python && python_foreach_impl pysolv_phase_func
-	use perl && perl_delete_localpod
-}
diff --git a/dev-libs/libsolv/metadata.xml b/dev-libs/libsolv/metadata.xml
deleted file mode 100644
index 801f1aa5c297..000000000000
--- a/dev-libs/libsolv/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="rpm">Enable support for RPM files</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">openSUSE/libsolv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 86596ab293b8..141a660fdd6d 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,4 +1,4 @@
 AUX libutf8proc-1.3.1_p2-overrun.patch 1358 BLAKE2B 4583a42923db3ad30cd407ee736b6758151e4060a2aed528a54a61ca012d0bf7113ec68994805039a725958ac5bdf15bb9b482d7ff0ab53af2188bea2d4c816e SHA512 e897917e6346f3a0c539d3e2a762a37fc553bda17c64327249835f6f64e981cd9e98c627ffc95e5b36bc54837254cbc43fe9192e7671308f18b7167f0d6cbf6b
 DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
-EBUILD libutf8proc-2.2.0_p1-r1.ebuild 725 BLAKE2B d717b965640c71dc30c7c318ca7bbd0f15dacdc4c5ff8883ae0316fbbb52fd1319632eed75a0edb54bd4e424bb78b3fa3f08807ac6d3d91c43eb82ec746e479e SHA512 121136c2a39c0d4e77804ca9f46d82d6f1ff40df8e2f860cdf3b75a6af9eb99bbf5584744ae56fa70d3de5f4a2de82e24e4fce93842a53d5cd6e454efcf5cd7a
-MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 736 BLAKE2B 11ae81025db163aa941f3ad33b9a146038c28578feafad6cfdd7f73a79ae4a961b2a249e39ca2bb1d67b0095fc7ce9d75f24a26f1783738fd445e9c1993df888 SHA512 16befb3a7872cf97b23dcb5b58cdb9f2d18f40ee4b5f44bdd629340beee25f5f47beaf2af3073546e7435c0d3fea9aa5b080e9060d42a73bf9e7ef68b1c8516b
+MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
index bfc2a2dc1b40..eeecdc8fec71 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="dev-util/netsurf-buildsystem"
 S="${WORKDIR}/${MY_P}"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	source "${EPREFIX}"/usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
@@ -30,5 +30,5 @@ src_compile() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/dev-libs/libutf8proc/metadata.xml b/dev-libs/libutf8proc/metadata.xml
index 68674fe1b802..88de5fc462b1 100644
--- a/dev-libs/libutf8proc/metadata.xml
+++ b/dev-libs/libutf8proc/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 3b10410e5d41..bb0d2f14dd9d 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -6,6 +6,8 @@ DIST libuv-1.22.0.tar.gz 1186080 BLAKE2B 5e909c36e5ff75fb199f52d5910bb092ca4117c
 DIST libuv-1.23.0.tar.gz 1189014 BLAKE2B 1bb2330773b8e7e7ee00e7000ea4076e0d93c3f54f7dc4e8ae0c6c73c652a406c907ee16a2364fc8688c7cc7a367fd3dab7a8b4885caf06a0196cb3d09fe7fb3 SHA512 d1622ea9c03661ce2dfa18e1725fc1bfdf3b16d7e40babc552dcc5b2f86d52f4dd81cac9bf89914024b11e4ed3671264dfcfba867cfa3b1a2206b89c59c95851
 DIST libuv-1.23.1.tar.gz 1190885 BLAKE2B 6a14ad9972f9f7e78627c2f1d0891c058189a26822fb99432f704ef959ad5d98a4f8308255e924ca87d14c6f64e38ed3ecf9d9203f5a51e70f555e12b32c33d7 SHA512 5c3170dea49d7954f5780bc94d5c021a8e1bf91e2d17188335825f1dc1098a8826d5eb9dac4be318ec68275888d0dfa9579a841d43de0c3520c89ab0dc70e5ab
 DIST libuv-1.23.2.tar.gz 1192529 BLAKE2B 045e7d46b9b45fb415be1827692021ae85a86b5a5b2fc5677de5d160e3b39c40a3379223fedd1ae7265707003f62e130b0c101b4fd367b9f44cd0daaa7d35dd5 SHA512 f91accf4ba9987fad23cc546a9821c3d643f8505cae22e0cbe28c4d5d5cb6b370b3483c6d95195cff3bcddd1e94f1bdab740075c3eaf22f8f673f7a57c1fdfc5
+DIST libuv-1.24.0.tar.gz 1201665 BLAKE2B 746d17fbe79f820ba66c4445a1ca7cc88bf5f6bc30a14b4a5101356d9f7305ffe5b6eafc05471886b9196e19e02fa2d74b77bdfbd5c210a2fc34c0408886d7e2 SHA512 b75dac19e99497b059b9b8ce646266c4fa10f1259f5fd74554f7f614f7b70f4b62b9c756316d9a3eed6cf6b9d61f5acde9f6eedb88d30431f6a5c87169487ec6
+DIST libuv-1.24.1.tar.gz 1204222 BLAKE2B 8f70043702712adc336bee67141e7901036246ea67737f89174aabe26823909f07d6ba3394d9625dd63e200ab4265f97790c138f84d5e74d9a7bf82dcf06ef20 SHA512 19cb03a7a62ad2a1f392e1de3e4fdb622e3ac5afe890bfb819c30118f4745f81ecc343d5b633eebb8471fdfb4025652bbface245fd616c55346aae82376f6836
 EBUILD libuv-1.20.0.ebuild 1167 BLAKE2B 822424c522ba27df7624d2b3e1fabb522e15865b8eb8a56127f6565da3d1ae55f519d47ddfe7cb7cecf406626487fba48d77a164a67e9d48be613cc2e36bf93e SHA512 3eb698ab1c3e9d31a90f79293a9484cf7a27e7a7945577bb241b74e6390bc4efee13e43b28de51c38c5fe3b921ca886f0ea8d26c752ea5f0437f5a4d0ab7bfd4
 EBUILD libuv-1.20.3.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.21.0-r1.ebuild 1223 BLAKE2B b722de91966dfb7612e4beec9e266099a83624183ae0d7b647c886e2b03d9b0de6cff5fc0e8c668db39c14adeb0469d38a2708adb7095c59c651bac3995cdda5 SHA512 e9743686b9e24773e37800b8437d58e6d1c3d6ab5fd664586d67b93b98981537ac1b3bdabbfcb13b1bc1b7b7bb0b06f8eab6d9f3b9c075da31c83279c95a86ea
@@ -13,4 +15,6 @@ EBUILD libuv-1.22.0.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928
 EBUILD libuv-1.23.0.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.23.1.ebuild 1184 BLAKE2B 4c01fa9bc2194f3f6053440a06ea037264753618ea5508ccf0b53294679854d6c6243e7ef4ce08e7a57eb67cf42705bb0b60dc55eb1fa1f000e2547b9a92fd22 SHA512 83883df664c3cfc1fddae6a834593efd5dfbe27fb767c7dd566ce95cef395e7989ddbd32ca1102251722ae180f03ba6710a03f03c45770736d36654420a2615f
 EBUILD libuv-1.23.2.ebuild 1225 BLAKE2B 7a7e7f855e8fe0ac81771e5cf64dbf9886e4a6600ec04de48d8c1b746389268d30ed0d5facc0eaaa47186f51760ce17523bb3ef641ee827c4635b57e14daee56 SHA512 c141a1f6216d4ee028937a17de132896eaaf9743eabdebaebbcadf0930bc73be9fdce7bfa33e296bd14852d69f1c2f87941b02d8ac7d4fb554faae24e0795893
-MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
+EBUILD libuv-1.24.0.ebuild 1225 BLAKE2B 7a7e7f855e8fe0ac81771e5cf64dbf9886e4a6600ec04de48d8c1b746389268d30ed0d5facc0eaaa47186f51760ce17523bb3ef641ee827c4635b57e14daee56 SHA512 c141a1f6216d4ee028937a17de132896eaaf9743eabdebaebbcadf0930bc73be9fdce7bfa33e296bd14852d69f1c2f87941b02d8ac7d4fb554faae24e0795893
+EBUILD libuv-1.24.1.ebuild 1225 BLAKE2B 7a7e7f855e8fe0ac81771e5cf64dbf9886e4a6600ec04de48d8c1b746389268d30ed0d5facc0eaaa47186f51760ce17523bb3ef641ee827c4635b57e14daee56 SHA512 c141a1f6216d4ee028937a17de132896eaaf9743eabdebaebbcadf0930bc73be9fdce7bfa33e296bd14852d69f1c2f87941b02d8ac7d4fb554faae24e0795893
+MISC metadata.xml 1337 BLAKE2B d054e429ce7e3a6b94910693123645ab6dbfefcb8921b37b57ae156aeb5a25a4b100b45fe6714c498a355015dc3cc37c98852a14be651bd3f55259b8ab78e2dd SHA512 dba39812f31549539955d26ab8e281b4a1a372b8b41f29e68f0ae63bc10d18df5eef106936b31a13344cc11705192bafd4b32a0aca1f16e7927244ad049278ca
diff --git a/dev-libs/libuv/libuv-1.24.0.ebuild b/dev-libs/libuv/libuv-1.24.0.ebuild
new file mode 100644
index 000000000000..446058848236
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.24.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libuv/libuv-1.24.1.ebuild b/dev-libs/libuv/libuv-1.24.1.ebuild
new file mode 100644
index 000000000000..446058848236
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.24.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libuv/metadata.xml b/dev-libs/libuv/metadata.xml
index f90a6ed59a8e..6842acbec120 100644
--- a/dev-libs/libuv/metadata.xml
+++ b/dev-libs/libuv/metadata.xml
@@ -5,6 +5,9 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+	</maintainer>
 	<longdescription lang="en">
 		libuv is a platform layer for node.js. Its purpose is to abstract
 		IOCP on Windows and epoll/kqueue/event ports/etc. on Unix systems.
diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest
index ef00ddc0b432..70b59bf11c20 100644
--- a/dev-libs/libverto/Manifest
+++ b/dev-libs/libverto/Manifest
@@ -1,6 +1,9 @@
+AUX libverto-Wflags.patch 800 BLAKE2B c933153042d1d66dd41e4cd307a6e1c6ac96c77d147e0574b35e75dfab5e42278e73177648e49524ce22b3da3829b92a69cb79d8349eeb883780da086de41c04 SHA512 c8e05cfdf7537624b844731e3bf595765641745ce18d88ac4e1cceb80f6ae6bb1a97480bdac50f7d222b334e7226a495c5bbe33d6d537dc8d79ca825fd90fb52
+AUX libverto-libev-c89.patch 392 BLAKE2B 265d2d37db847cfbd495d26ea7ce93e7fa244960c99f4758a7b6a6c7d315b84788def5a0254a80f0ece1b2ca08b188da8e215d2bdaa672796aa98740c1051ab1 SHA512 a9e1cf3206f350ecb7acd1b77417d2cea387396ac7dd68e30fd3b0ad097a677bee4d6735e8fb9abe95ed2758206e226bb85e002a5a9974865b87f8b01d59b619
+AUX libverto-load.patch 2058 BLAKE2B b0a5fc276fe34cca97b6622f74ce22b56faf4f0a88cf5fbd0d47360a660e0a29927d17dbfe47afbd0c72404843f3847466f199e0d865de4f3856f3fb133878c8 SHA512 caa4d4d3be591e9e025f7a75e1cb20190469888c35563b332244a7c6a0191147888a19415ca3fe33171336e4b7361c3dc75d62e1c60380892452c13c0e1b8490
+AUX libverto-verify-cflags.patch 736 BLAKE2B 67b4d65955a8bfa51dac8c0bb2a116ee21ab777ab58da2098132118bfad24701b0bc1dd47233ebd247836be9812e9572732fd666a08ea70fd0cd4992845492af SHA512 83cd538542af376f3875e00cd5732d779b4b0aab920d0d63ead89ffe47c513ee4e55651c8c9e18adb95118b67ba964a7e401b3691992a5c012202962fb3b7abe
 DIST libverto-0.2.5.tar.gz 349722 BLAKE2B fd46b1fd1500d4732baa2d461e4b490386ff54efa8a23f06f40048e1624b4698cfedcfda79cc0a21c9a77050baafe8572835f1c0d174873772afe46b199a6294 SHA512 d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e
-DIST libverto-0.2.6.tar.gz 352690 BLAKE2B b1610fd7c64fff31d46640ef10fd895f9ce2f0d1d4fd4ac205f2ec5f519f695c8ec82da8b9539c28c0d087bfd3664101192010ee59a9632f09b3ed92e52c1054 SHA512 aa8d047501d28741f2f8185fc4a0ef6dc4b99dbe69b583c40cd4c0afc97db4dd0a928d9ec23861fff61651e9ac82e52da9473b8e62ccc11a91e5e5c6b41dfd3b
-EBUILD libverto-0.2.5-r1.ebuild 1499 BLAKE2B a97d265fcde7e10561922e65cd82e996a1db10b9610343bf98eca138220770ea3d171a98ea9fa0c198f4748219f96e3faaf73171c8cd73e41178cb234bf48bb1 SHA512 b0857b0ad06148bf06d019cdb333bdb00844fa183dbe80a317b945330ed3fdf77dcc46bbad247a5bf7055e2abb0d7560450b9f707e6ff6d56013242f700df34e
-EBUILD libverto-0.2.5.ebuild 1370 BLAKE2B 90b0ceacf5ad29c383436ef3bf297edf9ea185bf0912727ad9f5509dd40c0f7f8b5e46c36c2d9667924617211f6e0064946283a591b0ce085abad17e6bd8e8ed SHA512 322710aac677120e167565e02ed2b6685cf88338ca9d28767c0181fba68de44f78f20dc15571f62ff98ec81775c210931b3ed543cd427ffaaf3a4aa8576c5fe3
-EBUILD libverto-0.2.6.ebuild 1509 BLAKE2B fc4a2ae5eb631f867e0cad789fe6052abc4096f776a3774eb622dbc43f33a1d3dc944df16113cf50878fb06237e430462518b3ea8420110f061f34e1f0b89af2 SHA512 0e33abd39d5fe51f523b3a2739a2b0be8126eafe3d8aa048a343d10545bc53b53c6adab93f9012616c4199c3f3e2ff7f55b4996716656eb514edd65caf776544
+DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117ade67f2fb8d38c98e05334fd952386f5690bbe49eba60c545c02ef99dcf63dee3fb17910589013b2868ee24139 SHA512 af4fec9cd20058c1db404443004c2b6c98bcacd0742369bb91f46dde6a35358e44f659bdfef30ab113e112ac1afb3156b098f5b5e2f4a58d1f4cd949abf0f57f
+EBUILD libverto-0.2.5-r1.ebuild 1513 BLAKE2B 751d2c63ba2794894bfdeea87513e514d5092c556f61454d65ac65ecaae830470563aa1d67ccb53ddef9efff58bf2677929e4d20c9edbf26a13b51f8929d4d44 SHA512 7bc75b511a82cb5fcd41be4515ababeaaf23b8cce57b924ede667c9291aac100592842c1dee55ec7d6ab7ccca8cd0c9c90c3b5924aa788bae9802650fddd7f2c
+EBUILD libverto-0.3.0.ebuild 1737 BLAKE2B 7630b8cabb87827838e7366e0b3fdc047eebb91a380e17b1ddda7b71fcb280fcc0bd8ad5559ac150a16e73154c270540762179ff6c9b5fd09bc95181d932f9df SHA512 f13a3ea85ee2fa92ac49315c4fcc70c19340706505062b027c06d90f7c32ecd30d53dc2cf6fbee12913d7a55f72238f05807cda68fb17b71444f4c8f071956e7
 MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00
diff --git a/dev-libs/libverto/files/libverto-Wflags.patch b/dev-libs/libverto/files/libverto-Wflags.patch
new file mode 100644
index 000000000000..de403720dd62
--- /dev/null
+++ b/dev-libs/libverto/files/libverto-Wflags.patch
@@ -0,0 +1,25 @@
+From f3935464e3a823539394dcb4669a6e7a889a95ef Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Wed, 31 Jan 2018 18:21:04 +0100
+Subject: [PATCH] Turn off -Wcast-function-type
+
+The glib event library forces all callbacks to the same type, even
+when they have different arities.  Turn off the gcc warning for this
+gross behavior.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4084965..dcab593 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+ 
+ AC_PROG_CC_C99
+ 
+-for flag in -Wall -Wextra; do
++for flag in -Wall -Wextra -Wno-cast-function-type; do
+   OLD_CFLAGS=$CFLAGS
+   CFLAGS="$CFLAGS $flag"
+   AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS])
diff --git a/dev-libs/libverto/files/libverto-libev-c89.patch b/dev-libs/libverto/files/libverto-libev-c89.patch
new file mode 100644
index 000000000000..e63c032b0c89
--- /dev/null
+++ b/dev-libs/libverto/files/libverto-libev-c89.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index 09ee123..b7b5908 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,8 +7,8 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+     [AC_USE_SYSTEM_EXTENSIONS],
+     [AC_GNU_SOURCE])
+ 
+-AC_PROG_CC_C89
+-for flag in -std=c89 -Wall -Wextra; do
++AC_PROG_CC_C99
++for flag in -Wall -Wextra; do
+   AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],)
+ done
+ 
diff --git a/dev-libs/libverto/files/libverto-load.patch b/dev-libs/libverto/files/libverto-load.patch
new file mode 100644
index 000000000000..94dceac5d69c
--- /dev/null
+++ b/dev-libs/libverto/files/libverto-load.patch
@@ -0,0 +1,78 @@
+From 7989b3c6bdfdeb8770d17d8717b4a0cd48e79386 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Wed, 24 Oct 2018 16:57:11 -0400
+Subject: [PATCH] Fix rare leak of DSO in module_load
+
+---
+ src/module.c | 31 +++++++++++++++----------------
+ 1 file changed, 15 insertions(+), 16 deletions(-)
+
+diff --git a/src/module.c b/src/module.c
+index 1f1b7c9..0b59034 100644
+--- a/src/module.c
++++ b/src/module.c
+@@ -182,7 +182,7 @@ module_load(const char *filename, const char *symbname,
+     intdll = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
+ #endif /* WIN32 */
+     if (!intdll)
+-        return dllerror();
++        goto fail;
+ 
+     /* Get the module symbol */
+ #ifdef WIN32
+@@ -190,16 +190,12 @@ module_load(const char *filename, const char *symbname,
+ #else /* WIN32 */
+     intsym = dlsym(intdll, symbname);
+ #endif /* WIN32 */
+-    if (!intsym) {
+-        module_close(intdll);
+-        return dllerror();
+-    }
++    if (!intsym)
++        goto fail;
+ 
+     /* Figure out whether or not to load this module */
+-    if (!shouldload(intsym, misc, &interr)) {
+-        module_close(intdll);
+-        return interr;
+-    }
++    if (!shouldload(intsym, misc, &interr))
++        goto fail;
+ 
+     /* Re-open the module */
+     module_close(intdll);
+@@ -208,9 +204,8 @@ module_load(const char *filename, const char *symbname,
+ #else  /* WIN32 */
+     intdll = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
+ #endif /* WIN32 */
+-    if (!intdll) {
+-        return dllerror();
+-    }
++    if (!intdll)
++        goto fail;
+ 
+     /* Get the symbol again */
+ #ifdef WIN32
+@@ -218,14 +213,18 @@ module_load(const char *filename, const char *symbname,
+ #else /* WIN32 */
+     intsym = dlsym(intdll, symbname);
+ #endif /* WIN32 */
+-    if (!intsym) {
+-        module_close(intdll);
+-        return dllerror();
+-    }
++    if (!intsym)
++        goto fail;
+ 
+     if (dll)
+         *dll = intdll;
+     if (symb)
+         *symb = intsym;
+     return NULL;
++
++fail:
++    if (!interr)
++        interr = dllerror();
++    module_close(intdll);
++    return interr;
+ }
diff --git a/dev-libs/libverto/files/libverto-verify-cflags.patch b/dev-libs/libverto/files/libverto-verify-cflags.patch
new file mode 100644
index 000000000000..dce747239dc7
--- /dev/null
+++ b/dev-libs/libverto/files/libverto-verify-cflags.patch
@@ -0,0 +1,26 @@
+From 5bbe8b009d6daa809f679fd1d25c270abba468b4 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Wed, 31 Jan 2018 17:52:39 +0100
+Subject: [PATCH] Verify flags prior to adding them to CFLAGS, not after
+
+---
+ configure.ac | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b7b5908..4084965 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,8 +8,11 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+     [AC_GNU_SOURCE])
+ 
+ AC_PROG_CC_C99
++
+ for flag in -Wall -Wextra; do
+-  AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],)
++  OLD_CFLAGS=$CFLAGS
++  CFLAGS="$CFLAGS $flag"
++  AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS])
+ done
+ 
+ AC_CANONICAL_SYSTEM
diff --git a/dev-libs/libverto/libverto-0.2.5-r1.ebuild b/dev-libs/libverto/libverto-0.2.5-r1.ebuild
index 66e4198d03c0..1486d1ddb5e4 100644
--- a/dev-libs/libverto/libverto-0.2.5-r1.ebuild
+++ b/dev-libs/libverto/libverto-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit multilib-minimal
 
 DESCRIPTION="Main event loop abstraction library"
-HOMEPAGE="https://fedorahosted.org/libverto/"
-SRC_URI="https://fedorahosted.org/releases/l/i/libverto/${P}.tar.gz"
+HOMEPAGE="https://github.com/latchset/libverto/"
+SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/libverto/libverto-0.2.5.ebuild b/dev-libs/libverto/libverto-0.2.5.ebuild
deleted file mode 100644
index 9e2921bdff40..000000000000
--- a/dev-libs/libverto/libverto-0.2.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Main event loop abstraction library"
-HOMEPAGE="https://fedorahosted.org/libverto/"
-SRC_URI="https://fedorahosted.org/releases/l/i/libverto/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
-IUSE="glib +libev libevent tevent +threads static-libs"
-
-# file collisions
-DEPEND="!=app-crypt/mit-krb5-1.10.1-r0
-	!=app-crypt/mit-krb5-1.10.1-r1
-	!=app-crypt/mit-krb5-1.10.1-r2
-	glib? ( >=dev-libs/glib-2.29 )
-	libev? ( >=dev-libs/libev-4.11 )
-	libevent? ( >=dev-libs/libevent-2.0 )
-	tevent? ( sys-libs/tevent )"
-
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( glib libev libevent tevent ) "
-
-src_prepare() {
-	# known problem uptream with tevent write test.  tevent does not fire a
-	# callback on error, but we explicitly test for this behaviour.  Do not run
-	# tevent tests for now.
-	sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die
-}
-
-src_configure() {
-	econf \
-		$(use_with glib) \
-		$(use_with libev) \
-		$(use_with libevent) \
-		$(use_with tevent) \
-		$(use_with threads pthread) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog NEWS INSTALL README
-
-	use static-libs || find "${D}" -name '*.la' -delete
-}
diff --git a/dev-libs/libverto/libverto-0.2.6.ebuild b/dev-libs/libverto/libverto-0.3.0.ebuild
index 7e7972bdcb53..5ef09140c7af 100644
--- a/dev-libs/libverto/libverto-0.2.6.ebuild
+++ b/dev-libs/libverto/libverto-0.3.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Main event loop abstraction library"
-HOMEPAGE="https://fedorahosted.org/libverto/"
-SRC_URI="https://fedorahosted.org/releases/l/i/libverto/${P}.tar.gz"
+HOMEPAGE="https://github.com/latchset/libverto/"
+SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -27,11 +27,20 @@ RDEPEND="${DEPEND}"
 
 REQUIRED_USE="|| ( glib libev libevent tevent ) "
 
+PATCHES=( "${FILESDIR}/${PN}-libev-c89.patch" \
+	"${FILESDIR}/${PN}-verify-cflags.patch" \
+	"${FILESDIR}/${PN}-Wflags.patch" \
+	"${FILESDIR}/${PN}-load.patch" )
+
+DOCS=( AUTHORS ChangeLog NEWS INSTALL README )
+
 src_prepare() {
+	default
 	# known problem uptream with tevent write test.  tevent does not fire a
 	# callback on error, but we explicitly test for this behaviour.  Do not run
 	# tevent tests for now.
 	sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die
+	eautoreconf
 }
 
 multilib_src_configure() {
@@ -46,6 +55,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	dodoc AUTHORS ChangeLog NEWS INSTALL README
-	use static-libs || prune_libtool_files --all
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
 }
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index ea3d588632c8..b9a7b75f7e4d 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,5 +1,7 @@
 DIST libvterm-0.0_pre20160305.tar.xz 665672 BLAKE2B 3f86ada9967f8c5e085ef324330082858c27b07583af2fa4946f74f3edf3bc697cb3335108df89a6de7f058b9649e82fc85b133084c0c8212a98e5f8adab6ce8 SHA512 7e9a44ae679b8c7216f019c0c6b90f1b762f051f58fdb349cfa2a3b2df606940d891547fbc24f05ff32a33e4749242ce8ee2af214b7b3623b83a9f4b9fd53585
 DIST libvterm-0.0_pre20171004.tar.xz 618644 BLAKE2B 07ca64652e09825b5ddf644b962eddcb5c3c97b099da853f091d784a30b5740b77d0f92f8047f8387804cd9ad98f1342ee989cca648bda27260659eb130a2245 SHA512 96b4b113046797a14287f13f39c05da3fe1d52211de44cc11d44848563fa9c234d53a59b66af27721118c2267ad02c9c5b3f6d5be8e1769c708ed90a79b1dcd8
+DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa357869f815658c3c13e04808841e5e1e847732046e212153d4e4d49bbddcd5c661cdb7f7f962e6fd0a305a534bbca074a4ca6 SHA512 9f55c9a00807e46c1c6157fc372d3cad575f2574ac8b3abc82acd26ef6425166ac18ee1b7d77a9dfc617b14bc9eb7dc3a364cef5c0bf6c4951dc755d9c6c5ce0
 EBUILD libvterm-0.0_pre20160305.ebuild 763 BLAKE2B 5eba9e60a96c6197e0630c4f324f1fe4803ddc24c5e0a2113fe48e3135e7b3dbbc22f3cd7be57851f37e2484516e044c42a623560580281f3e33e3f4f0e5321f SHA512 b3314341167cd00f0e849e566da865acaf84644f82b0370a87e25b5f1384919b35ede81d65ce3fd30302e294c0beeeae1dec06ad324ea886bf83596cf4ba4644
 EBUILD libvterm-0.0_pre20171004.ebuild 765 BLAKE2B 36262c4dd36157dccd571bf3218573fb802a04e71061676b8f8aec4238bfbd54950e555e234cb5f100461ee196befc584c69b9d5b705a4c8740f109047380e2c SHA512 d6fa75efa138639ade62b6d3ec37e0e1d6a36e8ac5273e7a4c0f12cb4bd29feae154b637c5559e5e5fd7088f2358a2d76e8d2b3c871d2495022568b9d25c7146
+EBUILD libvterm-0.0_pre20181126.ebuild 775 BLAKE2B 09df9db35c58476dca6d33cde26aaa5c5f0e067b70933fe2d5f9ed85ca44915a229a586330ca798aad3abd3be71024a2cc3b899378e2f62cc4b2da2b586c845f SHA512 55a59b3fc7a8f072e8e4b234e06ee9c66f30fd3d0e52e9341805557632e2959bec098cbd65efe7e05c5745607e4f9853c3f944ceba56b2a937efa6e4feea1c4b
 MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
new file mode 100644
index 000000000000..c636c41d4ba6
--- /dev/null
+++ b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
+HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
+SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig"
+
+RDEPEND="!dev-libs/libvterm-neovim"
+
+S=${WORKDIR}/libvterm-0.0
+
+src_compile() {
+	append-cflags -fPIC
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" install
+	prune_libtool_files
+}
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index 0a55d472eabd..986ffd976004 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,4 +1,4 @@
 AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba058cefc253d9e6ca112e2d7d0cdfb082a024c739e101eec03470319ce766694507d6d4ed2cd3b1810242c5313e8b3af5ad SHA512 62d0e6b7a5ec8c5e5c695933a886002bf81c5ac73e2f47917d9942932045cf66f5023eac039e21b8cf915a145dba2d3c12da4a85e9ae1a7340e522f36bdc3157
 DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
 EBUILD libwapcaplet-0.4.1-r1.ebuild 824 BLAKE2B 1798a009f4dd3f30873fe420097839ab80359531f69c9e6b9417c4826862fbc48427d8566a949651535f262c8f169f179a8cd9b44068cd073817b7dd189316bf SHA512 f8bc0540edd329f073012a9108761a34267da95986b7e6150b172a90c1d20a5adb8e39a84a7d2068a2a2ee4be1cbdc88f494f3aa94c12171a37e7938c5e76905
-MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
+MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libwapcaplet/metadata.xml b/dev-libs/libwapcaplet/metadata.xml
index 68674fe1b802..88de5fc462b1 100644
--- a/dev-libs/libwapcaplet/metadata.xml
+++ b/dev-libs/libwapcaplet/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 1c48ab0eca0a..90f7cf30165a 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -4,5 +4,5 @@ DIST libxml2-2.9.8.tar.gz 5469097 BLAKE2B 0b7836db46edebf6e7108c28da4bb7e3fb5ddc
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.8.ebuild 6422 BLAKE2B e58ea4de8a520aadcc704c4893fa1663e6beb44cb5e92297ded959b2ec18bf428c27f42268b546c4be332065451360b00852dfe7415cb35917579a89318a1cbf SHA512 a861d5a2a20db478d933624bed1972fd1f2df3817a4ac31a848bce21ff4ff227be96d909b28fadd3cee980db93da47cae1ae056d4f7c3f9511710bd373c31d4f
+EBUILD libxml2-2.9.8.ebuild 6421 BLAKE2B 98377ff5878e8ce958f9b26972cdd7943cccd49501b8aef622983337f512d77c56bfabc9e067306f3f8350176354c39d9aa26e0331b804c3b4de36e95aae90d1 SHA512 fde54a21af5aa5d9fa3acbc84cc13064d81f98b6ce0fed790d1fabc70f587237bbcca2fd4d51766a444bb16b4700b6d33c789f463a56c124f2686da5b0f8b599
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.8.ebuild b/dev-libs/libxml2/libxml2-2.9.8.ebuild
index c55b293e2021..1917e19e6284 100644
--- a/dev-libs/libxml2/libxml2-2.9.8.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 741454a1f30e..696d551af7aa 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,3 +1,5 @@
 DIST libxmlb-0.1.4.tar.gz 82036 BLAKE2B 26adc2a33e0e63c6340127cb25dffa62d88d1c1ea6c760fcd54189ecd899f4d27547194e3e6ebc9d638dcba384fb2435e832915d5e75018f9f03ca7dbecdd878 SHA512 58b5f51fe0d6c6bc9f8e960f26ef79f3fb437f6802505d4e216e6bb32f95bd134f3230056dbc922bd5cf734ce1ef2278a2931653c1653cfca9baf6ddcdf38b78
+DIST libxmlb-0.1.5.tar.gz 82894 BLAKE2B 37918d06938ff2a33efbcca712c1424767e88e0a0471a6458f41d97a5004fc3c93be67e3a47f031186fe157ccc610de5101e254dca8a0e9fb2d908c4f466e418 SHA512 c396ff647b6c0d86c8a1cfa5926699c0d16e0d62ae29afc542bcf4a148d7c1daa9239636222dae04c1236553d09257c7440ac383efb8912bfa9ccd761f3b59bb
 EBUILD libxmlb-0.1.4.ebuild 930 BLAKE2B f193bec72b41e589643ec1eee0856bd09ab8236357c71f8c57562d3425408d77bc799949a07497edcdc0effadd67febb5415decfc8b9b998de7e6f44cb1d5804 SHA512 b54cd8542667a35fea53d58b88643a8f9134fb0f1576f2378b2b793cc5e266720b2adc972fa16810123d8ce26071269646437d297e60f8c4405152b6223a9de0
+EBUILD libxmlb-0.1.5.ebuild 891 BLAKE2B 59caaa4e69c05ed265fb19d2ebe1476c615fa0358c2da1c8a138e35cca84cf2f6579a4c9d1da57e9ad8c8595d8282e5e947571c68a2b939726b11c8dca2ba35a SHA512 f7ca17456bad539fd71a3be24fd3fc3f30fe2562a2fa41dfa38a1191249bb02832a042500c4a38b0f69c60e33f0af639a454bec6875ed628910f014c89bb1d37
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.5.ebuild b/dev-libs/libxmlb/libxmlb-0.1.5.ebuild
new file mode 100644
index 000000000000..82682fedaa9c
--- /dev/null
+++ b/dev-libs/libxmlb/libxmlb-0.1.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Library to help create and query binary XML blobs"
+HOMEPAGE="https://github.com/hughsie/libxmlb"
+SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc introspection stemmer test"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/util-linux
+	stemmer? ( dev-libs/snowball-stemmer )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+BDEPEND="
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dgtkdoc="$(usex doc true false)"
+		-Dintrospection="$(usex introspection true false)"
+		-Dstemmer="$(usex stemmer true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 192baa746ebe..51c267d8889d 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -2,7 +2,9 @@ AUX libzia-4.14-ldadd.patch 548 BLAKE2B 655b2d21e8c5a90c7559381ed546df0b661b2cab
 DIST libzia-4.11.tar.gz 577185 BLAKE2B 80de10d5852742870ff7a7995b743eddf76a966695fd7ad786537ed4ad430b60a88b2f5bcb74fb41ecd01a84f02e126a0bfffa932761cb8bf73bbeb097cca181 SHA512 6d616ca12e1db20c8bbbe0a18b4e1e0ce1b086b38123762c2e4c3f46390ff5772dd27eb9b97b332b20f3430905f6eae0fdce70aca48fd56d5e43043369233964
 DIST libzia-4.13.tar.gz 583226 BLAKE2B 088c199c188fbbee54ed533565d3509a510db5f1d3bafeb1be76cb6b2f38d40244fe768ccfa2ee62aaba856ffa7b890dc6d5ea20ec7e1289cbce609d5a56b476 SHA512 b1dc294812342d8c4cf34b013d26c3e8d56da924ef22991b47bdf5ee18990e006a7cd216e9989a6fb3ffb3cb151fa04d5aff7707a7541ec7125b39a6f17eb80b
 DIST libzia-4.14.tar.gz 597138 BLAKE2B 200e0682c6bc28248646775c5e5a71bad329edf031d0950ad8ab5244e5e925903147467d23eb3a04f9be05cca6b34947692df15620331ffc5357b73f20d363b0 SHA512 c382ef352e80df69daf3d3e4da0c0de5d8037b32182a760f88a1edf7d2b9cc7d5112de942a5a85973ccf82ca1e0771c2e92de7972ff9bec745fdb525419a2365
+DIST libzia-4.15.tar.gz 600728 BLAKE2B 7e359a09c9e440c65fe369a8ff9004883ecbc047cfa4995e671c74662f9658370e0e8f613e626f9480abb9fb6d94e777bde70b44d080d45f4e17b1f982c48237 SHA512 041e21e1506b4cc38a0b9a5fa07037de01d19a390b6ba46159688b2bd7c75c44faf6e84d1ec929a582a2c8038c60f986d6d172636b5e9cb1b2fc5a729ec2225f
 EBUILD libzia-4.11.ebuild 707 BLAKE2B be3320d6589dfd6a561a6809febe80273e8e312da0c01b2d42c853e99b1b47b3fbcc64ea5ae66e5b7212db89fd0516ac46a3aa06d13c1b6c67a243ea22116005 SHA512 8c6a1b708ff15d1e2bcd88d5179079110292e067e7b2901c6d7db4746fb0fa8ee3572ebbbe3b6f48b6844f8ecaeced13f55928f6c11953a5722268f9414efb3c
 EBUILD libzia-4.13.ebuild 709 BLAKE2B 3818ea32c4f00fd2457d1507aa9830efd17c24e15bd38b0bbfcf5ef5d4fbb12ff6bed0ec2252fbe9d8813b27091f24846064479cc359b7baf431205c9970e13a SHA512 f0a1b9b019217baaa60436057eb91c80715e760f9fa9dacd0948a24937b7aafdc653be0f7bf9fedd336ace4c9ca6e6611ed4ff90f2fc68d8ac247902d1cf1035
-EBUILD libzia-4.14.ebuild 786 BLAKE2B f3d6dd1ab50bc88416f93c79da98f439c8f5dbb40858456991bcae580e63651ff0c267b6809aff098bb143858bfd90ddc69f75e8075500915acec3104e8892b3 SHA512 4c1f5d96337747c96e19e1c293d95eb81edef56576ed9ba47d7a6da4a942b7b8d3f1d5cdfb2cd6b576adc06ec75383913ec5775b634a96ea626f842e8881e620
+EBUILD libzia-4.14.ebuild 784 BLAKE2B 2073c5504b41ee7f4382dc902111d5058eb39cc58c8578b099e1db5d2be5613e331555e0fdc305344f4f1d2e20ef15721c7990264f48e3fbc39d8dadd42c9779 SHA512 9f73df3eee5f7caf277e4b9394ad1b179c11e00c9d7254c9707b85c74944cfd3f7037ccb5419a217df9fcfbe77957c4cee4c2421db4d84196dcae5427b65ee7c
+EBUILD libzia-4.15.ebuild 721 BLAKE2B 1be77624273a7846fde4dc163881aaba00ad0151d65294467b977bd3b90ee4d452213ced91a157764e8e1829f73b6b26d4e0c5d729c727ff89718bd862b1fe8c SHA512 c57c9e58e59cf7961022861b70f0b360bb07af7bba838878545153a0896157d5b67d4424af098ab11293b325c4e5501c6882ff2a7177635b17e6be1695e12158
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/libzia-4.14.ebuild b/dev-libs/libzia/libzia-4.14.ebuild
index 8182298faa85..5a63aa43ba6f 100644
--- a/dev-libs/libzia/libzia-4.14.ebuild
+++ b/dev-libs/libzia/libzia-4.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libzia/libzia-4.15.ebuild b/dev-libs/libzia/libzia-4.15.ebuild
new file mode 100644
index 000000000000..509910a756ec
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.15.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd
+}
diff --git a/dev-libs/light/Manifest b/dev-libs/light/Manifest
new file mode 100644
index 000000000000..b5e490d5d5bc
--- /dev/null
+++ b/dev-libs/light/Manifest
@@ -0,0 +1,3 @@
+DIST light-1.2.tar.gz 32592 BLAKE2B 86d2bf4a88cf61ec1b7af16510db3d26698397d5cc3ddee7f663c1f501ca6b5bf238e5f29f17142d6196908e1d444795abed41a12560c9411214d4a874c96ddb SHA512 3f876262a730ef34219e0d596065c725376218ca88a2e9f56f62a25956b9ba505168f32c5877715abf746090c053873322a3292680055cc2f5b77ec8c0d466a4
+EBUILD light-1.2-r1.ebuild 582 BLAKE2B 5b6009e2965b320bc7d391d417d49f7d9c7c2e7b209eb5f3d8bdc07a1be32b820a79e903859dd67a25fa003b334b36e9c4d777b0f99556caeab5287aa604e6ba SHA512 3a2ab39a7c4d99c2c987a7d92dc74069465d67630ad83650f9b4e4249cf2d6f52c8cc0c3cd8748b436cee329f7cb2355702385276cb9e6b5a767bf7ec81b14d9
+MISC metadata.xml 355 BLAKE2B 87de7a4fb6653614915e68daf6b4acf751c6e0a27b156acb5f442bfe118496ec975cba6edad9c79063cea8811a0692991d74a3d179f3ab50b538bb1f41de9e03 SHA512 9dbbe3645a35e946fcac945c8e1aa52500393e12b44db82fa8eb0fb804109b045081ba9ad808b7a5f52a9d2fca7ae303b7af7093591096f2e11c6bb47768ff76
diff --git a/dev-libs/light/light-1.2-r1.ebuild b/dev-libs/light/light-1.2-r1.ebuild
new file mode 100644
index 000000000000..ce2801ebb1c1
--- /dev/null
+++ b/dev-libs/light/light-1.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A program to control backlights (and other hardware lights)"
+HOMEPAGE="https://github.com/haikarainen/light"
+SRC_URI="https://github.com/haikarainen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="udev"
+
+RDEPEND=""
+DEPEND="udev? ( virtual/libudev:= )
+		${RDEPEND}"
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+src_configure() {
+	use udev && econf \
+		--with-udev="/lib/udev/rules.d"
+}
diff --git a/dev-libs/light/metadata.xml b/dev-libs/light/metadata.xml
new file mode 100644
index 000000000000..62e9eba6759d
--- /dev/null
+++ b/dev-libs/light/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>bman@gentoo.org</email>
+        <name>Aaron Bauman</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">haikarainen/light</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-libs/locked_sstream/Manifest b/dev-libs/locked_sstream/Manifest
index 7ffdb38aa9e7..ab117a84cb49 100644
--- a/dev-libs/locked_sstream/Manifest
+++ b/dev-libs/locked_sstream/Manifest
@@ -1,3 +1,3 @@
 DIST locked_sstream-0.0.5.tar.bz2 98277 BLAKE2B 096c215a5b64c51755505be9e45b5ccfff8a08d6a2d301b1501960a1b7f111b245f91d0200f80332109f7ca7045cbca625f0f3ab1d04bc26191e0c13295e5209 SHA512 5d136c2e1ac5b1eabd07a8048715f47881662ce7a3bfdc2460428f34ab51b0474327b2f28ce6ba2f4ac9774478abb20082af8f954ebb1c4653ba24ca82991c32
 EBUILD locked_sstream-0.0.5.ebuild 591 BLAKE2B 231862ce1b35f12f2e1cb563d4335c4665adac604578a55e7044cfa0d011ce1f617e1e2adddb7f5ac69a667a8f717b7284d1bd3d0275ad1626ecc5f7f9a62751 SHA512 a28ee64c9bedf9a7e246df90c6b04744ea0d31be2d874c50998be1cca632a3330b07effefc02e7f8f71eb3b084a90e5070d79dbc74b23b1e748e9128ceb946be
-MISC metadata.xml 549 BLAKE2B 333d06148cce716c9c544c8a7a71b97a07a9aed769551bca524e6c657df5d271067adb75bd1da92ced94ab8f64fc94e9d28515c41f294ba43ed60811a7528324 SHA512 a95bcee18e8cc7c223767261aa9fa9bf5aca985248d742ac0785c9204ecb1dafccb868bdd19c4880406ce9d06a3e421ad623ef61d6169c68d77f7e201ae8aa90
+MISC metadata.xml 478 BLAKE2B 092f58c58c5811f2805205532fa4def4341e9a461532d894b769321a9389ac08d197e8030675ddb7891a2095839b3584ecc90de041d88bb3cadfaf404dce0c14 SHA512 4baad1194dc2e3eb059a466b2974b28178f41c691cf42ed498e1bf8629ee4c03742f59455dfdf2b4e72af4c75220a7f51b1f60272a3b5c18d6a2b29051073376
diff --git a/dev-libs/locked_sstream/metadata.xml b/dev-libs/locked_sstream/metadata.xml
index 437dd2281c43..1d02d02cd9a0 100644
--- a/dev-libs/locked_sstream/metadata.xml
+++ b/dev-libs/locked_sstream/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 locked_sstream is a tiny C++ library which wraps std::stringstream in a mutex to attempt to fix crashes on OS X when multiple threads simultaneously use different stringstreams. It remains to be seen whether it fixes the problem completely, but it certainly helps.
 </longdescription>
diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index 234d04d9124b..eae0f0aeae35 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -1,5 +1,5 @@
 DIST mathjax-2.7.0.tar.gz 24594403 BLAKE2B 7cadfe7565a7ebba3569fb298a097f07081926b843a06c3c32447757eb0a5d463d654f20c42821010c81c59819bb14fdc5e84a39e87106bb6808bd6c9ca52bb7 SHA512 2a7c2b4a4991485c18f78dda4115da05a31c1a2d952c403726e99d22fd26f166298199238ad482e53b63b5414be687f325b586f5ebe4e2d552447c929415b350
 DIST mathjax-2.7.4.tar.gz 25355532 BLAKE2B 0bed5224356757c64989de8b9355f5c2505f1fa951456c52caf1cc0a9b5a864633ce5299cc9b67b1e5c743e39bcb6aee787a76d6871fc998b614d62e12499f6f SHA512 cddc4c64c188620307f0ede3b0bc7ba071f78702ba6315426d8c83129543a6b81a3a9a115f88017e23b5094b7aefd934c39aeec9688419830e33f9fd0fb1de7e
 EBUILD mathjax-2.7.0.ebuild 1219 BLAKE2B d6a55b0baf2dece7e35e043db8be4f41cc3705b9a032ae18537e6d1a5abd21c179d428b7c6defb809de30505aefc62a04b60db93655fadea15cbe01f4371be68 SHA512 41c37e0d36ecc2ef1eff3936bd6b47d90644e6ad31f54d3276acde4a0bb15f8b1c169bdd749c59c8e0f1ae7f92681a5b68463a6b1a40d12dec1dab7b9f9df1a8
-EBUILD mathjax-2.7.4.ebuild 1222 BLAKE2B 99be4290bb4275d3f17d866c42b6ced052976cbe2d65329372399de077b0193aedf241e1c75e756524f58d7b3877cbed5c060be7796dd73084faaa15c2be0efc SHA512 f3096b882da3c70b5fbbc4c1a78d84fa107ae32806d26b977d15bde5738ea90d4638b6715b20aa0da1e5ea1c6e45ea688a771dd9969bd0edb3798c162c840f27
+EBUILD mathjax-2.7.4.ebuild 1218 BLAKE2B 6005e2a63c29c8d7b3a9a54463e264ca78f1b4baaf353976d0c6af4d63954a0dc79919f9f94dfc716251b57cde0457d1a276e6f7eb6c02b6e772c29e7d18a75e SHA512 11c8a006181b2dbf4a110f3409972c70b4bc7482e4ff3d19ab3fb28282fdb9b15dfea98cfcbb38b475653753ba9d1811afc9b7c963868d2b6945348440a56808
 MISC metadata.xml 1030 BLAKE2B 8f3b54b726e2f135394cd6a0957d309070d3aba8fa7c40ef4b51ef8daaa0123b7f30f6cc793e2d93cef3c9f801267640444d7c604a3d6dcb277d9621ec6dd1a7 SHA512 aa7911df581513457da3e6f146e9d7d986c9b028698309ed42d1980f7bdd7a738dd6eb2a252ffbdd49fded3877e196c32b0a75f90fd1fd928b078429ed84565e
diff --git a/dev-libs/mathjax/mathjax-2.7.4.ebuild b/dev-libs/mathjax/mathjax-2.7.4.ebuild
index 5aaff1048750..996cca8af783 100644
--- a/dev-libs/mathjax/mathjax-2.7.4.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RESTRICT="binchecks strip"
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 0c2a05367291..dfc51980db32 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -2,6 +2,8 @@ AUX 0.8.1-api-version.diff 421 BLAKE2B 77cd7452029021c098f3d9a40a94e0af63a30c986
 AUX mongo-c-driver-1.10.3-enable-tests.patch 866 BLAKE2B b4abf32f0915f28185b8e036ed5083a37795cb84980dee755649ca63322f29469d1be614c1d2d97455ca37639c25956cdba08efa320db213561cddd337b1bc31 SHA512 23e41702d7e1d64c3baab4045f87945c36f028f9802701c37316bbddba667c2e1c038c1234b3374c66b252e9b2ff068f3dfd513a397ee56d170397cc268277c2
 AUX mongo-c-driver-1.11.0-enable-tests.patch 866 BLAKE2B d07afeb06dc61ddf15bbb46576e21c773a87e71ef8618130f8055b03080147e68a5c9a9b805149eb328510ccea172b790df8a512b45241173c5f1a5052ce7db6 SHA512 ce81feab28a06d003c731d4b14a611f705c0f45123282b7a1836d7eb0befdca4a1a041896b3d4b9bb49027c3fafa72feebfff2a26657df56f21862d0125c13c6
 AUX mongo-c-driver-1.12.0-libressl.patch 637 BLAKE2B df52868ae9253125cc77973de4d385bdbebd1b90bfc7bc49bed4a4d6cbcb02768fd98b9bf110e9b463893131d44538f1d2ff2b4cba3ce2242832d1149cbd7498 SHA512 fd4b083695e7db3e407e2068fbc76ec063040f200f2087fdad6b21b15bb0da4a8eb74123908a3798af2b81811e8813c047d44117aebdc0d5393069c1ac653ed6
+AUX mongo-c-driver-1.13.0-enable-tests.patch 886 BLAKE2B 9a568e6498ec9ed7b08bcd8e5ae92c8e439bcce6bc04a91f128411efdbeafa64f3258f687963c861aea14c268587972ca679fbcd380098a3eefcc50a0c0a4e24 SHA512 c7f4ca10791c2eae60ea50214c1605d9d4ff48a804511d8dd9b181046f794a61499033ae0f0a8657257ee378dc30976e78984270d7fdc8cb4791b7690c89102f
+AUX mongo-c-driver-1.13.0-no-uninstall.patch 866 BLAKE2B de38a7659be91d293b33c03036c14607bc3f6214a5970d28b8cbc02d77ee32a04f077e082cb7bf9ae126d13d5537a634c29e31230d444cfb72734fc417b0d604 SHA512 ccfca1aafb4b918a14950ccd99ca6b4f4a3d7d0178a726f6c9de7096a5e5ed700953672ae457a43064b61595df4e955774a4836e5d653d6d73b50cd5772f87d9
 DIST mongo-c-driver-0.7.1.tar.gz 108537 BLAKE2B 29d7f6680d700d15d02b3d5deefbdc27b4e0841a2ac30205ed148216d15e95fe487f4cea4decacdf573a4ce78248cfd12cba72b9dbf90065e127fa7fb56cad27 SHA512 5c6996dc47ecbe4d77971e3aa983a877e7de736bf358c467808eceba8b1a5eea342376249cdc682a034fc7ec39290d234527cec3c3732686f184281a72aec724
 DIST mongo-c-driver-0.8.1.tar.gz 124053 BLAKE2B 1c6b0d3998c6497c39fc2f6597021e84571c717e5d6f288d79d3862e7f15f131604648595ca0e12200352a7fbf40652803afd0f60a80eac657b9853a1de51173 SHA512 7b61ac4b1b154ee1f518eddb2bbc0cdafe0da8786eed4475e5703c2a735ec5a09efde59f5bfa45fb226cbce24d8c0ba0de403d8fc3e561c0e48507dfb07962b1
 DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
@@ -10,6 +12,7 @@ DIST mongo-c-driver-1.1.2.tar.gz 5443153 BLAKE2B f8004486baf6d2d3086e458bdb4bc80
 DIST mongo-c-driver-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
 DIST mongo-c-driver-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4 SHA512 d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e
 DIST mongo-c-driver-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
+DIST mongo-c-driver-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0da7129cd1fcf1dce7222df4d25ca109b1bfbb545c755abf8e4cc39dd40dde7ba4c50dd51dcfc67c970e2b8eb278bd543fc SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
 DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c19a5b8722a2ed69fdf046c35973c9bedcc1686065e4355db28afc83c1415872eee2972a6fb3f21647d2cafce12706adc0 SHA512 23844ffe20580998308aa9c8409afcb87dccde874077eefc6806b705e5de5743846ba0513f3a3fe83147fc47842ab8c7438ad1de5f3f55b81586b9e19046aabf
 DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af
 DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76
@@ -22,6 +25,7 @@ EBUILD mongo-c-driver-1.1.2-r1.ebuild 1926 BLAKE2B 9d924e541fd57a5b87f406f898b05
 EBUILD mongo-c-driver-1.10.3.ebuild 2191 BLAKE2B 43dba477bba4672c2846b940e30f87a1db9d22b20f2f8b333b73ca0903236fc10da2f5a2a022121b06d09f0037418eca3aad1f54ddc13e2813e9c64c8a4b665e SHA512 cc8ddbdfd8dcbb8ac48315ac880e7c36036c42ab87357661a1ba50caa375590371550415c4f4b4a934a65556549c5208fdaa565dd9b4fda143c26a650af82633
 EBUILD mongo-c-driver-1.11.0.ebuild 2293 BLAKE2B edd5b631add3c2f7813c82be5938141edc54ae59634b8c2ef8980f3b553551b340e01837006e88d9f30a2c0ab7c5f8865e3817ac126ed251b88386167594a59b SHA512 58baa8d3f4f66ab6cae3d4b27c9dab1fa0435b4d7f94169d32563c0f9e7bbdb479244e7ae09a8106a810e774bdbe975ae4a49fd4c5a166795a38a01f5283dc68
 EBUILD mongo-c-driver-1.12.0.ebuild 2340 BLAKE2B a9ac25791b3c66a7b9192bbe4ac3ec0274d191fdc4d0994bc223afa144d2159e83190c0f13d52454a8aabde00e4331fdb7cfcf54ae697afca1c967c5f195f8b6 SHA512 b0288069c8776c6d5ddc5953526dfe44911e0f88d4e6b0274577d9133370ada1c7679912fe53a24021b4d7b5f549f784560a73e6910e45a351787bee1bc6557e
+EBUILD mongo-c-driver-1.13.0.ebuild 2360 BLAKE2B 012d8d8d3652a449d4cf02e4124db9555ac5251c0f9a5b7acb868e7bbae2eca8285e4a01dc48a8a6664d741c5aec343d3db33c80e94d89807552ab17d2b3243d SHA512 346b8f43d9673c8d478bf5f5cdf4954e9b4ea0b2c2223f1f7e9dc62bfe9707286f199996a3ce650f42ec58c6398b78eff833b1940e86809995284f42e7062b65
 EBUILD mongo-c-driver-1.3.5.ebuild 2149 BLAKE2B 773a2fb9a1e5365d77f9bb0351524331e319bc740623ead4bd779706565c2dba71b20f31752e31313fe75eafc052165b638d6596d46d5a475793274f0175a855 SHA512 86d0292f1d2a4bed46a7b0ef7d68d2f1bb1b18aef3bf60210054d59a020603f8c89a130d835284bad3c4cbb62703bbbd408ec125f386b199ad4868a7787c7fcd
 EBUILD mongo-c-driver-1.6.2.ebuild 2089 BLAKE2B 0e49a73628df5df2ba90627ae42cb553aa4c593fe7b4b68f5b06ac74149549e395658cd075510f5876072f39386e6c5da8fd060d42cbdd4f816271514203913e SHA512 df452c236e0c8db8aa5404ada5a33689b892a10628c83cdd09e8db58a527ce8073de62a6e8747a231787ffc2089ecd5ff4a8fdfdba51e0b64ca3ee2618cc900a
 EBUILD mongo-c-driver-1.8.2.ebuild 2150 BLAKE2B 1ff46d08933c2d525b4dd60cfbd1ba4c3e8183cea11923f3b851b9fe1e0b25bdaf1d08e70f68a3dde383ff4ee7ca9127ea0cb7d0ac011c4aac2f42f46dd4a6f8 SHA512 55338086d4a8c91527f62758b153031751385b975eec7b8dc35a0d07132eb8120b4d0ccf8cdce419f4623ddb8b7deea62556dd7c9c41ad8a01abf04bad6869a9
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-enable-tests.patch
new file mode 100644
index 000000000000..983e025b9170
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-enable-tests.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 22d1f4f..8ab33c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -118,7 +118,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
+       message ("--   libbson include path \"${BSON_INCLUDE_DIRS}\"")
+       message ("--   libbson libraries \"${BSON_LIBRARIES}\"")
+       message ("--   disabling test-libmongoc since using system libbson")
+-      SET (ENABLE_TESTS OFF)
+ 
+       if (ENABLE_STATIC MATCHES "ON|AUTO")
+          find_package (libbson-static-1.0
+diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
+index 6ac94f3..cec430f 100644
+--- a/src/libbson/tests/test-bson.c
++++ b/src/libbson/tests/test-bson.c
+@@ -18,7 +18,7 @@
+ #include <bson/bson.h>
+ #include <bson/bcon.h>
+ #define BSON_INSIDE
+-#include <bson/bson-private.h>
++#include "bson/bson-private.h"
+ #undef BSON_INSIDE
+ #include <fcntl.h>
+ #include <time.h>
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-no-uninstall.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-no-uninstall.patch
new file mode 100644
index 000000000000..64a90bbe3ece
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.0-no-uninstall.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f7a0dfe..22d1f4f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -271,7 +271,6 @@ if (ENABLE_MONGOC)
+       VERSION_CURRENT
+       VERSION_RELEASED
+       # This sub-directory is added later, so manually include here
+-      generate_uninstall/CMakeLists.txt
+    )
+ 
+    set_local_dist (top_DIST ${top_DIST_local})
+@@ -341,14 +340,8 @@ if (WIN32)
+ else ()
+    set (UNINSTALL_PROG "uninstall.sh")
+ endif ()
+-set (UNINSTALL_PROG_DIR "${CMAKE_INSTALL_FULL_DATADIR}/mongo-c-driver")
+ 
+ # Create uninstall program and associated uninstall target
+ #
+ # This needs to be last (after all other add_subdirectory calls) to ensure that
+ # the generated uninstall program is complete and correct
+-add_subdirectory (generate_uninstall)
+-
+-add_custom_target (uninstall
+-   COMMAND "${UNINSTALL_PROG_DIR}/${UNINSTALL_PROG}"
+-)
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0.ebuild
new file mode 100644
index 000000000000..5eeca7c911d3
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Client library written in C for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE="debug examples libressl sasl ssl static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="app-arch/snappy:=
+	>=dev-libs/libbson-${PV}
+	dev-python/sphinx
+	sys-libs/zlib:=
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		dev-db/mongodb
+		dev-libs/libbson[static-libs]
+	)"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-uninstall.patch"
+	"${FILESDIR}/${P}-enable-tests.patch" # enable tests with system libbson
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# copy private headers for tests since we don't build libbson
+	if use test; then
+		mkdir -p src/libbson/tests/bson || die
+		for f in bson-fnv-private.h bson-iso8601-private.h bson-private.h bson-thread-private.h; do
+			cp -v src/libbson/src/bson/${f} src/libbson/tests/bson/ || die
+		done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
+		-DENABLE_BSON=SYSTEM
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=ON
+		-DENABLE_SNAPPY=SYSTEM
+		-DENABLE_ZLIB=SYSTEM
+		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
+		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+		-DENABLE_TESTS="$(usex test ON OFF)"
+		-DENABLE_TRACING="$(usex debug ON OFF)"
+	)
+
+	cmake-utils_src_configure
+}
+
+# FEATURES="test" USE="static-libs" emerge dev-libs/mongo-c-driver
+src_test() {
+	local PORT=27099
+	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+		--dbpath="${T}" --logpath="${T}/mongod.log" || die
+	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
+	kill $(<"${T}/mongod.lock")
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libmongoc/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/mongo-cxx-driver/Manifest b/dev-libs/mongo-cxx-driver/Manifest
index 8294b907d8e8..f1f771f949fe 100644
--- a/dev-libs/mongo-cxx-driver/Manifest
+++ b/dev-libs/mongo-cxx-driver/Manifest
@@ -1,5 +1,6 @@
 AUX mongo-cxx-driver-1.0.0-fix-scons.patch 1345 BLAKE2B 38d257b8a2a73caecf3932706ffaae5517d336ca9fd5cbae75948394deffd74ac233b21c435b371a46f03a594ea95cf2896ac715aedac84a5f39a9d12b9c761c SHA512 24031ed20354c98633887b57f513b0bd891370923fd5e6b9e668610e68875afcb64c01fb4d84dd01ab1629dcbce332f60822aa0ac7a8774cd06277cf02cb95b1
 AUX mongo-cxx-driver-1.1.0-fix-scons.patch 2126 BLAKE2B 78f7d00fa0b7c642854572ddc33856e166920c248e8169ebb204a35c473bc363e0c8edb1a76ac8a0078ace02f90bbe412ca364ec9296c86ada4b47597bd25979 SHA512 1a643dbfa20e1f53bd76b61487b7895daf165139d7264f3c6cee61d7bd30b8a583dee02e63f9c7295cc8a49028075c0f3066b0a57e7e1c4f2eb1a750f2249122
+AUX mongo-cxx-driver-1.1.2-boost-next.patch 482 BLAKE2B 298286d33ad6b5938ce9a79c699a8d782f0e9619e731146a0db57507c135c1b595d273150d782c2cf92f6f777fb549afc166677b60a51ce74f50ab8c6d852ab1 SHA512 e317c89f5f1701ff0b1a14a592bf4d2376955780067f1a84c5f4b6360ab10423635e50c70916edbbefdb29554641f7e10be60030843b449f136be7fcae3e8136
 AUX mongo-cxx-driver-1.1.2-boost-ref.patch 425 BLAKE2B 9bcc37f485e96989692b6ebd489cea8874fd70078fd7862822ce329fff2f3985be3a1383a17bf0876c64ddc35392960435065c70f280c16ba08f8fbf25e06f61 SHA512 613fb5c45c425c2ed2f907ff569741402f2ade0a11a2abb4183b5d05bc18c8b3d8143ac892d99b7561e04e0f74796f5ff7d32c385e78e08ec11415fd24ea697b
 AUX mongo-cxx-driver-26compat-fix-scons.patch 1478 BLAKE2B f69ee015f8b2bfe4149960016ffc34c53e56042115a65e5e88677eecc8382be4a1c6c92950b79e68710f5347310813f04f1914769384874c87b9dd5d2e9cf570 SHA512 3ba454dc193dfe0ab1a3727521a67f46c765a5e6f0a1fc04647d9ad52905899afd4d95ade632a9339fc3a5e5cb14473a812ea4772eecf4456874a49ff25bedd7
 DIST legacy-0.0-26compat-2.6.7.tar.gz 1512331 BLAKE2B 43735ef7be4d5f3094eccedb5ee70f9f9722a174513a10f2f5f7c3c5603766f85e13717ea8c68b935c0ba5914c8e4a9b6e6797cd1a10d0257b654473799070bc SHA512 edf13d5b7802c3b2e9772f08949fd0c412f2cd25ec6d05ff4e8c1f25c3e3506da6ebbd7b017ceec5478585c84e9fa44c66a5094ad3e7a7373187d3fb3c1c1222
@@ -9,5 +10,5 @@ DIST legacy-1.1.2.tar.gz 1577527 BLAKE2B 277e5ed6d6897587d3d9f9681b6821d2cc4bba7
 EBUILD mongo-cxx-driver-0.0.2.6.7-r1.ebuild 2183 BLAKE2B 3312d3ebdb8282595385d0be2c300491be5dfd3c8a36b23fd3f0d813e5053954b084fc4ccc98b73c9fbe63bf4b4f1a45a16cb3e3d46ca16aeb46cd40bc3ba742 SHA512 b1dc255b60e05f8ca56bb5626c256db056751aff967e58beff6f6a8a250fc0b49e2cb6162101161971febdcbb9128cb37a073762df720ae8c1a57d67cf39a9d3
 EBUILD mongo-cxx-driver-1.0.0.ebuild 1585 BLAKE2B 3aca1d81d365d1a5458ea2840ca750d26e47ba4b20b8bd2d02a4ac446aa153c06f838be69ba584eab73b5ce7cdf81566e82c53c438ad337adcb2c134f994e7f4 SHA512 133ab4ce256dbff77333432b4e2c71227a4bda772367629e5bb847393d564e4795ee8bc491181029fb8fa714081a1cdf55c9ad410a88f9c302bd73fa33a42e2c
 EBUILD mongo-cxx-driver-1.0.5.ebuild 1585 BLAKE2B 3aca1d81d365d1a5458ea2840ca750d26e47ba4b20b8bd2d02a4ac446aa153c06f838be69ba584eab73b5ce7cdf81566e82c53c438ad337adcb2c134f994e7f4 SHA512 133ab4ce256dbff77333432b4e2c71227a4bda772367629e5bb847393d564e4795ee8bc491181029fb8fa714081a1cdf55c9ad410a88f9c302bd73fa33a42e2c
-EBUILD mongo-cxx-driver-1.1.2-r1.ebuild 1510 BLAKE2B e753e9dedf0d94757669cb6e6c0f8d98050ffa475b3c30e829a144acdf950674dafc413019fb375f0dec1c4652ef8e66197a439f772da8113715e936f38fbd3f SHA512 1d336516d494e5699ad67bd2765655e9717a240f0d09ddaa33545a480dd2de59ff22e0b92c404e0abce353b307609fe6a91d3a6a414d03976beb968d97b43448
+EBUILD mongo-cxx-driver-1.1.2-r1.ebuild 1551 BLAKE2B 2aed7761319f8c1ca06fdd1fb84dc20af73f515348195e0b0fbf47b91b481bb897ad79a4be61d4f6d4f97df6a736ec5f5973add05cb9045937662ccd8bdb3da7 SHA512 ed99fd1996400bb5f1e3cae23fba9b13231e7f202e75fbd9becb0b88fa3059a331eb3cedbdbe11ea4754f03431155c8b9b1f4bd183b88d5206b11299408918fd
 MISC metadata.xml 336 BLAKE2B 8cd1026c27a1b598e3c49a9c11dbe0dc2a27bbe77b25223d7467ed9778b57743cab62e7703f988933e6a672506c996a1b8d75c71d2e2b306cb362c88a397a11a SHA512 b75e79f4e7e6ae6e596797bed26600142d8ec89bf15a5d71183d09835c3cdb5bcc4cdd625048fe5ba0e3ab04b8c36ae3cb30da97c185f1ee420040103c69ccf0
diff --git a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-next.patch b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-next.patch
new file mode 100644
index 000000000000..68bdc4dc1a4e
--- /dev/null
+++ b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-1.1.2-boost-next.patch
@@ -0,0 +1,21 @@
+Add missing include for boost::next()
+
+https://bugs.gentoo.org/671422
+--- a/src/mongo/client/command_writer.cpp
++++ b/src/mongo/client/command_writer.cpp
+@@ -22,4 +22,6 @@
+ #include "mongo/db/namespace_string.h"
+ 
++#include <boost/next_prior.hpp>
++
+ namespace mongo {
+ 
+--- a/src/mongo/client/wire_protocol_writer.cpp
++++ b/src/mongo/client/wire_protocol_writer.cpp
+@@ -22,4 +22,6 @@
+ #include "mongo/db/namespace_string.h"
+ 
++#include <boost/next_prior.hpp>
++
+ namespace mongo {
+ 
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild
index 4b2e018de535..2dad30753129 100644
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild
+++ b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0-fix-scons.patch
 	"${FILESDIR}"/${PN}-1.1.2-boost-ref.patch
+	"${FILESDIR}"/${PN}-1.1.2-boost-next.patch
 )
 
 S="${WORKDIR}/${PN}-legacy-${PV}"
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index 37ab5569008c..d68c69bcc732 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,3 +1,5 @@
 DIST nanomsg-1.1.4.tar.gz 310182 BLAKE2B d47d270bb1f631e332b6b9c2be1a29aebc2f3e0a2190aba1f4d0ccccbc5415899bd1bda5608dea1510b4ac8b1c8a076c8b6a5d126de6bfc938b54e8a34becd5a SHA512 a1f002f988f2d98eff03387b496fe15a099fef4eb9ccd1c46ade63fbbe5a4ad4cf9fa0fd1e612e1a6f2747bc2af63b7044ec1e920e1c9a0d8c8bc2191ad7046a
+DIST nanomsg-1.1.5.tar.gz 310739 BLAKE2B be3a6c3b8d41373798909f24f49c24018d99454e431dc64105a554021b1b49c8ed4fc6d14adfef315f5defd38d19482ab3a7625ea54fefea0794f149038ddfd4 SHA512 773b8e169a7accac21414c63972423a249164f5b843c6c65c1b03a2eb90d21da788a98debdeb396dab795e52d30605696bc2cf65e5e05687bf115438d5b22717
 EBUILD nanomsg-1.1.4.ebuild 796 BLAKE2B 57d916a6f2f05f8735e2781b6a1b8f0c829880a4d0ada0cf2b6bb902622ab1d819c401641f887184c721b920b24c4e1d42669892dd1d6359fd6337dc34684321 SHA512 ae8902a982fc294c13c6836ca66d9ee93f7c58fe4a9375f43783dfbebccc1611fc62a38bee62711562dd4e5eeb6101dfeb5df76498e18b4b141d92104b189576
+EBUILD nanomsg-1.1.5.ebuild 793 BLAKE2B c0077bec0bdfa4b7052a3500b97380565077303cefc7a83fcf653f816b19d60d42a0ab9c9a50157047cfe516f601f194104d5b6ba7188c2b2b94265a24e3ab83 SHA512 dd8a1b75444685843b2498af1353894021892233a00cdbb117f6923b2b6c3132cab6c3dde2c4c70dd6795a8429195e0f3cee269057c912eeff1d9b2609078902
 MISC metadata.xml 433 BLAKE2B e0f53ba20bd2976c331ffed8c188bd0bb4e90a6c703024ec7de86ca239733d9f080fbc3400e423afdd295d684b4d3b02790d9791c44da066868effc0ac716716 SHA512 3fd07647af6e9d7c4b3996674b0376a22ec9727a86b9e1af89a3a9695d547f36a745b9c448aa1cc57c37f094965ca64524f1ba465b6cf1938f731b0d0caa9d6d
diff --git a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
new file mode 100644
index 000000000000..73f7851f7dd1
--- /dev/null
+++ b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="High-performance messaging interface for distributed applications"
+HOMEPAGE="https://nanomsg.org/"
+SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/5.0.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="doc? ( dev-ruby/asciidoctor )"
+RDEPEND=""
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DNN_STATIC_LIB=$(usex static-libs ON OFF)
+	)
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DNN_ENABLE_DOC=$(usex doc ON OFF)
+		)
+	else
+		mycmakeargs+=(
+			-DNN_ENABLE_DOC=OFF
+			-DNN_ENABLE_TOOLS=OFF
+			-DNN_ENABLE-NANOCAT=OFF
+		)
+	fi
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index b61f3e2a1ae8..706c7de58256 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,3 +1,5 @@
+DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
 DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
+EBUILD nettle-3.4.1.ebuild 1733 BLAKE2B 28564bdcaa9f8b379c5acc98050ff3a019ff12b85a05956acc575be4e5e094b8cae87a86b06bedc5d6561975890a2df0b6c0873839f5ae33130987f0ebc025bb SHA512 c636e48bf6a8a44d3eba3ebbb8c3811cedeab36264c7532f5454a2955b081c41b0fd9f5c17412d55045200e533198febacb859cca392883d388bd42afcd6d441
 EBUILD nettle-3.4.ebuild 1725 BLAKE2B 71eb0b92783f817ab7eeb4c0a29445e65a56b9cb6cc07a7269c3401c34f605bb49589aa999c4e2a35330b4b4dc4a324cd2c860bfcf0164a79118330b40a1160b SHA512 dcfd2513e10dc106274500d3531b1b629ded8ac9c85d37ee5c150a32f2507fc1045d269b394d91b508a991525f271637048937a4ddf9a58613b35dbbfddb32f4
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild
new file mode 100644
index 000000000000..bcd2711cdabb
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
+
+DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/nettle/nettle-stdint.h
+	/usr/include/nettle/version.h
+)
+
+DOCS=()
+HTML_DOCS=()
+
+pkg_setup() {
+	use doc && DOCS+=(
+		nettle.pdf
+	)
+	use doc && HTML_DOCS+=(
+		nettle.html
+	)
+}
+
+src_prepare() {
+	default
+
+	sed -e '/CFLAGS=/s: -ggdb3::' \
+		-e 's/solaris\*)/sunldsolaris*)/' \
+		-i configure.ac || die
+
+	# conditionally build tests and examples required by tests
+	use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# --disable-openssl bug #427526
+	ECONF_SOURCE="${S}" econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-openssl \
+		--disable-fat \
+		$(use_enable gmp public-key) \
+		$(use_enable static-libs static) \
+		$(tc-is-static-only && echo --disable-shared) \
+		$(use_enable doc documentation) \
+		$(use_enable neon arm-neon) \
+		$(use_enable cpu_flags_x86_aes x86-aesni)
+}
diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest
index b05a5e151b4d..9dedf0ab452d 100644
--- a/dev-libs/nsgenbind/Manifest
+++ b/dev-libs/nsgenbind/Manifest
@@ -1,3 +1,3 @@
 DIST nsgenbind-0.6-src.tar.gz 106862 BLAKE2B 9b40ae6298921736f7d876ae664207eb71102adbe44f4072ea46b08b63cb5cf608df4c96f3ade1c8cca964d8d8b32d68aad25431f6fd455eb8392d8313faa9e9 SHA512 3083b48e48fcf8c7f32b09d040998470d5917469e020c4ccbfb8ffdb7d1252fd27dd02f590f5a2485c6984cdbc005ea87adf0db45077aee0a91f68037c542ffb
 EBUILD nsgenbind-0.6-r1.ebuild 682 BLAKE2B fdfacb0d276501a54ae61c71cb449745fe16f03a3021d7dc93acf8b7ca8594c89e5d5c1ce36814f2ee70396b6ed7377c478256c3bfe777d06e3058a037884107 SHA512 6ae5f18ba63b0639d8fe0846969ecd0f5d2a475efee3f06179de3685d916f75c45fb43751fca0c2fba5debe5af5cdbef02df7135ec978e72fec77b0ba64d6e73
-MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
+MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/nsgenbind/metadata.xml b/dev-libs/nsgenbind/metadata.xml
index 68674fe1b802..88de5fc462b1 100644
--- a/dev-libs/nsgenbind/metadata.xml
+++ b/dev-libs/nsgenbind/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index b5aece3decb9..dc0233462d8a 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -9,5 +9,5 @@ DIST nspr-4.19.tar.gz 1139967 BLAKE2B a8358249647a3d0e073f00febc475199d6479e2a34
 DIST nspr-4.20.tar.gz 1140892 BLAKE2B 2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49 SHA512 22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949
 EBUILD nspr-4.13.1.ebuild 3865 BLAKE2B eefd29695e1bf4666d2d3f99193d09566d7bec69cec353779ca612bcddc89d4f8d47607446e6286a6d80dcdbd01e4879546f209f32c2a1379bd04b757ae481b1 SHA512 594efb0fe957e619cb41c90c1d414dbb3d8c24e26cd82ef752e97dc220f2a9ae85048a1bdfac4712b931b265ef27f3108f8837580ed35e3efd401340403f36a4
 EBUILD nspr-4.19.ebuild 3858 BLAKE2B f0e8c816a00279b80002266dd3a1d6423c6ca77e886b3684514ee180ca2dfdbe627e8c001f2f479f54d706f640e8c82e2b1bc63c5c0cf9467d7e251a8e6bddbb SHA512 f835e068933d27ac8d1e0f91b5a2a5121e1ae6c505dbb5654cf64629211c324b9ae45d102062f4b7e4fca09231b5ddedb73008d8873e51284e814f79053f1672
-EBUILD nspr-4.20.ebuild 3828 BLAKE2B 7519ae3ca0b8aed35a452b15d78b04d3351be04868886a5c9b47d58b425d55297c9817e059ebaa90bdbe0f36b62df254b25a6f764f28488fe6a3c0bdbf01b254 SHA512 fb98366322ad9c4b7368d2cf6e64867a756afc1ae43352ee46a99051e796df165f700e9911fbe746fc593dc506d232d1660e20ab2ed63c59f0f8ade00eb3bd2c
+EBUILD nspr-4.20.ebuild 3818 BLAKE2B 4829c48d94a8c401db8fd086646ad6a525685fd0a893deade1010d37813b3730ecc4b0892c328c982d6570a6f09cc3482d3810b1aa775c72fb997db1ea8ebbd4 SHA512 dd99fa518b0015742311bca3808827cc65334174c3505bfd37f86ccb39c014ce28888e8cae2249d834beb5b02851b889d06bc5ffcf898f97f3c93bc8347eb791
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/dev-libs/nspr/nspr-4.20.ebuild b/dev-libs/nspr/nspr-4.20.ebuild
index bd7aae66dbb1..38ff9e61bfc6 100644
--- a/dev-libs/nspr/nspr-4.20.ebuild
+++ b/dev-libs/nspr/nspr-4.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 7dcc81a4919b..b44b1b46e766 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -5,14 +5,14 @@ AUX nss-3.28-gentoo-fixups.patch 5310 BLAKE2B 5f173bc4bba374c8233945293e8e944c5f
 AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03
 DIST nss-3.29.5.tar.gz 7480246 BLAKE2B 9ab16cbbd95aa31358b5b686bee64cd81c8343524dad8aac084f7c86883f1eaead78912dc1021b0461d027b0085356c4b7156f1d80010c3a0ece29d542deef50 SHA512 ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa
 DIST nss-3.37.3.tar.gz 23034239 BLAKE2B 3e30b0fe14501ca0e6b9d14322af73f191164989e6857b9ba46572b7363cdc65c88b672285982f2764ed44fcaf615cb249eea2f45b98050dfc6675003dc74a3b SHA512 11b21818f9fcff11d0e7f4c066ae9fbce0052a30a6b30df9a20022792039b5348554834a472e1b1195e467b9902067f9719678d5ca32efb4e60f1df161feed6f
-DIST nss-3.38.tar.gz 23023474 BLAKE2B 72500827955a25c53124ca6054850beef91868019ba155b70f8268fe79261b71e4f11ab42382241c2855478be7e6def57378cda5f398bf5e25f7fa5c035d630e SHA512 06804163daa08f1f65cfe0e9546ddf066ec7f773aa615431a5952f6c04956dd62425fec38d11037ff7fb02b709de03e5a7637c6ba13de5b7686db4f9ecda52ab
-DIST nss-3.39.tar.gz 23048561 BLAKE2B 74214b6ed23a44a0b6e0d52b9a327f908668079413ee637d172e4f0c7769f252a6c6ecca33215c1865606eaebe4630f31b435f2d40cf1a24ab373874508531b9 SHA512 16358c2d8660ca301410b1d39b2eae64fe2ebbbfab797872410e5fcc67f802ef48f4e362edeecb0591626c77013537019094a6a5dfc8d24487b6b6e54564da8f
+DIST nss-3.40.1.tar.gz 23311074 BLAKE2B 9cd723e983a3f70748b0734bb2a6cc1ddfa280f1c167c3b1b371a58900fb3d9b3bf3482293bb8614d39ffb538bcca815a2aedbe03d2d643731817452f82bc2ca SHA512 464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564
 DIST nss-3.40.tar.gz 23308315 BLAKE2B 02cc3ea9589f888e108bd3a6a99d5f52927bb4c63b2d9e03df88b7c1a188b6f2cd47d281dd5234b141b41684043e71d9fbee8f99223d0f5ae9778a4e1cfaa1ce SHA512 3781c94595126757c95ea82c3134eb3f06f4c3814e9ed2bfceae22623a413d622349d08c6779e1230b2dbebd1f07aba58094fe83dcddebb3e043481e7a478239
+DIST nss-3.41.tar.gz 23319563 BLAKE2B 76636b704cd572f9b840c7699c29697a4a882e66afcc3895ceb7b59a7af7af2513074e1abc6a028a13126d44e0cf722ab29e52a4c69640a2247814292efa282d SHA512 b5a43fe86ded664002fd714c493d9222a64539cd6139b64720625d1742fec5100712cbe401c90c79196e9cbad9ec07d9b4f0f517ce34e4b207beaa3e01c9e114
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.29.5.ebuild 9187 BLAKE2B f2c2a4d1470950405afeb2acdec4443818406ad60f85fd88dd399efaf30b62c7bb2e8d8002cd6c1fb1a7e3e3af6e85c953db10d0e2340d64dbe3dbcce1379219 SHA512 b0244c44bfdaf7f24fb36aaba4c9efea40d4e9439df81981b9f83f5f415aabcab17ed1726f0ab55729b82f8198b4b39c699eef4422259e95262f7a7f69f64802
 EBUILD nss-3.37.3.ebuild 9428 BLAKE2B ff335d4edc83f45859d84cbf10514062adede17c3e5a0931a80125e70fd8e3e415809f1ef1ea4ac2549695bdd626fe56fbc4bca658d7c92f3657b16c32ee72c1 SHA512 57fd38ea8f3a71e8c880358f11f5ea5603a103563d2341ce280d188e3b2451c1bbcc38a6fc2b2ba01b7166a87952dd9922e553595c0851ba9d240e989362c414
-EBUILD nss-3.38.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
-EBUILD nss-3.39.ebuild 9430 BLAKE2B d465d134977270ae52f893c87d3af1e80b999a022e4478009c1313080d07d29e10c8c132e1242e2fdfd43ff0b604835260e7125f1c8fee60a129d8501582dd74 SHA512 99709454db815aef2430f7b80b1321d247424075594941d25f45068fce1afb528e330ba0d9190ac432e17d8153f84ad792c1ee7cc08907cc175db0452984e094
+EBUILD nss-3.40.1.ebuild 9420 BLAKE2B a4e111a7ee9537d9da3e101dd751742fded5e36c1fbdbd05073b5d5629de85c775ccd7fb34836f5ba909ed007f1ae0c6e702e3c0ae18e7dcf388cc9b65c64ec4 SHA512 0d1753ddef862fd85e112822822a9bcd2fa1b043e4e5d308fdd4b69c45524ad2f9104ff48e18465c1428af9a5246dcb65d88125b195166fc68246a62cc4c61c7
 EBUILD nss-3.40.ebuild 9427 BLAKE2B 979ee7a2382bd013c32aabadf6746872088878d5319832cd3d8b3149a55f9f0981126b824236ded714df7170e538ed7632ee575faf7605b2bbbe79be68148557 SHA512 143da8d4a2a5cfe8e6c8bdaab6dffe24745c85953346febfceec46d0e91d9d0fa7dbeedf2459174e4a1d872509ef81353c7721d0845cdb8033714f45e6dfff8c
+EBUILD nss-3.41.ebuild 9427 BLAKE2B 979ee7a2382bd013c32aabadf6746872088878d5319832cd3d8b3149a55f9f0981126b824236ded714df7170e538ed7632ee575faf7605b2bbbe79be68148557 SHA512 143da8d4a2a5cfe8e6c8bdaab6dffe24745c85953346febfceec46d0e91d9d0fa7dbeedf2459174e4a1d872509ef81353c7721d0845cdb8033714f45e6dfff8c
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.38.ebuild b/dev-libs/nss/nss-3.40.1.ebuild
index 3a343d29931e..446703eb372c 100644
--- a/dev-libs/nss/nss-3.38.ebuild
+++ b/dev-libs/nss/nss-3.40.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
 
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/nss/nss-3.39.ebuild b/dev-libs/nss/nss-3.41.ebuild
index dce724d6b8d8..9ce8edd66595 100644
--- a/dev-libs/nss/nss-3.39.ebuild
+++ b/dev-libs/nss/nss-3.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index ab0f47a74d0c..250dd4078421 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,5 +1,7 @@
 DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
 DIST onig-6.9.0.tar.gz 869809 BLAKE2B a60b0f99e3a6cda81f09a4dd1af98d0ca98b9127090723d50f4c22874042719a31bcd23f2e3b1fac1daf62d723b1c8884036b8543c4c83a7fe5e2ad8e4daf625 SHA512 75d0f0406ad4313332a10990157cede5c2738d2b9b6aa780a99d2651f185e1de12dba57c919ee58ccef0633b1d703e67935af5ea4b36895279457a189b8825df
+DIST onig-6.9.1.tar.gz 870525 BLAKE2B 8427b92670545e66deba35dfde0cb0ce346629a188c4adaa3025d0acaa81d2ffd86111be17419ea67b2d5f3fb4387aab0d8d20d70fb2f518ccc0ca165b66207d SHA512 5454c161d2d45f2c992513a695ff586ffa99e44a27d7ac5498370e200adb664bb02f2d8cd7d73e61d467f626d1a9b41d9e6e3051e1ea1a021624f94f7d52975f
 EBUILD oniguruma-6.8.2.ebuild 970 BLAKE2B 5925f193741dfb7f8da7be4389c6bddfc8bb618d537edd2ac9e2477287f18e9997fdf282872b30f846cf92aec1c30fcd1aeb4c6e58cdacb069acf6220ed01602 SHA512 37c46f50bfd281fd331e9f799b7f9957aee3fba71824f69b6e2bb3d7b078125c53976a0c6651956034f47c6dca8a2885939b1334a6719a8d9d44e0265b2b97d2
-EBUILD oniguruma-6.9.0.ebuild 975 BLAKE2B cc8b607f1378f031a424d58557858f3f5941d7f6b66f6e44a32635b1d4eca31f1d46d7998ec607f1099a19239f3536b025c277ce557d7a3a6d6c04ea183cdb99 SHA512 5e06fb40f44205da4ac1ec7ed1c97f121345fab0d49751c368653ebf042a961d983dab3145d2ebe217645fab2c1bcc80d11d911bab5fe3e32bba88673c7880ce
+EBUILD oniguruma-6.9.0.ebuild 968 BLAKE2B 066fb7294194006674cb563e5268c47f4dc68e07ed776c0bdf40861e5cdaa1d366c5a25ca524d4d5d7afa029393d6c0117336053dbc816e56502639289afbf60 SHA512 bab262d0d505da968f7d1e1cf542ed47fd5657bf362b33c9d43d1c80b1221d27f7f762a81f0ccf9b970f0fc01001d8c940f75e260c0c542eb2f2ce72b29bbe62
+EBUILD oniguruma-6.9.1.ebuild 978 BLAKE2B 4a07a3eb8d1d61f09126c71b431e3dad423febc29dcd8434a345931c17469e4530214c8dbc0e96fb8980955606daf4db84be0fdf17a08b78ce1842e7b627f357 SHA512 94fc81c18f9c908b6fc743f7df96f2702e708be2a2dec1eb9d8baba527f5d6e6db2444c57120fd898fe88974b34e71bd66a438a1ecb95bc9ff3f9d138c7f96d3
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.0.ebuild b/dev-libs/oniguruma/oniguruma-6.9.0.ebuild
index 31122f47ac49..ec71399f2df5 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.0.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/oniguruma/oniguruma-6.9.1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.1.ebuild
new file mode 100644
index 000000000000..c37d24a66105
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2003-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+MY_P="onig-${PV}"
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index f050bfdd49be..91f5806721f8 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,5 +1,4 @@
 AUX openobex-1.7.2-version.h.patch 621 BLAKE2B 90ef501688d2313b70d755a5d6233c027eade70870bb135c018eea180993d5138fdaf614fd1cc396a1521a2d522f8d03c132dc3d3c14839664c7021fc2e657b4 SHA512 9c060d3f4af4ca78ccbc931df26311d1e37c1a86279a56358eb468162746ef3e3d6324fd419f9b38c072ae4c1bb0e9df64643b5de0cdb876aff54530daa83262
 DIST openobex-1.7.2-Source.tar.gz 127248 BLAKE2B c0405aef2f15f16e31641f4a60ac01da26c2a61a5114b8f3990f0fcf64bd55c730ff7aa5f524b450c1e6b5653b9616c0861686102594818ba3bdf2314a3c51ff SHA512 22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d
-EBUILD openobex-1.7.2-r1.ebuild 1056 BLAKE2B 44ad7ef4ff2af83f131f0d70c3f2f72ed5b8128a38ef5f4c3bcbf654d598417f07a5ec07af4a700087b7f343979a9c7d7c5cf1b6918b131d69d0ef5f2eb661cb SHA512 00f0761d0dc44805442b99c7440765c0c6b3c187bad5bc9eb009a1cc5d359b3a7889dd5568c673e801e317313f47bdff20f783401f958e188812dd611ca2661d
-EBUILD openobex-1.7.2.ebuild 915 BLAKE2B c54c4903a1c3f03284c1cdfc4cf354147b7c64aa22ea048885f35e3fd9b60ce3f657630e872f5cc390a3f336acf23f753170851d541924a2d408a31c76a1c88c SHA512 dd2b3c22c5fb5815916e2f4a62bd422b2f18d755040f5649de4ba63661f4725efd7a32b450d6b9a7114d82cf52b21823556441a50812b61070f27d01e4717e41
+EBUILD openobex-1.7.2-r1.ebuild 1055 BLAKE2B bf58d40d55db3a9d51a0b032f3342b0ab1c7f6428db4de40aadb242a49f8bac3c5935c2e12a4d1450bbb9531311f4d6a1e138cffca2d71a720061ce62a4d44ce SHA512 1ad98eddb4b2ea6561add36053f42b7713747c96834c0111a68906ccf316ca74931b93f1e724ba1f4dd256c549e75a26e9f9c99d7ecea2ff0062367239369b45
 MISC metadata.xml 550 BLAKE2B 4505f0b70a901fbbf3cebe1a066d4c9275853a7667abf221ff439cb6783f485c5d43a24c8abf05df5757a8578712fffbc8a1ff43e0f16f8f8507417e32654ef2 SHA512 19bbed2e27c2fd9ebf00552d3443d09bb295f81c7637d2d09850d5bfc6128f6f3a7642ae55760c36308f7fe333319d6d8324cde0fc75781d32a486abb32be4fe
diff --git a/dev-libs/openobex/openobex-1.7.2-r1.ebuild b/dev-libs/openobex/openobex-1.7.2-r1.ebuild
index 833af72107fe..edcdf803d0a7 100644
--- a/dev-libs/openobex/openobex-1.7.2-r1.ebuild
+++ b/dev-libs/openobex/openobex-1.7.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="bluetooth doc irda usb"
 
 RDEPEND="
diff --git a/dev-libs/openobex/openobex-1.7.2.ebuild b/dev-libs/openobex/openobex-1.7.2.ebuild
deleted file mode 100644
index b03a5bf4590e..000000000000
--- a/dev-libs/openobex/openobex-1.7.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils udev
-
-DESCRIPTION="Implementation of the OBEX protocol used for transferring data to mobile devices"
-HOMEPAGE="https://sourceforge.net/projects/openobex/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
-IUSE="bluetooth irda usb"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:= )
-	usb? ( virtual/libusb:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P}-Source
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPENOBEX_BLUETOOTH=$(usex bluetooth)
-		-DOPENOBEX_IRDA=$(usex irda)
-		-DOPENOBEX_USB=$(usex usb)
-		# TODO: enable them. patch would be appreciated.
-		-DBUILD_DOCUMENTATION=OFF
-
-		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)/rules.d"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index b6fbc0dc952f..020dee876f7d 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -6,25 +6,31 @@ AUX openssl-0.9.8m-binutils.patch 684 BLAKE2B 35650e98595910d2e6b6fc846b49fecbb2
 AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162a8b931e455f35f9e045372102d1461e3e3fd4cf4e4f544ec06a0b46a573d2009c8decf22678df03707c2487bade64f27b5 SHA512 b8e745ff90e447b000ace9cfd5f746c1bc8f3bb8249064d1d2f1072a1a628f5a89c405c7f384c73f0310f2a2f7af672950a9b7adbc583b1ee94b41d911b8a708
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
 AUX openssl-1.0.2p-hobble-ecc.patch 10875 BLAKE2B fc8240a074f8cc354c5ae584b76b3fc895170e026767d2d99d8bd5e5028614c861dd2b3c7b955c223883062f9a057ee302ae0deecfbbed00ddc53ae8a4d50919 SHA512 29f64bacac4f61071db6caf9d92131633d2dff56d899171888cc4c8432790930ff0912cea90ad03ca59b13ca0357f812d2f0a3f42567e2bd72c260f49b2b59aa
-AUX openssl-1.1.0i-CVE-2018-0734.patch 4386 BLAKE2B bb4b8c6e576d32e3e006a57972350bde37489afae10f4d9dce3164923572a5ecfd9a8db45c15135edab237a98c6d163874b918c49b7bebacf7e89130c64aacea SHA512 3947233cdf3ecac55e139939a4c3328d1eff8c97ccb6fef3ebbc2af147bf814f3ceda5b0430b93f6960e89836512efb8b41bed46e5ee68d15d08dbcc877c6845
-AUX openssl-1.1.0i-CVE-2018-0735.patch 1612 BLAKE2B 44402dc7e1a39f47fb3b359edbd3deeeb2aedba5d6b9b12ff86c93c7e80699f8109b327d94c2a6cf443c8b087ad461d959bd5307b17bfe0ff429d33e4949dc1b SHA512 4f2e586021f049f9c2dd6ee9925568fdd82b0372ddb81172540acd4093c9b033db312ab0a722dfeab918d18405562100d7ed061c986fc1a0f5557ba5445a955f
-AUX openssl-1.1.1-CVE-2018-0734.patch 4382 BLAKE2B 7e2f4ab59fbc1920c28c3aad294c6b3b7cc71ce3aa301917a758d2c0d6081d178dc2888ff6ae36a23de3f00eec762af489d9340c1180e69ab1f1dba01a365c34 SHA512 8f6c5bc15f8e2cf4aa99378c90c7baf767f3c7e155f4ac0b96fd7ee09189754219b7c7ce2bcc34c5f4dbcd34f5052223271c1aa867bdffc03db07aa7d9bd545d
-AUX openssl-1.1.1-CVE-2018-0735.patch 1642 BLAKE2B dffad919b1acd1af05044211b24a71cd4e972e0bd1cea3095610e06e06fafa1f61021a92eb9f8e2d800d20c86c8dc99b783509d124d444f6ff56f24871a8e31e SHA512 754f1290cb91f154e8614e145bea2df29e82cfc87ebb3b9ec506af70b0d8ea6785da8b76e7ac49ecd2e5e975f7d2a93b443acd60d2e8494141911d1afd81d750
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
+DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2-patches-1.6.tar.xz 16004 BLAKE2B 28c7e9a8c8b09a34aa6ed21dec18b04c1d6140276e319cfa99b63db5ae188ca7837c444e8352748ffc86e6df7676534aef2f28788e825ee8207c0f876efb5b7b SHA512 eac9bbbebd8d942707ef385ee466929045bb4698985f7a0fb16f529f2101a246735cc2e654bfbdaa8a178224bb5ac564478a7587e6156cfcbdfe62a719bfb0a3
 DIST openssl-1.0.2p.tar.gz 5338192 BLAKE2B fe4c0e2bf75d47a76e7377c7977be7bcaaa532061ab89ee989786eeb6495295711a29a88bf026c85d9ed55c97e71b0e9c8cf4c29b6e58a3dc56bcff518666823 SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16
 DIST openssl-1.0.2p_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2p_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
 DIST openssl-1.0.2p_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
-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
-DIST openssl-1.1.0i.tar.gz 5453234 BLAKE2B ae6bec9c116769d98a77165b96fb7d201fe2ede8ee98e3cb68eba496cc90a5fae38dbcbb68b824c9eeacb25605aa80c3ccca9b4f00725658da3ad646834b0f9d SHA512 4a9d454031f644a3072a980f4ea20df976f6c5c58178549dfa62fd4dcf1417509e3be517d2ccb265c87688836f2993531b142fc5971bac5c41d33060057627df
-DIST openssl-1.1.0i_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
-DIST openssl-1.1.0i_ectest.c 29908 BLAKE2B b398bafd5d5aea71daa9c3e2749dece9e515950e35547a6191d83987907aae73e090a4b552636af4d1ab2b39f7e3b1ea3fde2012c99f068f9c99d247996c1212 SHA512 e4445f8959b040caca6a7494da2026b840f84348df5d4eab47a68570d274333f62fa0c381955093edd86c857dad98595ffa2980c54afdcf2a8d32f32d0c70450
-DIST openssl-1.1.0i_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
-DIST openssl-1.1.1.tar.gz 8337920 BLAKE2B 266fb97bad4e1e7c0694c67a065d6669560695c92ad8fa10824169288a3fdfb9798faf408274a1e0c4e10a83a12b57367611bf4037dd2ab7ee74d7edab580a7b SHA512 c0284a4fe84bdf765ca5bc5148da4441ffc36392cfecaf9d372af00cf93b6de5681cab1248b6f8246474532155dc205da5ad49549ad7c61c07c917145e7c9c71
+DIST openssl-1.0.2q.tar.gz 5345604 BLAKE2B c03dd92de1cc8941a7f3e4d9f2fe6f8e4ea89eccc58743d7690491fc22cc54a9783311699b008aeb4a0d37cd3172154e67623c8ada6fc8dde57e80a5cd3c5fc1 SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0
+DIST openssl-1.0.2q_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
+DIST openssl-1.0.2q_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
+DIST openssl-1.0.2q_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
+DIST openssl-1.1.0-build.patch 3001 BLAKE2B 8f0ac4be6409b4ec50bec171697da2aebe2688e8ae06bd0dfac8b0c74661d38ebeb0a12bde0ef941b213eee9b85965262213b140636060285dcfb02a3bd14961 SHA512 ec6710e9669ac19e4c6f1286c89a383e7d276a773a2740037f98a8f2dbf18305614e7d30d9ed530923a0e7d10a3776fea2ca77229adc25df13ecad55589a3673
+DIST openssl-1.1.0-ec-curves.patch 5311 BLAKE2B e9ec985adf6f13eb04412158a05da7cbe10be7d64bce73b899152ea379336ece7b7069089ef46993ac301ef850fd46fd0352898e249b2ea9fff5baf20896e5b5 SHA512 c38c4b05195f2b323a07efd8d17335ba2a168a16a59d7941da36568081f1c043da8d2216b7084b0617963635ded9bafeee736ecddbfa251cf0a02e4cba64cdc8
+DIST openssl-1.1.0j.tar.gz 5411919 BLAKE2B 0fbd936f38d30b64bea717a67cd59704c5ce44ee19f377a820f89ba66b9e0a7509cf39e0fb00c104ae6440a6bd811e388239b458ffe685d8601235bab2afb2f1 SHA512 e7d30951ebb3cbcb6d59e3eb40f64f5a84634b7f5c380a588d378973f1c415395e3ab71a9aaff6478a89ec6efcc88f17f1882c99c25dcd18165f1435a51e5768
+DIST openssl-1.1.0j_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457
+DIST openssl-1.1.0j_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b
+DIST openssl-1.1.0j_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
+DIST openssl-1.1.1-ec-curves.patch 7265 BLAKE2B 04725d226c430132cf54afbfaa30a82f8f8bbfd3608823d1d0cd42c3c13f417e90762759da3134d7b0c4373e531925db337b681340f2f284cb2f16a4caef22e3 SHA512 de4d0f1635740c57217836a476c420141c0d34a5f90cbf7957aed7a80e7ac9ca036de2d8448e6bf4c122999e308730575899f61cea6e51ab6825dd04890d75a1
+DIST openssl-1.1.1a.tar.gz 8350547 BLAKE2B 71dae2f44ade3e31983599a491b5efe5da63bbe4f32a2336a8022b282f844a9d898f3b1c3fa825a5973cb16898e8e87fcd73d68e9b602b58f500c3f3e047b199 SHA512 1523985ba90f38aa91aa6c2d57652f4e243cb2a095ce6336bf34b39b5a9b5b876804299a6825c758b65990e57948da532cca761aa12b10958c97478d04dd6d34
+DIST openssl-1.1.1a_ec_curve.c 17938 BLAKE2B d5cbde40dcd8608087aed6ffa9feb040ffadecf0c46b7f3978cc468a9503f0a5ad0a426ea6f8db56f49a64474a508bebdf946e01ebf09adc727675f3b180bcdc SHA512 ec470f6514cb9a4f680b8cbbe02e2bbe71639b288f3429d976726047901d9c50377dfb2737f32429da2fb0e52fd67878a86debb54520e307ee196d97b5c66415
+DIST openssl-1.1.1a_ectest.c 35091 BLAKE2B a9602255ab529751c2af2419206ce113f03f93b7b776691ea2ec550f26ddbecd241844bb81dc86988fdbb1c0a587318f82ce4faecba1a6142a19cf08d40fb2c5 SHA512 7813d9b6b7ab62119a7f2dd5431c17c5839f4c320ac7071b0714c9b8528bda5fda779dbb263328dca6ee8446e9fa09c663da659c9a82832a65cf53d1cd8a4cef
+DIST openssl-1.1.1a_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
 EBUILD openssl-1.0.2p-r1.ebuild 10098 BLAKE2B c440754d7c2b257509cb2796372afb58ac031d7a5bc8125a5cceec9889e3498eb6660610171972e61a1332eb5e130076167cfed3e8dfcda16238ef443db9454f SHA512 0b45aa92749affdc1ed3c7fefecb49f7fc2f92b062b6045dda241b1d28ecddb98fc1767f56c31a0dadd4eaf9d44a2142f3dc6cbc724275fa70db07aab5dcedaf
-EBUILD openssl-1.1.0i-r2.ebuild 9185 BLAKE2B 69c53e057dd900b2cee07b14c155ceb826fad004a831a4556cad4d9b33dc471e6ab0f6d06a9aa8cab320ed82a66ef90923b5029a35f5640b5d9d485adc50901d SHA512 420f428bfcb4f63b62ba312d55abf43d9911a55005b249aba38b0045e7e8a2f227e8dcadff5029bc5fe44547a1673f90d0d36a1ea45a9e3ae76b9615ed0228b0
-EBUILD openssl-1.1.1-r2.ebuild 7970 BLAKE2B 6647ed5b1ecfa49dbe8450fd3480e18a7dee6521363927272596b4b327306ca84a89445f6423899eed2ae4850c068a258dde0e58762694128a0532edbcdabf92 SHA512 026aca158925d9c8a614f27bde17f836e1c155375e31837b1c2be122c9b057210a797f3160553bffc3f941aad49526bf018c66fca0491b94e0c8ca1769c86697
+EBUILD openssl-1.0.2q.ebuild 10267 BLAKE2B b9510245d31d1bbc003d780db91326284deb2610ba665ac85188de48ec2f388fce02172f4a92a70665615c192e5661862d211d6fb39c44a5c0f683ddcf8150fb SHA512 dac2cae56bab167ec7e4464a0c51be0a5184b4f4688e3c5286265c5f65c88baa224d658dd49f7126c81850d6ab614d7251540d6909b3e224772886fa0c5671c0
+EBUILD openssl-1.1.0j.ebuild 9105 BLAKE2B 7eb46a3f3d58b706a815843e4255a37920c249b51a3b819890507352f879839b614f3acd65d7281ddbb1116369fe8e66783c925954c4a2069585ccdde09ecbb2 SHA512 f09eb4a1c0b6504509553a3138cfd05fa215a45204aa5a1d4c60810a2a4d0bff91e6150341a20a8576764c30dcc45cb84ed6a6fdfddc040bd7278ce50b347390
+EBUILD openssl-1.1.1a.ebuild 9280 BLAKE2B 47a9ef1e05899f295bc2ce197821ce19ffbfaed7924be4131d07a6ae285dd339c9ce673b380163bf53b2a13e9e41d97ff4001482ea67754af77f481bd756ffee SHA512 4d1f897d5755ef451b17aa37c57df0c60bf4e5180029990debf060cab9f656100c74f110d6faa1e629b65c4d945e1da72488de1054df9e9133734e6d3626b108
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.0i-CVE-2018-0734.patch b/dev-libs/openssl/files/openssl-1.1.0i-CVE-2018-0734.patch
deleted file mode 100644
index 47b082f4085f..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.0i-CVE-2018-0734.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-CVE-2018-0734
-https://github.com/openssl/openssl/commit/415c33563528667868c3c653a612e6fc8736fd79
-https://github.com/openssl/openssl/commit/ef11e19d1365eea2b1851e6f540a0bf365d303e7
-
---- a/crypto/dsa/dsa_ossl.c
-+++ b/crypto/dsa/dsa_ossl.c
-@@ -11,6 +11,7 @@
- 
- #include <stdio.h>
- #include "internal/cryptlib.h"
-+#include "internal/bn_int.h"
- #include <openssl/bn.h>
- #include <openssl/sha.h>
- #include "dsa_locl.h"
-@@ -25,6 +26,8 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
-                          DSA_SIG *sig, DSA *dsa);
- static int dsa_init(DSA *dsa);
- static int dsa_finish(DSA *dsa);
-+static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q,
-+                                      BN_CTX *ctx);
- 
- static DSA_METHOD openssl_dsa_meth = {
-     "OpenSSL DSA method",
-@@ -180,9 +183,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
- {
-     BN_CTX *ctx = NULL;
-     BIGNUM *k, *kinv = NULL, *r = *rp;
--    BIGNUM *l, *m;
-+    BIGNUM *l;
-     int ret = 0;
--    int q_bits;
-+    int q_bits, q_words;
- 
-     if (!dsa->p || !dsa->q || !dsa->g) {
-         DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS);
-@@ -191,8 +194,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
- 
-     k = BN_new();
-     l = BN_new();
--    m = BN_new();
--    if (k == NULL || l == NULL || m == NULL)
-+    if (k == NULL || l == NULL)
-         goto err;
- 
-     if (ctx_in == NULL) {
-@@ -203,9 +205,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
- 
-     /* Preallocate space */
-     q_bits = BN_num_bits(dsa->q);
--    if (!BN_set_bit(k, q_bits)
--        || !BN_set_bit(l, q_bits)
--        || !BN_set_bit(m, q_bits))
-+    q_words = bn_get_top(dsa->q);
-+    if (!bn_wexpand(k, q_words + 2)
-+        || !bn_wexpand(l, q_words + 2))
-         goto err;
- 
-     /* Get random k */
-@@ -240,14 +242,17 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
-      * small timing information leakage.  We then choose the sum that is
-      * one bit longer than the modulus.
-      *
--     * TODO: revisit the BN_copy aiming for a memory access agnostic
--     * conditional copy.
-+     * There are some concerns about the efficacy of doing this.  More
-+     * specificly refer to the discussion starting with:
-+     *     https://github.com/openssl/openssl/pull/7486#discussion_r228323705
-+     * The fix is to rework BN so these gymnastics aren't required.
-      */
-     if (!BN_add(l, k, dsa->q)
--        || !BN_add(m, l, dsa->q)
--        || !BN_copy(k, BN_num_bits(l) > q_bits ? l : m))
-+        || !BN_add(k, l, dsa->q))
-         goto err;
- 
-+    BN_consttime_swap(BN_is_bit_set(l, q_bits), k, l, q_words + 2);
-+
-     if ((dsa)->meth->bn_mod_exp != NULL) {
-             if (!dsa->meth->bn_mod_exp(dsa, r, dsa->g, k, dsa->p, ctx,
-                                        dsa->method_mont_p))
-@@ -260,8 +265,8 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
-     if (!BN_mod(r, r, dsa->q, ctx))
-         goto err;
- 
--    /* Compute  part of 's = inv(k) (m + xr) mod q' */
--    if ((kinv = BN_mod_inverse(NULL, k, dsa->q, ctx)) == NULL)
-+    /* Compute part of 's = inv(k) (m + xr) mod q' */
-+    if ((kinv = dsa_mod_inverse_fermat(k, dsa->q, ctx)) == NULL)
-         goto err;
- 
-     BN_clear_free(*kinvp);
-@@ -275,7 +280,6 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
-         BN_CTX_free(ctx);
-     BN_clear_free(k);
-     BN_clear_free(l);
--    BN_clear_free(m);
-     return ret;
- }
- 
-@@ -395,3 +399,31 @@ static int dsa_finish(DSA *dsa)
-     BN_MONT_CTX_free(dsa->method_mont_p);
-     return (1);
- }
-+
-+/*
-+ * Compute the inverse of k modulo q.
-+ * Since q is prime, Fermat's Little Theorem applies, which reduces this to
-+ * mod-exp operation.  Both the exponent and modulus are public information
-+ * so a mod-exp that doesn't leak the base is sufficient.  A newly allocated
-+ * BIGNUM is returned which the caller must free.
-+ */
-+static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q,
-+                                      BN_CTX *ctx)
-+{
-+    BIGNUM *res = NULL;
-+    BIGNUM *r, *e;
-+
-+    if ((r = BN_new()) == NULL)
-+        return NULL;
-+
-+    BN_CTX_start(ctx);
-+    if ((e = BN_CTX_get(ctx)) != NULL
-+            && BN_set_word(r, 2)
-+            && BN_sub(e, q, r)
-+            && BN_mod_exp_mont(r, k, e, q, ctx, NULL))
-+        res = r;
-+    else
-+        BN_free(r);
-+    BN_CTX_end(ctx);
-+    return res;
-+}
diff --git a/dev-libs/openssl/files/openssl-1.1.0i-CVE-2018-0735.patch b/dev-libs/openssl/files/openssl-1.1.0i-CVE-2018-0735.patch
deleted file mode 100644
index 5762c04fa340..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.0i-CVE-2018-0735.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 56fb454d281a023b3f950d969693553d3f3ceea1 Mon Sep 17 00:00:00 2001
-From: Pauli <paul.dale@oracle.com>
-Date: Fri, 26 Oct 2018 10:54:58 +1000
-Subject: [PATCH] Timing vulnerability in ECDSA signature generation
- (CVE-2018-0735)
-
-Preallocate an extra limb for some of the big numbers to avoid a reallocation
-that can potentially provide a side channel.
-
-Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
-(Merged from https://github.com/openssl/openssl/pull/7486)
-
-(cherry picked from commit 99540ec79491f59ed8b46b4edf130e17dc907f52)
----
- crypto/ec/ec_mult.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
-index 22bb30ffa1..ff882cce20 100644
---- a/crypto/ec/ec_mult.c
-+++ b/crypto/ec/ec_mult.c
-@@ -177,8 +177,8 @@ static int ec_mul_consttime(const EC_GROUP *group, EC_POINT *r,
-      */
-     cardinality_bits = BN_num_bits(cardinality);
-     group_top = bn_get_top(cardinality);
--    if ((bn_wexpand(k, group_top + 1) == NULL)
--        || (bn_wexpand(lambda, group_top + 1) == NULL))
-+    if ((bn_wexpand(k, group_top + 2) == NULL)
-+        || (bn_wexpand(lambda, group_top + 2) == NULL))
-         goto err;
- 
-     if (!BN_copy(k, scalar))
-@@ -205,7 +205,7 @@ static int ec_mul_consttime(const EC_GROUP *group, EC_POINT *r,
-      * k := scalar + 2*cardinality
-      */
-     kbit = BN_is_bit_set(lambda, cardinality_bits);
--    BN_consttime_swap(kbit, k, lambda, group_top + 1);
-+    BN_consttime_swap(kbit, k, lambda, group_top + 2);
- 
-     group_top = bn_get_top(group->field);
-     if ((bn_wexpand(s->X, group_top) == NULL)
--- 
-2.19.1
-
diff --git a/dev-libs/openssl/files/openssl-1.1.1-CVE-2018-0734.patch b/dev-libs/openssl/files/openssl-1.1.1-CVE-2018-0734.patch
deleted file mode 100644
index dbc379c80d43..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1-CVE-2018-0734.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-CVE-2018-0734
-https://github.com/openssl/openssl/commit/f1b12b8713a739f27d74e6911580b2e70aea2fa4
-https://github.com/openssl/openssl/commit/8abfe72e8c1de1b95f50aa0d9134803b4d00070f
-
---- a/crypto/dsa/dsa_ossl.c
-+++ b/crypto/dsa/dsa_ossl.c
-@@ -9,6 +9,7 @@
- 
- #include <stdio.h>
- #include "internal/cryptlib.h"
-+#include "internal/bn_int.h"
- #include <openssl/bn.h>
- #include <openssl/sha.h>
- #include "dsa_locl.h"
-@@ -23,6 +24,8 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
-                          DSA_SIG *sig, DSA *dsa);
- static int dsa_init(DSA *dsa);
- static int dsa_finish(DSA *dsa);
-+static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q,
-+                                      BN_CTX *ctx);
- 
- static DSA_METHOD openssl_dsa_meth = {
-     "OpenSSL DSA method",
-@@ -178,9 +181,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
- {
-     BN_CTX *ctx = NULL;
-     BIGNUM *k, *kinv = NULL, *r = *rp;
--    BIGNUM *l, *m;
-+    BIGNUM *l;
-     int ret = 0;
--    int q_bits;
-+    int q_bits, q_words;
- 
-     if (!dsa->p || !dsa->q || !dsa->g) {
-         DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS);
-@@ -189,8 +192,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
- 
-     k = BN_new();
-     l = BN_new();
--    m = BN_new();
--    if (k == NULL || l == NULL || m == NULL)
-+    if (k == NULL || l == NULL)
-         goto err;
- 
-     if (ctx_in == NULL) {
-@@ -201,9 +203,9 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
- 
-     /* Preallocate space */
-     q_bits = BN_num_bits(dsa->q);
--    if (!BN_set_bit(k, q_bits)
--        || !BN_set_bit(l, q_bits)
--        || !BN_set_bit(m, q_bits))
-+    q_words = bn_get_top(dsa->q);
-+    if (!bn_wexpand(k, q_words + 2)
-+        || !bn_wexpand(l, q_words + 2))
-         goto err;
- 
-     /* Get random k */
-@@ -238,14 +240,17 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
-      * small timing information leakage.  We then choose the sum that is
-      * one bit longer than the modulus.
-      *
--     * TODO: revisit the BN_copy aiming for a memory access agnostic
--     * conditional copy.
-+     * There are some concerns about the efficacy of doing this.  More
-+     * specificly refer to the discussion starting with:
-+     *     https://github.com/openssl/openssl/pull/7486#discussion_r228323705
-+     * The fix is to rework BN so these gymnastics aren't required.
-      */
-     if (!BN_add(l, k, dsa->q)
--        || !BN_add(m, l, dsa->q)
--        || !BN_copy(k, BN_num_bits(l) > q_bits ? l : m))
-+        || !BN_add(k, l, dsa->q))
-         goto err;
- 
-+    BN_consttime_swap(BN_is_bit_set(l, q_bits), k, l, q_words + 2);
-+
-     if ((dsa)->meth->bn_mod_exp != NULL) {
-             if (!dsa->meth->bn_mod_exp(dsa, r, dsa->g, k, dsa->p, ctx,
-                                        dsa->method_mont_p))
-@@ -258,8 +263,8 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
-     if (!BN_mod(r, r, dsa->q, ctx))
-         goto err;
- 
--    /* Compute  part of 's = inv(k) (m + xr) mod q' */
--    if ((kinv = BN_mod_inverse(NULL, k, dsa->q, ctx)) == NULL)
-+    /* Compute part of 's = inv(k) (m + xr) mod q' */
-+    if ((kinv = dsa_mod_inverse_fermat(k, dsa->q, ctx)) == NULL)
-         goto err;
- 
-     BN_clear_free(*kinvp);
-@@ -273,7 +278,6 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
-         BN_CTX_free(ctx);
-     BN_clear_free(k);
-     BN_clear_free(l);
--    BN_clear_free(m);
-     return ret;
- }
- 
-@@ -393,3 +397,31 @@ static int dsa_finish(DSA *dsa)
-     BN_MONT_CTX_free(dsa->method_mont_p);
-     return 1;
- }
-+
-+/*
-+ * Compute the inverse of k modulo q.
-+ * Since q is prime, Fermat's Little Theorem applies, which reduces this to
-+ * mod-exp operation.  Both the exponent and modulus are public information
-+ * so a mod-exp that doesn't leak the base is sufficient.  A newly allocated
-+ * BIGNUM is returned which the caller must free.
-+ */
-+static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q,
-+                                      BN_CTX *ctx)
-+{
-+    BIGNUM *res = NULL;
-+    BIGNUM *r, *e;
-+
-+    if ((r = BN_new()) == NULL)
-+        return NULL;
-+
-+    BN_CTX_start(ctx);
-+    if ((e = BN_CTX_get(ctx)) != NULL
-+            && BN_set_word(r, 2)
-+            && BN_sub(e, q, r)
-+            && BN_mod_exp_mont(r, k, e, q, ctx, NULL))
-+        res = r;
-+    else
-+        BN_free(r);
-+    BN_CTX_end(ctx);
-+    return res;
-+}
diff --git a/dev-libs/openssl/files/openssl-1.1.1-CVE-2018-0735.patch b/dev-libs/openssl/files/openssl-1.1.1-CVE-2018-0735.patch
deleted file mode 100644
index 295f5dbe8d82..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1-CVE-2018-0735.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b1d6d55ece1c26fa2829e2b819b038d7b6d692b4 Mon Sep 17 00:00:00 2001
-From: Pauli <paul.dale@oracle.com>
-Date: Fri, 26 Oct 2018 10:54:58 +1000
-Subject: [PATCH] Timing vulnerability in ECDSA signature generation
- (CVE-2018-0735)
-
-Preallocate an extra limb for some of the big numbers to avoid a reallocation
-that can potentially provide a side channel.
-
-Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
-(Merged from https://github.com/openssl/openssl/pull/7486)
-
-(cherry picked from commit 99540ec79491f59ed8b46b4edf130e17dc907f52)
----
- crypto/ec/ec_mult.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
-index 7e1b3650e7..0e0a5e1394 100644
---- a/crypto/ec/ec_mult.c
-+++ b/crypto/ec/ec_mult.c
-@@ -206,8 +206,8 @@ int ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
-      */
-     cardinality_bits = BN_num_bits(cardinality);
-     group_top = bn_get_top(cardinality);
--    if ((bn_wexpand(k, group_top + 1) == NULL)
--        || (bn_wexpand(lambda, group_top + 1) == NULL)) {
-+    if ((bn_wexpand(k, group_top + 2) == NULL)
-+        || (bn_wexpand(lambda, group_top + 2) == NULL)) {
-         ECerr(EC_F_EC_SCALAR_MUL_LADDER, ERR_R_BN_LIB);
-         goto err;
-     }
-@@ -244,7 +244,7 @@ int ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
-      * k := scalar + 2*cardinality
-      */
-     kbit = BN_is_bit_set(lambda, cardinality_bits);
--    BN_consttime_swap(kbit, k, lambda, group_top + 1);
-+    BN_consttime_swap(kbit, k, lambda, group_top + 2);
- 
-     group_top = bn_get_top(group->field);
-     if ((bn_wexpand(s->X, group_top) == NULL)
--- 
-2.19.1
-
diff --git a/dev-libs/openssl/openssl-1.0.2q.ebuild b/dev-libs/openssl/openssl-1.0.2q.ebuild
new file mode 100644
index 000000000000..a073a353fb93
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2q.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+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
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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
+# These are ported instead
+#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
+			eapply "${DISTDIR}"/"${i}"
+		done
+		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
+		# 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
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# 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)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#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 || die
+
+	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            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://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 V=1 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() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED%/}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED%/}"/usr || die
+	fi
+
+	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
+
+	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
+	einstalldocs
+
+	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.1.0i-r2.ebuild b/dev-libs/openssl/openssl-1.1.0j.ebuild
index f38621117297..e46218cc4838 100644
--- a/dev-libs/openssl/openssl-1.1.0i-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0j.ebuild
@@ -36,7 +36,7 @@ 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='f27'
+FEDORA_GIT_BRANCH='f28'
 FEDORA_SRC_URI=()
 FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
 FEDORA_PATCH=( $PATCH1 $PATCH37 )
@@ -56,8 +56,6 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-	"${FILESDIR}"/${P}-CVE-2018-0734.patch
-	"${FILESDIR}"/${P}-CVE-2018-0735.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/openssl/openssl-1.1.1-r2.ebuild b/dev-libs/openssl/openssl-1.1.1a.ebuild
index 87d4a44d49a4..5b5bb76c6b75 100644
--- a/dev-libs/openssl/openssl-1.1.1-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1a.ebuild
@@ -28,18 +28,51 @@ DEPEND="${RDEPEND}
 	)"
 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
+PATCH37=openssl-1.1.1-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f29'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( ${SOURCE1} ${SOURCE12} ${SOURCE13} )
+FEDORA_PATCH=( ${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
 )
 
-PATCHES=(
-	"${FILESDIR}"/${P}-CVE-2018-0734.patch
-	"${FILESDIR}"/${P}-CVE-2018-0735.patch
-)
-
 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}"/test/ || die
+		for i in "${FEDORA_PATCH[@]}" ; do
+			eapply "${DISTDIR}"/"${i}"
+		done
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+
+	fi
+
 	# keep this in sync with app-misc/c_rehash
 	SSL_CNF_DIR="/etc/ssl"
 
@@ -133,6 +166,7 @@ multilib_src_configure() {
 	local config="Configure"
 	[[ -z ${sslout} ]] && config="config"
 
+	# Fedora hobbled-EC needs 'no-ec2m'
 	# 'srp' was restricted until early 2017 as well.
 	# "disable-deprecated" option breaks too many consumers.
 	# Don't set it without thorough revdeps testing.
@@ -141,8 +175,9 @@ multilib_src_configure() {
 		${sslout} \
 		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
 		enable-camellia \
-		$(use_ssl !bindist ec) \
-		$(use_ssl !bindist srp) \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
 		$(use elibc_musl && echo "no-async") \
 		${ec_nistp_64_gcc_128} \
 		enable-idea \
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index a43674b5ef37..ab7219de4988 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -9,4 +9,4 @@ EBUILD poco-1.4.6_p4-r1.ebuild 3450 BLAKE2B bf27e0ab8a20a5fa04add798f24e6c2199bb
 EBUILD poco-1.4.6_p4.ebuild 3384 BLAKE2B a14df4b50fac726746d4692ac651e25ecfbfc487a7322d307d145b6e41de501c727e3d5729c6183275809cd8be3817e3f9ca256069abea147b01366c15375466 SHA512 dd0a231de34a03305f756d676ba6bd7e71bb919fac8752028610a4cbdd89807e058b74b1eba0a50b30878190dd42f2ca20cb84ea0cccbcd8cac8659ea9436a41
 EBUILD poco-1.7.6.ebuild 3302 BLAKE2B f1a53d2e9aefc01c2ea7c34d742e0bb974f2961613a887fc6e5a6a182600e9e9387e5581216d2a5529ca7aa65dba3ba2470dd2aa31bae86f2f4e867373ecc1eb SHA512 fc9587211f348abb68a5d94e76d926ae9e74ae840551d2ca493b0cd680d5be1b1193161ee69aa647f63c7a429465cf2dcfd5a0bbd6494e67156d46c796faf07e
 EBUILD poco-1.9.0.ebuild 3302 BLAKE2B f1a53d2e9aefc01c2ea7c34d742e0bb974f2961613a887fc6e5a6a182600e9e9387e5581216d2a5529ca7aa65dba3ba2470dd2aa31bae86f2f4e867373ecc1eb SHA512 fc9587211f348abb68a5d94e76d926ae9e74ae840551d2ca493b0cd680d5be1b1193161ee69aa647f63c7a429465cf2dcfd5a0bbd6494e67156d46c796faf07e
-MISC metadata.xml 2516 BLAKE2B b47d63bb959634ff62322bd2fbbb270d9521a2f7d3a40d75adc10420ca725fa9efba7ca0fa9fd956abffd2b74f093e83453395269c13ca3681ca5c96091310bb SHA512 a85a369be9cff2d225b6bedeba4a8fbaaf5735b811367ca6c213c56ffde6165f4e4fac9018243308d0a6b15ff416298a76738f35db10528c20571d5e71998a47
+MISC metadata.xml 2399 BLAKE2B 51e232e6cc89bc70510d74db1c6bee49039aab297db20572b1fe408cf8148ba43ad17768745283da06d178e46a3b811a9ba600206514fb9ac20d3a35d01de090 SHA512 fc80467849b42aa6ce51582512fc5f6f75b7e6502a90c96b5e6fba1115e347c46d173c77a6054d45c7fb75ec4f40e3e9d89c4c68f806fc8f7be52f9cb9aab66e
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index e115e946586f..a2b0f1f2ac3f 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tommy@gentoo.org</email>
-		<name>Thomas Sachau (Tommy[D])</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>cpp@gentoo.org</email>
 		<name>Gentoo C++ Project</name>
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 86c1515ad09f..f50b7f5e592e 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -11,9 +11,15 @@ AUX protobuf-3.6.1-libatomic_linking.patch 1753 BLAKE2B 50f8ac92dfada973ebcd187f
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
+DIST protobuf-3.6.1.1.tar.gz 4489116 BLAKE2B 4ed5da3dcb56245b3ce2f979142d5e77837e8e1fbc2f0af27be48664b8b7dfa2ec44382cf75678d226dd665c289f81d95bf04c5f2795fcdd759aa8ec630dba1f SHA512 df59ed966047471d7296883a4500d657eee5e7d8713dd7e44f3f2e0b8c4400e85cb511b316f2fa8518620f1074fd0cad8ee9538c063ac371d6b59358de81ee88
+DIST protobuf-3.6.1.2.tar.gz 4490331 BLAKE2B be5fac5a38369b21941c3c615a97cf35d05a24ee03536b6ea6c1c797a82a0a7f8ecc3630b62af7728f063c850c4faac8ae670171a18bacd44e2a2fb38b2e6fce SHA512 557ffb1216f663df94a16cd8e51e20acf42378913d656f56402c6653cb58ce6a83f77a6050bd846460c7dcac59bb41ad03ac003b0b06250df6a97fd17f8a2c7c
+DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
 EBUILD protobuf-3.5.1.1.ebuild 2621 BLAKE2B f5d279625735d30a1025c414b20f60dd0385c7d8449fde3e45e6540fc1dcc90614c7e5d3c22c26ef89e7c0374f112ea84a5702ef679d01448923bfccb3364133 SHA512 fe1689582cbd86d2cb31bf85e44a1968524350b7fe62d2f97b20ec368e3046d567c746c26d7d773cba6f1d498f2527ad59dbb749e738458912e90b8b44d7e070
-EBUILD protobuf-3.5.2.ebuild 2491 BLAKE2B 7d13d39cca5329ea99664f9ebc22c38d5a88f013e0e8dabe7f8a8b4229b993943a7cba2cdb81c28e3070e9fc5a652185d17e988efc32883da34615a1453dd198 SHA512 5f4aa9d253c246d6420badffb87eb66939c3e2faf765426da34c85977431341e2ae7b9aac2595cbd24d1ae8be9ec836771b02e66508af84b74ddc0d695c3418d
+EBUILD protobuf-3.5.2.ebuild 2490 BLAKE2B ce32a12becfa87d89686be239ba8231aae5cd3b7ac2392b88985d4f9474378e5409274be69e139bbcdf9a5bd7f6ccab5e3c39dc1240e7b5cd3aff9851520aa31 SHA512 b1269cc5d0bbf8e5bb5b6e9410b0ea2d4c4c1c9d50203edb5b3e73b2d40c636f50ca180f67a9eb0f90e2f583f1a6480a141e176bb924669de5d0f43332a1cd60
 EBUILD protobuf-3.6.0.1.ebuild 2491 BLAKE2B 00444b7406baff1560defc88f3e3cde102cd24db454684fb2a919141fae3ba9000486b062f9a8128e0627930794af0f825555526d5a822363d944f2d064c7c52 SHA512 98ebec7694e6a0a47fa98b52371f74ca538f00ae649973e82eed51e4a3600e44c385a028dc3156c0a6c2232a305e317a95b389249090ebba6c77f77375ce49c1
-EBUILD protobuf-3.6.1.ebuild 2535 BLAKE2B ec0c2b742d6fdaae054a048a67a1e1f45e6051366b0834763a4acbb778d88b4b714b3d026918a3380ab9273a6a65eff5f432758bdc9b19adcc8b6fd37360ad3b SHA512 18edbb3423147d350103fb6c182e4a10584b2cb3b8a162dd23c7640a3ccd48ddddf0b1b94e5c5ca5dee8b037a8016d2bfbb5a441d24376c70028eb12a2921d45
+EBUILD protobuf-3.6.1.1.ebuild 2643 BLAKE2B 1a310c148f1b997319700f1f264337ffb4af2d201c509ce5a834767aece1255707f6d167dc5ac56f0c158c288ce7b7ccf717e2ae34bd727c9d2c2bdeea4dedb3 SHA512 d63065c8833053e8c9702fda577249a0dcd9491b2dd8d9165e90f44a1b6d812f693262cc0c996bfb18ba0f4b7be643825627347ffc19c7bdfc7baff698be1723
+EBUILD protobuf-3.6.1.2.ebuild 2643 BLAKE2B 1a310c148f1b997319700f1f264337ffb4af2d201c509ce5a834767aece1255707f6d167dc5ac56f0c158c288ce7b7ccf717e2ae34bd727c9d2c2bdeea4dedb3 SHA512 d63065c8833053e8c9702fda577249a0dcd9491b2dd8d9165e90f44a1b6d812f693262cc0c996bfb18ba0f4b7be643825627347ffc19c7bdfc7baff698be1723
+EBUILD protobuf-3.6.1.3.ebuild 2643 BLAKE2B 1a310c148f1b997319700f1f264337ffb4af2d201c509ce5a834767aece1255707f6d167dc5ac56f0c158c288ce7b7ccf717e2ae34bd727c9d2c2bdeea4dedb3 SHA512 d63065c8833053e8c9702fda577249a0dcd9491b2dd8d9165e90f44a1b6d812f693262cc0c996bfb18ba0f4b7be643825627347ffc19c7bdfc7baff698be1723
+EBUILD protobuf-3.6.1.ebuild 2538 BLAKE2B 3ff47d7d57c9cf22c31aaad4c11ed8ffd93f52da92cce924419c7c55e36035a81d67ddc65c205cc9e2ae61b8dddaa9d3f7d93a008f223c7a595b65746c67b2b6 SHA512 8625c37b0a32138e8924e3885465c6fddbf779e4cd6740abc0dff74aed0c7dd210432517e6409c5696b6adf5c0ede3b0c1fdc5cb6bac3dcce63a9b6e1b6292ff
 MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983
diff --git a/dev-libs/protobuf/protobuf-3.5.2.ebuild b/dev-libs/protobuf/protobuf-3.5.2.ebuild
index eb1466f8f448..0ed30529f285 100644
--- a/dev-libs/protobuf/protobuf-3.5.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/protobuf/protobuf-3.6.1.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.1.ebuild
new file mode 100644
index 000000000000..1d00ee9032f4
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.6.1.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2008-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( virtual/emacs )"
+DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( virtual/emacs )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.6.1.2.ebuild b/dev-libs/protobuf/protobuf-3.6.1.2.ebuild
new file mode 100644
index 000000000000..1d00ee9032f4
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.6.1.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2008-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( virtual/emacs )"
+DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( virtual/emacs )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.6.1.3.ebuild b/dev-libs/protobuf/protobuf-3.6.1.3.ebuild
new file mode 100644
index 000000000000..1d00ee9032f4
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.6.1.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2008-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( virtual/emacs )"
+DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( virtual/emacs )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild
index 03a40a241cd2..247140feda22 100644
--- a/dev-libs/protobuf/protobuf-3.6.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index ad3537555dc3..e5fc16ef9c61 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -1,6 +1,6 @@
 AUX rapidjson-1.1.0-gcc-7.patch 1393 BLAKE2B 71affc72ebbf714788e243b75f9157e9423dcc34eb43efb3479125e2e269c6fcdcfc4d9e9334979b3f5463d97e241dfa3f335d893729282109ce6c768023ec92 SHA512 4f24f37a3c106698b871438675f2b06f2389d724ab8484a616586b5810aec5d8bd11eed759772affa627493314d3f47757af3a54519f3659df1d218cd12c3cd9
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
-EBUILD rapidjson-1.1.0-r1.ebuild 928 BLAKE2B 58b31a00fb60325f6b2c19c5d2474719fe01052a7c69a53c981b6cb25cf54590eeecd6eb1b2d84e4f9bbccc3d6df0768e7f3589c4dbb4d8ff4c04933f4b81dc0 SHA512 4f3ba11af1b48a12b0467da686799285ea738393e4e53a31c77e279cee24a0edf6def7a46220960a71a0a1d59e9c55a108e4390a8b0c17fdc43e1dbaaad9b3a7
+EBUILD rapidjson-1.1.0-r1.ebuild 923 BLAKE2B ece3e7d08b89eafed0c5053a1f738e258b412e3aaf7e17401364e6bbf0023c3f6088539f475c6faf8fe53e8bf612409ecf19f2c1c8e6faeef6b653699428638a SHA512 0c9252994256e608581fe78bca59db2b354ab6c96537bb69f51f4eff88ff769f6b51b074f7faa03aa972a39e170caf84d6f661934d1cb14cdfda8eb6a35c8a4e
 EBUILD rapidjson-1.1.0.ebuild 883 BLAKE2B 9ef8ad122d007cf254f5b2ec2f0a19c5f2d79ef0b0d6a210e0f97131caa119a00231d165403c5040fa920e9d88b847474858278923f4bad30f6d28e848defa90 SHA512 622cf41a55c0a773125638e63f7b99d05bebd6e2ad6a20d3c553e37186753284f5ec75e77235519539856817b9c443fb97e5c568da0b1701e4f8d5bf3ca507c9
 EBUILD rapidjson-9999.ebuild 903 BLAKE2B f74b1efc8dac82f78ff03ab11332bc22c296cf722a8d0cbfc5069fe5572657adb05682123b531a6f1657abdbe821e121cb0bafc4aa343343ed59b152f945cc17 SHA512 5902cae652090ec736e2e79f54c63c75029772f11b763dd1e9e32858fb454649c612b311cd0ca8f20b39d80f2a860b97f6ef47936c6b5dd65e17bee1ad6a3dc9
 MISC metadata.xml 395 BLAKE2B acf0adcc9af1a50757d72f4b52d73c2481fda7bb48ebf2b71e7440c81788e1633b45a4af9ee0adbc1984b0667207706d162e1bdb7177ce8f4e85b819f789b708 SHA512 678196ecc89abed8aa3c1699844573b78103f1ee77dd193b68ad1ae1d5518cd46469b0a5850b00a201c41be381c730ced2aec79f8d4230cf61419b3a20a88935
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild
index d7e3fee0fe8c..3566ee541f7b 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/rapidjson-${PV}"
 fi
 
diff --git a/dev-libs/rasqal/Manifest b/dev-libs/rasqal/Manifest
index 08ab4e5ab6f1..1d32240d5595 100644
--- a/dev-libs/rasqal/Manifest
+++ b/dev-libs/rasqal/Manifest
@@ -1,5 +1,3 @@
-DIST rasqal-0.9.32.tar.gz 1544623 BLAKE2B c94833d2906fc211d743d63a52478e6acc9f26c7528beb1bea0ec8c365b5d13e6ac85e57b75b920d1ccb5768112d06cf615212c7bf248120671730c5095b3c88 SHA512 071f5ff30a1271bdd747cab7991a34c75f9c0132e81d7662acb13a2e380b98c325a9b2998f6a08a393251623680074a76f58f70bdd93b5c1416779aacc7be428
 DIST rasqal-0.9.33.tar.gz 1595647 BLAKE2B 87bca86b2f0dceb0801f5a34dae9ae1f87d8a7d0dc1e03fdf04998a0d4885ed76be2719d3e01489a5510a26715bb093a75ce194cc42f3cedff88f64161d6a2fb SHA512 05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522
-EBUILD rasqal-0.9.32.ebuild 1923 BLAKE2B da3d291be1ec4e166366babaf6f674e0625f636dd387eb54ce3a7be8aba2b7434425b03aacaaa1ade21a45ce3c03a6d45ab91573ccb931bd08d9d59ce7f3e86f SHA512 f8d876154ce4b8847c067776d2fd8d48cae9eac11fceb14d9a15994ebb3e461f9a0226e55388387692f13493098fd670ba5c2f3cd87585056aecf696cb743948
-EBUILD rasqal-0.9.33.ebuild 1716 BLAKE2B 808918c3451963403416cd28123c939739ec19fccf9a91519b17ddc106ec8ffd847fd3ad10074fe8261818c1941d596fb22b5c16109e25d0258084baf72c9302 SHA512 ebedd3925a9e42029db260f393ba87c34267db188e6cde7286c1cb2aa3401acad84432af3a9ee2eef20afb652524ad5ceda8e8075d92b32c065131f1f5e35b73
+EBUILD rasqal-0.9.33.ebuild 1711 BLAKE2B d99e0d6bb23ad11e15bdf1812d91e6ba765d115ee003ca99b60458c69825ed2685bd27fdf8876d829e873812818e305547cde413c56a4c9daed38d4fd3c486ff SHA512 577e77820ebb1df1254f6ad559e4091e4f4ecc6d3dc543d9f1378c79ac262a33611ac5fba50fcb9a0b1ffd6fd39e46d4309a28ee11693c4fb82d59a372f26422
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/rasqal/rasqal-0.9.32.ebuild b/dev-libs/rasqal/rasqal-0.9.32.ebuild
deleted file mode 100644
index 2400b22d3e4d..000000000000
--- a/dev-libs/rasqal/rasqal-0.9.32.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils libtool
-
-DESCRIPTION="library that handles Resource Description Framework (RDF)"
-HOMEPAGE="http://librdf.org/rasqal/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
-
-RDEPEND=">=media-libs/raptor-2.0.14
-	kernel_linux? ( >=sys-apps/util-linux-2.19 )
-	pcre? ( dev-libs/libpcre )
-	xml? ( dev-libs/libxml2 )
-	!gmp? ( dev-libs/mpfr )
-	gmp? ( dev-libs/gmp )
-	crypt? (
-		!mhash? ( dev-libs/libgcrypt:0 )
-		mhash? ( app-crypt/mhash )
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-3
-	>=sys-devel/flex-2.5.36
-	virtual/pkgconfig
-	test? ( dev-perl/XML-DOM )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	elibtoolize # g/fbsd .so versioning
-}
-
-src_configure() {
-	# FIXME: From 0.9.27 to .28 --with-random-approach= was introduced, do we
-	# need a logic for it? Perhaps for dev-libs/gmp?
-
-	local regex=posix
-	local decimal=mpfr
-	local digest=internal
-	local uuid=internal
-
-	use pcre && regex=pcre
-	use gmp && decimal=gmp
-	use kernel_linux && uuid=libuuid
-
-	if use crypt; then
-		digest=gcrypt
-		use mhash && digest=mhash
-	fi
-
-	econf \
-		$(use_enable pcre) \
-		$(use_enable static-libs static) \
-		$(use_enable xml xml2) \
-		--with-regex-library=${regex} \
-		--with-digest-library=${digest} \
-		--with-uuid-library=${uuid} \
-		--with-decimal=${decimal} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	dohtml {NEWS,README,RELEASE}.html
-	prune_libtool_files --all
-
-	# https://bugs.gentoo.org/467768
-	local _rdocdir=/usr/share/doc/${PF}/html/${PN}
-	[[ -d ${ED}/${_rdocdir} ]] && dosym ${_rdocdir} /usr/share/gtk-doc/html/${PN}
-}
diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild
index 1e2e41e7f79a..9707a9ad8aa7 100644
--- a/dev-libs/rasqal/rasqal-0.9.33.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
 
 RDEPEND="
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 9f806dbf005a..ca60d60b0d2f 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -8,5 +8,5 @@ EBUILD re2-0.2016.05.01.ebuild 1202 BLAKE2B 0594d59305793044b9fed2d0570a6c68c538
 EBUILD re2-0.2016.11.01-r1.ebuild 1305 BLAKE2B 8bc950fb1337eeb4f811b3a3a7435b28dce8ec9dad238095a2b19457eced7585ddf64e32844e7970e50b87f3fb913f5dcc9d7529094055e4e1a299ed75950c75 SHA512 a5ef7207e94fc73bcbc4fdd809fa3ed580c9ec0880e073124986a4bdbca7e726be0c122fe7b6f384db8a0ca654645c9fadfb16e3f035e78a1c74e6bca80850c9
 EBUILD re2-0.2017.03.01.ebuild 1305 BLAKE2B 8de6b4e1d07af2677a77755753ff474d818373c0be13008c326972de4cb02b949eb923b1c0353dc0130753d563f6deef1fc54104d32bbcc2c16f676c3afa27ad SHA512 bda266f9e96eec73858ad9c7e0f91f327c216e3d6044bd07abf58dfdf822313e6e7f7b9129b852e0b1ca4ae2bc8ad9c4a38e89e200bac433efd180fc2e7abf60
 EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff815933859635e6296570a5783d03b02b221f560ccce8582e2635614f29c379f34e2b375480c06e0d14fe114aa43a15d2b SHA512 c4af6a5638e487c3ce981649ef8ccb30dbf4cf59cd21f06dfef2af8ac0bfa69eb13d11bb9b64b9d575adf15d84fd57163a37dc439abb15086924aad6b54a821d
-EBUILD re2-0.2018.10.01.ebuild 1312 BLAKE2B b900d7db4b5d2e8389fe9b4368d1e59b8161577bb63f14ff4be0c93ddbeba5a80b80d2802191985eac10fbe003d8193039ed8b28acee55ff8243fede1e477a8c SHA512 0f094160180d99097666322e7d68c6ce06f00392f9e53844926593a00e11a9a2484fa5a7486d8dfae27c49b8d00e1ce8c380f466f8a77a9823ebaa6b5842fb94
+EBUILD re2-0.2018.10.01.ebuild 1310 BLAKE2B 47ba1d9df5d3ebf9f24119f26129fee29fe576026c9a0abc62a399b556addc838277c589fdf03d83d66dd37cf4b4edfe0676e0a7b1f06bff75df6d9ffe3fd81a SHA512 ba5c57e03316309a399cf69f354e369ec479ee55fecadbc93aef7df1c526471597407945fd752a780237b7cc2392bde634a7bfa77251e8255d403d6180cd6178
 MISC metadata.xml 337 BLAKE2B a584c0de18fba97bedbfc3589eb7e35d2f9f794946f8161c50e807e6ed8dc90631b9aecf3f20b6e04bc27b4b5f92e9044221a50a92f8ed61052794392a0f68e8 SHA512 5dbef91cae8363700badc73e352829c4e4e8265bdb96104136c3759d1731148b7260840b4319116ceac00aa9ba17de6eafa2cf9684878b7e9f032469b6f2fec0
diff --git a/dev-libs/re2/re2-0.2018.10.01.ebuild b/dev-libs/re2/re2-0.2018.10.01.ebuild
index 641a25172807..faed8349d095 100644
--- a/dev-libs/re2/re2-0.2018.10.01.ebuild
+++ b/dev-libs/re2/re2-0.2018.10.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="gentoo-2017-03-01"
 SLOT="0/${SONAME}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="icu"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index cf6b5744ee28..8693105186ce 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,8 +1,3 @@
-DIST redland-1.0.15.tar.gz 1600090 BLAKE2B e655860230459afafaad549d0403c0c439a744bc8f8168e8abf498d52988f716d1b719be25d8ef034008fda8194bcaaa4c0c46230d2bff84b6a046ff150b464b SHA512 94b8806d0c5b8ff5c394bc6825c1347efe609a2d7a72f9346fc88b15094938e69b482d28ca8a4eea64876a6afdf6c3b60275c987a617cc498cf19d6fbc53950b
-DIST redland-1.0.16.tar.gz 1624112 BLAKE2B cee6c1b4ca07e2758be57b63a47a2d1b63e0db46ff26aad3a2779b7f64fe2bb147dbcd924142eb46614f249bce78f3b760f2dfc4b0de8f9c956f5696c5df6045 SHA512 16a57569d00f8bbfda9e90d93d686e6f51b14f066f013c9757f2b372d7b23c58fe0ba172953f8affe73c8d804e966566dc38401caca46cee2a8b091019828457
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.15.ebuild 2035 BLAKE2B 32b6c160e8e0a060e710e214494c5a0302121c6ebd09eb361b9a771d2c6e1747bf334ab50260bd1a5575240a4bbf94d9fd84b091769240f4d7836672e0b4a6d2 SHA512 15d93fbeced1dcd4b97df929afc06ed1603ac84891e9c71d8dc919364f11b670827abb9ad6e642ff5cd73cde9f35d85abce7ecd67b44d96b1c321cb176e052d6
-EBUILD redland-1.0.16.ebuild 2381 BLAKE2B ff6c344a517ebe2715fea5d02fc80171021b9980b6acc0a8a52022e9fb23b59555ee7d0465d3f715f62450c5f36f70b14e3e452cbafb0e67201fa2c319bcc066 SHA512 fe1b176d738e8875379e32e03f540c389c89d45937b86a850f25f2450b8f5dd0318efe828357bb1352a0f3e81289f672808ebb34be8a5863d868ebcf1b28cb86
-EBUILD redland-1.0.17-r1.ebuild 2465 BLAKE2B 9e51a587e8a261690b6618a3582b13348024f662878ed78af00eb1a853e82350e85ffb6833055e09fec1bfbe57a0d0cd2d062635a41d8cc3e56a845030d28620 SHA512 6dfccc33a0c499c6caa93392fa1d8fcf7ad43661f4da4f01dac6aa2eb9289c7bfbb815333467ebb2afa66ba1242c016f9d2e129af0e298f67d4b7b2bef23c71c
-EBUILD redland-1.0.17.ebuild 2468 BLAKE2B 1213656b2309c86f3e0a0122a6462c02183d8ea8e2b66c921b7cbefd16f27b2353ea510238b5c8171f83c1c4d63fe11a1cd37a5e6a8b18b142198cee1cd9f9db SHA512 157f178cdc5ab1af0a7bf5ed3b10017a01c3f4e11a9376b3d7414af02fb5b917943d310470acc7e816415c0fd34d3165d27f83093b7d6466174bc28aa65d6841
+EBUILD redland-1.0.17-r1.ebuild 2464 BLAKE2B bed3fcba31401116c045a440fb1aab2196c25ad3070eaf0a11683087fea07d0e6998c612c034c6bfefeff5adbc12b87c69ef207585fbff9f2880aaf775ddf249 SHA512 f2975cf0c971b53381f5a7fbd54292812a2bdc8e96982069ede430de93b174c27f2404b26209aa45ebf6c15d1ee545cf78fa03f241f34a3e8b01b49fd25e9258
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/redland-1.0.15.ebuild b/dev-libs/redland/redland-1.0.15.ebuild
deleted file mode 100644
index a2881c810b0a..000000000000
--- a/dev-libs/redland/redland-1.0.15.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit libtool
-
-DESCRIPTION="High-level interface for the Resource Description Framework"
-HOMEPAGE="http://librdf.org/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="berkdb iodbc mysql odbc postgres sqlite ssl static-libs +xml"
-
-RDEPEND="dev-libs/libltdl:0
-	mysql? ( virtual/mysql )
-	sqlite? ( =dev-db/sqlite-3* )
-	berkdb? ( sys-libs/db )
-	xml? ( dev-libs/libxml2 )
-	!xml? ( >=dev-libs/expat-2 )
-	ssl? ( dev-libs/openssl:0 )
-	>=media-libs/raptor-2.0.7
-	>=dev-libs/rasqal-0.9.28
-	postgres? ( dev-db/postgresql )
-	iodbc? ( dev-db/libiodbc )
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	elibtoolize # NOTE: this is for fbsd .so version
-}
-
-src_configure() {
-	local parser=expat
-	use xml && parser=libxml
-
-	local myconf="--without-virtuoso"
-	if use iodbc; then
-		myconf="--with-virtuoso --with-iodbc --without-unixodbc"
-	elif use odbc; then
-		myconf="--with-virtuoso --with-unixodbc --without-iodbc"
-	fi
-
-	# FIXME: upstream doesn't test with --with-threads and testsuite fails
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with berkdb bdb) \
-		--with-xml-parser=${parser} \
-		$(use_with ssl openssl-digests) \
-		$(use_with mysql) \
-		$(use_with sqlite) \
-		$(use_with postgres postgresql) \
-		--without-threads \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		${myconf}
-}
-
-src_test() {
-	if ! use berkdb; then
-		export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
-		export REDLAND_TEST_CLONING_STORAGE_NAME=test
-		export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'"
-	fi
-	default
-}
-
-src_install() {
-	default
-	dohtml {FAQS,NEWS,README,RELEASE,TODO}.html
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/dev-libs/redland/redland-1.0.16.ebuild b/dev-libs/redland/redland-1.0.16.ebuild
deleted file mode 100644
index f83ab05da876..000000000000
--- a/dev-libs/redland/redland-1.0.16.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit db-use libtool
-
-DESCRIPTION="High-level interface for the Resource Description Framework"
-HOMEPAGE="http://librdf.org/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs +xml"
-
-RDEPEND="dev-libs/libltdl:0
-	mysql? ( virtual/mysql )
-	sqlite? ( =dev-db/sqlite-3* )
-	berkdb? ( sys-libs/db )
-	xml? ( dev-libs/libxml2 )
-	!xml? ( >=dev-libs/expat-2 )
-	>=media-libs/raptor-2.0.7
-	>=dev-libs/rasqal-0.9.28
-	postgres? ( dev-db/postgresql )
-	iodbc? ( dev-db/libiodbc )
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	elibtoolize # NOTE: this is for fbsd .so version
-}
-
-src_configure() {
-	local parser=expat
-	use xml && parser=libxml
-
-	local myconf=( --without-virtuoso )
-	if use iodbc; then
-		myconf=( --with-virtuoso --with-iodbc --without-unixodbc )
-	elif use odbc; then
-		myconf=( --with-virtuoso --with-unixodbc --without-iodbc )
-	fi
-
-	if use berkdb; then
-		myconf+=(
-			--with-bdb-include="$(db_includedir)"
-			--with-bdb-lib="${EPREFIX}"/usr/$(get_libdir)
-			--with-bdb-dbname="$(db_libname)"
-		)
-	fi
-
-	# FIXME: upstream doesn't test with --with-threads and testsuite fails
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with berkdb bdb) \
-		--with-xml-parser=${parser} \
-		$(use_with mysql) \
-		$(use_with sqlite) \
-		$(use_with postgres postgresql) \
-		--without-threads \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	if ! use berkdb; then
-		export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
-		export REDLAND_TEST_CLONING_STORAGE_NAME=test
-		export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'"
-	fi
-	default
-}
-
-src_install() {
-	default
-	dohtml {FAQS,NEWS,README,RELEASE,TODO}.html
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	# !!! REMOVE THIS ON VERSION BUMP, see bug 468298 for proper fix !!!
-	if [[ -n ${LDFLAGS} ]] ; then
-		sed -i \
-			-e "s:${LDFLAGS} ::g" \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/redland.pc || die
-	fi
-}
diff --git a/dev-libs/redland/redland-1.0.17-r1.ebuild b/dev-libs/redland/redland-1.0.17-r1.ebuild
index 5498592ffbf4..5b01d60bcae8 100644
--- a/dev-libs/redland/redland-1.0.17-r1.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/redland/redland-1.0.17.ebuild b/dev-libs/redland/redland-1.0.17.ebuild
deleted file mode 100644
index 5558ad0e9032..000000000000
--- a/dev-libs/redland/redland-1.0.17.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit db-use libtool
-
-DESCRIPTION="High-level interface for the Resource Description Framework"
-HOMEPAGE="http://librdf.org/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
-
-RDEPEND="dev-libs/libltdl:0
-	mysql? ( virtual/mysql )
-	sqlite? ( =dev-db/sqlite-3* )
-	berkdb? ( sys-libs/db )
-	>=media-libs/raptor-2.0.14
-	>=dev-libs/rasqal-0.9.32
-	postgres? ( dev-db/postgresql )
-	iodbc? ( dev-db/libiodbc )
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-MAKEOPTS="${MAKEOPTS} -j1" #500574, required for both src_compile() and src_install()
-
-src_prepare() {
-	elibtoolize # NOTE: this is for fbsd .so version
-}
-
-src_configure() {
-	local myconf=( --without-virtuoso )
-	if use iodbc; then
-		myconf=( --with-virtuoso --with-iodbc --without-unixodbc )
-	elif use odbc; then
-		myconf=( --with-virtuoso --with-unixodbc --without-iodbc )
-	fi
-
-	if use berkdb; then
-		myconf+=(
-			--with-bdb-include="$(db_includedir)"
-			--with-bdb-lib="${EPREFIX}"/usr/$(get_libdir)
-			--with-bdb-dbname="$(db_libname)"
-		)
-	fi
-
-	# FIXME: upstream doesn't test with --with-threads and testsuite fails
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with berkdb bdb) \
-		$(use_with mysql) \
-		$(use_with sqlite) \
-		$(use_with postgres postgresql) \
-		--without-threads \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		"${myconf[@]}"
-}
-
-src_test() {
-	if ! use berkdb; then
-		export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
-		export REDLAND_TEST_CLONING_STORAGE_NAME=test
-		export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'"
-	fi
-	default
-}
-
-src_install() {
-	default
-	dohtml {FAQS,NEWS,README,RELEASE,TODO}.html
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	# !!! REMOVE THIS ON VERSION BUMP, see bug 468298 for proper fix !!!
-	if [[ -n ${LDFLAGS} ]]; then
-		sed -i \
-			-e "s:${LDFLAGS} ::g" \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/${PN}.pc || die
-	fi
-
-	# https://bugs.gentoo.org/467768
-	local _rdocdir=/usr/share/doc/${PF}/html/${PN}
-	[[ -d ${ED}/${_rdocdir} ]] && dosym ${_rdocdir} /usr/share/gtk-doc/html/${PN}
-}
diff --git a/dev-libs/rote/Manifest b/dev-libs/rote/Manifest
index c2947c5c6667..7b83e97a616e 100644
--- a/dev-libs/rote/Manifest
+++ b/dev-libs/rote/Manifest
@@ -1,3 +1,3 @@
 DIST rote-0.2.8.tar.gz 61440 BLAKE2B f6626d38c6203f535308d38888c7998b2ba1a9016fabf13bd3b7a6bc59c3d4f4ac344bab6f089df07cba7702d6cdd4ab2d94a1d7902adce623353fade7154a6d SHA512 699d45fb188de51a7059cc94febf69ff8a7c15cc5dc2dcbc81cba76e531ec415b242ee856e03ce1c9ca6f7f6ae6a73bece299088a4bd41e8f9e846de206727ab
 EBUILD rote-0.2.8.ebuild 373 BLAKE2B a4bcc63badc56bb31854b4c64d2f0393c9c79637ea25c1e00db5f4a7e2c21fa6fc32370b3aedc792b1dde97a8605de80a10ac09cc305976b9e433540e2b77806 SHA512 3a64ce2d5c1b775fa503cb08459d9f8150d3e4279df84d61c4782da5ec51f4198245d0dc6ecda7d84d92df2f3d9abc1abd129a90c6d07aca91c9b756f4adea27
-MISC metadata.xml 317 BLAKE2B 40a450b8b6589ec0ee2ccefec66affa519c56bf67df2aea0c9ba909fdb68945f4821dc03a5648d912da6a8cdaa8529c8b449e7598728bde12132cab991843574 SHA512 0861402bf4ed87602ef4866a5cb216c49a2a9418fb18c179f647d42bd5cfe089c0e549301711cc79c79071076524b3a8e9721fc1aa695fd5185aff8ff219563f
+MISC metadata.xml 241 BLAKE2B d9fd5cd54a08ec5484e63a660653c8935c5952f41e1c58a1b4f03009cefd6cf88c2a6f6d34e929ad9ff5fd974e11fd998738df7fc8e1022d039e0be949ee9f1c SHA512 a2a7fc258dc66ad02e126f2e8953276da01bbd87a0e233b0bbae6af3a4b67e4ea4c67792f8a0e4f57475e532a354922d8cd7a80d479c3a522e1852b2931cb77e
diff --git a/dev-libs/rote/metadata.xml b/dev-libs/rote/metadata.xml
index bedda34b68ce..4d070fe11b62 100644
--- a/dev-libs/rote/metadata.xml
+++ b/dev-libs/rote/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">rote</remote-id>
 	</upstream>
diff --git a/dev-libs/satyr/Manifest b/dev-libs/satyr/Manifest
index 67ca6c8c9f05..7b80e67fb4d8 100644
--- a/dev-libs/satyr/Manifest
+++ b/dev-libs/satyr/Manifest
@@ -1,3 +1,3 @@
 DIST satyr-0.26.tar.gz 434820 BLAKE2B 4463c69e6ac2eb8237f599bfeed308265a906c6e3efa154b14eb6ee7acdc65580da9baf5ecb99e4efa4f8c00f7656ff2a747e607f2293b12a513ed680986fe08 SHA512 45dfc42e05e93fa0417c8c5d6811097cabaa0f4dcfb79df13d3840d789cfd41c84382ae84882ca120b1a3120987123a306656324cf39f306046a5d30547db656
-EBUILD satyr-0.26.ebuild 1009 BLAKE2B b90d8ad64db0a0547e2cba96fab7a7ced1173efe729b002c24758f15c8b9622e0a7496df37c9fa9ecc9f51f6730e4e68342067353f805d1d6c8ac8e72d1d6bae SHA512 71e35c0ae1e4b085b4032450a75ee5e0ea80b55e4db22dfc9c955a71baf382be491dd56424e518d9db13a123962bcd95f91db510a61778ae0806410e248eb3f6
+EBUILD satyr-0.26.ebuild 1004 BLAKE2B b5d3f80e47de950bfe174b8a2740edb7c06b39bbbcfa654f67d953fec8be553179c639f1457c12482033a6dc4059e53f04511a9d24ad6d3cb0d50af95b60ad02 SHA512 9bea552420ef0dbc15e86873c89b44c4b92d42387504f737cb786f8677791a0c61475fbb54e1b02c38ea2f2d6a905a70527c47f215dd9e9285f1d9ae456d80c4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/satyr/satyr-0.26.ebuild b/dev-libs/satyr/satyr-0.26.ebuild
index 400a2a442d4a..a00468b24ad7 100644
--- a/dev-libs/satyr/satyr-0.26.ebuild
+++ b/dev-libs/satyr/satyr-0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SLOT="0/3"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
 	>=dev-libs/elfutils-0.158
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 0871f2fb63f1..3a99c643caab 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,3 @@
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
-EBUILD serd-0.28.0-r1.ebuild 1109 BLAKE2B 42f001ef7d163b4feafe17d23262b106aa7df0b835fbf19a7f076f17e8574e62070fba26a36c1875f145785bf65202e6b41d912869656047289beef413313cd2 SHA512 c3767cf3f054e1f7696451538eeba5b0605d6e48f9a25ee96722c170e74acd3df1c9dcedb22ab8d243fc6d1a930a8744382c56037a744ae77706689e4101ddc0
+EBUILD serd-0.28.0-r1.ebuild 1120 BLAKE2B 6b3686efdfc89211d22b6d52b28448729e5c736ca4db6f13e6f59589ed3a972c521f5a8e6c2fcdd645a418d4a3e028c1957f704f665ca82a72ca1912d1bbe96a SHA512 881081e582897888d29f2c2b93ce721c1f6b90abfd50dca8f70e012811c9149949627a3a81dc54ea0946e94f6a64dd67db1bd442a1edac0eb122694d491b012a
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index ad1ecce82825..ff4e3106fa83 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 62bff63a8cb1..6ca96d75b914 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -8,4 +8,4 @@ EBUILD skalibs-2.6.1.0.ebuild 1102 BLAKE2B 6e9f79ea36986f7695841068d69eb5fdf791b
 EBUILD skalibs-2.6.3.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
 EBUILD skalibs-2.6.4.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
 EBUILD skalibs-2.7.0.0.ebuild 962 BLAKE2B 9021ed99abba3ade6a91c7114f82dbbbd67d74e0fe6a25d161899e15c8a3633bb51221dd8a23ee3c71047d006333f8cc2322a01a91ed0bb8ca5525cc0d71bbdf SHA512 99aba2aea0c3160111ad3e405df848f77862a13caa96c654ddfc8a803190ffc8662e064f7a64096a0d3dd41a78f049e9a55265f5e98dcd55043aa6c958e18710
-MISC metadata.xml 682 BLAKE2B e5d2f804eddae75e951e0d779f6c26b9055186976bb27ab8c4afc8fa160aee1a6c119d03c19b95d54e7af721a86aae99b9c78277adc03e59fa4f86c0a5e93263 SHA512 cc1e8bf973b516a44122fa19165cd6c08547837d38c909d0a8ac7116c87ad93bb1f25ca31e5358c63abf4b13673a285cce8fb783506b61659f998ce47dc4b656
+MISC metadata.xml 578 BLAKE2B d5f0ec32e0f6466121a5e91ddfd707a488517f4009fbb999e2ef04d5425dadfe16d4ff7792b64b65065a24b3723aa3076999ca2ce576bb7b134916e0a723b7e6 SHA512 837e8b1a0a2cc499f6431f3ea91a6b240c74d3e6087457d1282f1389f80a501446cd49d65de4233e1a58ce5ecc8191ddb7583d1a03486c35f77c7cd47eaf4890
diff --git a/dev-libs/skalibs/metadata.xml b/dev-libs/skalibs/metadata.xml
index b538bc1f73d4..993ae0503a73 100644
--- a/dev-libs/skalibs/metadata.xml
+++ b/dev-libs/skalibs/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index 9ec6d3f787c6..9bd1e5929b8c 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -1,4 +1,4 @@
 AUX libstemmer_c-shared-library.patch 850 BLAKE2B 864f1f7f34a35b04a57899f0ac3dd743121c4f6270ad1f5cd127789d79e2f70fedab1cbff72d492b7e0f7a048609650e2315b8cebef013fb711f812deeddf32e SHA512 36f96bf9661a71d7aa77619202d7c4d48cc494da6287ecf5a24ffa9963aefadf9f825ec52058534aca908e6c2641af71bfc1bf14ab880d9ba480add7a8cac12b
 DIST libstemmer_c-20140325.tgz 129506 BLAKE2B 46040a864b8111bcca1c858a16081542a9900e435e6154582e422e1687b8230b0a5f63c7e349e1ef47128eaa898891df7b87fd2a4d97d0c1304fb8af7ebb627b SHA512 938eb12d4fe9e229f21536a6cb8a4322e0b664a7fbc15685e7ad46b4a6ccdfbefc55cc484f86bc738791d6f3e6d1b61ba777a4332a62cf76a8b0a5efd2c2762b
-EBUILD snowball-stemmer-0.20140325.ebuild 1419 BLAKE2B f9050649a8b76bff439673ed3494f1cd65c672ab5344eace3d5b554a189e45acde33eb7736595890b4980d517b486c598028c9825dd608453906b80da4788f73 SHA512 e384f49987020183955303f4609a7cf11dec0949535ad1cd0bab1bb9da2ab62349f91c622ce9b11030e78c192993134fda42f41b6ab3119e9b97f0cd936e78e8
+EBUILD snowball-stemmer-0.20140325.ebuild 1415 BLAKE2B a9e2e342902a1c8642b099ff3e157b2b6c214da620d9285412b694f8dafebef4f293b835bc41865df47b8fe5212c6d6c59533592dc30fd2b4d823f34ed0ba38e SHA512 6d31292eab86a8cd66789df25064f8bf7fbe389bd2b547ad03d334f6a9ba7f390249ea3a1de61bf8928dbf13d7bf585d41e350eaf097bc2b4a9fd8e91af83770
 MISC metadata.xml 215 BLAKE2B f7ca08c496dce81653514ebb4de27022bfa50165d664a6ecd7201dae8a9914470fb4f2909cff468fdc235772b0ba86ba3f80cffa4f9051484992a0d6ae3e4367 SHA512 e92f7c910939f1ff7b7cd5df19679d7c08f9b62d58a9dd1dfda4e97d14772ea23a569d822bce780cc09d407165ea203a872f6137f00c1b2ec0147df7dece0829
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
index df7167c24bc9..2291dbcf20ef 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ S="${WORKDIR}/libstemmer_c"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 
 # This could be used to package both libstemmer_c and libstemmer_java together.
 IUSE="static-libs"
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index a4d813c245da..74bf134c6862 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,3 +1,3 @@
 DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed7158223ee685821ae80b18b61f5db82f804ee6a32236143cf8287ee875c3b3354edc6ccd1d4f25eaa3a04c785b SHA512 e18c6de62f2cbffedd4c200f6452f4fd37f719aed764ccc1b77c8da04a0f3394d47e8b57e19eefd6d600770926f505fdfa5da91564bbff5f4ead49f1adaba249
-EBUILD sord-0.16.0-r1.ebuild 1111 BLAKE2B 2534eea15bb8205581e78ef8e2094b52e568d083fe6041690a8a732a8e15f748cc94ff2f97d62aa89c153d3ddf38d68cdc8eae91bb1b40934acad94a44099712 SHA512 363fcfd8fe16643c83cb47105c0fbe4a8b37aa1e068698f08b349cd48ac3341c4beda632b1aa88cca42c0081ab0c46c81aa765924c1c4a9c2a5319b4be6562a1
+EBUILD sord-0.16.0-r1.ebuild 1122 BLAKE2B 340a9aaa4988131c262fe9f82609156c3e366a258b774f4ac940ad75f50fdbdfadebde603f005321e2f58b568f69e01c8a15cef6f51b667e33da2bfe558f0f9d SHA512 419a4c014c5de30eedfa234e1f14b87c3403ba6410ee9cc02870880f57bc5c9deaea919c74cfcd9beb3c5d482f7251885220adfa46fee137c23ba95ad2a79d08
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index f40505a333c7..3bfae64f3aa3 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/serd-0.28.0-r1"
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 3ead241f43f5..dd9df5eda81a 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -4,6 +4,6 @@ DIST spdlog-1.1.0.tar.gz 183937 BLAKE2B 51af49f641df69e78835bd6b9545da53c0e111ba
 DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
 EBUILD spdlog-1.0.0.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 EBUILD spdlog-1.1.0.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
-EBUILD spdlog-1.2.1.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
+EBUILD spdlog-1.2.1.ebuild 775 BLAKE2B fce5764a6d61b2748a5463fa319f03832af4deb3fdf505023483a6a48adddd1dcdcc03b9c8b3b73532927dcae68a1a592c5fd349cfd6befd54e7281fadd4e883 SHA512 394dd8bd0ba20cae5d3c37b59135eef5d784b9fcbe3eebf652319df34b4ee499d91478d934e326aafb9a221ef0aa3b260d5d0b4d0935ebf88e7562f713e9b00f
 EBUILD spdlog-9999.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.2.1.ebuild b/dev-libs/spdlog/spdlog-1.2.1.ebuild
index 03aaec9bd608..192745e8ae46 100644
--- a/dev-libs/spdlog/spdlog-1.2.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/spdlog"
 else
 	SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest
index 77c4c75037dc..0c3305748e6d 100644
--- a/dev-libs/sway/Manifest
+++ b/dev-libs/sway/Manifest
@@ -1,6 +1,8 @@
 DIST sway-0.15.2.tar.gz 5398956 BLAKE2B 6bb527e802b7837ef39cb1e29597d55fd33831231dbfb7f12225e50c38e49ae17d8bf2eb43672c195c6e074986d254b1680bac7c9d60b80b84feaf07e09718df SHA512 c457ace514f5c69ebd366d313cce93a76b199bb51c7540debc9c0586bff490401e6374f9725c784474afdfcca15bcab686a972c6c178117e45e2de83825ed370
 DIST sway-1.0_beta1.tar.gz 5444424 BLAKE2B b2803b6770ac3fbb3c21b892a208008e60780b6002e983e6d144d4f97e04992d3a3e5589abe36042221d67a107e31f5e76ae193cbf3e36c71fcf027095140944 SHA512 745b16be7641446c54e1b8777be1f8a26e8275f7826590f594bf4a2001a6de42e394b602e1ccd26a1e8ebe256fde6f9b393f5560a1dd0a610867819076645c69
+DIST sway-1.0_beta2.tar.gz 5454362 BLAKE2B 2cb7f3042a53879c962e7204917765b4a7a2e90f2a6a7eb6bbb63383e31d7526e71ad7ac4edd708c47a31f3166f70c1633719c9cddf5b751327da79b523d6780 SHA512 532acb6f1510578b7d9d222f04ff8104c836428ef215ddb6d7181839231d65101b3d47c8389a38f14cf59692116495b60759062ebd797edf83cf77aebaac379f
 EBUILD sway-0.15.2.ebuild 1925 BLAKE2B f6c56c97ce70d2b01ad6b836894faccff11f0ed74a782ac4621b1ce544c0f167b1a632835842cc5ac97a6ea8c897f50f1b06a8fda5d33e279ebd62213a0eef97 SHA512 7fb00b02563b71dc818d46a7211687499eac1cd6a677a13d76b8e62f0c3394c4fe3a6fbf1e98dc1b36d9d7141e2410dc12e261832f71828612418d03664a22b2
 EBUILD sway-1.0_beta1.ebuild 2512 BLAKE2B 11cc39dab4ce22ffe0e7103e052e2c4c039f0123347b4c92f6d09d45385619ee7f1b9d25d6ebe7de0c24352cdf46b3aac50abceae879cae7049e79d699e15fb2 SHA512 2c06f38eda3e672adfeb847e7d6f92870e15e4f100746265d03d062d01f372f8c84a60877a53d5f6d212c8c106888bb62d8ce630b8fdcbac2afe2d1f6c29fd6e
-EBUILD sway-9999.ebuild 2483 BLAKE2B f113708d24cb0f92e519645a60223e1552bc689c36b2283ccf865ae419675a5b4e4c26e80b306e2d31aaa5d5a6248e543d60f37a2ed2d1be1f58c352c002d387 SHA512 4bf8b44757e68e1641b55ebc74c998e3d9382fa3311e8075942955f3b60fcf3957642b93ded3ee2226b22763179df34dfbb8cb88547a81cebf71c23387fcca02
-MISC metadata.xml 2502 BLAKE2B 723534164daf4391cf1ecb79a2a2bd5e5e2ae671bda113ca27de8b5e57fb317b5e1d1230932ddbe6c39cccaf10488369c00b9c38bddc8761b6f3e2b1adc7af85 SHA512 364adb6db9a56e01b504ff2a12eee6bf8f4cd228b1752aba67a61faf9ab230ddf04b0e8ad5b8582db7378f8305bf45ffb9101472385958bfa0cb88cba2b25f41
+EBUILD sway-1.0_beta2.ebuild 3023 BLAKE2B cfd076509a8d914293011e28b176663ea64678d466b31814f3daa8ab0a848fb32adbfb149b531559a64929c5bf8c3149c399ee4eaa6be9d0ddda8629ef3d8015 SHA512 09985ae6bcaa3a12f56791034af182fccce1b109041863fbb6a5ae5a1f1d034c25a6fc0c16fd1b2c492be7e01d6bcd08e3e90591729bf7e475cfb7467aa1643a
+EBUILD sway-9999.ebuild 2994 BLAKE2B f641bd42370747f47e4a079fe4fd7e9ac9fda74b1b42f6ca85b84e40faa51f982a286fe9f4268ec98be41667d74bad87f622a69525c4305e638a01183d2a035b SHA512 e685c535a3edcb35508f828043b6ec92d2f3cb925cdeea3c4dc784ce3e27cc99996ec75d838a2d9688862f16fca1d8e02db4b1bbcd261473c24a3fe9f6fd7ffa
+MISC metadata.xml 2669 BLAKE2B 398de74534eb7b959b61bb37665191d209f0b69351065756afa78d5247028402ad462d47399070b6093741e17a64aeaa7a21e34de55a22c5992c4972d009fb30 SHA512 6e83d7727329bbffa21dea9dc304e34d58fe1feb442ef5a808cb08d1d7949362e7a5eee26e67f2fc0be72dec184abad7e2fb743343157b66641d96915cc78626
diff --git a/dev-libs/sway/metadata.xml b/dev-libs/sway/metadata.xml
index d2aff59d96e9..cb1a5f1eeef6 100644
--- a/dev-libs/sway/metadata.xml
+++ b/dev-libs/sway/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>hilobakho@gmail.com</email>
 		<name>Mykyta Holubakha</name>
 	</maintainer>
@@ -9,10 +13,6 @@
 		<email>speedjack95@gmail.com</email>
 		<name>Niccolò Scatena</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		"SirCmpwn's Wayland window manager" is an i3-compatible window manager
 		for Wayland.
@@ -33,8 +33,10 @@
 		<flag name="swaybar">Install 'swaybar': sway's status bar component</flag>
 		<flag name="swaybg">Install 'swaybg': allows to set a desktop background image</flag>
 		<flag name="swaygrab">Install 'swaygrab': allows taking screenshots or screencasts</flag>
+		<flag name="swayidle">Install 'swayidle': idle manager to run commands when user is inactive</flag>
 		<flag name="swaylock">Install 'swaylock': sway's screen locker</flag>
 		<flag name="swaymsg">Install 'swaymsg': tool for communicating with a running sway instance</flag>
+		<flag name="swaynag">Install 'swaynag': shows a message with buttons</flag>
 		<flag name="tray">Enable support for StatusNotifierItem tray specification</flag>
 		<flag name="wallpapers">Install sway's default wallpaper image</flag>
 		<flag name="X">Enable support for X11 applications (XWayland)</flag>
diff --git a/dev-libs/sway/sway-1.0_beta2.ebuild b/dev-libs/sway/sway-1.0_beta2.ebuild
new file mode 100644
index 000000000000..1812f7f4dc80
--- /dev/null
+++ b/dev-libs/sway/sway-1.0_beta2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+		EGIT_REPO_URI="https://github.com/swaywm/sway.git"
+		inherit git-r3
+else
+		# Version format: major.minor-beta.betanum
+		SWAY_PV="$(ver_cut 1-2)-$(ver_cut 3).$(ver_cut 4)"
+		SRC_URI="https://github.com/swaywm/sway/archive/${SWAY_PV}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/sway-${SWAY_PV}"
+		KEYWORDS="~amd64 ~x86"
+fi
+
+inherit eutils fcaps meson
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind fish-completion +pam +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="~dev-libs/wlroots-0.2[systemd=,elogind=,X=]
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.6.0:0=
+	dev-libs/libpcre
+	dev-libs/wayland
+	>=dev-libs/wayland-protocols-1.14
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	swaybar? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	swaybg? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	swaylock? (
+		pam? ( virtual/pam )
+		x11-libs/gdk-pixbuf:2[jpeg]
+	)
+	systemd? ( >=sys-apps/systemd-237 )
+	tray? ( >=sys-apps/dbus-1.10 )
+	X? ( x11-libs/libxcb:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/scdoc
+	virtual/pkgconfig"
+
+FILECAPS=( cap_sys_admin usr/bin/sway )
+
+src_prepare() {
+	default
+
+	use swaybar || sed -e "s/subdir('swaybar')//g" -i meson.build || die
+	use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die
+	use swayidle || sed -e "s/subdir('swayidle')//g" -e "/swayidle.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swayidle/d" -i meson.build || die
+	use swaylock || sed -e "s/subdir('swaylock')//g" -e "/swaylock.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaylock/d" -i meson.build || die
+	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
+	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		"-Dsway-version=${SWAY_PV}"
+		$(meson_use wallpapers default-wallpaper)
+		$(meson_use zsh-completion zsh-completions)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use X enable-xwayland)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow sway to access input devices!"
+	local dbus_cmd=""
+	if use tray ; then
+		elog ""
+		optfeature "experimental xembed tray icons support" kde-plasma/xembed-sni-proxy
+		dbus_cmd="dbus-launch --sh-syntax --exit-with-session "
+	fi
+	if ! use systemd && ! use elogind ; then
+		fcaps_pkg_postinst
+		elog ""
+		elog "If you use ConsoleKit2, remember to launch sway using:"
+		elog "exec ck-launch-session ${dbus_cmd}sway"
+	fi
+	if use swaylock && ! use pam; then
+		fcaps cap_sys_admin usr/bin/swaylock
+	fi
+}
diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
index 381dbbb1a604..14be762b4b73 100644
--- a/dev-libs/sway/sway-9999.ebuild
+++ b/dev-libs/sway/sway-9999.ebuild
@@ -14,14 +14,14 @@ else
 		KEYWORDS="~amd64 ~x86"
 fi
 
-inherit eutils fcaps meson pam
+inherit eutils fcaps meson
 
 DESCRIPTION="i3-compatible Wayland window manager"
 HOMEPAGE="https://swaywm.org"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="elogind fish-completion +swaybar +swaybg +swaylock systemd +tray wallpapers X zsh-completion"
+IUSE="elogind fish-completion +pam +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion"
 REQUIRED_USE="?? ( elogind systemd )"
 
 RDEPEND="~dev-libs/wlroots-9999[systemd=,elogind=,X=]
@@ -38,12 +38,12 @@ RDEPEND="~dev-libs/wlroots-9999[systemd=,elogind=,X=]
 	swaybar? ( x11-libs/gdk-pixbuf:2[jpeg] )
 	swaybg? ( x11-libs/gdk-pixbuf:2[jpeg] )
 	swaylock? (
-		virtual/pam
+		pam? ( virtual/pam )
 		x11-libs/gdk-pixbuf:2[jpeg]
 	)
 	systemd? ( >=sys-apps/systemd-237 )
 	tray? ( >=sys-apps/dbus-1.10 )
-	X? ( x11-libs/libxcb:0=[xkb] )"
+	X? ( x11-libs/libxcb:0= )"
 DEPEND="${RDEPEND}"
 BDEPEND="app-text/scdoc
 	virtual/pkgconfig"
@@ -55,7 +55,14 @@ src_prepare() {
 
 	use swaybar || sed -e "s/subdir('swaybar')//g" -i meson.build || die
 	use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die
-	use swaylock || sed -e "s/subdir('swaylock')//g" -i meson.build || die
+	use swayidle || sed -e "s/subdir('swayidle')//g" -e "/swayidle.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swayidle/d" -i meson.build || die
+	use swaylock || sed -e "s/subdir('swaylock')//g" -e "/swaylock.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaylock/d" -i meson.build || die
+	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
+	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
 }
 
 src_configure() {
@@ -71,12 +78,6 @@ src_configure() {
 	meson_src_configure
 }
 
-src_install() {
-	meson_src_install
-
-	use swaylock && newpamd swaylock/pam/swaylock.linux swaylock
-}
-
 pkg_postinst() {
 	elog "You must be in the input group to allow sway to access input devices!"
 	local dbus_cmd=""
@@ -91,4 +92,7 @@ pkg_postinst() {
 		elog "If you use ConsoleKit2, remember to launch sway using:"
 		elog "exec ck-launch-session ${dbus_cmd}sway"
 	fi
+	if use swaylock && ! use pam; then
+		fcaps cap_sys_admin usr/bin/swaylock
+	fi
 }
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 06cece90f12e..23dd986adf7d 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,3 +1,5 @@
 DIST tinyxml2-6.2.0.tar.gz 585870 BLAKE2B 6f79ffe0894d625e3a2cccaf897c13962672f090c477b6b13e8685585a304b5cf0f5069d88d61650882e55f23768514dcbeea4795e3a4758b016cb177eee44d4 SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1
+DIST tinyxml2-7.0.1.tar.gz 590384 BLAKE2B ea055e9b85c8f1ea789f91d406e549abf1d6e8aacbbf89f5d887b6cc0d8678562810b4352c158de0ee4adedf8146016f970e1b2a221dcb8fd36aac0486d45d9f SHA512 623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380
 EBUILD tinyxml2-6.2.0.ebuild 627 BLAKE2B 652072754229eecd012c67e3e83dc245a8cc1ee1cf8719bba2b806cf1552bde63c182f7f3e4b18e5642378b149410d245b2aa8fcb66251979334649f62e23ce2 SHA512 6dfccf9b44f590ee91b0dfade68933cbd3c6a68bc7394050134d19c7c75ae2ff18609fa937c949f88ce039ae26e25a0cce2ec434ccc60b8f9617b28a91c4bf5a
+EBUILD tinyxml2-7.0.1-r1.ebuild 572 BLAKE2B 7ffac3676ccbebde87288fca78c7137f088412ae0e3d94f582d8b7b139d8f297429a4298d8f2a8d3fadc891e6b1a43c3eebf6b6d4bb5bdbb89f6a372fa757e4f SHA512 b2cb8225ecc17d37c5fbcd938b6da6b14fb1b680085617042885995011ec4c541b36bd17a244747f0f9b7ec0ef62579b5198f7bd575fd2670a06fb49a9409676
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-7.0.1-r1.ebuild b/dev-libs/tinyxml2/tinyxml2-7.0.1-r1.ebuild
new file mode 100644
index 000000000000..5e24e7bc18ae
--- /dev/null
+++ b/dev-libs/tinyxml2/tinyxml2-7.0.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="A simple, small, efficient, C++ XML parser"
+HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
+SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+multilib_src_configure() {
+	local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest
index cdba2dd0a8ea..24aa8889870b 100644
--- a/dev-libs/univalue/Manifest
+++ b/dev-libs/univalue/Manifest
@@ -1,5 +1,8 @@
 DIST univalue-1.0.2.tgz 14201 BLAKE2B 47a72a629bc3a0ff193c33d89c3a97e19abca833180473b0a37a6f5a4ba15b7886d1a605a905f7a94af2512e4d1e9f2a7879cae4c5a0af78ac9dfb23a0a581c7 SHA512 727096735dbad082741fb863c9066936a80d7337b1d7c4c289107d240b7f695756a8720f5db320f0c7521b523e299829bd49833b6a31969d8aa43267653a4f2f
 DIST univalue-1.0.3.tar.gz 16820 BLAKE2B 40dd6c4e08e8f4a27731aa0fd6931162f8427a709cc3fc16c049a093d17a08f002a6eb08cf3c4fa9870805f3eed7627c8c9baa7cdc6d6fc8970a085488a955b0 SHA512 1c8358baca82b44d7a762c0cb3b7bef6f36d2f3d0ab29045224c1c39b69fbcbb66573dfb9ee4705f71aadff542cc9f02e98921b1c013748e2c0cd63c386bc1df
+DIST univalue-1.0.4.tar.gz 19677 BLAKE2B 1565a8aabe9b4dfddb2a8b577077bfe50a66aca62e63cfafaaadf1429ad08c0d8aa9f69469b063b2f3c51885addd0a6ab820e06f1ae1b9850de163dd2d1065fd SHA512 cd503ad2f59ea47afbce4acd352ba2baa06b8237f9cfec669353556cff85761e85717ba16c2dc76094b9a9554e5cb27e73e726f2c2d1e6dc5c76e4a5c4cd8edc
 EBUILD univalue-1.0.2.ebuild 595 BLAKE2B f945bffcf5b8f07c272fe9ec247b39ab1eaf376e419832041d63b236a0a0cd47b57898daa6c445aa1f6c77aa0f91790726b10bccf3b715803c80f8d49770fa36 SHA512 2c1a589eb63205ee66fca0205b5977cf442b5e45df606f7898980faeae7ca6c3f37c3b3d095b6b1e272d29e10ebf66f2ba05689fbebdd98be1b6a41fe982b7b6
 EBUILD univalue-1.0.3.ebuild 611 BLAKE2B 5b04edd36949349c453c46ee2305307e131db0e0c99e112965c186da6ddf3fc92c6fbb66572eacf2cec431afeb2ff967b3802e4cf48fa5f857506e7aed8429e9 SHA512 df499ad6fe120c9facaa1c7b3493e923a8c9bbb683a3e4846093ebbf9c7f702c571b3bb0755a9604caf03fa70c016362ed4b871b556973e4f7873beb418359d3
+EBUILD univalue-1.0.4.ebuild 720 BLAKE2B 625f17f804ae73f4698e5d46c0b20e213a66097e781abd5043ee634895d785dc6a961ce5119a12dfc298eaf55ea124627e5a5dfebc8cecf2ae9a6b83fa90ec97 SHA512 6f0170b7368a12f6ac1acb83c53626d9c151c7d81ec2460d21c5f060803c28c63b93be9a38a94bab03ecf82d194decd566905ea1402a2240c4d06f55fd951d13
+EBUILD univalue-9999.ebuild 720 BLAKE2B 625f17f804ae73f4698e5d46c0b20e213a66097e781abd5043ee634895d785dc6a961ce5119a12dfc298eaf55ea124627e5a5dfebc8cecf2ae9a6b83fa90ec97 SHA512 6f0170b7368a12f6ac1acb83c53626d9c151c7d81ec2460d21c5f060803c28c63b93be9a38a94bab03ecf82d194decd566905ea1402a2240c4d06f55fd951d13
 MISC metadata.xml 471 BLAKE2B df69918c0c8a76f7801782856f7f95fd5108153da22239012d4f333be6e099c70ddd560055eb8a1d806a72d9e37465816171e60771c1c94c3c67f0e1a55238dc SHA512 d64632af71d51e5aa814bd58fa773fbc877abe1e59774e18fefcfab2949f08d8cf4e0482fe5acefb2dea3e0873e7d269d950c09ae4b65cb474bdd8a3407b2e39
diff --git a/dev-libs/univalue/univalue-1.0.4.ebuild b/dev-libs/univalue/univalue-1.0.4.ebuild
new file mode 100644
index 000000000000..989d23ce6cce
--- /dev/null
+++ b/dev-libs/univalue/univalue-1.0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C++ universal value object and JSON library"
+HOMEPAGE="https://github.com/jgarzik/univalue"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/jgarzik/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/univalue/univalue-9999.ebuild b/dev-libs/univalue/univalue-9999.ebuild
new file mode 100644
index 000000000000..989d23ce6cce
--- /dev/null
+++ b/dev-libs/univalue/univalue-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C++ universal value object and JSON library"
+HOMEPAGE="https://github.com/jgarzik/univalue"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/jgarzik/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/urdfdom_headers/Manifest b/dev-libs/urdfdom_headers/Manifest
index 00fdd5121b98..74970540e222 100644
--- a/dev-libs/urdfdom_headers/Manifest
+++ b/dev-libs/urdfdom_headers/Manifest
@@ -1,6 +1,8 @@
 DIST urdfdom_headers-0.4.2.tar.gz 11498 BLAKE2B c593531a260156abdb842a892f8eee17afd12ad7a1b2192fbef82543159499173c8af1eb70a6bbf7d72a30cf0869658844059d0b4bce2d97da8c7b49dbefcfe8 SHA512 e54019c829a033a9504cfef315a957d45cbdb384fe817dc721ff68cb70e30befb835a6575a5ab870a93ff5503783770cf01e0b5b067ef3decf1dfa3020dc14ea
 DIST urdfdom_headers-1.0.0.tar.gz 11794 BLAKE2B 0232e1eda75e356c1a101b38a45085c358d70e0c1ce5f74532cf3ba6b85e9805552e35e26923608bc7df241fe65ab04992cfac1f7e279e8cb4cdc49649371fbb SHA512 b1f63c1a13f062c987d6be4fcea5eea903577a710d44fdce077722b70d72eb65a265131beac1fdeba576bde189ebf51ac0eb19b2b06a34b0f9fb9dcbd437291a
+DIST urdfdom_headers-1.0.2.tar.gz 12474 BLAKE2B 191ed19b362f1ef4bc3e99613a99107d3f3038b10df6d0836548f3bfd8454334fc832f5686873d4add4f56585d76f3f827806d1fc12ac080c5e819cfcceda91d SHA512 902cf18b3ccc62dd5d732707e9ca2b8698f3307b8005d3858fcdd0e9585d580bbe5d2ec77c8c8bfa7b8776b870844368a8ec93b0f8a8d71420cf5015a99b8867
 EBUILD urdfdom_headers-0.4.2.ebuild 599 BLAKE2B d2526a6497b021c74d63cffbc1e19719cdfa1d6c3a075141887ac71907bfc5fb4ac51879d1643678ba61243e6bf6db6e6a3e62b2c82b68891c0a71c14bd954e5 SHA512 6dee65599766f73b045a7e0c794def2050e03489aa4681acf3fab483ee9da8d827060ae034310f15b88c96425585704a772fa693da0be39c5933afaa28e38b26
 EBUILD urdfdom_headers-1.0.0.ebuild 599 BLAKE2B d2526a6497b021c74d63cffbc1e19719cdfa1d6c3a075141887ac71907bfc5fb4ac51879d1643678ba61243e6bf6db6e6a3e62b2c82b68891c0a71c14bd954e5 SHA512 6dee65599766f73b045a7e0c794def2050e03489aa4681acf3fab483ee9da8d827060ae034310f15b88c96425585704a772fa693da0be39c5933afaa28e38b26
+EBUILD urdfdom_headers-1.0.2.ebuild 596 BLAKE2B ae8ae16812aeb4de4650a80220c9ef4e4a911d30f34d448223ea4cf472d9f5719e3b628ef11d332a7f75954933a05b6946d9f98662bc8d57c697144bfc31b5af SHA512 7800ea728feadda8f5718b0c4fa13907dae911801ed17911ebe5fdbcef00275f5a64fed407a7ae2404d73ee566cfe44a7372a91050b31a56d697e412e217be7b
 EBUILD urdfdom_headers-9999.ebuild 599 BLAKE2B 2e27f12ee18f3960580414f5dd430b6935cb21673abba85093dc65cb242ca3a661a67e9e268df061b230e0aff1fe8cb55bc04d21501e528264a839ca7f41df0d SHA512 a1617b7b51673aa6b8982c2aec93e32739f71808d9619fe90ed5a1fccd65443da99ea7133e4a38a06732242ef2f1bf2605e277ca4e17d34b716225119cc2310d
 MISC metadata.xml 343 BLAKE2B dff4acf9fbc6c2734ac356a3a83da2557b8899e8c58dade74215241f4b563055c55e7b175dc32750f140ed6e2b217f850a79b3a401f09c28eb45f873902a115b SHA512 c12551c09865f8d8f4a833ac0ae8f694e44f507c4e89f39fdb188f5d7159aa0aa6d67c05acae217f5bd8a02d0af3a08599b18f5118a1fc59a3b4105ab6612262
diff --git a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.2.ebuild b/dev-libs/urdfdom_headers/urdfdom_headers-1.0.2.ebuild
new file mode 100644
index 000000000000..17422ddd7c2b
--- /dev/null
+++ b/dev-libs/urdfdom_headers/urdfdom_headers-1.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/urdfdom_headers"
+fi
+
+inherit ${SCM} cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/ros/urdfdom_headers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="URDF (U-Robot Description Format) headers"
+HOMEPAGE="http://ros.org/wiki/urdf"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 3ee0f18abd7b..2690636a8928 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -4,6 +4,6 @@ DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac3
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
 EBUILD userspace-rcu-0.10.0.ebuild 663 BLAKE2B 2d1ad36229c78b15bf3e9c738a383aa39c201329bf814e7e29d4726cd9828c6e9575e3af4ac02b5f54db3ba703a1f0aa46b90eb88028709299ed13bcb0285889 SHA512 2e945347710ff7f1459e33def817e4c4ce4e640bcb8f94726559534ce5f14aa45752bc6e169fdaeeefb491751743b30f744cd56dbc4a56fcaf1bff1c0227619d
 EBUILD userspace-rcu-0.10.1.ebuild 676 BLAKE2B 241781c4d2e7aebe4ea2915f44cd6690078ba021492de3d8e5a6c3b6697292d9cc4bf85a1f8410fabc5b913f6e7857d7820a099a4b5422f61b0ad3eead63a4e0 SHA512 b2fe79ade8a3c57f0d0e98e9eba4e0bf5831ac016d0392ca59e64da0a1851236550e257e6d8ebeae1806125ea137578265eefd4de709d3dcda64243f9f40ef73
-EBUILD userspace-rcu-0.9.1.ebuild 736 BLAKE2B 2254c2ca484cde4821753e7c2d8a2a5c8f71700d77068234f9215608104104f4eda13dd4d78e20222a5dec2295bd05b75dc9aaad733e8555e0bf57218079e330 SHA512 c6e0ddf946e8e07392545e52f2bad49d2da3637e800b77689112128374c6367d5efa6b9d44d6143b3f17a8d74cdcfb877f2922e6a112c0ee8bea834242af4818
+EBUILD userspace-rcu-0.9.1.ebuild 743 BLAKE2B 634a896a5850dde9ffc378c4e327037541851c39956027c5d9a2185f5deb598f9a11f264df25606f1d9f20f367243bea5e4ab295cf69e15db022cefa765b7a00 SHA512 11eab0b0257b0e057b76109a788627eda55c003c0de3d897028af8696b909e5030dd2c63ed169e215f9fbdcd5860bffedca5f44887ef804e5e74e1fbaad6e6ed
 EBUILD userspace-rcu-0.9.2.ebuild 749 BLAKE2B b7782ed9c88695473c2bb23dd9025eca95aa54eec2109fb4f2574f39b985b86ac1c53f5728a0b224b628717556427ffcb78325cc07f6e2f079d2fe05da514827 SHA512 61c3e1d51f225d39c5e521016605c01a4cf6188344af5a71785dc71f0a6cf4c1108139e38f32a093898c76f547decc794c19dfe70367461445abbb5816b7a6ae
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
index 66d994a11586..1e382978c395 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname version
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 x86"
 IUSE="static-libs regression-test test"
 
 DEPEND="test? ( sys-process/time )"
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 03526b10f2c3..2099e6a43220 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -3,5 +3,5 @@ DIST vala-0.36.14.tar.xz 2874504 BLAKE2B 217178c9018e8d6623e5997f36210ecccfa0176
 DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
 EBUILD vala-common-0.36.13.ebuild 2521 BLAKE2B 79f6d446883655f63b2956fc8f8ec254993526d803b8eb975c0f7f9c7c3b1faecf39538ee51bb7062e69dc27d2349c8d8c2b3d560bb83125fb96a0c9b2f8cc48 SHA512 52667e85b97693ee7e90cc87513c79fe009380cbd4c7efbd12109cf19360cd7d84399bf707d8488270845decc7943d51bfa7f893b390eeaba5bf23adeda48443
 EBUILD vala-common-0.36.14.ebuild 2531 BLAKE2B f3e397e41035058698e9c15ceb1ffe1648b8456c6ab8764ed97a4c01e36d9ac83c3e8c94c2a8be744eb9a547ae8f2c3bbe1f7bd3c92599c9dbaeaf941de0c65f SHA512 32ec0798c0a5047f2573fce558c40a23f4b74399829f8aece4044a1907405d5905dfa9e7cada6af38bb37af7ae3cea7847df8c5441aacf5fcac4786d178bae89
-EBUILD vala-common-0.36.15.ebuild 2527 BLAKE2B 69ca53262df04b8e59b148b4bde213537e2446408358759ae6a0ecdebac7cf688f0a459c28ecaabde13c0cf534eec24e7ef0761b97a127abb98f6b12830483af SHA512 661a42c7ae1301959526fe157343fc155a8f9c7580d55c95a7aa002f4ee5d90ce71d9605554a04d4f7e2b67b3044cc52fee6181523eddeec88558c9d0e20a3ca
+EBUILD vala-common-0.36.15.ebuild 2520 BLAKE2B 4e0a8c9c1d5e4d170764d7783d17cf6f84f3a414434b345f767dde86648c3f2714aec8f3c2ef99caadf7d48bdcd179ddf84f3faec0a0d5d13bc60c9505fc93de SHA512 066d976b41e04f8ac1fbc2d4a6c91d1d71cd929c79dadca32b29f06dddd37d7076057ed792ff9700d1ad61af55183eb09bd0d1451364757492bb9bab3439155a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.36.15.ebuild b/dev-libs/vala-common/vala-common-0.36.15.ebuild
index 7cf50400eeec..832e6d559ca9 100644
--- a/dev-libs/vala-common/vala-common-0.36.15.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.15.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/vc/Manifest b/dev-libs/vc/Manifest
index 10bf6c39beb4..ea4d730c831f 100644
--- a/dev-libs/vc/Manifest
+++ b/dev-libs/vc/Manifest
@@ -28,8 +28,8 @@ DIST vc-1.3.3-reference-log2-sp.dat 1200200 BLAKE2B 01a3124c9717187485e0d6d172be
 DIST vc-1.3.3-reference-sincos-dp.dat 3600000 BLAKE2B 2f3a4d208d8b8cccc7c6f84a9f7d6a0920c98735382fcf37cc28efef5199b7e216cae9402a3c631d5a445739d8bafd782bdb80ef205146169e5d10ab9d6dfcff SHA512 92f5cbe61cc79188759cc7d03e28df1644405bf2249fc59bb84f567bca6937053c5e2c1f7b0674e745d6656da6772703305118040b9c7a272da1d8bc52d49858
 DIST vc-1.3.3-reference-sincos-sp.dat 1800000 BLAKE2B c0993d43ec2c88edcbab2ade63f1a960ed64ccfd78fb5355aa0a6940b3860669dfafee75190a67e77f53d6005f9cf7e9e82abdd270e171606ebbb143b7326907 SHA512 0760409ae093c7d897e6ac0b689fea5c1cf9cf58e3c39e2880fcacf56398e9c3ceb897f725ef54730b95847f11ca73a05fd96e108aa153ba6d22c21f7104c009
 DIST vc-1.3.3.tar.gz 781361 BLAKE2B 8e98cd983e7ef132e8d2a74f53d95e1ae7ba52b90da8878512ee4df33751ddce40dca6e70c8384048a86e495c6387d425db6cc5df0b7d15afd14f0fee94eb2b7 SHA512 dbc6f5bc723c52d3116301798b600b08bde510cff9e6777312d1970c61ad1b71fd83335ce65e9993a9f582a20b9de73984d553039452908ef229c4bde3b334f2
-DIST vc-1.4.0.tar.gz 628333 BLAKE2B be9ff9e34ce4859db96044f409a44c5b551ba6e31b317132944e70e61b58fb5a0c7d9c27aab6307be6d6213e8bd57a1964a857d96b52851cd356d6615ff1e197 SHA512 7924d6f3dd066b0258781c51ec527add7e4adbadb2b755face240a88aed2026fb6b0bf77e7008a0dc4c425f0e3ee7a8b1e40781397f4417979cc41d8a9d09a18
+DIST vc-1.4.1.tar.gz 638797 BLAKE2B 38feab898a4ce2b15c4db508369426a6b470f24b81e6676ad0e667cc08efaf30e96ed1455c667372104192fe6eb2340fdbd367298fa68e3168350c2e134cc0b8 SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a
 EBUILD vc-1.3.0.ebuild 949 BLAKE2B 3c9537875a996b34205d5092d448a605215e10de738695c2f9dd71d0fa5b41ccc46b871d2671a3f85a2233f86b409373843d693d08fc9e1cc17a6b71b891fa65 SHA512 fe507595e252c0f396e4c1e4107e658b6f6ab92d650385e5ffec87d1c4478a66a5a5fd51db16c7d7d52edcd68df63d87274117a75d436e064c8b0a5abe252b1d
 EBUILD vc-1.3.3.ebuild 954 BLAKE2B b88596880883fdb3611644783fc6da739cace3881bc3577d08cb25b9ebe33912d662b9613cb60210a44465be4c002ab86b6400e12bdf851552179aabcf8315bc SHA512 5c3a96be341de9d7f91d606af3dd2434b4c2c6683e24132bda3b92b5cc0ccd26aa90db38e07b6b81c17a2103e328c80de67b6af89163773ba294d47e16cc63e6
-EBUILD vc-1.4.0.ebuild 447 BLAKE2B 575ccced4be806a573cb1642f86cb76fee9d33a6abbc49874a60a607a6093d129ec019db22fd9748ea3910577436416af1804a26b982bb22234f55168759dea1 SHA512 23df9074b5f5198e388b207ad14523095e2765239bb0ccdf877cb14757794d3d4a8e6b86fd7357bfb6de9c2b4bc61c4ade050a141fef43a96d0c6c875c15b477
+EBUILD vc-1.4.1.ebuild 447 BLAKE2B 575ccced4be806a573cb1642f86cb76fee9d33a6abbc49874a60a607a6093d129ec019db22fd9748ea3910577436416af1804a26b982bb22234f55168759dea1 SHA512 23df9074b5f5198e388b207ad14523095e2765239bb0ccdf877cb14757794d3d4a8e6b86fd7357bfb6de9c2b4bc61c4ade050a141fef43a96d0c6c875c15b477
 MISC metadata.xml 292 BLAKE2B 895bf66b71e43684a437957b5ed370cc274a808714f96567956512c561d1fdf18402f5d9340d9c11bf585044e15c081648964df9640c120f74acee9790f532dd SHA512 e30b480889c2fb22f22af6d46f64399012da00bf045a4c9bb2c46b3f3255c4bc50f5970a0b3902ea90024d2ad371d1577ce4dc5a86923eb55634bfd26dafa22a
diff --git a/dev-libs/vc/vc-1.4.0.ebuild b/dev-libs/vc/vc-1.4.1.ebuild
index c46a6c1dd52f..c46a6c1dd52f 100644
--- a/dev-libs/vc/vc-1.4.0.ebuild
+++ b/dev-libs/vc/vc-1.4.1.ebuild
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 9738d1830cfc..b4f2ec6e8210 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,10 +1,6 @@
-DIST wayland-protocols-1.13.tar.xz 99680 BLAKE2B 6bb0ecf08e6b0950c50ba40cffc07d79dd95244abc7d2622f9c232bc2b1cfdaeb9fb1e9f1650ff60defc99ae184abf47f13888f44f429136f2a631afe1c2d5e8 SHA512 f35c21da289038651b75af064ec7c10779158829f578e7320faf401e980da3c958d85e5bcad00994c574cac6319a3ab975aa5483a9b438f781b767bd6303e194
-DIST wayland-protocols-1.14.tar.xz 99844 BLAKE2B 55298d24dbaa6cce017775313e9f4cfccbf3176d7ef24c786f1384111a274c3a0164ac753ebfb4e708094199105cc32ccb58cdb22711e0e0711441dde45883bb SHA512 78d2b47c462618ece0c9c19f250b28efb39436e715f624205c7705dbbae4f125ff2eafa2454e7dce527d3b13449dcb037b282bbbb9ea9d9f52809d6b8187a204
-DIST wayland-protocols-1.15.tar.xz 100816 BLAKE2B 22ab7291a4554345a40858d1051e4842ddf1b4442e4a5446f1d8ef4202c8e71307daec5a9a1cca18e7134329367063509286f85b40d9bfda52276945c5b799f2 SHA512 4a3dcd8f3219f3c43fb2399b33626a579d4fbfb94298fd5a831946e7eadfcc0538b6732f71cbc7ac2c2896362821efd5ac6b1392071b831fa80eb7b2f48845b3
 DIST wayland-protocols-1.16.tar.xz 104156 BLAKE2B 7c6403e5498c2a9f1a97dfeef780a8df0bd05287e8866619657b29f5fc79c82fcc0892a7099b5eda80720dd136f8fa3c848c05aaf870e978e09ab2b04d883c2b SHA512 8ab33021854f3e8f6bca7a9e69427e7a3e53297cc0abd4c006de7e55fac66da3ad88489a6eb4e6c28c7ba2addd96e7f055309f3c8918643b18ef78a4fb637f84
-EBUILD wayland-protocols-1.13.ebuild 876 BLAKE2B f543802c91996ea704080c339bd0c5cfc1d53469109c10cf86fbb0c897295ab83a56db32fc1f787e05a7a057fb8c8e8d7a27b78ec2839aee7f74e33caf30e6a5 SHA512 362458b84cc219b1711e6abc309d953124e19e9ee37549c380464c40e6ae969054b7ccc2bb26a20b8c0baccb0c7db9cf97271cc635308f3cde043bc61a40cc3f
-EBUILD wayland-protocols-1.14.ebuild 885 BLAKE2B d492535004c630e7a2ed6096b5c1983526fdbad572a565c04428d3f5a02cf4f2c09b61d796df394f33d803d6afcdd796fbb6f637cdc99561abd95741083a250a SHA512 72e4d27a56920ebc5e5164f606327f1a5799513ae2fd0a9891889838ae1a5b75706b3f8e6da392e4ef2d3280d07a3d74b63fdd40982e09fb4b24e3ffa9f1df4f
-EBUILD wayland-protocols-1.15.ebuild 885 BLAKE2B d492535004c630e7a2ed6096b5c1983526fdbad572a565c04428d3f5a02cf4f2c09b61d796df394f33d803d6afcdd796fbb6f637cdc99561abd95741083a250a SHA512 72e4d27a56920ebc5e5164f606327f1a5799513ae2fd0a9891889838ae1a5b75706b3f8e6da392e4ef2d3280d07a3d74b63fdd40982e09fb4b24e3ffa9f1df4f
-EBUILD wayland-protocols-1.16.ebuild 875 BLAKE2B 71f5af29e4259a6dd04cf742d4ae540d1c0d5c7c1a718c83a3cc3904a706dce2de48f042a4ab35cd248c9f9b62367b7e68d4d2ba25ae10f7e181db4c0318fcaa SHA512 8041f9b2bfad23894e7ee27e15e712d379ea54887e33a30405694b8b869d08e8a5a8f21f07f67bc74351f1bc90ada2bc511d33b12e77a19f08db069ee4f45bfc
-EBUILD wayland-protocols-9999.ebuild 885 BLAKE2B d492535004c630e7a2ed6096b5c1983526fdbad572a565c04428d3f5a02cf4f2c09b61d796df394f33d803d6afcdd796fbb6f637cdc99561abd95741083a250a SHA512 72e4d27a56920ebc5e5164f606327f1a5799513ae2fd0a9891889838ae1a5b75706b3f8e6da392e4ef2d3280d07a3d74b63fdd40982e09fb4b24e3ffa9f1df4f
+DIST wayland-protocols-1.17.tar.xz 107680 BLAKE2B cde978ceeaa9d71ac76cd007c511011fed6a110e772a6a9e880a5fd07a0318239a11235aac25b855d0f7ed5ae9980dd2103886092e85a92ed606c8a2f53de726 SHA512 5f3aacbba58717092036659d9b665dc10ff05ee51df61b1de38b22f0417285a74fd8a6d15ca049ad60d204f28203aa13d773c52140c7c02db2c498a6964c2643
+EBUILD wayland-protocols-1.16.ebuild 872 BLAKE2B 395a193974494b7a6ebe34226cb61acf6c0055bfb18bfe4bfc5e9cae1daad1f84c0ecaab7170cfc71bdac502bb78c34d31446f6c3afbfa77f674a5094843ae07 SHA512 73bfed2b3a014fa8057fc205871cd0042cbcac723c27f4481f564744a259d05d8a65b53b2fae89f3909c5ea3c338eadbbe412edc196c2d7a01575a91cda56e1b
+EBUILD wayland-protocols-1.17.ebuild 882 BLAKE2B fb9318354b7cebad42f935ebf85d5c09827c612e7cc9bebc85dd6ca4c2e2f3b2cf489825b7a001f0e9f03072ab022942a1d06a2ca8f4c0cdd57b14aee4a73192 SHA512 0bb80c936c9aa9cc77bc8dc91c982a91d385b7c923607729924d10aed1a17a6a3321b4ba1f2e4d961ba0422525bd9a63b6b9dc9bbdd25cf0ee407c16ebc2dc83
+EBUILD wayland-protocols-9999.ebuild 882 BLAKE2B fb9318354b7cebad42f935ebf85d5c09827c612e7cc9bebc85dd6ca4c2e2f3b2cf489825b7a001f0e9f03072ab022942a1d06a2ca8f4c0cdd57b14aee4a73192 SHA512 0bb80c936c9aa9cc77bc8dc91c982a91d385b7c923607729924d10aed1a17a6a3321b4ba1f2e4d961ba0422525bd9a63b6b9dc9bbdd25cf0ee407c16ebc2dc83
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.13.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.13.ebuild
deleted file mode 100644
index 3f94387b1811..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-	EXPERIMENTAL="true"
-
-	inherit git-r3 autotools
-else
-	inherit autotools
-fi
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV != 9999* ]]; then
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/wayland"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	default
-}
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.14.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.14.ebuild
deleted file mode 100644
index 4948be07ff86..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.14.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-	EXPERIMENTAL="true"
-
-	inherit git-r3 autotools
-else
-	inherit autotools
-fi
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV != 9999* ]]; then
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/wayland"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	default
-}
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.16.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.16.ebuild
index 6d2099e408c8..10b44aaea1f9 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.16.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.16.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://wayland.freedesktop.org/"
 
 if [[ $PV != 9999* ]]; then
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.15.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild
index 4948be07ff86..0b33125e7a05 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.15.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild b/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
index 4948be07ff86..0b33125e7a05 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index a76db293486a..980fa611d491 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-1.15.0.tar.xz 432932 BLAKE2B d86e5ba52c16664926e4688317db3fad4f9629c3903239dde46ee238ef7874f28e39daa6bbda96519dfda4ff83a1f540522f21fbabe9b71aa263523481d4eb5b SHA512 f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8
 DIST wayland-1.16.0.tar.xz 435216 BLAKE2B 862cc8ca9da060f9b8345aa0a62a4af76a31562246b75d2679bcf30cc894cc94ec28f97951f766b6e5297b2e113cd8b08e5682dacbfc79544c0085995693ec55 SHA512 64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c
-EBUILD wayland-1.15.0.ebuild 1745 BLAKE2B 833f9fa82246d92583090cc859fd98fe1084e4ce1f82f1ed135da2d6b48e075174239de3dc824a7a6f08c663d6b14807af593456da1a5c99617799b679792179 SHA512 d13a68804828eed61dddb4ca73e91898ad316fc7adbcb0bc94c73a13f4cbb6d6bf73787bcfa39724baa07aa9a49305d963edf0b0c7fe567d499dc4ba9d9497d1
-EBUILD wayland-1.16.0.ebuild 1756 BLAKE2B 078a1db61f84e88a747bb47ee0ab72e914e8d1146d2e75e7c0d62d492475ace993ff3cd2ee22fe77c87455136483986518ff1d7ea6bf8678b0561f39f06f6257 SHA512 4c46d559ff7ddf363bedb07f600d0c97e2387cdd2f7eaa57fe657b683319d5f88ed71160d6a8869b0d355d191a7ec1df3e12beb5b64d9568fcb7c2c6c286634d
+EBUILD wayland-1.16.0.ebuild 1753 BLAKE2B d9ba4445e746f6f6cd739c7d81e04111b9135749ae1d95559c6be97954234d790c53ee6126fd024f51c93ff61f96cd33017da1fe1c4e3f7669d0d2167eb297f1 SHA512 a37fdad6ad58088087d185349e8ec37e8ce180c1fed891c231a77f653eeb2b068b619e36afe1fa66e0aa21bfa464d880f96fc2a8c59473233fba2c74c7361499
 EBUILD wayland-9999.ebuild 1763 BLAKE2B f8c1e3518caf8c3506c8d966a1ad804a626727358a9d34d31b3afb2a2ad25d304d282ad424b41f95d406ad3dc4044bb4b204c04572e8baaf1d8ec0c9878bd7c5 SHA512 0168aee43cef82ac67c1e1a44611d14a2a5454a23f54c6959d5d66a7210860567524f0b7a38354d391b339ae9393256338b531f63845784ca6ab02e053cbaacb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.15.0.ebuild b/dev-libs/wayland/wayland-1.15.0.ebuild
deleted file mode 100644
index e13f0b8db1a4..000000000000
--- a/dev-libs/wayland/wayland-1.15.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit autotools libtool ltprune multilib-minimal toolchain-funcs $GIT_ECLASS
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:=
-	!<media-libs/mesa-18.1.1-r1"
-DEPEND="${RDEPEND}
-	doc? (
-		>=app-doc/doxygen-1.6[dot]
-		app-text/xmlto
-		>=media-gfx/graphviz-2.26.0
-		sys-apps/grep[pcre]
-	)
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
-}
-
-multilib_src_configure() {
-	local myconf
-	if tc-is-cross-compiler ; then
-		myconf+=' --with-host-scanner '
-	fi
-
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(multilib_native_use_enable doc documentation) \
-		$(multilib_native_enable dtd-validation) \
-		${myconf}
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-}
-
-src_test() {
-	# We set it on purpose to only a short subdir name, as socket paths are
-	# created in there, which are 108 byte limited. With this it hopefully
-	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr
-	export XDG_RUNTIME_DIR="${T}"/xdr
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	multilib-minimal_src_test
-}
diff --git a/dev-libs/wayland/wayland-1.16.0.ebuild b/dev-libs/wayland/wayland-1.16.0.ebuild
index d2de7f860c52..fc2c02d12866 100644
--- a/dev-libs/wayland/wayland-1.16.0.ebuild
+++ b/dev-libs/wayland/wayland-1.16.0.ebuild
@@ -18,7 +18,7 @@ if [[ $PV = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wlroots/Manifest b/dev-libs/wlroots/Manifest
index 318e2ea4afe4..01305239f254 100644
--- a/dev-libs/wlroots/Manifest
+++ b/dev-libs/wlroots/Manifest
@@ -1,4 +1,6 @@
 DIST wlroots-0.1.tar.gz 436459 BLAKE2B 8545adb7a9ffe1c4b071ddad1093472f45b24638b29b3c2898b4aa3629c364936be7bec348c9aac5a7d3ecda677df108361fbef08cda8fca9c6bb21639883c86 SHA512 43897ac5a512ea26ad9703182dab5de9c714a087449b108472f638148538a632a67cfc778edf3e77940fdd7bdba91d64a4dc4e4ed1903a150f13ca59237ce01e
+DIST wlroots-0.2.tar.gz 437638 BLAKE2B dd7ca737ba2dfc00e30c83e973616cefb77fccb793161794361422a2fcbdf7299aacea8d794b910fdf06c9a191a89f7f1530d312545d08d126a729be41eeb424 SHA512 b7727b29ed7e5188d5fa6099687f8e6f48b6b3f17f7a6e136956ad6b607054595de3779118bffd4b9730115eaca2f00c2d30d52f4915b2753a749432ec0c3f2a
 EBUILD wlroots-0.1.ebuild 2626 BLAKE2B 9f4a1587211f67948f6a8cccf173318231f76dde8fa39ccb329b7cc91579872870486e41eb064cbabdeb53708b6bb120dcd2ba138b263c7e457eb3fa5f6d5fd3 SHA512 4990121b1a5ef0d24361997ce6a2d41378c462f14c83b021cc03d19e4f4661cb48e2b9becbfbcd2891ed30e1690b6bf3f4d86f0b83889a96056f5ac233b2fefb
-EBUILD wlroots-9999.ebuild 2626 BLAKE2B 9f4a1587211f67948f6a8cccf173318231f76dde8fa39ccb329b7cc91579872870486e41eb064cbabdeb53708b6bb120dcd2ba138b263c7e457eb3fa5f6d5fd3 SHA512 4990121b1a5ef0d24361997ce6a2d41378c462f14c83b021cc03d19e4f4661cb48e2b9becbfbcd2891ed30e1690b6bf3f4d86f0b83889a96056f5ac233b2fefb
-MISC metadata.xml 1685 BLAKE2B b765b48a93cf34274cbb12f9ecf98aa5b51a6cc29800cd2871b37f2e04f1bb20ac9168dd2d1940bd7a3937de4dffa89125dadfaa139518f05cc3920b67aecaff SHA512 f815d97c115285f2c23f833979137e0622f14a38344e3c04da11075c13fd4d83fe3d2bec78c2da448fc88b09bb2259e66b2bbdf8479cebb5e0ff1443959ecf0a
+EBUILD wlroots-0.2.ebuild 2572 BLAKE2B 81fe3641a8f35a9198d9312f8408f74f55bba972e7dbe88dec460868d686c4834a35cfd0d371ed261e33697e5a5bd9448091a2c8185326fcae44f1263b1414a4 SHA512 8f918c4d90938a0c78790c5541a8568766b30384c4f8a6a838de2ae3b8b45ad41cb7dab3aaa31f75458c2cb85b29fd7dd68e41deb18826232a6e65d31097d770
+EBUILD wlroots-9999.ebuild 2572 BLAKE2B 81fe3641a8f35a9198d9312f8408f74f55bba972e7dbe88dec460868d686c4834a35cfd0d371ed261e33697e5a5bd9448091a2c8185326fcae44f1263b1414a4 SHA512 8f918c4d90938a0c78790c5541a8568766b30384c4f8a6a838de2ae3b8b45ad41cb7dab3aaa31f75458c2cb85b29fd7dd68e41deb18826232a6e65d31097d770
+MISC metadata.xml 1672 BLAKE2B 6972ecf01e4d0981aed6b3c60e8f549e04c3662e77ea38a226acc37dedfa6ed04dbda33d4ac451e18b4a889200973bdf6f25c75e4b14e1c3e2b328c04de85a8d SHA512 34654dad23535a63b5891ae658c67bb1d7ba3a61126e1d9f31b10817c134964ce751aac46036ec1d11590f42a4be2c858d5fe44c4760279cfa401826f5ffcf92
diff --git a/dev-libs/wlroots/metadata.xml b/dev-libs/wlroots/metadata.xml
index b97edbb562b5..c5b96abdf826 100644
--- a/dev-libs/wlroots/metadata.xml
+++ b/dev-libs/wlroots/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>speedjack95@gmail.com</email>
 		<name>Niccolò Scatena</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Pluggable, composable, unopinionated modules for building a Wayland
 		compositor.
diff --git a/dev-libs/wlroots/wlroots-0.2.ebuild b/dev-libs/wlroots/wlroots-0.2.ebuild
new file mode 100644
index 000000000000..c3bccd9f7fe9
--- /dev/null
+++ b/dev-libs/wlroots/wlroots-0.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/swaywm/wlroots.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/wlroots/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit fcaps meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind icccm rootston systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND=">=dev-libs/libinput-1.7.0:0=
+	>=dev-libs/wayland-1.16.0
+	>=dev-libs/wayland-protocols-1.15
+	media-libs/mesa[egl,gles2,gbm]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	icccm? ( x11-libs/xcb-util-wm )
+	systemd? ( >=sys-apps/systemd-237 )
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xorg-server[wayland]
+		x11-libs/libxcb:0=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/meson-0.48
+	virtual/pkgconfig"
+
+FILECAPS=( cap_sys_admin usr/bin/rootston )
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		-Dlibcap=$(usex filecaps enabled disabled)
+		-Dxcb-icccm=$(usex icccm enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+		-Drootston=$(usex rootston true false)
+		"-Dexamples=false"
+		"-Dwerror=false"
+	)
+	if use systemd ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	if use rootston ; then
+		dobin "${BUILD_DIR}"/rootston/rootston
+		newdoc rootston/rootston.ini.example rootston.ini
+	fi
+
+	meson_src_install
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+	if use rootston ; then
+		elog ""
+		elog "You should copy (and decompress) the example configuration file"
+		elog "from ${EROOT:-${ROOT}}/usr/share/doc/${PF}/rootston.ini"
+		elog "to the working directory from where you launch rootston"
+		elog "(or pass the '-C path-to-config' option to rootston)."
+		if ! use systemd && ! use elogind ; then
+			elog ""
+			elog "If you use ConsoleKit2, remember to launch rootston using:"
+			elog "exec ck-launch-session rootston"
+
+			fcaps_pkg_postinst
+		fi
+	fi
+}
diff --git a/dev-libs/wlroots/wlroots-9999.ebuild b/dev-libs/wlroots/wlroots-9999.ebuild
index eae2493458cd..c3bccd9f7fe9 100644
--- a/dev-libs/wlroots/wlroots-9999.ebuild
+++ b/dev-libs/wlroots/wlroots-9999.ebuild
@@ -32,7 +32,7 @@ RDEPEND=">=dev-libs/libinput-1.7.0:0=
 	elogind? ( >=sys-auth/elogind-237 )
 	icccm? ( x11-libs/xcb-util-wm )
 	systemd? ( >=sys-apps/systemd-237 )
-	x11-backend? ( x11-libs/libxcb:0=[xkb] )
+	x11-backend? ( x11-libs/libxcb:0= )
 	X? (
 		x11-base/xorg-server[wayland]
 		x11-libs/libxcb:0=
@@ -49,7 +49,6 @@ src_configure() {
 		"-Dxcb-errors=disabled"
 		-Dlibcap=$(usex filecaps enabled disabled)
 		-Dxcb-icccm=$(usex icccm enabled disabled)
-		-Dxcb-xkb=$(usex x11-backend enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
 		-Drootston=$(usex rootston true false)
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index d3c12265ecf5..ff79db3ccbfb 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -8,11 +8,11 @@ DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a6
 DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9041f4a0d9f12c7a61565f10c7d360490a7c8a7c745d91c9eda45b9d9bc58bd6a2bbae02aa9dd7ff1949ac59f7e09b090df SHA512 f979c32b096ecdc7a71b2bd032c6d0e7131f3d304e47e44005989ca79ea1f940c39626c60a8e52ff3cdb2cb380aa5ddf82a99bae08e06629c0bd47d8e0bfa7cc
 DIST xapian-bindings-1.4.9.tar.xz 1123628 BLAKE2B 918748bb99b826485127b16511ae2fe6e7965102738308fc675eca3018c8a7131fd65f54cc396912367c4c6f43c7c28b1ba07591567fe3ae646c3e1480439d0d SHA512 cddc6cedfd571d565619ade0a4c9bfee8d688ca3d06d77368c8d673d3c9d1296b652122836debc84a4d54724c2bf0639a009396bf587ed4b8901a6bfe508851d
 EBUILD xapian-bindings-1.2.24.ebuild 5543 BLAKE2B 77c5f97e4c056eb60674e59a94736fd1276569ac8e7bb89bbb42d9360ffa36ad94065a0b378a9eae21568333dbb3ffbc80877ec69bdf8a98bcbd884b55f07cc7 SHA512 b219ee45083693768bb086e1cb4e4ed2da83786dfa8786210d26bf3b50e0d42efcd2a5b73a90ce1144fd36d666d2c61e20380a13614ff3ddb69e1af09f62179e
-EBUILD xapian-bindings-1.2.25.ebuild 5545 BLAKE2B 76db728a259f663261815664e3fceb870702b6be9543d888f0c129c133b99dbbb4e27e15d156fc8a7ee3960340102024e04dfe84f444c479225000c42fb67db7 SHA512 7208cf866ae4e5374f7f851d56c50c56f8882e7853ab5b1b83edbdf71cc261333f9b3e863bdb2dedbe66875ba4f23b702054e279deed134bc3a75553ab50f8cd
+EBUILD xapian-bindings-1.2.25.ebuild 5544 BLAKE2B c1bdefeda016ef62a5db076d1ede6238abb01538fa50418cb70c119c9da7967895696cfcfdb5dc6d4fdcf6582ce6a54bb926df49d520bcb2892021bfe47ce90e SHA512 6cc58b598f2406d097e061b9966cd43b77b6dfd797630016cb7a7db8880418d4d81836c4831fcf234ab47de9584af43adae3ced21d3aa98cfd439fce40be4d93
 EBUILD xapian-bindings-1.4.4.ebuild 3522 BLAKE2B 1dcaa9c2383685db410e9d7421cc55990598444c3360b698ece2d9ce051cf11d28966ec93d08f599e6036154fb5fb7a07855cf5b7dc6319f140a90d6d989312e SHA512 f57942ee1c7b2ffdb42799df989fc3634f3bdde4b61f9e423d7c5e343645cf28eb67b99694a6b82695f371f52c2b235e9e3dff7d07112dda1267a80dbcacadf1
 EBUILD xapian-bindings-1.4.5.ebuild 6502 BLAKE2B a19fd69e1d7366ddd9da3ea04a9052d0cba77115599815ff40b9cd22c30a38c9802e1f6a22b328fd9d06925dbdc5ba1ebd383eb8495236312dc5f9221ea31729 SHA512 7c25358e53d2e57b16068b260df9d6b3929586c6d8ff2288d9a68fb8e1f2b9054d3b50843d3bb275bd137efd696074c15c7181b57697e06f706ea51e2c9813f6
 EBUILD xapian-bindings-1.4.6.ebuild 6509 BLAKE2B 01fbe871700b6d4d7f7f5a93c971c1ec4463dff5a2a7165e7e1b603b5f02fb2b09e3a1286ac0f22b65ed8e7ef6794f5ae692abc8aab59541a9e0537ba67e96e8 SHA512 5ca05c47b2f9344c698b2825c28a378a0c15ea2cb44adc4f4de0a227ae1240dee21b2272d3d3db187e05a4facaa5c1ac877ccdf4448ac2b262a01c336a3ce603
-EBUILD xapian-bindings-1.4.7.ebuild 6503 BLAKE2B 4f0290ac79e0bfc1cbd3c43ccbf25d885aaf83b12c5bbfd2015ee0823d5b0b9b570f32bbc81b85941dd41dde3700a6bc5a0eb72e1d6a4c7240e804ffa472edc9 SHA512 d8c3843df098019d37a9631eba060b1539c702b691321422dcc7599e14a1814805e416af0a37f93ae8a46ae473a37644b422c44fa4f8810f6acb18e6be690b24
+EBUILD xapian-bindings-1.4.7.ebuild 6502 BLAKE2B 08bece0bfa2334837933a3e8127f6eda823379cba0310404885a92a2fbd27a7ece25ad072ca962c2a5c79b860ded8eaa8defbce3801681758350221099352504 SHA512 5bc11495b81dee898afca9c202cc0153bae5e2175e0c2fbab6746f9ac0795b028614ac5805be2b41bc04f1e6a01ef9cacdcc71e59f02c4e6bea865d080b44296
 EBUILD xapian-bindings-1.4.8.ebuild 6506 BLAKE2B b694b49a182513a041891384e190b2322ee9fe00a7d67714d63ef24379c6eeb8b3c051d410c8fd17f083686ccc206d61f4eac85ef87233c48272ea14f5bd5d81 SHA512 c8e3b5fe54651c9825badcad0093f83d6e9f819f335a42f5aa686aa58e29c6ff2493bb38bb9b8a7ccc6436f044139ecb8718f7cbc96035d3fea47df7bcf8aa96
 EBUILD xapian-bindings-1.4.9.ebuild 6506 BLAKE2B 2e054e8eb103a8d05439594f9c3df88700f928434a5463f1eaad828f8ffbe43e4cc138932f359c2b6505ea5539c4cc3be9ee92b45a6a87f751308617666750e2 SHA512 162575906ac0a348a0dcbc419bbfe5af6bdf1666b94ecfcca01206db2b38d0e24f184abde3f5d6f0e71d37420387eba33bae31dd59930e4cae56ef8eec2d1b89
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
index c9df709c44ea..ada47d47416c 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
@@ -22,7 +22,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 #IUSE="java lua mono perl php python ruby tcl"
 #REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
 IUSE="java lua perl php python ruby tcl"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
index 891a01aa5991..66769c1563fa 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index f8bc4903e323..9284404f7d67 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -7,11 +7,11 @@ DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5
 DIST xapian-core-1.4.8.tar.xz 2880432 BLAKE2B 8468a33614d8c7617755cfe4cc79e72ab42612a79be9fb684525e268efe80c42ce902a60a44dc5548c70b719d752e15927ce24b4ab457905022ae806bffb1f11 SHA512 9ed1f34ec1bf53a4dc628ebb8d080af79a4ac6a315bf1ae52441f0ac3a63e5478ed02887382116b28157b926e685fdc730489426edce560aa4bba27cb7295e48
 DIST xapian-core-1.4.9.tar.xz 2880024 BLAKE2B 25272128fbbd7cb23dab92c87be03fee8dae5b742f26a66b9c51c649a7826639e52124f5f0748d3c12cce81a7875ed217931ddbe2b04303a08709c4a773a617f SHA512 1af23815ff9358d6407723d1a7d3dc00df8f45f4808ccaa4c57f38197763fdc2d62cb7b080fab737408db42ced85707021eac881d80767248ea22aff8a2e4aa3
 EBUILD xapian-1.2.24.ebuild 1553 BLAKE2B 77d756575e5d0fdabd59f970ad6edfa4a197c1083a9080392725b6d74e6d9d0f948bed1dd7dbdeb29c0a16bbe70490af0a5b4505e539cee62272949768ddb931 SHA512 9e7f9ed40d9087f3c1fcb1cfe32e30646d2041e4abcc4f5f26940356b40e6d8bf9a80d7d57c86d3f4ecae369d974bbc0f141628fae831903f16d0b81ca336a48
-EBUILD xapian-1.2.25.ebuild 1821 BLAKE2B c47d0bbfad51df1a1322c4dae27f594f9686ce001870c99ff609cfeea3261e74b5bd74231551d9c6e35bb1d40f59873423ff2fef5d6447716fb8485045840760 SHA512 6bea9a2ba3d3addecd8e119aa8c049feff65db65a72edc6e2f5f34bbf6f9cacb7c8d6ad1310a06d1af483f1de693393daf43e82d69a876158ff46acebf8f954b
+EBUILD xapian-1.2.25.ebuild 1820 BLAKE2B 47c0b199a1a9bdb494e655b693593c20e0d9ab7ebb9db1d67f12091809e6a2d8e34d625df108c1d717ba40acb16c01b25fcdeecb6011d894e0205dd0d3bbace6 SHA512 51c262a93c7c0dac257af7c2cec5a14f9e50adb43edecc82f4382f5e02e72910f304ea5f45ef874163a3bf0978491781aae31558df6f9240d94d9027556112be
 EBUILD xapian-1.4.4.ebuild 1908 BLAKE2B cbb63641f65e5bd48dcf353a5131e5199d9b9574a166528375a8dbffeb324e89b8c0129778241486e9cc8e9ac9ff18c464651e63f09b21a9e9e473698ad31444 SHA512 d1369efedd3aebc02ae4bbb7e2c201accad3a825248cb51cc14682266692a860c57e621ae3f7c2fc2a8183b612a9d824d99dff5ad5bbb6d3a9dd47f199a31b2d
 EBUILD xapian-1.4.5.ebuild 1906 BLAKE2B b7402f69fb0d7f5e2dffa92651cafbb588533d9eba1eacb1a3dcc91245f7b609ab74ddbfdcef014acb267a85a1dc819deaa2b7ad0b83845b923ea7350e79561c SHA512 eeb3f0d3e7cacb4c8be2c92a889d53c470023fc3ae583509af879e3a546f8212d64527afe38cbef6d7e674292b4c20d03ab5454d48f510bb0f98c1f20bb2d68a
 EBUILD xapian-1.4.6.ebuild 1917 BLAKE2B f7a307085cc7322e471a9e0418c6d8f2f65b78b387f32dd4cd8a0bab719c8646cb22d18ffa6707ae5689288b7d6cefdd324e2b10cec20882828d9c6bde89022e SHA512 64b7c6a931b1611795cd62327529a7eef4a4897e0c345c20ba8c5e4c559e7d45ec2f932d87174b49fdfe8a309de8d9cf4c298ded68fb1b67214db8fd637ee032
-EBUILD xapian-1.4.7.ebuild 1911 BLAKE2B 0f96bd31abe010bc523214f45dc8dd77be8979cea22f9119147a90905b0d5ebd2613d02528d336a8cb53cbb83c338d109f8de753a6cb6035af47d1b777f357ec SHA512 4d3ebfcab04342a7b51bd1b01985aa4b4798a9a352392652b1be00765624e2ae43f2375a0dd1cc1810dc16c5bb387cad363c87c1b3396b8bfe09fbc401acd045
+EBUILD xapian-1.4.7.ebuild 1910 BLAKE2B fdfe271864545182dc4f41deb6b9060a26dce89ab1e5577e4a0cea52ab862d1817612bc620fa1dcf352b94b610ef0a641f75c38e7ffa22de7650b1d5fbefad2b SHA512 5bd62bb06b571f846af6d9310759ec745a2d1f4c095889e609c0b7033a2d5334cbc1d3c4d7bd6ea97753d0ecf0833432a3e7de50236e45c1877383b89ad4d68e
 EBUILD xapian-1.4.8.ebuild 1914 BLAKE2B 8d08a55a1db74ba1d71d6f5208627a41861d7b5759670e58749ff52a796c471b1e4fd1293ecee3748c719ed82842bf8af7a2b84107d63aa5b4b515774fe3d048 SHA512 5d143c95dad7d470705065bbb23508b774b9557a65d80bd22f8b56519f49d82144354fe05192574daa7a4c4518c129795d1b1eb5b3917a7b1159cc63a00d0497
 EBUILD xapian-1.4.9.ebuild 1914 BLAKE2B 8d08a55a1db74ba1d71d6f5208627a41861d7b5759670e58749ff52a796c471b1e4fd1293ecee3748c719ed82842bf8af7a2b84107d63aa5b4b515774fe3d048 SHA512 5d143c95dad7d470705065bbb23508b774b9557a65d80bd22f8b56519f49d82144354fe05192574daa7a4c4518c129795d1b1eb5b3917a7b1159cc63a00d0497
 MISC metadata.xml 932 BLAKE2B 303ba679d42d5917930aa698ca96fa22e2000b4ffbfe3113b67119b61dd51140b1662bc090078027f7b00d0ad04e0e61792e74d1bddfc625e46258568b5c5f57 SHA512 874335952e31a9da1d105b82eac0c209259a85dfcdc8b7171cc1ff7d48694838bf9c3037fc4ff0450298b3c6b6fbb143ecfe7497727e8f18b684ff630caeb49c
diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild b/dev-libs/xapian/xapian-1.2.25.ebuild
index ff1b5ee09410..613d0f0cd7f3 100644
--- a/dev-libs/xapian/xapian-1.2.25.ebuild
+++ b/dev-libs/xapian/xapian-1.2.25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.7.ebuild b/dev-libs/xapian/xapian-1.4.7.ebuild
index 08f3bc1ef86f..3d6cf0ff0aef 100644
--- a/dev-libs/xapian/xapian-1.4.7.ebuild
+++ b/dev-libs/xapian/xapian-1.4.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index e2bc73f06982..0149e6ca79e4 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,5 +1,9 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
 AUX xerces-c-3.1.4-fix-build-system.patch 2080 BLAKE2B 02e67cf0c737c30405b967619aa8deee0c1f1c8b9635265226b111ca729b23bcc1bb1d094ba3342269051cb9a819b281b0985d2c1785bfa524f3844b29d65636 SHA512 38ec4237425e63aaf00e4b969ad0c478bb788b803272f7406f38ea250e5ed1ba4e78f061959fbe180956058d1d7f3b56d31451450872809999b2c6be29add4dc
+AUX xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 DIST xerces-c-3.1.4.tar.gz 6992545 BLAKE2B 463e721843632b13f4b5c845f14cf9ab4f093085558858b435ae5a3122951ab590f9e56f43add1aeaf7dc244814710be804ab0331a1d1e8073919ad9d3b61068 SHA512 8afd775bac0345a2714b77a1ae2cfb8ae67f0239ec7370de7d89612dec64d2e1df48612c875fe239ab6f2eb31914c2d3914617e6b34a1bae0bbb14e4dbc787b5
+DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
 EBUILD xerces-c-3.1.4-r1.ebuild 2824 BLAKE2B 07765e9c4ab0af4f1eac7b3630faee0b5c4eedf4d48e3934e69ef24554ec2fcb5bd354404e1ad4c99c5260519002c2bba6d994303a9eec80938a30c7141140c6 SHA512 0bc0fd5c0b5bf2346700ba8435fe3fd48f08494166494d1ff5c36a0f348f563ba972100a7095583ff5f4569262d515a15ea6fa5e83468572179215d1f99aa5b7
+EBUILD xerces-c-3.2.2.ebuild 2759 BLAKE2B 6bb440b553a8e3766b5aabd52cbd4da8ead25c04d4c0ed77d9131dac911eb1e3156bab6be73cc20a951224c65d87e4320d0bce0327ca634ab90a1a5de2169ff8 SHA512 0784c58a373d2ae567de3a6b6582199c893f89ef5bb584a90876ada3cce88d0fc4d761b2a516ee47d815d9be23c73eb455a9189fa41bff1ffe6f425ece83b805
+EBUILD xerces-c-9999.ebuild 2868 BLAKE2B bd1be084d8090c1538260577ab8e89ec8aaf9abbf83c5c8fdaa046e2e44daf0acc996deafc832ad2635043cce5642a5b350223a58a7bb34e0bd4321a1e7893a1 SHA512 d1261c22979dffe67756acfac50fe395d98b56836f246e40acce0aeba1d0b79a8c5fc5d7cb54eff355f848d40aebd9fa36b3829ab00928193739a7823e7672d4
 MISC metadata.xml 849 BLAKE2B 4d7f00d4864bd2b347723a029ff58cc7c9f84867ebcc45392a94b2d063cdbde84a4290e2302d9fbdabf98c7cf3a3edb04a18ce60d6c5bd9c474a492f5acc4b2f SHA512 e1aaa46f73a6cc929dc87530053ab0f15d632a1998d3ac13991ac94610d578deeeb8e4e786bbe42512c7231d99701c9bf59047cffba0bb48044e80f96f36663b
diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch
new file mode 100644
index 000000000000..f1a847c55699
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch
@@ -0,0 +1,770 @@
+--- /dev/null	2018-12-04 16:29:46.857790926 -0500
++++ b/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg	2018-12-07 14:18:19.183422991 -0500
+@@ -0,0 +1,767 @@
++$quote "
++$set 1
++2  notation '{0}' has already been declared
++3  attribute '{0}' has already been declared for element '{1}'
++4  encoding '{0}' from XML declaration or manually set contradicts the auto-sensed encoding; ignoring
++5  element '{0}' is referenced in a content model but was never declared
++6  element '{0}' is referenced in an ATTLIST but was never declared
++7  {0}
++8  unable to include document '{0}'
++9  unable to open text file target '{0}'
++10  unable to include resource '{0}'
++13  '{0}' is not allowed for the content of simpleType; only list, union, and restriction are allowed
++14  globally-defined complex type must have a name
++15  globally-declared attribute must have a name
++16  attribute declaration must have name or 'ref' attribute
++17  element declaration must have name or 'ref' attribute
++18  group declaration must have name or a 'ref' attribute
++19  attributeGroup declaration must have name or 'ref' attribute
++20  anonymous complexType in element '{0}' has name
++21  anonymous simpleType in element '{0}' has name
++22  content of element declaration must match (annotation?, (simpleType | complexType)?, (unique | key | keyref)*)
++23  invalid content in simple type '{0}'; only list, union, and restriction are allowed
++24  expected simpleType in list definition for type '{0}'
++25  list, union, or restriction content is invalid for type '{0}'
++26  invalid content in list definition for type '{0}'
++27  expected simpleType in restriction definition for type '{0}'
++28  facet '{0}' is already defined
++29  expected simpleType in union definition for type '{0}'
++30  content in simpleType definition is empty
++31  expected restriction or extension in simpleContent definition
++32  base attribute must be specified for restriction or extension definition
++33  expected restriction or extension in complexContent definition
++34  invalid content in 'schema' element
++35  invalid content for type '{0}'
++36  unknown simpleType '{0}'
++37  unknown complexType '{0}'
++38  prefix '{0}' can not be resolved to namespace URI
++39  referenced element '{0}' not found
++40  type '{0}:{1}' not found
++41  attribute '{0}' not found
++42  invalid element '{0}' in complex type definition
++43  base type '{0}' not found
++44  unable to create validator for '{0}'
++45  invalid element following simpleContent definition in complexType
++46  invalid element following complexContent definition in complexType
++47  attribute '{0}' cannot have both fixed and default values
++48  attribute '{0}' with default value must be optional
++49  attribute '{0}' declared more than once in the same scope
++50  attribute '{0}' cannot have both 'type' attribute and simpleType definition
++51  simpleType '{0}:{1}' for attribute '{2}' not found
++52  element '{0}' cannot have both fixed and default values
++53  invalid {0} name '{1}'
++54  element '{0}' cannot have both 'type' attribute and simpleType/complexType definition
++55  element '{0}' has fixed or default value and must have mixed simple or simple content model
++56  simpleType '{0}' that '{1}' extends has a value of the final attribute that does not permit extension
++57  type '{0}' specified as the base in simpleContent definition must not have complex content
++58  type '{0}' is a simple type and cannot be used in derivation by restriction in complexType definition
++59  invalid element following restriction or extension definition in simpleContent
++60  invalid element following restriction or extension definition in complexContent
++61  duplicate annotation in type '{0}'
++62  type '{0}' cannot be used in its own union, list, or restriction definition
++63  block value '{0}' is invalid
++64  final value '{0}' is invalid
++65  element '{0}' cannot be part of the substitution group headed by '{1}'
++66  element '{0}' has a type which does not derive from the type of the element at the head of the substitution group
++67  element '{0}' declared more than once in the same scope
++68  value '{0}' invalid for attribute '{1}'
++69  attribute '{0}' has both 'ref' attribute and inline simpleType definition or 'form' or 'type' attribute
++70  duplicate reference attribute '{0}:{1}' in complexType definition
++71  derivation by restriction is forbidden by either base type '{0}' or globally
++72  derivation by extension is forbidden by either base type '{0}' or globally
++73  base type specified in complexContent definition must be a complex type
++74  imported schema '{0}' has different target namespace '{1}'; expected '{2}'
++75  'schemaLocation' attribute must be specified in element '{0}'
++76  included schema '{0}' has different target namespace '{1}'
++77  at most one annotation is allowed
++78  content of attribute '{0}' must match (annotation?, simpleType?)
++79  attribute '{0}' must appear in global {1} declarations
++80  attribute '{0}' must appear in local {1} declarations
++81  attribute '{0}' cannot appear in global {1} declarations
++82  attribute '{0}' cannot appear in local {1} declarations
++83  minOccurs value '{0}' must not be greater than maxOccurs value '{1}'
++84  duplicate annotation in anyAttribute declaration
++85  global {0} declaration must have name
++86  circular definition in '{0}'
++87  global type '{0}:{1}' declared more than once or also declared as {2}
++88  global {0} '{1}' declared more than once
++89  invalid value '{0}' for whiteSpace facet; expected 'collapse'
++90  namespace of import declaration must be different from target namespace of importing schema
++91  importing schema must have target namespace if namespace in import declaration is not present
++92  element '{0}' cannot have value constraint '{1}' if its type is derived from ID
++93  element/attribute '{0}' is of NOTATION type
++94  element '{0}' has mixed content type and the content type's particle must be emptiable
++95  complexType definition has empty content but base type is not empty or does not have emptiable particle
++96  content types of base type '{0}' and derived type '{1}' must both be mixed or element-only
++97  derived content type is not a valid restriction of base content type
++98  derivation by extension or restriction is forbidden by either base type '{0}' or globally
++99  item type definition must have variety of atomic or union where all member types must be atomic
++100  group '{0}' must contain all, choice, or sequence compositor
++101  content of attributeGroup '{0}' must match (annotation?, ((attribute | attributeGroup)*, anyAttribute?))
++102  top-level compositor in a group must not have 'minOccurs' or 'maxOccurs' attribute
++103  {0} '{1}:{2}' not found
++104  group with the all compositor must only appear as content type of a complex type
++105  group with the all compositor constituting the content type of a complex type must have both minOccurs and maxOccurs equal 1
++106  element declaration in the all compositor must have minOccurs and maxOccurs equal 0 or 1
++107  attribute '{0}' is already defined in base
++108  intensional intersection of attribute wildcards must be expressible
++109  base type does not have any attributes
++110  attribute '{0}' has incompatible use value in the base
++111  type of attribute '{0}' must be derived by restriction from type of the corresponding attribute in the base
++112  attribute '{0}' does not have a fixed value or has a different fixed value from that of the base
++113  attribute '{0}' has invalid target namespace with respect to the base wildcard constraint or base has no wildcard
++114  attribute wildcard is present in the derived type but not in the base
++115  attribute wildcard in the derived type is not a valid subset of that in the base
++116  attribute '{0}' cannot have different use value in the derived type if the base attribute use value is 'prohibited'
++117  attribute wildcard in the derived type must be identical to or stricter than the one in the base
++118  unexpected '{0}' in the content of the all compositor; only elements are allowed
++119  redefined schema '{0}' has a different target namespace '{1}'
++120  simpleType in redefine must have a restriction definition
++121  simpleType base attribute in redefine must reference the original type with the same name
++122  complexType in redefine must have a restriction or extension definition
++123  complexType base attribute in redefine must reference the original type with the same name
++124  group '{0}' must have minOccurs and maxOccurs equal 1
++125  unable to find declaration in the schema being redefined corresponding to '{0}'
++126  group declaration in redefine may only contain one reference to itself
++127  attributeGroup declaration in redefine may only contain one reference to itself
++128  redefine declaration cannot contain '{0}'
++129  notation declaration '{0}:{1}' not found
++130  more than one identity constraint has name '{0}'
++131  identity constraint declaration must match (annotation?, selector, field+)
++132  key reference declaration '{0}' refers to unknown key '{1}'
++133  field cardinalities for keyref '{0}' and key '{1}' must match
++134  XPath expression is missing or empty
++135  fixed value in attribute reference is not set or differs from the fixed value of '{0}'
++136  attribute '{0}' is of ID type or type derived from ID and cannot have default/fixed value constraint
++137  attribute '{0}' is a subsequent attribute in this complex type with a type derived from ID
++138  attribute '{0}' is a subsequent attribute in this attribute group with a type derived from ID
++139  empty value illegal for 'targetNamespace' attribute; target namespace must be absent or contain non-empty value
++140  {0}
++141  '{0}' has already been included or redefined
++142  namespace '{0}' is referenced without import declaration
++143  all compositor that is part of a complex type definition must constitute the entire content of the definition
++144  annotation can only contain appinfo and documentation declarations
++145  invalid facet name '{0}'
++146  root element name of XML Schema document must be 'schema'
++147  circular substitution group in element '{0}'
++148  element '{0}' must be from the XML Schema namespace
++149  target namespace of attribute '{0}' cannot be http://www.w3.org/2001/XMLSchema-instance
++150  invalid namespace declaration
++151  namespace fix-up cannot be performed on DOM Level 1 node
++152  more than one anyAttribute declaration found in complex type declaration
++153  anyAttribute must not be followed by other declarations
++156  parser has encountered more than '{0}' entity expansions in the document; this is the limit imposed by the application
++157  expected comment or CDATA section
++158  attribute name expected
++159  notation name expected
++160  illegal repetition of elements in mixed content model
++161  default attribute declaration expected
++162  equal sign expected
++163  element name expected
++164  comment must start with <!--
++165  invalid document structure
++166  expected version, encoding, or standalone declaration
++167  invalid XML version declaration
++168  unsupported XML version '{0}'
++169  unterminated XML declaration
++170  invalid XML encoding declaration '{0}'
++171  invalid standalone declaration
++172  unterminated comment
++173  processing instruction name expected
++174  unterminated processing instruction
++175  invalid character 0x{0}
++176  unterminated start tag '{0}'
++177  attribute value expected
++178  unterminated end tag '{0}'
++179  expected type for attribute '{0}' of element '{1}'
++180  expected end of tag '{0}'
++181  expected tag name, comment, PI, or other markup
++182  invalid content after root element's end tag
++183  comment expected
++184  comment or processing instruction expected
++185  whitespace expected
++186  expected root element in DOCTYPE declaration
++187  quoted string expected
++188  public id expected
++189  invalid character 0x{0} in public id
++190  unterminated DOCTYPE declaration
++191  invalid character 0x{0} in internal subset
++192  unexpected whitespace
++193  invalid character 0x{1} in attribute value '{0}'
++194  markup declaration expected
++195  TEXT declaration is illegal at this point
++196  conditional section in internal subset
++197  parameter entity name expected
++198  unterminated entity declaration '{0}'
++199  invalid character reference
++200  unterminated character reference
++201  expected entity name for reference
++202  entity '{0}' not found
++203  unparsed entity reference '{0}' is invalid at this point
++204  unterminated entity reference '{0}'
++205  recursive entity expansion '{0}'
++206  partial markup in entity value
++207  unterminated element declaration '{0}'
++208  expected content specification for element '{0}'
++209  '*' expected
++210  mixed content model '{0}' not terminated properly
++211  system or public id expected
++212  unterminated notation declaration
++213  expected ',', '|', or ')'
++214  expected '|' or ')'
++215  expected ',', '|', or ')' in content model of element '{0}'
++216  expected enumeration value for attribute '{0}'
++217  expected '|' or ')'
++218  unterminated entity literal
++219  unmatched end tag detected
++220  '(' expected
++221  attribute '{0}' is already specified for element '{1}'
++222  '<' character cannot be used in attribute value '{0}'; use &lt; instead
++223  leading surrogate character is not followed by a legal second character
++224  expected ']]>' sequence to end conditional section
++225  expected INCLUDE or IGNORE at this point
++226  expected '[' to follow INCLUDE or IGNORE
++227  unexpected end of entity '{0}'
++228  parameter entity propagated out of internal/external subset
++229  unmatched ']' character detected
++230  parameter entity references are not allowed inside markup in internal subset
++231  entity propagated out of the content section into miscellaneous
++232  expected &# to be followed by a numeric character value
++233  '[' expected
++234  ']]>' sequence is not allowed in character data
++235  '--' sequence is illegal in comment
++236  unterminated CDATA section
++237  NDATA expected
++238  NDATA is illegal for parameter entities
++239  hex radix character references must use 'x', not 'X'
++240  {0} declaration already seen
++241  XML declarations must be in this order: version, encoding, standalone
++242  external entity cannot be referred to from attribute value
++243  XML or TEXT declaration must start with '<?xml ', not '<?XML '
++244  expected literal entity value or public/system id
++245  '{0}' is not a valid digit for the specified radix
++246  input ended before all started tags were ended; last tag started is '{0}'
++247  nested CDATA section illegal
++248  prefix '{0}' can not be resolved to namespace URI
++249  start and the end tags are in different entities
++250  XML document cannot be empty
++251  CDATA section is illegal outside the root element
++252  unexpected trailing surrogate character
++253  processing instruction cannot start with 'xml'
++254  XML or TEXT declaration must start at line 1, column 1
++255  version declaration is required in XML declaration
++256  standalone declaration is only legal in the main XML entity
++257  encoding declaration is required in TEXT declaration
++258  colon is illegal in names when namespaces are enabled
++259  {0}
++260  schemaLocation does not contain namespace-location pairs
++261  fatal error during schema scan
++262  reference to external entity declaration '{0}' is illegal in standalone document
++263  partial markup in parameter entity replacement text in complete declaration
++264  invalid namespace value in prefix-namespace mapping '{0}'
++265  prefix 'xmlns' cannot be explicitly bound to namespace
++266  namespace for 'xmlns' cannot be explicitly bound to prefix
++267  prefix 'xml' cannot be bound to namespace other than its canonical namespace
++268  namespace for 'xml' cannot be bound to prefix other than 'xml'
++269  element '{0}' cannot have 'xmlns' as its prefix
++270  restriction must contain simpleType definition
++271  invalid root element '{0}' in DOCTYPE declaration
++272  invalid element name '{0}'
++273  invalid attribute name '{0}'
++274  invalid entity reference name '{0}'
++275  DOCTYPE declaration already seen
++276  fallback element is not a direct child of include element
++277  include element without 'href' attribute
++278  include element with XPointer specification; XPointer is not yet supported
++279  invalid 'parse' attribute value '{0}'; expected 'text' or 'xml'
++280  multiple fallback elements in document '{0}'
++281  include failed and no fallback element found in document '{0}'
++282  circular inclusion in document '{0}'
++283  self-inclusion in document '{0}'
++284  element '{0}' is not allowed as a child of include element
++285  included notation '{0}' conflicts with notation already defined
++286  included entity '{0}' conflicts with entity already defined
++
++
++$set 2
++2  no declaration found for element '{0}'
++3  no declaration found for attribute '{0}'
++4  notation '{0}' is referenced but was never declared
++5  root element differs from that declared in DOCTYPE
++6  missing required attribute '{0}'
++7  element '{0}' is not allowed for content model '{1}'
++8  ID attribute must be #IMPLIED or #REQUIRED
++9  attribute cannot have empty value
++10  element '{0}' has already been declared
++11  element '{0}' has more than one ID attribute
++12  ID value '{0}' has already been used
++13  ID attribute '{0}' is referenced but was never declared
++14  attribute '{0}' refers to undeclared notation '{1}'
++15  element '{0}' is specified in DOCTYPE but was never declared
++16  empty content is not valid for content model '{0}'
++17  attribute '{0}' is not declared for element '{1}'
++18  value '{0}' for attribute '{1}' of type ENTITY/ENTITIES must refer to external, unparsed entity
++19  attribute '{0}' refers to unknown entity '{1}'
++20  attribute of type ID/IDREF/IDREFS/ENTITY/ENTITIES/NOTATION cannot contain colon when namespaces are enabled
++21  missing elements in content model '{0}'
++22  no character data is allowed by content model
++23  value '{0}' for attribute '{1}' does not match its type's defined enumeration or notation list
++24  value '{0}' for attribute '{1}' is invalid Name or NMTOKEN value
++25  attribute '{0}' does not allow multiple values
++26  attribute '{0}' has value '{1}' that does not match its #FIXED value '{2}'
++27  element types cannot be duplicated in mixed content model
++28  {0} is not supported
++29  '{0}' is not allowed in the {1} compositor; only element, group, choice, sequence, and any are allowed
++30  base type '{0}' not found in '{1}' definition
++31  {0} declaration with 'ref' attribute cannot have content
++32  {0}
++33  prohibited attribute '{0}' is present
++34  illegal 'xml:space' declaration
++35  schema document '{0}' has different target namespace from the one specified in instance document '{1}'
++36  element '{0}' is of simple type and cannot have elements in its content
++37  unable to find validator for simple type of element '{0}'
++38  grammar not found for namespace '{0}'
++39  {0}
++40  'xsi:nil' specified for non-nillable element '{0}'
++41  element '{0}' is nil and must be empty
++42  content of element '{0}' differs from its declared fixed value
++43  unable to find validator for simple type of attribute '{0}'
++44  error during schema scan
++45  element '{0}' must be qualified
++46  element '{0}' must be unqualified
++47  reference to external entity declaration '{0}' is not allowed in standalone document
++48  attribute '{0}' in element '{1}' has default value and must be specified in standalone document
++49  attribute '{0}' must not be changed by normalization in standalone document
++50  whitespace must not occur between externally declared elements with element content in standalone document
++51  entity '{0}' not found
++52  partial markup in parameter entity replacement text
++53  failed to validate '{0}'
++54  complex type '{0}' violates the unique particle attribution rule in its components '{1}' and '{2}'
++55  abstract type '{0}' cannot be used in 'xsi:type'
++56  element '{0}' is abstract; use non-abstract member of its substitution group instead
++57  type of element '{0}' is abstract; use 'xsi:type' to specify non-abstract type instead
++58  type '{0}' specified in 'xsi:type' cannot be resolved
++59  type '{0}' specified in 'xsi:type' does not derive from type of element '{1}'
++60  element '{0}' does not permit substitution
++61  complex type '{0}' does not permit substitution
++62  attribute '{0}' must be qualified
++63  attribute '{0}' must be unqualified
++64  identity constraint field matches more than one value within the scope of its selector; field must match unique value
++65  unknown identity constraint field
++66  element '{0}' has identity constraint key with no value
++67  element '{0}' does not have enough values for identity constraint key '{1}'
++68  element '{0}' declares identity constraint key that matches nillable element
++69  element '{0}' declares duplicate identity constraint unique values
++70  element '{0}' declares duplicate identity constraint key values
++71  keyref '{0}' refers to out of scope key/unique
++72  identity constraint key for element '{0}' not found
++73  non-whitespace characters are not allowed in schema declarations other than appinfo and documentation
++74  element '{0}' declared EMPTY but has attribute '{1}' of type NOTATION
++75  element '{0}' declared EMPTY and cannot have content, not even entity references, comments, PIs, or whitespaces
++76  element '{0}' has more than one attribute of type NOTATION
++77  attribute '{0}' has non-distinct token '{1}'
++78  content model of element '{0}' does not allow escaped whitespaces
++
++
++$set 3
++2  unable to open primary document entity '{0}'
++5  index is beyond array bounds
++6  new array size is less than the old
++7  index is beyond maximum attribute index
++8  invalid AttType value
++9  invalid DefAttType value
++10  bit index is beyond set size
++11  bit sets have different sizes
++12  no more buffers available
++13  buffer is not found in the manager's pool
++14  NULL pointer
++15  binary operation node has unary node type
++16  content type must be mixed or children
++17  PCDATA node is illegal at this point
++18  unary operation node has binary node type
++19  unknown content model type
++20  unknown content spec type
++21  parent element has no content spec node
++22  invalid spec type for '{0}'
++23  unknown creation reason value
++24  element stack is empty
++25  pop operation requested on empty stack
++26  parent operation requested with only one element in stack
++27  no more elements in enumerator
++28  unable to open file '{0}'
++29  unable to query file position
++30  unable to close file
++31  unable to seek to the end of file
++32  unable to seek to the required position in file
++33  unable to duplicate handle
++34  unable to read data from file
++35  unable to write data to file
++36  unable to reset file position to the beginning
++37  unable to get file size
++38  unable to determine file base pathname
++39  parsing in progress
++40  DOCTYPE declaration was seen but installed validator does not support DTD
++41  unable to open DTD document '{0}'
++42  unable to open external entity '{0}'
++43  unexpected end of input
++44  zero hash modulus
++45  hashing key produced invalid hash
++46  no such key in hash table
++47  unable to destroy mutex
++48  internal error in NetAccessor
++49  NetAccessor is unable to determine length of remote file
++50  unable to initialize NetAccessor
++51  unable to resolve host/address '{0}'
++52  unable to create socket for URL '{0}'
++53  unable to connect socket for URL '{0}'
++54  unable to write to socket for URL '{0}'
++55  unable to read from socket for URL '{0}'
++56  specified HTTP method is not supported by NetAccessor
++57  element '{0}' is already in pool
++58  invalid pool element id
++59  zero hash modulus
++60  reader id not found
++61  invalid auto encoding value
++62  unable to decode first line in entity '{0}'
++63  XML or TEXT declaration '{0}' cannot have NEL or lsep
++64  current transcoding service does not support source offset information
++65  EBCDIC file must provide encoding declaration
++66  unable to open primary document entity '{0}'
++67  unbalanced start/end tags
++68  call to scanNext is illegal at this point
++69  index is past top of stack
++70  empty stack
++71  target buffer cannot have zero max size
++72  unsupported radix; expected 2, 8, 10, or 16
++73  target buffer is too small
++74  start index is past the end of string
++75  string representation overflows output binary result
++76  illegal string pool id
++77  char 0x{0} is not representable in '{1}' encoding
++78  invalid multi-byte sequence
++79  code point 0x{0} is invalid for '{1}' encoding
++80  leading surrogate followed by invalid trailing surrogate
++81  unable to create converter for '{0}' encoding
++82  malformed URL
++83  unsupported protocol in URL
++84  URL protocol '{0}' is unsupported
++85  missing protocol prefix
++86  expected '//' after protocol
++87  base part of URL cannot be relative
++88  port field must be 16-bit decimal number
++89  invalid byte '{1}' at position {0} of a {2}-byte sequence
++90  invalid bytes '{0}' and '{1}' of a 3-byte sequence
++91  irregular bytes '{0}' and '{1}' of a 3-byte sequence
++92  invalid bytes '{0}' and '{1}' of a 4-byte sequence
++93  exceeded byte limit at byte '{0}' in a {1}-byte sequence
++94  index is beyond vector bounds
++95  invalid element id
++96  internal subset is not allowed when reusing the grammar
++97  unknown recognizer encoding
++98  illegal character at offset {0} in regular expression '{1}'
++99  invalid reference number
++100  character expected after backslash
++101  unexpected '?'; '(?:', '(?=', '(?!', '(?<', '(?#', or '(?>' expected
++102  '(?<=' or '(?<!' expected
++103  unterminated comment
++104  ')' expected
++105  unexpected end of pattern in modifier group
++106  ':' expected
++107  unexpected end of pattern in conditional group
++108  back reference, anchor, lookahead, or lookbehind expected in conditional pattern
++109  more than three choices in conditional group
++110  character in the U+0040-U+005f range must follow '\c'
++111  '{' expected before category character
++112  property name must be closed with '}'
++113  unexpected meta character
++114  unknown property
++115  POSIX character class must be closed with ':]'
++116  unexpected end of pattern in character class
++117  unknown name for POSIX character class
++118  ']' expected
++119  '{0}' is invalid character range; use '\{1}' instead
++120  '[' expected
++121  ')', '-[', '+[', or '&[' expected
++122  range end code point '{0}' is less than start code point '{1}'
++123  invalid Unicode hex notation
++124  '\ x{' must be closed with '}'
++125  invalid Unicode code point
++126  anchor cannot be present at this point
++127  '{0}' is invalid character escape sequence
++128  invalid quantifier in '{0}'; digit expected
++129  invalid quantifier in '{0}'; invalid quantity or missing  '}'
++130  invalid quantifier in '{0}'; digit or '}' expected
++131  invalid quantifier in '{0}'; min quantity must be less than or equal max quantity
++132  invalid quantifier in '{0}'; quantity value overflow
++133  XML Schema was seen but installed validator does not support XML Schema
++134  SubstitutionGroupComparator has no grammar resolver
++135  invalid length value '{0}'
++136  invalid maxLength value '{0}'
++137  invalid minLength value '{0}'
++138  length value '{0}' must be a non-negative integer
++139  maxLength value '{0}' must be a non-negative integer
++140  minLength value '{0}' must be a non-negative integer
++141  both length and maxLength cannot be present at the same time
++142  both length and minLength cannot be present at the same time
++143  maxLength value '{0}' must be greater than minLength value '{1}'
++144  invalid facet tag '{0}'
++145  length value '{0}' must be equal to length value '{1}' in the base
++146  minLength value '{0}' must be greater than or equal to minLength value '{1}' in the base
++147  minLength value '{0}' must be less than or equal to maxLength value '{1}' in the base
++148  maxLength value '{0}' must be less than or equal to maxLength value '{1}' in the base
++149  maxLength value '{0}' must be greater than or equal to minLength value '{1}' in the base
++150  length value '{0}' must be greater than or equal to minLength value '{1}' in the base
++151  length value '{0}' must be less than or equal to maxLength value '{1}' in the base
++152  minLength value '{0}' must be less than or equal to length value '{1}' in the base
++153  maxLength value '{0}' must be greater than or equal to length value '{1}' in the base
++154  enumeration value '{0}' must be from the value space of the base
++155  whiteSpace value '{0}' must be one of 'preserve', 'replace', or 'collapse'
++156  whiteSpace value is 'preserve' or 'replace' while base type whiteSpace value is 'collapse'
++157  whiteSpace value is 'preserve' while base type whiteSpace value is 'replace'
++158  invalid maxInclusive value '{0}'
++159  invalid maxExclusive value '{0}'
++160  invalid minInclusive value '{0}'
++161  invalid minExclusive value '{0}'
++162  invalid totalDigits value '{0}'
++163  invalid fractionDigits value '{0}'
++164  totalDigits value '{0}' must be a positive integer
++165  fractionDigits value '{0}' must be a non-negative integer
++166  both maxInclusive and maxExclusive cannot be present at the same time
++167  both minInclusive and minExclusive cannot be present at the same time
++168  maxExclusive value '{0}' must be greater than minExclusive value '{1}'
++169  maxExclusive value '{0}' must be greater than minInclusive value '{1}'
++170  maxInclusive value '{0}' must be greater than minExclusive value '{1}'
++171  maxInclusive value '{0}' must be greater than minInclusive value '{1}'
++172  totalDigits value '{0}' must be greater than fractionDigits value '{1}'
++173  maxInclusive value '{0}' must be less than maxExclusive value '{1}' in the base
++174  maxInclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
++175  maxInclusive value '{0}' must be greater than or equal to minInclusive value '{1}' in the base
++176  maxInclusive value '{0}' must be greater than minExclusive value '{1}' in the base
++177  maxExclusive value '{0}' must be less than or equal to maxExclusive value '{1}' in the base
++178  maxExclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
++179  maxExclusive value '{0}' must be greater than minInclusive value '{1}' in the base
++180  maxExclusive value '{0}' must be greater than minExclusive value '{1}' in the base
++181  minExclusive value '{0}' must be less than maxExclusive value '{1}' in the base
++182  minExclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
++183  minExclusive value '{0}' must be greater than minInclusive value '{1}' in the base
++184  minExclusive value '{0}' must be greater than minExclusive value '{1}' in the base
++185  minInclusive value '{0}' must be less than maxExclusive value '{1}' in the base
++186  minInclusive value '{0}' must be less than or equal to maxInclusive value '{1}' in the base
++187  minInclusive value '{0}' must be greater than or equal to minInclusive value '{1}' in the base
++188  minInclusive value '{0}' must be greater than minExclusive value '{1}' in the base
++189  maxInclusive value '{0}' must be from the base type value space
++190  maxExclusive value '{0}' must be from the base type value space
++191  minInclusive value '{0}' must be from the base type value space
++192  minExclusive value '{0}' must be from the base type value space
++193  totalDigits value '{0}' must be less than or equal to totalDigits value '{1}' in the base
++194  fractionDigits value '{0}' must be less than or equal to totalDigits value '{1}' in the base
++195  fractionDigits value '{0}' must be less than or equal to fractionDigits value '{1}' in the base
++196  maxInclusive value '{0}' must be equal to fixed maxInclusive value '{1}' in the base
++197  maxExclusive value '{0}' must be equal to fixed maxExclusive value '{1}' in the base
++198  minInclusive value '{0}' must be equal to fixed minInclusive value '{1}' in the base
++199  minExclusive value '{0}' must be equal to fixed minExclusive value '{1}' in the base
++200  totalDigits value '{0}' must be equal to fixed totalDigits value '{1}' in the base
++201  fractionDigits value '{0}' must be equal to fixed fractionDigits value '{1}' in the base
++202  maxLength value '{0}' must be equal to fixed maxLength value '{1}' in the base
++203  minLength value '{0}' must be equal to fixed minLength value '{1}' in the base
++204  whiteSpace value '{0}' must be equal to fixed whiteSpace value '{1}' in the base
++205  internal error while processing fixed facet
++206  list itemType is empty
++207  union memberTypes is empty
++208  restriction union base is empty
++209  restriction union base is '{0}' instead of union
++210  value '{0}' does not match regular expression facet '{1}'
++211  value '{0}' is invalid Base64-encoded binary
++212  value '{0}' is invalid Hex-encoded binary
++213  value '{0}' has length '{1}' which exceeds maxLength facet value '{2}'
++214  value '{0}' has length '{1}' which is less than minLength facet value '{2}'
++215  value '{0}' has length '{1}' which is not equal to length facet value '{2}'
++216  value '{0}' not in enumeration
++217  value '{0}' has '{1}' total digits which exceeds totalDigits facet value '{2}'
++218  value '{0}' has '{1}' fraction digits which exceeds fractionDigits facet value '{2}'
++219  value '{0}' must be less than or equal to maxInclusive facet value '{1}'
++220  value '{0}' must be less than maxExclusive facet value '{1}'
++221  value '{0}' must be greater than or equal to minInclusive facet value '{1}'
++222  value '{0}' must be greater than or equal to minExclusive facet value '{1}'
++223  value '{0}' is not whitespace replaced
++224  value '{0}' is not whitespace collapsed
++225  value '{0}' is invalid NCName
++226  value '{0}' is invalid {1}
++227  ID value '{0}' is not unique
++228  value '{0}' is invalid ENTITY
++229  value '{0}' is invalid QName
++230  NOTATION '{0}' must be valid QName
++231  value '{0}' does not match any member types of the union
++232  value '{0}' is invalid anyURI
++233  empty string encountered
++234  string contains only whitespaces
++235  more than one decimal point encountered
++236  invalid character encountered
++237  NULL pointer encountered
++238  unable to construct URI with NULL/empty {0}
++239  {0} '{1}' can only be set for a generic URI
++240  {0} contains invalid escape sequence '{1}'
++241  {0} contains invalid character '{1}'
++242  {0} cannot be NULL
++243  '{1}' is not conformant to {0}
++244  no scheme found in URI
++245  {0} '{1}' may not be specified if host is not specified
++246  {0} '{1}' may not be specified if path is not specified
++247  port number '{0}' must be in the (0,65535) range
++248  internal error while validating '{0}'
++249  result not set
++250  internal error in CompactRanges
++251  mismatched type in MergeRanges
++252  internal error in SubtractRanges
++253  internal error in IntersectRanges
++254  argument must be RangeToken
++255  invalid category name '{0}'
++256  keyword '{0}' not found
++257  reference number must be greater than zero
++258  option '{0}' unknown
++259  unknown token type
++260  unable to get RangeToken for '{0}'
++261  not supported
++262  invalid child index
++263  replace pattern cannot match zero-length string
++264  invalid replace pattern
++265  enabling NEL option can only be done once per process
++266  out of memory
++267  operation is not allowed
++268  selector cannot select attribute
++269  '|' at the beginning of XPath expression is illegal
++270  '||' in XPath expression is illegal
++271  missing attribute name in XPath expression
++272  unexpected XPath token; expected qname, any, or namespace test
++273  prefix '{0}' used in XPath expression can not be resolved to namespace URI
++274  '::' in XPath expression is illegal
++275  expected step following 'child' token in XPath expression
++276  expected step following '//' in XPath expression
++277  expected step following '/' in XPath expression
++278  '/' not allowed after '//' in XPath expression
++279  '//' only allowed after '.' at the beginning of XPath expression
++280  '/' at the beginning of XPath expression is illegal
++281  root element selection is illegal in XPath expression
++282  empty XPath expression
++283  XPath expression cannot end with '|'
++284  invalid character '{0}' in XPath expression
++285  unsupported XPath token
++286  fractional values not supported in XPath expression
++287  invalid dateTime value '{0}'
++288  missing 'T' separator in dateTime value '{0}'
++289  invalid gDay value '{0}'
++290  invalid gMonth value '{0}'
++291  invalid gMonthDay value '{0}'
++292  invalid duration value '{0}'
++293  duration value '{0}' must start with '-' or 'P'
++294  duration value '{0}' must contain 'P'
++295  duration value '{0}' can contain '-' only as the first character
++296  duration value '{0}' contains invalid text before 'T'
++297  duration value '{0}' has no time component after 'T'
++298  duration value '{0}' must have at least one component
++299  duration value '{0}' must have at least one digit after '.'
++300  incomplete date value '{0}'
++301  invalid date value '{0}'
++302  incomplete time value '{0}'
++303  invalid time value '{0}'
++304  expected fractional seconds after '.' in time value '{0}'
++305  incomplete gYearMonth value '{0}'
++306  invalid gYearMonth value '{0}'
++307  invalid gYear value '{0}'
++308  year value '{0}' must follow 'CCYY' format
++309  invalid leading zero in gYear value '{0}'
++310  month component missing in gYearMonth value '{0}'
++311  time zone expected in '{0}'
++312  unexpected text after 'Z' in time zone value '{0}'
++313  invalid time zone value '{0}'
++314  illegal year value '{0}'
++315  month value '{0}' must be between 1 and 12
++316  day value '{0}' must be between 1 and {1}
++317  hours value '{0}' must be between 0 and 23
++318  minutes value '{0}' must be between 0 and 59
++319  seconds value '{0}' must be between 0 and 60
++320  minutes value '{0}' must be between 0 and 59
++321  derived by restriction complex type has content while base type is empty
++322  namespace of element '{0}' is not allowed by wildcard in the base
++323  occurrence range of element '{0}' is not a valid restriction of base element's range
++324  element name/namespace in restriction does not match that of corresponding element in the base
++325  element '{0}' is nillable in the restriction while it is non-nillable in the base
++326  element '{0}' is either not fixed or is fixed to a different value compared to corresponding element in the base
++327  disallowed substitutions for element '{0}' are not a superset of those for corresponding element in the base
++328  element '{0}' has type that does not derive from type of corresponding element in the base
++329  element '{0}' has fewer identity constraints compared to corresponding element '{1}' in the base
++330  element '{0}' has identity constraint that does not appear in corresponding element '{1}' in the base
++331  occurrence range of group is not a valid restriction of occurrence range of base group
++332  no complete functional mapping between particles
++333  forbidden restriction of any particle
++334  forbidden restriction of all compositor
++335  forbidden restriction of choice compositor
++336  forbidden restriction of sequence compositor
++337  occurrence range of wildcard is not a valid restriction of base wildcard's range
++338  wildcard is not a subset of corresponding wildcard in the base
++339  occurrence range of group is not a restriction of base wildcard's range
++340  no complete functional mapping between particles
++341  no complete functional mapping between particles
++342  invalid content spec node type
++343  NodeIDMap exceeds largest available size
++344  ProtoType has NULL class name
++345  ProtoType name length '{0}' differs from expected '{1}'
++346  ProtoType name '{0}' differs from expected '{1}'
++347  InputStream read '{0}' is less than required '{1}'
++348  InputStream read '{0}' is beyond available buffer size '{1}'
++349  storing violation
++350  store buffer violation '{0}', '{1}'
++351  object tag '{0}' exceeds load pool upper boundary '{1}'
++352  load pool size '{0}' does not tally with object count '{1}'
++353  loading violation
++354  load buffer violation '{0}', '{1}'
++355  invalid class index '{0}', '{1}'
++356  invalid checkFillBuffer size '{0}'
++357  invalid checkFlushBuffer size '{0}'
++358  invalid NULL pointer encountered '{0}'
++359  createObject fails
++360  object count '{0}' exceeds upper boundary '{1}'
++361  grammar pool is empty
++362  grammar pool is not empty
++363  string pool is not empty
++364  storer level '{0}' does not match loader level '{1}'
++365  undefined prefix in QName value '{0}'
++
++
++$set 4
++2  dummy
++3  index or size is negative, or greater than the allowed value
++4  specified range of text does not fit into DOMString
++5  attempt is made to insert a node where it is not permitted
++6  node is used in a different document than the one that created it
++7  invalid or illegal XML character
++8  node does not support storing data
++9  attempt is made to modify an object where modifications are not allowed
++10  attempt is made to reference a node in a context where it does not exist
++11  implementation does not support the requested type of object or operation
++12  attempt is made to add an attribute that is already in use elsewhere
++13  attempt is made to use an object that is not or is no longer usable
++14  invalid or illegal string
++15  attempt is made to modify the type of the underlying object
++16  attempt is made to create or change an object in a way which is incorrect with respect to namespaces
++17  parameter or requested operation is not supported by the underlying object
++18  call to a method such as insertBefore or removeChild would make the node invalid with respect to document grammar
++19  type of an object is incompatible with the expected type of the parameter associated with the object
++20  dummy
++21  boundary points of a range do not meet specific requirements
++22  container of a range boundary point is set to a node of an invalid type or to a node with an ancestor of an invalid type
++23  dummy
++24  failed to load a document or an XML fragment using DOMLSParser
++25  failed to serialize a DOM node using DOMLSSerializer
++26  dummy
++27  expression has incorrect syntax or contains XPath features not supported by the XML Schema XPath subset
++28  requested result type not supported
++29  no current result in the result object
++30  nested CDATA sections
++31  unrepresentable character
++32  unrecognized node type
++33  parsing in progress
++34  parsing aborted by the user
++35  parsing failed
++
++
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2.ebuild
new file mode 100644
index 000000000000..a7d0dd1ec9bb
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-3.2.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils prefix
+
+DESCRIPTION="A validating XML parser written in a portable subset of C++"
+HOMEPAGE="https://xerces.apache.org/xerces-c/"
+SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
+
+RDEPEND="icu? ( dev-libs/icu:0= )
+	curl? ( net-misc/curl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-lang/perl )"
+
+DOCS=( CREDITS KEYS NOTICE README )
+PATCHES=(
+	"${FILESDIR}/${P}-fix-XERCESC-2161.patch"
+)
+
+pkg_setup() {
+	export ICUROOT="${EPREFIX}/usr"
+
+	if use iconv && use icu; then
+		ewarn "This package can use iconv or icu for loading messages"
+		ewarn "and transcoding, but not both. ICU takes precedence."
+	fi
+}
+
+src_configure() {
+	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
+	# But the docs aren't clear about it, so we would need some testing...
+	local netaccessor
+	if use curl; then
+		netaccessor="curl"
+	elif use elibc_Darwin; then
+		netaccessor="cfurl"
+	else
+		netaccessor="socket"
+	fi
+
+	local msgloader
+	if use icu; then
+		msgloader="icu"
+	elif use iconv; then
+		msgloader="iconv"
+	else
+		msgloader="inmemory"
+	fi
+
+	local transcoder
+	if use icu; then
+		transcoder="icu"
+	elif use elibc_Darwin; then
+		transcoder="macosunicodeconverter"
+	elif use elibc_FreeBSD; then
+		transcoder="iconv"
+	else
+		transcoder="gnuiconv"
+	fi
+	# for interix maybe: transcoder="windows"
+
+	local mycmakeargs=(
+		-Dnetwork-accessor="${netaccessor}"
+		-Dmessage-loader="${msgloader}"
+		-Dtranscoder="${transcoder}"
+		-Dthreads:BOOL="$(usex threads)"
+		-Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
+}
+
+src_install () {
+	cmake-utils_src_install
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		# clean out object files, executables, Makefiles
+		# and the like before installing examples
+		find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
+			-o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
+		docinto examples
+		dodoc -r samples/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# To make sure an appropriate NLS msg file is around when using
+	# the iconv msgloader ICU has the messages compiled in.
+	if use iconv && ! use icu; then
+		doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
+	fi
+}
diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild
new file mode 100644
index 000000000000..1f61a3a023de
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-9999.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+
+inherit cmake-utils prefix
+
+DESCRIPTION="A validating XML parser written in a portable subset of C++"
+HOMEPAGE="https://xerces.apache.org/xerces-c/"
+
+if [[ ${PV} == *9999 ]] ; then
+	ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk"
+	inherit subversion
+else
+	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
+
+RDEPEND="icu? ( dev-libs/icu:0= )
+	curl? ( net-misc/curl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-lang/perl )"
+
+DOCS=( CREDITS KEYS NOTICE README )
+
+pkg_setup() {
+	export ICUROOT="${EPREFIX}/usr"
+
+	if use iconv && use icu; then
+		ewarn "This package can use iconv or icu for loading messages"
+		ewarn "and transcoding, but not both. ICU takes precedence."
+	fi
+}
+
+src_configure() {
+	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
+	# But the docs aren't clear about it, so we would need some testing...
+	local netaccessor
+	if use curl; then
+		netaccessor="curl"
+	elif use elibc_Darwin; then
+		netaccessor="cfurl"
+	else
+		netaccessor="socket"
+	fi
+
+	local msgloader
+	if use icu; then
+		msgloader="icu"
+	elif use iconv; then
+		msgloader="iconv"
+	else
+		msgloader="inmemory"
+	fi
+
+	local transcoder
+	if use icu; then
+		transcoder="icu"
+	elif use elibc_Darwin; then
+		transcoder="macosunicodeconverter"
+	elif use elibc_FreeBSD; then
+		transcoder="iconv"
+	else
+		transcoder="gnuiconv"
+	fi
+	# for interix maybe: transcoder="windows"
+
+	local mycmakeargs=(
+		-Dnetwork-accessor="${netaccessor}"
+		-Dmessage-loader="${msgloader}"
+		-Dtranscoder="${transcoder}"
+		-Dthreads:BOOL="$(usex threads)"
+		-Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
+}
+
+src_install () {
+	cmake-utils_src_install
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		# clean out object files, executables, Makefiles
+		# and the like before installing examples
+		find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
+			-o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
+		docinto examples
+		dodoc -r samples/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# To make sure an appropriate NLS msg file is around when using
+	# the iconv msgloader ICU has the messages compiled in.
+	if use iconv && ! use icu; then
+		doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
+	fi
+}
diff --git a/dev-libs/xml-security-c/Manifest b/dev-libs/xml-security-c/Manifest
index a28fade6e8fe..cc3b8d07c87d 100644
--- a/dev-libs/xml-security-c/Manifest
+++ b/dev-libs/xml-security-c/Manifest
@@ -1,5 +1,9 @@
 AUX xml-security-c-1.6.1-nss-compilation-fix.patch 498 BLAKE2B f6469e552ad6cb300556e80c52c881c64123fb34dbce83fe4d77eb2c48de0f20ac4605edc4d2f2712f991b2b55ffdee9f7d91409cbc5dadf7960b2c5c978692a SHA512 cef34103931356f68a250a89f195e4ad0e67a116c6d0de2ab07407f607d70bec0c1e8d57d9eefa47c8bee7f5750668963409a4d740cead239b7ad16665515bb2
 AUX xml-security-c-1.7.3-fix-c++14.patch 1182 BLAKE2B f534183150d2015b42563bd20ba6a39afbad8469d0af6d6746cc36608911e6fa06f8340611760df7e4c3aea8e1ba8d2ef656aaa0712e5453caedca401361fcf9 SHA512 b1a0154b1a973e8ae4f4687c319694b2b6d22dc20385c2e74e27bf00a1887734075da27e10a48d3204d72d35baa55aaba1965984b75512097a0cc38b192211a1
+AUX xml-security-c-2.0.2-libressl.patch 2224 BLAKE2B 076555d874526180d9842599cbb788819e6b8508d1c11dd20a63ad681e4a2d256b8d3b0d80cfcf6d23741cb735bdc5845a72226bd56526ba24e24f5155374b5f SHA512 f248594d5fadd960d6437b5c17ad12db5455dc1ee3b30849f0c394fbf4ac8e85b3a575a833e0878ca5c6fb2a264878b86e3656a21f3038a105c1162253ce446e
 DIST xml-security-c-1.7.3.tar.gz 909320 BLAKE2B 5fa9f3ae53b93104c191b76f8ae4f9dad69c690d409ae3f13864cf011bbbca740c5378c0718abb496811c9814b5a7f237042af22e697bfa2e5044668ff3fbd2d SHA512 ea46709d6706edf345e19132d9998774e50dc7b5947a7b4a55e3627998f5ac66f976fdff0a5015ef3cee73c03c04f3c4cf993efd397082491c2000c6548b89d2
+DIST xml-security-c-2.0.2.tar.gz 904933 BLAKE2B 8e336dd7539778411755a8d45398daa530a2f602a0d57faa29301d1f0b29ab0a61c3f47ead42b740337ea75a28e03f471ae6735d5cd66d31f56d3d5fe3405b1b SHA512 bebadee2daf27181f5bcc955a909397976e8fd2e67f5e546f5adbede0ca790647cbec9181b0b609da59d525ff3baa9f899af2a3d815bc7a2f3a57bd8b30c011b
 EBUILD xml-security-c-1.7.3.ebuild 963 BLAKE2B 7a2ff075d5996cb995df3e3da595adf636ff4b1a92b73c56e2ae6794b0f1de964a2c5d80738bff05daf80f6758c5fe86e104432f7c9de441d8521ad18d63ca9c SHA512 25370e42290a4d3787af196930b106030ec66d5ffef0277bcfe1afa08b8b853ea929a17e021a1c51ca1c69df38c74c0ca1fff17eee75a0a09e0a3c4658136ba1
+EBUILD xml-security-c-2.0.2-r1.ebuild 907 BLAKE2B 932b2c45d8e9bf2438baa48b75cc148355029bbd86433fee61b507dc114215539d73349dc4fc373ebce7b4ba7b85672e32d0d5d38789775527aa73ac1b1650ec SHA512 e67202e3f24ce6c3c00b932ed08edb41188592a98cd3cd98d169f172e0541787f266deb0fa0da2688caad9b7661cdeb8dafff79cc7611ad523eee81d3d17dbb0
+EBUILD xml-security-c-2.0.2.ebuild 860 BLAKE2B f0187d21d4bd9b23938d81cc9ea64abcb73d1952938fbd11d6da030cbd346d0771a0995dd0c07e4204b788b97b708432a7fe78b5f036346bff27a0cb99271eb1 SHA512 15718df9237da73c333e533b5be5ec3e87d625b830f0ff0c037ce1152abb3b8c2e47a315d33d1a529446a6f48c75d17321f0cf0b254d1c6a3786e17bd99d1eab
 MISC metadata.xml 483 BLAKE2B 184149c1f04282005aa8172c19edca6db6ae769d0ea042261180af79734e08554e325a1bf29f01bb27506dc4a3d5161ccb03395cc6f06c929f6d3f43e171643f SHA512 307df4870d40181dfa0fb62b5791a457ae5c1c4b5f752bcfcd3d6224a3f437ebbc17dad8892b8728ef8be152f2a463814404143e0caf92489c6221c1bf216ef2
diff --git a/dev-libs/xml-security-c/files/xml-security-c-2.0.2-libressl.patch b/dev-libs/xml-security-c/files/xml-security-c-2.0.2-libressl.patch
new file mode 100644
index 000000000000..754ddc6bcf1d
--- /dev/null
+++ b/dev-libs/xml-security-c/files/xml-security-c-2.0.2-libressl.patch
@@ -0,0 +1,52 @@
+diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
+index 2ad9da6e..a8ea9f1d 100644
+--- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
++++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
+@@ -48,7 +48,7 @@ XERCES_CPP_NAMESPACE_USE
+ //           Construction/Destruction
+ // --------------------------------------------------------------------------------
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ OpenSSLCryptoBase64::OpenSSLCryptoBase64() : mp_ectx(&m_ectx_store), mp_dctx(&m_dctx_store) { }
+ OpenSSLCryptoBase64::~OpenSSLCryptoBase64() { }
+ #else
+diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
+index c892eac4..82aeb0a1 100644
+--- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
++++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
+@@ -205,7 +205,7 @@ private :
+     EVP_ENCODE_CTX *mp_ectx;              // Encode context
+     EVP_ENCODE_CTX *mp_dctx;              // Decode context
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+     EVP_ENCODE_CTX m_ectx_store;
+     EVP_ENCODE_CTX m_dctx_store;
+ #endif 
+diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.cpp b/xsec/enc/OpenSSL/OpenSSLSupport.cpp
+index dfd37eb3..cf874f82 100644
+--- a/xsec/enc/OpenSSL/OpenSSLSupport.cpp
++++ b/xsec/enc/OpenSSL/OpenSSLSupport.cpp
+@@ -273,7 +273,7 @@ int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+ 
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ EvpEncodeCtxRAII::EvpEncodeCtxRAII() : mp_ctx(&mp_ctx_store) { };
+ EvpEncodeCtxRAII::~EvpEncodeCtxRAII() { }
+ #else
+diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.hpp b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
+index e3527fae..b5f67f26 100644
+--- a/xsec/enc/OpenSSL/OpenSSLSupport.hpp
++++ b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
+@@ -88,7 +88,7 @@ public:
+ 
+ private:
+     EVP_ENCODE_CTX *mp_ctx;
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+     EVP_ENCODE_CTX mp_ctx_store;
+ #endif    
+ };
diff --git a/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild b/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..afd103f43067
--- /dev/null
+++ b/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Apache C++ XML security libraries"
+HOMEPAGE="http://santuario.apache.org/"
+SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples libressl nss static-libs xalan"
+
+RDEPEND=">=dev-libs/xerces-c-3.2
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	nss? ( dev-libs/nss )
+	xalan? ( dev-libs/xalan-c )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=(
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+DOCS=( CHANGELOG.txt NOTICE.txt )
+
+src_configure() {
+	econf \
+		--with-openssl \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		$(use_with xalan) \
+		$(use_with nss)
+}
+
+src_install() {
+	default
+	if use examples ; then
+		docinto examples
+		dodoc xsec/samples/*.cpp
+	fi
+}
diff --git a/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild b/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild
new file mode 100644
index 000000000000..ea768c10d665
--- /dev/null
+++ b/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Apache C++ XML security libraries"
+HOMEPAGE="http://santuario.apache.org/"
+SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples libressl nss static-libs xalan"
+
+RDEPEND=">=dev-libs/xerces-c-3.2
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	nss? ( dev-libs/nss )
+	xalan? ( dev-libs/xalan-c )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGELOG.txt NOTICE.txt )
+
+src_configure() {
+	econf \
+		--with-openssl \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		$(use_with xalan) \
+		$(use_with nss)
+}
+
+src_install() {
+	default
+	if use examples ; then
+		docinto examples
+		dodoc xsec/samples/*.cpp
+	fi
+}
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 4ed52b1a308a..1b8fe9de1aac 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,5 +1,5 @@
 DIST xmlsec1-1.2.26.tar.gz 1922183 BLAKE2B 8cb8557a7d24df756655a7dfa45091445adc89cb67169a7620d9d1116f3fb3d982ea45199a53475e29300478c07e8e1168cec79cf9c3b5ff1dd6c840123b982b SHA512 1e3dc3c8c192eefee7b055787bef52ce3bcfafa786224f68af065aa45f4d7da93232da973359b3135615c5981ad4df7c124047d3934e552ab78439472685a7a4
 DIST xmlsec1-1.2.27.tar.gz 2013651 BLAKE2B fa46a25e3aaef432134d1c98a0e7bf0aba83f2ef6d1aff3774d6d37c5f6f392d1c2c11a0fe433ee910c39b56400c96b74ab061577948622b14a1116fa1ec2947 SHA512 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920
-EBUILD xmlsec-1.2.26.ebuild 1495 BLAKE2B 3a0ee80efcbcf28639f91e4d6547e647207c69ebc810891297f7d5c550641d8d621529f34bb134b10c71f151fcfe42c9cd77f5d7b2fd4881ad8e3fff83e04358 SHA512 355447f3eca80fc2a3c393c50b121a3393cd613bd47b25bd6fe874d13efad1489bd620441b5ea5777c4e14cfc076f0f07687c62a0b675e0eb4a13d71952ecd28
-EBUILD xmlsec-1.2.27.ebuild 1495 BLAKE2B 6e0eae9e61f83109385db8f2e71959d24cd75cf5b36b4789364a0d8868ff281f7ff407281e39b9b65e444dcfab6be67aa34839d672d02f12457f3685aad730ea SHA512 514b66b2106d954189feb472d1e0eaf79ee930b3d59ad8611d886c5e5342cd92321f9de28d0362ed98c24d78abfa1b8b442e01154e741db9bc9ff10beba607a7
+EBUILD xmlsec-1.2.26.ebuild 1551 BLAKE2B 332cf6b782a3ff702657933a8b7c43da5f4dcbdd44ef61c042dd2d75432bdb71b29134a47da618e4063cb855ff18010ff136b7856540568bd25b0df4b3aee35e SHA512 8e40917ce5326f5e511406f9bda9f7693475eba4ab05656a83060f506b069d29e01b97cf8b01d063417980a40b4c087bf16dfe9a6147352da3b38860591224f9
+EBUILD xmlsec-1.2.27.ebuild 1554 BLAKE2B 4fb9cbcc8cdff065f6989ad2454d241addb71970dd33269f305764e2d0e1c180318fd9224834b9004a221513e4fa70ce44a54f797c2ec288b851410a8fcf71c4 SHA512 2dde765583fc63486685241266473e401821b28cf0a26ec0b0b7139c3a689c5e17d0c728d1d49472b2189bab878ceeaad020e27f57ad4cf3b2d7707c345c8f3e
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
index 51d54fb37527..f8f0ce257d51 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86"
-IUSE="doc gcrypt gnutls libressl nss +openssl static-libs"
+IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
 
@@ -29,7 +29,12 @@ RDEPEND=">=dev-libs/libxml2-2.7.4
 		libressl? ( dev-libs/libressl:0= )
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+	test? (
+		nss? (
+			>=dev-libs/nss-3.9[utils]
+		)
+	)"
 
 S="${WORKDIR}/${PN}1-${PV}"
 
diff --git a/dev-libs/xmlsec/xmlsec-1.2.27.ebuild b/dev-libs/xmlsec/xmlsec-1.2.27.ebuild
index be5606ab62ed..b0791a6aa5fd 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.27.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.27.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc gcrypt gnutls libressl nss +openssl static-libs"
+IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
 
@@ -29,7 +29,12 @@ RDEPEND=">=dev-libs/libxml2-2.7.4
 		libressl? ( dev-libs/libressl:0= )
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+	test? (
+		nss? (
+			>=dev-libs/nss-3.9[utils]
+		)
+	)"
 
 S="${WORKDIR}/${PN}1-${PV}"
 
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index ed058cab645e..411df7be2e12 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
-EBUILD xxhash-0.6.5.ebuild 841 BLAKE2B 0ae60d26d8550d51096667e808e58984cafe39e7f1e8282ec59e809d04fa0f1f20e6a5723d6e3d62b3410257fef08ca8691c87b6ec7de5d8debb36fdfb918021 SHA512 f84649c48e0409680c65251976b28c2b92c199cdf08e7c1fafc77d6e7ddd907f554d4061daa4e149a5bc1aac52c4d94ac3c6839b63e7833dbfb3ddc62b564409
+EBUILD xxhash-0.6.5.ebuild 846 BLAKE2B b9a3939ccefec34b3d0112c59a73f980ebb1585d21ad80fef241f49efea62c4bb875cffe6937af0753bd001ea6f1831c4691abaafb4111af323949b2722fe021 SHA512 4351c124dca94bf8bbe9846e6cd738f46c262e7a3ffdcec0f3d45159e2cd6a43c99891a261c47af193da2cde2737b9e6f392533b5f0d45f5b0101a328df714d6
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index 5c5cfd42d765..82289a0b69a8 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index fefca037d787..376f0852905b 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,4 +1,4 @@
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
 EBUILD yajl-2.1.0-r1.ebuild 930 BLAKE2B 0a7882f77bf56732226ac8187954c2733a33c1438d39e76d1d26c7c9b3e713bcb6706190350f3b8409e8c53957c42556c2888b6687f0f99e0aca30fc567b98fa SHA512 5f6462f1b1a53e558f25c1e91d3e0b6dd624d33f5a83f01742212f6ceae3a6940ba74f84b5857be1f5480ec152141aaeda6cbef5152b5d3b353e774725d09b8d
-MISC metadata.xml 446 BLAKE2B 84c4b6dc7569e85ba3925a34c96c67c8f7d23a5d8861a296ba4fde89122645cd6e49d0ec8749cb6028d10d9b945735ed732ea4473c98393d8b83874eba9c06ec SHA512 6cbb37575c23168f216682c7f2decadcb18a11d9c0af71e6de531b1002541d913fa84f98ed78f13ad1c995c332b87d61c658ac0f3fbbef39e01fe2786e1da6f9
+MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/metadata.xml b/dev-libs/yajl/metadata.xml
index 5cf1579f6e2b..a05a0f6df056 100644
--- a/dev-libs/yajl/metadata.xml
+++ b/dev-libs/yajl/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-libs
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)