gentoo resync : 15.02.2018

57 files changed, 488 insertions, 1119 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fd163d574600..3cd240b4127c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 69ecf805daa5..24f3efbeb69b 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,17 +1,10 @@
 AUX boost-1.48.0-disable_icu_rpath.patch 1077 BLAKE2B 367246d711de06ef20a93a0e2a354fff4e8360ef79582a75d262b2e6dfcd76a5c2bb00e719a05ca79c7f5f0f3fefa975713251e65cb9f2c09e76cb6c3b16888b SHA512 013503fd16bcb609c624c9952a5448e612b81150db9ce60b5a51acbb57b62ce1cf0e7c5dd4a58c110ca7895c86effef24d8fe55ea3f316c9e47d5c549a33180c
-AUX boost-1.48.0-disable_libboost_python3.patch 1513 BLAKE2B fd0f5d8d3ff67861725e18b10a7191025b5f0cf242dbf38a44896d5b305268d6e585f093077b2e9a6ae9e13b7b94a01e387f7858215fbe78b127f84f6a8d8de7 SHA512 9a2b189530af9fa149203f0621b171461f11212306aeb4d94075a2896ed97abb12d47e6bc0429814405829244604044c2101ad34686a10b12ebe3536b2289ed7
-AUX boost-1.48.0-no_strict_aliasing_python2.patch 745 BLAKE2B 204ab844356219e90c80bcd0824090672ebe90ea95b79c5dd94d2759a1a522d1b6fa487fce1c991439848cf5581a85bfb8eca6a79150b78aa703bba8efc06993 SHA512 ad4c7b8ec59154e2e9588b72a23453f4dc915eecc87a065b10eccc6f713e4a55270f0766bad7766c53dfb934e4d94a25d006567c9e18d0e7dc32649f5a601296
-AUX boost-1.48.0-python_linking.patch 1282 BLAKE2B 06365a2fc9348829d673aa06756adbb0681af062bac8ea1a569f54a20c6680630d4d2cb38d7a152a1ff14d7795fb3373310a6da32c01c6a3f745c110fa5aae4b SHA512 9aff888908476107bde818f306fafd855408d214dd13abd3406339b911ba3c56a7a76ac2a549c63be16ba73a86275860fc1bf78c2fd976c872772b4199ecedb6
-AUX boost-1.51.0-respect_python-buildid.patch 1577 BLAKE2B 0db82775912e88d84bfbf152912db4754e42bf17c954e4b505d3ce796bd3883c589902570f0c6762d073c7827e044e2d3b174329f7f8dd132cf46fadc069a1c8 SHA512 bbe7e586a95c615d51612bf0404c07179b07c33a33e67957af5056ff80f44c620f81244d7fe30519f08f2d19e1d87f8fa09fa32c7f5d37f6f13de4590c050731
-AUX boost-1.51.0-support_dots_in_python-buildid.patch 617 BLAKE2B 1e95323dacd3c351bfa5a7c2d92a358e3068439fba12e01fc8889b4f3d607cd8640f2d2547f2fa1453a04f972022a47a70b11066ff7632a89dd976428085235e SHA512 667452299f96ac3008340f901c6a5355956676b10f82134e650f8c8e06e7c6f8814c2b92d07e958c31b11e013601c0b3ad4020cdc35bbd558761fcd33bb68b3c
 AUX boost-1.55.0-context-x32.patch 1077 BLAKE2B 76ff0e52ca076ccddd58a469b4531f49782d6373bfa9d65ac63fe365fe90d25d10557fa041584f8d0bcf04438a90e78b69624006220f53983a456485b868cbc9 SHA512 0e2e45abe5833396508666355e26bafe114fa4ada628b24d8d9953268edddcb2f8e3dcfe8bc7f27d6c1794418990dc9ef914c936dfa64ed6e5e647a40e3f8a73
 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
-DIST boost_1_62_0.tar.bz2 84513338 BLAKE2B 00f2ddf93d254183709a5e607d5cec5d135bdcddebac15fc3b1522e37b9e58d8df84f1977fee5b085309db58634861f2014e72822e755dd7789e8489fef19f7c SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be
 DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
-EBUILD boost-1.62.0-r1.ebuild 12501 BLAKE2B 2eec65f9186d5d411aaa67475810871777bde06316f7c36b44437cfe2e2a68bb7cc867f63745ee3abb4bad3c8db3efa228adbb65035546b3796e19b2d973e859 SHA512 3294c7dfbdd1a414cf910edd38882c57e97b670b844d18cb547887ff1b3d74c7ac09ae74a4a1e5c10d1a8be58cd7b9292e82752342a33f7a5c6c525ac0bac072
 EBUILD boost-1.63.0.ebuild 12465 BLAKE2B e04262f3f3a40a0cdf877c2e5c3b76356bfcd20a0140dc0b8e3e6f0e9978e020a62438e0413972064c56d3813ee2fe040ef6a0a514fc2798e0249ac896a6a956 SHA512 14f708e886a954d83b9e7d5e3a7b3b4dfce6345631fce38b2f18ba4f51468c8ceb692430a6cebf36443979e4880653d72c144b5b240415c4e59f02d82d66dc93
 EBUILD boost-1.65.0.ebuild 12446 BLAKE2B c8c22809a2ba6d496f1d3985f9f102083e4cf196a127900002443a26eb38a9e4cc761f26e7d3d9327435924bbf034a8a5d725549fd127731ed16d7ba5e9aa5e1 SHA512 9db27a7d0f96e7112360d70eaf19f1596b7d80099e2eaf3115f8e082763f087410b80973c7348a60aa0ee93a0989b82252c7923c6f479b5f74c210cde51f00aa
 MISC metadata.xml 1526 BLAKE2B 11c2e9eb5b41e3fa0b100d58d672acefe4a949d0fa428b4ce1d100cc8f95eec7c1279c725741033ca50f61cb258b388270c18361a5b714a684398cc3ae1a445c SHA512 4ba131f2492ae41f642a28dd69e5bd1d5d79c013e42a6c18ba135b36d470990ea20c8aa7cec6e3cb1d6ea8d7f6b6a5b45efb4b3dcba198bcf43809eff0f65ae6
diff --git a/dev-libs/boost/boost-1.62.0-r1.ebuild b/dev-libs/boost/boost-1.62.0-r1.ebuild
deleted file mode 100644
index 7ee2ada110df..000000000000
--- a/dev-libs/boost/boost-1.62.0-r1.ebuild
+++ /dev/null
@@ -1,444 +0,0 @@
-# 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} )
-
-inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
-
-MY_P="${PN}_$(replace_all_version_separators _)"
-MAJOR_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://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="hppa"
-
-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} )
-	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.51.0-respect_python-buildid.patch"
-	"${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch"
-	"${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch"
-	"${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch"
-	"${FILESDIR}/${PN}-1.48.0-python_linking.patch"
-	"${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"
-)
-
-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
-	)
-
-	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,')
-		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
-
-	use icu && OPTIONS+=(
-			"-sICU_PATH=${EPREFIX}/usr"
-		)
-	use icu || OPTIONS+=(
-			--disable-icu
-			boost.locale.icu=off
-		)
-	use mpi || OPTIONS+=(
-			--without-mpi
-		)
-	use nls || OPTIONS+=(
-			--without-locale
-		)
-	use context || OPTIONS+=(
-			--without-context
-			--without-coroutine
-			--without-coroutine2
-			--without-fiber
-		)
-	use threads || OPTIONS+=(
-			--without-thread
-		)
-
-	OPTIONS+=(
-		pch=off
-		--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* ]] && OPTIONS+=(
-			-sNO_BZIP2=1
-		)
-}
-
-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 /usr/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.48.0-disable_libboost_python3.patch b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
deleted file mode 100644
index d4560400d7d5..000000000000
--- a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -39,23 +39,6 @@
-     PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
- }
- 
--
--rule find-py3-version
--{
--    local versions = [ feature.values python ] ;
--    local py3ver ;
--    for local v in $(versions)
--    {
--        if $(v) >= 3.0
--        {
--            py3ver = $(v) ;
--        }
--    }
--    return $(py3ver) ;
--}
--
--py3-version = [ find-py3-version ] ;
--
- project boost/python
-   : source-location ../src
-   : requirements
-@@ -82,7 +65,7 @@
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
- 
--rule lib_boost_python ( is-py3 ? )
-+rule lib_boost_python
- {
- 
-     local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-@@ -91,7 +74,7 @@
-     {
-         python2 = true ;
-     }
--    lib [ cond $(is-py3) : boost_python3 : boost_python ]
-+    lib boost_python
-         : # sources
-         numeric.cpp
-         list.cpp
-@@ -148,7 +131,6 @@
-             <dependency>config-warning
- 
-             <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--            [ cond $(is-py3) : <python>$(py3-version) ]
-         :   # default build
-             <link>shared
-         :   # usage requirements
-@@ -160,9 +142,3 @@
- 
- lib_boost_python ;
- boost-install boost_python ;
--
--if $(py3-version)
--{
--    lib_boost_python yes ;
--    boost-install boost_python3 ;
--}
diff --git a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
deleted file mode 100644
index cb26792f99c9..000000000000
--- a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -85,6 +85,12 @@
- rule lib_boost_python ( is-py3 ? )
- {
- 
-+    local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-+    local python2 ;
-+    if $(python_major_version) = 2
-+    {
-+        python2 = true ;
-+    }
-     lib [ cond $(is-py3) : boost_python3 : boost_python ]
-         : # sources
-         numeric.cpp
-@@ -119,6 +125,7 @@
-         :   # requirements
-             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-             <define>BOOST_PYTHON_SOURCE
-+            [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
-           
-             # On Windows, all code using Python has to link to the Python
-             # import library.
diff --git a/dev-libs/boost/files/boost-1.48.0-python_linking.patch b/dev-libs/boost/files/boost-1.48.0-python_linking.patch
deleted file mode 100644
index 330cbb11e885..000000000000
--- a/dev-libs/boost/files/boost-1.48.0-python_linking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -109,20 +109,7 @@
-             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-             <define>BOOST_PYTHON_SOURCE
-             [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
--          
--            # On Windows, all code using Python has to link to the Python
--            # import library.
--            #
--            # On *nix we never link libboost_python to libpython.  When
--            # extending Python, all Python symbols are provided by the
--            # Python interpreter executable.  When embedding Python, the
--            # client executable is expected to explicitly link to
--            # /python//python (the target representing libpython) itself.
--            #
--            # python_for_extensions is a target defined by Boost.Build to
--            # provide the Python include paths, and on Windows, the Python
--            # import library, as usage requirements.
--            [ cond [ python.configured ] : <library>/python//python_for_extensions ]
-+            [ cond [ python.configured ] : <library>/python//python ]
-             
-             # we prevent building when there is no python available
-             # as it's not possible anyway, and to cause dependents to
diff --git a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch
deleted file mode 100644
index 17a681611b6f..000000000000
--- a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/6286
-
---- a/boostcpp.jam
-+++ b/boostcpp.jam
-@@ -99,13 +99,6 @@
-     BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" _ ] ;
- }
- 
--# Python build id (for Python libraries only).
--python-id = [ option.get "python-buildid" ] ;
--if $(python-id)
--{
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
--}
--
- 
- ################################################################################
- #
---- a/libs/mpi/build/Jamfile.v2
-+++ b/libs/mpi/build/Jamfile.v2
-@@ -8,6 +8,8 @@
- #  Authors: Douglas Gregor
- #           Andrew Lumsdaine
- 
-+import option ;
-+import regex ;
- import mpi ;
- import indirect ;
- import python ;
-@@ -24,6 +26,13 @@
-     <tag>@$(__name__).tag
-   ;
- 
-+# Python build id (for Python libraries only).
-+python-id = [ option.get "python-buildid" ] ;
-+if $(python-id)
-+{
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+}
-+
- rule tag ( name : type ? : property-set )
- {
-     local result = $(name) ;
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -2,6 +2,8 @@
- # Software License, Version 1.0. (See accompanying
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
-+import option ;
-+import regex ;
- import os ;
- import indirect ;
- import modules ;
-@@ -30,6 +32,14 @@
-         ;
- }
- 
-+# Python build id (for Python libraries only).
-+python-id = [ option.get "python-buildid" ] ;
-+if $(python-id)
-+{
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+}
-+
-+
- rule find-py3-version
- {
-     local versions = [ feature.values python ] ;
diff --git a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch
deleted file mode 100644
index a8912eb5e048..000000000000
--- a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/libs/mpi/build/Jamfile.v2
-+++ b/libs/mpi/build/Jamfile.v2
-@@ -30,7 +30,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
- 
- rule tag ( name : type ? : property-set )
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -36,7 +36,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
- 
- 
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index 66fa7286ba67..de49ff996b44 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -2,8 +2,10 @@ DIST dbus-glib-0.102.tar.gz 783792 BLAKE2B 5dca4d1d4c9d281e46ad9b15307a738698d65
 DIST dbus-glib-0.104.tar.gz 793417 BLAKE2B 87c12f15e7a960acf2071fae9a689780b74ef146e0f776e117fed66248d16d2ae45e52d264fa87eafc336935db5c64f85474a4b16f29389436faabd976beae6f SHA512 eff599f169976055545b51459d77845002d8bc7e8dcd056cec2bf83836d07c66b03baed2023bc87a6d7c021d35c744987830f8ed6f9c3391a49ee199db85134b
 DIST dbus-glib-0.106.tar.gz 793343 BLAKE2B 8444c587bf002a23abe6f0ffedd1dc1c3a60445cbdab923567c74bd80ebb178ae24c9ee685426601782785e5f67ebbcc1524d65379135958bc7d3ede44c48feb SHA512 13a1d4600add29d29dbb8d1271570e6c04f70ddff0862d28fcb7df774bfa76a961f90303f897f3b970070eb959e909d5d02a94941e2edd8ba315b9aaa3a602cb
 DIST dbus-glib-0.108.tar.gz 812488 BLAKE2B e958c4054c09ec98d7bff659917a9c162dc4338aabcc5c6ec6d7ec34304867dd65d373eeb8871cd188424a36dafa337bb713fb2aaa87e47d1ed4f91a4e7ecd7f SHA512 9fa7cd1c22bf6ee1e345dd6fe48aa725abc01b3b180ba430efea9996403ad99636b2c40f682956978ae5049c110c3298fa199470a4cc05907e11773d034ea5b1
+DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
 EBUILD dbus-glib-0.102.ebuild 2144 BLAKE2B 9c03b870f2711061dc58b4789aa7bc156c3ec347873ed1b6829365a49ee4b812549909ce95af5095b70232299380664d22cc6655c98f6aa7c2946c08d23d906a SHA512 2464a7f101b40806dce95827c693263d6ac533f97fd18473a5262c3a98ca92d8a8b08b2ecf4aeef1110798b36348255ea963a90818a35cf8121d789a2b5cbb3f
 EBUILD dbus-glib-0.104.ebuild 2108 BLAKE2B 30253cc6295eb45f268a5bc9f13d666c9b6c19e97fa2a7fdb5bdb2e3687f70ac4e3eda78cd889509c4d79449cfbe2d22de4c2ced5c012e9a6d3bc5fa7d2845ca SHA512 a047380aac56e192915e21938e65c29d8ee73d9e2feaf36747c9a28af8d7456e7ab9c9a8289240ec271cad508f1cc483122ee2c69fe124fed5f30b092bea2104
 EBUILD dbus-glib-0.106.ebuild 2108 BLAKE2B 30253cc6295eb45f268a5bc9f13d666c9b6c19e97fa2a7fdb5bdb2e3687f70ac4e3eda78cd889509c4d79449cfbe2d22de4c2ced5c012e9a6d3bc5fa7d2845ca SHA512 a047380aac56e192915e21938e65c29d8ee73d9e2feaf36747c9a28af8d7456e7ab9c9a8289240ec271cad508f1cc483122ee2c69fe124fed5f30b092bea2104
 EBUILD dbus-glib-0.108.ebuild 2100 BLAKE2B 39c5706373fcad6b2e5edbdb77394ab13a9a71e9a3e8bb0150e4ccdd507ea612c1d476d8b412d9bbdf11bbc196ba88cca928ab9754c02b362703b8de6ca9bfe2 SHA512 5f259f54a4b8d06e329b2ffd6d0e650a8af0bc1274e34d009f3c5488be75f91b6522a8d758a20eb8ead9e0bc94037ffb9a42abcb6a26580ca7997fa0469152e2
+EBUILD dbus-glib-0.110.ebuild 2047 BLAKE2B fce708b2bfb4014d81a0e56b9805aabc9aa385fe7a20318c6ad79c10fa996a83e60cfc78a747939682f7746fdd5d16c36aa858cac2fc9dbd760763256d3a3a59 SHA512 5f973f6c74d1a295c61ca26d45738ab4aafe5a121f86da43a06b2fcd71be2a57ca2b34de0090e7a8a045e6f5fc0c4d4bbbbb1f8a35c570f0d8bf2df9d2928e60
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
new file mode 100644
index 000000000000..85c48abd88a0
--- /dev/null
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 eutils multilib-minimal
+
+DESCRIPTION="D-Bus bindings for glib"
+HOMEPAGE="https://dbus.freedesktop.org/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-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 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+IUSE="debug static-libs test"
+
+CDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.8[${MULTILIB_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	abi_x86_32? (
+		!<app-emulation/emul-linux-x86-baselibs-20131008-r8
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+set_TBD() {
+	# out of sources build dir for make check
+	export TBD="${BUILD_DIR}-tests"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}"/var
+		--enable-bash-completion
+		--disable-gtk-doc
+		$(use_enable debug asserts)
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	ln -s "${S}"/doc/reference/html doc/reference/html || die #460042
+
+	if use test; then
+		set_TBD
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf \
+			"${myconf[@]}" \
+			$(use_enable test checks) \
+			$(use_enable test tests) \
+			$(use_enable test asserts)
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use test; then
+		set_TBD
+		cd "${TBD}" || die
+		einfo "Running make in ${TBD}"
+		emake
+	fi
+}
+
+multilib_src_test() {
+	set_TBD
+	cd "${TBD}" || die
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send
+	rm -rf "${ED}"/etc/bash_completion.d || die
+
+	prune_libtool_files
+}
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 66a32a50eb56..269648b6a6e0 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -1,7 +1,9 @@
 DIST ding-libs-0.4.0.tar.gz 827058 BLAKE2B aa6e1cef9747646ece2643495eaa720254a964ea1adf8695f0a8a2d9c401b141a72e0c81d9d9cd44aaa81feed73118b7c7e52a24121d4ee0f71928dcf4ecf43d SHA512 e062e104f4ad75eea0b59bb113b7a6a4044a42230d96b9b9dda611535835cd0809635b1da1408ae58e97f9ff9a9f4fd48f751365901f9b066b465df3523730a0
 DIST ding-libs-0.5.0.tar.gz 868840 BLAKE2B dc89dbd0951d8505776ae98a10bbfb54f4a2106da0a5b76f3d08556f7df0e85093862813ceb12f0190709ca71fe75eceb2c373dd95a0437f15ceec0bd70cf171 SHA512 d79db6794dbb59b518db15c51c3f981e8873e478a156ca8ae766a61107796968eeed36cf21bd20f5e6f04c5b460d3a40ab114a482754e2f3976c53bb82fe1fcb
 DIST ding-libs-0.6.0.tar.gz 880038 BLAKE2B 97d575fa73e436ae5062c15eb6448a31f3e2758ddc42338556a2c697e83ec4c57aa60867d5d2dc6add935266c8a4404f59d089fe52507d52783aed8bbe967503 SHA512 7218b6825bc078bdc35f149bd17944f427af0e32fa4d94026c00ecd14037598959ad7e1dee46af6fd3736424cdb499720fd8e1a0d1dfd173a5bc0085f8f986b2
-EBUILD ding-libs-0.4.0.ebuild 490 BLAKE2B 0fe7f20767b2dd1e8b3d1e46982f1c94c82298b412b7567d7e261c468131e5fe451ee231ee25d2f1fa44452c5d6d0c79b485dd1a1967d2b88222a623ab6f0159 SHA512 26b70f0a10519e7bbf8da6f2fc73c6aef3f2c3dd544bd0c8330834cfb2d0946c33f266eeefa0a55c6552c4ca297934ede3f66d0784a21a175ac6496f05c76f59
-EBUILD ding-libs-0.5.0.ebuild 546 BLAKE2B 114570d9911057951033196f3746c24594026fbd97de6b6d502f1ec41d8c8c2d7b6c13ea1e6631bb24262dacea2112adc7afdfe2c38232115883e08cafff832e SHA512 919631adedd25a89e1f0004524f53ccb50a450c3c165de0354e823a4557a1a4d010e55d6d20e703dedb769a3205910c164dbc3d73fefb7e7e85888ea0304705d
-EBUILD ding-libs-0.6.0.ebuild 596 BLAKE2B b62ccd13e047cfe11731d12d9011af489a59415afe5e432ff7a77e347813a47d007b9e5be29761b8177b0b04a20a5523da73368e4d638edf1a685d1da7fc032a SHA512 b7a4323745e97d4e70072ccbe36c9aa4f224e6f3d96810906832c1a002a28fd0ed8526ada3a459bc23c7c83937d09053af8c130257c19bf84627c982ae0cdca7
+DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628
+EBUILD ding-libs-0.4.0.ebuild 492 BLAKE2B 56a1412b2906d75ba6623c7e3f57aff2829a95c4fbdf8b21f3127754b5950deeaafaad6e918e6f97a26e44ea5127b7cbce2e58b4a2d16faca17a85bc9791eace SHA512 169e8d203a8aac008017dd1d61e7c160d75b97f90f4874ab6e6321c61a6c58b7bf04817520b081d33598290dde2069cad8e4e60c785bebde332a611783fb252f
+EBUILD ding-libs-0.5.0.ebuild 548 BLAKE2B b85dc9940e7d1249f3d729f8b2aca392ebccc4a8af068712fb68c31f7996dd1704eac4cc9247bc447715b9f8aacc5a0dc32d7bd37ffab00f5bc8a811fedf454e SHA512 ece4b10606274a789cb9a6877b7cad4fc87d7a011c48b7d0791fbd4a1a9b8859acb800c0c1b95cda542edf1abf63c364dab01ff6c149ca0fba742eb70138705e
+EBUILD ding-libs-0.6.0.ebuild 598 BLAKE2B f0212d264f319d4ac2c3204e8e187b0f00b35359a69987814eb1a2242e5ab4234aef0f16efb244c262f0bfe2e745d32ba3c9961cc8f01cc0c81573f59d39a515 SHA512 5e13b98a2defd0fcbb2c0e6ca17b06981ddaaf0ee09b83095f6c63edcf4f9f4eda0d1049f03705c9c677935d601f25e66acf36e3b3e7bdadf9b034a86c3b84d7
+EBUILD ding-libs-0.6.1.ebuild 603 BLAKE2B 36c5ec0674329382387be092b92278aec1e5f6f4b689553230c884c6f32a25dd8b64bc64fe503dcb9896041c98b2529b9ce6a85aec5d4c964bd383568ce6418c SHA512 103944fc4f531c596976def499a8c4af2494aff85ba4086b22e85e1d98c089f5226b6b67940a12d6d50a9a40477d22f27128112521b742450723281328587303
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild b/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
index 64656250a69d..8aa0f79aa2c9 100644
--- a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit autotools-multilib
 
 DESCRIPTION="Library set needed for build sssd"
-HOMEPAGE="https://fedorahosted.org/sssd"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/SSSD/ding-libs"
+SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
diff --git a/dev-libs/ding-libs/ding-libs-0.5.0.ebuild b/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
index d252ab3bea6c..f917de14d1b4 100644
--- a/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit autotools-multilib
 
 DESCRIPTION="set of utility libraries (mostly used by sssd)"
-HOMEPAGE="https://fedorahosted.org/sssd"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/SSSD/ding-libs"
+SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
diff --git a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild b/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
index 601c9a1db213..1f488639729e 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit multilib-minimal
 
 DESCRIPTION="set of utility libraries (mostly used by sssd)"
-HOMEPAGE="https://fedorahosted.org/sssd"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/SSSD/ding-libs"
+SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
new file mode 100644
index 000000000000..b29bfb4ea957
--- /dev/null
+++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal
+
+DESCRIPTION="set of utility libraries (mostly used by sssd)"
+HOMEPAGE="https://pagure.io/SSSD/ding-libs"
+SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index b23c9316b801..15bc816e8cea 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,5 +1,8 @@
 DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d525b4fdb8967159bbcf32ca8dc3d057ba39ad35dc19f5f68f67160fc48d805e107fcaea22f81fdd8bd1125db908 SHA512 aec4070b3d3b6c00900c3cb814e4b6a98beea09817eba3c3f7e6d5ce1ff68c091d183583f09b475e3e56bac67c94c1d912ebbe079dcece8195ac0ed9379d5f82
 DIST keybinder-3.0-0.3.1.tar.gz 358650 BLAKE2B 541ce7cf5bdb9fc8c0cb6d7f1f6326d47c0cb32f71b517a8bfe8aeecc74658cf17bbaff93854bd57aa898e1f22bff1269c20422bab347df6c1e2ca1d8eac13de SHA512 af65ce02707ed2712c70470c9151bffee87e6d5b3b97218b653d3061b74001a7f3ac59e15b71362e4466e7ac16573bdb6331dc00ebccd906ce08ca8176b6770f
+DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
 EBUILD keybinder-0.3.1-r200.ebuild 1173 BLAKE2B 45e340e209d26411e5268ea16c4c929b921cf5447f03b18475227637b49a0f65dc781a231ad6d19296b744cc6f4f640b418040d9e81d76e154a6c90b1adc8f7d SHA512 631ab2a39cb8fe98b95c961dcecd252741fd1799353ecba32637e47afb8338ac29f112ff506b732cef9cd31e75bdf48ecb2a6464c414bc4e3ea7b945152a8ce1
+EBUILD keybinder-0.3.1-r201.ebuild 1197 BLAKE2B 02db2149021737397e30d62ec5de976af4de13447ac6a6d03bfd41a983b5d1632eedc65a284c10594d9e98a3fc47880e607e8fd6f70e6a2898f95a2621f83f97 SHA512 9b48eda63e11a35fdefd9c2667a5286df7579910d4f0ea67d2df11f01eacbe863b40237fec23f77fd0b2cbc75cce132f4af028e3326892a2ca24102f0b5a2cdf
 EBUILD keybinder-0.3.1-r300.ebuild 939 BLAKE2B ad5c4af3b728edbef0c2c61882ae35a2e8c630392f7446efe13701ff6fd83bbfa1bc51768244437b4cdafa00620a5e8e5e69ce9fcbcb9880aed1f6a7fedeb6a5 SHA512 c84f03c94a0a27549ffe215a0648882f324f80d38e30c49a97a2b8529c133737c673f74545d2742efdc845d2be5717c66624fdf6ec34e7dbb442c3c71c70efa7
-MISC metadata.xml 223 BLAKE2B cede765d06f6d86311c003cfad1644c1b372e8a2991f8aa34bda1aef39f5ba5f5dc4df033121a94ad095ef48a3dfe7028409d4cc308d55316fb79e7087ee765f SHA512 8fbb217256f73ea719d6b267940c2ff296e62c13f64836a0485051019c88475a4ec7800bda03d1e69e84e9bad96f8f1a9a6f8392cd3a2dea3bac4967721e58d2
+EBUILD keybinder-0.3.2-r300.ebuild 1056 BLAKE2B f2b2dd065cabbb6603a4d268875d59d4725fbab59a40c06865bf58fa785142ce02303016da2ca378a51c4b6970c378b77ccbde77e3015c80759cc9381620d2f3 SHA512 dfa866abf83e47ba266a1db43136321afab931afbab818fd54f70c0e4d98bd32af1475958814af1ba10f9b757b4a352394acf8ce0003bd58f38a3b2df6d31dd9
+MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
new file mode 100644
index 000000000000..4557421f67e1
--- /dev/null
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="A library for registering global keyboard shortcuts"
+HOMEPAGE="https://github.com/engla/keybinder"
+SRC_URI="https://github.com/engla/keybinder/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+introspection lua python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=x11-libs/gtk+-2.20:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	introspection? ( dev-libs/gobject-introspection )
+	lua? ( >=dev-lang/lua-5.1 )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygobject-2.15.3:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable python)
+	)
+	# upstream failed at AC_ARG_ENABLE
+	use lua || myconf+=( --disable-lua )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
new file mode 100644
index 000000000000..155449bb9eb1
--- /dev/null
+++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${PN}-3.0-${PV}
+DESCRIPTION="A library for registering global keyboard shortcuts"
+HOMEPAGE="https://github.com/engla/keybinder"
+SRC_URI="https://github.com/engla/keybinder/releases/download/${PN}-3.0-v${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+introspection"
+
+RDEPEND="x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	introspection? ( dev-libs/gobject-introspection )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	# remove old symlink as otherwise the files will be installed
+	# in the wrong directory
+	if [[ -h ${EROOT%/}/usr/share/gtk-doc/html/keybinder-3.0 ]]; then
+		rm "${EROOT%/}/usr/share/gtk-doc/html/keybinder-3.0" || die
+	fi
+}
diff --git a/dev-libs/keybinder/metadata.xml b/dev-libs/keybinder/metadata.xml
index 61950dc27134..c363c085d028 100644
--- a/dev-libs/keybinder/metadata.xml
+++ b/dev-libs/keybinder/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <remote-id type="github">engla/keybinder</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">engla/keybinder</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 2d646ac2f371..c47afe5d8b3a 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,11 +1,10 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 DIST leatherman-0.10.1.tar.gz 423218 BLAKE2B 1c0af89efda8d899a703d92b7cb7c56cf37b06e4f35b026f511edfd444072b8fbd4870fa144b565e3d171be5ea09b1af2a871f18b9dc5d884e546c96fa48a396 SHA512 bbbb772c855f5ce1e38abe7186400d9a2c9663dcdc72bd0a822bbe171eed3d01e33a6ec2196d4f6f8f0895f309d031b1eb77ec188bd16b37e52b306fafb66d17
 DIST leatherman-1.2.1.tar.gz 431781 BLAKE2B 0fecfd8f1cdee49548e7408664b78c3edbc76f39dca6abfff3f052dcdae0aaca32ad6197d5cbdce8630116b801c1a8e55d9915531769a3327bde1ea3b242a354 SHA512 f12414093d09b86878558cbe68f03b7f36fc89131412edad0573dbc891b1c422b98b9923babbed9ac4acef2cad869ef452d602199ae4d3e90fca5a3e2eb688d2
-DIST leatherman-1.2.2.tar.gz 434088 BLAKE2B 40ba4903f7bf0b9e07237291364b664ca84c74d8289a9065cd86833fd30e7f8309b1ef4d36514b5c2abfff45b287ca8d3eb60bae5ecb7e1579ca4d60eb866517 SHA512 1142a9be30efc8b1d52c9e38347dc39250c00c97c0cd7a299b63d6abb7140ec75c1fff0dc166b436ca6f4f82d7699869ea6988d807e8be8058a689841ac73b2a
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
+DIST leatherman-1.4.0.tar.gz 805151 BLAKE2B 38d5b895370997c91d2d1637ca23e3019bba97e27bc0aa0fb86cd931573c19a669c40ce8c9473c60b365b8474d75ec90b3e8dc2b0f1d488452cef4736668423d SHA512 dcc59928c4623ce0746e2583d4591ae5a9b0426f186ab4105a5a8156daf12d83901e496f2d7edf2a1b77c8087ad200fe90ec703081d65ecae0f999b12e53b0ca
 EBUILD leatherman-0.10.1.ebuild 981 BLAKE2B c4ba598588bb3b388e627a36f6401c596752a8683814283460e8ae1d5e575ede72d603859ac6c514c451f3f0f655fb3ed01f300f41bb8ce7cb3599c599cbd02f SHA512 1d6b8e7fe40dcd0188b246fd29ce34dcd70afdcb9260899f5bf662a7de9d517a05e40a7187091bba03f97b304c0cdcb8f493e478c3f0e5687edaf05c1467fe9f
 EBUILD leatherman-1.2.1.ebuild 1069 BLAKE2B 2415743c31d327115a44cd551902fa5f8a768a103074cec467b84e2e1f930d392b2e31d77f40f6037462e306b92079375d5c209508ea6744cc1b87be6497e38f SHA512 a16f251b7baa9bcd65dc45e31f744d0a00aba3bed5419825a9e538f7b611bb86820cdb24be67fa6fb996c31686f97bbc9f4ec7116e8cab5653c9773edda93636
-EBUILD leatherman-1.2.2.ebuild 1073 BLAKE2B 6e46f69dec2e46fbf4ca43a94376d00650c368dfca841b65ab7de9561fd71a4534a84186651920db1acb289fbe637a959813f6773ba23d6deb32844bbbbaab9a SHA512 046b94798a40ae31b7b95dc49b1d1502c4b86b0b6057455c25fffa191db120c980557972e3d1c8479a25b9284aa686564bb287e039ba42027916c79e239b4f8a
-EBUILD leatherman-1.3.0-r1.ebuild 1218 BLAKE2B 064bd32081b3207ce77a0b9a09c05abc702045857f80f1c3db468f4b05286398fff03556c5c1d33a247362752c8689c28dc8cf91814e4a31c6bc65308b6dacac SHA512 bed02b2319ea24a6f40cf374212ffe2b90c5e03f8992fbe2fc2d3734a4313f9718424836563afadb50c6089a919e7b7c935a44399edba4a4c82525385110e48f
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
+EBUILD leatherman-1.4.0.ebuild 1218 BLAKE2B 064bd32081b3207ce77a0b9a09c05abc702045857f80f1c3db468f4b05286398fff03556c5c1d33a247362752c8689c28dc8cf91814e4a31c6bc65308b6dacac SHA512 bed02b2319ea24a6f40cf374212ffe2b90c5e03f8992fbe2fc2d3734a4313f9718424836563afadb50c6089a919e7b7c935a44399edba4a4c82525385110e48f
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.2.2.ebuild b/dev-libs/leatherman/leatherman-1.2.2.ebuild
deleted file mode 100644
index c166cb33d18e..000000000000
--- a/dev-libs/leatherman/leatherman-1.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild b/dev-libs/leatherman/leatherman-1.4.0.ebuild
index dd10169b1741..dd10169b1741 100644
--- a/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.4.0.ebuild
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 7a0766cd6fcd..f14f1b4b2d5a 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,3 +1,3 @@
 DIST libburn-1.4.8.tar.gz 977757 BLAKE2B 2a59adbd104238857cd848cb76c2da3e5ea61112607832c42bba2c47999218bf87563fe2a3901370d2a8cbbfbe2a6dfb1615efc6be10f7ee52d7f822917504f4 SHA512 e02c08078313abb19108bb394741d4bde1c5098c1a200129940744e03078d8350b6ac951bf5523872a343b3f9b7a4954dda60a3336997f975abdee6dbae9b87c
-EBUILD libburn-1.4.8-r1.ebuild 877 BLAKE2B 2dadba49cdc0664d4b0b684f8e4165724d7cc5e5f6a2cc002b33823723078c3be55a7f178740e3244675416635c0cf93f3f6148997fc92cf48a44bbc16485895 SHA512 85be1316d0f4d7a291b8eef085e17396ee2b94c5cfaec0b0b982865ad473f2d2cecfdd73ddb86dd4f734f77ddf2a887076ca14bb12e9cceb29f74eca1e956ba0
-MISC metadata.xml 538 BLAKE2B a591dca3074f586f80aa758e7aa25ffbd9903641f46afe5fe851315d94c237e304d09771e30c179023500ccf4a06c4bc9222683543be4fca820205a55f0d0d00 SHA512 64ea37a1d2d40222bca80e2ebd8b2a63b3b5d6e879a9fd67651753f228e9ae4f38b505a387b5a885b12f44915a21bd2329d6922ce2a9b853910d47902326a9cc
+EBUILD libburn-1.4.8-r2.ebuild 824 BLAKE2B d7df406726778b3752cdf5af3468893f09c1afc329e75f36f84a6e774b8a8706bdc3abb90cfefd1256a42a6783b4e8f6a089bd0ddbf1d78cb5315237fd0df915 SHA512 7f6c91c2cf05430cc03bf90c114fe577d674eff13a17d3477532adcc4d368078681fd2d8474692fdc6ca66a99e562c8de11edf0b32690583303bbd27b6113836
+MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.4.8-r1.ebuild b/dev-libs/libburn/libburn-1.4.8-r2.ebuild
index 48b875561534..e18746798c9e 100644
--- a/dev-libs/libburn/libburn-1.4.8-r1.ebuild
+++ b/dev-libs/libburn/libburn-1.4.8-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs track-src-odirect"
+IUSE="debug static-libs"
 
 RDEPEND=""
 DEPEND="$RDEPEND
@@ -19,7 +19,6 @@ DEPEND="$RDEPEND
 src_configure() {
 	econf \
 	$(use_enable static-libs static) \
-	$(use_enable track-src-odirect) \
 	--disable-ldconfig-at-install \
 	$(use_enable debug)
 }
diff --git a/dev-libs/libburn/metadata.xml b/dev-libs/libburn/metadata.xml
index 5245cf4760a1..21fe2e58d3b3 100644
--- a/dev-libs/libburn/metadata.xml
+++ b/dev-libs/libburn/metadata.xml
@@ -9,8 +9,4 @@
 Libburn is an open-source library for reading, mastering and writing optical
 discs.
 </longdescription>
-<use>
-<flag name="track-src-odirect">Read track input with O_DIRECT (see man 2 open), 
-this may deliver a better write performance in some situations</flag>
-</use>
 </pkgmetadata>
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index cdd8f7346e4d..d5de0f6b43ed 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -5,10 +5,8 @@ AUX libical-2.0.0-libical.pc-icu-remove-full-paths.patch 1358 BLAKE2B 5f29ec8e53
 AUX libical-2.0.0-libical.pc-set-full-version.patch 629 BLAKE2B e7d17235c6993c1ad4ae446d36020849db14c534d517c0f6e48ac96af7e51a9e3285eb1d9cb9886101c38f88b65aafd985cf35099e140ee537468fa585e60bbb SHA512 a30127d93d1366d65e464c6d4ad08a42b9de142eac6e14a905cad3e0e094e6deafa689e8deaaa3bc8746adfc9667f8a6657088a2a1e0643035a5a3c2fbde173f
 AUX libical-2.0.0-tests.patch 1176 BLAKE2B 4e96464d103095452ef7be6ebaf5331a9bc51cc3e1f2aa3afd74326ce5809bc577e36299f0293f34348d6b65c404d995399bcf28e2809968c91253409f60bbbe SHA512 c818aed46b64c7ecd72356506ccc36508521040886d9049b2ac0c20f2943f26b5f3ef10d3850b164132a08545f1ea86852db3b4b9ac17f3e4b2f56398a7ed1fe
 AUX libical-3.0.1-pkgconfig-libdir.patch 1228 BLAKE2B 34bae335d1889d0090d02b72a61ea5fc90940210cccb2d09e3ef6a01464579f2fb6bf83b6e9dbcd35950227f0f1c830bbc0b77d1fe3eaa42fd649edfef4f3181 SHA512 556e3deadef8bbb210dbd3bf918aa9cbe0f8a1cfbbf8ecbeeff36a74f134cdebabad96f6ad05f6a1e2afcde669bb145bbea6ab83efa6f7b90b4637f7f761fa49
-DIST libical-1.0.1.tar.gz 720618 BLAKE2B 7506db93346c1104dbc6572d69e6de1f38730e906ec863badb38f4b7f635a175110f5eb1d9784e5baf74bc509bbf7875e5769ca3e47660012845cbbe6d92309e SHA512 efce88c73352fc34e9f7eda2234bdb593e917b33d1373cc6e6a21a72db1b14f2ed72976d6084dddcd8f07b08a15d5f04370bc825695d2fd40cc7b8488a7a977f
 DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
 DIST libical-3.0.1.tar.gz 865208 BLAKE2B c03fb922bbd8b86f30ab61c83ba81281ba42aee1f6655cc1b7b03af14afc77ca8b341a666f65d5ef8db771ec9e6242a987074ea98bdea1b4134885e9a529d808 SHA512 764e4f1bdb5f5b8c3e121057f475c7eca7acf5c514ac2c2527ae0ad93cd30a1c809a9e2107be2957247223f1f2936842999579c96ca19cd58b84571a29638091
-EBUILD libical-1.0.1.ebuild 1276 BLAKE2B 4190c6409f897dfe7755b1e81a11b1e3ca10fbf60cc62a9117f7ec23d0186f64235d0b8f831ff7c0de26490582eb4399050443ecece277e23fdbccb8948412eb SHA512 712364e9a0276b05cd98e6ca57fa974f653540da3e884a5ae3ce9d9d08e75910860396daf839a9dd086afbdf2cfbc8ef3bf16c5d0640828750cbd616ce5f8117
 EBUILD libical-2.0.0-r2.ebuild 1520 BLAKE2B 9ad414a45f931658615a4844fa2ff3aba21b94ba335c5fd9635c8cb4fed0c92a9ffdceadaac653e0ebe2ac92f589122dfdeafb1044a5733c17b6a795b37b8ded SHA512 2c4c9120e6ef37e9f5e71452cfb73c24354afc53b8abc8f5d43fc0f7357a91ff6041efa46fcf1e6ce6586fde3c80ce92b0c5518bf1116e95726197ffa8dee09a
 EBUILD libical-2.0.0-r3.ebuild 1711 BLAKE2B 584078e51c208ed6a8eb40b9ea56cb7d5f75cdc1f0940018fc0283a4a0b2e08b28ce1a7698743c2187dc3bc0b6fb8c0f1636b5c5f4e032028fe9c1da6a5ae008 SHA512 b694e2ea6b883b05803c9190304e3e3d49c081aa57e72b90f157cd8a2d3a522213fb53e19fb9f4c627decf0486a12f45f3eba3a2c2bdab5478a6c5b50415c2ec
 EBUILD libical-3.0.1.ebuild 1988 BLAKE2B ed29518f1db3fb3b12eb648c167e70e0a992f6f28a6edf55cf4cc5b54e1ad42d1448d22a33b64e2e252d656745bfa27b2cf8fbc15dea80fee15a9de3315c73c3 SHA512 1ec6ac8c38e99e1609e88337a4b4a4c9b60a1670abd0cf72dd08d0de06340e083a36b1361c05b281834886ca0ea25119dcedf03d8ad21de23b7f4d2bc83b7350
diff --git a/dev-libs/libical/libical-1.0.1.ebuild b/dev-libs/libical/libical-1.0.1.ebuild
deleted file mode 100644
index 610e4e22bee3..000000000000
--- a/dev-libs/libical/libical-1.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# FIGURE OUT: Why ebuild for 1.0 was marked || ( MPL-1.1 LGPL-2 ) against what COPYING file says?
-LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
-SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc examples introspection static-libs"
-
-RDEPEND="introspection? ( dev-libs/gobject-introspection )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-DOCS=(
-	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-src_configure() {
-	local mycmakeargs=( $(cmake-utils_use introspection GOBJECT_INTROSPECTION) )
-	use static-libs || mycmakeargs+=( -DSHARED_ONLY=ON )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -j1
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples; then
-		rm examples/Makefile* examples/CMakeLists.txt
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index bc166e09de21..c531b3b333f7 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,6 +1,8 @@
+DIST libinput-1.10.0.tar.xz 491444 BLAKE2B bd7f4a68cd1ebc981cb16f402c8ea6a7bd99d7bbf289fe07923400a5bf9e259b3726c5c1765d5e31fe09b95cf9eadc88769c578d6be0f2fee4c12455d44d6d70 SHA512 173f72f454c534dee755b6121c4577900ae9b8a129ac41de69410c3195950a6d149d6148892c4976f013eeabca66117d53fa67e352cc005960863a5576696928
 DIST libinput-1.7.3.tar.xz 922464 BLAKE2B fa38675905af55931676c22d9e4d56befbb055fba56ba13c61a1917050bc1eb62bcfe1d078b478047006d4c0d06d83186d0d6739cbf9dc49acce487ccb0b7e3a SHA512 2262dc56d213a4d3ea765e870af200e2c336a166baa1bbdf5205e3ce70faefc777429ba09563c5dd79feb5442f53abc84e04a0f32a06bb622d6e120bb8ad152b
 DIST libinput-1.8.3.tar.xz 941832 BLAKE2B cf6464d68387cca23d0f70eaceeec8b453c53f1cac22892722d48983788b43a136617c62ad39c8d435bbf07c0cb9cd720250ea91e31f10526acd5147b1d78237 SHA512 88006d217e3507858fa6b9ac1f25c267255fb51d1bcf1208d2afd423bf2a9292944bc5526ea91f27fad3ff04c2f9f43ab3aa25fd9fb7ace1231ecd33ddf18de6
 DIST libinput-1.9.4.tar.xz 472636 BLAKE2B 692a23047cb0b54d14763b34ce3ce1414101d0097dce10d237ec32a67f29c31cbf2928681084f7561e072e555c932f0e3bc54cfb0ecbcdd0d823426806e357b6 SHA512 302f9497ea9ffb2163c643e9ca2f0a773ea141f6fe0a3aa3d8e86eb11a5d11e75d858b1e679ebfd3f913c645beac059cfd356b37c4ea17a8853068f79a740a4b
+EBUILD libinput-1.10.0.ebuild 1444 BLAKE2B 9bbc30b14228ee7c70b5e66574664eb8b699413868a0ba0644d919a518b144400d79c82a6901b40d31fa9138696f72d57d4decca4afc42de6aa3dcbb5fe55d74 SHA512 201e65f2b68ce18f19d9b1656e8eb25bfc54821aea970eed17144ca8a6bbb85b3d205a49ecb515719d71482be3f926a178303f765710ed4e672ce48fbe62e0b7
 EBUILD libinput-1.7.3.ebuild 1535 BLAKE2B 6d99e610dda382651bed647c29ee8073d14879ec2fa83f22e724ff294018cecc78f16799802974aac29153924c15f922d42d188e9199eaee60a81282be840d0d SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c
 EBUILD libinput-1.8.3.ebuild 1544 BLAKE2B d2fe752951be5a015ec92f907c7cf5ac2739f35c51bafcf26e2381f3d22e8a14a6bc21c3697f02e0a0684c27dc1cd4379b5390d1df9b8a083b7405f7b31b2c5c SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a
 EBUILD libinput-1.9.4.ebuild 1441 BLAKE2B 8a836146a0e384130f4f6584064b68bbc92a72e96ce0f952287278510c3b227b2cc8b1539b274e662d62107a43ff5797493091ae94a74567acf26c0e9599d549 SHA512 a7d4aa9e144f2c08e201f01436e9bbd8f9eaf96d88b614117a79e96f71316b28b054871b4bea81d77151f410c0c115c4311151c1dff712d2e1fb37b2d010125d
diff --git a/dev-libs/libinput/libinput-1.10.0.ebuild b/dev-libs/libinput/libinput-1.10.0.ebuild
new file mode 100644
index 000000000000..44cea37f06a6
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.10.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		-Ddocumentation="$(usex doc true false)"
+		-Dlibwacom="$(usex input_devices_wacom true false)"
+		-Dtests="$(usex test true false)"
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/html/.
+	fi
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index d27cade1aad5..04bb4f50b1e7 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -1,11 +1,6 @@
 AUX continuum-1.0.18.patch 3086 BLAKE2B 4f5b004d0910be5a8f8bb9c568a2555c2b3f4ab71b52964622d66ef43a0ca2c7ee8e6e0e9128b7863a465bb887ac300a8cfc1f6efcdb740fdd88ed36cd465b75 SHA512 905c5f1dc22b665ef8910b6319b25e1d1e9dd80892c03c6c71de597599d8ce2972b35d92e6976ad8798d2f10927e3e884570246d5d8162e84dc3e1f963959012
 AUX debug-disable-enable-1.0.18.patch 1458 BLAKE2B ce806c34ab5525f8d493030ad870d9a7fb1b27d18159c6626d37c1540f0cb7aec6a9d45d17423dabebfde8fb68fdb6796cc88ff8fa109c9622958a2eef322ede SHA512 f4d731ce227e91324b88d155daaf35f2228a48e61d8e448c93f9d102c9939fa4c3b2a07b96741d442382cc5498358e9ae0471f766373654b21d849a96a42d813
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
-DIST libmemcached-1.0.14.tar.gz 1000929 BLAKE2B 6dfef0fa5714e6383514ff28d3eb75740f30f7adce4e4c0ea4c26a6667fc6cfa5df84e0c52b47393d156e9a8e5de0409699b47d77128a400f64f37b981977dbb SHA512 4c0371cc4752eeee94baad6063b2413f096b5050166ce761ac26080559537dab32b69131a97703fdebf8f4886520d4bc29c7d4d8d1df6d0d681c81b88354c15b
 DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
-EBUILD libmemcached-1.0.14.ebuild 1129 BLAKE2B 52871bd77e5f913ccd7d703d21187bdf165245ce30018aa7e3e825aa4fd68614fad5e7648428c2c6fc0f75e0bdda381d6914c2c81f221689790ad092fe93c0eb SHA512 52429bbb7c05fc095f7c9c90ef2e42dae52eecded96e60c3dfe91a86c6eed43b077123ce5a5e3519aca12219986a8f12032cb865be01f7d9aa8bede8b215019d
-EBUILD libmemcached-1.0.18-r1.ebuild 1516 BLAKE2B 3cc6f403c3f161fbb8cf24c5af5932eda7497447a9fa5590b581e345537c6ce5658516631fd90c6a6e02b3046817683423e9ffb42e13f61fc9ad75ba0782d112 SHA512 f604fd2df67d929f13b2a1813b881b96844f9bc97d2ae8324f52646d5a52abd3aa6647a76c7f7d2fa5d72652ca2ae0008da19257d7e26c9cd437fe044b9b2722
-EBUILD libmemcached-1.0.18-r2.ebuild 1536 BLAKE2B 2f5cc8f43e879896d16950028a76e91091bb370aa2ba889566caa3afaec127f49b5d618e62ebe94693f51782f6b7ad0e23e7d9ff4431d5b3fa00d31cc08a5a88 SHA512 ad63b8c6f385cb8660586b9fa4169b55a318af9b9f659f618917188d0b33672844937d2e79bc4c01d9a6c59a0d69abb0f7d3a3a906a369f56a5a2de5ad493879
 EBUILD libmemcached-1.0.18-r3.ebuild 1610 BLAKE2B d2080c57255f7d6527f5799a97e729adba6cedfa7f91156b883b1af0a6a89febbafc941e9124acb67da777c1cb0c94e69574781f3b8ab4d4b0097947296b7c5d SHA512 33ba4f396c80db7eac9a15b5b866ed4db844eb94b02bad995a1d772990d6f3f8b4cc465f4bfbbfd409a43ea6fe04bb649b1c7a3ec95da343e0bbf17a861c1276
-EBUILD libmemcached-1.0.18.ebuild 1452 BLAKE2B 2eae8ce042b00d87704e300c9773359555514e96104c6dd182b239c56024b10422f9c67f7e6f323defa3c688af1d59b6d2997ece4df9b3922c56a4811c71abff SHA512 16a92236938f4b9ccb6f2a7bfc75801f66e21a44c68789ebd9b28477d9b5ddc817745753608f9fd0649541a401c3efb71d7f5a5675ec4f16b9d3ada1108b1eee
 MISC metadata.xml 826 BLAKE2B a77184515934e8eb06a2f7b42a4e4354c998192d617a1a4a3e0e6fdad88a189cdf809779106e3157f4b9f46675a6ae6961ef5280bdefaa1794b7c146b89fdeef SHA512 5bc0caef489fb8a9c6c038aa2a5620cd43d700104ab77407391eb0961f12392ac8535efd5fbe86c1e6be17cb89d766049fe1394461fa652bcdc1abd64afb9962
diff --git a/dev-libs/libmemcached/libmemcached-1.0.14.ebuild b/dev-libs/libmemcached/libmemcached-1.0.14.ebuild
deleted file mode 100644
index e80ecae12f28..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent static-libs"
-
-DEPEND="net-misc/memcached
-	dev-libs/cyrus-sasl
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myconf
-	if use debug; then
-		myconf="--enable-debug --enable-assert"
-	fi
-	if use hsieh; then
-		myconf+=" --enable-hsieh_hash"
-	fi
-
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r1.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r1.ebuild
deleted file mode 100644
index 573767f416c1..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/debug-disable-enable-1.0.18.patch"
-	sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
-	sed -e "/_APPEND_COMPILE_FLAGS_ERROR(\[-fmudflapth\?\])/d" -i m4/ax_harden_compiler_flags.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r2.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r2.ebuild
deleted file mode 100644
index f5676b7b2a8d..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE=1.13
-
-inherit autotools eutils multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/debug-disable-enable-1.0.18.patch"
-	sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
-	sed -e "/_APPEND_COMPILE_FLAGS_ERROR(\[-fmudflapth\?\])/d" -i m4/ax_harden_compiler_flags.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18.ebuild
deleted file mode 100644
index 0bb1960dc4eb..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.18.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
-	sed -e "/_APPEND_COMPILE_FLAGS_ERROR(\[-fmudflapth\?\])/d" -i m4/ax_harden_compiler_flags.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 062ea8d4e136..58f437caa5d2 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,5 @@
-DIST pcre2-10.22.tar.bz2 1470620 BLAKE2B d968869db31cb9b0d93586227e6b44ecab57dea625108a386bf6bf8cb007c17f83e0b427744eaa6b4d6a1f6a7f344ee0aed29726bb51d077ff51889e68faf072 SHA512 dcf70b5e5b73f29188a56e4d9efb9afdf2b9ebe50e13a7640b80f543851235a289e476e1f517f49fac9628b456268bcdaf2b492237bc879ddff36f84ef4f32ea
-DIST pcre2-10.23.tar.bz2 1515314 BLAKE2B f5900bbd3dae401180299092751700840b628b6e1e766885436dd8bda1e22279a179e280994ef6c6c98bb2af1ec5002c283b2c2ad3ee0420c3acca814ca1742a SHA512 3e5910bd2405cc35934d91e4be760abe4f2e900202a20b6ba74adb7a3acb2b74b3bf9b0e97e8de10f8e8534133e0722e0bf0f5fb40d6c2c4520d1ed61749d456
 DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
-EBUILD libpcre2-10.22.ebuild 2320 BLAKE2B 21a1d2dee729733bb618c8febe31df823cc8058c2ee09dcb1bf79c82b332c6a9cd7051dff4586bf2f5f7cf9f94f051a6b988bdda2bd80051fcba6306052b2d98 SHA512 4763d6daea9bdd4bb8dff8f24e3b051366eb728cf9019097a344ecb3a497d6950f7e352c7fcfe240d6f596c8114f001d562f01f2da953b975b2f805f59c30a23
-EBUILD libpcre2-10.23.ebuild 2329 BLAKE2B af4214bdab9d05107951eee2f5ab079b08b7667ce492c534ed6e0b8b75d36418a64ff40f31b3af499994f0ab7ed58bcade42b48d610cb7f5a215df141793663c SHA512 9ac3202801afb4b8889c4ab8b767d283771caa77be01ffd3741918ee618107c37742ee3b4cd9abf4944b70cb8d1b459db6920abac55c18dcd4f3539a01ac8b31
+DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd3fbade148de34eda5371cc4d9c168f9e234f0d581626f3da85988ec8d46f76377b019459d3f6b044998e82426 SHA512 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967
 EBUILD libpcre2-10.30.ebuild 2339 BLAKE2B 5fd326ec1dc0c4a5d54db90621ae6b9f07c91c4fbb9bf956e446705166d52de87c695fdcffde61e7e8233b538593558ee11ed9db79f1cd7263203aec647def76 SHA512 47979b06fed1350f34305eddfe073a791f91da379a0f05dfd21338bd9131911106dcb0bc899d5a572ad15ee1ddff1aac772216dd6ce87e1f2738ffc79bcf9c34
+EBUILD libpcre2-10.31.ebuild 2348 BLAKE2B 501e61f76820a596b4975bd0654981ac89be8da15c44cfab69abea1b1489eae80079855577d89200ecd96714b7d6a2307c0662cca4ec12cefc6ac67e6cf89f0b SHA512 3f6d74efd53d8466b67c6743801d73d2bb80e78e6dbf47d916d23be086245750d0a778cc81f146fe4d5e24fad9bbed28a5690da29fb12c4cc28d555052a293eb
 MISC metadata.xml 1106 BLAKE2B 357dea3a03dcd1184cd5ac7c3fd79cb826d37410d27f06ad267e92c024bfc6fab891363894469e87bb8982d8c0a315320a20c22eb4877b3411b196a8b89c42e8 SHA512 8f2e0a7fd277da813c6aa00ff9ed9fe69443a6c738b2e66d09d5c5b4f6381110c1bab0a6b8be315f99f07254ae38c347aea4d50b54693bab3056c83830bec8cf
diff --git a/dev-libs/libpcre2/libpcre2-10.22.ebuild b/dev-libs/libpcre2/libpcre2-10.22.ebuild
deleted file mode 100644
index f4650a2dbfb8..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.22.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-MY_P="pcre2-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# Only the final releases are available here.
-	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-else
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
-fi
-
-LICENSE="BSD"
-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"
-IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
-REQUIRED_USE="?? ( libedit readline )"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
-
-S=${WORKDIR}/${MY_P}
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre2-config
-)
-
-src_prepare() {
-	default
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
-		$(multilib_native_use_enable bzip2 pcre2grep-libbz2) \
-		$(use_enable jit) $(use_enable jit pcre2grep-jit) \
-		$(use_enable pcre16 pcre2-16) \
-		$(use_enable pcre32 pcre2-32) \
-		$(multilib_native_use_enable libedit pcre2test-libedit) \
-		$(multilib_native_use_enable readline pcre2test-libreadline) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(multilib_native_use_enable zlib pcre2grep-libz) \
-		--enable-pcre2-8 \
-		--enable-shared \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
-		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-}
diff --git a/dev-libs/libpcre2/libpcre2-10.23.ebuild b/dev-libs/libpcre2/libpcre2-10.31.ebuild
index 226ebc4fece6..b3366003de68 100644
--- a/dev-libs/libpcre2/libpcre2-10.23.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils libtool flag-o-matic toolchain-funcs multilib-minimal
+inherit flag-o-matic libtool ltprune multilib-minimal toolchain-funcs
 
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/pcre2-config
@@ -43,20 +43,23 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
-		$(multilib_native_use_enable bzip2 pcre2grep-libbz2) \
-		$(use_enable jit) $(use_enable jit pcre2grep-jit) \
-		$(use_enable pcre16 pcre2-16) \
-		$(use_enable pcre32 pcre2-32) \
-		$(multilib_native_use_enable libedit pcre2test-libedit) \
-		$(multilib_native_use_enable readline pcre2test-libreadline) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(multilib_native_use_enable zlib pcre2grep-libz) \
-		--enable-pcre2-8 \
-		--enable-shared \
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 854c98c3b872..f6ba1f9c26d4 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -5,7 +5,7 @@ AUX newt-0.52.15-snack.patch 797 BLAKE2B 6335815f32ec21d81956f411822ad2dc9ca7dfc
 DIST newt-0.52.15.tar.gz 183171 BLAKE2B e6fac06b28232c81d683b9fe613f8c75660543a1e1f9f7583ce27e2fcf8208e2695e94c190757af8da443c0b1fa30546ce8dc77630ee88464377d563193f52d1 SHA512 f93798e8e9e33b4bc1bbb6039d94ccdf55be76a0e0f918eb32a241fe527ea61121a8fc35ccd699e3f6202eb367ba4b4025b30264bd9b0face7c16782f113051e
 DIST newt-0.52.18.tar.gz 180425 BLAKE2B 96c10d6eb63b62a51cd75f3cc34671954abd8e0c528972cb555422065dd074bab7360b226fcc4278caafafafb3b53c6eb2c395b83cc18c3fd02efcf053480311 SHA512 223b4fba9568d7ddddd9292f52d5e556a24403642d1dac97b58c8ede698bc182ce7d5afd31df2cb1c5b8a8850529b50ce71d8ad84856be8d42fad0f1a33a48f8
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
-EBUILD newt-0.52.15.ebuild 2027 BLAKE2B f22ddffed76c60a187bcbec5f205ef154552dd1e72472162170523d0b9c24c7dc8bea98df0c451aafa13c42af13ff66b80954605d51c3a305fa6cf8d274ddf53 SHA512 3936acacd773e0d4fca2052f5eb581bd8cbec14ece1f44c40c18a52b2b205398b1ccef7dfbe50cd6fe73bfdf2361ecbdc6e84756c89c43728081a6b14185d851
-EBUILD newt-0.52.18.ebuild 1964 BLAKE2B 3a4829fb3e98fab50ac83c0934ab7aae5b58550657d86157925fbcceaddfcf367794c1d9b3cf9e7385809d777ccb7e3454a0be959072308a7ad204c21b577bdb SHA512 55961c54ede0379f42530892d39b768ad0f794060234e91e1c4dcf6a0e100b2656ba6980ee1116818ad1f198255eea3901d719afca0119142238235f91c02f2f
-EBUILD newt-0.52.20.ebuild 2057 BLAKE2B 2bb087204b2c49b7455a518a2a2f97739fadd8e2b81057123880fbc52c4a91dbf8e51d31b22c45ee5230c71a48edb337d05cad90b929866234edcc436066d3c3 SHA512 2211421457be95520f448d5cc3dbec66c16e7540a4ca7dd0ac29cc120a0524e3974ac9ef1148cbabc5a4ae7cc1f6438f0d4ce85df53b928bc5728b27b2f5eee8
+EBUILD newt-0.52.15.ebuild 2009 BLAKE2B 60893c4f48b7e26939b65cca8f47047fb4d13558b363fc2ce7be362b77c9c3a2bbb0a833b15c3bd3a44e93a75f6bc3e8bcd2529aefd78e28c5ffc1b9dff2cf01 SHA512 342cc64da9f59c34785897b768e48687dc700e9f66c4bbf9ec0ddff1ef53eafd7cfd90971df67d2cf1c668712f793a75583ee61ae07d4dae5fbb44c2fa5c1d4f
+EBUILD newt-0.52.18.ebuild 1946 BLAKE2B c94b8d8ea555381f8a5561a983de9dedbba63eb36c76bfb7550351947f044ef4df7b3bb7316e213adda862a235ea816a5450fe1ec06a28f6f7e7689786327465 SHA512 8914e08dce91d768dead676763eccbe41ba6cea208d28348e80bf0b5e7bc5f1cb70f54c382f14642726ad64d2512edd661af18172e37577c2fb1176a76da5a30
+EBUILD newt-0.52.20.ebuild 2039 BLAKE2B 1ed4352d9265012f2c2a449a804b3a722a2dd11d10d966eb673e6cba6367d7942e611e8d67d12a266436d2b4649f131541ba82ccd5a8ef499c664af2ab23c2eb SHA512 1674fd43412df57dee87d1fbe9dd9914e1dc3afb14e6725ebfc2afd8a5dabd7f7dc64a0a23f4d3289f3f5636d02a86fc7c43d3b98c84c9c9c6eb31e68d9d5ccf
 MISC metadata.xml 220 BLAKE2B 11380346d91090dbb55d040eccb10aa6370a3c71cdecb1930d6a0ca0873d2d3d5c9edd704011e478f635e97c7b7aa4e03e485475e9d2d3acdd87a6545e86735a SHA512 92d5a05e3acc3e5910f8f0948c3cb31126a5aec7042421c0aed7b4721bd1fc83b819814a1772fe7ad0ddea4e0e9f485bae74cfea2c116dbca13994b05854da91
diff --git a/dev-libs/newt/newt-0.52.15.ebuild b/dev-libs/newt/newt-0.52.15.ebuild
index 669bd8c5e902..7ba8453d0433 100644
--- a/dev-libs/newt/newt-0.52.15.ebuild
+++ b/dev-libs/newt/newt-0.52.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-r1 eutils multilib autotools toolchain-funcs
 
 DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://fedorahosted.org/newt/"
-SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-libs/newt/newt-0.52.18.ebuild b/dev-libs/newt/newt-0.52.18.ebuild
index 5b8a6e093be6..bb64ecc2c13b 100644
--- a/dev-libs/newt/newt-0.52.18.ebuild
+++ b/dev-libs/newt/newt-0.52.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-r1 eutils multilib autotools toolchain-funcs
 
 DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://fedorahosted.org/newt/"
-SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
index c71f947af1b5..54af8897f8c8 100644
--- a/dev-libs/newt/newt-0.52.20.ebuild
+++ b/dev-libs/newt/newt-0.52.20.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
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit python-r1 multilib autotools toolchain-funcs
 
 DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://fedorahosted.org/newt/"
-SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 90a64b11ec51..9c30b29187de 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -15,8 +15,8 @@ DIST openssl-1.1.0g.tar.gz 5404748 BLAKE2B 23daf80e4143aad4654ae86f8e96042dd7328
 DIST openssl-1.1.0g_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
 DIST openssl-1.1.0g_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae
 DIST openssl-1.1.0g_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
-EBUILD openssl-0.9.8z_p8-r1.ebuild 5064 BLAKE2B 1dd5b2191321cc28d206e29305393cadcf0241340c09a5f1de3aa67567a3ad28f90640ab598355c521e1005e9ca4a3c6979943c225dfedac290be1ba90c153d8 SHA512 087d142686bd8a8af6a4eb9c387ea1c4283a6a9029749cb49d31382c780b8a9c18328193defe21db46bbc07e7dd892ca80ae547249e194bf34eb381bd3abaecd
-EBUILD openssl-0.9.8z_p8.ebuild 4985 BLAKE2B b8f63b012f266297638b3bd4a112a5122f80862b82cb497857e8444c5b98719228334cf47396d1604a4d85a3be0223204cb812eb1a2da52997f1acf457f0e558 SHA512 a2c58689aae6e12ec3f7e9d377aa9f5998c690efc8e53ec76609b2477da5e28fecc0ec89b8fefe4c83a281c333aa6d77e41de46fa44d449db66f1132318153ce
-EBUILD openssl-1.0.2n.ebuild 8024 BLAKE2B 5c05f34f02cd875e73a7ab83ce76feed1bedae7c794ac2159666b327e59475002ae872f92d06391cd5c637db39232a460c00fbd4df0a8dcb7cb2e10d0d732af3 SHA512 4e0d994a19a112223115e6d9768bb34fa753fc74354e97ad322603f3af209dea40b62f17c3aa5910813b75dcc2c0650a05bab285669c195f04b70a9d943f53a7
-EBUILD openssl-1.1.0g-r2.ebuild 9033 BLAKE2B e57575c188737b2d7cce7a238fb6e104d609ddb45c8ebc62d9652f7fc42c5609c574a46087e998877886241602841d57b1b82498fd017fc267d5d21161865e07 SHA512 e92e8ea7f41dae6ea6171af4559b0680d715fb783d1bd470a75d179eb8e2f8b2494a22cb41cdd93f286ee07d2ac0783684eff48cb2ccd5020f2839b73f811155
+EBUILD openssl-0.9.8z_p8-r1.ebuild 5067 BLAKE2B bbe98db5565577ca9bffa9224a8e1ac2903ec8fdadf23b2f59a8b82a7e71c2c4fb049abdd64ba00966ffbe037f7f9d396667ee61f548c6b4415ed9d055c49602 SHA512 c747f5f2dabd1705cb3dea9f22c5999dca4afab0623eae581137efbb537402cace75a76f3b7751809108fe00959e7b4d30475a6b9002291804149a78bb4e332b
+EBUILD openssl-0.9.8z_p8.ebuild 4990 BLAKE2B 58f2db31a50db3b2053a0d375eb40efbb78cd0f593f0ae2ea8a86c7d477385291e3b40407cefde9dd80e087ca9ef35bbd220e74762fb3d2a36834b3dec019ab0 SHA512 3d2236951d4fabdf29493d5dfe5a104aa32bbc938a003f3b46d793873da6cfb513408b321a96adc3f2b23630e7ef1aa84f61171024d6effdf72c9f57eff28282
+EBUILD openssl-1.0.2n.ebuild 8029 BLAKE2B 03b66a7d81e954f811b87314dd56bce86ba3e2dd4b15678d3a72ee40f03cf8d27fe70493c0727c640c96cf21dcab8b8a6a0f022af8505d68f49e6e024d2166c5 SHA512 0da731451be5903656e4035f7eb30b1565b0b5a9fe277e300e9272bc2bebcd97a1043a5e8ebcf62808f50e7a2f8c9433e15f4a6fa44aa86d5efee94fffce8a54
+EBUILD openssl-1.1.0g-r2.ebuild 9038 BLAKE2B 061620ab8e0d73643f8856cb4390727822902a98533d6c9a5f56b7f9cccfbd06c6ced2651a2f85de99f36ddb74848d4b93d88d31bf34a045d093a761bb277791 SHA512 27f444378cdf7fee91a79304ae71259e3956bdabd68daf3044c61416aea6976b61cc51f8436b5a3d7596a3fe7ea5804f5a728affe42ccd24dc07b2ac7a3747d9
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild b/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
index 7ec8a13fbd6c..f573e495c90e 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
 RESTRICT="!bindist? ( bindist )"
 
@@ -102,11 +102,11 @@ multilib_src_configure() {
 	tc-export CC AR RANLIB
 
 	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      5,724,428 03/03/2015    https://en.wikipedia.org/wiki/RC5
 
 	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
 	echoit() { echo "$@" ; "$@" ; }
diff --git a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
index 229fa4a52448..6ef3483361b9 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
@@ -97,11 +97,11 @@ multilib_src_configure() {
 	tc-export CC AR RANLIB
 
 	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      5,724,428 03/03/2015    https://en.wikipedia.org/wiki/RC5
 
 	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
 	echoit() { echo "$@" ; "$@" ; }
diff --git a/dev-libs/openssl/openssl-1.0.2n.ebuild b/dev-libs/openssl/openssl-1.0.2n.ebuild
index fc14a2ac5281..db4a0a8bd9d5 100644
--- a/dev-libs/openssl/openssl-1.0.2n.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2n.ebuild
@@ -101,11 +101,11 @@ multilib_src_configure() {
 	tc-export CC AR RANLIB RC
 
 	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
 
 	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
 	echoit() { echo "$@" ; "$@" ; }
diff --git a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild b/dev-libs/openssl/openssl-1.1.0g-r2.ebuild
index 9f2d149794a0..b782dea17bfb 100644
--- a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0g-r2.ebuild
@@ -144,11 +144,11 @@ multilib_src_configure() {
 	tc-export CC AR RANLIB RC
 
 	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
 
 	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
 	echoit() { echo "$@" ; "$@" ; }
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 8e43ba850bf5..5267ec41aa60 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -25,5 +25,5 @@ EBUILD protobuf-3.0.2.ebuild 3063 BLAKE2B c63eb054a4a792527a10946c512c1476907a69
 EBUILD protobuf-3.1.0.ebuild 3012 BLAKE2B 1ca83e01980372a2e6f2ac29500ece536162c64bace65414efd69c01d9484d9d76bdb93133c8b28f63bd982db074022c94c7cd1687ac9a2ff8339dcbb3c794c5 SHA512 673cb5e3ede77b7a68a1ff2c6e32fb0ebdb5b712b98253525be958a94272d340b885c6efc36c5066985667b70aae417f00f8fd7fd0816650968f10ea84e760a4
 EBUILD protobuf-3.3.0.ebuild 2923 BLAKE2B a8f3e9277cc151c971106d5285ebb1c5e6457f5ace09823c453d43cfe1197d8368ed9e6277fe29f51070098d7908689e83ed5bd99c4ac360bb7d9d59823aac3f SHA512 307008f8508679e1e54a86d4ca85547c24d5cddf4a5abbfd7835981a8194fd3d36e630eaa280847f727511211e2f9cbc532aeed8c9df6b934bd4f0b50ce341f1
 EBUILD protobuf-3.4.1.ebuild 2523 BLAKE2B a774fdcde73cd91848e3d9ce0a04af49d2716598d3437db4dad303653173aea1d0348a35e8676323d8e80c55c56423ad8e1d521ef335eb055ce83082cf03a1ea SHA512 61f7adaeb0b4c88aa3955ebeb4e703f007d1c98e04d6856becac21be0378af85dc18b60b3f8d36a5e7fb639f4a61f5c8f518c724544ce7bd2e5faed93c2e6980
-EBUILD protobuf-3.5.1.1.ebuild 2523 BLAKE2B f22c62ab48794fc46f99a897a04817a13d98f91dd2e16e497c077f5fea5591ed39ca90ec496ed192e4dcb01e8ac9098bc3ea3fe0393eef62e5558485b4edb666 SHA512 59d0dea4bdafbd016799032e488796af153ebe797ea026ce7bcd8c156cad78150684fe186c899ee2bf27e248d256b16c412faa87cb5eae213b7f1490581f8786
-MISC metadata.xml 699 BLAKE2B 02042acf0fc18dc044723e8e59da58130672739cbbf9fc71eeff6d791322e965d8b5073ae2b4dfa749a23b3eefc2335e3b67d49e2bc8b501127eed1ea0613b0c SHA512 998dced87b96dee7c49277a755c1fc835a5711fd6354f6494e7940c42d9eddbe031174d65286209e6700e02fc51b196971647a64f538e0149d7af73e6de0144b
+EBUILD protobuf-3.5.1.1.ebuild 2522 BLAKE2B a008887d07cc77e7215c29fde449cb67a3c2ea8698b82381974f60d222dad8be8899d094179cb593b3ab88ab17280923027979ed8b89e9e6179cde54e6a5c81e SHA512 b2a160433b36c0e95a4db220b3b8f57b83e608428b402b480e444320af745c3cfdcf3c17e0055fc24232e158c3b5ce335e50370e02bfb95fd7eef1918e3ed9b3
+MISC metadata.xml 829 BLAKE2B 1a70e376287941c20f9a1f28b62e803c2d30037760802fd3a177aefb67222667f400093d372aaa2dcfc2db7ea0dae29d5767b09faf7784ca7ac881a2a38db62e SHA512 2b24521cdf16246d189dae7c62b53ba8516efa61002b3639b6b864d09fe9cde8a892ec63abc57ea8285bd772d6c5da7b60a60f6be9293f8fa5f34111390853b3
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index 204584ce5e67..d242db0f825a 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -4,6 +4,10 @@
 <maintainer type="person">
 	<email>tomboy64@sina.cn</email>
 </maintainer>
+<maintainer type="person">
+	<email>arfrever.fta@gmail.com</email>
+	<name>Arfrever Frehtes Taifersar Arahesis</name>
+</maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
index d6f72fb6d95a..3f6acc71004a 100644
--- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest
index 38f929cc7454..cdba2dd0a8ea 100644
--- a/dev-libs/univalue/Manifest
+++ b/dev-libs/univalue/Manifest
@@ -1,3 +1,5 @@
 DIST univalue-1.0.2.tgz 14201 BLAKE2B 47a72a629bc3a0ff193c33d89c3a97e19abca833180473b0a37a6f5a4ba15b7886d1a605a905f7a94af2512e4d1e9f2a7879cae4c5a0af78ac9dfb23a0a581c7 SHA512 727096735dbad082741fb863c9066936a80d7337b1d7c4c289107d240b7f695756a8720f5db320f0c7521b523e299829bd49833b6a31969d8aa43267653a4f2f
+DIST univalue-1.0.3.tar.gz 16820 BLAKE2B 40dd6c4e08e8f4a27731aa0fd6931162f8427a709cc3fc16c049a093d17a08f002a6eb08cf3c4fa9870805f3eed7627c8c9baa7cdc6d6fc8970a085488a955b0 SHA512 1c8358baca82b44d7a762c0cb3b7bef6f36d2f3d0ab29045224c1c39b69fbcbb66573dfb9ee4705f71aadff542cc9f02e98921b1c013748e2c0cd63c386bc1df
 EBUILD univalue-1.0.2.ebuild 595 BLAKE2B f945bffcf5b8f07c272fe9ec247b39ab1eaf376e419832041d63b236a0a0cd47b57898daa6c445aa1f6c77aa0f91790726b10bccf3b715803c80f8d49770fa36 SHA512 2c1a589eb63205ee66fca0205b5977cf442b5e45df606f7898980faeae7ca6c3f37c3b3d095b6b1e272d29e10ebf66f2ba05689fbebdd98be1b6a41fe982b7b6
+EBUILD univalue-1.0.3.ebuild 611 BLAKE2B 5b04edd36949349c453c46ee2305307e131db0e0c99e112965c186da6ddf3fc92c6fbb66572eacf2cec431afeb2ff967b3802e4cf48fa5f857506e7aed8429e9 SHA512 df499ad6fe120c9facaa1c7b3493e923a8c9bbb683a3e4846093ebbf9c7f702c571b3bb0755a9604caf03fa70c016362ed4b871b556973e4f7873beb418359d3
 MISC metadata.xml 471 BLAKE2B df69918c0c8a76f7801782856f7f95fd5108153da22239012d4f333be6e099c70ddd560055eb8a1d806a72d9e37465816171e60771c1c94c3c67f0e1a55238dc SHA512 d64632af71d51e5aa814bd58fa773fbc877abe1e59774e18fefcfab2949f08d8cf4e0482fe5acefb2dea3e0873e7d269d950c09ae4b65cb474bdd8a3407b2e39
diff --git a/dev-libs/univalue/univalue-1.0.3.ebuild b/dev-libs/univalue/univalue-1.0.3.ebuild
new file mode 100644
index 000000000000..8e6fe5bdaf55
--- /dev/null
+++ b/dev-libs/univalue/univalue-1.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="C++ universal value object and JSON library"
+HOMEPAGE="https://github.com/jgarzik/univalue"
+SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 60e1a65f74d7..3e8a4a0adaf0 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,7 +1,9 @@
 DIST userspace-rcu-0.10.0.tar.bz2 483899 BLAKE2B 76f7da8290a702c7ab4ce37743be6514df6f0b8a69fc68a7ae65ae32a8d63192efcebe2fbf995d13b60b5e593d1818d6fb201ef914d0390e0209020590370a56 SHA512 e3e458510f97709431caf848b007465110057d6fba7b9e39162fbc8857fa18299e884f0e484302aa8a79ab6e6a941921db9a4adabd863c151c1b547b7276eab8
+DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f708a925bef0cfcc90553de7694a85e1562bb2256b0c8d8726b910363d12b3a67f963f5c0213141ea2a4ad8d2bcd23bf7b SHA512 2bb042e1cf8888eab664ea6e88b94646c995bea61c89d49dcf4e844d144329303c600d73e29e0f05c935ad8278857cc08fb5b4b9f7f0c2f120c46b458b51a211
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
 EBUILD userspace-rcu-0.10.0.ebuild 663 BLAKE2B 2d1ad36229c78b15bf3e9c738a383aa39c201329bf814e7e29d4726cd9828c6e9575e3af4ac02b5f54db3ba703a1f0aa46b90eb88028709299ed13bcb0285889 SHA512 2e945347710ff7f1459e33def817e4c4ce4e640bcb8f94726559534ce5f14aa45752bc6e169fdaeeefb491751743b30f744cd56dbc4a56fcaf1bff1c0227619d
+EBUILD userspace-rcu-0.10.1.ebuild 663 BLAKE2B 18005f9386b7a0faca02b10623716b078d3794a422a602dd6ef972b111a81a06d8d1152ce8c0e38b2aa56f92fff522d513cf4917cf96ca09e33864a38e38c88f SHA512 0975aa37fc6cf0d86ab995e3f2027be58f57a7d2232c5ad41e4b35afbf71c0865e4c849925e72d3abc95fd439758a3fde99d10a8301a0e2e408cd9f84957c544
 EBUILD userspace-rcu-0.9.1.ebuild 736 BLAKE2B 2254c2ca484cde4821753e7c2d8a2a5c8f71700d77068234f9215608104104f4eda13dd4d78e20222a5dec2295bd05b75dc9aaad733e8555e0bf57218079e330 SHA512 c6e0ddf946e8e07392545e52f2bad49d2da3637e800b77689112128374c6367d5efa6b9d44d6143b3f17a8d74cdcfb877f2922e6a112c0ee8bea834242af4818
 EBUILD userspace-rcu-0.9.2.ebuild 749 BLAKE2B b7782ed9c88695473c2bb23dd9025eca95aa54eec2109fb4f2574f39b985b86ac1c53f5728a0b224b628717556427ffcb78325cc07f6e2f079d2fe05da514827 SHA512 61c3e1d51f225d39c5e521016605c01a4cf6188344af5a71785dc71f0a6cf4c1108139e38f32a093898c76f547decc794c19dfe70367461445abbb5816b7a6ae
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
new file mode 100644
index 000000000000..0576c317633d
--- /dev/null
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="userspace RCU (read-copy-update) library"
+HOMEPAGE="http://lttng.org/urcu"
+SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="static-libs regression-test test"
+
+DEPEND="test? ( sys-process/time )"
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+	if use regression-test; then
+		emake -C tests/regression regtest
+	fi
+}
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index c14999379091..36424960f715 100644
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -1,4 +1,6 @@
-AUX zlog_no_werr.patch 498 BLAKE2B 74feb340ed353fdbd2069ee6cecabbaf0670f771a527584127c05f514c658743e44b505eabe9cbbed910d850d2bc7eb3f2e64ec5255a7404e959f1c8f5bda50c SHA512 a827b7927089016a012bba7d2012800687494c540df73ae6797162157d412019bbc3943fced8e2a1e4f29c5faf5c9a998406b75a335ccd8c2bebd21b14c29fd4
+AUX zlog-testsuite-flags.patch 599 BLAKE2B d94678371fb64eaf64d48c0d6980cde20bc9ccd3f0865a02c8f0374af553ff8db25601c5bd548e8f83bea1be80f8da2444669be621a4546710643c9d70e326ad SHA512 003c62b10274102dcec16c4064ff8cd93767bd34ac8c56e71cc07dec7d24a07e380341324f6d19141f43e6d8bffc3f4678a7b7ac493341e83bc237ab069ff164
+AUX zlog_no_werr.patch 497 BLAKE2B 506c3709043fa5d64475011dac251598d3d153bfdeb61947badc2d0937bbf62342370df3afba8e86a536ceb395376b311c7f5ea4f625ad24c2ef5b5c510492cd SHA512 5f5d343824a4d8ba02ce7e588b5e6a7aaf5465c1e76d1b26aa4f412d34d5a61d33a307d4d0521220267eaf883cb90ac382fb849fe406375f04c2a1ae9050c77f
 DIST zlog-v1.2.12.tar.gz 120048 BLAKE2B e9f48d8ee3e0bfc14674e96426f9343c27e0f666541b017a438800a6707bb158ca79f564e6cb10d953e4bff6dc839d76a3d3fc0f54c128bfb4b00e5fc86dbecf SHA512 4e1d773f33f9202702bb5e80f4dcc6f8ab28480a8515ad8b9562ee68703c065c2f18113124535c7163e240013ad121a6ce311a0fc04ac6c32971509ec33615ec
+EBUILD zlog-1.2.12-r1.ebuild 719 BLAKE2B e4f403206a4368f222208845079bc7ccb5ffb7f0cfe358797818afb96bb1754cf81ca714c63a0c300c36d04422870d835208d3ff153164b6c718cabdb5d1fc21 SHA512 9ec4eb07a9e20251fe1c92c938f72fc7ba7804cb7fcf0bb9e8b8aa9c4ed9c17824e15a46f17c319d465da2f1ee944f1abde035af6a1a8207bc74ab5e1a992b48
 EBUILD zlog-1.2.12.ebuild 625 BLAKE2B c6ae9a810dd1e34c941d93d12180a1c6e2a0a562a2cb173e2b6ca6bafc1a6def63fe36cb20afc824864c694d32b94cf52feec08469523344ecfbb47afba79571 SHA512 0bb1dd33dcf297c647c66da1f1d3bfab3574045ea5eba044f27a7972305769619ca2d6fdf8f9b1323de2c241c6f86b466b025535e99a89a1d383f8efd8196dbc
 MISC metadata.xml 343 BLAKE2B cacb9dd07a85e4fa26b7fa703ea340117be968590c91b6e243d34642a38e6af506cc9d6d39c48250ffd288fa8dce7296cd02d37b7d5620af4d8d1edc74806af9 SHA512 1332dbac3769edb28e8c4241821fe5977619ae93b7fe29c58759ed4305b1a28cd51dd4a4d74b4d7db086bf6383e2f771b0e79804434ccd5ff6353e0d1b8d0f61
diff --git a/dev-libs/zlog/files/zlog-testsuite-flags.patch b/dev-libs/zlog/files/zlog-testsuite-flags.patch
new file mode 100644
index 000000000000..4ce0a4b6d16c
--- /dev/null
+++ b/dev-libs/zlog/files/zlog-testsuite-flags.patch
@@ -0,0 +1,22 @@
+--- zlog-1.2.12.orig/test/makefile	2013-09-25 04:38:42.000000000 -0700
++++ zlog-1.2.12/test/makefile	2018-02-13 16:59:33.812131188 -0800
+@@ -1,3 +1,6 @@
++CFLAGS := -O2 -g
++CC := gcc
++
+ exe = 		\
+ 	test_tmp	\
+ 	test_buf	\
+@@ -24,10 +27,10 @@
+ all     :       $(exe)
+ 
+ $(exe)  :       %:%.o
+-	gcc -O2 -g -o $@ $^ -L../src -lzlog -lpthread -Wl,-rpath ../src
++	$(CC) $(CFLAGS) -o $@ $^ -L../src -lzlog -lpthread -Wl,-rpath ../src
+ 
+ .c.o	:
+-	gcc -O2 -g -Wall -D_GNU_SOURCE -o $@ -c $< -I. -I../src
++	$(CC) $(CLFAGS) -Wall -D_GNU_SOURCE -o $@ -c $< -I. -I../src
+ 
+ clean	:
+ 	rm -f press.log* *.o $(exe)
diff --git a/dev-libs/zlog/files/zlog_no_werr.patch b/dev-libs/zlog/files/zlog_no_werr.patch
index 6cb2e8708672..b01325db09d0 100644
--- a/dev-libs/zlog/files/zlog_no_werr.patch
+++ b/dev-libs/zlog/files/zlog_no_werr.patch
@@ -1,5 +1,5 @@
---- src/makefile.orig	2016-08-11 10:40:49.466873499 +0200
-+++ src/makefile	2016-08-11 10:40:59.626762850 +0200
+--- a/src/makefile	2016-08-11 10:40:49.466873499 +0200
++++ b/src/makefile	2016-08-11 10:40:59.626762850 +0200
 @@ -32,7 +32,7 @@
  # Fallback to gcc when $CC is not in $PATH.
  CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
diff --git a/dev-libs/zlog/zlog-1.2.12-r1.ebuild b/dev-libs/zlog/zlog-1.2.12-r1.ebuild
new file mode 100644
index 000000000000..cd97f558f0b0
--- /dev/null
+++ b/dev-libs/zlog/zlog-1.2.12-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A reliable, thread safe, clear-model, pure C logging library."
+HOMEPAGE="http://hardysimpson.github.io/zlog/"
+SRC_URI="https://github.com/HardySimpson/${PN}/archive/${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PATCHES=(
+	"${FILESDIR}/zlog_no_werr.patch"
+	"${FILESDIR}/zlog-testsuite-flags.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_test () {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test || die "Tests failed."
+}
+
+src_install() {
+	emake LIBRARY_PATH="$(get_libdir)" PREFIX="${D}/usr" install
+}