gentoo resync : 04.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
commit: e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree: 9cb29a544215119b5c5538e37211b994ce1c87ae /dev-libs
parent: 480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)
120 files changed, 1198 insertions, 2137 deletions
diff --git a/dev-libs/DirectFB/DirectFB-1.7.6-r1.ebuild b/dev-libs/DirectFB/DirectFB-1.7.6-r1.ebuild
deleted file mode 100644
index 8c921ad2850b..000000000000
--- a/dev-libs/DirectFB/DirectFB-1.7.6-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-# Map Gentoo IUSE expand vars to DirectFB drivers
-# echo `sed -n '/Possible gfxdrivers are:/,/^$/{/Possible/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_intel="i810,i830"
-I_TO_D_mga="matrox"
-I_TO_D_r128="ati128"
-I_TO_D_via="cle266"
-# cyber5k davinci ep9x omap pxa3xx sh772x savage pvr2d
-IUSE_VIDEO_CARDS=" intel mga nvidia r128 radeon tdfx via vmware"
-IUV=${IUSE_VIDEO_CARDS// / video_cards_}
-# echo `sed -n '/Possible inputdrivers are:/,/^$/{/\(Possible\|^input\)/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_elo2300="elo-input"
-I_TO_D_evdev="linuxinput"
-I_TO_D_mouse="ps2mouse,serialmouse"
-# dbox2remote dreamboxremote gunze h3600_ts penmount sonypijogdial ucb1x00 wm97xx zytronic
-IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse tslib"
-IUD=${IUSE_INPUT_DEVICES// / input_devices_}
-
-DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.net/"
-SRC_URI="http://directfb.net/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
-	http://directfb.net/downloads/Old/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 -mips ppc ppc64 sh -sparc x86"
-IUSE="alsa bmp cddb debug divine drmkms +dynload doc egl fbcon fusiondale fusionsound gif gles2 gstreamer imlib2 input_hub jpeg jpeg2k mad cpu_flags_x86_mmx mng mpeg2 mpeg3 multicore opengl oss png pnm sawman sdl cpu_flags_x86_sse static-libs swfdec tiff timidity tremor truetype v4l vdpau vorbis webp X xine zlib ${IUV} ${IUD}"
-REQUIRED_USE="gles2? ( opengl )"
-
-# ffmpeg useflag broken
-# ffmpeg? ( virtual/ffmpeg )
-#	$(use_enable ffmpeg) \
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	cddb? ( media-libs/libcddb )
-	drmkms? ( x11-libs/libdrm[libkms] )
-	gif? ( media-libs/giflib )
-	gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
-	imlib2? ( media-libs/imlib2 )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper:=[jpeg] )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng )
-	mpeg3? ( media-libs/libmpeg3 )
-	opengl? ( media-libs/mesa[gbm,egl?,gles2?] x11-libs/libdrm )
-	png? ( media-libs/libpng:0= )
-	sdl? ( media-libs/libsdl )
-	tiff? ( media-libs/tiff:0 )
-	timidity? (
-		media-libs/libtimidity
-		media-sound/timidity++
-	)
-	tremor? ( media-libs/tremor )
-	truetype? ( >=media-libs/freetype-2.0.1 )
-	vdpau? ( x11-libs/libX11 x11-libs/libXext x11-libs/libvdpau )
-	vorbis? ( media-libs/libvorbis )
-	webp? ( media-libs/libwebp )
-	X? ( x11-libs/libXext x11-libs/libX11 )
-	xine? ( media-libs/xine-lib[vdpau?] )
-	zlib? ( sys-libs/zlib )	"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.7.5-flags.patch \
-		"${FILESDIR}"/${PN}-1.6.3-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.7.1-build.patch \
-		"${FILESDIR}"/${PN}-1.6.3-setregion.patch \
-		"${FILESDIR}"/${PN}-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch \
-		"${FILESDIR}"/${PN}-1.7.6-cle266.patch \
-		"${FILESDIR}"/${PN}-1.7.6-idivine.patch \
-		"${FILESDIR}"/${PN}-1.7.6-tslib.patch
-	sed -i \
-		-e '/#define RASPBERRY_PI/d' \
-		systems/egl/egl_system.c || die #497124
-	sed -i \
-		-e '/^CXXFLAGS=.*-Werror-implicit-function-declaration/d' \
-		configure.in || die #526196
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-driver_list() {
-	local pfx=$1
-	local dev devs map
-	shift
-	for dev in "$@" ; do
-		use ${pfx}_${dev} || continue
-		map="I_TO_D_${dev}"
-		devs=${devs:+${devs},}${!map:-${dev}}
-	done
-	echo ${devs:-none}
-}
-
-src_configure() {
-	local myaudio="wave"
-	use alsa && myaudio+=",alsa"
-	use oss && myaudio+=",oss"
-
-	local sdlconf="--disable-sdl"
-	if use sdl ; then
-		# since SDL can link against DirectFB and trigger a
-		# dependency loop, only link against SDL if it isn't
-		# broken #61592
-		echo 'int main(){}' > sdl-test.c
-		$(tc-getCC) sdl-test.c -lSDL 2>/dev/null \
-			&& sdlconf="--enable-sdl" \
-			|| ewarn "Disabling SDL since libSDL.so is broken"
-	fi
-
-	# fix --with-gfxdrivers= logic, because opengl, vdpau and gles2 are no video_cards
-	local gfxdrivers="$(driver_list video_cards ${IUSE_VIDEO_CARDS})"
-	use opengl && gfxdrivers="${gfxdrivers},gl"
-	use vdpau && gfxdrivers="${gfxdrivers},vdpau"
-	use gles2 && gfxdrivers="${gfxdrivers},gles2"
-	gfxdrivers="$(echo ${gfxdrivers} | sed 's/none,//')"
-
-	# fix --with-inputdrivers= logic, don't know where to put "input_hub"
-	local inputdrivers="$(driver_list input_devices ${IUSE_INPUT_DEVICES})"
-	use input_hub && inputdrivers="${inputdrivers},input_hub"
-	inputdrivers="$(echo ${inputdrivers} | sed 's/none,//')"
-
-	# The xine-vdpau flag requires a custom patch to xine-lib which we don't carry:
-	# http://git.directfb.org/?p=extras/DirectFB-extra.git;a=blob;f=interfaces/IDirectFBVideoProvider/xine-lib-1.2-vdpau-hooks.patch;hb=HEAD
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable X x11) \
-		$(use_enable divine) \
-		$(use_enable sawman) \
-		$(use_enable fusiondale) \
-		$(use_enable fusionsound) \
-		$(use_enable fbcon fbdev) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable egl) \
-		$(use_enable egl idirectfbgl-egl) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable mng) \
-		$(use_enable gstreamer) \
-		$(use_enable gif) \
-		$(use_enable tiff) \
-		$(use_enable imlib2) \
-		$(use_enable pnm) \
-		--disable-svg \
-		$(use_enable mpeg2) \
-		$(use_enable mpeg3 libmpeg3) \
-		--disable-flash \
-		$(use_enable xine) \
-		--disable-xine-vdpau \
-		--disable-ffmpeg \
-		$(use_enable bmp) \
-		$(use_enable jpeg2k jpeg2000) \
-		--disable-openquicktime \
-		--disable-avifile \
-		$(use_enable truetype freetype) \
-		$(use_enable webp) \
-		$(use_enable debug) \
-		$(use_enable zlib) \
-		--disable-video4linux \
-		$(use_enable v4l video4linux2) \
-		$(use_enable vdpau x11vdpau) \
-		$(use_enable multicore) \
-		$(use_enable dynload) \
-		$(use_enable opengl mesa) \
-		$(use_enable drmkms) \
-		--with-fs-drivers="${myaudio}" \
-		$(use_with timidity) \
-		--with-wave \
-		$(use_with vorbis) \
-		$(use_with tremor) \
-		$(use_with mad) \
-		$(use_with cddb cdda) \
-		--with-playlist \
-		${sdlconf} \
-		--with-gfxdrivers="${gfxdrivers}" \
-		--with-inputdrivers="${inputdrivers}" \
-		--disable-vnc
-}
-
-src_install() {
-	default
-	dodoc fb.modes
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	ewarn "Each DirectFB update breaks DirectFB related applications."
-	ewarn "Please run \"revdep-rebuild\" which can be"
-	ewarn "found by emerging the package 'gentoolkit'."
-	ewarn
-	ewarn "If you have an ALPS touchpad, then you might get your mouse"
-	ewarn "unexpectedly set in absolute mode in all DirectFB applications."
-	ewarn "This can be fixed by removing linuxinput from INPUT_DEVICES."
-}
diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
deleted file mode 100644
index e4ccaebf4a8c..000000000000
--- a/dev-libs/DirectFB/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX DirectFB-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch 1665 BLAKE2B a2ddffd72a76692f5eac0ce0933289cbd168248438cdd30c76c3a7a62e2c067477f6eff52ef83cf83a1d70e42aa6366e5f50a09f75ba695c8e55b211de4b54c9 SHA512 18e189e5d085c8b87f95e2ea3567f66c3bb90a7242fb83a81dd78264bdcbd7fe77b58479c3f03cd9aee32caae98767bc88dac03230f717a34e981f65d7653eee
-AUX DirectFB-1.6.3-pkgconfig.patch 664 BLAKE2B 07e5b12361fa90515bc7ebbba9d915dbad59056210477fcdfddabe575368c5c6befbc007dc30173683b371bfe7753db7c9a5f177653bb583947da79f0a99551b SHA512 1ce162ef7af5ab7b6efcdb786e9e89d569051f2009d1144744befed57ae36109771284b302438c882b550e09a3ced814b550fa039306b4f37c7e1b68675943a7
-AUX DirectFB-1.6.3-setregion.patch 3812 BLAKE2B e586ceb274de8bb45c0d51e4153f719d016df7bc7d1b7de9899d6514a543fcf5eb61fa093d975d9c8f7833be86b4292fcb12235bd318cdb27a71f7e654b75255 SHA512 98510a4a40daa46c9d5aa824a09584ab2d1e4a0a5b885fc2893e8af99b16317e5c89279f2889d94545451b63039d24909e8ee051788bce704d403e3fb7ef46af
-AUX DirectFB-1.7.1-build.patch 839 BLAKE2B 9079ebef5a49ee0cb0549ff7841b6b4d3b1a1ded5dd590d295c3f90045e9d55d97e8d75747beb4416beece436ceee539b2e9f4d598884ef4692a4037fdde392a SHA512 51a3a88274de35798f93b76accdb345e015da0781218393d5271835ae7c64ff1e38b5b9fe96281511c0057f12e9a952bb6dbba2c54d3f940ace6e1f57d9d1114
-AUX DirectFB-1.7.5-flags.patch 2003 BLAKE2B d13bd0ca552d5c69039b0425027c9cfe61b3c2024a59ef13b93b289ed47a08e472c8ec294e0340b0597313ab0834c7b1326412b290d7fc90c81e9c86b2560587 SHA512 b8f947f338b872436bb1e029d9971852018400aa869121fada260e3ea325f2d5d28d765a4b960b3970644fc91a7ba39d86a0eb3a160473cc467523048833c264
-AUX DirectFB-1.7.6-cle266.patch 410 BLAKE2B 666dd67efbb1de4a7f5139022f3e02e95d2d1a44461c5d37ce9408b7afe72e81d3d403820efe9ad394f649d6bd93fdedf25855e2122aa392fbfedafe23ffddb6 SHA512 409f5de16912e78d0053e8438f77ca79995d1d609f0c36064b0dcfe3d46b25d29ca53a44ecec7d000aba5e7f9339d57128651024d34879f51c208fb86c2a9afd
-AUX DirectFB-1.7.6-idivine.patch 1805 BLAKE2B 8198bcf18969f4f98c2f0e1d1cedb6f89b7499e249caae9f224a85eb1928c634a69bc06eb7f9af3039e331ee1e2a4ed52fd60d709a0bcbcc938250e78f02d1e2 SHA512 29f7b7c7bcf0eeb33b295c681723c2f1203ddca43879d430d15619d6d92d67df813acd4e6d237c297e407fe0d919952badb3901f54b32a7c025ec38b8ac55593
-AUX DirectFB-1.7.6-tslib.patch 1220 BLAKE2B 110259255dfe8d664f258b4f91388e6a886b0dd1a04a9b94a81fdc725554a82ba809ec338a1f3125631b1e1a5d9cb335c91d2a3ddca4a463aaa948187c89b9c8 SHA512 60f0dc5fcefde34bb65bbd034e9e29f2776eec0260c93ce1cda2d5ea714d940b270d83ebaf343d888bab5ed748ab24affdfe5393b4dd87b702034d319cba493b
-DIST DirectFB-1.7.6.tar.gz 5975444 BLAKE2B c28f95ed73b79766c377a5440517dc83fb5c11264c7d3b6c1ebebee0dd44bec21afc778032aa03af111ea2839dfbbbd26d33f86f46b61eff3e0036377d97dbbc SHA512 18cf1aad6c277a6de147a9b0aff1cd7408ddd7c7159ef21dab9a548db7399c681603624e7820b186a29e03edaa7737350a61e2abaec572887e9cc56658bf85a2
-EBUILD DirectFB-1.7.6-r1.ebuild 6714 BLAKE2B bb202e5bb379133dad4742c1310969fdbed7084cb2f8bca65390e4a7c79875b2e6c33e0c49c84853b77ce1629b40a5b9886c28be6d490f0335c1d9cf59bf717d SHA512 e69e0881f9f7b0fd9e995b9ea89811bd53cc069bba41759eb046bf33d4972ea1f7d1af3216297630737cca92fdd955a679fded747433c2378357fe1618f62ca2
-MISC metadata.xml 1948 BLAKE2B 4d40e92ca69e987e668e00a087cd0a3c223524f4ced9e9846cc483120f91315cbfa1dc2a34003eeaffd25282b08b92d2aae5838a31699bc58bdd497621fc4c43 SHA512 6d1dc07a903d8554fda072001ffaaaf685ee1363fc820626c3c271965f7589409c3a95567bc8b4b820bd643c752e570b8a4be9cb938da1ca53b6ac6643800dd1
diff --git a/dev-libs/DirectFB/files/DirectFB-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch b/dev-libs/DirectFB/files/DirectFB-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch
deleted file mode 100644
index 06f56fed39d7..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 253e1d0d10bdece158f8f68dc48c19ab57d2da29 Mon Sep 17 00:00:00 2001
-From: Mandeep Singh Baines <msb@chromium.org>
-Date: Mon, 18 Mar 2013 19:03:36 -0700
-Subject: [PATCH] atomic: fix compiler error when building for thumb2
-
-Fixed the following error:
-
-{standard input}: Assembler messages:
-{standard input}:179: Error: thumb conditional instruction should be in IT block
--- `strexeq r4,r1,[r2]'
-{standard input}:283: Error: thumb conditional instruction should be in IT block
--- `strexeq r1,r4,[r2]'
-{standard input}:379: Error: thumb conditional instruction should be in IT block
--- `strexeq r1,r2,[r0]'
-make[4]: *** [fifo.lo] Error 1
-
-Fix was to add the appropriate it block.
-
-While I was at it, I optimized the code a bit by:
-
-1) Moved the mov instruction above the ldrex to minimize the number
-of instructions between the ldex and strex as recommeded here:
-http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0552a/BABFFBJB.html
-2) Saved 4 bytes by replacing mov with movs and teq with cmp.
-
-Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
----
- lib/direct/atomic.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/lib/direct/atomic.h b/lib/direct/atomic.h
-index 94cb0c9..8dc0dfb 100644
---- a/lib/direct/atomic.h
-+++ b/lib/direct/atomic.h
-@@ -191,9 +191,10 @@ static inline int _D__atomic_cmpxchg(volatile int *ptr, int old, int _new)
- 
- 	do {
- 		__asm__ __volatile__("@ atomic_cmpxchg\n"
-+		"movs	%0, #0\n"
- 		"ldrex	%1, [%2]\n"
--		"mov	%0, #0\n"
--		"teq	%1, %3\n"
-+		"cmp	%1, %3\n"
-+		"it	eq\n"
- 		"strexeq %0, %4, [%2]\n"
- 		    : "=&r" (res), "=&r" (oldval)
- 		    : "r" (ptr), "Ir" (old), "r" (_new)
--- 
-1.7.12.4
-
diff --git a/dev-libs/DirectFB/files/DirectFB-1.6.3-pkgconfig.patch b/dev-libs/DirectFB/files/DirectFB-1.6.3-pkgconfig.patch
deleted file mode 100644
index 2c71bc96f9e6..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-1.6.3-pkgconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/200661
-
---- DirectFB/directfb-config.in
-+++ DirectFB/directfb-config.in
-@@ -300,7 +300,7 @@
- 	 libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@"
- 
- 	 if test -n "$echo_static"; then
--	    libs="$libs @DYNLIB@ @ZLIB_LIBS@"
-+	    libs="$libs @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@"
- 	 fi
-       fi
- 
---- DirectFB/directfb.pc.in
-+++ DirectFB/directfb.pc.in
-@@ -9,5 +9,5 @@
- Version: @VERSION@
- Requires: @DEP_VOODOO@ fusion direct
- Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
--Libs.private: -L${libdir} @LIBM@ @DYNLIB@ @ZLIB_LIBS@
-+Libs.private: -L${libdir} @LIBM@ @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@
- Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
diff --git a/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch b/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch
deleted file mode 100644
index 8d25a51920d7..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-https://build.opensuse.org/package/view_file?expand=1&file=DirectFB-setregion.patch&package=DirectFB&project=openSUSE%3AFactory
-
---- gfxdrivers/cyber5k/cyber5k.c
-+++ gfxdrivers/cyber5k/cyber5k.c
-@@ -636,7 +636,8 @@ osdSetRegion( CoreLayer
-               CoreLayerRegionConfigFlags  updated,
-               CoreSurface                *surface,
-               CorePalette                *palette,
--              CoreSurfaceBufferLock      *lock )
-+              CoreSurfaceBufferLock      *left_lock,
-+              CoreSurfaceBufferLock      *right_lock )
- {
-      DFBResult ret;
- 
-@@ -644,7 +645,7 @@ osdSetRegion( CoreLayer
-      ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
-                                       layer_data, region_data,
-                                       config, updated, surface,
--                                      palette, lock );
-+                                      palette, left_lock, right_lock );
-      if (ret)
-           return ret;
- 
---- gfxdrivers/radeon/radeon_crtc1.c
-+++ gfxdrivers/radeon/radeon_crtc1.c
-@@ -147,14 +147,15 @@ crtc1SetRegion( CoreLayer
-                 CoreLayerRegionConfigFlags  updated,
-                 CoreSurface                *surface,
-                 CorePalette                *palette,
--                CoreSurfaceBufferLock      *lock )
-+                CoreSurfaceBufferLock      *left_lock,
-+                CoreSurfaceBufferLock      *right_lock )
- {
-      
-      if (updated & ~CLRCF_OPTIONS) {
-           return OldPrimaryLayerFuncs.SetRegion( layer,
-                                                  OldPrimaryLayerDriverData,
-                                                  layer_data, region_data,
--                                                 config, updated, surface, palette, lock );
-+                                                 config, updated, surface, palette, left_lock, right_lock );
-      }
- 
-      return DFB_OK;
---- gfxdrivers/cle266/uc_primary.c
-+++ gfxdrivers/cle266/uc_primary.c
-@@ -138,7 +138,8 @@ osdSetRegion( CoreLayer
-               CoreLayerRegionConfigFlags  updated,
-               CoreSurface                *surface,
-               CorePalette                *palette,
--              CoreSurfaceBufferLock      *lock )
-+              CoreSurfaceBufferLock      *left_lock,
-+              CoreSurfaceBufferLock      *right_lock )
- {
-      DFBResult     ret;
-      UcDriverData *ucdrv = (UcDriverData*) driver_data;
-@@ -147,7 +148,7 @@ osdSetRegion( CoreLayer
-      ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
-                                         layer_data, region_data,
-                                         config, updated, surface,
--                                        palette, lock );
-+                                        palette, left_lock, right_lock );
-      if (ret)
-           return ret;
- 
---- gfxdrivers/unichrome/uc_primary.c
-+++ gfxdrivers/unichrome/uc_primary.c
-@@ -135,7 +135,8 @@ osdSetRegion( CoreLayer
-               CoreLayerRegionConfigFlags  updated,
-               CoreSurface                *surface,
-               CorePalette                *palette,
--              CoreSurfaceBufferLock      *lock )
-+              CoreSurfaceBufferLock      *left_lock,
-+              CoreSurfaceBufferLock      *right_lock )
- {
-      DFBResult     ret;
-      UcDriverData *ucdrv = (UcDriverData*) driver_data;
-@@ -144,7 +145,7 @@ osdSetRegion( CoreLayer
-      ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
-                                         layer_data, region_data,
-                                         config, updated, surface,
--                                        palette, lock );
-+                                        palette, left_lock, right_lock );
-      if (ret)
-           return ret;
- 
diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.1-build.patch b/dev-libs/DirectFB/files/DirectFB-1.7.1-build.patch
deleted file mode 100644
index 28c92eb79b02..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-1.7.1-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sat Dec 28 23:52:03 2013 +0100
-
-    * INCLUDES is deprecated, use AM_CPPFLAGS instead
-    * add missing SVG_CFLAGS
-
---- a/interfaces/IDirectFBImageProvider/Makefile.am
-+++ b/interfaces/IDirectFBImageProvider/Makefile.am
-@@ -77,15 +77,14 @@ else
- FFMPEG_PROVIDER_LTLIB =
- endif
- 
--INCLUDES = \
-+AM_CPPFLAGS = \
- 	-I$(top_builddir)/include	\
- 	-I$(top_builddir)/lib	\
- 	-I$(top_builddir)/src	\
- 	-I$(top_srcdir)/include	\
- 	-I$(top_srcdir)/lib	\
--	-I$(top_srcdir)/src
--
--AM_CPPFLAGS = -DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\" $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS) $(FFMPEG_CFLAGS)
-+	-I$(top_srcdir)/src \
-+	-DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\" $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS) $(FFMPEG_CFLAGS) $(SVG_CFLAGS)
- 
- idirectfbimageprovider_LTLIBRARIES = \
- 	libidirectfbimageprovider_dfiff.la	\
diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.5-flags.patch b/dev-libs/DirectFB/files/DirectFB-1.7.5-flags.patch
deleted file mode 100644
index 485cd1934fc6..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-1.7.5-flags.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sat Dec 28 23:48:53 2013 +0100
-
-    * respect system flags
-    * remove Werror, it breaks the build
-
---- a/configure.in
-+++ b/configure.in
-@@ -194,12 +194,7 @@ AM_CONDITIONAL(X11VDPAU_CORE, test "$enable_x11vdpau" = "yes")
- AC_CHECK_HEADERS(linux/compiler.h linux/unistd.h asm/page.h signal.h)
- 
- 
--dnl Clear default CFLAGS
--if test x"$CFLAGS" = x"-g -O2"; then
--  CFLAGS=
--fi
--
--CFLAGS="-ffast-math -pipe $CFLAGS"
-+CFLAGS="-ffast-math $CFLAGS"
- 
- DFB_INTERNAL_CFLAGS="-D_GNU_SOURCE $DFB_INTERNAL_CFLAGS"
- 
-@@ -467,7 +462,7 @@ AC_ARG_ENABLE(debug,
-                              [enable debugging @<:@default=no@:>@]),
-               [], [enable_debug=no])
- if test "$enable_debug" = "yes"; then
--    CFLAGS="-g3 -O0 -fno-inline -Wno-inline $CFLAGS"
-+    CFLAGS="-fno-inline -Wno-inline $CFLAGS"
-     DIRECT_BUILD_DEBUG=1
- else
-     DIRECT_BUILD_DEBUG=0
-@@ -483,13 +478,8 @@ AC_ARG_ENABLE(debug-support,
-               [], [enable_debug_support=yes])
- if test "$enable_debug_support" = "yes" || test "$enable_debug" = "yes"; then
-     enable_debug_support=yes
--    if test "$enable_debug" = "no"; then
--        CFLAGS="-g2 $CFLAGS"
--    fi
--    CFLAGS="-O3 $CFLAGS"
-     DIRECT_BUILD_DEBUGS=1
- else
--    CFLAGS="-O3 -g0 $CFLAGS"
-     DIRECT_BUILD_DEBUGS=0
- fi
- AM_CONDITIONAL(ENABLE_DEBUGS, test "$enable_debug_support" = "yes")
-@@ -2750,8 +2750,6 @@
- 
- AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
- 
--CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
--
- AC_ARG_ENABLE(extra-warnings,
-               AC_HELP_STRING([--enable-extra-warnings],
-                              [enable extra warnings @<:@default=no@:>@]),
-@@ -2761,7 +2759,7 @@
- fi
- 
- if test "$GCC" = "yes"; then
--  CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-strict-aliasing -Werror-implicit-function-declaration $CFLAGS"
-+  CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-strict-aliasing $CFLAGS"
-   CXXFLAGS="-Wall -Wno-strict-aliasing -std=$CXXSTD $CXXFLAGS"
- fi
- 
diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.6-cle266.patch b/dev-libs/DirectFB/files/DirectFB-1.7.6-cle266.patch
deleted file mode 100644
index ff72f5339dbf..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-1.7.6-cle266.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/527986
-
---- a/gfxdrivers/cle266/uc_overlay.c    2015-02-10 15:26:24.931309401 -0800
-+++ b/gfxdrivers/cle266/uc_overlay.c    2015-02-10 15:26:47.229309401 -0800
-@@ -246,7 +246,7 @@
-     dfb_surface_flip(surface, false);
-
-     ucovl->field = 0;
--    ucovl->lock = lock;
-+    ucovl->lock = left_lock;
-
-     ret = uc_ovl_update(ucdrv, ucovl, UC_OVL_FLIP, surface, left_lock);
-     if (ret)
diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.6-idivine.patch b/dev-libs/DirectFB/files/DirectFB-1.7.6-idivine.patch
deleted file mode 100644
index 561db23aeeda..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-1.7.6-idivine.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- lib/divine/idivine.h.orig
-+++ lib/divine/idivine.h
-@@ -0,0 +1,54 @@
-+/*
-+   (c) Copyright 2012-2013  DirectFB integrated media GmbH
-+   (c) Copyright 2001-2013  The world wide DirectFB Open Source Community (directfb.org)
-+   (c) Copyright 2000-2004  Convergence (integrated media) GmbH
-+
-+   All rights reserved.
-+
-+   Written by Denis Oliver Kropp <dok@directfb.org>,
-+              Andreas Shimokawa <andi@directfb.org>,
-+              Marek Pikarski <mass@directfb.org>,
-+              Sven Neumann <neo@directfb.org>,
-+              Ville Syrjälä <syrjala@sci.fi> and
-+              Claudio Ciccani <klan@users.sf.net>.
-+
-+   This library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2 of the License, or (at your option) any later version.
-+
-+   This library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with this library; if not, write to the
-+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+*/
-+
-+
-+
-+#ifndef __IDIVINE_H__
-+#define __IDIVINE_H__
-+
-+#include <divine.h>
-+
-+/*
-+ * private data struct of IDiVine
-+ */
-+typedef struct {
-+     int                         ref;      /* reference counter */
-+
-+     DiVine                     *divine;
-+} IDiVine_data;
-+
-+/*
-+ * IDiVine constructor/destructor
-+ */
-+DFBResult IDiVine_Construct( IDiVine *thiz );
-+
-+void      IDiVine_Destruct ( IDiVine *thiz );
-+
-+#endif
diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch b/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch
deleted file mode 100644
index 3315968bc092..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/deniskropp/DirectFB/pull/6
-https://bugs.gentoo.org/567294
-
-From 5c7c4b197b9d04587b05624db4cfca6503adb3ff Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 8 Dec 2016 16:47:34 -0500
-Subject: [PATCH] configure: fix tslib version check
-
-The tslib version is 1.0, not 1.0.0.  Trying to check for the latter
-fails when using pkg-config:
-$ pkg-config --exists --print-errors "tslib-1.0 >= 1.0"
-$ pkg-config --exists --print-errors "tslib-1.0 >= 1.0.0"
-Requested 'tslib-1.0 >= 1.0.0' but version of tslib is 1.0
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 6143cd393699..12a65fdc4f52 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2561,7 +2561,7 @@ fi
- 
- enable_tslib=no
- if test "$checkfor_tslib" = "yes"; then
--  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
-+  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0], [enable_tslib=yes], [enable_tslib=no])
-   if test "$enable_tslib" = "no"; then
-      PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no
-        AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
--- 
-2.11.0.rc2
-
diff --git a/dev-libs/DirectFB/metadata.xml b/dev-libs/DirectFB/metadata.xml
deleted file mode 100644
index aaac930ef7b0..000000000000
--- a/dev-libs/DirectFB/metadata.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<longdescription>
-		DirectFB is a thin library that provides hardware graphics
-		acceleration, input device handling and abstraction, integrated
-		windowing system with support for translucent windows and
-		multiple display layers on top of the Linux Framebuffer Device.
-		It is a complete hardware abstraction layer with software
-		fallbacks for every graphics operation that is not supported
-		by the underlying hardware. DirectFB adds graphical power to
-		embedded systems and sets a new standard for graphics under
-		Linux.
-	</longdescription>
-	<use>
-		<flag name="bmp">build BMP image provider</flag>
-		<flag name="divine">enable DiVine</flag>
-		<flag name="drmkms">build with DRM/KMS support</flag>
-		<flag name="dynload">enable dynload support</flag>
-		<flag name="egl">build with EGL support</flag>
-		<flag name="fusiondale">enable FusionDale</flag>
-		<flag name="fusionsound">enable FusionSound</flag>
-		<flag name="gles2">build gles2 gfxdriver</flag>
-		<flag name="imlib2">build Imlib2 image provider</flag>
-		<flag name="input_hub">provides an asynchronous interface
-			to the input devices available and those being
-			added/removed</flag>
-		<flag name="mpeg2">build MPEG2 image provider</flag>
-		<flag name="mpeg3">build Libmpeg3 video provider</flag>
-		<flag name="multicore">enable multicore support</flag>
-		<flag name="pnm">build PNM (PBM/PGM/PPM) image provider</flag>
-		<flag name="sawman">enable SaWMan (window manager and
-			application manager)</flag>
-		<flag name="swfdec">build Swfdec (Flash decoder) video
-			provider</flag>
-		<flag name="tremor">build Ogg/Vorbis music provider using
-			Tremor</flag>
-		<flag name="webp">build WebP image provider</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3f39916232f9..09d7022ea7c9 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index e8d517210963..c69016f313f1 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -3,10 +3,13 @@ AUX boost-1.55.0-context-x32.patch 1077 BLAKE2B 76ff0e52ca076ccddd58a469b4531f49
 AUX boost-1.56.0-build-auto_index-tool.patch 412 BLAKE2B 4449dbe600547f339eba9afc4d3da5310f08baa2dd1beb30f9c1b4076e95e867c8fa84fef8a84e2aa38bf35368173e52057e73499a66766cbb81e2d3312fa07b SHA512 9fe245adddf76375d0ee8066952c46d229c9e37fdce83ff608fcc1fb5942b1c226a0fba6e28f859bbcd58863dc49a356f32c7fcc3b90baca4069c6bdc9c0f203
 AUX boost-1.63.0-fix-python.patch 4210 BLAKE2B f39a501c9a2718ff77300d97ec8d1ec0a99e90b6f4f2f4ef970a5daaebe1065a870d98f759c0e946707251a93bda0c54f3f864b1e4189f915226d638738e7dca SHA512 0f390cae5a53f48f548e65149aaca4b1191ca6610863e7e471686556107c8ac398eb4bcad71a92849e941cad031cec9cbd543c646ee122238579ca881c420aad
 AUX boost-1.65.0-fix-python.patch 9210 BLAKE2B 31e32cfbc8fa0c4e8a5c142f56a4a7b1d06173b6a5b7b4bc1c2fcc64e645eac22e9e4f85c8b278a1fcefcb15e389a38d82ec90facdbb1e7812f9f4cc77d2fe93 SHA512 df2e8841b3415724b2920230da36e3e3aa610a5d7ee7dcada847cb4d6c921405ef4f0c034f96d1ac078d33bb3f32408b748cf7835f173b6e7692c76c6135e2f2
+AUX boost-1.67.0-fix-python.patch 6017 BLAKE2B e249ea8f387bb2b87f58bb2a538992ea20c12ad2a127da940bc86f1b6f5231a5d8b77b46cd8e946b723b2e0a2d05240e1bbf66ab738980f95f2407e325bc6bc5 SHA512 bcd0c5fad2dc5ca4964f6b366fb5bb2d5e016b0d67480a3abebee03743d337c8514b580d610e9cbe215bd1602a6846963aeab7f04ac72cbc0ed146c7869b4f32
 DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
+DIST boost_1_67_0.tar.bz2 87336566 BLAKE2B 85ea00fc2197b1bbfc35d69427c87f23ea43d7592f1c9ce66e2afcde8476bdec86f6debdac815b23de59f4665a8e0c7f1519ab66a31d39df629723bc45710058 SHA512 82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8
 EBUILD boost-1.63.0.ebuild 12466 BLAKE2B 7aedf34bbef100bb52457e3906422ae22435a34486a921f60a7b0a5a4f48f251228331f1cebb9317c1c43355a8dffb4f9f555e4477136fc4cfc51f057b118c0f SHA512 215acc04fd1fc80271bb1d64c5e508a1c9162613ea526aabf291445f58a6f547155c0d000987a3a98c8dde8387db012978c42b140d03352b52f91df33d18aa5a
 EBUILD boost-1.65.0.ebuild 12442 BLAKE2B 961453196627d0671eb5e3e38292156ddaa94418941f503312aad0c949b320c14d98a88f8c8e91f8b76f3ce150235f66f80f7dade71b710ebfb5a94517f8897d SHA512 e11e282a61f07cdfa1bd24d3032baacf064518f1fbd65c432d04ebf1e1f890879302f64e800cb005bda5c3cee015cf86c327fa546ef8f7bd7f937871f6129fef
 EBUILD boost-1.66.0.ebuild 12459 BLAKE2B 6653ddd8bc307f9c91166bac312ee146e174bf09cfbc28afb3dbb8aff8bf286bb37f766bc2735f0cedd5cb113bd26637a3116bdeb6be0afca93d6bd80a89c093 SHA512 6ccbd309c502220afb9da6abedb36fb52791dcaee848acc102c1fcf69f538e3477939b14c0a1892fd31babf3002307adae2b310503d1f9bd17d2393611b2ce6a
+EBUILD boost-1.67.0.ebuild 12358 BLAKE2B 5d420ea8d2209632e8fb7a0a49fdf31b24ab07e4986ef4d5f7ec9c08ef239d9b06c9d4e4fd61efdd73aa211566a664cddc76f48b2af0482ac5ebd83de2f46e41 SHA512 649f9d15de4c8c6d614fe1103cf7357c7b96ad37a2fa18679ee3640a3e174299d40489f8497876ec68118fca4c11765c8ff6b287b916375958a5419ce7f6a9c8
 MISC metadata.xml 1526 BLAKE2B 11c2e9eb5b41e3fa0b100d58d672acefe4a949d0fa428b4ce1d100cc8f95eec7c1279c725741033ca50f61cb258b388270c18361a5b714a684398cc3ae1a445c SHA512 4ba131f2492ae41f642a28dd69e5bd1d5d79c013e42a6c18ba135b36d470990ea20c8aa7cec6e3cb1d6ea8d7f6b6a5b45efb4b3dcba198bcf43809eff0f65ae6
diff --git a/dev-libs/boost/boost-1.67.0.ebuild b/dev-libs/boost/boost-1.67.0.ebuild
new file mode 100644
index 000000000000..7eb5c945be41
--- /dev/null
+++ b/dev-libs/boost/boost-1.67.0.ebuild
@@ -0,0 +1,419 @@
+# 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,5,6,7}} )
+
+inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${PN}_$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+
+IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
+
+RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		>dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	)
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	!app-admin/eselect-boost"
+DEPEND="${RDEPEND}
+	=dev-util/boost-build-${MAJOR_V}*"
+REQUIRED_USE="
+	mpi? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
+	"${FILESDIR}/${PN}-1.55.0-context-x32.patch"
+	"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
+	"${FILESDIR}/${PN}-1.67.0-fix-python.patch"
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local compiler compiler_version compiler_executable
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+		compiler_executable="$(tc-getCXX)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+		compiler_executable="$(tc-getCXX)"
+	fi
+	local mpi_configuration python_configuration
+
+	if use mpi; then
+		mpi_configuration="using mpi ;"
+	fi
+
+	if python_bindings_needed; then
+		# boost expects libpython$(pyver) and doesn't allow overrides
+		# and the build system is so creepy that it's easier just to
+		# provide a symlink (linker's going to use SONAME anyway)
+		# TODO: replace it with proper override one day
+		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
+
+		if tc-is-cross-compiler; then
+			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
+		else
+			# note: we need to provide version explicitly because of
+			# a bug in the build system:
+			# https://github.com/boostorg/build/pull/104
+			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
+		fi
+	fi
+
+	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die
+using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+${mpi_configuration}
+${python_configuration}
+__EOF__
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then
+		grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" ||
+		(
+			eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it."
+			die
+		)
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Do not try to build missing 'wave' tool, bug #522682
+	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
+	sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
+
+	multilib_copy_sources
+}
+
+ejam() {
+	local b2_opts=(
+		"--user-config=${BOOST_ROOT}/user-config.jam"
+		"$@"
+	)
+	echo b2 "${b2_opts[@]}"
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "-sICU_PATH=${EPREFIX}/usr" '--disable-icu boost.locale.icu=off')
+		$(usex mpi '' '--without-mpi')
+		$(usex nls '' '--without-locale')
+		$(usex context '' '--without-context --without-coroutine --without-fiber')
+		$(usex threads '' '--without-thread')
+		--boost-build="${EPREFIX}"/usr/share/boost-build
+		--prefix="${ED%/}/usr"
+		--layout=system
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=$(usex static-libs shared,static shared)
+		$([[ ${CHOST} == *-winnt* ]] && printf -- '-sNO_BZIP2=1\n')
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	elif [[ ${CHOST} == *-winnt* ]]; then
+		compiler=parity
+		if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
+			compilerVersion=trunk
+		else
+			compilerVersion=$($(tc-getCXX) -v | sed '1q' \
+				| sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,') || die "sed failed"
+		fi
+		compilerExecutable=$(tc-getCXX)
+	fi
+
+	# bug 298489
+	if use ppc || use ppc64; then
+		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
+	fi
+
+	# Use C++14 globally as of 1.62
+	append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+	local -x BOOST_ROOT="${BUILD_DIR}"
+	PYTHON_DIRS=""
+	MPI_PYTHON_MODULE=""
+
+	building() {
+		create_user-config.jam
+
+		local PYTHON_OPTIONS
+		if python_bindings_needed; then
+			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
+		else
+			PYTHON_OPTIONS=" --without-python"
+		fi
+
+		ejam \
+			"${OPTIONS[@]}" \
+			${PYTHON_OPTIONS} \
+			|| die "Building of Boost libraries failed"
+
+		if python_bindings_needed; then
+			if [[ -z "${PYTHON_DIRS}" ]]; then
+				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
+			else
+				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
+					die "Inconsistent structure of build directories"
+				fi
+			fi
+
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				mv ${dir} ${dir}-${EPYTHON} \
+					|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
+			done
+
+			if use mpi; then
+				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
+					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
+					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
+						die "Multiple mpi.so files found"
+					fi
+				else
+					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
+						die "Inconsistent structure of build directories"
+					fi
+				fi
+
+				mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
+					|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
+			fi
+		fi
+	}
+	if python_bindings_needed; then
+		python_foreach_impl building
+	else
+		building
+	fi
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+
+		ejam \
+			"${OPTIONS[@]}" \
+			${PYTHON_OPTIONS} \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use python; then
+		rm -r "${ED%/}"/usr/include/boost/python* || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED%/}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED%/}"/usr/include/boost/context || die
+		rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+multilib_src_install() {
+	local -x BOOST_ROOT="${BUILD_DIR}"
+	installation() {
+		create_user-config.jam
+
+		local PYTHON_OPTIONS
+		if python_bindings_needed; then
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				cp -pr ${dir}-${EPYTHON} ${dir} \
+					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
+			done
+
+			if use mpi; then
+				cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
+					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
+				cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
+					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
+			fi
+			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
+		else
+			PYTHON_OPTIONS=" --without-python"
+		fi
+
+		ejam \
+			"${OPTIONS[@]}" \
+			${PYTHON_OPTIONS} \
+			--includedir="${ED%/}/usr/include" \
+			--libdir="${ED%/}/usr/$(get_libdir)" \
+			install || die "Installation of Boost libraries failed"
+
+		if python_bindings_needed; then
+			rm -r ${PYTHON_DIRS} || die
+
+			# Move mpi.so Python module to Python site-packages directory.
+			# https://svn.boost.org/trac/boost/ticket/2838
+			if use mpi; then
+				local moddir=$(python_get_sitedir)/boost
+				# moddir already includes eprefix
+				mkdir -p "${D}${moddir}" || die
+				mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
+				cat << EOF > "${D}${moddir}/__init__.py" || die
+import sys
+if sys.platform.startswith('linux'):
+	import DLFCN
+	flags = sys.getdlopenflags()
+	sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
+	from . import mpi
+	sys.setdlopenflags(flags)
+	del DLFCN, flags
+else:
+	from . import mpi
+del sys
+EOF
+			fi
+
+			python_optimize
+		fi
+	}
+	if python_bindings_needed; then
+		python_foreach_impl installation
+	else
+		installation
+	fi
+
+	pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die
+
+	local ext=$(get_libname)
+	if use threads; then
+		local f
+		for f in *${ext}; do
+			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
+		done
+	fi
+
+	popd >/dev/null || die
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED%/}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# Yai for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die
+}
diff --git a/dev-libs/boost/files/boost-1.67.0-fix-python.patch b/dev-libs/boost/files/boost-1.67.0-fix-python.patch
new file mode 100644
index 000000000000..6f51152d12e3
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.67.0-fix-python.patch
@@ -0,0 +1,153 @@
+Python module needs to be built without these extra renames.
+MPI module needs to reference correct python
+
+~Index: boost_1_64_0/libs/mpi/build/Jamfile.v2
+~===================================================================
+~--- boost_1_64_0.orig/libs/mpi/build/Jamfile.v2
+~+++ boost_1_64_0/libs/mpi/build/Jamfile.v2
+~@@ -61,10 +61,10 @@ libraries += boost_mpi ;
+~     lib boost_mpi_python
+~       : # Sources
+~         python/serialize.cpp
+~+        /user-config//boost_python_alias
+~       : # Requirements
+~         <library>boost_mpi
+~         <library>/mpi//mpi [ mpi.extra-requirements ]
+~-      	<library>/boost/python//boost_python
+~         <link>shared:<define>BOOST_MPI_DYN_LINK=1
+~         <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
+~         <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
+~@@ -92,8 +92,8 @@ libraries += boost_mpi ;
+~         python/skeleton_and_content.cpp
+~         python/status.cpp
+~         python/py_timer.cpp
+~+        /user-config//boost_python_alias
+~       : # Requirements
+~-      	<library>/boost/python//boost_python
+~         <library>boost_mpi_python
+~         <library>boost_mpi
+~         <library>/mpi//mpi [ mpi.extra-requirements ]
+Index: boost_1_67_0/libs/mpi/build/Jamfile.v2
+===================================================================
+--- boost_1_67_0.orig/libs/mpi/build/Jamfile.v2
++++ boost_1_67_0/libs/mpi/build/Jamfile.v2
+@@ -60,33 +60,13 @@ libraries += boost_mpi ;
+
+   if [ python.configured ]
+   {
+-    py2-version = [ py-version 2 ] ;
+-    py3-version = [ py-version 3 ] ;
+-
+-    # These library names are synchronized with those defined by Boost.Python, see libs/python/build/Jamfile.
+-    lib_boost_python(2) = boost_python ;
+-    lib_boost_python(3) = boost_python3 ;
+-
+-    lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
+-    lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
+-
+-    lib_boost_mpi_python(2) = boost_mpi_python ;
+-    lib_boost_mpi_python(3) = boost_mpi_python3 ;
+-
+-    lib_boost_mpi_python($(py2-version)) = $(lib_boost_mpi_python(2)) ;
+-    lib_boost_mpi_python($(py3-version)) = $(lib_boost_mpi_python(3)) ;
+-
+-    for local N in 2 3
+-    {
+-        if $(py$(N)-version)
+-        {
+-            lib $(lib_boost_mpi_python($(py$(N)-version)))
++    lib boost_mpi_python
+               : # Sources
+                 python/serialize.cpp
+               : # Requirements
+                 <library>boost_mpi
+                 <library>/mpi//mpi [ mpi.extra-requirements ]
+-                <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
++                <library>/boost/python//boost_python
+                 <link>shared:<define>BOOST_MPI_DYN_LINK=1
+                 <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
+                 <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
+@@ -94,12 +74,12 @@ libraries += boost_mpi ;
+                 -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
+                 <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
+                 <python-debugging>on:<define>BOOST_DEBUG_PYTHON
+-                <python>$(py$(N)-version)
+               : # Default build
+                 <link>shared
+               : # Usage requirements
+                 <library>/mpi//mpi [ mpi.extra-requirements ]
+               ;
++            libraries += boost_mpi_python ;
+
+             python-extension mpi
+               : # Sources
+@@ -116,8 +96,8 @@ libraries += boost_mpi ;
+                 python/status.cpp
+                 python/py_timer.cpp
+               : # Requirements
+-                <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
+-                <library>$(lib_boost_mpi_python($(py$(N)-version)))
++        <library>/boost/python//boost_python
++        <library>boost_mpi_python
+                 <library>boost_mpi
+                 <library>/mpi//mpi [ mpi.extra-requirements ]
+                 <link>shared:<define>BOOST_MPI_DYN_LINK=1
+@@ -125,16 +105,7 @@ libraries += boost_mpi ;
+                 <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
+                 <link>shared <runtime-link>shared
+                 <python-debugging>on:<define>BOOST_DEBUG_PYTHON
+-                <python>$(py$(N)-version)
+               ;
+-
+-            libraries += $(lib_boost_mpi_python($(py$(N)-version))) ;
+-        }
+-        else
+-        {
+-            alias $(lib_boost_mpi_python($(N))) ;
+-        }
+-    }
+   }
+ }
+ else if ! ( --without-mpi in  [ modules.peek : ARGV ] )
+Index: boost_1_67_0/libs/python/Jamfile
+===================================================================
+--- boost_1_67_0.orig/libs/python/Jamfile
++++ boost_1_67_0/libs/python/Jamfile
+@@ -36,9 +36,10 @@ local rule split-version ( version )
+ # For example, Boost.Python built for Python 2.7 uses the suffix "27"
+ rule version-suffix ( version )
+ {
+-    local major-minor = [ split-version $(version) ] ;
+-    local suffix = $(major-minor:J="") ;
+-    return $(suffix) ;
++    # local major-minor = [ split-version $(version) ] ;
++    # local suffix = $(major-minor:J="") ;
++    # return $(suffix) ;
++    return "" ;
+ }
+
+
+diff -ur boost_1_67_0.orig/boostcpp.jam boost_1_67_0/boostcpp.jam
+--- boost_1_67_0.orig/boostcpp.jam	2018-07-30 16:26:03.346187542 -0700
++++ boost_1_67_0/boostcpp.jam	2018-07-30 16:26:18.839081472 -0700
+@@ -105,7 +105,7 @@
+ python-id = [ option.get "python-buildid" ] ;
+ if $(python-id)
+ {
+-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
++    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" _ ] ;
+ }
+
+
+diff -ur boost_1_67_0.orig/libs/python/Jamfile boost_1_67_0/libs/python/Jamfile
+--- boost_1_67_0.orig/libs/python/Jamfile	2018-07-30 14:56:15.591366992 -0700
++++ boost_1_67_0/libs/python/Jamfile	2018-07-30 16:26:31.662993677 -0700
+@@ -47,7 +47,7 @@
+ python-id = [ option.get "python-buildid" ] ;
+ if $(python-id)
+ {
+-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
++    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" _ ] ;
+ }
+
+ rule python-tag ( name : type ? : property-set )
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 71f1dfb12cef..6d2bacc847d9 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,6 +2,8 @@ AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432e
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
 DIST Botan-2.6.0.tgz 6599127 BLAKE2B c45a974f89571c1050e28108267ca6ec094171be3d7dbcb033b86b7dac3f8074703c40c42d5737074a86c19266b4b47c266d0864ce08ee26fad05116a50c48a8 SHA512 2082b4aaac0802f117a5f75c67a69e6d364b436a0ebe543032e370c3f085752bbe1ca48051462066e13bd42e47573ebc532d1d45074fe406df032f33346ee645
+DIST Botan-2.7.0.tgz 7021654 BLAKE2B 3f18b7ba660a72a409beeaba8bd1b1bd021f645c135bed56d75b6ba906b7c28d1e14eac9550862500dda9c4b3ac3135cfc9c340e073c573deb66b236e09f8054 SHA512 992138d83e18aedf80337d825f80c34dd3d2177eb30967573c57cf9fb7e7f9a9965ae3d75f23635f4c93b4efb7bb5adbb3423702663c78a5eb905dd567561858
 EBUILD botan-1.10.17.ebuild 4221 BLAKE2B 463e3e2b0893b5c9330c7d317fb089f70cc8adf2f60654711674bfb1eeb3c2b34e44e5695b230078510821cb7f45a23745016ebfd6c30cc660d6a132f4ef3223 SHA512 00065423d5f3600a08542e8722ce63dcf6147bce0b2104e466acf444c7e107f191652b588d7b7054652099cb89973b646987084c39678a8472d565249e064f6b
 EBUILD botan-2.6.0.ebuild 2339 BLAKE2B f3871202e70810f7003a16a02befc4bf69ff04baa451a80a2bfb13a96cb1cbc645a1f622941c9af27b2a6b8617fe69f81d601a1fc0738ac4f922465a8014277a SHA512 f46c844b7df21647876f933f4263427625fc2da6a6688c5333f4205fad06da0c99a68de152036778ba0a6b4890b772c8e41f95687786e6153ace2d52856be3b2
+EBUILD botan-2.7.0.ebuild 2343 BLAKE2B f1afad9cd5595cd440c4c5690a89bcb3221479bebae4d55b2655a87e05e894667fca6f065de30dd825d777fff644830d9cd675978097f6fb4c244cce29ba0ee6 SHA512 cace49e3060744b8470a1e71a3f24f0469808d4f5f0c6a6fa71d4fcf1304a90af3b62396ece497d7c84b9bb8e8c73835007e710059892dd8f108bebc07d86c4a
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.7.0.ebuild b/dev-libs/botan/botan-2.7.0.ebuild
new file mode 100644
index 000000000000..5b1383c390d7
--- /dev/null
+++ b/dev-libs/botan/botan-2.7.0.ebuild
@@ -0,0 +1,92 @@
+# 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} )
+
+inherit multilib python-r1 toolchain-funcs versionator
+
+MY_PN="Botan"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+SLOT="2/$(get_version_component_range 2)" # soname version
+LICENSE="BSD"
+IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
+	zlib? ( >=sys-libs/zlib-1.2.3 )
+	boost? ( >=dev-libs/boost-1.48 )
+	lzma? ( app-arch/xz-utils )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/python:*
+	doc? ( dev-python/sphinx )"
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling modules: ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)   myos=darwin ;;
+		*)           myos=linux  ;;
+	esac
+
+	local pythonvers=()
+	if use python; then
+		append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+		python_foreach_impl append
+	fi
+
+	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
+		--prefix="${EPREFIX}/usr" \
+		--libdir=$(get_libdir) \
+		--docdir=share/doc \
+		--cc=gcc \
+		--os=${myos} \
+		--cpu=${CHOSTARCH} \
+		--with-endian="$(tc-endian)" \
+		--without-doxygen \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		$(use_with boost) \
+		$(use_with doc sphinx) \
+		$(use_with doc documentation) \
+		$(use_enable static-libs static-library) \
+		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
+		|| die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+	use python && python_foreach_impl python_optimize
+}
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 00d28093264c..bc7172315470 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -5,5 +5,4 @@ DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae
 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
+MISC metadata.xml 2242 BLAKE2B 5bcbcb78454bc3640d839857c026114a69f485bbbe934cc2db098168368c34e0840e37389628e8c0425e9045833735c58c8c1a36132a76d36c3eeef4d8c557f7 SHA512 65a10606f3e77f82a26b4cf9fdba2a4ef1358fcd041ee5bbffe2a932477597479cdc604dd5df1a4cb0384709116b1d9430f1815f5020b1ff7cf4eeea7d8cd0f3
diff --git a/dev-libs/efl/efl-1.20.7.ebuild b/dev-libs/efl/efl-1.20.7.ebuild
deleted file mode 100644
index 248449f62f20..000000000000
--- a/dev-libs/efl/efl-1.20.7.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_SUB_PROJECT="core"
-	EGIT_URI_APPEND="${PN}"
-elif [[ *"${PV}" == *"_pre"* ]] ; then
-	MY_P=${P%%_*}
-	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
-else
-	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-inherit enlightenment gnome2-utils pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="avahi +bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound svg systemd tga tgv tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
-
-REQUIRED_USE="
-	?? ( opengl gles )
-	fbcon? ( !tslib )
-	gles? (
-		|| ( X wayland )
-		!sdl
-		egl
-	)
-	gnutls? ( ssl )
-	ibus? ( glib )
-	libressl? ( ssl )
-	opengl? ( || ( X sdl wayland ) )
-	pulseaudio? ( sound )
-	sdl? ( opengl )
-	vnc? ( X fbcon )
-	wayland? ( egl !opengl gles )
-	xim? ( X )
-"
-
-RDEPEND="
-	avahi? ( net-dns/avahi )
-	connman? ( net-misc/connman )
-	drm? (
-		>=dev-libs/libinput-0.8
-		media-libs/mesa[gbm]
-		>=x11-libs/libdrm-2.4
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-	fontconfig? ( >=media-libs/fontconfig-2.5.0 )
-	fribidi? ( >=dev-libs/fribidi-0.19.2 )
-	gif? ( media-libs/giflib:= )
-	glib? ( dev-libs/glib:2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.6 )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( >=media-libs/harfbuzz-0.9.0 )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( >=app-i18n/ibus-1.4 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	libuv? ( dev-libs/libuv )
-	luajit? ( >=dev-lang/luajit-2.0.0 )
-	!luajit? ( dev-lang/lua:* )
-	pdf? ( >=app-text/poppler-0.45.0[cxx] )
-	physics? ( >=sci-physics/bullet-2.80 )
-	pixman? ( x11-libs/pixman )
-	postscript? ( app-text/libspectre )
-	media-libs/libpng:0=
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw )
-	scim? ( app-i18n/scim )
-	sdl? (
-		>=media-libs/libsdl2-2.0.0
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	svg? (
-		>=gnome-base/librsvg-2.36.0
-		>=x11-libs/cairo-1.0.0
-	)
-	systemd? ( >=sys-apps/systemd-209 )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( media-video/vlc )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		>=dev-libs/wayland-1.11.0
-		>=x11-libs/libxkbcommon-0.6.0
-		media-libs/mesa[gles2,wayland]
-	)
-	webp? ( media-libs/libwebp )
-	X? (
-		>=media-libs/freetype-2.5.0.1
-		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-1.1.1 )
-	xpm? ( x11-libs/libXpm )
-
-	sys-apps/dbus
-	>=sys-apps/util-linux-2.20.0
-	sys-libs/zlib
-	virtual/jpeg:0=
-
-	!dev-libs/ecore
-	!dev-libs/edbus
-	!dev-libs/eet
-	!dev-libs/eeze
-	!dev-libs/efreet
-	!dev-libs/eina
-	!dev-libs/eio
-	!dev-libs/embryo
-	!dev-libs/eobj
-	!dev-libs/ephysics
-	!media-libs/edje
-	!media-libs/elementary
-	!media-libs/emotion
-	!media-libs/ethumb
-	!media-libs/evas
-	!media-plugins/emotion_generic_players
-	!media-plugins/evas_generic_loaders
-"
-#external lz4 support currently broken because of unstable ABI/API
-#	app-arch/lz4
-
-#soft blockers added above for binpkg users
-#hard blocks are needed for building
-CORE_EFL_CONFLICTS="
-	!!dev-libs/ecore
-	!!dev-libs/edbus
-	!!dev-libs/eet
-	!!dev-libs/eeze
-	!!dev-libs/efreet
-	!!dev-libs/eina
-	!!dev-libs/eio
-	!!dev-libs/embryo
-	!!dev-libs/eobj
-	!!dev-libs/ephysics
-	!!media-libs/edje
-	!!media-libs/emotion
-	!!media-libs/ethumb
-	!!media-libs/evas
-"
-
-DEPEND="
-	${CORE_EFL_CONFLICTS}
-
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# Get clean environment, see bug 557408
-	xdg_environment_reset
-	chown portage:portage -R "${HOME}"
-}
-
-src_prepare() {
-	enlightenment_src_prepare
-
-	# Remove stupid sleep command.
-	# Also 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
-
-	# Upstream doesn't offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i \
-			-e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	if use ssl && use gnutls ; then
-		einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
-		einfo "gnutls has been selected for you."
-	fi
-	if use opengl && use gles ; then
-		einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
-		einfo "opengl has been selected for you."
-	fi
-
-	E_ECONF=(
-		--with-profile=$(usex debug debug release)
-		--with-net-control=$(usex connman connman none)
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-x11=$(usex X xlib none)
-		$(use_with X x)
-		--with-opengl=$(usex opengl full $(usex gles es none))
-		--with-glib=$(usex glib)
-		--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
-
-		$(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)
-		--enable-image-loader-png
-		$(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 svg librsvg)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tgv image-loader-tgv)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_with vlc generic_vlc)
-		$(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)
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-
-		--disable-tizen
-		--disable-gesture
-		--disable-gstreamer
-		--enable-xinput2
-		--disable-xinput22
-		--enable-libmount
-
-		# currently no JavaScript engine builds. Therefore:
-		--with-js=none
-
-		# external lz4 support currently broken because of unstable ABI/API
-		#--enable-liblz4
-	)
-
-	use fbcon && use egl &&	E_ECONF="${E_ECONF} --enable-eglfs"
-	use X && use xpresent && E_ECONF="${E_ECONF} --enable xpresent"
-
-	enlightenment_src_configure
-}
-
-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
-	enlightenment_src_compile
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-
-	enlightenment_src_install
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index bf6078439790..591fc67fc6f0 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -31,7 +31,6 @@
 		<flag name="psd">Enable PSD image loader</flag>
 		<flag name="scim">Enable Smart Common Input Method</flag>
 		<flag name="tga">Enable Tga image loader</flag>
-		<flag name="tgv">Enable TGV image loader</flag>
 		<flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
 		<flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
 		<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 514e6477dc15..795da42bfeab 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,5 +1,6 @@
 DIST ell-0.5.tar.xz 393112 BLAKE2B c9b718a6b471ef428f563989843281b7b00c1ed382d68e241d9b1f624ef085c554ed46eefac544a8711fe2ec15428eb5b069f60d827e5a363e8c0a539e2fbf7f SHA512 aa84ce99980ada2bd80ac5a479d31c84784bc7b09afd0586ab1672a1227dbe14fdbc3788ccc812b22073e1e55b8902f81f86d9f1350c5c280886a8528d6979ce
 DIST ell-0.6.tar.xz 393016 BLAKE2B ad3a5402eca26a77caabb1d01054500333824c56403c1585c7aaf9ac19fd3f17e4d1dfc226f58ae1303d678e88d5b07c6b6e9c68a643f99b645ca4c4a10f7b19 SHA512 df39c460e781d5fa9838df362721687747148280cb7762dddce6aa35c38db1713b01efff5156d9dc144d6e11d50be7058db1362f4143f7a606bc6fbeeedaf8bf
 EBUILD ell-0.5.ebuild 711 BLAKE2B b2d4c540efc7456c20c10e42e79006ae43de0bd502ff4948a50d098c1eee1016f32b72d705d555a6b5dc6320467de1d962b3c382d785daec9025f1c288e8f8b2 SHA512 26fd2588d3630c874fb0a6ccc1bdd66d175022586b29b75362920ddf3e28928378d1e3c2156ffa6c70fbc57e0fc743ac8496ff8d0ef946fe51a417122f3c0fc0
+EBUILD ell-0.6-r1.ebuild 754 BLAKE2B c088f1e6e25cf5db76d1a6b74af9d059c8c2e5e77b4450d564e0d8ec3f8bc0bd078ee8a08d8db998d8c7bd532c8c66984e33d16d28950da35d2242661353d678 SHA512 f8d8ad907eee487cb02276835e2ac9d46182eb40d2871bcd8f1a82ac23fa0c83dd6e3a4efed43953f763110aa89e4cc2361f654b06dc248d92f60011328b793e
 EBUILD ell-0.6.ebuild 706 BLAKE2B 2ad1313da1ba1ad119013b185f59629e59723eb12cc0796b0b93db7500e96a107bad83eb0bc278555aaa4a58002f824303f2a706116ed01c96767573d1de59f0 SHA512 658e48ce434ed709ceb1c3803cba9aab2002960810d10ecc98aad01629fe50f6a3c02f0a9d3853d3ded652a2a7edc423c13c901f601d19b040a26245548b69e6
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.6-r1.ebuild b/dev-libs/ell/ell-0.6-r1.ebuild
new file mode 100644
index 000000000000..937ba6d0dece
--- /dev/null
+++ b/dev-libs/ell/ell-0.6-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index a5b97f0e2f3e..a5dc9645b62b 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,10 +1,5 @@
-AUX fribidi-0.19.2-nodoc.patch 326 BLAKE2B 44e0194815a8c4d9c69268918b7dd679d8e2b664b2baed7b60fd970be39fbe4cdd2ff1dfe44a5d0a32b753d5e725b5fd0ecdd62323d6fa51ddc3803ca5e068a3 SHA512 cebfda88ee8a073ea270f18c43e00aa3c15e4646511b161930d9afbafd67a6535423a78025e415031d7a5582243c326940cc8ce418f74a60424505a43614b674
-AUX fribidi-0.19.5-signedwarning.patch 617 BLAKE2B 464b63c4e3b274925e32d8086129599d57b38ba5a4d28e5b67c19f3f4d0985ae6141e2533ae4882b3eaafa89fe0904872f82dbdbeeb9262f69f47a900224210c SHA512 3fa29f77adb19d2da52ff46d39d3da7662edf80d4cde98d87d3827a8b844c2e272408a611d7ef1364f72b78e801ce585a5ff89fe2a85729fa95982c3aecaedd5
-AUX fribidi-0.19.6-page-size-header.patch 852 BLAKE2B b0109ff6e21fd816e42afc568c4207169e54b2f4fd38a65635816de477ae1499d83d5a5eecde5f68a4700327f4798f8f85d0992ef20702c878a14403a25be5ed SHA512 3d8fb438832b9de217c8468ecdd61101d9fa8f5e8ee5c9e4af9b4e01e6b04e6ba35351c586767ab794dfbb8d2e05e30c2f947bf97163839f4d46aff98e9be74c
-DIST fribidi-0.19.5.tar.bz2 625034 BLAKE2B 74929614cc07a574ffaddcde4bcbfd09dd107362a9f82502b940f6be08bf61a2004237429695184d1c59667a3689d5e01787586cdbc536fb17c3c093b7fb22a2 SHA512 0a1216d3ff23f76dd90a1fa5b1eadd1276cfedc07bd636e345df23911d2e23bc3780a5ba2e32f2025b517f7137135fb3de6d337f872932466efe480ece364e43
-DIST fribidi-0.19.6.tar.bz2 639022 BLAKE2B cf17ec580d93807e7720f7833bcac2e5ffaa16dd52505e1a3158d6d6fc6af5111ad11d75b15c7837185d04b48f18ca72b6b903962b084c5a7f5fbcc0bcf7f1bb SHA512 0661cf8e0985edfd5bf02c8de32432bf2faacadcaf35aef4e039a28f802a0468288e76b60231ebe7b54f909bd4d3ecc31a1fc94e83d434ae16dd21de6089629e
 DIST fribidi-0.19.7.tar.bz2 648299 BLAKE2B 496d010f29dd8fc3d349ad3f89d60a596dfceaa5350663442d5965cb09bc7a23e2ab8a876d7ca5b05ec3f4c5e178060cae2b493ccc46a6cdfc022d139e778259 SHA512 4bfdda43d961030a8a2ae2c98d2ca5d43c1b59633fa0987920c5537ec69f3f624204ceacc4c474d878cbb417ee2d9e708dfe169cfce6ad584d2f2d5122678b63
-EBUILD fribidi-0.19.5-r1.ebuild 1258 BLAKE2B 073108631a3d3db4e98a79e60dee5dabc34ed2701a819e814135fc223dc920d19e920b7447b995983fcdf2aa9d47b967142c0682124fbe72d93497b8e1357e48 SHA512 e428b8a0098b8a9b372c950cf12b539fa387a9e7708fc7331228f7e052c63fa6cb31152d35efba88c5cf89e96078322714c38f44577612a4b627cde8b9b64f36
-EBUILD fribidi-0.19.6.ebuild 1321 BLAKE2B 6ce0078d166db2c9dd60e8877211f097e50c4af20a118f70fae1a7418bca5e1079dcac3938340c9c415dee8b3b4d3f50269f5db509b706e0695364379177e793 SHA512 7b6e91b05f9a665330047817182d6b8e99b0c83c0fa76cc24b940cfffab49bf8d90504541076611d0f5331dd19ac07ac65c2fec656156f646be54f45137828ac
-EBUILD fribidi-0.19.7.ebuild 1202 BLAKE2B fa90fd48fd04cc75395338f550878974b74d06549263366127b931f0679478acb39110bc3de0ca4ce61698fb9f4fb6b3be7915cdb12de12d8ddbaa6633d35e5f SHA512 783194f668704618aa526ab4f1ba8f5597c2ff04e84d39d94753c98434fd3eb4442fb4991462304b047b116564c549c2811087bd22958143a5fe5aa1fbe50ff9
+DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2
+EBUILD fribidi-0.19.7.ebuild 1201 BLAKE2B 8f221f227b6fb6643841c3227862ac81ce4589a256044e111b09a77828f99b4102081c31830cc5b85a4414e084624587b6f31b31dcc048f4dbdc88108bc5e9e8 SHA512 ef4e35b977db7532f370559422e8a8d877365abd04a3c1d8d7962b3941a8babd1260efe2f804ed24df355ec0914408c9f98e72da19607209b2b343fea5dbb65e
+EBUILD fribidi-1.0.5.ebuild 947 BLAKE2B 527e0b3218abbb1d54d0e5bf57bfe5c7a6b2e8e8efec71a68b4f6b63738678e7fa329b43a49c48a3be9f2bc1cbcf75e6375672d87064238ec8ac765527a883aa SHA512 8508aba273bd92639bda17ce9fe2190a6390a85631c625878d44897ccc3580010192c59a26c59dfce7e05671c4d0e9ed5ec30da6bdc25e8adbe1bd2a537a9ad8
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch b/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch
deleted file mode 100644
index 8649db285528..000000000000
--- a/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am
-+++ Makefile.am
-@@ -9,7 +9,7 @@
- ##############################################################################
- 
- ## The order of subdirs is important, don't change without a reason.
--SUBDIRS = gen.tab charset lib bin doc test
-+SUBDIRS = gen.tab charset lib bin test
- 
- EXTRA_DIST = bootstrap ChangeLog.old
- 
diff --git a/dev-libs/fribidi/files/fribidi-0.19.5-signedwarning.patch b/dev-libs/fribidi/files/fribidi-0.19.5-signedwarning.patch
deleted file mode 100644
index 2619bf375510..000000000000
--- a/dev-libs/fribidi/files/fribidi-0.19.5-signedwarning.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 78dc3af68ed0e1aafe54c176b28dadee66eb306c Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Thu, 06 Dec 2012 17:17:53 +0000
-Subject: Fix theoretically possible overflow
-
-https://bugzilla.redhat.com/show_bug.cgi?id=884000
----
-diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c
-index ac9e2ff..dd27f0d 100644
---- a/bin/fribidi-main.c
-+++ b/bin/fribidi-main.c
-@@ -519,7 +519,7 @@ main (
- 				  idx++;
- 				}
- #endif /* !FRIBIDI_MAIN_USE_ICONV_H */
--			    if (wid < 0 && idx > st + 1)
-+			    if (wid < 0 && idx - st > 1)
- 			      idx--;
- 			    inlen = idx - st;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch b/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch
deleted file mode 100644
index c2b39155eea2..000000000000
--- a/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur fribidi-0.19.6.old/lib/common.h fribidi-0.19.6/lib/common.h
---- fribidi-0.19.6.old/lib/common.h	2012-12-30 00:12:59.000000000 +0000
-+++ fribidi-0.19.6/lib/common.h	2014-05-03 11:04:19.969727962 +0100
-@@ -130,14 +130,8 @@
- /* FRIBIDI_CHUNK_SIZE is the number of bytes in each chunk of memory being
-  * allocated for data structure pools. */
- #ifndef FRIBIDI_CHUNK_SIZE
--# if HAVE_ASM_PAGE_H
--#  ifndef __FRIBIDI_DOC
--#   include <asm/page.h>
--#  endif /* __FRIBIDI_DOC */
--#  define FRIBIDI_CHUNK_SIZE (PAGE_SIZE - 16)
--# else /* !HAVE_ASM_PAGE_H */
--#  define FRIBIDI_CHUNK_SIZE (4096 - 16)
--# endif	/* !HAVE_ASM_PAGE_H */
-+# include <unistd.h>
-+# define FRIBIDI_CHUNK_SIZE (sysconf(_SC_PAGESIZE) - 16)
- #else /* FRIBIDI_CHUNK_SIZE */
- # if FRIBIDI_CHUNK_SIZE < 256
- #  error FRIBIDI_CHUNK_SIZE now should define the size of a chunk in bytes.
diff --git a/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild b/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild
deleted file mode 100644
index f2f12390a25d..000000000000
--- a/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
-HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RESTRICT="test" #397347
-
-RDEPEND=">=dev-libs/glib-2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS NEWS README ChangeLog THANKS TODO"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.19.2-nodoc.patch \
-		"${FILESDIR}"/${P}-signedwarning.patch
-
-	# Fix compability with dev-libs/glib >= 2.31
-	sed -i \
-		-e '/include/s:<glib/gstrfuncs.h>:<glib.h>:' \
-		-e '/include/s:<glib/gmem.h>:<glib.h>:' \
-		charset/fribidi-char-sets.c lib/mem.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is
-	# present in /usr/lib/pkgconfig/fribidi.pc
-	econf \
-		$(use_enable static-libs static) \
-		--with-glib=yes
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/fribidi/fribidi-0.19.6.ebuild b/dev-libs/fribidi/fribidi-0.19.6.ebuild
deleted file mode 100644
index c93bd2a36797..000000000000
--- a/dev-libs/fribidi/fribidi-0.19.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools eutils autotools-multilib
-
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
-HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RESTRICT="test" #397347
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README ChangeLog THANKS TODO )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.19.2-nodoc.patch \
-		"${FILESDIR}"/${P}-page-size-header.patch
-
-	# Fix compability with dev-libs/glib >= 2.31
-	sed -i \
-		-e '/include/s:<glib/gstrfuncs.h>:<glib.h>:' \
-		-e '/include/s:<glib/gmem.h>:<glib.h>:' \
-		charset/fribidi-char-sets.c lib/mem.h || die
-
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	# --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is
-	# present in /usr/lib/pkgconfig/fribidi.pc
-	local myeconfargs=( --with-glib=yes )
-	autotools-multilib_src_configure
-}
diff --git a/dev-libs/fribidi/fribidi-0.19.7.ebuild b/dev-libs/fribidi/fribidi-0.19.7.ebuild
index bd18e3acd823..ff457b67bf78 100644
--- a/dev-libs/fribidi/fribidi-0.19.7.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/fribidi/fribidi-1.0.5.ebuild b/dev-libs/fribidi/fribidi-1.0.5.ebuild
new file mode 100644
index 000000000000..415d53968ef9
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-1.0.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="https://fribidi.org/"
+SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+DOCS=( AUTHORS NEWS README ChangeLog THANKS )
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+		--disable-debug
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index dfc737cfc06d..e00056a60601 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,3 +1,5 @@
 DIST gdl-3.22.0.tar.xz 529072 BLAKE2B 7215c53051dc3ec467c97615fa7e8059bf6c610cd166bea28ba256bf26b4de75fc63ab1e627acdeb8228257844ae1b47bb5d88cef24c7efcbd5bfbe508928eae SHA512 408fd75627497c658b65e9cd39b8779ad0db2fdc1f780e369237fbdd3f0ccc035cd86456ff72e1581c524f1d35673d3b31ebb074290babf025596d08d823833d
+DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471
 EBUILD gdl-3.22.0.ebuild 699 BLAKE2B b497476365878d4091df1b297ca87acb5e78537b32acefc6d28eed4bf03fda0c33ff14b07c66156330c555dfb42780fc7e844630204ecec0c4ad06e2f60769a3 SHA512 68e75de4dc853f09c7cb43f4533592c64ff6fbbcdf9bb4fb77e40fdf48958b78029b57edadd90f65e1194b08d3a7003e5e5a5dada30543a68f7b59b0b805c8d6
+EBUILD gdl-3.28.0.ebuild 728 BLAKE2B c968480bced21d97f5b16ac33d8aca5f87fa75dfe2ed038ec7311f7f281163632bf536e047d0fdef3fbeee6edc01421a8d8ebc39471595b8848ea7370faaefad SHA512 62c37d4eb12fe4f1299659463a927ac43ce0de4601ef63270529c8e828bf5ae9c4472cdc5999a33b9f9fb8f4082c10a8bdd3e13806dff78a80451564e07f8f66
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gdl/gdl-3.28.0.ebuild b/dev-libs/gdl/gdl-3.28.0.ebuild
new file mode 100644
index 000000000000..aa4f6208eff9
--- /dev/null
+++ b/dev-libs/gdl/gdl-3.28.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME docking library"
+HOMEPAGE="https://git.gnome.org/browse/gdl"
+
+LICENSE="LGPL-2.1+"
+SLOT="3/5" # subslot = libgdl-3 soname version
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=dev-libs/libxml2-2.4:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.4
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-gtk-doc
+}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 8562eed7613e..08c239d018f2 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,6 @@
 DIST girara-0.2.7.tar.gz 76723 BLAKE2B 7438709e15b9272260cfa9f5419b40672a2c33b2cdeed1d915b51b4d53b301a4347cb0c051155a9a20b09b61efb0ee13df7eb0fdc3a94d1a428a7cb1e296f0d2 SHA512 4229565b8a5fad1ecbf42e4f3f852644964a7d5c90154dab9b7dcb5ccd5f25731911452472bbeb28927d1e30d4df6ed066926e11c6a73f0fd5740570493a036f
 DIST girara-0.2.8.tar.gz 73646 BLAKE2B 08a3fea194922cfb84793d14905f15aac6e73daf3c4304842b88e7f517046daa287deaef770176bc06358b37c52418f1e42204df302c2c7d4f82c2f4a10a44a9 SHA512 d853f8337a63ae2ed319547a2daa2ccd3ce6f31b3dbb52522705c78dbbb94da1dc1efc4ac62d3c2af94531d4dea309323b878619ea0c9778c37960791ca0cb4e
 EBUILD girara-0.2.7.ebuild 1414 BLAKE2B 5da4f4a73ebcae523165ef9c7c8a91491b1d59fc1444f9c4dc52e551240d140f47ed0239e787aa3d2e57b6aabbc11f077baec982a469d6028e1a92e6a6298a55 SHA512 16beb54f7c54753de6743a767bab7c52f7961b651ff5a4df8336765086acb72e4645bc457410704364ecfe2e277edd1e0d546295d5be75e7afc8a54f4a5dfbf0
-EBUILD girara-0.2.8.ebuild 1415 BLAKE2B d759c6ed3f8715e6979e0d2ce5a97f86f290c047931c64cda02271f8ad81077a148017bae19e3b7825fe775fb7c01fca78bfb77f7cd2db7964182dfbfa48d1f4 SHA512 3eebe224c7b9fd3d88d956dfc81a29a4e601e57253c780aae77b78f57a58ef5ba0c103ceef50941cb10c2f9186ca73bbd72411415eca0c01e577a6bc2b0628d9
+EBUILD girara-0.2.8.ebuild 1414 BLAKE2B 5da4f4a73ebcae523165ef9c7c8a91491b1d59fc1444f9c4dc52e551240d140f47ed0239e787aa3d2e57b6aabbc11f077baec982a469d6028e1a92e6a6298a55 SHA512 16beb54f7c54753de6743a767bab7c52f7961b651ff5a4df8336765086acb72e4645bc457410704364ecfe2e277edd1e0d546295d5be75e7afc8a54f4a5dfbf0
 EBUILD girara-9999.ebuild 1374 BLAKE2B c62dc4c85ad520f17c5db15a541fc07336e5af6e25e536db8d269a95432846803816c90f25012d0db8daf6a41cb7dce4e949193deb6f5cfda48e312c77f1fe05 SHA512 033dc64f18e2a077463dc556475502cf322133f3942996b7398189c19c30ddf7efc55b76dc96d8ba9ba6e2240d4cf9af6c1bb745db4ffe3d139e32444c7610e4
 MISC metadata.xml 700 BLAKE2B a40c7ce11c9e6ccee885e8da21856f4b74b9845b358f560e7cbd597a87cdc70942fbdc2a4a30c0ad156a964c4c07754ccd03be8be9a98021813dabc12c5483e1 SHA512 96d4e1a4d9d59be1e2613ae45def5357af5a20d2f9511f1f56418bf2eb3e41198a062ff3af741cfca9b644201703a2e7979cb533c4e00fc9b85336844b10e5c2
diff --git a/dev-libs/girara/girara-0.2.8.ebuild b/dev-libs/girara/girara-0.2.8.ebuild
index f9a965f2d3e3..f8ff7c982364 100644
--- a/dev-libs/girara/girara-0.2.8.ebuild
+++ b/dev-libs/girara/girara-0.2.8.ebuild
@@ -17,7 +17,7 @@ EGIT_BRANCH="develop"
 LICENSE="ZLIB"
 SLOT="3"
 if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="libnotify static-libs test"
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 3235cbd78a39..890da03b0555 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,5 +5,5 @@ DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec24
 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 9547 BLAKE2B 042a59e8fdee8c0de912c224e2bd51aad8ce17ccfb33c123ef5a52225f1b993e9133469fd4e1577d27c47effe3315e0117f64acf41fccdba760f38df83acb6e3 SHA512 82508386cbee8cf9e49a04c22ce5a81bfd62b9aef1270da2ed885081797e6229a74a4313cea713830df6d74b99dbb7acb1f07bf7b0e588208656eb37a81143c6
-EBUILD glib-2.54.3-r6.ebuild 9994 BLAKE2B 8a9162033333ef27f21acbd0fb50e6dd3a4013526b26c552e0341696c76d00c8ca10cb63c4c23c0294ab3a2320a86a0c06b517255a67ef523260fac773fbd0f7 SHA512 e7ded5b7f76af59137d7b7fb5d97dee7c09d2e1c246d1fc285103c95454beb81bdd7f1f48d80ee946f4073d4d53f34e3b8365a6b715dd7442022de8bb8a46c11
+EBUILD glib-2.54.3-r6.ebuild 9998 BLAKE2B a6aa0197dfc2d787654970ab5d8086b181c97b8ed40bb5a1bebe5127f4bc5d9c62ecdb82e46a7c3eb99b150fbf3880be3846259501ddf1467827ec172b3d8990 SHA512 31a17d1552181e001bda28ced508699b757ceb892ca64955c65eb57ad8b1761261b966c6d272dfce5a9515f96d6a3ab14247dea83c875c3f1d56c0de63851d31
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.54.3-r6.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild
index 4d02ca0b7766..3541bdfccbef 100644
--- a/dev-libs/glib/glib-2.54.3-r6.ebuild
+++ b/dev-libs/glib/glib-2.54.3-r6.ebuild
@@ -6,7 +6,7 @@
 # then to be think very closely.
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 # Completely useless with or without USE static-libs, people need to use
 # pkg-config
 GNOME2_LA_PUNT="yes"
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 5f2d2f09e8ab..da24de523b11 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.50.0.tar.xz 1415700 BLAKE2B 7707d0affc35e60d272312debd429a96a578cc6ea4e889244a0a1dc34f23e3b686cea06076427575fa620f570141e173990ed12649cb669808141dab1fdffb19 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa
 DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93159425a176d8056fbac2af5038950b7bc4486785ca988fc4c8c4d6a069b2bf623092e57f096aea37bbb9a767adaa695ec8f0db4e6 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f
 EBUILD gobject-introspection-common-1.50.0.ebuild 1032 BLAKE2B 88bf89cee40bdfe0e69efe0126f65dca0133903ae4756c336494799c7a3a1b8093f7f2483560c627482d0a5dae7ec41872969c1322c0dc117df389f4e74c3424 SHA512 2f026c9d91e6300594e43499235d9fc563bbffc967cd91ebe7c7582ce173d717d10bc18a906086ac57eb82e5446c18288f091daf8a622b2e5a5bc033c70b5058
-EBUILD gobject-introspection-common-1.52.1.ebuild 1035 BLAKE2B 2457dd6ee074c44e8f3e1ab021c955adb40539f55b7b3a9b67572ff76622d2a20150a116d9f3b4fa3c7932e0b3bf74675729f8556c5f8f0fe0c095c6119606bc SHA512 7801dcc11fd4a35c5e6df11eba7afe6d5ea634def0c29a4f620539e15723260f107564de222eb6c1b0ccc26d04ffdd07c46ac1df58306b04f3e877794951706c
+EBUILD gobject-introspection-common-1.52.1.ebuild 1034 BLAKE2B a303a427f1f1373242105d1e94fb28428b80b5dd62a8d34dae9d64af86085ab2aa0e5a46dd52e466e06ac9dff2c991c7efeeac7f2df6cf9377dd7d31f7161443 SHA512 6b128e908dc0054ad7133b62e4718267a72a6f810a0f2f9b39d941ea42fb1595311496147c9006c1ece3888192bc9990b6ed25e07856c73926a128b422c8e8b9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
index 06ad2d2e99ee..e96dba30ab58 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 114f4c74c268..2f50fefe96b6 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.50.0.tar.xz 1415700 BLAKE2B 7707d0affc35e60d272312debd429a96a578cc6ea4e889244a0a1dc34f23e3b686cea06076427575fa620f570141e173990ed12649cb669808141dab1fdffb19 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa
 DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93159425a176d8056fbac2af5038950b7bc4486785ca988fc4c8c4d6a069b2bf623092e57f096aea37bbb9a767adaa695ec8f0db4e6 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f
 EBUILD gobject-introspection-1.50.0.ebuild 2092 BLAKE2B 92e733407ea06a272049437950950d24f42a90757c4368a4e634833df2b3502c1ebc9c57297fe9b7972d2d96fc57b0b247afd624d6468a697d59bd53fbde958d SHA512 559b28837ba8826dba5b258cd3c6a1723174fbf2ec2609c002677aee0fb2bfde431fc9f18b20f888c483fd4f4980b386bebd7888f5eda1c150b2f80b002297d8
-EBUILD gobject-introspection-1.52.1.ebuild 2099 BLAKE2B 74b536499e0b24c2c8fbe58c37dbe37af4229164547b8abb764582e7fbd89123b7090e8c71b4ceeac3028cb1eb139f4af61d899e56c075d3db0b0c91e6eaf92b SHA512 1a718f092a77da3835d418521770c86277d3c338dbda941d2acfc7656e65d25e316f910c9a5e2dd0f4b4c9a80d2fee5aa450b5ae7c7453a90fc25170ee377059
+EBUILD gobject-introspection-1.52.1.ebuild 2103 BLAKE2B 8ae5796263b70658e60073d7b4509db72d36753fb67ebc4e2426d9dbed42770f4acdd6892d8473f80e805dc4e1f9e3eb7beedcb1c8e917d3f7c04835c4731919 SHA512 035427b653fbbc484e39616b87dcf17f3886403e3eb24f2e143b370a6dc1b3cafd00068b3ad8dda331b5cb8fd7923355248d559defa63099b992494c575203d8
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
index d66d9a3032d8..cd13d805e9c9 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 python-single-r1 toolchain-funcs versionator
diff --git a/dev-libs/grok/Manifest b/dev-libs/grok/Manifest
index 46ae264dc8b3..4075b76241c7 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 983 BLAKE2B 1f23432272f3b36224cfde1188760ebb5c53d4f954c6fb95f517126b0054e5e88c62f2b6cc6870a5e06964db64561dbec9dbb04d63edb4618a494e498db69604 SHA512 05e12a456540a6de2a34752297aadf61c86c5529c3bd11f4d5a94acc14a127147bc64b88db76fba46773ac3052b6a1da48e544dcae74565adf0ba4d6cd0277b9
+EBUILD grok-0.9.2-r2.ebuild 982 BLAKE2B bb400f7d0d80d5a1649ef162bb87b8799a71a5ffa2712779756a9e423568aad044f5792c007fd5fc4a6b89deb833317c1f6dc9c62ec27b119bf2970b047aa45b SHA512 a4827e7d5f6fc7145a7f3cab3f39e95e2dce926a4898b0a82853fbbcdbdafcca4c1608f0521a5ea5890a76b70aac1ea5ddb59524020c507585fb3bcaecf9fa19
 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 64987886cdeb..72d46636f25f 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/isl/Manifest b/dev-libs/isl/Manifest
index 7f51f4707b88..1229e88bd588 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -9,13 +9,15 @@ DIST isl-0.16.1.tar.xz 1449164 BLAKE2B 8c048ad398d7c3de79f4d6a6c3d906b4086bbcf59
 DIST isl-0.17.1.tar.xz 1440564 BLAKE2B ab2dfd50a4c5adc5ebba172ab969475adf15f541305e63bed273e6a30d6087bcb9383cce16207bbcf89578bd98527f56df86b2a264c078dc9d730e3d59c326d2 SHA512 03d73e81db2a01c5dd31bec12816975988bf731f29b95637bc15ea24abf0becad6e8d650ca0bad45eaad4197cb0a1f5ca189aec638db162c56092a001e35d86b
 DIST isl-0.18.tar.xz 1475708 BLAKE2B 216d4d75e2bc03b3027c67ac7ab373aca6040ead12b2844504890d6fe6dd80e82c66d0f89eb1fc7451a23470445d2656f704971d3b8bfa2916154973e9b52038 SHA512 3606609765fc34740ab3014e2256d6bba7ff730463b014a0e4f5fcfb2e3dbef974503dff1f3702b307ef79ff86c5bc2c3ce3c3c8511533971fd5d53ab45f6eea
 DIST isl-0.19.tar.xz 1515156 BLAKE2B 1be213df736f59123072778b9721db06130c935edf0805fd489d74c9effeb9eaf5b191de0a28e8a5138f79dc23ac9ebb213c57c020d0411afb305788b5f312cd SHA512 eeda0405d38f77a18c6e69128948dc29af7e44ce827e9fb538d3844c6e22db3b4126287ca0937d9bee7b528bbab7aad8d3729db36e74864196f57e81943dade4
+DIST isl-0.20.tar.xz 1539064 BLAKE2B f1347c0126ba3ae9b5fa073d0f206a7f48d53edb40d87ddff18005d94754ea4d1fd3801ee913d3b7234124b6c1447990e5d299fad6c6b7ff1d022ede82bba9b2 SHA512 394bccd22d8e63cb052a60ad8b1a75f4ec43916a9482c66f5167b534b538161179c47919815983b7fbc20dfaa1a590e88b251850aa092bbffc2891635bf30dc4
 EBUILD isl-0.12.2.ebuild 1048 BLAKE2B 371ee9c0891fe772e5ccc2ca2401f10e03102edcc397ff8c22169ce0a98533da0eaafc149f3eff3e019b25b78b9520d82a8ed7db04014dcdd979182440dcd5a0 SHA512 6834670244e7f4ec9a8238442ad472282db1fe313af11a2b17b9e7c3205b6e3b2efee00fb539cfc7c720d5fc8f0e39334e739fa22fea2fb8eee9152b77ad184c
 EBUILD isl-0.13.ebuild 1060 BLAKE2B 6074a73a484526d0392bcbd01d497bda7be34d1e57e064fa9cf4fb1e4afeb4646d191b8dc946b647651f5b8416949a019fcb85646e04ef5ad2e8449ba941d04c SHA512 289ea8dfac458f4c79f63f15b65ca4c675ab23bf6d48ce149cbc1ae4c5640ddd0c1f37de6336d7271eb0411a6a1305f364bc3fb0d82294ad0aae7b2dc6b97b5d
 EBUILD isl-0.14.1.ebuild 1078 BLAKE2B ed37bfff657e07ac2939db638581eae19cd93c77379c0a25693692830181775520f2cd71f1ae59c270a7ec64368141bdd4a87b301959bdf41342dade22a061ae SHA512 0bccd7ddb31c98564515f1ef9436276c29249391a685f1022ddc7e78f415b25be3bc2acd63d888d18f99cc9b0aa311b90960a446656d02e973af507abbe57543
 EBUILD isl-0.14.ebuild 1078 BLAKE2B ed37bfff657e07ac2939db638581eae19cd93c77379c0a25693692830181775520f2cd71f1ae59c270a7ec64368141bdd4a87b301959bdf41342dade22a061ae SHA512 0bccd7ddb31c98564515f1ef9436276c29249391a685f1022ddc7e78f415b25be3bc2acd63d888d18f99cc9b0aa311b90960a446656d02e973af507abbe57543
-EBUILD isl-0.15.ebuild 1068 BLAKE2B 10de3bacb7378797046d02614b0a8f6121b3e12a3480564ded2f1bfdbfad68a501cfdc0847b6d6db11125ea4fa88c275d5c14942c632a65e0f20bcac29cb1d59 SHA512 ab839c2da913fca42dc4e166b800aa41733cfb4a9c1651db056bc1cebb02edaa587b303fb0da0686092ddcd91a3f09c1417294b9149cb95261a5ca2c6b4aa9c3
+EBUILD isl-0.15.ebuild 1067 BLAKE2B 93e49eecfc34622e1b28668615bc6d26638ef272a07f5fcaadd7176edb4920170c3cc8314938e5d879ed1e3bd37f343bf5a0ec3a789cd5a04ad21a1ba64dd2db SHA512 040ba32e203db3a859f9133e5b66bec283fe148e3d257acbc22f95bc3a8d6f64f63556542e7f3937b481a5331914cf56f113326af527f6bf745b7fc5621c6a44
 EBUILD isl-0.16.1.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ecde0ecd5f102073d4f720da7b8b3429014da53ea0f05c540cca486f3497bb472dea72c21cf230b846bcfed7 SHA512 74a306b624ecceeb45e7f92e5412746e804c366b76a477e0b6b5feb8e4328bc3e8a252d65ddfb59938504ebe99a99e0a7c34970d48bd3aea532bf073c1a36e5b
 EBUILD isl-0.17.1.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ecde0ecd5f102073d4f720da7b8b3429014da53ea0f05c540cca486f3497bb472dea72c21cf230b846bcfed7 SHA512 74a306b624ecceeb45e7f92e5412746e804c366b76a477e0b6b5feb8e4328bc3e8a252d65ddfb59938504ebe99a99e0a7c34970d48bd3aea532bf073c1a36e5b
 EBUILD isl-0.18.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ecde0ecd5f102073d4f720da7b8b3429014da53ea0f05c540cca486f3497bb472dea72c21cf230b846bcfed7 SHA512 74a306b624ecceeb45e7f92e5412746e804c366b76a477e0b6b5feb8e4328bc3e8a252d65ddfb59938504ebe99a99e0a7c34970d48bd3aea532bf073c1a36e5b
 EBUILD isl-0.19.ebuild 1362 BLAKE2B d31f140f3168fb1fb25ca106c5953c8c7baa92d338d4bbf361c13061a21cc8a0ee7b27fbbb7259d6e1aa5d0aae7fbe92c5824046473f62a8880116bfbf8bdce6 SHA512 e6215d0e567d46470e446cda506b618d67b2380b2ec8967636197d56ebc6afa46f98bb4c522d03427b6841aa6f89e8edec209b1f9f87aa64fc6220fad8381c61
+EBUILD isl-0.20.ebuild 1362 BLAKE2B d31f140f3168fb1fb25ca106c5953c8c7baa92d338d4bbf361c13061a21cc8a0ee7b27fbbb7259d6e1aa5d0aae7fbe92c5824046473f62a8880116bfbf8bdce6 SHA512 e6215d0e567d46470e446cda506b618d67b2380b2ec8967636197d56ebc6afa46f98bb4c522d03427b6841aa6f89e8edec209b1f9f87aa64fc6220fad8381c61
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.15.ebuild b/dev-libs/isl/isl-0.15.ebuild
index a8cc1bfa4c72..9d9ec2c2bdad 100644
--- a/dev-libs/isl/isl-0.15.ebuild
+++ b/dev-libs/isl/isl-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.20.ebuild b/dev-libs/isl/isl-0.20.ebuild
new file mode 100644
index 000000000000..2aba05792855
--- /dev/null
+++ b/dev-libs/isl/isl-0.20.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils multilib-minimal preserve-libs
+
+DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
+HOMEPAGE="http://isl.gforge.inria.fr/"
+SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/19"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS doc/manual.pdf )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
+
+	# m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
+	# https://groups.google.com/group/isl-development/t/37ad876557e50f2c
+	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	preserve_old_lib \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15)
+}
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index bb9ca91ae61c..1897955331bd 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -2,6 +2,7 @@ DIST libbson-0.98.0.tar.gz 4451923 BLAKE2B 2d53cdc0cf1afa189eb1597ccc46a604c9801
 DIST libbson-1.1.10.tar.gz 4431658 BLAKE2B 1e542797c6617296c0ca7cb6dbbd34be5b31789a39130fb61000f11dfce6f7e3584f884c9350234b9704143d6a3280635cd32572b35e83010a7e9ddcc3f86ff8 SHA512 636178bafb19e7b103b5192866dbda0c70b8d7173560b0466f88b3a85cce3292a7caac9521808fa8c09d187f8c96564dcd9fb787e855d1619610f813583379bc
 DIST libbson-1.1.2.tar.gz 4492014 BLAKE2B 684c5053faf5a7f3afe6063e34247cfe7709afe0c17e8f387cfb337e6cc62e7b79c3cbf018e245bc189899e094858e1caff156344e126ba889964b1112820d21 SHA512 03e2ee337445286c14b846cd7545707959b1d351fa466c6292379a85e48ea1a171dae37dd7aff092212239ad59aac6f1ab216ee5de74ef00a8a2a124559e34da
 DIST libbson-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
+DIST libbson-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4 SHA512 d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e
 DIST libbson-1.3.5.tar.gz 4547720 BLAKE2B e5e258344aea0969ac74d88d040a464b72d460a13776c5c8c639e569ed3208fabd2641e850bf035c6889b466ddcc33d487da0aeab58f308bee7446b5fd0a31a1 SHA512 b55ae1d424f786aabed6567a77cd09aa26c74ab0a09392e88faef8c156b1650c026f86f245bc8431a0ebcf404c4f80eb1b22e978a24289d32692c84375a66596
 DIST libbson-1.3.6.tar.gz 4546329 BLAKE2B fa9102cd02e40e0ddb7518d34502f6ff63109b91af18a2285422530dae8c6cc04041b7589f340f2e6ed7a80e2474fea2684001b7ced5e8c911d4ba51e1a6edcc SHA512 a7da914ed0f03212d4fb01879543f0b2c7629923e33200fe30335a9a90a1082ffa2566c7a556b90a6c7ffbef5665a45ec67f87ffff2a5fcb89830769b1df5130
 DIST libbson-1.6.2.tar.gz 4835257 BLAKE2B ebe20a6c9ac8a4fcbd8e838d1a7cd319a6b31956690aa2dfca2be42eaafb646405ea01fe2bf20b2dc21bf933c0eafc330fd45409f7c902a7bf0c0641cfe0891d SHA512 f95f5bb829cff3aac6c1d95a159e38396d8fccef66d3026dac8085ba13ec376274cddeb92277d711ac4d40cafd8b89b73e9a9d1cf29e22f7f79aa9422c69488b
@@ -11,6 +12,7 @@ EBUILD libbson-0.98.0.ebuild 975 BLAKE2B f5d79791d080bd8fce54c8cf351cf6910c916be
 EBUILD libbson-1.1.10.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abbf6a9d85a055c5ede7967d42a430c0be809a98ead267bc1a34fb4a0453a90cd6a19f61e0a3d43d52334049b3b SHA512 e6abbe7790ebe385d047629eedd6574edd9685000424e8350dd3d1e8e861b2459ed7dd3d3f02a1f5fc33e34e0b8bf7cfd5088c8aeef0713c590399eb91cf423a
 EBUILD libbson-1.1.2.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abbf6a9d85a055c5ede7967d42a430c0be809a98ead267bc1a34fb4a0453a90cd6a19f61e0a3d43d52334049b3b SHA512 e6abbe7790ebe385d047629eedd6574edd9685000424e8350dd3d1e8e861b2459ed7dd3d3f02a1f5fc33e34e0b8bf7cfd5088c8aeef0713c590399eb91cf423a
 EBUILD libbson-1.10.3.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
+EBUILD libbson-1.11.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1123 BLAKE2B b568b6ba2dad1c940d0a77e04b9b3aacc119377f378a496edf2a4757c37110bb89a8325c3f1b6682dfe87209f582e37165290387b0ab4cc98bad51529550a3f8 SHA512 1abff3af97b0a699689d92f5f80affa42228b5abeac36a0eba830c4ae6eacd87e67c192045aa1921d43f4a2fad5e407bea728cee6f2100bb4d0a4df7765b6c57
 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
diff --git a/dev-libs/libbson/libbson-1.11.0.ebuild b/dev-libs/libbson/libbson-1.11.0.ebuild
new file mode 100644
index 000000000000..e229e5ac1bdd
--- /dev/null
+++ b/dev-libs/libbson/libbson-1.11.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="examples static-libs"
+
+DEPEND="dev-python/sphinx"
+
+S="${WORKDIR}/mongo-c-driver-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BSON=ON
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libbson/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libclsync/Manifest b/dev-libs/libclsync/Manifest
index 035c6570a8db..c0203842a072 100644
--- a/dev-libs/libclsync/Manifest
+++ b/dev-libs/libclsync/Manifest
@@ -1,5 +1,3 @@
-DIST clsync-0.4.1.tar.gz 253890 BLAKE2B c8aada690635f1cac355a1eaa51f4379688b0005869c5dcd6edccf5ae8e86abddf9ff99ccfcffeb165ccc80f407087a3f0863d1b78279894ff410daf25467740 SHA512 875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444
 DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6 SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
-EBUILD libclsync-0.4.1.ebuild 1803 BLAKE2B 2a35a9a46b7cf9c9e9e4c9eed4f715b1efd9fb4dc026e0d879c41cb1adb973c0daaeda8a2b9c55579fcc0f95ec25b8c92cbbf74639744bdae92619702bb40d0d SHA512 a5e630dc4ebd513c6f979909ba70ca5f3da93c5bde173e37e8ab6c7e26e74242fcac3dcd8270bdc60129aa58301505e7dc7927312068e01960f9d259f3682be1
 EBUILD libclsync-0.4.2.ebuild 1705 BLAKE2B 4a16590f6a76d27d9f00b69c7c3f21cf75a7143d1588ce4fb62b049bc991553b30a43594a70e2be42ee5080538457feedb6c7eb9f9cfa34913725bfc85ffdd5c SHA512 76b97ae5b95133c8d3b1d89c18db94898069e737e72de492482b50e987ef71f161c21aa81cc9295d941a3d61b1a565229b16a4a74c3e87aea25206ed2a73e5a3
 MISC metadata.xml 718 BLAKE2B 30766db9a818c3dc8ed475fb0b885d20f6ff058eb2e493572923d9efa7708f29a8f9b91cb159a98e2683fbb268e8e44df7ea955098d574a4a707474abcb96e19 SHA512 4f5edc94ccb24487d3cf9f15dbc3c2e6666de4b22fdc8efe2daf10a2b9d31452d85cabe83403062383865d274aae826944da0756e2630af54b4055ac0fd87f64
diff --git a/dev-libs/libclsync/libclsync-0.4.1.ebuild b/dev-libs/libclsync/libclsync-0.4.1.ebuild
deleted file mode 100644
index ddfca4a6ff90..000000000000
--- a/dev-libs/libclsync/libclsync-0.4.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN#lib}
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xaionaro/${MY_PN}.git"
-else
-	SRC_URI="https://github.com/xaionaro/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-inherit autotools
-
-DESCRIPTION="Control and monitoring library for clsync"
-HOMEPAGE="http://ut.mephi.ru/oss/clsync https://github.com/xaionaro/clsync"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug extra-debug extra-hardened hardened static-libs"
-REQUIRED_USE="
-	extra-debug? ( debug )
-	extra-hardened? ( hardened )
-"
-
-DEPEND="virtual/pkgconfig "
-RDEPEND="=app-doc/clsync-docs-0.4*"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	local harden_level=0
-	use hardened && harden_level=1
-	use extra-hardened && harden_level=2
-
-	local debug_level=0
-	use debug && debug_level=1
-	use extra-debug && debug_level=2
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-socket-library \
-		--disable-clsync \
-		--enable-debug=${debug_level} \
-		--enable-paranoid=${harden_level} \
-		--without-bsm \
-		--without-kqueue \
-		--disable-capabilities \
-		--disable-cluster \
-		--enable-socket \
-		--disable-highload-locks \
-		--disable-unshare \
-		--disable-seccomp \
-		--without-libcgroup \
-		--without-gio \
-		--with-inotify=native \
-		--without-mhash
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-	use static-libs || find "${ED}" -name "*.a" -delete || die "failed to remove static libs"
-
-	# docs go into clsync-docs
-	rm -rf "${ED}/usr/share/doc" || die
-}
-
-pkg_postinst() {
-	einfo "clsync instances you are going to use _must_ be compiled"
-	einfo "with control-socket support"
-}
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index 41b2298d9304..c4665a268fa5 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -2,5 +2,5 @@ AUX 0.14-man-page-typo-fix.patch 1562 BLAKE2B 3e0bc53ca9cbe959ba6360c6226ee99a82
 DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287a30db80dd7c9cf69f9eaba27245424ecdbfd8719a4cf30d9686f4b61bb5e394821f66c05e770c244a0208e8f3f SHA512 a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
 EBUILD libdaemon-0.14-r1.ebuild 1199 BLAKE2B 5dfa0749f2f582edc5003f4c1d9bf4f00d4100ad62d5ff058ea4a996d5e6f23d5f4bd74e18be8b9afebf23bdd45a825c2de0b488652b047c38bbf0c81763e806 SHA512 a4f0679b5702353f0dc05cc959dbe1cacba004093a69430fa71a85e2d0be0a80c07603d3e62152ebc203e8dc0fca412b764614cf9ccabb291e0fbcbd3d0d2070
 EBUILD libdaemon-0.14-r2.ebuild 1446 BLAKE2B 4e43ad8358555b319685431f1f7f3b2598116060cfe0d3dac1f923f06bcfcd84438036dd17fb2e174df5ff8397332ce557d81541b8fe7455cfa2ab1abe3027e1 SHA512 dffc3b0c3bedd18a109b5831009aaa309023645d4b419cf9f3d718cfc6629b2e0de5c738b681a093a3f7207b8076d88abbca880a002c2e7c5e8f1256446ff892
-EBUILD libdaemon-0.14-r3.ebuild 1396 BLAKE2B 09219c6c961138369f1aeb7621330d619cd78fbe2304e8f953801779c09d37ad833be8234f7eefb5be7d9766d0fae1877124722a271f8219945cec1b5ea35305 SHA512 b09468047df48a997cadc3b0991b10f884c82e3c01ba6d7f22c966d9065178fa3da29e3d0d6210718cae67930e2718f71cab600fe55ad0f37d8033f1f41356b2
+EBUILD libdaemon-0.14-r3.ebuild 1395 BLAKE2B d8f30dc212ff7cf0dd79ec4c2678837071d750cd826e17dc9cb7e461d3eccd5989c266270a17956f884c60f82172c22a4aea389e4a673f249c9120148f2f78f7 SHA512 617743a69a8abd5f1ad6ef9ad4fc9844f97d1b38bc34ee0739d95254a12c68b10358200f5ec73ff0678d0537692c511d49eb0c8b391fac4bc0e3c29d343cf7e2
 MISC metadata.xml 214 BLAKE2B 33eeb62dd1e0788ebdae4c98136c1c6a3b94a197683d1056a2e0c08566d14cde6469852038c1c8a574141f422d7ed3559332415f8ae79ab0fc223bc5fb55a1b8 SHA512 9b8ba52023f39252d9fc270607a4b928d4c961c893ef4f722d7e2ac567c66a3de509849ef754e3c8fef73923144251e5ebcc19b0d2ec93b94ab79ffb5c17cb83
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index 98b6228b3335..e61b2ef2ccab 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libelf/Manifest b/dev-libs/libelf/Manifest
index f3a5430cca23..c6b319fab22a 100644
--- a/dev-libs/libelf/Manifest
+++ b/dev-libs/libelf/Manifest
@@ -1,4 +1,4 @@
 AUX libelf-0.8.13-build.patch 1358 BLAKE2B b0a6ea3d29cc508da873b9dcb9c99c171e01d47df4f6c753434f9da04f18aa56314df089fd2dfebca320645a99fa474359f731d315d51989041ccdc4eb997460 SHA512 7971ef661c058d092c7d5c89649c9abdec1b9fea45bb71f442d5a671a754f793b54674a7665614551067733f1c415c4e05be99c7714d78488eb19850a409f98c
 DIST libelf-0.8.13.tar.gz 148529 BLAKE2B c0364d6a155ec1590c8ef0754ff0989144d2331e99eb2a5208d80259229904a72328733460675e334ce6b26123f1c92d28d5fb9aea1acdff3ea7a16f4b572a09 SHA512 d2a4ea8ccc0bbfecac38fa20fbd96aefa8e86f8af38691fb6991cd9c5a03f587475ecc2365fc89a4954c11a679d93460ee9a5890693112f6133719af3e6582fe
-EBUILD libelf-0.8.13-r2.ebuild 1308 BLAKE2B 3f72706dbcec0560974fba8ebdcfa517d24a590f132924a2bd12e0720e59d4d0fb5d71b2cdf7e2ed57588fc65b3a4c1fc83f4698ec0997bf5bed2cbe1d365078 SHA512 1d72392eeb763883c68a10c3ec2bfd18d9546e00510672f4587f0a4c4e69aed54773021ed81255195e3e5494a4dc9c8c453c6d2191cefd9e3e8b1e7c35224931
+EBUILD libelf-0.8.13-r2.ebuild 1327 BLAKE2B 1978d279af56ccf9ab2d6cacfe26f3525c0c584f8f4c6034443b814f03ecbcdb1bf8ce627345012b6d3e2f14a01f3fe36a20b107933b3472ff9bb68d4c0f6e8d SHA512 80acd953c93ddf2a4c73d1919219812c6f6644b203681945028c04493584b2d6ca414723e05629a252dec35013c3375dedbf669eb716c393a9a93794152a577c
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/libelf/libelf-0.8.13-r2.ebuild b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
index 98d0962d4f44..f0832e2e44a8 100644
--- a/dev-libs/libelf/libelf-0.8.13-r2.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit eutils multilib autotools multilib-minimal
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.mr511.de/software/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls elibc_FreeBSD"
 
 RDEPEND="!dev-libs/elfutils"
@@ -21,7 +21,8 @@ DOCS=( ChangeLog README )
 MULTILIB_WRAPPED_HEADERS=( /usr/include/libelf/sys_elf.h )
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
+	eapply "${FILESDIR}/${P}-build.patch"
+	eapply_user
 	eautoreconf
 }
 
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 9631399d6fb5..7bf30e75dd38 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,12 +1,12 @@
 AUX libfilezilla-0.9.2-cppunit-pkgconfig.patch 15391 BLAKE2B a9d72ff20ba52c74e932a347321dd6010c1e39a5e7149d201ce00377521471bf77fcc560c104ac2725892f4ba827ef7be2893dcd19a9df36b5bbad242ff09e5a SHA512 99e8c3ee7784a730d975279521e6e1a5d5dcd63ec0e30181dbfa8b23d080243a77d3a04e5aee124435030380df26df92509a61ff1cce48a5c9c64e00b48c900e
 DIST libfilezilla-0.11.2.tar.bz2 396032 BLAKE2B 68285a458c026ead9d0ab413e0638a45a451fd34d3284ff205d33e878f8c5e43fd4b3c92a5742d539383cbe0738c7e8d783c7523362ab744e9fc4d01d71dc932 SHA512 a2242fd67a054d47a938011c07a074f7e6d4a8fd7352b88411db1302d24a908a7b39ea76cd38cfe63765eb522476da4ccc22164884f9563e263a9e0895e7217f
-DIST libfilezilla-0.12.2.tar.bz2 398156 BLAKE2B a7dee7d6cc14964b105f4c2227f67202d573d879c2428f815568ef0efcfda9349f372b07a10abbb735dfd44a9d52358985144e3b67388dd2ee2b65e8af33cd51 SHA512 8fb77ad2f55e5a2b9066b2923591d51408942ce4ade2b4f21d20ceb818d3b7e7f01da2e41693aba4f4044b1913b14d54719101734792bfec6fc5432593ffa92a
 DIST libfilezilla-0.12.3.tar.bz2 398275 BLAKE2B 0ba30e64b6aeae0bed58913248992b7152b389fc560291174388196a02a583dcbc485c9fb9680e0541e788c2d6691a6050f465e8719c2c3e7974eb5fd293bf8a SHA512 a08343a418b4147b42d38afd04c66a26c405770109818b48a291c127a5fde6c98515b716990fb056b319c3be859f44060d4ee83e96ec5c4bfa40c755ddc01bba
+DIST libfilezilla-0.13.0.tar.bz2 398773 BLAKE2B e25f15bc4ec6a5aff119352535721f44bad3020342dd15e471cd228b6b2a6db221a4a099a4884c3a6215074547ced186f23fc243e066b04afdfaa5f54f245c0f SHA512 cb7950febf72a6d13f3ec3961d32ac281e8437e881155f9fb26820d6deb2a1d59ed5a18c08cb59a75d9527a8a9fda2f502a96dda4045f361dcbae522c1e1b26f
 DIST libfilezilla-0.9.1.tar.bz2 383315 BLAKE2B 0cade4316662d64b9a0eb6abd586355236bc2c3d73f3d2ad84fe857a25e593027bbb090f57c8656b8c06ae40d126d93b8310fb0642e2e73d3cace7e560c86837 SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393
 DIST libfilezilla-0.9.2.tar.bz2 383522 BLAKE2B e70d23a67a8c365d06692dc27cf76543db75200ebb808e9ad91be95dafb8df2c7603c23e249405b056b7c44bffc527fd84d5a4052e704db63135fb93876d916f SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88
 EBUILD libfilezilla-0.11.2.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
-EBUILD libfilezilla-0.12.2.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
 EBUILD libfilezilla-0.12.3.ebuild 923 BLAKE2B 42d482992114fc7d22bde3aee13d8e2ebd1a634702da8f05b33ab7b26e368171e5509e09662309ef735d760072fde58d6b48d7a1e4c1dbb7875e54274f4af2e6 SHA512 ad6b73746667125d5ef08f0f8ce0efb6d2da3f8c16f8c38fa031627859c2f6858e867e7c2c04ff18401ea98148941a10ba290c38135a963f011fca8bed084917
+EBUILD libfilezilla-0.13.0.ebuild 923 BLAKE2B 42d482992114fc7d22bde3aee13d8e2ebd1a634702da8f05b33ab7b26e368171e5509e09662309ef735d760072fde58d6b48d7a1e4c1dbb7875e54274f4af2e6 SHA512 ad6b73746667125d5ef08f0f8ce0efb6d2da3f8c16f8c38fa031627859c2f6858e867e7c2c04ff18401ea98148941a10ba290c38135a963f011fca8bed084917
 EBUILD libfilezilla-0.9.1.ebuild 921 BLAKE2B 4c68ad50f7a65b85281194981fefad1dce5a958c4066312a57f1b492f5c5784ea0636ae32565a343674eba4bd06f389b019329ff9c88a5385bb80efab027b1ec SHA512 73c7ba2f0180dc26580e0e0d9226b1a8dfa70818720e8bbb78c53fada8ec68e690278859416694aefd7fe69178b401485e4da48591da96b4f848cc34b18b6bd8
 EBUILD libfilezilla-0.9.2.ebuild 1065 BLAKE2B 3c19a20507b7fb350bd3332104b51c91201b4e42935a3f93a3ec3cb41ae88f601ddc01c303f9a1a216c21a4d82a1ca780ecd9e2d5f63aa74b98df361e863c10b SHA512 880341a0f71b1bb08b48c9f7e6fe78dbdf8197e62faf9f82cafabf561e675b01f4f084d409eb815ee509c99c4da2ca88acbf92638c88a53dd23cf3456e3e4572
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.12.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.13.0.ebuild
index b546fecc3c4b..28b3e2505fd9 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.12.2.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.13.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit flag-o-matic
 
 DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 03f2180db7e3..8859409a6638 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,14 +1,6 @@
-DIST libfmt-3.0.1.tar.gz 606603 BLAKE2B faba3f2e1ab6677403141d7eb9a217857f1a18668fff802c8b027598b94b8a8227af890eb98d20a42dde62aa02584b208187f4a4c71bc2d55d029a2c5af12259 SHA512 daf5dfb2fe63eb611983fa248bd2182c6202cf1c4f0fc236f357040fce8e87ad531cdf59090306bb313ea333d546e516f467b385e05094e696d0ca091310aad6
-DIST libfmt-3.0.2.tar.gz 608369 BLAKE2B abc4634a8f3da9eed68e5f52497503a34a25e8cd3141819bfb8c08c4dd9eb47edac1e263d81d997d1465a221fa1958c6a5c40a8bdd06017430922a25716b1c34 SHA512 50f5a25d1a10fd5b265f3811fa11886b9efdae2952f2aefc9f22c87c1a748128369f4d530b320e5e9c67c745cdab4607d1cb08940f4cf968300dee22e1150117
-DIST libfmt-4.0.0.tar.gz 617818 BLAKE2B 0cbbbb86bb6ff488226786c40cdf919fa2004c25a3da7a11ec69b81b08ca58a6a721c4e11f42a684d790c61b6ba0012d04f3af8b75f38ff2fd80332e80795a82 SHA512 8b9f7ce4720c3caef6de4a75b8d4b0fd7db4f1638edca98d5ea95f4a5157aef8faefbac68438236691bd373111ca089b4d3864f7352f3fba1fe44392e9644f8b
 DIST libfmt-4.1.0.tar.gz 620863 BLAKE2B ff3a7db5a1eed3a6fc936be16caf2dd153d9452df16c07d6e0dc718bcfb9f51f52146498cb3f49591f1ad96d36a9561de2a78426d3bb8a0907b772e8be5a6f7f SHA512 8daaa4a61bfe63345a12df0a9bca0b1cd6a162d0f4e97d2d2978ae19a1a1357ec4d4cce948ce726cdbe9403e51ad995950a2a99de28f9b9085c02ce845540b22
-DIST libfmt-5.0.0.tar.gz 634165 BLAKE2B 32ef9f655e4864ef6decd6e8545260996834103cc7cbf0df7bce00afe88c15a9821fe2d46d3f6f1e3a729b45916c515e088e3a04a4e46e709e7c74fe3e04f34c SHA512 1ce93648ab7aca6082767ff009d5836e226fa42f183852ca15230f371ef0a34878110ca63d8669a68de7f115c137fdaa11de998986a9440f08d50f0f214ebb90
 DIST libfmt-5.1.0.tar.gz 641502 BLAKE2B 8507e875a78de2e89b7fe2c1c049691bfef6e0a7375ef7958e2191bcc4c60972b54b6ebc213d1465826af8322d8f90b217c1c7e176b29351c733184ff95cca40 SHA512 b759a718353254fa8cd981e483bf01a45af0fc76901216404ace5e47f5d3edf43d42422184e5413c221e49832322fdf60d1860e8ec87349c674511064b31e5d6
-EBUILD libfmt-3.0.1.ebuild 649 BLAKE2B 516deac5abf6212aa6e5f76a1b407c12444209cbc1393f488cf544c8849143ce976283177f7b0d79198b1d9b76abfd5e10eeb2e6d1880aa4dd2df5e916e1afdd SHA512 11e31c4ba76f2ee6ec3ba96ffcc74af496b93f565598fef7090ab2695a2ff884ceec5e1110a6eeb8ac5f91b7698efef02c44b3a98cce4d4d57e9fc0235318be8
-EBUILD libfmt-3.0.2.ebuild 737 BLAKE2B 0022cf34771a888150bd9e5eee091d26f158036b21ecb6f2952d2a06c43281e55a1ea5743999a50c4214bcc0df07ea2c0a5f00cca7b484e446ddc6f8218c08a9 SHA512 5fae3765dcfa750b08d4e366f6306219250b70e9d7c508e3bc01976d4038135ccc5cde6dc12ea65255eb250ac56dbc0143f0637fba8b414f68102cf479f49a71
-EBUILD libfmt-4.0.0.ebuild 770 BLAKE2B f9b87f63ec9b107adbc8fb079be9bd0d8f8ac496abb58076acdc2100f50a159ceb6dcd3a34771d4235f8d5c979ed42f6d31455231984d4fa08e543d7749febf5 SHA512 506b735d656546d3ba2114fad8099a364e7ae22b6ce08254dce879680d8284013f258054692f9a876da363d8147aff06e2245c6cadb8edf0483c4a046853ff44
-EBUILD libfmt-4.1.0.ebuild 770 BLAKE2B f9b87f63ec9b107adbc8fb079be9bd0d8f8ac496abb58076acdc2100f50a159ceb6dcd3a34771d4235f8d5c979ed42f6d31455231984d4fa08e543d7749febf5 SHA512 506b735d656546d3ba2114fad8099a364e7ae22b6ce08254dce879680d8284013f258054692f9a876da363d8147aff06e2245c6cadb8edf0483c4a046853ff44
-EBUILD libfmt-5.0.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
+EBUILD libfmt-4.1.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
 EBUILD libfmt-5.1.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
 EBUILD libfmt-9999.ebuild 770 BLAKE2B f9b87f63ec9b107adbc8fb079be9bd0d8f8ac496abb58076acdc2100f50a159ceb6dcd3a34771d4235f8d5c979ed42f6d31455231984d4fa08e543d7749febf5 SHA512 506b735d656546d3ba2114fad8099a364e7ae22b6ce08254dce879680d8284013f258054692f9a876da363d8147aff06e2245c6cadb8edf0483c4a046853ff44
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-3.0.1.ebuild b/dev-libs/libfmt/libfmt-3.0.1.ebuild
deleted file mode 100644
index 577be5b9940a..000000000000
--- a/dev-libs/libfmt/libfmt-3.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="BSD-2"
-IUSE="test"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-3.0.2.ebuild b/dev-libs/libfmt/libfmt-3.0.2.ebuild
deleted file mode 100644
index 23798b4282f6..000000000000
--- a/dev-libs/libfmt/libfmt-3.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="BSD-2"
-IUSE="test"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-4.0.0.ebuild b/dev-libs/libfmt/libfmt-4.0.0.ebuild
deleted file mode 100644
index 51fea82ad48f..000000000000
--- a/dev-libs/libfmt/libfmt-4.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib versionator
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="BSD-2"
-IUSE="test"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-4.1.0.ebuild b/dev-libs/libfmt/libfmt-4.1.0.ebuild
index 51fea82ad48f..205d52c52e72 100644
--- a/dev-libs/libfmt/libfmt-4.1.0.ebuild
+++ b/dev-libs/libfmt/libfmt-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/libfmt/libfmt-5.0.0.ebuild b/dev-libs/libfmt/libfmt-5.0.0.ebuild
deleted file mode 100644
index 205d52c52e72..000000000000
--- a/dev-libs/libfmt/libfmt-5.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib versionator
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="BSD-2"
-IUSE="test"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libfstrcmp/Manifest b/dev-libs/libfstrcmp/Manifest
new file mode 100644
index 000000000000..c0dea242b47e
--- /dev/null
+++ b/dev-libs/libfstrcmp/Manifest
@@ -0,0 +1,3 @@
+DIST libfstrcmp-0.7.tar.gz 394845 BLAKE2B a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e SHA512 aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c
+EBUILD libfstrcmp-0.7.ebuild 724 BLAKE2B b98d5ad213988637cda9a73c182f7fc20c259530466e17cabe05f50896224a075d508d2ab6bc7a73d221f7865915941128a0980144f20246bd216299f957ad0b SHA512 7c79e9215466f1adcfb96126513653bf405c39f8a0f48c6f84442ccf42604e443d83b167dd9087be6bb2623250e20131b556c22962f1198ce05722a720b7c072
+MISC metadata.xml 325 BLAKE2B cc27381f0071006c05af2fe95a2dbbc481fbb8457976c4c4eec7c3321df75ca4957b7a626ebc1d20aa524bedae4730ca05bf0fb36f8e2b0177429993d73d5237 SHA512 f9baf25481af2a997d7f05610c68b7a3fb376d4bdf1526e59b172d2e3c4e4a2008b1fce9c66247bf01b488db4932872dc58eb0e1fffb9e6a2cc769023f7c75d6
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
new file mode 100644
index 000000000000..f4d6bb2c005f
--- /dev/null
+++ b/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Make fuzzy comparisons of strings and byte arrays"
+HOMEPAGE="http://fstrcmp.sourceforge.net/"
+
+LICENSE="GPL-3+"
+IUSE="doc test"
+SLOT="0"
+
+SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/fstrcmp-0.7.D001"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	doc? ( app-text/ghostscript-gpl )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake all-bin
+	use doc && emake all-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-bin install-include install-libdir install-man
+	use doc && emake DESTDIR="${D}" install-doc
+	einstalldocs
+}
diff --git a/dev-libs/libfstrcmp/metadata.xml b/dev-libs/libfstrcmp/metadata.xml
new file mode 100644
index 000000000000..9fd38e376f59
--- /dev/null
+++ b/dev-libs/libfstrcmp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">fstrcmp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 6f1c40ab3e41..5be20c60b2c0 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 2200 BLAKE2B 49055b778612f9dac9286897a3e49a54bd88f91de6a9f49f178568c026eeb0073cf69a0267d853c97c745ec851aca63ecd11be4518d11f0e7c9c6fda430cbe6d SHA512 5bcddd9905f05888514f4506d317d25981ec610883181f4a58ec431bb83b2d361e7bfae8dc9a8f099f3befec5925886650293c896875673ed20351cee3dcd89d
+EBUILD libgcrypt-1.8.3.ebuild 2199 BLAKE2B 0dcbf625f04d7dea01569f8613ebba8d851ac612164dff1623dd1221d6b16e86f06e2e38d32226c7f93d453fe9a34cd6a6d9aa0af57acc51d38b13b7a98ca76b SHA512 c15d1510772203435c6c94706dfe255d04a65922f889e67881de69081ab0bdacfb4e23f81422af8752d813028e7835b67443b05d4b58faaf3bfe0409c9e4bd22
 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 8820d507dbb5..52183aedd458 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/libgee/Manifest b/dev-libs/libgee/Manifest
index 96670e6e4072..37f6b46cecbc 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,7 +1,5 @@
-DIST libgee-0.20.0.tar.xz 678972 BLAKE2B 0c656ad7f934933422102d0e4da1591ca4637ff33e91b9f3c031e8a08d6300c3f4ffdf4a0cac814d7b8cd41f7e0f02dc188a1c7d1b418ffc4381f7a49171f85f SHA512 c01611ed34862888fa038111010ec9899465f43423c9c90a18050dc0b0c2a53cf0fe3c7affcbdee91e225622ccbfa08bfd0c08f0eb7935611b3d461b5b919e66
 DIST libgee-0.20.1.tar.xz 681464 BLAKE2B 5e7d6d9fb9c2833bd7334f5fb38dd1ff151ee4e5ebc3414d904b9c0dc57d3c3fe56ea2194828f9bc1eec57413058cb6866156a5e3da76381cf71fe98102d9c52 SHA512 b991acfea965e0afa007adac0df1763c3b97b31bf2832c0408128d02f4bb237a03c583b4dd107de1ed877ef042614352c845b6ba5f8b6fb535f43e2400746d7f
 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a
-EBUILD libgee-0.20.0.ebuild 680 BLAKE2B 020ff7b524df551e92a5c263f6e07297dcff9e00ae2e262c3a68c0c05d9d7a29d44e8fc2533b9967a51de21867a723e11fddcf69c5741a2590837df81be0eab3 SHA512 2a7637bc3e7ab859851389a220e3fe1f632772999924ab7e5bab9ae5e1793afc5400f9696c5301c134dc17f70f6702f5ffa1d5f9cfab293d1d152acd687e66f2
 EBUILD libgee-0.20.1.ebuild 680 BLAKE2B 040bf44158fcf434acb0611eeed2a8eb7a57ae1e303b1cf1be12f656d67b6ccc6c178d2155f64bef21a1e3b12625b907f4b80b9209ed905cc0099240a46bd08d SHA512 087478f03b4f6fe81250f8a66e5742a7dabddbc7ba922475be6f97ace599d1014a02ce0f0853c649786ffe22a7f37e03fbb31c01b1ca1b4820087ae1c74af81a
 EBUILD libgee-0.6.8.ebuild 659 BLAKE2B aae1527a96cc83f1408aac93b27aa67f82fa8f2c772fc026b5f4a14e41434ff9381aaca40f4f8fe7127e56d332048badae59eee7eec69e6cff5c1412ea3f7b51 SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e
 MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
diff --git a/dev-libs/libgee/libgee-0.20.0.ebuild b/dev-libs/libgee/libgee-0.20.0.ebuild
deleted file mode 100644
index 679b7a9e5f4e..000000000000
--- a/dev-libs/libgee/libgee-0.20.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="GObject-based interfaces and classes for commonly used data structures"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.8/2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux"
-IUSE="+introspection"
-
-# FIXME: add doc support, requires valadoc
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection)
-		VALAC="$(type -P false)"
-}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 9351d1d985be..3e3ba6af63f9 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -2,6 +2,6 @@ DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3
 DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
 DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
 EBUILD libgpg-error-1.27-r1.ebuild 1298 BLAKE2B ab43e3a8adb285b7932a607cd242af87aa1e7db2731fef7d77227d058ff1737802fda662e1f2b96e6116ee60f3d41dde98ca9a742a97caf5a2dc7ea34bdf8231 SHA512 9e285f2989b2e9fbf2a2e8a8ce1cbd3cd93433c302ecc0216ab8a977cada3f3edf753c02ef24b57b44af8bc6be23cdbf42dc46ba7846b55dcfa73b33db26f139
-EBUILD libgpg-error-1.29.ebuild 1302 BLAKE2B c9f564d30f7b141add8edddfe94e6881abb56626ead8223b7bf69dff8c720902d264382b77debdce1a5cdda5ad64d58a10c703c94a27a6b8eff1ad96fa8ed2d0 SHA512 962fa276d0a57dc236a08935b7eb08c869763de3709bcba8bc360de714fc15e9b786dbe161b8f0b51aa39f79da58cfa0038458ce13279150952fa5209701ee6c
+EBUILD libgpg-error-1.29.ebuild 1300 BLAKE2B de5e87c95237d71b3e43fbacd6601cf5f93ddafefee9025675fb4611b01d346df17e2fb3a53d739da0b3b3cbcabe5e744a4c485d6a3746ae43d9a9b886c5faaa SHA512 0bcf5a7c36a42c1453cf776cc5fa0815759cfd8bdae0fd0fb2d79bc2f1ae9c6abbdea96d90d47328d55a21144f5c6f6abd5495cc9d0d2e7ca2595afd2862d070
 EBUILD libgpg-error-1.32.ebuild 1311 BLAKE2B 4d114d8dcadbf6f89df3c20fdf0d0b31bafa84c46bdd4098975c12b3774ae448f00c2628d22fa9f0a3bc51a873823df25cbc95efdca9e6d4d646f2d69fb2380f SHA512 2f13e457f63751fb4f03051d7ccb0f4d1f30bd5a36d37ab2274b14af748f9e3f38afc17a7f4241ca9fbc8501a7627984e2a2c92212d509f44c4d7835d30e6fe4
 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 f8a3e3daaca1..06e9e5c75d5d 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/libinput/Manifest b/dev-libs/libinput/Manifest
index acd72cebc076..8105cc53f738 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,9 +1,9 @@
 DIST libinput-1.10.6.tar.xz 495536 BLAKE2B 3f23808635406eeb66cd6b4ce2a2dbaed69ee0917045f75ad262a59702d72923493b6faa7951ea3f7cc2591d4c9e1fc49cffc53b6dfbcb2aadc7b9f40c20517b SHA512 b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
-DIST libinput-1.11.1.tar.xz 485064 BLAKE2B 15ab0fddee37323f3df0b52e297ac5b0995e7db6531854852a21c7182474df0ffb136886e3d305d987dcb4f82e9f1cf3724e2f34448ef40ed1df10bd27cb2218 SHA512 3dd1a318c89d66f5a66016c6dbfa5277b61a8cb5337d99f85b1eeef40ed894bdc04fd4588a97383988daea0f034df5a72bff318325320a01b857db9deb94a2b0
 DIST libinput-1.11.2.tar.xz 485600 BLAKE2B 97b07493693e24be1bde3e7792c83c33b9ed4d64afbbecc1a5b77b4470fe9ff03cfbb2b4dc36f6cc5a9d58003410797979d7fbbb539d921bb9cddb5f8fb1cf0e SHA512 cb6ada877fc3c09f634f3db39d5507e66d4b86c3d632bb8f7498c7b01fdf8372b2053a79b641293900b7fcc0aa4e920f7c830d9c7b2d9ff3cd61c58eb7c20b65
+DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949
 EBUILD libinput-1.10.6.ebuild 1441 BLAKE2B 3310fc527a72be6d0561091a4fd20cf637b66651e6668bb12357feb3f92f52c570db613bbcb45398ea9e38bbb685a82faeaf6a0299acdf156d3f7db01e80bfd1 SHA512 2281dfa10a76434333a54fa69c444a6a54b89b797344646ca4316e86b7292ccfa9047136f3f62dc631988ce1a4d92f35514915c8829fe469f1a35f454a772002
 EBUILD libinput-1.10.7.ebuild 1440 BLAKE2B 203a9e8e20785cb93d221d8614aec3488a316d301672d3bbacbd223cd959c31edae176c17d1d575426cec24bd6e89c82b80244bcb7273a4531743555c4ba3b42 SHA512 c0e320acdb66994bcb5fe11b60ac4dc88955cae25da1dc3de028738bfb86c57eba90d23f258ed076ddba0da2737af9027ccde6a73705e6ff4feb8beffb591f0b
-EBUILD libinput-1.11.1.ebuild 1528 BLAKE2B e3daf3472281d8a9dee058de497bcb2c0155f273a89fd5cf7334fbe40486e540e02d793bfa30d08342a1123aba2936dad4a921132d6cf802541635f6836cf8c7 SHA512 d601843c5a1a729de144c7b63a2a8efa3a4ff7ce60727a964a1d48419ef7a8c1b7b3bbd54853f71707a1071613cee9fba7434d91960236b467c7086b8224c4fd
 EBUILD libinput-1.11.2.ebuild 1528 BLAKE2B e3daf3472281d8a9dee058de497bcb2c0155f273a89fd5cf7334fbe40486e540e02d793bfa30d08342a1123aba2936dad4a921132d6cf802541635f6836cf8c7 SHA512 d601843c5a1a729de144c7b63a2a8efa3a4ff7ce60727a964a1d48419ef7a8c1b7b3bbd54853f71707a1071613cee9fba7434d91960236b467c7086b8224c4fd
+EBUILD libinput-1.11.3.ebuild 1528 BLAKE2B e3daf3472281d8a9dee058de497bcb2c0155f273a89fd5cf7334fbe40486e540e02d793bfa30d08342a1123aba2936dad4a921132d6cf802541635f6836cf8c7 SHA512 d601843c5a1a729de144c7b63a2a8efa3a4ff7ce60727a964a1d48419ef7a8c1b7b3bbd54853f71707a1071613cee9fba7434d91960236b467c7086b8224c4fd
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.11.1.ebuild b/dev-libs/libinput/libinput-1.11.3.ebuild
index 0635ed1b8faf..0635ed1b8faf 100644
--- a/dev-libs/libinput/libinput-1.11.1.ebuild
+++ b/dev-libs/libinput/libinput-1.11.3.ebuild
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index f03ce924df39..a18e7a643ac9 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,5 +1,3 @@
-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 1496 BLAKE2B 9208f635f3bd9a85f6f7d3575a975a4e32b68404721a235252ff78ec515524ed30030ed7749c37927f152c6472938bb761fb1dc256ccd04358509539e8eddae0 SHA512 c9ffbda9091b8382f4ce3d65a2471eb80cc66e41561ab084f8ad50db468c805f92134b47d2a4f38faccd4d27506a9a11a155949fe80590c5d3b19e87c6adb089
+EBUILD liblognorm-2.0.5.ebuild 1494 BLAKE2B e650f9f6e067624d25834012df2b15c53290d36f49eaba52b020ef37eaf785f1e6c5c1c06dd4b4508535ef0c678fd6f51b0e0fad2d1a47d956dd742b474501c8 SHA512 7a525f0e554b45fe8087d6e9ef4949bedd50d81daf128aff6b0afbeeb64d9dac8d8cdc9e1c668a44b0ef09381067dce436a470f35dd81ccb4666ea7d5545e7a4
 MISC metadata.xml 582 BLAKE2B 59408e460cb8208149a93cbe049867d8cc202272aea9cd113a7f282eeb6f57b967abf7379241c8dd987e58f66f1efb36c29809176db34cdb3b2127a5ebe02f0c SHA512 7df1432cf2ddfe55c6a449d0179b771652a051d75fa34b8d3ea42d201bc64b3b18b2410ace68c263f14eb692661846a25cb0220de43abcaef13401e87f1173e2
diff --git a/dev-libs/liblognorm/liblognorm-2.0.4.ebuild b/dev-libs/liblognorm/liblognorm-2.0.4.ebuild
deleted file mode 100644
index 635f5f3f9c52..000000000000
--- a/dev-libs/liblognorm/liblognorm-2.0.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux"
-fi
-
-LICENSE="LGPL-2.1 Apache-2.0"
-SLOT="0/5.1.0"
-IUSE="debug doc static-libs test"
-
-RDEPEND="
-	>=dev-libs/libestr-0.1.3
-	>=dev-libs/libfastjson-0.99.2:=
-"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.04
-	virtual/pkgconfig
-	doc? ( >=dev-python/sphinx-1.2.2 )
-"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# regexp disabled due to https://github.com/rsyslog/liblognorm/issues/143
-	local myeconfargs=(
-		--enable-compile-warnings=yes
-		--disable-Werror
-		$(use_enable doc docs)
-		$(use_enable test testbench)
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		--disable-regexp
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# When adding new tests via patches we have to make them executable
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	emake --jobs 1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/liblognorm/liblognorm-2.0.5.ebuild b/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
index d4da89071921..635f5f3f9c52 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/libpeas/Manifest b/dev-libs/libpeas/Manifest
index c6592da9cfdf..b1ecb86b6df3 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
 DIST libpeas-1.20.0.tar.xz 557872 BLAKE2B c10cd85ff6f15f2124541aba3b437e3216322647e36f93a2202df14aebda7c35896a5f77a40ddcd5a5f0300df11c274334cc3a8dfba3fe2745e0b364cb7eac4c SHA512 b3ddebf65e1a76493b5cd5150f60c13597c90398eea16c002e51d25449a595f7591bd0ccd1214ca3a8cbce724eb10f38a316e8c95092442034c048bc95cfdbf4
-EBUILD libpeas-1.20.0-r1.ebuild 2190 BLAKE2B d714b8b30bb27d3587ab8879e94265a72acc6279adc5642d969bc42f87ba5746636ded6b322f55e1b4eae04a82b038b79f7fca0874293161b6b897d12521544c SHA512 647363247a0a2baaf94ccf252f3cda514d147171123aaf123fa83104cde3e41159a9ecc6c3019548efc4249fb1e21d4185a2f00fddf003bee43edf00d7925e22
+EBUILD libpeas-1.20.0-r1.ebuild 2194 BLAKE2B a03b68170871a7e76c8388b4bd2d40f4445c5c4dcae3b98973d95bf7986df94cc3663b4f966f629bb13fb22426c1c3a4703e6b0dba1b4a8edd4655331e6391bb SHA512 bdc2c00a5cbf017d4350d53e3036608eb29b8066478f85cec4ff3a3ce77f8e023211eab919f2956d59d88c6828e947fb6560841ad0806fd270e01169ab8d0868
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
index ead15aa6969b..9eee684fe8be 100644
--- a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
 
 inherit autotools eutils gnome2 multilib python-single-r1 virtualx
 
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 1f79a577af73..eb5ab69a5a1c 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,6 +1,5 @@
-AUX librdkafka-0.11.3-fix-memory-leak-issue1534.patch 938 BLAKE2B acc607465285b2d5860f74a313a70bd153e0e850d1949cd345a920de69d466a8e75c89983b85056c6d8e40fbe93d40e4a5dac26b6a617705fd376cfe6c1baa75 SHA512 6f6406589ddf76e4168a6df50b00d8f499d3a6c22404696a4160eac3a10de7f8c8e03d01d6fd1aff831eb5cab962aec0eb164031e5aee3751e15a12c75e9f15f
-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 1236 BLAKE2B cd0ad6ac6ccfebbe37583fd03f3317f835bf7dda598e3b8c71b922b48db3541a28ac0462577ffdc62c9e219be4a6f1852cf6c591e7240626dda12bf5e636f5e6 SHA512 80e38fb2244bf009ea3102a34a10fc2de324576b77965583d04077af7281d00e6c259cef3a260eeb224eabc8fdb929ee9513bec19e6584f9c159022a9c335580
+DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
+EBUILD librdkafka-0.11.4.ebuild 1251 BLAKE2B 27576a7d2421373ed2d13d9f0ec566d6575c137372f08000271ad0e7f492c22d19a817d803816b2aacd9ceeda28a5f2c4307f56b7302efa8734a52b3b0b2db37 SHA512 9cdeeee1606f1108e4ad3e203ddcb4f99dace5768e4fa37bfade9b4630e60e7fe6899b17d231c8fdbda9d1ef513a2f5f3868fd7153348f386090db3bc3f94e1c
+EBUILD librdkafka-0.11.5.ebuild 1256 BLAKE2B 6b789b387aa1c063bffae6721a597ee16bb0f6679021a0c65e1a2c9b65844ca2e06cacc936553733feff6b3b6ecdb9ffdd4daf1a9e0e4e2be0d09170a63eca44 SHA512 bfe22f31e565a0690af0bf1e8edc4836612235edda04dcbb826e9f24011a2abd9a6924e0891c6ac5eb489fe3a24efff5857cc157845733f5cb77e9a9de10e259
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch b/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch
deleted file mode 100644
index ae4c3e5bc81e..000000000000
--- a/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/edenhill/librdkafka/commit/8fed971043e642c195860cd77006622d23616c22
-
---- a/src/rdkafka_msgset_writer.c
-+++ b/src/rdkafka_msgset_writer.c
-@@ -436,10 +436,12 @@ rd_kafka_msgset_writer_write_msg_payload (rd_kafka_msgset_writer_t *msetw,
-          * room in the buffer we'll copy the payload to the buffer,
-          * otherwise we push a reference to the memory. */
-         if (rkm->rkm_len <= (size_t)rk->rk_conf.msg_copy_max_size &&
--            rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len)
-+            rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len) {
-                 rd_kafka_buf_write(rkbuf,
-                                    rkm->rkm_payload, rkm->rkm_len);
--        else
-+                if (free_cb)
-+                        free_cb(rkm->rkm_payload);
-+        } else
-                 rd_kafka_buf_push(rkbuf, rkm->rkm_payload, rkm->rkm_len,
-                                   free_cb);
- }
diff --git a/dev-libs/librdkafka/librdkafka-0.11.4.ebuild b/dev-libs/librdkafka/librdkafka-0.11.4.ebuild
index 00872b0eadc7..4e975e7bdf02 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"
@@ -25,7 +25,7 @@ SLOT="0/1"
 IUSE="lz4 sasl ssl static-libs"
 
 RDEPEND="
-	lz4? ( app-arch/lz4:= )
+	lz4? ( app-arch/lz4:=[static-libs(-)?] )
 	sasl? ( dev-libs/cyrus-sasl:= )
 	ssl? ( dev-libs/openssl:0= )
 	sys-libs/zlib
diff --git a/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild b/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
index ef4921fdc0a1..5e13b2f3eb90 100644
--- a/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
@@ -14,9 +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"
-
-	PATCHES=( "${FILESDIR}"/${P}-fix-memory-leak-issue1534.patch )
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
 fi
 
 LICENSE="BSD-2"
@@ -27,7 +25,7 @@ SLOT="0/1"
 IUSE="lz4 sasl ssl static-libs"
 
 RDEPEND="
-	lz4? ( app-arch/lz4:= )
+	lz4? ( app-arch/lz4:=[static-libs(-)?] )
 	sasl? ( dev-libs/cyrus-sasl:= )
 	ssl? ( dev-libs/openssl:0= )
 	sys-libs/zlib
@@ -68,6 +66,6 @@ src_install() {
 	default
 
 	if ! use static-libs; then
-		find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
+		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
 	fi
 }
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index b365d17341f9..2dbec68a9f45 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 1123 BLAKE2B 12a68c0a7aa0454ce58bd2db4de48d7cf7523a65a98a16a9c5f70530e32498a09ffb7f2150625ac7642787bf31225ff66418aaf2a84cbc6a0aabd7df13be84fa SHA512 31e0a046a000dc49e603e6feef6903c45360b7b0a9bd15c55d8dd558cd5829083a62a08b2f029cb4aee45ec96ee7fb58743eccd63bcd96b4640e3272b2893910
+EBUILD librelp-1.2.16.ebuild 1122 BLAKE2B 5d046126c8f581f645da00d6147dca6d701a2740d7a11e85f48bb91ff82744030ebee1f62c64fa5f941a316fcaa0eafe56856eb030fc2636aa5a7a1f167b91dd SHA512 eb71c439ad272616e72821fc286768fc9ed53900add918def5fcb388644864ad7dc66af7463141cb73aa8dd328f4aa5caaf301ee8d4aa224f8e8e75f7847f9bb
 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 6f2b1a03d416..14405d27f2eb 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/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 6a3d97fae275..7db2d0108955 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -2,6 +2,6 @@ AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a
 DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
 EBUILD libsigsegv-2.11.ebuild 873 BLAKE2B b002a1adfc3c2d26211758114ec9ddfef9288e10083b7fe1f4663bfb357078df8b4d5b6a416b86981cf8bca5da3cc3e6c37c4fcc2876f207d8dd6b1d25d9a78e SHA512 70dc26ea9d120835ce750b60405ca296342203da4078319c02700734f226786f5a01defb5fab42718fa1e3b2791fd5d6ab120d9c66cae4ec61a2874632235024
-EBUILD libsigsegv-2.12-r1.ebuild 777 BLAKE2B 04de9d8a3f3033c5bdbbc335e21901f561ed649b46c2cbe7b12f5ae95c99988ecc594dde519a88d6a00bd9b964c3f3c48ffac691a779089f5a6223b297342835 SHA512 3eb0d2a115187a57e42bff93beec17c4f5055777bc7e141daa474f883d01e1f647f1add5e8d5070c81d22084e2f04651d75c17bf25e4d38901a0df9488ddd421
+EBUILD libsigsegv-2.12-r1.ebuild 776 BLAKE2B 9e4ec8b807871a966173f56c6483caf6fbef06774dae9ab07b66f7f09137a877a0999e76ff73dc376dc896cfa5bf17d874c0783a3a388dead6e72b7ff4cefe33 SHA512 25155fe9d642dd196538294f98c24f44efca56fefe0ab7d48ff6663233429ff2a16af1710103067d34598e92b156610e7c6226496b057ad0513713da0f97f611
 EBUILD libsigsegv-2.12.ebuild 789 BLAKE2B 71fee301710353c326e2903a7209de5d3b5642ea2683584ee46e301f5504757360ef84e7c3d798bb81803a03c5dcafc974db1e564ba827ab08afc6184abdeee0 SHA512 b7ba322748ebc4b9b7a5dcd678fa53fcfb3da531d30a881f51b1bc106b61cf00619b7f7c4dbc28bc9b86c0253d80c336c74e2527b1aa8deefbd98d86081cf632
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
index 96813ae766eb..5208e446e1e0 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 71e7cfe0927b..696cd77b9a52 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,13 +1,8 @@
 AUX libxml2-2.7.1-catalog_path.patch 2225 BLAKE2B 9a9c5836e5227e51de05d1e19c27b828c3c082c671d9b9bfb30afbe971fca580fb87cd86560e2ed431b4dc1495585c62f01da0f36e401d4dbdc4d8be2269cca5 SHA512 bcad080ee84c926c75df8baa47937bdfcfa207235263249f4025e64cbb5ac9be883e1ac4dc1ee55944116da2f84ced27b7cae781aa855579796f3f53a54aacb1
-AUX libxml2-2.8.0_rc1-winnt.patch 2392 BLAKE2B a350e5b77595319b70e0b124b4abe2922a639258fe9bf73cf060891170c124ea5ee17b9183d04f67e69786d373789fc76fddae1fd5ee004fb24fa8dfceeea930 SHA512 e78d010c82f18386b4f0ff84497585755b43416563bccd11f8e4dbf0153ca8842934fe05dce6c2373d8360574a2165795a78ea991682aed9610000d2bfcb0164
 AUX libxml2-2.9.2-python-ABIFLAG.patch 728 BLAKE2B d81b042b5000717d5aa88ac4cebf78749f5a4ef661c227537171c5695d97a16ca75c790c8b540e3481a54dc2d935112b46e0a23509c887e16e3f2886c08f1d69 SHA512 2f801329ad4e13dc70450d41f7659a510fe429b3aa9b66859fed25c4e3d95381d6f253f3a60a54002a16999296d3bd2adaca5e4cca92186492bfc7de3ac84426
-DIST libxml2-2.9.6.tar.gz 5469624 BLAKE2B cb8fc74044876b2ddf9742a4a84d685ce6cd1e41a991ee79fd70a9175c54d2a9a3d3a2c3229a4ce177fcd4e30b0cee08c7cf3a36fef68b179db0ce521fbbf3b0 SHA512 5ef80f895374bd5dd3bcd5f00c715795f026bf45d998f8f762c0cdb739b8755e01de40cf853d98a3826eacef95c4adebe4777db11020e8d98d0bda921f55a0ed
-DIST libxml2-2.9.7.tar.gz 5467389 BLAKE2B e15082fb87fb41a7aab6f39120b1d1bbd0325af8009bb3b74c69a98bf7347a39f59055762df157dcf223a79ac84f17535cb40af0a9a461ee3d2c1d55f4832e1b SHA512 da06cb7c5032ef4b7c8e902fabb9d2c74634c42c161be07a7c66a00d53a68029f89b0d4de32a6b9d4ff338c2d1d9c4e53aefb9cf50cb1c2d6c6b06b442ef42d5
 DIST libxml2-2.9.8.tar.gz 5469097 BLAKE2B 0b7836db46edebf6e7108c28da4bb7e3fb5ddc695aaa3e456ba51a66c0294a741d7b60eb4c31c7040443bbd54712c019424078bd533856a9650b39a703a926d5 SHA512 28903282c7672206effa1362fd564cbe4cf5be44264b083a7d14e383f73bccd1b81bcafb5f4f2f56f5e7e05914c660e27668c9ce91b1b9f256ef5358d55ba917
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.6.ebuild 6366 BLAKE2B 30e0fc36c5ef4383cc69af26fdd8a087e058485cae8e51d4fa66ef01b0b0a635137710931396121c7dca8141e272a5dda8f5328023b4aa74f7b76b40f2348e45 SHA512 01e661ff5ce990d43f45d5ed1b0d5090f1de474bc009daa00bd43c8487b3348016a0e81fbd14f02cdcdaa395199aef9aba335682edb2ac6e03f07c3f085201c4
-EBUILD libxml2-2.9.7.ebuild 6354 BLAKE2B 213da9e141ca519895fad2c2ec30e20b8281cb5af0ef72f23a6a450b4492c98303b29de2842b8f4c8451b5852fc9cc2d710a3038b9a9a637fb2a11d4ccd44a12 SHA512 048548b5e50127a945121236959e7e08a2449e5caf4d589057709af076c923eaa45a29debb3ccbf148020019405c82d24058d49addb6a57130ff591214c76106
-EBUILD libxml2-2.9.8.ebuild 6435 BLAKE2B 6fdf42344f01ee5782ecdd357da9b152b3e330189c062779ea7d07bb429b6d127879c8ef23f95f5c4d1baa6f08b917e731d8a500d8a78b99355046fbefd1bbc5 SHA512 8e313b976da6f69aa6a391874a1768673ed3ac445dfc4968f5cfe074cf25a737ab520816f6c1c481575be02847345634a0a93dcbe70f88e9507014fef4bd070a
+EBUILD libxml2-2.9.8.ebuild 6434 BLAKE2B 40de078886a4046c208e16b3490778acc89424a3549ec69e42a89e7fbc98c666b5c4c5ddb63a5c128caa07d6abfede96d6ccd551a2e956314b1b42868bbf7e30 SHA512 5bef9eee3c7fadade993c72c2d0309e84226c92dfa8b60d766ad94a5c3aa16373f8ab1ff5e8e10e3d38d4eaa851aaf2d444ae1019e133f32c742973b169d0470
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch b/dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch
deleted file mode 100644
index cce3ecb058ae..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 168e20836fe9614dd2dd4b42006c17a783f11c48 Mon Sep 17 00:00:00 2001
-From: Markus Duft <mduft@gentoo.org>
-Date: Thu, 20 Nov 2008 11:04:33 -0500
-Subject: [PATCH] Fix for ~x86-winnt
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: port to 2.8.0-rc1]
----
- dict.c                |    2 +-
- include/wsockcompat.h |    2 +-
- nanohttp.c            |    2 +-
- xmlIO.c               |    4 ++++
- 4 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/dict.c b/dict.c
-index 3579f64..71e7bc6 100644
---- a/dict.c
-+++ b/dict.c
-@@ -47,7 +47,7 @@
- #else
- #ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#elif defined(WIN32)
-+#elif defined(WIN32) || defined (__PARITY__)
- typedef unsigned __int32 uint32_t;
- #endif
- #endif
-diff --git a/include/wsockcompat.h b/include/wsockcompat.h
-index c762a64..1ed822b 100644
---- a/include/wsockcompat.h
-+++ b/include/wsockcompat.h
-@@ -27,7 +27,7 @@
- #endif
- #endif
- 
--#if defined( __MINGW32__ ) || defined( _MSC_VER )
-+#if defined( __MINGW32__ ) || defined( _MSC_VER ) || defined(__PARITY__)
- /* Include <errno.h> here to ensure that it doesn't get included later
-  * (e.g. by iconv.h) and overwrites the definition of EWOULDBLOCK. */
- #include <errno.h>
-diff --git a/nanohttp.c b/nanohttp.c
-index 2437fed..dbe97a7 100644
---- a/nanohttp.c
-+++ b/nanohttp.c
-@@ -74,7 +74,7 @@
- #define XML_SOCKLEN_T unsigned int
- #endif
- 
--#if defined(__MINGW32__) || defined(_WIN32_WCE)
-+#if defined(__MINGW32__) || defined(_WIN32_WCE) || defined(__PARITY__)
- #ifndef _WINSOCKAPI_
- #define _WINSOCKAPI_
- #endif
-diff --git a/xmlIO.c b/xmlIO.c
-index 73a995d..99562f6 100644
---- a/xmlIO.c
-+++ b/xmlIO.c
-@@ -47,6 +47,7 @@
- #include <winnls.h> /* for CP_UTF8 */
- #endif
- 
-+#ifndef __PARITY__
- /* Figure a portable way to know if a file is a directory. */
- #ifndef HAVE_STAT
- #  ifdef HAVE__STAT
-@@ -82,6 +83,7 @@
- #    endif
- #  endif
- #endif
-+#endif /* __PARITY__ */
- 
- #include <libxml/xmlmemory.h>
- #include <libxml/parser.h>
-@@ -657,6 +659,7 @@ xmlWrapStatUtf8(const char *path,struct stat *info)
- {
- #ifdef HAVE_STAT
-     int retval = -1;
-+#ifndef __PARITY__
-     wchar_t *wPath;
- 
-     wPath = __xmlIOWin32UTF8ToWChar(path);
-@@ -665,6 +668,7 @@ xmlWrapStatUtf8(const char *path,struct stat *info)
-        retval = _wstat(wPath,info);
-        xmlFree(wPath);
-     }
-+#endif
-     /* maybe path in native encoding */
-     if(retval < 0)
-        retval = stat(path,info);
--- 
-1.7.8.6
-
diff --git a/dev-libs/libxml2/libxml2-2.9.6.ebuild b/dev-libs/libxml2/libxml2-2.9.6.ebuild
deleted file mode 100644
index e1b36acddb4f..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.6.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~x86-winnt"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	cd "${S}" || die
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Patches needed for prefix support
-	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	# Fix build for Windows platform
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
-	eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Avoid final linking arguments for python modules
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-#	epunt_cxx # if we don't eautoreconf
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	emake check
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.7.ebuild b/dev-libs/libxml2/libxml2-2.9.7.ebuild
deleted file mode 100644
index 0660af14c410..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.7.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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="debug examples icu ipv6 lzma python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	cd "${S}" || die
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Patches needed for prefix support
-	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	# Fix build for Windows platform
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
-	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Avoid final linking arguments for python modules
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-#	epunt_cxx # if we don't eautoreconf
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	emake check
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.8.ebuild b/dev-libs/libxml2/libxml2-2.9.8.ebuild
index c3c6cbe521a8..2bfe2d2c50d8 100644
--- a/dev-libs/libxml2/libxml2-2.9.8.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~x64-cygwin ~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="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/mini-xml/Manifest b/dev-libs/mini-xml/Manifest
index 0549d5549b91..71256d585036 100644
--- a/dev-libs/mini-xml/Manifest
+++ b/dev-libs/mini-xml/Manifest
@@ -1,3 +1,3 @@
 DIST mxml-2.10.tar.gz 265398 BLAKE2B eb3edec5615d727dec9285e2b74f4c877e8332be8f8183483e85a91d92ca1f48e5fc6d06afa3650c133c9762998abfdc8e846a9961ce55251d0c5bbcba0a970f SHA512 c3838611979c4228df476166e4e987fc1ff8f9b8bd30139066b475dcd99e25be81ecc5171235bc80b1c2291c9d78c9ceae9a1dfc928272a983740d6a67372f5c
 EBUILD mini-xml-2.10.ebuild 1338 BLAKE2B 3c61f9345cbcbd53d045f391b81bbf177622728da6f340cdc2798d32354cd05fca221fdd4cadb9eef6c45222bad0f92bc3484d5660e5e61623b8dd25b86153b8 SHA512 eddb5ad74946de41caf859faa624e7d7f40c49ef1e2abd21ddd25503a29a940969783a65efafd0cfa48b47e428260953dafaec56ef3148e5d91f126f1baea8c5
-MISC metadata.xml 351 BLAKE2B 3492ca1e5b1dc56a5c125e6f6b9ef7e36caa9ad045fe9e9154dcf77d8da692cec2492b03a190eccec2db52a95a6abf83797b6d43babeedcb42d4552eb4aff014 SHA512 dad538833ec388605a2ad9e3facb368a12b010c769855e795314ba5aeb9224cb87a363e7d3ebc385ca578a0a29e16374a7e0aedbf29478599c558d134416cde6
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/mini-xml/metadata.xml b/dev-libs/mini-xml/metadata.xml
index 32d70436a670..7a38bb900964 100644
--- a/dev-libs/mini-xml/metadata.xml
+++ b/dev-libs/mini-xml/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>ruepel@gmx.li</email>
-		<name>Rüpel</name>
-	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index b04977db4012..7fc140f7b689 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -1,11 +1,13 @@
 AUX 0.8.1-api-version.diff 421 BLAKE2B 77cd7452029021c098f3d9a40a94e0af63a30c986148101f9b86d0dc416873f6081d8530001e9c478cf3c1b6d933fefee227987b9ac7e2305c82c16903259a24 SHA512 0ee058b1f16feef966cbddc9502507f8890d9a9ce5a6eca70bd0b831909d286caf7c09cfdded4ac97a28efda2215b11df8e9f747ace727b4b972c79841a7400e
 AUX mongo-c-driver-1.10.3-enable-tests.patch 866 BLAKE2B b4abf32f0915f28185b8e036ed5083a37795cb84980dee755649ca63322f29469d1be614c1d2d97455ca37639c25956cdba08efa320db213561cddd337b1bc31 SHA512 23e41702d7e1d64c3baab4045f87945c36f028f9802701c37316bbddba667c2e1c038c1234b3374c66b252e9b2ff068f3dfd513a397ee56d170397cc268277c2
+AUX mongo-c-driver-1.11.0-enable-tests.patch 866 BLAKE2B d07afeb06dc61ddf15bbb46576e21c773a87e71ef8618130f8055b03080147e68a5c9a9b805149eb328510ccea172b790df8a512b45241173c5f1a5052ce7db6 SHA512 ce81feab28a06d003c731d4b14a611f705c0f45123282b7a1836d7eb0befdca4a1a041896b3d4b9bb49027c3fafa72feebfff2a26657df56f21862d0125c13c6
 DIST mongo-c-driver-0.7.1.tar.gz 108537 BLAKE2B 29d7f6680d700d15d02b3d5deefbdc27b4e0841a2ac30205ed148216d15e95fe487f4cea4decacdf573a4ce78248cfd12cba72b9dbf90065e127fa7fb56cad27 SHA512 5c6996dc47ecbe4d77971e3aa983a877e7de736bf358c467808eceba8b1a5eea342376249cdc682a034fc7ec39290d234527cec3c3732686f184281a72aec724
 DIST mongo-c-driver-0.8.1.tar.gz 124053 BLAKE2B 1c6b0d3998c6497c39fc2f6597021e84571c717e5d6f288d79d3862e7f15f131604648595ca0e12200352a7fbf40652803afd0f60a80eac657b9853a1de51173 SHA512 7b61ac4b1b154ee1f518eddb2bbc0cdafe0da8786eed4475e5703c2a735ec5a09efde59f5bfa45fb226cbce24d8c0ba0de403d8fc3e561c0e48507dfb07962b1
 DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
 DIST mongo-c-driver-1.1.10.tar.gz 5321144 BLAKE2B d63ba4b1a256b8b29654398a53d9ca46d49faad0e0327db0d51cfc4e2a1771568341ff4e7ba6ff2ff31fb11ad8a14c452e52cabdd83da7eb1c1ceb8af7bef7d2 SHA512 10ebd1bddc0c713c0934679974fb1ed29eda1bf8e2ebbe2a1ebbcba219574092c34c4b352231ec65ffe3e350d8d701ef85debaaa9f9c10e6ab36fc3fa29f69df
 DIST mongo-c-driver-1.1.2.tar.gz 5443153 BLAKE2B f8004486baf6d2d3086e458bdb4bc8060462fd52ba700cbf05fdb9827adcbd087b61d7e0e00169cf635c8021983dc851b7f34c3e08d66efc65483fce98a85f74 SHA512 d420fc407f6a04c06a959b8971dc2643c987df5c3d82f2b13bfdf6a44e96bc377478c4d0e385abf67f21b56892c915c79675fe9ebf6efa9aab51fe452c5e6f95
 DIST mongo-c-driver-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
+DIST mongo-c-driver-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4 SHA512 d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e
 DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c19a5b8722a2ed69fdf046c35973c9bedcc1686065e4355db28afc83c1415872eee2972a6fb3f21647d2cafce12706adc0 SHA512 23844ffe20580998308aa9c8409afcb87dccde874077eefc6806b705e5de5743846ba0513f3a3fe83147fc47842ab8c7438ad1de5f3f55b81586b9e19046aabf
 DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af
 DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76
@@ -16,6 +18,7 @@ EBUILD mongo-c-driver-0.98.2.ebuild 1692 BLAKE2B 247c26866b8eb10aef7b0894300157a
 EBUILD mongo-c-driver-1.1.10.ebuild 1803 BLAKE2B ed8a0f4296418db9836fe3cc4052a9d2c72562542d5588c9219803ee408ba8106829945ab22d1cb64b49428f7a78991d086652f68bebc592ba5872f7aeba2a86 SHA512 3f5a4deeb9115b9a31b1229cf560f62d28611281fa76e1c2d043602f49264a0b75b67540a872621a72bb20bf3aafdfdc4b528aaccaf206ad538127bb69e8587e
 EBUILD mongo-c-driver-1.1.2-r1.ebuild 1800 BLAKE2B 61782ec9c74e2d67bd884c1e1aa1b51eda2aa7148b3df90de3b45187c2823efb3afff7edff1eb5047bb205004a3b9cb8977c0945e6609df7a7c037ca97ab2bf1 SHA512 0183addeff7e2bac1add74db48b727edaf09f1b24b774bafe717c43c0e9a4a083081f12ab1d2afb743b61fd3591d6d3fa04f1b6c2be9339a2ab55a27ef4791ea
 EBUILD mongo-c-driver-1.10.3.ebuild 2191 BLAKE2B 43dba477bba4672c2846b940e30f87a1db9d22b20f2f8b333b73ca0903236fc10da2f5a2a022121b06d09f0037418eca3aad1f54ddc13e2813e9c64c8a4b665e SHA512 cc8ddbdfd8dcbb8ac48315ac880e7c36036c42ab87357661a1ba50caa375590371550415c4f4b4a934a65556549c5208fdaa565dd9b4fda143c26a650af82633
+EBUILD mongo-c-driver-1.11.0.ebuild 2293 BLAKE2B edd5b631add3c2f7813c82be5938141edc54ae59634b8c2ef8980f3b553551b340e01837006e88d9f30a2c0ab7c5f8865e3817ac126ed251b88386167594a59b SHA512 58baa8d3f4f66ab6cae3d4b27c9dab1fa0435b4d7f94169d32563c0f9e7bbdb479244e7ae09a8106a810e774bdbe975ae4a49fd4c5a166795a38a01f5283dc68
 EBUILD mongo-c-driver-1.3.5.ebuild 2023 BLAKE2B fc14f7ffb1d3f6c6d8495b10276944240d57a712d76ce58f909de934ee3f1ddd9f9d57723d1e686692de422033859dbec384aff65eb0e16a4a915674980d923f SHA512 30eb5a0bdd2d92de202dc28df98b3038a8015af39d6bc8fdc7b76299efd509bc9bf0690f824d34c1d7ff4a59dabd036567d18e4846411759560a65ae027f4469
 EBUILD mongo-c-driver-1.6.2.ebuild 1963 BLAKE2B 6a65450eb17c0de23d4525d9028ecba3b69f8cf6b8be52af3ec81893d3295d30cb25f06869b915da4c6f87e2344777356dac99f1aeb506eaca2def1e1550bae4 SHA512 776b41fa17aa7859aae0a8861647cfa4072e31c75a9189cf59da53b3798d5832b45abb60073cf37176ee05a2abc734da3c9e1f9e5fdad718002670bb99e54cfc
 EBUILD mongo-c-driver-1.8.2.ebuild 2150 BLAKE2B 1ff46d08933c2d525b4dd60cfbd1ba4c3e8183cea11923f3b851b9fe1e0b25bdaf1d08e70f68a3dde383ff4ee7ca9127ea0cb7d0ac011c4aac2f42f46dd4a6f8 SHA512 55338086d4a8c91527f62758b153031751385b975eec7b8dc35a0d07132eb8120b4d0ccf8cdce419f4623ddb8b7deea62556dd7c9c41ad8a01abf04bad6869a9
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.11.0-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.11.0-enable-tests.patch
new file mode 100644
index 000000000000..67fafafc93b2
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.11.0-enable-tests.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 860e4ea..7d646b1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,7 +110,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
+       message ("--   libbson include path \"${BSON_INCLUDE_DIRS}\"")
+       message ("--   libbson libraries \"${BSON_LIBRARIES}\"")
+       message ("--   disabling test-libmongoc since using system libbson")
+-      SET (ENABLE_TESTS OFF)
+ 
+       if (ENABLE_STATIC MATCHES "ON|AUTO")
+          find_package (libbson-static-1.0
+diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
+index 51514ed..accb251 100644
+--- a/src/libbson/tests/test-bson.c
++++ b/src/libbson/tests/test-bson.c
+@@ -18,7 +18,7 @@
+ #include <bson.h>
+ #include <bcon.h>
+ #define BSON_INSIDE
+-#include <bson-private.h>
++#include "bson-private.h"
+ #undef BSON_INSIDE
+ #include <fcntl.h>
+ #include <time.h>
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
new file mode 100644
index 000000000000..aaa06162f886
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Client library written in C for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="debug examples libressl sasl ssl static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="app-arch/snappy:=
+	>=dev-libs/libbson-${PV}
+	dev-python/sphinx
+	sys-libs/zlib:=
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		dev-db/mongodb
+		dev-libs/libbson[static-libs]
+	)"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-enable-tests.patch" # enable tests without libbson
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# copy private headers for tests since we don't build libbson
+	if use test; then
+		for f in bson-fnv-private.h bson-iso8601-private.h bson-private.h bson-thread-private.h; do
+			cp -v src/libbson/src/bson/${f} src/libbson/tests/ || die
+		done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
+		-DENABLE_BSON=SYSTEM
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=ON
+		-DENABLE_SNAPPY=SYSTEM
+		-DENABLE_ZLIB=SYSTEM
+		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
+		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+		-DENABLE_TESTS="$(usex test ON OFF)"
+		-DENABLE_TRACING="$(usex debug ON OFF)"
+	)
+
+	cmake-utils_src_configure
+}
+
+# FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver
+src_test() {
+	local PORT=27099
+	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+		--dbpath="${T}" --logpath="${T}/mongod.log" || die
+	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
+	kill $(<"${T}/mongod.lock")
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libmongoc/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/nsync/Manifest b/dev-libs/nsync/Manifest
new file mode 100644
index 000000000000..d6bbf9bc94ff
--- /dev/null
+++ b/dev-libs/nsync/Manifest
@@ -0,0 +1,3 @@
+DIST nsync-1.20.1.tar.gz 154106 BLAKE2B 94eeb647de2ca58a3f3837119ef30805f0a72a9d12c19aa705f815955723ddefa1de4d2a3fe5fd0b227ffdd70d5208ab9a300e40b2aff2591a1cef28c79b450a SHA512 d7b9be1052b7d11d896d3fade822f7b1eebbd0a772c9f6e2cd827921f1adc29ed18f7587ebc7d29623d230be384a7a2356c1da3abd53567fc934979d89c70e0c
+EBUILD nsync-1.20.1.ebuild 578 BLAKE2B 01cef8c2bab0f07674742c7df195f081039cf8d761af8cab290587abfd38206239efa1a49f80524cca6371a7a36d9217792b87439eafff017d06fc653a9a0c47 SHA512 0a565f3e9e5dbb71af7cb50d77b18e25230a4c7975466214b9c5d4debbf1a1bd1d5e008f68733e0e622fbb8aeba7ed9d7d575afdda5e88675b0b756398aac5ac
+MISC metadata.xml 384 BLAKE2B 62c11261ccb01d4913cd84ed44abed5a2ae13d362c755db7102cb412ff9c4b55c4dec5e9a5b71ac970cd83e676d2a806d20d9b5cd7f63e1051b898927b064bd2 SHA512 83954282b0ca2a61a49222fef2e018057b7d02c4d68bd826a81a96bfcb4371e60c8c90a4c792607b337885154fcad49db872351c3ec27266631bb955ede097cf
diff --git a/dev-libs/nsync/metadata.xml b/dev-libs/nsync/metadata.xml
new file mode 100644
index 000000000000..2ab0dafc343e
--- /dev/null
+++ b/dev-libs/nsync/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+	<longdescription lang="en">
+		nsync is a C library that exports various synchronization primitives, such as mutexes
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/nsync/nsync-1.20.1.ebuild b/dev-libs/nsync/nsync-1.20.1.ebuild
new file mode 100644
index 000000000000..14e0c84223c0
--- /dev/null
+++ b/dev-libs/nsync/nsync-1.20.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="A C library that exports various synchronization primitives, such as mutexes"
+HOMEPAGE="https://github.com/google/nsync"
+SRC_URI="https://github.com/google/nsync/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DOCS=( README )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DNSYNC_ENABLE_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 19f90e201a4f..486a6da958c0 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 972 BLAKE2B 2cb62e4997f29717c74393307878b5cfbd10f35b94a3f40aa730578c9881b2825ffacd68890378c7d05894297e3bbcd8bcbf556ac96758a67b6ec44d97c64e70 SHA512 61b217489ae82123d55beccdfd0076e3d134c03b7ba44c7dc673f0181727810711996b9ea422a05730bdb654fedcd3629e935869accd16e603c06a326705fbb0
+EBUILD oniguruma-6.8.2.ebuild 970 BLAKE2B 5925f193741dfb7f8da7be4389c6bddfc8bb618d537edd2ac9e2477287f18e9997fdf282872b30f846cf92aec1c30fcd1aeb4c6e58cdacb069acf6220ed01602 SHA512 37c46f50bfd281fd331e9f799b7f9957aee3fba71824f69b6e2bb3d7b078125c53976a0c6651956034f47c6dca8a2885939b1334a6719a8d9d44e0265b2b97d2
 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 b4d87472117d..9113ff5a064c 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/quazip/Manifest b/dev-libs/quazip/Manifest
index 3e7b1b203900..6eff82a33d2b 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,5 +1,5 @@
 DIST quazip-0.7.3.tar.gz 439536 BLAKE2B 7b91d12f14e060f3554e6d9b4041aef56f269c3e5cc3a4e67eaa415cf990f474da8581a248037d2b741117c5f83c514f3dc4e30310dccc954cf363435acfc4c6 SHA512 d4b55bd040e47e97e7bd5d080399ae4aa5fbc4985d6ab5979b468abc852c91b2e3e5d35af90d4b4de3bb01ea9135d0247473d6eab0413392b1c8567dc799a9fe
 DIST quazip-0.7.6.tar.gz 149029 BLAKE2B 7eb99f550dc06d8d2911b22214294accaa5126657598bfd60614267715ea968790f470cea2820e1a78a8581ab0d4b75c90589c0da1ae815067e083e389020762 SHA512 4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1
 EBUILD quazip-0.7.3-r1.ebuild 1153 BLAKE2B 8eade14de50d7cb1d107047a4499a729c3485b63401dcda2ac2582d189e8623873475ca4e26ee38f7fc9cc2826ed610f12ba56e39da07fe73da42eb6013a725c SHA512 c136346ee3d3da176fad5458a82cea7d9c98c0e78084238a6d17c308daf3a155244f83d01e318c36829233518632167819b15424fc9a0f27fcb7d2654556296b
-EBUILD quazip-0.7.6.ebuild 1130 BLAKE2B 2c136da5203fe29c055cb04f7f782eb531ce97845e38e7c0c77ec48981681167eb015e12123af694983e667b6135a3d0a25e8cd7f420426b1df8c3fb4cd81f88 SHA512 e8d4dbffa69b2db8d01c5da05ba84004b6cdacc7b8f585be9b78e194eca894240ada789066c5d4eac6942822586c6b2ee39dad9fcbf9edd56669b33130f9da70
+EBUILD quazip-0.7.6.ebuild 1129 BLAKE2B 6eb2ae5634e8525642318be3db33bc104ee0980aba31eb895a16bf80453b71455f23796da12323f792b6d0b5ae39f4822d1737e0c2d072307e56ff90f33d4481 SHA512 6f9534c6a43d91477df93714dd0b87da41d5b6a970a58638f7b366085ab0e659dda03cac1d123b6d79484c454874e9b430180dde329260a938170ba9f23c79ca
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.7.6.ebuild b/dev-libs/quazip/quazip-0.7.6.ebuild
index 77d1a132a899..70d19e5a7166 100644
--- a/dev-libs/quazip/quazip-0.7.6.ebuild
+++ b/dev-libs/quazip/quazip-0.7.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 00b791272895..0871f2fb63f1 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,3 @@
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
-EBUILD serd-0.28.0-r1.ebuild 1104 BLAKE2B 9c87e861eca99b01c20281793527eceec9e34b04589517589bf01492050ec1bb0eb14e5c16d1b070fe4124e7e12f9cb42bc021df18ab35c659bc62907617fbed SHA512 13b92204381e8f8c3e14997738a9d2f962a3c7fcb05e1ba61df6dea0fe57317b74ae7659a8eea8c0a549c4c052b3ee53f6f290e36887990f3f7f3d8b7ab1e67d
+EBUILD serd-0.28.0-r1.ebuild 1109 BLAKE2B 42f001ef7d163b4feafe17d23262b106aa7df0b835fbf19a7f076f17e8574e62070fba26a36c1875f145785bf65202e6b41d912869656047289beef413313cd2 SHA512 c3767cf3f054e1f7696451538eeba5b0605d6e48f9a25ee96722c170e74acd3df1c9dcedb22ab8d243fc6d1a930a8744382c56037a744ae77706689e4101ddc0
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index 20f404eb2526..ad1ecce82825 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc x86"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index f54f6bfa3b43..a4d813c245da 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,3 +1,3 @@
 DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed7158223ee685821ae80b18b61f5db82f804ee6a32236143cf8287ee875c3b3354edc6ccd1d4f25eaa3a04c785b SHA512 e18c6de62f2cbffedd4c200f6452f4fd37f719aed764ccc1b77c8da04a0f3394d47e8b57e19eefd6d600770926f505fdfa5da91564bbff5f4ead49f1adaba249
-EBUILD sord-0.16.0-r1.ebuild 1106 BLAKE2B 34e7d07ac8348d062e5cfd7b3f0e92e23be4aaf23ac346c278b8ba469eafc04cea7d482deb1e8fd2cecfeee86a5a53a515167f3a70fe24fcb96bb1a6710dbc7f SHA512 ccf7ccae7c9cf967c2cc418aea6dc15dcd64f5811c2f929f878aafb1a10958fa8953173653308c22c3eb7ba3ee33e84503e56a715bef34a13c26004cf7518618
+EBUILD sord-0.16.0-r1.ebuild 1111 BLAKE2B 2534eea15bb8205581e78ef8e2094b52e568d083fe6041690a8a732a8e15f748cc94ff2f97d62aa89c153d3ddf38d68cdc8eae91bb1b40934acad94a44099712 SHA512 363fcfd8fe16643c83cb47105c0fbe4a8b37aa1e068698f08b349cd48ac3341c4beda632b1aa88cca42c0081ab0c46c81aa765924c1c4a9c2a5319b4be6562a1
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index 9440bedbf445..f40505a333c7 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/serd-0.28.0-r1"
diff --git a/dev-libs/svrcore/Manifest b/dev-libs/svrcore/Manifest
index 89369c487edc..2e7a0b04e7be 100644
--- a/dev-libs/svrcore/Manifest
+++ b/dev-libs/svrcore/Manifest
@@ -4,4 +4,4 @@ DIST svrcore-4.0.4.tar.bz2 217076 BLAKE2B 1d5b1c6d397552f299554a19c21a81d1df8f44
 DIST svrcore-4.1.2.tar.bz2 263891 BLAKE2B 4d546406e18099857c1d77d479123332bdc721b51f5ad6bae74812b77704d3d6f8fa2ab67848355be7050fc3ee161c534fc7ee1692811fe9829da513f7cba29e SHA512 9d148ec9c568f1183e44006fec83b4e43b0cef56d5a04fce122fab1e9a0c0bfe39919de81c5a4d7adb2258fb7f16b4d327da20cdb4d948810e968c422d62ad40
 EBUILD svrcore-4.0.4-r1.ebuild 837 BLAKE2B 309d9419d26117395c0bb618537c978dbc9c61672633d9e928632b01e491eec61ecd28fbad36c4f3ac9af70047c6918e69737e40523de60877e8fd9ba48be153 SHA512 7c10b47f3270b6149b99881a969e889743bce88cad4f1b09cd1519b7e38a77af51a5ec3e073e06132ed24e2f2e1bb23cb4c941d6bdd2d7aaad4a66c5cb121dbe
 EBUILD svrcore-4.1.2.ebuild 692 BLAKE2B d4a2ef8b78ffedc502a6a666dc16fa555d5d012aedf7362da87f6b4092f7274a00d3c06d643919ac6532e3700265ee244c0424a000c73fd41394f50c5041ae33 SHA512 105c0e603d9acace34ad5ab9705eec19822cedfacc85fca1940409d652a2bb3eb1621309f690efdca8705ace076ae0e45d63f232da4e6e98d31c3bd21dda103e
-MISC metadata.xml 459 BLAKE2B 1b1121a04f0ee2f59af930415a61b083378ce28d973be4c4c19472adaa7e3d74b443e5fa15262c58f9226124e988678f67fd086e03522e4f7e8f0916b62368a0 SHA512 55ecd7c4c70d396e9f6a9458664854f564e2bd81f67f477bffb7da39ef71ca3fb881895527c45e16795c7b59c9c47e529bce2c0aabc94a5bde5fe4661879c1ad
+MISC metadata.xml 351 BLAKE2B faa373d9030626334fad91404fd3a3cf322eb37e044224088fb98d2fac1ee8f002e3ef0b4ca5d098ef1ef59b00ab91589a7dc9d1f4b6dc320ee3c758d8cd12a8 SHA512 6ce6c04a65b242413c57a5d034faac7a94fc2d3a3318b0a613f3a0b27de5968ede9203eca46a0d68c0be8915f7d3e5faf10e64778d086978e2a1f6ea889b42c8
diff --git a/dev-libs/svrcore/metadata.xml b/dev-libs/svrcore/metadata.xml
index 502fff316fa2..f7f7b9686a7d 100644
--- a/dev-libs/svrcore/metadata.xml
+++ b/dev-libs/svrcore/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>wibrown@redhat.com</email>
-		<name>William Brown</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>wes@sol1.com.au</email>
 		<name>Wes</name>
 	</maintainer>
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 88ec7ad80e8a..5be56a3e45e8 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,9 +1,7 @@
-DIST vala-0.34.16.tar.xz 2795676 BLAKE2B 64428099c209e13a6aad09233af650f412efa191ff4873fae1dbfb9bcc252e13d4e152733c9f199cd23323872fd912807a685980f651c1f784bfaffae7bf4162 SHA512 6411d55524a6c717c2eaf5cc1231ac931400e3f66d151a8b8856910258eb5bd7affe3a90946de34feb51aabfafce721b8d57f61e0475095b275d20b73cc4bbec
-DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5138bfea1ed058f41bf07968e55e032469cc068cefdb6a4d53f1c029ca7e728c57b00f6b9845e32c4410e8258 SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f
 DIST vala-0.36.13.tar.xz 2869616 BLAKE2B adb22fa45e34c2be2accde2bc928148d3115dc0757338d66feb111b4225879f21f2af5f49511eff53697127d3431d22736be827d3663ed8a5de6d8ac718b0cee SHA512 7c9bb2e50f660ec28d55f755019ba81eb0358327967d8046a14691b5fe9c805f731c6277cbb732fc19af60322e2293bb25176387944ca2de709cde0c22b44d1f
 DIST vala-0.36.14.tar.xz 2874504 BLAKE2B 217178c9018e8d6623e5997f36210ecccfa0176ae06a52bed6b54b5d6af3504c7157b9bfb162d44ef96e0b95fa2ebfff4171b935f911491f62f88c69f6087d57 SHA512 123c54a3ba2198b6cc7d40bfce20dee687a369e26346fb6675ce07692755ceb91bea7137f707b9f5a7972c99b12a77e9d4cc65ae055053f48909c80377661fbe
-EBUILD vala-common-0.34.16.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
-EBUILD vala-common-0.34.9.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de
-EBUILD vala-common-0.36.13.ebuild 2533 BLAKE2B 1e834f43de5670f211052c5ba6be783806cfe25fd6aa4a2890efad0eba1db06953dd656dfbd58b880f4be2e87f9855f9300adeeb2c517b9d68028c73af1f0b28 SHA512 5a5b8eb3e3f25aa08d28eb2016e9514e7f3789aa8c32e81711190218900a4a90df3acf711269a03fbd395e78d88516e894ae7eed87fc32767ae9e731c1ac6e9e
+DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
+EBUILD vala-common-0.36.13.ebuild 2532 BLAKE2B d7d559633b486f7dff1ce9ba4d5afc64e51b711c8eddec3cfacde871b36b6b26b4b23fcff21a6828a9bdbfd337498942ff7eb363a4e1448bdc457490d5ec10e6 SHA512 7103cfa563c1dde203f73d3d9ee1f7f01fe912a16a7fd8e6473db61619bb25b3641f46c151fa93f300b5cd04639ed4fc828dcd5345b0356de08918332522d290
 EBUILD vala-common-0.36.14.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
+EBUILD vala-common-0.36.15.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.34.9.ebuild b/dev-libs/vala-common/vala-common-0.34.9.ebuild
deleted file mode 100644
index 743737dd7b56..000000000000
--- a/dev-libs/vala-common/vala-common-0.34.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-# Previously ${PN} was part of dev-lang/vala
-RDEPEND="
-	!<dev-lang/vala-0.10.4-r2
-	!<dev-lang/vala-0.12.1-r1:0.12
-	!<dev-lang/vala-0.14.2-r2:0.14
-	!<dev-lang/vala-0.16.1-r2:0.16
-	!<dev-lang/vala-0.17.5:0.18
-"
-DEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
-
-pkg_postinst() {
-	# Hack to prevent alternatives_auto_makesym in previously installed
-	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
-	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
-		ebegin "Removing old vala-0.10 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
-		ebegin "Removing old vala-0.12 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
-		ebegin "Removing old vala-0.14 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-	fi
-	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
-		ebegin "Removing old vala-0.16 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.16 makefile template"
-			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
-		ebegin "Removing old vala-0.18 macros"
-		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
-		eend $?
-		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
-			ebegin "Removing old vala-0.18 makefile template"
-			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
-			eend $?
-		fi
-	fi
-}
diff --git a/dev-libs/vala-common/vala-common-0.36.13.ebuild b/dev-libs/vala-common/vala-common-0.36.13.ebuild
index 21649ff52ab6..f3f9c323dd3a 100644
--- a/dev-libs/vala-common/vala-common-0.36.13.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.13.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/vala-common/vala-common-0.34.16.ebuild b/dev-libs/vala-common/vala-common-0.36.15.ebuild
index 914750231de3..914750231de3 100644
--- a/dev-libs/vala-common/vala-common-0.34.16.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.15.ebuild
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 963ca7589a0d..34c690b218a4 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -3,7 +3,9 @@ AUX volume_key-0.3.9-config.h.diff 819 BLAKE2B ad442b6cff8468e49172d4216125b59b9
 AUX volume_key-0.3.9-cryptsetup2.patch 11118 BLAKE2B a271091011046c5765f1202a655a591a9dde6732997a39760a792c12caba5eff31c130247a33866d8d7cb47ef91c515d28375729d06f321bd0502063d7793e8a SHA512 154e8c2860ffb07f367696ed23309910162c23a445e7c46411f63f6a46e65aaf5285559a51320edf3a424d98300058356ef058689c06719e00616f211ac4164a
 AUX volume_key-0.3.9-find_python.patch 1845 BLAKE2B 0924bdd416f4eab70648964a1ad76263db76a3c7c62819146d200c6a88ef65ed24aa90c3dcd426e5cd137e07ddf04ddfd95474f6204f4e76b0c2a3b746e16dfb SHA512 5b2de4c5c18bb17fbf2a7e5de8adc36d919c5e98aafc33bbd3464ab60ce520ee0b4da0447f7e55ae262c9f6243936badd20f8ce5f9f3367188d80ba28932d0d7
 DIST volume_key-0.3.10.tar.xz 474720 BLAKE2B 726252263976b63c3e73dc42bd0166aa1c05df7a61715ca19921e9cd92abf1f8c84347127c94f724e385e0a36411ffae92341d91d06d679c052c83edb5ab6c49 SHA512 b050d333e021bc3721f5e72c1d2498adea3265afe7f702e1b1e859546755745ac70dcffc194739a4833d4b0b77168506f7fe90fde382d8aab4df2af7b635932b
+DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.9.tar.xz 445092 BLAKE2B b9cec52ca02e331501d378482484535413f3ef7675b6592b9f26f272d36448a2ffee1a0ca1c7a552764324ab20cd6dac98447914faafbea96e4c526796bec587 SHA512 bc0e690997b9fa1c9fff361d04e7eddcac4cac09779d7a1f9e161be117f5c589a7e444ac16dab25fb3e3ce201591f7dc937595ddf2745d7daa625d4ab0a255e0
 EBUILD volume_key-0.3.10.ebuild 892 BLAKE2B f1698f22f16aa35276bc2b2eb4aee7a5fa3916b45c9bef3eaf2743d1c51dd6ddc8af059d47acdd64aec74f8304f50011a577b53ac112a2929d13f641a3f287f6 SHA512 76e10dd531efbf4f685fc0f5ae13c7548b20be8d80f232d128d07ac3aab57662bb90d10112b79b8ec417386f98b32ff342f5f7614ef9d053c28424ae53dd8a1d
+EBUILD volume_key-0.3.11.ebuild 853 BLAKE2B 638d69733a68fe645d717307bb5a207b0e5913196f1f751d2c48bb9d2b2595e127fd1dcb516df9e6e781d34c8275074f8f7b0f9c7578a46b2cf0fd1c3e59fcde SHA512 f07b6760999b9836d9c39bc1e94d4d4e5a5267ab1fef34ee3a45fff7a45d328b579bdd293dba9769a60062a2460dd6c1c4359b262a8cf0ce1bc6a3b97ed0e8be
 EBUILD volume_key-0.3.9.ebuild 1030 BLAKE2B 4eb58cce79277f652acda134685f10db2c61093d8418cd7d5c550b0aa3f4acd5739a17bf45bbc2b9b707954ffa8179119ab9c41c3e752d5e958fe2ffdb76d33e SHA512 421e9f70ecc487ca8e8db52ff20deb6503d8106443e14f3781a5c4bc338b722ff2c453a0311a8b46f346986b31c4709f0d1b30e2df70f7fa6d7e166474dad455
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.11.ebuild
new file mode 100644
index 000000000000..3c09344c519f
--- /dev/null
+++ b/dev-libs/volume_key/volume_key-0.3.11.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-single-r1
+
+DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
+HOMEPAGE="https://pagure.io/volume_key"
+SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-crypt/gpgme
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	sys-apps/util-linux
+	sys-fs/cryptsetup:=
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	test? ( dev-libs/nss[utils] )
+	"
+
+#RESTRICT="test" # possible gpgme issue
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 0ae73d8dfb45..15c1ea17e30e 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -8,7 +8,7 @@ DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a6
 EBUILD xapian-bindings-1.2.24.ebuild 5550 BLAKE2B 8715a21a7277695c9bb328ca20d52f188405f4306efaca6fbd89d79d0949fd82c5fb6a77b2e045bf472152aae5c1100904702856f457e4b10c051ec9d5821f63 SHA512 4961916df0b4cb265b3e4f68566f0c0f66f767c31d762cd044095a897e916910d3adaebc549e90d924ac738435863095664731272c8c12df6be0fd94dc0039c6
 EBUILD xapian-bindings-1.2.25.ebuild 5551 BLAKE2B d0e1431b390f2ce7f43bc5ceddb0e205dc0118255cb6a9a9844a3005845a1de10ff9834369118532ee956ebdd8f5d4fb43e5636df4d488502967ad26b37e78d6 SHA512 cea9b9dbb61721ce41ec481099c8cdc27fc7d6da5b88c7777503348b124442aecb70b0c888d3d1560332679ae3c8a3ab60eacde4b6154abba9c2be60a853c36a
 EBUILD xapian-bindings-1.4.4.ebuild 3522 BLAKE2B 1dcaa9c2383685db410e9d7421cc55990598444c3360b698ece2d9ce051cf11d28966ec93d08f599e6036154fb5fb7a07855cf5b7dc6319f140a90d6d989312e SHA512 f57942ee1c7b2ffdb42799df989fc3634f3bdde4b61f9e423d7c5e343645cf28eb67b99694a6b82695f371f52c2b235e9e3dff7d07112dda1267a80dbcacadf1
-EBUILD xapian-bindings-1.4.5.ebuild 6506 BLAKE2B 434e72be2ed959609954eb139f5f1583f2cf83e0ce05ed3f641a6f7e637b23b10a89940d5ab61eb1dc32556f58d4ece8a91879442c6502e9f56325ad766778da SHA512 41ab32456e622583f3e5bba8bdf6a0cad970a42030b3c7ea858f5cce7d39cc2e4ae629646c740d61da14fb6fbc438b164ac392d32f52e95a21798a3efd7185fc
+EBUILD xapian-bindings-1.4.5.ebuild 6502 BLAKE2B a19fd69e1d7366ddd9da3ea04a9052d0cba77115599815ff40b9cd22c30a38c9802e1f6a22b328fd9d06925dbdc5ba1ebd383eb8495236312dc5f9221ea31729 SHA512 7c25358e53d2e57b16068b260df9d6b3929586c6d8ff2288d9a68fb8e1f2b9054d3b50843d3bb275bd137efd696074c15c7181b57697e06f706ea51e2c9813f6
 EBUILD xapian-bindings-1.4.6.ebuild 6509 BLAKE2B 01fbe871700b6d4d7f7f5a93c971c1ec4463dff5a2a7165e7e1b603b5f02fb2b09e3a1286ac0f22b65ed8e7ef6794f5ae692abc8aab59541a9e0537ba67e96e8 SHA512 5ca05c47b2f9344c698b2825c28a378a0c15ea2cb44adc4f4de0a227ae1240dee21b2272d3d3db187e05a4facaa5c1ac877ccdf4448ac2b262a01c336a3ce603
 EBUILD xapian-bindings-1.4.7.ebuild 6509 BLAKE2B 123fddd3675c9006a6d1b284660346e4d5f02f3ab399613d0c492bc0a0beb7abde3fe8dc9daa2eb25739cf7b21ea845aefcde99dc66fd23b879158ded7fe0d9d SHA512 ff467ef72f453a6e860a5509e40f26e5d34c07484e318a1ccb472e337d1c094e42fa5cfdb21b0390203691371086999c0de4fd64c0a9fd6ecf0ce4156bdbfd40
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
index 3cf7292e7693..2877acc8e0b6 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 0028ec16d8a9..288805f4ae3a 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -7,7 +7,7 @@ DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5
 EBUILD xapian-1.2.24.ebuild 1553 BLAKE2B 77d756575e5d0fdabd59f970ad6edfa4a197c1083a9080392725b6d74e6d9d0f948bed1dd7dbdeb29c0a16bbe70490af0a5b4505e539cee62272949768ddb931 SHA512 9e7f9ed40d9087f3c1fcb1cfe32e30646d2041e4abcc4f5f26940356b40e6d8bf9a80d7d57c86d3f4ecae369d974bbc0f141628fae831903f16d0b81ca336a48
 EBUILD xapian-1.2.25.ebuild 1827 BLAKE2B c5482b6cab85fcc237ef1c6b8728af9ab3438538a117f378bfb1e32c8779990465054e6235bf184da0f13744fac80498bdba85a22b142ce905064d832a9b320a SHA512 32bf0df37b927f5c1a470d6706d0097edf4b270e7e5251a614eb12fba11068caffaef31ee77cfeb9098c2e5c737642bfebd1f7fbc70736144de6523c8dbbda6f
 EBUILD xapian-1.4.4.ebuild 1908 BLAKE2B cbb63641f65e5bd48dcf353a5131e5199d9b9574a166528375a8dbffeb324e89b8c0129778241486e9cc8e9ac9ff18c464651e63f09b21a9e9e473698ad31444 SHA512 d1369efedd3aebc02ae4bbb7e2c201accad3a825248cb51cc14682266692a860c57e621ae3f7c2fc2a8183b612a9d824d99dff5ad5bbb6d3a9dd47f199a31b2d
-EBUILD xapian-1.4.5.ebuild 1913 BLAKE2B af5abd9a3a4e6b0e6ba459912725aa25c0cac1fdce6d2e9e4f309a838082914ea8461089f7e07d0ed5f1d3eea30c1a5a78efca158c7837355e5ed986fdba4b89 SHA512 13f8ff4880b45edd0f06b266e2ddcc27289c34f8dd4de99fbd7cbb203b67e2108043030afaf764b417e74dd1099138711237f22126e2e401bb5f5af5dcb2fe4a
+EBUILD xapian-1.4.5.ebuild 1910 BLAKE2B 6cb7b9aebebd2635c27b8a00757bb850917202844074f2f365ff0283a6f72c423deebe71ee6fde786f554ef3cbff84d1ba5706089071d6dcd7a63b9fba6f7c6c SHA512 92d3339e7e78b32941bd0c73873aa579b1013296f6979816d0f68f85f9bbc0d217684a8f46ac59e71e4ba829b39fb0b7dfd08663cddb36bdba1421f332ab78f2
 EBUILD xapian-1.4.6.ebuild 1917 BLAKE2B f7a307085cc7322e471a9e0418c6d8f2f65b78b387f32dd4cd8a0bab719c8646cb22d18ffa6707ae5689288b7d6cefdd324e2b10cec20882828d9c6bde89022e SHA512 64b7c6a931b1611795cd62327529a7eef4a4897e0c345c20ba8c5e4c559e7d45ec2f932d87174b49fdfe8a309de8d9cf4c298ded68fb1b67214db8fd637ee032
 EBUILD xapian-1.4.7.ebuild 1917 BLAKE2B f7a307085cc7322e471a9e0418c6d8f2f65b78b387f32dd4cd8a0bab719c8646cb22d18ffa6707ae5689288b7d6cefdd324e2b10cec20882828d9c6bde89022e SHA512 64b7c6a931b1611795cd62327529a7eef4a4897e0c345c20ba8c5e4c559e7d45ec2f932d87174b49fdfe8a309de8d9cf4c298ded68fb1b67214db8fd637ee032
 MISC metadata.xml 932 BLAKE2B 303ba679d42d5917930aa698ca96fa22e2000b4ffbfe3113b67119b61dd51140b1662bc090078027f7b00d0ad04e0e61792e74d1bddfc625e46258568b5c5f57 SHA512 874335952e31a9da1d105b82eac0c209259a85dfcdc8b7171cc1ff7d48694838bf9c3037fc4ff0450298b3c6b6fbb143ecfe7497727e8f18b684ff630caeb49c
diff --git a/dev-libs/xapian/xapian-1.4.5.ebuild b/dev-libs/xapian/xapian-1.4.5.ebuild
index 67af0263b6c7..7eb786501531 100644
--- a/dev-libs/xapian/xapian-1.4.5.ebuild
+++ b/dev-libs/xapian/xapian-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index c8ee43431d12..569fb08dd6f8 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,3 +1,3 @@
-DIST xxhash-0.6.4.tar.gz 28995 BLAKE2B 2556ac14e6a6b1341adeeba244ad5bac7b52ff43b5d85acfc51de903771f1a7b32defeab657db765d21a33ec49aee1a892617d6656a152ad5ce6e1636a743e18 SHA512 6c914bac5092dfd01349c8223c382d3c13ba1b22e08300ce86ea9663a9a934f930debdeb71c14365ec57d72b95088a4354da92dfb7fcf7d07ec01c0f4fb70ca7
-EBUILD xxhash-0.6.4.ebuild 602 BLAKE2B 0893da7a8e081a13e40d97167e8784edab1494b1e3bfd107ec7baebb7c261bedda06cf4b6310c8ddbeb277c8c2a5edbccb3ba06de66ce1307c7729c9d0396bf7 SHA512 77a9f7b217cf6d664a80ef707e1d5c1c99eb60a4ae86f3506542676f73991831fe16ca62b52237d18f58c3688be0f36363771fd2513871728ca035873bb1866a
+DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
+EBUILD xxhash-0.6.5.ebuild 602 BLAKE2B 0893da7a8e081a13e40d97167e8784edab1494b1e3bfd107ec7baebb7c261bedda06cf4b6310c8ddbeb277c8c2a5edbccb3ba06de66ce1307c7729c9d0396bf7 SHA512 77a9f7b217cf6d664a80ef707e1d5c1c99eb60a4ae86f3506542676f73991831fe16ca62b52237d18f58c3688be0f36363771fd2513871728ca035873bb1866a
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.6.4.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index e21fdc1aa0d7..e21fdc1aa0d7 100644
--- a/dev-libs/xxhash/xxhash-0.6.4.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
commit	e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree	9cb29a544215119b5c5538e37211b994ce1c87ae /dev-libs
parent	480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)