gentoo resync : 14.07.2018

69 files changed, 857 insertions, 512 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 38fda4f27e86..7d7e7128751d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 188ef258c224..92ee3dae56c5 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,5 +1,5 @@
-DIST amdgpu-pro-17.50-511655.tar.xz 547875548 BLAKE2B c3e396d9846ca15297ecbfd8ff1c9ca3aae6352080f280dc13f2ad4d32da7b84a6d069fd4b64c6e4d9814459cc5cca1ab838295a83ede953a9df6cdcd1387f91 SHA512 d4d995eb596f94656d2fb6e43a2db29bcbfe28e09f75e19e23d1d446de899dbb6e4597ef833955a8b1788055fa848bc14e45a32c820ed8e97c667a784cf816cc
+DIST amdgpu-pro-17.50-552542.tar.xz 549501204 BLAKE2B 37dcda126a3bda4e87b64ce260c7e4b65a1b864363c51f06e3152f152b83a60074331e6a0bf7b831c059a50192dea8add9b38ed16971c87293ce0e56ddf26bb2 SHA512 060e96609cf1a013fddf10db9bba4b512750e5188671a669e2582c28a03213b40d073031e35a617b982374d9d1cd4078f43b27053ee34be7c83873c0814ed196
 DIST amdgpu-pro-18.20-606296.tar.xz 230733856 BLAKE2B 21a498a894a9712d9f0277fae7f704413be0cd01cebbe427008fa3d181d03b58268e74bd3cdaf0dfb9aeca2871dad82b4aa640bbce690ca461e3f3e4acf01ffd SHA512 6575bf963e5714657914d9116de4d9b1835851fe0609b1f072b1fbdf73c068da77aba0eca1c9cce6e05e6cd8f2c1ed6b4bd6ab4ef334be5ff796ee6a3ad73831
-EBUILD amdgpu-pro-opencl-17.50.511655.ebuild 2308 BLAKE2B d0368da6709472e95c19b427bc6bca553c9569994d3ccf58d98e2fecff9fdc1a65a67c91ee6873631e4ebf539232500b433789590c6af547ca12fe42913b4625 SHA512 520e304dc4cd32745db6f7d9ef6286c45a496bbfc60281cf1dc8beedf0acfd078ba72d2cabaa5eb4132d93df74f29b2ae160d0c4bdbc78945c24e33561e1af12
+EBUILD amdgpu-pro-opencl-17.50.552542.ebuild 2324 BLAKE2B 1912cf7ced90db456b26978a516749e5f8531f92479288995ed68c3a4d81882f9e05ac704454c957a3218b3ef6414166d21aeb933ab3e0aeff9942653cfd4297 SHA512 86d9a1b05d85a8c367bf511f1d3739d419ac7c08bc13749d3384a420ffcc7989123626070922af508ebe9b0ea462c96339ef8a050de1544a787035c73f50c419
 EBUILD amdgpu-pro-opencl-18.20.606296.ebuild 1838 BLAKE2B 5d9dc6a2fea24026f87d7273d5281b344ea2d3dbc4090c7516085bda7c5085e9ff9db99bd37945074b69b7d2f4b89fa6b0e452558d041a176cbc1ddadd4a262a SHA512 6a01ae72eaa059aa5d87b9e159ac02b2dcf42de6b85be87d7f2666d2f043ab17bcba0f316948d6d31d2b90c512f482620d2b261a9e86e569cedfc5f2aa852afa
 MISC metadata.xml 656 BLAKE2B 5af3c00c551e7fd2b0de6d8c24421a58986ef20c24b7f2799a428dc7e07e2da4841ce93ade51edae33c0ba79dc55ed6df3452c0b5a610499e7e79e09c31b22de SHA512 5f6933f6ff6dd222a54e4c3609b888182ffd136bb0b58c905624cc9b404091b4e46917cf20d4d24585fa3ed710fb9881f3b6437e015371743d23d07fab488fb0
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild
index 19744b81c4cd..19adb74c35b8 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild
@@ -9,7 +9,7 @@ SUPER_PN='amdgpu-pro'
 MY_PV=$(ver_rs 2 '-')
 
 DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-Release-Notes.aspx"
+HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-with-Vulkan-1.1-support.aspx"
 SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
 
 LICENSE="AMD-GPU-PRO-EULA"
@@ -53,8 +53,8 @@ src_prepare() {
 
 src_install() {
 	into "/opt/amdgpu"
-	dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
-	dolib opt/amdgpu/lib/x86_64-linux-gnu/*
+	dolib.so opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
+	dolib.so opt/amdgpu/lib/x86_64-linux-gnu/*
 	insinto "/opt/amdgpu"
 	doins -r opt/amdgpu/share
 
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index d45eea7f0d09..eac6d2260967 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -1,11 +1,13 @@
 AUX beignet-1.2.0_no-hardcoded-cflags.patch 721 BLAKE2B 033bd173462a38e9a35aedb7090adf6c621c040d3a732dfec12c2807a33ffeebbd3dac85a1bfc500f86b997604c6e66d144653cf2ada95b589fac6f6bd4f2600 SHA512 fdb922091986a60a416f9f7be3487e30974e085f8d1fddf0dba2fdcca155d26523c504289d8775e4943acce01bbb7bd3619c1af5e9a43af8afada276a52506e6
 AUX beignet-1.3.1-oclicd_no_upstream_icdfile.patch 564 BLAKE2B f90bdf1c1a795007e9c9322e43df988267eaa1544b2f896bfc1b0bf333647fff753cc7a2e0ec5715f4251b1c54220590d796e48b8a0d0d1681e30f51247639f3 SHA512 c26772accbd5c2a04f8b8a108b87a518cba5ee4fdd142c7514d67f387080d2d37d6d3e87020b4d44b602dfa0cd6387dad29d5fc1bb75e1d5d090f674f937ddd9
 AUX beignet-1.3.2_cmake-llvm-config-multilib.patch 950 BLAKE2B 9028eede7ee68dfd539bb268914c354eeaac8a9d26647c6dfb030078199e749cf67d2c396305ccaa7a139f10fcc8eca7b36657d4425439137e7199a4e62c4d13 SHA512 9a9a0348b39f0f9d256166141b48e255ccbc03e4d5150e660cfad2c23af8ff67b75049361fa84f2c2c26be2be914ad07efeae5e150f4f390ec7d5503c49b1c74
+AUX beignet-1.3.2_llvm6.patch 1039 BLAKE2B 990a653b7ff52ec89ec1204cc5bae1d0b041ae51da4a16fd1a459abfe083be1e5647e9fdac3b336284fcdb6c460dbd9c151d5818c084d49c0c2d68fb56aed905 SHA512 634ddb79878b017be984c0327160affc06d7acaf17b1030e55542d2d2cc873bebd3808638f0966538b0dd7bca763eda2263f22f818dd0b73167a4ba3f5933aaa
 AUX beignet-1.4.0-oclicd_no_upstream_icdfile.patch 726 BLAKE2B 4d182497c099e174a95524b4bd7bda66c03e128cb089b7536716afda442d8959beab19f0e6015173fbe761f1f569ce065fd1701545ebfdd0680b070644a4d9c4 SHA512 3a77f85cb8f28096b21a77e70f901ccc64291e7439c5e4ae6d7259c30531ea550604f54d0cf910e4482089ab5782f50dcb1940e5df723b0457fdafd550b2b537
 AUX beignet-1.4.0_no-debian-multiarch.patch 862 BLAKE2B 54fb9124832e57b3466c11696cf311d32863bdc36d9f4f4e946958233884f95ad9c212bf63f598e52ad054da79f453fb5a3208958de48e45bd9f21a010309edf SHA512 6760b3b7038ba0dc125998de65ec688b5eb840d8a41543ab35f6d6b6084a877fe0e383bd44b6947695ff835b391794547d7eec21bf787548e6bb03ccf2b73587
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
+EBUILD beignet-1.3.2-r1.ebuild 2668 BLAKE2B 12e4ec730bd82c38086c7b6516353c3d884cc6578f9b73a9d671b409ac1ac1e2c575887252c762b2df2323c098e89c134030850a7919acaa4ada20809d303557 SHA512 3e59792f8235d1f659abfff9be27b69384b01c1bd6cfc6fe15bfbc4d5da0860a12bfe13dd3c506d132695ee739631a413e5f4d70ac481f3348e9c4f5d90d1f57
 EBUILD beignet-1.3.2.ebuild 2630 BLAKE2B 09a301f4174494e0f8007de277f9c3d888361661631ace7e1858a0a4cfec7cac07f494b2187862e447e1079716b9561bc6526422ce8100df54bdaf282de8cf0b SHA512 823a890987d1c6e3c16f9127ebe20947ea09d9114f9e5e42fe97e212d32ae53d44dcfb37aead35608c8b3c2f2214f9c493c99381073cabd4d6ab8872f49762db
 EBUILD beignet-9999.ebuild 2452 BLAKE2B 91b4102d667aa6e265c725f7e77a5bf66198b75569d15a6ea7ea6e89a064639a5783d7670dd7627e47b6ee90124a076fba3abc8a13aeb7f82d3aaf9a7e4ab7a0 SHA512 def37f0a7884bcf1f87f3ec1da46d499a7cb6f8dc216ce51212f72039490f70746a5ca3fe3ab1bc7da481834b16d54c0bdf11f7834de319b5e978e5b641d203b
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..c562b68c13b3
--- /dev/null
+++ b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 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} )
+CMAKE_BUILD_TYPE="Release"
+
+inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
+
+DESCRIPTION="OpenCL implementation for Intel GPUs"
+HOMEPAGE="https://01.org/beignet"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="ocl-icd ocl20"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
+	S=${WORKDIR}/Beignet-${PV}-Source
+fi
+
+COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
+	<sys-devel/clang-6.0.9999:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]"
+RDEPEND="${COMMON}
+	app-eselect/eselect-opencl"
+DEPEND="${COMMON}
+	${PYTHON_DEPS}
+	ocl-icd? ( dev-libs/ocl-icd )
+	virtual/pkgconfig"
+
+LLVM_MAX_SLOT=6
+
+PATCHES=(
+	"${FILESDIR}"/no-debian-multiarch.patch
+	"${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch
+	"${FILESDIR}"/${PN}-1.3.2_llvm6.patch
+	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
+	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
+	"${FILESDIR}"/llvm-terminfo.patch
+)
+
+DOCS=(
+	docs/.
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if tc-is-gcc; then
+			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
+				eerror "Compilation with gcc older than 4.6 is not supported"
+				die "Too old gcc found."
+			fi
+		fi
+	fi
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	# See Bug #593968
+	append-flags -fPIC
+
+	cmake-utils_src_prepare
+	# We cannot run tests because they require permissions to access
+	# the hardware, and building them is very time-consuming.
+	cmake_comment_add_subdirectory utests
+}
+
+multilib_src_configure() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
+		-DOCLICD_COMPAT=$(usex ocl-icd)
+		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	cmake-utils_src_install
+
+	insinto /etc/OpenCL/vendors/
+	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+	doins "${PN}-${ABI}.icd"
+
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
+}
diff --git a/dev-libs/beignet/files/beignet-1.3.2_llvm6.patch b/dev-libs/beignet/files/beignet-1.3.2_llvm6.patch
new file mode 100644
index 000000000000..be3ccbc44325
--- /dev/null
+++ b/dev-libs/beignet/files/beignet-1.3.2_llvm6.patch
@@ -0,0 +1,27 @@
+--- a/backend/src/llvm/llvm_to_gen.cpp
++++ b/backend/src/llvm/llvm_to_gen.cpp
+@@ -322,7 +322,11 @@ namespace gbe
+     DataLayout DL(&mod);
+     
+     gbeDiagnosticContext dc;
++#if LLVM_VERSION_MAJOR >= 6
++    mod.getContext().setDiagnosticHandlerCallBack(&gbeDiagnosticHandler,&dc);
++#else
+     mod.getContext().setDiagnosticHandler(&gbeDiagnosticHandler,&dc);
++#endif
+ 
+ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 37
+     mod.setDataLayout(DL);
+--- a/backend/src/llvm/llvm_unroll.cpp
++++ b/backend/src/llvm/llvm_unroll.cpp
+@@ -205,7 +205,9 @@ namespace gbe {
+           if (parentTripCount != 0 && currTripCount * parentTripCount > 32) {
+             //Don't change the unrollID if doesn't force unroll.
+             //setUnrollID(parentL, false);
+-#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38
++#if LLVM_VERSION_MAJOR >= 6
++            loopInfo.erase(parentL);
++#elif LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38
+             loopInfo.markAsRemoved(parentL);
+ #else
+             LPM.deleteLoopFromQueue(parentL);
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index e3730d3ad009..1e254784d20a 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -1,4 +1,3 @@
-AUX bglibs-1.104-parallel-fix.patch 3908 BLAKE2B 11fb4c08ea3a0a0cdbd4985cbc437eb5a76d4d67c6d7396e0a1297bfdd0a8d0b6a88053464fc17ed3e4493dd6258cfdbc92261779152455c48775cd5f76c9798 SHA512 458b9bcc75084f9157453f52b2cf052fd8db87ec3446f7ddeb7695cd093d3c29cb9ddb6e561bc88cd946065281f4d5287543151f299a2bf5b0f1c21199b9d6bb
 AUX bglibs-1.106-parallel-fix.patch 2142 BLAKE2B 2f51f4bf7980afadc9bed2d701a59cf8c7c4abc628dfd3cae5eb0aa72ef6c2da4e7c5d846a7090d47bfd9be51fe72c7cdba9ddb9da3b3ecf95e59eae121af0a3 SHA512 8f6d1760932416e1f9b83229df89730a191c467b3e05ba7ba4faf4e3f5ef57d16469695fadc39717352be6b8ae7b84d8ba3933b39e4a8a041086c386c84c0339
 DIST bglibs-1.041.tar.gz 317199 BLAKE2B 808bfbc713aaf06c5eb828b4bf0f5b789969afaa078b68292f209d7612860d4a5de793ec8768c63908a48f98841d30a0b2bd9a40b45ce94cb0a539ebcb2cbdbb SHA512 63f1cbef024f528d13a23f84f11b014be2ee9a9c8c40f49f8a114a6b4407c1279860a049f3dd67cfa7306a5326bbb93bb57b134af05031ec3c00f5f49784f6bc
 DIST bglibs-1.106.tar.gz 481564 BLAKE2B 838bd29753b254efc90c8c2c2e4d4920de2e931f823d32393184156f76967ec1995f1e79d2879169dd509cddd298b2389a4ca0109b81245fc617575f3ccf7405 SHA512 c1ae4bb9978b09ffe01231738d1f249c2040a51c2a0bbc4b04389a7085a3885cca6483f1bfe65deca213d991273bb3b7b925ebde8b6e2cd9182d8a57cb9a49d8
diff --git a/dev-libs/bglibs/files/bglibs-1.104-parallel-fix.patch b/dev-libs/bglibs/files/bglibs-1.104-parallel-fix.patch
deleted file mode 100644
index d0717c2dd0f3..000000000000
--- a/dev-libs/bglibs/files/bglibs-1.104-parallel-fix.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Fixes for parallel compile.
-
-- Redirection straight to an output target that is later used for dependancies
-  is not safe. The output file must be come into existence atomically.
-- libtool-2.x writes to .o AND .lo, regardless of the -o parameter. Because of
-  this, if you get a run order of compile then libcompile and makelib
-  simultaneously, there is a chance that the .o file from the original compile
-  can vanish and cause the makelib to fail. To deal with this, we split the
-  libraries target into shared and non-shared, and deliberately call the build
-  process as 3 phases: libs-shared, libs-static, all
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
---- bglibs-1.104/Makefile.orig	2008-04-09 08:24:31.000000000 -0700
-+++ bglibs-1.104/Makefile	2008-11-05 19:05:16.304710791 -0800
-@@ -254,7 +254,8 @@
- 	./compile crc-gentab.c
- 
- crc/crc16_arc_table.c: crc-gentab
--	./crc-gentab crc16_arc 16 0x8005 reflected >$@
-+	./crc-gentab crc16_arc 16 0x8005 reflected >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc16_arc_table.lo: libcompile crc/crc16_arc_table.c
- 	./libcompile crc/crc16_arc_table.c
-@@ -263,7 +264,8 @@
- 	./compile crc/crc16_arc_table.c
- 
- crc/crc16_ccitt_table.c: crc-gentab
--	./crc-gentab crc16_ccitt 16 0x1021 normal >$@
-+	./crc-gentab crc16_ccitt 16 0x1021 normal >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc16_ccitt_table.lo: libcompile crc/crc16_ccitt_table.c
- 	./libcompile crc/crc16_ccitt_table.c
-@@ -272,7 +274,8 @@
- 	./compile crc/crc16_ccitt_table.c
- 
- crc/crc16_xmodem_table.c: crc-gentab
--	./crc-gentab crc16_xmodem 16 0x8408 reflected >$@
-+	./crc-gentab crc16_xmodem 16 0x8408 reflected >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc16_xmodem_table.lo: libcompile crc/crc16_xmodem_table.c
- 	./libcompile crc/crc16_xmodem_table.c
-@@ -281,7 +284,8 @@
- 	./compile crc/crc16_xmodem_table.c
- 
- crc/crc32_table.c: crc-gentab
--	./crc-gentab crc32 32 0x04C11DB7 reflected >$@
-+	./crc-gentab crc32 32 0x04C11DB7 reflected >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc32_table.lo: libcompile crc/crc32_table.c
- 	./libcompile crc/crc32_table.c
-@@ -290,7 +294,8 @@
- 	./compile crc/crc32_table.c
- 
- crc/crc32c_table.c: crc-gentab
--	./crc-gentab crc32c 32 0x1EDC6F41 reflected >$@
-+	./crc-gentab crc32c 32 0x1EDC6F41 reflected >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc32c_table.lo: libcompile crc/crc32c_table.c
- 	./libcompile crc/crc32c_table.c
-@@ -299,7 +304,8 @@
- 	./compile crc/crc32c_table.c
- 
- crc/crc64_table.c: crc-gentab
--	./crc-gentab crc64 64 0x42F0E1EBA9EA3693 normal >$@
-+	./crc-gentab crc64 64 0x42F0E1EBA9EA3693 normal >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc64_table.lo: libcompile crc/crc64_table.c
- 	./libcompile crc/crc64_table.c
-@@ -1025,7 +1025,10 @@
- libpwcmp.a: makelib pwcmp/client.o pwcmp/hex_encode.o
- 	./makelib libpwcmp.a pwcmp/client.o pwcmp/hex_encode.o
- 
--libraries: libbg.la libbg-sysdeps.la libbg-crc.a libpwcmp.a libbg-path.a libbg-instcheck.a libbg-base64.a libbg-adt.a libbg-installer.a libvmailmgr.a libbg-sysdeps.a libbg-str.a libbg-fmt.a libpwcmp-module.a libbg-misc.a libbg-instshow.a libbg-dict.a libbg-crypto.a libbg-cli.a libbg-cdb.a libbg-msg.a libbg-iobuf.a libbg-net.a libbg-unix.a
-+LIBS = libbg.la libbg-sysdeps.la libbg-crc.a libpwcmp.a libbg-path.a libbg-instcheck.a libbg-base64.a libbg-adt.a libbg-installer.a libvmailmgr.a libbg-sysdeps.a libbg-str.a libbg-fmt.a libpwcmp-module.a libbg-misc.a libbg-instshow.a libbg-dict.a libbg-crypto.a libbg-cli.a libbg-cdb.a libbg-msg.a libbg-iobuf.a libbg-net.a libbg-unix.a
-+libs-shared: $(filter %.la,$(LIBS))
-+libs-static: $(filter %.a,$(LIBS))
-+libraries: libs-shared libs-static
- 
- libvmailmgr.a: makelib vmailmgr/req_arg.o vmailmgr/req_init.o vmailmgr/req_write.o vmailmgr/resp_read.o vmailmgr/vpwentry_export.o vmailmgr/vpwentry_free.o vmailmgr/vpwentry_import.o
- 	./makelib libvmailmgr.a vmailmgr/req_arg.o vmailmgr/req_init.o vmailmgr/req_write.o vmailmgr/resp_read.o vmailmgr/vpwentry_export.o vmailmgr/vpwentry_free.o vmailmgr/vpwentry_import.o
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index f12c0452215b..6bc82171c4da 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,6 +1,4 @@
-AUX boehm-gc-6.5-gentoo.patch 2815 BLAKE2B f8d853bcd7f7aff56ae246653feecea291451ab82c946f6ba4d7e981ee1252fddb6455231ff0aca0f7342b93c1b5bbc133b954394b6d0bde766c1b3c39a9f12a SHA512 ba006dda2d3ab295cb14e80f8b7e0908acbde89dbdae46b12b91b111ee1ebc1340ac0b91db8eec18a130a59fe27eda2f7d48f9ea35280c1e9ce3513d3a72779b
 AUX boehm-gc-7.2e-automake-1.13.patch 372 BLAKE2B 5e385b21e4868cee8928d5137c7eb6a5f9acfd20883ea116bc2fe974a35ea4d62866573dc414beec72439d8a1e128b9a4d3e9d9b358c79ebab7ed0f0ec3c3f2b SHA512 19efd52b91b985b31e190b77e5370fb510ad582a54868bb1a7fe54ae57e0625df113ad059a6d636a10f314624137704af8e193460b55c8ba422b9255aadae020
-AUX gc6.6-builtin-backtrace-uclibc.patch 425 BLAKE2B 24bc5443353681d3aa5b4ba592535d5905bc6feded1e8e80927d9aaf8928411e37529cf0cfea5e7a22fff630bda26540ee55ccf68d787018f34024049f1acfb5 SHA512 614dbce788a8e559c25966f9c82343d7ff2b26069f6f77bfa6d91abb755a8d4a46958e9b95f14d1e7e20349dc4df5b32a9e5bdd3eee9e5009a30003214e5f87f
 DIST gc-7.2e.tar.gz 1291186 BLAKE2B 8c320aac2d9deb8fcca2e93622aa122f96c4152d2b18bd284be32d5a041f357beaf8f3142548685fe167642070471862d04c0e6c3ba1c99bc9c05e63d6854005 SHA512 80d1d50e38714b4f198743cd8cd5ab80a35cfbb7f5f9d66c89f40319604e989125870f010d4499876978594a5823d7b61213224a68da8664b9e4f8e14076c999
 DIST gc-7.4.2.tar.gz 1082597 BLAKE2B 5ca30e786a995941fdf2d803d201e7263bdd7d9974a71f672ff259c75ee36dc5d499a614334e570100ddbcb25fd06176f48429b64bad95fb218c35ba584ad4c6 SHA512 2e21516addf268780641ee55c0cb3ecc2d96fa963faffee5beadcade9c6bf1ee49ee1a75b076b5d49ddde7c839fb94f4c3623ca8412d14c2a5bf6ca30d424a72
 DIST gc-7.6.4.tar.gz 1120784 BLAKE2B e7cad27d2144fd37aebad44093e1a0814fe9a1cc887701e485681cdd01f3ea4477150697d535d0873a1255abff0765084119096c7ed61d3caeda439cf2a7644f SHA512 2c85be3e24b85732b3dc6f08fe98cf1a82b6fb2a22ec73090f80920721c737ef92cee8f0cd7ea7228d686005d164e7da54ce3907c3a1ba5eefa43355a472085e
diff --git a/dev-libs/boehm-gc/files/boehm-gc-6.5-gentoo.patch b/dev-libs/boehm-gc/files/boehm-gc-6.5-gentoo.patch
deleted file mode 100644
index 72eb881eef7d..000000000000
--- a/dev-libs/boehm-gc/files/boehm-gc-6.5-gentoo.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ur gc6.5.orig/include/private/gcconfig.h gc6.5/include/private/gcconfig.h
---- gc6.5.orig/include/private/gcconfig.h	2005-08-05 00:03:00.000000000 +0200
-+++ gc6.5/include/private/gcconfig.h	2005-08-05 00:08:42.000000000 +0200
-@@ -1100,6 +1100,9 @@
- # 	endif
- #	define OS_TYPE "LINUX"
- #       define LINUX_STACKBOTTOM
-+	/* On I386 Linux, enable HEURISTIC2 as a backup to /proc data	*/
-+	/* for the case where /proc is missing or nobbled (grsec)	*/
-+#	define HEURISTIC2
- #	if 0
- #	  define HEURISTIC1
- #         undef STACK_GRAN
-@@ -1901,6 +1904,9 @@
- #   ifdef LINUX
- #	define OS_TYPE "LINUX"
- #       define LINUX_STACKBOTTOM
-+	/* On x86_64 Linux, enable HEURISTIC2 as a backup to /proc data	*/
-+	/* for the case where /proc is missing or nobbled (grsec)	*/
-+#	define HEURISTIC2
- #       if !defined(GC_LINUX_THREADS) || !defined(REDIRECT_MALLOC)
- #	    define MPROTECT_VDB
- #	else
-diff -ur gc6.5.orig/os_dep.c gc6.5/os_dep.c
---- gc6.5.orig/os_dep.c	2005-08-05 00:03:00.000000000 +0200
-+++ gc6.5/os_dep.c	2005-08-05 00:07:56.000000000 +0200
-@@ -967,7 +967,13 @@
- #   endif
-     f = open("/proc/self/stat", O_RDONLY);
-     if (f < 0 || STAT_READ(f, stat_buf, STAT_BUF_SIZE) < 2 * STAT_SKIP) {
-+    /* if /proc/self/stat isn't available, and HEURISTIC2 is possible,  */
-+    /* return NULL so that HEURISTIC2 will be tried.  Otherwise bail.   */
-+#	ifdef HEURISTIC2
-+	return (ptr_t)NULL;
-+#	else
- 	ABORT("Couldn't read /proc/self/stat");
-+#	endif
-     }
-     c = stat_buf[buf_offset++];
-     /* Skip the required number of fields.  This number is hopefully	*/
-@@ -983,7 +989,16 @@
-       c = stat_buf[buf_offset++];
-     }
-     close(f);
--    if (result < 0x10000000) ABORT("Absurd stack bottom value");
-+    if (result < 0x10000000) {
-+    /* if stack base result is silly (e.g. is 0 due to grsec), and	*/
-+    /* HEURISTIC2 is enabled, return NULL so that HEURISTIC2 will be	*/
-+    /* tried.  Otherwise bail.						*/
-+#	ifdef HEURISTIC2
-+		return (ptr_t)NULL;
-+#	else
-+		ABORT("Absurd stack bottom value");
-+#	endif
-+	}
-     return (ptr_t)result;
-   }
- 
-@@ -1045,6 +1060,12 @@
- 	   result = GC_freebsd_stack_base();
- #	endif
- #	ifdef HEURISTIC2
-+/* if both LINUX_STACKBOTTOM and HEURISTIC2 are enabled, try HEURISTIC2	*/
-+/* when the LINUX_STACKBOTTOM returns NULL (indicating failure to get	*/
-+/* a sensible result from /proc/self/stat)				*/
-+#	    ifdef LINUX_STACKBOTTOM
-+	    if (result == (ptr_t)NULL) {
-+#	    endif
- #	    ifdef STACK_GROWS_DOWN
- 		result = GC_find_limit((ptr_t)(&dummy), TRUE);
- #           	ifdef HEURISTIC2_LIMIT
-@@ -1062,6 +1083,11 @@
- 		    }
- #	        endif
- #	    endif
-+/* tail of extra 'if' condition when both LINUX_STACKBOTTOM and		*/
-+/* HEURISTIC are configured.						*/
-+#	ifdef LINUX_STACKBOTTOM
-+	    }
-+#	endif
- 
- #	endif /* HEURISTIC2 */
- #	ifdef STACK_GROWS_DOWN
diff --git a/dev-libs/boehm-gc/files/gc6.6-builtin-backtrace-uclibc.patch b/dev-libs/boehm-gc/files/gc6.6-builtin-backtrace-uclibc.patch
deleted file mode 100644
index 1d3e5780e74d..000000000000
--- a/dev-libs/boehm-gc/files/gc6.6-builtin-backtrace-uclibc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/gc.h	2006-02-25 15:49:52 +0000
-+++ include/gc.h	2006-02-25 15:50:00 +0000
-@@ -473,7 +473,9 @@
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-      && !defined(__ia64__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
--#     define GC_HAVE_BUILTIN_BACKTRACE
-+#     ifndef __UCLIBC__
-+#       define GC_HAVE_BUILTIN_BACKTRACE
-+#     endif
- #   endif
- # endif
- # if defined(__i386__) || defined(__x86_64__)
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 08ec0fd7dcaa..d17dc9a6bc47 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -8,5 +8,5 @@ DIST pcsc-cyberjack-3.99.5final.SP11.tar.bz2 965662 BLAKE2B 568eb77c9b35557fb9f4
 DIST pcsc-cyberjack_3.99.5final.SP03.tar.gz 1485952 BLAKE2B 5dc9d5330b4b25c23e4704a0c2ed648e9ef0fb929c7f221373fd7128b77fea223480119a5dc28aa81bbe19fb5355bfd421bc93f214ebed89ee44836c7d8f0b40 SHA512 a091a09b501d7a7c757f0a458007f44ac281cbeaaf5bc3c2aa89915ee7a39478e6f80b6f24fec77be753c8d77deeda2858b7a806e3c982f54c199bd797288e05
 EBUILD cyberjack-3.99.5_p03-r1.ebuild 1564 BLAKE2B 44aacda78c6d6b7bafde573263c657d2328fee5441eea6e99c4589d6e10e6066f5ade3727e85fa2ad9165270b7783a61b0a6a3d783a6b31fcfdfd9a8d9ca7451 SHA512 e0ead9d16cb78ae488b72554523c2ad82ede4b06e7fba215fbed9ed2723174fd56f904826d860f7c5e611e1a293c940f51a539d3db222377fa30207c6df881d6
 EBUILD cyberjack-3.99.5_p10.ebuild 1802 BLAKE2B 08f02559fc2d93119bc4cb04a94244b90b32d2196cc0a4af052614f26ece9f5df89374537d6afef7e01ad4078bea840066ffa1966a1a2c46207d1beffdda20be SHA512 4022da1cdf0a2772c64138d0760d40272a1fa53f1650fc40c4e9eef42cf3ef4c4bcdb8675f4499240f06a210681f34121c3921423a5b93e5b280c69785ceeb80
-EBUILD cyberjack-3.99.5_p11.ebuild 1801 BLAKE2B 2a473e018d4a4187877b3b6b75dbd9e9f38e3354700c478f3ca657747d0fc08ed7023d98d1629721ec99ab5c3d514d64fb96497ae6ba407e8c8f267a5f3ad6c1 SHA512 cc7d743fae5ffd2630531f1c4ca1183d8c5e8e3f99788c99586bce8e55c5a093e5b016f9b55a688153b3cb89553b7b1b8530cfd3430cf48907dc01ef01e26daf
+EBUILD cyberjack-3.99.5_p11.ebuild 1800 BLAKE2B f19269d69cfcb7e080213d5b06e11b9f39c839b76f0bb5dc35aa4f2411fc7af4a9f5d7e38b4a93c4aee8519cf4a4177424fa54724f7d777315ce4205f5ea7e29 SHA512 801ed1eb4d1e075ea51ff068bb9ba817eeb9bb5e0dbae0b41121b562439d9ba9b096cde776c8bffcf441a26a6e246e97b48d9499c280586870cd60b1d7139bfe
 MISC metadata.xml 282 BLAKE2B b5bcb715b56152d697265edd126e2beed5fd199f4c7935ed86952ed171ccf13e57ffbe45ef133de75cc25e529814b42ca06d2c2dcfd0cb02e8b9f3c590b75183 SHA512 a054fd64db7cd889a3fc6f1606814fc50f3ddb9e1a96ae3ec7e707c9739d263d456a8a8c431f8a04a75da40a7848779b7552935687b6713a86996a6b1efacec3
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p11.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p11.ebuild
index 7ea7c028a444..72c222da879f 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p11.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://support.reiner-sct.de/downloads/LINUX/V${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs threads +udev +usb"
 
 # FIXME:
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 8ca29ff306b7..93bb7028b417 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,6 +1,4 @@
-AUX double-conversion-2.0.1-scons.patch 350 BLAKE2B 870bb737ed41db86f438743cbb0b19f5fd681438b32647b9a4aa8ade15b36bef7a879a571f1952eccb1a612a9601a3d9d58f808f94488b1541256979f0ec3a41 SHA512 d0f89b18e870f384c729faa993eb72cdd449fe293c2a9a3885dcba0e93884d4e9fc2fad38828798e9ff999f1519f31f9569ae1de1deeae0dff740df7ac16b6f7
-DIST double-conversion-2.0.1.tar.gz 7014148 BLAKE2B df8df63f601076bd827ef95b2a2cde8bec6a85fb6ee81a879556481a168c2a101b3ca130ed6f45ca515281ea139e4a607a03934b05fc0a2fe5bacdf56033f2b3 SHA512 a4773dc95e9267d8426dda976586aa1ba968ead28b118caae9b1b7c123d1eea4aba5b588fde9a109a99a068a79a3a2426f12d6caadea8c548d4250e56eff33a4
 DIST double-conversion-3.0.0.tar.gz 7019526 BLAKE2B 631973dadefa8bbf7e4acffd44968dfbf6b7dbeeb045fbbe0df7824a890991f510131647a52646fcd2b069b8b886a7b66a82434b829bdcb58bd8f503fecc7d18 SHA512 5057af6e72f2aaace56ebdd9a0ddfa34318cbdfeabec5c361b60e6c92f160c8999c046c50f8c6f8d590eb8e97aa70bb6e97ba8148f0dc95dbc42f204fcdc1abf
-EBUILD double-conversion-2.0.1.ebuild 1053 BLAKE2B 4ba64d131e5b5f954ba588ffdc1ae6bb6e51165d9a8d32776bb81be49cd31b33ab790bca1c0dd8f587f701bd43033fb0ad91f4efa86bca8b091e2c6dd1aa3e7e SHA512 dd9bbe6cfd4d816dd6595a76cbf223eecbd8122966bdca2050f3835610fead7ace07c478f1fbd27c291e26f1bea80898eac7f6ebfcf02730d7b896109905fb7d
+EBUILD double-conversion-3.0.0-r1.ebuild 1353 BLAKE2B 5349043968384e1246fe72a352d967dd45ab5e0387da1fd1ea9fa6df5a04fa7038c07a9836861ccd70432c7c5cc052b224ade8701138f26b46d5f7fd69bf0bfe SHA512 5cf8c41a67bea073dbd871aef16103457e5fc26ef4e138b75154821d66c7bd8617cf4291de90bb1e8359e25e87d243ed7d7eb838f3bb77e60f3a14f9a87a6dbe
 EBUILD double-conversion-3.0.0.ebuild 617 BLAKE2B eeeab151a1432c666abf6e5c4340a838d4961b857b7e7ff54f41e39b05915333cb02e18aa53ed38fbcc4894a15d3fdb54ecad429f6c21142e551f8cf08f72cab SHA512 35369bd050c61dbd0ca29f12e360ea81a9320646aeba2763455cedbd746959fcb868eedeb334e2557af717a73350cc5508aac61f3ce910b594ba91210c035ce4
 MISC metadata.xml 606 BLAKE2B 6c92fbf6c8247fdaa5f1cdf29f58b91b8374d8b8b4785a408145584030dfd06ba939999626575ea97bd7fcd65c2774f4e0bee6844a00e0f1c28d89f8e117d79f SHA512 0d6b6503f8ac11ede082ac8a1ec267620d5e6cbdb151ebd20cd775e9b832e396c434e6ef6e843d13ceedb9cea7dae002e93564d823161f4ff845053699c3312a
diff --git a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild b/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
deleted file mode 100644
index 15ab24390e36..000000000000
--- a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit scons-utils eutils toolchain-funcs
-
-DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
-HOMEPAGE="https://github.com/google/double-conversion"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-LIBNAME=lib${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-scons.patch
-}
-
-src_compile() {
-	sed -i -e "s/g++/$(tc-getCXX)/" SConstruct || die
-	escons ${LIBNAME}.so.1
-	use static-libs && escons ${LIBNAME}.a
-}
-
-src_test() {
-	escons run_tests
-	export LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}"
-	./run_tests --list | tr -d '<' | xargs ./run_tests || die
-}
-
-src_install() {
-	dolib.so ${LIBNAME}.so*
-	use static-libs && dolib.a ${LIBNAME}.a
-	insinto /usr/include/double-conversion
-	doins src/{double-conversion,utils}.h
-	dodoc README Changelog AUTHORS
-}
diff --git a/dev-libs/double-conversion/double-conversion-3.0.0-r1.ebuild b/dev-libs/double-conversion/double-conversion-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..786bdf2fd13a
--- /dev/null
+++ b/dev-libs/double-conversion/double-conversion-3.0.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multibuild
+
+DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
+HOMEPAGE="https://github.com/google/double-conversion"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+		if [[ ${MULTIBUILD_VARIANT} = shared ]]; then
+			mycmakeargs+=( -DBUILD_SHARED_LIBS=ON )
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=( -DBUILD_SHARED_LIBS=OFF )
+		fi
+
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+}
+
+src_install() {
+	myinstall() {
+		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_install
+		[[ ${MULTIBUILD_VARIANT} = static-libs ]] && \
+			dolib ${BUILD_DIR}/double-conversion/libdouble-conversion.a
+	}
+
+	multibuild_foreach_variant myinstall
+}
diff --git a/dev-libs/double-conversion/files/double-conversion-2.0.1-scons.patch b/dev-libs/double-conversion/files/double-conversion-2.0.1-scons.patch
deleted file mode 100644
index da7f2f9cb3a6..000000000000
--- a/dev-libs/double-conversion/files/double-conversion-2.0.1-scons.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SConstruct.orig	2014-03-31 12:40:22.186757814 -0700
-+++ SConstruct	2014-03-31 12:46:21.726024868 -0700
-@@ -18,7 +18,8 @@
- # for shared lib, requires scons 2.3.0
- env['SHLIBVERSION'] = '1.0.0'
- 
--CCFLAGS = []
-+CCFLAGS = [os.environ['CXXFLAGS']]
-+
- if int(debug):
-   CCFLAGS.append(ARGUMENTS.get('CXXFLAGS', '-g -Wall -Werror'))
- if int(optimize):
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 8cd608ad776f..00d28093264c 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -4,5 +4,6 @@ DIST efl-1.18.4.tar.xz 64609944 BLAKE2B b36e5ee7c64a57772c5826e990a85110fffc3488
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 EBUILD efl-1.17.0-r1.ebuild 7068 BLAKE2B e0ce5cf1e86f41918799a7ceebfa341726ea9a700c7e2e4d89acedaf595171b12bef11261fed2bea14c4099fa63fcf063d0eddb49c1dcf490449f936ec4dd1c8 SHA512 a5293c2f97a4976fe3681ad8da97918f37a0bd47bf37cf38d4f025ad7512782e967deaef1d2f80c624ccf57c8b68b74f8288a9b223f710dcee3bde515d454be2
 EBUILD efl-1.18.4-r1.ebuild 7298 BLAKE2B d88740f4081b53d274f36e1f8200dd917030b6246cc88d8f9f2b24569ff79a69f2b7e68e76d61e2123297315850d03c3273894ffc0a508d425724fb25395ddd3 SHA512 2e2992916f6af3acec5af00c3d5c3e781414fb2c35c13000a18786dfd0e46ba27506130010900cbe75da80f33fa62410ccfb597be4b77d2770773bdf87be7faa
+EBUILD efl-1.20.7-r1.ebuild 7785 BLAKE2B 6f9cff3f6fbf9a8169251b5e89b447cf20a9d9a187efe24681dc6d6e5e6fa912018df393444fd7720d0605116c68f0ad0c7173192ca720ccb3472da57d11e6b0 SHA512 3433be6e2fe8913671f8028fbd2566ea98fb4f14c9184086f4bd13760aaa153769b024dd57faa7e0c5327b6de961f55175c5d35ecc515b7e76a11c595f6e0d0d
 EBUILD efl-1.20.7.ebuild 8732 BLAKE2B a9d1650012beaabce5e423b9d15ac362e9298f30ca67033950f1fd2fcf0ea233ac7c1f923c3f7ecefa04cffe52d4e4bc4017e6ec68049c7588c51f2436dee513 SHA512 befffaca4129e3ddc6a4db04efa0c58a04eef1343f656b22541c0423fffaa7f9e63fd62d1d53171c5cb874ae0494de77a1f0d4c95307dfe1dc8c5d6b1af1d791
 MISC metadata.xml 2292 BLAKE2B f2d83b012b8bbeef3f7841290eb25016ebdd042c2afe66e04b7ceabbb1ef3b627bbaef099047e4b0f9ce364c7488bf06369f4b140b8c5b3f8fe639f59dd2d2d0 SHA512 efdbe9d36bda51b5184e7a664f945c70fb776509c6e3826f2801b0cf5a6dac8cd1304e3e041c130b665acc36f9ef53180648b4a09b15bbf2b1b7265f824cefa1
diff --git a/dev-libs/efl/efl-1.20.7-r1.ebuild b/dev-libs/efl/efl-1.20.7-r1.ebuild
new file mode 100644
index 000000000000..f50a671f5ca6
--- /dev/null
+++ b/dev-libs/efl/efl-1.20.7-r1.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils pax-utils xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="avahi +bmp dds connman debug doc drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
+
+REQUIRED_USE="
+	?? ( opengl egl )
+	?? ( opengl gles )
+	fbcon? ( !tslib )
+	gles? (
+		|| ( X wayland )
+		!sdl
+		egl
+	)
+	ibus? ( glib )
+	opengl? ( X )
+	pulseaudio? ( sound )
+	sdl? ( opengl )
+	vnc? ( X fbcon )
+	wayland? ( egl gles !opengl )
+	xim? ( X )
+"
+
+COMMON_DEPEND="
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib:=
+	virtual/jpeg:0=
+	avahi? ( net-dns/avahi )
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	egl? ( media-libs/mesa[egl] )
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib:= )
+	glib? ( dev-libs/glib:2 )
+	gles? ( media-libs/mesa[gles2] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	harfbuzz? ( media-libs/harfbuzz )
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:0= )
+	libuv? ( dev-libs/libuv )
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( dev-lang/lua:* )
+	nls? ( sys-devel/gettext )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	pixman? ( x11-libs/pixman )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? (
+		media-libs/libsdl2
+		virtual/opengl
+	)
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	systemd? ( sys-apps/systemd )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	valgrind? ( dev-util/valgrind )
+	vlc? ( >=media-video/vlc-3.0.0 )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	X? (
+		media-libs/freetype
+		x11-libs/libXcursor
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+		gles? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+			xpresent? ( x11-libs/libXpresent )
+		)
+	)
+	xine? ( media-libs/xine-lib )
+	xpm? ( x11-libs/libXpm )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	!media-libs/elementary
+	!media-plugins/emotion_generic_players
+	!media-plugins/evas_generic_loaders
+"
+
+src_prepare() {
+	default
+
+	# Remove sleep command that forces user to read warnings about their configuration.
+	# Back out gnu make hack that causes regen of Makefiles.
+	# Delete var setting that causes the build to abort.
+	sed -i \
+		-e '/sleep 10/d' \
+		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
+		-e '/BARF_OK=/s:=.*:=:' \
+		configure || die "Sedding configure file failed in src_prepare."
+
+	# Upstream still doesnt offer a configure flag. #611108
+	if ! use unwind ; then
+		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
+		configure || die "Sedding configure file with unwind fix failed."
+	fi
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myconf=(
+		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
+		--enable-cserve
+		--enable-image-loader-generic
+		--enable-image-loader-jpeg
+		--enable-image-loader-png
+		--enable-libmount
+		--enable-xinput2
+
+		--disable-gesture
+		--disable-gstreamer
+		--disable-image-loader-tgv
+		--disable-tizen
+		--disable-xinput22
+
+		$(use_enable avahi)
+		$(use_enable bmp image-loader-bmp)
+		$(use_enable bmp image-loader-wbmp)
+		$(use_enable dds image-loader-dds)
+		$(use_enable drm)
+		$(use_enable drm elput)
+		$(use_enable doc)
+		$(use_enable eet image-loader-eet)
+		$(use_enable egl)
+		$(use_enable examples always-build-examples)
+		$(use_enable fbcon fb)
+		$(use_enable fontconfig)
+		$(use_enable fribidi)
+		$(use_enable gif image-loader-gif)
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable harfbuzz)
+		$(use_enable hyphen)
+		$(use_enable ico image-loader-ico)
+		$(use_enable ibus)
+		$(use_enable ivi wayland-ivi-shell)
+		$(use_enable jpeg2k image-loader-jp2k)
+		$(use_enable libuv)
+		$(use_enable !luajit lua-old)
+		$(use_enable neon)
+		$(use_enable nls)
+		$(use_enable pdf poppler)
+		$(use_enable physics)
+		$(use_enable pixman)
+		$(use_enable pixman pixman-font)
+		$(use_enable pixman pixman-rect)
+		$(use_enable pixman pixman-line)
+		$(use_enable pixman pixman-poly)
+		$(use_enable pixman pixman-image)
+		$(use_enable pixman pixman-image-scale-sample)
+		$(use_enable postscript spectre)
+		$(use_enable ppm image-loader-pmaps)
+		$(use_enable psd image-loader-psd)
+		$(use_enable pulseaudio)
+		$(use_enable raw libraw)
+		$(use_enable scim)
+		$(use_enable sdl)
+		$(use_enable sound audio)
+		$(use_enable static-libs static)
+		$(use_enable svg librsvg)
+		$(use_enable systemd)
+		$(use_enable tga image-loader-tga)
+		$(use_enable tiff image-loader-tiff)
+		$(use_enable tslib)
+		$(use_enable v4l v4l2)
+		$(use_enable valgrind)
+		$(use_enable vlc libvlc)
+		$(use_enable vnc vnc-server)
+		$(use_enable wayland)
+		$(use_enable webp image-loader-webp)
+		$(use_enable xcf)
+		$(use_enable xim)
+		$(use_enable xine)
+		$(use_enable xpm image-loader-xpm)
+
+		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
+		--with-glib=$(usex glib)
+		--with-js=none
+		--with-net-control=$(usex connman connman none)
+		--with-profile=$(usex debug debug release)
+		--with-x11=$(usex X xlib none)
+
+		$(use_with X x)
+	)
+
+	use fbcon && use egl &&	myconf+=( --enable-eglfs )
+	use drm && use wayland && myconf+=( --enable-gl-drm )
+	use X && use xpresent && myconf+=( --enable-xpresent )
+
+	if use opengl ; then
+		myconf+=( --with-opengl=full )
+	elif use egl ; then
+		myconf+=( --with-opengl=es )
+	elif use drm && use wayland ; then
+		myconf+=( --with-opengl=es )
+	else
+		myconf+=( --with-opengl=none )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if host-is-pax && use luajit ; then
+		# We need to build the lua code first so we can pax-mark it. #547076
+		local target='_e_built_sources_target_gogogo_'
+		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+		emake -C src "${target}"
+		emake -C src bin/elua/elua
+		pax-mark m src/bin/elua/.libs/elua
+	fi
+
+	V=1 emake || die "Compiling EFL failed."
+
+	if use doc ; then
+		V=1 emake -j1 doc || die "Compiling docs for EFL failed."
+	fi
+}
+
+src_install() {
+	if use doc ; then
+		local HTML_DOCS=( doc/. )
+	fi
+
+	einstalldocs
+
+	V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed."
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index b7d6eb42172a..17260d41e75b 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -4,5 +4,5 @@ AUX gjs-1.43.3-disable-unittest-2.patch 1119 BLAKE2B 8ab995513b63faee201f84ec45f
 DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 EBUILD gjs-1.46.0.ebuild 1559 BLAKE2B 8e46f9f4a7f06ed43132e023b25203eef301345e8de0d52183edb25c07b79fc1dec1c2285ea5b4b57b4923092e165901ebba049362cbce73c50a377b4a7e5d0e SHA512 083fd06684cd111f77b35f251c9d1418614550947366e838408daa2f214204d530273a2954304f6e3aba092c8160dec9ae581d7422f033cbf3aaaf72ec99ccae
-EBUILD gjs-1.48.7.ebuild 1554 BLAKE2B 7576294fc5a5630c02b322a16ffd3217f17a291b1ac3642e67d7fc580aa21e1325e0d6a3e5a06fb71e62f0196e7b4660ec13b3ae5b58e552d153f53cfb29a9cd SHA512 afa6f9b1ca4069ca1aa61ff8538046de97c7bb7c737c2726108eb272efc24be1060a9ee698d90c4980bc838ac9c0db2aefd5285a602be6e6e4dd176a0b0e398f
+EBUILD gjs-1.48.7.ebuild 1553 BLAKE2B 2557beed75a4747209898983b0bd3ebf863ff3f1d40a1e6f3c8c85b9e6b15ae948b3b081488d7b6a0fc03d5bb1dd108bc218918614ff4ed7d42b87a8451717a4 SHA512 92004a2797688b4e275d83185d655cd2c027f53c768fc039223e2db2bfcd8a2d0703cf01e9b4886d6a97dce53f71619a68d05179a13db331c16e40950a354f02
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index 419fb94e3157..910ff1edc3e1 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.52.1
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 4f911e427bb2..3235cbd78a39 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -4,6 +4,6 @@ DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43d
 DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942
 DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD glib-2.52.3.ebuild 9548 BLAKE2B 102e4af3df4cb0f0e77c9a0dfbffc3497a14c13cbeee958541271524b597c4a000e31bb2e7adfb20d922fe82014eced5aabdc0297f0c788b27a2d2d66e39f733 SHA512 9467435bed65be8321b0f7f1e0817562b26d672f86befd4b64865b41ec3096bc21dc7d745bb63eafd6a71d757907f64a792dce7bd91b8c4953852cbae53efb05
+EBUILD glib-2.52.3.ebuild 9547 BLAKE2B 042a59e8fdee8c0de912c224e2bd51aad8ce17ccfb33c123ef5a52225f1b993e9133469fd4e1577d27c47effe3315e0117f64acf41fccdba760f38df83acb6e3 SHA512 82508386cbee8cf9e49a04c22ce5a81bfd62b9aef1270da2ed885081797e6229a74a4313cea713830df6d74b99dbb7acb1f07bf7b0e588208656eb37a81143c6
 EBUILD glib-2.54.3-r6.ebuild 9994 BLAKE2B 8a9162033333ef27f21acbd0fb50e6dd3a4013526b26c552e0341696c76d00c8ca10cb63c4c23c0294ab3a2320a86a0c06b517255a67ef523260fac773fbd0f7 SHA512 e7ded5b7f76af59137d7b7fb5d97dee7c09d2e1c246d1fc285103c95454beb81bdd7f1f48d80ee946f4073d4d53f34e3b8365a6b715dd7442022de8bb8a46c11
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.52.3.ebuild
index 4b6663a76acb..c85788d6d53e 100644
--- a/dev-libs/glib/glib-2.52.3.ebuild
+++ b/dev-libs/glib/glib-2.52.3.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index d719587c943e..44d8197ec547 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,3 +1,3 @@
 DIST granite-0.5.0.tar.gz 365015 BLAKE2B 47b88d0b08a300fecc561161e1722cc1a544f58580d21244b6584f6aba7756afe6548dd663620fe9a09406fc0be2766b1d1093a21d262a5ab001992f309239ed SHA512 6042f40c1338768281ab3e6ad0bfdd8c5c69fc4951a069b0779a22b8999b35110ea8f09cf025dd88bafef7eca6cc0d076a608d55f01c078186e150908f8e4650
-EBUILD granite-0.5.0.ebuild 1267 BLAKE2B c6043b9761e43c643a1d45c0c4ee940f6e597e49c2f97b3fca1bcc2eefb545341c67b0dfdae127c82a36865893e1541daa10e00c6bb392fc4567b6b89a0d0508 SHA512 d16d0e0f029cb967a802b2550b9a65402f89e8d0429561429e1dcccec3eea20efb3675041348328ec5313aefffccc0440bbb0052fa4bf91224f3a77add2e66b3
+EBUILD granite-0.5.0.ebuild 1233 BLAKE2B df2d0807d42020aa0179cf75b6ed3e6ce8f4c86fd17ee98ffc75220ddf08cc6cde6e472e7088ea493b843aaeabbfba863516873bd23a398e5a8e3531c880d6c7 SHA512 7cb63a7489f868bec6c6617d173f9faebc7012ca28a5f7ce5624f15eb9c3d6e9e8fea68913ec88d016162abea69f491ecb854414a4a8b9c87b49d12c3b89bdf8
 MISC metadata.xml 829 BLAKE2B 39f7f389875b4e27aa0657a3f2dde9d99e6cc18de9e2cbd24e9a7e7b441823255a04972cd470e04bccfd4db803ff05c0c5be74d592564129d1dff137294fc934 SHA512 152c9807840842a1388a9e10723af0eb7aeb198444f85eb27cd19a3a0233374e3c60c9c2c34319b1549a5cb59d71cdeba075f0f36fb784c69fd78059367e1a91
diff --git a/dev-libs/granite/granite-0.5.0.ebuild b/dev-libs/granite/granite-0.5.0.ebuild
index 94fbcf91b3ab..abb46af52627 100644
--- a/dev-libs/granite/granite-0.5.0.ebuild
+++ b/dev-libs/granite/granite-0.5.0.ebuild
@@ -41,7 +41,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
 		-DVALA_EXECUTABLE=${VALAC}
 	)
 
diff --git a/dev-libs/grok/Manifest b/dev-libs/grok/Manifest
index 211356bdd037..46ae264dc8b3 100644
--- a/dev-libs/grok/Manifest
+++ b/dev-libs/grok/Manifest
@@ -6,6 +6,6 @@ AUX grok-0.9.2-libdir.patch 1223 BLAKE2B 7a303aa738c98f9ff11bdb76e28d7b0ef13beb2
 AUX grok-0.9.2-libtirpc.patch 665 BLAKE2B 21c00cba5fd0bb68104c8a5cdd886d8d634463afc41fce2bcc5384ff80bd32bb5ef75b53ca25f2463e35f276fe1efc1677f3075d73d3fe5a4b77df1f593e9a3e SHA512 565d08bd4f2d58f5db4f095cc5276077fb9c3de159ecc54c65825d2d8db1af56e6c5c567d5259cbf4b866c6e99d996f5c94b36c7bbd40162088ee74321c32a33
 DIST grok-0.9.2.tar.gz 243554 BLAKE2B 390f9a252668af2ccf90c5ea91e5182bf91ed0b66fd354d77f67c13a2e4c08aa244ba290adae687f7cdacea24fdb561fa378456d1d7bed07b3f44e0b46dc1adf SHA512 91d410259e89de6fbab011691cf56497158bc7a508194e6d17a2b32c8b70650be3b40c4792390589929b0f553a92b81cd3981e84ddcbe6a6ea80ab8fcdb38b2e
 EBUILD grok-0.9.2-r1.ebuild 797 BLAKE2B fdcac4abcd8b3ed5fa3b88822c27f2c8b163dc20109367adef8112a4e4ab3d5b7d0fc6ebc10aa1746b0d54b5c74986e282c7d20be4fadd6634bc83228dd0c6a5 SHA512 4ec5c6a91ae7eefccf96fb686665bc19a64d3758bbcd63bd1b37bef7825458c9cd7a23c0bbb9b17e96bcb6137aa096b8ca09230de902b49b7f515c38ade25d2b
-EBUILD grok-0.9.2-r2.ebuild 984 BLAKE2B c8284ef78def0ffcad299b3afc5422977311d4e70949ddb3bc6bd9a8f7a76506a33d200dd7d0e90523e70d0f346ff52785a8c5db8c1a14035190a8a5fe713a93 SHA512 e12bd75a7af382677361a7086eb625f9e805c760fa4461e48e6e076a7ad564b0fee0bae7b0b2e01b96cd3254728e73d811d0b3598b0e00e551c9f5949fd89f01
+EBUILD grok-0.9.2-r2.ebuild 983 BLAKE2B 1f23432272f3b36224cfde1188760ebb5c53d4f954c6fb95f517126b0054e5e88c62f2b6cc6870a5e06964db64561dbec9dbb04d63edb4618a494e498db69604 SHA512 05e12a456540a6de2a34752297aadf61c86c5529c3bd11f4d5a94acc14a127147bc64b88db76fba46773ac3052b6a1da48e544dcae74565adf0ba4d6cd0277b9
 EBUILD grok-0.9.2.ebuild 660 BLAKE2B d44f0f9c6e52b1acfa47319c5679c39343b0143456bbd1aa124625f2ca04b19269531bca78a054abd410e0124964b9f50eeabfe0656515c0c159fd3027603021 SHA512 cd035ee0106ddbfa87bdd216dabeb1ae4e43e22720e266b1c8311ae9a152fec1b9944542e51b901c249930d59dbe8d8724a303e44410fae993afcb6918445ce3
 MISC metadata.xml 254 BLAKE2B 8b393297b0cf2112182d89c18f2fc26d2b57e4d191f96bdcad17d2809fc52c51e0b76c1e8f9b7998f36f296be7015eb8a0a730d18892ee83343b28738cba6ea9 SHA512 4cc0684e2b8c6a3d54834d288930076f6b90205f375b4c91bc8253cdda537d44022e34710d3e9fe657f57d5ac69b57320fe5ae8b7abd4d4162259b4fa9aa6fcf
diff --git a/dev-libs/grok/grok-0.9.2-r2.ebuild b/dev-libs/grok/grok-0.9.2-r2.ebuild
index 0893251563d9..64987886cdeb 100644
--- a/dev-libs/grok/grok-0.9.2-r2.ebuild
+++ b/dev-libs/grok/grok-0.9.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
 
 IUSE=""
 
diff --git a/dev-libs/hashit/Manifest b/dev-libs/hashit/Manifest
index b6e011b317a8..8109328ccbe0 100644
--- a/dev-libs/hashit/Manifest
+++ b/dev-libs/hashit/Manifest
@@ -1,4 +1,6 @@
 AUX hashit-0.9.7-pkgconfig.patch 782 BLAKE2B b71dd4d8b16d802750443bc92bf4de45b2a7bc0667cbc5eed7df19b5501ce2cb5ff178a43288de4bd8a149961a0ab4f52d3df284a2b9297bf2023a3767520d33 SHA512 dcafb388565779ae6a087b55dd31fc84879768c6a23edcf07ff0329a6a962edc83b67a3276bf8d4da853eddd132a500b094ac5ac8c950ef9bc2586925a19315d
 DIST hashit-0.9.7.tar.bz2 16368 BLAKE2B 99db8e0c83c63835d5265ef0d4bf39223214210a1762a869f1bccf08ce345a42f5bd0d4ec2dec7824e05c081e18f0b24c84254f4d3527fb67926ddbd8c1dbe21 SHA512 ce692cc1dfec12f2173f39c32f24ab96223feae6fca5c5ea1bc9dc815be4113936741c620e08cba35feeea26288503d1a42e6a4fe14cf2f854915e5bebcf4eff
+DIST hashit-0.9.8.tar.bz2 18127 BLAKE2B 63a36e644dced8dfbf0bb049adc811ac526c519c4fe85f47ae631eba8d989b06325199fafa43abd0e98d014c7adc90c97bde75fbaacd5a215384a9e6e2f6b505 SHA512 b6a85cb8a7c97d2214fe91409006973de1b452dc7f5b412ad870a5a8d2b937957947ca47c314fd4d05b2683b20a9b8eb4241e0cbbc57e3b68b5cdfa024b80dce
 EBUILD hashit-0.9.7-r1.ebuild 463 BLAKE2B 68b434425668b619a769b9fd4f64014ea537b2d70dd98d4fc65230f58a82672c93081e7338aa1d7055523ec542b786d4241dac642da4cfb52bc7ed018c2fa5b1 SHA512 a496300ca75420704f6e3cb72b02d480223aa3339bf803da8d078c1e36588b8abb38e74165e6408f056905d4d2381edb3ced71afbc0939e72d449596e853aca6
+EBUILD hashit-0.9.8.ebuild 422 BLAKE2B 6739ddd1bf9cded891ce736d8b4edf5608c35173c22cf00ba054f09d5124fcef7c1fc0836c090eefd4d474aba24087c822cf6c2262d806dd1a502e7623a24856 SHA512 8eb250ec2ec13995836da20935015e855de78db4ccd921fae7138d643843d026e5a437de453c91e1c1584be6669d5184bddb92b09ad788d1b41abc7ee3a096ee
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/hashit/hashit-0.9.8.ebuild b/dev-libs/hashit/hashit-0.9.8.ebuild
new file mode 100644
index 000000000000..134d03741b64
--- /dev/null
+++ b/dev-libs/hashit/hashit-0.9.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Generic C hash library which supports multiple collision handling methods"
+HOMEPAGE="http://www.pleyades.net/david/projects/hashit"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 0b24fe10aea0..b2ec2d53b4fa 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,10 +1,6 @@
-DIST libclc-0.2.0_pre20160921.tar.gz 127817 BLAKE2B 831bdc4a82d50ec33eb3199ef707fd84951b2b07cc8f6b1f166834240eab533d5f69dbe1d5d6c47cecd9f3c51618b96ad868c724e758fce2ec9d5f0915989f38 SHA512 5aae6010f32935c0b8fa510fc27cfd0be2df3d58d73cb5fb280d6758aafe54bd63a0137e59053aa81dca01ad2c5a0591ee1d4a83e3ef9a590a009a1a19062373
-DIST libclc-0.2.0_pre20170118.tar.gz 130793 BLAKE2B 5083e821c5a0e481d3b6b638ac93c8c936972dcdb78e20a86de5f6873f300d7065e8aba242b332d4a91d494bb3a9e67f1f60a566bfbef78891d7c438bebbf41c SHA512 d94a58ebcafb7bbdbcded84574676537ae7b4ba86c7c2270cc1cd7aa3113104e018e53396b570e821c2fd473b6dd63677f59d990e36e15a7cdb43cdb96cd058c
 DIST libclc-0.2.0_pre20170929.tar.gz 138719 BLAKE2B 05a3d47626a5e1918f32510b1254f846c88c642f60920377dda73568d34656fecd53872ebc01114b2cc8b2161b196c89efe119bfd785875f723fcee4c1ce3662 SHA512 08f3a21fb1dc103a3b33980c420506fd142294b2d8b4a3eeb100ea55036fb87b9740a2489a0a9a5793d71ebb157e6f3ad7854d1916fc1fa472de72374cdeaea3
 DIST libclc-0.2.0_pre20180319.tar.gz 161608 BLAKE2B b8e4f2d475c0425cbe5b41a5ba3b7b40d14c045f5c23d007e87cdfedc7a01a8317218e5f3b881e944256f04b9fb68a130bff2a137e51cb961b3d5bb7f2e2261d SHA512 5a4130eeb416f90901b66708adc17c825baa757d00d983a12e217f36503e4ed5d208f3a49cc26d7f9b71134ee3d258748153bf52cf7769bcbc06ec0510087a36
 DIST libclc-0.2.0_pre20180610.tar.gz 170102 BLAKE2B 3f8c33a9961db34e68cebc328a88a71173000972b5540d099fa79fe89fd186b7f2f8791a86b45b1be135383d26a92fd4ccdc2827b5620b5f86f0b48467fc092f SHA512 0c75c3e7b81754c175c5c43614ad313cda2fa09a1865794c904675b8d2527f78ffa357178f7d4a471b52ac3d7d96b0184303439b69060df4bf482a01871fcb95
-EBUILD libclc-0.2.0_pre20160921.ebuild 988 BLAKE2B 206c8e5c6b19d0e0b6a18c4ebc2a5ba8d102492366650900f9ee725e888c3c39175238eb1c37f23152f4d932a4325b9b39c77fe672848a907727e22a2c04f127 SHA512 eb5a022ca76cd80bacacd7c538326df3b25cb5f29fdd5d9d5774e223c69ba1b087f7704d1ad660eef6ac3c6a4b32fac29c4ae64040da43eeebfdb01514f34907
-EBUILD libclc-0.2.0_pre20170118.ebuild 1207 BLAKE2B 9fea7ead38a05076b4d93813f9bcdbd9069ccc55e5932a01499f17eeeef2304fd1da2718cc85a785d348d81f9c5bd29bfcf9defddf8c067bce0ca6c5949b9610 SHA512 f0d7c5c773b6fd9ed2fe5e703f2270612a68aa3f5c868825de241396c64f444b7673dcff8540733f2cc2256e310579f392333b155adc35a8d9e41c586e3ec5f3
 EBUILD libclc-0.2.0_pre20170929.ebuild 1391 BLAKE2B 45569e8b40dee2c80bf035bc719becde88dfdf3dac19eec45563c35d0edcf565bfe2ececece4285b0cb20c0f45fbbd424c7526c9eb376443f645c92f9ca04aed SHA512 d97c5ad240eacb62d73fa079c48b30ef2af61fce5e06a833f1e857605e6ff02f7a9e7cf90ae6f4386151a044df16077bd0e98346af87c410b1df88cfb0ffba27
 EBUILD libclc-0.2.0_pre20180319.ebuild 1433 BLAKE2B 3fa277010d42c6398ffa618c06397df166d2e37c38d9d9932813a979ec8a57ba57893dc67cbbacefa2fd47fad5aeac2799eefceadfbfa20a7096d53a571e3715 SHA512 ce2cdc8905a750c428a4a706cc2e4eeccabb27b800c37997414586fc3c43588b37b15b05f5e8c81a87199c9727c8f8de1b2af4bc37629f88f129aaeea54f3fdf
 EBUILD libclc-0.2.0_pre20180610.ebuild 1934 BLAKE2B d35749cdba040817e6bbea60be46fa4b4ce183818c17e08329d3938075c7f0d6d04ac6ebac6bbe1748cb5863b6101c0fce8bf7b8cfa77d58506da6e777c9ce97 SHA512 f9a7d649723475cf42043b7ab1a82aff2df1566347ac21501ba8027e0857526f6994021a78d047d6474c8fb2e12a28f2910cd446685bea120fb33cad3539d624
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20160921.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20160921.ebuild
deleted file mode 100644
index 6285d2447d28..000000000000
--- a/dev-libs/libclc/libclc-0.2.0_pre20160921.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-EGIT_REPO_URI="http://llvm.org/git/${PN}.git
-	https://github.com/llvm-mirror/${PN}.git"
-EGIT_COMMIT="520743b0b72862a987ead6213dc1a5321a2010f9"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-else
-	GIT_ECLASS="vcs-snapshot"
-fi
-
-inherit python-any-r1 ${GIT_ECLASS}
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="http://libclc.llvm.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://github.com/llvm-mirror/libclc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-		${SRC_PATCHES}"
-fi
-
-LICENSE="|| ( MIT BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=sys-devel/clang-3.9
-	>=sys-devel/llvm-3.9"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-src_configure() {
-	./configure.py \
-		--with-llvm-config="$(type -P llvm-config)" \
-		--prefix="${EPREFIX}/usr" || die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild
deleted file mode 100644
index 39ad522a7e7f..000000000000
--- a/dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-EGIT_REPO_URI="http://llvm.org/git/${PN}.git
-	https://github.com/llvm-mirror/${PN}.git"
-EGIT_COMMIT="2ec7d80d5e1c96fb85c694cc6ac0a78faf01a614"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-else
-	GIT_ECLASS="vcs-snapshot"
-fi
-
-inherit llvm python-any-r1 toolchain-funcs ${GIT_ECLASS}
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="http://libclc.llvm.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://github.com/llvm-mirror/libclc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-		${SRC_PATCHES}"
-fi
-
-LICENSE="|| ( MIT BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=sys-devel/clang-4
-	>=sys-devel/llvm-4"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	# we do not need llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	./configure.py \
-		--with-cxx-compiler="$(tc-getCXX)" \
-		--with-llvm-config="$(get_llvm_prefix)/bin/llvm-config" \
-		--prefix="${EPREFIX}/usr" || die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 02733873fa17..c998a80c78c1 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,3 +1,5 @@
 DIST libevdev-1.5.9.tar.xz 408200 BLAKE2B b99974eab572693c9e2a915b21adf2e6c09e26af70011ce661084ac9add51cb6257f36bcfeb89d76c8987cf8724e69b027d30eda17c4457a40f3e047302efa19 SHA512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c
+EBUILD libevdev-1.5.9-r1.ebuild 1069 BLAKE2B ce9fc469b63870e17fd86864afe1e18d154b6a2d9bd05e4f3fc71937c45aece02391275d960bece94ce998ba4f40fc7e1b0c73f8fbb1de83bd1e1d84fed19879 SHA512 0fe984fb6a8efe9692532041e9adc37e209d93641e4c4b00693242332610b6f6e6139738ed53ea2014ceef19c5615aac9e2948b3b7e3cc58819f2123a0b22bfa
 EBUILD libevdev-1.5.9.ebuild 661 BLAKE2B 7652efcfaec06d2115d750a2ea48b82e3126af8ae9b017b7b90e706f05a44f5a5dc361870a2b4cbe5ea356a009c44078419b234fefaf9fa83175d2de2ec0645f SHA512 2274dca24677c9e60ca05c2430eb1903da437e6c3dcd81843750378d0a9570d206933baab589be3050296e95e8cd6e15c70a96278ed04db0b2210f81ec02fb0b
+EBUILD libevdev-9999.ebuild 1069 BLAKE2B ce9fc469b63870e17fd86864afe1e18d154b6a2d9bd05e4f3fc71937c45aece02391275d960bece94ce998ba4f40fc7e1b0c73f8fbb1de83bd1e1d84fed19879 SHA512 0fe984fb6a8efe9692532041e9adc37e209d93641e4c4b00693242332610b6f6e6139738ed53ea2014ceef19c5615aac9e2948b3b7e3cc58819f2123a0b22bfa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
new file mode 100644
index 000000000000..d551ca6aecf2
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit multilib-minimal python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libevdev.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+RESTRICT="test" # Tests need to run as root.
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use doc ;then
+		local HTML_DOCS=( doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
new file mode 100644
index 000000000000..d551ca6aecf2
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit multilib-minimal python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libevdev.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+RESTRICT="test" # Tests need to run as root.
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use doc ;then
+		local HTML_DOCS=( doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index fe939410358d..d85d53dd6ec7 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -11,5 +11,5 @@ EBUILD libgcrypt-1.8.1.ebuild 2098 BLAKE2B 05f395da3900dcc66b319f25c1a4ad57fe51a
 EBUILD libgcrypt-1.8.2-r1.ebuild 2145 BLAKE2B bf0273a1c467077406890da14fcd055dc7b144a834b04554fbd1cf9949530a6c4905dc701a42fa945b93bea6d6ae031b2dc22073d9873487906b75aed60fa0d4 SHA512 e3aeeafeccff8e5c70c7d3c5784dd26c7f250f08a8dba378856ed065e1e7dfa18da989fce814872a36d548829ebeddd48758ebaf40d4c9031ebfd012575fa580
 EBUILD libgcrypt-1.8.2-r2.ebuild 2210 BLAKE2B f34057ad59eca6355567b72bbfdf1985e44e4746d7fbb1b0522f2306ebf645aa73f4760561520beed81ff51ad713787fcced4f4af0fbbeec3f6865e325a95850 SHA512 d2e53d31e04a409b5dd58012416ed0470dadae9cc8a0eabaeffc35131d390a9a77466c2a8bd61ce3e4a90585db9a8352660ca7e66df7849a90dbf1c23edc807d
 EBUILD libgcrypt-1.8.2.ebuild 2111 BLAKE2B 8102d7a2504f12054a8a6b99960651930b22df9961d9df8efd72ba4f5ce76e89741a4607ee96118eadc2cd91cf2f1c2467405d2aaae145e709d382091b1ace08 SHA512 e8977abb9bc4313b09222d4945f487b0f3dd39e7bd1455e2186cb65965f77f653c7618b7c8b10d9d8028d50ff3d054b06b9565df7ecfd0f8849188fc783d78d1
-EBUILD libgcrypt-1.8.3.ebuild 2202 BLAKE2B 6b411f77beefd838eddd760739333613e198bc6e33345581bbd845cda6ce7eed69ad632f3db8fd2a056ae193b45485a734fd1f1ec1c1302b766be7e86de66278 SHA512 76818a97f98f538c39f21af3036b180a38cce7057133b9d66e62e9ef129243342e946bd8929e01ec5e2c29799c91f9cf7307592078ccfc3884d591c82fc556cb
+EBUILD libgcrypt-1.8.3.ebuild 2201 BLAKE2B 56b9089acc154f834d5682ebad620cfab84aefd1b9146c63526148a07635e1186b03ec1c5c200d572549bbc210a929af777e9f64c8980b8615047e3909e18f0e SHA512 db93fce4ccb773b04c4f216fd3eacfdec783bcf263491bae43cc0c20ad3cb3684b713384ca7ce747582192fa8c5feb544aac9203af654973985b6026dc0c32bd
 MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
index 980dcda24850..7286569a35b5 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 302d40e32217..8181205699b6 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,8 +1,8 @@
 DIST libgit2-0.26.4.tar.gz 4733342 BLAKE2B 76dfacbf6df9128625e52f4c554814a971f446a44c9706a915200976f5a873a2add1869c0534360ccad821df11246faacfff43765f311162bcb6afca46088a77 SHA512 c65a0ef8e7ef2dc60d07bced36b8cfd26ce9c40f99978058fc67b30e5bbda8d6b15e26aec7b1277bb277123685e763d106bab175540fceb449bb5b50f776473a
-DIST libgit2-0.27.1.tar.gz 4765926 BLAKE2B 2eb34a621d61b1fb3b770081e27b92d662fd235750fc6ea580ddabeac5cfd20e40a70ce830d45144531c333239d173a322d0de343bb98cc02ce9bfb7822432bf SHA512 4cdee4aec0f0c7b36226ee29276b8802d6b59817f95b1357f35225c23a8d6de70242b2dd9a5fb3b765c3242f4ed1848933e20fc24899071d8b443d46c43ce99d
-DIST libgit2-0.27.2.tar.gz 4770842 BLAKE2B 8a46589a17c4bbd0e821412ad259099a77755073736c7ba469a593252160bb1e5601c8b91e1e26e17c11ae3fd6e3d2bf87d22b638b1d473371311487e96ca39b SHA512 4fa2b6c1bb340d5dbc3106ababb630a4634cee2415d478be986d315ef9c659d772574a56f0b8fa77d26bd793aea92893fddf64b5f21d7c965069f928b9ce5cff
+DIST libgit2-0.26.5.tar.gz 4734075 BLAKE2B cdc34a5792576d97d8bc8a8c998e610e9c2caab4899f55bfd11da382d73d3061277ac068edd20c8e31d7cf5c3b26ca688fd67eb43ca7b9e0b82413fb04d04b3f SHA512 7dd7c567ad776db76b3514e6532f52841a4279b58dc51b44d39ab53b6911220cb60ee8f37b4c6ad6f369edbbd43a2591cf5f46aca354282f56735c8b215d533b
+DIST libgit2-0.27.3.tar.gz 4771877 BLAKE2B a15aed24d0391cf8d5c74329f5064d703def5db1cbf132881279d501d1ba31002367e54171e8a341b75862d327eddb1abebdaeeaee6878a14ad1d8abbbc8402d SHA512 e470050b89289908ec64dafaa954ad9bfc8f557ba7dafcab440d9efde474f736c025d8202bfd81a508070d9cf678f3fb1f3687d72a849ce86edd1ee90ad13c3b
 EBUILD libgit2-0.26.4.ebuild 1874 BLAKE2B 5da6902f0c5983909b465a287db11c2ca95192a73bfbf9b76f27b02925c62372a6c90085202cebf76a1eca9cbed828b825abdaca48f767422722ab8bf2ecbeee SHA512 8b7009bd803c553b94c575526dd704bea6c39546ca7a1f9cd8291a11a24dcbb4188c22604e055711ba806b7957af7f5cc461bcc8971969dcda0b020dafa76703
-EBUILD libgit2-0.27.1.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
-EBUILD libgit2-0.27.2.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
+EBUILD libgit2-0.26.5.ebuild 1875 BLAKE2B 61a7dba555ae02c7a89d4a2e15d4f13bdd8063d95f9736ead540ba7cbf81643e72d4b36b0b43d654338199127ffa5f56dfb41c8149d0cff1f2432e84b284b487 SHA512 001cc3cf9c525ded47f1bb8a8bcfea39fafe4a0b65b592d955997586843e8f5b1e354ab00066a5f840b23a8484b7e9af7ecd5378df8d7da534b9ff55bb82dbb5
+EBUILD libgit2-0.27.3.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
 EBUILD libgit2-9999.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.27.2.ebuild b/dev-libs/libgit2/libgit2-0.26.5.ebuild
index 456ded8f18df..1ffdfff08098 100644
--- a/dev-libs/libgit2/libgit2-0.27.2.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.5.ebuild
@@ -10,14 +10,14 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
 HOMEPAGE="https://libgit2.github.com/"
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="0/27"
+SLOT="0/26"
 IUSE="+curl examples gssapi libressl +ssh test +threads trace"
 
 RDEPEND="
@@ -40,7 +40,7 @@ DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
 
 src_prepare() {
 	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die
+	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
 
 	cmake-utils_src_prepare
 }
diff --git a/dev-libs/libgit2/libgit2-0.27.1.ebuild b/dev-libs/libgit2/libgit2-0.27.3.ebuild
index 456ded8f18df..456ded8f18df 100644
--- a/dev-libs/libgit2/libgit2-0.27.1.ebuild
+++ b/dev-libs/libgit2/libgit2-0.27.3.ebuild
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 9f37da3da0b1..68a72fd32a40 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,5 +1,5 @@
 DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f
 DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
 EBUILD libgpg-error-1.27-r1.ebuild 1298 BLAKE2B ab43e3a8adb285b7932a607cd242af87aa1e7db2731fef7d77227d058ff1737802fda662e1f2b96e6116ee60f3d41dde98ca9a742a97caf5a2dc7ea34bdf8231 SHA512 9e285f2989b2e9fbf2a2e8a8ce1cbd3cd93433c302ecc0216ab8a977cada3f3edf753c02ef24b57b44af8bc6be23cdbf42dc46ba7846b55dcfa73b33db26f139
-EBUILD libgpg-error-1.29.ebuild 1303 BLAKE2B c6808923620deada7f8e9062f962a7c0655d8276c6cfb199e8c4bd4041ed3a1720b862d87435237b0b6c0177a8b475757249432bc2770c0f13235e89ac2deec4 SHA512 623a751767ad901bfaa4c5d9ce681a637db66c611360ad6ad63fadfe9dc448f267feb444e26368fd4caf04347f9e60fbb4ebdda5c1bee02402b61a6aa56398de
+EBUILD libgpg-error-1.29.ebuild 1302 BLAKE2B c9f564d30f7b141add8edddfe94e6881abb56626ead8223b7bf69dff8c720902d264382b77debdce1a5cdda5ad64d58a10c703c94a27a6b8eff1ad96fa8ed2d0 SHA512 962fa276d0a57dc236a08935b7eb08c869763de3709bcba8bc360de714fc15e9b786dbe161b8f0b51aa39f79da58cfa0038458ce13279150952fa5209701ee6c
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
index c1cd62c653c8..f8a3e3daaca1 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index b7abacf4897a..845ae110702e 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,4 @@
-DIST libixion-0.12.2.tar.xz 407280 BLAKE2B f8a9307758f1005bd8dedb7aab9fed7478c963e3fd235c3d1efc29dbc51a3e9c6e92ff6972c8b06b2b90122a400d1f907bb39c67c2c20aa55c46a93e0c783edc SHA512 0a85120a08c79c73a252a997c8b3df461fe1f8ce8b2334aee0e50bfd887a440a220b44922edd18fbd402b1c8ea8be629e6181493bc618eda198f35159813ddcd
 DIST libixion-0.13.0.tar.xz 413756 BLAKE2B 04aef61a1cc691bb159d7e8131e2e47fe2590634adc93f2e5771ed106316eb1c92ee7c4aa05ba753a1751cb5e7c55cba9263515671a26f9bc9983a1cfcacceff SHA512 15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0
-EBUILD libixion-0.12.2.ebuild 1141 BLAKE2B fba5cb475f161d3c40f04fff8899fc2911d6533a373927c17339da905446f89a61693407c739b31f1ce77f34267af97506f4df99e145fe158a8b4bfc5ebefff7 SHA512 993232ee16cf3682214bf7b36f1af69354578c0e398ab2e269bb0f511e91ecd622da69ccbdf82187d0bec94bf01f9edad968abdbeedb15202433ab36d756b822
 EBUILD libixion-0.13.0.ebuild 1148 BLAKE2B be4a403e157a7d39a5e0e4828250bd738dc817af41a4c49c6a2198ee0095d6714f9403248559462bfd295552d300e7f8d2c385f60ceab29071d6ab33d4016931 SHA512 c5adfd22bf54af99c81df60a96832615e98441bc8575e0202b7e32027cb6b3e4bf695b483364519851764d753fe84c4c97eea935ad5fc0d827f83942c67f6827
 EBUILD libixion-9999.ebuild 1150 BLAKE2B d4d57ba89107e6a3c81ce172ec28a10cf11b133e1423862160ac587fe2de19aca6e216fb8bbfba5620b905856ffcfb73431b15aa9d4af1c31e1fe63145ff4c4d SHA512 46d1e9174374413fa3a9bec611d202420efbfe3e1d6da0da3772775d6a486739cfcc0177c0bf76c13f3a8bc983584a81e3b32c83dd8db102aa67755470d989a5
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.12.2.ebuild b/dev-libs/libixion/libixion-0.12.2.ebuild
deleted file mode 100644
index d3906167d9a9..000000000000
--- a/dev-libs/libixion/libixion-0.12.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit eutils python-single-r1 ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="General purpose formula parser & interpreter"
-HOMEPAGE="https://gitlab.com/ixion/ixion"
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.12" # based on SONAME of libixion.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="debug python static-libs +threads"
-
-RDEPEND="
-	dev-libs/boost:=
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/mdds-1.2.0: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 \
-		$(use_enable debug) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use_enable threads)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-}
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index 7e87115093dd..f03ce924df39 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,5 +1,5 @@
 DIST liblognorm-2.0.4.tar.gz 665898 BLAKE2B 80bcd114d2be81f8eea847e699b7e8ade9ca37d4376f64af81bfaba1a440e1efbab579235aba775c46a9d011e930453d2c001de525577b7775784e7152b3e700 SHA512 3c7cbf0c8c320708615218009354d198ba0893632ca464a07270f59d137753dfc7ad6dae66b565660f14e9285f9c8964824d36070b1872b6c633589b4996ba02
 DIST liblognorm-2.0.5.tar.gz 667709 BLAKE2B 9f2a774c2378caa460a1f11e21570e719f83e782c5731a35921099b1b31397495ea2a4baebd489d186526eb2d011f2ab30d971713a8083c1ae02168d3f632ce8 SHA512 2b36fabfa8b751127d47f307833414d339ae43bad5b687ce6ac42a961021f9a515703ca0c4808e098ef49be3a943abdbf307f90995a2331c6e266167ef041d00
 EBUILD liblognorm-2.0.4.ebuild 1494 BLAKE2B e650f9f6e067624d25834012df2b15c53290d36f49eaba52b020ef37eaf785f1e6c5c1c06dd4b4508535ef0c678fd6f51b0e0fad2d1a47d956dd742b474501c8 SHA512 7a525f0e554b45fe8087d6e9ef4949bedd50d81daf128aff6b0afbeeb64d9dac8d8cdc9e1c668a44b0ef09381067dce436a470f35dd81ccb4666ea7d5545e7a4
-EBUILD liblognorm-2.0.5.ebuild 1497 BLAKE2B c366d9b41d91979eec17b0fd641140299c3459e0f55b7afedcfefa8bb5b4f4e8a59c610a1b79450f1deee35e5f008bec61b927e27e265fc111315c62ee0b5c9f SHA512 5a01e30ec38cfb631ba77cf212e645c32b1d19f1c560cf32060ea9c4415fe105d0c44783037ac9c898cc90a21eb49be1b7661691afa866d2bcfdedfc886c4a90
+EBUILD liblognorm-2.0.5.ebuild 1496 BLAKE2B 9208f635f3bd9a85f6f7d3575a975a4e32b68404721a235252ff78ec515524ed30030ed7749c37927f152c6472938bb761fb1dc256ccd04358509539e8eddae0 SHA512 c9ffbda9091b8382f4ce3d65a2471eb80cc66e41561ab084f8ad50db468c805f92134b47d2a4f38faccd4d27506a9a11a155949fe80590c5d3b19e87c6adb089
 MISC metadata.xml 582 BLAKE2B 59408e460cb8208149a93cbe049867d8cc202272aea9cd113a7f282eeb6f57b967abf7379241c8dd987e58f66f1efb36c29809176db34cdb3b2127a5ebe02f0c SHA512 7df1432cf2ddfe55c6a449d0179b771652a051d75fa34b8d3ea42d201bc64b3b18b2410ace68c263f14eb692661846a25cb0220de43abcaef13401e87f1173e2
diff --git a/dev-libs/liblognorm/liblognorm-2.0.5.ebuild b/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
index cb850214b738..d4da89071921 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux"
 fi
 
 LICENSE="LGPL-2.1 Apache-2.0"
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 8ec45fcb7c87..12f82cc53e02 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,3 +1,5 @@
 DIST libmirage-3.1.0.tar.bz2 234649 BLAKE2B 1b0194fc6271454481ba752f2e7241d9aa69b8d1608dc059b17eb32ad78ee7721d0f85677511e97ccc6fd708690950d0ed6ab662cdff4ccd94804b1a5756542b SHA512 fcf49b171b6f84ad32cdeeb63def76e8bd5c5f33aadcc678e06d7388d0c351e8047beae6db9db7b69f704ab4db86aca4e8fb9817b2450c70b5f1d3d7a3760394
+DIST libmirage-3.2.0.tar.bz2 234214 BLAKE2B f2b8c42eed89efaeddb8051160c51814b4df45c1ca7cdb4cef683b86ea73dcd1446c6806588a9df0410da5b3971ce8945f2479022f21177237ee8b0d4b18d2d3 SHA512 15507154441b660f5a58e1101d4e6f9931a7640b90d3de5e387274c72be07f367b54a6be34dd31442bc504459414f611ffc39f86ff6a7381a820d059aef1d6d6
 EBUILD libmirage-3.1.0.ebuild 1178 BLAKE2B 368ef1f9c2dafa9706b90bd21e360a85997c7f6347260b23f566851eb84d1f0b482dc0367b81ba7ab888d5c80e08718201797d327bce2e6deba61e4a7aeae81b SHA512 e73f833029df60b402a6c4ee05e348c579cf358a5e5a66743b51710629a26d420d88bb5ea336a32ff03207204794f847bd1d668295658a3e4e99f1500d92ed13
+EBUILD libmirage-3.2.0.ebuild 1180 BLAKE2B 0a24ee26236ebe6d93f7ef5457a8c07390bbf1be2c1eee96ffe094dc63e6eae25e6921c533f8f7e6f272263b0358bacb5b92d54d8d50148a10ff10cea434456c SHA512 fc1918dde5b4b329212ba94a6a1948c2eb8c266f35900d1110622718ca3582fcb8984441a3b74663e886101d0ca1f93bebc42b84ab47ad737a473f717e58f7f5
 MISC metadata.xml 455 BLAKE2B 23500677c263c1b8fc4839698bd6f1c08e9821fe4472a0b1725ad4777cfff385531ab6ec966f32a2335571c315b6f886f973451076745aa9fe4297c3cc436a30 SHA512 51c8d87f3c49c81798e4d2e038f911a2e05bfde742f229939f759c6768c6459cf4aa6829981791c57ef766fd447923194d7c14d4ad16951ae505d3b5a73c3479
diff --git a/dev-libs/libmirage/libmirage-3.2.0.ebuild b/dev-libs/libmirage/libmirage-3.2.0.ebuild
new file mode 100644
index 000000000000..dde47a4856b6
--- /dev/null
+++ b/dev-libs/libmirage/libmirage-3.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="CD and DVD image access library"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/11" # subslot = libmirage soname version
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc +introspection"
+
+RDEPEND=">=app-arch/bzip2-1:=
+	>=app-arch/xz-utils-5:=
+	>=dev-libs/glib-2.28:2
+	>=media-libs/libsamplerate-0.1:=
+	>=media-libs/libsndfile-1.0:=
+	sys-libs/zlib:=
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGTKDOC_ENABLED="$(usex doc)"
+		-DINTROSPECTION_ENABLED="$(usex introspection)"
+		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	local DOCS=( AUTHORS README )
+	cmake-utils_src_install
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index a8981dbda1cf..3846e2069cd4 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -7,6 +7,6 @@ DIST libnl-3.2.28.tar.gz 941954 BLAKE2B c36817832f36ef2f3e32af8703024c92c874a85f
 DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
 EBUILD libnl-1.1.4.ebuild 1141 BLAKE2B 16521e18a8b986a96540245ed54c5737c1ba8d17d3a492fe34b2e504216ba21186d1eaf4685716894f826186a87dd3b4ad82c87d9a4e439cd984fdf0472b4828 SHA512 1c63d4eabb1268b349918acbdc3cbc7d2fabc09a75e4b07793f1e380309404f460bfc3b90c7426377d57be65f5b679a5d20155003ab589497b225dea2f9c281a
 EBUILD libnl-3.2.28.ebuild 2486 BLAKE2B 2f99ac310c3777c72d36d7eb2ee3ca8d165fcef9385e67385297f384606bdc69675d23e85fb9b4cdadf0dca25639e51d677ce266005a0e9a405f9e069c61e789 SHA512 e6fc4f0076da3a41c6ec89cd52619f42ca5e966f2080e2150b5697612a4edad5c5f47fa34bb3188611fec7f04574db57cbbb1fd94ac3ca992771bd8f8086c30f
-EBUILD libnl-3.4.0.ebuild 2405 BLAKE2B 62b2cb103fbcef71eb3ba797f4976c210d9c419f423dec49987aed1080139e4b0dea4910c6980121e6701ae2f1ccd53e69677b2b54c38b6d2f36bd4cd8830ee5 SHA512 a9a5302851a6bc6eddc440f48a5e90eb4e17a6d749f1dc3bffcbab7b8fe1e1da9c9902a9cc3960e1a42067fe30ed98bd139069b5a32c2290b8849a95c4057340
+EBUILD libnl-3.4.0.ebuild 2403 BLAKE2B a387a668f1a038addbef80b494d242963ea748e01bf8a3b4c63f605d68c0a1a74d2a54117e8bca8419461a105d8a5851e79c422c57091861987a11ed6e3cddb8 SHA512 c3c0d850a5a0a950222f89efa0d7fe8ca95b130a3d7f97aff6a4f4eae3987aa5af6f5d92ddb21496412975058fae099b3b60de3e7cd814bfcaad96c6b722b6a7
 EBUILD libnl-99999999.ebuild 2196 BLAKE2B aeff1715ffd0c59e7524386f82283e1c41d0aa39548e2f4ebdcfed77624ed64ae975a74bf1796644411c846c32c275b3465f89878cdffe4fa757d54f184136b1 SHA512 65b184e96b140b5e95dc1623175c5b042d8fade476fde6a8f58e462d31e6db4d1fda6d998097f75c6acae0f6ab65fbbce6502a0737e8c051d2358885e5ef54e6
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
index 4c6460c8f168..bc1a0718a1ba 100644
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ b/dev-libs/libnl/libnl-3.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index c6c1f5ba1cc5..6bb2db3ad85e 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,6 +1,4 @@
-DIST liborcus-0.12.1.tar.xz 1673880 BLAKE2B 6f85f1ce04bd7c797f8fccc9b4d860189b6fa9f51623587a668c343e8897bf17a3e62a5465354776044fabe9347ec35913eb1433dc551e4e509ce260ba92c3b9 SHA512 294b24ad7fccae77070edd9d8e6e1a370f609ec8af9a2c58567431e641fc0f3f27c4cd4b6ac1825a8179a22a1d1a81d84827859eb631d2625194f9e59ca1a8c3
 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.4.ebuild 1297 BLAKE2B 42bd250fdb0c44caf5a26764d36f8e4ea79b0e5a5d60196d4e038f153dd45579f12097a481672a4cd6d009ef0bf7ad5f3ea1be00f697430544f47767a8fee3d1 SHA512 7e2caafe015c3a07559ef68992e4da221e5199ae275d3559f754c0d89c4179185c3e33304414b4dd8b3ef90705203563baef453c160f34fd0298a77af6e77f5e
 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.12.1.ebuild b/dev-libs/liborcus/liborcus-0.12.1.ebuild
deleted file mode 100644
index 6f116c83448b..000000000000
--- a/dev-libs/liborcus/liborcus-0.12.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 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="http://kohei.us/files/orcus/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.12" # 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.12*:= )
-"
-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/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index 1fdcaeb888a9..85fee5a3c33c 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,3 +1,4 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
+EBUILD libpthread-stubs-0.4-r1.ebuild 814 BLAKE2B 32d51c2d5a14a72c1d9b88a413331966b20dff6957d6c7b920e2f0c0315da325cec14d8957ab17fd783c46a065f42e0a399a0de01f9dcab502cde30164b8a3e3 SHA512 dcf57e1df4bbcc60155074cbab63b79af0a0f4be1f81b35f17d64094ea6da72aa944b912ae711df9945fb7b7e090b3dd21b0b22de9ce67b23f19532abb0e44d4
 EBUILD libpthread-stubs-0.4.ebuild 559 BLAKE2B 5a167e159355ae1fff81ce825d23d87ffd4bc9538997f402a2c92b24f58a40f92ccaa1b9db4b2014bf16c6fe49c24c740881c632be3f5339b10aa778aebabe1c SHA512 4b899d6f4941f824b0d0b6efd4c23a134ecb40579d56d30dba0377cb81590ad7f85a5573610dc0c83468d95a843af9a5e85a8221f218fd4645ef08d977e8ecc6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
new file mode 100644
index 000000000000..594762ecbbf1
--- /dev/null
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Pthread functions stubs for platforms missing them"
+HOMEPAGE="https://www.x.org/wiki/"
+SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+# there is nothing to compile for this package, all its contents are produced by
+# configure. the only make job that matters is make install
+multilib_src_compile() { true; }
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index b03bf74d626f..1f79a577af73 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -2,5 +2,5 @@ AUX librdkafka-0.11.3-fix-memory-leak-issue1534.patch 938 BLAKE2B acc607465285b2
 DIST librdkafka-0.11.3.tar.gz 1849838 BLAKE2B 570713642b5ec9c2487a37b9146edda5f844427dbf55d6cb654ca9a8690cd6f77bcc9325800ac2a34da21f1cca33187f390c00132f9e5c28503f816ee256c4f9 SHA512 e9bb97ea1597019a841dd4ba3666ad72dcbc0539054155ce0caee92f1324f1a490515b0310405f822b829c05ed2688b48e2ca205a91cf88bf9ad6411f7c12b26
 DIST librdkafka-0.11.4.tar.gz 1900117 BLAKE2B 3e755c91d6a2e12829ba841749977f8c05c9f243d79db64247547e4a49790e67d07f7d82633f45689dcc5f88caaef200027e6af3866de283c1de6120d7f98467 SHA512 6b34e7c476d328a2f8e8321f6ddcaeaf43730284bb3aaddac81c3cd9a1fa5d7f7ef7481f1093b36d89edde7b766da6cd27a9eb9a635b12b640e8a46a269bafc8
 EBUILD librdkafka-0.11.3-r1.ebuild 1299 BLAKE2B 38941daac5f384ebd687939dec6f91afb15906c8b0d80790fd11df4d61c0bc9043f9bf70d9924269b9d51186fc59f934537b589cc2c5b5a590ad66068ddd4b90 SHA512 fa53f16810c902c7a72e2df7077acf193873bf2a04ca6553233b83709ae3213c54bf350e1ac7b8a431cf076e845d97e1c68a32616eed54eade7404ba3e2e9bd7
-EBUILD librdkafka-0.11.4.ebuild 1237 BLAKE2B a51664d7672ca6ebaa947eac204bb64258910ed483b63048c13474ae7d9567891798ae9ce05b401a46cd3bc0efc4cf7f775ed079860db7a54d5af5960faf76ac SHA512 b9040a41d58f6b7bdc6f486d55cc20ba3d14c96dc0e8f8d61c70908ecb624c8725190f2d492032efd9e46d311631a42578dcca313dc173a97dc3544868edfb67
+EBUILD librdkafka-0.11.4.ebuild 1236 BLAKE2B cd0ad6ac6ccfebbe37583fd03f3317f835bf7dda598e3b8c71b922b48db3541a28ac0462577ffdc62c9e219be4a6f1852cf6c591e7240626dda12bf5e636f5e6 SHA512 80e38fb2244bf009ea3102a34a10fc2de324576b77965583d04077af7281d00e6c259cef3a260eeb224eabc8fdb929ee9513bec19e6584f9c159022a9c335580
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-0.11.4.ebuild b/dev-libs/librdkafka/librdkafka-0.11.4.ebuild
index 9305ad361470..00872b0eadc7 100644
--- a/dev-libs/librdkafka/librdkafka-0.11.4.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.11.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 8bdeaa7c6dbc..b365d17341f9 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -3,5 +3,5 @@ AUX librelp-1.2.16-fix-valgrind-usage.patch 988 BLAKE2B 410abca2c3b323a8f896768c
 DIST librelp-1.2.15.tar.gz 440273 BLAKE2B dba423e206bdbcbfb351ab691f777d4c78f25d9042ffe2cdac01bc4e7e07eb7c02301ab0d8942a73d688eaf28b43d9f77aa94cc88a258dee1b28dac94a13954e SHA512 9cf52c82c8e61f6970a83ead60da4bc64ab56a2bda42fedf184a1ae60c28f66d565a0c3a8720b55b9a2e5e3ffb7ec35601158f634c8f2965f8c0d3b4f1c15568
 DIST librelp-1.2.16.tar.gz 474456 BLAKE2B b528aaa66e9d52d5304510f86400067e1baea44be487f8cb176aeb146924bc35af24a403e849376e74614fb060093b48a3afe9d6c5da56bbf4dc37a6740478cc SHA512 54c101281c94046e4f8d6f77e73ab52874408e62c77f3dfa29ec0b294f39c216637674cc0bf1b7e04173557b3f21bfa74b7be1aafa3ff2771acd41d1d067d3a3
 EBUILD librelp-1.2.15.ebuild 979 BLAKE2B 8383923df704355300689ee33a1f20d1e82db40b01d75d3ebc2f6c912510738f27bf5434a4c0f7ede684f1cb18c87a8f9bcf38a7754c79daecbba411d1a0d1f2 SHA512 00d1baaf48bb2e1643bfdeceb2af3c735c4e2d1e94e7ce763643d9a9ab730495a865ba02ca7a3e90d9e10bd521090f04affb11512e15db4381cc74ecbc2fc5f0
-EBUILD librelp-1.2.16.ebuild 1124 BLAKE2B 62906d1ecf1950630bb49f79e654040a2ae49ae17c4c300be2f9f05e0ae8729f169e162085bbfcd1794448589f7fa8574bce06d81396ed95a536853875fb4278 SHA512 bf1279d55123314886369c4dd6eda064dce15005efff3601ff3d12918ef20fbb57563f341d4832cfa6a221de3ef4639ff0f71564648ee069b8297f4b843b6f9d
+EBUILD librelp-1.2.16.ebuild 1123 BLAKE2B 12a68c0a7aa0454ce58bd2db4de48d7cf7523a65a98a16a9c5f70530e32498a09ffb7f2150625ac7642787bf31225ff66418aaf2a84cbc6a0aabd7df13be84fa SHA512 31e0a046a000dc49e603e6feef6903c45360b7b0a9bd15c55d8dd558cd5829083a62a08b2f029cb4aee45ec96ee7fb58743eccd63bcd96b4640e3272b2893910
 MISC metadata.xml 358 BLAKE2B 2b9924cec5f5b08dfaa8df564577e388c620b48db4206c2c37774e7e110c1b3ca695f82eb39913c0f552a59ce30c6a03a2e348aef78ee01a7c37165fd3c097d8 SHA512 8b0638c9c4d4c385dc14d8b3e0300791d181bd08c9476dfe5d881281b8b6d4e7bbd8501c06159602d38db4b037b24ad45615b29377cf5a8989ae850fff8f362d
diff --git a/dev-libs/librelp/librelp-1.2.16.ebuild b/dev-libs/librelp/librelp-1.2.16.ebuild
index 7534979676c1..6f2b1a03d416 100644
--- a/dev-libs/librelp/librelp-1.2.16.ebuild
+++ b/dev-libs/librelp/librelp-1.2.16.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.4.0"
 
-KEYWORDS="~amd64 ~arm arm64 ~hppa sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa sparc x86"
 IUSE="debug doc +ssl static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index a1b868a4b197..7de194fd11dc 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -4,7 +4,7 @@ DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec
 DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
 DIST libressl-2.7.4.tar.gz 3359012 BLAKE2B 07b98fdc6bcdf9d888fb1b1d301c95ab6f998fb7ff2c6dfd2ecf4558768e200dfa96c394e5b321bc27ba390e92646c319ef5be5915872a7c086de8017ff8f855 SHA512 1cd82a1bff4f655251b5feb0c850f4164e0fd548e4b404407370f74dcc75c205f42efc7787a157eecac84cbbe46af48cb63f46b3fef75f4a0a9ea19a5863a691
 EBUILD libressl-2.6.4.ebuild 1454 BLAKE2B 9c0b73409f09cc0148f30c1b5464892f5ec66b275c571163c79798af7ca20600d4a1803870019cd5f3d80f31edd408c92db70129a74fcbfc104689ac7a749f24 SHA512 ad98eb1ae5dd53874030af1ddf9b813ff42fe07f3158987f314e5faecc1cabd83c5d454b0c4d5eb4fec2645959fe0eb37912046045c21b65080a4d99d1ed4190
-EBUILD libressl-2.6.5.ebuild 1458 BLAKE2B bb499287bf0a73d3ee1b6fe044a2a7ef207be657a1036f4ed386f561330f7d0370388c2637fa000d0964689dd82fd3bc3ddc0465bf6c0838c4a686406e61dd16 SHA512 16828292d3fc3e1e9dffe322ceb4d5f5d549de76336a52d7e873d31c86b10204d3b6ad3abb7deb67a62ebaa2b0a820d16c9eec324dade169b9f358179e19bdcb
+EBUILD libressl-2.6.5.ebuild 1456 BLAKE2B 2570ec4a9bb5ecd1e1edc1be5d3cb8df2a8aded439f013d96cd03dfeecb03b5407113430a4226512603d44b991d6408356ae72e3669fe3ebd483faa375fdc764 SHA512 5765995fc84dfe51631844789250241a81bbccf0c72cea7afbd91d0385f7fae28be8a8cef76cdded1760746caa78735de67b42030ce5cff727c8d745c91e936b
 EBUILD libressl-2.7.3.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 EBUILD libressl-2.7.4.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.6.5.ebuild b/dev-libs/libressl/libressl-2.6.5.ebuild
index eae7a5ae1579..c8e510fa235a 100644
--- a/dev-libs/libressl/libressl-2.6.5.ebuild
+++ b/dev-libs/libressl/libressl-2.6.5.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/44"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 61a57957cf80..c72865d16db4 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -2,7 +2,9 @@ AUX libuv-1.21.0-UV_FS_LCHOWN.patch 775 BLAKE2B 45699fb69103c7bc023f4d2a796440a6
 DIST libuv-1.20.0.tar.gz 1180231 BLAKE2B 8ba258477c685acc1ed5486211b65719419757f6dec5dda863d622d4190552a2f5968f3b05519ec5574a5963cce99a9b92c224b511e0f9e70aa099d47f4fb4ca SHA512 382309cb6e54765b956b03357cb754f49d93505ba0e0122a77f33efca07d7b87966c993a5fd9f9503edd1bcd0f49ca42bd9cd9264cce94c847aebca77d237ba0
 DIST libuv-1.20.3.tar.gz 1181741 BLAKE2B ee68f975c9f150034b02772b297a05692305155449dac75f35ca32761ffa2803385b22cce5c0fe1b2ad73a52144e6218e2c62d73c92e098017bee74a99e16062 SHA512 60ebc0059ec9fdd022aa9d60b2a0340f29e037bf79fa08707f6f2ecca9ec263c7a6466bdc1f94e0875a6a627ee749efa86117dedb22119676a7bafed8b5d77a0
 DIST libuv-1.21.0.tar.gz 1187827 BLAKE2B e534eb4a7cdde3988a34047c999fd20e83f443bcf3ac1c62e07b7e4ddd95f62ac8221d58197b5f8fed618686d6003e35793b1b91e1dcfd6245a05d8bff1b881c SHA512 ab6b52f8bee1900953d9136e4d281f81ba9f14287760f7bfc8633289699cb9eeaab15d9146ed05b164631fcb3c2b5abcee8c10499d080a82a411bb1f02564c48
+DIST libuv-1.22.0.tar.gz 1186080 BLAKE2B 5e909c36e5ff75fb199f52d5910bb092ca4117ca0c53f8d3e7c9dd7e57f4959dca6e46db095cca93f3a079850268e5cc0fc68b2916a20773f09b2ba5f1531cc0 SHA512 e79cae6aa1d9cf2c8f7c0262c866fea2858d7104ece7c556e537e7d1cf884f191d5cd3e56539bfe857fa15dc50b57fdcb33019824cd585a2ca250a77d923af73
 EBUILD libuv-1.20.0.ebuild 1167 BLAKE2B 822424c522ba27df7624d2b3e1fabb522e15865b8eb8a56127f6565da3d1ae55f519d47ddfe7cb7cecf406626487fba48d77a164a67e9d48be613cc2e36bf93e SHA512 3eb698ab1c3e9d31a90f79293a9484cf7a27e7a7945577bb241b74e6390bc4efee13e43b28de51c38c5fe3b921ca886f0ea8d26c752ea5f0437f5a4d0ab7bfd4
 EBUILD libuv-1.20.3.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.21.0-r1.ebuild 1223 BLAKE2B b722de91966dfb7612e4beec9e266099a83624183ae0d7b647c886e2b03d9b0de6cff5fc0e8c668db39c14adeb0469d38a2708adb7095c59c651bac3995cdda5 SHA512 e9743686b9e24773e37800b8437d58e6d1c3d6ab5fd664586d67b93b98981537ac1b3bdabbfcb13b1bc1b7b7bb0b06f8eab6d9f3b9c075da31c83279c95a86ea
+EBUILD libuv-1.22.0.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.22.0.ebuild b/dev-libs/libuv/libuv-1.22.0.ebuild
new file mode 100644
index 000000000000..1edbef416b0b
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.22.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 1e24cd31d7d0..6fb3ada9adfe 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.11.tar.gz 577185 BLAKE2B 80de10d5852742870ff7a7995b743eddf76a966695fd7ad786537ed4ad430b60a88b2f5bcb74fb41ecd01a84f02e126a0bfffa932761cb8bf73bbeb097cca181 SHA512 6d616ca12e1db20c8bbbe0a18b4e1e0ce1b086b38123762c2e4c3f46390ff5772dd27eb9b97b332b20f3430905f6eae0fdce70aca48fd56d5e43043369233964
 DIST libzia-4.13.tar.gz 583226 BLAKE2B 088c199c188fbbee54ed533565d3509a510db5f1d3bafeb1be76cb6b2f38d40244fe768ccfa2ee62aaba856ffa7b890dc6d5ea20ec7e1289cbce609d5a56b476 SHA512 b1dc294812342d8c4cf34b013d26c3e8d56da924ef22991b47bdf5ee18990e006a7cd216e9989a6fb3ffb3cb151fa04d5aff7707a7541ec7125b39a6f17eb80b
+DIST libzia-4.14.tar.gz 597138 BLAKE2B 200e0682c6bc28248646775c5e5a71bad329edf031d0950ad8ab5244e5e925903147467d23eb3a04f9be05cca6b34947692df15620331ffc5357b73f20d363b0 SHA512 c382ef352e80df69daf3d3e4da0c0de5d8037b32182a760f88a1edf7d2b9cc7d5112de942a5a85973ccf82ca1e0771c2e92de7972ff9bec745fdb525419a2365
 EBUILD libzia-4.11.ebuild 707 BLAKE2B be3320d6589dfd6a561a6809febe80273e8e312da0c01b2d42c853e99b1b47b3fbcc64ea5ae66e5b7212db89fd0516ac46a3aa06d13c1b6c67a243ea22116005 SHA512 8c6a1b708ff15d1e2bcd88d5179079110292e067e7b2901c6d7db4746fb0fa8ee3572ebbbe3b6f48b6844f8ecaeced13f55928f6c11953a5722268f9414efb3c
 EBUILD libzia-4.13.ebuild 709 BLAKE2B 3818ea32c4f00fd2457d1507aa9830efd17c24e15bd38b0bbfcf5ef5d4fbb12ff6bed0ec2252fbe9d8813b27091f24846064479cc359b7baf431205c9970e13a SHA512 f0a1b9b019217baaa60436057eb91c80715e760f9fa9dacd0948a24937b7aafdc653be0f7bf9fedd336ace4c9ca6e6611ed4ff90f2fc68d8ac247902d1cf1035
+EBUILD libzia-4.14.ebuild 709 BLAKE2B 3818ea32c4f00fd2457d1507aa9830efd17c24e15bd38b0bbfcf5ef5d4fbb12ff6bed0ec2252fbe9d8813b27091f24846064479cc359b7baf431205c9970e13a SHA512 f0a1b9b019217baaa60436057eb91c80715e760f9fa9dacd0948a24937b7aafdc653be0f7bf9fedd336ace4c9ca6e6611ed4ff90f2fc68d8ac247902d1cf1035
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/libzia-4.14.ebuild b/dev-libs/libzia/libzia-4.14.ebuild
new file mode 100644
index 000000000000..faa975e860ad
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.14.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		   -e "s/docs_/#docs_/g" Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd
+}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index a6226df897fd..19f90e201a4f 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -3,5 +3,5 @@ DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9
 DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
 EBUILD oniguruma-6.7.1.ebuild 1014 BLAKE2B 7d7ffa3f662ddd4f5e9a13c7869c03e1a924ffc3ea7ea97e57b701405c73bff9e46c0f1645dd80da07d51d1c2529f8540b226e8dc6d5519dd01568895433208b SHA512 e88607585975fe4afaa432e92f8319d2e63691ebbbba61ab3ac41af2796e37df5d369ac6c6152230fd723113999c9f060ff02708a11cc3a231e9312b5bbe94a9
 EBUILD oniguruma-6.8.1.ebuild 968 BLAKE2B a83d76cf686f58abf1adc1e5c210dc84ec82d5b6f85789a72ad5f5314a4df8166e6c6e98348a107dcd732ec1dc755026db0b887a27fb0c567fd655c06c77a5da SHA512 9d12c6b3e6e41e69f0658ebe45fd09c4f075ced52023080e76c76e38fcca32f2704ec5aaee48d151a64bff4cb4dce8a812f5136699bf927b9237fdb150f94f91
-EBUILD oniguruma-6.8.2.ebuild 973 BLAKE2B da31c64e8ea927d5696e5d6a393417c8650893fec2c6cdbacfe7a06c9110c90446df440c18d6c9009b165964ce7cf2af1a1ae5965e0e33fb2a230bce75a69e6d SHA512 999fb1c75c6d5bfea1b2a114fd2a2429d9c93cb5e40563b9a9cfc62cae3bd0c086948d46da14393b8e1c2522cf8c9311246d9d41482ae54f6225a0ecbc385159
+EBUILD oniguruma-6.8.2.ebuild 972 BLAKE2B 2cb62e4997f29717c74393307878b5cfbd10f35b94a3f40aa730578c9881b2825ffacd68890378c7d05894297e3bbcd8bcbf556ac96758a67b6ec44d97c64e70 SHA512 61b217489ae82123d55beccdfd0076e3d134c03b7ba44c7dc673f0181727810711996b9ea422a05730bdb654fedcd3629e935869accd16e603c06a326705fbb0
 MISC metadata.xml 898 BLAKE2B e2c9418b8a69edf7d702de74609e6a4122c5a51160869dabe820d07a5f9f2ef478fcea57b9348babe49066b78b6d1b5bd6f60b7798fa0eb8edf13ff4510d7858 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a
diff --git a/dev-libs/oniguruma/oniguruma-6.8.2.ebuild b/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
index d4a968fc0f4d..b4d87472117d 100644
--- a/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/syncdir/Manifest b/dev-libs/syncdir/Manifest
index 71d099adf18f..f4d71663f160 100644
--- a/dev-libs/syncdir/Manifest
+++ b/dev-libs/syncdir/Manifest
@@ -1,3 +1,4 @@
 DIST syncdir-1.0.tar.gz 8878 BLAKE2B b9b53d90cb9122e86d23ca8e86ceb4178e4a62e2bdf486e6d7861065592adbc047226581e9d574092590db0a54bf2dd9afbc21e4997ceea3cebb2d66927297b7 SHA512 0b5262e23e43f34be7bc31ed6baf7624a115a509e459504651b184a0856c7918671db4be1b8e14552f275c49c5c6bbc00d786c57f1d96548a491048674f58317
-EBUILD syncdir-1.0-r1.ebuild 834 BLAKE2B 6c46acb954b7f8f666ba3f3148147732e7b88d09632b4a30a375fa0455f056e4cab1cc1ba751ccf93357e99735946910e3d0ccfa54e4110f864321d34cd91e74 SHA512 e263fa1e71a4519edf3c5312911707c4aeb09d7026063a563a744d2fc961cbafa0f167592ba785e2df33f2292897f435f4cf3f86aed9dcf685869f45621b2894
+EBUILD syncdir-1.0-r1.ebuild 836 BLAKE2B e66d5f243775945f49c8ec7386dcad5d59bf06ba8ed3e82c4230cfde4eed4496326cb4d18212451661fe112683654c1e00de386863131f13d9411d065428eb6a SHA512 8339a1611f7fc3d199058672a531bf622e06771f0fe78ef67c16535f6d198d2eb4668db0874167421fbc38f5642ff95111ca2e446765d7b2dbda0420436994cc
+EBUILD syncdir-1.0-r2.ebuild 837 BLAKE2B 91f611dc7bb60af583943f4af6dd315f9cf3a6daeec8b3411b60a630eb5c0a7859dff8b699a1518009ca01c3385c289f92f125f42a416e5ae520c8c72d123418 SHA512 64cbb87b40af76340ec261ad06bb227841b72c4fd8bd46792ffa23f59dd9d2f4e528b34666141837e9463d1789e6d6390d324eb080a3402cbd457df55019666b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/syncdir/syncdir-1.0-r1.ebuild b/dev-libs/syncdir/syncdir-1.0-r1.ebuild
index 493e2e498c01..7627f5ebe419 100644
--- a/dev-libs/syncdir/syncdir-1.0-r1.ebuild
+++ b/dev-libs/syncdir/syncdir-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,8 +6,8 @@ EAPI=4
 inherit multilib toolchain-funcs
 
 DESCRIPTION="Provides an alternate implementation for open, link, rename, and unlink"
-HOMEPAGE="http://untroubled.org/syncdir"
-SRC_URI="http://untroubled.org/syncdir/${P}.tar.gz"
+HOMEPAGE="https://untroubled.org/syncdir"
+SRC_URI="https://untroubled.org/syncdir/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/dev-libs/syncdir/syncdir-1.0-r2.ebuild b/dev-libs/syncdir/syncdir-1.0-r2.ebuild
new file mode 100644
index 000000000000..ed06d5f79598
--- /dev/null
+++ b/dev-libs/syncdir/syncdir-1.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Provides an alternate implementation for open, link, rename, and unlink"
+HOMEPAGE="https://untroubled.org/syncdir"
+SRC_URI="https://untroubled.org/syncdir/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	if ! use static-libs; then
+		sed -i Makefile \
+			-e '/^all:/s|libsyncdir.a||' \
+			-e '/install -m 644 libsyncdir.a/d' \
+			|| die "sed Makefile"
+	fi
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		libsyncdir.so \
+		$(use static-libs && echo libsyncdir.a)
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)
+	emake libdir="${D}/usr/$(get_libdir)" install
+	dodoc testsync.c
+}