gentoo resync : 18.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
commit: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree: 326613a08f25851c388715e205576a2e7d25dc4f /dev-libs
parent: b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
201 files changed, 4361 insertions, 814 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0b2f962213b7..72d14eb835c0 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 33addf149d86..8d660b9cc8a5 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,6 +1,8 @@
 DIST amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz 229474380 BLAKE2B f589aad71f093b74e37de40ac7c45ebbbeff93609b2fff1baaba711347a4641ef17acdcbe69d371372510a48bd48262cf6269c1f4d05e264023d52a425a423f2 SHA512 240e701acfde4ebe665cf69c8bd3710d036f450822aeb7ee2a21caab289af44167afda1d3b8d0dbe2c46c4e63d9b6fb5e96778311f342c26f334dc7beb4a2d5b
 DIST amdgpu-pro-19.10-785425-ubuntu-18.04.tar.xz 243520380 BLAKE2B 8c775feaff685b18b6df2f6f17667dbadb3da89f58c823f5470113342b585ecb436fbacef6ba26b35fe05bac53530cfe334d79d933afee303651e1375654da85 SHA512 d9c214134bf220c2ab4a306f5d83ce5718adc1f3e93165c724e70b99b4b5bcd8e703299ed70fe79f1d2db5f4f69cae2e1036b5a6238696346710c88f7fa6b3c6
+DIST amdgpu-pro-19.30-838629-ubuntu-18.04.tar.xz 301833044 BLAKE2B ffdd49be431906c5ba20e9b285b44e368b40a70678177412d2329489c987567612f5262b64a9a1aef137cef603f77f768127d674c13488e13dddbc8732cf729c SHA512 7e8091dd37ae176d1ff131e5e2b13961f5a33fc7243052dce074dffb1468476f267d50a920182358188e44f4a93d0cbf39c5d430d56a9a2e09a67409e3478904
 EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2332 BLAKE2B 20a692a7666997d60c1a2f4ad0f431d016a7a0a75f0f9c898603793d5c481fb662f002f5875e0435f75bbd94b5072f6a30b884eb4e797c64b29681dac35ae69c SHA512 acb6b04711b83787b394fc2ef6b6621ae7e45d67359d4ed6ae39826704660874170babedc15b6e4d69f3bbddb0ce4ba405e7b15ae633fbdf423dfc7358b65a40
-EBUILD amdgpu-pro-opencl-19.10.785425-r1.ebuild 2990 BLAKE2B bee18c16420fd0f4dbed8578fc3330ba97a047bfed6e047c8b9ec44756bb759773efd3a51079bdb86b8cef867ba37a02febe83d8b2ed41fbea5bac3cfea3389e SHA512 12f0a9ab897fd5190d7d55f33e0ec85ea817fedcd339c1df9017bbc37a0e98a6002e9ae6bafe079f678bd81567dd229d8d2aa2f626063b2967186761dae3ac4f
-EBUILD amdgpu-pro-opencl-19.10.785425.ebuild 2945 BLAKE2B e726f111998e748151e074f0b2810cf9bf1c67de2087f63c8c54d216ce3aa15aa600ef3bd0f892349bb4e801062b1da3a06573dbfc03b3f84f082863836c9392 SHA512 32589484e64b9083446768aadbb1d79694c53511a1bc6b2c7de2ea54e3c63005f25d20d4a338f2963604b80e35a66be5a6ce21d172884bdcf65b6af1954e2b7a
+EBUILD amdgpu-pro-opencl-19.10.785425-r1.ebuild 2936 BLAKE2B ca7616f25c0b4ee2b132837bfc5b291338ab9201bfe2037d935821baf0841229ed962af3a5f014ee5d99bfbab1253e09bdc34ea76d25f3e34d9d2218eac0b554 SHA512 732074140878ccd2631182b2f1c5ae4b611d979cddbdc51d90088c775cbd4396c459f4c397354d8fed8730dcae4e6a739333cbf3790caf243bbc628d9fde02e3
+EBUILD amdgpu-pro-opencl-19.10.785425.ebuild 2891 BLAKE2B 7bb17e22e4e2522cab4c2469a785c93cbb947bb4906911db7a86f93aa8135f9d0e6a1a313359b4b1d40b8cb34c12f52612dbb4797ec1f10fe4215099d67a9268 SHA512 53a1f95a1d39541a5ebae9795c35b7e38bd1b15f74c0d9d29436c69b1a0084ab290a06ce702b239bc36bf370f3e49afb07df4dc4c38594e522356e74f368afda
+EBUILD amdgpu-pro-opencl-19.30.838629.ebuild 2940 BLAKE2B 77d5668ce9be3f4cf98d5a61f32a748fd1907b7f34e58e77721a124b5feafcebd092b4debd6b7b4bacb4076252ba592ba893f890b9dc04d8fa2914871abba44b SHA512 64c1d9010a379bb7bd58341ae27291f80d3677409053275ca445dddbd5e13344d1fbd1ed8b55689eef462843fd33d945842d072067676dc19bb4573eed27c61f
 MISC metadata.xml 536 BLAKE2B 788d99a058d77cc3992b953dd8761a224575480b29dd37bc6fc5a5f914fdc03a7c9a9eb70d9d9cebf79394f6e21d966e273ad27a02f93ca887ea48f491b797ad SHA512 912ff2f26e27d5c20219a26505f3a4545409773f1f761de4591cbd7086cd1ff241fca18d7ae5081ed12e04c1b5dc46deeb02b4a68e2a3787d1d20739a818325d
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
index 9e9ca9dc6bed..17472bd93adc 100644
--- 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
@@ -77,10 +77,7 @@ multilib_src_install() {
 	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
 }
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
index 21ba2fc29539..bf99e75ccc57 100644
--- 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
@@ -76,10 +76,7 @@ multilib_src_install() {
 	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
 }
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
new file mode 100644
index 000000000000..a7fc2f7c5bb1
--- /dev/null
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
@@ -0,0 +1,97 @@
+# 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-amdgpu-unified-navi-linux"
+SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-18.04.tar.xz"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+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.98"
+	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"
+}
+
+multilib_src_install_all() {
+	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/Manifest b/dev-libs/appstream/Manifest
index f05e8f2fd755..f71cbc88dad7 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,5 +1,7 @@
 DIST AppStream-0.12.6.tar.xz 1953604 BLAKE2B 28b03a935b8c203f2ac2c52c1de8317cc899f2b81b00e83e2eb858dbd185a985ce608ba3f6b1c35f084b4ee91946a4870c89d6b0c0a4c6fd32a938558e3997f1 SHA512 c19cd89ba39aff5afa2ff6d5fca72581a8624463c33011b11036526db98392ff5aa6c0f599682e90fdee29b8732538cf96c20b66965016b96f60b3f899d722bb
 DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561
+DIST AppStream-0.12.8.tar.xz 1992072 BLAKE2B ae1d6801119798f360b7eae36b0c46b0511a93ae00adb2437e7dda830d5293c622b04475664055bee392dc824f398d42c6a0a4000392f82fc8bdfc828fa0295e SHA512 4354ef1840d919102647feffc38687f508b14fe9c047c868448347d888aa821dd8a4d25787a2ffb55247f8e9e20e9e03ba330ad74ad61d476be0c414c04a7c30
 EBUILD appstream-0.12.6.ebuild 1577 BLAKE2B 068254a2aaf873f8376cfe229596319a462a636137c74a90109c36ef975fa6022fc63bdd7c1469981731cb1e3712740506acebb74756de81502c92127a1be3bb SHA512 1f1c5a1d307e42ddb273c4ad77cc887f913f2a74392ff25050a541403a424981baecd95e1a3c127877888ab9e910307e4a6070821a7892583e5a853620c421b4
-EBUILD appstream-0.12.7.ebuild 1595 BLAKE2B 34b1c48910d151e7a603efbf9b95aa96a54c6d676824a11a01a38ada5e81bbf518393fb51b56a29da8c1cce0cbbd01824fd2e0679bf0595d18998ecebf69f510 SHA512 0f537725005bee2b72e28ae0ea29741f388689199406652ee1eec2168a26e557c010266d2390262c0cb8c1d5ac3b990abd76bbc20cd42b2e70efef194090cd19
+EBUILD appstream-0.12.7.ebuild 1593 BLAKE2B 970c6254d488a75ed7205c7c3564381d987ac6afbcc34aba8a8b6d70e8396832b9be5d4829a394b5c8ea4e88559cd1197cdc55c8904668867619991586c70b1d SHA512 0af12d23c034999c44a59d3cf89b8e25cb08e7bb7d085c4cc0c5c269008a494480cd055b8ffad9e7e83b48a1e69eaa88eb5ebee6fe14486195064e7247dcb7c2
+EBUILD appstream-0.12.8.ebuild 1595 BLAKE2B 34b1c48910d151e7a603efbf9b95aa96a54c6d676824a11a01a38ada5e81bbf518393fb51b56a29da8c1cce0cbbd01824fd2e0679bf0595d18998ecebf69f510 SHA512 0f537725005bee2b72e28ae0ea29741f388689199406652ee1eec2168a26e557c010266d2390262c0cb8c1d5ac3b990abd76bbc20cd42b2e70efef194090cd19
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.7.ebuild b/dev-libs/appstream/appstream-0.12.7.ebuild
index cbbde57065d8..1cacb6a7e53f 100644
--- a/dev-libs/appstream/appstream-0.12.7.ebuild
+++ b/dev-libs/appstream/appstream-0.12.7.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	MY_PN="AppStream"
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/dev-libs/appstream/appstream-0.12.8.ebuild b/dev-libs/appstream/appstream-0.12.8.ebuild
new file mode 100644
index 000000000000..cbbde57065d8
--- /dev/null
+++ b/dev-libs/appstream/appstream-0.12.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ximion/${PN}"
+else
+	MY_PN="AppStream"
+	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
+HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+# check as_api_level
+SLOT="0/4"
+IUSE="apt +introspection qt5 test"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=dev-util/meson-0.42.0
+	>=sys-devel/gettext-0.19.8
+	test? (
+		dev-qt/linguist-tools:5
+		qt5? ( dev-qt/qttest:5 )
+	)
+"
+DEPEND="
+	dev-db/lmdb:=
+	>=dev-libs/glib-2.54:2
+	dev-libs/libxml2:2
+	dev-libs/libyaml
+	dev-libs/snowball-stemmer
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	qt5? ( dev-qt/qtcore:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
+	if ! use test; then
+		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		-Dapidocs=false
+		-Ddocs=false
+		-Dmaintainer=false
+		-Dstemming=true
+		-Dvapi=false
+		-Dapt-support=$(usex apt true false)
+		-Dgir=$(usex introspection true false)
+		-Dqt=$(usex qt5 true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 41356ee64b8b..33395ff1b680 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -7,5 +7,5 @@ AUX beignet-1.3.2_llvm7.patch 4805 BLAKE2B df959c8e482e1810b2257419088a4cd283bfe
 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-r3.ebuild 2867 BLAKE2B 09622ce3932f4b04027b2c4585b3c003bf3a0582f25ef6aae3045b87226e27b3efb5eb640663990e557ba037ebeb48a60fb97392717e3008b62af9e98c9bb386 SHA512 c1c31f7f1eaf6804c3dfaa01e40e8ec3a8476de87806aea3fba2b608b807c43b3867244d86c9b77cce412ff0a8384328ea6893c3d0ec8962ce8a22a2740cb9d3
+EBUILD beignet-1.3.2-r3.ebuild 2872 BLAKE2B 3aa3f5947e4b0febe3b20a3d44174c894eb747e7bae4298ad3acb881f2d85f64853b9b8e09ecb8be4f4d93611b0ba7a2744ce6fbf17b0546cc7dbcc17aae4bbc SHA512 c69487a7ad53caa87b98b4a276f5d8dce898fa0f9d9aceaa3ea73e1e9673104289ab0688377909defe7b381309413d3ff23b802199db9ddb9b80d53f1485f341
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index 132de5924f5f..ffa7b2b286a0 100644
--- a/dev-libs/beignet/beignet-1.3.2-r3.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -20,7 +20,7 @@ IUSE="ocl-icd ocl20"
 BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig"
 COMMON="app-eselect/eselect-opencl
-	media-libs/mesa[${MULTILIB_USEDEP}]
+	media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 	<sys-devel/clang-8.0.0:=[static-analyzer,${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 489bc486287d..12bef49f19dd 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -8,6 +8,6 @@ DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 585e0ee19b76d96116c67b021bbe19fd01d8d
 DIST capstone-4.0.tar.gz 3411532 BLAKE2B 3e60a946e81f6d6ea88c314ad066e1855e2401cd9e8e61a67d48071b0fe4b705b2276b0d2b52d0979f472895a69cbe7609f6a2c60b79be668730f41ea98bf92e SHA512 5a10c67e88b246ad905364c62c56b4741df242c22f1b62bdea171e4d1d43e484f42f30b33e17324be6cff4c6fb10365528a9c3f4b2a5339ad24b0564fdd40bdb
 EBUILD capstone-3.0.5_rc2-r1.ebuild 1437 BLAKE2B a3867e2cbc40acc823bbdbb2908aac3b70ce7abaabff84e98b393ef38a07872c9553f3e2ec225b72a1dd67fba61986b661f6b0faeb46d43545f377c079b65606 SHA512 732b223711c0e7b5c3f1cc935de1d7f28ea7d70b77a733ff25c40fefce6dcf3cee0a180876c79812187a40223f27030d119e7fbfb245efa418a016ea3e5f59d0
 EBUILD capstone-3.0.5_rc2.ebuild 849 BLAKE2B 8954f0ab824ca3532d0fba48e7b41abcc2b463a26bd7795553d8299f64f3b27e850c79bb04f210c3eeb4b27263390e2a0990be5ca76e4774bdfb16aa2921f748 SHA512 7896e5759c146a82b47239bf0fede1c67f49ec9970d3ca82ff1db6d4c53c7c8f3a3a657491ed12a8ca5de585ffcdaf032f3c3d1b9db6db0d4c75e613ef4dfc70
-EBUILD capstone-4.0.1.ebuild 1447 BLAKE2B b4a995e7ba3e84d5497d7de003d268f2fbb71d2abab9ce1e759962c4cb84b7fe65ae3ffb85e109307e16317dfd5938f49affe8ba466cb0320f113ee312e0b985 SHA512 0f52d5c354020d7e6d0cb79bfffe046edf3434e133f3f3c7d1116e46886d40668e8177c44d51062dc22ccaa68e8c9068fa36bdcde16339cefe14620b9262744f
-EBUILD capstone-4.0.ebuild 1478 BLAKE2B 26377bd2101a7d07b96a2a4694dc65c703ed01c4025c89c8f7a605c6d6eb96770848dae7bd2a1787dbdf11555fdcefe8fae077406f3e86a6d9035a2c0495e7d6 SHA512 43a98ec5866876de4872bdd6d8e1c41e355792c40d74b67ffd3068ab24b6ba7c87a99bfc2cc815882b5e1d5cd04de024ceb640ef0880d2fc249e3271acd3bb86
+EBUILD capstone-4.0.1.ebuild 1473 BLAKE2B 205a878f86f832c768f4a052fd7fbbcd72c44cbf1f2a5d98d8e283149f4733544926f6f364132836330c8580eb91d7082fa4d62d73604a38a8441e6fde016976 SHA512 6f99273e9e5b0a214bf6abdb287bfe787561174731e3e1a4dd6c78f5b03e3d1e496427546be0d52d438e03a0adb2898951c16f9472c55ee34730ae307257b7b5
+EBUILD capstone-4.0.ebuild 1504 BLAKE2B 45d6ef6ac54959b9f8f0aacf2e09f22aec1d7c843aab4922f80e50489b00524c9de8e50228982b7650a44efdf879b1a6300966ab1ae19f1d77d89a1013f85874 SHA512 71bbb0ce3eb8dc5b88a1c93fd5d07221ccda696bf3a86476974b7762054bb6a67202be96204ffc947fcf60e5fda40680b8a2bd9e755cbce82a54e74b4baa7bb9
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild b/dev-libs/capstone/capstone-4.0.1.ebuild
index 10fabceeab04..e4931c690d0d 100644
--- a/dev-libs/capstone/capstone-4.0.1.ebuild
+++ b/dev-libs/capstone/capstone-4.0.1.ebuild
@@ -59,6 +59,7 @@ src_configure() {
 		LDFLAGS = ${LDFLAGS}
 		#  libs
 		LIBDIRARCH = $(get_libdir)
+		PREFIX = ${EPREFIX}/usr
 		EOF
 	} >> config.mk || die
 
diff --git a/dev-libs/capstone/capstone-4.0.ebuild b/dev-libs/capstone/capstone-4.0.ebuild
index 2d3c1f9c4544..2f0796ab51f8 100644
--- a/dev-libs/capstone/capstone-4.0.ebuild
+++ b/dev-libs/capstone/capstone-4.0.ebuild
@@ -60,6 +60,7 @@ src_configure() {
 		LDFLAGS = ${LDFLAGS}
 		#  libs
 		LIBDIRARCH = $(get_libdir)
+		PREFIX = ${EPREFIX}/usr
 		EOF
 	} >> config.mk || die
 
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index acdbb27ded75..b4a3a6d72389 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,5 +1,5 @@
 DIST confuse-3.0.tar.xz 449144 BLAKE2B c8e913aa8b074d55535c35ddce7de1a0f21dade78839f66723272780345d4b5c5f265c2040a4abc9b473a09e221b50450382dff60103198f72384d28d1ab068e SHA512 12279045b772e94d2e29201ab1d7aef1ef8e698780a22d6a282d12f51ccd9a437e7817a4dd5e39bdfc8dae79700b72aa0783b4b983a935d751403d2cffd1161e
 DIST confuse-3.2.2.tar.xz 473912 BLAKE2B d8df03f4543291afa6d46a36c48f78d25aee7cdcd0fab7a37a639a73cd0562b52a70057075f83f7e4e56bb542a27561a65e3217c458d757345c46a29203e6187 SHA512 c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9
 EBUILD confuse-3.0.ebuild 1147 BLAKE2B b093e1e0ae54d28daacf0f44053c03e028dff3e39a584105a0a98089afa064876ae733838eae4eea571fbf5045dc96ebfcff02509ca3d239ab7e492aa0bba91b SHA512 a25765ee079b156f33aedd4e9ba0c76a497452ab993c373e67b2d5eee1b74999ff88bd1741c4b5b7383d7d8d71ec720bb69d779e79758479c27bef2d9fb08416
-EBUILD confuse-3.2.2.ebuild 1150 BLAKE2B 33cee78b5b6865bf6940f361a04ca418fea536787068de368e8ee83abbfffbf303b0ef04f0bebbe55de1f9d5e16d1326f9526a40f37d3c22379953bb35d79e37 SHA512 19118efc8f0649dca8f5603df541a3c9d255b7a107113abd0d12694dc920084ba4889ab6432d48d0278b6d7a4137ad42d9583f7c96e11f2c113b727db9a084be
+EBUILD confuse-3.2.2.ebuild 1176 BLAKE2B ccf43f41a046556423e2cf72739fe108d6c647218a7e54b7045c575e4412001b9f9a61446d9be9f259eaddef12392b8592477fff58b3930897811513fd927523 SHA512 c435f6b693d892840adaf9d9e33c4a0306666c864cc4215397380495660e553c2787525be1e7f313b09049261a701f94f18c92c4c74adc862b73696f42823e0b
 MISC metadata.xml 330 BLAKE2B 91be3657843f0a430fe8002a9496e3831c4f6d3d9ac0a04a549835403f01c216ecc95802e023695158ed60a0f194baac91cb75c0f856978aad97e31d2ef5eb12 SHA512 240e353d9f2dc60b40eab3def6e661a9a40e22bf9cdb3e3d0bdc351cc26f45a8104dd5ab487d0248087b6be702640bafc8851c6dddaa315a6260fb61858d790c
diff --git a/dev-libs/confuse/confuse-3.2.2.ebuild b/dev-libs/confuse/confuse-3.2.2.ebuild
index 52a38f545bfb..a36fb39e57e8 100644
--- a/dev-libs/confuse/confuse-3.2.2.ebuild
+++ b/dev-libs/confuse/confuse-3.2.2.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=7
@@ -6,7 +6,7 @@ inherit multilib-minimal
 
 DESCRIPTION="a configuration file parser library"
 HOMEPAGE="https://github.com/martinh/libconfuse"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/2.0.0"
diff --git a/dev-libs/cppcodec/Manifest b/dev-libs/cppcodec/Manifest
index f2b61b253c02..3db5c1391876 100644
--- a/dev-libs/cppcodec/Manifest
+++ b/dev-libs/cppcodec/Manifest
@@ -1,4 +1,4 @@
 DIST cppcodec-0.2.tar.gz 33984 BLAKE2B 248487326d3fafb104d469d16cddab86fe63dec6eecb74af6211c262a42ff8806ee97619459f9dca648107748e30268206e84d64efba47a9ea1c398eb4c06919 SHA512 50c9c81cdb12560c87e513e1fd22c1ad24ea37b7d20a0e3044d43fb887f4c6494c69468e4d0811cd2fc1ae8fdb01b01cfb9f3cfdd8611d4bb0221cbd38cbead3
-EBUILD cppcodec-0.2.ebuild 779 BLAKE2B 2bff6d777076a567b28f2b4ba138000fbff3d40b4005015bb33e13d4d69375ae123026e40f5036c8933ac96d5fcabc273d909589f9a99aee65413f0a1e20bff0 SHA512 b3874abbe0a140fd3ee53c615af7b15c808fac737a0cc26390a05b028c67de61fcbfb85c4e8872d799542f7cd7a9f7837cd6791d71854d7c5755961fe3d90d80
+EBUILD cppcodec-0.2.ebuild 777 BLAKE2B 2e191c3e6e69180df8c6e4a010b12e4e9924157dfc729225e358b58dd0ea63297f2115ef9bfcd8be307a28003edf1147ce0c4a009ce53d6e4f6d18a9234391e1 SHA512 b06784a7b988695e99acb58b292f89baf79508208558304ad952674b7c02f89cad7c9a168eae135c2c2c34d48bd9875c22dd80f15857a204063fdc8e9dd2361c
 EBUILD cppcodec-9999.ebuild 774 BLAKE2B 7b73f884b925c89694cd41531fada72c3851564c91e4d45fd14c10cf01b8e971d5c2a43073eb914efd4a5f1a9b5f4296fee538b8ca6a8f2d753efe2059542932 SHA512 7fc8be9364a979796773ab3024c05dcd21e8c44e3ba8531029f360a5af57ff9b53c47db49816482090ac4cb27303c35af5f0a04c1bf7c3dddf7083c1c412c430
 MISC metadata.xml 385 BLAKE2B b2d35f81b4df3fc6de6d0be3bb253131817980e55fb6b4e1f43c06ec07fb6bd4b6d102248873dd4b8831aa05139879a05953f0f6efccea05a1bb00e8cf5a94b1 SHA512 195de9b1b75f92cc00a943e8dcbda580d7994c0a94947fa964b46ab4ad979ffd85d6658d59908aafe8f265241bfb322eac1ec6586e403246c3eaedf7b2799c11
diff --git a/dev-libs/cppcodec/cppcodec-0.2.ebuild b/dev-libs/cppcodec/cppcodec-0.2.ebuild
index 652020de95ef..28d85ba816a9 100644
--- a/dev-libs/cppcodec/cppcodec-0.2.ebuild
+++ b/dev-libs/cppcodec/cppcodec-0.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/tplgy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index fefe408a5577..ce66e9f6acfa 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -4,8 +4,8 @@ AUX crypto++-8.2.0-build.patch 6814 BLAKE2B 490329199a411c6d291e35216680fae3b540
 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-r2.ebuild 1757 BLAKE2B 4e5aeb50987810116a42540643ad205cdc11828da0d89ef07b15a8f8644de794bf855f01b8615f9f50ea0f02da2d62f170a8a6d83bd3c7f79e073bb4e7d4c446 SHA512 93432cd5e446b19c1f1d5d1c9efed7929b262fae0d558687b947bb39d498fadd3627718bfef831d807ab3be481b02e318be7aac10e244e330b2b298c6039f606
-EBUILD crypto++-8.2.0.ebuild 1122 BLAKE2B d87980a0e685c8920329464642f96d948811dc16788803e0526e687372908afd2404937b3cbe8b17804ff62b3df5844879a969f59ee23affd30aad6b248ac6d7 SHA512 2fe322606599bbb28f6f229dce588017072f9a9efb2c8acf837a1319692db32f7e026df1cc725d3fed7b4ba7cd122ece5273f6df3966614bab88dbaa2707e309
+EBUILD crypto++-5.6.5-r1.ebuild 1507 BLAKE2B 4f2893230ded13387853392a152e07d06ab5726a0b375bb85ddd4951da6629fe37848b67ec3d1983bc2dee1a2ae0b00aee95f2cd2ed27d6676b4ebec45f9d866 SHA512 bc32c5f3418b6cbf1a68aa9230f3a1f2313bc030360082505849dbeed69c5e385624c0137381865e760d0b3baf71a5b135db425c6c8b157fe7075e623aef08a2
+EBUILD crypto++-7.0.0-r3.ebuild 1067 BLAKE2B ea668821b86e1ce420bbc49f469526807479a1fe173fdb26446fec8dba74ddc311b5258ada39f3e3dcc92c571d9455762c70fbaf40f6913686ecf2dc1e5b3ea5 SHA512 81aa77ff0eb1468bf6e6d115c062e4493645843ded79840968d7a7276ed1651ffa2b5a11440e3e80b349f90ee78e3edb1b263e5ddf87a77f0096db76069b5dab
+EBUILD crypto++-8.2.0-r2.ebuild 1747 BLAKE2B b1942241db59fd6f8681daa9963d86ae740cce43fd004f57de4432af668b5584d5049db6c6eff804673948b4ee9f85e2a3b2865493db42e6a69a6d063967d9f0 SHA512 b31518efdacbf66c0f5698898ef98a4d8dea36809c3d1f84070cd2014920736209852194df0444794ebe1e9e261b2576e97862a78b77743b680e00b060b789e2
+EBUILD crypto++-8.2.0.ebuild 1112 BLAKE2B 60bc4870f0d483abc922f3590681cb7644ff3b2cd4234f2724e8d6b719afa04df730df7405435e45ede1a53e8cf6541fdc30e293a29321a7ff90b857ccd08d85 SHA512 6eea13d6963413a0dd4302ceafaa17d24d6e811f5b2295bdc209fb652aca79f6a699c2367e4921072b3edd5c1564e81c36a87bb827e411a55ea996a4fce81047
 MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
diff --git a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
index 03281fc62859..a9e3e6b14bee 100644
--- a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
+++ b/dev-libs/crypto++/crypto++-5.6.5-r1.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
@@ -43,11 +43,11 @@ src_install() {
 
 	# remove leftovers as build system sucks
 	rm -fr "${ED}"/usr/bin "${ED}"/usr/share/cryptopp
-	use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 
 	# compatibility
 	dosym cryptopp "${EPREFIX}"/usr/include/crypto++
-	for f in "${ED}${EPREFIX}"/usr/$(get_libdir)/*; do
+	for f in "${ED}"/usr/$(get_libdir)/*; do
 		ln -s "$(basename "${f}")" "$(echo "${f}" | sed 's/cryptopp/crypto++/')" || die
 	done
 }
diff --git a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
index b9882c54d476..b8e97a92fc85 100644
--- a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
+++ b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
@@ -44,5 +44,5 @@ src_compile() {
 src_install() {
 	default
 
-	use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 }
diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
index 41b85ded0216..0aaec92008f8 100644
--- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
@@ -56,5 +56,5 @@ src_compile() {
 src_install() {
 	default
 
-	use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 }
diff --git a/dev-libs/crypto++/crypto++-8.2.0.ebuild b/dev-libs/crypto++/crypto++-8.2.0.ebuild
index 3adfa849d2f7..fbe99b4b3ced 100644
--- a/dev-libs/crypto++/crypto++-8.2.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0.ebuild
@@ -48,5 +48,5 @@ src_compile() {
 src_install() {
 	default
 
-	use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 }
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index 111ec048c71a..a00df160c88e 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -3,6 +3,7 @@ DIST cudnn-10.0-linux-x64-v7.4.2.24.tgz 424488399 BLAKE2B 9883cccf146e3ca3a05b8e
 DIST cudnn-10.1-linux-x64-v7.5.0.56.tgz 471291852 BLAKE2B 966a84e983631c827d7852e1dee0a87d80b61521a3c7c836c746f6ce5b60afb1da955a692dce5f0166600707c1f060231d7062d78acdf6085deb37c023301b8d SHA512 875e50669f7ab0b8f52e793285041c0a33dfc951a562869258dd22f85c94cc924c87325253f39fa64c4386768eafd3b0fe181188ef6dd5707f57fc88a6495e36
 DIST cudnn-10.1-linux-x64-v7.6.0.64.tgz 500810447 BLAKE2B cfe884dd3b2a5ca4641844a0b5df22420148bcd9092b9ad81a45560f901d36e3ab228e7b5fed85519094f4b68be46cbb631368d67166cbef2546b94185a9058d SHA512 c8d2c6efdb79940f5d475057b1e11246038b894990f58a620635e03d561ec3987806c0bccee8c12d0d3d8c4b5bf5211e46faa2c12918520af61f36bd36eb1738
 DIST cudnn-10.1-linux-x64-v7.6.1.34.tgz 521806738 BLAKE2B 9804ed394cf58f0c415d454ce83503db3faff74181e3746eabbae648cf85718ccfdcc1b64877e30e367a285294665975169fe1f992c27ac12b65d340784079a8 SHA512 81dc9a3d07885996b3b7141ea9785768dd6e266d138a671b934139b38ac1dcab0ffdb97617b308a9f492b5b163cb4dd65972e24de98499a2ecbed2bd261c1244
+DIST cudnn-10.1-linux-x64-v7.6.2.24.tgz 522872521 BLAKE2B 6424ade8443521138b36bb528105bc482202ff475dd3eb3aaa7f992e8ad8b67628ac1b464d10056f16bb5766fb8464abe8ae406f8766831d248b90796d146c1e SHA512 3451c113b4dcb8aaa33b2740e0e0b60d121ef02525c4e8ece3d7afd76b3472f704a90eb69d1a06f2bc94a981c2bfa3bea2f3bd057dcbdc6eecdea1056563057d
 DIST cudnn-8.0-linux-x64-v6.0.tgz 201134139 BLAKE2B a7e616c671272a3a0f0c51b93646c8c60302c3dec85b71144e011bc3460d0ce80ff75d39869c05c4ef183d2d09aff31bb470a3fd3fd3d79b581a7a2d5a349279 SHA512 ddeeacb5b449920d942a26b98c353d78fd6f7d7fb3b3ce42a078626473efdda25c7ae641232702d62eb5749e39ecfd03e88346119c920c19348ac3ee82d3ff47
 DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749
 DIST cudnn-9.2-linux-x64-v7.1.tgz 421083972 BLAKE2B 1a1dd6708132d6ad6f8f541694b1406de4a26b7bb78b6198bc8ec5ddde2172d0cc0dc540c7c446a2f941ad11cfafa562235d17129ab8e6aa641433c35c8d31d6 SHA512 2f67c905976eb041512eb012a7cc98e1f408ec867f6a1d9d440afbcddc622c03c40de10386e44e4ab138c1a4ad040d39b0e9243f68e22975ca27ec297be25c5d
@@ -14,4 +15,5 @@ EBUILD cudnn-7.4.2.24.ebuild 543 BLAKE2B b040a2b17939e30b7c76bdb04dce006e861f5da
 EBUILD cudnn-7.5.0.56.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
 EBUILD cudnn-7.6.0.64.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
 EBUILD cudnn-7.6.1.34.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
+EBUILD cudnn-7.6.2.24.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-libs/cudnn/cudnn-7.6.2.24.ebuild b/dev-libs/cudnn/cudnn-7.6.2.24.ebuild
new file mode 100644
index 000000000000..2f134235f5ae
--- /dev/null
+++ b/dev-libs/cudnn/cudnn-7.6.2.24.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CUDA_PV=10.1
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cuDNN"
+
+MY_PV_MAJOR=$(ver_cut 1-2)
+SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
+
+SLOT="0/7"
+KEYWORDS="~amd64 ~amd64-linux"
+RESTRICT="fetch"
+LICENSE="NVIDIA-cuDNN"
+QA_PREBUILT="*"
+
+S="${WORKDIR}"
+
+DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt/cuda
+	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
+
+	insinto /opt/cuda/targets/x86_64-linux/include
+	doins -r cuda/include/*
+
+	insinto /opt/cuda/targets/x86_64-linux/lib
+	doins -r cuda/lib*/*
+}
diff --git a/dev-libs/darts/Manifest b/dev-libs/darts/Manifest
index 066eb96662ea..3b4eec1eaf94 100644
--- a/dev-libs/darts/Manifest
+++ b/dev-libs/darts/Manifest
@@ -1,3 +1,3 @@
 DIST darts-0.32.tar.gz 234001 BLAKE2B e40f16e6ead25809d981c98924867903e1d0f3734682b61ad1be40a10a4212795dfdef55a0eb6f9d0f60ef7676ed27929a6812bf8f57972dcf00875e99d9917b SHA512 b9af8ce60688f5858dac2cac35a8666848dba6729f9f4364786123a1c0484e56c8b981ec04e59653afbcf20cce3b326a49243095213efb525b5669472ac7358e
-EBUILD darts-0.32.ebuild 716 BLAKE2B e422d2b73ae39488d2fc3fbb81987337712b2206ff8d11fc4f704de8c8483b334f8160f23247f0e867f5939a4742c6945136b6023959fa9f77805f62dd9f853f SHA512 14cb09b610018d813bda854aa26e90cae94700180f91af0bc966e6bca6b9f5c7ceebff9550c72ad5cbe1b9a51f5855771fb275699005d5fa6214f43ba90cc708
+EBUILD darts-0.32.ebuild 729 BLAKE2B 1dc4fef45e356b9a262761d3856ef7f738b410abf05ae38b3e9234d7add6628373742188d5de7e7d909e03da6ab80116f78758c18d82d90228dc0ea1c1ae6e4f SHA512 00b64494e1fe11c587c0a6112e6934574d081657a87f3ae0e9dce4fb5f769b946e52d58039f2d07b4d8ec57a048769fdd6e0830e73b5e1ca4ed11726dfbed954
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/dev-libs/darts/darts-0.32.ebuild b/dev-libs/darts/darts-0.32.ebuild
index 115570f6f76c..b7c803763059 100644
--- a/dev-libs/darts/darts-0.32.ebuild
+++ b/dev-libs/darts/darts-0.32.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2003-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI="7"
 
 DESCRIPTION="A C++ template library that implements Double-Array"
 HOMEPAGE="http://chasen.org/~taku/software/darts/"
@@ -9,18 +9,27 @@ SRC_URI="http://chasen.org/~taku/software/darts/src/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="zlib"
+
+BDEPEND=""
 DEPEND="zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with zlib)
+}
 
 src_compile() {
-	econf `use_with zlib` || die
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
-	dodoc AUTHORS ChangeLog NEWS README || die
-	dohtml doc/* || die
+	dodoc AUTHORS ChangeLog
+	(
+		docinto html
+		dodoc doc/*
+	)
 }
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index bffb96ac0185..9d860309fecc 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,13 +1,9 @@
 AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b3324f57a5db8a13b8d618c75239d339f01c0f0a13bc87c1988e9ff05e92bfd69b0bbce0f5260a3bbb9d38b9d000ac809818 SHA512 ce542011f6ea4398455e418a8eae06508407e975e179306ffca5e3e9702583ff9f5e6010ee2e25d098b7f396c361029c932cd0c40ba3d910d9fb60c97f07f50c
-AUX elfutils-0.173-partial-core.patch 1271 BLAKE2B e8c499676c41bcda97db927a4df2e55a89d931306f3336d289c4235009d473920022455caa8dd4f69848201f23e68d99ac877c65b684f7386fb0660a4f274e25 SHA512 0b6d257e2ae702e3f9d0404a4dea2883b56d521794e5c812f18fe0b2b4deb0af2b15e84b5857901d96f014797e515831768206a1dda2dca3912bb15d2d844bdb
 AUX elfutils-0.173-reorder.patch 1262 BLAKE2B e2691a7e5dd1d6332c7b300a4262f82cc781430dce18adf1184dac99173a6ef41feb013b25c1d8e1c30c8872add163ed232900bfaf0d017e9a427c9ee924c4d6 SHA512 faedaa3b78abf8bafce480be32b5fba3b1964ab2da2e99fae85503a28889b11f1138a40827a289341cf4e29c65ab8ded5bbf92c59f46ca337ead43c8f906ad9e
 AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b16fdf6bc203ed2cde70b0da80d982dc3493c993532492cdb8f597b66fd38ebedf7517403096c1704d77f7541972d875af2b952cad3586751bb SHA512 d3263c42b1638a416e95c2b8e68b15a9723e748490c8eca727da94bf7bb3dd8389222dd01bf69612ba45a20114ee1427d77935c41436d1ca9180fcfd71d3cdfe
-DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
-DIST elfutils-0.173.tar.bz2 8684782 BLAKE2B c5905bb864059bdfb2699a0681a0ec576b6b8da444b0641e8184f58735084588910930bcca14583db6be75b24a0e374413911ded5ba2ca893798404fbe7374eb SHA512 7f38e4ce2098b685f15030bf01f0a66a74aa32fbfcead0304c1d0e0a929b348a72f99e685cd4605465f4337393382112f64b8847e6c2f7cc1a57a4fd03d03eb3
+AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f96a5eefefc4a3a382090eb7cad07c80419218300d853ccbef8f4e2288eb443ff06b3e64bf4511d9fa7aa84f5b794 SHA512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b
-EBUILD elfutils-0.170-r1.ebuild 1790 BLAKE2B 2581434109a567bc3c57d6ebaf6b1416377d2fbfcc1cadc51efbefa02caab505dcdfa22e58b33c80ce37637c5abb1559ebdb117999eb5f552095f85da8f0dafc SHA512 22d72fdb2e2c1e8d4e1d47113a8c0d6aeb2e8e7b9f0759d445e32509c7bce9cc6dc8edd38e12ffa556447981fc60c7a04df76fd6d529b79d07d28cb10314f6ce
-EBUILD elfutils-0.173-r1.ebuild 1909 BLAKE2B ed2992e3c50b9ea4885f434d074782db9b3af7570ae2eefd99c17b6c7cc58a16b3774a4c54545e644ce9ac159f79dbdd0ba22442d2a0cbe098218c2e2016f546 SHA512 9a62caf142a53c2b3ab7da0250235536e6911f0a905a1d56a8ba2469f23c7d11c2a068b22985fce38e5fa1bc00f3a4db6ffd823c69625ffc2914df9699ede12b
-EBUILD elfutils-0.173-r2.ebuild 1961 BLAKE2B 3dbfbcc53a801468deebbc25a9b3c128b85d580fab3c8aafc8b29da3897011f119cf31c47b141289f718d0a72683682db07ebe466f3cb6bdb3de89d69c4cc7c6 SHA512 6696b9f1cc0cfba128049a21186822760a038cf775563f7785efff20697f7324831171ca2a0bd64c43fba1668a4190c6536f034a0f2abd096a5bd1d1faf2a570
+DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f
 EBUILD elfutils-0.176-r1.ebuild 1944 BLAKE2B 5c5068ba8d9eef2406a918bb7fa4eaa65a54dd84198e16bf3cd33025129f7fbeb2180f1e0ca9c0d427a61a26b5660d1624fa371565ad9657b275b5907572ac5f SHA512 1a98e8a45115fdbcbf68924d1cfa87b7df8fcbb50b45860a2fb8dbb3691d4d5bb9153af14d9959035b2bd1b711868dfe7c98d064ef7a6c3659bb6192defd11f7
-EBUILD elfutils-0.176.ebuild 1915 BLAKE2B 2c30c4718da7fc0cf5c16eedda0f460d1e495b92616c5ebfaa667b6df10d7e194ba6a069dde660a8596794acf90c3c9a6bcc172dc914749eb06a8612858c3e8c SHA512 114f21a0334433cb5b365710e4c57bc386b750feb40d72562138b986de55b88e4d468eb57cfbe0668b5f3210cd5c6e3587ba94ed6725bfbab4e8fa89fad4556a
+EBUILD elfutils-0.177.ebuild 1962 BLAKE2B 1679323257c950ea3b2464f2e65853f3b2abf1517997ed61c2a2604658971c11463383e8a905ef958f8c5a2db59c318e1ca82a2b10b6955342f1d5a597fee090 SHA512 a36297dc7350ae97453ce1db675d1d4f0c4ea7cb5ba903e74c8bb4a89a8eb8fbcd7f42925aafbc6629f6091ed85c2ab306d2b28a11db8235b804c6d3f8889150
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.170-r1.ebuild b/dev-libs/elfutils/elfutils-0.170-r1.ebuild
deleted file mode 100644
index 43f88abea483..000000000000
--- a/dev-libs/elfutils/elfutils-0.170-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://elfutils.org/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	!dev-libs/libelf"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4"
-
-PATCHES=("${FILESDIR}"/${PN}-0.118-PaX-support.patch)
-
-src_prepare() {
-	default
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	use test && append-flags -g #407135
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads thread-safety) \
-		--program-prefix="eu-" \
-		--with-zlib \
-		$(use_with bzip2 bzlib) \
-		$(use_with lzma)
-}
-
-multilib_src_test() {
-	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc NOTES
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/elfutils-0.173-r1.ebuild b/dev-libs/elfutils/elfutils-0.173-r1.ebuild
deleted file mode 100644
index d102c9265db0..000000000000
--- a/dev-libs/elfutils/elfutils-0.173-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://elfutils.org/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	!dev-libs/libelf"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
-	"${FILESDIR}"/${PN}-0.173-partial-core.patch
-	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	use test && append-flags -g #407135
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads thread-safety) \
-		--program-prefix="eu-" \
-		--with-zlib \
-		$(use_with bzip2 bzlib) \
-		$(use_with lzma)
-}
-
-multilib_src_test() {
-	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		emake check VERBOSE=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc NOTES
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/elfutils-0.173-r2.ebuild b/dev-libs/elfutils/elfutils-0.173-r2.ebuild
deleted file mode 100644
index 668001589b8e..000000000000
--- a/dev-libs/elfutils/elfutils-0.173-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://elfutils.org/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	!dev-libs/libelf"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
-	"${FILESDIR}"/${PN}-0.173-partial-core.patch
-	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
-	"${FILESDIR}"/${PN}-0.173-reorder.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	use test && append-flags -g #407135
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads thread-safety) \
-		--program-prefix="eu-" \
-		--with-zlib \
-		$(use_with bzip2 bzlib) \
-		$(use_with lzma)
-}
-
-multilib_src_test() {
-	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		emake check VERBOSE=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc NOTES
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/elfutils-0.176.ebuild b/dev-libs/elfutils/elfutils-0.177.ebuild
index e8dd597d47f2..373a5ff08cd7 100644
--- a/dev-libs/elfutils/elfutils-0.176.ebuild
+++ b/dev-libs/elfutils/elfutils-0.177.ebuild
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
 	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
+	"${FILESDIR}"/${PN}-0.177-disable-large.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/elfutils/files/elfutils-0.173-partial-core.patch b/dev-libs/elfutils/files/elfutils-0.173-partial-core.patch
deleted file mode 100644
index 41ef14d66838..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.173-partial-core.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://sourceware.org/PR24103
-https://bugs.gentoo.org/676794
-
-From da5c5336a1eaf519de246f7d9f0f5585e1d4ac59 Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Sun, 20 Jan 2019 23:05:56 +0100
-Subject: [PATCH] libdwfl: Sanity check partial core file dyn data read.
-
-When reading the dyn data from the core file check if we got everything,
-or just part of the data.
-
-https://sourceware.org/bugzilla/show_bug.cgi?id=24103
-
-Signed-off-by: Mark Wielaard <mark@klomp.org>
----
- libdwfl/dwfl_segment_report_module.c | 6 ++++++
-
---- a/libdwfl/dwfl_segment_report_module.c
-+++ b/libdwfl/dwfl_segment_report_module.c
-@@ -783,6 +783,12 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
-   if (dyn_filesz != 0 && dyn_filesz % dyn_entsize == 0
-       && ! read_portion (&dyn_data, &dyn_data_size, dyn_vaddr, dyn_filesz))
-     {
-+      /* dyn_data_size will be zero if we got everything from the initial
-+         buffer, otherwise it will be the size of the new buffer that
-+         could be read.  */
-+      if (dyn_data_size != 0)
-+	dyn_filesz = dyn_data_size;
-+
-       void *dyns = malloc (dyn_filesz);
-       Elf32_Dyn (*d32)[dyn_filesz / sizeof (Elf32_Dyn)] = dyns;
-       Elf64_Dyn (*d64)[dyn_filesz / sizeof (Elf64_Dyn)] = dyns;
--- 
-2.20.1
diff --git a/dev-libs/elfutils/files/elfutils-0.177-disable-large.patch b/dev-libs/elfutils/files/elfutils-0.177-disable-large.patch
new file mode 100644
index 000000000000..782958517611
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.177-disable-large.patch
@@ -0,0 +1,14 @@
+getconf does not disable test on 64-kernel with CFLAGS=-m32
+--- a/tests/run-large-elf-file.sh
++++ b/tests/run-large-elf-file.sh
+@@ -19,6 +19,10 @@
+ 
+ # Only run on 64bit systems, 32bit systems don't support > 4GB
+ # ELF files.
++
++# this detection fails for 64-bit systems with -m32
++exit 77
++
+ long_bit=$(getconf LONG_BIT)
+ echo "long_bit: $long_bit"
+ if test $long_bit -ne 64; then
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 45dd20aa6fa9..876fc812cf6a 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,10 +1,8 @@
-DIST ell-0.18.tar.xz 439368 BLAKE2B 9e65ed73119f322fea7177771d21e46ce9ad7d4060e50d8850451939a66bc82dcc1731ddff56458f4cd60c1b6b82b5023bb96adaf3992d3ec982ed845283c8dd SHA512 cc62d01ffaa11a491d1a3ab2898da001f0a418b968350c2bdba2f381df931e53c4281cc4287937264eee72da263844886816af9baea96d7f65309b3e47e42d31
-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.21.tar.xz 448612 BLAKE2B a20e177bb2ef7620c79cecdb84e47db662d97904189c885c90232a21ca40125bee14218fe2f1f06df74b424ccdc88dcd89da12bc9bf3e86c453b9903ae93013d SHA512 7bb96194e03d0067b22745899eec3f7166dce69aeed2ece1cd362178c1b7f94d464a894417d8329554f5b707133280e6cadfbd4e3ee34a5652f396d719e6fd17
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
-EBUILD ell-0.18.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
-EBUILD ell-0.19.ebuild 1047 BLAKE2B 559ec11d2d8ef153c04dc5a3ba023d44a33ba0e79ac38a5970daa92ca2920f40c4caa0dda42f17a055857ee71ffb9b2754b95f5a0a9131a2d6ce7b1ee75f485a SHA512 820411f7503e5c95fb622aef7b35687795f5a433ac79ff5ce1f607bfe6fbffc28b96b49db2655cbcdaaa944a5586acf192d4c0798892c104e03548db2ac5fa85
 EBUILD ell-0.20.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
+EBUILD ell-0.21.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 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
+EBUILD ell-9999.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
+MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.19.ebuild b/dev-libs/ell/ell-0.19.ebuild
deleted file mode 100644
index fd8d023bed3e..000000000000
--- a/dev-libs/ell/ell-0.19.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="glib pie"
-
-RDEPEND="
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable glib)
-		$(use_enable pie)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	local DOCS=( ChangeLog README )
-	einstalldocs
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.18.ebuild b/dev-libs/ell/ell-0.21.ebuild
index cafd42ed2ce6..cafd42ed2ce6 100644
--- a/dev-libs/ell/ell-0.18.ebuild
+++ b/dev-libs/ell/ell-0.21.ebuild
diff --git a/dev-libs/ell/ell-9999.ebuild b/dev-libs/ell/ell-9999.ebuild
index e067c9ec27f8..cafd42ed2ce6 100644
--- a/dev-libs/ell/ell-9999.ebuild
+++ b/dev-libs/ell/ell-9999.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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/metadata.xml b/dev-libs/ell/metadata.xml
index 01db0cd57ae0..653c017de8b7 100644
--- a/dev-libs/ell/metadata.xml
+++ b/dev-libs/ell/metadata.xml
@@ -5,6 +5,10 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <maintainer type="person">
+    <email>bkohler@gentoo.org</email>
+    <name>Ben Kohler</name>
+  </maintainer>
   <use>
     <flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag>
   </use>
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index a176cddfe7b9..3a4b54fad919 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,5 @@
 AUX 0.11.4-vala-0.42-compat.patch 1073 BLAKE2B 06381277531ded9adda4dc6246176de7f1d6243d05746b667071d76f9e7246d63b8a56aa51b364c02e8ef5c3aa924109d4e9c01a9b311868f66287b769443e45 SHA512 f925fe81d6422fd73aa1b0b624d8bbc7a18f029ed8e806a418c752d32a084d6c2d8b8d205e8a5d65a5a6e6f212c00165b70377f7c6e6caf1d84d7bcd31a7f0fc
 AUX 0.11.4-vala-0.42-tests-compat.patch 1445 BLAKE2B 913bb02f130c5f0d0485afa7c270c885cfac6e22d71fd53c0dffb2098659ac0dd27a57fa18641a0cee3b23bf394222a91dfd32c4e7c604e77c6a69ff4fd799f0 SHA512 61c32261a8eaefa381131c4f3115940d72a5b5af451d80a86d2d391b403436466f57d319fac97b4ab1a083c8b87bad656d2dc33f863bc9b0761c9b9275eb7162
 DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
-EBUILD folks-0.11.4-r1.ebuild 2556 BLAKE2B ca413a1c56321b6c610b3e76c466d67bc192cc39686bb217b78a35a92b45d83ae6f8853fae47308290e112a3ec8b0155fb10c456ca82e5dedd290e3520e82eda SHA512 ebf3b45d6501a313a03423b14bbfbb9c0ae64db08eb259eeed8e017827e659fc8c166c7a17f7bf7355191f9f2eddef9d3e7cf49f40762db13a55e7ee54f22061
+EBUILD folks-0.11.4-r1.ebuild 2563 BLAKE2B d8c4cee6a10be42a91052421d3a3eab4a6a6b67dbc0479dcd8e3f9e71a6d1f0e835f07f0f41e44cf9413f4b9fed7edd7f44c7fd0d8359b127a904337b3a02422 SHA512 84c6923cfc7ab30b27843e5899082a2284c30304b5d3c1353eca590a3729a712f7661365604a862d792fb4d4a0b79a04ea3907c548f90a5396446990d64b3eb2
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
index 58d08c1764a1..ae3a4dd69092 100644
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ b/dev-libs/folks/folks-0.11.4-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 
 # TODO: --enable-profiling
 # Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 8b19a75dfd23..ab0d2647a38a 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 823 BLAKE2B dac34f78cf5c4b564f771a001ebbf4dc52a42c06191364ab1a1efe3f4b0353968db7b560b6987b9df26287e6ce3a4e80e764e1df3e6107a7cf1d2740eb1d1174 SHA512 41c8067e339e22a0f0360dec9a2677b860edef39e888bee37a66cbe89cb6fe27302464f59bee83f14b25f8a06df177d1436c433e6af7746af0dacee1d1b73033
+EBUILD fstrm-0.3.0.ebuild 822 BLAKE2B 1eeca05b7201cd31d03d93cd7d69cddc8fa08fa4f660ca97c94c3db126a64dbab327579d8930cfddbda0afc1105963383d7298c6f284b2efa6483df07a961efa SHA512 5dc820a90d4252e5c31cf252ee2a07621b13c73aab9d4747eea06067b0a4307ce55424b0ecfe6cdaf35a197325e26e64e4eec2d2f06caa3614bb6b3433089f23
 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 4950eecace42..3a1720c757b8 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 ~arm64 ~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/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index ba55240e7456..40a09ff42dcc 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,7 @@
 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
+DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
 EBUILD gobject-introspection-common-1.56.1.ebuild 1019 BLAKE2B 8f1d42b739389066c17614960bc214c616a9717d51e845b98ff0dc59fc10d484bda878a4149b358615568544d5b05259e2a788dce281bd4d5a70fe590373f4ea SHA512 db776369d3eb5af2c664aad6bd52a19f3d0371f9b84221c9cf65359cb625089e54b9b1aa9e3cf926b250fcd89e303a7fcffb34c0e5c58893583c82237a0c16f2
 EBUILD gobject-introspection-common-1.58.3.ebuild 1021 BLAKE2B 42f44b301be74849799c2f3b4382090aa2aa419bf50af10c7143c01251ebb9eab93997bef45e25680a3fd0d599e9bd4979bce5d6f50272199a923da6b3c7a2f1 SHA512 07e3ee6f0ec78190f024045a04b9ae3b83c34c4e495ebd99a9ddd1ad8233ca5989aa54158ed5c77bbff1d98bec21698bb46ac007c75ccd71dbfe23b50b3a4a02
+EBUILD gobject-introspection-common-1.60.2.ebuild 1030 BLAKE2B 5218b44c2b33f827ef1938baee886673372f1c549cb825fd828ccd985c5359297c29bdaae0f77e75a7abd968334f862d27ae63e73796cfce0b59078610ca2600 SHA512 69b3785d707c2ea62c8816961adba2d8e7022983a421c102d9eb46b34f0859fc4b0093eddd009c41e6c02988fbcbaf80102f968202a5c5e79276dfb927bb87ef
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
new file mode 100644
index 000000000000..27b259c27b3d
--- /dev/null
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="gobject-introspection"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for GObject Introspection"
+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"
+IUSE=""
+
+RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
+# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
+# https://forums.gentoo.org/viewtopic-p-7421930.html
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/aclocal
+	insinto /usr/share/aclocal
+	doins m4/introspection.m4
+
+	dodir /usr/share/gobject-introspection-1.0
+	insinto /usr/share/gobject-introspection-1.0
+	doins Makefile.introspection
+}
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 739315b144db..b06eceb140e0 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,7 @@
 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
+DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
 EBUILD gobject-introspection-1.56.1.ebuild 2123 BLAKE2B ee5a7866e95a1a70b74e2313e51a0b443ef2effa47aa9a119bb3c06442ba98e54e45c0d2fad34ade22fd0e1a8c9f4bb54fa4182f9acda62d0570ac30685f9893 SHA512 0e4c52cecf5cd72848f62a89402207c97bc6073472af2b0a3933dfc0f44170d06969f0bd9a0bdb692b3fffce4a1f4b40aad3b55fb9e932dc3dfa90637b9a28dd
 EBUILD gobject-introspection-1.58.3.ebuild 2201 BLAKE2B 53844bc18ba8ebe1e7f5e4e290c323bb02378793b43590bf9326c2af5fee6ad72d1083a37a2e16f654cc4c6a01e0dfa496954328ac1b9bca07aaea24791210ad SHA512 ede4515431a1d256694d18801416eb22ffe4bc6feb7cebc714178044acd396f2044c61976a3703add9066c99d08a2cad16e02b2c38cdd83725509584d4558bd0
+EBUILD gobject-introspection-1.60.2.ebuild 2124 BLAKE2B 2339e661c404552ceba7ed9a73999507da0def83f6e0185f305aab0e2b5e7245c7afd976a6221c6dc70a309055e8c050f783420c1fc54844a9c247c8f45a44cf SHA512 8be68cc09473492b6184c760690037142070ad52d9c4e9fe5ba02adfb645461e3025b38fcfadeec8c1ba168f8761970721c0b6ae312a42808a0a76bbec418731
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
new file mode 100644
index 000000000000..41b7103c3513
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1 toolchain-funcs
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="cairo doctool test"
+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"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.58.0:2
+	doctool? ( dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}] )
+	virtual/libffi:=
+	virtual/pkgconfig
+	!<dev-lang/vala-0.20.0
+	${PYTHON_DEPS}
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.19
+	sys-devel/bison
+	sys-devel/flex
+	test? ( x11-libs/cairo[glib] )
+" # autoreconf needs autoconf-archive
+# PDEPEND to avoid circular dependencies, bug #391213; but needed for tests, thus test DEPEND as well
+PDEPEND="cairo? ( x11-libs/cairo[glib] )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	if ! has_version "x11-libs/cairo[glib]"; then
+		# Bug #391213: enable cairo-gobject support even if it's not installed
+		# We only PDEPEND on cairo to avoid circular dependencies
+		export CAIRO_LIBS="-lcairo -lcairo-gobject"
+		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
+	fi
+
+	# To prevent crosscompiling problems, bug #414105
+	gnome2_src_configure \
+		--disable-static \
+		CC="$(tc-getCC)" \
+		YACC="$(type -p yacc)" \
+		$(use_with cairo) \
+		$(use_enable doctool)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
+		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"usr/share/aclocal || die
+}
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index 2f7362b3055b..09ddbbaec712 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,7 +1,3 @@
-DIST hyperscan-4.6.0.tar.gz 1557704 BLAKE2B 978b6b3aa83962602df9d3cd5eaf433d15875694fbb34868f594fb930260d57e52f2ac6183ca588096de42ac54a4a68c420b4e7fb2a2c4c50e1e078254e6785e SHA512 17bddc0f8085615df633f5d050e21a448bda781512990a1efe59286002114322372d59d165a113dfe5548f77102576208e1c667454ab40e46c0a96208a4fdd57
-DIST hyperscan-4.7.0.tar.gz 1738159 BLAKE2B 88bcfab979b0eb6177404e65cc1124d6fc9f4615346823fd6d5156794134e344d0141be41aeb4d850620947f53471cc8b78ed4833efaa7c075ec3c88d8670ee7 SHA512 ec32cecc98165ab590cefe37c31aa9cbad813aedd6bec72760574a8ece2a8aefecc229b1d76a2e90c54a51302d1db70620278dbb96d47091ebf846e9f8c4ff08
 DIST hyperscan-5.1.0.tar.gz 1810559 BLAKE2B 0946b3afe00cdce51b82852515ffe674729854d762854c252ba90fc73cbdc23205fe75f8e6c4e976efb31bf10950076b5790bd9692768dabcbd642d53e739c32 SHA512 5e6d11429e61dc061dd31e6b311a8c1dbfcd03af6e24d97b95eb2cef24dcd33d593064e5faa7c22807d785a8921bc410a69a43c4e5b3d7b4774f37c4a12a025d
-EBUILD hyperscan-4.6.0.ebuild 700 BLAKE2B 67adb438a7222f1adb85833ba79bddb1f0a6d620bc4a563d9e3d9a785557c71e8a2d08c820fd4615db91077a184d6b17a98cd169344e484d243c3069f2a4a74b SHA512 e5045e9f7811709c3011d833807338f24927c78982d4d8d8cd4c0c33d639664fd346b6290792db25407ad33dedd2d7d61e19776ff86e020a0146f44293699738
-EBUILD hyperscan-4.7.0.ebuild 700 BLAKE2B 7e1c8d32087a735d6f14198eada91352f6cde0bb44ec755345fe46d02d7fdabdc615e33987523e4cab6d87d522588344f65d895f5dab56c30907ae8ad03dc58c SHA512 828897769cb5550563a9bb30c20b45e17dafe25fd22143ea06ed3b8d7111e40ef16069fc04cf56a8b7e3c6c6140ae2447381e166808d54d9c083d3ea6fcdd28f
-EBUILD hyperscan-5.1.0.ebuild 765 BLAKE2B 594f11c997bd8c315a83892eed563405e4a2b25f7f35a8e1e6bced0fec43fff73356a70d0a6aa6b80bce1e1441672217b8a8c435a2f9f8121a0bc7c53f37465a SHA512 b2f17bee988fd0a726be9b97263b0ec53b4cfef990ab8290bb22b4043d26828bf4d328e253e4f4c0b3d9e4cd7024f1f0f5975fc2c42dcfe77fe7c3bb3f08cca0
+EBUILD hyperscan-5.1.0.ebuild 789 BLAKE2B 27f42a6f9a83588eefa43355515b8bf309c8bca15e997da087a36bbbf479759ea35b3f0a375da2594aaa7ad243ce76b0641beb89173d14efa55dbae4b9bd5b38 SHA512 dcf1b2de973ee265fd12fd094f5eb0e74997ecc11e17bb1580b287f3cc58f39abf73ce17d0f67ce6d146422d1fceeba551f9d018d12c678f8bae9491a3c3a31f
 MISC metadata.xml 444 BLAKE2B 135788c6bce69014c87cd2e80660f5ab8563afb0e2bddf281245d64e9787318b8b4cfa743d0d2648b40f40ce909dfe5a8677fe00114311c4d8ea88b037ff9afd SHA512 8b3dd40cc7b43125b2a7297c991143d74a5d3cbb70e0d5608ede859987cd27cae0a27b92c46419746d56a0f88252e6cb75ad6111ac25e920ba4e46acc8caa423
diff --git a/dev-libs/hyperscan/hyperscan-4.6.0.ebuild b/dev-libs/hyperscan/hyperscan-4.6.0.ebuild
deleted file mode 100644
index 7de8f427c25b..000000000000
--- a/dev-libs/hyperscan/hyperscan-4.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="High-performance regular expression matching library"
-SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://01.org/hyperscan"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_ssse3 static-libs"
-
-DEPEND="dev-util/ragel
-	=dev-lang/python-2*
-	dev-libs/boost
-	net-libs/libpcap"
-
-REQUIRED_USE="cpu_flags_x86_ssse3"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
-		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/hyperscan/hyperscan-4.7.0.ebuild b/dev-libs/hyperscan/hyperscan-4.7.0.ebuild
deleted file mode 100644
index 11e8e448c187..000000000000
--- a/dev-libs/hyperscan/hyperscan-4.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="High-performance regular expression matching library"
-SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://01.org/hyperscan"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_ssse3 static-libs"
-
-DEPEND="dev-util/ragel
-	=dev-lang/python-2*
-	dev-libs/boost
-	net-libs/libpcap"
-
-REQUIRED_USE="cpu_flags_x86_ssse3"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
-		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
index ce2fc792b977..b73f317040a3 100644
--- a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
@@ -25,7 +25,8 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-REQUIRED_USE="cpu_flags_x86_ssse3"
+REQUIRED_USE="cpu_flags_x86_ssse3
+	${PYTHON_REQUIRED_USE}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index 273cf5c8b18c..e0ca6dd9e88f 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,6 +1,8 @@
 AUX intel-neo-19.16.12873_cmake_no_libva_automagic.patch 330 BLAKE2B a38c4a03d1837102168b907049c1a8fec93035f7efadd5e5cfb17296fd5fbf17dac1961affaa625847cd7c0cb3694d9d5c36b96d45f8c036334e8dc707100db0 SHA512 5c7133d355e0f4f8c0f8f0c84264d5f2a8cba6126d59b8a509354759a97d1a6f96b5deddcaacbce2ceb32e2014dd2f13e613a7db1973d3f865b906b803e8866e
 DIST intel-neo-19.16.12873.tar.gz 2370395 BLAKE2B 2efc76c9729d3ec000455270e923df1e3d0ec5d0a5c31cd156401b37c63ba01ee2a6051f487a98c4db10f61c2a70434f994f15472f54741ef4a80a71b036636f SHA512 1ec8b7883bfeefc1ed2095eac6111803a44e3c88e8bd1a478fb89a5baa4484fc96894f7ef0c01f4b6b9cb94731cdfc633f38ef2f636fdeb2d5e4344ca4aaa2ae
 DIST intel-neo-19.22.13062.tar.gz 2402939 BLAKE2B e47f19fa602444cb260a2cdd9b676201ec8e4c50fe55c4216f779b8edab3497b5249071edcf5d162457be4f72cd33868cf7a971d99b1ae60e7a5e3714a795e82 SHA512 81ad69d051add3eb8d64373ad2ede0b323a4330c9f18010130e9b3db4d78d6e30e2e37f01c0cb7a77e378af62d9d6dd62755a21b153ae753417a6a2556d61b66
+DIST intel-neo-19.30.13641.tar.gz 2446018 BLAKE2B 640b3076c928eab80911d219dabda85029f544d62ff7d39de465f89844f244e75afe053f8475db79aba88a969252d3d5141f0167c8bc7f05120a71fd9ccfda26 SHA512 70aaccc74d74c1ecc9098e579fd6ad154b22eb6024f84aab626d92ece33f5d5d75bdded1656fa7250f34b5b69f69767f39e22b9777601152a5ae6b32d8e1c796
 EBUILD intel-neo-19.16.12873.ebuild 1239 BLAKE2B 9f656d45ae8dd12435ee39fbfc0c47b00d4556482db1dbd1298940d140e0dca46e5c58684f7388a3e04a68a67cf3d6cba8996c3d3f331135c59077e487054551 SHA512 4fb62c57384aca36eecc1734401ef7a7262811e27650f25fd84d854d217dc9209015ac9685662cf09becf355bf9fa5f6f3826ba11c6bb6aeb453bcf8183cfa10
 EBUILD intel-neo-19.22.13062.ebuild 1346 BLAKE2B f370b74e4661c304cff1460da5c47d07b5768b08b1e67417308ed5965f4c4ef43f140e87b7f4256950935788fa244500c0dde0bc3defde0b7edd52626a2f6557 SHA512 982efe953499958ca48523a3ee7ddf271182221ed04a4ad756c862a5a906e9ac2f3c3c44c5cf1eb0fc154f0b468c50614d9bf3046da906f8b402efd13b063467
+EBUILD intel-neo-19.30.13641.ebuild 1346 BLAKE2B f370b74e4661c304cff1460da5c47d07b5768b08b1e67417308ed5965f4c4ef43f140e87b7f4256950935788fa244500c0dde0bc3defde0b7edd52626a2f6557 SHA512 982efe953499958ca48523a3ee7ddf271182221ed04a4ad756c862a5a906e9ac2f3c3c44c5cf1eb0fc154f0b468c50614d9bf3046da906f8b402efd13b063467
 MISC metadata.xml 871 BLAKE2B 2e394b97e0147760965e10f7d43f3b7f189a0f146df84adbcfd5adf22937587982b113fe4d7f07d436265746eb9339d5141dbe2655846a1b10ebcc0751f1a763 SHA512 1092d3b8c8dd26fac3822f0b4d25f19ea74726df3f3978a6d596a97b5019465a8a7a853fb98512a07f51c5b81ecc3a7fb9350fb796a2fb7fb27fd16b937eff93
diff --git a/dev-libs/intel-neo/intel-neo-19.30.13641.ebuild b/dev-libs/intel-neo/intel-neo-19.30.13641.ebuild
new file mode 100644
index 000000000000..fa2b3c8393e5
--- /dev/null
+++ b/dev-libs/intel-neo/intel-neo-19.30.13641.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_PN="compute-runtime"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for OpenCL, for Gen8 (Broadwell) and beyond"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="vaapi"
+
+BDEPEND="virtual/pkgconfig"
+COMMON="dev-libs/ocl-icd
+	dev-util/intel-graphics-compiler
+	>=media-libs/gmmlib-19.0.0
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		>=x11-libs/libva-2.0.0
+	)"
+DEPEND="${COMMON}
+	media-libs/mesa"	# for Khronos OpenGL headers
+RDEPEND="${COMMON}"
+
+DOCS=(
+	README.md
+	documentation/FAQ.md
+	documentation/LIMITATIONS.md
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-19.16.12873_cmake_no_libva_automagic.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
+		-DENABLE_VAAPI_MEDIA_SHARING=$(usex vaapi "ON" "OFF")
+		# If enabled, tests are automatically run during the compile phase
+		# - and we cannot run them because they require permissions to access
+		# the hardware.
+		-DSKIP_UNIT_TESTS=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+}
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 2a5445ef929d..3da7ec59cd51 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -4,5 +4,5 @@ DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b6760
 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
+EBUILD ivykis-0.42.4.ebuild 633 BLAKE2B 0d5864886d7c16e4c605fee8c50696851e52ecff6a908a44ad818b29c0e6eba525e6109a3f7bd2dc80eada9926028bcbadaea526f562e6b942a272a53c7a39d8 SHA512 7f7b9cc57222554c87c36dd4403132a78caa5327ff843211036b5e80a9d1ed2d05ceea85ee365c48bf8219833de9ef99c6648ac7829e90931f854a6449d0734e
 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
index 01d96ca954e5..56b502130939 100644
--- a/dev-libs/ivykis/ivykis-0.42.4.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 14500d353b66..42be7b8f3ffb 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -11,10 +11,12 @@ DIST jemalloc-4.5.0.tar.bz2 449992 BLAKE2B 6141c71f7f5f9cee91a59eeed9c69b0a69b3c
 DIST jemalloc-5.0.1.tar.bz2 499300 BLAKE2B 551933fcd93315968cbf89bfadc40313717ff216141af8a131f2333d10090438ddf36fbfdc0ee831cbec6f930ae15aa9cfaafae72ed4f38dd97b00712ca918e8 SHA512 8cb5957a5724eb2bbad120cf0028ea8b2b14b4a416c1751b7c967351a7fd51135058ea0d3c4dc1d127c86f3aa7e9fd5ef101857110aabfdb7789427791c432c3
 DIST jemalloc-5.1.0.tar.bz2 515622 BLAKE2B 3c8b35d30fca0018e3e32452e6fa41c7ac59f9f2f7d4bc243237fde95025ab5a7562fb86b5afe2ca9b7bb072f7baf6ac7589a4862d9ebaafddae187d93e20da0 SHA512 d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f
 DIST jemalloc-5.2.0.tar.bz2 543892 BLAKE2B 042dd32452713d0524ae8aedbd3aa96a420037ae3ff0345bbf56a7839ae6ba9e0c700034fab9d5c7b6f4cbb43e2d8199b412901afce16c2785a816d439166e6d SHA512 e3be4d534770126caf10f2684aed9fe4ba1422dd47625fe50343cfb750f26eff869fcc7d1e30a96dd6c73f6614c4bbcd560fd24fc26b55ac731c43e60fd05234
+DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431 SHA512 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
 EBUILD jemalloc-3.6.0.ebuild 1903 BLAKE2B 16c2fb0e1ade011c05cd06fc4d5b2e07cad582d563509690950980b05927f98c2d6ce6d0702db83bfcb7b18543f2846ffc3de1807b57189fb191d6e140071ae4 SHA512 2e48b580adbf9d05b1b0abc21af41e7f9ac830856dd5e5dea3ad2353432cc797c78861698537e99dd8b89f60a3b1ecc86cb0501ce81d1f974dcc7f0017899732
 EBUILD jemalloc-4.4.0.ebuild 1751 BLAKE2B e39f6707e796afe8ea28e055d994f17e5f683e1bf1ab4ac67d492740cca2490553bf88685e8458dfaeb197a5b98ee6b58f242afee337d9cf73e9435c84f8931e SHA512 5d3a5d490de405548f193e29178cb41c876e093fb56af071bef0a8fd330c740b826127ea314e844583652380d02364729e3f8a0ab6ed76a97058ee93103e2712
 EBUILD jemalloc-4.5.0.ebuild 1787 BLAKE2B 06f3036d060df40707bb79c6520b62c13c55c3753d6f40fad5d82509baf76446de952b418c5fed71160a29331398167ceb7c199a872e553555ad6611506e5a4a SHA512 2fbf17ce207095a1948d0180b0769294fb90e5500297152629dc8c666fae1f8c6d182d1d823a2efeaf8b36cd9f9016cc036c9ed3f4be52bc371ab858f9dbcd2e
-EBUILD jemalloc-5.0.1.ebuild 1915 BLAKE2B 7ece59bb02fb7a809814e4925bdc3934660aeddd5ce9f28f51e545b79d0794e3861114cf48bfdf35f56a5e23453655cded7858a1f634f662b6a328273129b2db SHA512 fff3e8afea78b30f2ec4a4675c218779426d93c1437521c9532acf1f1cc3c417758a49765616a30d9b54c5dc8c51f7a8f66bb7fd5db4362c8a3c6bcfcf5496b5
-EBUILD jemalloc-5.1.0.ebuild 1872 BLAKE2B f777715cbde72411ee128c992b122556bf1de06e418e113d66968b3cbe5de1ad00903370d115d43b89c3cafeae46b03bc6680868181ee5d0f40584a6f285c396 SHA512 4c1c05b235c548f959a2e00b23b434a794d78478b818cdaf70e12fae58d9c018c1747525b93a93400454e38309f813de29cd51414b3bd6a30011665b310619c7
-EBUILD jemalloc-5.2.0.ebuild 1817 BLAKE2B 7c7c0ca39e9b44cfc157e33ecbc00eb44cae22e2013ade6f38d832e9562a3b282bd86a5816e94d7194c0b344039a13e2379fd8c9714d742e47f235bc50e4c413 SHA512 4ea52d48abc6e6fae2096b9170121fb4708c4c79e2734ba4df83f7fefff30b8b4db9f357bad54ec74ab4d21dcd572638a7c0194cc1af1a00e20cf23948f3f304
-MISC metadata.xml 762 BLAKE2B db6f1712f7b716c824f199ec10e566fa543aa594a6bc75f60adca55e249163a96adbdff109a49327799bee090b3abadd9961c74878c0b0a9c54aa0cb4118f2a1 SHA512 4fdae623c6f76fad566807e7a48c3cf11b5818bf2f93e32f6c0a53558732642f0011dabb7bd4d7f637c8df141cccdb1075c48177a83caac78f9f375b3e57278a
+EBUILD jemalloc-5.0.1.ebuild 1943 BLAKE2B c63f49de52d468421fcd74f4726b673f1e50c356bcbda8212dc09b3d81d5515ce97d068b3ae5785d3deb55c65f847b975a4496e9d82b1edfdc6aeea2baec5c0c SHA512 d3d32d6b3ed70746106bb881ad251e16e428ea35d361b53bb845f66cb0fab72c8b2fd3f59dec0893525663038ea30e8343bf10c2fecb30d0e4598d771327f1e8
+EBUILD jemalloc-5.1.0.ebuild 1900 BLAKE2B e720371595b0652033dda4960c561a623a2076ca081deeba87bdeeb51bd3734588308a2dc2ae91be7d16637b452e4de11c4022caf330dcb76eeacdbda68d104e SHA512 1cca96a6ba7e45d3bbaae91749dc93a6ff32ab90b473bc179ef35c7f7d8ab9f89db92eab0cc893f3192b979815db9b843edecd9c1ddfa8b3f8ccee9056a764a2
+EBUILD jemalloc-5.2.0.ebuild 1845 BLAKE2B fb4289d6d0a5e3c95adb88bc129efcaa85a81e009a216a1d60b133a5f567c02f21fd9bbdfeecc7f8a582697c0ef98952e2955f3718d8827aff87e2ebb6c98a44 SHA512 d7cfc4732f7830098f1afda42f34d6d2d77e4e0cdb3b9616139b149d9f7e7b29ed27af0324fd2d7c1065f7e44d0d200b03bca1c2baf76e044a64575a6cdda9fe
+EBUILD jemalloc-5.2.1.ebuild 1845 BLAKE2B fb4289d6d0a5e3c95adb88bc129efcaa85a81e009a216a1d60b133a5f567c02f21fd9bbdfeecc7f8a582697c0ef98952e2955f3718d8827aff87e2ebb6c98a44 SHA512 d7cfc4732f7830098f1afda42f34d6d2d77e4e0cdb3b9616139b149d9f7e7b29ed27af0324fd2d7c1065f7e44d0d200b03bca1c2baf76e044a64575a6cdda9fe
+MISC metadata.xml 817 BLAKE2B d5d6f72de6d230f5f1145859729384bfabdfff47430900d7b9d814afb471effd0fd6bdfa9859e20df4568d3af63cf839732e93838c74c626a1cc03a752f0865b SHA512 2859064d9e92245d040e2056719df537b4d4ecccbb6390b6dd878dd739a82a16f31dbe4c6ebbae0fb9c907031f4beaa19a99cb28ca83bfe638b798e5a66988e0
diff --git a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
index f5ad09f06a68..ddad51b8e619 100644
--- a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 LICENSE="BSD"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened +hugepages lazy-lock static-libs stats xmalloc"
+IUSE="debug hardened +hugepages lazy-lock prof static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.0.1-strip-optimization.patch"
 	"${FILESDIR}/${PN}-4.5.0-fix_html_install.patch"
@@ -40,6 +40,7 @@ multilib_src_configure() {
 		$(use_enable debug) \
 		$(use_enable lazy-lock) \
 		$(use_enable hugepages thp) \
+		$(use_enable prof) \
 		$(use_enable stats) \
 		$(use_enable xmalloc) \
 		"${myconf[@]}"
diff --git a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
index 7eda36ea909c..3a7b8d7c3def 100644
--- a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 LICENSE="BSD"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened lazy-lock static-libs stats xmalloc"
+IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.0.1-strip-optimization.patch"
 	"${FILESDIR}/${PN}-4.5.0-fix_html_install.patch"
@@ -39,6 +39,7 @@ multilib_src_configure() {
 	econf  \
 		$(use_enable debug) \
 		$(use_enable lazy-lock) \
+		$(use_enable prof) \
 		$(use_enable stats) \
 		$(use_enable xmalloc) \
 		"${myconf[@]}"
diff --git a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
index 16ced36e7579..3e82a451db07 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 LICENSE="BSD"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened lazy-lock static-libs stats xmalloc"
+IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
 
@@ -38,6 +38,7 @@ multilib_src_configure() {
 	econf  \
 		$(use_enable debug) \
 		$(use_enable lazy-lock) \
+		$(use_enable prof) \
 		$(use_enable stats) \
 		$(use_enable xmalloc) \
 		"${myconf[@]}"
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
new file mode 100644
index 000000000000..3e82a451db07
--- /dev/null
+++ b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools toolchain-funcs multilib-minimal
+
+DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
+HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
+SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
+HTML_DOCS=( doc/jemalloc.html )
+PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
+# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
+# but jemalloc doesn't implement them in its configure; need this here to
+# supress the warnings until automagic is removed from the eclass
+QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use hardened ; then
+		myconf+=( --disable-syscall )
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf  \
+		$(use_enable debug) \
+		$(use_enable lazy-lock) \
+		$(use_enable prof) \
+		$(use_enable stats) \
+		$(use_enable xmalloc) \
+		"${myconf[@]}"
+}
+
+multilib_src_install() {
+	# Copy man file which the Makefile looks for
+	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fixup install_name, #437362
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
+	fi
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
index 848a0a7987dd..14624ae1ff1b 100644
--- a/dev-libs/jemalloc/metadata.xml
+++ b/dev-libs/jemalloc/metadata.xml
@@ -11,6 +11,7 @@
 	<use>
 		<flag name="hugepages">Enable transparent huge page support</flag>
 		<flag name="lazy-lock">Enable lazy locking (only lock when multi-threaded)</flag>
+		<flag name="prof">Enable allocation profiling</flag>
 		<flag name="stats">Enable statistics calculation/reporting</flag>
 		<flag name="xmalloc">Add support for xmalloc (abort-on-out-of-memory)</flag>
 	</use>
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 184a18dc5a37..941e462e8098 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,8 +1,8 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
-DIST leatherman-1.6.0.tar.gz 814463 BLAKE2B 1c990c261ded1fd32bb5b1912f84a4bef8ac3ccfae9172e0496f90283e1a2ac210bf9dc1c7e88bcb8776798674d93c1313359135051b4c7f023e1e3080104e2e SHA512 d0d22b60db2c164183268d29fe1bc1ee9ed16797d38174849eaa74841f801869d038e5672664aae89517487811a70f689a345a2c87d3a2f0a04d55214e7f9eaa
 DIST leatherman-1.6.1.tar.gz 814463 BLAKE2B b3370eaf1312894dadb9e754869cf72d498c452ef4c740acc9550d1c3fd881a673439f35fcfe2475635869910df52e81d0cc9b97a7a2fc62227a14376297f55b SHA512 0803b985b57bd5e34ba31137b31fdfece53cb545dffb6a9447aa3de0353c9300e2d9e41b2b4f761b7683e02ed6577decfb1938d238314fd8439eccb16aa9475a
+DIST leatherman-1.7.1.tar.gz 814579 BLAKE2B e29e8bbdb58800e35c4c790b833a512ead0e177e22f140f16ef725738336b49afa709976ab6062b7219b705e14a369f31eef0ded26d51240919ace2cba1de739 SHA512 753cb89f7511b6fbc66e49e9c1fc3ecf1a2d61781b65baea763666f49780cf84a20e0a90fb98e7146f6e11555f892cbfb9c3b4f0d84961af7cce7fc4a277a7f1
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
-EBUILD leatherman-1.6.0.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
-EBUILD leatherman-1.6.1.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
+EBUILD leatherman-1.6.1.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
+EBUILD leatherman-1.7.1.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.6.1.ebuild b/dev-libs/leatherman/leatherman-1.6.1.ebuild
index 335426971404..3e365ff23fc8 100644
--- a/dev-libs/leatherman/leatherman-1.6.1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/leatherman/leatherman-1.6.0.ebuild b/dev-libs/leatherman/leatherman-1.7.1.ebuild
index 3e365ff23fc8..335426971404 100644
--- a/dev-libs/leatherman/leatherman-1.6.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 2d55d350c668..2b0973d8259a 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,5 +1,5 @@
 DIST libcharon-3.4.1.tar.gz 143489 BLAKE2B e8eb5317c708b808981cf8cb53614b54a34abca284457716b7997633a86e3cc2101f788b5c39b9292944d884985f3c342459626282695be484be5adf32b53501 SHA512 9aa269e477ce6c5c563986fcfd0061032dc58df30a7bd687a243db06ef071e888d45cc2c47cfeaac0837672529d6b3150a0a60d0cb357cea5035e47ba16115f3
 DIST libcharon-3.6.0.tar.gz 143947 BLAKE2B 5787f734e0d494eb9fc151fcf240c36b0ade38546fbbcc4e563c4d746d3e3634bd7e599e8258c0f05d96f33f6ee8283101c7dcaa1e3583244e0109bdbff7a041 SHA512 15d2b0f348bb70ef4fd92e9a4f11ed8d70bd8ee0fcd1e1e8c71d4e04a54fb5dff66f7abe81fea34630f3e200dd1aae39c697dffd95ff35fb60ff06f4a443e8b4
-EBUILD libcharon-3.4.1.ebuild 512 BLAKE2B b5594e176423627d35f1371ffba5c29495fc824d11c3b6b25a698bab2765bcb7c01c30c23a8811e64cb9434a0bb0dc5098612aa103619ae53ee73f349002d2f3 SHA512 44f8c7fbdf5392cec38dce8873c6ffe118fff658e8fd9309db2021b81eed827b23de7038168f1654273782c13d67562bbc1150a5c58a604458f12c2ad061e851
-EBUILD libcharon-3.6.0.ebuild 509 BLAKE2B ac239e495d601ce824933e0d142f524bd0434d4ef4cee4467c35d43d794e4436671cdd4813f93c9ebba4b7993ce17c2f70a4e85b12cfafb0d3ee28f27c0cb8d0 SHA512 0e8586d08199572067904c6df2b736a854276e376368c1f647268a0eb14ce9a976b19d68980a65b5972ef94f068a79117c32d5b2634de4d719520f0890947dae
+EBUILD libcharon-3.4.1.ebuild 587 BLAKE2B 799f3115af06d3b5cc91c1ed0cd52627d1cb8f2eb8281ed1d184ab691059352e13f728cf41d4d6e9e016d1c480d5922cdc5874a97fcd18dd0ba6142c8a6c0771 SHA512 a101825cde1a3f11facfcbcdf4eb9e79cc1edb0109a7d86dced4dca36ee6a760043b15d42bc3a3b9a352a9a7bb46ebbc297c357c9bfc939937d188b32c514851
+EBUILD libcharon-3.6.0-r1.ebuild 587 BLAKE2B 799f3115af06d3b5cc91c1ed0cd52627d1cb8f2eb8281ed1d184ab691059352e13f728cf41d4d6e9e016d1c480d5922cdc5874a97fcd18dd0ba6142c8a6c0771 SHA512 a101825cde1a3f11facfcbcdf4eb9e79cc1edb0109a7d86dced4dca36ee6a760043b15d42bc3a3b9a352a9a7bb46ebbc297c357c9bfc939937d188b32c514851
 MISC metadata.xml 861 BLAKE2B dd8d5bdc3a7e48870daffb19659eba707b1c43c6682fbd5cadf52babd3282315419451c1d5352f0a2e044e60d6fc16c19d546b1dc32ec9da7dceeef4deb45eca SHA512 15a172c082a1cbcdbd0ecd93f475f9a193d3bb0707980904d8f7d6adde745297f64b906134c0c338cdd088f6f54e736b29ee3df39638ffc941dd5eda5f15f735
diff --git a/dev-libs/libcharon/libcharon-3.4.1.ebuild b/dev-libs/libcharon/libcharon-3.4.1.ebuild
index ca9cf5b39c66..1edcc8fe92b5 100644
--- a/dev-libs/libcharon/libcharon-3.4.1.ebuild
+++ b/dev-libs/libcharon/libcharon-3.4.1.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
@@ -16,5 +16,9 @@ LICENSE="LGPL-3"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND=${PYTHON_DEPS}
+DEPEND=${RDEPEND}
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libcharon/libcharon-3.6.0.ebuild b/dev-libs/libcharon/libcharon-3.6.0-r1.ebuild
index 503dd3878a83..1edcc8fe92b5 100644
--- a/dev-libs/libcharon/libcharon-3.6.0.ebuild
+++ b/dev-libs/libcharon/libcharon-3.6.0-r1.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
@@ -16,5 +16,9 @@ LICENSE="LGPL-3"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND=${PYTHON_DEPS}
+DEPEND=${RDEPEND}
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 1e159e6cf9ba..641f578a89c0 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -2,5 +2,5 @@ AUX 3.30.2-leak-fix.patch 820 BLAKE2B 42fa64e28ba3c94e4ff759bb6abaacc6046eb3e6b6
 DIST libdazzle-3.30.2.tar.xz 432192 BLAKE2B 4c31b74b0a5c972b5c86bbacf50862a0c2db5c9ed1e67124671e2ece75d72de4c3605c6ecc81bde10cf2566ae06cbd7f14fccaff5d154c1bd9e53a9f8b2dc2eb SHA512 591c3bb9dd65ae02e6234a1599497dce78d843ee6ca47e8d50656b9f98bab91c7b89424c23eb387184bdb28132e1fbe11ee7c01d4a7f0598bcef92739aa8bff6
 DIST libdazzle-3.32.3.tar.xz 439492 BLAKE2B 7a8cf5a4ad29ca11b489553785e66d49a2ba7998f6791bb392ca37740441ff0e72f59ced192dc681ab20da79cb9183621a7d73baf57c9f045ae917fc993d1205 SHA512 e82d5f04706ec2003db27ece490255264828334d1e1c2076485660539664fd382c1289b9d8d4a6cc2dc31c65db270207e7d51105ffd1cadb7c384cd91199ceaa
 EBUILD libdazzle-3.30.2.ebuild 1418 BLAKE2B 17728c31418560be84d81ad57278bbddeaeec59657956a22c548e70861639eff121d4199fc57d321e88f90dbfbc791fb2f9b51104d09a3a44849d34452e52717 SHA512 e81703274d2f3801069553ebcfe5a77f3c4f096741d9ed44ac2f02ce971b6e54c6561a4a0c6bab3a0ca0a44bbb17fd03c1dfa0522a57b8b6220ca0e17ff0af3c
-EBUILD libdazzle-3.32.3.ebuild 1572 BLAKE2B 54867a4fadcfe33777a64464539a01b3992fb5f3b202a70089ce0f7f93abb56c2f388834a46456f24f5c6395582efe2a4e0e5bfedf6137de9df482edf59ef58d SHA512 35c88f44538ead06c4d290dcee7bbe0ab8c9e0f41edf5a017e97147327d522ea6281610d7c12b7d2b2fe1242b6ae26675e2fcc84957c3889c2d00d6c8f0e562d
+EBUILD libdazzle-3.32.3.ebuild 1579 BLAKE2B 3e3f9c9319f2ad4869370b848b0adc19ebc8dbbbbad8f74cb55bfb4c69a05878dd47d81a3a997a6a664490625b899acecaafdb706be4585df6cf0354d1beb411 SHA512 7203827c55be6e2226f0ebef71386d1e7436b486e850bd1de67058808031c0466e2a53bbbdb37bcf102673607993b33663b25de460b1301334931bc4488232c4
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.32.3.ebuild b/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
index 22a3edefeebc..e982bad9364a 100644
--- a/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index 923c56184f23..5fd68be5fbfe 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,5 +1,4 @@
 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 1252 BLAKE2B 3d9a6de479e080efc8edcb71f4924d809aafc594acf26783a36109ef0520e2b1b715205a386e3ec346b9cec6217c644d2f5f67b45edb5a6f70cae99db20b651b SHA512 e3f51b2c361eef3658ac1ebebc65e3179b2498b024aa6beef7f881be5c70cf6a4668bbb550d44d0f6a3a9aadff4487f33c5bee772b86141c43592b41ea31f47f
-EBUILD libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild 826 BLAKE2B 8a6322d0553d41cd185962c00c895e93f108dba609eba9bfbd3eeb235482ea80715ed3fe1fdee23baf34bda86bd3c96bed497bb8bad54caf5102fcb85eb60e4b SHA512 4b51ccc17e42e9ff0f56b1fbb2e9fd37cfe3bb0c76df4f7ea20744efa3a653fdd06e02291cf80937fa77972bbec04adeb6df1cf38d2e9b530b3141477a9085da
+EBUILD libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild 823 BLAKE2B 02c67bdedb7104bce6031bcd2250bab168e142d9f2e3577e8d48ad54ff04c62a1495a291d54124a651d3d046625104e1541dc0a42ddd720b0da6f38862604e44 SHA512 cbc29dbd5748d9e8a6cb4ec991218b650911a06a4a14c3924aba5c64d8908709b6686ddf7167dc06f7706a03bb184400f6581954ae55ebd9a63acb610ba2c440
 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
deleted file mode 100644
index 94932495e000..000000000000
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EBZR_REPO_URI="lp:libdbusmenu-qt"
-
-[[ ${PV} == 9999* ]] && inherit bzr
-inherit cmake-utils virtualx
-
-DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
-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"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-[[ ${PV} == 9999* ]] || S=${WORKDIR}/${PN}-${MY_PV}
-
-# tests fail due to missing connection to dbus
-RESTRICT="test"
-
-src_prepare() {
-	[[ ${PV} == 9999* ]] && bzr_src_prepare
-	cmake-utils_src_prepare
-
-	cmake_comment_add_subdirectory tools
-	use test || cmake_comment_add_subdirectory tests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_DOC=OFF
-		-DUSE_QT5=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local builddir=${BUILD_DIR}
-
-	BUILD_DIR=${BUILD_DIR}/tests virtx cmake-utils_src_test
-
-	BUILD_DIR=${builddir}
-}
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
index 267ccc08f93e..91e13fae7055 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.ori
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index e1bd33f3b9dc..426aaaa95609 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,4 +1,5 @@
 AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
+AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
-EBUILD libdbusmenu-16.04.0.ebuild 4010 BLAKE2B 57f8dc0556ec2ff1f14cb1cc8941851f4e51fea3ce06a2b3fb6c03ad975247373c7063b6bd8c771001f1f0ff3a19c1377d812acddbd5926347c67305074e0dab SHA512 451323a8a7017cf9c0c39180936693099253cec15ac6ab4cf215f85c518b7095c5265c771c14a3d4ba02e45905ed7b29aa2773fbeb2f4c3b50c812a744d86656
-MISC metadata.xml 491 BLAKE2B 2cf408454b7544b7db725159845410fc104e6b73f3629a7e81b42154ee9700fe94587408cbb95e91f28a9233972c0c0c06dbbbbb9d11d171b809d33ad7cd8e01 SHA512 9183ab899735954d60ecb8b7ca394a72bc519b291fb2032cf5888711ab0f748bed9bc1cfb657ea6c34224b657df5634ab4d54a5bf89fbb0762d5a23d90425d12
+EBUILD libdbusmenu-16.04.0.ebuild 4050 BLAKE2B 7dd433075ca01b118a6c9540f6283db8cba309d93d06092563746338282e11c716a9d142656be3165b8db4edd6808952853947a8aa633a43c3a9b73e96eedbbe SHA512 239eb435509708f61103ac561b34d8f2b355ed3b234a93e68914aa50e86c09f49533a80bdf5b25561a6102b37c312256a106f474995b8b1c4a5d37ebbaa61aaa
+MISC metadata.xml 361 BLAKE2B 93f09713c694acddbfa9011a7a8c688341336d641ac74e49e914e2e099865fa6f7755a645dcee37014f5251b1577b980cb2b62e06d17f3d74ef5f0c02b0e769c SHA512 65033c817aacc6bf81e47970baca8feb6dacfcc74ed788806f65dc49e48178419b300edac867688f1be36d2ffc9291366274832912fa61cee48c328ca8f55efd
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-werror.patch b/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-werror.patch
new file mode 100644
index 000000000000..aaa61785b3bb
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-werror.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/691260
+
+--- a/libdbusmenu-glib/Makefile.am
++++ b/libdbusmenu-glib/Makefile.am
+@@ -68,3 +68,3 @@ libdbusmenu_glib_la_CFLAGS = \
+ 	$(COVERAGE_CFLAGS) \
+-	-Wall -Werror -Wno-error=deprecated-declarations \
++	-Wall -Wno-error=deprecated-declarations \
+ 	-DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\""
+--- a/libdbusmenu-gtk/Makefile.am
++++ b/libdbusmenu-gtk/Makefile.am
+@@ -68,3 +68,3 @@ libdbusmenu_gtk_la_CFLAGS = \
+ 	-I$(top_srcdir) \
+-	-Wall -Werror -Wno-error=deprecated-declarations \
++	-Wall -Wno-error=deprecated-declarations \
+ 	-DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\""
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -105,3 +105,3 @@ TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=$(top_builddir)/libdbusmenu-glib:$(top_b
+ DBUSMENU_GLIB_TEST_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	-DG_DISABLE_DEPRECATED \
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -18,3 +18,3 @@ dbusmenu_dumper_CFLAGS = \
+ 	$(DBUSMENUDUMPER_CFLAGS) \
+-	-Wall -Werror
++	-Wall
+ 
+--- a/tools/testapp/Makefile.am
++++ b/tools/testapp/Makefile.am
+@@ -14,3 +14,3 @@ dbusmenu_testapp_CFLAGS = \
+ 	$(DBUSMENUGLIB_CFLAGS) \
+-	-Wall -Werror
++	-Wall
+ 
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
index a5112080a494..d2da6965ec8f 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.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
@@ -59,6 +59,7 @@ src_prepare() {
 	python_fix_shebang tools
 
 	eapply "${FILESDIR}/${P}-configure-fix.patch"
+	eapply "${FILESDIR}/${P}-werror.patch"
 	eapply_user
 	eautoreconf
 }
diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml
index f6c24ef12fe8..7fcb01d9972f 100644
--- a/dev-libs/libdbusmenu/metadata.xml
+++ b/dev-libs/libdbusmenu/metadata.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
-		<flag name="gtk" restrict="&gt;=dev-libs/libdbusmenu-12.10.2-r2">Enable support for GTK+2</flag>
+		<flag name="gtk">Enable support for GTK+2</flag>
 		<flag name="gtk3">Enable support for GTK+3</flag>
 	</use>
 	<upstream>
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 45365ab0ff3c..c49c97a6c7ab 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,7 +1,7 @@
-DIST libevent-2.1.10.tar.gz 1074897 BLAKE2B 15c86f9d82a54912dc8ebde54192e77dc105a9b7fab215a3ba0b85de31e9caccef8aa02ace0172e22ee394cff0e7b5a4e8ff2a8c5c3e472378630f66b1c0d33b SHA512 2a449b60c5bba0908f693d3169a2941f0952b462ea18cf3c7a7288cd902592f35a42c76096af502f04259ffce2567233fda3586578c2ac53fbfce6e00d35c086
+DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
-EBUILD libevent-2.1.10.ebuild 1680 BLAKE2B 38059071769d093178d31de9ff77a3f00e188f3bec08c688d35be003e8a6ec76f090263c22239b57032b261ddd190f34d06052555458ceab756847810fc06742 SHA512 4b4a40df65a482542d2e9086744ce8c793320c74389c995239299811ac17e663ea97c084375025eb568e298c8b5419cc46bee6b294a537532be167676dd0534d
+EBUILD libevent-2.1.11.ebuild 1680 BLAKE2B 1210af2341c69b0894533524421dd680351707fa7285e6e06fcc40ce88da6c1da5364b55329296862f914e30d589afe38be921aae71723410d9fee1ad711cff0 SHA512 f90ae6cae1d90ac481d096f66c69662390086924f00007040f635e9689ab29c27a624ee25d888c54fd48767d5200b99ab5cb8c49059ba97ee9d5d327a1d2166c
 EBUILD libevent-2.1.8.ebuild 1703 BLAKE2B ab36dd6165c91aba3eee97f652f50d20a8bf5f391c01cd568453b31ff24390eab17d10a0669e7f34759e25ea65163e463e95bc320a94ab14df1acbbb89b460b4 SHA512 aadd8949ea76bab2d03f5155456ddf9b7740c408ab818a2efe48959d839ca61a29ca01ac96557af0cddb5a7e3c9810e888eeb5dd4be52e72a189e1d4466aab68
-EBUILD libevent-2.1.9999.ebuild 1305 BLAKE2B b55445f376cf87b92c0921a45d9afb86d6108ae052305f7311045845931a384a08e6963286e5f124df52b924b5f6f7855ac850cad77c13162ae878e12e74a2ae SHA512 d9e19f90f9dccda27e4cc9758dce3ac52ca4d666cbb3ed325f72f5e72162bc404604f20c7a86a4ec74aa9601607a92972ed5927aad54ea8f26cba70d089c8326
+EBUILD libevent-2.1.9999.ebuild 1305 BLAKE2B 700706493970712ee849965e9a43aa4698694793e43316cb041f24dd1a5918f0f9be95f8f831938bc5ce22c8658781b1c8adc9822f1b3048c8317304576716ec SHA512 6833ac30705f79f88d348c4b0fb5a71ae9749be51036a6890a7d3260a92dcc32970aad657eff6400c89e5e786cdd8825bfebf9cb943f2abaef38c0e411c15f0d
 EBUILD libevent-9999.ebuild 1242 BLAKE2B 64d887151fa3290389d91f64142e85b8302c0150ea943197ad0e4b64ff41f07426b573dc7e98d715f9a7c523f12d8b68aa477d4a2ec898189b5f73b0a73ca263 SHA512 54669027b1982f5f538df5f68aa32b91b468c9be132419e532fb7effc97d488417037ed480efd7e008f913724d347f5d037b6c8a2378e7b65489034c55628e57
 MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
diff --git a/dev-libs/libevent/libevent-2.1.10.ebuild b/dev-libs/libevent/libevent-2.1.11.ebuild
index 89ba66189985..aab84dca42b3 100644
--- a/dev-libs/libevent/libevent-2.1.10.ebuild
+++ b/dev-libs/libevent/libevent-2.1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 "
 LICENSE="BSD"
 
-SLOT="0/2.1-6"
+SLOT="0/2.1-7"
 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"
 
diff --git a/dev-libs/libevent/libevent-2.1.9999.ebuild b/dev-libs/libevent/libevent-2.1.9999.ebuild
index 0a40893390d8..cf4e7dfeb381 100644
--- a/dev-libs/libevent/libevent-2.1.9999.ebuild
+++ b/dev-libs/libevent/libevent-2.1.9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 # libevent-2.1.so.6
-SLOT="0/2.1-6"
+SLOT="0/2.1-7"
 KEYWORDS=""
 IUSE="debug libressl +ssl static-libs test +threads"
 RESTRICT="test"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index acac624796ab..5e5b596d861c 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,7 +1,11 @@
 DIST libfilezilla-0.15.1.tar.bz2 404746 BLAKE2B 644f4b8949670d5b07f9e7b861d388ce70eae6612e34bf938cb628b65724a527e33c1f039087fd8381c06a15c12cc2b4fc6f616cc5949bf325e2eebf41abdf2d SHA512 d557f7636bfc3958b8558fab3384b0ea84caea594566d39c051f20f02dfd71213369c50df282a3f7d2dd757038bd26e9722214839dab965cb7cde9733d59883a
 DIST libfilezilla-0.16.0.tar.bz2 413535 BLAKE2B ea6ce80e272efea3fcef2fbd1f0ecca1248c314eea49631b4a98d257cfe1ebe505de011c021874ab0158883077d0af61929689ffb2b92528ef50502d84c933a7 SHA512 ea3302ae0c51582d6715fa3dd06d330a2ac820c3229b4dcab4a3470021dba667b6aea1a5b13168d720d7218cc8513e40c97990ed6573d0ea46d76e6ef50c2e6e
 DIST libfilezilla-0.17.1.tar.bz2 517778 BLAKE2B d678675b2fafe80e2f0e54af372220194870460c1eeaeb91ae6709ad8addcfbb6326819bbaf1d3782e391b07172f94783b0d8a3405f54bad3f818c72426b5047 SHA512 c9c88bf3cbeb5284c3e55571b40b07f780cb23aeb802284d385a2564bf46396875a34739f9819b0c3f89923950f19a13f6454940434a987bb91b2f23b898f774
+DIST libfilezilla-0.18.0.tar.bz2 526221 BLAKE2B f2bc8610a2bba6e296a0bcdd0ae52f4c03dae14c5ff85db89c15fdbd4981bb1cc0001072b59ccd543968c96f08ccf7f59c14ae7ec24c9c539a653bb321908a81 SHA512 745039ca0123516bc58a7057117386fdaed8956b7612b331ffd10f3c7b6c739c47c9c90261ccaf5f7862662775f6b0b467891731ae30c5976d36a0cfb0102455
+DIST libfilezilla-0.18.1.tar.bz2 526448 BLAKE2B e4d709096db184072b9038cc85265fc8a16049ac2c460a45717d8386dfb36ffac17b75141565de2cfb1f37b08bc0c23aac348181ac34ef7ecd8014e543f1fdaf SHA512 b1077a48575ec6bd99cb01a21171fdec4ea662bb4ecb568cb547c6401164854588801cdc4ae80d62809534d2b04d42dcc3f7325bf57af0e2e737a4ca9f15032e
 EBUILD libfilezilla-0.15.1.ebuild 892 BLAKE2B e93ea6ffe19681a690f1fc9df8f811b1245c35a6e5cfbf6f553fe88355382c7ff362aeb97a3f323c56faf5a4855c2e582a162bd8ccf961022a776dc23cfe024e SHA512 fb897a916e059235c8daef7eefd6a52a67623a7b7048a5f132cc91190c514209663808d525ed5f0607ad82a8b208238d3d78e57a154aadff0cab9e9b474b93dd
 EBUILD libfilezilla-0.16.0.ebuild 894 BLAKE2B b8e4add077c17fefc6ac06c0430ab72daaa389fa41477b62176512919b91dd20b7d82775d9af0c0ad520f992bdd9402d35db91c7dd570d9ee604ba477281a0b6 SHA512 054e46acaa485b9b2b109fb5a5d9046de22a3ee1db8f585e784d0e8e9a9e37eda4b7b8589f9446acfa216341c5f53328c1cb514954711d3ff11ddadce03558e2
 EBUILD libfilezilla-0.17.1.ebuild 924 BLAKE2B dca7cc4d3375a4efa42c56b80fbc9cdf08b9bd7b15f7df34fd3dc95cef57c6d00b6b4131a51d43032b761907cc50b3b362c9718b136f419d5760e1b824fe73c7 SHA512 9e075a5b597f488808284ed653d4a5f6251a58bba203ef9933331598bf6eff70c85301a5cd75fe77ecd8d8c56a90a2183fa6b82b46d45e72de2ac4c048d28537
+EBUILD libfilezilla-0.18.0.ebuild 1023 BLAKE2B cf5d65ea1a6178922c004a9ff6a0eaa853855844516891f40143d491831b7d5aceb6fa3138994c7b6b2e59ffaeef4e16aaa60dd0f47c9963e8d5f61a357e18a0 SHA512 798afdf395ccd2ea8b542877ca7828a59f920082e48b74405aeb4012cc86a2c1913b970c79f857363cf6a3326edae2c5530ff65bd53e0bd8069905fe01262603
+EBUILD libfilezilla-0.18.1.ebuild 1023 BLAKE2B cf5d65ea1a6178922c004a9ff6a0eaa853855844516891f40143d491831b7d5aceb6fa3138994c7b6b2e59ffaeef4e16aaa60dd0f47c9963e8d5f61a357e18a0 SHA512 798afdf395ccd2ea8b542877ca7828a59f920082e48b74405aeb4012cc86a2c1913b970c79f857363cf6a3326edae2c5530ff65bd53e0bd8069905fe01262603
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.18.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.18.0.ebuild
new file mode 100644
index 000000000000..7ed54fcee7d1
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.18.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_install() {
+	default
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.18.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.18.1.ebuild
new file mode 100644
index 000000000000..7ed54fcee7d1
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.18.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_install() {
+	default
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 64c80b578849..c50b1c082cf3 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,5 +1,7 @@
 DIST libgee-0.20.1.tar.xz 681464 BLAKE2B 5e7d6d9fb9c2833bd7334f5fb38dd1ff151ee4e5ebc3414d904b9c0dc57d3c3fe56ea2194828f9bc1eec57413058cb6866156a5e3da76381cf71fe98102d9c52 SHA512 b991acfea965e0afa007adac0df1763c3b97b31bf2832c0408128d02f4bb237a03c583b4dd107de1ed877ef042614352c845b6ba5f8b6fb535f43e2400746d7f
+DIST libgee-0.20.2.tar.xz 675684 BLAKE2B 197eea5f1c4babf203e58c65a3419407c7657f4fb92e4e921afa2408cbe3dcba3f8e554a898766c83d3318a4a7fddc47b17f21daf04d79b5635e3363749cb035 SHA512 4ea312f73046fee5d0ad1d5d1942c9f4aecbec22509ce7f00b51352039b9643d65d2f37d4c0de550f0165ff7f6058cf88ecb55d7c5963706a1b63d5ec14c7d7d
 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a
 EBUILD libgee-0.20.1.ebuild 679 BLAKE2B 56a9571229a501d6116c9c4de19620e8323caf7d5d96402b180ea1b82108fd04445f4e8694fdc9db522c873e956daed754fd974f8f481afcbb363f8e4103dfa2 SHA512 b852c9bb102daeb8bfcafda5c5200861c155ca7635061f5b136cd9a340102cccc8351344f1d7657545a2f0b411fdfe2737cc1f59bb76e6ad0561fab2ce6ef3ec
+EBUILD libgee-0.20.2.ebuild 687 BLAKE2B b284c0fa4739f28759a242c04535363bc4833021f4f13d71e754ac4d24f1fdda08b7ddb12e89d2c89c5a2baed49cb1dcdf5368dc9f8e374f122115939812a0de SHA512 43a8aa4b0a02499f0039fd2c3d5061f78d0f2ce6cf4378fc160c4aef038c68d4aa2b91455da3decba46709e043b3e705cadcd037bd960c08dbae84d8a80bc55a
 EBUILD libgee-0.6.8.ebuild 659 BLAKE2B aae1527a96cc83f1408aac93b27aa67f82fa8f2c772fc026b5f4a14e41434ff9381aaca40f4f8fe7127e56d332048badae59eee7eec69e6cff5c1412ea3f7b51 SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e
 MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
diff --git a/dev-libs/libgee/libgee-0.20.2.ebuild b/dev-libs/libgee/libgee-0.20.2.ebuild
new file mode 100644
index 000000000000..0f4023e5f8ec
--- /dev/null
+++ b/dev-libs/libgee/libgee-0.20.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="GObject-based interfaces and classes for commonly used data structures"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.8/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux"
+IUSE="+introspection"
+
+# FIXME: add doc support, requires valadoc
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		VALAC="$(type -P false)"
+}
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 68c71775a890..562944bc14e3 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,7 +1,5 @@
-DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
 DIST libgit2-glib-0.26.4.tar.xz 138492 BLAKE2B 725c14076fb940186faac079cff1ea87c456ed41e943ae95a4a674632c1be261ab6d4d5bcb5c0800bbde5d86c1ff3095d59045a2fda1342a1cf5c691a2b424aa SHA512 9eb78f292583862890ca0cd27d7621da2f8f633a76f4679f897ce6cf9e06b64a3cb7b0ddda39d231d21d3faa830fe1a9a9326b4abd420df8356d50a734360b37
 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 1320 BLAKE2B 00883cee9d3c36676ecc0fca9213c5e6f039736b69a02f285b5a86fda36fa6793b535a70ba21c23cdee8d0842703d72e2ae7f8d8a904f80b2d975fb8543d022a SHA512 0f8a2debb19db854e8114de3531a625fd3bc84233a1f2fd0a5e364e2eeae4d33fcad04206470dbfdcd796c65116f500e56a9ee8131296ae611c1b4673972c4aa
-EBUILD libgit2-glib-0.28.0.1.ebuild 1262 BLAKE2B c4698febceb4823b5c67ade03fce33425c82cc0ae1283b3beebf352b7beb5b0962f7b17db4722f6aef2ecd82a69e833b411cdf1c65a4dc3a0227675777c1ae92 SHA512 9858b1c3edcd9b36f5e091aacf6ee5cf32640c4380821bd4dced070e8424b17c642d34d2d9f70d50ffe05ab8050ef4e633b648ba0a231cc8127f42c2f3fb39c0
+EBUILD libgit2-glib-0.28.0.1.ebuild 1261 BLAKE2B c52e3d4aeeb67d7c78dc634e2b93295d2e22693b10127c58cbbfb36d3efebd8352b2203f4c97216b4307257b0cb3e02d04674dd52575b462784a7ea0e6ec8fbd SHA512 2cd67890db12dd5bd2fdcb12e6e86d5c9bbb415b1497828963c2de76fce4fdfec5485051d274dcb0554ef08a2b69dfcf965698242bbf455a33f65741368b2f77
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
deleted file mode 100644
index e1643f1af334..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="python +ssh +vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Specify libgit2 dependency with subslot because libgit2 upstream has a habit
-# of changing their API in each release in ways that break libgit2-glib
-RDEPEND="
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgit2-0.26.0:0/26[ssh?]
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python ; then
-		install_gi_override() {
-			python_moduleinto "$(python_get_sitedir)/gi/overrides"
-			python_domodule "${S}"/${PN}/Ggit.py
-		}
-		python_foreach_impl install_gi_override
-	fi
-}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
index ed38c0c65f60..f2eae843a731 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.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 34cee8ebe67c..968992a451fd 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,7 +1,9 @@
 AUX libgit2-0.26.8-disable-oom-tests-on-32bit.patch 1775 BLAKE2B 4c3df3edfa76a57f2c14433b7be1cec2afadcaffa30f2f2559ba9f1e0cf915f6ccba43abc038cf3a42949f12e78e532d29a25ae74e41f303838c839036d6e3a4 SHA512 db77d1cd4876ed45a579c9dcec67e7fa0feff2d98db4635257961588734497b5818efcf4ce748742018c6775bb65f2394515fc2854c691194b93b6d9c65c6cf2
 DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e
 DIST libgit2-0.28.2.tar.gz 4987586 BLAKE2B cf791adb173050b4b153062ff5fdc923289462677ce34af1077d228a95c4d9d7e9b836aee44dc79f079f42c910c4b4548241ec7ff16665ce49e319ccd38d4c7a SHA512 0879c162e2e1dc00eadfbda22cd1f9d3a95b4ec2b653c108983f37c2f695140882de4d50d7cbc04ced247125a4e9fe6df16130e1267891aecdb2411d920db5c6
+DIST libgit2-0.28.3.tar.gz 4988580 BLAKE2B 93d87792b0aef6383845230880d749fa77f28ac8ece4564abf041ccbb672d17e6efb1ef9503879d45cf5f78b6f1e54dd2b2ab9eac0fb09ddb445310484bbd7fc SHA512 15444823b7d4885f7b8c3982f8905efc4a75913de016a9b2e0a24d5ce9746e6a549dffd5469036529557feff2ce7ece9328266eb312c80b96091ce0f65ee97ee
 EBUILD libgit2-0.26.8.ebuild 2050 BLAKE2B 29ba7bdeb65ca0d274b97240ca81c732e8f5505b64856d61124a8726791ae6c4bfe1fdba88c62dec9a35a4f9ac0d43df3884f978814e7bab9ce1f8a573f7c1ad SHA512 ce1746610579ddb076cd7d8c4f97596142bc73e9d454f7188962a940693dba7e0f8814a551b9512502c0c1ece2d1392e963747208a3bcaa5f1af6d9d376f1a0a
 EBUILD libgit2-0.28.2.ebuild 1687 BLAKE2B 1776bfc14b35eb1593e6d9159f58c3c9ccdac6c25419e1d57028ef6ef832fc638fd8782e5fdf46b9e65f4caaa744660f2b87c73ae421c4db3924514c476068d0 SHA512 46079c16b630c677bd97592bfe3244c1d6943178da84ea9d862c1e58552b8267f0185102fbca573d831de67098027ffb95ba82e4f944a42d6391ecdca4031da2
+EBUILD libgit2-0.28.3.ebuild 1685 BLAKE2B e7f2859e215e7dab9517d81d44d97f1c3c415771e10692c94108442aa4497e3a396134064b819abe23079088d32a03595c768a8cfbf37fe4e2b27e7146de8125 SHA512 e5b2cccfa6bfcb0da2a951e4417946d9c69bc9f40455f43089c73f30c7eef0ce3040676cdbcd8d0ea90b047d145c9fe85de1f7cee05f6a21e5facd335cdea1dc
 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.28.3.ebuild b/dev-libs/libgit2/libgit2-0.28.3.ebuild
new file mode 100644
index 000000000000..adf461f51e8f
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.28.3.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/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 0572ffe13da1..c9d3973031a5 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,3 +1,5 @@
 DIST libgudev-232.tar.xz 270904 BLAKE2B 90b2ec011f065929bd560398de9cfa8c365f9b84d205c816f2d7a98391d96bde47449eb77bc76b1e486af7dfdb3ed6525f216549e0dc3571b2ee672920438c98 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc
-EBUILD libgudev-232.ebuild 1112 BLAKE2B 050ab9592a018ee05a1cc8adabd08c78fbc07de9ab16e5d0b439154fd94f62f4a8edad95f92eb432e97d221dae1805262a9deb782aebd04804b996f338df80e1 SHA512 5693cd632bfe6cb0daf11a0492f20538cfdcb15c619514447d48a825dea032cd440d813403f074cff1d52b73d54858eecb66479828284f0d3d430f94bf06d118
+DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
+EBUILD libgudev-232.ebuild 1113 BLAKE2B 1e963ec6a6ea7bcc322d55489203147edcbbde2593bdc9d24461b0bd2c2d6fd806d1b357b9b9ef4e7a47cd49f5826e96ec61506859f8ca6ac59e7a0fa745e63f SHA512 858e3f1db9b255b87115ebeeb7922db41cade10ad7b6cc1a45fb96f0108e20c6f29d54702fd2435a160d96141ea3b07f3eb595ea505f8367b0eecbc53faada64
+EBUILD libgudev-233.ebuild 1123 BLAKE2B 1cae6100395e31b8354d73aa74697d43a05fcdcc119369cd9069ab33c14d4a9a6b686141ac0ead6d5b303b0ec90d12a5b60d493c12955d3c749cca202aed19d0 SHA512 0124b1e12e35f5d3b6087cac1da378ba6e29a0c9ccdb32f1010982fa8634b54eb5a5f41cd25b08b838fb2083c1bb528253d5a792d816d15adf2d9d6d4ef08e37
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-232.ebuild b/dev-libs/libgudev/libgudev-232.ebuild
index 738cfa2faaf5..600d6061721e 100644
--- a/dev-libs/libgudev/libgudev-232.ebuild
+++ b/dev-libs/libgudev/libgudev-232.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
@@ -8,7 +8,7 @@ inherit gnome2 multilib-minimal
 DESCRIPTION="GObject bindings for libudev"
 HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0/0"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="introspection static-libs"
diff --git a/dev-libs/libgudev/libgudev-233.ebuild b/dev-libs/libgudev/libgudev-233.ebuild
new file mode 100644
index 000000000000..350bd518580c
--- /dev/null
+++ b/dev-libs/libgudev/libgudev-233.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="GObject bindings for libudev"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="introspection static-libs"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-fs/eudev[gudev(-)]
+	!sys-fs/udev[gudev(-)]
+	!sys-apps/systemd[gudev(-)]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.18
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+# Needs multilib dev-util/umockdev
+RESTRICT="test"
+
+multilib_src_configure() {
+	local myconf=(
+		$(multilib_native_use_enable introspection)
+		$(use_enable static-libs static)
+		--disable-umockdev
+	)
+	local ECONF_SOURCE="${S}"
+	gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 6696690ef1e7..b6597b45d7b4 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -2,5 +2,5 @@ AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c17
 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.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
-EBUILD libical-3.0.5.ebuild 2108 BLAKE2B 891417bbe3bf343fefc5b03f5145424ab7cfe4fe8a63f0bffafe3e9e97fb71290dee0c5d16207cf8f3ce1371a839a100b7e2b14827bbf4214e4431d614325200 SHA512 883d5c3d9872ff8eb505442966ea3d3b53996830ec880e49736efd2c97132b4e8bdd04f9b299de44afb3f118e96f759a389bc61500077f53b889bebdc7733ce1
-MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
+EBUILD libical-3.0.5.ebuild 2085 BLAKE2B 225bf8884f0c71986de135bf79c4b4bbce00f8a437d713bad09b3c999ddda3f362973313effef20000c30ff7d79d68ee83d2b3689cc3e397e92c1c9fe8379850 SHA512 7f881e58e5c9b920e27eef4a83bf2200b8f29a1787a5d80c87046350ab7a36eee72d5b90e04a046a1d92092c9ba68fe6b1d4dbccacf309175398238836820e69
+MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild
index c15ce6147212..8b595cd6c716 100644
--- a/dev-libs/libical/libical-3.0.5.ebuild
+++ b/dev-libs/libical/libical-3.0.5.ebuild
@@ -13,7 +13,7 @@ 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"
+IUSE="berkdb doc examples glib static-libs test"
 
 BDEPEND="
 	dev-lang/perl
@@ -22,14 +22,14 @@ BDEPEND="
 	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:= )
+	glib? (
+		dev-libs/glib:2
+		dev-libs/libxml2:2
+	)
 "
 RDEPEND="${DEPEND}
 	sys-libs/timezone-data
@@ -57,7 +57,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DICAL_GLIB=OFF
+		-DICAL_GLIB=$(usex glib)
 		-DICAL_GLIB_VAPI=OFF
 		-DGOBJECT_INTROSPECTION=OFF
 		$(cmake-utils_use_find_package berkdb BDB)
@@ -65,7 +65,6 @@ src_configure() {
 		-DSHARED_ONLY=$(usex !static-libs)
 	)
 # 	TODO: disabled until useful
-# 		-DICAL_GLIB=$(usex glib)
 # 		-DGOBJECT_INTROSPECTION=$(usex introspection)
 	cmake-utils_src_configure
 }
diff --git a/dev-libs/libical/metadata.xml b/dev-libs/libical/metadata.xml
index 002b34042a96..fcf112716f75 100644
--- a/dev-libs/libical/metadata.xml
+++ b/dev-libs/libical/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="github">libical/libical</remote-id>
 	</upstream>
+	<use>
+		<flag name="glib">Enable dev-libs/glib interface support</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 3dfc699fec3a..1e0cf5404c67 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,4 +1,5 @@
 AUX libindicate-0.6.1-no-mono.patch 1888 BLAKE2B 60cb0434e3974cf474fca729be08defcaa01d713e4039001f4994bcaae0a657fd04b0c2eafa447c25c2e56d92bddd39f2b17915fdb7d26b916eae3e3315588d7 SHA512 b2623349c139321403e285ce384191f2741b6216dd87ce5e05a439bd175a2846bca111ade729e87322a413bfc518fdfc2546274114fe5726de171b51d3be7cb1
+AUX libindicate-12.10.1-werror.patch 343 BLAKE2B d7c64d707ef1d5dc47e865458ac6617c49842cf26001a1f74c69b226cf13b281c08cc854ae4df2de6cb36a5031eac107c88592a0134075e7b91f5b67a7c7c683 SHA512 8a385ed6cd0a9a216c675eb003497e15415a25666a2a475be2bbe7fd077ebf4fb8566a4252e53123f372adcf49fac48cfa8ffaef7c6ee6fabef98edf06f3d00f
 DIST libindicate-12.10.1.tar.gz 550378 BLAKE2B 9966c645c2538bf9246221e138771ce38e7f74629ae2365cd803a5e26372922cd5194ca1449f79a35f2bcd391e3ee2056183ab53b11fa8d92a8b2c258ead9c6d SHA512 4dcb5f292153210bc15a05f117101429da77a60b8b05b569baddf0e9043d852c2dccb0d5a6adbdf4d4a1b6f06b33c61e242bb4bcb376e3d96563bda591685c06
-EBUILD libindicate-12.10.1-r3.ebuild 1679 BLAKE2B 3a980835e3ab99b0b860b21cfb84cde7f8ffad2cb3494c3ec4e1885adbc54e6f4f45e8f0296d353670dc3c02c49bd8b854101e1e6e95a3936162c67f3c4c021f SHA512 72c0e40f47d614373ce3df91a38ac3e07c6b77d494be931c51ab3050a2fa3a497ff3730bf6cdced8c5b2d93bcbea5e31e6b3f18c617c6cef566b4f24f0475178
-MISC metadata.xml 328 BLAKE2B e528a6922cf244dd2e8e3387f539f9922378395dadf028852a3e17120186a4cdd82c89b29802ef5a0698a35737294733fbf9a717c3c31af90cb634ee5aa5cea9 SHA512 fc8169dee128e50da93fe6baec57989b4b2e0a59e36661328ae7bd5bf1db1ea5bcc08efb72e6ba2d0e0d9a18870144066a5c77a1f275801a4fc98953cf891a3b
+EBUILD libindicate-12.10.1-r3.ebuild 1722 BLAKE2B 8f3b29499a3185819a032f04ee931b565fedf65a1ea67dc579c13d36a6a7a1f77215ee32cab7f7f646d92fa57900f54126a350d2c1e8e2468cea4d2ed4b09aca SHA512 10c84de5011de720281115addd1e5e0fe4ee0406be40de54e1b0a4f89f7f758678d61ab8dda388a3f4acf82e5c2ad5ca9ff2dbcd7ff2b2c997ee9be520f7dfe3
+MISC metadata.xml 246 BLAKE2B bf90acdc36bc8aa411c24dc044144d43ea688be2451d7aeb1bfd3d7cc047e9fb9f59ee60389b200a43bc7fbf9b35a235d41c0866d2d894b989cf78156652ecd8 SHA512 a7134844aead376dcfe05a2d3eec66ef246a31a970f0d0b3d6acb2b31da13e67d28c94f6126e214384e5ad712b0e5bb1d0ddc946468639c000cadc3e79c19f8c
diff --git a/dev-libs/libindicate/files/libindicate-12.10.1-werror.patch b/dev-libs/libindicate/files/libindicate-12.10.1-werror.patch
new file mode 100644
index 000000000000..9a330caac03c
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-12.10.1-werror.patch
@@ -0,0 +1,13 @@
+--- a/libindicate-gtk/Makefile.am
++++ b/libindicate-gtk/Makefile.am
+@@ -45,3 +45,3 @@ libindicate_gtk_la_CFLAGS = \
+ 	-I $(top_srcdir) \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATEGTK_CFLAGS)
+--- a/libindicate/Makefile.am
++++ b/libindicate/Makefile.am
+@@ -76,3 +76,3 @@ libindicate_la_CFLAGS = \
+ 	$(COVERAGE_CFLAGS) \
+-	-Wall -Werror
++	-Wall
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
index 2b05d40e90de..bdb26096b1c3 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r3.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
@@ -37,7 +37,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-0.6.1-no-mono.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.1-no-mono.patch
+	"${FILESDIR}"/${PN}-12.10.1-werror.patch
+)
 
 src_prepare() {
 	default
diff --git a/dev-libs/libindicate/metadata.xml b/dev-libs/libindicate/metadata.xml
index 857e4ae6dcfe..b87c5beb58d3 100644
--- a/dev-libs/libindicate/metadata.xml
+++ b/dev-libs/libindicate/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="launchpad">libindicate</remote-id>
 	</upstream>
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 388d068d335a..e40da294bdba 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,5 @@
 DIST libinput-1.13.4.tar.xz 530000 BLAKE2B 96345625b98ecc5476b9525cac84ec6cffb5854ce8d9e197fa73dbcb3548ebfea7820fa32d4e808222c0471fc94d89003775587cc0ed9c8445dd5902d3463792 SHA512 ccfdfc704dab9ea19a503399ecd4ce3a95b8d9480b8dfddeb80be01236c34c6f2f472be0e12e04dddd68092611470d303351e092141bc7491729639bcf7e64d7
+DIST libinput-1.14.0.tar.xz 563272 BLAKE2B 9d5f831c9224b01aa4be92494f28ab95909dff2d81f5e60bada2ca12a2fb4f5745b99a4caa4abef06938cbd7d9e8da9aed85573e447ad6b6e52392e17534953a SHA512 e501c5b8a58bb287c175692af0e59ff766a8613eb576aaa0700686dfbb6c6ab63b7a5d3f148fce75397c8170bc49871068861d93c352355ab5d0d9e7f1b059ec
 EBUILD libinput-1.13.4.ebuild 2059 BLAKE2B daeccd68674bec236e3501b14aa4529c7dfc66545acf523e76fe84696024761cd28b05aa4a30e27f30168b3ed947bde3ced491f7d410546eeff2d39dd6b0d116 SHA512 67193ea533150a70b2ff073d3078acff974eef2a46d40faa8cc6b69c695abbf4cbc6f3be7d25c351055b63ad1d2546147bfbde8fafad58fdc542da97fbe4d510
+EBUILD libinput-1.14.0.ebuild 2069 BLAKE2B c689b9409c22d2241ff39c52e19fa459938d72e51f3179d1ece4b9472ffce24e236b42a0bd69b1a7afbd4ac2d9f1946cfd41d12e11a75af1b950c324b8e55884 SHA512 807a2c5f246aa8a5a080fa446ea2b8f05f98511e693974b2cab731410b1567d93ead5344ad1fb10fa73b1d92c8591b1f88a8660cfb6516cc5186708f9205fec9
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.14.0.ebuild b/dev-libs/libinput/libinput-1.14.0.ebuild
new file mode 100644
index 000000000000..c6c5651aad46
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.14.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2014-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 meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}"
+#	test? ( >=dev-libs/check-0.9.10 )
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 8415aa5147cf..588ce0140d4d 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,7 +1,7 @@
 DIST liblinear-210.tar.gz 381662 BLAKE2B d64d217f7ba67605821062f66d4e9f130f4f2396dde14cd35532bad11f4af4f34bc231a1e3796ba2d0e14f84830ec05c6358d40018e048f4ae3fa62db2b1d0d7 SHA512 4e4558467f2ebb3dbd640c172b1129c8e5981c231a043abb0398a803252559795604a34992baee50ae6689646050733d3a908d7d76f8b1c94309b859eae7f8c8
 DIST liblinear-221.tar.gz 520288 BLAKE2B b28c837488f5827ae76f32dc14a1b92027eb5ff123a15c07e9974197eea842c8247420632d259defdba3968383749538c1ed16f6b5c982fad87b3bc52572b485 SHA512 abf21f9030e67886d88a95ad1699e566f8b67bb3bd23253f1f656460911f92a5c3c184fe127390d6100bbf9970cf7a246ef3611b0788907c35a33286228f1753
 DIST liblinear-230.tar.gz 524693 BLAKE2B 02e52f6dc26f6ae19dfe52691e4a86c64ea92c40a50d0fbe8a7bddcf06e1216b8f28462fb2105539dedf15ddb07f39ef7e7f78fa7cfd74eac955246e9ed050e7 SHA512 c8acdd9f5cfcf7ef1ff9b9fac658ff51ac4677801fdb9ce6a210ccca7fb136a7957d0edaf45e83269c1928de1926de0200d669cd94e09371c06821d42ba539bc
-EBUILD liblinear-210-r1.ebuild 1416 BLAKE2B 329845a3366d90bd89c17c714b7dedaa8fac27f462d3c98ec2f4831d51b18d15cda975a2ed6aedf69b08cdfd439ee05a85cb09489c9bbfa102a145b7d78e7226 SHA512 96bf9b251b5ddca7c7c4b717b504ae585f821eba683a7891d4a23fa87ea961456f364bff5656e17e5fa36ea2a8918b10622c3ccc8a528f0262799d22e359b9ae
-EBUILD liblinear-221.ebuild 1447 BLAKE2B 9560996f77a28c1d22eff32a3f0ddb3e4038fe59489dfaacdc052e3f94f22f32081f5f0e708c6e8abbaee621e047fa3df44b07f0dd7464f3668faebd62bc939e SHA512 616f1b29a9fbf1aa784e13f6fab3f4d771f670b77e14c9c39f38a556faf1bc33b387e2b4b4296cab9510fd732a98ec0dd8a7956dde254f8c37adfb840517cba7
-EBUILD liblinear-230.ebuild 1447 BLAKE2B 4416754ff7bd96f5ffc5d46fe1f6d2b287745e39ba2b2f05997d955e8bb2321ae39ae7196b11059ab54714ac141b66840f5257d672eedcc1d25dfd479914c406 SHA512 b2421ffe5a6c2e03cf8245dfe72cf21e9ba28e2086b2967b60751a677ab13d78f85eb707b41e258b2d4b4e924a1aa443af148822a09750cd7d31c57340961432
+EBUILD liblinear-210-r1.ebuild 1167 BLAKE2B a0d1764c3ddd712031f95177cb16b98c7fdecfdc27e2a79ced241341586d69c20e440bbaea33b3cae6473339f5f2016cdf82e8502302c4e5d53a834a949109d9 SHA512 f18c6e659ab04373c64aef5391c94df494306ca4d919137869bbc8db98c0fc52a857dde3c011c00f977593f4b2bc2bf76ad2952e8fd352524185f6392c84a18a
+EBUILD liblinear-221.ebuild 1201 BLAKE2B 81693678e4ee3c03203caa7b111042f6b8e7d82b708bf9d3a0f5b585c76a6bbace7691d270caf2f3046ff9653ef948903fb30789971eaa40ae82249cfa618c71 SHA512 a4ddfabe8b35fb1e0eafb5b9290aed978074516e4e2a5998a211bcd4d425a8cbd0800a7522f884e341cd8eaf7cea1d5f869fd7a3c107bd02d16816499e051ff7
+EBUILD liblinear-230.ebuild 1201 BLAKE2B 81693678e4ee3c03203caa7b111042f6b8e7d82b708bf9d3a0f5b585c76a6bbace7691d270caf2f3046ff9653ef948903fb30789971eaa40ae82249cfa618c71 SHA512 a4ddfabe8b35fb1e0eafb5b9290aed978074516e4e2a5998a211bcd4d425a8cbd0800a7522f884e341cd8eaf7cea1d5f869fd7a3c107bd02d16816499e051ff7
 MISC metadata.xml 335 BLAKE2B 2a905547b4dbf1ea8870dc8816a63252e142edcba93710b5d2cb57c2b6603c165ea06a3b459f442e1d08653cb9c6530a56bbaa8685c8147a280d917b4cd1f342 SHA512 efd0a36cca5d21c4a5e94388d125870af42ae9091234a44ae53b8ac6ea7e6ad0b637a5629d3c9ceabfebddce71fde8fa94285e5b1c7edefddebb8bab9e99f0bd
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild
index ca03976be48a..cb9a44912d2a 100644
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild
+++ b/dev-libs/liblinear/liblinear-210-r1.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=5
@@ -12,15 +12,6 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/3"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="blas"
-
-RDEPEND="
-	blas? ( virtual/blas )
-"
-DEPEND="
-	${RDEPEND}
-	blas? ( virtual/pkgconfig )
-"
 
 src_prepare() {
 	sed -i \
@@ -34,9 +25,6 @@ src_prepare() {
 		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
 		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
 		Makefile || die
-	if use blas; then
-		sed -i -e 's:blas/blas.a::g' Makefile || die
-	fi
 }
 
 src_compile() {
@@ -47,7 +35,6 @@ src_compile() {
 		CXXFLAGS="${CXXFLAGS} -fPIC" \
 		AR="$(tc-getAR) rcv" \
 		RANLIB="$(tc-getRANLIB)" \
-		LIBS="$(usex blas "$( $(tc-getPKG_CONFIG) --libs blas )" blas/blas.a)" \
 		lib all
 }
 
diff --git a/dev-libs/liblinear/liblinear-221.ebuild b/dev-libs/liblinear/liblinear-221.ebuild
index 1aaede97f49f..18f397fed815 100644
--- a/dev-libs/liblinear/liblinear-221.ebuild
+++ b/dev-libs/liblinear/liblinear-221.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="7"
@@ -11,15 +11,6 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
-IUSE="blas"
-
-RDEPEND="
-	blas? ( virtual/blas )
-"
-DEPEND="
-	${RDEPEND}
-	blas? ( virtual/pkgconfig )
-"
 
 src_prepare() {
 	default
@@ -35,9 +26,6 @@ src_prepare() {
 		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
 		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
 		Makefile || die
-	if use blas; then
-		sed -i -e 's:blas/blas.a::g' Makefile || die
-	fi
 }
 
 src_compile() {
@@ -48,7 +36,6 @@ src_compile() {
 		CXXFLAGS="${CXXFLAGS} -fPIC" \
 		AR="$(tc-getAR) rcv" \
 		RANLIB="$(tc-getRANLIB)" \
-		LIBS="$(usex blas "$( $(tc-getPKG_CONFIG) --libs blas )" blas/blas.a)" \
 		lib all
 }
 
diff --git a/dev-libs/liblinear/liblinear-230.ebuild b/dev-libs/liblinear/liblinear-230.ebuild
index 00881437e2d5..18f397fed815 100644
--- a/dev-libs/liblinear/liblinear-230.ebuild
+++ b/dev-libs/liblinear/liblinear-230.ebuild
@@ -11,15 +11,6 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
-IUSE="blas"
-
-RDEPEND="
-	blas? ( virtual/blas )
-"
-DEPEND="
-	${RDEPEND}
-	blas? ( virtual/pkgconfig )
-"
 
 src_prepare() {
 	default
@@ -35,9 +26,6 @@ src_prepare() {
 		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
 		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
 		Makefile || die
-	if use blas; then
-		sed -i -e 's:blas/blas.a::g' Makefile || die
-	fi
 }
 
 src_compile() {
@@ -48,7 +36,6 @@ src_compile() {
 		CXXFLAGS="${CXXFLAGS} -fPIC" \
 		AR="$(tc-getAR) rcv" \
 		RANLIB="$(tc-getRANLIB)" \
-		LIBS="$(usex blas "$( $(tc-getPKG_CONFIG) --libs blas )" blas/blas.a)" \
 		lib all
 }
 
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 21d69e456954..a4fac95f596b 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,3 +1,3 @@
 DIST liblouis-2.5.3.tar.gz 3785311 BLAKE2B 15130dfa6c32b9c12b6ffccf4a8b2185bcc8fe483e8822d4fdd9f1c1cd0c3e8f33325419f75a9eb23e1414743fe01b44041c836a06e4ff040708b95998251854 SHA512 5aa65f3a0b7cef37fe7cd8ccf09df8c40f38d183a88d1be9f1251b40406204e57a8d95716bf1de3569b09b640be613cc3e0bd0e05dc4d544face00bfc8d75ac7
-EBUILD liblouis-2.5.3.ebuild 1411 BLAKE2B 0dbfd0672ad52fa181c8b196133703ca40f5449d165ff98a5d66cd73ff61a06e10c07b315cb367ec178ca369632ef93ad28844d8c29b89102fdfcc98c98c0810 SHA512 58dc1bd56b29c52a85277c00219e9d38fc35232eb95cfab479c53d7089b4f10204de1a82b67cbbb9e350131ca24ba86d02df94d1486796cd559fb2b1b12db0a7
+EBUILD liblouis-2.5.3.ebuild 1418 BLAKE2B 038a99116882249aa70912948a915b418fe37f29a9e57d2f86e801e3c86f62275c5beafa70d14c820c31140991fa5e4cb56f7489f9a22360163045095c700bfe SHA512 0811310f33eca3c289f6704de1a00a27a02e82853594d7dadb68c7f3c39e45f1ad5e9c1b79d858b57250a2e975f85b64c0c51949883f09cf2d15ecbb6ad5308c
 MISC metadata.xml 351 BLAKE2B 0fa7c957682fe363ddd29442ae153152469cc64ebf9005361c4b82f180c380485adf0b04467b147a441c6656ddcc9e44967fd692ed9f835d70653dbae9b9be1a SHA512 377a2d9ea4bc6007a60fcaf0284bd47af78b6fe2c901916f9cd7d6ab0f7a5225baf7314b47b0c3b00cd162278f910206bd99469bdef0165cd6e19c1eff73714d
diff --git a/dev-libs/liblouis/liblouis-2.5.3.ebuild b/dev-libs/liblouis/liblouis-2.5.3.ebuild
index 50e3ccaacfec..d1c9eb1331eb 100644
--- a/dev-libs/liblouis/liblouis-2.5.3.ebuild
+++ b/dev-libs/liblouis/liblouis-2.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://liblouis.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="python"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 3d96ce87fd01..40bab2866b95 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 557 BLAKE2B 93ef4c923139c9e52a349637b02d6e501e268249df408505b9a5eecc733525b8733ec33d365b880e358c699ee406d363998f5fc7f09be5a121014a214bbade18 SHA512 7ebb98508508ab81ee3a25301e7285c95de607ce5602e4d93757db7b9268f05866b1a62e5efdbbfd962cf081e965dfbd2a544421d6b9f8b95edb57beb30b464c
+EBUILD libmaxminddb-1.3.2.ebuild 556 BLAKE2B 54b2ac32420725354a62ca86c2383f66a51057e9d9c13fe478c66bb1c58784e7e82f3ceb650fa8cccd3d23a7f9ee8fe2b49a8c27693a8239f6ed3b87c567d9c8 SHA512 b73e97483c0877c0fc187eefa5a851b67467056dbf955f001c3df2615e760f0e1f9857e59919dae0eeda280d8e7ed337febf8fe70694d49efcd77eed3b8bc2e7
 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 d8f75bc7ce1c..8c941da15298 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/libofx/Manifest b/dev-libs/libofx/Manifest
index 814374ff2a5f..4dc06ca2412f 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,3 +1,5 @@
 DIST libofx-0.9.10.tar.gz 1433837 BLAKE2B 131be0243b8450d32417dd75f0421744412a3186c0f7a3451883b6572c0dd27427579baf280ac2ae6409d0738bd578f69eaa9debfe50024411c6b0ccad11f5c9 SHA512 061110702034dbbb9be3adaebe6236a4b0842169d8ee7671bad6c93960b380cbb33953bdf080c8b14f45930b0c817fcfe1bf71f15d9872dd2535a1415f5be895
+DIST libofx-0.9.14.tar.gz 210155 BLAKE2B 1b5ee8503dd9d4837415e53ae79889c32c50146b2b508aab052e8074a277f8181c6866470220758ed7997b0b6e3e524ac6f9e1cac9a673f60c30ce3093e5a3ee SHA512 785c5130fc6f6cfc019d4aee2bf6de6311835e5dc7f2bd56a83f1ecf5e62ecb320a95bf4a5ff8f9e14dcaf5ff1eabc833cd7974927e571a8469c9a02fb8362d2
 EBUILD libofx-0.9.10.ebuild 1118 BLAKE2B 893e34773b269783129ddecb76ecc2afad25d9fe0067e87e1d5eef0de8f6f30a84a9254e9b64a19dcedb1b8759c8ef16165a8ecef9a78f7e29cbc6f2b8eaf7f9 SHA512 37c9ab47af820ad0572b511b0d97a850b53113e8339e82bacbc26b4dd02b6a8a40784e478bd2158804d22b02963a71346c96fb6ac3710b8a4f88ff4d6ed6e673
+EBUILD libofx-0.9.14.ebuild 1232 BLAKE2B 05db418dcb8fccfdba01d26b845477bbadf93e952bd256516f785838bd15690757c97466908898198c5eca6850506b0f8cdd511a0732056664b4c54c3e15b313 SHA512 ccd2b398a0832d2b19cc47c005f6ac0b7bcd12b5a796e7e8f0938c187d0a0955faf604b297be812aec2f87467d35bce51e6e58d90e88a654f125dd51e258d40a
 MISC metadata.xml 243 BLAKE2B 1611cb7b6df68e87374031fa563dcb5388243c0df9537b81e1c53f05cc297789e1f4d178edbbc8906af7a6b0ec549aae225662f87df1d48dc4a6fa2cc2c703c0 SHA512 fc5071bd581b91f72ea6f021641f47d46d1e6038cac7bd34bc13d94e6229441e3b2f7cdd981490a169d7e645339fe4137496a0eb0956014027ffd42a5b9814a8
diff --git a/dev-libs/libofx/libofx-0.9.14.ebuild b/dev-libs/libofx/libofx-0.9.14.ebuild
new file mode 100644
index 000000000000..5e46431a232a
--- /dev/null
+++ b/dev-libs/libofx/libofx-0.9.14.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A library to support the Open Financial eXchange XML format"
+HOMEPAGE="https://github.com/libofx/libofx"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	>=net-misc/curl-7.9.7
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}
+	>app-text/opensp-1.5
+	>=dev-cpp/libxmlpp-2.40.1:2.6
+	dev-util/gengetopt
+	sys-apps/help2man
+	virtual/pkgconfig
+	test? ( app-crypt/gnupg )"
+
+# workaround needed for ofxconnect to compile
+MAKEOPTS="-j1"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# we will tell you where we wants the docs!
+	sed -i -e 's:docdir.*::' Makefile.am || die
+	sed -i -e 's:docdir.*::' dtd/Makefile.am || die
+
+	# configure arguments alone don't disable everything
+	sed -e "/^SUBDIRS/s/doc//" -i Makefile.am || die
+
+	append-cxxflags -std=c++14
+
+	# build will fail without this. shenanigans...
+	touch INSTALL || die "failed to touch INSTALL"
+}
+
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 93ff8fd3b006..dc14cde94dd9 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,5 +1,3 @@
-DIST libpqxx-6.0.0.tar.gz 676528 BLAKE2B a40095ba9851acde1296d93af7e4c4414f334a734b5062874b63a146836105fdde24672707caf623f2073dc1caf87b1053f25c80b10c3fa779fc91a52f9ec7ae SHA512 f237cc03c01a8262eee44a9428206c1cc11b6034dddf540afef145f58eee5c32b880d84832563480d73d834c24311170e2ef6789e100793afbe0b6e393bd4169
 DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e
-EBUILD libpqxx-6.0.0.ebuild 2180 BLAKE2B 7d701220cf445748f4e67104c36bc3d9c8ffbee6633ed578c676416586b440477da4bf48fc31c2291dff2f52e33f5760891177a01098254bdff5f2523da1708b SHA512 9b85c12d7be7acca245f52557cc11063b3064ce8ee09292c31a35402648de7f555134731d675835353ab1ca0639553b4c84adaddb2e92389c7e715eeb51282f0
 EBUILD libpqxx-6.4.5.ebuild 2175 BLAKE2B 666e0bf84fa747c1d2a3735e9f1f490194d7f9992cdd022861f241b31fb9e31dbfe59a1c6928959e7fdf3825b0b8ab3505ab777b8b5d0e4e8944c8ca6ceebb80 SHA512 772047ecffe3658073da917d237d04c78b3c76deb5145f7e2906da2af16b29f5f93e9e9f9a3113f5ef647cbae0256ad9d79bd8d408a3548eecceda6841d09ef6
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-6.0.0.ebuild b/dev-libs/libpqxx/libpqxx-6.0.0.ebuild
deleted file mode 100644
index 6f10efcd3469..000000000000
--- a/dev-libs/libpqxx/libpqxx-6.0.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1
-
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
-SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://pqxx.org/development/libpqxx/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND="dev-db/postgresql:="
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? (
-		app-doc/doxygen
-		app-text/xmlto
-	)
-"
-
-DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
-
-src_prepare() {
-	default
-
-	sed -e 's/python/python2/' \
-		-i tools/{splitconfig,template2mak.py} \
-		|| die "Couldn't fix Python shebangs"
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable doc documentation) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	einfo "The tests need a running PostgreSQL server and an existing database."
-	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
-	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
-	einfo "    ${EROOT%/}/etc/libpqxx_test_env"
-
-	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
-		if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then
-			source "${EROOT%/}/etc/libpqxx_test_env"
-			[[ -n $PGDATABASE ]] && export PGDATABASE
-			[[ -n $PGHOST ]] && export PGHOST
-			[[ -n $PGPORT ]] && export PGPORT
-			[[ -n $PGUSER ]] && export PGUSER
-		fi
-	fi
-
-	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
-		local server_version
-		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
-		if [[ $? = 0 ]] ; then
-			cd "${S}/test" || die
-			emake check
-		else
-			eerror "Is the server running?"
-			eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
-			eerror "    Role: ${PGUSER}"
-			eerror "    Database: ${PGDATABASE}"
-			die "Couldn't connect to server."
-		fi
-	else
-		eerror "PGDATABASE and PGUSER must be set to perform tests."
-		eerror "Skipping tests."
-	fi
-}
-
-src_install () {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index f62d50727a5f..a638133f2497 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -9,5 +9,5 @@ EBUILD librdkafka-0.11.5.ebuild 1249 BLAKE2B e10b7391be22a1b2fa32af02872ffa2e813
 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 1534 BLAKE2B 8efba93d73fb34a800283061f19741a1831b3d0dedbad241d28ad8e61aec1b5ab8f232b8156b942ebae50a82bd1d5a4b11352bf2369c420cfe39e03eb5b0ebc6 SHA512 777c6c640484a94f688985e8e1cd2b25fd75de034329c6fccaef41dbf4de673733d6d8533791a37c5594b7ca5d6dcaa925ca39b919406ff9439b7dd74790a0bb
-EBUILD librdkafka-1.1.0.ebuild 1538 BLAKE2B aa081858762d70eb9bf5f5386e3b7412dad89b9a6b38b71d3dd4a7bb7ee2edd042a8c051c925cea732e90bd625cc71688a77226520e2151c1700de2c316ee199 SHA512 72c26cb1a2e6a1ea02c2d52f156df2319b3a81362ff0c6bf4c448801b2de96f301a899bb70fc4b9de3dbc430b1941bef64225dd2222e7002e7490300230e42d1
+EBUILD librdkafka-1.1.0.ebuild 1534 BLAKE2B f37bb2a872b3fe8a121972561bb4a2463e443f3def8e0a188f07fc2d8f9eed46c8e655046d3c7845498b805d01e5233566372ac319695289a62466baa26df482 SHA512 1152c7e3c82c834243750ca620ed41ce389009a85ad290a8b84776e7e095c4b386a876ea08e455f6b748634d3ee05d17d7e6891c7d989bd9fcb699678caac70b
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.1.0.ebuild b/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
index d47d633d5484..48f125af392d 100644
--- a/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+	KEYWORDS="amd64 ~arm arm64 hppa ~ppc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 8ce9f71261ea..2432afb583d5 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -5,8 +5,10 @@ DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec
 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
+DIST libressl-3.0.0.tar.gz 3620475 BLAKE2B c1dc1709e60cfbfa9907c206340262b78e1bfb991d3956dfc0a5d8d80f80b61df41059e645f9f096185724470e8466a5b7a444a575f5f09d5a0f9eb35ff3ae7e SHA512 460fa390012218262b7c148a28e6ddfc0dc3d669c4bdd37b68bfa6f50a0cb2fb81a277fb46ae0ac22673aae5b5cc4476fe96e56471a6812176bf76e9c5e10838
 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 1713 BLAKE2B 7450f36e1dad66cd156bd346401022f6829ae4feacf1b7d680276ae24611bf18a197906564321fef865d4bfa3ed2717e43bc5a6637535ee0df42ecc4bdcad305 SHA512 8dbe7abdf2738a06e72dd60857ea90f3a62488d8603c5d1ee9d330f5603af617a1a8bc6fbc2ca13fbfee363d10274c0ea182705d244838fbff906e991b42f411
+EBUILD libressl-3.0.0.ebuild 1679 BLAKE2B 07b9911e9603c7b840987bb5f1eae44839f9a03bc66ca95619d3f5e2e20d5774477d6a2b160138020179c8e9d483cb732cf4aec3950febef2458764b9cc4bcb1 SHA512 2e2a11411d8ea417e7d7ccd1c379cd5c966630a9cd787039131b03712f6da92733259875ac5f3ac85cf2b006f9b1f3210d65b803f6ba8ec8e65865d0bd2bc6f2
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.0.0.ebuild b/dev-libs/libressl/libressl-3.0.0.ebuild
new file mode 100644
index 000000000000..65dfe075bbcc
--- /dev/null
+++ b/dev-libs/libressl/libressl-3.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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_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/libuv/Manifest b/dev-libs/libuv/Manifest
index bf221bcf2cff..ed614460214a 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -2,9 +2,11 @@ DIST libuv-1.28.0.tar.gz 1218769 BLAKE2B 444881479688144b36559a258f998e99e663d85
 DIST libuv-1.29.1.tar.gz 1224127 BLAKE2B f116b0e0df9c2b65bafb8ebe0259ac1e1702232e751e015dbffa9be403f39727d255a7abc560b219279caff1bfab9528f38e32dbd2cf42dc0274dbaa57727861 SHA512 7e1ed1bc500bfaab44858b3ff4685ec3d2abce412718ad144d642f7526f6dbcba643ea9a623bb129d545599570be64ed9a498d85485c1716c4c365bb7ab61898
 DIST libuv-1.30.0.tar.gz 1228356 BLAKE2B 1e70ff162f5b6200e1a88c069360cbbc246d8bd5428c918ff80fadd139b3416301116c1015953ff7be583523a5c977b1da003958e6dd66cf2f43ef5adfc798c3 SHA512 3ba158cea5027fe7c30314da08a620a718cb30ca38997e46ad00912eefac9d2d94f9dd256c204771686a546d7445da2db1be2a0abed7ba14f122332767ee5ee8
 DIST libuv-1.30.1.tar.gz 1228593 BLAKE2B db45d283b7aec00ee5b617a6d3578112aeae6f006da5b09c9d0eb07ce9ceee59d6acc0ae9e476602f664c67d24685c4e1ac0e1524f38475da1f00e89c8376bd8 SHA512 bf6d99e4807da3e90c1852b901953fb5ddb9354942a433d8ddfef9a0766abfe3783216936c546ea1b9f2872d0d031dd184519bb5c7f58f6baeae4446f0f5e3fd
+DIST libuv-1.31.0.tar.gz 1238566 BLAKE2B d6a9b92dc8a6f28dd89f65e6d1b7ff4921c7d591c13965e27304d3ca38f25d0436a1ab690a09238c511bb787bcecbaf2cc34a214a388515eef039fc5742ec7ee SHA512 bb27ab86f2f6e9c2b22e768216097db2b69e468967b48bf1a15d17c36b445355ee4bd356f59bbd1bcf7d7c0d3f68b2c6660f999a2cc0660033eb5e3775499409
 EBUILD libuv-1.28.0.ebuild 1220 BLAKE2B f2a288593c2b6dfec730f5eee44f92ca7547256397130f5237f331aadd2e6b2e9d4f9a48ab499885a3844f27363b357a09e607a027a7d4844c0c546801a15f4e SHA512 74b859a4bc98970f1eca1b6ad29f974bfeddc8815455842220d317fb2ba0173baa179987fe096ca58154b6fc84fbf95d071f89df8b50aa5ead1f2e0649808658
 EBUILD libuv-1.29.1.ebuild 1237 BLAKE2B 05df78f6a04e72033411d2c2e4523ca314c1d11aadbdc599fcd83f84fc3758044a56d1f02709cace36675ce56f61c6df4d6d26a806c5e358b2c56cf4fca891ee SHA512 8426a40e2dce0793b9cc6defa6dde8525d0702fa46b3eeaeb05fc6a8d5fbc3527d76126920660e41b0d9382480dec8dfd7b40165fd2d46cf082f2898e180751c
 EBUILD libuv-1.30.0.ebuild 1237 BLAKE2B 05df78f6a04e72033411d2c2e4523ca314c1d11aadbdc599fcd83f84fc3758044a56d1f02709cace36675ce56f61c6df4d6d26a806c5e358b2c56cf4fca891ee SHA512 8426a40e2dce0793b9cc6defa6dde8525d0702fa46b3eeaeb05fc6a8d5fbc3527d76126920660e41b0d9382480dec8dfd7b40165fd2d46cf082f2898e180751c
-EBUILD libuv-1.30.1.ebuild 1237 BLAKE2B 05df78f6a04e72033411d2c2e4523ca314c1d11aadbdc599fcd83f84fc3758044a56d1f02709cace36675ce56f61c6df4d6d26a806c5e358b2c56cf4fca891ee SHA512 8426a40e2dce0793b9cc6defa6dde8525d0702fa46b3eeaeb05fc6a8d5fbc3527d76126920660e41b0d9382480dec8dfd7b40165fd2d46cf082f2898e180751c
+EBUILD libuv-1.30.1.ebuild 1244 BLAKE2B 72493abf57cae2fda6ed7e23c7dd8c06300bb80812cbd795a957697e4c07787e6f8c4ce9766af69ce0cf987e0dd8a1d58d5f5d3b8445c0d3eba76796241fc45c SHA512 91549516a2b1c2c54aa37786e46d5039caa8549448a921cf172d47b9c94aa386f4193c88cc430caa8841fcde09583a399c4428d2bd49cec09e77bbfe67f50b63
+EBUILD libuv-1.31.0.ebuild 1244 BLAKE2B 72493abf57cae2fda6ed7e23c7dd8c06300bb80812cbd795a957697e4c07787e6f8c4ce9766af69ce0cf987e0dd8a1d58d5f5d3b8445c0d3eba76796241fc45c SHA512 91549516a2b1c2c54aa37786e46d5039caa8549448a921cf172d47b9c94aa386f4193c88cc430caa8841fcde09583a399c4428d2bd49cec09e77bbfe67f50b63
 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.30.1.ebuild b/dev-libs/libuv/libuv-1.30.1.ebuild
index 82a9f17f9244..046df21f2944 100644
--- a/dev-libs/libuv/libuv-1.30.1.ebuild
+++ b/dev-libs/libuv/libuv-1.30.1.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 ~x64-cygwin ~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 ~riscv ~sparc ~x86 ~x64-cygwin ~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.31.0.ebuild b/dev-libs/libuv/libuv-1.31.0.ebuild
new file mode 100644
index 000000000000..046df21f2944
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.31.0.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 ~riscv ~sparc ~x86 ~x64-cygwin ~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/libwacom/Manifest b/dev-libs/libwacom/Manifest
index f102310083ff..487659b5c2ca 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,3 +1,5 @@
 DIST libwacom-0.30.tar.gz 119261 BLAKE2B 4f76fcbed42c5453701e3b5dda880a26f9956a803827584aeaf080196b26bedb65f6bdccb7ffe18e7f93861dfee8a633894869b1ea4f6b95e72d64273087b60c SHA512 952ead4b39461d64d9592d0e05824669d0a8bc721aced46f5a99832da0fc63a4023f9803d416ceaf71dc7182660d05d45b799424bca7f54128fa7c44447b688b
+DIST libwacom-0.33.tar.bz2 503217 BLAKE2B 034b06495209cc88e9a3131a8a23b35fdadf8bc038ff9db62d4dc05b31657d1cfbe4856cf7b1a6112c97d47bb532b664e4e59c3b00a2aebf14dfacbcac141063 SHA512 de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d
 EBUILD libwacom-0.30.ebuild 1175 BLAKE2B e9793b8744475b467d267622056ef59b02fa4b147bd87ff2cad3a38c29f45a50fd113008c925414fb230b47db8c7ae3a2d6581d0040d1b04b093c0a259e25d4c SHA512 5cf6d46b944b4dcbbaa7ee691f908bed59d911c3bbcb0cd19cdec73a4a964c93ba79008e025f751837b64bc4afe6749b0e42480b5b486a59125e5b52bf4b4bdc
+EBUILD libwacom-0.33.ebuild 1182 BLAKE2B ffe3f1f6785716f0f491dddd7e81ea72728932a01295d9caa503cb40f473f8561c600353416b2de8921d36491bcf1eaa29e102cadc005a0689bb0dc8b22fefac SHA512 5b1703864a02619f78b0e7dcc7faa3ec8f3f29853d690f976e7364c267491ed6b52973f82128568147fb3322683d23d9614d3cfb3f6222702fed5ae195d2a553
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-0.33.ebuild b/dev-libs/libwacom/libwacom-0.33.ebuild
new file mode 100644
index 000000000000..0b1c33cddfbf
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-0.33.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="https://github.com/linuxwacom/libwacom"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/glib:2
+	virtual/libgudev:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	if ! use doc; then
+		sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	local udevdir="$(get_udevdir)"
+	dodir "${udevdir}/rules.d"
+	# generate-udev-rules must be run from inside tools directory
+	pushd tools > /dev/null || die
+	./generate-udev-rules > "${ED}/${udevdir}/rules.d/65-libwacom.rules" || \
+		die "generating udev rules failed"
+	popd > /dev/null || die
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index c98d50f790b6..e5585ace2034 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -5,5 +5,5 @@ DIST yaml-0.1.7.tar.gz 527518 BLAKE2B 80bb082e22e7f8275924aaa4f8e95eefdc94e92969
 EBUILD libyaml-0.1.7-r1.ebuild 1102 BLAKE2B a3429606925e85426aaed0e2b4a82f39b1c1d0a3292f2e7823b205a5d9cf544406586dd88342b73fa141a48915b4bf97ed9b5cce3b044d9c1b392c4c3e921bc7 SHA512 275fe1435255cfb5a1752d3f96d77cc0f76909a553b2e220580472bca22924953203279c117fc379e38e5b5c055d1c056a55146a0c3dc8c170abd3f108136a6a
 EBUILD libyaml-0.1.7.ebuild 1066 BLAKE2B 6909e22b3ece9efd806dc6e09d5d444cc97199e24c91885dfd53d4c74ef300519f388b7043ea5f7c64df1ba1b46a0722a506d8c96316f42154bd546e69b551b9 SHA512 18f60b395a0f87cd31f01d8174d400a086d69b76df7332bb7672d217cfe4ef9e3ba0a81ce51ab0d7c49abc1b3290e5af00f6dcaffe1106d5a30187160c1bc4a8
 EBUILD libyaml-0.2.1.ebuild 1052 BLAKE2B 5a2c1d4c78738d437775a89779651bc7c2db7eed8b6be20dcaa83285d821c05ea7a669371e6e23a8788efafaf650196fd4b7d9619e9c90da5abca84315d83c39 SHA512 02b2aaabefde73b7b27ef2795b470edecbc5e67a56cead4e5d3febc8e95cf6e5e4cc4b114af66dc65bfc81e401c1bc3573f131f22ca550278ca1f0dc6443f321
-EBUILD libyaml-0.2.2.ebuild 1037 BLAKE2B a7bed3685361aff3521f7191cb6118be242955e03436149193d9d0dcfe3c42d09dc5504bd9875c76d6ea6da02e465f8e7a26b004533e5b8187b317311ccdd346 SHA512 a0efbeaecff28ba353e078185764bfeb1d0c8a5945e91358e49425b453cf44df8768578b1bd494b02fb61fd9f8e101e45b161dc12d8d6f4cf4b93b0586ec19c8
+EBUILD libyaml-0.2.2.ebuild 1030 BLAKE2B 9de6feefb7f95eaa580f1a238cf628f634599f530b062348623ae4ab4e17373f34a6680b286ef8b8950a04c27a72e4fb54ccccd7dc42bea320bff99948d8fee9 SHA512 e74650e3226fe5181e74c184d323357f10f55633ae05a1c3eb84aafc08417eff133d9766ba6b3ae4646f42af4a8420aab500c69d484b3fe19ab731cb27f35b69
 MISC metadata.xml 393 BLAKE2B cce8a44acadbabe965899f786d3855d19b49549e42e39b2311a1d125a22789aa28924136767b42c074210fee6dd1b17f337968195aacf3190418979898bafe03 SHA512 ce775cab169e0601244583a8b771dc9f3fa58ccbe6e9bd315d5a778cc92e887b97ee63c7d5bcbc87d0b0483d89444855562aabf0d7f0067f660c173c4aeaad37
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
index 84ef17996558..f7f9e9d5a975 100644
--- a/dev-libs/libyaml/libyaml-0.2.2.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index abd0eb5c5db0..061f4dd83eab 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,6 +1,6 @@
 DIST ocl-icd-2.2.11.tar.gz 455800 BLAKE2B 64da3670d3631dba06030d5f6764522fae6c868d4cf45b1a47a0e2b004831797ff7881353a34fb6fff64e4af5b9ebd475b800303ad1e37c7c11b265981ed22a3 SHA512 54d6a281f0fc04858323ef8d1764c5d2276d9a003853d5af5821a6dd24c74a744da0ff2204179a5877d0e3f156d03c83236797cd5ca88e6897457c75da6713cd
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 EBUILD ocl-icd-2.2.11.ebuild 801 BLAKE2B 34e88e64693625630d301237d243f1a8f2e59db4a5797a116993286e3efb843ef058a15121d28e4d19fa33c60b1fcbc5123fdbef0596703bb57b2a91e7e7f0e8 SHA512 63fe2318b11c70188abc8d22c13db5bf55acf6bbba71eedb527390bad7785d1d2bd3d3143674c1201c0af82ae25b9b45f1e92affecee223834949b439174d7fa
-EBUILD ocl-icd-2.2.12-r1.ebuild 1208 BLAKE2B 87ad977e3539e7093644910295823b345ceb7b512fe55f3d5308e7ce238a6c6afbdc5f48e71c7e40eaa5fa874270b31039989eb0b16339947b0e50244d3c8d70 SHA512 d6da133b1ff2992850614040a826471dc16a8cd643e99f009c76b7579ee8b7257a6269cba6ce514485f1554c4fa1bea705df05f433fd7e33ac1bb3e4cc7374c3
-EBUILD ocl-icd-2.2.12.ebuild 1205 BLAKE2B 8d8e122de896b7762ce9365aba4ec1a796a3f4d61e9b6bed109c58fed4e9150c0a27f16011d8de406b8d9611706e7b59823012183f3b8c7bf35c1a609ec56aea SHA512 026c3d0c4cf3e3a48a4e1715c21f12eadc04db4b3e04313e489e0852b8cda0b43e397202ddb70a06880d772aeac58a596f6ed134b82667cd8b16db69f2a8d6e7
+EBUILD ocl-icd-2.2.12-r1.ebuild 1210 BLAKE2B 3856f7d812263286c5ab7d9cee2e7af13493827b528b91ee83d337b5f34f821526be463924c4f5dc5b7c75b9b0c47e6cb5d7f4ca9f9919f202fdd281212074bc SHA512 297dae8d9483b961e926b14a437391191d2f91afa1df571ee6107eaab947ec6df6f06f8716a1221809ec6eb93da15d840cc016542ee290138134cf1d608d3bba
+EBUILD ocl-icd-2.2.12.ebuild 1207 BLAKE2B 05ddc8149f9a60bd1de2862be075fbd9d815352e68bc1c35315d72c2d32a7a54de4da2786adca0e919f46a2e1686e06112d6f666c97a898a971fb04c8cde4136 SHA512 9852a177d53bcdaabc0f36b6bcbcfcef587e34e97131cd4e97d5494efa58abb34595e57defc0916596f9a7035b1d4bf84daa964462458fc6a6b025deb2e624a4
 MISC metadata.xml 396 BLAKE2B e87119ee4f6793c9fa1229c9c2430f8eba749df95522f5f658a6bc26fa22265bdcaa185e8338eef057320342beea263b64f162b2a8ad3c6aa4db73307b949244 SHA512 69effb7af79439eae9702055f6f1e20318f30ef76827e5be6d69ae63ff39a6bafbb177c681f76ac9bdf861a9921d7c897cecaea320d796e6d104dbcab9a24b79
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
index 7bc7cd5195e1..c9d2704ee26a 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
@@ -33,13 +33,13 @@ multilib_src_install() {
 	default
 
 	# Drop .la files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
 	dodir ${OCL_DIR}/{,include}
 
 	# Install vendor library
-	mv -f "${D}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
+	mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
 
 	# Install vendor headers
 	if use khronos-headers; then
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
index 38bc636d4462..04777289f858 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12.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=7
@@ -33,13 +33,13 @@ multilib_src_install() {
 	default
 
 	# Drop .la files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
 	dodir ${OCL_DIR}/{,include}
 
 	# Install vendor library
-	mv -f "${D}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
+	mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
 
 	# Install vendor headers
 	if use khronos-headers; then
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index f1d11aa8fc88..17a9915dc3d7 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,5 +1,7 @@
 DIST onig-6.9.1.tar.gz 870525 BLAKE2B 8427b92670545e66deba35dfde0cb0ce346629a188c4adaa3025d0acaa81d2ffd86111be17419ea67b2d5f3fb4387aab0d8d20d70fb2f518ccc0ca165b66207d SHA512 5454c161d2d45f2c992513a695ff586ffa99e44a27d7ac5498370e200adb664bb02f2d8cd7d73e61d467f626d1a9b41d9e6e3051e1ea1a021624f94f7d52975f
 DIST onig-6.9.2.tar.gz 901931 BLAKE2B 93326408c7c9cd9c5053f14edd0e5fbf348a4da135146cfbff7659518686a83301b8d4111dbd65b834e201334871d9fa8202a8ed3cc4f793d444591e96071c74 SHA512 c10134e42a3c0b0eeae2027ffb7a3e1bcc9228dee286f6b6e997f8a73d717217fa74de0e19c40975d2e78044c8c4f029eb622f90c8eb4fdc4667eb4804e97001
+DIST onig-6.9.3.tar.gz 902349 BLAKE2B 4b20290a2d72b638b13a2e2edc89e072a8d17f89f6a273b58d0e408d01726ace948dd390bb2f4c478b87d01bed9fa344a4933060736a40981219301529957aaa SHA512 6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861
 EBUILD oniguruma-6.9.1.ebuild 967 BLAKE2B d33b2347afacdf230928fb427f582970b105eb5cbd893079172f9e9f9fa17f6e4ae31c03df4e967626ee573413f2668e3429b522285e00dcd1f72c3151664be0 SHA512 b0b2ca4be822fa8cd223291371e019ab023538c0dabf1300eb662e4d252a6ff05648200c1621e748965a80df80db46ec0e93d94e9d6925385c33c550ca9fa657
 EBUILD oniguruma-6.9.2.ebuild 987 BLAKE2B e328f16352bdbe51260a4b1aef78c0631f0f71aef036677ea73153f9e49709bc965a6943d04ca4702bc72b04dc819834f7a0381a37778d299acb17b667bab0d7 SHA512 11dbf5f9f1fc2cecf1d0c2500dbac1f3632330c6b8350b44dd33196aad6453e064718e6673e03c2bb011d18953bf24813cd32c1c54b88554269b37b4c4c16bef
+EBUILD oniguruma-6.9.3.ebuild 988 BLAKE2B 22e1129f20b9dd06a570543c88780d0fca2e85ae0f8d9737a1b0c0a931cdc0644891b3c989a95df120277b1079252a224dc87723f6ed383e8c62779456272c40 SHA512 000936ac268ce4abde9cc6416dcb60776998a35cba426da92172e362b9d38ad63f00de61fc10f7c075a08334b3a019379232e701f60d00e01a143097ba403e5d
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.3.ebuild b/dev-libs/oniguruma/oniguruma-6.9.3.ebuild
new file mode 100644
index 000000000000..ffce8089134b
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2003-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+MY_P="onig-${PV}"
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index 97efe13a5e9b..b76f1f86e633 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -1,9 +1,14 @@
 AUX pigpio-67-makefile.patch 2074 BLAKE2B 7f8d9e294992301d64ce0c0f6d6446ca97b790057cbe5eeed67a12d91966d5fa9053cf69ee284a7d2a3a39c8c53ac4599ad38c7f47bb630bf5e0ec9fa10e63e7 SHA512 443052a0db49c5a5b9fa4be6e01a7b78efd392f157de6a2855e66fe3da9353f5dfce2f30aaed86ea6f05e0fd2b75e3c0f51c8b9996561db968f160cc3aba3d97
+AUX pigpio-70-makefile.patch 3244 BLAKE2B 3a8155c52ec15227c815a5bac7b42a1fddf9682fbc10dd4513d6c5d7da8b2e1ea9189bc4b28560650b69a857e65c3db00b7af1de30970e23d1bcd988bbba0255 SHA512 096af62d64e61fa6d6394484c58e55dcbe4aa22551c5b3448209e6dcd707688dc3033d219eba954c0e78635d2480b7c7de044aeb18a80d0ac0d701b4d4cc4fa8
 AUX pigpiod.confd 188 BLAKE2B ce3d491b4e333492d42ed84d9f6728631263eb57ff54c56f44479e5567b165666feac78be4aa118bb71d77932bea4c243ea0dad2907d8986b017249c8182a523 SHA512 83903a28e3f9a341b9a709408a2df6b0f89120fe5db529e982e473e27abdc80a0d1f861d1011021ddb04c5c3f9cf040d8dfa6fbb41f216848187c272581b503a
 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606
 AUX pigpiod.systemd 121 BLAKE2B acb298046861f0dc0ee65505e2fa4c62cdfee3e628044d07881891f630e70507d27f253e1735457d56b6f7d9e8602c5a1597765c808f8cacaff96ce0efb52df9 SHA512 bb67874841fc629f5987dc41115ac6cfdd477264d5022bac06bcb3762394818a27f4f6357d537408c2cbcb81959e60ab894fd7e5c45f9a138a45f6da7208ef61
 DIST pigpio-67.tar.gz 369268 BLAKE2B a9d59369f5eed4b733e0e5c0e85013a132e55ff63a2393d79a3fb52d1fcb2513559d4dfeea84c4842d6281936b6e116bd81cd63e4542bbcffaf813ee356ee0d1 SHA512 9792f8402ee0dd204f4a975ab0513099a1fe3d398a28b766f412c08d7908e8e307de4cc92b2a2519b6484f15a043bd40008b7707486015c08bda5f97b1e7e00b
 DIST pigpio-68.tar.gz 371251 BLAKE2B c0118854d18ce158a3d5c96380289cc8bc68f35f72ce28f207dfbb827f97f538acd82cec2af11590e59985b77ef08834d55b3ac7578e1f6b6d1a0b5d5d594632 SHA512 125364eab9dd33c39fda148c6018679ac91b099914d7f0c6362f61566a9c957065189ace03ad4668b29f25d4d542b81d42c0befe0712867b48977b755dc03edc
-EBUILD pigpio-67.ebuild 1081 BLAKE2B 4858dffb1e3a65013b5a8473051c7f378d42fade37e6d9abfdffc4220aa6c3c3d754dcdc46a450d93e33b554ac694df934059c3535566ed16328ff384bcfc845 SHA512 e6050e91ee48e6d088fb53e8063c9ddf0f6d79c3d4f2041604b9e48cf137ba41dbe4898869ba62d7cd23fa23a6d007f29749136bca9dec511fac501d291c9ca0
-EBUILD pigpio-68.ebuild 1084 BLAKE2B 2686719bc407095c4ae485a3c69b5332e0a34b81b581d9bac8fbab3085cbdc55bab3af01973758d955c8582af38aae754c9c89235c9b635c44278d4ea21792b9 SHA512 cafe3aedfbd60fa64a1d9247764ea4ab158347a50394b9cfe94862fca358278807298dc1e8274f825d8a4a21be6f3958820ac924d4249b745e5cab74b68db3fa
+DIST pigpio-70.tar.gz 374569 BLAKE2B a2caadf0e1307c8c3ce936d5fd4d31e18185aa53900f6b2cf8b92a31f423b9a82bf4d2b7212fa8cd5b2d26773598a138ef8331884410f3f418542f43ca1fe2d4 SHA512 00db37b9c0f9751e6179b19e7018583abd9e11d78d01ff9f99b713004cf4e6a224e93644206599378a34dd46fd75c08557021b706015b0bc2bd8b34e363691db
+DIST pigpio-71.tar.gz 374952 BLAKE2B a79a408915285674211e50e30d3cafa433a9ee364cacced501e109d6c31a3a03c14f9d25c3c18e3df252801de65c60ca67cd5f1a8e08f05be8098ad591a14fee SHA512 c3bf029bebff9a7ee02b48597f624a5dcdf277c5c1a7ffa2f6cb83885a93cd6713935d9502127d11c4e9c11e7f6f6be49c8af367707eca2fff469728b5248e2f
+EBUILD pigpio-67.ebuild 1086 BLAKE2B ead6c79ddc9eb0132ed8a8829c882b6eb7e52e62d754f5368cefd3c06d1beb44703aa19936fd6f1a0ca6cc165e575a786ad83c85d28cec5cf62007a2591336f2 SHA512 835c65eb698fc746181a5062a433a0eaef7e3ad5e86017863ed62ce5d8feb903e77ac6dddfcc27cbfba1ed3f823ac20c3d4bc3a381bab35425368010b13899fe
+EBUILD pigpio-68.ebuild 1099 BLAKE2B 90b8f83e25a1146557411ec07a09f82dc3dbe2ecc9df3fcd60ed4265bc6f18301ba743364144174e9feb0a69ed5705f54ac89ba5daeeae2231b43270a2bf69f7 SHA512 b1eaa643b9bc949664c417efcef64317359b58898e7df9810ff0d7d01f884151a531a10d66dbc68f9a3e45abcf8485fd6051a9053bf26316af07dd538ec875de
+EBUILD pigpio-70.ebuild 1099 BLAKE2B 0565c98714cf0c5159817543f7d29a41cb21334a4425c81d8b45768c6d69989bf33cab7128dad03e21afdcc13f4e92f6a4e882c6110b0f598ef461d68fbcfb11 SHA512 e82831ad43f6eb0d40e358120e763b70af14567b5e88fc87576cff1a3646113084b5b2aa25a9350b2815e582c5fa6cb25b6df5fa6651894b08f89fc486ce4042
+EBUILD pigpio-71.ebuild 1099 BLAKE2B 0565c98714cf0c5159817543f7d29a41cb21334a4425c81d8b45768c6d69989bf33cab7128dad03e21afdcc13f4e92f6a4e882c6110b0f598ef461d68fbcfb11 SHA512 e82831ad43f6eb0d40e358120e763b70af14567b5e88fc87576cff1a3646113084b5b2aa25a9350b2815e582c5fa6cb25b6df5fa6651894b08f89fc486ce4042
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/files/pigpio-70-makefile.patch b/dev-libs/pigpio/files/pigpio-70-makefile.patch
new file mode 100644
index 000000000000..10df7e872c6c
--- /dev/null
+++ b/dev-libs/pigpio/files/pigpio-70-makefile.patch
@@ -0,0 +1,98 @@
+--- a/Makefile	2019-08-10 10:10:22.834043361 +0200
++++ b/Makefile	2019-08-10 10:43:15.797503591 +0200
+@@ -9,6 +9,9 @@
+ STRIP        = $(CROSS_PREFIX)strip
+ SHLIB        = $(CC) -shared
+ STRIPLIB     = $(STRIP) --strip-unneeded
++LDCONFIG     = ldconfig
++PYTHON2      = $(shell type -P python2 || echo ':' 2> /dev/null)
++PYTHON3      = $(shell type -P python3 || echo ':' 2> /dev/null)
+ 
+ SOVERSION    = 1
+ 
+@@ -25,7 +28,7 @@
+ 
+ LIB      = $(LIB1) $(LIB2) $(LIB3)
+ 
+-ALL     = $(LIB) x_pigpio x_pigpiod_if x_pigpiod_if2 pig2vcd pigpiod pigs
++ALL     = $(LIB) pig2vcd pigpiod pigs
+ 
+ LL1      = -L. -lpigpio -pthread -lrt
+ 
+@@ -66,28 +69,21 @@
+ 	$(CC) -o x_pigpiod_if2 x_pigpiod_if2.o $(LL3)
+ 
+ pigpiod:	pigpiod.o $(LIB1)
+-	$(CC) -o pigpiod pigpiod.o $(LL1)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o pigpiod pigpiod.o $(LL1)
+ 	$(STRIP) pigpiod
+ 
+ pigs:		pigs.o command.o
+-	$(CC) -o pigs pigs.o command.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o pigs pigs.o command.o
+ 	$(STRIP) pigs
+ 
+ pig2vcd:	pig2vcd.o
+-	$(CC) -o pig2vcd pig2vcd.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o pig2vcd pig2vcd.o
+ 	$(STRIP) pig2vcd
+ 
+ clean:
+ 	rm -f *.o *.i *.s *~ $(ALL) *.so.$(SOVERSION)
+ 
+-ifeq ($(DESTDIR),)
+-  PYINSTALLARGS =
+-else
+-  PYINSTALLARGS = --root=$(DESTDIR)
+-endif
+-
+ install:	$(ALL)
+-	install -m 0755 -d                             $(DESTDIR)/opt/pigpio/cgi
+ 	install -m 0755 -d                             $(DESTDIR)$(includedir)
+ 	install -m 0644 pigpio.h                       $(DESTDIR)$(includedir)
+ 	install -m 0644 pigpiod_if.h                   $(DESTDIR)$(includedir)
+@@ -103,15 +99,13 @@
+ 	install -m 0755 pig2vcd                        $(DESTDIR)$(bindir)
+ 	install -m 0755 pigpiod                        $(DESTDIR)$(bindir)
+ 	install -m 0755 pigs                           $(DESTDIR)$(bindir)
+-	if which python2; then python2 setup.py install $(PYINSTALLARGS); fi
+-	if which python3; then python3 setup.py install $(PYINSTALLARGS); fi
++	$(PYTHON2) setup.py install
++	$(PYTHON3) setup.py install
+ 	install -m 0755 -d                             $(DESTDIR)$(mandir)/man1
+-	install -m 0644 p*.1                           $(DESTDIR)$(mandir)/man1
++	install -m 0644 *.1                            $(DESTDIR)$(mandir)/man1
+ 	install -m 0755 -d                             $(DESTDIR)$(mandir)/man3
+-	install -m 0644 p*.3                           $(DESTDIR)$(mandir)/man3
+-ifeq ($(DESTDIR),)
+-	ldconfig
+-endif
++	install -m 0644 *.3                            $(DESTDIR)$(mandir)/man3
++	$(LDCONFIG)
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(includedir)/pigpio.h
+@@ -136,19 +130,19 @@
+ endif
+ 
+ $(LIB1):	$(OBJ1)
+-	$(SHLIB) -pthread -Wl,-soname,$(LIB1).$(SOVERSION) -o $(LIB1).$(SOVERSION) $(OBJ1)
++	$(SHLIB) -o $(LIB1).$(SOVERSION) $(OBJ1)
+ 	ln -fs $(LIB1).$(SOVERSION) $(LIB1)
+ 	$(STRIPLIB) $(LIB1)
+ 	$(SIZE)     $(LIB1)
+ 
+ $(LIB2):	$(OBJ2)
+-	$(SHLIB) -pthread -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB2).$(SOVERSION) $(OBJ2)
++	$(SHLIB) -o $(LIB2).$(SOVERSION) $(OBJ2)
+ 	ln -fs $(LIB2).$(SOVERSION) $(LIB2)
+ 	$(STRIPLIB) $(LIB2)
+ 	$(SIZE)     $(LIB2)
+ 
+ $(LIB3):	$(OBJ3)
+-	$(SHLIB) -pthread -Wl,-soname,$(LIB3).$(SOVERSION) -o $(LIB3).$(SOVERSION) $(OBJ3)
++	$(SHLIB) -o $(LIB3).$(SOVERSION) $(OBJ3)
+ 	ln -fs $(LIB3).$(SOVERSION) $(LIB3)
+ 	$(STRIPLIB) $(LIB3)
+ 	$(SIZE)     $(LIB3)
+
diff --git a/dev-libs/pigpio/pigpio-67.ebuild b/dev-libs/pigpio/pigpio-67.ebuild
index e10bc7791689..56f692b26a27 100644
--- a/dev-libs/pigpio/pigpio-67.ebuild
+++ b/dev-libs/pigpio/pigpio-67.ebuild
@@ -31,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: libdir="$(get_libdir)" prefix="/usr" mandir="/usr/share/man" install
+	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: libdir="/usr/$(get_libdir)" prefix="/usr" mandir="/usr/share/man" install
 	einstalldocs
 	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
 	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
diff --git a/dev-libs/pigpio/pigpio-68.ebuild b/dev-libs/pigpio/pigpio-68.ebuild
index ab323e84a88e..6ca0daa626e3 100644
--- a/dev-libs/pigpio/pigpio-68.ebuild
+++ b/dev-libs/pigpio/pigpio-68.ebuild
@@ -29,7 +29,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
-		libdir="$(get_libdir)" prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
 		mandir="${EPREFIX}/usr/share/man" install
 	einstalldocs
 	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
diff --git a/dev-libs/pigpio/pigpio-70.ebuild b/dev-libs/pigpio/pigpio-70.ebuild
new file mode 100644
index 000000000000..f4a86cfd1b13
--- /dev/null
+++ b/dev-libs/pigpio/pigpio-70.ebuild
@@ -0,0 +1,39 @@
+# 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 distutils-r1 systemd toolchain-funcs
+
+DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
+HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
+SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-70-makefile.patch"
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
+		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
+		mandir="${EPREFIX}/usr/share/man" install
+	einstalldocs
+	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
+	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
+	systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
+	use python && distutils-r1_src_install
+}
diff --git a/dev-libs/pigpio/pigpio-71.ebuild b/dev-libs/pigpio/pigpio-71.ebuild
new file mode 100644
index 000000000000..f4a86cfd1b13
--- /dev/null
+++ b/dev-libs/pigpio/pigpio-71.ebuild
@@ -0,0 +1,39 @@
+# 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 distutils-r1 systemd toolchain-funcs
+
+DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
+HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
+SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-70-makefile.patch"
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
+		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
+		mandir="${EPREFIX}/usr/share/man" install
+	einstalldocs
+	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
+	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
+	systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
+	use python && distutils-r1_src_install
+}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index ce7cedfabbf8..c872b8aff062 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -13,8 +13,10 @@ AUX protobuf-3.8.0-system_libraries.patch 6352 BLAKE2B fde8a49ac3034320d9ae03479
 DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
 DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
 DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
+DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
 EBUILD protobuf-3.6.1.3.ebuild 2632 BLAKE2B a56bc323756a435869076bb5e85d7aec0c777b1709dde5ba78c40cceac648802366710d00508296928cb8b7f8b3fe9f089a38c4bea32d3b877902970cb6a9c82 SHA512 afec4771997a723c61c223465fa7b18d4d8c66676dcc606a1e2d7ca06dc45f7b16c2fc12c816a08507e09c6b98d0271154310125849356e72ddc7b28b9d84a3c
 EBUILD protobuf-3.7.1.ebuild 2943 BLAKE2B 896edce997fcecd5c16e03906333fce045a365c387b42a9880af6b6ff4ffb8a8a585a80db1833ea1b215830e0fbf8eb7b915bea3b1b13db8fb68ffe98153cc1e SHA512 f0c19b39ecc5c9ef7e2fc0fd5bb5479f6d467c82cf260d943aadfe5e8c7616b9a9e2753213e2d88c1b6cd77bbe5d9253dafee65ab892e88d2e6b36285e8f3faa
-EBUILD protobuf-3.8.0.ebuild 2952 BLAKE2B 649df58847b2b8563146794a416ba5ec555c5c6f68fd953d953b96d246fb47951fddd0c6c9a73919dde9e95fbc79dba0492093601d28fcebf69589774c1454ca SHA512 5e95b7a76ae54c481e12467e9a7b03800ec59b045b51be6b695606ad3125e60ed8babe9ae2bdf8c106fe510891d9bc40bdeecc5ebe75a9534756026154f285e8
+EBUILD protobuf-3.8.0.ebuild 2892 BLAKE2B 5b8e850804d5f9020490f1a83699e22210b8ce3c8b19aa9aa216b801efefa8e4fa579f738c8cfc68bb803013c6cc4221ad740acbea9ebd18bbdc0479a03d0e29 SHA512 2bc85c8b152b3a506967aec62f8015dfdf6ffd0f7868628790f4f1105978fcef2f79206dd60c750603b3824bfb9b893f3ec6143e4e35dbe04b1f4c1471fcd426
+EBUILD protobuf-3.9.1.ebuild 2896 BLAKE2B c893d4fd10dc19eb708804bb6c65ff9c349ead7e318e87a44aa6e6554ca8989227de888b5ff733d788ab2a425d1c6342f67ef549705559efddee8deb2fc2c69e SHA512 27e0441ce650a4981808dd5fd25b88ae33371e012be0e522635907bfce65e049d2095a14dcfed8c261d5c2ec3d3a34e0bb214bd133cefa5e5c28aa8c3be61332
 EBUILD protobuf-9999.ebuild 2720 BLAKE2B 2f45592f132b7758201e6c3125290ce4aef7728997cc64a325585679a81a92ae9eb5037a67c78eb762ab2490e7ddd4e174024b869d01b8629a31838fa0a52541 SHA512 0353bf1028af6eeae9689b7a08aa6e5726638c6a7e9472cf2fe4153c3c346222ec14e5a9c2627c1eff94a6e00c52a9c39c642ea05da082f53b87dd59787b2ffa
-MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983
+MISC metadata.xml 426 BLAKE2B e4705957b7b549ca44bd4099f7ae592cc313604e00dba91d97887992e097e68beadbcb9cadca1a0f1c7da2a60d2fe844a79570db28d0606140d9204e73c739de SHA512 f7784ccfe1935b7946f0e4b25b1c0db457989f196b5551ab14e2b043549220260b29b014b6d330fd3ceb900490a2b87cb43a178dc45601e80ada30c6a0468fb1
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index f37667040e4f..ac91ac3eab9c 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -5,10 +5,6 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<slots>
 		<subslots>Soname version number</subslots>
 	</slots>
diff --git a/dev-libs/protobuf/protobuf-3.8.0.ebuild b/dev-libs/protobuf/protobuf-3.8.0.ebuild
index 345fbe9a3df1..9d5b0b86ec79 100644
--- a/dev-libs/protobuf/protobuf-3.8.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.8.0.ebuild
@@ -1,8 +1,6 @@
 # Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# True Authors: Arfrever Frehtes Taifersar Arahesis and others
-
 EAPI="7"
 
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
@@ -24,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/19"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
@@ -97,7 +95,7 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	find "${D}" -name "*.la" -delete || die
+	find "${D}" -name "*.la" -type f -delete || die
 
 	insinto /usr/share/vim/vimfiles/syntax
 	doins editors/proto.vim
diff --git a/dev-libs/protobuf/protobuf-3.9.1.ebuild b/dev-libs/protobuf/protobuf-3.9.1.ebuild
new file mode 100644
index 000000000000..39e484b64e65
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.9.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2008-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/20"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( virtual/emacs )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( virtual/emacs )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.8.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.8.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.8.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -type f -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
new file mode 100644
index 000000000000..30abfe8abbed
--- /dev/null
+++ b/dev-libs/rocm-comgr/Manifest
@@ -0,0 +1,10 @@
+AUX rocm-comgr-2.6.0-correctly-install.patch 1397 BLAKE2B 99558ad6f8e7908efe33ae215e1645ab733966d778753a25714a1fb0880db9bf3df43c108c0b200d1bf54475b928607d4e99a7a7a97464863cb5a6ea0cac53e9 SHA512 3dddf76dde36118aa8808178ca6bb6c7653148b83d1d2f3c66d18d6c5421ae7ad438b1467af6e842aa4c24a3256c4ef95717ed46feedba07f965828f47bdedcb
+AUX rocm-comgr-2.6.0-dependencies.patch 713 BLAKE2B 2a4a642044d243d5da9084e8d0dc37b7b230ade108a547a3c46a41f7fe456804288b69a67a8f378032d1ca3d6c0f6416ce711ed9ddb6e5cacfaea166f2313610 SHA512 435d7488516551e7345acb4a645f8ea040d461bec1b6dafdc832c692038061459be4c615b1d42292cd22daa7c88e26cc4b8df41ff4e0f65ede0e23c098223cd8
+AUX rocm-comgr-2.6.0-find-clang.patch 982 BLAKE2B 7284604ac25dbbd292050d35952db0b42fada73465f86bba34a40941c28c38709b6cc5006ba40357dcccece60662d12abde68d3cacc46b138325851f975a63e2 SHA512 74d4042c1c4ddaab22b0708a317db0d3c4e7045dfd36b03b94a10fd8f7c40a3442c5016e20067e59ca2266e1563fd33fc378053ce917c2a161cfc4b71425b33d
+AUX rocm-comgr-2.6.0-find-lld-includes.patch 1886 BLAKE2B b06fc169e9271f9476e17091fa6060518b11bf2dfce700fedc780189f9db4da57aa4290183e743a08bfe4502be9079895690085a89788b1ba56bf4e9f8aa3062 SHA512 211b274280734b7f2478ecb094a36f303f7849cfede46709714a5171d07f2521959c216564623d119a14064d762fa752de4b745cee340480210eea4b757c7e3f
+AUX rocm-comgr-2.6.0-unbundle-yaml-cpp.patch 1082 BLAKE2B 0b44c1731884d225056a18b81c52c99f59a9a3e9d16e06cbe77e683b10703cd83cb96446ff138d6c4c14c48f931a1df0f37699153e0b6f253f89d42f93feebbf SHA512 74190c23d86792bac64b09f3724ad98a3c7b89dd0bbfcbc051d7821222a97e37de9138eee32abb8982ce78982dbddbe640c3f05ad560ef29c287c9196afdef89
+DIST rocm-comgr-2.6.0.tar.gz 1484343 BLAKE2B fcb496b4997d672640e3f75622e74085eeb9dfe83c88ae025530389d3cdca7628155168060e71f7a3ff915e933ffe70c7026720dc124d128d16ef4df397525e7 SHA512 b14e90603d2b6e17f6b0335ea35da2e5d7e31710f301d7a7f7751a45d996e3dbbfbf84a03e2e911e8798e72e77b87b5cd88317e897cb4de3ee5cf0e7c3222d68
+DIST rocm-comgr-2.7.0.tar.gz 1500771 BLAKE2B 275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b SHA512 afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9
+EBUILD rocm-comgr-2.6.0.ebuild 1189 BLAKE2B 29d9b7ad1e3dca202024101223422b667c82d58eed20da01492e955c39e768f85b677d9fbbedcb7b22aa41855dd68acf11562f7083303f9d00749fbfd5af9c84 SHA512 ab54afa2597fc0133db00c42fec5226da8118b4d79eb67c6d6af1bf3c111296b9b72c5675469594c403021a00446e68b8ab5ab51b678dec0958ca21e9bcc83c4
+EBUILD rocm-comgr-2.7.0.ebuild 1240 BLAKE2B 9695e6a8d5a33c02a696384737ec5ac3729f4bcf4dc82c8784aefddf6d0c15d352d02c11ec1be1f6a56bab00f7004cef9acfefed447369f485c42eb2eb4fdabd SHA512 b9961ef6b9e6a280441443e4370a0778b658bcaf4c01cbe74f8833a1fa2b5e7dd6b963a9f634fa9c9700526fe8fb6d79f76f83f0d88498f4496bf5af7d89db00
+MISC metadata.xml 484 BLAKE2B 5afcf22d4b70b094748570fc3f2c756c85b1f192aabc8df86d64e3bad535702444111151282dead984de46a5de2ab04748e0a2b0252f3a3af6e32e1e60416a3b SHA512 da6dbb545060ba024ce5df3439db80210c15e9191953703c9c50b2fed11a4140303a87cc89ee0336ad81f495da0d434fedd85e6c32a1ddede525a1bc5420ca94
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
new file mode 100644
index 000000000000..74206760f39a
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
@@ -0,0 +1,44 @@
+From 98f589636729b1e25625db6880fbd7820dcf9e40 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Wed, 31 Jul 2019 10:04:11 -0400
+Subject: [PATCH] Install to standard locations using GNUInstallDirs
+
+Some distributions require 64 bit libraries to be installed to lib64, for example.
+Using GNUInstallDirs ensures that files are installed to the expected locations.
+---
+ CMakeLists.txt | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 454b830..a89af16 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ cmake_minimum_required(VERSION 3.2.0)
+ 
++include (GNUInstallDirs)
++
+ # Build ROCM-Compiler-Support with ccache if the package is present.
+ set(ROCM_COMPILER_SUPPORT_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build")
+ if(ROCM_COMPILER_SUPPORT_CCACHE_BUILD)
+@@ -146,17 +148,17 @@ configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in"
+ 
+ install(TARGETS amd_comgr
+   EXPORT amd_comgr_export
+-  DESTINATION lib)
++  DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ install(FILES
+   "include/amd_comgr.h"
+-  DESTINATION include)
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ install(FILES
+   "README.md"
+   "LICENSE.txt"
+   "NOTICES.txt"
+-  DESTINATION share/amd_comgr)
++  DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr)
+ 
+ # Generate the install-tree package.
+ set(AMD_COMGR_PREFIX_CODE "
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
new file mode 100644
index 000000000000..bce19d168b0a
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
@@ -0,0 +1,38 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
+
+--- comgr/CMakeLists.old	2019-07-19 17:19:26.080276421 +0200
++++ comgr/CMakeLists.txt	2019-07-19 18:17:25.780163592 +0200
+@@ -185,7 +185,11 @@
+ include_directories(./yaml-cpp/include)
+ 
+ set(CLANG_LIBS
+-  clangFrontendTool)
++  clangFrontendTool
++  clangFrontend
++  clangBasic
++  clangDriver
++  clangSerialization)
+ 
+ set(LLD_LIBS
+   lldELF
+@@ -193,8 +197,19 @@
+ 
+ llvm_map_components_to_libnames(LLVM_LIBS
+   ${LLVM_TARGETS_TO_BUILD}
++  Option
+   DebugInfoDWARF
+-  Symbolize)
++  Symbolize
++  Support
++  Object
++  BitWriter
++  MC
++  MCParser
++  MCDisassembler
++  Core
++  IRReader
++  CodeGen
++  Linker)
+ 
+ target_link_libraries(amd_comgr
+   PUBLIC
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch
new file mode 100644
index 000000000000..dda005ab7a21
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch
@@ -0,0 +1,26 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/16
+
+From 09eb70afa22e2d6066a5f29888158c6005170ca6 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Wed, 31 Jul 2019 10:13:30 -0400
+Subject: [PATCH] Find Clang avoiding the system (non-ROC) LLVM
+
+Use NO_DEFAULT_PATH to avoid finding the system (non-ROC) LLVM.
+Use /opt/rocm/llvm as an additional hint to be consistent with the build systems of other ROC projects (such as ROCm-OpenCL-Driver)
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 454b830..8642c98 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,7 +13,7 @@ endif()
+ 
+ project(code_object_manager)
+ 
+-find_package(Clang REQUIRED CONFIG)
++find_package(Clang REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
+ add_definitions(${LLVM_DEFINITIONS})
+ include_directories(${LLVM_INCLUDE_DIRS})
+ link_directories(${LLVM_LIBRARY_DIRS})
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch
new file mode 100644
index 000000000000..5b44feaf1b3d
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch
@@ -0,0 +1,43 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/17
+
+From 4588c1a5aad3edae9d3e121685d8d1f5fddd54ba Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Wed, 31 Jul 2019 10:45:01 -0400
+Subject: [PATCH] Find lld includes in LLVM_INCLUDE_DIRS
+
+Allows building against an LLVM build tree
+---
+ CMakeLists.txt | 20 ++------------------
+ 1 file changed, 2 insertions(+), 18 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 454b830..db28533 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,24 +19,8 @@ include_directories(${LLVM_INCLUDE_DIRS})
+ link_directories(${LLVM_LIBRARY_DIRS})
+ include_directories(${CLANG_INCLUDE_DIRS})
+ 
+-# FIXME: There is no way to directly determine the include paths for LLD when
+-# working with an LLVM build tree, but we want to avoid having to install LLVM
+-# to build Comgr. This should eventually be fixed in usptream LLD so this can
+-# be removed.
+-if(DEFINED LLVM_BUILD_MAIN_SRC_DIR)
+-  set(INTERNAL_LLD_INCLUDE_DIRS "${LLVM_BUILD_MAIN_SRC_DIR}/tools/lld/include")
+-  set(EXTERNAL_LLD_INCLUDE_DIRS "${LLVM_BUILD_MAIN_SRC_DIR}/../lld/include")
+-  if (EXISTS "${INTERNAL_LLD_INCLUDE_DIRS}"
+-      AND IS_DIRECTORY "${INTERNAL_LLD_INCLUDE_DIRS}")
+-    set(LLD_INCLUDE_DIRS "${INTERNAL_LLD_INCLUDE_DIRS}")
+-  elseif (EXISTS "${EXTERNAL_LLD_INCLUDE_DIRS}"
+-      AND IS_DIRECTORY "${EXTERNAL_LLD_INCLUDE_DIRS}")
+-    set(LLD_INCLUDE_DIRS "${EXTERNAL_LLD_INCLUDE_DIRS}")
+-  else()
+-    message(FATAL_ERROR "You are attempting to compile using an LLVM build tree, but the LLD include directory could not be located. The paths '${INTERNAL_LLD_INCLUDE_DIRS}' and '${EXTERNAL_LLD_INCLUDE_DIRS}' were tried.")
+-  endif()
+-  include_directories(${LLD_INCLUDE_DIRS})
+-endif()
++set(LLD_INCLUDE_DIRS "${LLVM_INCLUDE_DIRS}/lld")
++include_directories(${LLD_INCLUDE_DIRS})
+ 
+ find_package(AMDDeviceLibs CONFIG)
+ 
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
new file mode 100644
index 000000000000..d61f4c2a2003
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
@@ -0,0 +1,30 @@
+diff --git a/lib/comgr/CMakeLists.txt b/lib/comgr/CMakeLists.txt
+index 454b830..70e2526 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -90,12 +90,8 @@ if (UNIX)
+         -Wl,--no-undefined)
+     endif()
+   endif()
+-  # FIXME: Remove when yaml-cpp is removed from the build.
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ else()
+   list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS "/W0" "/wd4244")
+-  # FIXME: Make this private once yaml-cpp is removed from the build.
+-  add_definitions(-D_HAS_EXCEPTIONS=0)
+ endif()
+ 
+ # Windows is strict about visibility of exports in shared libraries, so we ask
+@@ -179,10 +175,8 @@ install(EXPORT amd_comgr_export
+   DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}"
+   FILE "${AMD_COMGR_TARGETS_NAME}")
+ 
+-set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing" FORCE)
+-set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Enable parse tools" FORCE)
+-add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
+-include_directories(./yaml-cpp/include)
++find_package(yaml-cpp REQUIRED)
++include_directories(${YAML_CPP_INCLUDE_DIR})
+ 
+ set(CLANG_LIBS
+   clangFrontendTool)
diff --git a/dev-libs/rocm-comgr/metadata.xml b/dev-libs/rocm-comgr/metadata.xml
new file mode 100644
index 000000000000..20237687f91a
--- /dev/null
+++ b/dev-libs/rocm-comgr/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">RadeonOpenCompute/ROCm-CompilerSupport</remote-id>
+    </upstream>
+    <longdescription lang="en">
+        Radeon Open Compute Code Object Manager
+    </longdescription>
+</pkgmetadata>
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
new file mode 100644
index 000000000000..c000ce55ab71
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/lib/comgr"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
+	KEYWORDS="~amd64"
+fi
+PATCHES=(
+	"${FILESDIR}/${P}-correctly-install.patch"
+	"${FILESDIR}/${P}-find-clang.patch"
+	"${FILESDIR}/${P}-find-lld-includes.patch"
+	"${FILESDIR}/${P}-dependencies.patch"
+	"${FILESDIR}/${P}-unbundle-yaml-cpp.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocm-device-libs
+	dev-cpp/yaml-cpp:=
+	sys-devel/llvm-roc:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	rm -rf yaml-cpp || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.7.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.7.0.ebuild
new file mode 100644
index 000000000000..17cde6491434
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-2.7.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/lib/comgr"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
+	KEYWORDS="~amd64"
+fi
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.0-correctly-install.patch"
+	"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
+	"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
+	"${FILESDIR}/${PN}-2.6.0-dependencies.patch"
+	"${FILESDIR}/${PN}-2.6.0-unbundle-yaml-cpp.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	dev-cpp/yaml-cpp:=
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	rm -rf yaml-cpp || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
new file mode 100644
index 000000000000..6d7d89ce6e54
--- /dev/null
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -0,0 +1,6 @@
+DIST rocm-device-libs-2.6.0.tar.gz 221981 BLAKE2B 6350fafb31453daf015886bc2d3d2ba59b805fafdf12372fcad8f328c9e7c74d4e54093817b07961d7be77b990780038f7a7b91d5ab63650a92bf107e0be4a40 SHA512 4262c956ea8c212c2707acf74ee27f609a6faee1bee7c3fd436b2a4adbedf1b072b611e6143cc315bd4e9d1e306d874aa0f4629cff9301bd28be65fd16867180
+DIST rocm-device-libs-2.7.0.tar.gz 226395 BLAKE2B 85c5b7ebfca1570d9653428d4aa7052f784443c774b224b563471638caac01f9d800d0bb5d52dace2b54a447cfc00c0f39ed87ab1612f1e382fbba10c5e30e80 SHA512 2277ff4037b25d32b473b3b046708b2ce4aeb28c1df7ed4ce51893c204e5409c931083b3ecc38c6796581c1233e0d25dd0f0c5710961be8d1d60118e9a1de88a
+EBUILD rocm-device-libs-2.6.0.ebuild 851 BLAKE2B 7e07a2b6f56b52b2245af3084cb021b496aef361ecb554a848901679341e6733e168951c7cb1ba29b92d118380ba6c5ab9565384892d455db52df35ee7df547a SHA512 0954cabec7c11b7eb1c54acbfd0e23c1f1746c50ffbbb60b1042509111380686aa9b21b426cc9281e17c4cf74b6033dfc9ccb4f5612f031913a37b0b66f4c5e6
+EBUILD rocm-device-libs-2.7.0.ebuild 867 BLAKE2B caec1c5ad1e4f7b6a643720d469ce6da76c0e5951b0c9b81a972427ac4e4308f772d4df40eb4f30fc4be9a98ec6241d53908e1bd5613ee69e06094049b963a6f SHA512 74b9fa8b676ab3e75afe13099367cc7c915ad7c8ac3a2f7c594e791c8cedd127c8a107005c5823864fe305ef665d3c94fb657dc1057bd078b04cde03f85d8fdc
+EBUILD rocm-device-libs-9999.ebuild 851 BLAKE2B 7e07a2b6f56b52b2245af3084cb021b496aef361ecb554a848901679341e6733e168951c7cb1ba29b92d118380ba6c5ab9565384892d455db52df35ee7df547a SHA512 0954cabec7c11b7eb1c54acbfd0e23c1f1746c50ffbbb60b1042509111380686aa9b21b426cc9281e17c4cf74b6033dfc9ccb4f5612f031913a37b0b66f4c5e6
+MISC metadata.xml 477 BLAKE2B 75910bca37a606f3ca0b41122d64b786776930f7cf00e8125496b4722d887f31506f1abec272123b66e81ce5e5ff9ffad5e3176c29e64c314e46f71c8baefb4a SHA512 ea01d8303b071b1338e53361ec9b21e73447d42e4d96598f4b723496fa48dab4f811d743f1dd188da28c7240fdf4b132775181c177fc35702d8b99ef40ef7b01
diff --git a/dev-libs/rocm-device-libs/metadata.xml b/dev-libs/rocm-device-libs/metadata.xml
new file mode 100644
index 000000000000..e7986fbb2ae9
--- /dev/null
+++ b/dev-libs/rocm-device-libs/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">RadeonOpenCompute/ROCm-Device-Libs</remote-id>
+    </upstream>
+    <longdescription lang="en">
+        Radeon Open Compute Device Libraries
+    </longdescription>
+</pkgmetadata>
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild
new file mode 100644
index 000000000000..91d53a41976d
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime
+	sys-devel/llvm-roc:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.7.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-2.7.0.ebuild
new file mode 100644
index 000000000000..e0264de7479c
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-2.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
new file mode 100644
index 000000000000..91d53a41976d
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime
+	sys-devel/llvm-roc:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-hostcall/Manifest b/dev-libs/rocm-hostcall/Manifest
new file mode 100644
index 000000000000..f2afbc63ea07
--- /dev/null
+++ b/dev-libs/rocm-hostcall/Manifest
@@ -0,0 +1,4 @@
+AUX rocm-hostcall-2.7.0-install-correctly.patch 1460 BLAKE2B a635eb5e841db218d48fd70fe68956e13f496cc6beb33f37ad1cdc237fd9168f2f48fcec951b0904016b114008f6270bf2df3f91e2269e2db3055b9ecdc7726f SHA512 faa49431ca93dc446deed02706aac06ff7ed7f7877a9c5e4611e7b653feaf3eedaa9d1300c328f54663c082dd033a464aa90ce46b30b733573763c5f30245ced
+DIST rocm-hostcall-2.7.0.tar.gz 1500771 BLAKE2B 275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b SHA512 afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9
+EBUILD rocm-hostcall-2.7.0.ebuild 866 BLAKE2B b49f21e9d48418cbb7831f41a340fc36301083589e28cef71e52a49abc7a1e2771d69507cc2b5f4c62914b5ca62efd40f9c5a7ff1530b842838f742c12d32d31 SHA512 8ca7162104c4045b2591f41c9b1d936d47f5ce7949458c68831cafe5e1d716aaf23fc3c2935f71303ac75d682576213bc629537ab9124217492c512aee54974e
+MISC metadata.xml 477 BLAKE2B ec5920ba7f035d1122905dc096529265b11b9c6f9bc5b65552d528891f76334b4f105b7339a3180760c31e10ccbca5a2454018d4ebd10d1884e27c742c6b59f6 SHA512 738e3d6ecfdae4b69714187789223b16a8483bd4e93d830af0898b5f536312011efb74f7af1f046a76dcd6169181b67dcf00a9188959551c865aabbb8e1ec259
diff --git a/dev-libs/rocm-hostcall/files/rocm-hostcall-2.7.0-install-correctly.patch b/dev-libs/rocm-hostcall/files/rocm-hostcall-2.7.0-install-correctly.patch
new file mode 100644
index 000000000000..f419674886a7
--- /dev/null
+++ b/dev-libs/rocm-hostcall/files/rocm-hostcall-2.7.0-install-correctly.patch
@@ -0,0 +1,39 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/18
+
+From 345025de5c6c470e36505ff70978b168c05a1a71 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Wed, 31 Jul 2019 11:18:56 -0400
+Subject: [PATCH] Install to standard locations using GNUInstallDirs
+
+Some distributions require 64 bit libraries to be installed to lib64, for example.
+Using GNUInstallDirs ensures that files are installed to the expected locations.
+---
+ CMakeLists.txt | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0f524e6..009bab7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,8 @@ if (NOT UNIX)
+     message(FATAL_ERROR "No Windows support due to lack of signals")
+ endif()
+ 
++include(GNUInstallDirs)
++
+ find_path(HSA_HEADER hsa/hsa.h PATHS /opt/rocm/include)
+ if (NOT EXISTS ${HSA_HEADER})
+     message(FATAL_ERROR "Cannot find HSA headers. Please check the CMAKE_PREFIX_PATH")
+@@ -34,9 +36,9 @@ target_compile_options(amd_hostcall
+ target_compile_definitions(amd_hostcall
+   PRIVATE "${AMD_HOSTCALL_PRIVATE_COMPILE_DEFINITIONS}")
+ 
+-set(INCLUDE_INSTALL_DIR include)
+-set(LIB_INSTALL_DIR lib)
+-set(SHARE_INSTALL_DIR share)
++set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
++set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
++set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR})
+ set(CONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/amd_hostcall)
+ 
+ install(TARGETS amd_hostcall
diff --git a/dev-libs/rocm-hostcall/metadata.xml b/dev-libs/rocm-hostcall/metadata.xml
new file mode 100644
index 000000000000..6b2718fcba0e
--- /dev/null
+++ b/dev-libs/rocm-hostcall/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">RadeonOpenCompute/ROCm-CompilerSupport</remote-id>
+    </upstream>
+    <longdescription lang="en">
+        Radeon Open Compute hostcall API
+    </longdescription>
+</pkgmetadata>
diff --git a/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
new file mode 100644
index 000000000000..848a8f3a5408
--- /dev/null
+++ b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/lib/hostcall"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/hostcall"
+	KEYWORDS="~amd64"
+fi
+PATCHES=(
+	"${FILESDIR}/${P}-install-correctly.patch"
+)
+
+DESCRIPTION="Radeon Open Compute hostcall API"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-opencl-driver/Manifest b/dev-libs/rocm-opencl-driver/Manifest
new file mode 100644
index 000000000000..f9c0afae528d
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/Manifest
@@ -0,0 +1,7 @@
+AUX rocm-opencl-driver-2.6.0-install-correctly.patch 1931 BLAKE2B a0bb45e0bf08b777e88804cfe77eadebe1181aa4488885333c9996bbaa0177f7211b16f1fac30e743d53efaa63f59c28b2e928eb2ed6e5396ee2fa6862782caa SHA512 547bf0901a7ef8ac3ae3822dff77ab3409f39c6038c906acfa49579c7652dcd44d235331bd44cab2e5abb9ce1adcc75320f7476cc88666a45d303352e09ef20c
+AUX rocm-opencl-driver-2.6.0-install-header.patch 828 BLAKE2B 5640501a48f6d8552edf7fc89608dc7ff3d7ebe353c88759707e37ec9597a2b6a4cd982a17bf87e30f8f6def80a3a1fd866769b3f2d2572dd8506804ce7e3143 SHA512 f8569519b47f194f58fcb3a2b54f51157be792200004c7bebfde6fb7fea574eac3bec69ab0ea73ff4ef030a9335fdaa21ae22e8655661fab65e11a1a0492395f
+DIST rocm-opencl-driver-2.6.0.tar.gz 21311 BLAKE2B f17219b577ccd58de052d5936953fd78588a0b042ce002853b10c05e6f6d433edcd90045c15dcd2f2c31ccef89f8b420ef756a1dd1613702efcc8868163878d1 SHA512 7b8bf646d9a36b09d75a0408301c2f1771daad95b8075b1671ca0c8b1f5826e8cd9de8935946858268dc89863a0ee054b4dde3040c84dd37e90f28c7ffa6e097
+DIST rocm-opencl-driver-2.7.0.tar.gz 21312 BLAKE2B 8c7233e8c5de2d92d0604a832475a474e5a171853f435908dbe73ab41d077f9f4c2d7069546b4e660d900c02cccf1f77d85d2fbe5ddb52fdde4c32d6c26910a2 SHA512 ee14bbbf502ffc00fd9e1e04224ae8109c8603d44438cddde8951c2d2caf5d45b94d39eb184af66462b4029759064aab0e2312b44fdd3f925064ebe6097ac49b
+EBUILD rocm-opencl-driver-2.6.0.ebuild 1166 BLAKE2B 4e94bb069a67cd2e0e4dfed81fd46cd331b980b5c2d615932adf988be6708f8d27a000672b81b00c34cc29ce2660aa71f0960bb716c43d1d1dc824c7e3f1b0d5 SHA512 ad72eef3737a65c333d26539150271d82a1ce31618d345c9b9acd485a72948e291ccd147985323ad724544efe9298e4369037213410565f5a37514aedbafe5f1
+EBUILD rocm-opencl-driver-2.7.0.ebuild 1196 BLAKE2B 1c5f07259df697ee75d2b25a652d1c274c9d1fae914a79e0cbc639b8fbebd3c78088afd528920a004bc399d6f259c7f892b26841af776a24370d1730dabb8c51 SHA512 64afcc72b31176174e5657e66f694df91b9ce644e4f2df78fd26a943922f42fe9378f42a217a232cf39774421ed750fbc9111503bacd2b7e22376a52e968ac89
+MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a
diff --git a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch
new file mode 100644
index 000000000000..d70f0977ec8f
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch
@@ -0,0 +1,49 @@
+https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/pull/85
+
+From 8819a684c9b6e154abedc041b3da545aab353d67 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Fri, 26 Jul 2019 15:54:59 -0400
+Subject: [PATCH] Use GNUInstallDirs to install to standard locations
+
+Some distributions require 64 bit libraries to be installed to lib64, for example.
+Using GNUInstallDirs ensures that files are installed to the expected locations.
+---
+ CMakeLists.txt            | 3 +++
+ src/driver/CMakeLists.txt | 2 +-
+ src/roc-cl/CMakeLists.txt | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d1759b7..d21e9da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,6 +42,9 @@
+ 
+ cmake_minimum_required(VERSION 2.8)
+ 
++## Include common cmake modules
++include ( GNUInstallDirs )
++
+ # Build ROCm-OpenCL-Driver with ccache if the package is present.
+ set(ROCM_OPENCL_DRIVER_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build")
+ if(ROCM_OPENCL_DRIVER_CCACHE_BUILD)
+diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
+index 7046e34..55ed13f 100644
+--- a/src/driver/CMakeLists.txt
++++ b/src/driver/CMakeLists.txt
+@@ -90,4 +90,4 @@ target_link_libraries(opencl_driver
+ target_link_libraries(opencl_driver ${llvm_libs})
+ target_include_directories(opencl_driver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+-install(TARGETS opencl_driver DESTINATION lib)
++install(TARGETS opencl_driver DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+diff --git a/src/roc-cl/CMakeLists.txt b/src/roc-cl/CMakeLists.txt
+index 5037453..a8e2801 100644
+--- a/src/roc-cl/CMakeLists.txt
++++ b/src/roc-cl/CMakeLists.txt
+@@ -54,4 +54,4 @@ link_directories(${LLVM_LIBRARY_DIRS})
+ add_executable(roc-cl ${sources})
+ target_link_libraries(roc-cl opencl_driver)
+ 
+-install(TARGETS roc-cl RUNTIME DESTINATION bin)
++install(TARGETS roc-cl RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
diff --git a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch
new file mode 100644
index 000000000000..b37100994e04
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch
@@ -0,0 +1,19 @@
+From 1258a99decf96092de8ea512150209e14152ed9c Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 30 Jul 2019 16:46:20 -0400
+Subject: [PATCH] Install AmdCompiler.h header
+
+ROCm-OpenCL-Runtime uses AmdCompiler.h so it should be installed to the system and made available for use
+---
+ src/driver/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
+index 55ed13f..8f68fb7 100644
+--- a/src/driver/CMakeLists.txt
++++ b/src/driver/CMakeLists.txt
+@@ -91,3 +91,4 @@ target_link_libraries(opencl_driver ${llvm_libs})
+ target_include_directories(opencl_driver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ install(TARGETS opencl_driver DESTINATION ${CMAKE_INSTALL_LIBDIR} )
++install(FILES AmdCompiler.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/dev-libs/rocm-opencl-driver/metadata.xml b/dev-libs/rocm-opencl-driver/metadata.xml
new file mode 100644
index 000000000000..359755b2e5a5
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">RadeonOpenCompute/ROCm-OpenCL-Runtime</remote-id>
+    </upstream>
+    <longdescription lang="en">
+        Radeon Open Compute OpenCL Compatible Runtime
+    </longdescription>
+</pkgmetadata>
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
new file mode 100644
index 000000000000..6ab3d1073d10
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+
+RDEPEND="sys-devel/llvm-roc:=
+	dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-install-correctly.patch"
+	"${FILESDIR}/${P}-install-header.patch"
+)
+
+src_prepare() {
+	# remove unittest, because it downloads additional file from github.com
+	sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
new file mode 100644
index 000000000000..f95628a7cb79
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+
+RDEPEND=">=sys-devel/llvm-roc-${PV}:=
+	>=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.0-install-correctly.patch"
+	"${FILESDIR}/${PN}-2.6.0-install-header.patch"
+)
+
+src_prepare() {
+	# remove unittest, because it downloads additional file from github.com
+	sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
new file mode 100644
index 000000000000..a75041444363
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -0,0 +1,5 @@
+AUX rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch 56337 BLAKE2B bfb8265b4c901d9c71c8bacae34e43f9e951be3b7c2feb0eb76d9ceb62535a8924882c9383b7e7abf71f8aa6d22da9c78f46b9d7ba5c10e9127f05b922e85187 SHA512 660b4fd2d0d0a1aee5a3683806b5f2491bfb551101c569a297b4fd32ded507787e98cd3fea85e9f9ad4476324da407a5d527bc967e43582fc8edf9eac5caa614
+DIST OpenCL-ICD-Loader-bc9728edf8cace79cf33bf75560be88fc2432dc4.tar.gz 62858 BLAKE2B 931fb7ade12debda99512d8b9fbfb987f47e3b68568863e480de406f842a014d39f0321c44420fb8b68b8757d49cc02cadf82e767c9d2b71e53bdb8e9763cace SHA512 2ab9035fbc0a80a529d1b2f454b0b9a263b6eff601121750e81e2e32581f06189566cdcf201ab741ff3f1491ead825a7858000901f8042af67b1304be622e9fa
+DIST rocm-opencl-runtime-2.6.0.tar.gz 986155 BLAKE2B 43469ec3a368e2ee9716a38d08df48c28165a233bd80de54f286011df25782a197e252e8e41ffa8f59eecf93d6beae5434497e8d4b648676252d32a0859ba59a SHA512 bbbbd29bf23f93440135786600cca28a806714bb207b7ad0947d26471fa38470820e7801acc84380000d43d55ff2ec1d95cee9e64b500628b6a3b026744c67df
+EBUILD rocm-opencl-runtime-2.6.0-r1.ebuild 1483 BLAKE2B 7271f4b536f08c31031d4e4a38a5b9741cbd7d24799c508205dd3c9f39905173426aac248528864c41de8598bc798c55999c2c1c79d44c7ec84909dc0090a892 SHA512 81180ca79e5d5d4b3b1518f3e7a1947ff57abfb50c71006511a08f15e1d94761496eb8e8c36b76a8493bc2ac1ac43ea836c8663e1130c03b4df638d012aed49c
+MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch
new file mode 100644
index 000000000000..379dd11e9f99
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch
@@ -0,0 +1,1233 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ebdfc25..fb1c3eb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,6 +21,8 @@ endif()
+ 
+ project(OpenCL-ROCm)
+ 
++include (GNUInstallDirs)
++
+ # Add path for custom modules
+ set(CMAKE_MODULE_PATH
+   ${CMAKE_MODULE_PATH}
+@@ -38,38 +40,28 @@ set(CLANG_ENABLE_STATIC_ANALYZER OFF CACHE BOOL "")
+ # override default option value in library and driver
+ set(GENERIC_IS_ZERO ON CACHE BOOL ON FORCE)
+ 
+-add_subdirectory(compiler/llvm EXCLUDE_FROM_ALL)
+-
+-find_package(LLVM REQUIRED CONFIG PATHS ${CMAKE_BINARY_DIR}/compiler/llvm NO_DEFAULT_PATH)
++find_package(LLVM REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
+ 
+ list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
+ include(AddLLVM)
+ 
+ add_definitions(${LLVM_DEFINITIONS})
+-# TODO: add find_package for Clang and lld, and also use LLVM/Clang variables got from their config
+-include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/include)
+-include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/tools/clang/include)
+-include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/lld/include)
+-
+-# TODO: move AMDGPU.h header to include folder
+-include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/lib/Target/AMDGPU)
+-include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/lib/Target/AMDGPU)
+-
+-if(${USE_COMGR_LIBRARY} MATCHES "yes")
+-  set(COMGR_DYN_DLL "yes")
+-  add_definitions(-DCOMGR_DYN_DLL="yes")
+-  include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/include)
+-  add_definitions(-DUSE_COMGR_LIBRARY)
+-else()
+-  add_subdirectory(compiler/driver EXCLUDE_FROM_ALL)
+-endif()
++set(USE_COMGR_LIBRARY "yes")
++find_package(amd_comgr REQUIRED CONFIG)
++add_definitions(-DUSE_COMGR_LIBRARY)
++FOREACH(DIR ${LLVM_INCLUDE_DIRS})
++  include_directories("${DIR}")
++  include_directories("${DIR}/clang")
++  include_directories("${DIR}/lld")
++  # TODO: move AMDGPU.h header to include folder
++  include_directories("${DIR}/llvm/Target/AMDGPU")
++ENDFOREACH()
+ 
+ set(BUILD_HC_LIB OFF CACHE BOOL "")
+ set(ROCM_DEVICELIB_INCLUDE_TESTS OFF CACHE BOOL "")
+ set(AMDGCN_TARGETS_LIB_LIST "AMDGCN_LIB_TARGETS")
+ set(AMDGCN_TARGETS_LIB_DEPS "AMDGCN_DEP_TARGETS")
+ set(AMDGPU_TARGET_TRIPLE "amdgcn-amd-amdhsa-amdgizcl")
+-add_subdirectory(library/amdgcn EXCLUDE_FROM_ALL)
+ 
+ add_subdirectory(compiler/lib/loaders/elf/utils/libelf)
+ 
+@@ -82,28 +74,6 @@ set(OPENCL_INCLUDE_DIRS
+   ${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2)
+ 
+ add_subdirectory(api/opencl/amdocl)
+-add_subdirectory(api/opencl/khronos/icd)
+-
+-add_subdirectory(tools/clinfo)
+-
+-install(PROGRAMS $<TARGET_FILE:clang> $<TARGET_FILE:lld>
+-        DESTINATION bin/x86_64
+-        COMPONENT libraries)
+-
+-install(PROGRAMS $<TARGET_FILE:OpenCL>
+-        DESTINATION lib/x86_64
+-        COMPONENT applications)
+-
+-install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
+-        DESTINATION lib/x86_64
+-        COMPONENT libraries)
+-
+-install(DIRECTORY
+-        "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2/CL"
+-        DESTINATION include
+-        COMPONENT libraries
+-        USE_SOURCE_PERMISSIONS
+-        PATTERN cl_egl.h EXCLUDE)
+ 
+ foreach(AMDGCN_LIB_TARGET ${AMDGCN_LIB_TARGETS})
+   get_target_property(lib_file_name ${AMDGCN_LIB_TARGET} ARCHIVE_OUTPUT_NAME)
+diff --git a/README.md b/README.md
+index a834965..e319be2 100644
+--- a/README.md
++++ b/README.md
+@@ -7,13 +7,6 @@ Developer preview Version 2 of the new
+ * Supports offline ahead of time compilation today; during the Beta phase we will add in-process/in-memory compilation.
+ 
+ 
+-## GETTING REPO
+-
+-Repo is a git wrapper that manages a collection of git repositories. Install this tool and add it to the command search PATH:
+-
+-    curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
+-    chmod a+x ~/bin/repo
+-
+ ## GETTING THE SOURCE CODE
+ 
+ Main OpenCL™ Compatible Components:
+@@ -26,11 +19,6 @@ Main OpenCL™ Compatible Components:
+ * https://github.com/RadeonOpenCompute/lld 
+ * https://github.com/KhronosGroup/OpenCL-ICD-Loader
+ 
+-Download the git projects with the following commands:
+-
+-    ~/bin/repo init -u https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git -b master -m opencl.xml
+-    ~/bin/repo sync
+-    
+ ## INSTALL ROCm
+ 
+ Follow the instructions at https://rocm.github.io/install.html to install ROCm.
+@@ -45,6 +33,11 @@ Copy the amdocl64.icd file to /etc/OpenCL/vendors
+ 
+ To install additional dependencies:
+ 
++* ROCm-OpenCL-Runtime
++* ROCm-OpenCL-Driver
++* ROC versions of LLVM, Clang, and lld
++* ROCm-Device-Libs
++* OpenCL-ICD-Loader
+ * OCaml
+ * findlib
+ * A Python 2 environment or active virtualenv with the Microsoft Z3 package
+diff --git a/api/opencl/amdocl/CMakeLists.txt b/api/opencl/amdocl/CMakeLists.txt
+index 91bd42f..8606c98 100644
+--- a/api/opencl/amdocl/CMakeLists.txt
++++ b/api/opencl/amdocl/CMakeLists.txt
+@@ -21,7 +21,6 @@ include_directories(${CMAKE_SOURCE_DIR}/api/opencl)
+ include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos)
+ include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers)
+ include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2)
+-include_directories(${CMAKE_SOURCE_DIR}/compiler/driver/src)
+ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib)
+ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include)
+ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/backends/common)
+@@ -67,6 +66,9 @@ add_library(amdocl64 SHARED
+   ${ADDITIONAL_LIBRARIES}
+ )
+ 
+-target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${ROCR_LIBRARIES})
++target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${ROCR_LIBRARIES} LLVMBitWriter LLVMIRReader LLVMLinker LLVMMCParser amd_comgr)
+ 
+-install(TARGETS amdocl64 LIBRARY DESTINATION lib/x86_64 COMPONENT applications)
++install(TARGETS amdocl64 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT applications)
++
++file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/amdocl64.icd" CONTENT "$<TARGET_FILE_NAME:amdocl64>")
++install(FILES "${CMAKE_BINARY_DIR}/amdocl64.icd" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/OpenCL/vendors/")
+diff --git a/api/opencl/amdocl/cl_execute.cpp b/api/opencl/amdocl/cl_execute.cpp
+index 0336353..ee799e6 100644
+--- a/api/opencl/amdocl/cl_execute.cpp
++++ b/api/opencl/amdocl/cl_execute.cpp
+@@ -10,7 +10,7 @@
+ #include "platform/program.hpp"
+ #include "os/os.hpp"
+ 
+-#include <icd/icd_dispatch.h>
++#include <icd/loader/icd_dispatch.h>
+ 
+ /*! \addtogroup API
+  *  @{
+diff --git a/api/opencl/amdocl/cl_icd.cpp b/api/opencl/amdocl/cl_icd.cpp
+index 71b886c..7e4e317 100644
+--- a/api/opencl/amdocl/cl_icd.cpp
++++ b/api/opencl/amdocl/cl_icd.cpp
+@@ -10,7 +10,7 @@
+ #include "cl_d3d11_amd.hpp"
+ #endif  //_WIN32
+ 
+-#include <icd/icd_dispatch.h>
++#include <icd/loader/icd_dispatch.h>
+ 
+ #include <mutex>
+ 
+diff --git a/opencl.xml b/opencl.xml
+deleted file mode 100644
+index 4813651..0000000
+--- a/opencl.xml
++++ /dev/null
+@@ -1,17 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<manifest>
+-  <remote name="RadeonOpenCompute" fetch="https://github.com/RadeonOpenCompute/"/>
+-  <remote name="KhronosGroup" fetch="https://github.com/KhronosGroup/"/>
+-
+-  <default remote="RadeonOpenCompute" revision="refs/tags/roc-2.6.0" sync-c="true" sync-j="4"/>
+-
+-  <project path="opencl" name="ROCm-OpenCL-Runtime"/>
+-  <project path="opencl/compiler/driver" name="ROCm-OpenCL-Driver"/>
+-  <project path="opencl/compiler/llvm" name="llvm" revision="refs/tags/roc-ocl-2.6.0"/>
+-  <project path="opencl/compiler/llvm/tools/clang" name="clang"/>
+-  <project path="opencl/compiler/llvm/tools/lld" name="lld" revision="refs/tags/roc-ocl-2.6.0"/>
+-
+-  <project path="opencl/library/amdgcn" name="ROCm-Device-Libs" revision="refs/tags/roc-ocl-2.6.0"/>
+-
+-  <project path="opencl/api/opencl/khronos/icd" name="OpenCL-ICD-Loader" remote="KhronosGroup" revision="7433f2acbf5bbc400f26494ff1dc895da6265bef"/>
+-</manifest>
+diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
+index 62e2bf7..5e4abae 100644
+--- a/runtime/CMakeLists.txt
++++ b/runtime/CMakeLists.txt
+@@ -14,8 +14,6 @@ include_directories(${CMAKE_SOURCE_DIR}/api/opencl)
+ include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos)
+ include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers)
+ include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2)
+-include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/include)
+-include_directories(${CMAKE_SOURCE_DIR}/compiler/driver/src)
+ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib)
+ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include)
+ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/backends/common)
+@@ -36,6 +34,7 @@ add_library(oclruntime OBJECT
+   utils/flags.cpp
+   utils/debug.cpp
+   device/appprofile.cpp
++  device/comgrctx.cpp
+   device/device.cpp
+   device/hwdebug.cpp
+   device/blitcl.cpp
+@@ -63,6 +62,8 @@ add_library(oclruntime OBJECT
+   ${CMAKE_SOURCE_DIR}/compiler/tools/caching/cache.cpp
+ )
+ set_target_properties(oclruntime PROPERTIES POSITION_INDEPENDENT_CODE ON)
++add_dependencies(oclruntime opencl1.2-c.amdgcn.inc_target)
++add_dependencies(oclruntime opencl2.0-c.amdgcn.inc_target)
+ 
+ set(AMDGCN_DEP_LIST)
+ if(AMDGCN_TARGETS_LIB_DEPS)
+diff --git a/runtime/device/device.hpp b/runtime/device/device.hpp
+index 450cd69..8134fa2 100644
+--- a/runtime/device/device.hpp
++++ b/runtime/device/device.hpp
+@@ -21,7 +21,7 @@
+ 
+ #if defined(WITH_LIGHTNING_COMPILER) && !defined(USE_COMGR_LIBRARY)
+ #include "caching/cache.hpp"
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #endif  // defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
+ #include "acl.h"
+ 
+diff --git a/runtime/device/devprogram.cpp b/runtime/device/devprogram.cpp
+index 22fb125..3d475b2 100644
+--- a/runtime/device/devprogram.cpp
++++ b/runtime/device/devprogram.cpp
+@@ -14,7 +14,7 @@
+ 
+ #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
+ #ifndef USE_COMGR_LIBRARY
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #include "libraries.amdgcn.inc"
+ #include "opencl1.2-c.amdgcn.inc"
+ #include "opencl2.0-c.amdgcn.inc"
+diff --git a/runtime/device/devprogram.hpp b/runtime/device/devprogram.hpp
+index 67af239..8390e7d 100644
+--- a/runtime/device/devprogram.hpp
++++ b/runtime/device/devprogram.hpp
+@@ -11,7 +11,7 @@
+ 
+ #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
+ #ifndef USE_COMGR_LIBRARY
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #else
+ #include "amd_comgr.h"
+ #endif
+diff --git a/runtime/device/rocm/CMakeLists.txt b/runtime/device/rocm/CMakeLists.txt
+index 4ce7c45..617bece 100644
+--- a/runtime/device/rocm/CMakeLists.txt
++++ b/runtime/device/rocm/CMakeLists.txt
+@@ -1,3 +1,21 @@
++find_package(Clang REQUIRED CONFIG)
++
++# FIXME: CLANG_CMAKE_DIR seems like the most stable way to find this, but
++# really there is no way to reliably discover this header.
++#
++# We effectively back up to the Clang output directory (for the case of a build
++# tree) or install prefix (for the case of an installed copy), and then search
++# for a file named opencl-c.h anywhere below that. We take the first result in
++# the case where there are multiple (e.g. if there is an installed copy nested
++# in a build directory). This is a bit imprecise, but it covers cases like MSVC
++# adding some additional configuration-specific subdirectories to the build
++# tree but not to an installed copy.
++file(GLOB_RECURSE OPENCL_C_H_LIST "${CLANG_CMAKE_DIR}/../../../*/opencl-c.h")
++list(GET OPENCL_C_H_LIST 0 OPENCL_C_H)
++if (NOT EXISTS "${OPENCL_C_H}" OR IS_DIRECTORY "${OPENCL_C_H}")
++  message(FATAL_ERROR "Unable to locate opencl-c.h from the supplied Clang. The path '${CLANG_CMAKE_DIR}/../../../*' was searched.")
++endif()
++
+ include(bc2h)
+ 
+ set(INC_SUFFIX "amdgcn.inc")
+@@ -74,8 +92,8 @@ endforeach()
+ 
+ # generating opencl*.inc files
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch
+-  COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL1.2 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch < ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
+-  DEPENDS clang ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
++  COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL1.2 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch < ${OPENCL_C_H}
++  DEPENDS clang ${OPENCL_C_H}
+   COMMENT "Generating opencl1.2-c.amdgcn.pch"
+ )
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.inc
+@@ -88,8 +106,8 @@ add_custom_target(opencl1.2-c.amdgcn.inc_target ALL DEPENDS ${CMAKE_CURRENT_BINA
+ add_dependencies(oclrocm opencl1.2-c.amdgcn.inc_target)
+ 
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch
+-  COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL2.0 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch < ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
+-  DEPENDS clang ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
++  COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL2.0 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch < ${OPENCL_C_H}
++  DEPENDS clang ${OPENCL_C_H}
+   COMMENT "Generating opencl2.0-c.amdgcn.pch"
+ )
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.inc
+diff --git a/runtime/device/rocm/rocdevice.cpp b/runtime/device/rocm/rocdevice.cpp
+index 8b9901b..2648459 100644
+--- a/runtime/device/rocm/rocdevice.cpp
++++ b/runtime/device/rocm/rocdevice.cpp
+@@ -20,7 +20,7 @@
+ #include "device/rocm/rocvirtual.hpp"
+ #include "device/rocm/rocprogram.hpp"
+ #if defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #endif  // defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
+ #include "device/rocm/rocmemory.hpp"
+ #include "device/rocm/rocglinterop.hpp"
+diff --git a/runtime/device/rocm/rockernel.cpp b/runtime/device/rocm/rockernel.cpp
+index 8a28acc..7d5b62d 100644
+--- a/runtime/device/rocm/rockernel.cpp
++++ b/runtime/device/rocm/rockernel.cpp
+@@ -11,7 +11,7 @@
+ 
+ #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
+ #ifndef USE_COMGR_LIBRARY
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #endif
+ #include "llvm/Support/AMDGPUMetadata.h"
+ 
+diff --git a/runtime/device/rocm/rocprogram.cpp b/runtime/device/rocm/rocprogram.cpp
+index 191e58c..58d82e6 100644
+--- a/runtime/device/rocm/rocprogram.cpp
++++ b/runtime/device/rocm/rocprogram.cpp
+@@ -11,7 +11,7 @@
+ #include <gelf.h>
+ #include "libraries.amdgcn.inc"
+ #ifndef USE_COMGR_LIBRARY
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #endif
+ #endif  // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
+ 
+diff --git a/runtime/platform/object.hpp b/runtime/platform/object.hpp
+index 8ab1b68..b33a9e3 100644
+--- a/runtime/platform/object.hpp
++++ b/runtime/platform/object.hpp
+@@ -9,7 +9,7 @@
+ #include "os/alloc.hpp"
+ #include "thread/monitor.hpp"
+ #include "utils/util.hpp"
+-#include <icd/icd_dispatch.h>
++#include <icd/loader/icd_dispatch.h>
+ 
+ 
+ #define KHR_CL_TYPES_DO(F)                                                                         \
+diff --git a/tools/clinfo/CMakeLists.txt b/tools/clinfo/CMakeLists.txt
+deleted file mode 100644
+index 974a46f..0000000
+--- a/tools/clinfo/CMakeLists.txt
++++ /dev/null
+@@ -1,13 +0,0 @@
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+-
+-set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+-
+-include_directories(${OPENCL_INCLUDE_DIRS})
+-
+-add_definitions(-DHAVE_CL2_HPP)
+-
+-add_executable(clinfo clinfo.cpp)
+-
+-target_link_libraries(clinfo OpenCL)
+-
+-install(TARGETS clinfo DESTINATION bin)
+diff --git a/tools/clinfo/clinfo.cpp b/tools/clinfo/clinfo.cpp
+deleted file mode 100644
+index c5afb7f..0000000
+--- a/tools/clinfo/clinfo.cpp
++++ /dev/null
+@@ -1,832 +0,0 @@
+-/* ============================================================
+-
+-Copyright (c) 2010 Advanced Micro Devices, Inc.  All rights reserved.
+-
+-Redistribution and use of this material is permitted under the following
+-conditions:
+-
+-Redistributions must retain the above copyright notice and all terms of this
+-license.
+-
+-In no event shall anyone redistributing or accessing or using this material
+-commence or participate in any arbitration or legal action relating to this
+-material against Advanced Micro Devices, Inc. or any copyright holders or
+-contributors. The foregoing shall survive any expiration or termination of
+-this license or any agreement or access or use related to this material.
+-
+-ANY BREACH OF ANY TERM OF THIS LICENSE SHALL RESULT IN THE IMMEDIATE REVOCATION
+-OF ALL RIGHTS TO REDISTRIBUTE, ACCESS OR USE THIS MATERIAL.
+-
+-THIS MATERIAL IS PROVIDED BY ADVANCED MICRO DEVICES, INC. AND ANY COPYRIGHT
+-HOLDERS AND CONTRIBUTORS "AS IS" IN ITS CURRENT CONDITION AND WITHOUT ANY
+-REPRESENTATIONS, GUARANTEE, OR WARRANTY OF ANY KIND OR IN ANY WAY RELATED TO
+-SUPPORT, INDEMNITY, ERROR FREE OR UNINTERRUPTED OPERA TION, OR THAT IT IS FREE
+-FROM DEFECTS OR VIRUSES.  ALL OBLIGATIONS ARE HEREBY DISCLAIMED - WHETHER
+-EXPRESS, IMPLIED, OR STATUTORY - INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED
+-WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+-ACCURACY, COMPLETENESS, OPERABILITY, QUALITY OF SERVICE, OR NON-INFRINGEMENT.
+-IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. OR ANY COPYRIGHT HOLDERS OR
+-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE,
+-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, REVENUE, DATA, OR PROFITS; OR
+-BUSINESS INTERRUPTION) HOWEVER CAUSED OR BASED ON ANY THEORY OF LIABILITY
+-ARISING IN ANY WAY RELATED TO THIS MATERIAL, EVEN IF ADVISED OF THE POSSIBILITY
+-OF SUCH DAMAGE. THE ENTIRE AND AGGREGATE LIABILITY OF ADVANCED MICRO DEVICES,
+-INC. AND ANY COPYRIGHT HOLDERS AND CONTRIBUTORS SHALL NOT EXCEED TEN DOLLARS
+-(US $10.00). ANYONE REDISTRIBUTING OR ACCESSING OR USING THIS MATERIAL ACCEPTS
+-THIS ALLOCATION OF RISK AND AGREES TO RELEASE ADVANCED MICRO DEVICES, INC. AND
+-ANY COPYRIGHT HOLDERS AND CONTRIBUTORS FROM ANY AND ALL LIABILITIES,
+-OBLIGATIONS, CLAIMS, OR DEMANDS IN EXCESS OF TEN DOLLARS (US $10.00). THE
+-FOREGOING ARE ESSENTIAL TERMS OF THIS LICENSE AND, IF ANY OF THESE TERMS ARE
+-CONSTRUED AS UNENFORCEABLE, FAIL IN ESSENTIAL PURPOSE, OR BECOME VOID OR
+-DETRIMENTAL TO ADVANCED MICRO DEVICES, INC. OR ANY COPYRIGHT HOLDERS OR
+-CONTRIBUTORS FOR ANY REASON, THEN ALL RIGHTS TO REDISTRIBUTE, ACCESS OR USE
+-THIS MATERIAL SHALL TERMINATE IMMEDIATELY. MOREOVER, THE FOREGOING SHALL
+-SURVIVE ANY EXPIRATION OR TERMINATION OF THIS LICENSE OR ANY AGREEMENT OR
+-ACCESS OR USE RELATED TO THIS MATERIAL.
+-
+-NOTICE IS HEREBY PROVIDED, AND BY REDISTRIBUTING OR ACCESSING OR USING THIS
+-MATERIAL SUCH NOTICE IS ACKNOWLEDGED, THAT THIS MATERIAL MAY BE SUBJECT TO
+-RESTRICTIONS UNDER THE LAWS AND REGULATIONS OF THE UNITED STATES OR OTHER
+-COUNTRIES, WHICH INCLUDE BUT ARE NOT LIMITED TO, U.S. EXPORT CONTROL LAWS SUCH
+-AS THE EXPORT ADMINISTRATION REGULATIONS AND NATIONAL SECURITY CONTROLS AS
+-DEFINED THEREUNDER, AS WELL AS STATE DEPARTMENT CONTROLS UNDER THE U.S.
+-MUNITIONS LIST. THIS MATERIAL MAY NOT BE USED, RELEASED, TRANSFERRED, IMPORTED,
+-EXPORTED AND/OR RE-EXPORTED IN ANY MANNER PROHIBITED UNDER ANY APPLICABLE LAWS,
+-INCLUDING U.S. EXPORT CONTROL LAWS REGARDING SPECIFICALLY DESIGNATED PERSONS,
+-COUNTRIES AND NATIONALS OF COUNTRIES SUBJECT TO NATIONAL SECURITY CONTROLS.
+-MOREOVER, THE FOREGOING SHALL SURVIVE ANY EXPIRATION OR TERMINATION OF ANY
+-LICENSE OR AGREEMENT OR ACCESS OR USE RELATED TO THIS MATERIAL.
+-
+-NOTICE REGARDING THE U.S. GOVERNMENT AND DOD AGENCIES: This material is
+-provided with "RESTRICTED RIGHTS" and/or "LIMITED RIGHTS" as applicable to
+-computer software and technical data, respectively. Use, duplication,
+-distribution or disclosure by the U.S. Government and/or DOD agencies is
+-subject to the full extent of restrictions in all applicable regulations,
+-including those found at FAR52.227 and DFARS252.227 et seq. and any successor
+-regulations thereof. Use of this material by the U.S. Government and/or DOD
+-agencies is acknowledgment of the proprietary rights of any copyright holders
+-and contributors, including those of Advanced Micro Devices, Inc., as well as
+-the provisions of FAR52.227-14 through 23 regarding privately developed and/or
+-commercial computer software.
+-
+-This license forms the entire agreement regarding the subject matter hereof and
+-supersedes all proposals and prior discussions and writings between the parties
+-with respect thereto. This license does not affect any ownership, rights, title,
+-or interest in, or relating to, this material. No terms of this license can be
+-modified or waived, and no breach of this license can be excused, unless done
+-so in a writing signed by all affected parties. Each term of this license is
+-separately enforceable. If any term of this license is determined to be or
+-becomes unenforceable or illegal, such term shall be reformed to the minimum
+-extent necessary in order for this license to remain in effect in accordance
+-with its terms as modified by such reformation. This license shall be governed
+-by and construed in accordance with the laws of the State of Texas without
+-regard to rules on conflicts of law of any state or jurisdiction or the United
+-Nations Convention on the International Sale of Goods. All disputes arising out
+-of this license shall be subject to the jurisdiction of the federal and state
+-courts in Austin, Texas, and all defenses are hereby waived concerning personal
+-jurisdiction and venue of these courts.
+-
+-============================================================ */
+-
+-#include <iostream>
+-#include <map>
+-#include <set>
+-#include <algorithm>
+-#include <string>
+-#include <cstdlib>
+-#include <cstdio>
+-#if !defined(_WIN32)
+-#include <errno.h>
+-#endif
+-
+-#ifdef _MSC_VER
+-#pragma warning(disable: 4290)
+-#endif
+-
+-#if defined(HAVE_CL2_HPP)
+-#define CL_HPP_ENABLE_EXCEPTIONS
+-#define CL_HPP_MINIMUM_OPENCL_VERSION 120
+-#define CL_HPP_TARGET_OPENCL_VERSION 200
+-#define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY
+-#include "CL/cl2.hpp"
+-#else // !HAVE_CL2_HPP
+-#define __CL_ENABLE_EXCEPTIONS
+-#define __MAX_DEFAULT_VECTOR_SIZE 50
+-#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
+-#define CL_USE_DEPRECATED_OPENCL_2_0_APIS
+-#include "cl.hpp"
+-#endif // !HAVE_CL2_HPP
+-
+-bool verbose = false;
+-
+-/// Returns EXIT_SUCCESS on success, EXIT_FAILURE on failure.
+-int
+-main(int argc, char** argv)
+-{
+-    /* Error flag */
+-    cl_int err;
+-
+-    //parse input
+-    for(int i = 1; i < argc; i++){
+-        if ((strcmp(argv[i], "-v") == 0) ||
+-            (strcmp(argv[i], "--verbose") == 0)){
+-                verbose = true;
+-        } else if ((strcmp(argv[i], "-h") == 0) ||
+-                   (strcmp(argv[i], "--help") == 0)){
+-            std::cout << "Usage is: " << argv[0] << " [-v|--verbose]" << std::endl;
+-            return EXIT_FAILURE;
+-        }
+-    }
+-
+-    // Platform info
+-    std::vector<cl::Platform> platforms;
+-
+-    try {
+-    err = cl::Platform::get(&platforms);
+-
+-    // Iteratate over platforms
+-    std::cout << "Number of platforms:\t\t\t\t "
+-              << platforms.size()
+-              << std::endl;
+-    for (std::vector<cl::Platform>::iterator i = platforms.begin();
+-         i != platforms.end();
+-         ++i) {
+-        const cl::Platform& platform = *i;
+-
+-        std::cout << "  Platform Profile:\t\t\t\t "
+-                  << platform.getInfo<CL_PLATFORM_PROFILE>().c_str()
+-                  << std::endl;
+-        std::cout << "  Platform Version:\t\t\t\t "
+-                  << platform.getInfo<CL_PLATFORM_VERSION>().c_str()
+-                  << std::endl;
+-        std::cout << "  Platform Name:\t\t\t\t "
+-                  << platform.getInfo<CL_PLATFORM_NAME>().c_str()
+-                  << std::endl;
+-        std::cout << "  Platform Vendor:\t\t\t\t "
+-                  << platform.getInfo<CL_PLATFORM_VENDOR>().c_str() << std::endl;
+-        if (platform.getInfo<CL_PLATFORM_EXTENSIONS>().size() > 0) {
+-            std::cout << "  Platform Extensions:\t\t\t\t "
+-                      << platform.getInfo<CL_PLATFORM_EXTENSIONS>().c_str()
+-                      << std::endl;
+-        }
+-    }
+-
+-    std::cout << std::endl << std:: endl;
+-    // Now Iteratate over each platform and its devices
+-    for (std::vector<cl::Platform>::iterator p = platforms.begin();
+-         p != platforms.end();
+-         ++p) {
+-        const cl::Platform& platform = *p;
+-        std::cout << "  Platform Name:\t\t\t\t "
+-                  << platform.getInfo<CL_PLATFORM_NAME>().c_str()
+-                  << std::endl;
+-
+-        std::vector<cl::Device> devices;
+-        platform.getDevices(CL_DEVICE_TYPE_ALL, &devices);
+-
+-        // Get OpenCL version
+-        std::string platformVersionStr = platform.getInfo<CL_PLATFORM_VERSION>();
+-        std::string openclVerstionStr(platformVersionStr.c_str());
+-        size_t vStart = openclVerstionStr.find(" ", 0);
+-        size_t vEnd = openclVerstionStr.find(" ", vStart + 1);
+-        std::string vStrVal = openclVerstionStr.substr(vStart + 1, vEnd - vStart - 1);
+-
+-        std::cout << "Number of devices:\t\t\t\t " << devices.size() << std::endl;
+-        for (std::vector<cl::Device>::iterator i = devices.begin();
+-             i != devices.end();
+-             ++i) {
+-            const cl::Device& device = *i;
+-            /* Get device name */
+-            std::string deviceName = device.getInfo<CL_DEVICE_NAME>();
+-            cl_device_type dtype = device.getInfo<CL_DEVICE_TYPE>();
+-
+-            /* Get CAL driver version in int */
+-            std::string driverVersion = device.getInfo<CL_DRIVER_VERSION>();
+-            std::string calVersion(driverVersion.c_str());
+-            calVersion = calVersion.substr(calVersion.find_last_of(".") + 1);
+-            int version = atoi(calVersion.c_str());
+-
+-            std::cout << "  Device Type:\t\t\t\t\t " ;
+-            switch (dtype) {
+-            case CL_DEVICE_TYPE_ACCELERATOR:
+-                std::cout << "CL_DEVICE_TYPE_ACCRLERATOR" << std::endl;
+-                break;
+-            case CL_DEVICE_TYPE_CPU:
+-                std::cout << "CL_DEVICE_TYPE_CPU" << std::endl;
+-                break;
+-            case CL_DEVICE_TYPE_DEFAULT:
+-                std::cout << "CL_DEVICE_TYPE_DEFAULT" << std::endl;
+-                break;
+-            case CL_DEVICE_TYPE_GPU:
+-                std::cout << "CL_DEVICE_TYPE_GPU" << std::endl;
+-                break;
+-            }
+-
+-            std::cout << "  Vendor ID:\t\t\t\t\t "
+-                      << std::hex
+-                      << device.getInfo<CL_DEVICE_VENDOR_ID>()
+-                      << "h"
+-                      << std::dec
+-                      << std::endl;
+-
+-             bool isAMDPlatform = (strcmp(platform.getInfo<CL_PLATFORM_NAME>().c_str(), "AMD Accelerated Parallel Processing") == 0) ? true : false;
+-             if (isAMDPlatform)
+-             {
+-                std::string boardName;
+-                device.getInfo(CL_DEVICE_BOARD_NAME_AMD, &boardName);
+-                std::cout << "  Board name:\t\t\t\t\t "
+-                    << boardName.c_str()
+-                    << std::endl;
+-
+-                cl_device_topology_amd topology;
+-                err = device.getInfo(CL_DEVICE_TOPOLOGY_AMD, &topology);
+-                if (topology.raw.type == CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD) {
+-                    std::cout << "  Device Topology:\t\t\t\t "
+-                          << "PCI[ B#" << (int)topology.pcie.bus
+-                          << ", D#" << (int)topology.pcie.device
+-                          << ", F#" << (int)topology.pcie.function
+-                          << " ]" << std::endl;
+-                }
+-             }
+-
+-            std::cout << "  Max compute units:\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_MAX_COMPUTE_UNITS>()
+-                      << std::endl;
+-
+-            std::cout << "  Max work items dimensions:\t\t\t "
+-                      << device.getInfo<CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS>()
+-                      << std::endl;
+-
+-            std::vector< ::size_t> witems =
+-                device.getInfo<CL_DEVICE_MAX_WORK_ITEM_SIZES>();
+-            for (unsigned int x = 0;
+-                 x < device.getInfo<CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS>();
+-                 x++) {
+-                std::cout << "    Max work items["
+-                          << x << "]:\t\t\t\t "
+-                          << witems[x]
+-                          << std::endl;
+-            }
+-
+-            std::cout << "  Max work group size:\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_MAX_WORK_GROUP_SIZE>()
+-                      << std::endl;
+-
+-            std::cout << "  Preferred vector width char:\t\t\t "
+-                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR>()
+-                      << std::endl;
+-
+-            std::cout << "  Preferred vector width short:\t\t\t "
+-                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT>()
+-                      << std::endl;
+-
+-            std::cout << "  Preferred vector width int:\t\t\t "
+-                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT>()
+-                      << std::endl;
+-
+-            std::cout << "  Preferred vector width long:\t\t\t "
+-                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG>()
+-                      << std::endl;
+-
+-            std::cout << "  Preferred vector width float:\t\t\t "
+-                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT>()
+-                      << std::endl;
+-
+-            std::cout << "  Preferred vector width double:\t\t "
+-                      << device.getInfo<CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE>()
+-                      << std::endl;
+-
+-#ifdef CL_VERSION_1_1
+-            if(vStrVal.compare("1.0") > 0)
+-            {
+-                std::cout << "  Native vector width char:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR>()
+-                          << std::endl;
+-
+-                std::cout << "  Native vector width short:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT>()
+-                          << std::endl;
+-
+-                std::cout << "  Native vector width int:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_INT>()
+-                          << std::endl;
+-
+-                std::cout << "  Native vector width long:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG>()
+-                          << std::endl;
+-
+-                std::cout << "  Native vector width float:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT>()
+-                          << std::endl;
+-
+-                std::cout << "  Native vector width double:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE>()
+-                          << std::endl;
+-            }
+-#endif // CL_VERSION_1_1
+-            std::cout << "  Max clock frequency:\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_MAX_CLOCK_FREQUENCY>()
+-                      << "Mhz"
+-                      << std::endl;
+-
+-            std::cout << "  Address bits:\t\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_ADDRESS_BITS>()
+-                      << std::endl;
+-
+-            std::cout << "  Max memory allocation:\t\t\t "
+-                      << device.getInfo<CL_DEVICE_MAX_MEM_ALLOC_SIZE>()
+-                      << std::endl;
+-
+-            std::cout << "  Image support:\t\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_IMAGE_SUPPORT>() ? "Yes" : "No")
+-                      << std::endl;
+-
+-            if (device.getInfo<CL_DEVICE_IMAGE_SUPPORT>())
+-            {
+-
+-                std::cout << "  Max number of images read arguments:\t\t "
+-                          << device.getInfo<CL_DEVICE_MAX_READ_IMAGE_ARGS>()
+-                          << std::endl;
+-
+-                std::cout << "  Max number of images write arguments:\t\t "
+-                          << device.getInfo<CL_DEVICE_MAX_WRITE_IMAGE_ARGS>()
+-                          << std::endl;
+-
+-                std::cout << "  Max image 2D width:\t\t\t\t "
+-                          << device.getInfo<CL_DEVICE_IMAGE2D_MAX_WIDTH>()
+-                          << std::endl;
+-
+-                std::cout << "  Max image 2D height:\t\t\t\t "
+-                          << device.getInfo<CL_DEVICE_IMAGE2D_MAX_HEIGHT>()
+-                          << std::endl;
+-
+-                std::cout << "  Max image 3D width:\t\t\t\t "
+-                          << device.getInfo<CL_DEVICE_IMAGE3D_MAX_WIDTH>()
+-                          << std::endl;
+-
+-                std::cout << "  Max image 3D height:\t\t\t\t "
+-                          << device.getInfo<CL_DEVICE_IMAGE3D_MAX_HEIGHT>()
+-                          << std::endl;
+-
+-                std::cout << "  Max image 3D depth:\t\t\t\t "
+-                          << device.getInfo<CL_DEVICE_IMAGE3D_MAX_DEPTH>()
+-                          << std::endl;
+-
+-                std::cout << "  Max samplers within kernel:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_MAX_SAMPLERS>()
+-                          << std::endl;
+-
+-                if (verbose)
+-                {
+-                    std::cout << "  Image formats supported:" << std::endl;
+-                    std::vector<cl::ImageFormat> formats;
+-
+-                    cl_context_properties cps[3] = { CL_CONTEXT_PLATFORM, (cl_context_properties)(*p)(), 0 };
+-                    std::vector<cl::Device> device;
+-                    device.push_back(*i);
+-                    cl::Context context(device, cps, NULL, NULL, &err);
+-
+-                    std::map<int,std::string> channelOrder;
+-                    channelOrder[CL_R] = "CL_R";
+-                    channelOrder[CL_A] = "CL_A";
+-                    channelOrder[CL_RG] = "CL_RG";
+-                    channelOrder[CL_RA] = "CL_RA";
+-                    channelOrder[CL_RGB] = "CL_RGB";
+-                    channelOrder[CL_RGBA] = "CL_RGBA";
+-                    channelOrder[CL_BGRA] = "CL_BGRA";
+-                    channelOrder[CL_ARGB] = "CL_ARGB";
+-                    channelOrder[CL_INTENSITY] = "CL_INTENSITY";
+-                    channelOrder[CL_LUMINANCE] = "CL_LUMINANCE";
+-                    channelOrder[CL_Rx] = "CL_Rx";
+-                    channelOrder[CL_RGx] = "CL_RGx";
+-                    channelOrder[CL_RGBx] = "CL_RGBx";
+-
+-                    std::map<int,std::pair<std::string, std::string> > channelType;
+-                    channelType[CL_SNORM_INT8] = std::make_pair("snorm", "int8");
+-                    channelType[CL_SNORM_INT16] = std::make_pair("snorm", "int16");
+-                    channelType[CL_UNORM_INT8] = std::make_pair("unorm", "int8");
+-                    channelType[CL_UNORM_INT16] = std::make_pair("unorm", "int16");
+-                    channelType[CL_UNORM_SHORT_565] = std::make_pair("unorm", "short_565");
+-                    channelType[CL_UNORM_SHORT_555] = std::make_pair("unorm", "short_555");
+-                    channelType[CL_UNORM_INT_101010] = std::make_pair("unorm", "int_101010");
+-                    channelType[CL_SIGNED_INT8] =  std::make_pair("signed", "int8");
+-                    channelType[CL_SIGNED_INT16] = std::make_pair("signed", "int16");
+-                    channelType[CL_SIGNED_INT32] = std::make_pair("signed", "int32");
+-                    channelType[CL_UNSIGNED_INT8] = std::make_pair("unsigned", "int8");
+-                    channelType[CL_UNSIGNED_INT16] = std::make_pair("unsigned", "int16");
+-                    channelType[CL_UNSIGNED_INT32] = std::make_pair("unsigned", "int32");
+-                    channelType[CL_HALF_FLOAT] = std::make_pair("half_float", "");
+-                    channelType[CL_FLOAT] = std::make_pair("float", "");
+-
+-                    std::vector<std::pair<int, std::string> > imageDimensions;
+-                    imageDimensions.push_back(std::make_pair(CL_MEM_OBJECT_IMAGE2D, std::string("2D ")));
+-                    imageDimensions.push_back(std::make_pair(CL_MEM_OBJECT_IMAGE3D, std::string("3D ")));
+-                    for(std::vector<std::pair<int, std::string> >::iterator id = imageDimensions.begin();
+-                        id != imageDimensions.end();
+-                        id++){
+-
+-                        struct imageAccessStruct {
+-                            std::string  name;
+-                            int          access;
+-                            std::vector<cl::ImageFormat> formats;
+-                        } imageAccess[] = {{std::string("Read-Write/Read-Only/Write-Only"), CL_MEM_READ_WRITE, std::vector<cl::ImageFormat>()},
+-                                            {std::string("Read-Only"),  CL_MEM_READ_ONLY,  std::vector<cl::ImageFormat>()},
+-                                            {std::string("Write-Only"), CL_MEM_WRITE_ONLY, std::vector<cl::ImageFormat>()}};
+-
+-                        for(size_t ia=0; ia < sizeof(imageAccess)/sizeof(imageAccessStruct); ia++){
+-                            context.getSupportedImageFormats(imageAccess[ia].access, (*id).first, &(imageAccess[ia].formats));
+-                            bool printTopHeader = true;
+-                            for (std::map<int,std::string>::iterator o = channelOrder.begin();
+-                                 o != channelOrder.end();
+-                                 o++)
+-                            {
+-                                bool printHeader = true;
+-
+-                                for (std::vector<cl::ImageFormat>::iterator it = imageAccess[ia].formats.begin();
+-                                     it != imageAccess[ia].formats.end();
+-                                     ++it)
+-                                {
+-                                    if ( (*o).first == (int)(*it).image_channel_order)
+-                                    {
+-                                        bool printedAlready = false;
+-                                        //see if this was already print in RW/RO/WO
+-                                        if (ia !=0)
+-                                        {
+-                                            for (std::vector<cl::ImageFormat>::iterator searchIt = imageAccess[0].formats.begin();
+-                                                searchIt != imageAccess[0].formats.end();
+-                                                searchIt++)
+-                                            {
+-                                                if ( ((*searchIt).image_channel_data_type == (*it).image_channel_data_type) &&
+-                                                     ((*searchIt).image_channel_order == (*it).image_channel_order))
+-                                                {
+-                                                    printedAlready = true;
+-                                                    break;
+-                                                }
+-                                            }
+-                                        }
+-                                        if (printedAlready)
+-                                        {
+-                                            continue;
+-                                        }
+-                                        if (printTopHeader)
+-                                        {
+-                                            std::cout << "   " << (*id).second << imageAccess[ia].name << std::endl;
+-                                            printTopHeader = false;
+-                                        }
+-                                        if (printHeader)
+-                                        {
+-                                            std::cout << "    " << (*o).second << ": ";
+-                                            printHeader = false;
+-                                        }
+-                                        std::cout << channelType[(*it).image_channel_data_type].first;
+-                                        if (channelType[(*it).image_channel_data_type].second != "")
+-                                        {
+-                                            std::cout << "-"
+-                                                      << channelType[(*it).image_channel_data_type].second;
+-                                        }
+-                                        if (it != (imageAccess[ia].formats.end() - 1))
+-                                        {
+-                                            std::cout << " ";
+-                                        }
+-                                    }
+-                                }
+-                                if (printHeader == false)
+-                                {
+-                                    std::cout << std::endl;
+-                                }
+-                            }
+-                        }
+-                    }
+-                }
+-            }
+-
+-            std::cout << "  Max size of kernel argument:\t\t\t "
+-                      << device.getInfo<CL_DEVICE_MAX_PARAMETER_SIZE>()
+-                      << std::endl;
+-
+-            std::cout << "  Alignment (bits) of base address:\t\t "
+-                      << device.getInfo<CL_DEVICE_MEM_BASE_ADDR_ALIGN>()
+-                      << std::endl;
+-
+-            std::cout << "  Minimum alignment (bytes) for any datatype:\t "
+-                      << device.getInfo<CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE>()
+-                      << std::endl;
+-
+-            std::cout << "  Single precision floating point capability" << std::endl;
+-            std::cout << "    Denorms:\t\t\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
+-                          CL_FP_DENORM ? "Yes" : "No")
+-                      << std::endl;
+-            std::cout << "    Quiet NaNs:\t\t\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
+-                          CL_FP_INF_NAN ? "Yes" : "No")
+-                      << std::endl;
+-            std::cout << "    Round to nearest even:\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
+-                          CL_FP_ROUND_TO_NEAREST ? "Yes" : "No")
+-                      << std::endl;
+-            std::cout << "    Round to zero:\t\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
+-                          CL_FP_ROUND_TO_ZERO ? "Yes" : "No")
+-                      << std::endl;
+-            std::cout << "    Round to +ve and infinity:\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
+-                          CL_FP_ROUND_TO_INF ? "Yes" : "No")
+-                      << std::endl;
+-            std::cout << "    IEEE754-2008 fused multiply-add:\t\t "
+-                      << (device.getInfo<CL_DEVICE_SINGLE_FP_CONFIG>() &
+-                          CL_FP_FMA ? "Yes" : "No")
+-                      << std::endl;
+-
+-            std::cout << "  Cache type:\t\t\t\t\t " ;
+-            switch (device.getInfo<CL_DEVICE_GLOBAL_MEM_CACHE_TYPE>()) {
+-            case CL_NONE:
+-                std::cout << "None" << std::endl;
+-                break;
+-            case CL_READ_ONLY_CACHE:
+-                std::cout << "Read only" << std::endl;
+-                break;
+-            case CL_READ_WRITE_CACHE:
+-                std::cout << "Read/Write" << std::endl;
+-                break;
+-            }
+-
+-            std::cout << "  Cache line size:\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE>()
+-                      << std::endl;
+-
+-            std::cout << "  Cache size:\t\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_GLOBAL_MEM_CACHE_SIZE>()
+-                      << std::endl;
+-
+-            std::cout << "  Global memory size:\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_GLOBAL_MEM_SIZE>()
+-                      << std::endl;
+-
+-            std::cout << "  Constant buffer size:\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE>()
+-                      << std::endl;
+-
+-            std::cout << "  Max number of constant args:\t\t\t "
+-                      << device.getInfo<CL_DEVICE_MAX_CONSTANT_ARGS>()
+-                      << std::endl;
+-
+-            std::cout << "  Local memory type:\t\t\t\t " ;
+-            switch (device.getInfo<CL_DEVICE_LOCAL_MEM_TYPE>()) {
+-            case CL_LOCAL:
+-                std::cout << "Scratchpad" << std::endl;
+-                break;
+-            case CL_GLOBAL:
+-                std::cout << "Global" << std::endl;
+-                break;
+-            }
+-
+-
+-            std::cout << "  Local memory size:\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_LOCAL_MEM_SIZE>()
+-                      << std::endl;
+-
+-#if defined(CL_VERSION_2_0)
+-            if(vStrVal.compare("2") > 0)
+-            {
+-                std::cout << "  Max pipe arguments:\t\t\t\t "
+-                          << device.getInfo<CL_DEVICE_MAX_PIPE_ARGS>()
+-                          << std::endl;
+-
+-                std::cout << "  Max pipe active reservations:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_PIPE_MAX_ACTIVE_RESERVATIONS>()
+-                          << std::endl;
+-
+-                std::cout << "  Max pipe packet size:\t\t\t\t "
+-                          << device.getInfo<CL_DEVICE_PIPE_MAX_PACKET_SIZE>()
+-                          << std::endl;
+-
+-                std::cout << "  Max global variable size:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_MAX_GLOBAL_VARIABLE_SIZE>()
+-                          << std::endl;
+-
+-                std::cout << "  Max global variable preferred total size:\t "
+-                          << device.getInfo<CL_DEVICE_GLOBAL_VARIABLE_PREFERRED_TOTAL_SIZE>()
+-                          << std::endl;
+-
+-                std::cout << "  Max read/write image args:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_MAX_READ_WRITE_IMAGE_ARGS>()
+-                          << std::endl;
+-
+-                std::cout << "  Max on device events:\t\t\t\t "
+-                          << device.getInfo<CL_DEVICE_MAX_ON_DEVICE_EVENTS>()
+-                          << std::endl;
+-
+-                std::cout << "  Queue on device max size:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_QUEUE_ON_DEVICE_MAX_SIZE>()
+-                          << std::endl;
+-
+-                std::cout << "  Max on device queues:\t\t\t\t "
+-                          << device.getInfo<CL_DEVICE_MAX_ON_DEVICE_QUEUES>()
+-                          << std::endl;
+-
+-                std::cout << "  Queue on device preferred size:\t\t "
+-                          << device.getInfo<CL_DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE>()
+-                          << std::endl;
+-
+-                std::cout << "  SVM capabilities:\t\t\t\t " << std::endl;
+-                std::cout << "    Coarse grain buffer:\t\t\t "
+-                          << (device.getInfo<CL_DEVICE_SVM_CAPABILITIES>() &
+-                              CL_DEVICE_SVM_COARSE_GRAIN_BUFFER ? "Yes" : "No")
+-                          << std::endl;
+-                std::cout << "    Fine grain buffer:\t\t\t\t "
+-                          << (device.getInfo<CL_DEVICE_SVM_CAPABILITIES>() &
+-                              CL_DEVICE_SVM_FINE_GRAIN_BUFFER ? "Yes" : "No")
+-                          << std::endl;
+-                std::cout << "    Fine grain system:\t\t\t\t "
+-                          << (device.getInfo<CL_DEVICE_SVM_CAPABILITIES>() &
+-                              CL_DEVICE_SVM_FINE_GRAIN_SYSTEM ? "Yes" : "No")
+-                          << std::endl;
+-                std::cout << "    Atomics:\t\t\t\t\t "
+-                          << (device.getInfo<CL_DEVICE_SVM_CAPABILITIES>() &
+-                              CL_DEVICE_SVM_ATOMICS ? "Yes" : "No")
+-                          << std::endl;
+-
+-                std::cout << "  Preferred platform atomic alignment:\t\t "
+-                          << device.getInfo<CL_DEVICE_PREFERRED_PLATFORM_ATOMIC_ALIGNMENT>()
+-                          << std::endl;
+-
+-                std::cout << "  Preferred global atomic alignment:\t\t "
+-                          << device.getInfo<CL_DEVICE_PREFERRED_GLOBAL_ATOMIC_ALIGNMENT>()
+-                          << std::endl;
+-
+-                std::cout << "  Preferred local atomic alignment:\t\t "
+-                          << device.getInfo<CL_DEVICE_PREFERRED_LOCAL_ATOMIC_ALIGNMENT>()
+-                          << std::endl;
+-            }
+-#endif // CL_VERSION_2_0
+-
+-#if defined(CL_VERSION_1_1) && !defined(ATI_ARCH_ARM)
+-            if(vStrVal.compare("1.0") > 0)
+-            {
+-                cl_context_properties cps[3] = { CL_CONTEXT_PLATFORM, (cl_context_properties)(*p)(), 0 };
+-
+-                std::vector<cl::Device> device;
+-                device.push_back(*i);
+-
+-                cl::Context context(device, cps, NULL, NULL, &err);
+-                if (err != CL_SUCCESS) {
+-                    std::cerr << "Context::Context() failed (" << err << ")\n";
+-                    return EXIT_FAILURE;
+-                }
+-                std::string kernelStr("__kernel void hello(){ size_t i =  get_global_id(0); size_t j =  get_global_id(1);}");
+-                cl::Program::Sources sources(1, std::make_pair(kernelStr.data(), kernelStr.size()));
+-
+-                cl::Program program = cl::Program(context, sources, &err);
+-                if (err != CL_SUCCESS) {
+-                    std::cerr << "Program::Program() failed (" << err << ")\n";
+-                    return EXIT_FAILURE;
+-                }
+-
+-                err = program.build(device);
+-                if (err != CL_SUCCESS) {
+-
+-                    if(err == CL_BUILD_PROGRAM_FAILURE)
+-                    {
+-                        std::string str = program.getBuildInfo<CL_PROGRAM_BUILD_LOG>((*i));
+-
+-                        std::cout << " \n\t\t\tBUILD LOG\n";
+-                        std::cout << " ************************************************\n";
+-                        std::cout << str.c_str() << std::endl;
+-                        std::cout << " ************************************************\n";
+-                    }
+-
+-                    std::cerr << "Program::build() failed (" << err << ")\n";
+-                    return EXIT_FAILURE;
+-                }
+-
+-                cl::Kernel kernel(program, "hello", &err);
+-                if (err != CL_SUCCESS) {
+-                    std::cerr << "Kernel::Kernel() failed (" << err << ")\n";
+-                    return EXIT_FAILURE;
+-                }
+-
+-                std::cout << "  Kernel Preferred work group size multiple:\t "
+-                          << kernel.getWorkGroupInfo<CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE>((*i), &err)
+-                          << std::endl;
+-            }
+-
+-#endif // CL_VERSION_1_1
+-
+-            std::cout << "  Error correction support:\t\t\t "
+-                      << device.getInfo<CL_DEVICE_ERROR_CORRECTION_SUPPORT>()
+-                      << std::endl;
+-#ifdef CL_VERSION_1_1
+-            if(vStrVal.compare("1.0") > 0)
+-            {
+-                std::cout << "  Unified memory for Host and Device:\t\t "
+-                          << device.getInfo<CL_DEVICE_HOST_UNIFIED_MEMORY>()
+-                          << std::endl;
+-            }
+-#endif // CL_VERSION_1_1
+-            std::cout << "  Profiling timer resolution:\t\t\t "
+-                      << device.getInfo<CL_DEVICE_PROFILING_TIMER_RESOLUTION>()
+-                      << std::endl;
+-
+-            std::cout << "  Device endianess:\t\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_ENDIAN_LITTLE>() ? "Little" : "Big")
+-                      << std::endl;
+-
+-            std::cout << "  Available:\t\t\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_AVAILABLE>() ? "Yes" : "No")
+-                      << std::endl;
+-
+-            std::cout << "  Compiler available:\t\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_COMPILER_AVAILABLE>() ? "Yes" : "No")
+-                      << std::endl;
+-
+-            std::cout << "  Execution capabilities:\t\t\t\t " << std::endl;
+-            std::cout << "    Execute OpenCL kernels:\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_EXECUTION_CAPABILITIES>() &
+-                          CL_EXEC_KERNEL ? "Yes" : "No")
+-                      << std::endl;
+-            std::cout << "    Execute native function:\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_EXECUTION_CAPABILITIES>() &
+-                          CL_EXEC_NATIVE_KERNEL ? "Yes" : "No")
+-                      << std::endl;
+-
+-            std::cout << "  Queue on Host properties:\t\t\t\t " << std::endl;
+-            std::cout << "    Out-of-Order:\t\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_QUEUE_ON_HOST_PROPERTIES>() &
+-                          CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE ? "Yes" : "No")
+-                      << std::endl;
+-            std::cout << "    Profiling :\t\t\t\t\t "
+-                      << (device.getInfo<CL_DEVICE_QUEUE_ON_HOST_PROPERTIES>() &
+-                          CL_QUEUE_PROFILING_ENABLE ? "Yes" : "No")
+-                      << std::endl;
+-
+-#ifdef CL_VERSION_2_0
+-            if(vStrVal.compare("2") > 0)
+-            {
+-                std::cout << "  Queue on Device properties:\t\t\t\t " << std::endl;
+-                std::cout << "    Out-of-Order:\t\t\t\t "
+-                          << (device.getInfo<CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES>() &
+-                              CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE ? "Yes" : "No")
+-                          << std::endl;
+-                std::cout << "    Profiling :\t\t\t\t\t "
+-                          << (device.getInfo<CL_DEVICE_QUEUE_ON_DEVICE_PROPERTIES>() &
+-                              CL_QUEUE_PROFILING_ENABLE ? "Yes" : "No")
+-                          << std::endl;
+-            }
+-#endif
+-
+-            std::cout << "  Platform ID:\t\t\t\t\t "
+-                  << device.getInfo<CL_DEVICE_PLATFORM>()
+-                      << std::endl;
+-
+-            std::cout << "  Name:\t\t\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_NAME>().c_str()
+-                      << std::endl;
+-
+-            std::cout << "  Vendor:\t\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_VENDOR>().c_str()
+-                      << std::endl;
+-#ifdef CL_VERSION_1_1
+-            if(vStrVal.compare("1.0") > 0)
+-            {
+-                std::cout << "  Device OpenCL C version:\t\t\t "
+-                          << device.getInfo<CL_DEVICE_OPENCL_C_VERSION>().c_str()
+-                          << std::endl;
+-            }
+-#endif // CL_VERSION_1_1
+-            std::cout << "  Driver version:\t\t\t\t "
+-                      << device.getInfo<CL_DRIVER_VERSION>().c_str()
+-                      << std::endl;
+-
+-            std::cout << "  Profile:\t\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_PROFILE>().c_str()
+-                      << std::endl;
+-
+-            std::cout << "  Version:\t\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_VERSION>().c_str()
+-                      << std::endl;
+-
+-
+-            std::cout << "  Extensions:\t\t\t\t\t "
+-                      << device.getInfo<CL_DEVICE_EXTENSIONS>().c_str()
+-                      << std::endl;
+-
+-            std::cout << std::endl << std::endl;
+-        }
+-    }
+-    }
+-    catch (cl::Error err)
+-    {
+-        std::cerr
+-            << "ERROR: "
+-            << err.what()
+-            << "("
+-            << err.err()
+-            << ")"
+-            << std::endl;
+-        return EXIT_FAILURE;
+-    }
+-
+-    return EXIT_SUCCESS;
+-}
diff --git a/dev-libs/rocm-opencl-runtime/metadata.xml b/dev-libs/rocm-opencl-runtime/metadata.xml
new file mode 100644
index 000000000000..359755b2e5a5
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">RadeonOpenCompute/ROCm-OpenCL-Runtime</remote-id>
+    </upstream>
+    <longdescription lang="en">
+        Radeon Open Compute OpenCL Compatible Runtime
+    </longdescription>
+</pkgmetadata>
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.6.0-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..c26ed40b481a
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.6.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+OPENCL_ICD_COMMIT="bc9728edf8cace79cf33bf75560be88fc2432dc4"
+SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
+	inherit git-r3
+else
+	SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime
+	dev-libs/rocm-comgr
+	dev-libs/rocm-device-libs
+	dev-libs/rocm-opencl-driver
+	dev-libs/ocl-icd[khronos-headers]"
+DEPEND="${RDEPEND}
+	dev-lang/ocaml
+	dev-ml/findlib"
+
+PATCHES=(
+	"${FILESDIR}/${P}-unbundle-dependencies.patch"
+)
+
+src_prepare() {
+	mkdir -p "${S}"/api/opencl/khronos/ || die
+	mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 3a246b8d61a2..88cba8868e41 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,4 +1,9 @@
-AUX rocr-runtime-2.0.0-cmake-install-paths.patch 2492 BLAKE2B e7fa2044ca98a019e6f86018d6ee929f58128d6958fe719daddeb241757eb468b6f8832fa75d8e0105eb9e82dde7e766e515195cb46faf92851df741b30ad8b4 SHA512 71723b79815a77ad03aa373f540369c0554806ac037847146fad47befe5dcec8b36427942c8d1c10b9a4a6898c9f2ba646fb03a5240a88511afa809a1390599d
+AUX rocr-runtime-2.0.0-cmake-install-paths.patch 2151 BLAKE2B 4d52316dae6fae72c85dcf0d042f97dc94910278ffecfc4ca2c4f51fe7ed9afafef994626d7f58e8f806eb3620762adfe4523630db982f715ccad6f90c120e97 SHA512 d8d3862d018582c3c4c5551ffd75dbfccb0d005bcaf0a005de07a2c0ac7d9060c21a348b2ac01b447a9ede007ffd63ba11a8a8e24d4c15c0044e2e86d6266f95
 DIST rocr-runtime-2.0.0.tar.gz 313087 BLAKE2B 5fe5ea99728f7d7337c9e8a174a31d4ca8bdd559fad3400955ba6d86947d5bf9004094d78548cab2cb2089bfd028d0e4dfdd4d5fd7b41bed73feeebf2f33b705 SHA512 662d3d8fff8aeb17557df67207d885edc1266bb9800ec46ecab28bbd6ace7fbffb9e4092d74beb0366cacfe8873b1b257bcf2f8345d81a9b6657a7adcfc53c0c
+DIST rocr-runtime-2.6.0.tar.gz 318296 BLAKE2B c04e04db32f650def8a7973fa73f0c0e9b99412b13676a05e9c4283ea07958ffe14f7c54002db469ddfd506f349087bd66fff138b7e7b19c41f4ca8789a7c384 SHA512 3b88cf4e1cb6fca6b4361a612abc2c02466d4f716838665d02f16b6fa975b5f69795622d6b96a01b796165980d2888be7eedd77957a7fd44fac19a0ea581f6b8
+DIST rocr-runtime-2.7.0.tar.gz 321669 BLAKE2B 99f7a62019aaa893ff032a7ed492720c1d0d8fc2c8a730f2e6833d1ad34af57e1045ed480a7d5ba72123bebfa6accd6282be4299bf94d77404adc5bbc9d13624 SHA512 46926a711665df4e232a6dcbcb1f67a4a133bffac927b70404e3cefe624be31dfc5ffea49ae9b834076cfcdf94a6e61b6804af6aed75f433e1842c980bc6e54d
 EBUILD rocr-runtime-2.0.0.ebuild 862 BLAKE2B c9262812cdfdc159248b81cb168b5d2465f2bd7544d576d4d7407919a0f9764a6c2eaf53731294c424755e05915ec47647435ce7524d276acbc7786bccf6ede9 SHA512 8c02bd29599c6cc7ad77dae4f8759cd4f3c2840800ecab30953d325b0ce1aa6bc5bee51ad2b5eca60eb420d5c4fce74e746cdf1efc470a4262eb5a360531399d
+EBUILD rocr-runtime-2.6.0-r1.ebuild 869 BLAKE2B e5a736b834cf77ee056ed3497bcdd3bdb0c525e3ed117164d0a28a9c49ffd079909967110af94c5c87f9e1429e58d36511f95b8bb60c3158a27800fb8679269d SHA512 f883e3f6e2354a2bdab1f5dce33eb9ae6b6405d158414f8016276b25e8e50420489419d4bd3727981bba04ec2311afa7ac3c2590148ab1f45116b7c66124cfbb
+EBUILD rocr-runtime-2.7.0.ebuild 877 BLAKE2B cc25bd18c02adef5491b3d9abcd95b926b0c57441fce8983ef12c91ce3802fb827d1cc26e04240725ec714abeb0941a2d266466e3b070abe9443c3898ebe903f SHA512 ee2786353e21af0980fd92db90770430facbf9e3066e7b1e848cde4d1589e41bc2781a9da9a7ed255a65aa541eb8737b676ba8175f5bfc502624089a6f971a5c
+EBUILD rocr-runtime-9999.ebuild 804 BLAKE2B fbe4f25307d253b02a5a31d3a9e6fdb21fa79cdbe209a76428b8b8b745713ed176a5ab27f364d7d62e9d294acf959f78d6cc16746d1e6075b663b4d92c2e9019 SHA512 e6cb9a6877237362eb1dab9ade2b0d1394f1775ea221bc28373151bbbd5fdae1525724e4a1b35742bb343ce9e68f05e99c31a70d8a54723780f7f3ca4c162440
 MISC metadata.xml 600 BLAKE2B 6bdb934a6f2602bc39dab093a9554a71463e8818181cd9bdb15f108f8d371cc515fdd165742dfe8ac4085073cccc9bbb990a353f0d860d4590049c6965c70e3a SHA512 29543e96a8ccdb2506ba33170822f1bb7399d82c82eb60d342eed616c193902ecf49d377628db010f15aae79b529a65ea1e196ec446621bb2cd9386547c5662c
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch
index ece1571ab406..2caeebb2bbba 100644
--- a/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch
@@ -1,16 +1,16 @@
-From 866c2fbcf1efa3e84e6f25bebc12dc1d4caa4e74 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 7 Jan 2019 21:06:14 -0500
-Subject: [PATCH] Correctly install the library into the system
+https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51/
 
-Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa)
-Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include"
----
- src/CMakeLists.txt | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
+commit 2d51a6133f32b72f60fba0e95234aee2b63aa682 (HEAD -> patch-6)
+Author: Craig Andrews <candrews@integralblue.com>
+Date:   Mon Jan 7 21:06:14 2019 -0500
 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 37a9b09..e39f3d2 100644
+    Correctly install the library into the system
+    
+    Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa)
+    Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include"
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 37a9b09..545f183 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -53,6 +53,7 @@ project( ${CORE_RUNTIME_TARGET} )
@@ -21,22 +21,22 @@ index 37a9b09..e39f3d2 100644
  include ( hsa_common )
  
  ## Find LibElf
-@@ -177,14 +178,12 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
+@@ -176,15 +177,9 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
+     add_custom_command ( TARGET ${CORE_RUNTIME_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} *.so )
  endif ()
  
- ## Create symlinks for packaging and install
+-## Create symlinks for packaging and install
 -add_custom_target ( hsa-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa-link )
 -add_custom_target ( ${CORE_RUNTIME_TARGET}.so-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}.so-link )
-+add_custom_target ( ${CORE_RUNTIME_TARGET}.so-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink hsa/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}.so-link )
- 
+-
  ## Set install information
 -install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib )
 -install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa )
 -install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa-link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
 -install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}.so-link DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so )
-+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/hsa )
++install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
 +install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
-+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}.so-link DESTINATION ${CMAKE_INSTALL_LIBDIR} PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so )
  
  ## Packaging directives
  set ( CPACK_PACKAGE_NAME "hsa-rocr-dev" )
+
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.6.0-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..dc4aad01c299
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-2.6.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl"
+DEPEND="${RDEPEND}
+	dev-libs/roct-thunk-interface"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.7.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.7.0.ebuild
new file mode 100644
index 000000000000..b2fdce8bee32
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-2.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl"
+DEPEND="${RDEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
new file mode 100644
index 000000000000..a31193337a6d
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl"
+DEPEND="${RDEPEND}
+	dev-libs/roct-thunk-interface"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index f9d910b04d21..903a404c36bb 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,4 +1,13 @@
 AUX roct-thunk-interface-2.0.0-correctly-install.patch 11811 BLAKE2B d1e17c4c1d01e3c9baeabf8e7e82283dc89578f06a87de645e21786fa4d1258a07a3bbb52b1f9650f79df0e0e1464e6188f4b2fcbeed1d4398897b01aa4680f5 SHA512 3026e293da9ffc26d8a0c6c2cae1d8580c28eb05460e36568bcae5bcbea606280bca15acecd66895db7173397753beec0a2a750a8286c5372754e9861e28e870
+AUX roct-thunk-interface-2.6.0-correctly-install-pc.patch 943 BLAKE2B b6cf3f6d9a3d8e29929e3eab94155eee6c3100dd0717806ee85e355ca23a607436ab0711dd6a22ef9428443db9a85200a98edcb2f47cb318947696eded4507de SHA512 78088c886c7c7c7fe40b08bdf7596f305f3db920a10f7df1830af46b2ae5ebdef9e7d3ad84b5bce8b0cdbc952af4ffc1ace9275ccf64b473aa61db56428e6c19
+AUX roct-thunk-interface-2.6.0-correctly-install.patch 982 BLAKE2B 75306fd9f457a2d785571ba29b35012c284ce237e56636b411bf98acc85b245b4c536bbabf15ccc40a7bd55cf8e5e6e07312818dc5a278e6d10037211d0e2986 SHA512 26e5c6463fe57f03e33038107fc8883550c35c1103ff5c53a2ff7bd4531e6e8b8b16652bde719e5550ce8233180d0d90fa1bbce8dbe7693ba5afc38479429533
+AUX roct-thunk-interface-2.6.0-do-not-install-kfd_ioctl.h.patch 1182 BLAKE2B 824b99754d9a6c9ab61b9e195e34eb2927b436bf9a1080d0645e220a76199797169616518fa36154c8afaafbeacc85c3d5ede2abb4acfbc5cb4b420222deb4ca SHA512 ab8ee4abc9418809ecc01fccd91bfffc8d189405c533ced32d6f6a28ca6c4d8da0fe9b5a2b225e2a7bfb7275c3a018d1290f743d816071a1b930f608eea10c5c
+AUX roct-thunk-interface-2.6.0-pc-prefix.patch 860 BLAKE2B 93118ca68359edae385b8842512ebe37c7ba1ec88e11a90bc6ee561eb22de87364cc716830575b00dff99638a6f429060d1f90e7e46911f2c49a7aa301bf4396 SHA512 18d91c568e76c09fb6d49648b0ae425684ba5fbdb138943722fc7192b223343c7ae63f7e2ca96beadb4eb53ce090a4b3dda496d413bb16fbedcb95ee42753032
 DIST roct-thunk-interface-2.0.0.tar.gz 1958218 BLAKE2B c1ba89cac9a18964e040e6b1e57a464216e7086c400e3360cfca6f376ac90b0b1afbb3a2a4d995581d1829ca57afe62bf6f2ac59cc103a48d384a8e52b1457d0 SHA512 7d2e35df2bec201bcc977328d7d36b921f76b57a0c54fc2332eb1faf3a722b6a3a1e3b1658e93b216ed68b965426c463a2dbf52a22af64ce1dcc9fad0f27ca9c
+DIST roct-thunk-interface-2.6.0.tar.gz 1957383 BLAKE2B 0335d4e219978d16bc8dbc77c6e1fb315f424ddf9225eb14968d4f8233348b358151f2baf279dc2a6e422da7839b704c847f1311b21d69e07738f3fca3235452 SHA512 e54f7cefa1854fb9967e373bd3ef5a0236987ebb26c21728ef5676e73cf63be6e9a49c1ce52d1156caa970473f214e02f25370e2cd7381c1f74a0b8cd5b2bc7f
+DIST roct-thunk-interface-2.7.0.tar.gz 2677696 BLAKE2B 44e15d772f3e86994739ca28300cac0dde56a173daa3789a332d58ed7ac4f5e8705b778e1096d022225a8b89fa5ceb4e3e40b456d470e7ab325721328e04292e SHA512 325444d6b457dae03779730324bf683712acb07ed9379675b025456a8dfcc4f6ebf1d2e10bcf03b6474ad8353c20c8fa1d380a671578e47f9a7e27caf946ecab
 EBUILD roct-thunk-interface-2.0.0.ebuild 893 BLAKE2B 1b3d076a1042d862427afdd98d149f3f2716395f275407eafae0df0a8bfb1a410bae65ab16b18a8394d3d6516eabb4a358c66667b55555d871213929263a0461 SHA512 472c9f047007f97f15c9cece71aaba8473698f1e3a1b8a72f1e42b4e7aff298ea092fec272bfc0134550f7c31d74cd7476133c614337405ba824d96957a10ffa
+EBUILD roct-thunk-interface-2.6.0.ebuild 1162 BLAKE2B 625d067629a44d62e9f9b874bb74098226c6fd4bcc0afe520edcd6c815403137d28274d42b42bcce7ae1e2db6b8e5410cc8b03dde505377ffce4b2e285629279 SHA512 c04811fe533d4b06770ff1e19d0e9572d8f45f932aab8f60052a86d0749bbc082f39401e3fef701cdd7857c85754f8f57e49dedcde2b4974492612eb93ef8fdf
+EBUILD roct-thunk-interface-2.7.0.ebuild 1190 BLAKE2B 68654588a3a2a3bfbe5d50536c518e5be81fcd9edf69db25e8b7e4ecab42d8538c7575b770a5c359ca41955384ebf11e5841773d140af851deadcf21f821d877 SHA512 dc0e98aacaba2e3f24f86a7241224536021a9569fd8923a164af41b17b28e146c1bc9e4e40f65ee88f107b7ba8cc8210bbc129cec7958bc245ab1e3501afaa8b
+EBUILD roct-thunk-interface-9999.ebuild 1081 BLAKE2B 79de97419f7b465562b3215ffb57a2dfcedaf686042ffb3022b0dce22cbf9d74c1d2e713ae92a7bcada0238bbbdd2c787b7e8ea905585751c5b08438f026d3d4 SHA512 a44004e851ae89b50bc355357e1b9f9132384a8d77524236bc35aab65ca753a416514dfe14aca8fbc344ca2abe4c537da7450b4d1ee015ae81873ca50f71b5cb
 MISC metadata.xml 742 BLAKE2B e4bf5b17c7add51f1fce354e5b68d874808e680e3dce8e514da738a0fdfb8a26076f76cfc5c8091bd11f7ef4576e2d45334590f20f899865b8c984406892b1a0 SHA512 7d0b104b201778561f5e0566c28f593abd8a9c05ea1154a7d58bebb135f15e86cf6dd7f98f9fd5059b054ffac1d64a86404743f7c9bb1a619431f5e911a233cf
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch
new file mode 100644
index 000000000000..4d0680415ce1
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch
@@ -0,0 +1,25 @@
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/39
+
+From 032a3e38c62b84ec56fad70d24cf82ee65d8c80b Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Mon, 22 Jul 2019 17:06:16 -0400
+Subject: [PATCH] Install libhsakmt.pc to the standard location
+
+pkgconfig files should be installed to /usr/share/pkgconfig/, not /usr/libhsakmt/
+---
+ hsakmt-dev.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hsakmt-dev.txt b/hsakmt-dev.txt
+index eb0d3e2..195cc6c 100644
+--- a/hsakmt-dev.txt
++++ b/hsakmt-dev.txt
+@@ -43,7 +43,7 @@ set ( BUILD_VERSION_PATCH @BUILD_VERSION_PATCH@ )
+ set ( CMAKE_VERBOSE_MAKEFILE on )
+ 
+ ## Set the install targets
+-install ( FILES libhsakmt.pc DESTINATION libhsakmt )
++install ( FILES libhsakmt.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig )
+ install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} )
+ 
+ 
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch
new file mode 100644
index 000000000000..961d2978a2d1
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch
@@ -0,0 +1,25 @@
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/38
+
+From 1362864410579c35eb2ec428384ad883cb8b24b1 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Mon, 22 Jul 2019 16:18:08 -0400
+Subject: [PATCH] Install LICENSE.md to DOCDIR
+
+LICENSE.md should be installed to the DOCDIR, not /usr/libhsakmt
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e020132..398da3e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,7 +145,7 @@ add_custom_target ( package-dev DEPENDS build-dev
+ 
+ ## Add the install directives for the runtime library.
+ install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+-install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION libhsakmt )
++install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} )
+ 
+ ## Add the packaging directives for the runtime library.
+ set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} )
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-do-not-install-kfd_ioctl.h.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-do-not-install-kfd_ioctl.h.patch
new file mode 100644
index 000000000000..711c16f852e0
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-do-not-install-kfd_ioctl.h.patch
@@ -0,0 +1,25 @@
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/42
+
+From 9090559aad755bf2b5041fb617c3ddf790c7cdf6 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Thu, 8 Aug 2019 14:01:04 -0400
+Subject: [PATCH] hsakmt-dev should not install linux kernel headers
+
+hsakmt-dev should not install include/linux/* (currently just kfd_ioctl.h) as those are linux kernel headers provided by the linux kernel header packages (`linux-headers-*` on Debian/Ubuntu or `kernel-headers-*` on Red Hat / Fedora)
+---
+ hsakmt-dev.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hsakmt-dev.txt b/hsakmt-dev.txt
+index eb0d3e2..6af364c 100644
+--- a/hsakmt-dev.txt
++++ b/hsakmt-dev.txt
+@@ -44,7 +44,7 @@ set ( CMAKE_VERBOSE_MAKEFILE on )
+ 
+ ## Set the install targets
+ install ( FILES libhsakmt.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig )
+-install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} )
++install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} PATTERN "linux" EXCLUDE )
+ 
+ 
+ ## Set the default generator types for the devel package.
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch
new file mode 100644
index 000000000000..0b4a716e6c9d
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch
@@ -0,0 +1,22 @@
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/40
+
+From fb42a02230ed5140b3ac3beadb38ca39eb9ea463 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Mon, 22 Jul 2019 17:17:09 -0400
+Subject: [PATCH] Use CMAKE_INSTALL_PREFIX in pkgconfig
+
+The location where files are installed is the value to use; the CPACK packaging directory isn't important as the pkgconfig file is used on the system after the package is installed.
+---
+ libhsakmt.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libhsakmt.pc.in b/libhsakmt.pc.in
+index 3093afc..1abb66d 100644
+--- a/libhsakmt.pc.in
++++ b/libhsakmt.pc.in
+@@ -1,4 +1,4 @@
+-prefix=@CPACK_PACKAGING_INSTALL_PREFIX@
++prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild
new file mode 100644
index 000000000000..69e6b7fe853e
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
+	KEYWORDS="~amd64"
+fi
+PATCHES=(
+	"${FILESDIR}/${P}-correctly-install.patch"
+	"${FILESDIR}/${P}-correctly-install-pc.patch"
+	"${FILESDIR}/${P}-pc-prefix.patch"
+	"${FILESDIR}/${P}-do-not-install-kfd_ioctl.h.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+	sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+src_compile() {
+	cmake-utils_src_compile build-dev
+}
+src_install() {
+	cmake-utils_src_install install-dev
+}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.7.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.7.0.ebuild
new file mode 100644
index 000000000000..e7eb65985846
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.7.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
+	KEYWORDS="~amd64"
+fi
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.0-correctly-install.patch"
+	"${FILESDIR}/${PN}-2.6.0-correctly-install-pc.patch"
+	"${FILESDIR}/${PN}-2.6.0-pc-prefix.patch"
+	"${FILESDIR}/${PN}-2.6.0-do-not-install-kfd_ioctl.h.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+	sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+src_compile() {
+	cmake-utils_src_compile build-dev
+}
+src_install() {
+	cmake-utils_src_install install-dev
+}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
new file mode 100644
index 000000000000..4860c47142d2
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+	sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DCPACK_PACKAGING_INSTALL_PREFIX=/usr
+	)
+	cmake-utils_src_configure
+}
+src_compile() {
+	cmake-utils_src_compile build-dev
+}
+src_install() {
+	cmake-utils_src_install install-dev
+}
diff --git a/dev-libs/serdisplib/Manifest b/dev-libs/serdisplib/Manifest
index 3b1f8e930ffb..05e8b3aca79d 100644
--- a/dev-libs/serdisplib/Manifest
+++ b/dev-libs/serdisplib/Manifest
@@ -3,5 +3,6 @@ AUX use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82
 DIST serdisplib-1.97.9.tar.gz 293190 BLAKE2B f11406acaedb724d51266510d10f5cbae7e3bf1a69e3378ed8a0f8c4551336e3d662eb104ccc938f72821aec3406e1eed27754c990e17940d8dbe7dd8c5d6805 SHA512 ab45202fd1fd85b12f1ebf7a7e1a4575ad363f6faffd45949300840456e26dd521c70b67ff57c32e1ff6c0a9f2668b3be6a653afb57ba6da701fbae6e8db3118
 DIST serdisplib-2.01.tar.gz 472998 BLAKE2B 7ee78703d1d2cb4172e44db443825dd0fb3080284e832c60a102b853a1df6e0812a30a40504b8eb3e5ecda83f57138d78b43c3c40b8e4efabb7071eff7ad1b3e SHA512 0474cce4353edb3640d8432272905859e90efe6140e6791c84e1cb51df7f533734a9c78447d8d8448a70e62dda6d65061bbcc515ee346354825029874ae5e9a9
 EBUILD serdisplib-1.97.9.ebuild 689 BLAKE2B 046e5cbc15c905f6e9ce98cd91798a7b08e93f0ab5409d3ca46a0f52f2cf5c600d53521720e584146c001dcf1a414ae65c98f469cfd203a89b427193cdbad07d SHA512 f1d713fc3c1005ad81b074a4b75638015f06b57141d2f83e02c4cf11a2b2cdaac56b89f1c3fbfc1b3e38d33f2c48e0e22a7ac6af31c47e50b1d4431231c613a9
-EBUILD serdisplib-2.01.ebuild 2506 BLAKE2B 8052e43fbc97bffe04494a8fda82a7b8d892242a1bff51d9728cf9b2a5237446643f80d65368d8937ad037e5e0ef844e8cd2ac52e6c8ccc01952bbbe7cdce066 SHA512 575c1540c0625cad14a4b5fe0a3a3e29e0ed870790491c96fa72ce50b3f3e74da943a93395a0ee6ae75c79c56b7632e01faaa0286b7a4a6ee3fecb3e61421155
+EBUILD serdisplib-2.01-r1.ebuild 2553 BLAKE2B 31e2264b9067da35325471efd106c4d9821a9e5fc3ec5b20eb935b56b31d76ce60c1a38ec052cc139ceede0100877b4e8168cf56b8c2f0a235f20bf9693ba9bd SHA512 44480f59bbe65481df51461bdf461171f62445a5285efb89e1272338ae32c962d778fdf00ac58108844ae8a7ae81b6399b43bff13e202208dc9012c69e5bb2a9
+EBUILD serdisplib-2.01.ebuild 2508 BLAKE2B 4efd666b305375c65be803c8e79d91b9f8caf72cc74d2f655a6ccd790e80099fb44749d46749a8504b0f74902187fb2501402c330301e01d3de62e9b721cfe65 SHA512 cf3279873e09b74ef7c3c357c94fd8bc2a23840d4f606011c2cecad5a3a3972337c4f5ae4c9ca93afe1200aad54b0f8b958e9f80aa2591c525412286c1b9dc26
 MISC metadata.xml 781 BLAKE2B 39a77b8c97974cdd41d31afa7bc47def2f23f1137b00f79f6574c4f4236702f2ac12219520c7afb7346c4b51dafce61ae901f64da618972fdc44d80b918ab5bd SHA512 fd9814780e1fde17eacd0424f757b9d2b905cbf2116d44cc0966d703cbfe7878580a1afe7b2da4e02d641617922b3e057e9daf8213091a69b0820bd7d92186fd
diff --git a/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild b/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild
new file mode 100644
index 000000000000..8a7fa4dd1e17
--- /dev/null
+++ b/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Library to drive several displays with built-in controllers or display modules"
+HOMEPAGE="http://serdisplib.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="threads tools"
+
+# Define the list of valid lcd devices.
+IUSE_LCD_DEVICES=(
+	acoolsdcm ddusbt directgfx displaylink framebuffer glcd2usb
+	goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544
+	remote rs232 sed133x sed153x sed156x ssdoled stv8105 t6963
+)
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+IUSE+=" $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) "
+REQUIRED_USE+="
+	|| ( $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) )
+	lcd_devices_framebuffer? ( threads )
+"
+
+# Specific drivers will need some features to be enabled
+RDEPEND="
+	media-libs/gd[jpeg,png,tiff]
+	lcd_devices_acoolsdcm? ( virtual/libusb:1= )
+	lcd_devices_directgfx? ( media-libs/libsdl )
+	lcd_devices_displaylink? ( x11-libs/libdlo )
+	lcd_devices_glcd2usb? ( virtual/libusb:1= )
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" )
+
+PATCHES=( "${FILESDIR}/use-destdir.patch" "${FILESDIR}/disable-static-build.patch" )
+
+src_prepare() {
+	default
+
+	# Fix Makefile, as it will fail, when USE="tools" is not set
+	if ! use tools; then
+		sed -i -e '/$(INSTALL_PROGRAM) $(PROGRAMS)/d' src/Makefile.in || die
+	fi
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e '/@LDFLAGS@/d' serdisplib.pc.in || die
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in ${IUSE_LCD_DEVICES[@]}; do
+		if use lcd_devices_${lcd_device}; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	local use_usb="--disable-libusb"
+	if use lcd_devices_acoolsdcm || use lcd_devices_glcd2usb; then
+		use_usb="--enable-libusb"
+	fi
+
+	local myeconfargs=(
+		$(use_enable lcd_devices_directgfx libSDL)
+		$(use_enable lcd_devices_displaylink deprecated)
+		$(use_enable lcd_devices_displaylink libdlo)
+		$(use_enable lcd_devices_remote experimental)
+		$(use_enable threads pthread)
+		$(use_enable tools)
+		${use_usb}
+		--disable-dynloading
+		--disable-statictools
+		--with-drivers="${myeconfargs_lcd_devices#,}"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	udev_dorules 90-libserdisp.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-libs/serdisplib/serdisplib-2.01.ebuild b/dev-libs/serdisplib/serdisplib-2.01.ebuild
index 85de825917ea..0a3e778a8d1b 100644
--- a/dev-libs/serdisplib/serdisplib-2.01.ebuild
+++ b/dev-libs/serdisplib/serdisplib-2.01.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="threads tools"
 
 # Define the list of valid lcd devices.
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 8933b52f0398..d735502871b8 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,3 +1,6 @@
 DIST utf8_v2_3_4.zip 22422 BLAKE2B cf736876a99068c7e5cb1b0b892d1d63cb38906c993c60b78c8c5625aef86fac3a849551771d0840c3cccf04f1a3617216cbd4684fa5cdde0037e3901c70ff4b SHA512 0e85e443e7bd4ecbe85dedfb7bdf8b1767808108b3a4fc1c0c508bcf74787539ae0af95a31a70e715ca872689ac4d7233afc075ceb375375d26743f92051e222
+DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
 EBUILD utfcpp-2.3.4.ebuild 537 BLAKE2B cceb94f796696ab61bc98cf7ee4f601a0b2a2c528aed81d89ab3cae6f626868c1f33703e6e19785f35c9bf080716580764dd6f6b68a1a6ae7ace9264e1ed9c5d SHA512 5ab92460e7cc22c0d19c78a4632d12eaff02b9c2e0f985ab86dceefb3d73235012a7c037907d42ee956532d160a9775021d2c5c7cc5ffdb9aac2c834c395a4b0
-MISC metadata.xml 241 BLAKE2B bebf9b2f9e4975ea533d4cd1d684f5b702b6f3ec3535623cb53ae32dc4dadc2d753f8ad0f010125ce7228c7d7faf358856a7098f498ef7eaf954f83c9c36232e SHA512 863bee3a93ff22253bbb40c46dc65adbb4cedcef5ab478971cdaba2ab152d0e4490e0d987805622c3c4d2f937852187d6cd42e9524995563d8c91e6192d58100
+EBUILD utfcpp-3.1.ebuild 946 BLAKE2B c72550954ecda684130ac539d566dd3b1cecc26f653302a54b28cf64fdd02716ddf278654c86ff47eba1e8156a89a33267e605660c8a21c9a8f7a1228dfef6c4 SHA512 5128f79915aa8924b6e82f75dfc2faf71a0e34803a55bf88df5af04f59e8ffd79edaf4b94f0355ee6b36f6f274c51dfa1f497bcf83c7f51e1824a0a1bbc31812
+EBUILD utfcpp-9999.ebuild 916 BLAKE2B 8a7a1e05ae84fbb8d875e0b7fb0558cfc0c9835090b0253343648d6d9c1833724f99de9b64702d1976a89f93bfdb38f36cf7c41979e73cae9a39bdf66338f5d0 SHA512 e7d512b80328c68fd6037d08796ea88ffabaf903d18e33ebed26253f03c5cdd02c050450a38980e23d83356c3bb30f90ecdba1c8125fb86f877c846c4bb33b01
+MISC metadata.xml 352 BLAKE2B 4ffd4d4fed2363f01b91b53dd2e869b6c49aa0bbddc249e7525b064df74e51528c193a5a987880ca2a3d20a13eba774498d220181d4f55ae262c8ac0e2867083 SHA512 bcd0d5ab729af171d91a6147ff7437f1627638a7d1f4e0c6501aaf6269d9912bca3ee8666dadd1d7037f06850468a40952ba97d572bcf846c38ac7b9273e6cad
diff --git a/dev-libs/utfcpp/metadata.xml b/dev-libs/utfcpp/metadata.xml
index 162dbab4fe24..433cf52c3011 100644
--- a/dev-libs/utfcpp/metadata.xml
+++ b/dev-libs/utfcpp/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">utfcpp</remote-id>
+		<remote-id type="github">nemtrif/utfcpp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/utfcpp/utfcpp-3.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.ebuild
new file mode 100644
index 000000000000..9bd3480908d9
--- /dev/null
+++ b/dev-libs/utfcpp/utfcpp-3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2015-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="UTF-8 C++ library"
+HOMEPAGE="https://github.com/nemtrif/utfcpp"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+DEPEND="test? ( dev-cpp/gtest )"
+RDEPEND=""
+
+src_prepare() {
+	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
+	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTF8_SAMPLES=OFF
+		-DUTF8_TESTS=$(usex test ON OFF)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/utfcpp/utfcpp-9999.ebuild b/dev-libs/utfcpp/utfcpp-9999.ebuild
new file mode 100644
index 000000000000..2b6fa17b5966
--- /dev/null
+++ b/dev-libs/utfcpp/utfcpp-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2015-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="UTF-8 C++ library"
+HOMEPAGE="https://github.com/nemtrif/utfcpp"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+DEPEND="test? ( dev-cpp/gtest )"
+RDEPEND=""
+
+src_prepare() {
+	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
+	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTF8_SAMPLES=OFF
+		-DUTF8_TESTS=$(usex test ON OFF)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 6ba1355e063d..a19799befe86 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,9 +1,9 @@
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
-DIST vala-0.44.6.tar.xz 3354452 BLAKE2B 7fb8946b55a73a582e4bf7fc15ca129bbd8c766e665dab15671466fac62bb19481fdda5476263d6689e36a63f6fb2c095c10e2ce7cb8f8cf33b38f691d2f86aa SHA512 7b0fa6da3b7ecfe5d6731e64a7803e3dde38e843c269e7bd0d9d92dbbba2823bd17689bceec3e2ee6cf8f7884a5e1e11e1699e98808a32fef2167221bdc7b8a2
-DIST vala-0.45.3.tar.xz 3356112 BLAKE2B 4632b476ea20d5a486e3094efec2a8bfc5b8f0edb25e600f14e5aa0ffbc1030e6966d54888b41f2af0083ebaeb0fbebd011e26da2153641e707d0b20d0e82fb7 SHA512 ba9eeacf45b2d1f8a87b0097e7b4ba15af7d35c9340957432b2b6acf3d8ede942ad6ee5820e64d9b3ac740653111b920c81f003647b61c569d43489894ddf4b1
+DIST vala-0.44.7.tar.xz 3355928 BLAKE2B 172e9fee6edec63324b9babc125d2bdb53c2025b2cb86339b54a4c8017ccdf78a848076fdd6a8f5200c15c48864542d711896160f78790d36a29d30980177d34 SHA512 5a645e1b1929644ec6b53d06895afcf62d41d6fd63f82c3be3aa4e28847173071621ec857cb973df38d36e60eb960954c2fb48fb4189e1afcbb25a2376ff0d77
+DIST vala-0.45.90.tar.xz 3357976 BLAKE2B 8c7beb7f2e0fc88b2d789334d0986a6822448148fda2666bc34ff2d3a928e0256895025a88a86c5ca35a9969536157eb27226523c1bda0355bbd436e3c82337b SHA512 3d8ca535f30ba73c2433f377f029b3f7edb92f4a5a71a54ddd95936314f881d5d0b6e31a8fc8747197ab458b3bd84b3e1f1b7a7a73d6bf99edb544e6b2b5339b
 EBUILD vala-common-0.40.14.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
 EBUILD vala-common-0.42.7.ebuild 2518 BLAKE2B 79889f31651bf8044e066f1275ca2c7b931a10f7a1dbe9985d945ad5141b388b13bb9e27dd2bcc508ab83f63ba63efca7d529ed1eb505c1397a4e00465b58a54 SHA512 0c264a16df1c0bfead6d1edd4967ba7d0ffeff3f4f506b6bc210b0d2db807d8986c286560baa83335412388a00fdb7841718c3e9cadb42e51427e1dcfc9940d4
-EBUILD vala-common-0.44.6.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
-EBUILD vala-common-0.45.3.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
+EBUILD vala-common-0.44.7.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
+EBUILD vala-common-0.45.90.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.44.6.ebuild b/dev-libs/vala-common/vala-common-0.44.7.ebuild
index 5d6856bd6561..5d6856bd6561 100644
--- a/dev-libs/vala-common/vala-common-0.44.6.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.7.ebuild
diff --git a/dev-libs/vala-common/vala-common-0.45.3.ebuild b/dev-libs/vala-common/vala-common-0.45.90.ebuild
index 5d6856bd6561..5d6856bd6561 100644
--- a/dev-libs/vala-common/vala-common-0.45.3.ebuild
+++ b/dev-libs/vala-common/vala-common-0.45.90.ebuild
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 8a7d1aae5491..e874ee0ebc58 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-protocols-1.17.tar.xz 107680 BLAKE2B cde978ceeaa9d71ac76cd007c511011fed6a110e772a6a9e880a5fd07a0318239a11235aac25b855d0f7ed5ae9980dd2103886092e85a92ed606c8a2f53de726 SHA512 5f3aacbba58717092036659d9b665dc10ff05ee51df61b1de38b22f0417285a74fd8a6d15ca049ad60d204f28203aa13d773c52140c7c02db2c498a6964c2643
+DIST wayland-protocols-1.18.tar.xz 108344 BLAKE2B 7e770bafa364ff96441354246801d1c6cbe561eefe864673610dc2d47e3aa5ac7cd22a2fc2925aa1060a261ed6df8b6b5ef81c33adbeb374170821feeecd651f SHA512 166be44f370a99281da442e7e2c2fc2f3169b61eeaa69263611b4e33847e93d1071f3cc89537597e1252d48d03993ce39c7d65f43b66a23c9b1551f47959e483
 EBUILD wayland-protocols-1.17.ebuild 871 BLAKE2B 5545ecff86f62dad1e8fe4f3f823ac4137904b1a79e39dea836d3424bc68344065e3be4d1021a90f58f7814abfceb0f2a8e7a1b18076d3af653c8e1eb6990d10 SHA512 dc7a9bfb0e4f181a1951c1f43a04b7794e3cdd437b219bcfe4c5e7c64a253ef72271e9f46ed51e4f0d95d10cae60b2ba107bafeeda38b4b8919cf9ff599f063b
-EBUILD wayland-protocols-9999.ebuild 882 BLAKE2B fb9318354b7cebad42f935ebf85d5c09827c612e7cc9bebc85dd6ca4c2e2f3b2cf489825b7a001f0e9f03072ab022942a1d06a2ca8f4c0cdd57b14aee4a73192 SHA512 0bb80c936c9aa9cc77bc8dc91c982a91d385b7c923607729924d10aed1a17a6a3321b4ba1f2e4d961ba0422525bd9a63b6b9dc9bbdd25cf0ee407c16ebc2dc83
+EBUILD wayland-protocols-1.18.ebuild 801 BLAKE2B 47c2feac8595a08e0cb05efc517caec202f5181cc62c3271c691ea8b018e9e62a109b5fbe34e4c3c880821f3322de41a715cdc347c5edc912f1b364b4c868da9 SHA512 4a9f7fa800c47e7db184d2b9fad45704ac8c522fcc7b409a0679d0f470680e4ebb5d175db889bc3cc1579588c966fb9c9b73dcdc33bc4f83bff586c82d1fd684
+EBUILD wayland-protocols-9999.ebuild 801 BLAKE2B 47c2feac8595a08e0cb05efc517caec202f5181cc62c3271c691ea8b018e9e62a109b5fbe34e4c3c880821f3322de41a715cdc347c5edc912f1b364b4c868da9 SHA512 4a9f7fa800c47e7db184d2b9fad45704ac8c522fcc7b409a0679d0f470680e4ebb5d175db889bc3cc1579588c966fb9c9b73dcdc33bc4f83bff586c82d1fd684
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild
new file mode 100644
index 000000000000..837f825ff1b8
--- /dev/null
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.18.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wayland protocol files"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_test() {
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	default
+}
diff --git a/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild b/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
index 0b33125e7a05..837f825ff1b8 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
@@ -1,21 +1,15 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-	EXPERIMENTAL="true"
-
-	inherit git-r3 autotools
-else
-	inherit autotools
-fi
+EAPI=7
 
 DESCRIPTION="Wayland protocol files"
 HOMEPAGE="https://wayland.freedesktop.org/"
 
-if [[ $PV != 9999* ]]; then
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
+	inherit git-r3 autotools
+else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
@@ -24,9 +18,9 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-libs/wayland"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 7d84e42abe0f..63fc47bc34c8 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,7 +1,9 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
 DIST weston-6.0.1.tar.xz 1522600 BLAKE2B 58318cc70bc935886141107d2be9cda8113b50723bb0893f9ada9e2469461a8ce84acd2796b052b6974439ce4ebae329b183761dcacae7137e0a64ac61cebe47 SHA512 3da04ff9b884480ce0824950347185e55584e3938021fe62014423d3d51577eafdda8de650a5de6eb37a842130c9cb14c7a952a560f6be93ff973164363af3d9
+DIST weston-6.0.93.tar.bz2 1180746 BLAKE2B 47768ad3b2901ead6fe167cf4453c99537c7795568966893f39356f614b85a813daab4b3a8d33fe4752063dbb45b5777cdd7efee784f9fbec40bda70a9cbb9c4 SHA512 3fb6d06c8fc5d8e5d3f6306f278a1227230f9ba47120475278b8cfbeee6da168834ce2c7ab25f52b382b315febf424f355cf92315c6aafbf7626522b4df4de19
 EBUILD weston-3.0.0.ebuild 3498 BLAKE2B 066de40c7595bd86c63143e8dcc1b56991b09b23755530247f38ac2a35ceb94f16329e46ded39f0e9d4135fac47e9127477afc124c119f48d220c09022ac0bb8 SHA512 e3ef428c5f03621f8860463c69d7a124e7f16f6e92523d9e309dcb623b75f9c41c73268a54579e1c3849e1100aad534f289fd0e3465dfcd9d02b846695ac5237
 EBUILD weston-6.0.1.ebuild 3561 BLAKE2B 30743028f046b73951f12a86e6ed851664dc03568ce96c7646f286055c4b133b7ea55db5e8d1c9f9aac246a64844c52a76ffd12804d16ccddcbd663bf61ca6fc SHA512 39ee9294db7dac2426c44198ec0082bb82b4ea43c207ca3b15f5564724d929be0094558b0e11f6ad2526429a41cb5da94417aa693dacf3c156a522cee0f2c782
-EBUILD weston-9999.ebuild 3561 BLAKE2B 30743028f046b73951f12a86e6ed851664dc03568ce96c7646f286055c4b133b7ea55db5e8d1c9f9aac246a64844c52a76ffd12804d16ccddcbd663bf61ca6fc SHA512 39ee9294db7dac2426c44198ec0082bb82b4ea43c207ca3b15f5564724d929be0094558b0e11f6ad2526429a41cb5da94417aa693dacf3c156a522cee0f2c782
-MISC metadata.xml 1476 BLAKE2B cc010d7358f64a0fc6eb9b886410a84fb80cf7c097231032e10efce10d827a74e238547b78325aa3b0c9a580a8d6dfcdbbe5f857c3e78939e20d5d14933250ee SHA512 1c89115a2e7e3f612159e642a898c2351718aeb90cd446f6f619c4002d5231c76b9f288a20f393110ddca4ce57b45c70e40a49646dab47111b1d45fdf2e8810e
+EBUILD weston-6.0.93.ebuild 3676 BLAKE2B adafcb4c1be9ef5d782eb3cef0b0b8331242a9e91b25fdf0cdb0d8d3bf3a47a65d82115ace9fe6bdff24cdebc7fc21c8dafa3c749a87d21c9b59175650c634f7 SHA512 71497b35b5aea4b89e48c7162a89e17953c6b42744d5b25ae6ded384d2a689dcc7b0935e2c29d35b821e3ce1c6094bc9b8fd57edae22ea5f507edaae6fb16b27
+EBUILD weston-9999.ebuild 3655 BLAKE2B b1c76f1d0a5405bef3483af7497cdf549266f9fc0897460f3ad080a083518d415680d69f6256989f8fbd8c24f1025b3587125cb7628821be76ced7069c876c3e SHA512 6b3d5190612b81140161b33d02e8757c39594b55b71f439da6926c54e1b9bb19497d35cfb20c1e0413988e1369114663b8cecb3ed3e422511ccc06da0945e916
+MISC metadata.xml 1506 BLAKE2B 7b66fcfbb46edb8480df35f1aabe87c167f02d3cbf505939523248dabadcaab41f395f6ed10eee33c08ee3fbbc2b49d391f61811a75699d4864d6f1eaea3e6fd SHA512 833531fb156a41c3d0996c50e9e72a920b315ad41b7f9a12b82a0f071b621ef9f0b73f8fe2cd63bbce7c1d63d54f41180a3496e3479ef5d0dab725a8af3330dc
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index c98075bd2fed..c5e4b9c68897 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -6,7 +6,6 @@
 	<name>James Le Cuirot</name>
 </maintainer>
 <use>
-	<flag name="colord">Allow setting color managment</flag>
 	<flag name="desktop">Enable the desktop shell</flag>
 	<flag name="drm">Enable drm compositor support</flag>
 	<flag name="editor">Install wayland-editor example application</flag>
@@ -16,6 +15,7 @@
 	<flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag>
 	<flag name="ivi">Enable the IVI shell</flag>
 	<flag name="launch">Install weston-launch utility</flag>
+	<flag name="pipewire">Enable virtual remote output with Pipewire on DRM backend</flag>
 	<flag name="rdp">Enable Remote Desktop Protocol compositor support</flag>
 	<flag name="remoting">Enable plugin to stream output to remote hosts using <pkg>media-libs/gstreamer</pkg></flag>
 	<flag name="resize-optimization">Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
diff --git a/dev-libs/weston/weston-6.0.93.ebuild b/dev-libs/weston/weston-6.0.93.ebuild
new file mode 100644
index 000000000000..0f1fdb431f46
--- /dev/null
+++ b/dev-libs/weston/weston-6.0.93.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+	KEYWORDS=""
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pipewire rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
+
+REQUIRED_USE="
+	colord? ( lcms )
+	drm? ( gles2 )
+	pipewire? ( drm )
+	screen-sharing? ( rdp )
+	test? ( desktop headless xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm fbdev headless rdp wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-0.8.0
+	>=dev-libs/wayland-1.17.0
+	>=dev-libs/wayland-protocols-1.18
+	lcms? ( media-libs/lcms:2 )
+	media-libs/libpng:0=
+	webp? ( media-libs/libwebp:0= )
+	jpeg? ( virtual/jpeg:0= )
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.68
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	fbdev? (
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	colord? ( >=x11-misc/colord-0.1.27 )
+	drm? (
+		>=media-libs/mesa-17.1[gbm]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	gles2? (
+		media-libs/mesa[gles2,wayland]
+	)
+	pipewire? ( >=media-video/pipewire-0.2 )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? (
+		sys-auth/pambase[systemd]
+		>=sys-apps/dbus-1.6
+		>=sys-apps/systemd-209[pam]
+	)
+	launch? ( sys-auth/pambase )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xorg-server[wayland]
+		x11-libs/cairo[xcb]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		$(meson_use fbdev backend-fbdev)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use launch weston-launch)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use colord color-management-colord)
+		$(meson_use systemd launcher-logind)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		-Dsimple-dmabuf-drm=auto
+		$(meson_use examples demo-clients)
+		$(usex examples -Dsimple-clients=damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+
+	# devices test usually fails.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Fxv devices) || die
+}
+
+src_install() {
+	meson_src_install
+	if use launch && use suid; then
+		chmod u+s "${ED}"/usr/bin/weston-launch || die
+	fi
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index a223d8efcb1c..2eefef3e88ef 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -25,11 +25,12 @@ fi
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pipewire rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
 
 REQUIRED_USE="
 	colord? ( lcms )
 	drm? ( gles2 )
+	pipewire? ( drm )
 	screen-sharing? ( rdp )
 	test? ( desktop headless xwayland )
 	wayland-compositor? ( gles2 )
@@ -39,7 +40,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libinput-0.8.0
 	>=dev-libs/wayland-1.17.0
-	>=dev-libs/wayland-protocols-1.17
+	>=dev-libs/wayland-protocols-1.18
 	lcms? ( media-libs/lcms:2 )
 	media-libs/libpng:0=
 	webp? ( media-libs/libwebp:0= )
@@ -63,6 +64,7 @@ RDEPEND="
 	gles2? (
 		media-libs/mesa[gles2,wayland]
 	)
+	pipewire? ( >=media-video/pipewire-0.2 )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
 	remoting? (
 		media-libs/gstreamer:1.0
@@ -106,6 +108,7 @@ src_configure() {
 		$(meson_use xwayland)
 		$(meson_use systemd)
 		$(meson_use remoting)
+		$(meson_use pipewire)
 		$(meson_use desktop shell-desktop)
 		$(meson_use fullscreen shell-fullscreen)
 		$(meson_use ivi shell-ivi)
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 44394d984b05..5385cba54968 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -8,8 +8,8 @@ DIST xapian-core-1.4.8.tar.xz 2880432 BLAKE2B 8468a33614d8c7617755cfe4cc79e72ab4
 DIST xapian-core-1.4.9.tar.xz 2880024 BLAKE2B 25272128fbbd7cb23dab92c87be03fee8dae5b742f26a66b9c51c649a7826639e52124f5f0748d3c12cce81a7875ed217931ddbe2b04303a08709c4a773a617f SHA512 1af23815ff9358d6407723d1a7d3dc00df8f45f4808ccaa4c57f38197763fdc2d62cb7b080fab737408db42ced85707021eac881d80767248ea22aff8a2e4aa3
 EBUILD xapian-1.2.24.ebuild 1580 BLAKE2B 381e09ce792274d6142ee236e0f1422a7bcb4947cb9efffb3b2e65bb44f5f879d554f871551b02e5482549eebff8b094f242b0399482eed984db6d8aa6b87ed1 SHA512 b9db357b0eeb6d2bfedd9641df740aeba2d435d1618aa6f46dbb2801cf69136d308b5c0c5a41bcfcbdc10fdd09dafa15af1dfac4543ee22de19908b21bb24cb8
 EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B d1b5198ecb2c78befcf92017ffc74e2626a4575f0464ea22612543ea0fbdf2024aed6c24c4e741f9f97d9f70f1f4cc83607f1a1a549da056f77c4a271f86fa28 SHA512 abd485682ed6071849ce5b28e9235acf2bf7cb017cda6668ec1409581ca1e6dc528c516087d3ccc6b2757dd2cae700c474e6e65e9fc74e7fe40c634eb94abf81
-EBUILD xapian-1.4.10.ebuild 1944 BLAKE2B 91d5dd19c21679b7b68691f90981c330be0b81f65887c90b0e781ee3943622067a91e850910256378bc47b832589be92115163f65d6ae64f5428a024b9c7d1da SHA512 47329f8de89aa602baeae23980ed3d3d7a23532c1102d5fc25b43e38ebe2f5029ad775adffc99759ceffb403b112809bea2a76c0e16556179b704b62b404b43a
-EBUILD xapian-1.4.11.ebuild 1908 BLAKE2B 8026767dc9cf473f324008dbf7a1371dd3bac3d677c3c6a7e2d1521f8ac9e377994c17d49a020d08abdea508530ebbe720e52be108051e73342b63cbffddb3c2 SHA512 235ecc1ec2b8bbfb9f8f874ffed791dd43edd921aa1cbe2ec206c06a1f0fabef114b4b4528cf14e28383c095afcf96ce4ae19711bba6c03b219d48834a31b000
+EBUILD xapian-1.4.10.ebuild 1944 BLAKE2B 796deca4b4bbb01743dc5327fe45b1371a96cbeadf4be2acde95782c576f77587e71339f2d3045e6170bde4f9cd47878a0574ab436a31188e96deaa8e547a51e SHA512 73e54166ded4dd3fafdf78fb7ba6a879539fbbf6a287232c3b18a5c7b49f792d4c607232623f6581a51de5a7b8f39e9fa3fae7af326ed580f26a2019aaa4d53d
+EBUILD xapian-1.4.11.ebuild 1908 BLAKE2B f50d8b8086109ccfc7f108623d024076cf4e8592023bd6d554f55a013be04075eb64de42e85ed18681c2600a7c112e1874ee2dd3b6cc0ea2640c34116ff02a06 SHA512 e09b9b3760512916c32b20466a680d340e7909bfe075b1364ba17e3c9efe0b28a235b3897f18787dd46f12024539964a9e479d85ddba688e192dabcb7a3e0aba
 EBUILD xapian-1.4.5.ebuild 1936 BLAKE2B 76f950ad9162610700da01eff6d6f33ab694d1e09b55b08592912323d70f67d09cdec09bd4f1c8316761c4b31c40e978eef683222cfbea90cb21b41cb9444f8e SHA512 6add7e80ac66f69ebbffd464d782ceefe23919faec529dc33fe53fbdc3b9cd17bfaa5be8b8580f2046601654fdd17e611d4395e262ef4a4cfe97aab85dc5844c
 EBUILD xapian-1.4.7.ebuild 1937 BLAKE2B 64996a418dcf2969c826deadfdf8b62474189cf1c32c9c017c1baa1d2ba2b18fdbe0175ff4f7d92347a21e78d4557dec0ac28abb50f7e432486aa52ff9373f22 SHA512 df6f4147fda42057fa70e9d144055cc143472657e5f5767bb2a27aacd95f09cec3e321c75501fe0cbea568141e7222d58990f85ac11141995045cc64aa065a11
 EBUILD xapian-1.4.8.ebuild 1944 BLAKE2B 6cc1549770b5283f153665c3b015264cd5ca3f6a173f3bddc509c09f14735293fa39ad4da9e761e92708cfd54c5dbadb3b056f4327d646b15af074e3757e50af SHA512 d33a78e9db80b47f09c372ed1141db6cda833d333d978af14abcd0026918217e8b7deccf42e286322a25aae04c5427e33595b93f38ae6e2787f09b8bc62a923e
diff --git a/dev-libs/xapian/xapian-1.4.10.ebuild b/dev-libs/xapian/xapian-1.4.10.ebuild
index 0c23be4d11e9..0e1129a1b5bb 100644
--- a/dev-libs/xapian/xapian-1.4.10.ebuild
+++ b/dev-libs/xapian/xapian-1.4.10.ebuild
@@ -58,21 +58,23 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/xapian/registry.h
 )
 
+multilib_src_test() {
+	emake check VALGRIND=
+}
+
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 }
 
 multilib_src_install_all() {
 	# bug #573466
-	ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
+	dosym xapian-config /usr/bin/xapian-config-1.3
 
-	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
+	if use doc; then
+		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
+	fi
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
 
 	find "${D}" -name "*.la" -type f -delete || die
 }
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
diff --git a/dev-libs/xapian/xapian-1.4.11.ebuild b/dev-libs/xapian/xapian-1.4.11.ebuild
index f5aa42950fd2..917f435049f5 100644
--- a/dev-libs/xapian/xapian-1.4.11.ebuild
+++ b/dev-libs/xapian/xapian-1.4.11.ebuild
@@ -56,21 +56,23 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/xapian/registry.h
 )
 
+multilib_src_test() {
+	emake check VALGRIND=
+}
+
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 }
 
 multilib_src_install_all() {
 	# bug #573466
-	ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
+	dosym xapian-config /usr/bin/xapian-config-1.3
 
-	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
+	if use doc; then
+		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
+	fi
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
 
 	find "${D}" -name "*.la" -type f -delete || die
 }
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index ee51c85bb47c..e3936debb372 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,5 +1,7 @@
 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
 DIST xxhash-0.7.0.tar.gz 52372 BLAKE2B e59a80ab3970f4830d0de17d3c91de1049fd671dba777d143fae2cf372970c717b6b586bfaca13c49c7dd2f57257d41ebad500632f25bc47125570ed715a47fa SHA512 2d7a06a5cabc945ac841df4451a744f0a666e4afcce77f5eea70bd68547ac46ebf776dd0e3645ef0204c7ff1dea3f5ff8228a8d9894dae0077f865ffdc123c66
+DIST xxhash-0.7.1.tar.gz 76328 BLAKE2B 8ef64a1a44763417441dbec396d54b5d57ee225058f6c1bfb6baa8983bae49d84ab55a59743f7edf8580be52acc1bfb622c590f43450891af4d17cbd2ac48972 SHA512 03aa89c35fffafa8fc81b249ff4fa0dd3f7985466106815a9f36b00314ce82e3e2586e7abec5b56dd94d9b785768ac9562b03973817390b716cad8cd53e9ebc1
 EBUILD xxhash-0.6.5.ebuild 866 BLAKE2B e74ebb6ca149fbb5a21d27be21919a11716ba1da1552d8524c6e3d09601edb4876cdb27a7ed5726f903c309124dfb0ca8a39c883046a5bef9d6cb6916edab65e SHA512 fef64fa69b75cc2e5e599edc5bccf37d38e111912271e0e84d41bd8a537ab72a43d86f6dfa511e10e9259b031388794d9750ff6110a11654932e25a1a3ae7306
 EBUILD xxhash-0.7.0.ebuild 869 BLAKE2B 52bbe35fc037a735519a6a88477d58337bb66c5283f709ed8ddcf3872c4a482f57bde8aa0f28a2f9897c31ba47a272cb7d0b132ce18371ec32add75db0307c2a SHA512 d7b96bcb2eff8d499068daf01dd320ac106317265b706d29d3a4bd086a1386d862c5f2d7e80ee6350938b91ae5d3673aeafc188f69dc45fbff5b4356241ec3ea
+EBUILD xxhash-0.7.1.ebuild 922 BLAKE2B 36544ef79746feb6580f458cfcb90bb6c84f17199a9b9d9c3af8a5446e241eb67f54af686bac8f64727913174995ccb8db61b830b52231d8044f0c87be26ef93 SHA512 1c93853714b91db9a7d385035a2e296679a6d5ca64dfeb4de85b0e676b0b376e9295b248068a3a7901d107f3397e20d431e852430b17cec36b0210507925179c
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.7.1.ebuild b/dev-libs/xxhash/xxhash-0.7.1.ebuild
new file mode 100644
index 000000000000..9f2255c1241b
--- /dev/null
+++ b/dev-libs/xxhash/xxhash-0.7.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Extremely fast non-cryptographic hash algorithm"
+HOMEPAGE="http://www.xxhash.com"
+SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-2+"
+# https://abi-laboratory.pro/tracker/timeline/xxhash
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-macos"
+IUSE="static-libs"
+
+S="${WORKDIR}/xxHash-${PV}"
+
+src_compile() {
+	PREFIX="${EPREFIX}/usr" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	PREFIX="${EPREFIX}/usr" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+	MANDIR="${EPREFIX}/usr/share/man/man1" \
+	emake DESTDIR="${D}" install
+
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/libxxhash.a || die
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
commit	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree	326613a08f25851c388715e205576a2e7d25dc4f /dev-libs
parent	b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)