gentoo resync : 02.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
commit: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree: c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /dev-libs
parent: 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)
169 files changed, 2536 insertions, 1299 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 49446fe392cb..b12983a1ead2 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 2ef680abefb2..e1c9f7a46839 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,7 +1,6 @@
-DIST amdgpu-pro-17.50-552542.tar.xz 549501204 BLAKE2B 37dcda126a3bda4e87b64ce260c7e4b65a1b864363c51f06e3152f152b83a60074331e6a0bf7b831c059a50192dea8add9b38ed16971c87293ce0e56ddf26bb2 SHA512 060e96609cf1a013fddf10db9bba4b512750e5188671a669e2582c28a03213b40d073031e35a617b982374d9d1cd4078f43b27053ee34be7c83873c0814ed196
-DIST amdgpu-pro-18.20-606296.tar.xz 230733856 BLAKE2B 21a498a894a9712d9f0277fae7f704413be0cd01cebbe427008fa3d181d03b58268e74bd3cdaf0dfb9aeca2871dad82b4aa640bbce690ca461e3f3e4acf01ffd SHA512 6575bf963e5714657914d9116de4d9b1835851fe0609b1f072b1fbdf73c068da77aba0eca1c9cce6e05e6cd8f2c1ed6b4bd6ab4ef334be5ff796ee6a3ad73831
 DIST amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz 229474380 BLAKE2B f589aad71f093b74e37de40ac7c45ebbbeff93609b2fff1baaba711347a4641ef17acdcbe69d371372510a48bd48262cf6269c1f4d05e264023d52a425a423f2 SHA512 240e701acfde4ebe665cf69c8bd3710d036f450822aeb7ee2a21caab289af44167afda1d3b8d0dbe2c46c4e63d9b6fb5e96778311f342c26f334dc7beb4a2d5b
-EBUILD amdgpu-pro-opencl-17.50.552542.ebuild 2306 BLAKE2B 60c131d8af09f855dee725590f6645bf6d77b10b80240bfff768ecca2713da7703264e156f04f1224ba19fc6d349d936c4a10cc98f9d029e9978b9e484cdc297 SHA512 38eae62aaf48c0f36e92d369f2621721c57d2757b68c0b6a4961c3eeb9a4d72b84b2a2be26eaaf359e450b56a9de36accdcab94b1a130754f92d8ae6979b6215
-EBUILD amdgpu-pro-opencl-18.20.606296.ebuild 1818 BLAKE2B ecbe7a9283eb9af7cd006064ec5d564689e507b8f648b0dd8b5932bf14a6bbae4305c14dd6b164904660615cd7bafc74a782b08075ac178be1ced1f44b3aec76 SHA512 b59a92167c53b8fcf2f3e4fa31337874ee085e18bb8cdb2f97ce8d33f393ef8096668e3b8d143d3eeedb765c7b98a3af3e450b65fd8ac7eee850fa8131454797
-EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2337 BLAKE2B fedd53526d3ce08f6a2d31a7a896dc4e5e7b381df91d4beaf87e3102ce79c0a860bd3e3129809865c10407046f48b22a8e84ccdcbe02b7ae42625539c139e4bd SHA512 a6f2d145343a6083fef02020d2ee6b61fc1be77935f9c9c091cb4a2ee75230db6d760f6450f70d7feb3d403b8bddd44e86d7b156600d8da8c720895fe198d71e
+DIST amdgpu-pro-19.10-785425-ubuntu-18.04.tar.xz 243520380 BLAKE2B 8c775feaff685b18b6df2f6f17667dbadb3da89f58c823f5470113342b585ecb436fbacef6ba26b35fe05bac53530cfe334d79d933afee303651e1375654da85 SHA512 d9c214134bf220c2ab4a306f5d83ce5718adc1f3e93165c724e70b99b4b5bcd8e703299ed70fe79f1d2db5f4f69cae2e1036b5a6238696346710c88f7fa6b3c6
+EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2332 BLAKE2B 20a692a7666997d60c1a2f4ad0f431d016a7a0a75f0f9c898603793d5c481fb662f002f5875e0435f75bbd94b5072f6a30b884eb4e797c64b29681dac35ae69c SHA512 acb6b04711b83787b394fc2ef6b6621ae7e45d67359d4ed6ae39826704660874170babedc15b6e4d69f3bbddb0ce4ba405e7b15ae633fbdf423dfc7358b65a40
+EBUILD amdgpu-pro-opencl-19.10.785425-r1.ebuild 2985 BLAKE2B 762a240cf6365c046367e982d901be8307160b71928077e81b07cd9ba153d5a20ee528f8293b47ee0c2f4306c52dc6ebdacfa65cec6ba9d94a30902838b42824 SHA512 7ceb9aed7b1a75dcbc9cff009035527312dd8318f323967766e6545972f2a4c2e174c9728fbf7c434d404272d9d2706d2339286cc7837bf30a9e8c54c42ad2f0
+EBUILD amdgpu-pro-opencl-19.10.785425.ebuild 2945 BLAKE2B e726f111998e748151e074f0b2810cf9bf1c67de2087f63c8c54d216ce3aa15aa600ef3bd0f892349bb4e801062b1da3a06573dbfc03b3f84f082863836c9392 SHA512 32589484e64b9083446768aadbb1d79694c53511a1bc6b2c7de2ea54e3c63005f25d20d4a338f2963604b80e35a66be5a6ce21d172884bdcf65b6af1954e2b7a
 MISC metadata.xml 536 BLAKE2B 788d99a058d77cc3992b953dd8761a224575480b29dd37bc6fc5a5f914fdc03a7c9a9eb70d9d9cebf79394f6e21d966e273ad27a02f93ca887ea48f491b797ad SHA512 912ff2f26e27d5c20219a26505f3a4545409773f1f761de4591cbd7086cd1ff241fca18d7ae5081ed12e04c1b5dc46deeb02b4a68e2a3787d1d20739a818325d
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild
deleted file mode 100644
index b9f388b4b18e..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(ver_rs 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-with-Vulkan-1.1-support.aspx"
-SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-COMMON="app-eselect/eselect-opencl
-	dev-libs/ocl-icd"
-DEPEND="${COMMON}
-	dev-util/patchelf"
-RDEPEND="${COMMON}"
-
-QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
-
-pkg_nofetch() {
-	local pkgver=$(ver_cut 1-2)
-	einfo "Please download the Radeon Software for Linux Driver ${pkgver} for Ubuntu from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed in your distfiles directory."
-}
-
-src_unpack() {
-	default
-
-	local ids_ver="1.0.0"
-	local libdrm_ver="2.4.82"
-	local patchlevel=$(ver_cut 3)
-	cd "${S}" || die
-	unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
-	unpack_deb libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
-	unpack_deb ids-amdgpu_${ids_ver}-${patchlevel}_all.deb
-}
-
-src_prepare() {
-	default
-
-	cd "${S}/opt/${SUPER_PN}/lib/x86_64-linux-gnu" || die
-	patchelf --set-rpath '$ORIGIN' libamdocl64.so || die "Failed to fix library rpath"
-}
-
-src_install() {
-	into "/opt/amdgpu"
-	dolib.so opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
-	dolib.so opt/amdgpu/lib/x86_64-linux-gnu/*
-	insinto "/opt/amdgpu"
-	doins -r opt/amdgpu/share
-
-	insinto /etc/OpenCL/vendors/
-	echo "/opt/amdgpu/$(get_libdir)/libamdocl64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
-	doins "${SUPER_PN}.icd"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		ewarn "Please note that using proprietary OpenCL libraries together with the"
-		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
-		ewarn "for support in case of problems with this package."
-		ewarn ""
-		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
-		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
-		ewarn "has become officially supported by Gentoo."
-	fi
-
-	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
-}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild
deleted file mode 100644
index 03574c8b01e7..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(ver_rs 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-Release-Notes.aspx"
-SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-COMMON="app-eselect/eselect-opencl
-	dev-libs/ocl-icd"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
-
-pkg_nofetch() {
-	local pkgver=$(ver_cut 1-2)
-	einfo "Please download the Radeon Software for Linux Driver ${pkgver} for Ubuntu 16 from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed in your distfiles directory."
-}
-
-src_unpack() {
-	default
-
-	cd "${S}" || die
-	unpack_deb opencl-orca-amdgpu-pro-icd_${MY_PV}_amd64.deb
-}
-
-src_install() {
-	into "/opt/amdgpu"
-	dolib.so opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
-
-	insinto /etc/OpenCL/vendors/
-	echo "/opt/amdgpu/$(get_libdir)/libamdocl-orca64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
-	doins "${SUPER_PN}.icd"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		ewarn "Please note that using proprietary OpenCL libraries together with the"
-		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
-		ewarn "for support in case of problems with this package."
-		ewarn ""
-		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
-		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
-		ewarn "has become officially supported by Gentoo."
-	fi
-
-	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
-}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
index 739777fa05df..ffc46c93b615 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-16.04.tar.xz"
 
 LICENSE="AMD-GPU-PRO-EULA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 RESTRICT="mirror fetch strip"
 
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild
new file mode 100644
index 000000000000..12086b373c16
--- /dev/null
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit unpacker multilib-minimal
+
+SUPER_PN='amdgpu-pro'
+MY_PV=$(ver_rs 2 '-')
+
+DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
+HOMEPAGE="https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-10-unified"
+SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-18.04.tar.xz"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+BDEPEND="dev-util/patchelf"
+COMMON="app-eselect/eselect-opencl
+	dev-libs/ocl-icd"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}
+	!media-libs/mesa[opencl]" # Bug #686790
+
+QA_PREBUILT="/opt/amdgpu/lib*/*"
+
+S="${WORKDIR}/${SUPER_PN}-${MY_PV}-ubuntu-18.04"
+
+pkg_nofetch() {
+	local pkgver=$(ver_cut 1-2)
+	einfo "Please download Radeon Software for Linux version ${pkgver} for Ubuntu 18.04 from"
+	einfo "    ${HOMEPAGE}"
+	einfo "The archive should then be placed into your distfiles directory."
+}
+
+src_unpack() {
+	default
+
+	local ids_ver="1.0.0"
+	local patchlevel=$(ver_cut 3)
+	cd "${S}" || die
+	unpack_deb "${S}/libdrm-amdgpu-common_${ids_ver}-${patchlevel}_all.deb"
+	multilib_parallel_foreach_abi multilib_src_unpack
+}
+
+multilib_src_unpack() {
+	local libdrm_ver="2.4.97"
+	local patchlevel=$(ver_cut 3)
+	local deb_abi
+	[[ ${ABI} == x86 ]] && deb_abi=i386
+
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	unpack_deb "${S}/opencl-orca-amdgpu-pro-icd_${MY_PV}_${deb_abi:-${ABI}}.deb"
+	unpack_deb "${S}/libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_${deb_abi:-${ABI}}.deb"
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	local dir_abi short_abi
+	[[ ${ABI} == x86 ]] && dir_abi=i386-linux-gnu && short_abi=32
+	[[ ${ABI} == amd64 ]] && dir_abi=x86_64-linux-gnu && short_abi=64
+
+	into "/opt/amdgpu"
+	patchelf --set-rpath '$ORIGIN' "opt/${SUPER_PN}/lib/${dir_abi}"/libamdocl-orca${short_abi}.so || die "Failed to fix library rpath"
+	dolib.so "opt/${SUPER_PN}/lib/${dir_abi}"/*
+	dolib.so "opt/amdgpu/lib/${dir_abi}"/*
+
+	insinto /etc/OpenCL/vendors
+	echo "/opt/amdgpu/$(get_libdir)/libamdocl-orca${short_abi}.so" \
+		> "${T}/${SUPER_PN}-${ABI}.icd" || die "Failed to generate ICD file for ABI ${ABI}"
+	doins "${T}/${SUPER_PN}-${ABI}.icd"
+}
+
+# FIXME: is this right?
+multilib_src_install_all() {
+	ewarn "FOO $PWD"
+	ewarn `ls`
+	insinto "/opt/amdgpu"
+	doins -r opt/amdgpu/share
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Please note that using proprietary OpenCL libraries together with the"
+		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
+		ewarn "for support in case of problems with this package."
+		ewarn ""
+		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
+		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
+		ewarn "has become officially supported by Gentoo."
+	fi
+
+	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild
new file mode 100644
index 000000000000..21ba2fc29539
--- /dev/null
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit unpacker multilib-minimal
+
+SUPER_PN='amdgpu-pro'
+MY_PV=$(ver_rs 2 '-')
+
+DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
+HOMEPAGE="https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-10-unified"
+SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-18.04.tar.xz"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+BDEPEND="dev-util/patchelf"
+COMMON="app-eselect/eselect-opencl
+	dev-libs/ocl-icd"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+QA_PREBUILT="/opt/amdgpu/lib*/*"
+
+S="${WORKDIR}/${SUPER_PN}-${MY_PV}-ubuntu-18.04"
+
+pkg_nofetch() {
+	local pkgver=$(ver_cut 1-2)
+	einfo "Please download Radeon Software for Linux version ${pkgver} for Ubuntu 18.04 from"
+	einfo "    ${HOMEPAGE}"
+	einfo "The archive should then be placed into your distfiles directory."
+}
+
+src_unpack() {
+	default
+
+	local ids_ver="1.0.0"
+	local patchlevel=$(ver_cut 3)
+	cd "${S}" || die
+	unpack_deb "${S}/libdrm-amdgpu-common_${ids_ver}-${patchlevel}_all.deb"
+	multilib_parallel_foreach_abi multilib_src_unpack
+}
+
+multilib_src_unpack() {
+	local libdrm_ver="2.4.97"
+	local patchlevel=$(ver_cut 3)
+	local deb_abi
+	[[ ${ABI} == x86 ]] && deb_abi=i386
+
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	unpack_deb "${S}/opencl-orca-amdgpu-pro-icd_${MY_PV}_${deb_abi:-${ABI}}.deb"
+	unpack_deb "${S}/libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_${deb_abi:-${ABI}}.deb"
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	local dir_abi short_abi
+	[[ ${ABI} == x86 ]] && dir_abi=i386-linux-gnu && short_abi=32
+	[[ ${ABI} == amd64 ]] && dir_abi=x86_64-linux-gnu && short_abi=64
+
+	into "/opt/amdgpu"
+	patchelf --set-rpath '$ORIGIN' "opt/${SUPER_PN}/lib/${dir_abi}"/libamdocl-orca${short_abi}.so || die "Failed to fix library rpath"
+	dolib.so "opt/${SUPER_PN}/lib/${dir_abi}"/*
+	dolib.so "opt/amdgpu/lib/${dir_abi}"/*
+
+	insinto /etc/OpenCL/vendors
+	echo "/opt/amdgpu/$(get_libdir)/libamdocl-orca${short_abi}.so" \
+		> "${T}/${SUPER_PN}-${ABI}.icd" || die "Failed to generate ICD file for ABI ${ABI}"
+	doins "${T}/${SUPER_PN}-${ABI}.icd"
+}
+
+# FIXME: is this right?
+multilib_src_install_all() {
+	ewarn "FOO $PWD"
+	ewarn `ls`
+	insinto "/opt/amdgpu"
+	doins -r opt/amdgpu/share
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Please note that using proprietary OpenCL libraries together with the"
+		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
+		ewarn "for support in case of problems with this package."
+		ewarn ""
+		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
+		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
+		ewarn "has become officially supported by Gentoo."
+	fi
+
+	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+}
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index d0dde9f45915..4d1d886dfc8c 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +1,5 @@
 DIST appstream-glib-0.7.15.tar.xz 2240040 BLAKE2B e1b58e0ce6523354490e529381302aa603e4ac1886c37e9c261ab612f76490ae4ea8fd22eff9c2bc1981d5ceb77ff8c4f8279e091dc62bd4df39d2c32623c1ea SHA512 bab0c73e54d90fbf22295f616d4a09332f94b90a3fa0cb38f1b654c6d9a459c9557dd81c677f486361dbf4f1dd23651306fe34b1cdd15254694269a8c9e8a927
 DIST appstream-glib-0.7.9.tar.xz 2245728 BLAKE2B fb6f54329bed91f1acaa6218b111fd4527dff7ed412a89cb44a6e4f6cdfb7e0fe4e6f9fb37b6cdc2efa75164dccef323b6d7428a63b08369b941d36b0b9071f0 SHA512 d78cb6f11cad01d67cb33f16e987485177d20b78a8b21cfbabb64ce7b18b813c0d2d1de2faeea199fdc31d12633e899a5596a6cf133cb831a4377d641f79eb7d
-EBUILD appstream-glib-0.7.15.ebuild 1643 BLAKE2B e4dfcf72682c21ab765cc8571beac003c1a79df323b8f8779b2484142356e7ef1642aae07b9b0e4e8aa3f796cf4564aa8f477c82b79a58805eec85924b757775 SHA512 1b6fd974e8427ad7796d47d91f34c5ac6c057c97052609543de08c334342963c1aa357d5bd85e2e013928355c1cb13334e97447c413543ae70edaf0eee756ff0
+EBUILD appstream-glib-0.7.15.ebuild 1642 BLAKE2B 55ad57e62fd47a15f0b8c8206b77a25b4d2023ace1d0c796774f133de8606b2dcfa2cc4dd0c586dd46b4f56417cd933a8bec07c433719b230b15dd48bef49def SHA512 80c699280cd18d7fb9318c5039a23b88c881b937cb0f632f092256d04f6c7ed56bc2cd92119c60ad02d4310d7f769787464cb2dcf2a769847045b5d975f67a94
 EBUILD appstream-glib-0.7.9.ebuild 1623 BLAKE2B c66d8dae417e53b8fcc0be7afbd2cc06aee3df35254ea1e204dd00feacd37133b702f39ca1899e91c9fea5294e45cbf35a31df7b8e30370be76821301f47dae0 SHA512 d865778c663bbfcab9e99473f66c4156c5d887fcdd1e4402bacc9bb7dcaf073656a624b8d0e2d78883b180512e31ecb7553cfb5ca0733d369d5bb745b5141bf6
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
index f91b1ef7119b..9de2cc8807f5 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.15.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 4b2ae3a22d67..8be08e6faa63 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,3 +1,3 @@
 DIST AppStream-0.12.6.tar.xz 1953604 BLAKE2B 28b03a935b8c203f2ac2c52c1de8317cc899f2b81b00e83e2eb858dbd185a985ce608ba3f6b1c35f084b4ee91946a4870c89d6b0c0a4c6fd32a938558e3997f1 SHA512 c19cd89ba39aff5afa2ff6d5fca72581a8624463c33011b11036526db98392ff5aa6c0f599682e90fdee29b8732538cf96c20b66965016b96f60b3f899d722bb
-EBUILD appstream-0.12.6.ebuild 1578 BLAKE2B f49c8b79d6f8bf133d1d85f711cd5c31425cd10428f87bbcc0660bf8ea7b748b687bce5838895d46245fe0204e538f1c602520a5667debd23a65a788adeba82c SHA512 17ee9c6aed9b5abfe4bbea349311eab42b75e0b101ea74151614b51d9bac49d11839d1ef6bd28f3535606856b9a22431d85a36f91b72787e709e2b138c16a067
+EBUILD appstream-0.12.6.ebuild 1577 BLAKE2B 068254a2aaf873f8376cfe229596319a462a636137c74a90109c36ef975fa6022fc63bdd7c1469981731cb1e3712740506acebb74756de81502c92127a1be3bb SHA512 1f1c5a1d307e42ddb273c4ad77cc887f913f2a74392ff25050a541403a424981baecd95e1a3c127877888ab9e910307e4a6070821a7892583e5a853620c421b4
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.6.ebuild b/dev-libs/appstream/appstream-0.12.6.ebuild
index d45c21e89008..528e7d9d8092 100644
--- a/dev-libs/appstream/appstream-0.12.6.ebuild
+++ b/dev-libs/appstream/appstream-0.12.6.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/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 06c505db9ffd..78a7dc6f80dd 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -4,5 +4,5 @@ DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 EBUILD apr-util-1.5.4-r3.ebuild 3685 BLAKE2B 6de15972c714d4077aeeaf62771b0427c96d7022ffbe8f639576d1c422562806ac5daf93b6d6841f581f0d8e2419a33692abe392bdb583b1722ae3734865af9c SHA512 576d513d8716117cbbe854d14e183c13060408f187a22b000e5e21f2f6b71c8774bf197612ae27080a3d97ea0bbbb078579db2551c54c12a6a1b75dd63fb2c7b
 EBUILD apr-util-1.5.4.ebuild 3214 BLAKE2B a90ae943aba394503d08cfad961e603c5aaf1460b28f040e35c0a330ad59ea333606cc909e6d8543f1c24a4a0898492dc50d988cfcf6e7ea681dd12207870838 SHA512 a419670fc4df0a4b7c7f1c2d07b67428dda3d72663e45ab1c2cd72268c33100a4d9319398086666530d69524f61eae196198e4622f0dc889f7413b763c3ec5c2
-EBUILD apr-util-1.6.1-r3.ebuild 3750 BLAKE2B 4809d994a0892f89751ebca1ebbd06a754d88b8099251f63db81d6d254c2f697c45e62951f7474aff6595c113f8524072487b5ab1ca014028bb7aa3866063dcd SHA512 ce15fa08f7040d9433f06a9eec2c00f482a003143f582d95182a1f3e6d72233b3ce1f71a2f7684be9713c67e8f535ac3c2a015e59bf8dd9e2e7e0f957d36fa2e
+EBUILD apr-util-1.6.1-r3.ebuild 3749 BLAKE2B 8ecf1f4437c01f14476224dc4c9fa2db85c6a47151bdeee212e7d4f50ebb1dbe17dc14d1cef4f2015cbc2c44af18da588d9e67c62b5356a60a7ee8ae10e37716 SHA512 0a3cbaf9475af0b49e95a1a3bd5fd0d67376608e82b213dc2329af1863faff391621cae045fccb493dc064f3a242cdaefdcac4c839275607d092fe47c3bf4561
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index a4d3584e8c93..f5a1fba08fe7 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 701093a292da..4878f85e8256 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -2,5 +2,5 @@ AUX atk-2.30.0-use-basename-instead-of-filename.patch 2528 BLAKE2B 7a81c6ed9c73c
 DIST atk-2.28.1.tar.xz 712508 BLAKE2B 71aee8bc937e1e37d40e6a9820d0002bcc763dbf87385ede2484ec6fe17a9924d5753d74dc3a769602746c915d0c46da8eea78cc80c706e3c38faca2e5050364 SHA512 aa61e7718b3f4d9c33ec2b4747e35f894a51550ef39ecc4a7af5705811c029645bd3c728071f446b075a0b7aef0c35c1b73406a210cd30171838f24a8dfc0abb
 DIST atk-2.30.0.tar.xz 290264 BLAKE2B dec44abf3bd4937f417cd0b75bee32fdd073ccca1e44d883293d060afbbc30909aac483007e293231fafe0c5481df94d1113d287a0002a823f4e9c8e7bd647c2 SHA512 03f311378fdb91442f27ed542fa36edd2c9c036837c9f25ff37468bf7f743277d0b9253621563d15894e0da9d37e8df0a0e2c0e47e6aae33a38b13744c3b8b8e
 EBUILD atk-2.28.1.ebuild 1441 BLAKE2B c1283a8624ebc62e5bebd5d7593413be5030a7dc3206440e07630f29b0b06bcb93effe354fa52552706a557e5a965396f8c0a800322595589137ab56208d9f3e SHA512 04ffcc74623d10bf92d3401deec43395bf4cf8c3093481af7d46369df7e0e563ae91655be7fb78a6a232e76dd4fe0cc43d7330af3b3147e9aa6f12dfd8ce2513
-EBUILD atk-2.30.0.ebuild 1254 BLAKE2B a00dc265ca6e607af431804063cd6037fd1991be6ee0243f37781e22cb0e2da99ccb7c78da16b7c1a5913053bb22213101ba4d052add0d8670b7ca6356e61be6 SHA512 111abd759cd1c949531b1f78439587d080030db2124c318577f38e533756f06e53a126e378f0490f92026ec7eeef09b0c695a940fe3e10e153be3a4366b7c4a9
+EBUILD atk-2.30.0.ebuild 1253 BLAKE2B f54d156b3c432954f800300f71c62a33222ae2815fcf710e8f6d1b3dc954c49de557148c86ee72e498af9159fefcae05e5725c88e64040130263c9fbebb83586 SHA512 b7c8231f15edea969c89dc6f8416ed198fd45ed7b3b566e4d8a9000042b2d9746b6bf9828a865786594e9150b48cff6d8d6ab5f6c886b5e459202096266dfc0c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.30.0.ebuild b/dev-libs/atk/atk-2.30.0.ebuild
index 7dc5cfa6ce85..dc7bd71ee6b5 100644
--- a/dev-libs/atk/atk-2.30.0.ebuild
+++ b/dev-libs/atk/atk-2.30.0.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="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 53664dc53feb..724524a852ff 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -3,13 +3,11 @@ AUX beignet-1.3.1-oclicd_no_upstream_icdfile.patch 564 BLAKE2B f90bdf1c1a795007e
 AUX beignet-1.3.2_cmake-llvm-config-multilib.patch 950 BLAKE2B 9028eede7ee68dfd539bb268914c354eeaac8a9d26647c6dfb030078199e749cf67d2c396305ccaa7a139f10fcc8eca7b36657d4425439137e7199a4e62c4d13 SHA512 9a9a0348b39f0f9d256166141b48e255ccbc03e4d5150e660cfad2c23af8ff67b75049361fa84f2c2c26be2be914ad07efeae5e150f4f390ec7d5503c49b1c74
 AUX beignet-1.3.2_disable-doNegAddOptimization.patch 2536 BLAKE2B c07e063686e80a0b3f461475345582616ee59b8e195f90a87c2338a856cb3ebb04f0dd70595d901f10ae3645b9c33cccd5c0fb9bfd60052f76067f415eafac64 SHA512 d1d4f7ba2a44ee2c6255190189d141fc8adadeb6f64935501d5ce41cff1eb31e64b32664aee3edb2203f0d267fc776fbe9ed761c344fb23d858d91d6690af086
 AUX beignet-1.3.2_llvm6.patch 1039 BLAKE2B 990a653b7ff52ec89ec1204cc5bae1d0b041ae51da4a16fd1a459abfe083be1e5647e9fdac3b336284fcdb6c460dbd9c151d5818c084d49c0c2d68fb56aed905 SHA512 634ddb79878b017be984c0327160affc06d7acaf17b1030e55542d2d2cc873bebd3808638f0966538b0dd7bca763eda2263f22f818dd0b73167a4ba3f5933aaa
-AUX beignet-1.4.0-oclicd_no_upstream_icdfile.patch 726 BLAKE2B 4d182497c099e174a95524b4bd7bda66c03e128cb089b7536716afda442d8959beab19f0e6015173fbe761f1f569ce065fd1701545ebfdd0680b070644a4d9c4 SHA512 3a77f85cb8f28096b21a77e70f901ccc64291e7439c5e4ae6d7259c30531ea550604f54d0cf910e4482089ab5782f50dcb1940e5df723b0457fdafd550b2b537
-AUX beignet-1.4.0_no-debian-multiarch.patch 862 BLAKE2B 54fb9124832e57b3466c11696cf311d32863bdc36d9f4f4e946958233884f95ad9c212bf63f598e52ad054da79f453fb5a3208958de48e45bd9f21a010309edf SHA512 6760b3b7038ba0dc125998de65ec688b5eb840d8a41543ab35f6d6b6084a877fe0e383bd44b6947695ff835b391794547d7eec21bf787548e6bb03ccf2b73587
+AUX beignet-1.3.2_llvm7.patch 4805 BLAKE2B df959c8e482e1810b2257419088a4cd283bfec8984a774865722de5fb21e8e29ea4d66b98ae535f4d5a7ccb0a6754a1c683709dd9f6f535c4747822fccea2ebc SHA512 0e72053db39fb06fd14b4660109702fc917493191dfad1c1fb4afe7e8533df371dd6a048833175de247ba33aab7ef56dc0cf6449f37b432cbf2e6086391da663
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r1.ebuild 2731 BLAKE2B 28cf32641aebc20518c7f1d9c7443a6d70df6586bef1d44f7412e9df9d385db05799ad4abf4f47777724e5627fc98becad0c0e9ca35996b3949fd30382b1e140 SHA512 2804dc211c9ac1b2ad59c0fcb94c0b254ab4cc38491f439f8113da9b0125edd008eafa598d1b03fce3bbc5294086254e31a121fa5485d55a064022e65b8d06a8
 EBUILD beignet-1.3.2-r2.ebuild 2959 BLAKE2B bd67d958a8ab72669c924c28fcd487d677098370c357045cad33b4fc627a182c41bc8037388255d16215a9ad7d73663f36d91bc4ad1bef32fffcdbce29de551a SHA512 64ebc3b96c4a9e41fa36f1c5260a9ef47779c11f9d8dac83deab2777ad8a9cdf5259348d67b2ce2fa8e41e2a093dac85b073580b70827729498fa4febcffd56c
+EBUILD beignet-1.3.2-r3.ebuild 2855 BLAKE2B 760d63a15608ea0ffcf78fa42db32d64ca690794ff5d0d7f79f7b70b10b1de4064f777ca8c3c9c3c29a0f03abcf38fb045983f28c140cd97407f985e9d1f2f70 SHA512 71dcea5162e2c039971959030a49c5e64dbf02524665bd63722cec4d79e03bb5f29ebca0a3a8012c0469ad2d49d768a8218f0fc5b1472321cb1cb8f76b58e6f5
 EBUILD beignet-1.3.2.ebuild 2673 BLAKE2B 8edf3cb1b0dfe6201405afe50117e79172e20f9d5aafdecaba72cd85301c01c472a9be024d0b3a8a2c723b84bfd4a72c631d76bec3f08dc8412aa9d6ebd8f2dc SHA512 bf959b3ce52019d83e4a8bd3871155386c2e3c5de4f241044d77a1282c56c9837be6f12a78ca648833b2e21b533f42ba85de31d16027cb66cb47d52a985ac8b2
-EBUILD beignet-9999.ebuild 2495 BLAKE2B 71c35c38df5b0c3492510bc19f79ecff277488e9be8ad2c8f08e36b9569de28e005172256984618417a9aecf78588766bc6aa7974fb7e458d3c71b15f5db007e SHA512 d60e4b39d4a078bf7ee0958536a37f734faa578884ca79b329496d852b28727961f9f20f272a6dbf47ff910e4eff677e1ed2701331184dfc1efe46a9bae925bd
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index c7cc20e5302c..820fc50e9a73 100644
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -1,48 +1,42 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
-inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
+inherit python-any-r1 cmake-multilib flag-o-matic llvm
 
-DESCRIPTION="OpenCL implementation for Intel GPUs"
+DESCRIPTION="OpenCL implementation for Intel Sandy Bridge, Ivy Bridge and Haswell GPUs"
 HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
+SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="ocl-icd ocl20"
 
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
-	S=${WORKDIR}/Beignet-${PV}-Source
-fi
-
-COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
-	<sys-devel/clang-6.0.9999:=[${MULTILIB_USEDEP}]
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig"
+COMMON="app-eselect/eselect-opencl
+	media-libs/mesa[${MULTILIB_USEDEP}]
+	<sys-devel/clang-7.0.9999:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]"
-RDEPEND="${COMMON}
-	app-eselect/eselect-opencl"
-DEPEND="${COMMON}
-	${PYTHON_DEPS}
-	ocl-icd? ( dev-libs/ocl-icd )
-	virtual/pkgconfig"
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	ocl-icd? ( dev-libs/ocl-icd )"
+RDEPEND="${COMMON}"
+DEPEND="${COMMON}"
 
-LLVM_MAX_SLOT=6
+LLVM_MAX_SLOT=7
 
 PATCHES=(
 	"${FILESDIR}"/no-debian-multiarch.patch
+	"${FILESDIR}"/${PN}-1.3.2_disable-doNegAddOptimization.patch
 	"${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch
 	"${FILESDIR}"/${PN}-1.3.2_llvm6.patch
+	"${FILESDIR}"/${PN}-1.3.2_llvm7.patch
 	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
 	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
 	"${FILESDIR}"/llvm-terminfo.patch
@@ -52,16 +46,7 @@ DOCS=(
 	docs/.
 )
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc; then
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
-				eerror "Compilation with gcc older than 4.6 is not supported"
-				die "Too old gcc found."
-			fi
-		fi
-	fi
-}
+S="${WORKDIR}"/Beignet-${PV}-Source
 
 pkg_setup() {
 	llvm_pkg_setup
@@ -104,3 +89,16 @@ multilib_src_install() {
 	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
 	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
 }
+
+pkg_postinst() {
+	elog ""
+	elog "Please note that for Broadwell and newer architectures, Beignet has been deprecated upstream in favour of dev-libs/intel-neo."
+	elog "It remains the recommended solution for Sandy Bridge, Ivy Bridge and Haswell."
+	elog ""
+
+	if use ocl-icd; then
+		"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+	else
+		"${ROOT}"/usr/bin/eselect opencl set --use-old beignet
+	fi
+}
diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
deleted file mode 100644
index 735edfd2e512..000000000000
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-CMAKE_BUILD_TYPE="Release"
-
-inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="ocl-icd ocl20"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
-	S=${WORKDIR}/Beignet-${PV}-Source
-fi
-
-COMMON="media-libs/mesa
-	sys-devel/clang:=
-	sys-devel/llvm:=
-	>=x11-libs/libdrm-2.4.70[video_cards_intel]
-	x11-libs/libXext
-	x11-libs/libXfixes"
-RDEPEND="${COMMON}
-	app-eselect/eselect-opencl"
-DEPEND="${COMMON}
-	${PYTHON_DEPS}
-	ocl-icd? ( dev-libs/ocl-icd )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0_no-debian-multiarch.patch
-	"${FILESDIR}"/${PN}-1.4.0-oclicd_no_upstream_icdfile.patch
-	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
-	"${FILESDIR}"/llvm-terminfo.patch
-)
-
-DOCS=(
-	docs/.
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc; then
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
-				eerror "Compilation with gcc older than 4.6 is not supported"
-				die "Too old gcc found."
-			fi
-		fi
-	fi
-}
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# See Bug #593968
-	append-flags -fPIC
-
-	cmake-utils_src_prepare
-	# We cannot run tests because they require permissions to access
-	# the hardware, and building them is very time-consuming.
-	cmake_comment_add_subdirectory utests
-}
-
-multilib_src_configure() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
-		-DOCLICD_COMPAT=$(usex ocl-icd)
-		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	cmake-utils_src_install
-
-	insinto /etc/OpenCL/vendors/
-	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
-	doins "${PN}-${ABI}.icd"
-
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
-}
diff --git a/dev-libs/beignet/files/beignet-1.3.2_llvm7.patch b/dev-libs/beignet/files/beignet-1.3.2_llvm7.patch
new file mode 100644
index 000000000000..8990f0f0e48f
--- /dev/null
+++ b/dev-libs/beignet/files/beignet-1.3.2_llvm7.patch
@@ -0,0 +1,124 @@
+commit e1b2419a0008e38ef2d9d255d9e9c74e9fba084b
+Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
+Date:   Sat Jul 21 20:05:54 2018 +0100
+
+    Add preliminary LLVM 7 support
+    
+    This is preliminary because LLVM 7 has not been released yet:
+    it was tested with the snapshot from Debian experimental (svn336894).
+    
+    1.Change linking order, as clangCodeGen now links to clangFrontend
+    2.Pass references not pointers to WriteBitcodeToFile and CloneModule
+    3.Add the headers that LoopSimplifyID, LCSSAID and
+    some create*Pass have moved to
+    4.Define our DEBUG whether or not we just undefined LLVM's
+    (theirs is now LLVM_DEBUG, but we never actually use it)
+    
+    Signed-off-by: Rebecca N. Palmer <rebecca_palmer@zoho.com>
+    Reviewed-by: Yang Rong <rong.r.yang@intel.com>
+
+diff --git a/CMake/FindLLVM.cmake b/CMake/FindLLVM.cmake
+index 5457f248..f882589d 100644
+--- a/CMake/FindLLVM.cmake
++++ b/CMake/FindLLVM.cmake
+@@ -113,10 +113,10 @@ macro(add_one_lib name)
+ endmacro()
+ 
+ #Assume clang lib path same as llvm lib path
++add_one_lib("clangCodeGen")
+ add_one_lib("clangFrontend")
+ add_one_lib("clangSerialization")
+ add_one_lib("clangDriver")
+-add_one_lib("clangCodeGen")
+ add_one_lib("clangSema")
+ add_one_lib("clangStaticAnalyzerFrontend")
+ add_one_lib("clangStaticAnalyzerCheckers")
+diff --git a/backend/src/backend/gen_program.cpp b/backend/src/backend/gen_program.cpp
+index 274c99c7..41592349 100644
+--- a/backend/src/backend/gen_program.cpp
++++ b/backend/src/backend/gen_program.cpp
+@@ -454,7 +454,11 @@ namespace gbe {
+ #ifdef GBE_COMPILER_AVAILABLE
+       std::string str;
+       llvm::raw_string_ostream OS(str);
++#if LLVM_VERSION_MAJOR >= 7
++      llvm::WriteBitcodeToFile(*((llvm::Module*)prog->module), OS);
++#else
+       llvm::WriteBitcodeToFile((llvm::Module*)prog->module, OS);
++#endif
+       std::string& bin_str = OS.str();
+       int llsz = bin_str.size();
+       *binary = (char *)malloc(sizeof(char) * (llsz+1) );
+@@ -545,7 +549,11 @@ namespace gbe {
+                                     &modRef);
+         src = llvm::unwrap(modRef);
+       }
++#if LLVM_VERSION_MAJOR >= 7
++      llvm::Module* clone = llvm::CloneModule(*src).release();
++#else
+       llvm::Module* clone = llvm::CloneModule(src).release();
++#endif
+       if (LLVMLinkModules2(wrap(dst), wrap(clone))) {
+ #elif LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 37
+       if (LLVMLinkModules(wrap(dst), wrap(src), LLVMLinkerPreserveSource_Removed, &errMsg)) {
+diff --git a/backend/src/backend/program.cpp b/backend/src/backend/program.cpp
+index c37c5951..b36f7b4a 100644
+--- a/backend/src/backend/program.cpp
++++ b/backend/src/backend/program.cpp
+@@ -794,7 +794,11 @@ namespace gbe {
+       llvm::raw_fd_ostream ostream (dumpSPIRBinaryName.c_str(),
+                                     err, llvm::sys::fs::F_None);
+       if (!err)
++#if LLVM_VERSION_MAJOR<7
+         llvm::WriteBitcodeToFile(*out_module, ostream);
++#else
++        llvm::WriteBitcodeToFile(**out_module, ostream);
++#endif
+     }
+ #endif
+     return true;
+diff --git a/backend/src/llvm/ExpandLargeIntegers.cpp b/backend/src/llvm/ExpandLargeIntegers.cpp
+index 8515dc13..4aec44ee 100644
+--- a/backend/src/llvm/ExpandLargeIntegers.cpp
++++ b/backend/src/llvm/ExpandLargeIntegers.cpp
+@@ -99,8 +99,8 @@ using namespace llvm;
+ 
+ #ifdef DEBUG
+   #undef DEBUG
+-  #define DEBUG(...)
+ #endif
++#define DEBUG(...)
+ // Break instructions up into no larger than 64-bit chunks.
+ static const unsigned kChunkBits = 64;
+ static const unsigned kChunkBytes = kChunkBits / CHAR_BIT;
+diff --git a/backend/src/llvm/llvm_bitcode_link.cpp b/backend/src/llvm/llvm_bitcode_link.cpp
+index ef56e4c2..4c3e20e4 100644
+--- a/backend/src/llvm/llvm_bitcode_link.cpp
++++ b/backend/src/llvm/llvm_bitcode_link.cpp
+@@ -340,7 +340,11 @@ namespace gbe
+     /* We use beignet's bitcode as dst because it will have a lot of
+        lazy functions which will not be loaded. */
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 39
++#if LLVM_VERSION_MAJOR >= 7
++    llvm::Module * linked_module = llvm::CloneModule(*(llvm::Module*)mod).release();
++#else
+     llvm::Module * linked_module = llvm::CloneModule((llvm::Module*)mod).release();
++#endif
+     if(LLVMLinkModules2(wrap(clonedLib), wrap(linked_module))) {
+ #else
+     char* errorMsg;
+diff --git a/backend/src/llvm/llvm_includes.hpp b/backend/src/llvm/llvm_includes.hpp
+index 184553af..ffccf025 100644
+--- a/backend/src/llvm/llvm_includes.hpp
++++ b/backend/src/llvm/llvm_includes.hpp
+@@ -89,6 +89,10 @@
+ #include "llvm/CodeGen/IntrinsicLowering.h"
+ 
+ #include "llvm/Transforms/Scalar.h"
++#if LLVM_VERSION_MAJOR >= 7
++#include "llvm/Transforms/Utils.h"
++#include "llvm/Transforms/InstCombine/InstCombine.h"
++#endif
+ #include "llvm/MC/MCAsmInfo.h"
+ #include "llvm/MC/MCContext.h"
+ #include "llvm/MC/MCInstrInfo.h"
diff --git a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch b/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch
deleted file mode 100644
index ddffcfc8aff4..000000000000
--- a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -214,14 +214,6 @@
-   Find_Package(OCLIcd)
-   IF(OCLIcd_FOUND)
-     MESSAGE(STATUS "Looking for OCL ICD header file - found")
--    configure_file (
--      "intel-beignet.icd.in"
--      "${ICD_FILE_NAME}"
--      )
--    IF(NOT OCL_ICD_INSTALL_PREFIX)
--      set(OCL_ICD_INSTALL_PREFIX "/etc/OpenCL/vendors")
--    ENDIF(NOT OCL_ICD_INSTALL_PREFIX)
--    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${OCL_ICD_INSTALL_PREFIX})
-   ELSE(OCLIcd_FOUND)
-     MESSAGE(STATUS "Looking for OCL ICD header file - not found")
-     MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.")
diff --git a/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch b/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch
deleted file mode 100644
index 983ba61ff38f..000000000000
--- a/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,15 +33,9 @@
- 
- SET(CMAKE_VERBOSE_MAKEFILE "false")
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
--INCLUDE (GNUInstallDirs OPTIONAL)
--# support old CMake without GNUInstallDirs
--if (NOT CMAKE_INSTALL_FULL_LIBDIR)
--  set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
--  set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
--  set (BEIGNET_LIBRARY_ARCHITECTURE "")
--else (NOT CMAKE_INSTALL_FULL_LIBDIR)
--  set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
--endif (NOT CMAKE_INSTALL_FULL_LIBDIR)
-+set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
-+set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-+set (BEIGNET_LIBRARY_ARCHITECTURE "")
- 
- if (NOT LIB_INSTALL_DIR)
-   set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index cc014efdd590..5e0ab74359cf 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -2,6 +2,8 @@ AUX crypto++-5.6.4-nonative.patch 1011 BLAKE2B e8f8245dbb1ce9a0011c0e73ea1021ab4
 AUX crypto++-5.6.5-CVE-2017-9434.patch 1728 BLAKE2B 0cfd25fca89d59486ba9c49a87f04d90f0b5bff524aa817a46dcb1c3fd005609a938e08007d71bf407bd8ef0c334baa2054b44c2aac58c15817314223c7b0a2c SHA512 42566d3e67c6b253b65587877652112691ba91e554db47843256a9c2af8a29d7950266a508358356f008462ec51cc1dadf4d0e9dbbd33a33a5a94d029eebc1f9
 DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
 DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
+DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
 EBUILD crypto++-5.6.5-r1.ebuild 1530 BLAKE2B df7d53463e39d86aa3eb905911e5ccdd6cd6ae435b4a51059978b68109c3448c555bbe91984f285671856d5ab7c98232cf2b171d154a01a97655d5aea14cf94b SHA512 f8065ac14fcffa77b75a439edcad34214d62a40184c27f79b073d4f788b2ef3b8667110ef9766d901ed69a25cb1f1639d494f4a0ad2e97391879821569b5a06b
 EBUILD crypto++-7.0.0-r3.ebuild 1077 BLAKE2B f6fda1242e5f9c5379b03793d1652a62596f8f3f97a507c19c7399e8418128908e82ca92494b485eff40d195e16a84009377208e9c83c49feb69d8b338a40edf SHA512 0088c1bc6c4a3e573955f14dab24da6e077699c147de1f3b18c3d76ab0d4073d20ddfb169691f2fee9c459a88d9662cc69d519224434c327d8c4b1dd36f6951b
+EBUILD crypto++-8.2.0.ebuild 1085 BLAKE2B b7a1484da1c66f5fd818dd5e04c23299ebc305a14e65cd13609618ef1bb737b2af066ba3f2cd46d3dc4aaae93c8ece2b613a369e8210767c1ff4553a2d82dd8c SHA512 90e2946803f7351f9242005909f4dab4e67d22b7c432f67efc1c5074f1e93c4c4117344e62b4d295500997e8d4d724159923625dab8f42700d3d0993f5d6d2f1
 MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
diff --git a/dev-libs/crypto++/crypto++-8.2.0.ebuild b/dev-libs/crypto++/crypto++-8.2.0.ebuild
new file mode 100644
index 000000000000..be40704c5f30
--- /dev/null
+++ b/dev-libs/crypto++/crypto++-8.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="C++ class library of cryptographic schemes"
+HOMEPAGE="https://cryptopp.com"
+SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
+
+LICENSE="Boost-1.0"
+SLOT="0/8" # subslot is so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="+asm static-libs"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+config_uncomment() {
+	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
+}
+
+pkg_setup() {
+	export CXX="$(tc-getCXX)"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
+}
+
+src_prepare() {
+	default
+
+	use asm || config_uncomment CRYPTOPP_DISABLE_ASM
+
+	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
+	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
+}
+
+src_compile() {
+	emake -f GNUmakefile all shared libcryptopp.pc
+}
+
+src_install() {
+	default
+
+	use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
+}
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 75f0931b52a3..1e596a6c950b 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -8,5 +8,5 @@ DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc
 EBUILD ding-libs-0.4.0.ebuild 492 BLAKE2B 56a1412b2906d75ba6623c7e3f57aff2829a95c4fbdf8b21f3127754b5950deeaafaad6e918e6f97a26e44ea5127b7cbce2e58b4a2d16faca17a85bc9791eace SHA512 169e8d203a8aac008017dd1d61e7c160d75b97f90f4874ab6e6321c61a6c58b7bf04817520b081d33598290dde2069cad8e4e60c785bebde332a611783fb252f
 EBUILD ding-libs-0.5.0.ebuild 548 BLAKE2B b85dc9940e7d1249f3d729f8b2aca392ebccc4a8af068712fb68c31f7996dd1704eac4cc9247bc447715b9f8aacc5a0dc32d7bd37ffab00f5bc8a811fedf454e SHA512 ece4b10606274a789cb9a6877b7cad4fc87d7a011c48b7d0791fbd4a1a9b8859acb800c0c1b95cda542edf1abf63c364dab01ff6c149ca0fba742eb70138705e
 EBUILD ding-libs-0.6.0.ebuild 598 BLAKE2B f0212d264f319d4ac2c3204e8e187b0f00b35359a69987814eb1a2242e5ab4234aef0f16efb244c262f0bfe2e745d32ba3c9961cc8f01cc0c81573f59d39a515 SHA512 5e13b98a2defd0fcbb2c0e6ca17b06981ddaaf0ee09b83095f6c63edcf4f9f4eda0d1049f03705c9c677935d601f25e66acf36e3b3e7bdadf9b034a86c3b84d7
-EBUILD ding-libs-0.6.1.ebuild 802 BLAKE2B 3239136179d46f0b395bf68c3673996c7f2c307ffa3eaa261feb7f6d3ff6f7db1cb09467a2848328765ed9ec03b3b71fe0fe504be40531af961833db8a24ebb6 SHA512 c72fb6dbfdb36de0d12c35d3294f150dd05b9ddfee17bfbf9917f4174ce430b397ad543e8b954b9c4ab294e55b70483f9e625b101ee4bfab1766837cfc5c25c2
+EBUILD ding-libs-0.6.1.ebuild 801 BLAKE2B bb44b255ba41dea53fa1efdc27f67a8c611b5ad1c4c1ac3a68054cd5ad171c46c7f766c67ec1f6810ecf3bae83603228e1fd6977a2e2cfcd3233d416d7a551f3 SHA512 c48f4aeeaa8bb788f0d4682d15d0e73faddb6ab20a60a082490f2c4fb33a458d68acd871f90c995c7ba8ae04c2fe17d4b17bcd1300c15eadf684e5a8b4b4cf6e
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
index 88d34677f297..ad1d696f0176 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 4c6970bdb34a..81dc7fa20352 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -2,5 +2,5 @@ AUX 0001-CMake-install-to-correct-lib-dir.patch 1957 BLAKE2B a8139d2c7474b96526b
 DIST double-conversion-3.0.3.tar.gz 7019705 BLAKE2B 65d7729b55dbb9fd0cf31b258738f3e9f3350b4ecf0204d3d2d23de24cb24651788e844aa1a10d6ec452ca6484c43ed1d218d434fc18be7bb1f15bf8ba97102a SHA512 3a8e956da485195753508c90cd6fa3d9fde42103291a8e65a0d95488faa02e98dddff21935625519c0ce49d8911d66d0773ddf6012264094f3edd851b461f62b
 DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
 EBUILD double-conversion-3.0.3.ebuild 1345 BLAKE2B 054cea2fe264a7f76cd26b48a72718eb806c22a89e47b697b8163618c62dd4c6c112c9030aef9bf42487c63c004413ca86faef3cc99b00132077de4755dc694a SHA512 5f525223d86923f672e0652effd7b30dfcbffa4b507ab4c5151d00b3b427e45619f50eaa4f80ef4750f02041440f47360636436ce4ba19cff6fa2f0b1e19a1e4
-EBUILD double-conversion-3.1.4-r1.ebuild 1404 BLAKE2B 40eeda349953ad21fd945c661c5916e3f122e52e168b6932d3f70a3f4d0dd0c35638e397a215401ad32dc87300945e028f27d2e8c1dcdc286bb1731629fc4429 SHA512 5245089830a68a8aa56af1795deae6ea64de4bd7a01eef72ebb566e1eaf7350d89cf927759e7c018a55949978ff4a3bb7160800ab3f1a8d7f3a4e41697a3cc21
+EBUILD double-conversion-3.1.4-r1.ebuild 1399 BLAKE2B 41fcdb92091dffbad28efd3a25f5425e933f0aa44feb61c15ae154201d86e4d974a2616bbc6cccabf9adc525e6d72548986d014ce064700251f7b0cd9c5e1a94 SHA512 6d9f7c9ee007f7166c62f0bc723c2f8f6028ea9e2d1e3ea49785c758bcc7b0b50f089f28059798ba0341c3d6fd8e50323896ba35d443971bce1d38ba68d0854f
 MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
index dd31effe733b..9497111c5428 100644
--- a/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 PATCHES=(
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index b44eb2de4391..9c4dbde2c989 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,8 +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
 DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
-EBUILD efl-1.20.7-r3.ebuild 7708 BLAKE2B d16c5185d86e88f6cf202ddf864c1608dc42f5c5e6c93f2b2100c69d587be3f88274b8dda345beabedd8d1118bfa3833cbbc0cb543c243f95015d820ff8a1c72 SHA512 dc55ff7bf0bb0d35194bb804679284ef2ea6fd290cd54cf3c85b1fbda4f325fbf617374b7bfb33fbd7311927c1f4939601b38c7109ffa92c49db12402edcb218
-EBUILD efl-1.21.1-r3.ebuild 6631 BLAKE2B b127f01247ea7ce5b1c925b14b8d2222d3b2f837dea2cf059ad14b554de5cb8d0ff8e146ce2af8ecb6b338960ea38393555cb09304c9bb2ecc8cdb4510189413 SHA512 46c9b081cb79c0b39c026787ada23b50aef90e4ca265915c4d48516154caeccef5a3ecdc667a47ed0fe7ac5aaa978c71ab1b0951a68d3b30e27178f172cdfbf3
+EBUILD efl-1.21.1-r3.ebuild 6637 BLAKE2B e8846787fa6d2a5767468468625492bb0794fd76a53ae8b08a204c3ce6d2950a96ce15fb7fb2d7fd7f98313f7c06124ce97638909fd34e8d8c979e3382110f77 SHA512 67874905f334701605d886c5f75a82b027c4c418c87f8e495b1449b3d3b79d544172b5be8a180098656ee620eeb46eeb805695dbeaa242d2301a8ea0f8c4710b
 EBUILD efl-1.22.2.ebuild 6879 BLAKE2B f6d0200b055bfe235b08053982243b64e4cdaa5290e91c173e86918a839a69a45385256651b0d013f6c0a854ac9d7dfd6281c9d8a529ba175d54e410081b2f10 SHA512 914afb7338f7c9889a35fc1e72bf4699439496e3c37aac13b83635a8cade901abcb17b45ebd0fd899fd7c725d546d767fc2e0b7db6ac42e2a64bdadd380f4f9c
-MISC metadata.xml 2123 BLAKE2B 73aacd157b7dfc9bef846c985a550179c6fc2d479f578edbaeb11e005249c51bf73b94e8d6988cc1f4e9256f459f646f800389e9d0255b6d7c045763fc0efcfa SHA512 7125edb182fb323470e4604f0829ea635b1eaa966100b767427c5dd43ffeb6a99f9183512b739d18a47d070e3c3d9a7bcc667100d73bed3f642ccf53e3a0d3ad
+MISC metadata.xml 2006 BLAKE2B 38ab4b1c584a3e44389d22fff8e44111f8c60555f6de2110e1689c5fdb460e5fe473c4e688a9807313f839c64f5689487fe4082c33c816fa8b1e7267b4f06e80 SHA512 f9b09075773de10f6ecb37a5e470065fdedf3cbdd9067289299d10d78b98c96c95f2bc6fef868ae211787ba15b10c1ea4d24a7555d8fd500220a71eb7686d9af
diff --git a/dev-libs/efl/efl-1.20.7-r3.ebuild b/dev-libs/efl/efl-1.20.7-r3.ebuild
deleted file mode 100644
index eb9d5b8d1fa2..000000000000
--- a/dev-libs/efl/efl-1.20.7-r3.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="avahi +bmp dds connman debug doc drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent"
-
-REQUIRED_USE="
-	?? ( gles2 opengl )
-	fbcon? ( !tslib )
-	gles2? (
-		|| ( wayland X )
-		!sdl
-	)
-	ibus? ( glib )
-	opengl? ( X )
-	pulseaudio? ( sound )
-	sdl? ( opengl )
-	vnc? ( fbcon X )
-	wayland? ( gles2 !opengl )
-	xim? ( X )
-"
-
-COMMON_DEPEND="
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib:=
-	virtual/jpeg:0=
-	avahi? ( net-dns/avahi )
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib:= )
-	glib? ( dev-libs/glib:2 )
-	gles2? ( media-libs/mesa[egl,gles2] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:0= )
-	libuv? ( dev-libs/libuv )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( dev-lang/lua:* )
-	nls? ( sys-devel/gettext )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	pixman? ( x11-libs/pixman )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( >=media-video/vlc-3.0.0 )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		media-libs/freetype
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		gles2? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-			xpresent? ( x11-libs/libXpresent )
-		)
-	)
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!media-libs/elementary
-	!media-plugins/emotion_generic_players
-	!media-plugins/evas_generic_loaders
-"
-
-src_prepare() {
-	default
-
-	# Remove sleep command that forces user to read warnings about their configuration.
-	# Back out gnu make hack that causes regen of Makefiles.
-	# Delete var setting that causes the build to abort.
-	sed -i \
-		-e '/sleep 10/d' \
-		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
-		-e '/BARF_OK=/s:=.*:=:' \
-		configure || die "Sedding configure file failed in src_prepare."
-
-	# Upstream still doesnt offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-		configure || die "Sedding configure file with unwind fix failed."
-	fi
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-		--enable-image-loader-png
-		--enable-libmount
-		--enable-xinput2
-
-		--disable-eglfs
-		--disable-gesture
-		--disable-gstreamer
-		--disable-image-loader-tgv
-		--disable-tizen
-		--disable-xinput22
-
-		$(use_enable avahi)
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable dds image-loader-dds)
-		$(use_enable drm)
-		$(use_enable drm elput)
-		$(use_enable doc)
-		$(use_enable eet image-loader-eet)
-		$(use_enable examples always-build-examples)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gles2 egl)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable hyphen)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable ivi wayland-ivi-shell)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable libuv)
-		$(use_enable !luajit lua-old)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable physics)
-		$(use_enable pixman)
-		$(use_enable pixman pixman-font)
-		$(use_enable pixman pixman-rect)
-		$(use_enable pixman pixman-line)
-		$(use_enable pixman pixman-poly)
-		$(use_enable pixman pixman-image)
-		$(use_enable pixman pixman-image-scale-sample)
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable static-libs static)
-		$(use_enable svg librsvg)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_enable vnc vnc-server)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xcf)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-glib=$(usex glib)
-		--with-js=none
-		--with-net-control=$(usex connman connman none)
-		--with-profile=$(usex debug debug release)
-		--with-x11=$(usex X xlib none)
-
-		$(use_with X x)
-	)
-
-	use drm && use wayland && myconf+=( --enable-gl-drm )
-	use X && use xpresent && myconf+=( --enable-xpresent )
-
-	if use opengl ; then
-		myconf+=( --with-opengl=full )
-	elif use gles2 ; then
-		myconf+=( --with-opengl=es )
-	elif use drm && use wayland ; then
-		myconf+=( --with-opengl=es )
-	else
-		myconf+=( --with-opengl=none )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if host-is-pax && use luajit ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-
-	V=1 emake || die "Compiling EFL failed."
-
-	if use doc ; then
-		V=1 emake -j1 doc || die "Compiling docs for EFL failed."
-	fi
-}
-
-src_install() {
-	if use doc ; then
-		local HTML_DOCS=( doc/. )
-	fi
-
-	einstalldocs
-
-	V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed."
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild
index 5d68d8ef7d72..0efdcf3a7234 100644
--- a/dev-libs/efl/efl-1.21.1-r3.ebuild
+++ b/dev-libs/efl/efl-1.21.1-r3.ebuild
@@ -11,7 +11,7 @@ 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 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+bmp dds connman debug drm +eet examples fbcon +fontconfig fribidi gif gles2 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="
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index f3a7227c4bbb..5920ddfb2a91 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -20,11 +20,9 @@
 		<flag name="hyphen">Enable text hyphenation support</flag>
 		<flag name="ibus">Enable Intelligent Input Bus</flag>
 		<flag name="ico">Enable Ico image loader</flag>
-		<flag name="ivi">Enable ivi-shell support</flag>
 		<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
 		<flag name="luajit">USE <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
 		<flag name="physics">Enable Bullet physics effects and support</flag>
-		<flag name="pixman">Enable PixMan for software rendering</flag>
 		<flag name="ppm">Enable PMAPS image loader</flag>
 		<flag name="psd">Enable PSD image loader</flag>
 		<flag name="scim">Enable Smart Common Input Method</flag>
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index f15784d66569..59220b7f5bea 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -2,9 +2,9 @@ DIST ell-0.18.tar.xz 439368 BLAKE2B 9e65ed73119f322fea7177771d21e46ce9ad7d4060e5
 DIST ell-0.19.tar.xz 439472 BLAKE2B 9d29f49ce401c686b2e2262310bb00552d703455dbe9190acbb479e8fa2be7a03e732250ed63c9721f6079a46841a7bbb954fd0943edf520893eccb1a4fb9b6f SHA512 f7a22d0c385d45661b7c630d39f31b67321d20635c938ef5ad3ddce7194501652381a6bfc39a1b9a404a59108977216e24e2c32f6f30fc00972a0ebca909fcab
 DIST ell-0.20.tar.xz 443196 BLAKE2B 35daff12e43a27b44b60ff0fd0f10c8d6b8ba122a5825ff705394b2bfb401a90174133f63e6673690461ce2d56595186593fc65783dff2f795b83a461c3aa4b5 SHA512 91200ac000dc44ae593618c21012174af2614be0e7b33bd979aefb248e42d7bb0282f0a7ba256514dfb7657231b5fec29969c874417923f413d34c38500d4d97
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
-EBUILD ell-0.18.ebuild 1041 BLAKE2B 1b3c2cda4f13a795f1bbb32208ea0fd4cf62bcb593d42255e523173825ee535193e6691961033b533c4926acee864f82f6c2b82c2833e3c809f27bc238bbf349 SHA512 6daf4baab54fff7c33c1de37c82282887ab9b9cd1ba1692701496b877ecbda3b6615eade0ef9dc2fe0a1bbaf5714573e8e3e137e2b44c137e2c829b320a16bbd
-EBUILD ell-0.19.ebuild 1034 BLAKE2B 7ea489d2db90a5695631236ccca9fd0c58ded12d93e50ddb1b0ede685a53f8d916550598dbfbc770fc38e7c9375cf998376bdd0076755b583e1ede66f474242c SHA512 7458c2f805911724e443f3b57a05b71adcf10c142402214e38dbf388cc21cffc174b09c1b9c4a9bac910c947fd0b38b7f4718a8fd8bcf11e11cda15296a663a1
-EBUILD ell-0.20.ebuild 1041 BLAKE2B 1b3c2cda4f13a795f1bbb32208ea0fd4cf62bcb593d42255e523173825ee535193e6691961033b533c4926acee864f82f6c2b82c2833e3c809f27bc238bbf349 SHA512 6daf4baab54fff7c33c1de37c82282887ab9b9cd1ba1692701496b877ecbda3b6615eade0ef9dc2fe0a1bbaf5714573e8e3e137e2b44c137e2c829b320a16bbd
+EBUILD ell-0.18.ebuild 1048 BLAKE2B 8ed9e487df2b5ccd7df7f149f1c99aa2a609dc85388934546df2a44ac93ca426d4a7bc51984043e8e105a7a5512aa0af2c6703d2948b57b2bf98f25a345b0fca SHA512 da14e4f50826d2cd3acc8d6132bb0a95ed5db2b83944a320fe2c6f44fa5c4aecbf0666d1d3d1fc4aadd5cd691b8e858391968e36ee3003983acad5fd63191464
+EBUILD ell-0.19.ebuild 1041 BLAKE2B b905509fb7bd9b0aea24f76660368d5326aa4d96668b7079fb1f2eb09bf92f3202e143029b1c72093a21ec4bd74043f719f703836a506ed8d8436beda7eab24f SHA512 e8beded1f8f51021693b3605c773be7d5c71074438b3da94e92fcc4b29b016a17e4930b35c360f3dc05d23fc61631fef785f7ce73b7a62724b3e84f340115bed
+EBUILD ell-0.20.ebuild 1048 BLAKE2B 8ed9e487df2b5ccd7df7f149f1c99aa2a609dc85388934546df2a44ac93ca426d4a7bc51984043e8e105a7a5512aa0af2c6703d2948b57b2bf98f25a345b0fca SHA512 da14e4f50826d2cd3acc8d6132bb0a95ed5db2b83944a320fe2c6f44fa5c4aecbf0666d1d3d1fc4aadd5cd691b8e858391968e36ee3003983acad5fd63191464
 EBUILD ell-0.9.ebuild 821 BLAKE2B 000640e99b5e0c1e1a328014a8edfe47cc197201757fc6b4e71ce3c9efe27d7ea3f89c7171c2366605374624b4282fbf2859b1832d3f5136e4c713ccf0530391 SHA512 9d497dbe091631b7863b8f403e2ae138cf30c38a1b1eb7e98b775275649fce9c67717599f1ca38ab705dd7bb33e8bc406035c2102c368fa83a15c13069c0b79e
 EBUILD ell-9999.ebuild 1041 BLAKE2B 1b3c2cda4f13a795f1bbb32208ea0fd4cf62bcb593d42255e523173825ee535193e6691961033b533c4926acee864f82f6c2b82c2833e3c809f27bc238bbf349 SHA512 6daf4baab54fff7c33c1de37c82282887ab9b9cd1ba1692701496b877ecbda3b6615eade0ef9dc2fe0a1bbaf5714573e8e3e137e2b44c137e2c829b320a16bbd
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.18.ebuild b/dev-libs/ell/ell-0.18.ebuild
index e067c9ec27f8..ab4f6b336c53 100644
--- a/dev-libs/ell/ell-0.18.ebuild
+++ b/dev-libs/ell/ell-0.18.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.19.ebuild b/dev-libs/ell/ell-0.19.ebuild
index 75a8368f5c6a..95be6b7404d0 100644
--- a/dev-libs/ell/ell-0.19.ebuild
+++ b/dev-libs/ell/ell-0.19.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.20.ebuild b/dev-libs/ell/ell-0.20.ebuild
index e067c9ec27f8..ab4f6b336c53 100644
--- a/dev-libs/ell/ell-0.20.ebuild
+++ b/dev-libs/ell/ell-0.20.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index b2a10a71d57e..a85556fffdd1 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,3 +1,5 @@
 DIST flatbuffers-1.10.0.tar.gz 817750 BLAKE2B 1896b01afbdb8527836fa684980169890b1d5f1213d64cc88310f819c5fe7bc2a7e0a87e1abc2565ca165a0406dee9c814af382d2c8f08718ae5d9173530f98a SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2
+DIST flatbuffers-1.11.0.tar.gz 894944 BLAKE2B 8eee7165f2dfbed6ee0b0cfbec0df995bc6e8a19600ad42ac70788714635ba90d72f2dc24d0e1edd5ac6a1cf6148948f625245d3079e75861d29117f6fcf34fd SHA512 cbb2e1e6885255cc950e2fa8248b56a8bc2c6e52f6fc7ed9066e6ae5a1d53f1263594b83f4b944a672cf9d0e1e800e51ce7fa423eff45abf5056269879c286fe
 EBUILD flatbuffers-1.10.0.ebuild 710 BLAKE2B 51608ad4b42cfc506656c5289a869e23c254c8b97d12c39aa7e0549c330d260cd7e0523af380da6ab3b3e3b1592049eea736fddea1f847f154a2fdcf9be11a99 SHA512 763f697f453ef44323228f32b01d237ab8c240f51614c1665aad5bea4716e04cc885f2ba76af8607c4eb5fa7acb8cfffc5a0f8feb51700b0e36d89b4c61e9b14
+EBUILD flatbuffers-1.11.0.ebuild 684 BLAKE2B 8525aa20aee9e50955b974bbf0ecea3685fdae34d94bfd6bc302376943190e4981273279d3e30017281bc74380e608109441cf3a5b84455bf3c4379921ea37ff SHA512 380cc971f22e68278b0fdf46c72768fddf01fddeb7d237b89f1fce68c006c0e5b1e74ad29f7164ac09c5f1800398129db754d60d35b0b767fb57b3601b52b1d3
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
new file mode 100644
index 000000000000..2bf8b35e8ddc
--- /dev/null
+++ b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Memory efficient serialization library"
+HOMEPAGE="https://google.github.io/flatbuffers/"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+DOCS=( readme.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
+		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
+		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
+	)
+
+	use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 42e55bd2f192..8b19a75dfd23 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,3 +1,3 @@
 DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d
-EBUILD fstrm-0.3.0.ebuild 816 BLAKE2B 60fea1160338a0739b23885d3a6dc9b068758f668643c865adff569bae7b5ab282356aad4c6ae6532b0c9a2371500208f5669f185cfe4cf83a97c0bca6995ed3 SHA512 aa1d1dada3b516874c2983c3a86a9481146731097e1616e46aa0ba2edb68ea2eeeb964d51fe3995b6f0b72ee34cd774a7b8276855682784a2e2e5090592ccb4e
+EBUILD fstrm-0.3.0.ebuild 823 BLAKE2B dac34f78cf5c4b564f771a001ebbf4dc52a42c06191364ab1a1efe3f4b0353968db7b560b6987b9df26287e6ce3a4e80e764e1df3e6107a7cf1d2740eb1d1174 SHA512 41c8067e339e22a0f0360dec9a2677b860edef39e888bee37a66cbe89cb6fe27302464f59bee83f14b25f8a06df177d1436c433e6af7746af0dacee1d1b73033
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.3.0.ebuild b/dev-libs/fstrm/fstrm-0.3.0.ebuild
index fdf4025a8936..4950eecace42 100644
--- a/dev-libs/fstrm/fstrm-0.3.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/farsightsec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="static-libs utils"
 
 RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 94fe92f30692..d5b3907c9604 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,5 +1,5 @@
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.54.3.tar.xz 647704 BLAKE2B 792225afd9828755ef67b3e7221d4c53535d79d879e0aef0c7c56f06e02313a966776b5dddf9876649984a1599eb44a27d6288f9216bb929a66ad9e14cb632e5 SHA512 f19e667963fa3feecd23a9e4cc263a55d9d1311de7d10905969966f74e26ff982839c192c555cbc059e4fd65ff7c89d18944ca6bf8ffbb65ec91081036d19505
 EBUILD gjs-1.48.7.ebuild 1548 BLAKE2B 47a474a7958d70ed915b8c1a2a973f1e72f99a7bc4459e98a687503122d83d40dc0733dcd3e7fbefc42304049520acf80b3ad609cda1ea5c8653e0ba215f19f7 SHA512 4a976754dcc518a188fa3ceae85ec61aa20b0abfe6c9c5ad248fa72ea62820935415451cb8f6659931b6b8f4044dee2f5a20be8c08a6d1a3df0d526b24b8695f
-EBUILD gjs-1.54.3.ebuild 1561 BLAKE2B 9f4065981e8c9f33fb9a095dcc4591b9f7d92df6ad76cbb30369bc5caa3921ff70abe9a2f3e6d45a10e7461b26a6f72a89aaecb8026611f87e04adac00615a6f SHA512 5b926f35e873415e3af09aa75b01be67a25fb04df9bee5f0a289bb861cc76d5158ecf4e5fd7f99111ea697af89c64c0bc6499863ec3c6a2ea85a4d306c4008ad
+EBUILD gjs-1.54.3.ebuild 1560 BLAKE2B 2d5618173f551bc0b86fd1bcbf0c13c4d3029ceb02a9a3b3632559b0b1a7aba9e5f7f1d6330150121d4213b58cfa91cdcc99cbac78f526c46ba81def69497418 SHA512 c405c244a64236a0064f7cf794b5b2582b62dbb6226f012e5ada86efa90fee08d2c3e48916c1769a038916f07a228edfa88584c8fafc3fd98fb5c4c9c45fa327
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.54.3.ebuild b/dev-libs/gjs/gjs-1.54.3.ebuild
index cf81bd1fae3d..6482015e0fda 100644
--- a/dev-libs/gjs/gjs-1.54.3.ebuild
+++ b/dev-libs/gjs/gjs-1.54.3.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 readline test"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.54.0
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index c1f9cd2210ef..f9eea2885965 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.56.1.tar.xz 1397812 BLAKE2B 070597f3bd6e4e58d1ae1964cf6e8d7881daa68aeeddc5e9b64bc410fad6d435f2041171f4dfc2a6b477d39f2d7e9181b9917d1244fcb45b3a37491726381649 SHA512 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
 DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f6d343312d4967345cc202ef137f29690fbd7a35fa9310f87b134fbdfd4fd753b68b47203cd306689d9892eccf17e303d1e7bcccd4 SHA512 0811cd08e224975b3aa55ae89d648fc65f3105cae8a077a5671593d84743b1db28e9fbffe53fc86a2b3e82ea98c35f3daae033d3df07c7020cc3bf8b5d94f796
 EBUILD gobject-introspection-common-1.56.1.ebuild 1019 BLAKE2B 8f1d42b739389066c17614960bc214c616a9717d51e845b98ff0dc59fc10d484bda878a4149b358615568544d5b05259e2a788dce281bd4d5a70fe590373f4ea SHA512 db776369d3eb5af2c664aad6bd52a19f3d0371f9b84221c9cf65359cb625089e54b9b1aa9e3cf926b250fcd89e303a7fcffb34c0e5c58893583c82237a0c16f2
-EBUILD gobject-introspection-common-1.58.3.ebuild 1026 BLAKE2B 9725d24590ece7d0180e25dac5411f5b0d8791cd0e0c0f9f11dbd38cba7c2f9d1e55d71f3e3442791daa662911e32ed38b4f265a0bd436c84fcb8abd53c78da1 SHA512 27ab7c4963e2d93463fc7f625e0067b05e6a898f623e15ea296581285bfa7a6251a8bf375ebc9fbea27b052f52c0f056b07f3ddf3ffb3424e015e8a8b3b8163a
+EBUILD gobject-introspection-common-1.58.3.ebuild 1025 BLAKE2B 9864a56784eceb06e677ff0220ba87fdf4ddcee9aa35edd3ce2d61fc46e0b30cc6315d336fdb56c93428bf58e39951a067ca410e8584885865ef55d38496c5d9 SHA512 c8214171bdbe020ef8152facb08c59f3cab0bb286137b242dac196efa28cfcc981e2687bd3424fe0afcc039198ac8c551aa4be273753598d63fada90bf117dc1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild
index 3b87a9d78717..bd8514e0f016 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.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 a3074603eb14..374614cb7f64 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.56.1.tar.xz 1397812 BLAKE2B 070597f3bd6e4e58d1ae1964cf6e8d7881daa68aeeddc5e9b64bc410fad6d435f2041171f4dfc2a6b477d39f2d7e9181b9917d1244fcb45b3a37491726381649 SHA512 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
 DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f6d343312d4967345cc202ef137f29690fbd7a35fa9310f87b134fbdfd4fd753b68b47203cd306689d9892eccf17e303d1e7bcccd4 SHA512 0811cd08e224975b3aa55ae89d648fc65f3105cae8a077a5671593d84743b1db28e9fbffe53fc86a2b3e82ea98c35f3daae033d3df07c7020cc3bf8b5d94f796
 EBUILD gobject-introspection-1.56.1.ebuild 2123 BLAKE2B ee5a7866e95a1a70b74e2313e51a0b443ef2effa47aa9a119bb3c06442ba98e54e45c0d2fad34ade22fd0e1a8c9f4bb54fa4182f9acda62d0570ac30685f9893 SHA512 0e4c52cecf5cd72848f62a89402207c97bc6073472af2b0a3933dfc0f44170d06969f0bd9a0bdb692b3fffce4a1f4b40aad3b55fb9e932dc3dfa90637b9a28dd
-EBUILD gobject-introspection-1.58.3.ebuild 2206 BLAKE2B c0c3ebc9b9241dbd90c5ebda1ad2eb915b8294ad3427b7a0fd820e3cd7e45dbafcb50129d1a5548eb4050947b1f15adbce1916b47fc7cd769ce67884e69336b6 SHA512 3c01633eb4b06ebca70d9df74f161d38a9174ff69213cea5c31a611ce916ff5edceb261b1e3436620aa942dc3408f236f23b9d19c69dd29d158128544f602a3e
+EBUILD gobject-introspection-1.58.3.ebuild 2205 BLAKE2B 4d4da0466bdf6f653a9818b231bfee1722076ebeaacdd5d59c988c0fd1972fa3aa7401617a558d9e11857d14347efe12e1b9910d221b89a3e1989e4947e44cf8 SHA512 55bfb6c57dbfc32b17921ac24a704da0cb0194d4da6bbf26198eaa493a0085466fbfdfa989a2f1bc4d5ddbc0aaa64376d4561ec0f678ae630e8946bf4e5a758a
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
index 1a090d5df94c..5bb84b126cab 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.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/grantlee/Manifest b/dev-libs/grantlee/Manifest
index d4cadebfa750..1a1b61479aff 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -2,5 +2,5 @@ AUX grantlee-0.3.0-nonfatal-warnings.patch 695 BLAKE2B 74d631feb939a6bac5045d151
 AUX grantlee-5.1.0-qt-5.13.patch 778 BLAKE2B 01c0c1fb6a3a9830134cc0d1bc19ead874d526a452dfb08ef0d4f298d979ee40ca70742ab8d6ad823982d80ff19bb695aa8e4b66ff90500f4f470d7eaf83554f SHA512 03b0168b886ec7a394bdd06acb98908dd002b0e9fb8763f71fee3f022fd1726c09da895154eb4022ea6e114b6f7c1b37f90f35ff77521e6f8272371961ff54c9
 AUX grantlee-5.1.0-slot.patch 1616 BLAKE2B b395e361dee3120f7cc0bfef36c5fc0ec2b7a3c8ea714fdb21a93a34cd309407d07488c926f6a67d921a5767d06c05b620d24fce7c253aaea93bb2ca20aa92e1 SHA512 62ec0d0e510fc7aaecfb2eaf9e52b395070833732aa840ff8fc4b4bb94b6716fe59765a7413263c2a6edb073cc379141955a99860c0fcf592d6f5227493482e1
 DIST grantlee-5.1.0.tar.gz 1175380 BLAKE2B 6468c0131a334c3ac52b841a64171093a41605686e4ec2af1a60bbb829f652d388fb48e501a0c1f5eef54ff3253c10b0d6ebd5a4439ed2852f8746188011f9e4 SHA512 2b806a0770b9c6d02f207d5b4939ae8cae325de4fa01901320ffef5c8442ef0f1c10dd799966d0bf0d223e6541f93db8568aaf922ea1b334bcb2f85f6373a936
-EBUILD grantlee-5.1.0.ebuild 1234 BLAKE2B d1b4736a8d0ef07704bd386a3942039ef2d2f2d9003e3a6994871a530337874f017ebe49a287eef08cfe40e1b2ef9f0ca672636226c88a2fa7320920307eae45 SHA512 ecb833915fe40e5259870c6c38e59ebac879f610b6cd6340da26de3bd6911083a2c245af733ce583bc5f43931f37878d4d7f528490d5e6deb47e8b9f1042491a
+EBUILD grantlee-5.1.0.ebuild 1233 BLAKE2B 73032b4f39b8ac3514b5740155e1b6fafcf11fc86bd3d7bff29f57acb292b02721aec25a2d3cf43a908fce5101e899363c26d49927992c21c48b90fc89f359d9 SHA512 e8285340ef1a54323e9eeace82841b64ad3323d8580eb98c76bd151c4c706308d2e77e9a9aa5b5a71501170379b1f36a82c155f4562567ab0d7364d71ec1b2ab
 MISC metadata.xml 331 BLAKE2B 6dab7a95213e13aa8367317827224739d146430a1dba20837be5469221ba7e9403ab6edf7e439511fee5082d10d5fd883c3a25c871b4ff4aae7c24399d1f1cf1 SHA512 073a759e22f25e29be31689015b96dd3c8ab4748d59c31fabfc6a7c43cea6ca2a0a0f48ae49b36cc2a835d97fc2ea5a2f2a790a3cf74fb4d16e1e0f5d771b1b6
diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index 59e9f458582d..d8de4e45a9f6 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 0e3421cd6ddc..4d5808d02c84 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -2,10 +2,8 @@ AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a6
 AUX icu-layoutex-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6aba8808829ebdef16978fc7130bb4fba80f2bcc7886bafe3c944ff83f56cbf5f02860a35cb0a655722ce305e5e6b05dae15d5254 SHA512 3cf34c7ffaa200f841d605f11ee8145d70f2975be2ae5282a6de2fb5caf6bd8ae67e05cf652b0714023087fa145b4e5fdd4e4287dc331334ec347d957674d291
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
-DIST icu4c-64_1-src.tgz 24013136 BLAKE2B e577bd4c9b822e5ef3a101b3ef46b7b42ca18077d6e05fca543ff1eb702261f017981fb22dd3970662397530b390f648d4417c84dcf3d6ed0d298dd7a8c38897 SHA512 5eca8342d8bdf902689243506643e04512744b33962687e118f6810af6f7fd073678f67b991d2ae9139d257713b63abb4222b96687234df01ad5ff62df16ede0
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
 EBUILD icu-layoutex-63.1.ebuild 2525 BLAKE2B 7c45a83f8dcb5035d44c676edbeed9cb971eca673172a8ab5642589fd63c04f05d6c26b0346ea9caf5da340e5d29d5fc085a4e9e17390c5cbb358926f03257f5 SHA512 0f27c41556ab551538f95c086b39c85539138254d160284e6579a0ada90d93485a9ad41670518d7f27e9b93e9029a63bab484727101c5026d4d1f52e44536588
-EBUILD icu-layoutex-64.1.ebuild 2509 BLAKE2B c5f9d5cf312a3ba8ea2676845bcd423dea004b86b84be36162d0ddb09ff603e534559c064bfcf104b16889c4c7acdb512dcf42b62c6fe22bd05f5d366efd2cbd SHA512 745dd1f5f94c0aaf8d1c9a7ef0436a2ebefefc4cbdcec4e957d7d691b377a460aa89cb953d6be90bac98b843334333a3e666f96b8f86cf758d63b7acce7096ec
-EBUILD icu-layoutex-64.2.ebuild 2565 BLAKE2B c359dde14778eb9039ff2ee65f8e522d8f16ac796e2855e18b581110625020c3cdd0abe97f5c07e9ba973cf1a539d6bc26d83fc8f62c4983c092320238e1ed5d SHA512 710052ca72a6e70e3b072424e0d8b3633363cf3978ac6b0ed77e93c47f71dcd59eab6219c26327b0c842e4bd5e204216dbd8306a9100cf85671772a8ff7f5442
+EBUILD icu-layoutex-64.2.ebuild 2562 BLAKE2B 52ee1fd8e360a9970319ba7941770dfef3efaeffeecbb2ec66d053b8f988e68596dc5ff67b90ce2cbe13bc9854bef75a0bc4fdee323487019e8c4eb7c3cd71a9 SHA512 b4413e46715babae7b05668a00d157b0813191bfc2108d23aa955070fbc5f58bba5b5bd0ec1f03ef53b7adbc04ba626ab6af044e1d945fd1b63db138e77b7909
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-64.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-64.1.ebuild
deleted file mode 100644
index 9f738852cf9d..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-64.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
index efe008f99812..48222c7d4dd8 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-s
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 6d0ed3cac588..ab6bbe6c1e9d 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -10,10 +10,8 @@ AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef395737
 AUX icu-64.2-extern_c.patch 29978 BLAKE2B 398f371d256fd4e60fc069949d0d861e363c43889a762c9fffad176cb1164b069209a295475748c08a18a83b43abb561851f4d74359fc3fd683b97eb0cef2e50 SHA512 d45a8da416a573b69b76a615d11bf99f852cb1703cb0fd4ba35fe96411134fda97a29cddf3d14a23900a5099a930c32ff9d1865f02d07314268974c306832409
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
-DIST icu4c-64_1-src.tgz 24013136 BLAKE2B e577bd4c9b822e5ef3a101b3ef46b7b42ca18077d6e05fca543ff1eb702261f017981fb22dd3970662397530b390f648d4417c84dcf3d6ed0d298dd7a8c38897 SHA512 5eca8342d8bdf902689243506643e04512744b33962687e118f6810af6f7fd073678f67b991d2ae9139d257713b63abb4222b96687234df01ad5ff62df16ede0
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-63.1-r1.ebuild 3321 BLAKE2B b8e6b6ea9bb9379f0b09195382db18e7758fc919d626f49240f9b8a75b97c84833dc2741c528788348d090749229b18d610bcd5bb196506fec03803d3a78af3f SHA512 0efd9eeac3944f3ea14e20f99c3d3bf0f9a2ed22d62074a1d1342c8fb04f4bb76c30d51ca173a09a59abb832cdb134bd1120b065ce0c63536da08839f4abd2de
-EBUILD icu-64.1.ebuild 3338 BLAKE2B b79f6248fc64eafd37d25fdd58ba9752b038e1677c97d009bdcb925c2a665172bbf99a44c1c23b9fb1b0b38f7db057aeaea2833316d079f9e0444727fd578c53 SHA512 58a5dfc85fc423b9c81132c1df1cd9c6e3338e8e3132681c68fb13d729bf63fdd6662cb6457855b772de19eb03481142dd92d7592f953eff7752ce0de2cfcf0f
-EBUILD icu-64.2.ebuild 3406 BLAKE2B 9b091c1333d4c7545a0f0d7003b74099162258a10c252b82c93719c96ec5c0dc0a608d9fb631fc5b255d6604aa1e5b77d597ef5b1bee8d41292349db2c99d224 SHA512 c9b0d0e951513e36559eb4d2db19941722150c42ff8c092e80dcc7cb599a2d60fdf056bf8b481436d52be4e44216addae462d13e48afe7fabedfc564c007dae2
+EBUILD icu-64.2.ebuild 3452 BLAKE2B c155821d71318f0cc7f9d109f274e3bebdfde38cda04ec4278d377d47a65b8c65ff705c1db7f3475161b9eb1a1ac067467d76b952c72d90bb40d606ac00137d8 SHA512 add4911b736ecfcf00f56a9dd706bb9abb33e18725e295ace2fcb7f6c6b3d960823bc32487289f31385fff1deb0eed9482a51a2f19c532035a0381ffa8eeed31
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-64.1.ebuild b/dev-libs/icu/icu-64.1.ebuild
deleted file mode 100644
index fbe419ce9732..000000000000
--- a/dev-libs/icu/icu-64.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-58.2-darwin.patch"
-	"${FILESDIR}/${P}-guard-memory-include.patch"
-)
-
-src_prepare() {
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/icu/icu-64.2.ebuild b/dev-libs/icu/icu-64.2.ebuild
index c0d84349895e..51285878f756 100644
--- a/dev-libs/icu/icu-64.2.ebuild
+++ b/dev-libs/icu/icu-64.2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs autotools multilib-minimal
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
 
 DESCRIPTION="International Components for Unicode"
 HOMEPAGE="http://www.icu-project.org/"
@@ -13,14 +14,12 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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="debug doc examples static-libs"
 
-DEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-BDEPEND="
+BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
 "
 
 S="${WORKDIR}/${PN}/source"
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 72703a228b6a..2a5445ef929d 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,6 +1,8 @@
 AUX ivykis-fix-segfault-glibc-2.28.patch 929 BLAKE2B 7bba4bc43cc07221bcb57b4302dd01a1649263541e1ad0f330442f2b1dba61310304c13600e291692134c1f30ecd18c04c792eac491471e3408b7b96e9ef4d15 SHA512 7119f12154810cb1a898c83931d74e207ff0902ff4e4d97d06ebc374a78fb2e22b1f676bf9cdc7321b259cb9558b574e3cdd7cddcd5512992b4a83c57e643469
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
+DIST ivykis-0.42.4.tar.gz 656775 BLAKE2B 9b85dacb74eae99907999d5181029a824c5f0d6aabb41d892353723318f9ff6fc1a2a6296224c7ee407510f7354f2ee934d40b9627a0fd13489bf53b8ff7f115 SHA512 26f4fa28582555004cbe1d80cb042f93deb42b195c7d563ce4048ace25c74bb558455d98d2d8e0e59534fabb2dff6503aff16d0feb7a05fd835b63432f080286
 EBUILD ivykis-0.42.2.ebuild 402 BLAKE2B 9fe4f5097ce2060c52b99c925cd12a9e79742396c7bb3ae84a7a89a1d7d082fc88152a4e06032ad988366f4323a2c10a329f6ff690a2278d0f6bfa4c3f5a6c09 SHA512 ca5974208c11a02c33f7a66c2336e64e054be78b9ed1bad43b55de065ab9a4b939f893c3286544dd87965dcc9a0b1e02a1435b36d02f8b657c41fc0a7c4e7da0
 EBUILD ivykis-0.42.3-r1.ebuild 709 BLAKE2B c101007f21a5ff3c1bbfe36c2382122a571f723e714f50eeb2ef43991c7d2fe622938711d5a80e5eb3a97a0d28297f25aee6e2216bbb867793bf3d9a822f5478 SHA512 a96143d639e6c8165e6e6ecde0cc5c650bdde5ae77f7b05140e02babeddb88b8e4148d9755d53d8983ae94f116a4abf71a291dcde37bf89a579637487ffda9dc
+EBUILD ivykis-0.42.4.ebuild 642 BLAKE2B aa3d880a84f192c2b8977f25aa265b14bb57d647724cb51f505f29b7ba5b7bcff72e8a98472c42970c58913ead43b92e8fdd51b2ac8ef0cf62bdde10c9b59fb6 SHA512 a859e9efd7caf5c7bf7f7902df8ee0d2b2a6becf629d35941250be5b6941046a777e077ddc94829d8fe0f504bda47af8482fa7f3eb6f51c43de5fcb98dbf8789
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.4.ebuild b/dev-libs/ivykis/ivykis-0.42.4.ebuild
new file mode 100644
index 000000000000..01d96ca954e5
--- /dev/null
+++ b/dev-libs/ivykis/ivykis-0.42.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library for asynchronous I/O readiness notification"
+HOMEPAGE="https://github.com/buytenh/ivykis"
+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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index 5d9fb5bdb90f..9fbb812c2d6f 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,5 +1,5 @@
 AUX kdiagram-2.6.1-fix-horizontal-bars.patch 4650 BLAKE2B 4063f8dbd92621f7d05d9b771650e9094eb3caa175a601b3ba51066853e4b222ceeeb6ac006c78a6ae12e70e5b0b4f192a004bb07437c296b5d4c9907f21c681 SHA512 8e0a94c65249f7a8b52e0c6261e251a7bcc07103e5f2bf21c1fc06b171d60a8d726f4c475c91a9114a1b129443208a95340b1aad07f2d31b2be0988f7f1611c4
 DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
-EBUILD kdiagram-2.6.1-r1.ebuild 782 BLAKE2B 25cb3f928da97936bfe38caa7b8a68b9e8081092141ae9443ca4c49109070d005c233323e4e8c8a68da2b2e9cffe051735adb6fbcaae1b0b648d7a175e660c3a SHA512 8c7db0341f06fddf09951d3c487b31f7220a9aa3f0797d80a8b2a4a7fcdb32ac94a33b1c2a475628c54c44d4ca58fd070e2e3ff06c206916e18a1a767b66e3ae
+EBUILD kdiagram-2.6.1-r1.ebuild 781 BLAKE2B 87027f52dd286e85dca1b418c07d63b1479d9900a61eeb175cb5d5fec26e4813b1e3f0fcbc53f023e0c850b1fae5ebb3d0f5b64d49c29511715ef74ef5f13a17 SHA512 8ff4ed92a236f8e1b0986a8c226e1e0b3520112aef6d39a1c944dc98cfbb404fedad79af275976001880e453bf57a642c2dd2ef8f61f4b70899583325857f9f1
 EBUILD kdiagram-2.6.1.ebuild 654 BLAKE2B 107e745348aa6492db244419f2ab596e9d4f95970ea2c7bbb798c53347bffec9b993c61976a489da293abfd2f46e7fd606c6a3d228da22a01cb5eb8d387d186a SHA512 9b035287ab682100ec8d1dc5616439c3ca695a7c45a35bbd3593fdd12563babfa5b06dff799bece565bf75091a82c3d84345631b6304f3b2beefc0feedb7adcc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
index 6e88b0a90514..84b8bfdc1cc5 100644
--- a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 fi
 
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index 2152cf8949d3..6ad9c2f4cb80 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -1,12 +1,17 @@
 AUX insecure_tmp_mktexlsr.patch 602 BLAKE2B bb2dd2178a515431e643f4a3e91a4b30fb8e63e860e6e0b6c13208b00642bc88a672b1dc9ead8277c593c2ef333f0581af24c821b6f3c84841a750911d4fe909 SHA512 2b9e92665482403b7a153c27ad8aea5ae5f05ef42c994c899ee4987d39fb4005204c7abbb464d7c0ec1b48a7630d34991d6fea3076cee1f50d9c4855c7a908f1
 AUX texmf-update-r2 6017 BLAKE2B b9ded4693768342c6fe9a0d99b6836e74b3d8b9a5bb3d335d8ecbbe5c2a45967ac880ebfc2476c04e461ca2dac3eb02ee6c41ee34a050ba94b54d9d731853ee0 SHA512 924c6a53d778b1a05252830d914c92f8d1a8d1c479cd8a065b861bf1f263d6bb529c42c365134fea19ea1d9bedf68a943d609cd89abf73912f90bbc3397fb14f
 DIST kpathsea-texmf.d-8.tar.xz 11456 BLAKE2B e631ebcae97494b963dbe4bc03d7ba19ce0a38392dca8c171a40738cd7c6ea46ee821f993ab3ce8f4beb068cc485cb1c84adc7a07dd13c58c68bf9a0c17dff5e SHA512 496ef6e3134f1b0507b15729416de86d72f41b518f4d382c78c2f39b0d603d3d44f8c8befdab2351d38d2a26fd87e5a73570a67b11dbb3f307b006f409a6f036
+DIST kpathsea-texmf.d-9.tar.xz 12120 BLAKE2B 80069cdb1c8e1edf8ae0b5af2de825afdf234840f9365c0033d7fb080a1e5e5692ae9ba4c191b83422724f35523a21551102ef91e8642f5cbd4df9e251357b11 SHA512 5718ef60d33013159b5913f198330f9ecb098ac4333dd536068e8c48bf6eb208039a9b29afba331b3e4942c0c77c46e6add1c116d273f1f53550116ac06e69aa
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-module-kpathsea-2016.tar.xz 30696 BLAKE2B 066f5586c93b07db1c07ee0e9a31465e24564faa30b0abf40e31212a1048527a54c58d516c5af139931df2f7d32b6c9c679080acc93f71f05245b2c4f0bb9530 SHA512 330254cf76fd30bf3686dd48710f21c4804f2f6ea9b14e6033b2741c3e6ba627e51efe96da9a1089120d474e36aad1c052285a7ea394b76ee2d4d335b86095fd
 DIST texlive-module-kpathsea-2017.tar.xz 30956 BLAKE2B f9f7d70a6d814996a211a5f3d9c6ee1f477497f84e4716af915bf1171018243094f11d131d2f51930575129b6e16e5fe5e907c0d74be1a182ba7e573be0eadb5 SHA512 df4bc2175394bb6e9726b2c09ccf04e2787f73d584dd6944a25b3aab1eb6e8b4bdcd14ca043b7fe4f6e240ede1bd7e9003b83e34dd3df8c685658b8dcddc83c9
+DIST texlive-module-kpathsea-2019.tar.xz 31480 BLAKE2B 897ceb8cb536f2d4a54ead2529da891eba83e4480b9ca527ab99337ed030f680bc25a12d4286e101965d146567720e3bb5fb8ff18a240365be9eeb7471c970bc SHA512 12676ea4b26af792c1abc2a3189c103357b6af4994d3131d8d98e507af24f5d9666bfe4d8abba0ec984eec1ba8c99ab7a6d35813c8e053c79c82a7baa88c973d
 DIST texlive-module-kpathsea.doc-2016.tar.xz 1128872 BLAKE2B e3b2e5c2c14e2d67fba3c89d31169b2af13bd6767983302ca302369ee8cf790655b248cc1069cfd59e4044562627eb83bca6ffe368d5c1b38832e08fcc53b678 SHA512 1cfbb4b5a8647bf5da46b04c9bc911091aa3322b154d65544aa3a1163e24b6906d7e5420549ab0ba023250e6dfa90e75d3a20dffd2e7360fba068a5c3cece885
 DIST texlive-module-kpathsea.doc-2017.tar.xz 1128868 BLAKE2B d1f6bb2f9a893616cc9e090671a7a3c2aaab0f942eed0824a60826b75ee0a62ded33cad197d0bb953100a02ecead1f8d84bf7374889bdba9fc36a26b23440a9c SHA512 af829f666c815da49b59bbe678a2c1e9fe45cbc528f484dfb6e43a1e52bbf0245a4e571505f5be2cc7cf7f5ebcdb06b862ac6e9f9b5390489f0fab10a11fd997
+DIST texlive-module-kpathsea.doc-2019.tar.xz 1068236 BLAKE2B 19ecf7d3e5dc1c7a537f59ad45188bb2cd23127682382e719d8bfced05a7f46704606be55c1ff3fe1374587b99866f441b67cb1b555dbf2e33f332d147e30dda SHA512 bd13bb8a5740df0abda5d5f546138504bf3b6bd54caa95e5f1758cc540af4bbbd055e3868c494f65e9bebe108038205d8537fcffbc821a8f17bc51119e5d479c
 EBUILD kpathsea-6.2.2_p20160523.ebuild 3274 BLAKE2B d028c3c47209c2505ec27054c2b5c7526fa548649eda49a2f58680389cbf2261e5d06a0014de9176c6f02ab7cd3df4e2a47b28fcce2fca01956465ad7f644f45 SHA512 2593e50d9d773406fa17dd4583ad02d837ede26de6140aa8b4a593170693b0c49bebe2e025b50356165b1c9ce8432b99e4e341c2f1874c000861c901ff1319ca
 EBUILD kpathsea-6.2.3_p20170524.ebuild 3287 BLAKE2B a33b736ea9ff4701aafd847ca262e2211de48ab992665666daa0f093de1416ce608a98051f6a42e4d7f1e17c01e471cc58a8e6ba97e5816e97bdf10a29295210 SHA512 a5cbe9f1986f60ef7c65c541a84f0dd7a4685094df88d6542777c64138b946dcb4d39b9ab0e34d9ec466ec898c0513599178c11bb3311e97494c3b0641990193
+EBUILD kpathsea-6.3.1_p20190410.ebuild 3189 BLAKE2B 761cc74fd9184ded8deaeec80f1d0ffbbf4db6cec5d4487438646b4436004a85ea47b6ae0d45416961805470024fd56f2a1e795f0ee9f23af607b080f3420f5d SHA512 bc438b69f2f77c877346ecb4758655455b14b8531d6b2331e5240ecec0cc7a10aca227b0392601e6a66b221164bba7f6cf615ec0b0dfe3d62e0955fbf0f0275b
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild b/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
new file mode 100644
index 000000000000..bb7bc257e980
--- /dev/null
+++ b/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit texlive-common libtool prefix
+
+TEXMFD_VERSION="9"
+
+DESCRIPTION="Path searching library for TeX-related files"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
+	mirror://gentoo/${PN}-texmf.d-${TEXMFD_VERSION}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV%_p*}"
+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="doc source static-libs"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+TL_VERSION=2019
+EXTRA_TL_MODULES="kpathsea"
+EXTRA_TL_DOC_MODULES="kpathsea.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+src_prepare() {
+	default
+	cd "${WORKDIR}/texlive-${PV#*_p}-source" || die
+	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
+	cp "${FILESDIR}/texmf-update-r2" "${S}"/texmf-update || die
+	eprefixify "${S}"/texmf-update
+}
+
+src_configure() {
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #347798
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+
+	# Disable largefile because it seems to cause problems on big endian 32 bits
+	# systems...
+	econf \
+		--disable-largefile \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" web2cdir="${EPREFIX}/usr/share/texmf-dist/web2c" install
+	find "${D}" -name '*.la' -delete
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	if use source ; then
+		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+	fi
+
+	# The default configuration expects it to be world writable, bug #266680
+	# People can still change it with texconfig though.
+	dodir /var/cache/fonts
+	fperms 1777 /var/cache/fonts
+
+	# Take care of fmtutil.cnf and texmf.cnf
+	dodir /etc/texmf/{fmtutil.d,texmf.d}
+
+	# Remove default texmf.cnf to ship our own, greatly based on texlive dvd's
+	# texmf.cnf
+	# It will also be generated from /etc/texmf/texmf.d files by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/texmf.cnf"
+
+	insinto /etc/texmf/texmf.d
+	doins "${WORKDIR}/texmf.d/"*.cnf
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+
+	dosym /etc/texmf/web2c/fmtutil.cnf ${TEXMF_PATH}/web2c/fmtutil.cnf
+	dosym /etc/texmf/web2c/texmf.cnf ${TEXMF_PATH}/web2c/texmf.cnf
+
+	newsbin "${S}/texmf-update" texmf-update
+
+	# Keep it as that's where the formats will go
+	keepdir /var/lib/texmf
+
+	dodoc ChangeLog NEWS PROJECTS README
+}
+
+pkg_postinst() {
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index fae9c60ab559..cfa11d832c65 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -14,7 +14,7 @@ EBUILD leveldb-1.15.0.ebuild 1230 BLAKE2B bbaa78014b6f36a8c6d8e5a71ff56995b95f9f
 EBUILD leveldb-1.17.ebuild 1720 BLAKE2B 683381ebc3ae11d8844e52fb2c7161348a6495f4f83bd29369f991d4169619d526ae6bd1ed878bae9269715da5a9d7f80efc298253fa78c35aa1c7eea9b98bd5 SHA512 a59df720d900c7da98a4e0c9c865f5cb962b1843461289cd0a4e78cbcb5bcfff93b0d4213fde486df0a9f5d2dc7bfe86ecfec757c83513932fb1ab02859feb25
 EBUILD leveldb-1.18-r2.ebuild 1878 BLAKE2B 8a31c57e1e5e6015b549e55b83277c47be0b882f695f3af8f2295ea801380cb02ac0e0691a2a9113bccbb39e4a505a9ceeeaa2c0f9be3644afb1eb4c5949d7b3 SHA512 865cc8d9fa5b956e3b31863d3ce4d18624bda106aa06c0176ff514c7cc3b7016edb0dd34dd5724b5fe4a9ef231ceaf2b59ef47ac9589c66ca4979254b4703075
 EBUILD leveldb-1.18.ebuild 1647 BLAKE2B 65c40aea5784964fcdf7550ff41f20980b61e3eae2e69ea790d1e1db1c3b152abb18c7ec679bbdaca21c2c91ace348e7b8a8bee53fa5c39528f1b0c1ac76108c SHA512 5a8feaeca45690fbb5d6f7ecfe7074e176532765900cb343107da542b32e61935bb0832a6682550d57a7e74bc20fec0469a7b0b20a1de9636f628fafd3de4193
-EBUILD leveldb-1.20.ebuild 1736 BLAKE2B 51041f0f5685af26fcab70362ecc3c3bc7b9c99ed4334facb66f8c6f0a323e0260d90f85c1a8fa529c6468fe6880380a7dffd08d51924ffd971b482a5988197a SHA512 9298f80a533896f38fb21edb077e97a7ece2f3c1fd2ae720a554cc82a53d98e50829b8d7b5bc07097d0dd7ef724fa24ac72d32cd8f89dd2524b125c6bd593632
+EBUILD leveldb-1.20.ebuild 1735 BLAKE2B b4f0ef8f4ddd61fd24a8ad649081085a5e7c55b708a13f45f13ddd5fce339f6fdee478913a09d56cfaa34667fe4df673c8e6b37867a892f23e284407b8e569a2 SHA512 61f2a35428c9dd6f76092d46d742179e17e48eb4281d36c96e527c6b7d800d1dee9d44c4032e1efb400b100bbc952e40aa492f3082da904a172d5f653055f170
 EBUILD leveldb-1.9.0-r5.ebuild 1223 BLAKE2B 7bbb2958034b96f22b3bb5e55fd9f1383e2cd01b7a523dc32ead090b31cefcf4299d581e85430dbec267746ded520ed21ddb89a5fad9c40a1f6a652677961ecd SHA512 a97ee6357c3e37208d7900f216e4d4270bd7b6c9add1449e3a0c52d49755a1be88f6008e9ae9bb6a021d3345fa57db18e3751073a63ccc8e4270e7ba684216ea
 EBUILD leveldb-1.9.0-r6.ebuild 1277 BLAKE2B 9e581129c37d33f46037eeef50916c5ce6916e6f671f01144b9f0f7cffed096dff724076f36261d552df6cd8f396a38725ee476258211a1cdbf42af9bef6b289 SHA512 ca4965119338028813e0cdb5d1b303c88ef2e2450f471f4d58e16a276485fcb001d6c4818097f5b0c47eb66ce1b23b561ad37809415654c4cee771d0ac17137a
 MISC metadata.xml 487 BLAKE2B 33632d0f2ef6a0ed11b059a6245ec9582b1e977622a9a755e4ae98cd1f8dd8f853c0ed0aea919b11451c57c576699f4e9a22bd1303148eacec6fc2770f47492f SHA512 61c9350d750209e948d6aa51a3594546837e425c49dede490c0171771e7ff5a2e03932f5052ee90b36e477a20153bde3c265036839e2723703677414bd77d0d3
diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
index fa326715485d..ce1166ec824c 100644
--- a/dev-libs/leveldb/leveldb-1.20.ebuild
+++ b/dev-libs/leveldb/leveldb-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # https://github.com/google/leveldb/issues/536
 SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+snappy static-libs kernel_FreeBSD +tcmalloc test"
 
 DEPEND="tcmalloc? ( dev-util/google-perftools )
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index f1d3afa3ab32..f95176c51889 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,5 +1,5 @@
 DIST libatasmart-0.19.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
 DIST libatasmart_0.19-2.debian.tar.gz 6511 BLAKE2B d283dd1db988b95436a99cf804790b6c9b22d48b41d561a6fd2b9aff0948241ab5e775c5c35691692103acd5e73ad2e46278b9d37f886cd48c91cc69353a1564 SHA512 78e86b0c1d2a56dddc8d9ac97ee325871e319ad2226f1fbd5a048d792cd05e5d8162d282c1f767086da5329cd1ee67b37fbb5a2fd3c950f84e9efab11abcf754
 EBUILD libatasmart-0.19-r1.ebuild 947 BLAKE2B 073735d386281eed2d06473756dc5c2320c630f682c5896961fead7384c9b015fe998d18fc10481f3989ad28fcdc34efb0f2d4b6f7dc0da1b18e75debfcb0d98 SHA512 9f01383cfd7db79cfa99d76f9a8b8c6fd2eb91d329c1b99ef32103c107fe731286b6103fa4748e304787ef16ff41e10d16db2b29788966b1854a19e7f6e478b0
-EBUILD libatasmart-0.19-r2.ebuild 963 BLAKE2B bfb008fdbeada89ef36350dec054fbd5d4085153eab95c87cac47fb82579c687a7fa3de8373f58d58977f0c4691e242c16332ea7b888a04448415c3c6b6e19da SHA512 cf2249decbdf24d67df1d55017703607b1d392f1047a19eff6de791bad27397a682aa75b7ce754319fd93a1fbe456696fe613f9ff6f85ceac9d6c94b1206fec3
+EBUILD libatasmart-0.19-r2.ebuild 962 BLAKE2B ee87912f6b870e8ccb660802d46708d171bc057ec404c04f814483feec58e6cd65c0afe358e52a5868a5331ee25989523579b17b6dae814655066b560739d8f1 SHA512 d6ea6bd3d6982e89fde7189312757e1bafef524f8ee8e69074291a01f35005d53d433454a289a635debc723be4fd1a1e071269cf9d41148c6afbb759c5e3c304
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
index 2117666652ca..059a6224249e 100644
--- a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://0pointer.de/public/${P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libudev:="
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index a3218419636c..1ac3056277b7 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -3,5 +3,5 @@ AUX libbpf-makefile.patch 655 BLAKE2B c601e3c6de94a21569e7ca8def5e798484e8a1f945
 DIST libbpf-0.20190311.tar.gz 110782 BLAKE2B b660b2677abd3068aa37f390e817c755ee06cf683e357cad6a9537d8e509d53f24ac66e472148f5b66cbcdca7849db10fc34ff8e6f85bd54a0570a52846ff933 SHA512 dbac8efce3b4c6d4faf40b22de6f71bee630fc8b71aa96e13692ffff0474ed7aa5f66a3c1f5871ec1c27dc71b87bec3ce5138096590fb9238d4d696a722f358d
 DIST libbpf-0.20190404.tar.gz 115495 BLAKE2B a159d75163cee051e7784c20018020e650d88e3b011928b1a748199f88b22de713000d3557d083cbbfc3450b6ded9b891d0afb487611044cf2af93fd5691ff8c SHA512 724fe12c9a028a9b6d5a05ee679a3c7f687a32f403bbee3c90730005dac20e0a5e9e6c21df02780d329a88acf4ec525411e448f537b49ce2767de8eae6012661
 EBUILD libbpf-0.20190311.ebuild 1505 BLAKE2B 18e4884b9b82382eb00535941150a09d34ea2c0d7dca8119336f4149cab42eb0dc2cad35dadc8cf93090febde32d966e5392fef9644fc80e76ec79d7e9554f28 SHA512 4b68c327b79792445a8f4c11d8422a07b04394bb1a99d9b822f758aa4e26e39b558b2492ff0f6b9ba2c73dbbdf938fb33d1beccb99c5d82f994c7a6502df0507
-EBUILD libbpf-0.20190404.ebuild 1495 BLAKE2B 5ca8a9a8ec7830d60db8b3fa1f6870fb9d70f335bb226b2fbdee0fe424b6879c5e062d82931c0b19576152f613baee25e016d9762fae48e97599d587f7be4a45 SHA512 7394a76b1e54ba01bcc743e933a2920bba9347babdcdfe76e8a3d80250e2cb859feaa797ca5e81f4ec9efb7d79bec63d26edf685bc184c6aba28c84e7e85f690
+EBUILD libbpf-0.20190404.ebuild 1502 BLAKE2B d71499b6f3621ef6e6c355336869937fde76c8b43b06b731064b29976173eb80ff0efd3a144ed1b861e01668d5c19b8923eed5878bfca9f5d85a05eb3c1dc6ff SHA512 84cee7bf1a93d32d5aa78a55bf85b6abe74e446b59c73c77b5cd8871b10f84a3e08589c8bc50528220b42665e7c2f48ebf068ad387848a2ec32c7ceb1d1ca4ed
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.20190404.ebuild b/dev-libs/libbpf/libbpf-0.20190404.ebuild
index 2ffb199b195b..e26002cb967f 100644
--- a/dev-libs/libbpf/libbpf-0.20190404.ebuild
+++ b/dev-libs/libbpf/libbpf-0.20190404.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2 LGPL-2.1 BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="static-libs"
 
 COMMON_DEPEND="virtual/libelf
diff --git a/dev-libs/libcaldav/Manifest b/dev-libs/libcaldav/Manifest
index 6f3202bf91f1..e57cfd660b44 100644
--- a/dev-libs/libcaldav/Manifest
+++ b/dev-libs/libcaldav/Manifest
@@ -1,4 +1,3 @@
 DIST libcaldav-0.6.2.tar.gz 513852 BLAKE2B a8916bec69cd23ad9b7194a55222e7defe8bed7ba005cf3ecde186b843c68089bb0ad34f10d161ad8f3d11fdbfca9fb4e599188cbb65e80e430f2646871b8599 SHA512 a6d9c70f0cb7699644504e88934f7942b0840e81e89304ada50200d778e51e95dca08d0a0748636455295a03535a52559a07f58a15dd5ef1d4520dd3b0fc1aba
 EBUILD libcaldav-0.6.2-r1.ebuild 562 BLAKE2B a5407cffc101400fbad13f22472cfae89f45b36352a0def26977fa7916a73d23a2c4798b606ce9d480cec9a9efda79fccff8b2fb219939082b1702a3121e4f5f SHA512 8ea08cb0c7b6db9adf1357dd038ac1d6a4d61990f46ef870861c5abcf8f0db0171bf333a4ece37642ab6e954267bb5b0fabc3f86b413964d90ac9d065aca3a69
-EBUILD libcaldav-0.6.2.ebuild 576 BLAKE2B 94fec557a5973adb52ea50851823b6c4c2eff493e07f83b39f921cf2056b40556ba48b6504e9df5313e5a7140db1e0e06dcd556be15a5aaeb73dcaa3640d2c15 SHA512 9abe86aa121ad3f842c19921735564a100f5501a14ce51630311d232b5370b81e8e0326f4eab1995206d023e1770ccfcba7d82d9bd925a2a83c98a76deafd271
 MISC metadata.xml 246 BLAKE2B 023099f8ff9f7e2013c6a2cf92a1fb7f53e230affe07573b212f09d5a5b42012ef2cc7e91beadd8f29f410e92ff4b3206ea11ffa6737b1a30529692e01c5621d SHA512 021025439c733ffdc43f0714b191e86090b768b1c0913d71019fa8e7973d3dbfb79cd82c66a7e0a6870e7a04a8bf042f6d94a2fe1d48f7d32fb7f96f25aedce2
diff --git a/dev-libs/libcaldav/libcaldav-0.6.2.ebuild b/dev-libs/libcaldav/libcaldav-0.6.2.ebuild
deleted file mode 100644
index bac33cb7be75..000000000000
--- a/dev-libs/libcaldav/libcaldav-0.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="C library implementing client support for CalDAV"
-HOMEPAGE="http://libcaldav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libcaldav/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/glib
-	net-misc/curl[ssl,gnutls(+),curl_ssl_gnutls(+)]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-	)
-"
-
-src_configure() {
-	econf $(use_enable doc)
-}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 7718466eadbd..fef090309896 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,5 +1,3 @@
-DIST libclc-0.2.0_pre20180915.tar.gz 170385 BLAKE2B 43a90347936be5ad383fe4e4b06523aac455596d6cb1fc58038811ea19b4f6ab2091ffc345e68ff2ad7f7f1615713085000711b31b9d1ad3911a85bc0db93d5b SHA512 5b8e68f7683d72390d8f9c263e15a54b4b4613b73eff2bf3881d7a35d6480468693a62dcaed159fd8421ae80768d6aaebcd6c33163b082c0a2cf15581d37dcab
 DIST libclc-0.2.0_pre20190313.tar.gz 176803 BLAKE2B c9ecd5053685c2de89d92ae4e9cc9e9f8bee24ca05e5ddca6fffd0b45356b7d4a96b54d9bebf316624e0a49594a33ebb156ae6c4b963093bdc6c1067548b2bd0 SHA512 22813bcd76e77c018acbdf2a3d3d300c2996e169c17729726ae8a93c39f85033cfa1f6d43907a7c026451bcdfcce6fbdc64a202961492aa951ef1b818c3f9335
-EBUILD libclc-0.2.0_pre20180915.ebuild 1919 BLAKE2B 46b75b65909ecebed20e357e44929b861cf54a9838dfd05a33cb85f30794e4e92393c4b2cc86ed4113254c31aadea22c7bf0cc8e0375db77a99f8ac0979fcf34 SHA512 c0df7667b61caaff6cb607873fd691739bd3999e82862323d7c9144b076cb95583efd5f3ef4f744b7f26d5bc6f93e99498786f5cbb60bb682b6ed4993bbe664b
 EBUILD libclc-0.2.0_pre20190313.ebuild 1934 BLAKE2B 07b17d62e8e3b11a3a117bf874d5bcf91428b7865fa9893b557c39868fb202b406c1ad61c086af6c32d8d43e912f56ae678bf18256ffa9f9253be89c92fae642 SHA512 b8b1728446ce23bebfd88f559fa6dee45a31460ebe8d992039f4c0dc092ac63b29437de121e96df3413f71c8dd28c61891ef926574be887455ae6fe8a4fec759
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20180915.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20180915.ebuild
deleted file mode 100644
index fb844443dd38..000000000000
--- a/dev-libs/libclc/libclc-0.2.0_pre20180915.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-
-EGIT_REPO_URI="https://llvm.org/git/${PN}.git
-	https://github.com/llvm-mirror/${PN}.git"
-EGIT_COMMIT="dabae5a2afb78cba0320a86e3f5f0b5dc83e077c"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-else
-	GIT_ECLASS=""
-	S="${WORKDIR}/libclc-${EGIT_COMMIT}"
-fi
-
-inherit llvm prefix python-any-r1 toolchain-funcs ${GIT_ECLASS}
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="http://libclc.llvm.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://github.com/llvm-mirror/libclc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-		${SRC_PATCHES}"
-fi
-
-LICENSE="|| ( MIT BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-IUSE="${IUSE_VIDEO_CARDS}"
-REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
-
-DEPEND="
-	|| (
-		sys-devel/clang:7
-		sys-devel/clang:6
-		sys-devel/clang:5
-		sys-devel/clang:4
-		>=sys-devel/clang-3.9:0
-	)
-	${PYTHON_DEPS}"
-
-LLVM_MAX_SLOT=7
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify configure.py
-	fi
-}
-
-pkg_setup() {
-	# we do not need llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use video_cards_nvidia && libclc_targets+=("nvptx--" "nvptx64--" "nvptx--nvidiacl" "nvptx64--nvidiacl")
-	use video_cards_r600 && libclc_targets+=("r600--")
-	use video_cards_radeonsi && libclc_targets+=("amdgcn--" "amdgcn-mesa-mesa3d" "amdgcn--amdhsa")
-
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	./configure.py \
-		--with-cxx-compiler="$(tc-getCXX)" \
-		--with-llvm-config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
-		--prefix="${EPREFIX}/usr" "${libclc_targets[@]}" || die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 57f7849a9be2..55e32ac95918 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -3,5 +3,5 @@ AUX 0.6.12-CVE-2017-7961.patch 1437 BLAKE2B 8678147cc24ff674b067691a3eeae42a5731
 DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081ca8b0787db577062e36487d23cd99b384ca3269421d26aff9825725b262fd6a3e48be73448fe984548ab3eb080b SHA512 af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6
 DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
 EBUILD libcroco-0.6.12-r1.ebuild 1442 BLAKE2B 9f5c7428459553d93c099cb6ed0c1f6b3e0fe0bdeafec490f0e709f08f50045761748639b4b9df2e58fd4ad78e8bf2e30152b5654b2cc277d3467639b4f556ec SHA512 c25781b12bcc99c38e4a55e4dc03b8c27171e60b84c8095313c3b705446e2c02cdabc0d7206bf0aa459296dfc687f3c7b573513a4cbde71b5f9df088c8cd4846
-EBUILD libcroco-0.6.13.ebuild 1351 BLAKE2B 9ec7c78a33dfbd4b0ec31fe4156485fadeaf94b6c22896a96c26848830b6de9155d011ac4b8fdf1bf27c7f3a8854870e30bf700be32726f31e1db9e7f4e9b9d0 SHA512 2f0caa7d03c36b1c2eadb45e33ea006c4fc5842f2aeebcc09f986fb017cceb9f0af778a942cf0da97ed9aa73710caf0878a3fb689255472c0ff6472f7146ad94
+EBUILD libcroco-0.6.13.ebuild 1350 BLAKE2B bd0e2a92a24fe8732b85e31ba362ad6485c3e51d4c0032269c800de9fe23b8b4a0e32799c0cfad378c1ed71169ab3ada2ab9248f9f25550764272eca35a2d112 SHA512 f3cca1321fe2768004f28cff88a62946e1b36dab65e5e9584b6b8aff855e80b2114782a067bcbf20f5f0cadf87dda191032c35a792074235113085273768de53
 MISC metadata.xml 597 BLAKE2B 93f85899d5ecfde37206061e57a03b1eaa181d9e2c105999621da011bbed2b11efaae603c2dbba0b405917653adc75cf849e92682e798e9514984e5577fee90f SHA512 9161b1cf0d796d0aeb681374b278be7938bc551316d6d7fc4fc1e19bfff4477f6b12bf606df0eb17c57e08ecb257f358f579a232ce6dbd6cc2f838aee4e2b9bf
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index 7681819641bf..8c2bf5067848 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index df52d9c9e399..923c56184f23 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,5 +1,5 @@
 AUX libdbusmenu-qt-0.9.3_pre20160218-cmake.patch 7959 BLAKE2B feef71cd51c36607b60104d0ca24eadd269e79ad22a633625b1b855137f97b8da645e15b10a374911bb5e9ea33b71e17d9336211233f4f12155f3dfc5f28b685 SHA512 00db7fd1c5d90f03f0963abb413349043ef215cd7a9f41f78e4233ff53590a9b9854ad500b9899f7b344ce9853d8d8200abb31565fda855793e1edd6e76800c0
 DIST libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz 46438 BLAKE2B 66b1fa44f28b5f4d5fa09afa988ca793ae892a7aeab6290b1650876a992e27a15af5a6a999080aa4c499295e2fa3de768fe5f185b5df2af36b957766508c1804 SHA512 dfaba59cedd320e6a3b5a9c0a5e13fb9e0952224e39cdd6ee3b32b03d95ac850a533e2a73835a7c0ead93b2283b9c235472bacb84e3d761ebe9e9398345314a9
-EBUILD libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild 1256 BLAKE2B dc7097ea4dbbb176a5b23aa4785f4b2c6a9afa759ab05fd751d2c37f170a54e772ea1ab61f429f1495a2ab0e39f04ade2375d45670f6a98029f3070dcdaf1e80 SHA512 f3e6d70dfe14ffd3f5188c60bd224a1b3614353181b878e034374a55c38adbf294b60ad8b0376ed12784628c978b395255925157967be7bd7779a68b1a45ec3e
+EBUILD libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild 1252 BLAKE2B 3d9a6de479e080efc8edcb71f4924d809aafc594acf26783a36109ef0520e2b1b715205a386e3ec346b9cec6217c644d2f5f67b45edb5a6f70cae99db20b651b SHA512 e3f51b2c361eef3658ac1ebebc65e3179b2498b024aa6beef7f881be5c70cf6a4668bbb550d44d0f6a3a9aadff4487f33c5bee772b86141c43592b41ea31f47f
 EBUILD libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild 826 BLAKE2B 8a6322d0553d41cd185962c00c895e93f108dba609eba9bfbd3eeb235482ea80715ed3fe1fdee23baf34bda86bd3c96bed497bb8bad54caf5102fcb85eb60e4b SHA512 4b51ccc17e42e9ff0f56b1fbb2e9fd37cfe3bb0c76df4f7ea20744efa3a653fdd06e02291cf80937fa77972bbec04adeb6df1cf38d2e9b530b3141477a9085da
 MISC metadata.xml 323 BLAKE2B 02dce303163a2303c73bb15ae09358e93077a751333d7204c2372ed7cf7667137ea4d633250b39ee5ee032316433cddedca5b80ec01ff8300d8ac221793bddbe SHA512 290f7befe52993609acc464791369b56b20c1584e4266166073d504dd0ea66a2e2f6f786fcc56e1928125b37dd3f7461ab29b00e17e012ef2ea6c34321f643ba
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
index 32db4c0a9192..94932495e000 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
 if [[ ${PV} != 9999* ]] ; then
 	MY_PV=${PV/_pre/+16.04.}
 	SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2"
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 601d14dfc1c8..eb0922f5404a 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -4,6 +4,6 @@ DIST libebml-1.3.6.tar.xz 57764 BLAKE2B 554f9d4d162d02ba05e2b1eecd688a6c25a4c727
 DIST libebml-1.3.7.tar.xz 69460 BLAKE2B 53cb7ab3c553cc533b025bdf1953c1de33108e506900e8df0ecafa5f88bc43b0a54611c69bd169401ddea162a1e669bde0e93dc38255b8ea24d04dd41fae9599 SHA512 ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1
 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 626 BLAKE2B 3cfdb8b9660b70697007c66ebc7864155db2c893e9a93742352bdee482e61118ee951fd0c38d12bcc6113f1232c6422930c8679507c261d066f1960e3ecb337a SHA512 763f59c043e232c7ecda4bcb21618a75f895ce18ddf6858e772a7fa7b5f4d7f03369c266b55726937f9e06322271eb2ca5b214e8bf9fef60a74f72e8ea554215
+EBUILD libebml-1.3.6.ebuild 625 BLAKE2B e55976f6a05f7bd2633d38dbaab9b959a282e24bbf3ff8c8820406bf0b26da99574ce48fe0f67967e26db49e1fbc9b9fd7e93ea392a6afca03aeecbec4ae0d22 SHA512 6826cedc2ff765cfb5ec03f001dfdb17947791dac98a994333446c8b8beb3ff393ecc93fc11b3f7afde74ac092648a4df3a0feeba5207e81f6835f38ac6804e2
 EBUILD libebml-1.3.7.ebuild 635 BLAKE2B 5805ef9b68f9391dd868c94a44d2841283d61488e74a44ca0676d6f6fcf9f04a975cdda45f31c22cfdc428b7b90bc2ef904dee8f2a504afe9f3fee4cbe26a7c3 SHA512 7dc35d4f04ae4b0b9920bc86d765642896559352278ed5e14a3290bfb935f89297498e6a2822a7026325f4b87463aec64cfa04970ded60893dbab6e0d3dd3f77
 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
index 18a43c86b94e..77792f6ff04d 100644
--- a/dev-libs/libebml/libebml-1.3.6.ebuild
+++ b/dev-libs/libebml/libebml-1.3.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_configure() {
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 9d65f752b710..1410370bd646 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,5 +1,7 @@
+DIST libevent-2.1.10.tar.gz 1074897 BLAKE2B 15c86f9d82a54912dc8ebde54192e77dc105a9b7fab215a3ba0b85de31e9caccef8aa02ace0172e22ee394cff0e7b5a4e8ff2a8c5c3e472378630f66b1c0d33b SHA512 2a449b60c5bba0908f693d3169a2941f0952b462ea18cf3c7a7288cd902592f35a42c76096af502f04259ffce2567233fda3586578c2ac53fbfce6e00d35c086
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
 DIST libevent-2.1.9_beta.tar.gz 1067050 BLAKE2B d59f424995742e6a57df74420d91c8a1614d7dbb6e3928a3dd666269f7c2f4876d6fedd649e4e947a6db63c15f69c18866bda9997c3bb3571452a8dbf126916a SHA512 672bff332292ec76503bc0ccb9462058e093f1867740fece51f77bb666c77c85e10271730b32b36d6faa9ab2ccee0433879457e201bf94b6bf704dba2c066051
+EBUILD libevent-2.1.10.ebuild 1679 BLAKE2B 6fc0538071b7ed07bfd223f25297b33059c3003cdc06e9ab46f6cd7a0725fecb809888be078c3f0dec80b12ea786b49aac9945a18e65f443f1ca4f4ca8bb3783 SHA512 c7ea1349503ec810f61cb3c6569ed34763bdbef0c4ccbf2959cf1faadbf9e2033a97161802742e287e1d7c6f9e2f924647919e66c37474dabf8ad2d027a25c77
 EBUILD libevent-2.1.8-r1.ebuild 1723 BLAKE2B 07f20b57d7ae3fa923149fde4f47dc299ac5f638fd784f7fb67d2fd1f500875d462a98cd6f23050b223e562c2b3b326e99162c9e21fa4aa596f1d4b368d2d82c SHA512 042d0843a134418417fa521a86316fd4001c23615c9b6b36990da1222175bff8e750e3c6d28dc403201e1cb157acbf74e6019ca5dec01e11fd726a3f0c22a373
 EBUILD libevent-2.1.8.ebuild 1705 BLAKE2B d483a5f882b40db3891d48f3e7de7f7b4916c45711e60e83d92249988f6afdece6808c71a7212680548d45f58ed3163cad4bcdbb2ad67d2a8a62df5ea66658ca SHA512 b44f94eb5db73acad177149232465f1dd11eb2bd37fb3680e4ef050ef5429d49080f978046e9a8af7aa203fa0504580f24dae9d51ed7b624e6a6aeca1bde1f3f
 EBUILD libevent-2.1.9999.ebuild 1304 BLAKE2B ca5125cb04834e449294880d988eee53abbb0818c46d46aead9feba8ba5fc92b0bd88c47906e40322b47104b9f964f6ab4dfb03b71fb7249d19e0fa9353aa4a3 SHA512 e39b9eb34693d1fd59c1ffbad2e784c3fb0ee752378c00c0c884837134d03fa8018af27a436a5b95b103f1b109e05a81f629eb06eb51f15719f21e5129907b38
diff --git a/dev-libs/libevent/libevent-2.1.10.ebuild b/dev-libs/libevent/libevent-2.1.10.ebuild
new file mode 100644
index 000000000000..d8985a9c4837
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.1.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="http://libevent.org/ https://github.com/libevent/libevent/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/releases/download/release-${PV/_/-}-stable/${P/_/-}-stable.tar.gz -> ${P}.tar.gz
+"
+LICENSE="BSD"
+
+SLOT="0/2.1-6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug libressl +ssl static-libs test +threads"
+
+DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="
+	${DEPEND}
+	!<=dev-libs/9libs-1.0
+"
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/event2/event-config.h
+)
+S=${WORKDIR}/${P/_/-}-stable
+
+multilib_src_configure() {
+	# fix out-of-source builds
+	mkdir -p test || die
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-samples \
+		$(use_enable debug debug-mode) \
+		$(use_enable debug malloc-replacement) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_enable test libevent-regress) \
+		$(use_enable threads thread-support)
+}
+
+src_test() {
+	# The test suite doesn't quite work (see bug #406801 for the latest
+	# installment in a riveting series of reports).
+	:
+	# emake -C test check | tee "${T}"/tests
+}
+
+DOCS=( ChangeLog{,-1.4,-2.0} )
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 042d8bc1b649..3c3e332a8082 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -2,5 +2,5 @@ AUX libgdata-0.17.8-disable-demos.patch 1941 BLAKE2B e8c3b0b558d3c446f3e383268b7
 DIST libgdata-0.17.8.tar.xz 1464812 BLAKE2B 787b5d6e4a62e70f76ca4080fb5c3ff1e7d68745f388be646dd980ef8be18275997bca46a1f3639c9457c8310f9c3f4cd34892be88db284a9ee5e5f43e9723fa SHA512 dfc4c825a7053a6fd7659d04c7077bed8539b4cf3ef3da1d5ece4da3ce17941900e960a300a50b284010ed890dcab87e4c4726403f04481c672832fd34b975b0
 DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
 EBUILD libgdata-0.17.8.ebuild 1641 BLAKE2B 8bab41b7e782b93b1c0be447f60aea096d9b18284c4e684034cf7475be39db2751f34c9c80791396c39a95ce3df16da72573bc979c18ee21793306a1f1c5cb6d SHA512 7bce4dfccc02a77a70f0d1ecd8e1c6d121016004138917fa5505aa2cdc33205e5665c367aee3b3b45ee7524ffe041c8f3a561e8c11e835d213fd01f2a2910b6e
-EBUILD libgdata-0.17.9-r1.ebuild 1725 BLAKE2B 2970ed7bc2a1f2a4f4c2ceb1024a8b7a53fb53aff7e92654f451f2718692d5060376738a9e2d7d7402769432100523282a27da34f2757bacda4bee0aee7e516b SHA512 5f3a09447b175cb31e23f9334c9e117b884782d5b0a1bf42043bb314205528dbbe1512a65281ff717224e36cde008240524aa671582159743a9982c42e11077f
+EBUILD libgdata-0.17.9-r1.ebuild 1724 BLAKE2B acff62b19b2ae1a914eb25407c341ec68b7c508b83ef7379738da389f89f3559216c39f14bd4c457b2e5bdb1bb79d8b2f694b236907fac5c47d8688c5c6e4679 SHA512 5d4efa0f573bcf7b770720345111fa610d0029fc92866ac98c74bd40caec81a8aa17134d198933f9297769bb0b5e755ee67f48b9b628394b377fcf41d7b79e79
 MISC metadata.xml 362 BLAKE2B f10a4dba3d98334e8c3092595559b1a0e9036388c3d9b72a53fd1dda5935721198ef7c751efd2179701c4805b6116b3f61965fb5037fe63ef9bccfcb8b37bdfb SHA512 00513b8910b0cf0f0c42b1723c8e22a93c95a702ba3ba9f139ba8e2a25a6c408f1e8f97302ee300189ea534717b1f7d21a909cab0ebf6ba8d6cd19d38df2f30d
diff --git a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
index b6640ef1664b..9ba514674752 100644
--- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 "
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 28ff4abe1512..6df903799519 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -3,7 +3,7 @@ DIST libgit2-glib-0.26.4.tar.xz 138492 BLAKE2B 725c14076fb940186faac079cff1ea87c
 DIST libgit2-glib-0.27.8.tar.xz 137796 BLAKE2B 4dc6d9b435a662acb3fb51bd7349b9c273bad68073ca05d1c27fa59148a39549036e5e8786ef502e1c5758596bf58a80c7153837c6a5956c764d69d71b860531 SHA512 abeb530971edcdc3e813d34ebffbb5d2edfdea527372976e6495f9370a4a7f63c7f34e61bdec02a602a8b5e687960e33f77dc6cbc8f3b65accee7c195b03b593
 DIST libgit2-glib-0.28.0.1.tar.xz 138928 BLAKE2B 708523bb5a723f59e51501675c046da072bcdf18b3ded94920ce9eb181854780d6b44759531c8e949199a889578515994299facd14d10a07958019f6af0b6aba SHA512 6ae88bb56052461a9531016140edbd8517db8d5c0e5c217b4e8918ffef70b92652e4a95493c4290112068d0b793bff2b894f136b79929924fb7347926e3a8f51
 EBUILD libgit2-glib-0.26.2.ebuild 1297 BLAKE2B 9cae857d1b8eac43814de33f157d257fdc88e7f7bc7ee68a5634904cedc03692db12b7b2c91f48cff91cf84585e9b2ff3a5d8e6525ba080e679924ce26ab5ad0 SHA512 2c4edfe78cdfd7c7a0505c465dfe4011059095d24e0ea152ce7366b86a194bf11c2b761007eae492afb15e288b6726b89b713d0108f8cfacd103e01ee4d810ea
-EBUILD libgit2-glib-0.26.4.ebuild 1322 BLAKE2B 9e2e100561fb42e6ac64ddcece2b694f64169ee9dd455c985a2b948bec77fac3d9ad400d1093545a201bc8f4c7b98aa1dc90a0971ea6fbfeb9314f155790a631 SHA512 06831fd60154a5c14aab34a9280a6dc1e20de1dafa2aaacb39609bdcfff554a89fae3c498075bbff35d0a9298ff448d6089a6f0f9bea7a2ff19aefed1385dae0
+EBUILD libgit2-glib-0.26.4.ebuild 1321 BLAKE2B 3f9bb5fa640ea2cdaa2ce6034eec6a45e1e78b0ec83b8232b8f833bd554bdd659a0439c7ad3613253ef4d0f0687f40ae6be3a9c90e4d2923598fb7f9729f9f75 SHA512 d4e465ed497daa0a47077a07ff01ff7065cc1f0ba48d8660a7fbb97d6e983fdc9c0d2a19dc5acdb5f7ac382cff7d9fa8527fc62f9e0be116e7b6681a6ea30ec4
 EBUILD libgit2-glib-0.27.8-r1.ebuild 1262 BLAKE2B c4698febceb4823b5c67ade03fce33425c82cc0ae1283b3beebf352b7beb5b0962f7b17db4722f6aef2ecd82a69e833b411cdf1c65a4dc3a0227675777c1ae92 SHA512 9858b1c3edcd9b36f5e091aacf6ee5cf32640c4380821bd4dced070e8424b17c642d34d2d9f70d50ffe05ab8050ef4e633b648ba0a231cc8127f42c2f3fb39c0
 EBUILD libgit2-glib-0.28.0.1.ebuild 1262 BLAKE2B c4698febceb4823b5c67ade03fce33425c82cc0ae1283b3beebf352b7beb5b0962f7b17db4722f6aef2ecd82a69e833b411cdf1c65a4dc3a0227675777c1ae92 SHA512 9858b1c3edcd9b36f5e091aacf6ee5cf32640c4380821bd4dced070e8424b17c642d34d2d9f70d50ffe05ab8050ef4e633b648ba0a231cc8127f42c2f3fb39c0
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
index 21f9ff2f08b6..d26630c95978 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="python +ssh +vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 21b75c5f5104..0429e828a8b7 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -2,8 +2,10 @@ AUX libgit2-0.26.8-disable-oom-tests-on-32bit.patch 1775 BLAKE2B 4c3df3edfa76a57
 DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e
 DIST libgit2-0.27.8.tar.gz 4783928 BLAKE2B 0f0f79a43de3e869d593dafc1b506ee0894143d2daedf2fe56683ad8f2edfd7d87bab784354b9fb1796fa8e08a36b9de88af65c7621a90d537cb585c89118197 SHA512 53ab69a0687afd315029fdbe0ce8192b7e88f7f1ff6bc9c4875718e638cecd64755a9942ad605e6c388c58c6b892b351d54c5405de8e0d5ba90406055a25ffaa
 DIST libgit2-0.28.1.tar.gz 4987204 BLAKE2B bb4f32b0b78a9faed3e5204f40cbda15d032719dfd581948cf175bc17a30356f97f20545e1f64ff6f3cd1dc4ff483af99edb29d7a10c56349ce74976c186886b SHA512 5a1bc5c6af6ad25cb8b2c446e75a774d2a615d4999ec3223d681c7b120d83e7cecd94f1ca549bac0802f5324e27e73cc5a6483ad410636c2f06f098b30b1b647
-EBUILD libgit2-0.26.8.ebuild 2051 BLAKE2B 4859872a3feb9ca22bd344e39470c0f6b44fcf08e93ed7cc63a39c5ed02640c1e2dbac66c1eda916fd450830e504e8040ee41d43c4a85d293fb71641232febbb SHA512 675efffc1836dfa802ffeac98a218c2e0e4e0afc5d0e5974883cbc616f9e56a07d90a0ee26f838048663627d6d96dd7ff9da97138895681c17b1d93a6c8b9cec
+DIST libgit2-0.28.2.tar.gz 4987586 BLAKE2B cf791adb173050b4b153062ff5fdc923289462677ce34af1077d228a95c4d9d7e9b836aee44dc79f079f42c910c4b4548241ec7ff16665ce49e319ccd38d4c7a SHA512 0879c162e2e1dc00eadfbda22cd1f9d3a95b4ec2b653c108983f37c2f695140882de4d50d7cbc04ced247125a4e9fe6df16130e1267891aecdb2411d920db5c6
+EBUILD libgit2-0.26.8.ebuild 2050 BLAKE2B 29ba7bdeb65ca0d274b97240ca81c732e8f5505b64856d61124a8726791ae6c4bfe1fdba88c62dec9a35a4f9ac0d43df3884f978814e7bab9ce1f8a573f7c1ad SHA512 ce1746610579ddb076cd7d8c4f97596142bc73e9d454f7188962a940693dba7e0f8814a551b9512502c0c1ece2d1392e963747208a3bcaa5f1af6d9d376f1a0a
 EBUILD libgit2-0.27.8.ebuild 2053 BLAKE2B 177c2d0f6514cff1b124755061c8be28c01deb4af54283ee56c79057428b36a61fff1a09deae180cef474701803fc8292671cc77537cc8659bb27c89e0cad0a0 SHA512 519816e85e64f933a15ea076dd92f6460225c962b556c379ac4830802920c4e1dcfcff39d7ce6fd3fd12302ef29cf92b0f2572e779934032d61a4a7f0df67658
 EBUILD libgit2-0.28.1.ebuild 1687 BLAKE2B 125a6d27dd61f165f6e5f6c94f1e46944cea35192944088b4b67bb7eb5afc3f9f52d5587ea16599c61424bde6d4cf8a7f1deefd969e59e20cb8ae06aa41f711b SHA512 b2862ca2cde1fb26962f72978a929dec46a098c87bea5560931b769177ab47704fb156ae5969a149f48f377612f3f806a93f1f3f71b6943f52aa16b7a08e65e9
+EBUILD libgit2-0.28.2.ebuild 1687 BLAKE2B 1776bfc14b35eb1593e6d9159f58c3c9ccdac6c25419e1d57028ef6ef832fc638fd8782e5fdf46b9e65f4caaa744660f2b87c73ae421c4db3924514c476068d0 SHA512 46079c16b630c677bd97592bfe3244c1d6943178da84ea9d862c1e58552b8267f0185102fbca573d831de67098027ffb95ba82e4f944a42d6391ecdca4031da2
 EBUILD libgit2-9999.ebuild 1664 BLAKE2B ca592e3b60a50ee0ad16da964b1e9df3095e235d78aeec683582b38fd2b70395311778e453e59bbee913c2976e341f5bc947487ed58defc60d78ca63307ebd18 SHA512 ca41454b876cc379a6aac038b00ab48e01cd2fc728ba79e9164e144a1cd5b2fa7f563b9243d0af4c8d7f1538baece44cff31db260b137f265bee8ebc35050aca
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.26.8.ebuild b/dev-libs/libgit2/libgit2-0.26.8.ebuild
index 89674ff077fc..715f0172be33 100644
--- a/dev-libs/libgit2/libgit2-0.26.8.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgit2/libgit2-0.28.2.ebuild b/dev-libs/libgit2/libgit2-0.28.2.ebuild
new file mode 100644
index 000000000000..89a49f8ac99d
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.28.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils python-any-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/28"
+IUSE="examples gssapi libressl +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P/_/-}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake-utils_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 0486e8352b37..4e61a0f0b6cd 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,5 +1,9 @@
-AUX libical-3.0.1-pkgconfig-libdir.patch 1228 BLAKE2B 34bae335d1889d0090d02b72a61ea5fc90940210cccb2d09e3ef6a01464579f2fb6bf83b6e9dbcd35950227f0f1c830bbc0b77d1fe3eaa42fd649edfef4f3181 SHA512 556e3deadef8bbb210dbd3bf918aa9cbe0f8a1cfbbf8ecbeeff36a74f134cdebabad96f6ad05f6a1e2afcde669bb145bbea6ab83efa6f7b90b4637f7f761fa49
+AUX libical-3.0.4-pkgconfig-libdir.patch 940 BLAKE2B 2b7748bdaba3ae14a83305aba4a2620a6cd85d679b736b5ad9890104f5ac1042cc39b50506f1239ff35d9f98408f4feee1a384943b855c83fb4519785bf19a48 SHA512 492def0e87c6abc9c7c3e4a69133b54bd4c5a05ba42be554bf3ebe170d846b6d5ec5d1cbfabb9289b5ea82693e1b2af60a2cfe07ea5c36da5ba335e29df9a1f5
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
+AUX libical-3.0.5-fix-lots-of-params.patch 898 BLAKE2B b0fd85229bde64bba92ee93171766e3e6d99748c873cbbf2e213c8196555db06a82b113d75c7512eb8f75e3beadeedc5529755ed9ef593414b272fcc43eacc12 SHA512 4d5559d147a3ce51697af24c13e2eca0575f4da16bea5db3066e00fad09b6d58d16fb2401e44e9623b9db9b939d4ab115989ee1f8bad2cfe59118e2cf626ead5
+AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
 DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
-EBUILD libical-3.0.4.ebuild 2040 BLAKE2B a40362cf9984fb4a562a9b3a93280c7a9923d53cf9571e15a3937f60bea81239f4c6958e05e00a285dee81ebfcae716ffafbe3fc55cd1bd03df993e358505818 SHA512 9be3ec5d8dbd56306eeee4c74ccc04f80ceb5b56a0746d7eba88645be4b2e781ed8812b01054a4beb39a9e463dac048ecbccd68b114d0d68f7321473fc5df01e
+DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
+EBUILD libical-3.0.4.ebuild 2044 BLAKE2B 74e2578c8f33971566f608ff67695a97c935217746f9a4d4222fac1c0558803fcba89fa8e9f3107ed210aec7d89ea863e475c840bd49163c582696d798e3aa8b SHA512 8cb6f316e299b25f1477aa3191e5a541061f5d1c5e327caaab252c46a429a2c85173e36015c0f7aa787d962e0c8a55c8cbb2358d61660842574eb319aef87963
+EBUILD libical-3.0.5.ebuild 2117 BLAKE2B b1812c771a9a96e3264d83cf1006a164f997ec914c27c977f09587d21a99eae820c5bccdb0c78e79b41ad847d41d74eb429753640b2fc0f6e5983a39d01390ca SHA512 8d1f1dac9762c8065d3ea2209790cf83302a570e1da4fede045df3fc5724c685e76df52f4976d6d2260215d88f8b542e4aa8ec97e56e3499f7f12b8c38041c8f
 MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
diff --git a/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..1ef0817bce7b
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch
@@ -0,0 +1,24 @@
+From 111ee5ff9daf7db21ad0b6874c4b7cc05baf4703 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 8 Jan 2019 22:13:47 +0100
+Subject: [PATCH] Fix typo in libical-glib.pc.in
+
+Missing '$' causes compiler warnings about missing-include-dirs, due to
+the {includedir} not being properly replaced with the variable value.
+
+Signed-off-by: Allen Winter <allen.winter@kdab.com>
+---
+ src/libical-glib/libical-glib.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libical-glib/libical-glib.pc.in b/src/libical-glib/libical-glib.pc.in
+index 42f1ffe5..e164cfb5 100644
+--- a/src/libical-glib/libical-glib.pc.in
++++ b/src/libical-glib/libical-glib.pc.in
+@@ -7,5 +7,5 @@ Name: libical-glib
+ Description: A GObject interface of the libical library
+ Version: @LIBICAL_LIB_VERSION_STRING@
+ Requires: glib-2.0, gobject-2.0, libical
+-Cflags: -I{includedir}
++Cflags: -I${includedir}
+ Libs: -L${libdir} -lical-glib
diff --git a/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch b/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch
new file mode 100644
index 000000000000..187a5de0cd4b
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch
@@ -0,0 +1,24 @@
+From f02ca493123b7c8e8eaaa758d787e9e2753fd9b8 Mon Sep 17 00:00:00 2001
+From: Kent Sutherland <git@ksuther.com>
+Date: Fri, 17 May 2019 13:26:52 -0500
+Subject: [PATCH] Include invalid parameters in the maximum number of allowed
+ parameters Fixes hangs when iterating lots of invalid parameters (valid
+ parameters already have a cap from f6c64896988644a7c6d4d5060f6ab574c2a62fbf)
+ oss-fuzz issue 14809
+
+---
+ src/libical/icalparser.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libical/icalparser.c b/src/libical/icalparser.c
+index 99803418..fa71e8bd 100644
+--- a/src/libical/icalparser.c
++++ b/src/libical/icalparser.c
+@@ -1098,6 +1098,7 @@ icalcomponent *icalparser_add_line(icalparser *parser, char *line)
+ 
+                     icalmemory_free_buffer(str);
+                     str = NULL;
++                    pcount++;
+                     continue;
+                 }
+             }
diff --git a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
index aae02abc537d..a3a80e9f76f5 100644
--- a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch
+++ b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
@@ -38,7 +38,7 @@ Fix pkgconfig libdir paths.
 @@ -8,4 +8,4 @@
  Version: @LIBICAL_LIB_VERSION_STRING@
  Requires: glib-2.0, gobject-2.0, libical
- Cflags: -I{includedir}
+ Cflags: -I${includedir}
 -Libs: -L${libdir} -lical-glib
 +Libs: -lical-glib
  
diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
index 2dbe0b25537d..3e1efabd39b7 100644
--- a/dev-libs/libical/libical-3.0.4.ebuild
+++ b/dev-libs/libical/libical-3.0.4.ebuild
@@ -41,8 +41,8 @@ DOCS=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch"
-	"${FILESDIR}/${P}-tests.patch"
+	"${FILESDIR}"/${PN}-3.0.{4,5}-pkgconfig-libdir.patch
+	"${FILESDIR}"/${P}-tests.patch
 )
 
 pkg_setup() {
diff --git a/dev-libs/libical/libical-3.0.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild
new file mode 100644
index 000000000000..5503824d60d6
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="berkdb doc examples static-libs test"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( ${PYTHON_DEPS} )
+"
+# TODO: disabled until useful
+# 	glib? (
+# 		dev-libs/glib:2
+# 		dev-libs/libxml2:2
+# 	)
+# 	introspection? ( dev-libs/gobject-introspection:= )
+DEPEND="
+	dev-libs/icu:=
+	berkdb? ( sys-libs/db:= )
+"
+RDEPEND="${DEPEND}
+	sys-libs/timezone-data
+"
+
+DOCS=(
+	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-tests.patch"
+	"${FILESDIR}/${P}-pkgconfig-libdir.patch"
+	"${FILESDIR}/${P}-fix-lots-of-params.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use examples || cmake_comment_add_subdirectory examples
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICAL_GLIB=OFF
+		-DICAL_GLIB_VAPI=OFF
+		-DGOBJECT_INTROSPECTION=OFF
+		$(cmake-utils_use_find_package berkdb BDB)
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DSHARED_ONLY=$(usex !static-libs)
+	)
+# 	TODO: disabled until useful
+# 		-DICAL_GLIB=$(usex glib)
+# 		-DGOBJECT_INTROSPECTION=$(usex introspection)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile docs
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+	cmake-utils_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libidmef/Manifest b/dev-libs/libidmef/Manifest
index 320c24a84e44..820cea67466c 100644
--- a/dev-libs/libidmef/Manifest
+++ b/dev-libs/libidmef/Manifest
@@ -1,4 +1,3 @@
 DIST libidmef-1.0.3.tar.gz 1321584 BLAKE2B e2fc6e542e96e4d00aafaea7e0817937adc33c4a0c5f824b58f8db683e9020434778fb993ea70c1548f7bae61e6c85d280eb4cd2e83ac7a25c8e6da1129da8dd SHA512 5f21c50efffc52b8008c979b95fcedd2add7e4355643626043880105f96b4086cd9cda3c9532ddd6745f6236e2edf15a20324bdfb932e63cdcf23c8104b03dc5
 EBUILD libidmef-1.0.3-r1.ebuild 509 BLAKE2B 50ebcf5876c6804a35ca1b6c2075cba09db3e1b6f842750d13b43d805814c24203d341de6a117692f68d35725b1409cf92fc43a06c7277038aa6f2e01fb393e2 SHA512 a3f94a84735fc35764ca6e199411f5ff8414712a6872fdccf037040350b3bbb6f863125b775ac9c39592fee37916a4dc6114539ef48f92af6930d16f605f3db4
-EBUILD libidmef-1.0.3.ebuild 577 BLAKE2B df2af93cdf5947852001ab8fb173c9cf7989e9124a9f9bcb6c3deab08b3e5ccb405af94cf8b9647955b49e80777b17a89eeb89dd68dafa8ec0baa8500e68a783 SHA512 190e241d7dfc6f4cff482d9da6c0bd90d2ede1c8c1bd65a8f05a3faa0a4f77c6dfcb67c136180ed905ff85958045d695c59c9aa3b5229110b7979bc68d946566
 MISC metadata.xml 245 BLAKE2B 4cfef53cffd85edb40ee51c0c30272e372a646b1e4639220cec2552954194f7c9da9c694810b86764ce4d944a5b5f62bfbda6cd257d7edc1f123f768f8680218 SHA512 535c6138c251977440996f4a7638ade914f83418282b233749cd37c1501225ea80469cdccba901584c05fc0a4400cf3519e6743ecf79ff91938f9718e8bd00a3
diff --git a/dev-libs/libidmef/libidmef-1.0.3.ebuild b/dev-libs/libidmef/libidmef-1.0.3.ebuild
deleted file mode 100644
index ac0b722c6241..000000000000
--- a/dev-libs/libidmef/libidmef-1.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Implementation of the IDMEF XML draft"
-HOMEPAGE="https://sourceforge.net/projects/libidmef/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
-
-DEPEND=">=dev-libs/libxml2-2.5.10"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README TODO )
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index 08aaca6aa597..92b48fe92dab 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -1,5 +1,5 @@
 AUX libindicator-ldflags-spacing.patch 298 BLAKE2B 2d0fb361e2980d429beee418d9bf8d2f786de0d2b337b6775f9457158aa30d02b4dcbccdc488fa79236f04bf766aad49df732d25f48f1ecba923c46a4e239280 SHA512 fa283a8d6b88da0e2b6f5d0711ebe8a5cc0d4ab87cb07c3cecae9974dd68be751169b89503ae66751bca6cd73df2b2a262ac55a667c5c8e00e129d51f4452c67
 DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
 EBUILD libindicator-12.10.1-r201.ebuild 1207 BLAKE2B d69e47daa9bf13333d31fdfde8f00e5dc49bb0ab8c3219ccc5e88698fdb8b12c3089fd1aa221e46452515a39bc938eb0127db19d927db57622df701d6e9730f4 SHA512 aad48d226c41fd1a282e4349a1686ffc2aa5c556a7d849ad40ebce9dcfe6fe8b2dc5d5ab60bf54d689fca4a579b3c3977bcd5bf9da2c0edc2156a540d573a355
-EBUILD libindicator-12.10.1-r301.ebuild 1182 BLAKE2B 2e189f65164fa1eaebdde14487088b0b9513a4bcf8ae7671fb506802e175589469bfdcf7e24d045d406fa98fbc42e87cf848d139fe0eef0e64f0dc2ffb5062a2 SHA512 c39f24ee8f1ed913f37d25a0ffcc92fb284a042ede3ec10e3cef84c7c18013eb0acc6e21de135956550c177e0a119cd4dc2e223f637f9f96de82d88b2492cf68
+EBUILD libindicator-12.10.1-r301.ebuild 1181 BLAKE2B 6302ce3ff7ab26163fa5720f512d07c038314ecd18686493e5823d2d11f35dd38ec9fc0523c797e2aededc1b5a83fe195af56e5981d6628513bc159d27c4baf6 SHA512 16cfaf47444b8f2121b645bcbf5624cb8f3c36eaf3c29c7937a76787f09ca6b2f9f973427b9fa78202bd51b74a3877bf9097ad274b37fe52bbcd6a191d646508
 MISC metadata.xml 247 BLAKE2B 216107f32a44b828d5bd65432dbdf2f3b71d81e96ee3580fc551392310b9ee554715698dfcba215fa2181a90f361564b6d04546c61848c3a2d176f3590602f69 SHA512 f24203e0188dd8311689fc59007368585764703b92f6fde9b4ea01666d37304193fc728a9f99b7f6c936f5a5a51a58a8402a101dc4eddc0bf2bf09f221bb0054
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index e624f40f5466..c5c2badc6db5 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index b39602909ed9..3d96ce87fd01 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,4 +1,4 @@
 DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
-EBUILD libmaxminddb-1.3.2.ebuild 558 BLAKE2B 45c955b5d811592d173a63e1de01b8e4dc2539fd5fe1ffdb3f508065ece45ee63011a0be7c858805d2d1041bee2b43cd1aa934ccb977d47f5fd5ffef595defb7 SHA512 5f036ef62451899645b197434f80254e0684b3060fdfd6d921522660713fb06e82a26f17c03620c3e2ffeee685ebb5f709dc6cd13e373d47844c0f51f112e126
+EBUILD libmaxminddb-1.3.2.ebuild 557 BLAKE2B 93ef4c923139c9e52a349637b02d6e501e268249df408505b9a5eecc733525b8733ec33d365b880e358c699ee406d363998f5fc7f09be5a121014a214bbade18 SHA512 7ebb98508508ab81ee3a25301e7285c95de607ce5602e4d93757db7b9268f05866b1a62e5efdbbfd962cf081e965dfbd2a544421d6b9f8b95edb57beb30b464c
 EBUILD libmaxminddb-99999.ebuild 534 BLAKE2B 17a96d2066900a4c310b913932bf72ccb410e13ffe150e8044bc9db80bd8af2ad82b9b5d6385b676ba5c723c0219b5001e552ce8a1c52f5529af6d949937aac9 SHA512 74e11c6417593375ae978788fc7b3790d0568229232114e5966505da839f7971ff6b77452a7649f7d430883781f39ab950f9cad4fc255fc84f1b12b8911f55a5
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
index 1deb5b3020e5..d8f75bc7ce1c 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-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="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index 1f4253d155a8..b9bffd0d334d 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
-EBUILD libmcrypt-2.5.8-r4.ebuild 987 BLAKE2B c47fe43082b47b45a1f4fd6d6a9c58cefcea0d0c2bded5d38d8addfd03d20d976607209258829c773be8f78188a1882b4d5a566b544d56e6ec399b18310bdf5f SHA512 31a2245e611d07d50f8272447f168f6f94fd1ff8af42ffcf8afcff8d9d60dedb0368fefb8a1b368ce19e828af5d24b47c1adad0df2fc2f11597be77d4990c3a4
+EBUILD libmcrypt-2.5.8-r4.ebuild 983 BLAKE2B f08b0c18ae10a344b6f470af6bcdc94afd1fac606266f5027cb41b427faca0d52cf539fc56ae79813cfa2858854050f1212fc6854274110596a938d194e7ce65 SHA512 1f289aeec9ce3a6a736dfc0c0c2a39f053c407462efb3889a2deef751531aefd5974f8819ddc0a892572d18f53eeb23f62f7017cf479937f8faa7e01710342b8
 MISC metadata.xml 326 BLAKE2B 7815b2e4462f847a84c902df0c20b993c2a1cdd77006da029616096587e07003b2bba50499144d211c8ad0880eef53f0a3a9ce23af69f6320c427d6352958384 SHA512 a5d7a15b6084aebe038f38dc8003040c42434d415ebdb33b225e2772047950d35b2328dba5a7194533608b74ec47ca6a1bfccb56540f3a67308b499b04774207
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
index 328252c5ac32..cda8c0fb3658 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 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 ~sparc-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 ~x86-solaris"
 
 DOCS=(
 	AUTHORS NEWS README THANKS TODO ChangeLog
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index a3d59dc6c757..c66cd2b6e6a0 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,5 +1,5 @@
 DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8b499b226fb02d4f38833747e5e709054473267a1e139e1bef29222220e7f60cf2f472ac58ca67b52dca2c5661 SHA512 b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5
 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 1056 BLAKE2B f8dd579ba5ee32da9c40b5ab144632858c82f6d19c93d3e407357bc04074214f7e7d5fc52bf9cfba2adea8cfe131e106445411166c30a1e944df311a6a83665d SHA512 ec93260fb04e37047d4a02aa74a02c02ab657fc98c6008e66f7a21e6a02b3543cbb20d22b075dd4a88d1a7d15862751174ec2f5a50ce2eadcf97af1b0ba06cb5
+EBUILD libowfat-0.32-r1.ebuild 1055 BLAKE2B 9cb834bb413232dc3a96ba6c03d75193b06b50bdafc6d1407819722ab694ed4a31fdb64686ab514c1b4cf9dfe7aaeaf71f4e55dae8901ee900f8f96cd8b3da22 SHA512 1282bf87ebd5cd46c15e435a4d4482b7e3b374b815786402d8e07b0dfb59ede787e6af01040006a1612297431ef3bcbf73e4bc1734cbc7003665252f8fef5af2
 MISC metadata.xml 430 BLAKE2B 16b95e09cd79b1b22a0b391fbd70b3ef51b08dd5d92449613f21e8e1ac85f16fdb5e0bde3a298aa7b2c740439c909836a3a71dc55022a1322746f2078522ed78 SHA512 83ef95906f9aa9e0a88eb9241dd1245cd6628a24acc06fc99d97028ef9d82e4369fbed5643d88d51ae514dedf70dde032443a1523d335ea0fb1f96cdd9149a79
diff --git a/dev-libs/libowfat/libowfat-0.32-r1.ebuild b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
index 875540792621..622656e3a5f3 100644
--- a/dev-libs/libowfat/libowfat-0.32-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.fefe.de/libowfat/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa sparc x86"
+KEYWORDS="amd64 hppa sparc x86"
 IUSE="diet"
 
 RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 3756c431268a..f85a4d892c3a 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -2,7 +2,7 @@ DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676af
 DIST libp11-0.4.4.tar.gz 450709 BLAKE2B 4424c8dd8ee1f581c179c36b47bc03269f1c6b38bed2517a1209c8eaf2d8c2ab62da928b4cd20f1355b56dfbecbd2bd695118f7690c3eba2f5c188c6c4b5b169 SHA512 12d1e39981e62d758dc12a39c2ed5b6967a6e8c1db706c491db2c9aa0394fac278fa47dd4c64aa961e3b5ea98c1799b4ef7ef617ac076a414d88a6e29d5f0c4b
 DIST libp11-0.4.7.tar.gz 475538 BLAKE2B 81d36f0795cae00a20be935790441b46257728cc5b1d9eb16d6c5df2609a795a68e12d0dc6b34b0348107fbd8c136d27dbadc42e0bc8970d5e491529e1903091 SHA512 8142b32bee9e6763b506b93be788a4df2b28ae8cb3ad6e11fc53ba3db770d77bdcc0362661c2f906cab1b5afc2828019f3d0f0b9d898414c0d6266201b7e08e6
 DIST libp11-0.4.9.tar.gz 492083 BLAKE2B df84d9303e6e143fbfeaaf2e8d0b57f3c4cd63356b15d629ab210196611ab42e396cf7efa69392ac81dd9fd591aea5580e0b38f545bf9bad9ec4748d08da90d2 SHA512 0c4a76ee7a5d98ec144dac1de8d4f52ad2515e6c578b3ee9705ef861bc06a27477b6ec42cf1d96944844f006992aef449b579b430b2e32d367f29d1a0d82f8ee
-EBUILD libp11-0.4.10.ebuild 781 BLAKE2B 6985770648eba34bf70e4eedd489dcf97992c68fc9918ede4991d8ca35dbcd96ce4243b3b7d90c7188481d4981f84c1b68483e67332bde64024f766a0ddb2702 SHA512 cb99ab0be8cbef9dd8b70c561adf72eae3c4d549a6fe090e6c8af34c65230eb7dd0a8eb505e4f316181fd480baef378d9abaaad2183e3cf99ea97869456aa819
+EBUILD libp11-0.4.10.ebuild 780 BLAKE2B 81d859abc6f65ca3a0a388ced3f91b37505b97d33e2a5f18e088dff0d4e74851aea55beb1ed427fda9b04648d13edfeb3762667c041f3a8ac92af5bfcc33dd21 SHA512 ad72e746e165f1261f0c0ea4a080d5d5b0c2d53c687461156ca691cbdf5cbda6b0c7c0d953975063128a734f87a6cdacdd4ad352876c547357806b7d4698c50f
 EBUILD libp11-0.4.4.ebuild 782 BLAKE2B e2ea80c9b0a6c514806ecf69da143c3bc0f981cbff1aca891c7ca9ce1a4e36314b26a23166e8a6b0af141fb288244dae23c4e610687af39301403afc6b51f12e SHA512 6dd12ffe649c25f7320f1d5809d7b792fd3efd46725306193ed5fe92b246441e54e662fd9a2ac657c16977dffb146947f4a8a15fab2e1934711a7088ab310604
 EBUILD libp11-0.4.7.ebuild 786 BLAKE2B f44f40db44fd3455989171a60014fca0128b43741123a57c7d7418d626c716431e992809e175f6b8f6e71c2686b214991c5d6f7c793568915a4725418521f3d2 SHA512 9a934922c8731336e4b950ad9543b07e90b303d164bef57d4ff41dc99a2933e008613113a8f302d1e0a1324bc3e0d7a01590208a45428816b7a8bbfc023f92e0
 EBUILD libp11-0.4.9.ebuild 775 BLAKE2B 8605353f5a55c1e0ee467ec751bfcf5307c963f735095a9630201f230308dba02bc10837812f01d6735a912a8b7114987a452ac7980574d0985bfa4e24f6d24b SHA512 0b53c57f47b1f29d239f54f870b98fd010556b41a26d6f6213980dc3d606b5b7156eee3cf89685b361d546fbeb16fa67ec9f9af8db6886af310e7727bc31e802
diff --git a/dev-libs/libp11/libp11-0.4.10.ebuild b/dev-libs/libp11/libp11-0.4.10.ebuild
index 1dbbb76d9c31..7df1bf7032dc 100644
--- a/dev-libs/libp11/libp11-0.4.10.ebuild
+++ b/dev-libs/libp11/libp11-0.4.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="libressl bindist doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index c3dc9b969e05..1d01e3711e82 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,5 @@
 DIST libqtxdg-3.2.0.tar.xz 67736 BLAKE2B addc2636a9bbaa0163c3d344337eca9f350ffb38f4d0e785ade9775fc7d3e38c6f7a3c6c8d8d05e7b491f0cf2c34f5ceb8d51d34eb05b56e4170e190a5b5ae4c SHA512 1a52e79e97cd148c9f406402134d6feaa6ccb8d10cfa7c0e2a3fbf728690e193c05e444012b87e38790ce0570d1cf71c6c2cee7105f11d43923040543e0dd143
 DIST libqtxdg-3.3.1.tar.xz 66004 BLAKE2B a676f22144ddbf67e02686fc25b381a911e5d0391e2f735c6d85914362433aad20ad0a3740ea7101d26b5b5692d0504c3798489333b1bf9585c3be88f6636beb SHA512 f0fdb95f20ee49becf770455a513178bb3ce63ee460e8bbaac8d40f50ae47a139ff518021c8fc19254bbd777b67bc7f2754302de7e2bb6cdf929bc559a1b51f3
 EBUILD libqtxdg-3.2.0.ebuild 898 BLAKE2B c53adcda19dc7700d4023a8edf956b86b78b6c61dd3afb8fe42028e9da196f9c9d68c7d1278d357edef9a4b2c52d1b2b9f88a77a86c04192ac661a68e773aceb SHA512 6d80157a0164728ccdbdd129426c35aa91b24796eb7657475cbaf0659c048378f9e4bb37f1c519c120a98f9ae19840d1ab470d15f8785b061463f7658e3a0aeb
-EBUILD libqtxdg-3.3.1.ebuild 947 BLAKE2B c12194fbb6571c708241887052f19f88e4ea6d3359734ba938c157b26c8c873b1d33a09b682b98c0b2e7e9295cc315c36245ab153c0bd1bfef6f908bb9f91eac SHA512 5f31b7105b3b124a3eb7bfcbaad307be0d23c09f06ed00ffa1fccc4d04c30a6b6a31191c810c331357018ed69c305676eaa2d660b370d1a85604a60236f55830
+EBUILD libqtxdg-3.3.1.ebuild 945 BLAKE2B 6d2d8add873c6a95d6492c4b930ae23116a24ce0bf0875fbd5c026389556edf50a6953edfffb89a8b9a915f26abb6a0d8853a59df1b365597c0f1595737c76e7 SHA512 a7ec712996a2cd6eb195845bba8cf27cd6c8ede78fee0f0aa15dd97064b4e5abbc62a90f147d72b1ba81148e2ea03bfa3c0bf925cb4f86df0b68aaf452b1ce05
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
index f01b33214f82..91b64f8020e3 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index b39e18306b12..21f5ddffb555 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -2,7 +2,9 @@ AUX librdkafka-1.0.0-remove-automagic-on-zstd.patch 967 BLAKE2B 1df3c82dab189ab7
 DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
 DIST librdkafka-0.11.6.tar.gz 1994337 BLAKE2B 7b61e6ba02c5ed58c20e604d6765f6a57ff63ab0c61f2a4c64eff55bfb6c854ef089ac9eea9acc6d44b6abdb6d1425ff23e9d4e6037c733bc5719d6b69c74ae0 SHA512 9657dc53220bbff3eb44941cff2f50ab7f71a82f7486d64ea14f67eabd4abe8c67f225a752cc1f0339439a1cc512e99ade6536d087857979cd198c0102015718
 DIST librdkafka-1.0.0.tar.gz 2465603 BLAKE2B 7006dc421ae5c2c991853f4ede9d99e7dd308b49372a7c2c859ecc0e6ee7aa3b6cda9af7a71a5813610630b564bd65c6cf18ecaefd1a1880545838d7758aea88 SHA512 15ac1e4c9042debf8d4df602ccdc5eccae3a37b305be24d724fcaffc3d1d0aafa708fc8e29d6af51f51ed6c7daf74b3041b8b9b0444e6702cd73479c8078859a
+DIST librdkafka-1.0.1.tar.gz 2466259 BLAKE2B a391d57b21711853ce7df338070512f715f3a49ead2b4f7eb1fe5500699c1891821e6bbd4b87d3debea6852eb85094aba161cb3ca95aee3c592a38be4933ecff SHA512 094599e974236814c03e688eaa5e39d817cca110ff691501826268c45653fcd6b21b60e741140a1f7ffccd49902247f08fcec82475be2e9f85feaa4340b32d4c
 EBUILD librdkafka-0.11.5.ebuild 1249 BLAKE2B e10b7391be22a1b2fa32af02872ffa2e813ae0a387e7a31005900b63c9d2d3ada9cd47ca2e7a155f6178267b3a2b258f7eb9f8c7a2470be8ad61256d7d207a38 SHA512 41f0086bfe66d0a12f2ab448d842119bb3afe4e3008662b0fb0ca5bc99ef36fe81c4c4d0c8de46ff4eeb6594cd4253ef5f0895beb45235f99b195d3b13476953
 EBUILD librdkafka-0.11.6.ebuild 1249 BLAKE2B 038b73de2adf38cf66b95a470c1bf4e82b4d30c50410ba8ddbad3d59cb6ec323dd28da6c9deaa162049cb26c4d38f1456459fb309f01ee7d2b7f7d826825ca99 SHA512 e3d82210e7d6caee61bece6eadf2098144bb7dc7f1fe3c19e6e0ef154e0f36acc2b60017d8fc044f3a63ab7c83a7e1f5c8c732c39817904d31fec3b47d1f20cb
 EBUILD librdkafka-1.0.0-r1.ebuild 1369 BLAKE2B 0217f4996dd3904f871ccd0fbb300f681c1f2cdb9c4d08bcfb494ea99b15828c35712cd635c371daa776ec8f8dfa07dd70f4f678827393e9c45d3731e321ed70 SHA512 af7fd02a7f5c56b903c57f2f986a417ed9b31c956afb201b2c0523a452c1fced34359722e88d34e06203c1941101c0fdf56c4768397cd37432edfb309a13ba8b
+EBUILD librdkafka-1.0.1.ebuild 1376 BLAKE2B 6042b6b5ff4be42cca0a4a2703e66474b169bd2098eb9f98b29db001f6c5caf478bfc7f2996b42fc13efb56af7efdf7c0e797ee8ea8b1d28a0ca9d988821a705 SHA512 22ab80e0f1fca1b2dae08fc2dd3fc6fb9f9a2bbb8bd3b3fc02f82f86a027ca4aa820cd5e823eee8cdc2945a5eb122043b99b98073c258b9f94228311421485b2
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.0.1.ebuild b/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
new file mode 100644
index 000000000000..7ffc8964e5ea
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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 zstd"
+
+RDEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(-)?] )
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? ( dev-libs/openssl:0= )
+	zstd? ( app-arch/zstd:= )
+	sys-libs/zlib
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-remove-automagic-on-zstd.patch )
+
+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)
+		$(use_enable zstd)
+	)
+
+	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/libressl/Manifest b/dev-libs/libressl/Manifest
index ed8a15d4d5e6..78d3bcbac2e7 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,9 +1,12 @@
 AUX libressl-2.6.4-hppa-asm.patch 2236 BLAKE2B 508555aa87f763c7cc39cf1cbd2ae5692d7c33315b08e4527db61a878cb5373e6856669e8185b7c49ab82e3f7c01034c1496c639d3a46d605c39170f3f1ce32d SHA512 b49da63109f4b0d471402c07df927b1aba60f94e263376919206fac9a4dddb9a10c4c0004836b2c00a560eb59dcde71bd6b4aba45d966a3e0b2fba79f7277a3e
 AUX libressl-2.8.3-solaris10.patch 1928 BLAKE2B e12372c1fba9c586e5d8c4ccd7af0c3d888dd42f4456e28091424f8c1f0ec0362f9558957752a30fabb7b06e35929cad8fd582deea58d48da4759ee0aec12b08 SHA512 39ab3dea9af735f2485108aa88e7d951563ffbdeb8a002eb76560617583df58c84d5af83a1e51d0a6f71e9709d1f1f83265b030740f6024e5d45aaf0d98290b5
+AUX libressl-2.9.2-non-glibc.patch 981 BLAKE2B c9d208dac68fbe7205617ca667d111d00ab9d2324ba0c91c36f05efba9372a97ca76d844144d886814798e5be29c8e6a1bc0ac0341ee420660282d6d5267970f SHA512 5672b69a6c4ad68eb02e7e2b43dca6b2c557e0b74c29fcd249f46e65b284c740d9979e43fb36a7784ad41e7bbfee79ce18242990e62ecdb80d1a44cf1540dc8c
 DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d
 DIST libressl-2.8.3.tar.gz 3366196 BLAKE2B e32c097b31998d68a31266fbbf3624d5ab8ca716f8c53e423bcf09b3a8ab3542c92a99e259ded7b86f99b45cc199cd44791520a609f18c35d150365de5768eec SHA512 3967e08b3dc2277bf77057ea1f11148df7f96a2203cd21cf841902f2a1ec11320384a001d01fa58154d35612f7981bf89d5b1a60a2387713d5657677f76cc682
 DIST libressl-2.9.1.tar.gz 3607116 BLAKE2B a4542d7fc97bfd213162fe908e28b27d52329e2b6a5d77e0cb67d1a6732c500ca772d0c5735c9fcd036c477e6ede330305b4675bfcff9f72fd7886a781f30015 SHA512 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354
+DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f094a7e5dfac85878191070e2c196753162532efb921fab582481aeda3705fca9a2b48921cba82465192f2c1eef95 SHA512 b43e73e47c1f14da3c702ab42f29f1d67645a4fa425441337bd6c125b481ef78a40fd13e6b34dadb2af337e1c0c190cfb616186d4db9c9a743a37e594b9b8033
 EBUILD libressl-2.6.5.ebuild 1450 BLAKE2B 193d943fb6ceec65937ff2d47d2f1b677b7e643962c277f045371e9029af3ea7f0aecac2498b0bf74f1c4d7fd0160846ae3ab757bdbe24361f3304faa6f740b4 SHA512 42d2263c867c290d42c08379778b13f36eab1e185d8dff69d8970e09766596bc162d494d2ba3ff9491d2cbe781ccced9e1e4813eade213a9d94ddd22e7e3cfa2
 EBUILD libressl-2.8.3.ebuild 1545 BLAKE2B dc63614ba49a5d077e4be5fbc830fb3a20e7a34b403560f0b803c3eb7c761610eff701b1e79ee0a495eba310726518638951f66ac5f890f1b881ef5edc9a0d5e SHA512 d342dd4eca89a4db529c823161d49ec9292d7d8d98cfa5a10f18e88b1ebc4ecd4cf935269bbc3ad9a5d44a4cdad40929ea5e31830cb40a516def5de71dd51ee6
 EBUILD libressl-2.9.1.ebuild 1679 BLAKE2B 62ac39e1a95e996b33a84551619b4f642c733f8ce4708dd1a4620dd9ef047303c99fe6d9539b87b88bc18ee0932f6724c389eff27b61d6026328ec1f9f8d813f SHA512 cfc4b9b8fdd259d65905035190f29efb273b6e3a6317619d4d7e86413cca8259fe87fd16c1ed7f4e98e0f7438376fb82a1b912a7672aaffca79765a5eda37d42
+EBUILD libressl-2.9.2.ebuild 1720 BLAKE2B 2197ad603e93db34acfecdd0e3bbb649ab8da4f6c0ea6805cc4b1bf9f90d3760117ae9bef2057353501df889b7e176eee7db9dc62aa2ea703a1b383de1865eeb SHA512 ef2cf1984782adf4eb17bb67a0c103b17e9fb6d8d40a21665dd594c68460d8ddea9842e52d5e8ebb1d92e6d3753c94ef2ee1e138929632bd450392f11694237c
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/files/libressl-2.9.2-non-glibc.patch b/dev-libs/libressl/files/libressl-2.9.2-non-glibc.patch
new file mode 100644
index 000000000000..b00316d88141
--- /dev/null
+++ b/dev-libs/libressl/files/libressl-2.9.2-non-glibc.patch
@@ -0,0 +1,32 @@
+From a9f0b2143c3154da34b8798127263f6f11f61bd5 Mon Sep 17 00:00:00 2001
+From: Ishimoto Shinobu <47295761+protonesso@users.noreply.github.com>
+Date: Tue, 21 May 2019 22:41:05 +0900
+Subject: [PATCH] avoid glibc
+
+cause problems on musl systems
+
+Upstream-Status: Backport
+[https://github.com/libressl-portable/portable/pull/529]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ crypto/compat/getprogname_linux.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/crypto/compat/getprogname_linux.c b/crypto/compat/getprogname_linux.c
+index 2c89743..4e7e31f 100644
+--- a/crypto/compat/getprogname_linux.c
++++ b/crypto/compat/getprogname_linux.c
+@@ -26,9 +26,7 @@ getprogname(void)
+ #if defined(__ANDROID_API__) && __ANDROID_API__ < 21
+ 	extern const char *__progname;
+ 	return __progname;
+-#elif defined(__GLIBC__)
+-	return program_invocation_short_name;
+ #else
+-#error "Cannot emulate getprogname"
++	return program_invocation_short_name;
+ #endif
+ }
+-- 
+2.21.0
+
diff --git a/dev-libs/libressl/libressl-2.9.2.ebuild b/dev-libs/libressl/libressl-2.9.2.ebuild
new file mode 100644
index 000000000000..7271086d9ba7
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.9.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal libtool
+
+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 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply "${FILESDIR}"/${P}-non-glibc.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+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/libsass/Manifest b/dev-libs/libsass/Manifest
index 75f8542a8c95..f7e3c78f24c4 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,6 @@
 DIST libsass-3.5.5.tar.gz 327298 BLAKE2B 4127722343394bca4ed054987eed6113788e10dc4d03a869778c10b56135406c1fcd72dc101bfe405c96267b628735e8ee74d3812ab392f097dc941b78bef882 SHA512 dcb73a5080c00023b60a19ea037ba5af481253a7b47492bd7114bf45ab78ed931c7b207fa8f12ed200a39760553d72ae92dbe4eb80b826b59a6201fb34008fe5
 DIST libsass-3.6.0.tar.gz 332747 BLAKE2B be4ad469aa55f89ce54e6cf1cc5cf0a72f4727610bf2d5aeca7321fde4e4cbc009f59bee46c1e5e5b88825d5bd2f3b4fa427ab3cd535584956f7541c16339f1d SHA512 9665e50ee964ca3cc323f26c2b8322677102d26a7a102558ffbc5bef7a4c4ea44ca5096a967e4044dac1404bfa343a37d846f22d1e1adc27592023d5d4ac40c8
-EBUILD libsass-3.5.5.ebuild 1122 BLAKE2B 85c70cd6516cb1509ee83d391550d29b8f593ae84cc78636dc7acde24207f0d3056685f9e5b0f2fd3fb16dcbe178893133e4b65422e27ba617e41925ca1945f1 SHA512 f8438c8e839bd133d80b4bf9a7f294a6d167fb6da3e2cdcbe9d6e34e37c3151527cb801cf4a891b9dc6a18e97df4dc9651acff43fe4f1adc99976ad5f3415ab6
+EBUILD libsass-3.5.5.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
 EBUILD libsass-3.6.0.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 EBUILD libsass-9999.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 MISC metadata.xml 635 BLAKE2B 88705faeb11d0f69615b94933da84ce8784e73c5dcf36bb248fd1e3796a17da347d005c8c95a9f4cc0b591d208718e347384531cad60bb3d9ead910456eff621 SHA512 794b10c517680dc0b460208eea733891cb7bc8b65875f5617d086f86eb8b08e436c441c2ad00dba80bb643090182a42a77484b5934eb1df2e36f2119a1c5fbdf
diff --git a/dev-libs/libsass/libsass-3.5.5.ebuild b/dev-libs/libsass/libsass-3.5.5.ebuild
index 675522074df5..1ece89467a74 100644
--- a/dev-libs/libsass/libsass-3.5.5.ebuild
+++ b/dev-libs/libsass/libsass-3.5.5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libslz/Manifest b/dev-libs/libslz/Manifest
index 239e30034b9e..f8b0c6d04ce7 100644
--- a/dev-libs/libslz/Manifest
+++ b/dev-libs/libslz/Manifest
@@ -1,3 +1,3 @@
 DIST libslz-1.1.0.tar.bz2 229577 BLAKE2B d05b619d0b7b76c2777285ecaf976b75565b50c77e00a1ce042f5a28ab8d527788a75d28d70357a32ea9a98267ae621d5a6e4613e4a7e4f52767e68c77765bb3 SHA512 064e2e8e7091adf863653981e5b677bdb9e64901f61cf3b68f098cf7957a4c32e19cec7d41b8dab61098017119d6ea562350c7fbfa10b5e922f52ac0d6066948
-EBUILD libslz-1.1.0.ebuild 1167 BLAKE2B 1fbad459b2d8205f2f3001e75201860472685366b5e04df4be95176caaf63492e76cc81e501aae3d745e4e7fd1b8f2be6dde48cf4bb186f414b5d8611a599bdf SHA512 8f0252966bc7705e8eefc38638c7fbb8b635517a6cccffd555561c338b4fb99da2c0d885ba3555ec01ce0ddf555bd71d284f51303cd81c80edfff0353402876f
+EBUILD libslz-1.1.0.ebuild 1171 BLAKE2B 198e5fca5067778136ff7a2b50b990879186b073095906e4ac134922386780822f5d6a6d52b8f9122f3a793944c19ce560ac77c24b429f50be1f28607b7d89fb SHA512 4d2e6f3c7b54edd926e9bbe275e999314fb3e7ab577abad77126ae88fbf477b6c2d98a0282d00cdc435228271cd8928eece3cb56a069fccd3d7fd69636a9feb4
 MISC metadata.xml 1176 BLAKE2B 912f2785a4418e9dda2014a1c7d9d8a47be8d38ceda9b56c45b5ac9ad05f5b0aa0793891d8436823ee1bb3a14f7f1239b15daa4ba1ee6dcf35c42a95e1b910bb SHA512 fd49087a1691173da56b6669a410d0db911b999fce1fba2536832ff13a8b4c7a304410fa5ba0f87b7587bdffab216b620ca5b8549936cbf21375139a402b771d
diff --git a/dev-libs/libslz/libslz-1.1.0.ebuild b/dev-libs/libslz/libslz-1.1.0.ebuild
index bf812e97c808..dfda44e0c7f4 100644
--- a/dev-libs/libslz/libslz-1.1.0.ebuild
+++ b/dev-libs/libslz/libslz-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://git.1wt.eu/web?p=${PN}.git;a=snapshot;h=v${PV};sf=tbz2 -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="amd64 arm ppc x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="static-libs tools"
 
 DEPEND=""
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index b56ba35158d4..96e90d6219c7 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,8 +1,10 @@
 DIST libuv-1.20.0.tar.gz 1180231 BLAKE2B 8ba258477c685acc1ed5486211b65719419757f6dec5dda863d622d4190552a2f5968f3b05519ec5574a5963cce99a9b92c224b511e0f9e70aa099d47f4fb4ca SHA512 382309cb6e54765b956b03357cb754f49d93505ba0e0122a77f33efca07d7b87966c993a5fd9f9503edd1bcd0f49ca42bd9cd9264cce94c847aebca77d237ba0
 DIST libuv-1.28.0.tar.gz 1218769 BLAKE2B 444881479688144b36559a258f998e99e663d856c349086f74a21c3946f8d48d0fd9ed0a7c64c76c18b47edd3df037936fd87c4d47e9ae7c5639bb6e289e026d SHA512 5f49b980b69011897bbb7a00d779fe0e71528d106626bc13fc130cd09afb7c8188007f354cd6320b1eba67f77c938ae3e83f3bd4a3ef5b9ea65a3adf51f66a53
 DIST libuv-1.29.0.tar.gz 1223722 BLAKE2B e4e7e3e3c0668a573a29bd90b0bd63954fe0c03a195c420df5d7997fd79475f997117d09bf81aec5b58a57482aa8b3ad50cd7892249697e256340b36a720fd6b SHA512 19f1f25ffdb287a755f773488e3da5fd5b5b43c333e3dfb019bbac430ccd77456da96dbf60c38b97c87880f90f08438366e29bbcc8d81a28f777f39fca8af529
+DIST libuv-1.29.1.tar.gz 1224127 BLAKE2B f116b0e0df9c2b65bafb8ebe0259ac1e1702232e751e015dbffa9be403f39727d255a7abc560b219279caff1bfab9528f38e32dbd2cf42dc0274dbaa57727861 SHA512 7e1ed1bc500bfaab44858b3ff4685ec3d2abce412718ad144d642f7526f6dbcba643ea9a623bb129d545599570be64ed9a498d85485c1716c4c365bb7ab61898
 EBUILD libuv-1.20.0.ebuild 1167 BLAKE2B 822424c522ba27df7624d2b3e1fabb522e15865b8eb8a56127f6565da3d1ae55f519d47ddfe7cb7cecf406626487fba48d77a164a67e9d48be613cc2e36bf93e SHA512 3eb698ab1c3e9d31a90f79293a9484cf7a27e7a7945577bb241b74e6390bc4efee13e43b28de51c38c5fe3b921ca886f0ea8d26c752ea5f0437f5a4d0ab7bfd4
-EBUILD libuv-1.28.0.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
+EBUILD libuv-1.28.0.ebuild 1217 BLAKE2B 32d99f6d79e589f0b068d8fab8c9cba584a26e002d7c047308ef02478838a84fdd57192d16ee3be61aca6fec1390afa8f018ce5a84983e91f2f73b29f5c2923b SHA512 410b9743d1e98c1a16a31a2c737d8944158dcb846a9a33001747bf67a7fd72af5ccad1fe1c477b4681ba1468d03bd98b42e4445245f1db1a56a6b52e2692edf4
 EBUILD libuv-1.29.0.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
+EBUILD libuv-1.29.1.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
 EBUILD libuv-9999.ebuild 997 BLAKE2B 1d82e7c3acd3715c580dda78f0aa6db97f217cdcd1dd58ac04963e43dd077cd62c798e2d676a098c69471bed2b4d035a63da335abe427762097de1bfe947e624 SHA512 d1ad9a68ce54465945cb795d28312eae4615e839889f8a7dadfa6ab54e580925c15781d00fadc99edc8d3dc5b54d18351df17b1de096fe97ab06bdae21fd9870
 MISC metadata.xml 1337 BLAKE2B d054e429ce7e3a6b94910693123645ab6dbfefcb8921b37b57ae156aeb5a25a4b100b45fe6714c498a355015dc3cc37c98852a14be651bd3f55259b8ab78e2dd SHA512 dba39812f31549539955d26ab8e281b4a1a372b8b41f29e68f0ae63bc10d18df5eef106936b31a13344cc11705192bafd4b32a0aca1f16e7927244ad049278ca
diff --git a/dev-libs/libuv/libuv-1.28.0.ebuild b/dev-libs/libuv/libuv-1.28.0.ebuild
index 6fe68c68f88e..fe2b4e41346e 100644
--- a/dev-libs/libuv/libuv-1.28.0.ebuild
+++ b/dev-libs/libuv/libuv-1.28.0.ebuild
@@ -10,7 +10,7 @@ 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"
+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"
 
diff --git a/dev-libs/libuv/libuv-1.29.1.ebuild b/dev-libs/libuv/libuv-1.29.1.ebuild
new file mode 100644
index 000000000000..6fe68c68f88e
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.29.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 75860c47d226..b2b0a4ef445b 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -6,6 +6,6 @@ DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f5
 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.9-r1.ebuild 6791 BLAKE2B 8442f05e04f430a6f779b968d0b04fff41a550ccd29e0819f18d88388f205176f2bd8cb7eed80ddb3cc5642d8115da58e3b97713742a11aa1d721e37b54061d4 SHA512 5ddc1ac7bdf54ba9d518d0bf69f25e1ab87371550027596556dcb5a0b5ee7cdc010b147466aebeb15a4f09817d86e1b79eae9e9b12dba6cf83156d1f3a85e985
+EBUILD libxml2-2.9.9-r1.ebuild 6790 BLAKE2B b857c2d6c9d29714d7172a6f18ecfd527c8126dfb867f8de1c00f0b218ae3efdacb850ccc4613263dc60a5a1a431b843225a604ec322d2a7cf4786f9d30dca95 SHA512 fe7ea18196ea969722ba2c9730f101f725ebbb13217878db5f519c898fd9336bebac11cb5b0d31dce04cd49db9aef47364a279b24b9d7418a5875475cdea710c
 EBUILD libxml2-2.9.9.ebuild 6531 BLAKE2B b4b9d5c06f04316bb31aca3aeb1f60a9c0ae045ecc9e04d863c517120c4dbdd580c5bb7d88e85f16cb63b0f8a8d0751c5d9df42bf8fafe6a3af185292149a11a SHA512 63e8a73380c3a1798af17075f9e5ff5821b53b4d3e782dbf51dcca6d604ef8315b3fc3b5f6d3bffbb0336d4418e47e5f4c220d4798cf20042dde8cd766924f7a
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
index c69d53bbd17b..e61c1fbe63f8 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~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="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 12cad11f2dbe..a5b19aec153c 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -4,5 +4,5 @@ DIST libxslt-1.1.32.tar.gz 3440715 BLAKE2B 8d5dead5788d8d09ab121d6e33397ee8ed883
 DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948
 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
 EBUILD libxslt-1.1.32.ebuild 3275 BLAKE2B 8c62899c0f9744559d7aac7be6f73ae599303b848699eb89f9276ab8e72a038024773a5754c5ba08f223ceab334a5a22c91137343b0c89a5b3bebd56d59739c6 SHA512 7fc90253308d84200aac763dce0e4fea507c0d43ab36b07d55bd40bcbf4a2365c496977ff963200b68966b892646b05680138c1e94e790def07f3fb5d4f4ac95
-EBUILD libxslt-1.1.33-r1.ebuild 3477 BLAKE2B e2da111cc7fa50aeef897aee961095b2aeb87c30cee5e246f63c46f290b07e0c2bc9c9a8da56cfbae92333a58ec73aab12267b0c0de0d574bb5e79ccc6f829de SHA512 1edc25d0c9305f0829fcec04b3b08eb77297151433f36d38999f90794c34a16e6dfd73c856fda85ec88533ebd30c72e2d623a093f1104d53a5c0e20015464133
+EBUILD libxslt-1.1.33-r1.ebuild 3473 BLAKE2B 704ddda02fd3eb1338b18c529acc3ac41518948e206c113659dc64a5f6df020d35cbae4355d2a734b095697965855ed780715ab7daca94a4768442e24c6f7bb5 SHA512 20cd0332110acd01a34e0499dfd0cecf001077347417183be0c0319b7518ea39c6c99b7972d4bffabaeeef7f8865e46f5bb78cbfa83d35d06db5cd5f037ea69f
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
index 16a917a37f50..8d3e53d37f01 100644
--- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~ppc-aix ~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"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc ~x86 ~ppc-aix ~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="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index a004bc5ad6fd..833615f7bfee 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -3,6 +3,6 @@ AUX libzip-1.5.1-options.patch 1297 BLAKE2B d2394b095b59d484269bc29cbbb311c5c585
 AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc910522e38dd05546c995d90d5377cd0419666e4b724448cf6d38110faa640191d98b06bbe08610ae947340658f0a SHA512 e8af90b4559df0a6b2c8d0d1b7797833d0f59c4827082cd5dd8459d57ac1557249030510dcdad5f31a84a99cd79e30bb7b9293b1f19303be750faa40be2892cc
 DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
-EBUILD libzip-1.5.1.ebuild 1902 BLAKE2B b877e4b304f3047f326a9c6d316412615fc7cc10827bf4bc4d9dbf3888e52f3b1ad13f97cf25d1ec7b1067530be1a9e9957870c4aac7aab62c40ee58e396550e SHA512 db79cb9cd92e33bb7500a7cb336018babf86726af2b8ece56da12e75f129eafba021f24de7486ec9cdcffa5d910b6f8650200151188344864b6311aa7e23083b
+EBUILD libzip-1.5.1.ebuild 1901 BLAKE2B f668410b13077d0cc6e36e2b539070fb1172424623082053c71fd0ffc1533545c3aa5abe50030e6b62c0cd7690332eac3198807a94e41eeb9af709ca79166578 SHA512 00692e68879b5c76936f632f32c5ccf2759f8022bf13802bad8c6c3931a2d984ae5b976115f2b11f65fd0bf732b02083dea6c91dc7c69483d16e8fab3879dc3d
 EBUILD libzip-1.5.2-r1.ebuild 2287 BLAKE2B cd489ff9474e34b75a1df7ec33757bdaa4d7fb9af8fcf05478457cae249c7a50488274b88504145548d78dcbba787f49b1dd399be85a29bf6d6fbd6df1eea8fd SHA512 7e5b7aea06ecd54984bf54f79ebefc5e03d210580395f1acad093c87fcfc859a746a4757e1f21b2553902cf1945498b60d6cadbc549f48faba796a79ab14ffb2
 MISC metadata.xml 440 BLAKE2B a69b3d641d9262e897f015c91fc0a4aa7a7cecc73889d24b479101674f2de16825844c9ad6c10e42968a22279bdfef71b839f50289aab5457efb0164ae5fd1c3 SHA512 737e1fb7de749b2e38f5642dff624daf6521183fa974f9cc2831580aaa1b8532fdf8725ca3166bde8ef8faa492b8a2298f542fb8bd15d89b1ab983885756282d
diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild
index c58ae4a73832..95c3608bf77c 100644
--- a/dev-libs/libzip/libzip-1.5.1.ebuild
+++ b/dev-libs/libzip/libzip-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 doc gnutls libressl ssl static-libs test"
 
 DEPEND="
diff --git a/dev-libs/log4shib/Manifest b/dev-libs/log4shib/Manifest
index d33b29061c78..ce8d067bf832 100644
--- a/dev-libs/log4shib/Manifest
+++ b/dev-libs/log4shib/Manifest
@@ -1,3 +1,4 @@
 DIST log4shib-1.0.4.tar.gz 487529 BLAKE2B 8ba4dd17e2f35c6566ba4736b5450c41fab1c5506ab6e994136b97ccab4d399281afb32fcf13935c25acd7ba063d2ed6595bab564614ffbb0d944074b68a5bba SHA512 af31bb436393e1a6a2674c0f4804148dea4f4081bb07b78f158f4109157bef4ed40647a3e4da7ec5eef0ed38b6286aee6d8b8a3320572c2b55df2998850d5245
-EBUILD log4shib-1.0.4.ebuild 699 BLAKE2B f35f4578fdf625bd2d743ffe732c09a6f22e0f9bb8660d08bd6183a86dd7fa3655de908fc395409604b787038b25c1dd08d1d85e3059aa888807a7a83e0e1f47 SHA512 7b4a9b2a52c72161c281f9b78b4ccca40f9919af31aa2c9429d3ff861affd2dcab690e2181e2d74c7a8c35bfadd973dce237c5c9a5cf86499293b3854ddb9745
+EBUILD log4shib-1.0.4-r1.ebuild 581 BLAKE2B 51b45b8a80d953e3448bcbac424fd12b272f1e6bb39d1d9110b4ead6f6d1cc3db5b2661e6109f5f312a21e6808b522a7324bb2e667129e2d0d1d2b4787e58277 SHA512 faf1af7b515951198162af69c5aa5c12c908033f313f093416e4346f4a8f6e278aa6592291c9035c8145adc49e100bfe962e8d087a540fd6af65eeb279957e4a
+EBUILD log4shib-1.0.4.ebuild 687 BLAKE2B c8c8f8627b01f80b257234b9704b7020991d9306baeeb18f684700ae44ae1eb947fb4ebc2fdda3438401a2481f2cfabefb538cfd3ad5f57b0311b9b1479cdf89 SHA512 66e2918cfdda48f56c551429cf9c656fd34575d1e405ae99c533f000038b5d0a030ddf81c0c48aeb050658f60d629de558f7d0531c572745742cad16de12035d
 MISC metadata.xml 396 BLAKE2B d9c3e97cacd4d4d4e9b26f9e78a9a56293ab4569232c63e599c89376723af4b8dd250c9a8642d835d1bc4eb7b53eb5a6b78a80eba1c95fec7f5edc11f8b0efbe SHA512 4232880b47191b4e89f07dc4987e8f24833a0f42a21355f943b03f88487f50f2401e1a51aa7a150ad27659e7ebf9d61509fb232191dc4836d8ee4a9c7345df70
diff --git a/dev-libs/log4shib/log4shib-1.0.4-r1.ebuild b/dev-libs/log4shib/log4shib-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..63ac7a704a4d
--- /dev/null
+++ b/dev-libs/log4shib/log4shib-1.0.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Internet2 version for OpenSAML of log4cpp logging framework"
+HOMEPAGE="https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib"
+SRC_URI="https://shibboleth.net/downloads/${PN}/${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug doc static-libs"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	econf --without-idsa \
+		$(use_enable debug) \
+		$(use_enable doc doxygen) \
+		$(use_enable static-libs static)
+}
diff --git a/dev-libs/log4shib/log4shib-1.0.4.ebuild b/dev-libs/log4shib/log4shib-1.0.4.ebuild
index 6e744c15a904..bc6707fe0f40 100644
--- a/dev-libs/log4shib/log4shib-1.0.4.ebuild
+++ b/dev-libs/log4shib/log4shib-1.0.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 
 DESCRIPTION="Internet2 version for OpenSAML of log4cpp logging framework"
 HOMEPAGE="https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib"
-SRC_URI="http://shibboleth.internet2.edu/downloads/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://shibboleth.net/downloads/${PN}/${PV}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/mm/Manifest b/dev-libs/mm/Manifest
index e5b2d1d786a1..e91900341d7f 100644
--- a/dev-libs/mm/Manifest
+++ b/dev-libs/mm/Manifest
@@ -1,3 +1,3 @@
 DIST mm-1.4.2.tar.gz 344903 BLAKE2B 5fec1eeea52e9ff77f94081f4e77dfd627c356cc94591169fa89f5564882e2e3a4712c90c3f1e133024ef0adf095da8063916145159e5023c4191748bd622c6c SHA512 dcc12676453cfaf19560f99fa97e905428051d72b46aeaf574300f51e64f689caa70c81b619b8794ad604e8a2efe6bde1e486a2e315263b5694d6eab1cacc182
-EBUILD mm-1.4.2-r2.ebuild 702 BLAKE2B 17eb838eb0e56f535a854d151deb697004184be5f3db2e2b30c40ecbda7a338b257ec9888d893bb5c8f6a13b08776a867eda44401561944f1483d14398c1bb90 SHA512 464cac6439d28dcf16c8f5a279a8b1f356516cf356ab974c401d94fbe20fdb96d91c8c939c954cbcc7c83eceee47c9e72bb56aa66ff2da70a5e67f17022472d4
+EBUILD mm-1.4.2-r2.ebuild 701 BLAKE2B b2a46936714bc79e40c46cf11b101da99fbab3b1a54e7b37d7ad88576e9e0825627b50ff9f61e446cf92a0ebca00a0f4960c84f0e6f782b9a5560d83f42934b1 SHA512 d5bc3051c69a6ecea8b76fabc1475be5988584535b69420e1766f65e0d429ca259b2865d35ad99f19937b7d5f0166c030b415053833bb862cf014f82a8b1e8bd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index 84e891c31927..51290880bc5d 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
 
 LICENSE="mm"
 SLOT="1.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=""
 
 src_prepare() {
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index af06d91b1505..9d062b3be388 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1,11 +1,8 @@
 AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca055c02f6ff2d807dc36fb15c15e67c2aa5d3ac4ae11288e710e6e0e4830dced12a0817e395fcc2331547228eb8 SHA512 6f3a68b75fae6693ddbb47b88f8ede4a6994daa4476b3ca472b3ec62db26e36785e3bb7fe7375a9e78ffd0761a4d82351f5d02c30f8ddd55fa5648257526e98f
 AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313
 AUX newt-0.52.15-makefile.patch 403 BLAKE2B a7d85c4d99961894b21d051bb143059c6efbcd29fcf187de1e37344850d545ad98b974346483f2f1aadf1ab029d9d9a0fd64416e6892188cbd2bcfb60a64bc05 SHA512 146430581aa1811ac2f5aa03f6da6f193afda153eb3c3efd8576631f591f3671f05d9479182f593faedc79be17fc91852641259df93faa1231d3eda5e9dfd73d
-AUX newt-0.52.15-snack.patch 797 BLAKE2B 6335815f32ec21d81956f411822ad2dc9ca7dfcad43b30bfa916f84458f35c6259d3851552c8759c915d3de5eaf60c09bd7d1e6fde80f27968fa48c7a9a64829 SHA512 3a7a706c74307d5fc1d10ef0ec64f2d6cc086630b5620ffc3a679770adde65212fe0b5fb9529dea43565f0c8d40bc57a8b8fd67b106ab2279be8f8a9bde1c56b
-DIST newt-0.52.15.tar.gz 183171 BLAKE2B e6fac06b28232c81d683b9fe613f8c75660543a1e1f9f7583ce27e2fcf8208e2695e94c190757af8da443c0b1fa30546ce8dc77630ee88464377d563193f52d1 SHA512 f93798e8e9e33b4bc1bbb6039d94ccdf55be76a0e0f918eb32a241fe527ea61121a8fc35ccd699e3f6202eb367ba4b4025b30264bd9b0face7c16782f113051e
-DIST newt-0.52.18.tar.gz 180425 BLAKE2B 96c10d6eb63b62a51cd75f3cc34671954abd8e0c528972cb555422065dd074bab7360b226fcc4278caafafafb3b53c6eb2c395b83cc18c3fd02efcf053480311 SHA512 223b4fba9568d7ddddd9292f52d5e556a24403642d1dac97b58c8ede698bc182ce7d5afd31df2cb1c5b8a8850529b50ce71d8ad84856be8d42fad0f1a33a48f8
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
-EBUILD newt-0.52.15.ebuild 2009 BLAKE2B 60893c4f48b7e26939b65cca8f47047fb4d13558b363fc2ce7be362b77c9c3a2bbb0a833b15c3bd3a44e93a75f6bc3e8bcd2529aefd78e28c5ffc1b9dff2cf01 SHA512 342cc64da9f59c34785897b768e48687dc700e9f66c4bbf9ec0ddff1ef53eafd7cfd90971df67d2cf1c668712f793a75583ee61ae07d4dae5fbb44c2fa5c1d4f
-EBUILD newt-0.52.18.ebuild 1946 BLAKE2B c94b8d8ea555381f8a5561a983de9dedbba63eb36c76bfb7550351947f044ef4df7b3bb7316e213adda862a235ea816a5450fe1ec06a28f6f7e7689786327465 SHA512 8914e08dce91d768dead676763eccbe41ba6cea208d28348e80bf0b5e7bc5f1cb70f54c382f14642726ad64d2512edd661af18172e37577c2fb1176a76da5a30
-EBUILD newt-0.52.20.ebuild 2023 BLAKE2B aacda586a62bd92bcce19f3fb5fee0e9e05e63e71271ea7d8a281e6cf0121eb039a69851d283be8db82d1ea063e30fbce9b9ffcd9a3e571378a858eccc82f445 SHA512 4e76bac8a02b000c06bf9d522b209e3746899750b30627287a6297f840ec382e108bb25f51c50ebec56040b5fcb8f3e9eed4e76a7eb04e4bd7c69aa4cebd9267
+DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
+EBUILD newt-0.52.20.ebuild 2022 BLAKE2B ee8fed9342ee68b4548c8a95726894e5ee9f3de9902f7537e8b8458154ba391e46090a70518450bc7a51e330cbcfe81f7423b49de0de79a8406914a0e7d01007 SHA512 2945fcdd40fd57b502da9aada6273022a961607ae40a30730d8935791ea409aab96efc14181c6a2f4d07ac2a9752d677adc09bd99ab4489866fdea70d49c3e2a
+EBUILD newt-0.52.21.ebuild 1989 BLAKE2B 5954f0985a18ea0b0c12fbd297e5d4c79494feb9cef088c2063eb8f74ce23f6a246ffc1eb9a2e85e014d871f0bfc3b539bd20b77d886410a3780c7d93a43760f SHA512 7deb7b896bd8a3d406f9005aecf77e7f0a2eace68119dcb94485e417abcdeaf4ef9668189cc07f522725993b95ba0ca52954d12e6ea4bf214c614b1c20b3cbfe
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/files/newt-0.52.15-snack.patch b/dev-libs/newt/files/newt-0.52.15-snack.patch
deleted file mode 100644
index dd2627538e6d..000000000000
--- a/dev-libs/newt/files/newt-0.52.15-snack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 75764e1..ca95bb6 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -90,7 +90,7 @@ _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
- 		PLDFLAGS=`$$pyconfig --ldflags`; \
- 		PLFLAGS=`$$pyconfig --libs`; \
- 		echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c; \
--		$(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c; \
-+		$(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c; \
- 		echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L.  -lnewt $(LIBS); \
- 		$(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L.  -lnewt $(LIBS); \
- 	done || :
diff --git a/dev-libs/newt/newt-0.52.15.ebuild b/dev-libs/newt/newt-0.52.15.ebuild
deleted file mode 100644
index 7ba8453d0433..000000000000
--- a/dev-libs/newt/newt-0.52.15.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://pagure.io/newt"
-SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="gpm tcl nls"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/popt-1.6
-	=sys-libs/slang-2*
-	elibc_uclibc? ( sys-libs/ncurses )
-	gpm? ( sys-libs/gpm )
-	tcl? ( >=dev-lang/tcl-8.5:0 )
-	"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# bug 73850
-	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die
-	fi
-
-	sed -i Makefile.in \
-		-e 's|-ltcl8.4|-ltcl|g' \
-		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
-		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
-		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
-		-e 's|instroot|DESTDIR|g' \
-		-e 's|	make |	$(MAKE) |g' \
-		-e "s|	ar |	$(tc-getAR) |g" \
-		|| die "sed Makefile.in"
-
-	local langs=""
-	if [ -n "${LINGUAS}" ]; then
-		for lang in ${LINGUAS}; do
-			test -r po/${lang}.po && langs="${langs} ${lang}.po"
-		done
-		sed -i po/Makefile \
-			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
-			|| die "sed po/Makefile"
-	fi
-
-	epatch "${FILESDIR}"/${PN}-0.52.13-gold.patch \
-		"${FILESDIR}"/${PN}-0.52.15-snack.patch \
-		"${FILESDIR}"/${PN}-0.52.14-tcl.patch \
-		"${FILESDIR}"/${PN}-0.52.15-makefile.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		PYTHONVERS="${PYTHON}" \
-		$(use_with gpm gpm-support) \
-		$(use_with tcl) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	building() {
-		emake PYTHONVERS="${EPYTHON}"
-	}
-	python_foreach_impl building
-}
-
-src_install() {
-	installit() {
-		emake \
-			DESTDIR="${D}" \
-			PYTHONVERS="${EPYTHON}" \
-			install
-		python_optimize
-	}
-	python_foreach_impl installit
-	dodoc peanuts.py popcorn.py tutorial.sgml
-	doman whiptail.1
-}
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
index b0fad196dbb6..b272773647d3 100644
--- a/dev-libs/newt/newt-0.52.20.ebuild
+++ b/dev-libs/newt/newt-0.52.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/newt/newt-0.52.18.ebuild b/dev-libs/newt/newt-0.52.21.ebuild
index bb64ecc2c13b..8af4c46bcaa8 100644
--- a/dev-libs/newt/newt-0.52.18.ebuild
+++ b/dev-libs/newt/newt-0.52.21.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
-inherit python-r1 eutils multilib autotools toolchain-funcs
+inherit python-r1 multilib autotools toolchain-funcs
 
 DESCRIPTION="Redhat's Newt windowing toolkit development files"
 HOMEPAGE="https://pagure.io/newt"
@@ -14,14 +14,14 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gpm tcl nls"
+IUSE="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/popt-1.6
 	=sys-libs/slang-2*
-	elibc_uclibc? ( sys-libs/ncurses )
+	elibc_uclibc? ( sys-libs/ncurses:0= )
 	gpm? ( sys-libs/gpm )
 	tcl? ( >=dev-lang/tcl-8.5:0 )
 	"
@@ -52,18 +52,21 @@ src_prepare() {
 			|| die "sed po/Makefile"
 	fi
 
-	epatch "${FILESDIR}"/${PN}-0.52.13-gold.patch \
-		"${FILESDIR}"/${PN}-0.52.14-tcl.patch \
-		"${FILESDIR}"/${PN}-0.52.15-makefile.patch
+	eapply "${FILESDIR}"/${PN}-0.52.13-gold.patch \
+		"${FILESDIR}"/${PN}-0.52.14-tcl.patch
+	eapply_user
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		PYTHONVERS="${PYTHON}" \
-		$(use_with gpm gpm-support) \
-		$(use_with tcl) \
-		$(use_enable nls)
+	configuring() {
+		econf \
+			PYTHONVERS="${PYTHON}" \
+			$(use_with gpm gpm-support) \
+			$(use_with tcl) \
+			$(use_enable nls)
+	}
+	python_foreach_impl configuring
 }
 
 src_compile() {
@@ -84,4 +87,5 @@ src_install() {
 	python_foreach_impl installit
 	dodoc peanuts.py popcorn.py tutorial.sgml
 	doman whiptail.1
+	einstalldocs
 }
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 602131f5798a..73c06e91c181 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -15,20 +15,36 @@ DIST openssl-1.0.2r.tar.gz 5348369 BLAKE2B 9f9c2d2fe6eaf9acacab29b394a318f30c38e
 DIST openssl-1.0.2r_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2r_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
 DIST openssl-1.0.2r_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
+DIST openssl-1.0.2s.tar.gz 5349149 BLAKE2B 46c72dcceb5b473b129be0a895f3d6c25a24ee852a31dc369ccf0e44319259d8694d3571b8cb698efb8bce89dbe31f4fc9f82753cacb24cbd3d50fa2ab9b6e83 SHA512 9f745452c4f777df694158e95003cde78a2cf8199bc481a563ec36644664c3c1415a774779b9791dd18f2aeb57fa1721cb52b3db12d025955e970071d5b66d2a
+DIST openssl-1.0.2s_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
+DIST openssl-1.0.2s_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
+DIST openssl-1.0.2s_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
 DIST openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch 3001 BLAKE2B 8f0ac4be6409b4ec50bec171697da2aebe2688e8ae06bd0dfac8b0c74661d38ebeb0a12bde0ef941b213eee9b85965262213b140636060285dcfb02a3bd14961 SHA512 ec6710e9669ac19e4c6f1286c89a383e7d276a773a2740037f98a8f2dbf18305614e7d30d9ed530923a0e7d10a3776fea2ca77229adc25df13ecad55589a3673
 DIST openssl-1.1.0-ec-curves_d2ede125556ac99aa0faa7744c703af3f559094e.patch 5311 BLAKE2B e9ec985adf6f13eb04412158a05da7cbe10be7d64bce73b899152ea379336ece7b7069089ef46993ac301ef850fd46fd0352898e249b2ea9fff5baf20896e5b5 SHA512 c38c4b05195f2b323a07efd8d17335ba2a168a16a59d7941da36568081f1c043da8d2216b7084b0617963635ded9bafeee736ecddbfa251cf0a02e4cba64cdc8
 DIST openssl-1.1.0j.tar.gz 5411919 BLAKE2B 0fbd936f38d30b64bea717a67cd59704c5ce44ee19f377a820f89ba66b9e0a7509cf39e0fb00c104ae6440a6bd811e388239b458ffe685d8601235bab2afb2f1 SHA512 e7d30951ebb3cbcb6d59e3eb40f64f5a84634b7f5c380a588d378973f1c415395e3ab71a9aaff6478a89ec6efcc88f17f1882c99c25dcd18165f1435a51e5768
 DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457
 DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b
 DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
+DIST openssl-1.1.0k.tar.gz 5287321 BLAKE2B fce40a399f5a08d5fe183dfcaab11b211d982885fb9888b25fa41bdd9919ecd203fca6f573363cfb42c9a0776ae69ea50b0f144227a3f28ca0dbadf878d396bc SHA512 65f41a240a97d79504c0e1391fde8ac8692f0993437cdc35e4bc964ecc36e5ef75a62499c4c6cb4ce63f892135e06dba2d3594c8869d935554296fa3c6ccd822
+DIST openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457
+DIST openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b
+DIST openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 DIST openssl-1.1.1-ec-curves.patch 7265 BLAKE2B 04725d226c430132cf54afbfaa30a82f8f8bbfd3608823d1d0cd42c3c13f417e90762759da3134d7b0c4373e531925db337b681340f2f284cb2f16a4caef22e3 SHA512 de4d0f1635740c57217836a476c420141c0d34a5f90cbf7957aed7a80e7ac9ca036de2d8448e6bf4c122999e308730575899f61cea6e51ab6825dd04890d75a1
 DIST openssl-1.1.1b.tar.gz 8213737 BLAKE2B 7ad9da9548052e2a033a684038f97c420cfffd57994604bcb3fa12640796c8c0aea3d24fb05648ee4940fbec40b81462e81c353da5a41a2575c0585d9718eae8 SHA512 b54025fbb4fe264466f3b0d762aad4be45bd23cd48bdb26d901d4c41a40bfd776177e02230995ab181a695435039dbad313f4b9a563239a70807a2e19ecf045d
 DIST openssl-1.1.1b_ec_curve.c 17938 BLAKE2B d5cbde40dcd8608087aed6ffa9feb040ffadecf0c46b7f3978cc468a9503f0a5ad0a426ea6f8db56f49a64474a508bebdf946e01ebf09adc727675f3b180bcdc SHA512 ec470f6514cb9a4f680b8cbbe02e2bbe71639b288f3429d976726047901d9c50377dfb2737f32429da2fb0e52fd67878a86debb54520e307ee196d97b5c66415
 DIST openssl-1.1.1b_ectest.c 35091 BLAKE2B a9602255ab529751c2af2419206ce113f03f93b7b776691ea2ec550f26ddbecd241844bb81dc86988fdbb1c0a587318f82ce4faecba1a6142a19cf08d40fb2c5 SHA512 7813d9b6b7ab62119a7f2dd5431c17c5839f4c320ac7071b0714c9b8528bda5fda779dbb263328dca6ee8446e9fa09c663da659c9a82832a65cf53d1cd8a4cef
 DIST openssl-1.1.1b_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
+DIST openssl-1.1.1c.tar.gz 8864262 BLAKE2B bd157b244bedcefb8e646a743732945119b267236789ac69c38856570318aca09299bdaaea3f20294863b633e6fd4dfe124820597185b3b7461cfdf094daadb0 SHA512 8e2c5cc11c120efbb7d7850980cb6eaa782d29b4996b3f3378d37613c1679f852d7cc08a90d62e78fcec3439f06bdbee70064579a8c2adaffd91532a97f646ff
+DIST openssl-1.1.1c_ec_curve.c 17938 BLAKE2B d5cbde40dcd8608087aed6ffa9feb040ffadecf0c46b7f3978cc468a9503f0a5ad0a426ea6f8db56f49a64474a508bebdf946e01ebf09adc727675f3b180bcdc SHA512 ec470f6514cb9a4f680b8cbbe02e2bbe71639b288f3429d976726047901d9c50377dfb2737f32429da2fb0e52fd67878a86debb54520e307ee196d97b5c66415
+DIST openssl-1.1.1c_ectest.c 35091 BLAKE2B a9602255ab529751c2af2419206ce113f03f93b7b776691ea2ec550f26ddbecd241844bb81dc86988fdbb1c0a587318f82ce4faecba1a6142a19cf08d40fb2c5 SHA512 7813d9b6b7ab62119a7f2dd5431c17c5839f4c320ac7071b0714c9b8528bda5fda779dbb263328dca6ee8446e9fa09c663da659c9a82832a65cf53d1cd8a4cef
+DIST openssl-1.1.1c_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
 EBUILD openssl-1.0.2r-r200.ebuild 7981 BLAKE2B b8b41046e8754f64427bd1da2557d654939e8b16f5be96be731e56c26c23a338807641858712ddc589001e5f7cd20c167dfb6e459b1c1086c7cdfb9d3bc253b1 SHA512 530f96ce8e8543cad92138abc6695b0546819d9eaff26d08ebcbf9fd6b1075e777f395af174087016530bd4ed29f067fbb1c6bbd7647354cb87f6ec600811728
 EBUILD openssl-1.0.2r.ebuild 10261 BLAKE2B d69c02146d892718a81ea97c6d946cdbef7fbefdfdbccc1590b961d1514d0c21e5b3f9d52a07465d0848cba20b9d5773092680e95dafb2233232b607582f9834 SHA512 8e5c8ecf64b9684047106fc07d9529f64f34782129975e1dff7777104dd18de66800a75f2cc30dea3d2079e2387843fa742fc470319f53c1bf6574798ddd8630
+EBUILD openssl-1.0.2s-r200.ebuild 7981 BLAKE2B b8b41046e8754f64427bd1da2557d654939e8b16f5be96be731e56c26c23a338807641858712ddc589001e5f7cd20c167dfb6e459b1c1086c7cdfb9d3bc253b1 SHA512 530f96ce8e8543cad92138abc6695b0546819d9eaff26d08ebcbf9fd6b1075e777f395af174087016530bd4ed29f067fbb1c6bbd7647354cb87f6ec600811728
+EBUILD openssl-1.0.2s.ebuild 10274 BLAKE2B 449fe8da38c842deb7d1bd36cadb4f5090b7b969c33ed65279d3aaf6ce8f9082457ead493d203e0497d589834fddd80b20474d1b70af633596bdca334d58099c SHA512 cd1afc4d90d76aea584040334fe354bbe830090259343c82639ca5cd767b450e4f92745b4e7e18e85035f5af14bc9ee29c9f92dbb6a7281f40c42772aed10c8d
 EBUILD openssl-1.1.0j-r1.ebuild 10046 BLAKE2B 13160922f67effce50f1d73e7233c9d2b2373c1dcc2a63a33f92614395620c2dae18c9694c6398cb4cd247ed044c310f6472bd5bf9becef2ae54a81b7529d634 SHA512 6bfc16c20ca75c4c150c5e2899c15ff67e0e11b1f9450b55344f69d56474d7e8f50220f8e808d4160331aa3ae1ca0b0548e4e230ce93454f7e82032b289b3b81
+EBUILD openssl-1.1.0k.ebuild 9998 BLAKE2B 6a7f3c750f34cf1e7d202d739cca5bef55cbb1851ac3ef2ae333c0cbdd82b49e00a8d2f79fc4ae52c1b2f3321a38fa735cf54847174735d574e7b4adb055c84d SHA512 ddceb95296e5906cb999c5652cf1f64edb5de7f3093c1eb36d16385882ec759fafeb768937d9c3449c1483f9f61b21c9633feb3aa78ae5181dcf793d846b103d
 EBUILD openssl-1.1.1b-r2.ebuild 9593 BLAKE2B 9fc53267f4c5059ea12338a666d8bed60462a23461b79ba3e7e4fbc65d50e2cf9fa4923af8827d67b8fd37ecf8ae7b3f0a332aa12db3b4d9bc9a5acf2beb309c SHA512 fe9b503331830c33fae862fa19e384aa5db198525bbc96ffaa46d4bd807e198d2ae8209345707392a4e5e0e209506b87257e1fafd4e694c6bfc385f2d7675a9a
+EBUILD openssl-1.1.1c.ebuild 9525 BLAKE2B ffe3df0bc527dbaedf30e2026f8c976ab2f2d5012e9b5897276288f05165a70c4ff91b5bf5e17762d9dfbfc2bf6d1d6a94268c75790da0f6c6feeb39ea652e9f SHA512 b5539566f093d5c21a3607ef8722c554936a17f65d1035c72530d0d0b2a9d10776b4c7ecd4666f3acc6b700dfdde19551c1e052c694b1ccd7c571bacd943f27a
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.0.2s-r200.ebuild b/dev-libs/openssl/openssl-1.0.2s-r200.ebuild
new file mode 100644
index 000000000000..44b9547d141e
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2s-r200.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2019 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="1.0.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}] )
+	!=dev-libs/openssl-1.0.2*:0"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+
+RESTRICT="test"
+
+# Do not install any docs
+DOCS=()
+
+# 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 build_libs
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.${SLOT}
+}
diff --git a/dev-libs/openssl/openssl-1.0.2s.ebuild b/dev-libs/openssl/openssl-1.0.2s.ebuild
new file mode 100644
index 000000000000..57280189ad1b
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2s.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 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 ~riscv ~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.0k.ebuild b/dev-libs/openssl/openssl-1.1.0k.ebuild
new file mode 100644
index 000000000000..f5af55a9879c
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.0k.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+PATCH37=openssl-1.1.0-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f28'
+FEDORA_GIT_COMMIT="d2ede125556ac99aa0faa7744c703af3f559094e"
+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}&id=${FEDORA_GIT_COMMIT} -> ${P}_${FEDORA_GIT_COMMIT}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH}&id=${FEDORA_GIT_COMMIT} -> ${i%.patch}_${FEDORA_GIT_COMMIT}.patch" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+src_prepare() {
+	if use bindist; then
+		# we need to patch the patch but we cannot patch in DISTDIR...
+		mkdir "${WORKDIR}"/fedora_patches || die
+		for i in "${FEDORA_PATCH[@]}" ; do
+			cp "${DISTDIR}"/"${i%.patch}_${FEDORA_GIT_COMMIT}.patch" "${WORKDIR}"/fedora_patches || die
+		done
+
+		# now patch the path, due to OpenSSL change cb193560e0da17a41b40ce574a2349f1d4d59ed1
+		sed -i -e 's#test/evptests.txt#test/recipes/30-test_evp_data/evppkey.txt#g' \
+			"${WORKDIR}"/fedora_patches/openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch || \
+			die
+
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${FEDORA_GIT_COMMIT}_${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%.patch}_${FEDORA_GIT_COMMIT}.patch"
+			eapply "${WORKDIR}/fedora_patches/${i%.patch}_${FEDORA_GIT_COMMIT}.patch"
+		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"
+
+	# 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 "${PATCHES[@]}"
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# show the actual commands in the log
+	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared || 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
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# 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
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	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.
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(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
+	# Fix quoting for sed
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-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' \
+		-e 's:\\:\\\\:g' \
+	)
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED%/}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# 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
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED%/}"/usr/share/man || die
+	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}
+			# We don't want to "|| die" here
+			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.1c.ebuild b/dev-libs/openssl/openssl-1.1.1c.ebuild
new file mode 100644
index 000000000000..f4e635b13b6d
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1c.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${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"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+# 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
+)
+
+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
+			if [[ "${i}" == "${PATCH37}" ]] ; then
+				# apply our own for OpenSSL 1.1.1b adjusted version of this patch
+				eapply "${FILESDIR}"/openssl-1.1.1b-ec-curves-patch.patch
+			else
+				eapply "${DISTDIR}"/"${i}"
+			fi
+		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"
+
+	# 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
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| 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
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# 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
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	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.
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(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
+	# Fix quoting for sed
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-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' \
+		-e 's:\\:\\\\:g' \
+	)
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+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 DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# 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
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	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}
+			# We don't want to "|| die" here
+			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/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index 27158e81baf7..76fcb23ca260 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,5 +1,7 @@
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 EBUILD ptexenc-1.3.4_p20160523.ebuild 1316 BLAKE2B 5bfb94b2c8768f015452935dc3cfab18f49c37c2de9b1adcc077509a99ab654c6f91bb379ca022805aef2bc79cb20c2554ab313566252e25f5ed4937d3b9c4cc SHA512 e3bb57562cb7215109bddafa5182e8636cc32aa0953d98f33b88cd692df4598c85bac94ee9787e6820779607fefd3c2f09c65a77498bb5ae2fd4cd00e409bb09
 EBUILD ptexenc-1.3.5_p20170524.ebuild 1326 BLAKE2B 4eee0ce2d875623dfb4385543c37c29c65b4c5d8eb1cd78ab15cca2f43f33b7a5c2886b3a9b006dfb0e9c0a36a7c657a7ce90147edd3b0b2408161da1e8c939d SHA512 73036b3d92f6f25a1293257bf64a953e1cc5dc38894a87bc7099e868cc2faea056cf818038fe8bd967195e9ed09575ea2ee33b97d385f320d9c54e9f058cb027
+EBUILD ptexenc-1.3.7_p20190410.ebuild 1313 BLAKE2B 7ea95d47df84cf821c6d41f18e8381f83ac344bcbc62a77085740e485ba4aec3d0a59e5707037f361c2d73d15357a6073182d44d51443b27c3c8ce3fbf82c4f0 SHA512 3c05399a1f3606948e4c0d8d456147b54593d077d697e7d521dbdf385a80ea17b7bb55dd07f2b163be4844a61f4d019032f002f872d1005b453663ab6d378f80
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
new file mode 100644
index 000000000000..2539ee1a51e8
--- /dev/null
+++ b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="Library for Japanese pTeX providing a better way of handling character encodings"
+HOMEPAGE="http://tutimura.ath.cx/ptexlive/?ptexenc"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+# http://tutimura.ath.cx/~nob/tex/ptexlive/ptexenc/${P}.tar.xz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="iconv static-libs"
+
+DEPEND="iconv? ( virtual/libiconv )
+	dev-libs/kpathsea"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_prepare() {
+	default
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=377141
+	sed -i '/^LIBS/s:@LIBS@:@LIBS@ @KPATHSEA_LIBS@:' "${S}"/Makefile.in || die
+
+	cd "${WORKDIR}/texlive-${PV#*_p}-source"
+	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
+}
+
+src_configure() {
+	econf \
+		--with-system-kpathsea \
+		$(use_enable static-libs static) \
+		$(use_enable iconv kanji-iconv)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete
+
+	insinto /usr/include/ptexenc
+	doins ptexenc/unicode-jp.h
+	use iconv && doins ptexenc/kanjicnv.h
+
+	dodoc ChangeLog README
+}
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 8fd0aaecca7f..1e82c594959d 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,3 +1,5 @@
 DIST quazip-0.7.6.tar.gz 149029 BLAKE2B 7eb99f550dc06d8d2911b22214294accaa5126657598bfd60614267715ea968790f470cea2820e1a78a8581ab0d4b75c90589c0da1ae815067e083e389020762 SHA512 4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1
+DIST quazip-0.8.1.tar.gz 150584 BLAKE2B 4a1d61b65b01eee06e1292ee88b543675c77ac922d0fb1726ac0afd447d74e8c8154db82da0ce95c2f2c303c036f2795e8938a412dc22e921ee09a0ef99278f6 SHA512 d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb
 EBUILD quazip-0.7.6.ebuild 1128 BLAKE2B c688ed7a4574358ea89fbeb4965e23e3c25ed78a71dae0f202d98274322a1752f35a10e3a4a9442fd28676b96885037c3b3b71ce988a01d8301ef74586cc804f SHA512 56358d0d23a4b366cf9819a09b71bc494af7368b7825d1a328f1c638d012308507e3c26db6bcc0775d9a32e50da6a2e0a5a5a84b9fa4ea42ce668d6af9fdf072
+EBUILD quazip-0.8.1.ebuild 1137 BLAKE2B e6a8b68e60282463a8804c257ebfd24d0fcd2ceb6431be79572ead0bce48dc7a156a1b1c4a6dcda6f155f9b95a98a2be3e2879c9184b0d45c47170088b45f803 SHA512 8cfe8b24d963f3cc4e22783c09ce7da8a5173c29efcd58ac7f8c19693ce2e1daeb4f4e0fa309ab6809b872e9538a63e1be119ea34c5ef3f88c65e81076dd4c90
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.8.1.ebuild b/dev-libs/quazip/quazip-0.8.1.ebuild
new file mode 100644
index 000000000000..69667b006a02
--- /dev/null
+++ b/dev-libs/quazip/quazip-0.8.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic qmake-utils
+
+DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
+HOMEPAGE="https://stachenov.github.io/quazip/"
+SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use static-libs ; then
+		sed -e "/^install/ s/quazip_static//" -i quazip/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local -x CXXFLAGS="${CXXFLAGS}"
+	append-cxxflags -std=c++11 -fPIC
+
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DLIB_SUFFIX=${libdir/lib/}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# compatibility with not yet fixed rdeps (Gentoo bug #598136)
+	dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
+}
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index 5cf535be7217..e20cea7a4efc 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -2,5 +2,5 @@ AUX rapidjson-1.1.0-gcc-7.patch 1393 BLAKE2B 71affc72ebbf714788e243b75f9157e9423
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
 EBUILD rapidjson-1.1.0-r1.ebuild 1072 BLAKE2B be1b8ab17394ecf0383dd8c7da4a814b881683e7c33a36a24dfd60dfe56f0c751343f67af703c9365d279ba0cdd79d54b129b4316552315789199556a46ebcac SHA512 6bd802f9e22115b54afafa5f8a9b37090382c66717b3e2153c75bf2200c6261c54a02438d644026568a30fc5de361c44529db48eed914816d8f0dde9b1c5ec8a
 EBUILD rapidjson-1.1.0.ebuild 883 BLAKE2B 9ef8ad122d007cf254f5b2ec2f0a19c5f2d79ef0b0d6a210e0f97131caa119a00231d165403c5040fa920e9d88b847474858278923f4bad30f6d28e848defa90 SHA512 622cf41a55c0a773125638e63f7b99d05bebd6e2ad6a20d3c553e37186753284f5ec75e77235519539856817b9c443fb97e5c568da0b1701e4f8d5bf3ca507c9
-EBUILD rapidjson-9999.ebuild 1094 BLAKE2B cff09abe29af443755e68fff426bc46dca4ea08628f663bce079830a1772ccf515eac0c026c742b8cc4549a22206030c8e81d11bb1ec4d7d31c162a7deea9c31 SHA512 c292d6654d312145d45a803f1df4124b9d90e00188c54e9cb117ae63a27a1ff9e4e1284894d372c9cc2c837500dedacb825538924890d0b8e98d1b6610401462
+EBUILD rapidjson-9999.ebuild 1049 BLAKE2B 65bde54b25f8f8813a18ed589f871a763817872781aeeec033d70d68845c4bb6bb8fa735c9554a93d4b680c3cca0fb36efc7a34718f71474503f650184e03390 SHA512 00c021a40bf9cc989a28582c320186f1a8553cd8c441e980df9506e5c7d0931a71078b4462cf4bcc037044dde32503b4f1ac20336c73ec62c930f93b5ad6c7d5
 MISC metadata.xml 395 BLAKE2B acf0adcc9af1a50757d72f4b52d73c2481fda7bb48ebf2b71e7440c81788e1633b45a4af9ee0adbc1984b0667207706d162e1bdb7177ce8f4e85b819f789b708 SHA512 678196ecc89abed8aa3c1699844573b78103f1ee77dd193b68ad1ae1d5518cd46469b0a5850b00a201c41be381c730ced2aec79f8d4230cf61419b3a20a88935
diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
index fe37df29542d..160fb5e9d92f 100644
--- a/dev-libs/rapidjson/rapidjson-9999.ebuild
+++ b/dev-libs/rapidjson/rapidjson-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,10 +30,6 @@ DEPEND="
 	)"
 RDEPEND=""
 
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-7.patch"
-)
-
 src_prepare() {
 	cmake-utils_src_prepare
 
diff --git a/dev-libs/rasqal/Manifest b/dev-libs/rasqal/Manifest
index 1d32240d5595..de87024d3a6f 100644
--- a/dev-libs/rasqal/Manifest
+++ b/dev-libs/rasqal/Manifest
@@ -1,3 +1,3 @@
 DIST rasqal-0.9.33.tar.gz 1595647 BLAKE2B 87bca86b2f0dceb0801f5a34dae9ae1f87d8a7d0dc1e03fdf04998a0d4885ed76be2719d3e01489a5510a26715bb093a75ce194cc42f3cedff88f64161d6a2fb SHA512 05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522
-EBUILD rasqal-0.9.33.ebuild 1711 BLAKE2B d99e0d6bb23ad11e15bdf1812d91e6ba765d115ee003ca99b60458c69825ed2685bd27fdf8876d829e873812818e305547cde413c56a4c9daed38d4fd3c486ff SHA512 577e77820ebb1df1254f6ad559e4091e4f4ecc6d3dc543d9f1378c79ac262a33611ac5fba50fcb9a0b1ffd6fd39e46d4309a28ee11693c4fb82d59a372f26422
+EBUILD rasqal-0.9.33.ebuild 1710 BLAKE2B 365a304af6df2fb79d4681a71d9e750dea17d9cd96c480dac9574a53a17f5a7613bbfd1f0a6a1a5e6e3237222894788a4493eefa2add952c9605e26e9be70f8c SHA512 80d9fc9f59d034033faddec7807f9524cd9d981abbff8124eb9a0417282061e46d227f395be0a7f98395d6ca25e7c5a02ead93155fd29dbec65548d1d92bbfb1
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild
index 9707a9ad8aa7..92686eca94aa 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 e07014279b21..550eb1dabd96 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 1346 BLAKE2B b5078682c1e7244796aa2f9e1bc63a2af8e6627d110cfd8846c129881998d93daa66d830d7d3553e725ada19c5508e21b6e7f0a8fd0d658d3e397ca642dbf623 SHA512 30de1552eb499ac0c1f25b4f06feb319d1eaf64868e3b782265868b5e7ce670df688138a99331590dcedde9f3843cfccfd1b4a1eb8831d59057791f314ad3d4d
+EBUILD re2-0.2018.10.01.ebuild 1345 BLAKE2B efa3dbca54f7d8916ef63e41091daecd85d829a0641877fb82e0ad9251d179a247c5fc69127945a7aad4537d83da7cb93abc1576e223f1bb83527187cffa2795 SHA512 d3c6e9cff14639ab4e8ac01e90e896cdc671898f718444009e32750fb392b35836e87e3a2394b55313d58b652cd6b1822a49211dd3159f7fc867c3dcce6815a1
 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 a7536bfa74f4..8e3f95ed048d 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="icu"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index 8f026475fc09..d336141fc443 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -1,3 +1,3 @@
 DIST redland-bindings-1.0.14.1.tar.gz 792557 BLAKE2B fac20e9e2fbf9a4ea7299ef0b4a656ea3e5f1cbf436cd31c80e81be40dc95e074e557925b32ecf24091ce3cfe882d681318ae8402e14baf1e0966ec8a0a892ed SHA512 5e037a96f857c95bf4b9277d98c7de1fa41c4ba7e49e199eeb516458343587c796a10e857679c889406b22bca8617828a2bccd07c31b73f2366cdea39cefad15
-EBUILD redland-bindings-1.0.14.1-r2.ebuild 1333 BLAKE2B 534ac7ecfd91b4bea0ca1f8832ec38e8e06fcc762ef2bed1ce75ee25ccfa5d492f3b56947a74df2cc1518893701659d6e472b9a00906001dea4c04a79ef730f5 SHA512 ac3108971da8983313f0f2d4cb9242fba85bc2c0af5c249f8757e68966cb8a657a87243902e67c16dcd2a05e10072c796c40d3a4f8868822bd202b70ccc745a3
+EBUILD redland-bindings-1.0.14.1-r2.ebuild 1332 BLAKE2B c48d7f1237b06b03b5e8316a9cbf13dc76ec086bea96342fd7d7dd558389acaa2a0c26f2ea5e3c90b583521aeb5c9164f5cad2b7b141f0a124a2225587548d8c SHA512 1096a3e2c3df6c3523926145db63dab3f334a4e46d35b364dc51ad8913705af0e737d5707c9223e6412f823d957f7782017f3a1b8d6ce619d12ee5291c5febd4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
index f95cfbb27738..b113ecc582dd 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
@@ -13,7 +13,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 ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos"
 IUSE="lua perl python php ruby"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index cba9d48313d1..440b5021a962 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,3 +1,3 @@
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.17-r2.ebuild 2500 BLAKE2B b7e0d2e37bbeb79ba79218431056d5afd65e04d825b9d4f409c9ba1400fe1cde828350e2bc4ed9434dad7e1dca65d7e68eedc7e432e4c6ed1e423d0bd930eaa2 SHA512 75bf0cb44ea5c095b1ea248bbc776ed84a6abbb0ccfdd5804626b570d7e235dec1b0fc03fb008fabe8842c5f90992ae617169484ef3a7b281322c646e5829d06
+EBUILD redland-1.0.17-r2.ebuild 2499 BLAKE2B 9c594b2c2bf208302bfe4b36470c5d74e9cbc4e2ab19c31d7883e32f487993b23f17081b4d917982051cc7c430f1b4828513f93b463e485804feb6385664537f SHA512 e3c520b1228c6eb57aeb7f906b59150cdbfaca57bd4215c2390972af0a818649b969b6cc568ad60781bc1b1294427aeb2eabc93fc801fb6b1a9b6f2af83dcfbb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index d7fa804dcef5..987b257ff816 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.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/serd/Manifest b/dev-libs/serd/Manifest
index 91ff0eb305bf..6d9ca38b7587 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 1123 BLAKE2B cdc884e5acd464322ddf4d5640dab58d812abc06fde01ca8e489a78a4f189dd9622871053f80930bce9060bf01846adbd69c74434907875a194453a17381d53b SHA512 72880352428cb4df6bb15a970474d60402b2dd17cf953d84c0221f7210527fdadb31774beccb3e4e16bdc6faacf34ea2bb247428fd24772e3ff010f6309b0be7
+EBUILD serd-0.28.0-r1.ebuild 1118 BLAKE2B 33772236a29b1d08cd24dd73e5a3029211fb8e7de8708c246054b5e08fb0783e3a177bc00a3c4136b75695c6c3a3b4da0bc702f3881fe6d9fe5a22e8d0740047 SHA512 aae05966d1d890be9fbf40ff94306342836537153a2638acc2bec6026ed0f3535f9bb4e3d007f23aae59b8c14b1377a84bf020ec027880e8e237744df8feedc1
 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 716194bf0d93..d945053ae450 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index 145ce455a601..0cb608af3847 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 1414 BLAKE2B c65a25acd7c95910c740740713117da1247ffcdff6cd5298363f651ea38174aaae0301b3ad3a459f423f293aa2cbcb19d3c526c750483b185f5fe575fda3f42b SHA512 41fc47e3fb877dc3be8a3d1f8acd75569bac4806aa4b67fb3f655a963c973dcb307b62b1fe05256800609b0f2df288aea6e17f87185318547294af43b20335ec
+EBUILD snowball-stemmer-0.20140325.ebuild 1413 BLAKE2B 872cddc7506ab1d3d6af32271aba2f2214bb9a185a03a0babf05798367fc49925b2b42a30cc01a39fbc3b13129aea241812df7b1d244e149af6f9b0e15061254 SHA512 28b6f45099a8a93631e259ebd2bb8c2a944079fd30bac898149b327f360f79a96b0d68f3e7c3b0531bb470cce74c7c0923862dccd98dd5f7a2f242b0c15b9a9b
 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 fe6fcbcaf303..4eb1aa6c4305 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
@@ -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 657a0294c108..5e4ac145f5dc 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 1125 BLAKE2B 1d9ceef0ddb0a470d528943c6d135de64d516bd6e727c4005c3fca44d32578cce8deb339f12f592fddff90f621831a9890af3bb4a5f59cfef67b7ba044ae645e SHA512 ee35c6fb723232babbdeef2adc8f3243d85c652a301e4a0cc312af0325de0fb36ac4e84bfbe8c6203aa9a0fcab74e688bb9b9b5a99c63694791707f5e43ef12d
+EBUILD sord-0.16.0-r1.ebuild 1120 BLAKE2B 04b8f85abad3de3ac22933009631110080c3707d23dbc978acfd95faee5cbee20b85183fe8302d74f2f5d059cc6b7b1fea0ab7539e2eb107bc4fb11652185bc4 SHA512 d2ffd2687e261cd6fc2ecd44e6b3b4eb841bbdb923fbb6977fc2b28867cb0ae877fb7e8322589f60a2536bd3c5d30cb5f2ca98a9a81401a52d5545dad87971ce
 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 6e8b08b93d41..d65bb3b73170 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/serd-0.28.0-r1"
diff --git a/dev-libs/svrcore/Manifest b/dev-libs/svrcore/Manifest
index 2e7a0b04e7be..671be72465ac 100644
--- a/dev-libs/svrcore/Manifest
+++ b/dev-libs/svrcore/Manifest
@@ -4,4 +4,4 @@ DIST svrcore-4.0.4.tar.bz2 217076 BLAKE2B 1d5b1c6d397552f299554a19c21a81d1df8f44
 DIST svrcore-4.1.2.tar.bz2 263891 BLAKE2B 4d546406e18099857c1d77d479123332bdc721b51f5ad6bae74812b77704d3d6f8fa2ab67848355be7050fc3ee161c534fc7ee1692811fe9829da513f7cba29e SHA512 9d148ec9c568f1183e44006fec83b4e43b0cef56d5a04fce122fab1e9a0c0bfe39919de81c5a4d7adb2258fb7f16b4d327da20cdb4d948810e968c422d62ad40
 EBUILD svrcore-4.0.4-r1.ebuild 837 BLAKE2B 309d9419d26117395c0bb618537c978dbc9c61672633d9e928632b01e491eec61ecd28fbad36c4f3ac9af70047c6918e69737e40523de60877e8fd9ba48be153 SHA512 7c10b47f3270b6149b99881a969e889743bce88cad4f1b09cd1519b7e38a77af51a5ec3e073e06132ed24e2f2e1bb23cb4c941d6bdd2d7aaad4a66c5cb121dbe
 EBUILD svrcore-4.1.2.ebuild 692 BLAKE2B d4a2ef8b78ffedc502a6a666dc16fa555d5d012aedf7362da87f6b4092f7274a00d3c06d643919ac6532e3700265ee244c0424a000c73fd41394f50c5041ae33 SHA512 105c0e603d9acace34ad5ab9705eec19822cedfacc85fca1940409d652a2bb3eb1621309f690efdca8705ace076ae0e45d63f232da4e6e98d31c3bd21dda103e
-MISC metadata.xml 351 BLAKE2B faa373d9030626334fad91404fd3a3cf322eb37e044224088fb98d2fac1ee8f002e3ef0b4ca5d098ef1ef59b00ab91589a7dc9d1f4b6dc320ee3c758d8cd12a8 SHA512 6ce6c04a65b242413c57a5d034faac7a94fc2d3a3318b0a613f3a0b27de5968ede9203eca46a0d68c0be8915f7d3e5faf10e64778d086978e2a1f6ea889b42c8
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-libs/svrcore/metadata.xml b/dev-libs/svrcore/metadata.xml
index f7f7b9686a7d..585b0dc75dda 100644
--- a/dev-libs/svrcore/metadata.xml
+++ b/dev-libs/svrcore/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>wes@sol1.com.au</email>
-		<name>Wes</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 605c7d3f8f98..24bae9a8e1a6 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,3 +1,3 @@
 DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
-EBUILD totem-pl-parser-3.26.3.ebuild 1914 BLAKE2B 958f0d5a553afef0dd039fc49e53c92dc2a8b16e2ba424da615791e5adbbb7490e1f6d75ce6258f3da08c27e410e60e9849b3b9894efb50bb906c73cf066b551 SHA512 817f2a12ea42e3be1d4571336422dba6ae88a839b6feeb59d108f1470203eae5a01d0f8f235e3a98bf7c03b28e6201aadcc3d972f4c46f84f7b2e5a0753e4249
+EBUILD totem-pl-parser-3.26.3.ebuild 1913 BLAKE2B c250404ca3ad515f325550ee89f01fc80a88bd6133b3079a8acba60e7a398daa03a9a918ac035d55421606a2739f3acbc798a1222fcf485962f2c10372601cfd SHA512 cd406fbb1a0956500546c32225e0c467e996e7760726118d24f601afe816e8cd9a5822b00928264bf8cbe0705ee9e0c6a24d9d19fed706bd419d648ebc10e11c
 MISC metadata.xml 522 BLAKE2B 733f895375a3a264b84359f121bf92fd602b62eb562a37e5c5cf8ae7947e8138b32067d276cdc13f7a98f8941130fe93f0a5cac7d8f02ee3238ea7ab5cae4266 SHA512 07c6a9bf474a64950ba6e557b3df879e9c8399c0b09a9e7f585821ee540ea40b7459ad8b7c3af728e8201fbe50193417b3298f186c9caedb1b89b538c7c70206
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
index 39531d0cccb1..37f9fb14ce9d 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
 LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt gtk-doc +introspection +quvi test"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index e43caa03761d..929e607b4f2d 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,5 @@
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
 EBUILD vala-common-0.40.14.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
-EBUILD vala-common-0.42.7.ebuild 2524 BLAKE2B 678ebbd2039eec4e6e3d5ae3a7cff41fe78e4b372daabbdd6750c1c27ca2bc2c80d0b72a63bb6b1986e06867ab86620c4733f43666e7012aa4a3e5af9a96f697 SHA512 0d50c061d01fc6fc1d6e022b521eaf0daa8e1f5fbc1ad1bece67294a4f0e3ba02d3758ce15cd28e0b0730ac71850542b20a67bb85d1345c042fe8a601df55351
+EBUILD vala-common-0.42.7.ebuild 2523 BLAKE2B 2efdafda35a260c3a7e0c90af861712787aac0c4b61c1ead2b442c8d0b91ff86028314c1424aaeeafe2e8b67a6f78e06ec52c1ac59ac37a792dd55f5d744c619 SHA512 0027b4ee9528113a78a44506e94cd4fffed6ae38d13edbba2f4ca38432e5e1f54e7097f30285a34a7d846c11075c47fcd436ef3650b7b4e8be023d276bf10a16
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.42.7.ebuild b/dev-libs/vala-common/vala-common-0.42.7.ebuild
index c5c75b595683..dea39516a265 100644
--- a/dev-libs/vala-common/vala-common-0.42.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.42.7.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/xapian/Manifest b/dev-libs/xapian/Manifest
index 5af7689743f5..1eb1fe9a4cc0 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -11,7 +11,7 @@ EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B d1b5198ecb2c78befcf92017ffc74e2626a4575
 EBUILD xapian-1.4.10.ebuild 1944 BLAKE2B 91d5dd19c21679b7b68691f90981c330be0b81f65887c90b0e781ee3943622067a91e850910256378bc47b832589be92115163f65d6ae64f5428a024b9c7d1da SHA512 47329f8de89aa602baeae23980ed3d3d7a23532c1102d5fc25b43e38ebe2f5029ad775adffc99759ceffb403b112809bea2a76c0e16556179b704b62b404b43a
 EBUILD xapian-1.4.11.ebuild 1910 BLAKE2B 0d5fac58808ad36c8abe25fdf09cf5879fe90312fe2ed04549060fa0f71914f24c18ca5846fa4c8ba2a3e9378a8f7b003bb82ce6fb97c7149b2e5334d3a77513 SHA512 87a01a8b23e26ed0a780293090ae5e08d4948814114ced9b41443b6b4b6a5b22b0688cdf8381b659308ab2b8fd68cfbd33ad154fa733ee0b2b844334d51f17eb
 EBUILD xapian-1.4.5.ebuild 1936 BLAKE2B 76f950ad9162610700da01eff6d6f33ab694d1e09b55b08592912323d70f67d09cdec09bd4f1c8316761c4b31c40e978eef683222cfbea90cb21b41cb9444f8e SHA512 6add7e80ac66f69ebbffd464d782ceefe23919faec529dc33fe53fbdc3b9cd17bfaa5be8b8580f2046601654fdd17e611d4395e262ef4a4cfe97aab85dc5844c
-EBUILD xapian-1.4.7.ebuild 1938 BLAKE2B 4be0206ef6d9b5861223f8caabf3369ceb4606566b7e69976508808aec3e373a88fc55f3fd3aa412462301783d2077cba254cbb89c2cd100d0d8aa3ab7b1fa58 SHA512 f49bfe603b15cb6ac73e7931171f6b5feead411be80b5c7580a1968b380e81573d33b5b3d3f4d3016977e4579a46cac52275af6cfb1536e96d9fcce70195929a
+EBUILD xapian-1.4.7.ebuild 1937 BLAKE2B 64996a418dcf2969c826deadfdf8b62474189cf1c32c9c017c1baa1d2ba2b18fdbe0175ff4f7d92347a21e78d4557dec0ac28abb50f7e432486aa52ff9373f22 SHA512 df6f4147fda42057fa70e9d144055cc143472657e5f5767bb2a27aacd95f09cec3e321c75501fe0cbea568141e7222d58990f85ac11141995045cc64aa065a11
 EBUILD xapian-1.4.8.ebuild 1944 BLAKE2B 6cc1549770b5283f153665c3b015264cd5ca3f6a173f3bddc509c09f14735293fa39ad4da9e761e92708cfd54c5dbadb3b056f4327d646b15af074e3757e50af SHA512 d33a78e9db80b47f09c372ed1141db6cda833d333d978af14abcd0026918217e8b7deccf42e286322a25aae04c5427e33595b93f38ae6e2787f09b8bc62a923e
 EBUILD xapian-1.4.9.ebuild 1944 BLAKE2B 6cc1549770b5283f153665c3b015264cd5ca3f6a173f3bddc509c09f14735293fa39ad4da9e761e92708cfd54c5dbadb3b056f4327d646b15af074e3757e50af SHA512 d33a78e9db80b47f09c372ed1141db6cda833d333d978af14abcd0026918217e8b7deccf42e286322a25aae04c5427e33595b93f38ae6e2787f09b8bc62a923e
 MISC metadata.xml 995 BLAKE2B 819460521f02526c8eed62539408148f86c76c0bc33c0104c5c3b52b0006c4396e7cc6b6458521398cd412a8e2e7f6bc34136e2efb2ac5effb6a854bb8642e03 SHA512 ceb0b1563cd98457eb65b42f39445d95a18b047e21bd9eb665caf5a83b23d7798727f0ba49042553e6b8e9a4ec88a2a4d7622c9adf8be50278bbb80aa0948fe8
diff --git a/dev-libs/xapian/xapian-1.4.7.ebuild b/dev-libs/xapian/xapian-1.4.7.ebuild
index 850489cd794a..799618ef9132 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="https://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 s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~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/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index f9a32582b86d..13c7c8d4a28e 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -3,5 +3,5 @@ AUX xmlsec-1.2.28-test.patch 2418 BLAKE2B e5cf92fd7f72be16d95fe67da99c96fc8e1bc8
 DIST xmlsec1-1.2.27.tar.gz 2013651 BLAKE2B fa46a25e3aaef432134d1c98a0e7bf0aba83f2ef6d1aff3774d6d37c5f6f392d1c2c11a0fe433ee910c39b56400c96b74ab061577948622b14a1116fa1ec2947 SHA512 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920
 DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480
 EBUILD xmlsec-1.2.27-r1.ebuild 1566 BLAKE2B 07937e208f8d123a8bc02efae6e83a0da1dc3c89bf8046e8e0f3e1b4378952e1071c71f2ce26230c97058ca4e828769565a5771d528ff20fbe648a6eac7fc6e0 SHA512 fe3ec7050c90a5edd33cc9ed6a8ecb7c03c8bfe71641897aac9f8aeab720bee92a565d51bda30546eb9cb603d399bcc654cadf832da78821e4f6de5dc772f126
-EBUILD xmlsec-1.2.28.ebuild 1374 BLAKE2B 36628d848821c460a3b7ee77822cc78219ac8471a86765783c90a1fce2ca74984ba2ae109db90170567eea5ebf6d5d51586fa81e426d546ec0d2818b4b628cbd SHA512 1bda6cc443d6fa8927755628bd5399be02e589722054acd76586d40f1e9e25dbff627934834b9795762139dde91e7178c4602dc474ece99bec3cc40d03b0cfec
+EBUILD xmlsec-1.2.28.ebuild 1372 BLAKE2B 6694591d9ead51d34ba1701adb642cfe14009032a8e04fa8bcda9a89afff7ed0dd6beb0a4c17e00d2ca0e67db2bc72c74f54295d777622d8cf833c7c1486d737 SHA512 7c4c195d528d89681930054f9433e18aa9772396274858d5fef10afa01ec6906c3ccdee99a7a34dde4a0899d0e51c8adec1ac4e46aa9dd04f44cb68e703e5bce
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
index 5f02c714f9a4..ff93864ba19a 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
@@ -11,7 +11,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"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 7769c04db911..c566989e38ab 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -2,5 +2,5 @@ AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b
 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 929 BLAKE2B 3056d21fbf420a21a5fe3e8ba091b5d1509c5c270dd559faf6ba189c1770f5eae18adb40efc9c67bdc5f662eb94594e593943ec5c9938eb90370007f394bdd70 SHA512 ddf6476d025c541b62e831540a97c16a89706a51c61b1207afdfe52bd04c1175360e67351433158237cb17156e41446a81702e50ede4078a2bb67f08618deb61
-EBUILD yajl-2.1.0-r2.ebuild 971 BLAKE2B 9dddec9de04be2b2b7faad1ca29f5d80f9e8e9e21fbebd8a808b9941c967b458341e7f7bba3d2319622a27975d8306517d09a9c5c54fea0aba6a1fac72e38d18 SHA512 dd1c43e5126d0ec0bb42e18c44ce1acf03677a526c5cf533d0ddcfc1642d71dcdc741bafcb6e84f1f8db8b0382b535f373793cc84287126b56d7cb4b9ea74fd0
+EBUILD yajl-2.1.0-r2.ebuild 966 BLAKE2B 5861f88f62a9ce2d6725e5ac971d1a2cb6934cc5d6f2567460c76aaed3cf399c6b88284b439641b2f6e6f8164b33e630a1190f3a4c1a4f6bbd836c5ad83964cc SHA512 07922ebe0057094df5d077cd6cf068ef77558e7b4b74fa8dbb410d251d443492750cbf2b83681f5c65464abcf8169c5dd1d610e8d8c989d1040348510040087c
 MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/yajl-2.1.0-r2.ebuild b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
index 0e7ec004ef21..d90b251ae72b 100644
--- a/dev-libs/yajl/yajl-2.1.0-r2.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 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"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch "${FILESDIR}"/${P}-pkg-config.patch )
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
commit	2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree	c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /dev-libs
parent	6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)