gentoo resync : 10.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-10 17:26:49 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-10 17:26:49 +0100
commit: 6957f5c65b02bba533954eabc0b62f5de36be206 (patch)
tree: 21d8ab8f61dffd9cccc82d0badb68982516a6855 /dev-libs
parent: e91a1aaa5ec8fab37f0fd082ac6024d41c6651e2 (diff)
54 files changed, 248 insertions, 639 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 144beb57bc4b..37abb90b7fd4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index d998705a9779..8cef94dda62f 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,10 +1,7 @@
 AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432ee7af503dd2fc8a59185c5406b659629ee5a0c4f73c2c090dfccf64757baea196fcca4f60379a2b2f04baf81ee6 SHA512 bccb615e832ef31381afd0996a06cfb4c37f29bd8d7691435d592f2ec88f525f3e9e19adf84c78ebd6f24f60e407e29ef99bdff11103ef1344250fe5251fca0a
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
-AUX botan-2.3.0-build.patch 1433 BLAKE2B 125c79ede4b803ff444f3e5f3b381e75140174b21aa694b4746c548b787ca4f83fd12e4fc5307bb700e48aa82d6b9ca2e7d17b9082b3f85f60a14b8c26d7fdc3 SHA512 b62758505ec7f6b8cd62a6891c3c721fc5499e529c44f55600f1bb7572d58d2f1707b3d88bde4c8b6eb715b80fb60fdd09ae233c6586df3aeb2146934cfa07a2
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
-DIST Botan-2.3.0.tgz 5947072 BLAKE2B b8eaf4228c01200f839031b423901f93c1b6863d10424ad52afeac85131e95bc1bad024478c8e4c8e4c12210e85aa62d30fb83b3ece8facdb57763f95c45687c SHA512 a8575bdb2eaa01fb45d8565bea0b54ddf47a21d2fb761fc0a286373b09d51e5a00e84d5cefc51040c5720db66f5625c6bc73ab09cffa9cd42472545610f9892a
 DIST Botan-2.5.0.tgz 6596225 BLAKE2B ffb5647e5734a8bef14b6c52ad12a211844e9c73f843427cb2972813523091cef99a21cea3d6a8bf69367f0d937ea0a422d2ed8aaf839ee1c7a2d95a1bd702a8 SHA512 51d91bcf6ba41247fbb649697e33e3a0c8ba9f35ba7865be9120c0f0efb7fa8c51fb3d922f0d5576ae1ef637188821ff4352ed45de52e0798910ee354787cdda
 EBUILD botan-1.10.17.ebuild 4215 BLAKE2B c65f9f66f62f1eab3f0ce2d07c40cae16d5d521c9b42c659ba53e8a818a352f1f63c646af695c9e488e6356936e51d87f453c98fe25163136b82787417d9f588 SHA512 b17de38168bcc6fe153b267d6c5a62e54ae90cac3b58ee15876adc903bbf66575f908a5987b5d9b8fc168b6283b458dd5b0eb431ae744f8bca48c41bde980bf8
-EBUILD botan-2.3.0.ebuild 2783 BLAKE2B c65f5c4b2c84305bb10bf38439e34b25545d6ff7c06be17fcf276c87b4513b353d713075de183c92c701f9b161c949be081e5b874ac31b9b87917b04050d1092 SHA512 49471ee62fdc03e9a058ba90b7e2260b8bee4cad677d804a35ccf4e22d2179220497e0cc47733d80974f7af686ae10a68164babc27586e0ebd155d7b32526a45
 EBUILD botan-2.5.0.ebuild 2296 BLAKE2B 62f67b544ba3e7640f3965c6f3e0eac2303933616581c5ac4ab8d14f417daf6164ceffe2a1614d80e99ca03c0f627b9090c7e0ec41973df4e3238056474a23e8 SHA512 52bcb8843557422b7e8307505a6bf3a44fde75b046966c7307b3f49a3740dc44804a98d2cdb2b158c435e1be024b15bdfb3d03501a240f401756ba913c0c9420
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.3.0.ebuild b/dev-libs/botan/botan-2.3.0.ebuild
deleted file mode 100644
index d715da51c97e..000000000000
--- a/dev-libs/botan/botan-2.3.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit multilib python-r1 toolchain-funcs
-
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
-
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos"
-SLOT="2/3" # soname version
-LICENSE="BSD"
-IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( boost ) boost? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
-	zlib? ( >=sys-libs/zlib-1.2.3 )
-	boost? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python?,${PYTHON_USEDEP}] )
-	lzma? ( app-arch/xz-utils )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	dev-lang/python:*
-	doc? ( dev-python/sphinx )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-src_prepare() {
-	default
-	use doc || sed \
-		-e "/^install:/s/ docs//" \
-		-i src/build-data/makefile/gmake.in
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local disable_modules=( proc_walk unix_procs )
-	use boost || disable_modules+=( "boost" )
-	use bindist && disable_modules+=( "ecdsa" )
-	use python || disable_modules+=( "ffi" )
-	elog "Disabling modules: ${disable_modules[@]}"
-
-	# Enable v9 instructions for sparc64
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
-		CHOSTARCH="sparc32-v9"
-	else
-		CHOSTARCH="${CHOST%%-*}"
-	fi
-
-	local myos=
-	case ${CHOST} in
-		*-darwin*)   myos=darwin ;;
-		*)           myos=linux  ;;
-	esac
-
-	local pythonvers=()
-	if use python; then
-		append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-		python_foreach_impl append
-	fi
-
-	./configure.py \
-		--prefix="${EPREFIX}/usr" \
-		--libdir=$(get_libdir) \
-		--docdir=share/doc \
-		--cc=gcc \
-		--os=${myos} \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--without-doxygen \
-		$(use_with doc sphinx) \
-		$(use_with bzip2) \
-		$(use_with lzma) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		$(use_with boost) \
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
-		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
-		|| die "configure.py failed"
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX) -pthread" AR="$(tc-getAR) crs" CXXFLAGS="-std=c++11 -D_REENTRANT ${CXXFLAGS}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
-	fi
-
-	use python && python_foreach_impl python_optimize
-}
diff --git a/dev-libs/botan/files/botan-2.3.0-build.patch b/dev-libs/botan/files/botan-2.3.0-build.patch
deleted file mode 100644
index 06d44cd0c491..000000000000
--- a/dev-libs/botan/files/botan-2.3.0-build.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9e28eac720176ecb9b784510d352aa0ac38d0b56 Mon Sep 17 00:00:00 2001
-From: Jack Lloyd <jack@randombit.net>
-Date: Wed, 4 Oct 2017 13:59:21 -0400
-Subject: [PATCH] Add limits.h header for INT_MAX
-
-Gentoo bug https://bugs.gentoo.org/633468
----
- src/lib/prov/openssl/openssl_mode.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/prov/openssl/openssl_mode.cpp b/src/lib/prov/openssl/openssl_mode.cpp
-index 9580bc9c5..fabaccb18 100644
---- a/src/lib/prov/openssl/openssl_mode.cpp
-+++ b/src/lib/prov/openssl/openssl_mode.cpp
-@@ -10,6 +10,7 @@
- #include <botan/internal/rounding.h>
- #include <botan/internal/openssl.h>
- #include <openssl/evp.h>
-+#include <limits.h>
- 
- namespace Botan {
- 
-From 8526077c273c752661786e0ef5d9f7b945c83931 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 13 Oct 2017 19:34:25 +0300
-Subject: [PATCH] Add limits.h header for INT_MAX
-
-Gentoo-Bug: https://bugs.gentoo.org/633468
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/lib/prov/openssl/openssl_rsa.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/prov/openssl/openssl_rsa.cpp b/src/lib/prov/openssl/openssl_rsa.cpp
-index fae869b..ab5ac64 100644
---- a/src/lib/prov/openssl/openssl_rsa.cpp
-+++ b/src/lib/prov/openssl/openssl_rsa.cpp
-@@ -22,6 +22,7 @@
- #include <openssl/x509.h>
- #include <openssl/err.h>
- #include <openssl/rand.h>
-+#include <limits.h>
- 
- namespace Botan {
- 
--- 
-2.13.6
-
diff --git a/dev-libs/http-fetcher/Manifest b/dev-libs/http-fetcher/Manifest
index 1b264d3eede8..d2ec5ee0015f 100644
--- a/dev-libs/http-fetcher/Manifest
+++ b/dev-libs/http-fetcher/Manifest
@@ -1,4 +1,4 @@
 DIST http_fetcher-1.1.0.tar.gz 382470 BLAKE2B 6d2c7139d3e9435ff993fd5cd097c1b85b8900e048e6f93fc5e4f61f44f1eb47e0b9cd04c90985c15391ce862356a47acb56bfd8ff16050ca562095c80cb3f12 SHA512 136eceabc317bc4bf9956272ebbdae735ff589012ed0b17210fdb70051389bb7b3c1b43cdfc322a340e5538e9fd60b7b5216d3d46c439ac9df6af29e621bb1fa
-EBUILD http-fetcher-1.1.0-r1.ebuild 642 BLAKE2B d0578513f3916e29d481152f0e3457392f3fc961299a26cba15811f16960db7ae325e34ea4b939599c82e8d2581aa2ffa13ededc18f098ea403ab98930b57f11 SHA512 6aa9890ad269f9a9cfb30042735eb36e2e55fae1abe4d101ae829196ae42652c9f9ba5770f3db0d6761aefb8b253a076668ef24b69577c753fc3ef264ae53b02
+EBUILD http-fetcher-1.1.0-r1.ebuild 641 BLAKE2B c1770b76dcf99b6d2f813b1854425d8a0c2d71302613bbd0a2c7eea3de261c35007b6bc0f5c00386bf919134932101c8364f167c9bbc8a559f3fb5ba793e8bbd SHA512 49ad7aae51dfc900719369015bb4b6dc7cc572fc6ed0572e16d8e36f0d895324eb36da0c3e125369dece48c21b81bcd66e44e5280c7c04bba6988a6d6af32074
 EBUILD http-fetcher-1.1.0.ebuild 772 BLAKE2B 03a7679f460549f6cfb140eae2f09995bbb639efdf6f287f10166ce372fcd762549fcb63b09b6197c1312878387ebd8cbfe5c6536e4d65301092629a3440281e SHA512 8c0649790c8b0e67cb6148afe37a37d936de675e6d3df4bb2de5b7c04a8351855bbc7760d80a3721a7e526b3ccdba0902fe0b56cedd8cf93920434906d772f8c
 MISC metadata.xml 333 BLAKE2B af3916f84f1e47250b8a4abac78cd72b5b9deb2212a94de92030c1d5b6f754501e35e267112a51c907d3b97c4484fd5b1a952610dda668aa39ad84be042b99d0 SHA512 0be8b9414e23971abba7606c7332511588a0abadd68cf6f7026bd4a5b729e7bc9c7123af103c3dffa0c6cb04517a5302cbb015c4b6f20916eec87808bb8145f8
diff --git a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
index b55698fa999d..f8cfc2839049 100644
--- a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
+++ b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ppc ~x86"
 IUSE="debug"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index bdd6cb1e7563..f6c692d16a89 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1,25 +1,15 @@
-AUX jemalloc-2.2.1-no-pprof.patch 702 BLAKE2B 4064122a60c994866c1e29226a301a08d0f844b8121d99e3f3f505fcd56314841ac348e4ee68ac626499da625fc4974ad7b7f0bde250e6497ff2a2bf8d0b0d43 SHA512 bf06dc0f8a1f3106778425ba1ac817934a5473f77490e33dad5a2254ccb1de312f1712e1e71d1ddeeab0c2abc5bd99778c0b6b4f18656a9e32d67bee21476d89
-AUX jemalloc-2.2.5_fix_html_install.patch 235 BLAKE2B 29ebf899d27579f82c43f3ec4ad998281ede4b6a712939189d1700add7546c35aea44404ff1848579074d61b2d0f3ed93f6f4077db5e9eb444cbf7bb6660a158 SHA512 007b42157afa6727465a939de6da5e579f91196d1491f77eceaebe8c5fd674c08f3b51a05ab7935f8bcf641f2e11a0764ccd9654de926bdde6bc854bd86f9e5c
-AUX jemalloc-3.0.0-no-pprof.patch 823 BLAKE2B 7f0ba9d813ccb5bc231784dfff3881f54878519085eaf9a09b69076dc94fcc67c63ec9ee0ef3bf0dbe82b1eb04ca7388c0ee151a75199daf01b1836e82a8d14d SHA512 c9d9b9d527ae8b25ec39bb5a562c8b94979d1fd7401dc6ada2c2daf552289b1914573cc7ea709644b8e01717bec3a0d071b4356c566947367c516ed92bf1a4f8
-AUX jemalloc-3.0.0-strip-optimization.patch 864 BLAKE2B 705aa128a668cf250db103d6769a392435128da91aae5250e519fe4cc64b949faf2d294c907a882edac2c9587f02ac32b934cbbc8b15caf4939e40c35dcf1527 SHA512 d4a1feda1fdceca0a0b58b1719e36286730f35269ee188549055ec435ceabd52ad06c6096542ac9fc3ff38b91db113f1abf89c881481f2131453cd28131ce301
-AUX jemalloc-3.0.0_fix_html_install.patch 333 BLAKE2B 15b719700fd1568274e4e4fc3baf8d3f52cb3854d354725af92f06a46e06b8fa3ba1d30cece26e2223e2e412247434e8cb60da1172d0cf3936f7dc97064e85a1 SHA512 21d7df34ab45796c22ce3a9164dbaec5a6fca407295211d0403f2d4a163fbdeb1452e385ae844fd4c1e25cb20e055e848bfa0d51dd96f1af966d9761185f946f
 AUX jemalloc-3.5.1-no-pprof.patch 822 BLAKE2B 3794e3a7ad8d351673fc90a3f085a202c4e9e4937ffe5cfb78980a0d11fdb9992f30cfd9fd0e350450fb3647369e54097569ed7e54e5f23f83ee332b9f45deb8 SHA512 1560154337302c7a56d79af21822d27b5d5bfd64afa4af3753306ca0d0a307b5abb9b240be168c7591d858a9c4be15e8d6571fd52da2d6732c472755dffa545f
 AUX jemalloc-3.5.1-strip-optimization.patch 886 BLAKE2B 5311ae00c3ed4471d3022048ca0e82fb62b12345f602a6fce8b60ce0ba4e4291ca76df1a17c4fbed203d5209db9bd60a27a4cac9f92eaab49297c1045c344de6 SHA512 5835c534ccb04b47216d3678b08d663a09a93e60fb651e9c0b489fb747ca5f32060c89da3dc0f44b45964ffbffbd8da32b75a842198c180a79179266565b204a
 AUX jemalloc-3.5.1_fix_html_install.patch 356 BLAKE2B 8b8926248930acbeb5bf9cf4bc51b2ba30fbe7148670601c8870b504b007f7b008f811f5d9aa142c82aeb1928941456f41cf7b601be54bb6ab6c10e5868d5e08 SHA512 d5ad9e7c9b93f2b0311a43bdd963cea6f32f2e5a53a916ce52b89918d3d76e0306158239cf2a7b508f102607fa550374a9ec8463f2b3a064015cf7bb2ce852cd
 AUX jemalloc-4.5.0-fix_html_install.patch 581 BLAKE2B 97ced7415f9d7dc9d29252ef73888e1e9685d4cfe82e08b35e3b01f1d50aefdabd463c362bc14ca29097c5ff3b24ae53f3f225305b7c5a8770562e03c92c950a SHA512 ce210e9c9394a9ba5a16b5524322f1e477a140e55c076543a1f4dcfb1c8491f7839cb49fba433088773b24d2656b821c3072e729c0c7e41cb90dc131ad6828ff
 AUX jemalloc-4.5.0-strip-optimization.patch 880 BLAKE2B 251919ff0ceedb815963e8dc151b0a9da684c22d6b053e40be36e31ace751c9fb3718c02759532ef4aea7710eaa9631d94780f3e85d6c7dcb1084e0353ae0e09 SHA512 6c6dd0a99fe58ad0f6cb6306e14e2724dcd39d372e91c01540aebb31e8228b33d17ba0819e6a5c9cb7a3009eedb8f3a58319f0cde322cdf31c2c1cb47f98ff41
 AUX jemalloc-5.0.1-strip-optimization.patch 685 BLAKE2B f67c89bb123861cfe3c5b4616d78478693e083476f9e83648d976e613743e6367c9bce9f0b86a1e2fe514d3a3689a596ef94e4a53e26edfa95bdf0336ec0a9ef SHA512 dd4452feea0004b3f61d664a63da0751179a4be8095e76d94938034045114a68b32e0fe9872cb4810c2f3fc927963ef1b1886d210dc558b3c5a3f5eb9ef4240e
-AUX jemalloc-strip-optimization.patch 800 BLAKE2B d107eddae78352a7c1bec62e0ed6913fa26491229cdfe5bb7c3691d8c8c47334aca8721a6ec68fc06c3ee14b97f2d883be72924fc9155e0b94aa2f42688299ec SHA512 cff5130387c25bf1e047103eb6c371d96105acd962c62c58bb6bc72f1bfec071f05b7f2cf54170264f38ce7102004e97bc705a6b08f5f398bbc461b17e61e3c9
-DIST jemalloc-2.2.5.tar.bz2 224118 BLAKE2B 97b178b7bf5142d2c0123c238e44df77fd4655071b695a2ce6a6470dd13ac714eac58df5350c33247b48cde21549cb7d9706de1bc64ad79eae00e89561157641 SHA512 56a29dc7dca66c41d2934731c4bc756de5b58bf707dc2ebcf8515be400ce25e372af6526035117cad5b1964b9ba040ab7178f4c28c1649e86dcb53c3ec884a9d
-DIST jemalloc-3.3.1.tar.bz2 252997 BLAKE2B a1069b2c19d7f29752a5882df1b4319f08f24b49664f35848bd0b1d79901614d030a045565a39d39ce0889c2c5d6b233ad87f4cac9682dbc4370c96da521c7b3 SHA512 32814e8678af4954e26c0c0a0e5d06aba8f3844205fe212c5e41929dfab6a94ff11127a9238b5c18d72749827c467ecb874b8f3a9bc161cf1afdf4ea84c58690
 DIST jemalloc-3.6.0.tar.bz2 338964 BLAKE2B a5edacc85c5bebf3b373e7fc8bafd9449273ff58c2e44e94eb9900f54b11f2d8b837a3a8ee76cce46777ccc40dea23905b7ff81eef5af39ea1d3f98017b27111 SHA512 ebe7c64558a87a735b5906d5cb7527c241664eeae7328538675a12eabe7a1004be0f8766a3bd2a78e61334b196ca7ffc0ee8b8ff59167922a35f126cd1e76e43
 DIST jemalloc-4.4.0.tar.bz2 440144 BLAKE2B 6acb91c5be6c5b17c209341dd08e6973e3ad5ecdfe7ebe5d8c78181cddca1fccba3c11628e736d66acd7698f7813f38077033d39093bf2e4bd704c8b4de60e7b SHA512 2f88fb17ede3bf87e334e9c80949870e0dd85b5adcdd89a1750ccf6df5240f35293159ac0a360d3a29cf0b1d17edf86dcc7997c6bf3190ae7da7442d3a3cc14e
 DIST jemalloc-4.5.0.tar.bz2 449992 BLAKE2B 6141c71f7f5f9cee91a59eeed9c69b0a69b3cc39666aa608445073c11ee3ca9b4777a851c5cb5adac80d42bfbf10a6726e5dc1340ffe85ea1ee884d87c7865da SHA512 76953363fe1007952232220afa1a91da4c1c33c02369b5ad239d8dd1d0792141197c15e8489a8f4cd301b08494e65cadd8ecd34d025cb0285700dd78d7248821
 DIST jemalloc-5.0.1.tar.bz2 499300 BLAKE2B 551933fcd93315968cbf89bfadc40313717ff216141af8a131f2333d10090438ddf36fbfdc0ee831cbec6f930ae15aa9cfaafae72ed4f38dd97b00712ca918e8 SHA512 8cb5957a5724eb2bbad120cf0028ea8b2b14b4a416c1751b7c967351a7fd51135058ea0d3c4dc1d127c86f3aa7e9fd5ef101857110aabfdb7789427791c432c3
-EBUILD jemalloc-2.2.5-r1.ebuild 908 BLAKE2B 4a61107376367d2d8174b3c8cfd4daa10fd6c129b15b057feb7698615c28c20dcf2ef782f86503ed7e35d39aacee36e36a65284c5b417b97a230e1869273b37b SHA512 7d046cb6f169e188cbe432aede49f2b9c8973cfc13aa9d159debabb3cdddfbef8f98f91ba5fa649350639b86f737aaf0d4da0415e96a0c09dd3012e08e488a4a
-EBUILD jemalloc-3.3.1.ebuild 1049 BLAKE2B 212d3d82e378b88b2c65b7789a72b56871be595793333ad2b0bca8ed772f2d6fe379a0289101539014ff557239bd1c6676cae9bcf2ae6b186254646e522ed089 SHA512 a5a0bed33a86fe3783cdcadefe3cd0929bc1fbcffd24ef5ce5bd4cfc51b03d70f77c5161deabb80a36fef30c45c02d6683d49c266e354b9722d8919c6e3c275b
-EBUILD jemalloc-3.6.0.ebuild 1863 BLAKE2B 78225216889fba0c657d36d371ea1a9e0ba6e4471a00c85528a74a0e4131db29dd8ddaaaae6de742b32b2290d12c7f46e1a8cae3d7c47a13f8363863a7755590 SHA512 fde66a60ee8b6e0a860c024c4b3475267dd42be2102cacf68b04df6e736d2747ff163589bbd615f5c3f8e58add090b3b20c6c1d91bb174ad8ff6b792eee7dc1d
-EBUILD jemalloc-4.4.0.ebuild 1728 BLAKE2B aea84d47093a3cbc5d38de7ef10abef7054af2e2f43d0160f773f9e5cf01cda7f12879d7cb46c4dab6494187e45623c0fa9db6aee022b5aae06a2e070d4d0991 SHA512 f63bdca82f62dce58e17ada58816154cb7f0aa214b75b269eb082124de4e750d9721b2453da8e9cdadd8d7c3b75fdc6498538594f05b097c824288271317d988
-EBUILD jemalloc-4.5.0.ebuild 1764 BLAKE2B d1e09429445f465b28221ef4e5bf8944c616348ab824c505a28da54a67ad3e135ee2ba709d30d36d403f1469a12b9bef773ef8df96709c52f999912db27bb9f2 SHA512 665b73e2e6bdadba26f772a58bf68a89844fa8a5afb1ff932e08d23c5e27b22c54bd9b3824b5023db45bff6fe2ea8899c19c0ab655b8e8762feef448e6798f4e
-EBUILD jemalloc-5.0.1.ebuild 1892 BLAKE2B bd2474ddffb110f2d839dc9750e16d314e7b7993fd7084aef8c56d0cbb50a9abe648589dca79860d257aa195332efe448c890db34c7178afdc6e009068a53e00 SHA512 0ffff440dc2f084e7f1793d9296adda87333ff56e918adf13ad47c3af98060d2e58a6a43487b98ba643cf8245f396f447357d57f963117af0f98b6ad2c7315b8
+EBUILD jemalloc-3.6.0.ebuild 1907 BLAKE2B 798433f1866bc808756d99cc69e34081671ef537e1c428f6d03dbe9266bdebab79e7d5852ae5b73fa7b3127eb5805ff197a623aba5515f20376de7f19d2fd048 SHA512 f13a892b9457ab2e13e13654dda6ec372bc8e3d30e0c625a5f67546c56608beb1d16ba1a1d17c10ca8f4145e2536100406d2afb45767e87fe3a99b4c873506bd
+EBUILD jemalloc-4.4.0.ebuild 1751 BLAKE2B 1e0afa26a8a50d25d2d91dbbf859e654a9d7a8b9eab4e8d006b78dfa2252fd1f380d760b5a5967d23d5314e734effaf618e2aa069d512022894936a755bba1bf SHA512 a1e93f367829015b5a7c6348bcfcff18901a5149485c52bb6f70ab754a1052e1a1434271c9460b1dae10a586b56ba96fb7b704eeaafd61507bf586b9026f958d
+EBUILD jemalloc-4.5.0.ebuild 1787 BLAKE2B 3ed0be5248d1c608f75bb850709e30378928f4048c4cec707b3043462d1c3deb05f416d39500fba5abb9d6d47aceb315bc742bf0be47ed83ebeb81251fee2878 SHA512 053be5a448c79cf77dce59c968c096606aa5eb23f1badd391afb5376667947bab20af975a33bd8c3fccfde9b0dbba7901cd13015b69d38bef6931459ef6849e5
+EBUILD jemalloc-5.0.1.ebuild 1915 BLAKE2B 7ece59bb02fb7a809814e4925bdc3934660aeddd5ce9f28f51e545b79d0794e3861114cf48bfdf35f56a5e23453655cded7858a1f634f662b6a328273129b2db SHA512 fff3e8afea78b30f2ec4a4675c218779426d93c1437521c9532acf1f1cc3c417758a49765616a30d9b54c5dc8c51f7a8f66bb7fd5db4362c8a3c6bcfcf5496b5
 MISC metadata.xml 762 BLAKE2B db6f1712f7b716c824f199ec10e566fa543aa594a6bc75f60adca55e249163a96adbdff109a49327799bee090b3abadd9961c74878c0b0a9c54aa0cb4118f2a1 SHA512 4fdae623c6f76fad566807e7a48c3cf11b5818bf2f93e32f6c0a53558732642f0011dabb7bd4d7f637c8df141cccdb1075c48177a83caac78f9f375b3e57278a
diff --git a/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch b/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch
deleted file mode 100644
index e10aab4d4f38..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/Makefile.in	2011-04-11 10:42:32.084403330 -0500
-+++ b/Makefile.in	2011-04-11 10:43:23.490760665 -0500
-@@ -42,7 +42,6 @@
- endif
- 
- # Lists of files.
--BINS := @srcroot@bin/pprof
- CHDRS := @objroot@include/jemalloc/jemalloc@install_suffix@.h \
- 	@objroot@include/jemalloc/jemalloc_defs@install_suffix@.h
- CSRCS := @srcroot@src/jemalloc.c @srcroot@src/arena.c @srcroot@src/atomic.c \
-@@ -141,13 +140,6 @@
- 	$(CC) -o $@ $< -L@objroot@lib -ljemalloc@install_suffix@
- endif
- 
--install_bin:
--	install -d $(BINDIR)
--	@for b in $(BINS); do \
--	echo "install -m 755 $$b $(BINDIR)"; \
--	install -m 755 $$b $(BINDIR); \
--done
--
- install_include:
- 	install -d $(INCLUDEDIR)/jemalloc
- 	@for h in $(CHDRS); do \
diff --git a/dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch
deleted file mode 100644
index aff4add8b3fe..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -176,7 +176,7 @@
- 	install -m 644 $$d $(MANDIR)/man3; \
- done
- 
--install_doc: install_html install_man
-+install_doc: install_man
- 
- install: install_bin install_include install_lib install_doc
- 
-
diff --git a/dev-libs/jemalloc/files/jemalloc-3.0.0-no-pprof.patch b/dev-libs/jemalloc/files/jemalloc-3.0.0-no-pprof.patch
deleted file mode 100644
index c2fa815ec529..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-3.0.0-no-pprof.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6675b59..ce0782f 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -69,7 +69,6 @@ endif
- LIBJEMALLOC := $(LIBPREFIX)jemalloc$(install_suffix)
- 
- # Lists of files.
--BINS := $(srcroot)bin/pprof $(objroot)bin/jemalloc.sh
- CHDRS := $(objroot)include/jemalloc/jemalloc$(install_suffix).h \
- 	$(objroot)include/jemalloc/jemalloc_defs$(install_suffix).h
- CSRCS := $(srcroot)src/jemalloc.c $(srcroot)src/arena.c $(srcroot)src/atomic.c \
-@@ -196,13 +195,6 @@ build_lib_shared: $(DSOS)
- build_lib_static: $(STATIC_LIBS)
- build: build_lib_shared build_lib_static
- 
--install_bin:
--	install -d $(BINDIR)
--	@for b in $(BINS); do \
--	echo "install -m 755 $$b $(BINDIR)"; \
--	install -m 755 $$b $(BINDIR); \
--done
--
- install_include:
- 	install -d $(INCLUDEDIR)/jemalloc
- 	@for h in $(CHDRS); do \
-
diff --git a/dev-libs/jemalloc/files/jemalloc-3.0.0-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-3.0.0-strip-optimization.patch
deleted file mode 100644
index 98c09af6277f..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-3.0.0-strip-optimization.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a72019e..e366e1c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -556,23 +556,6 @@ if test "x$enable_debug" = "x1" ; then
- fi
- AC_SUBST([enable_debug])
- 
--dnl Only optimize if not debugging.
--if test "x$enable_debug" = "x0" -a "x$no_CFLAGS" = "xyes" ; then
--  dnl Make sure that an optimization flag was not specified in EXTRA_CFLAGS.
--  optimize="no"
--  echo "$EXTRA_CFLAGS" | grep "\-O" >/dev/null || optimize="yes"
--  if test "x${optimize}" = "xyes" ; then
--    if test "x$GCC" = "xyes" ; then
--      JE_CFLAGS_APPEND([-O3])
--      JE_CFLAGS_APPEND([-funroll-loops])
--    elif test "x$je_cv_msvc" = "xyes" ; then
--      JE_CFLAGS_APPEND([-O2])
--    else
--      JE_CFLAGS_APPEND([-O])
--    fi
--  fi
--fi
--
- dnl Enable statistics calculation by default.
- AC_ARG_ENABLE([stats],
-   [AS_HELP_STRING([--disable-stats],
-
diff --git a/dev-libs/jemalloc/files/jemalloc-3.0.0_fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-3.0.0_fix_html_install.patch
deleted file mode 100644
index 0f3026d44c2b..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-3.0.0_fix_html_install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6675b59..3032c6d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -240,7 +240,7 @@ install_doc_man:
- 	install -m 644 $$d $(MANDIR)/man3; \
- done
- 
--install_doc: install_doc_html install_doc_man
-+install_doc: install_doc_man
- 
- install: install_bin install_include install_lib install_doc
- 
-
diff --git a/dev-libs/jemalloc/files/jemalloc-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-strip-optimization.patch
deleted file mode 100644
index 60b7d6c22ff1..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-strip-optimization.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/configure.ac	2010-02-22 12:07:05.000000000 +0100
-+++ b/configure.ac	2010-02-22 12:08:29.000000000 +0100
-@@ -296,21 +296,6 @@
- fi
- AC_SUBST([enable_debug])
- 
--dnl Only optimize if not debugging.
--if test "x$enable_debug" = "x0" -a "x$no_CFLAGS" = "xyes" ; then
--  dnl Make sure that an optimization flag was not specified in EXTRA_CFLAGS.
--  optimize="no"
--  echo "$EXTRA_CFLAGS" | grep "\-O" >/dev/null || optimize="yes"
--  if test "x${optimize}" = "xyes" ; then
--    if test "x$GCC" = "xyes" ; then
--      JE_CFLAGS_APPEND([-O3])
--      JE_CFLAGS_APPEND([-funroll-loops])
--    else
--      JE_CFLAGS_APPEND([-O])
--    fi
--  fi
--fi
--
- dnl Do not enable statistics calculation by default.
- AC_ARG_ENABLE([stats],
-   [AS_HELP_STRING([--enable-stats], [Enable statistics calculation/reporting])],
-
diff --git a/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild b/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild
deleted file mode 100644
index 34dd28ffc61f..000000000000
--- a/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="http://www.canonware.com/jemalloc/"
-SRC_URI="http://www.canonware.com/download/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
-
-IUSE="debug static-libs stats"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-strip-optimization.patch" \
-		"${FILESDIR}/${PN}-2.2.1-no-pprof.patch" \
-		"${FILESDIR}/${PN}-2.2.5_fix_html_install.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-jemalloc-prefix=j \
-		$(use_enable debug) \
-		$(use_enable stats)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die
-	dodoc ChangeLog README
-	dohtml doc/jemalloc.html
-
-	use static-libs || find "${ED}" -name '*.a' -exec rm -f {} +
-}
diff --git a/dev-libs/jemalloc/jemalloc-3.3.1.ebuild b/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
deleted file mode 100644
index ea41d7565f66..000000000000
--- a/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="http://www.canonware.com/jemalloc/"
-SRC_URI="http://www.canonware.com/download/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~x64-macos"
-IUSE="debug static-libs stats"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-3.0.0-strip-optimization.patch" \
-		"${FILESDIR}/${PN}-3.0.0-no-pprof.patch" \
-		"${FILESDIR}/${PN}-3.0.0_fix_html_install.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable stats)
-}
-
-src_install() {
-	default
-	dohtml doc/jemalloc.html
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fixup install_name, #437362
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.1.dylib \
-			"${ED}"/usr/$(get_libdir)/libjemalloc.1.dylib || die
-	fi
-
-	use static-libs || find "${D}" -name '*.a' -delete
-}
diff --git a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild b/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
index 3f63d189b746..2940dc6db76a 100644
--- a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit autotools-multilib eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="http://www.canonware.com/jemalloc/"
-SRC_URI="http://www.canonware.com/download/${PN}/${P}.tar.bz2"
+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"
diff --git a/dev-libs/jemalloc/jemalloc-4.4.0.ebuild b/dev-libs/jemalloc/jemalloc-4.4.0.ebuild
index d34d914c14ef..1311edc26203 100644
--- a/dev-libs/jemalloc/jemalloc-4.4.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs multilib-build multilib-minimal
 
 DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="http://www.canonware.com/jemalloc/"
+HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
 SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/dev-libs/jemalloc/jemalloc-4.5.0.ebuild b/dev-libs/jemalloc/jemalloc-4.5.0.ebuild
index 9b1c134e5a25..8c24950492cb 100644
--- a/dev-libs/jemalloc/jemalloc-4.5.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-4.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools toolchain-funcs multilib-minimal
 
 DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="http://www.canonware.com/jemalloc/"
+HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
 SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
index ad448d5e1f78..f5ad09f06a68 100644
--- a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools toolchain-funcs multilib-minimal
 
 DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="http://www.canonware.com/jemalloc/"
+HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
 SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index abca118743e5..a7e625f402ec 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 EBUILD jsoncpp-1.8.1.ebuild 1353 BLAKE2B a561f153e32b1b81043fc02b64020a51235fb6557626aeceb49ddb58be7a424f8da93c2c8db7bb16a24a4d6cd86e01f8c7290f22926d983794fa2969ce4cbd1f SHA512 1479c2d2c5069ff392f158dc7f0e8320b1414d15ebb941a62a3e1359baf482e3e07093b828e38796180f5b08866e081fe3cd9f62efdca5104e9c583a1ec24a82
-EBUILD jsoncpp-1.8.4.ebuild 1369 BLAKE2B 7da910bd64137755c85315743ea4066f3685093169dcc31e724af42658d6106113eb22f57f9c3f6f9f976d5c485db47cfd5e5f887ac01863269e967dcf774676 SHA512 4f31c63900a3fcf32e5a465ea5245258e76b4c470981599e9fb9f920772eb22168f411b14c37a93fea864b1c21f9620126a6c1100398bf4769b247049dbf581c
+EBUILD jsoncpp-1.8.4.ebuild 1368 BLAKE2B 8e6b9bc8432b0166e80f20ccc655cd5430038bb68eb6091b3bc45793fe74ec208ea247d6e1e41e30dfbde9691bda19ed1fb3a610ec2a366c11641737ad5c7786 SHA512 abcb9c249cafd7a62bd4e35b78d19e29bd414b79db689dddfbaf7eb9e2fa816920c3045785f9946e68c74d3b05f7e99c56f4b84fac88adeb88bb3aca6d629d19
 MISC metadata.xml 522 BLAKE2B 6f34ae666bd7ccce5ccb075abfed8c32b8b5b3b32ac9fde277871ab735626fef6af12bf6b9da75f081726af7846bbe55cb8fe0663f107d6adb4f3bdf2db2dd26 SHA512 95270a54162bd5940602765fc238d7f30fdd0f42b8523774464a3f2e124b586dc0b03913a7b2db4bbb90f83b6384b97d8b8af8bcfabe7ce50dc93e2c87058530
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
index 9ad40f8d7dc4..427d3c1b7b4e 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/19"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index 15bc816e8cea..02ab5cee6349 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -2,7 +2,7 @@ DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d
 DIST keybinder-3.0-0.3.1.tar.gz 358650 BLAKE2B 541ce7cf5bdb9fc8c0cb6d7f1f6326d47c0cb32f71b517a8bfe8aeecc74658cf17bbaff93854bd57aa898e1f22bff1269c20422bab347df6c1e2ca1d8eac13de SHA512 af65ce02707ed2712c70470c9151bffee87e6d5b3b97218b653d3061b74001a7f3ac59e15b71362e4466e7ac16573bdb6331dc00ebccd906ce08ca8176b6770f
 DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
 EBUILD keybinder-0.3.1-r200.ebuild 1173 BLAKE2B 45e340e209d26411e5268ea16c4c929b921cf5447f03b18475227637b49a0f65dc781a231ad6d19296b744cc6f4f640b418040d9e81d76e154a6c90b1adc8f7d SHA512 631ab2a39cb8fe98b95c961dcecd252741fd1799353ecba32637e47afb8338ac29f112ff506b732cef9cd31e75bdf48ecb2a6464c414bc4e3ea7b945152a8ce1
-EBUILD keybinder-0.3.1-r201.ebuild 1197 BLAKE2B 02db2149021737397e30d62ec5de976af4de13447ac6a6d03bfd41a983b5d1632eedc65a284c10594d9e98a3fc47880e607e8fd6f70e6a2898f95a2621f83f97 SHA512 9b48eda63e11a35fdefd9c2667a5286df7579910d4f0ea67d2df11f01eacbe863b40237fec23f77fd0b2cbc75cce132f4af028e3326892a2ca24102f0b5a2cdf
+EBUILD keybinder-0.3.1-r201.ebuild 1196 BLAKE2B 8295c5e21a6aaef187fa9cb7b7f6b653863f08189a3c14255c278781d80adb0d1daaed733c3745e89722afc50ba611d588fe83263d19970ce65d81b4a53980cc SHA512 6692bfbdba188beedb453b345075c3b00c77420da4b8c0761a927773c409d37b55b5c5c57e2555515d1351aaf1c5389a20e397ba29918d39a1fd62bb59632e17
 EBUILD keybinder-0.3.1-r300.ebuild 939 BLAKE2B ad5c4af3b728edbef0c2c61882ae35a2e8c630392f7446efe13701ff6fd83bbfa1bc51768244437b4cdafa00620a5e8e5e69ce9fcbcb9880aed1f6a7fedeb6a5 SHA512 c84f03c94a0a27549ffe215a0648882f324f80d38e30c49a97a2b8529c133737c673f74545d2742efdc845d2be5717c66624fdf6ec34e7dbb442c3c71c70efa7
-EBUILD keybinder-0.3.2-r300.ebuild 1056 BLAKE2B f2b2dd065cabbb6603a4d268875d59d4725fbab59a40c06865bf58fa785142ce02303016da2ca378a51c4b6970c378b77ccbde77e3015c80759cc9381620d2f3 SHA512 dfa866abf83e47ba266a1db43136321afab931afbab818fd54f70c0e4d98bd32af1475958814af1ba10f9b757b4a352394acf8ce0003bd58f38a3b2df6d31dd9
+EBUILD keybinder-0.3.2-r300.ebuild 1055 BLAKE2B 84972cc1560624ef0851cde30983ab041897133aa7679ce89cd2d1572444ffcef827a1c522abdaa4fe3d1ce4d64d0e62ffd4666c17b4d4783f3886d3e85b8554 SHA512 13dc8f85ff0ef4b582b76068d2cb2f610280f8a5e7c1162b09e27c29c5514205b4f5acad3c1f674d02430e038a62e11a0cedd681587cbdbd04d1a580cb778882
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
index 4557421f67e1..d767a4294d51 100644
--- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/engla/keybinder/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="+introspection lua python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
index 155449bb9eb1..d2a9be821831 100644
--- a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/engla/keybinder/releases/download/${PN}-3.0-v${PV}/$
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="+introspection"
 
 RDEPEND="x11-libs/gtk+:3[X]
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index 92a2d3864397..de6b3a8b2172 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -8,5 +8,5 @@ DIST texlive-module-kpathsea-2017.tar.xz 30956 BLAKE2B f9f7d70a6d814996a211a5f3d
 DIST texlive-module-kpathsea.doc-2016.tar.xz 1128872 BLAKE2B e3b2e5c2c14e2d67fba3c89d31169b2af13bd6767983302ca302369ee8cf790655b248cc1069cfd59e4044562627eb83bca6ffe368d5c1b38832e08fcc53b678 SHA512 1cfbb4b5a8647bf5da46b04c9bc911091aa3322b154d65544aa3a1163e24b6906d7e5420549ab0ba023250e6dfa90e75d3a20dffd2e7360fba068a5c3cece885
 DIST texlive-module-kpathsea.doc-2017.tar.xz 1128868 BLAKE2B d1f6bb2f9a893616cc9e090671a7a3c2aaab0f942eed0824a60826b75ee0a62ded33cad197d0bb953100a02ecead1f8d84bf7374889bdba9fc36a26b23440a9c SHA512 af829f666c815da49b59bbe678a2c1e9fe45cbc528f484dfb6e43a1e52bbf0245a4e571505f5be2cc7cf7f5ebcdb06b862ac6e9f9b5390489f0fab10a11fd997
 EBUILD kpathsea-6.2.2_p20160523.ebuild 3274 BLAKE2B d028c3c47209c2505ec27054c2b5c7526fa548649eda49a2f58680389cbf2261e5d06a0014de9176c6f02ab7cd3df4e2a47b28fcce2fca01956465ad7f644f45 SHA512 2593e50d9d773406fa17dd4583ad02d837ede26de6140aa8b4a593170693b0c49bebe2e025b50356165b1c9ce8432b99e4e341c2f1874c000861c901ff1319ca
-EBUILD kpathsea-6.2.3_p20170524.ebuild 3275 BLAKE2B bf7ce702b400d20d6f397dc1ffac5d1b56479f53779112de8d943e29411d93d7bcc00d92034623366a1ca4f68800c59e256393c4f180ba27fe22f3ea8a814c01 SHA512 f47d09662b1f33ab828952fcb71e5e15e06a37de2803a4110b7851874d7805470bfece56bd106d92523e5a117007dd36b5ed09053d13f910416a78768deb0d5f
+EBUILD kpathsea-6.2.3_p20170524.ebuild 3274 BLAKE2B e6df7cc38e0fb01b86d9b889370e0d5490f5f1e090c5b88e5e33170f7d5719401a033d81d5f63ad52d3f8ef303ebea94fac52c966b40927d5ebd2bc314b23f78 SHA512 9a66ccc4414e299e0d5ad84d1a78306c1ca6bdeacfe8025d318dd03cd4c1ceff49691b5c946335911582b9490d0db05428683cbfc4eef6fdd0c8637c013ae1e2
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/kpathsea-6.2.3_p20170524.ebuild b/dev-libs/kpathsea/kpathsea-6.2.3_p20170524.ebuild
index 5ea57830ec01..05f4938a34b5 100644
--- a/dev-libs/kpathsea/kpathsea-6.2.3_p20170524.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.2.3_p20170524.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0/${PV%_p*}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source static-libs"
 
 DEPEND="!<app-text/texlive-core-2013
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 57b9ea4dddcf..79a059a7f490 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,5 +1,6 @@
 AUX libcdio-1.0.0-cddb.patch 1245 BLAKE2B e1b677c2cca08d30edd07caf9a0f55c0997497801ad47db3c88f8759bc8fb74b538bf6e611fdd7273ba5ecd257dacb4f0d26a83529780c65c234ef874becb85e SHA512 17ba1c822d0c6377b0714ac7652b4234bef7a0e8935f4345fcbfee788ed7eb668c14b7f59556d82ed10be61e82c007886a3b47cbc6a86f057deab3028f599638
 AUX libcdio-1.0.0-version.patch 613 BLAKE2B e0332426f7ca2d4cfe1335e70bada237f536ef2e198681540eb01d01bc23ba2566521b15713cacea20299235658d984acbaf872d75367442621241146da20972 SHA512 6dc238f442fad3f0b35350fd11aa75bcdbc364cbc3616b4d61e9d53ff9b36b0293ce7e9e2118e07045399cd4a06fa5474870794326f11df98f3e218b74cef822
+AUX libcdio-2.0.0-iso-ioleak.patch 1093 BLAKE2B bd30e99cd35d2cb09dbbc7dd91133f1649a8761e7f23b1544a65477a77466f6b72bb99eb3ac21980b1cca54590fd5852dc1b9f7fde28a50bc5e101320576bdf5 SHA512 851fb3610ab801a5c62075426b9b51d42c60d35aaf4d247a825f8323d41bce692f48632604b7e6bc03ef83974f077ced371812ce50397dc054d16e353074f625
 DIST libcdio-0.93.tar.gz 2723371 BLAKE2B 3dc361f48c0ccc22c76ad691f856512a87906ddccdbf05a22d4c8f7f28221d201480e015532be382d576550ecabae40df9e325043fa6cff89b39d77e30b6509b SHA512 a2ea7a1f219e1abdbbb42633003e10ff77b6a879133c96a0c8e7a80fe205c08a48bade1d9941c6493f24d6eb2ed410469b57e19d9740a4400266a6f3f9d3da91
 DIST libcdio-0.94.tar.gz 2355452 BLAKE2B c6a720fb714e6aa0d4425ccf92e4c08172d26d77a94e8a6897ffee197a740de78da8d480ec9af2dcfd59c3f96fb2a823a4e39259389dd82ece4108c6a05a4646 SHA512 e1d3c96c4acc7be923c97109c3f76223adc00b293278daef7d5008b1e5d67f33402f9f224f05120e9e1e8b3a8d1fa1b0bd5069dc6dd309741e3590e2c19e0e66
 DIST libcdio-1.0.0.tar.gz 2343992 BLAKE2B d187a0aba99efa1172cab302fcd020dc2a581633368230a6ba00db6250c8e7d5e66111fba1804ecb0ba5416c876f88f1d07549118bb003d4631c14d0f3e85ba6 SHA512 2beb5c9cf455c5b56f0a8ba641b8fe322c487256b017108fadbdf288e92787fa0b956d2291aa877df5a9b4494f8425de58c0f71d587ef5f9346987733f66e5dc
@@ -9,5 +10,6 @@ EBUILD libcdio-0.93.ebuild 1858 BLAKE2B 522e84217ec320417221586649a82881d7a3d6f9
 EBUILD libcdio-0.94-r1.ebuild 1876 BLAKE2B a673433cb8f17b5d1a0a3f7c3aef86d8826aa6821b377f235f49598a6ace1e1224aada8883c1bbba344bb1e4453a575e5f64ca403357f9ede2462e8f76a62c68 SHA512 aa070eaaa077d75007f63d187fc6e433f6129fd29d91e4dfaa9cc7c73cb5d731f249cbac418e1829e2ad7ba00bf8d01fce1213d7b84e857e42508ef45a9dd887
 EBUILD libcdio-1.0.0-r1.ebuild 1854 BLAKE2B 73212575a6b33ea13958f38cec55f360dc6a4d4f8e289dfe7ce8d1e250c0a70cce9a9671c43828f6bd8064c01b7c483864a75d4b96c9e0c2c649635f772d4cfc SHA512 d36d0f899bdde4f5e962ce8ddcd56aab60ea8b67dad068910e2947f93eedc04c8ca0376a7850db6fa7c909b1391c02787e92504169959140c1298ae5f1c2eea6
 EBUILD libcdio-1.1.0.ebuild 1776 BLAKE2B f3474ac6bb1f240f2460ded72f713a7c3a30068a9019103f375051d46c83fa2d6700914f410e62cfa80d4730ef790cc22e0ef58934df112ce33ed2ee8b31176a SHA512 41d22cbadf18cea8719118fa1b96b59ce7084a69bb7a66d137b0cd1ef739f9c43a4ff34b45b0157614aad675fad92004da6107f9f7314932f78c262a9f8f1360
+EBUILD libcdio-2.0.0-r1.ebuild 1850 BLAKE2B 8bb98ff3b62086dfebf8144b3fd142916dffae14cfef11dce3d0a7c7080073342455f4fa9b1d6f175275fb2dfbd3a151490073f03e7d3e0be331382d5acb3f28 SHA512 bd55f79e107c712b76f8713e9b4bd30654160a001b0f139b1e50e1686ff6c77f1f4e2a84b0f6e2d09715e6ff9d9728af91bf59cb85dddd793b911a5fbf07a20e
 EBUILD libcdio-2.0.0.ebuild 1776 BLAKE2B f4deb1500127ab04377bc36e3be4c1377e3952cbe2f72d108e412ee275729eba3b8fee209aae64050c6e2c41df591ff0d50aed615b6a2c062862f19699baa6ce SHA512 1f2ef514ecdfe39541a9d691d05f4788070400bc7fe6e173a4f434e60677f50430fdebdb4a946afb143395d7281b6feaac0ac9edd3f318d19217bebff10c51bf
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch b/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch
new file mode 100644
index 000000000000..17732104c3d1
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch
@@ -0,0 +1,37 @@
+From 8c0de2d3f0324ecf3fd135589589dcd783c15556 Mon Sep 17 00:00:00 2001
+From: rocky <rocky@gnu.org>
+Date: Fri, 16 Feb 2018 09:14:17 -0500
+Subject: Fix small I/O leak when we can't read ISO file
+
+See Savannah bug #53170. Thanks to David Binderman.
+---
+ src/iso-read.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/iso-read.c b/src/iso-read.c
+index 0541e27..8647485 100644
+--- a/src/iso-read.c
++++ b/src/iso-read.c
+@@ -1,5 +1,6 @@
+ /*
+-  Copyright (C) 2004-2006, 2008, 2012-2013, 2017 Rocky Bernstein <rocky@gnu.org>
++  Copyright (C) 2004-2006, 2008, 2012-2013, 2017-2018 Rocky Bernstein
++  <rocky@gnu.org>
+ 
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+@@ -364,7 +365,10 @@ main(int argc, char *argv[])
+       ret = read_iso_file (opts.iso9660_image, opts.file_name,
+                            outfd, &bytes_written);
+   }
+-  if (ret != 0) return ret;
++  if (ret != 0) {
++    fclose (outfd);
++    return ret;
++  }
+ 
+   fflush (outfd);
+ 
+-- 
+cgit v1.0-41-gc330
+
diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..62bcbab5b554
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="A library to encapsulate CD-ROM reading and control"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/18" # subslot is based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cddb +cxx minimal static-libs test"
+
+RDEPEND="
+	!minimal? (
+		>=sys-libs/ncurses-5.7-r7:0=
+		cddb? ( >=media-libs/libcddb-1.3.2 )
+	)
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README{,.libcdio} THANKS TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cdio/cdio_config.h
+	/usr/include/cdio/version.h
+)
+
+PATCHES=( "${FILESDIR}/${P}-iso-ioleak.patch" )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	sed \
+		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+		-i configure || die
+
+	elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
+}
+
+multilib_src_configure() {
+	local util_switch
+	if ! multilib_is_native_abi || use minimal ; then
+		util_switch="--without"
+	else
+		util_switch="--with"
+	fi
+
+	# Tests fail if ECONF_SOURCE is not relative
+	ECONF_SOURCE="../${P}" econf \
+		--disable-maintainer-mode \
+		$(use_enable cxx) \
+		--disable-cpp-progs \
+		--disable-example-progs \
+		$(use_enable static-libs static) \
+		$(use_enable cddb) \
+		--disable-vcd-info \
+		${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 414bbdbfd8da..9d33955133cf 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,12 +1,10 @@
-DIST libinput-1.10.1.tar.xz 495644 BLAKE2B 50044d59992ddefd4c1143288025d4510bbda8540e93737d9a78108413d77e06838a2de283a8aff2ca40d74327bc509523b847503d2f8b4bbddff10986f83f90 SHA512 69e7cd12f3d686d1b09afd93fe072ddd6f8c9a1f04c0a651c7dd02c5a20b3f8163c5b787b41bf3ae91db0da7d3e2958d315d6c9a2875259c62b0d290ac89d1fb
-DIST libinput-1.10.2.tar.xz 493780 BLAKE2B aede2b9f65698bbc805a3daebdcbe08480b027df3144b5661e902dfefd41902741a35c9a72e88a056a38220699a62e07cd4e751bf66e8b2c0ad6937e8843227d SHA512 c0418b2e0919fe085839a9ce7d4f155ea7a76f5395f5ed0ab7ab2f2226a2085b10ada5006bfb64c65d98a5fcc19395f722de379f0977a6c52a3630a9c0ad556e
 DIST libinput-1.10.3.tar.xz 493216 BLAKE2B 0646575d619c42bfc2b54018e4ee08e43c939e2bf8ce2fd111a113dce4acef73dddfb453a083a53964b70bb0e15a619c1a00b63c87b2cf231190b184b82622f7 SHA512 4c73673e138a7aff9d6f2d189b8afdfb51c868eca0487c8c487ffd3bb48849994a9095fbd4c5c725ee17fafc2a85298106e0cc7b59b4a8cd13ec28f65d15c01d
+DIST libinput-1.10.4.tar.xz 493152 BLAKE2B 84f49f523fc2fb4c306212a28ccf2c02650898ee5ac6956522aa9a13d46f0ddffbfac94fb11205caf3e172ef652d7339902831993ef37c0ad4e3e9ef1cc6eaf3 SHA512 b6f24f135e2396d53c0576a3b3887cd3736f2209fc448c6419cd1f1d7ee6aedff8e067f4b780f50ada5a4418d5bc47a4010cb328f366ee7fd1a2dba1ffc96c38
 DIST libinput-1.7.3.tar.xz 922464 BLAKE2B fa38675905af55931676c22d9e4d56befbb055fba56ba13c61a1917050bc1eb62bcfe1d078b478047006d4c0d06d83186d0d6739cbf9dc49acce487ccb0b7e3a SHA512 2262dc56d213a4d3ea765e870af200e2c336a166baa1bbdf5205e3ce70faefc777429ba09563c5dd79feb5442f53abc84e04a0f32a06bb622d6e120bb8ad152b
 DIST libinput-1.8.3.tar.xz 941832 BLAKE2B cf6464d68387cca23d0f70eaceeec8b453c53f1cac22892722d48983788b43a136617c62ad39c8d435bbf07c0cb9cd720250ea91e31f10526acd5147b1d78237 SHA512 88006d217e3507858fa6b9ac1f25c267255fb51d1bcf1208d2afd423bf2a9292944bc5526ea91f27fad3ff04c2f9f43ab3aa25fd9fb7ace1231ecd33ddf18de6
 DIST libinput-1.9.4.tar.xz 472636 BLAKE2B 692a23047cb0b54d14763b34ce3ce1414101d0097dce10d237ec32a67f29c31cbf2928681084f7561e072e555c932f0e3bc54cfb0ecbcdd0d823426806e357b6 SHA512 302f9497ea9ffb2163c643e9ca2f0a773ea141f6fe0a3aa3d8e86eb11a5d11e75d858b1e679ebfd3f913c645beac059cfd356b37c4ea17a8853068f79a740a4b
-EBUILD libinput-1.10.1.ebuild 1444 BLAKE2B 9bbc30b14228ee7c70b5e66574664eb8b699413868a0ba0644d919a518b144400d79c82a6901b40d31fa9138696f72d57d4decca4afc42de6aa3dcbb5fe55d74 SHA512 201e65f2b68ce18f19d9b1656e8eb25bfc54821aea970eed17144ca8a6bbb85b3d205a49ecb515719d71482be3f926a178303f765710ed4e672ce48fbe62e0b7
-EBUILD libinput-1.10.2.ebuild 1444 BLAKE2B 9bbc30b14228ee7c70b5e66574664eb8b699413868a0ba0644d919a518b144400d79c82a6901b40d31fa9138696f72d57d4decca4afc42de6aa3dcbb5fe55d74 SHA512 201e65f2b68ce18f19d9b1656e8eb25bfc54821aea970eed17144ca8a6bbb85b3d205a49ecb515719d71482be3f926a178303f765710ed4e672ce48fbe62e0b7
 EBUILD libinput-1.10.3.ebuild 1450 BLAKE2B 38f14353e8d61575ca6286d6b2aeeb0e24f5cc1feddf56177d6c8fdd7c80100c26d19015223a00d88aad0fd339b3fc7973513468aeb6697a5e0d8e7105465ef7 SHA512 917200b05e8b3bd74a83f4c6324a64018fba2aa977c0e80d1e6465837811dc684b1f153e0298df29c27451e8563dd66a632ed57a036333a23fa67579fb221c1b
+EBUILD libinput-1.10.4.ebuild 1450 BLAKE2B 38f14353e8d61575ca6286d6b2aeeb0e24f5cc1feddf56177d6c8fdd7c80100c26d19015223a00d88aad0fd339b3fc7973513468aeb6697a5e0d8e7105465ef7 SHA512 917200b05e8b3bd74a83f4c6324a64018fba2aa977c0e80d1e6465837811dc684b1f153e0298df29c27451e8563dd66a632ed57a036333a23fa67579fb221c1b
 EBUILD libinput-1.7.3.ebuild 1535 BLAKE2B 6d99e610dda382651bed647c29ee8073d14879ec2fa83f22e724ff294018cecc78f16799802974aac29153924c15f922d42d188e9199eaee60a81282be840d0d SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c
 EBUILD libinput-1.8.3.ebuild 1544 BLAKE2B d2fe752951be5a015ec92f907c7cf5ac2739f35c51bafcf26e2381f3d22e8a14a6bc21c3697f02e0a0684c27dc1cd4379b5390d1df9b8a083b7405f7b31b2c5c SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a
 EBUILD libinput-1.9.4.ebuild 1436 BLAKE2B 600e53d3de921d0aaaa3e42ac9fe698fe0349e99c949b3706ccbab1acc0e02fb738741bd6cdbf896d3dadb1ff3be5c61a96324f12f6600a89aea9a4d0a70d4fe SHA512 8b3264d9cfd0da9895bc84808ffb3b953ae19f320c2dd72cef27fcd692bd668179e589d3ae986be567e0701b945af7747920243ccb57aa474bd26cfa26767b22
diff --git a/dev-libs/libinput/libinput-1.10.1.ebuild b/dev-libs/libinput/libinput-1.10.1.ebuild
deleted file mode 100644
index 44cea37f06a6..000000000000
--- a/dev-libs/libinput/libinput-1.10.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit meson udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc input_devices_wacom test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? (
-#		>=dev-libs/check-0.9.10
-#		dev-util/valgrind
-#		sys-libs/libunwind )
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		-Ddocumentation="$(usex doc true false)"
-		-Dlibwacom="$(usex input_devices_wacom true false)"
-		-Dtests="$(usex test true false)"
-		-Dudev-dir="$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/html/.
-	fi
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libinput/libinput-1.10.2.ebuild b/dev-libs/libinput/libinput-1.10.4.ebuild
index 44cea37f06a6..5364b191c2fc 100644
--- a/dev-libs/libinput/libinput-1.10.2.ebuild
+++ b/dev-libs/libinput/libinput-1.10.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libkpass/Manifest b/dev-libs/libkpass/Manifest
index c1571e527c60..8b61066e8dd8 100644
--- a/dev-libs/libkpass/Manifest
+++ b/dev-libs/libkpass/Manifest
@@ -1,4 +1,3 @@
 DIST libkpass-6.tar.gz 407412 BLAKE2B 5afba2f62f4ec11fb9e387a429b4905a01be6be4f89bbcec81ead8f3bf1fa891553fc677dd0c660e2e41b585588003aa6ba2c874139eedf9bd76c47adb66e859 SHA512 506e642dbbd1295fe9f46e31d80d151df4428373b191cc98340d9bd2f5e06c31e53b45a35e843d8cbb1ef2b2c4fee36a54032e7ced6dead789082c4a174443de
 EBUILD libkpass-6-r1.ebuild 561 BLAKE2B c4400cceda4ca451388ef953212f0f0f47b61a9ac68e9d340e641ccc5ed68d2e3719beeb9459cf358b600891b9b0a6a6b6388137d78ff453885b2f106f39133b SHA512 fe83e3b3726e384f91a0f6467c0ab9c96c108ed3b6e9a9e708fcfaeb2431192aeda871f9c4095a48c3b33910a0e2c1f577981de79e3349f33ea777c8a4a5d3a0
-EBUILD libkpass-6.ebuild 601 BLAKE2B 1c6c5efccd9a219c30bd5cc25dfe7bd35611e586f6ba044a86d120300ca637ef669dec8f2790fecf11e567ee5d388a3919e55de47b918f891bc1272990ce6a11 SHA512 2233459e730a08f522ee19963fa0fbf0610dd1c67e9e0ffbfb8b2a570e5bddbd98c0a12c7cf9102c07f5eb95989a68153a60a424e6998488dd8c4891e17d6023
 MISC metadata.xml 245 BLAKE2B 86601a00299cac72ec88a509b5f728e187c4c08b3e1cfbff1efe537fbea3ad04f0edb307b5f52adf93ff05130a9aeab15b1fbf74fbd69b29f04db9eb629d6f41 SHA512 404a90521867fe7d5fb02b72d72d820201d91c415dcb792b852cf4b4b6dc499ccbfa51ac3f6bde4a0cf35d85267647c8b28d062bc4f3ba2fbfa8c2d54669b22f
diff --git a/dev-libs/libkpass/libkpass-6.ebuild b/dev-libs/libkpass/libkpass-6.ebuild
deleted file mode 100644
index ef324877ee5f..000000000000
--- a/dev-libs/libkpass/libkpass-6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Libkpass is a C implementation to access KeePass 1.x format password databases"
-HOMEPAGE="http://libkpass.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/nettle-2.7.1"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}"/usr/lib*/${PN}.la
-}
diff --git a/dev-libs/libntru/Manifest b/dev-libs/libntru/Manifest
index 409d3a521895..8e93fcddb203 100644
--- a/dev-libs/libntru/Manifest
+++ b/dev-libs/libntru/Manifest
@@ -1,4 +1,3 @@
 DIST libntru-0.4.1.tar.gz 97284 BLAKE2B 1384f96627c02f0b3981b25f8f080ae87606cbbf855358d40ccfb46abd22834c0af03f518bdfd23fbe17bdc40fc57cd1066db9e3bedb9a7529e2cf1130c6a5af SHA512 c49251a194614f02124c90c08b886f89d0dacbed2088eb2e306946666af3b8bc3f9c2dc2c7f5e4c0560af66fca31a640fa853b3142dcfb2ee2b0dfe9a0d41f61
 EBUILD libntru-0.4.1-r1.ebuild 1427 BLAKE2B eb86e9b3c56da03eec4ba9f365dcbe451229d7ffcfcc2fe4ee942e6e5b7ce467fc1c5b60d8c282d064a0f2fe4afa2028710b0993f39a6b99705dd1e4ba307dc3 SHA512 3ea44cdbcd5e3b9379e715b89a79e4b5f18e34fa6a4bb379afcf1f6e2ccdaad545b942b0e3f80e23956bfa6c722177502bedf86c032c301d587b538c8646938d
-EBUILD libntru-0.4.1.ebuild 1417 BLAKE2B 43abe2e648ad76c2d56143f5ffc5c164c65a3ec53392f640349ca3a3717dc01df584485d00085c43ea02d375e6e2158f8f2a5159ca498f796afd31e84a90d4b5 SHA512 6c137ed108af1177f0b3f7f7a716418106b2923f3c2a25e06be488a21d519079385d363ad137ef31bba8e93553102f50c88701bd1ecfbd12e7764664bd3b4774
 MISC metadata.xml 246 BLAKE2B 539591427eb235ea24426e19f5fd86c40a9f74939f0252d96ba84bc8ea50ff6563be0d923150635b49736e3ee92b95ea12ae21c6fa6458d0836541e8fd587848 SHA512 d0b4f22c4207d647b24be3a25c4154aa30cf75727f0add14c9c1177f60fc264d1d9d60520518d16f5d5df3373d0a78643c650ab6925baf5255eab1a7e9fcebc3
diff --git a/dev-libs/libntru/libntru-0.4.1.ebuild b/dev-libs/libntru/libntru-0.4.1.ebuild
deleted file mode 100644
index c676d0ff62b7..000000000000
--- a/dev-libs/libntru/libntru-0.4.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="C Implementation of NTRUEncrypt"
-HOMEPAGE="https://github.com/tbuktu/libntru"
-SRC_URI="https://github.com/tbuktu/libntru/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples static-libs"
-
-DEPEND="dev-lang/perl"
-
-src_prepare() {
-	multilib_copy_sources
-
-	_copy_test_dir() {
-		cp -pr "${BUILD_DIR}" "${BUILD_DIR}-test" || die
-	}
-	multilib_foreach_abi _copy_test_dir
-}
-
-multilib_src_compile() {
-	CFLAGS="${CFLAGS}" \
-		emake \
-			CC="$(tc-getCC)" \
-			$(usex static-libs "libntru.a libntru.so" "") \
-			MACHINE="$(if [[ ${ABI} == x86 ]] ; then echo i386 ; else echo x86_64 ; fi)"
-}
-
-src_test() {
-	_test() {
-		CFLAGS="${CFLAGS}" \
-			emake CC="$(tc-getCC)" test -j1 -C "${BUILD_DIR}-test" \
-				MACHINE="$(if [[ ${ABI} == x86 ]] ; then echo i386 ; else echo x86_64 ; fi)"
-
-	}
-
-	multilib_foreach_abi _test
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		INST_LIBDIR="/usr/$(get_libdir)" \
-		INST_DOCDIR="/usr/share/doc/${PF}" \
-		MACHINE="$(if [[ ${ABI} == x86 ]] ; then echo i386 ; else echo x86_64 ; fi)" \
-		install $(usex static-libs install-static-lib "")
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use examples ; then
-		docinto examples
-		dodoc src/hybrid.c
-	fi
-}
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 9695dae8badb..35d6de2e1cdb 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,8 +1,6 @@
 DIST liborcus-0.12.1.tar.xz 1673880 BLAKE2B 6f85f1ce04bd7c797f8fccc9b4d860189b6fa9f51623587a668c343e8897bf17a3e62a5465354776044fabe9347ec35913eb1433dc551e4e509ce260ba92c3b9 SHA512 294b24ad7fccae77070edd9d8e6e1a370f609ec8af9a2c58567431e641fc0f3f27c4cd4b6ac1825a8179a22a1d1a81d84827859eb631d2625194f9e59ca1a8c3
-DIST liborcus-0.13.3.tar.xz 1817824 BLAKE2B 99bb88c1b52539ef09c52ce1f13928b31e2a5c0e88d172e8d0ca212d9f0921cbe98460ae8047be19db5d4b70a9b527c2ae499ab5c6474dab16445eab9a4b1c4c SHA512 fecea0fca5b455ae734b00c5a7784e1cf0db32b35d0992f26d4ca8b4188147cabc9c267b984c4b5a5b1cbf8a5f4029a7dd96de4dfc1dc902b43f01def662d1f3
 DIST liborcus-0.13.4.tar.xz 1816340 BLAKE2B f8e7251c8688f82604d5ac1212938890e42f23ce45edb09eba9ab26a810e5fd4215a23dd20e86ddf9100db67818fc73fbbee7357642a6390f8f60dc28596be31 SHA512 f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b
 EBUILD liborcus-0.12.1.ebuild 1294 BLAKE2B d5fa81bd750f1376f09116ae40f68c5449ecacc894908bb3e706defbcb3cefe0b0866946e55eab79098d7dba5dbb8feaa39efaed741ea6567609e3f78bd38448 SHA512 86b0e04d7223f2932e913013cff0e42c6c22d1540bbe873a90e59c4828f9a528c3942444a993983aad113e75d4f887160dcd8791a6167e0e750851a37e303df2
-EBUILD liborcus-0.13.3.ebuild 1299 BLAKE2B 02f09dddd6907115bc5a70523b48e5768b33ef3582b9fe9ca39e23104fbf0aa5f47070df81786ad9857a8049514ec52b91aff527a372c0e60101cb7343bff2b7 SHA512 7db1b63103cae486e1be74992c1094bee3948d86898725d475625e5502987648992441ffdfc25bc796e772fd07a190826023141b863f76a39c51e27229846440
 EBUILD liborcus-0.13.4.ebuild 1299 BLAKE2B 02f09dddd6907115bc5a70523b48e5768b33ef3582b9fe9ca39e23104fbf0aa5f47070df81786ad9857a8049514ec52b91aff527a372c0e60101cb7343bff2b7 SHA512 7db1b63103cae486e1be74992c1094bee3948d86898725d475625e5502987648992441ffdfc25bc796e772fd07a190826023141b863f76a39c51e27229846440
 EBUILD liborcus-9999.ebuild 1299 BLAKE2B 02f09dddd6907115bc5a70523b48e5768b33ef3582b9fe9ca39e23104fbf0aa5f47070df81786ad9857a8049514ec52b91aff527a372c0e60101cb7343bff2b7 SHA512 7db1b63103cae486e1be74992c1094bee3948d86898725d475625e5502987648992441ffdfc25bc796e772fd07a190826023141b863f76a39c51e27229846440
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.13.3.ebuild b/dev-libs/liborcus/liborcus-0.13.3.ebuild
deleted file mode 100644
index 2f6e8414b8d3..000000000000
--- a/dev-libs/liborcus/liborcus-0.13.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit python-single-r1 ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.13" # based on SONAME of liborcus.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="python +spreadsheet-model static-libs tools"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=
-	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( >=dev-libs/libixion-0.13.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/mdds-1.2.2:1
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable python) \
-		$(use_enable spreadsheet-model) \
-		$(use_enable static-libs static) \
-		$(use_with tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 8c8513e17a39..6114e629cbeb 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -4,6 +4,7 @@ AUX librdkafka-0.9.3-remove-lz4-automagic.patch 1721 BLAKE2B d7c458bc12a59aec86b
 DIST librdkafka-0.11.0.tar.gz 837546 BLAKE2B 32dc35a97c51353c2635965244eefb98ba0575f4aafe405f7cccbc1ce06a3c8230ebd6171f4519ab50f4d996dc934c868366f8520d210216697584d1d730bde6 SHA512 1c41bd5bb9eb93b3bf743e8c4f14684609cb47b0c4fb95d303ddc7c62fdb678d9e6928fa6ea57c0aaa7695d08ab6e7ec84b699d7d61c7f750af0fe2cb148c596
 DIST librdkafka-0.11.1.tar.gz 859238 BLAKE2B bc53f358320aa40d1acb209daa2594f18421bb6913bad7ba08a5612dfd6683e65489dc31ed67adc9df090d719ea6ab1031f46e524f055c61cab3f1f941a7163b SHA512 24aba6cfbd5df6a010a735fde455a9272c85b26055b172893b8e5259c2d6a7f2adc9637699f7f3b7270200a280cd95d52779a8f89fbb6af5fc035488ff54310e
 DIST librdkafka-0.11.3.tar.gz 1849838 BLAKE2B 570713642b5ec9c2487a37b9146edda5f844427dbf55d6cb654ca9a8690cd6f77bcc9325800ac2a34da21f1cca33187f390c00132f9e5c28503f816ee256c4f9 SHA512 e9bb97ea1597019a841dd4ba3666ad72dcbc0539054155ce0caee92f1324f1a490515b0310405f822b829c05ed2688b48e2ca205a91cf88bf9ad6411f7c12b26
+DIST librdkafka-0.11.4.tar.gz 1900117 BLAKE2B 3e755c91d6a2e12829ba841749977f8c05c9f243d79db64247547e4a49790e67d07f7d82633f45689dcc5f88caaef200027e6af3866de283c1de6120d7f98467 SHA512 6b34e7c476d328a2f8e8321f6ddcaeaf43730284bb3aaddac81c3cd9a1fa5d7f7ef7481f1093b36d89edde7b766da6cd27a9eb9a635b12b640e8a46a269bafc8
 DIST librdkafka-0.9.2.tar.gz 620799 BLAKE2B e3665de63c573529df171bc4def2e341f0a051f8df1119d83d65d631e0744bbcc73251fc7ea3278e840bd16962960d45d45493f4f33c8f4592a381853a054927 SHA512 12a7da8de59de684da527ab969cd84dc8602741e9208941e1c7ad6dc69774bcbc3fbde0620d48c300372fa20b15aa826d309b71730119d82ec578e274c241152
 DIST librdkafka-0.9.3.tar.gz 637066 BLAKE2B 7c120e5e79a6b51c9e6f7d849eb5e49f7e7096e2888d27e2d63b11954269ecf886a88af98e447b1422400ab013852be272f828a711712dac6a28946314bcd40b SHA512 5ec4c597eb7871c13feaaa96a76dc97c836f1fb5ae6c11d10675aee5577ad09d33e104af8fd497a8fbc7ee2c59434800d4cd857843f5c37460d4107ba0dc4e78
 DIST librdkafka-0.9.4.tar.gz 696078 BLAKE2B fa3b5b1cff0ffaa495e0a62c2886665c0d577bb68a6af9a0c1a6375e8a5804efba80e82b5c4f6d5308374d9a22b078eee18cf75ffa24669fa91c6276c80256f7 SHA512 054897d90131ba7d91f66e2929f19224ae96feabe1be69e93a87ad05864f4893aa56456c3c15a303826f0c519eab09c5cd6e0b34d76ae68db6060aa80e9bc8de
@@ -11,6 +12,7 @@ DIST librdkafka-0.9.5.tar.gz 753196 BLAKE2B 48e9c2aba02f1a3c720b48c7962af7a1e26c
 EBUILD librdkafka-0.11.0.ebuild 1238 BLAKE2B 5517b883241ce8a07e44e41c8f9df9859db8a077b8318546761f55f47f232f46d14a4b09b6e7821c45d231eba7129b77b6eba4900cd2deabeac974a59123f3e3 SHA512 1a78a8e00cb86f6b4209023c296e406384948fa2a1c7230fc01b70b0f6fc5ce9e97e21ac626d9f0f9d5590bc51d8295fc2e4c9fab77b872efa0684f80b07f10f
 EBUILD librdkafka-0.11.1.ebuild 1238 BLAKE2B 5517b883241ce8a07e44e41c8f9df9859db8a077b8318546761f55f47f232f46d14a4b09b6e7821c45d231eba7129b77b6eba4900cd2deabeac974a59123f3e3 SHA512 1a78a8e00cb86f6b4209023c296e406384948fa2a1c7230fc01b70b0f6fc5ce9e97e21ac626d9f0f9d5590bc51d8295fc2e4c9fab77b872efa0684f80b07f10f
 EBUILD librdkafka-0.11.3-r1.ebuild 1300 BLAKE2B 3914a9337b5e98d0e7f20e8b572b2a487d84de39a36f5e013f2fb1a864a09792d9a173b15f8986eb0bef26598e2fd28003286d27cd3fd62f7db7cf9f9c2c5b0c SHA512 8db20f79d86c5022ac3887abf83a7cd5329e88354a92e7440859f01d429f50b13f6b0e3134d9df6108beab4521fabe9f468db21639b368e62b58460942f7468d
+EBUILD librdkafka-0.11.4.ebuild 1238 BLAKE2B 4e4a3f1f13d44f31a2206e8e195ce5cc3a2beaed2be17496f8fef347561e7818f9083ff70416ca3f8dee103c01b0d810d9b49ddc42eb5da32f98181b949ec21e SHA512 d61d3f55eea98eea6a0d2553f934b25cd972754a55ac5b1459224393afb48751949968d332b0703b5f1d8f34d728224f7a970126a147b65da4a9f94670847b55
 EBUILD librdkafka-0.9.2-r1.ebuild 1288 BLAKE2B cd9f140cb8c34659d0121af5e073a29871b6ffb9d1c963802c888927b3f1528d93f55c446c3a5f76c73c4183567414a1d0d55e7b152508555fd92947be924a40 SHA512 1269fc2b6392ecea08d09299f9740e5f2a90b121fcbc1617e63beceffa16db5dae0c2a7a289c0c33ca112ef75087e5c991272967d687cfeb636215cd64494880
 EBUILD librdkafka-0.9.3.ebuild 1292 BLAKE2B b23378509efa2206fb03bc7763fe1ee159fbe2f16983ede1e05971ba1bc534a5ed3617e34d65f42577b85049e641a693a33f11e4eb8c6f21cbdc3b3ab7e98d29 SHA512 a24bb014f1b8fdc8c946b618b0afbbb96a75b925e87d3cf85839c19013516da0a3b622a0373844a353c4022a9aa5b1c91428db0e8995a7d3d92b76934b1d8e86
 EBUILD librdkafka-0.9.4.ebuild 1226 BLAKE2B 62e334f66a75f44e92cd34f9cc23ca5d3f9f52301820f662f55e921741ce49fb53ef9e7de84ba62b8cf329b3718dbbf6611e3cccbd9ae0dd1ea8709afd9e6e53 SHA512 195b6d8f752f432eecf25d53fa3adfa61ed0c89959a582037035adde522814a8d1e0c60b410542e82508fbda5fb0aca1af312779401f932da193fece7accd9f1
diff --git a/dev-libs/librdkafka/librdkafka-0.11.4.ebuild b/dev-libs/librdkafka/librdkafka-0.11.4.ebuild
new file mode 100644
index 000000000000..921e16195487
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-0.11.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs"
+
+RDEPEND="
+	lz4? ( app-arch/lz4:= )
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? ( dev-libs/openssl:0= )
+	sys-libs/zlib
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	local DOCS=(
+		README.md
+		CONFIGURATION.md
+		INTRODUCTION.md
+	)
+
+	default
+
+	if ! use static-libs; then
+		find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index ab66f81eabda..799d1a01d305 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -1,5 +1,5 @@
 DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
 EBUILD libsigsegv-2.11.ebuild 873 BLAKE2B b002a1adfc3c2d26211758114ec9ddfef9288e10083b7fe1f4663bfb357078df8b4d5b6a416b86981cf8bca5da3cc3e6c37c4fcc2876f207d8dd6b1d25d9a78e SHA512 70dc26ea9d120835ce750b60405ca296342203da4078319c02700734f226786f5a01defb5fab42718fa1e3b2791fd5d6ab120d9c66cae4ec61a2874632235024
-EBUILD libsigsegv-2.12.ebuild 797 BLAKE2B 3f4d50b02c2447e0912900bc2d08f11fee8515045fbbb700a64fe7b75a88810510d900d633e49782d1522cb175522c54a5c2860431a01edb8d0f94551295745b SHA512 43681fec4395c73a3e2a095b6f553e3eada18e2c867bad65a13aac03d8479b3eab5b11d40c805ca350c45cf5f27d342ae8c09fe3ff2731496ddcabaced19662a
+EBUILD libsigsegv-2.12.ebuild 795 BLAKE2B 81718c3384a731cae1bb5ff2e888836335d7e5111f850fb1aadbed5982e12312c88e782a461b9a8e4ef118562d295a8096e3d8e44ba726ca9e3e3161754ef718 SHA512 1087e20a780ff156751d486484cb73ae1cdd6d8804fe9ffdb4998b508fb1e297854398d571f100a5feb49834b9dc9ddaaec2782068b21793985179d19f0bfb1c
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
index 92b03ea49dc8..5f6a30721136 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure () {
diff --git a/dev-libs/libtar/Manifest b/dev-libs/libtar/Manifest
index 42b6e9bc6d48..75ced5297f94 100644
--- a/dev-libs/libtar/Manifest
+++ b/dev-libs/libtar/Manifest
@@ -6,5 +6,5 @@ AUX libtar-1.2.20-fd-leaks.patch 2021 BLAKE2B 73e9ca5475e86fc6c5cddee5f608b0a1e3
 AUX libtar-1.2.20-tar_open-memleak.patch 630 BLAKE2B 31616574597017dc5444d0b79aa6084c55f3eedf5c23099663da2905bdf8be8d499c9a81228b268840524e286e06b18c3221a60c95f2e3effbb09beb8c0712f9 SHA512 a37df7b6e1e98298f622c1cbef348861c187409abf6614eafac21d802aaa1418081281db3e03fda0ba9fc5a690f4fb00b61fbe277c4c34c82443d4fe4548e317
 DIST libtar-1.2.20.tar.gz 63542 BLAKE2B 57565fd703aec159a0b30280c026ce82d4a74fc658a24e589c2d9fcf11ff0e8c79de172df8b4cfeefa776eb27bb4b1a65951739ec37de4300da47d508a8d4227 SHA512 360a0296af99bedd6d93236c3d6d6746fd38deaa5287e7a138d303e1072bc8871437a693dc926d82af5b54dedba2ebdff5a3edb1f7d7dc494b4235439e477dec
 EBUILD libtar-1.2.20-r3.ebuild 1363 BLAKE2B a18bc2460adcbd2ca5e453219edafd307d261be4c50035e6861d3590ebd3e2d9d0aaa479f03d995bd22c76191400274ac401ca94cd526bd960d266c92796b83f SHA512 8e7a8081bd465e86f4104931e0cf874c104f620e85dbab7d82cebf8522bb1eca457e1cd02b0882897007d43adf729affa9114b1a4157cc2cf89c31d46b0875ab
-EBUILD libtar-1.2.20-r4.ebuild 1500 BLAKE2B 5b74229aad6c9fb24cede48224eb1f89688fad80132dd1a9520a4934fe4330078e7463974c334f13e358e7026dd2d6352dd1a05ace5ae48a8e87c11cbe5358de SHA512 cd07ed00fa665c6ef7ec521a6f42ba1492f434528c37c4886873eff1d639d762fd381fc3c7561dabb6e47157b15291e2b9feecd6c5bd8153f55b01dc7fe27c04
+EBUILD libtar-1.2.20-r4.ebuild 1499 BLAKE2B 814dc0bb642f92c9877c497bc837db6e52a8bc2f9be50bc760288b74a04cb36de13c0ffe93bfa868df637999fa2c10e0017641c665dccac29e36a348ea0ade20 SHA512 085ce0cf5e77e40025fdb1d0d2eb95d526aa947c9ab7cb41ebcd0185ef9b6a0e57302e7d3c40186d9fd3e9b4837be3da0f5cf242b77a64378f5929584873f13c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libtar/libtar-1.2.20-r4.ebuild b/dev-libs/libtar/libtar-1.2.20-r4.ebuild
index 4a3b780059e8..b9717afbdee3 100644
--- a/dev-libs/libtar/libtar-1.2.20-r4.ebuild
+++ b/dev-libs/libtar/libtar-1.2.20-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs zlib"
 
 RDEPEND="
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 2b5b967d989f..d12c37028343 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -2,5 +2,5 @@ AUX libtasn1-4.12-CVE-2017-10790.patch 2268 BLAKE2B d3261e687f14596ae091951de1b7
 DIST libtasn1-4.12.tar.gz 1888450 BLAKE2B ccd3d5c7bbc9d00fd5be125a60b1705833bee4dff8bd0147cc6a7ed67ed679210984dedcf5d76f701ab53b8d7c127580ddb3162876aea9e1142f518271d12252 SHA512 6c551670949881193e39122f72948e4999ff1ba377f9ee5963d0a4ad1b84256e4fe42e9f6d6a2aa9f7d4ef7acc0e5174fb5cc3df5298524cdeda92f4b8c104f7
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
 EBUILD libtasn1-4.12-r1.ebuild 1361 BLAKE2B 242d6f13825143cd912cc33e684c4026c56fbb534631463e6f9f125920e21cc1f1769d392bb3e9b33158c0111c66bcbf2851cdf8e08543ac486bb53d5314fa40 SHA512 be735c1c8b9b4113adfbe133ebe90d191bd11f32e3b108e55876b48252c5b83a2b0503bfe08b818edc5fa47bc63ffafd60dd40453ce03fa52fc23229155361bd
-EBUILD libtasn1-4.13.ebuild 1311 BLAKE2B cfd6eadb39484adc5ddfb15b11275a5308aa17e5c05126ca6d655835feacf4620c3bd9a0275ed55c6f55dfd8837a6a3c5e144b3b0957460ad8ca2582e9f6a83f SHA512 4759c6450eac07233c31548ec39934c43c26257c169048677a0cf4fdc6b80fdbc09077b31c40acf9a5a5c01ec938dd3a70cdae4496685203ea9d14993d1cd06e
+EBUILD libtasn1-4.13.ebuild 1309 BLAKE2B 8e14f7f420324bf552b54ba84c954b2d2abef13a1870046742052a3e606d07866ccc0e021c834fa25877c480b8cc559c54f13ca5f8aba4f9133576a96ca6ef6e SHA512 cd16e260ae42a63d40f98e4e6032380dcea1aa05f982ad0732acf81f7847491d7dc55a11de224b299e62d20ae684b8b58183ed8443a678621dbd5d4d8a2ab46e
 MISC metadata.xml 347 BLAKE2B d1cb59aca28df43f3b322b98daf2cefd4c91d45120bd47c5cb883dde59ae0ac9b8fcb092e0bd4b51e1f09aff48b97a6e1880568ae6796025a989b67902b01a7c SHA512 2f70d06c9e91e2d9305cce180c302b6b04b4831fd93c1897fd2027a1bf5855700c5531ba3f9c3fe93748df1db923d6ad4ea78bbe3cfd2458c0006457ed43a450
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index 51d99a5e1960..beffdd9cdbeb 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs valgrind"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index ad390c8f42b6..a997aabbe2ef 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -19,6 +19,6 @@ EBUILD oniguruma-5.9.6_p1-r1.ebuild 1367 BLAKE2B 70deefd41dcea8158140baec264749a
 EBUILD oniguruma-6.4.0.ebuild 1155 BLAKE2B 07dfe6707e0ce33eefcfd13693f38c47d40cbfe1ad6d6da73c76f1a271b0af677a5ed611599d8b1a8b1189fe0e2ee6701565dbddc62cbdc3a15261b944ad27bb SHA512 56f20dd2bd854d209674839e80505ef80b14a7dc8b61bc3cdcbba194f63d6a7dfe556ea83a9d78f1fec80fbfcf40fe94fee97bb89877de1e3221600055402f22
 EBUILD oniguruma-6.6.1.ebuild 1112 BLAKE2B 4bf1ae4b3f3b0b4f1202ab94498ccfd27bf5fb761547c84cfb132502ace2b47d709b3fb023d0bdb86dc9c7de15e55587402ec51a0f7235ba6019429c8c56cb3b SHA512 93e21e61a4d46e321088809332b560748adebf2db65f8b690b8945928c09e6199495b2a8b9ecafcb383938debb8ee279e724b5e5c08227e9cebdb43a971dbfd5
 EBUILD oniguruma-6.7.0.ebuild 1025 BLAKE2B 0dda1e53ecdea21e89f9d4045eab988da0217a24d0b55076644eecf913365a75a1345501a7ff9d88d097e44856d9779760fe19658f4fbab6175f6dc24b80b8dc SHA512 4597d01dfb2a8cba6dd36846be059bed3ab8c0867263e693806fe2ec11dbf416a5a3e838da7474375457bcc895db22ee6102dd94bd9ed26ef4cad51a236df5d9
-EBUILD oniguruma-6.7.1.ebuild 1020 BLAKE2B 01d228b779da2149900e403744e5331761c3a549e7be36d0627d3c9e9fda6d4c4f13507353f957f8a8e346ca631de98f75745ef0057a9b6d5f873bf026bcb439 SHA512 b47ffaa6317d3cd07b7d7f0ca4ea3e56b62ddd1d05dd0c4bd1b1acf0a0217629f9bc1bcb5bc85514def929d117317540937f74834efbed52c7987b1f6cde9128
+EBUILD oniguruma-6.7.1.ebuild 1018 BLAKE2B dd84e5bcf595ebb2953ff5a9fa3d14b4dcb9dee3de98ab42de84f4d1abf91ac266123c8ad1ff3c0037ff8f81d2dfb9a1fb7bdd1dea46a34a0d1478e51294b5ee SHA512 f67876f86021a107dc43fc1b979d0278d4c2c1e7bac83c27a726d9b86a93a2a835041d27cac4b2f5bb4ec849eab7ecfab6ea4d1545387ea42bf4d7faa8a6f80f
 EBUILD oniguruma-6.8.1.ebuild 968 BLAKE2B a83d76cf686f58abf1adc1e5c210dc84ec82d5b6f85789a72ad5f5314a4df8166e6c6e98348a107dcd732ec1dc755026db0b887a27fb0c567fd655c06c77a5da SHA512 9d12c6b3e6e41e69f0658ebe45fd09c4f075ced52023080e76c76e38fcca32f2704ec5aaee48d151a64bff4cb4dce8a812f5136699bf927b9237fdb150f94f91
 MISC metadata.xml 898 BLAKE2B e2c9418b8a69edf7d702de74609e6a4122c5a51160869dabe820d07a5f9f2ef478fcea57b9348babe49066b78b6d1b5bd6f60b7798fa0eb8edf13ff4510d7858 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a
diff --git a/dev-libs/oniguruma/oniguruma-6.7.1.ebuild b/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
index 30e6a6134389..42608b7b302a 100644
--- a/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/4"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 1d25feb8b8de..b45cf2427ba9 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -24,7 +24,7 @@ DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131e
 EBUILD openssl-0.9.8z_p8-r1.ebuild 5067 BLAKE2B bbe98db5565577ca9bffa9224a8e1ac2903ec8fdadf23b2f59a8b82a7e71c2c4fb049abdd64ba00966ffbe037f7f9d396667ee61f548c6b4415ed9d055c49602 SHA512 c747f5f2dabd1705cb3dea9f22c5999dca4afab0623eae581137efbb537402cace75a76f3b7751809108fe00959e7b4d30475a6b9002291804149a78bb4e332b
 EBUILD openssl-0.9.8z_p8.ebuild 4990 BLAKE2B 58f2db31a50db3b2053a0d375eb40efbb78cd0f593f0ae2ea8a86c7d477385291e3b40407cefde9dd80e087ca9ef35bbd220e74762fb3d2a36834b3dec019ab0 SHA512 3d2236951d4fabdf29493d5dfe5a104aa32bbc938a003f3b46d793873da6cfb513408b321a96adc3f2b23630e7ef1aa84f61171024d6effdf72c9f57eff28282
 EBUILD openssl-1.0.2n.ebuild 8029 BLAKE2B 03b66a7d81e954f811b87314dd56bce86ba3e2dd4b15678d3a72ee40f03cf8d27fe70493c0727c640c96cf21dcab8b8a6a0f022af8505d68f49e6e024d2166c5 SHA512 0da731451be5903656e4035f7eb30b1565b0b5a9fe277e300e9272bc2bebcd97a1043a5e8ebcf62808f50e7a2f8c9433e15f4a6fa44aa86d5efee94fffce8a54
-EBUILD openssl-1.0.2o.ebuild 8042 BLAKE2B de8fb66a4686a4552a61de1eaabffc8624beeb419c814bcec24ca1df6f2b34081482f95fa2c892788a3d37a44659ce8e75118ca0c06c77ba116c58a04fe0ec6c SHA512 93182c91b30f5f90c303a3fac9d91968fc360d00df6c866f3826cc7e396c0f6e615fe3e6e6d6da981c0077b896dbec291f6c8a143998c007e96936d99006ae2d
+EBUILD openssl-1.0.2o.ebuild 8039 BLAKE2B ea64e4e5eaf760014d2a1ce0144b0a980eef1efd0c40c8202c770e2954a58820017dad793f8431ce047dc885294819055ac564d107be8d5e7c1882adae9fdf58 SHA512 d00bd2024c7d6d35474448f6f21af4cb563a86db45a88905b671b67e534330b72c2dfbd021e6a2cc6c6929b9328d0f60fd55ba27c327e6e5b6bb464594ef1acc
 EBUILD openssl-1.1.0g-r3.ebuild 9123 BLAKE2B ed3a8a8bbbfeadecba97d3a3724b7013967ace24b8a2de53ec8824638ed342e688c411f5edad812f21340a6a42632768c0537edd3d2ae88e9b8f2947fb2ac917 SHA512 422f242d0ad025bf204baa377395f7e57c514c42eb137bf6d75266b9bc97c64f85225f7a1b77881a67e8b2185ad963443bde55c5465aa50eef91d00037c7b92b
 EBUILD openssl-1.1.0h.ebuild 9060 BLAKE2B a826a13c07eb8781e8de306aaaa211688017cd5d9b0ef76a51e4d347bda1c4c7b7e9bd544c10a3724288f2737093527da1585e6c0379f42ae18f78f17722f208 SHA512 8180398aed74bb25baa456d1e993c96af0b0ea4b3f5fc23daaf6d5c6a961c4e4f28f23c67584b871a03a7d98b8d322fec657e7109da619194a23a8df18f46b10
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.0.2o.ebuild b/dev-libs/openssl/openssl-1.0.2o.ebuild
index 37c5f699c032..25a4951caf19 100644
--- a/dev-libs/openssl/openssl-1.0.2o.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2o.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index 5e8a5f736624..d18f7e7d8612 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 EBUILD ptexenc-1.3.4_p20160523.ebuild 1316 BLAKE2B 5bfb94b2c8768f015452935dc3cfab18f49c37c2de9b1adcc077509a99ab654c6f91bb379ca022805aef2bc79cb20c2554ab313566252e25f5ed4937d3b9c4cc SHA512 e3bb57562cb7215109bddafa5182e8636cc32aa0953d98f33b88cd692df4598c85bac94ee9787e6820779607fefd3c2f09c65a77498bb5ae2fd4cd00e409bb09
-EBUILD ptexenc-1.3.5_p20170524.ebuild 1328 BLAKE2B 799fa7d97579d54c2c141b078e2684651357fdea5d2409a95f81037af3a15a525b9c24b5fb9ff88b2565210f86ee27a1e2d44af77e74a60c9229fd3d4720c4fd SHA512 42b23afb1ee91c90d619a9ed310d5c67c71e0635d1300c85c8830166be0ca1c6f0492fe9d7dcaf9c13b58987063448da7b0cd878ec37e789ce99d4aeb8033593
+EBUILD ptexenc-1.3.5_p20170524.ebuild 1327 BLAKE2B 37a8b93e0abc2846e2a45dc45a4874b16632920d21820ce3ce8895c8f1bb67f49a5d477c519789630e05ed02f83cac604d4ebded1262e17494f9ee30090113af SHA512 7a769e6731a0871bfcb844ac415390d506f78d4abf9ed0300705bb334c7e61c156dc5d294653028e6dce5de84e18695d5bb38ad7bd4ca31f57956c42b5335731
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild b/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild
index 502e4b76cbb2..d9740fb14a55 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 78065f2ac872..b98407fbd59f 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,3 +1,5 @@
 DIST pugixml-1.8.tar.gz 357806 BLAKE2B 7f7b9c0a1e51186b6511c53dfd11a3fabbc28343e87fcb98c0480a6b8216bb6dbbfc7bc6bfa7b06b649061910b542747a60c7b04d76b5683f4d823da5f9d4dcc SHA512 f59d83e6685949ab392fb08a60b9153f709697e7c1f93989c3d07ac1817b381fa13b2bea23914de803c4db090e3f503d943db0baf53597f7f8c7d734e8028f42
+DIST pugixml-1.9.tar.gz 377369 BLAKE2B 39b5b0d63a20e9c15c5634e56f82207aed63843d252900db94dbf06d100d03916a16523ccb9de433cc94ded4a9e9d1dc11f47bfd6fd75e348a9a2af31c305db6 SHA512 853a9d985aae537391c6524d5413ef4de237d99d96cc58ea7fe7152f786df1e408cdacd2e4387697e23c3e67cdc1d42b29de554501309eae16d86edd0e24785f
 EBUILD pugixml-1.8.ebuild 587 BLAKE2B d0ebc6c9f3f5f8f2ec7f4f83021ff9738f8998fe3a604134029ea3db35543a3fd764a67eb7bab6324a6b4b9d206c857c29a2349bfd65abaa7a69123c91821279 SHA512 e876cbfa8d2191c3c189e08dda7c54b47d4e89c7107b6618cea1f77b3d59bfd1093e46decda7c0175b465dc23dc63b2dedbf2627efc823b4ab0954df47472968
+EBUILD pugixml-1.9.ebuild 591 BLAKE2B dfe778c940cc68a739f7e8bc51e085f358c23ba1d12bea670fba43ba5981d6f413e6d5f6052504a9db720b269f0ec5568c9335f51f8bc28092e4b23fd31a9f59 SHA512 e5bfa856625b36b6d6b1b034e882fa279d10c4522df99ac804c4a3ea5a0f0d64e4350246beae8f53484c86b1ece325207080d5d448605a54a94b9b24f64e12d3
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.9.ebuild b/dev-libs/pugixml/pugixml-1.9.ebuild
new file mode 100644
index 000000000000..38a691d1f58f
--- /dev/null
+++ b/dev-libs/pugixml/pugixml-1.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake-utils
+
+DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
+HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
+SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
+	cmake-utils_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-10 17:26:49 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-10 17:26:49 +0100
commit	6957f5c65b02bba533954eabc0b62f5de36be206 (patch)
tree	21d8ab8f61dffd9cccc82d0badb68982516a6855 /dev-libs
parent	e91a1aaa5ec8fab37f0fd082ac6024d41c6651e2 (diff)