gentoo resync : 29.08.2018

38 files changed, 507 insertions, 124 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 694e12d05bd1..0ca132973e32 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index e60296adf0fa..35c6959dd722 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -2,6 +2,7 @@ AUX apr-1.5.0-cross-types.patch 1969 BLAKE2B 1ded46da99aae4a225eef6c6c4e7ec8b27b
 AUX apr-1.5.0-libtool.patch 514 BLAKE2B b9d33d1317293c7614a3f0f753e466c7f8acf0792ee5776c68ec9abcacc74d6c55fbd50a3996b06655635ff10e110fa2a8277eb343251dbf6229f8212f481e41 SHA512 e8c2a7a2b5c8171a0d2c8920e053bd861e4fb2044428cb3f6ffc9ccea05694c20b879411f86b967c4269918b5740b1450ecb0e720d74ea0fe9ac305f58ee88d5
 AUX apr-1.5.0-mint.patch 872 BLAKE2B dda2941cbed87117a8a6c488bd8045894686aef0ba219ff489f67dd03b58fb07a05f9e67c54cdff330c65e579c41c992446a465104661bbacbb2525a5b9518eb SHA512 ba71f17ef9f61a8379139f05ca17eb583ad34cbc3ebf5c4f59d011662db6b5c963da5c466c093c3eb98372299d8f202d927a05b52cc7515270ac52fe44ec6daf
 AUX apr-1.5.0-sysroot.patch 1309 BLAKE2B de3dc13a44a9d5071c249875322b7d6be9ed765176f8232b96a5e5088c5764dff8b810377b214999b59380522fdc9d0577217fe1acff5a7ab4b17461d6daf909 SHA512 48609c522225b47df96039174dafa043f77ce5b91f464b14250dd2b30590d6685c9baa03d4ca34937532c26afea8d208fb78158dfc8026a606ff90543b5c8d5d
+AUX apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch 567 BLAKE2B 7a41d3aeb1e69af2a90bc55ac5aeb1e8395c5b0f6ff569f65f88de15c29c1df794415526b1ef13ca2deedfe48f8801e93b2eca655086518d9cd7bc5159252d1a SHA512 d2c4e0fbd9d4b909669820c30642c34de51b87edfc746875c0743430a7cc2599b68a037a6146f9c0f49d8e78844617c392819367636e2b6175bd919fce5ec5a8
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3 SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 DIST apr-1.6.2.tar.bz2 853363 BLAKE2B 99ff559a5a974c1cd116dbaa65a03c731ed8cdb4393c395b66daee3d6217f17ff1c895dc1cba498b0244f32b8b00dccc76f2d84a5b3dde053458e7557753e446 SHA512 20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a
@@ -9,5 +10,6 @@ DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f14
 EBUILD apr-1.5.2.ebuild 4088 BLAKE2B 42d181fe7480bffff9577aff115731ac62e70513ee49fe459db6d82ac62431ac2323c698d139285449defe377c7fd90c586342773fb05722003cd4075807f165 SHA512 1675f275f3c37a3141f73434ec17ba6841f153c6a12edc20997f9cf5da462126cdc77d5ff7a625b0a3c9ef8e08480163c6b004ccd374d8e96f6a2a19df1fc775
 EBUILD apr-1.6.2.ebuild 4079 BLAKE2B 0760c6a464e2ba6006a815d335aeb37a8319b6513252d113c65713417cbad361a892d1da65d63eeff7341881724f5790273b326116927e1c70acac8aa054c0e0 SHA512 b0d0cd2ae97fb8d3622d891385f17a2b2098b55278563880d4062f0014ea1831478cbd9363c898431a3073d7340332c3406e55c08eb075752865b021b63d29c6
 EBUILD apr-1.6.3-r1.ebuild 4125 BLAKE2B 554bcdbfb44ade141ca48850d4c62bda067feb802b03f38d1a8b6d46a8f20fed1cf9e3498c54dee16e18bee1ad62df6687ef4839b1c6f5f92fea783a6d2b63a9 SHA512 8b53c6e0b587f63b75cd31099fdadeb4e410a1d825dd681ad0e3f9553a58c02dd1eb3dca47cacd580a925a46e9273c294d1e40f6a5b748d420b38f3e19e53fda
+EBUILD apr-1.6.3-r2.ebuild 4271 BLAKE2B 57587f147574e6898f5996bd8322561ef072975ce258ac4d6791a41a5a961b816164eba98a8d563185a8f3b193ab6314208aae3bec5cfabe17b5e5a149545574 SHA512 cd39d77617d53364bb0cd3a586760b983016f5c14fe0eb63be16ef95e0f4b690e2a022818965ec1fa9f8d12ba77843717746db8b7bec6e6a71ed8c638602c633
 EBUILD apr-1.6.3.ebuild 4079 BLAKE2B 0760c6a464e2ba6006a815d335aeb37a8319b6513252d113c65713417cbad361a892d1da65d63eeff7341881724f5790273b326116927e1c70acac8aa054c0e0 SHA512 b0d0cd2ae97fb8d3622d891385f17a2b2098b55278563880d4062f0014ea1831478cbd9363c898431a3073d7340332c3406e55c08eb075752865b021b63d29c6
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.6.3-r2.ebuild b/dev-libs/apr/apr-1.6.3-r2.ebuild
new file mode 100644
index 000000000000..a874140ae17b
--- /dev/null
+++ b/dev-libs/apr/apr-1.6.3-r2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool ltprune multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
+
+CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-apache )"
+DEPEND="${CDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-mint.patch
+	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
+	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+	"${FILESDIR}"/${PN}-1.6.3-fix-overflow-check-in-overflow_strfsize.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+	)
+
+	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, $PN detects this.
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
+
+	if [[ ${CHOST} == *-solaris2.10 ]]; then
+		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+		*atomic_cas_ptr*) ;;
+		*)
+			elog "You do not have Solaris Patch ID "$(
+				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
+			)" (Problem 4954703) installed on your host ($(hostname)),"
+			elog "using generic atomic operations instead."
+			myconf+=( --disable-nonportable-atomics )
+			;;
+		esac
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_test() {
+	# Building tests in parallel is broken
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	# Prallel install breaks since apr-1.5.1
+	#make -j1 DESTDIR="${D}" install || die
+
+	prune_libtool_files --all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
+}
diff --git a/dev-libs/apr/files/apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch b/dev-libs/apr/files/apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch
new file mode 100644
index 000000000000..d6e1f54fc074
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch
@@ -0,0 +1,21 @@
+https://bz.apache.org/bugzilla/show_bug.cgi?id=62056
+
+--- apr-1.6.3.orig/test/teststr.c
++++ apr-1.6.3.orig/test/teststr.c
+@@ -307,10 +307,15 @@ 
+     for (; off < 999999999; off += 999) {
+         apr_strfsize(off, buf);
+     }
+-    for (off = 1; off < LONG_MAX && off > 0; off *= 2) {
++
++    off = 1;
++    while (1) {
+         apr_strfsize(off, buf);
+         apr_strfsize(off + 1, buf);
+         apr_strfsize(off - 1, buf);
++        if (off > LONG_MAX / 2)
++            break;
++        off *= 2;
+     }
+ 
+     ABTS_ASSERT(tc, "strfsize overflowed", buf[5] == '$');
diff --git a/dev-libs/bcm2835/Manifest b/dev-libs/bcm2835/Manifest
index b41404fcfbdf..d644ef33b08a 100644
--- a/dev-libs/bcm2835/Manifest
+++ b/dev-libs/bcm2835/Manifest
@@ -1,5 +1,5 @@
-DIST bcm2835-1.46.tar.gz 251302 BLAKE2B 750c39ff30006bba26808e9b3bea3d4b33fc93b479dc5b515ae664ed03353903e7c06d86a642a69432233e0d3d4a4f40abc397974b4c7635106fb36b1a3400d3 SHA512 32a6c7ee2a023a3d0bb0a6863b15d1e708414b10baae591bd98ce6e9a71e88e39b9c84bbb9a1017f4ed7e3f71879fe54d50d2099b444165997bf304345795b30
 DIST bcm2835-1.52.tar.gz 258007 BLAKE2B b681617352ee0239c9c4effb5a5e161b2c409514d08e0d60d35e9bb58126f2a00bb9ab1a7f767db4c68a28eab4432f1f8908d5a4372b5b1c05f6f979f27c036d SHA512 5a6c608ed10169b0bcf9dab91dc0193b9fd16814c5c6bb18ea242b36ac803e56c49147721ed48c83ff72892683be6032f2e85bcc76dae523e5d79a5ae52f5154
-EBUILD bcm2835-1.46.ebuild 539 BLAKE2B 6ad94e89fb95e5bb77bbc059bb23c1649ef7c975aeb255b8873917a5bf52a36bde6cc911b129c4d5fe994872b4eef1c85f7d3ce05840de170c6407c1efc6923b SHA512 f92c4363e346045d461aa56fef6145e23b1fe192df33c6b59df4778bb96c1c7d94aa43e05a7dd203941981eaacd16709d43235bf3121c30f6623e91b0d6c08b4
+DIST bcm2835-1.57.tar.gz 262233 BLAKE2B 618a6089f773b874905ba8341eb42b6751355dc8607c51957b6020a0d484734ef5ea4e49a6086ba25cc820c57cb077f292654fdc4eeb1b293746f9cbb83ca462 SHA512 0af59c22869511465a9fdcc384d7456f04bec06a1480e0575b7756628f0ecc72648974a9ace7a46df257b0fd45a117c89c430c3e97d214081d038cbaef398821
 EBUILD bcm2835-1.52.ebuild 579 BLAKE2B 74dc8492eef09b9994152a565eb2169028aece2a11a7d771b6b856d4b1eedff3f5e419ddd6c50be72e61d6b22b5abbd21dbb85c0ab46f387d6cf8f98a6996ac8 SHA512 1d24a860e1051ab855133d7b17f1ebb590b91aaf03078e69dded8c8d51f90c8f9ca66002470081a54d7b7bc4732078845fa04c84186aa8d7ee20c14c30bb5a4e
+EBUILD bcm2835-1.57.ebuild 579 BLAKE2B c3c00db822c408dedadf639f05e12bb49b1a935083678f84c4f16a71e42ac9184d934f0c9c38b22078cff55055ac5b1d3b2ab2f77d1e8ee50a0761efa317d772 SHA512 8cd5eb782fd264cf3c2354e7212f1e55196b531c606cf58affb99160de5aeb03b732179d322f5b70f6b24bb702d5bed78f47cf0e0468ac164431235062b3d987
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/dev-libs/bcm2835/bcm2835-1.46.ebuild b/dev-libs/bcm2835/bcm2835-1.57.ebuild
index fbdb2b15b36d..e81b5e6bba57 100644
--- a/dev-libs/bcm2835/bcm2835-1.46.ebuild
+++ b/dev-libs/bcm2835/bcm2835-1.57.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 
 DESCRIPTION="Provides access to GPIO and other IO functions on the Broadcom BCM2835"
 HOMEPAGE="http://www.airspayce.com/mikem/bcm2835/"
@@ -16,11 +16,10 @@ DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
 
 src_install() {
-	default
+	use doc && HTML_DOCS=( doc/html/. )
 	if use examples; then
 		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
-	if use doc; then
-		dohtml -r doc/html/.
-	fi
+	default
 }
diff --git a/dev-libs/cppcodec/Manifest b/dev-libs/cppcodec/Manifest
index 56c76769aa81..57f52147bbcb 100644
--- a/dev-libs/cppcodec/Manifest
+++ b/dev-libs/cppcodec/Manifest
@@ -1,4 +1,6 @@
 DIST cppcodec-0.1.tar.gz 26932 BLAKE2B abfe4aa3126d5900f806682c6ecb60d3cab5eb41e21d68c3f0c55d011c528304be9d286e48c6dac7bd3edea9e519609091053b6aeb2ab85818837b10499b24ae SHA512 8b406755b3d9457e4e265f76abcb7a18daa4566ec9b56ac3a01b44fd62062eef8d91806e0009ce26ade92a35c5c0488eeaf7db695479a2013f8549ac5fa8626f
-EBUILD cppcodec-0.1.ebuild 801 BLAKE2B 2f19fe2f5ebb180ee2dbed5a5532354282618446024e6f49c4dc57be8d8b69667634c7ee503c12ce4a7ee6d10bf75773f5bb722d8eff903d958477614f177a83 SHA512 b4a2eff015e31d0846d7031c4b9cbe79807571a2d77774d4f90dcb6eeaf573339874bd70d178da74c14a710465108ec8b9f14c4210951dc0eceb472929690f33
-EBUILD cppcodec-9999.ebuild 801 BLAKE2B 2f19fe2f5ebb180ee2dbed5a5532354282618446024e6f49c4dc57be8d8b69667634c7ee503c12ce4a7ee6d10bf75773f5bb722d8eff903d958477614f177a83 SHA512 b4a2eff015e31d0846d7031c4b9cbe79807571a2d77774d4f90dcb6eeaf573339874bd70d178da74c14a710465108ec8b9f14c4210951dc0eceb472929690f33
+DIST cppcodec-0.2.tar.gz 33984 BLAKE2B 248487326d3fafb104d469d16cddab86fe63dec6eecb74af6211c262a42ff8806ee97619459f9dca648107748e30268206e84d64efba47a9ea1c398eb4c06919 SHA512 50c9c81cdb12560c87e513e1fd22c1ad24ea37b7d20a0e3044d43fb887f4c6494c69468e4d0811cd2fc1ae8fdb01b01cfb9f3cfdd8611d4bb0221cbd38cbead3
+EBUILD cppcodec-0.1.ebuild 799 BLAKE2B da02aaae5e7e3739b9fd830f84ddf9992988fe12bfbaccf1c7e9c588cd10aa65874a77dfdf2361a19329600705ec324a4ce6580d09b1fe70ffd768ca500b7193 SHA512 2f97f12995dc3c8a03d622c6adbc0661ef23281d7015afe8fc4a448c662e0fe7760b982a9b8a854ad8b749a08d2ab3557791b1d2f0df2ae76a7bfd8ee4c363c9
+EBUILD cppcodec-0.2.ebuild 799 BLAKE2B 8519df7d0bc4bab63102556abad7193c302c8c07efbd4af50778901665e8ad31782d99fa5309ff022eba3cdd7617a6d4744d62635a260bc04e1f2fb84e3c2ee9 SHA512 d48e6cae20416b2ee356bd75f7f74ddf26b6c7110248654b485b9ae6da6cf4f51835b854d51426c4f9530c0694c1c275f3ae942b25e471b212405269dd2f8081
+EBUILD cppcodec-9999.ebuild 799 BLAKE2B da02aaae5e7e3739b9fd830f84ddf9992988fe12bfbaccf1c7e9c588cd10aa65874a77dfdf2361a19329600705ec324a4ce6580d09b1fe70ffd768ca500b7193 SHA512 2f97f12995dc3c8a03d622c6adbc0661ef23281d7015afe8fc4a448c662e0fe7760b982a9b8a854ad8b749a08d2ab3557791b1d2f0df2ae76a7bfd8ee4c363c9
 MISC metadata.xml 385 BLAKE2B b2d35f81b4df3fc6de6d0be3bb253131817980e55fb6b4e1f43c06ec07fb6bd4b6d102248873dd4b8831aa05139879a05953f0f6efccea05a1bb00e8cf5a94b1 SHA512 195de9b1b75f92cc00a943e8dcbda580d7994c0a94947fa964b46ab4ad979ffd85d6658d59908aafe8f265241bfb322eac1ec6586e403246c3eaedf7b2799c11
diff --git a/dev-libs/cppcodec/cppcodec-0.1.ebuild b/dev-libs/cppcodec/cppcodec-0.1.ebuild
index 7a7f9e55ed60..8fd88d739a88 100644
--- a/dev-libs/cppcodec/cppcodec-0.1.ebuild
+++ b/dev-libs/cppcodec/cppcodec-0.1.ebuild
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="GPL-3"
+LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/cppcodec/cppcodec-0.2.ebuild b/dev-libs/cppcodec/cppcodec-0.2.ebuild
new file mode 100644
index 000000000000..fe7a12a7e61f
--- /dev/null
+++ b/dev-libs/cppcodec/cppcodec-0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils
+
+DESCRIPTION="C++11 library to encode/decode base64, base64url, base32, base32hex and hex"
+HOMEPAGE="https://github.com/tplgy/cppcodec"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tplgy/cppcodec.git"
+
+	# Disable pulling in catch
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/tplgy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		virtual/pkgconfig
+		>=dev-cpp/catch-2.3.0
+	)"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/cppcodec/cppcodec-9999.ebuild b/dev-libs/cppcodec/cppcodec-9999.ebuild
index 7a7f9e55ed60..8fd88d739a88 100644
--- a/dev-libs/cppcodec/cppcodec-9999.ebuild
+++ b/dev-libs/cppcodec/cppcodec-9999.ebuild
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="GPL-3"
+LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index b1ecb86b6df3..4192ee599e15 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,6 @@
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
 DIST libpeas-1.20.0.tar.xz 557872 BLAKE2B c10cd85ff6f15f2124541aba3b437e3216322647e36f93a2202df14aebda7c35896a5f77a40ddcd5a5f0300df11c274334cc3a8dfba3fe2745e0b364cb7eac4c SHA512 b3ddebf65e1a76493b5cd5150f60c13597c90398eea16c002e51d25449a595f7591bd0ccd1214ca3a8cbce724eb10f38a316e8c95092442034c048bc95cfdbf4
+DIST libpeas-1.22.0.tar.xz 561332 BLAKE2B 219918f8663cd60c9353f477ef905ce0d1e21bf5b7c09661c4cb3c8adbba3af9f5e93b9de8a1b098dab09b1f4071854a871c8ea1db878bda8fe9e51aa45e5f87 SHA512 9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91
 EBUILD libpeas-1.20.0-r1.ebuild 2194 BLAKE2B a03b68170871a7e76c8388b4bd2d40f4445c5c4dcae3b98973d95bf7986df94cc3663b4f966f629bb13fb22426c1c3a4703e6b0dba1b4a8edd4655331e6391bb SHA512 bdc2c00a5cbf017d4350d53e3036608eb29b8066478f85cec4ff3a3ce77f8e023211eab919f2956d59d88c6828e947fb6560841ad0806fd270e01169ab8d0868
+EBUILD libpeas-1.22.0.ebuild 2196 BLAKE2B 2bb01f72b8310096a7ed5e8bca2897e8b9ccf5bb7f274b59dc53bde0fedc87ae73bac4a6468465bc4dcfee18f2bdb8b1785ed68628d42528ad2236ccc30ae4ab SHA512 d284b413a68ae347349a341e4ae0257f38417d592b46d9ba6e6d1aa8a5d953f7fd860d51ff0836c8c9604c998430b358c913de44a315a0e6bb3eec94c83e190c
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0.ebuild
new file mode 100644
index 000000000000..8d8c434cf020
--- /dev/null
+++ b/dev-libs/libpeas/libpeas-1.22.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+
+inherit autotools eutils gnome2 multilib python-single-r1 virtualx
+
+DESCRIPTION="A GObject plugins library"
+HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="+gtk glade lua luajit +python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-1.39:=
+	glade? ( >=dev-util/glade-3.9.1:3.10 )
+	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
+	lua? (
+		>=dev-lua/lgi-0.9.0
+		luajit? ( >=dev-lang/luajit-2:2 )
+		!luajit? ( =dev-lang/lua-5.1*:0 ) )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs gobject-introspection-common, gnome-common
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Gentoo uses unversioned lua - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
+	eapply "${FILESDIR}"/${PN}-1.14.0-lua.pc.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
+	# What do we do about gdb, valgrind, gcov, etc?
+	local myconf=(
+		$(use_enable glade glade-catalog)
+		$(use_enable gtk)
+		--disable-static
+
+		# py2 not supported anymore
+		--disable-python2
+		$(use_enable python python3)
+
+		# lua
+		$(use_enable lua lua5.1)
+		$(use_enable $(usex luajit lua luajit) luajit)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_test() {
+	# This looks fixed since 1.18.0:
+	#
+	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
+	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
+	# To reproduce:
+	# >>> from gi.repository import Gtk
+	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
+	# This should return True, it returns False for Xvfb
+	virtx emake check
+}
diff --git a/dev-libs/librevenge/Manifest b/dev-libs/librevenge/Manifest
index 79041b4bc26f..c4100b2c3657 100644
--- a/dev-libs/librevenge/Manifest
+++ b/dev-libs/librevenge/Manifest
@@ -1,4 +1,4 @@
 DIST librevenge-0.0.4.tar.xz 421604 BLAKE2B 414674e4313f3062dac20a1ad7f1cf1c0a1681bb486f4edef109558fa70aaf8ee407fec8dfa93014db8c8746804e0a2bfec9636d75066b93d84e9bcbdc3f4dc4 SHA512 c4c2c98bac3522c8bd487058f4db19d85ad0d99159c4de4ffde91a10ea3adb7f995ebe8ccf6afcf533d81f50fb654bf265b9cd197508f85b5b68a101ca279712
-EBUILD librevenge-0.0.4-r1.ebuild 1111 BLAKE2B 699b148da3e63fa2e57c94217db510800e04aeecb33908b0b1b9f0c2f5e3a3243653e7308f1a0693cd3d6ee5ae58846324ad4638e806ddf95a2907b65a409862 SHA512 31d1e544d2b8cb0b8eda384c495a352bfefcf8dfc0744b70f6c40b646bcc95036e73aeae24274fe386a8216b0238a8b305d8b992ff9ae5e9c414f7e1c3792f53
+EBUILD librevenge-0.0.4-r1.ebuild 1118 BLAKE2B 3ea9ac17fe74e397607fd0bd8e1e54c45d639be430fe461fae03f46bee668f04a68b06bd41a9e59bee768a68cca3ecf8d5fb294d32ceb00a6f94f70cd1f05954 SHA512 781a27f8b5efd6ff3769e2a443e61a524dd59ccafbbf8a584a044521114ec31483722d2bca7cfa4eaf54a9cace3d3c7ee7be046547c459540ccdc29dbc5acebf
 EBUILD librevenge-9999.ebuild 1091 BLAKE2B f28e2ff7db9f1f741ee729f037799c432981e6acc86c67b57c8bce5a1c33343dcd0cd956ae79417491f873625b956a398bb095fda34e145a8debb3c0094a2c85 SHA512 5920bee7ae22c3ab194c19a9dad9194358577431c1ea40049a28356ceb51429374b7b6d855ae0e3c44fbaab3239c986337c6e525bb0a01334cce4017d01f269f
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
index 41207196a523..fa647a541612 100644
--- a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 fi
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 59a32984c8d6..b578f72309be 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -5,5 +5,5 @@ DIST libwacom-0.30.tar.gz 119261 BLAKE2B 4f76fcbed42c5453701e3b5dda880a26f9956a8
 EBUILD libwacom-0.24.ebuild 1079 BLAKE2B 63e046663de6133c9396f23da3971620024de275e918749e5cfd39e314515fe9b06c3c6964950d363df03d2225326a93baf9847c061bffaf188245dbe3f21df3 SHA512 b538779a85fec5a6b63ae0e0269c96e84fc74e1bb8a651a637eedeb57dee1195d2e12dbf165f030b88a5f1ff3b47e2632c0b1b901812850a41cb5f585923ef37
 EBUILD libwacom-0.25.ebuild 1089 BLAKE2B 59837e9e7569797e5cefd876dcfd0a131096c147e418bee54391c4bc3aaa4755714aa5c2ef58799411b88df74b45c367b07c48103b9727c2a7704d755bc6b560 SHA512 40d0da1e92752643fe8305a75eb109ae94905376ca53c0cc0ee6e3d60c4ef6d251936249c56b11c3a90d1465ece431e5d0903e7cfd78f5cc07f8f1cafbb62944
 EBUILD libwacom-0.26.ebuild 1096 BLAKE2B 5a7b22119e2f81952f47beb72cf663d9f286db7887a8e4385884446112569e665bf3fb312b553db9902cbb0f66bb6d96e7c6ade4614c0fe92add7a07da2de5cd SHA512 a33a370fb8938c7b4676a580cd821c6647096f7111b2dcc15b1d44b016f29425059155eb42e004a337af36c827151ed35fd6a8d4f35f107a7dce0974aaed907f
-EBUILD libwacom-0.30.ebuild 1183 BLAKE2B ad3e7869bc193d0664dc1bd71725ccca43286c963cf3e59b473b9f64f7d0e194e4d37c3ce7e2ecf5210da260a590980540fcc2b79c5eff1487ba0341b07c344e SHA512 139f5a12c5cabe0094d21786b365513c2585c82ad16f3ac9208af17a6481ecaf55682e5c5df41add6fcbebb8a1827619197dd48ff43f1614f82a636ba627cd65
+EBUILD libwacom-0.30.ebuild 1180 BLAKE2B fe6cf348acf09bf6244e855d7a3b56e74ecd7a1c8a732cd99ca5e42f07d555dd447f7db4151bfd10376807b6bb66972d7d3c5a943628dff8afd2f405e43a7682 SHA512 28447d3b1db11bc4b159de2e70c0d50030b9fcbedb2c39e945f6fc16fc96261f087eab3a6ce433fc34fd96f2cd2e218453f970977aa0e3c58c1e729431228ef4
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-0.30.ebuild b/dev-libs/libwacom/libwacom-0.30.ebuild
index a08f16940e64..4ac5c07c9739 100644
--- a/dev-libs/libwacom/libwacom-0.30.ebuild
+++ b/dev-libs/libwacom/libwacom-0.30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index a67ff6e9ceb2..6630591be66e 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1,8 +1,11 @@
-AUX m17n-lib-1.7.0-no-freetype.patch 1181 BLAKE2B ce58fa83e9e9b123541ccc9aa1336b62018eb1201996eecd7c936e475aee80f8d989b07449cf345706c1bc9510e0add938e9cb821ae1383359e1e7c8ca8766a4 SHA512 dc94d2637c65242a3b53d8a0121e3502e9b389514961146c62cb1a28859e0726fb3abb21f530d829984cc37546cba443f520e6bfd6d02f7f5f23be7597db29eb
-AUX m17n-lib-configure.patch 3290 BLAKE2B 8b82158404739bd9f976f01d600e4f820c981f6cc128662250eaf3df4e8138d8f2a25c2ee8b244154894207d8a813ff6287a805f3983b50979078cda3aba01f4 SHA512 01a5ef3f1efb1dd81cc569a797be6fab45247df92c9fb95ed72da44637bf0eedc310198b487c30a1727bd38f39e5868cf4921a61f4a130d459c17516976ea7dc
-AUX m17n-lib-gui.patch 365 BLAKE2B 0efcef5e8be1f794f2fadb193aed03371c334226225cf2c53df81c54ad0d26e1d367c7d7e9f04365f415b61a428662fcbcae2cfe70e75e71df076f4ff8145400 SHA512 792900e167d8ed47a006dd48f8cb0b0b58e239f1ab56751131de15179b917c5ec8251d00932dc5d0d2fec8c51b2532606e958e90c943f6360a3442a02b76f445
+AUX m17n-lib-configure.patch 3476 BLAKE2B 6e74f8e94de9d589b7a5054bee0e805f4fb1f031b82c9d532347d7a06005828b068cb6b350f41464e21682c056a2ac6470e8db4fcd9b16f258ddb8c6c958b6c7 SHA512 d66119495b0eb3a67964826540e9fb86d9b6bfd057dfa6f3156628659751f0b9f9a702e6c6f7eefed2a26ced2101087678ef6af0d1e2098f77c35521ef400a43
+AUX m17n-lib-freetype.patch 1181 BLAKE2B ce58fa83e9e9b123541ccc9aa1336b62018eb1201996eecd7c936e475aee80f8d989b07449cf345706c1bc9510e0add938e9cb821ae1383359e1e7c8ca8766a4 SHA512 dc94d2637c65242a3b53d8a0121e3502e9b389514961146c62cb1a28859e0726fb3abb21f530d829984cc37546cba443f520e6bfd6d02f7f5f23be7597db29eb
+AUX m17n-lib-ftconfig.patch 1200 BLAKE2B 8aea727469596923fba54ac98cde29719a09eaecdabde0ab5f02b491e0d86ed855689eeb92f536e420a75111d937fdb0941bc419c9d15ef4baf1e0a4f678bb81 SHA512 b03680b185dccf063ef01ce85bb1d252bd984a77e94e314e76482747af4ecd4f90c3b7dd03b5da88e1d75654526b22368c70c80df398044baa39bc80f5936ba3
 AUX m17n-lib-ispell.patch 458 BLAKE2B 745b7567421b475fad70e63c4a6c5e12606de89bd7add18cc269d0a18e294dd3c1fed542cf65aa776120989f63009bf95bfabaad1b795fd5316e1599dd66dbf7 SHA512 cbfbd70a1b6d7525627ad8d87c3b2d79f8bfbd74915da5b6f8646a5ab7cbb351abb7a1ea103320faaa4cf80fa0a58d0adf7d9b3a7cc0ee40e8bb4220dd92574c
 AUX m17n-lib-parallel-make.patch 2379 BLAKE2B 2867ed88387bf6014841b1f00ceebacda768948e92f4fb0bdaa7d5316657bc48342232edc64c24ec4e7f7b1329fff8ba2b453e8211856168d6830218d6ebd48c SHA512 a1726270680ab0124764a092aca36369e89a21b0164b039d5663cb0af8352b316ed59bec049dc849201f046bcb7bbcf3dd8522bbc7ab20ef64c59d898274eef1
+AUX m17n-lib-pkg-config.patch 465 BLAKE2B 9e66c6cea978acabcafe6b1c8d1bcf58a29987881c4cebe9fd0e0f6fc5ed49a36b602c61259acfedc0f7020258b4313595c45326bcfc65d9744b273a49e1ab11 SHA512 978d968bdfe590861ec078135db5afb7edf21e2d0bb73403926f5fb7d77566bbd51813849bcd97e1ae127721b886be1ad8216b47b53a82f5df6dec813b249e7f
 DIST m17n-lib-1.7.0.tar.gz 1063169 BLAKE2B 61192d26dec8a8bdb55b6a819c5b1aa5503e4320d57864889065c9490ee6720f5b258fbef10d5944f69f5a9ccbe49ea5494c8b0a10d536592c301f46df6826c5 SHA512 26fc1be02a5e487a2fa5f2f63d991f3c745aa1b78e20d931fe4b265125266501cc8d402aa3cb5c1b71a7d4c0f7a0bf5b2c3b17ec5f4f8e0f5ee3052ad4e205b7
-EBUILD m17n-lib-1.7.0.ebuild 1797 BLAKE2B 6ba7262da1e21d675d2b458cd791b9cfd7273436c5bc04110f4fb8d3e81fee2c38a960ec2f9a32708e0fb580dbd95f306a5406747fdee1df0ba85c01cf14462d SHA512 9b0bf74495f2ccb2c3c50f1ff44f2716149fd961a9c7536cb1d46229576b26abe3ed7c21e2ee6ca26b8c139336ca852c39a52ffeb1fceb5ffd07317f3e51679d
-MISC metadata.xml 873 BLAKE2B b273eacca314fca66e3b779dbc02401d36030747c3068c9e70799500dfdd6a5ea8e5e04f259bf4e284278ec633ad625abae6b1559e757857ba585caeffe6128d SHA512 e0318084f83ee510dee477bb9b6396a81dfe4afbdc407daecc49d51c037217002686af4db286e4bcd6a158061ca0a77822f3853f25f12db5a384a3fafdd38291
+DIST m17n-lib-1.8.0.tar.gz 1091731 BLAKE2B a4b55fbc3246fe0865dcf1647e91d03de6ead06fb4349ba207613cdea6bb079c0e7623510a6fb046dce4bfefd262f68c41c9174d29a2b4a6f673da298642e1cb SHA512 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
+EBUILD m17n-lib-1.7.0.ebuild 1757 BLAKE2B 4c7890f2bc2a5240c87f174cd0366b0f5ff93eda8d4881fd4022c2b3683674a4766bc337d775d8ca507a2a5713776d8ed13aa426c0b53c1ebdafc13fa4c1cec8 SHA512 97e1c3ad3b83e52efa29feefc4c888d635b4092bab5b8a55a93e18593edbefcd6f76f16822f730d6caba05e2166375bf22a320b5aadf93580767ac1e69ac25ad
+EBUILD m17n-lib-1.8.0.ebuild 1840 BLAKE2B 0d84d47d4322331569a9d1be081980f64e975e5b8e0d835cd313a3c1aaf7a723631967e9d898961f8709161c5222869e8b8454bf5d01c314bfcf81129e99c1b5 SHA512 f385a0b6f80f0cd8f688f61a119101b4d4d6619291051aa4c47b313a439e80fcab039142c2b4da8f2b2ebc5fd5f66d92408fea86064250496d6e70db3fbd83d1
+MISC metadata.xml 810 BLAKE2B a17dd171386fee0a400c07e5dc5008855e68d15a048380714c35355551fa40aaaf6e0dc8fb4b28f7a89553c9482cbf40b7b13117506aac007cf8e6901dda4acb SHA512 d5530380b5ad05c6dbdeffebf310bd45985301b62b2ab11757727551522bc45c3b00d0e751503d8ead750155fb857125b73f14210df6fd3a2f85af48638f0f88
diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
index 00ba09493f3d..04ffc7749a5b 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-configure.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
@@ -1,6 +1,17 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -125,7 +125,9 @@ if test "x$no_x" != "xyes"; then
+@@ -97,8 +97,8 @@
+ 
+ dnl Checks which levels of APIs should be compiled.
+ 
+-AC_ARG_ENABLE(gui,
+-	      AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
++AC_ARG_WITH(gui,
++	      AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)]))
+ 
+ AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
+ 
+@@ -125,7 +125,9 @@
    X11_LD_FLAGS="-lXt -lX11"
    M17N_EXT_LIBS="$M17N_EXT_LIBS X11"
  
@@ -11,7 +22,7 @@
      AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1,
  	      [Define to 1 if you have the Xaw header files.])
      XAW_LD_FLAGS="-lXaw -lXmu"
-@@ -149,7 +151,9 @@ else
+@@ -149,7 +151,9 @@
  fi
  AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no)
  AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no)
@@ -22,7 +33,7 @@
    AC_DEFINE(HAVE_FRIBIDI, 1, 
  	    [Define to 1 if you have Fribidi library and header file.])
    M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi"
-@@ -202,8 +206,10 @@ fi
+@@ -202,8 +206,10 @@
  AC_SUBST(OTF_LD_FLAGS)
  
  dnl Check for Freetype2 usability.
@@ -34,7 +45,7 @@
    FREETYPE_INC=`freetype-config --cflags`
    save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
-@@ -255,7 +261,9 @@ AC_CHECK_HEADER(X11/Xft/Xft.h,, HAVE_XFT2=no,
+@@ -255,7 +261,9 @@
  #else
  Version too old.  Compiling this line should fail.
  #endif])
@@ -45,7 +56,7 @@
    AC_DEFINE(HAVE_XFT2, 1,
  	    [Define to 1 if you have Xft2 library and header file.])
    M17N_EXT_LIBS="$M17N_EXT_LIBS xft2"
-@@ -330,7 +338,9 @@ else
+@@ -330,7 +338,9 @@
  fi
  AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no)
  AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/)
@@ -56,7 +67,7 @@
    AC_DEFINE(HAVE_XML2, 1,
  	    [Define to 1 if you have libxml2 library and header file])
    M17N_EXT_LIBS="$M17N_EXT_LIBS xml2"
-@@ -344,7 +354,9 @@ AC_SUBST(XML2_LD_FLAGS)
+@@ -344,7 +354,9 @@
  dnl Check for Anthy usability.
  
  PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
@@ -67,7 +78,7 @@
    AC_DEFINE(HAVE_ANTHY, 1,
  	   [Define to 1 if you have Anthy library and header file])
    M17N_EXT_LIBS="$M17N_EXT_LIBS anthy"
-@@ -355,7 +367,9 @@ AC_SUBST(ANTHY_LD_FLAGS)
+@@ -355,7 +367,9 @@
  
  dnl Check for Ispell usability.
  AC_CHECK_PROG(HAVE_ISPELL, ispell, yes)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch b/dev-libs/m17n-lib/files/m17n-lib-freetype.patch
index 59b040c4335b..59b040c4335b 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-freetype.patch
diff --git a/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch
new file mode 100644
index 000000000000..203f836bf942
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch
@@ -0,0 +1,29 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -210,21 +210,20 @@
+ dnl Check for Freetype2 usability.
+ AC_ARG_WITH(freetype,
+ 	    AS_HELP_STRING([--with-freetype],[enable Freetype support]))
+-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
+-if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+-  FREETYPE_INC=`freetype-config --cflags`
++if test "x$with_freetype" != "xno"; then
++  PKG_CHECK_MODULES([FT2], [freetype2])
+   save_CPPFLAGS="$CPPFLAGS"
+-  CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
++  CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
+   AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
+   			      HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS")
+   if test "x$HAVE_FREETYPE" = "xyes" ; then
+     save_LIBS="$LIBS"
+-    LIBS="$LIBS `freetype-config --libs`"
++    LIBS="$LIBS $FT2_LIBS"
+     AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
+     			   		     HAVE_FREETYPE=no)
+     LIBS="$save_LIBS"
+     if test "x$HAVE_FREETYPE" = "xyes"; then
+-      FREETYPE_LD_FLAGS=`freetype-config --libs`
++      FREETYPE_LD_FLAGS=$FT2_LIBS
+       AC_DEFINE(HAVE_FREETYPE, 1, 
+ 		[Define to 1 if you have FreeType library and header file.])
+       M17N_EXT_LIBS="$M17N_EXT_LIBS freetype"
diff --git a/dev-libs/m17n-lib/files/m17n-lib-gui.patch b/dev-libs/m17n-lib/files/m17n-lib-gui.patch
deleted file mode 100644
index b60d81bbc221..000000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-gui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,8 +97,8 @@
- 
- dnl Checks which levels of APIs should be compiled.
- 
--AC_ARG_ENABLE(gui,
--	      AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
-+AC_ARG_WITH(gui,
-+	      AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)]))
- 
- AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
- 
diff --git a/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch b/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch
new file mode 100644
index 000000000000..aabe12e586d8
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,7 +120,6 @@
+ M17N_EXT_LIBS=
+ 
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
+-AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes])
+ 
+ if test "x$no_x" != "xyes"; then
+   AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11.])
+@@ -318,6 +317,8 @@
+ 
+ fi
+ 
++AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes])
++
+ dnl Check for libxml2 usability.
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
index a6cd8d7426e9..b5dcd1285ee7 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
@@ -35,10 +35,9 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-configure.patch
-	"${FILESDIR}"/${PN}-gui.patch
+	"${FILESDIR}"/${PN}-freetype.patch
 	"${FILESDIR}"/${PN}-ispell.patch
 	"${FILESDIR}"/${PN}-parallel-make.patch
-	"${FILESDIR}"/${PN}-1.7.0-no-freetype.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
new file mode 100644
index 000000000000..767f8eabe5f1
--- /dev/null
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Multilingual Library for Unix/Linux"
+HOMEPAGE="https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git"
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
+
+RDEPEND="~dev-db/m17n-db-${PV}
+	X? (
+		x11-libs/libX11
+		athena? ( x11-libs/libXaw )
+		bidi? ( dev-libs/fribidi )
+		fontconfig? ( media-libs/fontconfig )
+		gd? ( media-libs/gd[png] )
+		libotf? ( dev-libs/libotf )
+		xft? (
+			media-libs/freetype
+			x11-libs/libXft
+		)
+	)
+	anthy? ( app-i18n/anthy )
+	libxml2? ( dev-libs/libxml2 )
+	spell? ( app-text/aspell )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${PN}-freetype.patch
+	"${FILESDIR}"/${PN}-ftconfig.patch
+	"${FILESDIR}"/${PN}-ispell.patch
+	"${FILESDIR}"/${PN}-parallel-make.patch
+	"${FILESDIR}"/${PN}-pkg-config.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+	# workaround for parallel install
+	sed -i "/^install-module/s/:/: install-libLTLIBRARIES/" src/Makefile.in
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with anthy)
+		$(use_with libxml2)
+		$(use_with spell ispell)
+	)
+	if use X; then
+		myconf+=(
+			$(use_with athena)
+			$(use_with bidi fribidi)
+			$(use_with fontconfig)
+			$(use_with xft freetype)
+			$(use_with gd)
+			--with-gui
+			$(use_with libotf)
+			--with-x
+			$(use_with xft)
+		)
+	else
+		myconf+=(
+			--without-athena
+			--without-fontconfig
+			--without-freetype
+			--without-fribidi
+			--without-gd
+			--without-gui
+			--without-libotf
+			--without-x
+			--without-xft
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-libs/m17n-lib/metadata.xml b/dev-libs/m17n-lib/metadata.xml
index 0c2995cb954a..75b918da5084 100644
--- a/dev-libs/m17n-lib/metadata.xml
+++ b/dev-libs/m17n-lib/metadata.xml
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <use>
-    <flag name="X">Build the Graphical User Interface API and utilities</flag>
-    <flag name="anthy">
-      Enable support for <pkg>app-i18n/anthy</pkg> input method
-    </flag>
-    <flag name="athena">
-      Enable the MIT Athena widget set (<pkg>x11-libs/libXaw</pkg>)
-    </flag>
-    <flag name="gd">
-      Build API and utilities based on <pkg>media-libs/gd</pkg>. This
-      flag is only meaningful if the X USE flag is also enabled.
-    </flag>
-    <flag name="libotf">Use <pkg>dev-libs/libotf</pkg> to handle OpenType fonts</flag>
-    <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML</flag>
-  </use>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="X">Build the Graphical User Interface API and utilities</flag>
+		<flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg> input method</flag>
+		<flag name="athena">Enable the MIT Athena widget set (<pkg>x11-libs/libXaw</pkg>)</flag>
+		<flag name="gd">Build API and utilities based on <pkg>media-libs/gd</pkg>. This flag is only meaningful if the X USE flag is also enabled</flag>
+		<flag name="libotf">Use <pkg>dev-libs/libotf</pkg> to handle OpenType fonts</flag>
+		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index badfea916879..c64f636619e0 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,5 +1,3 @@
-DIST openobex-1.7.1-Source.tar.gz 131091 BLAKE2B a30e96a89edeb2f07ab78b1e7eaa341de62b9ad15b0251eaac93300cbf21b073034c672eb753e9dfd44c678a99e4bf0b10cf5c1e5841565ab727c2e082d66d92 SHA512 df38b363bd4c6eb6c0181fc7858fb03ac2bdfa85d8496faaa514d5cc4473b33c883956d4e1c94c3fefa5e44e5eed35a8dfcab889ce6ca8c29694f2b18334754e
 DIST openobex-1.7.2-Source.tar.gz 127248 BLAKE2B c0405aef2f15f16e31641f4a60ac01da26c2a61a5114b8f3990f0fcf64bd55c730ff7aa5f524b450c1e6b5653b9616c0861686102594818ba3bdf2314a3c51ff SHA512 22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d
-EBUILD openobex-1.7.1.ebuild 1141 BLAKE2B 0e3d8c0b2b9a87c228f5fce53cbc54395bba805a87cb89489e2f105f343b1c5b31139ed8afb3d4725a91127506cc6abe562aadb5a883d03a394c347b4d2cba3a SHA512 9697124b1e9ff41254c75d4b5a7f32cced7b6e53fc6ed0cedd781c61198e156eccf21d4e9027951baae62ace634c0c1f67e7722cc4d4c1470bde9a01743dd4a4
 EBUILD openobex-1.7.2.ebuild 915 BLAKE2B c54c4903a1c3f03284c1cdfc4cf354147b7c64aa22ea048885f35e3fd9b60ce3f657630e872f5cc390a3f336acf23f753170851d541924a2d408a31c76a1c88c SHA512 dd2b3c22c5fb5815916e2f4a62bd422b2f18d755040f5649de4ba63661f4725efd7a32b450d6b9a7114d82cf52b21823556441a50812b61070f27d01e4717e41
 MISC metadata.xml 467 BLAKE2B 6465b304f41324406f6e641b7e08268a19e1154a35d5dffdc3f57cb0b4925cbc0a6eb0e617a8bc309e9fe237352b5395a8afbbaaa61f1082dc63e336f16a4461 SHA512 947ebd0891b57e986712a13177719a300679db7a90e91210d8f9f22919d38dd7c391deaee73de43282b0b01ce80746cd6d387d53ce6f4409c82be44a98df41f4
diff --git a/dev-libs/openobex/openobex-1.7.1.ebuild b/dev-libs/openobex/openobex-1.7.1.ebuild
deleted file mode 100644
index 4612f1346267..000000000000
--- a/dev-libs/openobex/openobex-1.7.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 udev
-
-DESCRIPTION="Implementation of the OBEX protocol used for transferring data to mobile devices"
-HOMEPAGE="https://sourceforge.net/projects/openobex/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="bluetooth irda usb"
-
-RDEPEND="bluetooth? ( net-wireless/bluez:= )
-	usb? ( virtual/libusb:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P}-Source
-
-src_prepare() {
-	# Some of the bundled macros require C++... so making the project
-	# C only makes it impossible to build. CMake is awesome, isn't it?
-	sed -i -e '/project/s:C::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPENOBEX_BLUETOOTH=$(usex bluetooth)
-		-DOPENOBEX_IRDA=$(usex irda)
-		-DOPENOBEX_USB=$(usex usb)
-		# TODO: enable them. patch would be appreciated.
-		-DBUILD_DOCUMENTATION=OFF
-
-		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)/rules.d"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index 7b39251e9ffc..4b01b7f5cb7f 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,8 +1,8 @@
 DIST redland-1.0.15.tar.gz 1600090 BLAKE2B e655860230459afafaad549d0403c0c439a744bc8f8168e8abf498d52988f716d1b719be25d8ef034008fda8194bcaaa4c0c46230d2bff84b6a046ff150b464b SHA512 94b8806d0c5b8ff5c394bc6825c1347efe609a2d7a72f9346fc88b15094938e69b482d28ca8a4eea64876a6afdf6c3b60275c987a617cc498cf19d6fbc53950b
 DIST redland-1.0.16.tar.gz 1624112 BLAKE2B cee6c1b4ca07e2758be57b63a47a2d1b63e0db46ff26aad3a2779b7f64fe2bb147dbcd924142eb46614f249bce78f3b760f2dfc4b0de8f9c956f5696c5df6045 SHA512 16a57569d00f8bbfda9e90d93d686e6f51b14f066f013c9757f2b372d7b23c58fe0ba172953f8affe73c8d804e966566dc38401caca46cee2a8b091019828457
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.15.ebuild 2123 BLAKE2B de7cac987266b6c74430bc0b7a265d4f3d4cec1f65abe27759806f640492154ff4cbcfeaf901566168fa3283d5a700106f7cf4ffadc07328d6196e3904fa7358 SHA512 2e6814699d4a0e995d71fa32b86fa7a5c5d088abd3fa8b665c3dfdc44310fc1cb6ef405f0de11b1900a1598ebe8c8fb145b1c1e770ac7442240d1ed8ffc1db3b
-EBUILD redland-1.0.16.ebuild 2469 BLAKE2B 7ccce2f674c0d08a6dbd981182ed05579ce36bc0929bae0a842b712f632dd53c25351766cf0e1eb1bc7e54e4c8d626069ed4e88ba26a8cef89892624a04af7d7 SHA512 93977c197a2b6fe3bfe6a43d4583e41fa06b6cac58a866fc74a0d66556560796c2fbf9fd67ed20e7768996d876a5149644c35842b4945618aa608f204e703006
+EBUILD redland-1.0.15.ebuild 2037 BLAKE2B 76bbc94678e60052acf6f4dcf4204718573c8cc9e2023376ca53cfd0c31ebfdab9b438a18407e9a04f2e25c69f7155ebcb107d3a3f33bb0b420dcdb1a3ba37e2 SHA512 5db077e60139ade14d05b94469c9acf58a564faa49f9834947cac0f2a5cca38aea509fe3ebd5bb3fff92eb0b0a755be7b571ee0a47d20244a643949876c41e18
+EBUILD redland-1.0.16.ebuild 2383 BLAKE2B e1ffdb4435548b5cd9fe6f9fcb5dee7ef2c1d921bc8a01e9d1ebd4d9543f3fd6e8a3c8099e19e002fb7a5f26441f75beb982a137ffd03b873cab383b023a787e SHA512 95faf59e5b1dd7b606c4efedb1b9d067e4f631c5878cbf42db47f1ea1a63d7d2f7b1ebfb7685a33df2ca3c1570f8ddf3932c6595d3cf767f8cca21bd785195d7
 EBUILD redland-1.0.17-r1.ebuild 2475 BLAKE2B 54eea53f5948006d6829586ddeb9bf66787c33d676a8d2bfa0588268b3d290ee005dbc2c48474d36b7c82fec706918bad23faae19c1884ef887b3bcb9be0a870 SHA512 762f99e78c11d5c1ff68b4ed8d5f956adade95e9fc359e5ef6bed3c9af7ba1136f46c0877f94e1d3048e5b92fb5e96e47c4c8f887bc0fe7354052efabfb86fb8
 EBUILD redland-1.0.17.ebuild 2468 BLAKE2B 1213656b2309c86f3e0a0122a6462c02183d8ea8e2b66c921b7cbefd16f27b2353ea510238b5c8171f83c1c4d63fe11a1cd37a5e6a8b18b142198cee1cd9f9db SHA512 157f178cdc5ab1af0a7bf5ed3b10017a01c3f4e11a9376b3d7414af02fb5b917943d310470acc7e816415c0fd34d3165d27f83093b7d6466174bc28aa65d6841
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/redland-1.0.15.ebuild b/dev-libs/redland/redland-1.0.15.ebuild
index bc0fbf29714c..931d328b87fe 100644
--- a/dev-libs/redland/redland-1.0.15.ebuild
+++ b/dev-libs/redland/redland-1.0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite ssl static-libs +xml"
 
-# Drop the libtool dep once libltdl goes stable.
-RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+RDEPEND="dev-libs/libltdl:0
 	mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-3* )
 	berkdb? ( sys-libs/db )
diff --git a/dev-libs/redland/redland-1.0.16.ebuild b/dev-libs/redland/redland-1.0.16.ebuild
index dc5933e75bc1..fd6b87809580 100644
--- a/dev-libs/redland/redland-1.0.16.ebuild
+++ b/dev-libs/redland/redland-1.0.16.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=4
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs +xml"
 
-# Drop the libtool dep once libltdl goes stable.
-RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+RDEPEND="dev-libs/libltdl:0
 	mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-3* )
 	berkdb? ( sys-libs/db )
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 52e632f01742..3d10a84ac8dd 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -3,7 +3,7 @@ DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f
 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 669 BLAKE2B 4d3ac9e75c34236c1f1f3b884b5223a2ff12466334beba7e0a78dc9586d6d91b9faaee877fb7c736c91404da9f68106903dd11be026bd13394c971d506d60d7b SHA512 0e4ecabdf0078597ca8681217e0754176af01fe9e78d94682b23a466ca583986b6f97e41b7ca105765d168be2459d22bf1be59ca0a997729bac3200fa0145da9
+EBUILD userspace-rcu-0.10.1.ebuild 676 BLAKE2B ee98949e39e87a0aea1d7d0c14f62d0682f25267e2709d6a2405fe72ef2b1f4d0f914b4e9161e04c11c79a13789124383d0320bd4c92f4b2fd3067e917f3a838 SHA512 56ba3cee83fee5c273444c017f1b0cee57e56e5b2f4444f3686a12f98921f6f157c97831dd540eedf615264ea8db2d01cb4f3bb4d031c2c09a41e4c99bc3d050
 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
index 40699ad58d7a..25c6126b63e0 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -9,7 +9,7 @@ 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 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs regression-test test"
 
 DEPEND="test? ( sys-process/time )"
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 15c1ea17e30e..6301949c3ad7 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -5,7 +5,7 @@ DIST xapian-bindings-1.4.4.tar.xz 1117140 BLAKE2B 2240ecbe136443e9beea8871731a72
 DIST xapian-bindings-1.4.5.tar.xz 1118884 BLAKE2B 507b06f0121e5a56224250bfe7b19795eb9fd2fba977d12022d054e7b832fd70af70085ad576dab41efcde261f9ecd48179646f1ea67aaa266fb6272358eb69a SHA512 e39ece495e25077990db3d06554306567c52c6f45ad55a65005cb97e18086ee18947e41d0d612157b891b61e015881385bcb082a03aa0c6452565e90d09e8275
 DIST xapian-bindings-1.4.6.tar.xz 1121532 BLAKE2B ecac35f9510fadb39f260c1ebd03220ebe01131e4a5fcc2842778adccdf9bf3e3ae6161dd66dc75774bfb1643f1dccc99a3bbb99894e49dbbdd65f838f827a4d SHA512 e1d8d4c79ef8eb1b890be955b14eca7e9c7aafc6051cf9080d67948455f82ed68ab518343f532cde2a1c9e07d94b3aae8b8f5130db158c6badc9b6d118ceb733
 DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
-EBUILD xapian-bindings-1.2.24.ebuild 5550 BLAKE2B 8715a21a7277695c9bb328ca20d52f188405f4306efaca6fbd89d79d0949fd82c5fb6a77b2e045bf472152aae5c1100904702856f457e4b10c051ec9d5821f63 SHA512 4961916df0b4cb265b3e4f68566f0c0f66f767c31d762cd044095a897e916910d3adaebc549e90d924ac738435863095664731272c8c12df6be0fd94dc0039c6
+EBUILD xapian-bindings-1.2.24.ebuild 5543 BLAKE2B 77c5f97e4c056eb60674e59a94736fd1276569ac8e7bb89bbb42d9360ffa36ad94065a0b378a9eae21568333dbb3ffbc80877ec69bdf8a98bcbd884b55f07cc7 SHA512 b219ee45083693768bb086e1cb4e4ed2da83786dfa8786210d26bf3b50e0d42efcd2a5b73a90ce1144fd36d666d2c61e20380a13614ff3ddb69e1af09f62179e
 EBUILD xapian-bindings-1.2.25.ebuild 5551 BLAKE2B d0e1431b390f2ce7f43bc5ceddb0e205dc0118255cb6a9a9844a3005845a1de10ff9834369118532ee956ebdd8f5d4fb43e5636df4d488502967ad26b37e78d6 SHA512 cea9b9dbb61721ce41ec481099c8cdc27fc7d6da5b88c7777503348b124442aecb70b0c888d3d1560332679ae3c8a3ab60eacde4b6154abba9c2be60a853c36a
 EBUILD xapian-bindings-1.4.4.ebuild 3522 BLAKE2B 1dcaa9c2383685db410e9d7421cc55990598444c3360b698ece2d9ce051cf11d28966ec93d08f599e6036154fb5fb7a07855cf5b7dc6319f140a90d6d989312e SHA512 f57942ee1c7b2ffdb42799df989fc3634f3bdde4b61f9e423d7c5e343645cf28eb67b99694a6b82695f371f52c2b235e9e3dff7d07112dda1267a80dbcacadf1
 EBUILD xapian-bindings-1.4.5.ebuild 6502 BLAKE2B a19fd69e1d7366ddd9da3ea04a9052d0cba77115599815ff40b9cd22c30a38c9802e1f6a22b328fd9d06925dbdc5ba1ebd383eb8495236312dc5f9221ea31729 SHA512 7c25358e53d2e57b16068b260df9d6b3929586c6d8ff2288d9a68fb8e1f2b9054d3b50843d3bb275bd137efd696074c15c7181b57697e06f706ea51e2c9813f6
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.24.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.24.ebuild
index c862a7af6066..6d733e8d95b8 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.24.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.24.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 
-USE_PHP="php5-5 php5-6"
+USE_PHP="php5-6"
 
 PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index aa96d9a81cd7..333ff81e7add 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
-EBUILD xxhash-0.6.5.ebuild 766 BLAKE2B eb8f2808fbf511e3f7e07b3658c98ec1de7ab9c3fa9f4136874db7614fbdc6204e2218d768752356ed0d987f05d7c430667f40da4bc6fdf5ddd66d4e5cf53e98 SHA512 782f1312e2f94994ee4bf4a8c4181a253d3f822817a7c1ecf7286c9fd46c3f04478548853f44c8bcb27790016f8003e52acdf209631edb00f9d6b79d2a8cb975
+EBUILD xxhash-0.6.5.ebuild 845 BLAKE2B 5a40f8029b7c27a74b3067093fd54461003370d7af026423230806376c450a179ad680f81fe76fc42845de61c7408bfe1b258e61c3358b90aa5c6de67ec381b4 SHA512 8dd17ec00173f5b19e6d9384e017a8685a7f482af2406b55e320b1392622e127a4c39776043db418d7ddbeca86497d95ec0ff09daf20c121911ab311e7c4b48c
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index b7bfec9671d0..2b31be40a067 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x64-macos"
 IUSE="static-libs"
 
 DEPEND=""
@@ -19,6 +19,8 @@ DEPEND=""
 S="${WORKDIR}/xxHash-${PV}"
 
 src_compile() {
+	PREFIX="${EPREFIX}/usr" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
 }
 
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 1715af1cd141..172b046c419a 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,5 +1,5 @@
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
-EBUILD yajl-2.1.0-r1.ebuild 938 BLAKE2B 643b858c69462911616a1b7aa1cbdd2678dcd74e459a1538017cba672b3158ddb9cdbbdcb9d66c78cd3ac5fd0ff2651ef5276199350f5a1762a6ad04329919bb SHA512 94108784b1245ec434427c3ee9cc99221b452c7b4a15998e73db68e57044c77ac0a87298f19d37a37206e13097917a3e81d0b541599528646309bf4e249ce092
+EBUILD yajl-2.1.0-r1.ebuild 935 BLAKE2B 0fed9fb7b75c73c364038d6a0bce13ec53c03c082cff5482c5c70365a0804ff9c137342fe4230f83bf705ed648bd154e417389fbdefc694bf9dcd73cbebf27bf SHA512 8a1360c10bdb2f017b2c6f5615e9da7216578c89b87bed0c0641cf8448daccc086f9393a0c92b30f6b0780249e4b37bac3ee27d8263ad207caa3caf29418ceca
 EBUILD yajl-2.1.0.ebuild 894 BLAKE2B b264eef4b077162606be918a7a2af354c7a6ed46b39bf4307649703727b8de7b222d231fd34e9d7c1a234021069c13de5840a18b5b534950da694f1276677411 SHA512 74b0cc65f70342aa512fb7da7322bc06f6e6acd635427d836c383dd42eee55f61af85968d0a624fe72c18aa9e5b19f6f42d49049717e45bc09be06a5b55cfe8a
 MISC metadata.xml 446 BLAKE2B 84c4b6dc7569e85ba3925a34c96c67c8f7d23a5d8861a296ba4fde89122645cd6e49d0ec8749cb6028d10d9b945735ed732ea4473c98393d8b83874eba9c06ec SHA512 6cbb37575c23168f216682c7f2decadcb18a11d9c0af71e6de531b1002541d913fa84f98ed78f13ad1c995c332b87d61c658ac0f3fbbef39e01fe2786e1da6f9
diff --git a/dev-libs/yajl/yajl-2.1.0-r1.ebuild b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
index b296aac066ca..805116207d7d 100644
--- a/dev-libs/yajl/yajl-2.1.0-r1.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch )