gentoo resync : 07.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-07 11:03:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-07 11:03:14 +0100
commit: 957235cf19a691360c720f7913672adda4258ed0 (patch)
tree: 812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /dev-libs
parent: 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)
115 files changed, 968 insertions, 730 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d01fdda3eec4..37cc09566fcc 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index f368b784da42..54781a3b9e4c 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -4,5 +4,5 @@ DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 EBUILD apr-util-1.5.4-r3.ebuild 3685 BLAKE2B 6de15972c714d4077aeeaf62771b0427c96d7022ffbe8f639576d1c422562806ac5daf93b6d6841f581f0d8e2419a33692abe392bdb583b1722ae3734865af9c SHA512 576d513d8716117cbbe854d14e183c13060408f187a22b000e5e21f2f6b71c8774bf197612ae27080a3d97ea0bbbb078579db2551c54c12a6a1b75dd63fb2c7b
 EBUILD apr-util-1.5.4.ebuild 3214 BLAKE2B a90ae943aba394503d08cfad961e603c5aaf1460b28f040e35c0a330ad59ea333606cc909e6d8543f1c24a4a0898492dc50d988cfcf6e7ea681dd12207870838 SHA512 a419670fc4df0a4b7c7f1c2d07b67428dda3d72663e45ab1c2cd72268c33100a4d9319398086666530d69524f61eae196198e4622f0dc889f7413b763c3ec5c2
-EBUILD apr-util-1.6.1-r3.ebuild 3755 BLAKE2B 573a5e6330a9e2963c1d5b53249a164492543c19505925e253fba88ea94b85c2d3e49a0bd2ef23bb58ee8004d3ccc3e1df323b487aff04fdcad97438cbfbef68 SHA512 bd2fd029bf28a5a06258fca09efd74f21bc1d106142752dcedac86726785f7bc252cc79b8e160cd610cb930c271b905d8bcd3ee35d749816dc2bc51874aaa4a8
+EBUILD apr-util-1.6.1-r3.ebuild 3754 BLAKE2B 383ac17d4207ae3b8ac2748ecd72794c1183ecb15337b374b447659d120a353f397568a937e5dcce340c7c5a24d6fb914f60db5149581b7e2f23c65467a90a48 SHA512 c8faa9b04edf8632d5057d22b9a1cca170b936d9281f0087a14e18898c924fba4647a50f0b24876f53719dff4e2f9a416fe8e781aadc4e9aaab49a39fef676c4
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index 00d205ec23a6..ebf60b55f79f 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 79ed6fe545e4..93b4c954c86c 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,6 +2,6 @@ AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432e
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
 DIST Botan-2.7.0.tgz 7021654 BLAKE2B 3f18b7ba660a72a409beeaba8bd1b1bd021f645c135bed56d75b6ba906b7c28d1e14eac9550862500dda9c4b3ac3135cfc9c340e073c573deb66b236e09f8054 SHA512 992138d83e18aedf80337d825f80c34dd3d2177eb30967573c57cf9fb7e7f9a9965ae3d75f23635f4c93b4efb7bb5adbb3423702663c78a5eb905dd567561858
-EBUILD botan-1.10.17.ebuild 4274 BLAKE2B d88abeb1a9bfc04c121836a5a77a9b07ddb34c45244a85b0b74fe9346689736b882d489ff42a1b0726242771a90cdcacb053ba24b5a83c7d69ef8f6ea7f08ed5 SHA512 7cfd69bf005f0653793b4ece07bdba09b7b8ae8098da17b7ed028acfbd8fbef63a9568134f9ce3f7660761e5baa75f13f40f5d0c651acf7a00670907af85a534
-EBUILD botan-2.7.0.ebuild 2393 BLAKE2B 26b85ca13ac9f98c014fc58665df5331c0e6f56a4ca5823c1ad953e50c9b295c594b68740492ce6aa7e7b5433599d62bb90dce782b85bf3a972f1bcbbfd167c7 SHA512 494abf5e37c78ac82bf2e3f00efa0ef1cea54d62f54cad7883e46bf4339865223f495c0133b5ee9d0b4f2d9c33a89f363b3f3b5c37b62d3e32a1319c51b5d58e
+EBUILD botan-1.10.17-r2.ebuild 4274 BLAKE2B cc2cc4d510a95803463c477848e09cfec79a11e5246d9c9d5678502f1f279989b0ebb92840e62c445bc13a0fe1276a41b63a3c1a14ad4b8bde058f51ac91e586 SHA512 5e256c4785e2560bcb151d687136688b3a2daa11e8f87a46965aa9e687b781c7fb00cabce5ee90b6fba6aca800ff636ee9921093d1de8d22a1780d809f0613de
+EBUILD botan-2.7.0.ebuild 2480 BLAKE2B 3207ded4663f1cf2cd55153f4369fef6a4a93967703a1afbe8f91b2dc0cca944a89eeaef3dd64b3ee8253deb034b8c69e4adcc0c018f80b3dafbe145d0955ce1 SHA512 e5cd37b8ff517686c295b094e66305d5b3d5741d95ee42e62c03dc6e0d5b452257033bd7c740c59bc65e47b179c2e4b2ade7cd11ebbf629f12a0c2c842590ff7
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-1.10.17.ebuild b/dev-libs/botan/botan-1.10.17-r2.ebuild
index 3288e91d07f7..6e97aaa2be67 100644
--- a/dev-libs/botan/botan-1.10.17.ebuild
+++ b/dev-libs/botan/botan-1.10.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -128,15 +128,15 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}usr" install
+	emake DESTDIR="${ED}/usr" install
 
 	if ! use static-libs; then
-		rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
+		rm "${ED}/usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
 	fi
 
 	# Add compatibility symlinks.
-	[[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
-	[[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
+	[[ -e "${ED}/usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
+	[[ -e "${ED}/usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
 	dosym botan-config-1.10 /usr/bin/botan-config
 	dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc
 
@@ -145,7 +145,7 @@ src_install() {
 			rm -fr build/python
 			ln -s "${BUILD_DIR}" build/python
 			emake -f Makefile.python \
-				PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \
+				PYTHON_SITE_PACKAGE_DIR="${D}$(python_get_sitedir)" \
 				install
 		}
 		python_foreach_impl installation
diff --git a/dev-libs/botan/botan-2.7.0.ebuild b/dev-libs/botan/botan-2.7.0.ebuild
index 9763cbe67a68..10f8cd214c78 100644
--- a/dev-libs/botan/botan-2.7.0.ebuild
+++ b/dev-libs/botan/botan-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="https://botan.randombit.net/"
 SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
 
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
 SLOT="2/$(ver_cut 1-2)" # soname version
 LICENSE="BSD"
 IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
@@ -49,8 +49,12 @@ src_configure() {
 
 	local myos=
 	case ${CHOST} in
-		*-darwin*)   myos=darwin ;;
-		*)           myos=linux  ;;
+		*-darwin*)	myos=darwin ;;
+		*)			myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*)		CHOSTARCH=parisc ;;
 	esac
 
 	local pythonvers=()
@@ -62,25 +66,26 @@ src_configure() {
 	fi
 
 	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
-		--prefix="${EPREFIX}/usr" \
-		--libdir=$(get_libdir) \
-		--docdir=share/doc \
-		--cc=gcc \
-		--os=${myos} \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--without-doxygen \
+		$(use_enable static-libs static-library) \
+		$(use_with boost) \
 		$(use_with bzip2) \
+		$(use_with doc documentation) \
+		$(use_with doc sphinx) \
 		$(use_with lzma) \
 		$(use_with sqlite sqlite3) \
 		$(use_with ssl openssl) \
 		$(use_with zlib) \
-		$(use_with boost) \
-		$(use_with doc sphinx) \
-		$(use_with doc documentation) \
-		$(use_enable static-libs static-library) \
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		$(usex hppa --without-stack-protector '') \
+		--cc=gcc \
+		--cpu=${CHOSTARCH} \
 		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
+		--docdir=share/doc \
+		--libdir=$(get_libdir) \
+		--os=${myos} \
+		--prefix="${EPREFIX}/usr" \
+		--with-endian="$(tc-endian)" \
+		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		--without-doxygen \
 		|| die "configure.py failed"
 }
 
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index bd2df26b3a6f..5d9c82c946db 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -3,5 +3,5 @@ AUX crypto++-5.6.5-CVE-2017-9434.patch 1728 BLAKE2B 0cfd25fca89d59486ba9c49a87f0
 DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
 DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
 EBUILD crypto++-5.6.5-r1.ebuild 1530 BLAKE2B df7d53463e39d86aa3eb905911e5ccdd6cd6ae435b4a51059978b68109c3448c555bbe91984f285671856d5ab7c98232cf2b171d154a01a97655d5aea14cf94b SHA512 f8065ac14fcffa77b75a439edcad34214d62a40184c27f79b073d4f788b2ef3b8667110ef9766d901ed69a25cb1f1639d494f4a0ad2e97391879821569b5a06b
-EBUILD crypto++-7.0.0-r2.ebuild 977 BLAKE2B 730156615bf2d5c2906fff86dc6b9c980af6a8382caa7ff6aae06312dcca7ca1efc9dd1bc4744a83f84fc326976769ee498065da7f77f615db124b25f37e88de SHA512 b5fe6d57979b304edd20fbeb66611109e3fe5533c5eb9f575604e4688c24b8a9f15229942bff70de810b6752e14827d36b402ec3f6473a076a258cfebc1c789f
+EBUILD crypto++-7.0.0-r2.ebuild 973 BLAKE2B ae9cbb5042009a6206a8662b6be7da9cb0c2e742aa1f9c8cb4014a9ffc6c080e569c0a5b3c1edce948064714ab619847cc31ed3e569ddcec225f2fef443d3984 SHA512 3bcafbf3ebd72a3e1180aa69ae127392474ddf7ea065edd5435e042d1b2afa1cf5049b5dc29413543f461b0cbfcf7b77998ae7a2f825673d63af20269df09fc2
 MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
diff --git a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
index ca2ab2b9648c..48ed4e46d471 100644
--- a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/7" # subslot is so version
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index a3fe5dd1cb96..faee7e4790f6 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -3,5 +3,5 @@ DIST dbus-glib-0.108.tar.gz 812488 BLAKE2B e958c4054c09ec98d7bff659917a9c162dc43
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
 EBUILD dbus-glib-0.102.ebuild 2004 BLAKE2B 96ae72736aa5720e4a977014e4ddf8ea50296d1a769201864f19f36b1a910c8489a894b983a6106970a2407efea6d1c56510f78f2b5a27d6dff62972ac4e9de7 SHA512 abfa6ade67b9dfbbba290cf4bf5af1224763ec6ffb7b5bd5e1a420cef6117325dfa292f5916f905656348487346b041fff0fe98ea120229c5aecaf4ba1e92f54
 EBUILD dbus-glib-0.108.ebuild 1957 BLAKE2B 97f1a627cb0d1f45cb9668483e2ab90cd56c633759f0286a3ab87016fbcfc8126f890f5095275ab1ceae109783b2be1cf8d587e970f10798e48cf15edc4fc707 SHA512 3b419676f6a1b24181b61dcc20becb6f25df57ce61322f9f186e89f67a084efa8f86b69a282ae48f4ef451011238d7744e49df8f23f332d1a33297b934319325
-EBUILD dbus-glib-0.110.ebuild 1903 BLAKE2B 0bc3d43318a223eb303c44050b730a8d94f1d2a26da3c128240c4e710a7816ad5fd3629f8845adf471b6415597af4ebe043bc5de38cd6b1cc4cb5ba6096970a2 SHA512 806c14e4bb4e79812e85afa53c26e4e501b2ea279ea36a74a555d4dfa637814025fb9e19c55188c09bc2bc7856df371406a861764c0cd7e6b32455204e29b726
+EBUILD dbus-glib-0.110.ebuild 1897 BLAKE2B 3572063aeb3e4481c231bbe838ff5ebfd9c52458896ec8dcb3a335ca8ab45f86d9f3b7cb08a5e5d445b07dca670c01f963e0a1cb2c8290d8cc02acaf4754c0a8 SHA512 6238cfd544298435a9c903906e2ed32362aa40b8663d426e20020c74aae6d5885aceeb8db514bb9cb803436aebcbe34034cea5d9ea4f7fb9669007ededb6e2dd
 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
index b1c7afdf6d26..cd25f239647f 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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 ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 
 CDEPEND="
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index b538cf413026..c331a0bc541e 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,5 +1,7 @@
+DIST flatbuffers-1.10.0.tar.gz 817750 BLAKE2B 1896b01afbdb8527836fa684980169890b1d5f1213d64cc88310f819c5fe7bc2a7e0a87e1abc2565ca165a0406dee9c814af382d2c8f08718ae5d9173530f98a SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2
 DIST flatbuffers-1.8.0.tar.gz 616362 BLAKE2B 545b568fbc1671005c351ba255f9dc2b5f97b618eae13bc74b717d1e08875e465a0afd3965b35ec8243c1dc80223fdab7f15abbfb4196a129700e4a1532a8965 SHA512 8f6c84caa6456418fc751ea9de456dd37378b3239d1a41d2205140e7b19a5b8b2e342a22dc8d7fdd0c36878455e9d7401cc6438d3b771f7875e8fcfe7bbd52f1
 DIST flatbuffers-1.9.0.tar.gz 681752 BLAKE2B 7886895f79ad5b8b62c4acb479d60a6fe16226a1a9daadf2c457189b7a3381676ba9dd3f8e2af5ebd5f2d78c6ac37d9d83de88ee08b566fd4e4507ecdb887938 SHA512 0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696
+EBUILD flatbuffers-1.10.0.ebuild 707 BLAKE2B f929f2b2ab5eb4fb4c5d428771ca3594882bfcc6f36cd8e3f852756e0bfa1a8ee9e4dde03b587f14466da9f0bec02fc0a1190078468d695dba8f919d83fb4bff SHA512 89ac8125c39a3e3636c5c31ef01a82b53a6c28f65241f441508485941e0d6d4a8827e40a53797aeed9292cd2303b69fe2e2f750f1f733aae57760e991d068321
 EBUILD flatbuffers-1.8.0-r1.ebuild 710 BLAKE2B 8d56bcf7a01f88839f94ae26e976e1e159700f21827addd0e8938e6a618da3c057c1f3d0714b38457d678bec40bc7ff1a7f6aa037c1378e81661499ec2808752 SHA512 b7ac615fb1a0db489fa47abe2649ab82f29ca4df6e649aabf9874aeeb859549b5f54c2437113dd972ed8b9e146d1d8c4fbd31de806265a2d3779ed49930e080b
 EBUILD flatbuffers-1.9.0.ebuild 710 BLAKE2B 8d56bcf7a01f88839f94ae26e976e1e159700f21827addd0e8938e6a618da3c057c1f3d0714b38457d678bec40bc7ff1a7f6aa037c1378e81661499ec2808752 SHA512 b7ac615fb1a0db489fa47abe2649ab82f29ca4df6e649aabf9874aeeb859549b5f54c2437113dd972ed8b9e146d1d8c4fbd31de806265a2d3779ed49930e080b
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild
new file mode 100644
index 000000000000..5aee3963ad99
--- /dev/null
+++ b/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Memory efficient serialization library"
+HOMEPAGE="https://google.github.io/flatbuffers/"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+src_configure() {
+	append-cppflags -std=c++11
+
+	local mycmakeargs=(
+		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
+		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
+		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dobin "${CMAKE_BUILD_DIR}"/flatc
+}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index ad2fdeb2ecf0..c7191a9d0f53 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -4,7 +4,7 @@ AUX gjs-1.43.3-disable-unittest-2.patch 1119 BLAKE2B 8ab995513b63faee201f84ec45f
 DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.50.4.tar.xz 612260 BLAKE2B c5731dd9f0703a3c6fa8e407fdba888629f7f0ad197ad60a433bc9eb315a6f633e9f192cf3ef51d17dd3529f66dc4c291f302e5dd57873e6f274047af46c2647 SHA512 d95aed6ec8001ccc5f70abad8e2c6dcee8d62f54500f19f5acb25096b398b03a932afeb226d27c0bd6c5c57d9685403f7b77b06ee7b861648402a9137446fcbb
-EBUILD gjs-1.46.0.ebuild 1559 BLAKE2B 8e46f9f4a7f06ed43132e023b25203eef301345e8de0d52183edb25c07b79fc1dec1c2285ea5b4b57b4923092e165901ebba049362cbce73c50a377b4a7e5d0e SHA512 083fd06684cd111f77b35f251c9d1418614550947366e838408daa2f214204d530273a2954304f6e3aba092c8160dec9ae581d7422f033cbf3aaaf72ec99ccae
-EBUILD gjs-1.48.7.ebuild 1552 BLAKE2B e73f0771b9cca26ed1720083502a1bff29d328c55a1a0c340c4e55941e51e683c72d41ef1af7d13269cf2cc34480a79775b5652c47244bbdfaec60e03c74f9e4 SHA512 ace6e02f405ef1433b9f8a1ee17a7d26ea695b9b8bb954ca6bc1ff3730c8246a9561e9c28b80c42f7c3713d2f40b37e020a2297cfac517e84044518ba8718920
-EBUILD gjs-1.50.4.ebuild 1424 BLAKE2B b9039836c0e02838fed58199e147221fb0410fb7c7b2baacd5ed156b82b786f8efd0318a47c56517a313096da511338b51a4546abc4eddcb1c5d189278999d1d SHA512 1eb4bb24fc0cd53475a2759cd13ad2e729fb1a5d15a1589bf16a25aed701a8a27bc5f99d22c1cc9d15dff21a993821afa03c40206e4e354ae480429fe858b9cf
+EBUILD gjs-1.46.0.ebuild 1558 BLAKE2B 035abf83ae724d27a06ee1973ccd28afc29bedea4e5720fe5b3758bfda79e5c33718dce56fe938698ee58b7c48b1737767b1facfcea6fa6be97b093b92c7c70a SHA512 f6fb1dafb934f9b5296195e8a651dc410b061d0a1cba8b066547043c50090e1c101fde253d08312a0f0b98658f624e3513b4d9fdeddd99ad8893749e23ca43a6
+EBUILD gjs-1.48.7.ebuild 1550 BLAKE2B 1eab7ab879fc148e8c1a09b9b627f3d06b4c0e80cca096ee93c5268b7b7d7b1822b48f2537e7bfb390ebfd2724da9b1974e2d40bbf1f6e5f5a8ed9e12c63d2ff SHA512 2713ac130bccd430323cfc8331b1d71fd689b42965ed29169f438912c8dddbec9186e9bf0058b60611ed65c6df610dc84923d8b815cf22f382776aed44e32299
+EBUILD gjs-1.50.4.ebuild 1426 BLAKE2B 7e0935809f042ae3078234aec4958a916f6d0d72fb02a2618f7e83e55b98aed3c74463314c6061f006170225350f854771ba2b7e5689bcabf14273880560c662 SHA512 b3c1c9390ba0be0958e4eb5eb811bfd97999894f6520b1aafa6e8f8aa2db2685c31bb2955c1cd224d9439d188a76c33a1c9687628211534326bb96ccf8b236ff
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.46.0.ebuild b/dev-libs/gjs/gjs-1.46.0.ebuild
index a93e55bea193..a0935c8510fa 100644
--- a/dev-libs/gjs/gjs-1.46.0.ebuild
+++ b/dev-libs/gjs/gjs-1.46.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ RDEPEND="
 
 	sys-libs/readline:0
 	dev-lang/spidermonkey:24
-	virtual/libffi
+	virtual/libffi:=
 	cairo? ( x11-libs/cairo[X] )
 	gtk? ( x11-libs/gtk+:3 )
 "
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index e21c88092638..257b11cc9611 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.52.1
@@ -18,7 +18,7 @@ RDEPEND="
 
 	sys-libs/readline:0=
 	dev-lang/spidermonkey:38
-	virtual/libffi
+	virtual/libffi:=
 	cairo? ( x11-libs/cairo[X] )
 	gtk? ( >=x11-libs/gtk+-3.20:3 )
 "
diff --git a/dev-libs/gjs/gjs-1.50.4.ebuild b/dev-libs/gjs/gjs-1.50.4.ebuild
index c4457cc28600..f31803a08d20 100644
--- a/dev-libs/gjs/gjs-1.50.4.ebuild
+++ b/dev-libs/gjs/gjs-1.50.4.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 
 	sys-libs/readline:0=
 	dev-lang/spidermonkey:52
-	virtual/libffi
+	virtual/libffi:=
 	cairo? ( x11-libs/cairo[X] )
 	gtk? ( >=x11-libs/gtk+-3.20:3 )
 "
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index e0258f1e2991..8338e4eeefa2 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,7 +5,7 @@ DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec24
 DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD glib-2.52.3.ebuild 9536 BLAKE2B 6ab32f46e939df7690f1a855522e323db3e5f34294399cb281a6d775fcd47272019cbf5be91ef19c6f264ab9725691485a7656bf24fe1a7f94de95d843657c56 SHA512 81dea9748342fe63b025fc637ea8940ae10e0f2d2aef5ff3d724714998ccaef21f10229a6c0374cb3c7bbf0ef1991a4d4da1f1fcfcee1c566918817ecd463cf1
-EBUILD glib-2.54.3-r6.ebuild 9987 BLAKE2B 9c0a0272ad99ece03e1770a6e2506fcb517996c1a54f6bf68a2f88eec5fa169876d8570e2bc73ff207b8ed4afd7c23ac82caae00ff7c126d48771517bb00c16f SHA512 658a2e7e650abb0b2d3b77c158f5b754f3979f8b8fb91227368c81142815d6087b3c6e2b2e55981c348ded06a96475890213d65930b78209aaf71ec7653da1f6
-EBUILD glib-2.56.2.ebuild 9676 BLAKE2B 06d2b78ba5ba5515467b8458cedc6b9897c8103ca91aa42b1618be7f6eaf21c666318edb1581c4b6e97603d8ae3aa3a42b8767cff81666f33a8c195d5c82aabd SHA512 0b83bed25cd099cc044ca6581d618f0eb1bf6b81a797052722bf68bbb7cf19b92431622790d702b5613b600bc6b1b0a570e5b51f02a469b496459bbef1a91a9d
+EBUILD glib-2.52.3.ebuild 9535 BLAKE2B aadf3d0845d85d7466b05c24cb9fca72b737cce6825ab6e685f809814fefe452995e8b7705045afd3a5172733ef756ab59314fe8318a03bc9bee5de288052cf6 SHA512 3edf2ce2a54cce35781b65332398eddac3b7956624cb02fa384f616b79979f3df54ec73a949a391d607bcb25a639fd60d90e3aa487584b871f06d2052815707b
+EBUILD glib-2.54.3-r6.ebuild 9986 BLAKE2B 4eca2dcc09586f88ee9e08451e915c83c2a7fd54e0e78e23cd8ff25502896ab56c99cce5f8314686099ab74cebed7c3685b77c70644caf2706a4007ea92ed43e SHA512 a27606f1dc6c4d6b76504d9f7310ad6f6c2f9ab4dbd160a0ac9721b9be085e5144747607184ef179bc742d8616fa58cb031ce127c04e2c1443a55b46daaf2282
+EBUILD glib-2.56.2.ebuild 9675 BLAKE2B 7b93561c9c133edad4153a2b946bbae03d897f03512959fce597a39466a60b6519db895a84feb859b7db50cf69eea3f9b3387f5c4b043f346b8d95a4ae3ada1b SHA512 71f589c33599f2cd5101d15eb95c2039aa3e1cef4c2044c09b1e37e5c5f62300bc0fc8efe14b9a5bfbc3d18057bac8465e995eec0a02b81e13b7ff03ce47221c
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.52.3.ebuild
index f5f22a01a8a2..931700a301b5 100644
--- a/dev-libs/glib/glib-2.52.3.ebuild
+++ b/dev-libs/glib/glib-2.52.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then
@@ -37,7 +37,7 @@ RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
 	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
 	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/glib/glib-2.54.3-r6.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild
index 475953b02b92..ece8f434c299 100644
--- a/dev-libs/glib/glib-2.54.3-r6.ebuild
+++ b/dev-libs/glib/glib-2.54.3-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then
@@ -37,7 +37,7 @@ RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
 	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
 	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild
index c30bba39cb88..0deac6b0f6bb 100644
--- a/dev-libs/glib/glib-2.56.2.ebuild
+++ b/dev-libs/glib/glib-2.56.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,7 +31,7 @@ RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
 	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
 	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index cef125664f00..7dc1f21bde38 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -2,10 +2,10 @@ AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
 DIST leatherman-1.4.2.tar.gz 814263 BLAKE2B 5ca8123f264ed0f7843c6fc1b0966c577fb9d12933e5baa375e0beef8ba17afe4388f1e05e1022e392c50e32e159b765531137cf069bd0f5b8baa3626c860949 SHA512 e0cb19605163b68ac5a8fc74e875d856af5e34345f19c38f0db45da7536ec27ba6cf4b4e8c5883ceb9a5978cdc8831181ec89ad4105252366b198af4f3f22bff
 DIST leatherman-1.4.3.tar.gz 814259 BLAKE2B 049cfab8240e5447bcb14bb4a96fa21ca7e4b7a24d8a38abf3820d6e1c25cf1e0841b04317c3d3a72ceb5f61f9b9a055ea76dcd5f731ffd567d96be60d2b8abd SHA512 a28d7f852904eafb3b703d5890d9514db24ef387fa440108ae8750041d1c5c1b36240b0925b37833ed68739d92a1d22463914e0838e5f09e03035aad47c49d81
-DIST leatherman-1.5.0.tar.gz 814292 BLAKE2B d48f09ade91fd5194669101fc5c9e60ad1eba09dce61507c716257bfeaef4cf8e9318f5674a23c92bf95324fad7712443f4c31ea09de1b9769e4d4e2d1a2de15 SHA512 9788722bb85ff3018f4b7ecccd9dbd86104d8bdafd6179766e137ed09343e4b6b2029e48afe2aa4bae03e2b45176fc619da0697e3e305ee4651cc21602e15af4
+DIST leatherman-1.5.1.tar.gz 814327 BLAKE2B 133c65adb16b9eabd8dab341361d36a3736447596b019f15603e7cb45bef472a4267c5765adcb03bf9492d7f553d326c0f64ca026b4cad22e6f4744f9f12cc6e SHA512 3673a6ed530ae8f30b9a037ad42a3648ad61d50eae5c3a39a4a58f190567ccd21c4132289ecc8534202502bb7435ae79c9568a3dadf0ce75ae9c7d7fb65271f9
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
 EBUILD leatherman-1.4.2-r1.ebuild 1155 BLAKE2B 1b6663520e7a3245ccc085cc5a5a3f9cc36a8d7112394224155f63851c7d52e42622c347e303f64f38959bbfcae4a38942fe571490e11a9bd4b4099a0a9c2041 SHA512 2d64e5114ebd7ced81278737367bb5470e6d431e5c517d67e23b7fc20dcaf0b3f58029b8be21f39bcfb4f684a82005ff8c7767d7ebe3feb017f3dd7f774cfb77
 EBUILD leatherman-1.4.2.ebuild 1151 BLAKE2B 8cde9882d7506f59fc13ebd6395efbdf8ebaf413eb17edff53b790f24394a6f68620ac39b9a4eb61c107cd8b898462fd603107764c805de52e24227e205a9dd1 SHA512 49c05ce146a7e89f9b18a856a96d8864f98a2e7dfde2818029c61c15da2b73409c44d5eb7d56015e6d32d9b21bff96176021a22937a3f768174e68a0d55dc04e
 EBUILD leatherman-1.4.3.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
-EBUILD leatherman-1.5.0.ebuild 1155 BLAKE2B 4d72e82f0b95572bfbff180fc5f954a06a783610f0f23f7382c6ea2333d2688c9c75de277ae436f189e00f8642ef305d10185ecaac98936e77a9e71dfff72545 SHA512 e50d9fc558f936f8208990cafeeba75cacd421905e9a7c41e3644a2bda7ce83f18eb326eee4c8e35ae7b9023a161797f6542c16f1b3a8b545de5a9b416de519c
+EBUILD leatherman-1.5.1.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.5.0.ebuild b/dev-libs/leatherman/leatherman-1.5.1.ebuild
index d209a9910531..cc7a76208a23 100644
--- a/dev-libs/leatherman/leatherman-1.5.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 638f7b0f61cd..607b749ed757 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,5 +1,6 @@
 DIST libassuan-2.4.3.tar.bz2 559867 BLAKE2B b80f73573449aa1705ac3b4f12f89cac6a19bf4b2ed8f46d5576164196300baeaeb782c997078ac252a564b9f6067df87a340b46c68058d4a28c8291bbecf96b SHA512 2b0f58682b408fc58fa0ec2980b36e54ba66701bf504cf6c98ec652af43501bc7c18573bc78c5b83260f5a3bdb0ec8f4e0662bafd9bba3fe7287e77598e8e4c1
 DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
 EBUILD libassuan-2.4.3-r1.ebuild 1088 BLAKE2B 458d0bc83d786010d8baa61a4a7c195a1c0081ee6e592ca3d29be23aaaccea5497e4927b706eb3ff63a9d07360046e02474c31ca03f8bab94af695db3611faaa SHA512 e37bd3bb1d513367b556210b9a395958f42773f5ecb4252a525717fbaa769c9a0911f6586a920c264ef388c382aad148747166c02e4bf8919c960b16c129638f
+EBUILD libassuan-2.5.1-r1.ebuild 1218 BLAKE2B 6f0705cb8c942e8de261a0ceb7252b8074ecb427451a8be29bd163f4342f5becebfc5332e48c05d2e491c002dfd1d34fa191ae3a809da0a129357ca4c3b0259f SHA512 ab6659c42a059ac9443204f9550ad86667593a29b760614a50f86a001e7d83499701079c85b7f063a555e27d5145e69f175a2fa05926fdba3eecea454d0c3098
 EBUILD libassuan-2.5.1.ebuild 1087 BLAKE2B 16d92a4b99e67f950b73ffd544b112833b3da5ec14d7eca14d40651bae83a5b96eee71f751190b4522aaf969fd4fd8df492a85b5cc71baa41d7c284795c84639 SHA512 8d9b67ceaa45c369d93c0fff2a56061d49c056aefe9a67dfee92d508d8bdf323f5651e912480d246964e4a0bb653a22f107d1ee141b3978affccd3798ece6194
 MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
diff --git a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..f834f0c7a39c
--- /dev/null
+++ b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="IPC library used by GnuPG and GPGME"
+HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		elibtoolize
+
+		# fix standards conflict
+		sed -i \
+			-e '/_XOPEN_SOURCE/s/500/600/' \
+			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
+			-e 's/__EXTENSIONS__/_NO&/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+}
+
+src_install() {
+	default
+	# ppl need to use libassuan-config for --cflags and --libs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index d1532e5d0904..75182dfd4369 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -2,5 +2,5 @@ AUX libatomic_ops-7.6.4-gcc7.patch 1669 BLAKE2B b37d7940e2a793fcda7f20d509e326fd
 DIST libatomic_ops-7.6.4.tar.gz 497571 BLAKE2B 151cd518a346dcf2540c2e8229c2309aa83a7cecc3d66e3e8bab3d09c8688d725e26b27c836c0a3a3a46cde40fedfe26b0cca53cf2b2017f67e72d4a4993371f SHA512 2e6ef0bfd4b77e9260383feb2865c96388fb1ebed9d37605eeb83ac87e3b6a565495d588808129ac7b3ee5f6a58a37440da7784b680cc6590842b09c2625983b
 DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
 EBUILD libatomic_ops-7.6.4.ebuild 777 BLAKE2B 0f1a533dd9fe6603a0b8b4b02263d67830c3751aa31e4b12fcee2eb9c0f93af9f0cad132d2ae7705ccee3645c333ee893f9763aa6f949dbcc3a3a14c0c4b4c26 SHA512 a5ce9721e64aaeb642587edcb6219f0f4ef64448bd995c96b90bd69e75ef390b462ae58f773fc808068797416693ec81bc0e758fd36b79006ef4d6ae15c9c0be
-EBUILD libatomic_ops-7.6.6.ebuild 738 BLAKE2B 265631a726b304566a26e1a302fcc06089317676e73f6a31c690af800c8d41bbe1f6d61126c81098a0c39b9f68f3406fec2ebb5996a9e253d06db3e25ecd4894 SHA512 9f441be3a6dc0b337c1201ea23b54880d3fe9819d06e5cde1d677edf1905aaac7310d64fe6f6c6535ca934c13995bf4ea601af89ab8759aa661431bc3bab4182
+EBUILD libatomic_ops-7.6.6.ebuild 734 BLAKE2B e232e71e2fb3de24ea1710660294c5adcae596599112f90e7af8c328b41cbce194b7e0d40df91b08f7a39e539fb706c9eac12e381acb634fb1287e19dd078da0 SHA512 627b84b11582a66fc496d5dc6529eb8c7a93e96426a82deba0abb689db8a6edf8391026820de4852ff176891bda2ab2b7ce1f5a3568e5fda59a8be4e2d701be8
 MISC metadata.xml 347 BLAKE2B c8fa80a777d85e172d52bd7eae6523981b9fcc79fa8d6cb7378960adda45dd6489def86930704bb845e64437ff33b39f5401cda0d11ed021342235c7020759e5 SHA512 7a4acee1ccb58c4694e9100d556046c55f508050f6e09dc3d4dd509db9eb747b94eca152e1e98c2ebacd8b8c9c75c362426ad9545cac490f959ec16464f809e5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
index a2a7fc2abd3d..eb11eae64c09 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 5d221f0b219d..1bff35281722 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -4,5 +4,5 @@ DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B aa4aa1c19872edf9e7e6ed270275199366345531
 DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
 EBUILD libbsd-0.8.6.ebuild 1227 BLAKE2B 2dcb7ad4b36a7de7c926ba5480814d060c325433ba3013e635c8b13ff940f303566b77f36a6b37920a3055ce3fb3e1c06882ddbbd58c6b9c98d379d78219b1f1 SHA512 a45b2b20b2b4b2a32277bd346f6433e8cef1d42260a6098aeb8c419d45c7a5c5db26e8ede2dbdef8039b03511e7ffb3ef65f450abea77b250e929889cea39939
 EBUILD libbsd-0.8.7.ebuild 1232 BLAKE2B d30cbbad96b19726f36e83d9fb8c69d14f53702c74f0401ce9abee5b7f7cddbd0f90da75d02833535e12fc1d9f4dbf202305466d8ef712fe892c08c707b94fc3 SHA512 1967086f1067249a65c99a6c68fe0e3238b120ad15d6dc5d6a9ebed7105ae3e4cd86b6c51aa4e1bfbd2ce5b3b0597ae20cfd6326c14d6a06f38d6406e1ad30f2
-EBUILD libbsd-0.9.1.ebuild 1182 BLAKE2B ededda1743d781e8846e0e70c5d7457c0e9e1ac6600255a381376fdbdeb717e465a9a8306e3da1f8a4c86d30d86976e32fda02a3507fcbe60341b83c947e70c8 SHA512 94e40afe8193d06fa79ec53d5887586b39c7ee30bf2269b7165d4f930e5bd20486233c3acd532ce9cb98406693ffc7ff54f549fa5edbda744720efc77873b5c9
+EBUILD libbsd-0.9.1.ebuild 1175 BLAKE2B 0313bdfaebb0414fd50bcaff4e2486dbf40105b41717ff1264b251c38cc71b740a1f9e4106fe06a7bb3073e35c857b5fb7359576db7e9835d6e498f52baf675a SHA512 f9b23b91b0a8b92ed9b58c874677a4ba30c05cfd89e3782bae1604f07151dbff030e4a3655c16bbb0ab8ad8e41822c07fe7962e219bf7c9568f2e79976dd0333
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/dev-libs/libbsd/libbsd-0.9.1.ebuild b/dev-libs/libbsd/libbsd-0.9.1.ebuild
index 28704d7a0f1e..af8633e3a839 100644
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ b/dev-libs/libbsd/libbsd-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=sys-kernel/linux-headers-3.17"
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index d1fdd3693d78..81e94890b475 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -5,8 +5,11 @@ AUX libffi-3.2.1-ia64-small-struct.patch 2306 BLAKE2B 1bace1573d4bdb93e7be97a860
 AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e969799e42c5dd808750ba51997d7486eef58e636ef2e1f215f9a26b5e88e61366d57e758688c4e69f578edd81167e1dbb0a8357f049150 SHA512 6c8b2d7dca0cdc6f69b2393777f546b6722b6260cfa6fcb814915975227185cc3b467b6537939f8f8d05df5fd8f245301030aa4ef74a3c2fa073e6200e91d47f
 AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
+AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761de8194a5fff6dc0c32be843e15e3da089ccd3819b656843844475199eb5ecc53312f4ad5c1b26d896df464d077ce15ee32eb13 SHA512 202b0685ecbf058a0414e1f2e673e4c793f5381b5714e5e8f025307068eb48f5c7eb85081859194b4500cbc5b6981f07fb4b6efc866071ea0e64f9231852444c
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
+DIST libffi-3.3-rc0.tar.gz 1084854 BLAKE2B 2c38d60f17ef52bcf270178c13c218f6ee320c9785091621d4689bcf6cee31d07eaaca12790965e1ae3ad71ad2c408342743968bf1d23f81a07fbdf6cfd55b90 SHA512 e6e695d32cd6eb7d65983f32986fccdfc786a593d2ea18af30ce741f58cfa1eb264b1a8d09df5084cb916001aea15187b005c2149a0620a44397a4453b6137d4
 EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c2e5fd3cbda307bd24ae63573a8ab27459ed0b73177bd969232be7640b737a35bae7f5be69876b92de4351dfcbff SHA512 1f27cd306112d3de8762f0cfab1f6196819a6793585c477027b3e0a48fdf0259f764d87b8cb221c5b32aabd5ae47d8535f040d0960256064d14a4d78a67bcfb9
 EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189
 EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7
+EBUILD libffi-3.3_rc0.ebuild 2022 BLAKE2B bfa0038c2730f125a3754a8c5e52895d2163ff7748235082112e8dc5316b7e7ed43b3bc8eb0726513dda7058aa0f5fb1a9b4be0c18f205eba2c48f8144ae4061 SHA512 134ee21346f8b308cdeb05c3f72ad541f846eadfa786c188dfb050916c2703ea8c282b9b59ba008ffb18a125df9f195b127a252b9839c964cb8411f4846f4252
 MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90
diff --git a/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch b/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch
new file mode 100644
index 000000000000..c6286f349900
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch
@@ -0,0 +1,93 @@
+From 955e3c56459556284cf4a7fb23c51f9d310be80c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 19 May 2018 10:49:07 +0100
+Subject: [PATCH] hppa: avoid TEXTREL in .eh_frame section
+
+Before the change hand-crafted .eh_frame section contained
+ABS relocation and caused TEXTREL tag to be emitted:
+
+```
+$ ./configure --host=hppa2.0-unknown-linux-gnu LDFLAGS=-Wl,-z,text
+$ make
+...
+/usr/libexec/gcc/hppa2.0-unknown-linux-gnu/ld:
+    read-only segment has dynamic relocations.
+```
+
+Link failure is caused by absolute address of FDEs
+encoded into .eh_frame entries.
+
+Fixed TEXTREL by using pcrel (instead of ABS) encoding
+for absolute addresses (__PIC__ code) by adding augmentation
+information ("zR" CIE type).
+
+All tests still pass on hppa2.0. The specific tests that still pass
+and exercise this code path:
+    testsuite/libffi.call/unwindtest.cc
+    testsuite/libffi.call/unwindtest_ffi_call.cc
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/pa/linux.S | 25 +++++++++++++++++++++++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/src/pa/linux.S b/src/pa/linux.S
+index f11ae76..ab04c75 100644
+--- a/src/pa/linux.S
++++ b/src/pa/linux.S
+@@ -297,10 +297,18 @@ ffi_closure_pa32:
+ .LSCIE1:
+ 	.word   0x0     ;# CIE Identifier Tag
+ 	.byte   0x1     ;# CIE Version
++#ifdef __PIC__
++	.ascii  "zR\0"  ;# CIE Augmentation: 'z' - data, 'R' - DW_EH_PE_... data
++#else
+ 	.ascii "\0"     ;# CIE Augmentation
++#endif
+ 	.uleb128 0x1    ;# CIE Code Alignment Factor
+ 	.sleb128 4      ;# CIE Data Alignment Factor
+ 	.byte   0x2     ;# CIE RA Column
++#ifdef __PIC__
++	.uleb128 0x1    ;# Augmentation size
++	.byte	0x1b    ;# FDE Encoding (DW_EH_PE_pcrel|DW_EH_PE_sdata4)
++#endif
+ 	.byte   0xc     ;# DW_CFA_def_cfa
+ 	.uleb128 0x1e
+ 	.uleb128 0x0
+@@ -310,9 +318,15 @@ ffi_closure_pa32:
+ 	.word   .LEFDE1-.LASFDE1        ;# FDE Length
+ .LASFDE1:
+ 	.word   .LASFDE1-.Lframe1       ;# FDE CIE offset
+-	.word   .LFB1   ;# FDE initial location
++#ifdef __PIC__
++	.word	.LFB1-. ;# FDE initial location
++#else
++	.word	.LFB1   ;# FDE initial location
++#endif
+ 	.word   .LFE1-.LFB1     ;# FDE address range
+-
++#ifdef __PIC__
++	.uleb128 0x0	;# Augmentation size: no data
++#endif
+ 	.byte   0x4     ;# DW_CFA_advance_loc4
+ 	.word   .LCFI11-.LFB1
+ 	.byte	0x83	;# DW_CFA_offset, column 0x3
+@@ -338,8 +352,15 @@ ffi_closure_pa32:
+ 	.word   .LEFDE2-.LASFDE2        ;# FDE Length
+ .LASFDE2:
+ 	.word   .LASFDE2-.Lframe1       ;# FDE CIE offset
++#ifdef __PIC__
++	.word   .LFB2-. ;# FDE initial location
++#else
+ 	.word   .LFB2   ;# FDE initial location
++#endif
+ 	.word   .LFE2-.LFB2     ;# FDE address range
++#ifdef __PIC__
++	.uleb128 0x0	;# Augmentation size: no data
++#endif
+ 	.byte   0x4     ;# DW_CFA_advance_loc4
+ 	.word   .LCFI21-.LFB2
+ 	.byte   0x83    ;# DW_CFA_offset, column 0x3
+-- 
+2.19.0
+
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
new file mode 100644
index 000000000000..0a31487e51f1
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7" # SONAME=libffi.so.7
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug pax_kernel static-libs test"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README.md"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
+	"${FILESDIR}"/${PN}-3.3_rc0-hppa-no-TEXTREL.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
+	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
+		local base="${T}"/conftest
+		echo 'int main() { }' > "${base}".c
+		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
+		if [ $? -eq 0 ]; then
+			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
+			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
+			die "The system is in inconsistent state with unknown libffi installed."
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	econf \
+		--includedir="${EPREFIX}"/usr/$(get_libdir)/${P}/include \
+		$(use_enable static-libs static) \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_test() {
+	emake check RUNTESTFLAGS='-a -v'
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+	einstalldocs
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 4336f6d99508..4a9bda2c9bfa 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -11,5 +11,6 @@ EBUILD libgcrypt-1.8.1.ebuild 2087 BLAKE2B 3fef7833b394d4adc5a21b6e725029e222d5b
 EBUILD libgcrypt-1.8.2-r1.ebuild 2134 BLAKE2B 337e99d2b43af15fcacf52bfc1dc2f58ffcebdc1d9ddb5441afa887dc14d0ef3c01129862133cd9d1cbc589985822bca6aa48a6527ae624e8d5c51183e1ac066 SHA512 81266f185d38869b311ee901a476e001d4d08ad49dbc789a6c196145b3203439398eb31dac171490340146aab09b69b9b01183a404506f3a42b57745819b604f
 EBUILD libgcrypt-1.8.2-r2.ebuild 2199 BLAKE2B d89c6479ecfe6ba8aefa19e8a3a93acfc1b36f96b3d24442918c9265829623564e11fbb447f953677c68ee88512705bd760e72a66265b2f4f65712372916d7fb SHA512 fd32c5982155cd59683efe845834c861048135330b1a6677c04780be1545183865a2880ef712e2f68a38fe130efe8b6f9f39268b0ffa147edb1ee608750d9f46
 EBUILD libgcrypt-1.8.2.ebuild 2100 BLAKE2B f5b19c9a2df7e882a440b8efcad581bc20df60805ced3ac31e289a36095008d6d89167d89780185a2313516779938d0a151714d06f6d12f93cb5456ea695b6c0 SHA512 c9966023f681b53bf9d2c9b9f0da01f888e14b15c360e4b565e752c0013883b4a91a08dbb06aedd75678930376a8aef240e2cfa193b2b7978d4a15d84acd060d
+EBUILD libgcrypt-1.8.3-r1.ebuild 2333 BLAKE2B c9d9679dbcb7d316b0da41b3be1f9b9c9da2564cb35269e70b89244882857364ece908dcd2c4521f351e2aea2e575ea7dedbb93b268c2070c7a592d69ff159f9 SHA512 09c1ed28c41f64f5520319682e4abb327c29f4dbb34a5689383515ecc81cd6d46ac8ee2afa5dfd2c2f81e6224109d35375fa08a594cc230900d7aa41a2383aa3
 EBUILD libgcrypt-1.8.3.ebuild 2186 BLAKE2B d1c56ad5f0182fcac6ab2fa237e5205818a0f61a7edea666b1f0f1fc4fe1f95fc6ad4a410262b293fb6e47f3e570d71f552a717887a9efb921bf902bb4f12061 SHA512 8f902c37512a01fcbc83026281e8ce9f5a8dc18d975c180f4f4206c38538dad8192ff15fc3782bcb6475e37c4bfcb4b3a96ab5321e79268a91a623f890aebbae
 MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..02488a6c3c14
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--enable-noexecstack
+		$(use_enable o-flag-munging O-flag-munging)
+		$(use_enable static-libs static)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index f6340673a295..392db32e74d2 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
-EBUILD libgit2-glib-0.26.2.ebuild 1283 BLAKE2B 57d0c5d1d5e580f6d43326d183446004d2242668f196e2a6f82c950fb15b87ca9f1b3c2f8aeb9053fee7a4402279a6aa234af8af22abaf827008232f810f3561 SHA512 2c61ed36beb0422bc1acdf3209e94358fa0c6d50c520d3ad5cb9cdc4c97b26fdfb150e4ad8cea42ac2bef97b45a22303dfbddf382d642205659e220a8312112e
+EBUILD libgit2-glib-0.26.2.ebuild 1304 BLAKE2B 9a3bedeca6910a8bb1dc73783869b733c8135375748ee3be8ae1695636b7cb0e92f12fbadd701ce08ea438a10d898be30a5d10bbc25ebb3db31d82b32c6d6ecf SHA512 b111e69cd3c5ba40f24b12060c9b3cd5d61a3b425c173e14743c82dcf425b27da9786d52b79cb3c0af94302a29cba058ec70196b752cacad2262bfecdd72ebd3
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
index a7a8316fda36..0a599c520050 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 		dev-python/pygobject:3[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index cdb0a42b7e53..9610161997c1 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,6 +1,6 @@
-DIST libgit2-0.26.6.tar.gz 4734435 BLAKE2B 0831d0a78ba74b6cd989821f0abb6774f8879f18906025ce02d7c0f7f8f3e7f03b30121f79e370b85201e110a6fc4aca2ae2e608b12f01cd527ab42bf597099d SHA512 6a5a167bfe8696294cf188feec2aad898af52f4c05a3a40a55f48ea3168d200a60fc42b3819a22b1bf472be696f5dafef473d457c08bab164cbf654c4de6bda7
-DIST libgit2-0.27.4.tar.gz 4772254 BLAKE2B 9c0e7b436d8cb07a8f1407d22bcd4c7b161f3ceef9dc4e67f9daec784a1cfb9f8f2e493a78f5ef6b4893e54c1f1b567ae53ead52a992ee10eabe3229195417a1 SHA512 d27db86eb1b9f0d4057f8538ba1985ee76c3ca106e57d417fa9bff79d575f91a07ad28693112b58dc1d61d68116a82e6a145f12276158f2806b6c4964d741f61
-EBUILD libgit2-0.26.6.ebuild 1946 BLAKE2B 74710e5754c400a95e86754ff85a256dcc915cbbfa1102afcf9731ce427d9afc5f38bd559a13f0f6e47d0a6169445ecba65d3b154c6245bb760994897958e12a SHA512 721657b35fff014617ab5aad24b8977ab6117cfbab1e8eefc1d909e992356d9387b528116725501c5b80485626712145bddf5fd08fe29840ed95e619735990a0
-EBUILD libgit2-0.27.4.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
+DIST libgit2-0.26.7.tar.gz 4737641 BLAKE2B dd87ab3048dec361619ff0e42d19161e4b20a07d334ad42aa077b77202bf5e84b85e33a6d6668afef36a7ff23f85a68f28049e08dd7502b241e40a730a78bb44 SHA512 5ad0c514b6c1c58031029f4ada278a164cc112f25c36745973df27711f12888000c054816b65889576124e93b71ec9a1c4f4cc0b538f177d93a57bc145fea1e1
+DIST libgit2-0.27.5.tar.gz 4775158 BLAKE2B 118af462a4969bc802451b887386e87da0f855641a774ce7460d6fe7ad9c62ce71a4b35a7461a95c7c4a96c59143c9c1acc78c5a1b21143a651491713f4fa15b SHA512 318b981456d55f60f8aa1897f1f70274329e48f09769b661eb4bbe76399071eca0fbc7deacb3191db16bc89dba8cc69a64adaf8cbc65e34a65b6e72ca122e21f
+EBUILD libgit2-0.26.7.ebuild 1943 BLAKE2B 1b307186052d51167fa1cc022aac4f847de31e36398c8ba58b178399e2aa527e0619a09bbcca20414f122008a4e7f8344ffd8f67b0948b605ce42d3c95c4fba9 SHA512 11a0a56558a263784838c185f6967a9fba0f2206591cc1bce6f18be73ea2a990c6012cde6c370fcb7ceace0433a07353735a6d0cb0d0580cf27005f090581fb1
+EBUILD libgit2-0.27.5.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
 EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.26.6.ebuild b/dev-libs/libgit2/libgit2-0.26.7.ebuild
index fe1356367611..4b2a77205814 100644
--- a/dev-libs/libgit2/libgit2-0.26.6.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/libgit2/libgit2-0.27.4.ebuild b/dev-libs/libgit2/libgit2-0.27.5.ebuild
index d10065358a4f..d10065358a4f 100644
--- a/dev-libs/libgit2/libgit2-0.27.4.ebuild
+++ b/dev-libs/libgit2/libgit2-0.27.5.ebuild
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 2751a2d33f27..130880a681d6 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -3,5 +3,6 @@ DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88
 DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
 EBUILD libgpg-error-1.27-r1.ebuild 1287 BLAKE2B d8b77035b21a5d67fb35fa94c7581a1c2229aff20fab7ad47ab4a0bc18490d4331dbdfb81e2114b5f3fdfb4184837067a3afcca141710b1f846d3e40de2f3c98 SHA512 59121052137fb7f122a048bc320076d1d54320a41748aa5647e3d660be4b53d1d89868eb4ae23335b0492ee5b530f912449c45f1e1a5a8567b386fc7f077993a
 EBUILD libgpg-error-1.29.ebuild 1289 BLAKE2B 0d86eb4d6815b150aa7f9514e44368af4a45ab36462e4f8d858552c7b88df9e82ca103d2f742f42e5d93ea5df9721b47f08026ba99eb9fa5c63bf27bfa80059d SHA512 6b22dbb50879e62a76df64f957a23a718177a37f610b793c09c6e08c073fd882e421ecf820a0499e77edaac7cb3095003e1ccb5b62ceddb46fa88513395284ac
+EBUILD libgpg-error-1.32-r1.ebuild 1428 BLAKE2B f70906a053dd6a9731cee51b131c22152aa221ea12083353e457acc69246dcc302288bd646759d85c08321d21d03ce11e9d98ff33034f375e7516942cf8f6a2d SHA512 5e74d9b2ed48ec553d24eb088c40dbae89b9bc784494461bacd92bb8feba1920e6b48ad590592c3fb0b3ae95cc55a6bee9a69397f624d40cd2787d81861d7cf4
 EBUILD libgpg-error-1.32.ebuild 1300 BLAKE2B f7367cc13a9db8e3e671459d9dea8884633c5f401af615c28670c4902c52e9f461ad4d40b2cee61ba4aaf0b76f205ab55a32b724083a14d3762d469109894f66 SHA512 ae3d6a4c73e9ba6631a1f852278ea3a5827e81271ef90bc8cb991cd7c4b69cdf81df660ac768cd76d3a5b8010bfb7da9c7cef1421dfa1ba01138d2b03a3b0282
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
new file mode 100644
index 000000000000..92257a968e2a
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gpg-error-config
+)
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/gpg-error.h
+	/usr/include/gpgrt.h
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(multilib_is_native_abi || echo --disable-languages) \
+		$(use_enable common-lisp languages) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--enable-threads \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		$("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 1ca119e42594..b1f08664bdd4 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,3 +1,3 @@
 DIST libgudev-232.tar.xz 270904 BLAKE2B 90b2ec011f065929bd560398de9cfa8c365f9b84d205c816f2d7a98391d96bde47449eb77bc76b1e486af7dfdb3ed6525f216549e0dc3571b2ee672920438c98 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc
-EBUILD libgudev-232.ebuild 1089 BLAKE2B 4898321c81f89ddf83300bbea870bd1c3e3c04ec2785ea005785265a7ca98a4de348a9dc54803f372ac4846098336d67b71743d96d2a8bf3d3568709e6ed1fa9 SHA512 616900ea83853274a9ae05420935201d8043b1386160a6aa96d334884ca0f3059676db86c36c80ac6cf4675f4a8ed7e1cfee7d4c738cd1b6f7058e036cd6355a
+EBUILD libgudev-232.ebuild 1107 BLAKE2B 657169f15b0ced4bcf54872d71e89fe6fe9a7564e4df737b872ad82bf54f8a2fbdee47cfdd6c315ed30f6114883cfc34f57534c8643af4673baf92bea7ef82a0 SHA512 07bb376e155292c054cac61b500447f3f680874a441c024fe8d6daf882b9aaff0faa046a9d0a206e5634bb502abf41544e7c57bcc0914c494e464f97c7bad18e
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-232.ebuild b/dev-libs/libgudev/libgudev-232.ebuild
index e05ba73f4771..19cf0c8a543c 100644
--- a/dev-libs/libgudev/libgudev-232.ebuild
+++ b/dev-libs/libgudev/libgudev-232.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-apps/systemd[gudev(-)]
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.18
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 9206bd2aecb7..b52dd7e73cef 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,5 +1,5 @@
 AUX libindicate-0.6.1-no-mono.patch 1888 BLAKE2B 60cb0434e3974cf474fca729be08defcaa01d713e4039001f4994bcaae0a657fd04b0c2eafa447c25c2e56d92bddd39f2b17915fdb7d26b916eae3e3315588d7 SHA512 b2623349c139321403e285ce384191f2741b6216dd87ce5e05a439bd175a2846bca111ade729e87322a413bfc518fdfc2546274114fe5726de171b51d3be7cb1
 DIST libindicate-12.10.1.tar.gz 550378 BLAKE2B 9966c645c2538bf9246221e138771ce38e7f74629ae2365cd803a5e26372922cd5194ca1449f79a35f2bcd391e3ee2056183ab53b11fa8d92a8b2c258ead9c6d SHA512 4dcb5f292153210bc15a05f117101429da77a60b8b05b569baddf0e9043d852c2dccb0d5a6adbdf4d4a1b6f06b33c61e242bb4bcb376e3d96563bda591685c06
 EBUILD libindicate-12.10.1-r2.ebuild 1772 BLAKE2B 4e8fee45234f05b75aa26528d066db18718fdf68cf6312c4a124a81b57f2afdf404fc542634e5b0c22a9b09b90b543f5c7b8b4a337fbbaa3d487cbc7a7221cd7 SHA512 80cb5b9c8f5fb1eb512657a9df105e4540c5246c294b06dce21a433e85f92baee8308d5ee7bd0b70ba24a7a493346944b8831661d39a009d5f5671c1bc2d9fb6
-EBUILD libindicate-12.10.1-r3.ebuild 1686 BLAKE2B 8243be1670a95a6a8a4416fa93921c98efbc2120aa37f756792e63f71172a309ba5b28d70c03113a1478953ec8735bdd38d76e9198d522b353a012e4f848fedd SHA512 cc0477aca3f4c2f53337fc08bd4d28bd1c1c39fa5b853b1cfa5eda6f6e0217b24174ce83614de4c3d8bee6ff641fb48dd4ad5c4a4ce51009cebe90d05269fc03
+EBUILD libindicate-12.10.1-r3.ebuild 1680 BLAKE2B ff6b7415ef202771091e30bbb4883b20a1ce6d1e590a54c67a5f895bc6f0f9ff04e1974706795e499f5d16e00482265ae212b52be61d3f4808e54ed2708024be SHA512 060af29ebf73d4dff380ad77afd2495b94da1310e54f00d4a8adf666f4be2aee1b78f1c41666b14cacdcc372333484a47ae4a10f8946962935105d61762f1c0e
 MISC metadata.xml 328 BLAKE2B e528a6922cf244dd2e8e3387f539f9922378395dadf028852a3e17120186a4cdd82c89b29802ef5a0698a35737294733fbf9a717c3c31af90cb634ee5aa5cea9 SHA512 fc8169dee128e50da93fe6baec57989b4b2e0a59e36661328ae7bd5bf1db1ea5bcc08efb72e6ba2d0e0d9a18870144066a5c77a1f275801a4fc98953cf891a3b
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
index 73526a89128e..20f1036d1a87 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc x86"
 IUSE="gtk +introspection"
 
 RESTRICT="test" # consequence of the -no-mono.patch
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 8b6302c732e2..e5c397c41e20 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,9 @@
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
 DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949
 DIST libinput-1.12.0.tar.xz 519320 BLAKE2B b40036740350180ca0e183088651647e3604bca236ab27c99a941934b27ed67a21d8596be9baab68dd798dea9c5967cca3a038623ba2870dc2ad3db8336e0b96 SHA512 4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924
+DIST libinput-1.12.1.tar.xz 520072 BLAKE2B 2d2b2d82f27ac01ff25b3bf6fd7b77ca56467ab818cdc5d4a641629fed623ef5042915889f54f71b1881595af1d85770bbf4ecfd798c079878efa0a0546c4a36 SHA512 de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68
 EBUILD libinput-1.10.7.ebuild 1440 BLAKE2B 203a9e8e20785cb93d221d8614aec3488a316d301672d3bbacbd223cd959c31edae176c17d1d575426cec24bd6e89c82b80244bcb7273a4531743555c4ba3b42 SHA512 c0e320acdb66994bcb5fe11b60ac4dc88955cae25da1dc3de028738bfb86c57eba90d23f258ed076ddba0da2737af9027ccde6a73705e6ff4feb8beffb591f0b
 EBUILD libinput-1.11.3.ebuild 1443 BLAKE2B 95c2a74f98abe1b021f14df89375e8acba26cad0df3ebbd753844cdbe477fcb7d2d9606c76b51676ee0fb27623a5de658a6326d74d7d90e9d1cf5be0cb8d8428 SHA512 2e91a777ad1f5a3a849ad7a559f34f43dffbeda2c5be97a06c0870d52d558c916045ff98229f155527cca58e38e155e76a48473a8f03c7d3b8ad045bb595fcd6
 EBUILD libinput-1.12.0.ebuild 1443 BLAKE2B 95c2a74f98abe1b021f14df89375e8acba26cad0df3ebbd753844cdbe477fcb7d2d9606c76b51676ee0fb27623a5de658a6326d74d7d90e9d1cf5be0cb8d8428 SHA512 2e91a777ad1f5a3a849ad7a559f34f43dffbeda2c5be97a06c0870d52d558c916045ff98229f155527cca58e38e155e76a48473a8f03c7d3b8ad045bb595fcd6
+EBUILD libinput-1.12.1.ebuild 1440 BLAKE2B 0a7cacdd6a101e465108981d625476b8e360872f7f0be8a7a583415215403a31f6c2f81275d00a626b2a8a7d5d31487cf64c768f4072d76ce695b7123478920b SHA512 60b1254d675c0bae51157b20145f4ba4a40983ec2950af0862a923a72df3a6de742752c27e0408c539698d9715b938b3abd65113859c2528a25eabc66aa7e4a1
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.12.1.ebuild b/dev-libs/libinput/libinput-1.12.1.ebuild
new file mode 100644
index 000000000000..e4f4f74efb75
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom"
+# 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:=
+	virtual/udev
+"
+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
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/html/.
+	fi
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT%/}"
+}
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 1a3c7a8c9194..49eeb4694194 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,3 +1,4 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
 EBUILD libksba-1.3.5-r1.ebuild 803 BLAKE2B 9efcc44c2c4eed76d727ba908068e13edacf642d0136b54c4d310e168661c5a1cb8a9a4af90628493748d4fbcbe5c0a6489c71ac2fa401dedd076b131d98f0e4 SHA512 1f648c845434fabc1a9ebd5650e9a17a9943f82ed5963c8e5400cf5fbd8d13fc281be2f82a571616f3c55a59430f19aed69c8696c0d3ecc61a3aee3523c67c0a
+EBUILD libksba-1.3.5-r2.ebuild 927 BLAKE2B bc4a9c94d9a9ba57047f0ab165fa918fb57466e9c5745655553238f59f26d5aeb7426d4a0d8ec4283a7eab9bfc874c21dc52930adc22733a2b460dbc090748cd SHA512 9ca0cdcf38fa02a84613515bbf9bbc23c2ee250be4a6935d0bdd8aee11364f747214b81e7b3009ea842b58648d8e17b8c2aade1604e39022362eb15aa4f9216f
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/libksba/libksba-1.3.5-r2.ebuild b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
new file mode 100644
index 000000000000..ef29c486e9a7
--- /dev/null
+++ b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.509 and CMS (PKCS#7) library"
+HOMEPAGE="http://www.gnupg.org/related_software/libksba"
+SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
+
+LICENSE="LGPL-3+ GPL-2+ GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+}
+
+src_install() {
+	default
+	# ppl need to use lib*-config for --cflags and --libs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index 48e6fbe5c87d..e53841a6d1eb 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,3 +1,4 @@
 DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
+EBUILD liblzw-0.2-r1.ebuild 481 BLAKE2B a68d77abd812adcbc20377de1b9488b6c92fc1d941bcc54a68260afdc877f678daedb639bfb9e74b8b79eaa6e46968f910263eeae44b60c53b48003feae02ef0 SHA512 2f3a763e301016f849b5648cfa0d5c6db41175801c4a79b10059a48a2672e26b89ef0797880720dac6e0f7757fd1fd967f7f44a5488a6512235addf098d312a2
 EBUILD liblzw-0.2.ebuild 465 BLAKE2B a0ce966c22682ea2a0c95a5842441581a58f6eb479e8906786f45e4c706cb6979be80c0743ecda7f520011697573c146eec76d1a0e5b3e482a3c39283dac7393 SHA512 68d82e623358e6abdedd188709c53409669343ace16f7277484305dc014813b80c3b17733d13246c61ef3d081b3e100146ad567702a5fca4e932a0501fc23669
 MISC metadata.xml 298 BLAKE2B 60130700ab462ebfa04aef1cd0e9eb03149d92258231dd3d8a0f15a7a374d3f3d0990600cb028b63617b25e4a3c47ebbe5fc4a65e8631105273e181f53211a74 SHA512 6bef7a0d6aa13e842ecbcadde45cb547b121eb8e7683289c279b9850fde59361e7be855b6dc0e54f7ec2094c55aeaa35e95595754a9a155ab651ccb7203f2280
diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
new file mode 100644
index 000000000000..d2613787f461
--- /dev/null
+++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="small C library for reading LZW compressed files (.Z)"
+HOMEPAGE="https://github.com/vapier/liblzw"
+SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~sh ~x86"
+
+src_configure(){
+	econf --disable-static
+}
+
+src_install(){
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index 8e8a43937a65..cb653c3ab2ed 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,9 +1,3 @@
-DIST libmateweather-1.12.2.tar.xz 3394620 BLAKE2B b95af472d88c6c4495422251cd8f10a50b739b26f535677411388e6fc4748512768ae153cf0283ce2ee2697712f2f773bb8df231630782df4dd6f61e1c52754c SHA512 057037c6983ba6d21ae8c9af67d5b1bde1f7da81dbc5ef89e5eabc1b844178d2d121d29d90484baa001d22cb24e8dc832bcb1ad2702460d22f48db430fa20fd9
-DIST libmateweather-1.14.3.tar.xz 3345244 BLAKE2B 1db6f13507a10c6ad9bc0eed69b9cbdc35fa9f601ef80993a419238234c8a62a1d45f0c215d2c9347ee6622a9eb30faef76452acf8a210695051654bdf1dd227 SHA512 51e1a29b5faca6d433f6a84fc3e08bf39e87ac48d77ff90085cd7d394b3f31388f7b6b3382e4b75dbdf3b2d07f16e9f9f92bff713d3a038270314313f614af36
-DIST libmateweather-1.16.1.tar.xz 3346620 BLAKE2B 4bf5594b879517f00faf3c41b97642945cf0a8dbb65eaf66672f5d5c70432c136802743109ef74dcc67c3cf8e64ed2099f98d2167f5ffccf28a93d1b03931e76 SHA512 7cc49cc3fc16a3f06cd50db49f868d8f31a2acc95cf0c6912724248a1b35700ae0600363cd891d5bdf9961d3ae373841a0df412382933084f5e5224ff21aa386
 DIST libmateweather-1.18.2.tar.xz 3455940 BLAKE2B 15cb57c0202c1117f203bd9550c86d255404984e9163a7f79b8f81a0c436ff6bf9e1945536a15078ad479c9379798966337b6b8851ec84384ccc08c352d06260 SHA512 9b0f9b11f0c9b472a13adc1cfd26076dffd278e0154efa4248f8cc4a999250c88c761985b9a18978a7581e5459232fe2314181ae26a1c7c4fd4c80b536827504
-EBUILD libmateweather-1.12.2-r1.ebuild 1351 BLAKE2B d32c05e9f3b19d85e983006bac8b5a7e213473e89df0d85477c8650ea91adbb3f7e16013a612330c548c54aab3fcbbf2a1db680499d2fd4a7a5d8dad4e7475c7 SHA512 a8c4479e2b4a2aaa5079598906a3b005b8fbfb6f45101c5cf14890c4fba168b65219080507e163e486477cf91342ccbbcf9beba7c407e378e249555b70257951
-EBUILD libmateweather-1.14.3-r1.ebuild 1393 BLAKE2B 9f9a6f172ce2fb888f88b4bffc1f3da0aa38c6899de7c3b17fe8274020e9a634ac97df71442c8055154c635d9154de2c15384f888aa0f35dfc76f16f390e2d24 SHA512 a8e6b2fa6abcc518c0ca56f7b770578209a508ffbb5b97b2b147ff7fd602cc3c2a1cbe657f198b525a6f91f8d0bb13fa89aa63cd9e578a39512d26707a7690d5
-EBUILD libmateweather-1.16.1-r1.ebuild 1393 BLAKE2B 9f9a6f172ce2fb888f88b4bffc1f3da0aa38c6899de7c3b17fe8274020e9a634ac97df71442c8055154c635d9154de2c15384f888aa0f35dfc76f16f390e2d24 SHA512 a8e6b2fa6abcc518c0ca56f7b770578209a508ffbb5b97b2b147ff7fd602cc3c2a1cbe657f198b525a6f91f8d0bb13fa89aa63cd9e578a39512d26707a7690d5
 EBUILD libmateweather-1.18.2.ebuild 841 BLAKE2B 89c03dce2df151e8543f7bf98e0adf752121193cfc0880a85934c939bddc09bfa65a280caff3cd1c82fd0bcc8abd7104bf44eef4eb408fa960b34159945fcaac SHA512 62bd8582102a4e79ddf286bd86325107cde4c7219b41e58ed2aa0669b03223f8f5a208c445c9c7e24e6111497bb8f33cce8a117e7309e4a1a16960eb4d5d0331
-MISC metadata.xml 419 BLAKE2B ce791bdb7144ed1cece755cdf8d85dfff6ea4f06f44066de84e73087817e113e2087fd9c33f10e3480c363d46c5e4b08a7771c3cdcc2766a0b60c315be0a0449 SHA512 72aa11bd406832fed28f2a95e1ed19af5c483ce4238ac76a3d3364bfded1a6d823ca62e2c9e794b37a9d58d9270f92aa03f392b5307611b6b17cb148e826f5fe
+MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.12.2-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.12.2-r1.ebuild
deleted file mode 100644
index 594d5bf14f73..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug gtk3 python"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	"
-
-RDEPEND=">=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2:2[${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-}
diff --git a/dev-libs/libmateweather/libmateweather-1.14.3-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.14.3-r1.ebuild
deleted file mode 100644
index 6858f117b265..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug gtk3 python"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2:2[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-}
diff --git a/dev-libs/libmateweather/libmateweather-1.16.1-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.16.1-r1.ebuild
deleted file mode 100644
index 6858f117b265..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.16.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug gtk3 python"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2:2[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-}
diff --git a/dev-libs/libmateweather/metadata.xml b/dev-libs/libmateweather/metadata.xml
index 7cbfd82a6056..dc3f1bc34c2f 100644
--- a/dev-libs/libmateweather/metadata.xml
+++ b/dev-libs/libmateweather/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/libmateweather</remote-id>
 	</upstream>
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 0a92ba7b8f05..0d75188408de 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,5 +1,3 @@
-DIST libmirage-3.1.0.tar.bz2 234649 BLAKE2B 1b0194fc6271454481ba752f2e7241d9aa69b8d1608dc059b17eb32ad78ee7721d0f85677511e97ccc6fd708690950d0ed6ab662cdff4ccd94804b1a5756542b SHA512 fcf49b171b6f84ad32cdeeb63def76e8bd5c5f33aadcc678e06d7388d0c351e8047beae6db9db7b69f704ab4db86aca4e8fb9817b2450c70b5f1d3d7a3760394
 DIST libmirage-3.2.0.tar.bz2 234214 BLAKE2B f2b8c42eed89efaeddb8051160c51814b4df45c1ca7cdb4cef683b86ea73dcd1446c6806588a9df0410da5b3971ce8945f2479022f21177237ee8b0d4b18d2d3 SHA512 15507154441b660f5a58e1101d4e6f9931a7640b90d3de5e387274c72be07f367b54a6be34dd31442bc504459414f611ffc39f86ff6a7381a820d059aef1d6d6
-EBUILD libmirage-3.1.0.ebuild 1178 BLAKE2B 368ef1f9c2dafa9706b90bd21e360a85997c7f6347260b23f566851eb84d1f0b482dc0367b81ba7ab888d5c80e08718201797d327bce2e6deba61e4a7aeae81b SHA512 e73f833029df60b402a6c4ee05e348c579cf358a5e5a66743b51710629a26d420d88bb5ea336a32ff03207204794f847bd1d668295658a3e4e99f1500d92ed13
 EBUILD libmirage-3.2.0.ebuild 1178 BLAKE2B 8b781a34e0f1e0d8049b3be8b4fb3c0a11c96cf3bcaa655ba8309ef14e5d298609f6a78f383e1a6895e726b31a442b34c4581c610198bacb517435799fdd4a05 SHA512 491e40196a432fa0fb4d3d1d6adc430e0b0d6fb04b9f1d2b23450c35e4c51aa6984a61d1b9c934b7fa6d856875dc6eaa5204bb46a5b732298409ff467e38a931
 MISC metadata.xml 455 BLAKE2B 23500677c263c1b8fc4839698bd6f1c08e9821fe4472a0b1725ad4777cfff385531ab6ec966f32a2335571c315b6f886f973451076745aa9fe4297c3cc436a30 SHA512 51c8d87f3c49c81798e4d2e038f911a2e05bfde742f229939f759c6768c6459cf4aa6829981791c57ef766fd447923194d7c14d4ad16951ae505d3b5a73c3479
diff --git a/dev-libs/libmirage/libmirage-3.1.0.ebuild b/dev-libs/libmirage/libmirage-3.1.0.ebuild
deleted file mode 100644
index 53a4fe0fd81e..000000000000
--- a/dev-libs/libmirage/libmirage-3.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="CD and DVD image access library"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=app-arch/bzip2-1:=
-	>=app-arch/xz-utils-5:=
-	>=dev-libs/glib-2.28:2
-	>=media-libs/libsamplerate-0.1:=
-	>=media-libs/libsndfile-1.0:=
-	sys-libs/zlib:=
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGTKDOC_ENABLED="$(usex doc)"
-		-DINTROSPECTION_ENABLED="$(usex introspection)"
-		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS README )
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index ecb842477581..39429f503b13 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,4 +1,6 @@
 AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd432fd679ab61620aeaf654041cfb6c39a18f3be475bf7e0a93c004d7c953d6f2ed66e4528d3b546e9d22b28e1e666c6d9caeb SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda
 DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
+DIST libmspack-0.7.1alpha.tar.gz 486840 BLAKE2B f97abba7b261cced6e5c500c50243920c44ae8bc245e54386c4568e17989f2bad2c3316d83ebbd75220b50b09ed4ded156965e9aa430bd207aaa6b7c6218d800 SHA512 e903629a34c29099a261a108e4eb9cda485ab999bbc3383e3cd6a39715077d00b26a1c641b0f3df0eef60d2e15a7ef623379df0cfe25b99d4eda080529ffec7b
 EBUILD libmspack-0.6_alpha.ebuild 1179 BLAKE2B 26b87e8a8c53c60a7f7d75aa8f294c0edaa89afed3e2ded99c97700e3d5ec0154c7610883c9b0f504076389033ae6edad381b13ef40e465ec1da7bda6e4d9335 SHA512 ec70ba20463026e7a918908484fc114d78ca572ad276ed0e9cc77087977b58afd5be9ab8d384df58810c2801c32d1096de36d217d9656d64bc82c33eb34d255b
+EBUILD libmspack-0.7.1_alpha.ebuild 1347 BLAKE2B ffaa1c2516bcd34312195cd5f3345c5c201c9e701a2cfadc68c6dcde8730eb8da694d85fdc869367f1316273fcf8eafdcbee5b52dfff82f75b68a1d2f39110f8 SHA512 74f9481d5e94c72ad769a97e3a0f98bac1f6253a909e20221c1588f9d2a49829d499b2d71aec155054076580400250e2697e2bcbc0e732104fdebc2f160c0dbe
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
diff --git a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
new file mode 100644
index 000000000000..a75ec2a107d3
--- /dev/null
+++ b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils multilib-minimal
+
+MY_PV="${PV/_alpha/alpha}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A library for Microsoft compression formats"
+HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
+SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+IUSE="debug doc static-libs utils"
+
+DEPEND=""
+RDEPEND="
+	utils? ( !app-arch/mscompress )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# https://github.com/kyz/libmspack/issues/19
+	export MAKEOPTS=-j1
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS=(AUTHORS ChangeLog NEWS README TODO)
+	use doc && HTML_DOCS=(doc/*)
+	default_src_install
+	if use doc; then
+		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+	fi
+	if ! use utils; then
+		rm "${ED%/}"/usr/bin/* || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 4192ee599e15..fdbdee33ab40 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,6 +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
+EBUILD libpeas-1.20.0-r1.ebuild 2212 BLAKE2B 94369c4abc1588f29d6a110b9214b25ccc43f4726c91ebb007f1e72b46716bd7dc99ffc18e4c4586e342ff520b124fdaa7909c83c29b294379f8e4a892fadfda SHA512 8be3b2b79b1c7f6adb3ead0aaedbf190723a4526a453553e975f87d9d9cafc66e8e8ba56e4ff4023a3504bd80c3eea03f2a298aaff143cc63bc42dae870d3e90
+EBUILD libpeas-1.22.0.ebuild 2214 BLAKE2B a46dee4e46b038bdb23673db638f532b35d8c1306a3acecfc132d57380894ae249965a624b4c6b3bf0ff9b4806af50e9c5103d3e2ede4926fac2efa193be8e92 SHA512 ccfb81db1a18863d8f639a9b76c48543165f89bb2202d16b0354395d72f7cf188f5102d49bbbbfb7d89a4cf0d3b21ed63656fe92597af38aef05a056ee31ed40
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
index 9eee684fe8be..347976db785f 100644
--- a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,6 +31,7 @@ RDEPEND="
 		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0.ebuild
index 8d8c434cf020..943446685b42 100644
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,6 +31,7 @@ RDEPEND="
 		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index eb5ab69a5a1c..6b64e4dd7bfc 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,5 +1,5 @@
 DIST librdkafka-0.11.4.tar.gz 1900117 BLAKE2B 3e755c91d6a2e12829ba841749977f8c05c9f243d79db64247547e4a49790e67d07f7d82633f45689dcc5f88caaef200027e6af3866de283c1de6120d7f98467 SHA512 6b34e7c476d328a2f8e8321f6ddcaeaf43730284bb3aaddac81c3cd9a1fa5d7f7ef7481f1093b36d89edde7b766da6cd27a9eb9a635b12b640e8a46a269bafc8
 DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
 EBUILD librdkafka-0.11.4.ebuild 1251 BLAKE2B 27576a7d2421373ed2d13d9f0ec566d6575c137372f08000271ad0e7f492c22d19a817d803816b2aacd9ceeda28a5f2c4307f56b7302efa8734a52b3b0b2db37 SHA512 9cdeeee1606f1108e4ad3e203ddcb4f99dace5768e4fa37bfade9b4630e60e7fe6899b17d231c8fdbda9d1ef513a2f5f3868fd7153348f386090db3bc3f94e1c
-EBUILD librdkafka-0.11.5.ebuild 1256 BLAKE2B 6b789b387aa1c063bffae6721a597ee16bb0f6679021a0c65e1a2c9b65844ca2e06cacc936553733feff6b3b6ecdb9ffdd4daf1a9e0e4e2be0d09170a63eca44 SHA512 bfe22f31e565a0690af0bf1e8edc4836612235edda04dcbb826e9f24011a2abd9a6924e0891c6ac5eb489fe3a24efff5857cc157845733f5cb77e9a9de10e259
+EBUILD librdkafka-0.11.5.ebuild 1251 BLAKE2B 7f395b4ae2c92b1ff4a0c110cebb46a30379b0bce1994bcf2e0038fb81c2408f6bd2ac3e902fbcf3018dbd249be3c65f0b334cd4d27d93963a03554292cb1875 SHA512 83a55f1104a0f7061e377358b040f86ce932f469de90ab4296ecf5229e8b9883d236ce785695277ad4dae84aa7dc0a731e48110502d8aafc461566c003925fee
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-0.11.5.ebuild b/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
index 5e13b2f3eb90..cbd1e8fd3d24 100644
--- a/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 223c6f07c9af..30334dc8a384 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -5,5 +5,5 @@ DIST librelp-1.2.17.tar.gz 506426 BLAKE2B 998d2845263655a43d0cb002c4538663047f2e
 DIST librelp-1.2.18.tar.gz 506766 BLAKE2B 939bd2279e03a6431fbdfb787aa3d62b3f622ec3248dfc7c0a0a141294c27319081092a624c328374cdba0cbd51659301a77ad41bed27ba13f47601f7a607944 SHA512 7193438238b7019e7a4944d6d900a1fa5a369ff8a6b97a6dca7e82b6637c0f391ec3554eeeaa285881457cb2abe72fa1a893244ec9a36cc9d2e2592d58c5462a
 EBUILD librelp-1.2.16.ebuild 1121 BLAKE2B d273b6b565f873de81b7e9f4ef5898b27b9e89a8b6f55f34af56d9a1ec4fd737906124449192ca1a34964f1f83392d8f31260bda8788f408fed0f21698d13a5a SHA512 1c97eca0f18370667f0d9efd30d42e8d1e047cf146c505731a6005da2492a10e1cb9dd5c26e210e76018c0763f6be2ea5996ec8d7b3c0277396b81f44f772df8
 EBUILD librelp-1.2.17.ebuild 1453 BLAKE2B 0340264d4d63c0b46fdc82716e3232355131121204108f247ade16c6ff5bc194ca0b9fa2e5d69b928c8793af537310d19fcc31e8b154226ff7bdde14bbde8f74 SHA512 0aaf5db558d22b5b79b36df0a32cc88c9b649a6d0457002e5553a414b8c058af68efe18570c0822f95708f69acec2fefcb131957e40bb775b55570c376ec29d0
-EBUILD librelp-1.2.18.ebuild 1450 BLAKE2B 2dc770f3a5df10a91fdb9dfdbbbafef121c2716059458d40fdf74d818c120ec98ed30442576102d2d6b1fd345d32464d5998c51d6ee1c38bcfcfd2544fa2bc38 SHA512 9f79958875bc5b457c0c1105016beff198e9c157aa47100f41dc4796174c6a720d9cd90af6fed441c6213c93b5943809d5317c8fac6e1d658bdc772ab3feb091
+EBUILD librelp-1.2.18.ebuild 1448 BLAKE2B 0b4ab1fa9a6cbf0c8ce6292ab91532696097188da64f3fdf89817ebd8dc356ec1c2b8215aad30c56ae575fe1d2dbc3d8db388b0724236d494783847611966908 SHA512 0ec2fa4e69440f21b6784e068366c4805f37109226f9a53633b6dee17df5be95c3243690082a17e2f6ee108d2c1163c2f50c7a3b86023da98fade0982ca7b56c
 MISC metadata.xml 503 BLAKE2B 987b40e4f9b5e33e1f293023237b7d0cb614ea36113d6d5becb780fddc729a2a2a033cab8e41b64a0465d0f14e220c96787e30b7b133979e36ad86a1273ad0a8 SHA512 31f5e4ece41aab561a70c7b9af6119bce8c3cb7fb6720be754dd925ee656faa75ee953cd3d296d1b8bb5f48368d015ec5d2768d217b349f1689e767424786e3a
diff --git a/dev-libs/librelp/librelp-1.2.18.ebuild b/dev-libs/librelp/librelp-1.2.18.ebuild
index b57bbb9097e4..d6002e114922 100644
--- a/dev-libs/librelp/librelp-1.2.18.ebuild
+++ b/dev-libs/librelp/librelp-1.2.18.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.4.0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )
 	gnutls? ( ssl )
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 817455b54ea9..9a63a5831cfa 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,13 +1,10 @@
-AUX libsodium-1.0.10-cpuflags.patch 1261 BLAKE2B 7c6db671f50891243b5c235404991dbfa5b5ac3ac6424669e73d0e10713d9734f3ce58223f300b865c58962170c43aa823f221a00f41c596e95ee84029cdf089 SHA512 ba8ded5442d027d6b85d19d12dcee4a42234013062e9d4d33f5016ecb455401284b48754069277839e5095cd814de7f6e8c1e93ca5b1e8999f2c8e1b81296bd0
+AUX libsodium-1.0.10-cpuflags.patch 1262 BLAKE2B 64c222e8b67fa85968151238bdd397d8babfcacdb857c54c8fe54b148787a111d9246583c312593b8e803c7fb4a21143ef7351ece2d4d2d5d0518f32e05de46a SHA512 eab27424dd5c506b1f371c156f656f4d95189329053c5814d5212f3503f39a02c1583fe8c6ba9bf0f7e6240f8a94ffe448656857e0be174b354f67bae3e1e2fc
 DIST libsodium-1.0.11.tar.gz 1846782 BLAKE2B aadab6c89d11740dca72d7686d06cfeca6c504fca9e78108778817da4071d9e7bb6115df42e9509cd872ae7a5489ef15c099cabaf564f28e90b7f74a63bae140 SHA512 4b1293c4d0e52264beecdd05833857bc4d77d1c2a97eea0138fe04df383b9a2dfcad4a79ccd9aed8f6c0047ba67c49292b0d2ccf987ab0b5046b46b1586ccbd7
-DIST libsodium-1.0.13.tar.gz 1895139 BLAKE2B cc59f58f0bcd3c7d69a32a401063f8514289a3bf655ccea303f37ec9c08ad16c8780981999f99efe8257180ef45d86af8f512271eb4e1232eefe6e5baaf300b2 SHA512 c619b12fdf0b2e59174b6e383a62d5499ebcd720fdbb2c1a41a98a46c285df075202423454b294fefee185432441e943805397d7656f7cd7837de425da623929
 DIST libsodium-1.0.14.tar.gz 1876526 BLAKE2B 37e9b785cc397f58ab07e38eef9e6f3ed8a2dbfbfd1c865b64d8d9b9440db3f8aa32671065cebf4f73d449889e7abfacf63910add08f0e27582cd6fb32bfbacd SHA512 46663b05aab13ec4003ecc32c89bdaedf60824703be522661eeaa3db8013140bda434c19a759dc38bcbce757e9673a03e701c0eac1526a31a4b7a15608ae8696
 DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7a965b36920c744379c5939643e588687032478e3d7a79b4614c5fa57b0dd2afd216b2e23ca69ad16ea67764a840ca SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc
 DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d74bb9f850364bf0670547a12842009c0ca32d36d06053906fb649497406b1d7988e167772d5f1138d23798d8775f7 SHA512 eab917d599c9c1fe971a6ecf915b9a6476ccec2d46cf23cbfbf06dd3833089b422f192de4d55f17b93362f1251ba8d5ddeb95ced1a422a3a2631b4b82553907f
-EBUILD libsodium-1.0.11.ebuild 1042 BLAKE2B 95f1c5cdf1ef19da389bb03c973cec7c5e93cb7c09dced6eb2b0b7c772c18811b82ce9db2e41adeb7e91a0ec94a58103ca129b4f7fe8e4d5013e0a75606858be SHA512 d70a16a7e9c752f7d649b23f697f7f8b52e1b51ff5bf8904b73ebe2bc830ca314ca7dd574b91ecc28e7458776a98b79bd36f3c5457081e1576242cfb5bb8955b
-EBUILD libsodium-1.0.13.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
-EBUILD libsodium-1.0.14.ebuild 1052 BLAKE2B ea8f2cb2872ff2803d9c2b56572b864fc47885645516d966f5ca0a7b77a06f7af76c5973461bc6bbecd6aec106205999291337762c850a36396d5a515fed1462 SHA512 46407c1cdec13c2db6f5399ccdf915d51bf3b34fa1f6fea094360e4a295347ea47356bd340729efc5511fd92246f2a087f829a57d72a00e48184392a101c7bb4
-EBUILD libsodium-1.0.15.ebuild 1047 BLAKE2B 1cff6b973068f72f2e2810760be7bd51416bfe6ae7a79cd8a266e234577046d52ff49f9a3cf940dc2538a952e8c566614f7918d11dd44d17d78d5b2a7c2e662c SHA512 613ba210222df239cbb6c986e472b08e27a83e48016016adcf2d14280587390a7807c0f7d6b5f1c3fd24d506d8dbee40de030329e3329a7d004fa37e0aa131fe
-EBUILD libsodium-1.0.16-r1.ebuild 1204 BLAKE2B 7b3cc043c5cd3c91e75177878156cc2c4d63b3e8c109801bd604b9f9d8e0e94f593c983da16e065c9650dce785f67fece9d71cc835f1457b5092dcb20e14c711 SHA512 1a7d8bc354f2cc6b76706e4e202e6a0ad997fd0523c50598d92f56b13a3e370f0245f3571a4304de92a680178e1f696ac1bb588933af1f4edb8ad593f0f9d42d
-EBUILD libsodium-1.0.16.ebuild 1064 BLAKE2B 80b0f5bb116fc2da72b1d21f824c7a859feab1ae105222dfbcdf734ae23f10dacbe712c0320d4172b6b57b1928bf4432dd2c49cda21c803a061361bd9e2c6f2c SHA512 f21c78a4250393a583ec41f1f13fa14e2aff7106abf63d529ee92a65c346b5b62ce75ffb4528d538a02fbacdc018faee67e9440a9cd534b59863817900a7f19a
+EBUILD libsodium-1.0.11-r1.ebuild 1039 BLAKE2B d5abb8deb7cbe76beec8cc9b5a5b2300d1a6d62117b33525bc1087e1f09a499a4aa0e7e279dc5dd003a3e2f18dae20104262da5822ed6d62ea63bdb197f792de SHA512 93eddc42552a4921d4de77603e8b26fbc29627b44edb889d85fbe9948ece1f0864053a8b09f5f6457eacd6e6bd1da078a91d5c67266395e1e1f5edf20b1dcacb
+EBUILD libsodium-1.0.14-r1.ebuild 1049 BLAKE2B 6a2fca4e15d07b6f757012c33597beab78c3ef05dd57928876e8301c91d710c87a1c8ec168c8deb98d4f211a0d945ccaa85dffb588155fd36c63f5f7c286a019 SHA512 ec83eb24460a3614219d1139982ed129e1c2a8fb1e459e769084280e296684671e4f82529e4c3945434a3ea345042617e2ec5bd94cad8e9db179c08c9218a3c4
+EBUILD libsodium-1.0.15-r1.ebuild 1044 BLAKE2B 1e07b5338e770271c8a0ea1833d066d88b95a61992dd5cb98da4ff5e3c897c221e6c11651871619f145bf4f55fb42b1c993fd7970470913356c8b94244a1e633 SHA512 bcf15ab7e59a53ee010fe61cf76715d46ec021b4565c51fb363513e6b9e65cedd4ed4369dad97e3c65d6e71d29ef7e1a85f7883f97c54820a1edc527ae787abc
+EBUILD libsodium-1.0.16-r2.ebuild 1199 BLAKE2B 6df35838a1c4c1194457b91372692a3cf59158462d08865d8d7480a7027800fd96eb9eb17385c8d6308cce01dcf6abfd4c8776b6a957e9ad49ee141cb3072b93 SHA512 6dc67f08544c796824367276b042835d01aafe68e93575a09d8685c66f48fb60c4534d352042fd360100e236951b414a83ec42fc94431aac3654f266221e2f3d
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
index 09e5c01618c5..544c283d8509 100644
--- a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
+++ b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
@@ -24,7 +24,7 @@
    CFLAGS="$oldcflags"
  
 +AC_ARG_ENABLE(aesni, [AS_HELP_STRING(--disable-aesni,Do not use aesni code)],
-+  AS_IF([test "x$enableval" = "xyes"], check_aeni="yes", check_aesni="no"),
++  AS_IF([test "x$enableval" = "xyes"], check_aesni="yes", check_aesni="no"),
 +  check_aesni="yes")
 +AS_IF([test "$check_aesni" = "yes"],[
    oldcflags="$CFLAGS"
diff --git a/dev-libs/libsodium/libsodium-1.0.11.ebuild b/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild
index 0ee03ff85352..fe9bd6598f34 100644
--- a/dev-libs/libsodium/libsodium-1.0.11.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/libsodium/libsodium-1.0.13.ebuild b/dev-libs/libsodium/libsodium-1.0.13.ebuild
deleted file mode 100644
index 2b80cec2ea29..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# --disable-pie needed on x86, bug #512734
-	use x86 && myconf="${myconf} --disable-pie"
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.14.ebuild b/dev-libs/libsodium/libsodium-1.0.14-r1.ebuild
index 2b80cec2ea29..6d9c86e10fa9 100644
--- a/dev-libs/libsodium/libsodium-1.0.14.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/libsodium/libsodium-1.0.15.ebuild b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
index cfce5ad6f4cf..cbf53540a9cf 100644
--- a/dev-libs/libsodium/libsodium-1.0.15.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-libs/libsodium/libsodium-1.0.16-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
index dd260ff32ea3..2afa35b750c9 100644
--- a/dev-libs/libsodium/libsodium-1.0.16-r1.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
diff --git a/dev-libs/libsodium/libsodium-1.0.16.ebuild b/dev-libs/libsodium/libsodium-1.0.16.ebuild
deleted file mode 100644
index 6144b166e52d..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# --disable-pie needed on x86, bug #512734
-	use x86 && myconf="${myconf} --disable-pie"
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 1d3620fd1899..6183d1107bf8 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -8,7 +8,7 @@ DIST msgpack-1.4.2.tar.gz 776384 BLAKE2B c8605847aca3faa3aba2c573bc6f020fbfbc773
 DIST msgpack-2.0.0-patchset.tar.bz2 1645 BLAKE2B 273faa0fe88f4da06b57b7deb02de77191bdb6c5ca76d314043636979157b879f73cbcb0a0b931cecb3eb0f706b3c6cce0e42350eebf20c44503393504c9edb0 SHA512 7b40b0e6675b333bdbf3d811e47a55e35c4aa136e378966ce3e5f42aaf6de57d883db71ed5c189c6da1803d6725847db23f6fdf1cc0cdc921d3cadcf245545c4
 DIST msgpack-2.0.0.tar.gz 446063 BLAKE2B 24bb0657dc8f190740ae3f91541f702d9954e1ff6c12931c43911556a1d34634882dd59678e5aae4a4b55733620a1445c2fef0379be9454b0fa32ce5d7515f08 SHA512 74d1c9641ecdf1a54346088c59415cf778821dc6f6acb0c5a8a93c2284edaf53c4746459093971d96136279fbd8de10cb9a43dd8d8220d335618ad30e971e9a3
 DIST msgpack-2.1.1.tar.gz 460168 BLAKE2B b6e3746033e4779139c5efe0d48eb00e19badff17f910f5a5cdba8ebdccb178f88cbb4e6e85687e4a2ddb0d5c9e6b53dec1e4cc2cee070b5e51e38c5a67b0ad3 SHA512 31ed6fda498d43da6fdbbe000ce36c40e4cf886f00d879c57d406def7f5bba4eaf66f02f221398cb50f6f4c748d5cde9c97eca0cfa21b368c7c933c3301cf9b5
-EBUILD msgpack-1.1.0.ebuild 1063 BLAKE2B b01756400a2d53df06f2ef9db07d917b2345222e2e8aeae733a15c8f2868bd5c5facf918e41f745e470b975ecff7cecf9f5dd625afff15bfa6df763a570bbceb SHA512 357f12d850d2a039e066e51907679849b59783ed6ee26ed4b2d4934850274ee4e25bc5b338e2d085ad1eaa750d5724786606e4ce17e2f097f65816e2e9e2bf26
+EBUILD msgpack-1.1.0.ebuild 1033 BLAKE2B e41916d1f6989bc7c51034b13014b7082ec7e211ddfd2f8a04954ae4b6d401b79280cca54c7571412e28a487339f7ace68b05fc7aca15f0c8ecd8359a67e6ee6 SHA512 2184c7b7c056ea3dcce1c7502b9824066ffdcac16abed62b80edcff6af977c9694e0b3c652cd1abe08bc87f7e767e7e4cc9660370ce7f1f0d1a8e2b699b3dcb8
 EBUILD msgpack-1.4.2.ebuild 1674 BLAKE2B 2a36fc474c50ed7723ad62a2942946c62a0eddf2def09599f1e15215f24c0ba7c560f6e904a07f4cc672602a802a3659a00ce590f0f70d1463797a3f7d2cdfd1 SHA512 bc91ffe2886996f3bec6519cbd22702395efe799793567c63a43d211e5b59e2188bd9194adc607bb5fdc5ad14199a51717084aa941a400a61b1a32ba1ce5a976
 EBUILD msgpack-2.0.0.ebuild 1023 BLAKE2B fce4463e3f3b4c66ab563b2e1ea346808b0c4b4d64e1392c6e857f49db1d25dd9e3fabda8f70f4c9f07c23f29b3aa3ec042a332ccee15b1c8b647d0a765ef141 SHA512 9e920a7a0e0321cf9ef8001adec487166733a8ecb9e7aa6d4e6101b7aae9215f2389f3738724bac5acdd67dac5de26ea9b7913b8acd6c7a4cb61349da639302a
 EBUILD msgpack-2.1.1.ebuild 1673 BLAKE2B 3c50da3985f6154b8896c0913b93319aa39d181e43f252c5a89dca2b3ed1e0da6e0ce71f70dce4f62aabc0c27f402db3c0ae87ae27f6a6eb54b857e538feba0c SHA512 9f3ed1a223c3390b60c3790885ab7e19cf51f2071c9078f1f5f9de1ade7707f06a54b7f77d4f0d1169d462d70f6f341285e0604a03ce2a1a815d871dcc47c702
diff --git a/dev-libs/msgpack/msgpack-1.1.0.ebuild b/dev-libs/msgpack/msgpack-1.1.0.ebuild
index 9b281e2b23f9..5b8c66b8a343 100644
--- a/dev-libs/msgpack/msgpack-1.1.0.ebuild
+++ b/dev-libs/msgpack/msgpack-1.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-multilib
 
@@ -37,9 +37,9 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use cxx MSGPACK_ENABLE_CXX)
-		$(cmake-utils_use static-libs MSGPACK_STATIC)
-		$(cmake-utils_use test MSGPACK_BUILD_TESTS)
+		-DMSGPACK_ENABLE_CXX=$(usex cxx)
+		-DMSGPACK_STATIC=$(usex static-libs)
+		-DMSGPACK_BUILD_TESTS=$(usex test)
 	)
 
 	cmake-multilib_src_configure
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index 93a1bdce0bf4..19712eed7b20 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -5,5 +5,6 @@ DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10
 EBUILD npth-1.3.ebuild 675 BLAKE2B 101174fbc1293b04ee1b227560213654c2dbe7488dbdbaeb8de89fed9ab4462e22aaa7885f296f7188a7215f599adb82b73ff23e1af88576fbd44f5d93c4be30 SHA512 3a699b2874058b7fe4614d9d6853b10178565092f68aed700f12a79ea7ec7ba28e7e30e97f5e0c766066223d224c58cf14275986edf6eef1b521ff1c270504c8
 EBUILD npth-1.4.ebuild 690 BLAKE2B ebfdb4fa6dd18b1ba10b0eb7cb87b9506151db6906e10ecfa7b3930e9b11dede9212f46109bee83baba3afce807105abaae322f4bb825197d7466b5dc60b51a0 SHA512 c46dca3ea141e43649d01408d668ab3619fb06c1ca2d66eaf8c44d250f983886844e20ec79aedf3731c257118c3bee96d2f3003de55559cf5db399adb0697006
 EBUILD npth-1.5.ebuild 759 BLAKE2B 8fab769d848c8f18dc3b3ed6304e994ef75a218aa194b7aae52abb4bececd80696824164dd9cf7e1677b9ec078d2327104b298e9fba49a9c6a2647aad2a1e6d4 SHA512 76f6420df7ea25fc796356765cfc2f1512948c0b089e3fb1335c8ae1e32c380701a581c4bb1eb6c9f46dc63be056314a341156b973c138af59e7a47d93b34043
+EBUILD npth-1.6-r1.ebuild 775 BLAKE2B 8b5d532ba541583413b1945737d42f4a043d1215e6431c7defb127c34c8f6113fdbc4c8e2ebdf930a1bd8c4465fa8f27d6a1e6ff9598e09f37908c23944f247d SHA512 d0102def9bcf1e86a1894db0fc04a055c569eccab77d9129797f5c51c2be4774a546296b9b08740336da901ee79c42011c0e74898b51f30399d513817a16aced
 EBUILD npth-1.6.ebuild 771 BLAKE2B 468a628fcfdf6598dcf33f8cbde187d4d6cbfdc59a50793e73b87f8d34966dfeea4105d894ac5b8a7b6478b8282424c1cc1c86ae008999caf8b1ffcac36d0957 SHA512 9cfd786c8bcd1b597eb45e779462dde2e5b72f0d09aa3990bc2a242c43167c350a22a20249fb1121b0fc1f69332ac962474ed6dfb10ee4104183b75f2419b229
 MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
new file mode 100644
index 000000000000..14e2fc70b370
--- /dev/null
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="New GNU Portable Threads Library"
+HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	elibtoolize  # for Solaris shared library
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/processor-trace/Manifest b/dev-libs/processor-trace/Manifest
index 8de3bf19824f..16a9d425cb24 100644
--- a/dev-libs/processor-trace/Manifest
+++ b/dev-libs/processor-trace/Manifest
@@ -1,3 +1,7 @@
 DIST processor-trace-1.6.1.tar.gz 250843 BLAKE2B 0fa3f97f14e6fb931ea787261e84c65cbce0667db7adc709bdf386f5a87a9eb9af71b3b5b45c1c0f17d6b8e6800b92e9417955dc5496f3f6d3022620153fc2ad SHA512 c7c9c8ba78021fff3fde12a216f5729c6031114e5a727f49b7ff1a31c53b5ddba24d1b3aee252d8278ecd1fafe78a44ed059c12b9eb29eca33093e0720673468
+DIST processor-trace-1.6.2.tar.gz 259982 BLAKE2B ab394dd37eab924e841d77911f90e0b3ecceac69ae1b8fcd911c0bc26c2ac4aedf8bde3e0d8197b3341159d6b35458177f0c795eb9c1b146e38fd278135042fe SHA512 10f4ef6bcca9a4b39b0cfbfc82d79a6adb206aaa1a78961b0dea0926f7e2e462ea3cd5430dc82e71ce9dede18550f3c84d38fee26e1b2065668767fb5f796995
+DIST processor-trace-2.0.tar.gz 338965 BLAKE2B cc536139ab0e6f7e0d4a99e906a32e9636e55444e4c5fc37fb18a0df538bb5f6ae4c0cf4bc207afab6d0490a2fa7678fc8a0696dd1b16055869d6fdbd73618db SHA512 ec63151e842c81cc73ea11ba560b63e005cefbe19d98de24ae5c8caa4de7c9c1d71d1ec5b6214a347592eac675b75a3d2b26d4691ca86f91020ebfea8e912939
 EBUILD processor-trace-1.6.1.ebuild 543 BLAKE2B 0a4155b01d2de88da40c6786cb052e8de930350a90a72aa734f25660b4e7441f74705f4a5808f091da2e540485e1544183817d60a8d94d69213d6d3443881f87 SHA512 6fb6b8239ac8ee0eb3d1f8d1c15980df0b0338bf9e78d3ac0b4b3dc1e22bdc9ca2db8d2e760e70682087748aa25d9eb6a440445493334f31ca00534115fb7f61
+EBUILD processor-trace-1.6.2.ebuild 540 BLAKE2B a44ae143be81d5cb72cb63fbd04b4a22407ea8a4f17a2ebecce0753d9c85e1a80a314a267d93551fe6d68efd0b9663cb17903a8cfd0d82bce343bf2debddfe1a SHA512 a3bbdf085cec752deaf4023eb99c58e246ca837dedc39e46f0809b5c430df9df995d98e7e7e131531a65fbe08b7a8accf40864894751a0ebd4f4001b96bfb47a
+EBUILD processor-trace-2.0.ebuild 544 BLAKE2B abd9ee3819ffdb9458f48da3d1c8eb5c32ecb65f902fa5791d9edd87476e5f00105c2cb883e35f474927d8e4a7fb24eb0cb180a96afcbef88a3833884b72a125 SHA512 b72dd17cc2f06c009164ff6f051231092b2befa9055590ddf39a5527c6a3c90db2997214f1f2083b637d1089d7b88bd70572ae142489aa546152e5b6d5b385ea
 MISC metadata.xml 369 BLAKE2B edcef74fef3ee485f69eb5c78d78dd917969ca0caf6d0e1df3829abafe94c88bc5c1b098c79f1c7f9af67108a3d31f841ec749a386d25785db20f160091f450a SHA512 2f19cdf8f8f3bce36e4c7f904e16b8068cdf41fb01e8031c13afee9a413e1d65084fa69db2198ba0b239ccd05ade12bc13ec042b689eb86ee725d51167d9a9e1
diff --git a/dev-libs/processor-trace/processor-trace-1.6.2.ebuild b/dev-libs/processor-trace/processor-trace-1.6.2.ebuild
new file mode 100644
index 000000000000..58e645476adf
--- /dev/null
+++ b/dev-libs/processor-trace/processor-trace-1.6.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Intel(R) Processor Trace decoder library"
+HOMEPAGE="https://github.com/01org/processor-trace"
+SRC_URI="https://github.com/01org/processor-trace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT=0
+KEYWORDS="-* ~amd64"
+IUSE="doc test"
+
+DEPEND="doc? ( app-text/pandoc )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMAN=$(usex doc)
+		-DPTUNIT=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/processor-trace/processor-trace-2.0.ebuild b/dev-libs/processor-trace/processor-trace-2.0.ebuild
new file mode 100644
index 000000000000..253935c1743f
--- /dev/null
+++ b/dev-libs/processor-trace/processor-trace-2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Intel(R) Processor Trace decoder library"
+HOMEPAGE="https://github.com/01org/processor-trace"
+SRC_URI="https://github.com/01org/processor-trace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="-* ~amd64"
+IUSE="doc test"
+
+DEPEND="doc? ( app-text/pandoc )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMAN=$(usex doc)
+		-DPTUNIT=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 2d93ad2e65e9..ec7a05c5acbe 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,20 +1,18 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
 AUX protobuf-3.4.0-disable_no-warning-test.patch 900 BLAKE2B 6187eeba1912f1bc6732d944eba4617ab99946efa429b3a96bb3b984af7ef45098885ce6bcdada1bb8995aee4a61cde404175459975242acf263a57d2d74c7fc SHA512 6d0687d17b626493e7e57dcb3e34095c9a450ecb8e538e9ad7cab69bdaf19ba52fbf5d70187c773bee0ee28496850e5ab0f56dcd571797e62434d865bd8761c2
-AUX protobuf-3.4.0-protoc_input_output_files.patch 9636 BLAKE2B 6276c9b731a0ed8e6f437a4a2db57a79d245e02046a62ff7415f41d925ffe7cb115810a2784a7e41ec3f32311be1bbe8ff35660126535be55f9e2ff92a50af6f SHA512 036fcc8a169be8d96dd04523642d5f42a2b935d8b818d3f3ae6f4e8e08ed9bd10528b6c0b1f84901b8415e09e4375ce5b885177f08e757c2af5160640c0369d9
+AUX protobuf-3.4.0-protoc_input_output_files.patch 9645 BLAKE2B 56911d89826684d39e9590a7577e10b036794f42bfa899896ba8311002632ea511057280c2676c1755ade71c8b698693b27fdd08cf4866d6673dc6cbcc17ffa2 SHA512 52894a8886386c5d9db45d78b777d7874b2bee3bf66315b27dcdd5d0ccb387fc25a47f547cbaca6630aae120ea78dc052ae5cdadb2219adbcc3b52612a5cd1ae
 AUX protobuf-3.4.0-system_libraries.patch 5788 BLAKE2B e82517985065f53793ba5f4914317a6c2dbd7bd2c1e3bdb0796c85c402f4ec7e9d6645c1ccb7f73bf0b559d44db14ace9657c059c07948c3baf11c4b450bb572 SHA512 f8b54087e755ab6ae07630e99ca542b5690429ed7c9801c04219b016fd361b39a01d9e4d594f5c5820a0ec90f02f7ef4aeaf864e1ea2b770078a198daf928db3
-AUX protobuf-3.5.0-atomic_operations.patch 785 BLAKE2B 7c7cc7a0000fc5472a8603a8770fd20f0577e099d66f280f9c111485159f34a3010fcc76e88e2feb6eca4283a3458cd02bedac58f100e14f7e911e305c06869b SHA512 a84b8e87efab8c4063bf9b8f2422170c3b08acac66ebdeafca700309ee27614bdec1ec18a57d188bd6170bcc966854582ec748b0caedbec1feb0c3602fe9d9ae
+AUX protobuf-3.5.0-atomic_operations.patch 812 BLAKE2B f55d364fa5b7ee405d7cb9b08e6ce1a3446a9604a39002f915bdaca2cd527bc7c173aefd898f473b1666eff55c1473db9699b4dc3c992ab3bdc8ae18855cb1b1 SHA512 c7ed996f106bd9632c9979c2e5665759c18c46f64f05bf5b8b9efc5c896b6a072375a657df7f5372b8089aad38791f768765ac1118c2aeed1785f040aea310ee
 AUX protobuf-3.6.0-disable_no-warning-test.patch 965 BLAKE2B 6ec0b1fc9d9d0be4f6dc9bc023d65b6b04c98d624ca4d1926cff0554d774d7cffd8d3597383acff1b7aca1a92dff4dd8368d5d86f1612aace16ede836f025af5 SHA512 82e601a26e51903e6b193c50960024240aecd3ddeeba8b29f437c550ad0bd277573ea4f83bcd70b2a4187c7df2b25af2790de22fb6f009640c403a9502d703be
-AUX protobuf-3.6.0-protoc_input_output_files.patch 9623 BLAKE2B 8b04f9a8f98701dec8ec1b5c2206a01a3b8d18e378c6c99d09ff079f24de204bdac9cd384d286973ce79742ab6bc6339e89b43db172296e661eaaeec7973ff6d SHA512 334ae940d86c34e2175fb57dcb0ea50e154ccb526910442bd0a48563b604ffc404518a9a527207d043af572047c15327703861833a21f5896ff1a48674a72f30
+AUX protobuf-3.6.0-protoc_input_output_files.patch 9632 BLAKE2B 6466f6f6cf08e7a9a89ced8281790593fa9ea85e029d59ff20bba8c9add16bbb039a44d1839516bb109b9a2b269773640b43e6137fb9ccf5f100ef4109ad2b8d SHA512 8ac3c42684869e1b45d0d1ec70912610eaaa6962bc14d9a89b1244f424af7d638b4905b6dbd7445cd5f54bc4520fc1fbae88c66d9f4a9169db879abd1fba2faf
 AUX protobuf-3.6.0-system_libraries.patch 6323 BLAKE2B 0fb8e389a58b76c592b592782900b48bb6c68e85fc159d4b9a59a43ab5a116916f7d9ef15cca392e5751f015a887f855631abb124b4d4109d51f6ba401059549 SHA512 ab58b9aa9d1398a15346d6e85611ad826f8e52744aa137ca4f138348b4738afc7c6cd27129f925f5142edac7e272d56da880a83b216b2ce264804d6967997728
-DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-EBUILD protobuf-3.4.1.ebuild 2512 BLAKE2B 671e0bb79f5744b86a4c968a42b3efc0583b357cea941ae577dfa3839c401d19a2f42db02d0a70d66466d5a585bac646c8d143da3c4b2bbfb81fab0512418f70 SHA512 e80a80f3806c09fcf79a6ad7cb271a1bac2ad10f4020cc49b57112982bef76f2658660439f320ba71fe0b2ec1f86374c8e5f19d8b9640963ba10bbb436e5fcf3
-EBUILD protobuf-3.5.1.1.ebuild 2606 BLAKE2B de3ad34fecf997b8734738c0e8eeeb320c1a40cb31fb254e6385bfce42ee6e783de5328dddd3f4e65967e19d8d37f11d24724155d14d378cd3e75e0b611d4f30 SHA512 e15a7313e583a56b88cc7408d2d081e8ceac6e660595fb99c9f1dd91eafa7a8fa45c4f6259d7bd240a994f7464d28bdd0997da5c026d64399ad650e3f32625ab
-EBUILD protobuf-3.5.2.ebuild 2476 BLAKE2B 102bace5a78941b00193e4f0ffbd49e6ed849e7ffaadb24337ca014ce2d8e3c701c059add758033e77a85b4b91102a506f30c4abe990f634ee591779ae599ae1 SHA512 cbf835d457fd5420001d85cfb6ff34ea0adf385fa606a2b169e57f01214835f72d54589309ea215f8823e8ce7551e8d7caf4d629353ed1ae3ce4c00a840e1bd1
-EBUILD protobuf-3.6.0.1.ebuild 2476 BLAKE2B 527f59cc354c4c0e1db7500f5b7c803abf79d7f97e4d7ab4a187ea7817cc75441d162bac2614fb00e635871d79ac89cb76726320e060c01d622006e9668c7c23 SHA512 10ea54508497790213297670dfc9998218d46f2eb5276bc636a37b9afff3762650c081bcdd12ff4d6a28a50b01b781b6afa83abc9b2c1e36dee1d61d29f535b6
-EBUILD protobuf-3.6.1.ebuild 2476 BLAKE2B bef94c1f01371d56bb2f7dc0c95349b9a011f408b43694eb2129fe363d3de3ec07fc67d7acfe3770edc2b99ae11f75672afeae392ad8cc38f23a503a0f242ef6 SHA512 3c11db3b60189a0d09c91fd61566e521f124048037e28af02789ef87094137f7aea3fe0d47b42b87f6f41dd0fdb0ff33980e24937e3b0697cbc8b609a8a08f34
-MISC metadata.xml 534 BLAKE2B b5ffe91fcd25e8285f33e178fdf39f6c5e2e477e5db4bf80ffb144dc8e2c982a586329eb27239ea2867efdbc771ecde26197aa12c67441ede2bf08e1d8e78f0c SHA512 f9b4a37461edbf530940c86f2b0a3838fad80395f1c5e4738b40519fec2df24867e005cf55884f126d2a3a1dfc894cfd1a26fa085268da2dc4b0e562390ebb3e
+EBUILD protobuf-3.5.1.1.ebuild 2621 BLAKE2B f5d279625735d30a1025c414b20f60dd0385c7d8449fde3e45e6540fc1dcc90614c7e5d3c22c26ef89e7c0374f112ea84a5702ef679d01448923bfccb3364133 SHA512 fe1689582cbd86d2cb31bf85e44a1968524350b7fe62d2f97b20ec368e3046d567c746c26d7d773cba6f1d498f2527ad59dbb749e738458912e90b8b44d7e070
+EBUILD protobuf-3.5.2.ebuild 2491 BLAKE2B 7d13d39cca5329ea99664f9ebc22c38d5a88f013e0e8dabe7f8a8b4229b993943a7cba2cdb81c28e3070e9fc5a652185d17e988efc32883da34615a1453dd198 SHA512 5f4aa9d253c246d6420badffb87eb66939c3e2faf765426da34c85977431341e2ae7b9aac2595cbd24d1ae8be9ec836771b02e66508af84b74ddc0d695c3418d
+EBUILD protobuf-3.6.0.1.ebuild 2491 BLAKE2B 00444b7406baff1560defc88f3e3cde102cd24db454684fb2a919141fae3ba9000486b062f9a8128e0627930794af0f825555526d5a822363d944f2d064c7c52 SHA512 98ebec7694e6a0a47fa98b52371f74ca538f00ae649973e82eed51e4a3600e44c385a028dc3156c0a6c2232a305e317a95b389249090ebba6c77f77375ce49c1
+EBUILD protobuf-3.6.1.ebuild 2491 BLAKE2B 5bca8ad4099728658473282f8649d56321c5c5ff1e560a0b552fc3431b7cb3fef3ba2092c02c9fb799e8c3dddc42a3e454ea35b6c63b91038caa4c183a83feae SHA512 f6d59bf331d98a6805b5fd29d9b9fc37ecb5dbb1e23afa05e1bfb46eb48ee63f81e2b3088e0be13538619daef3f3c4f1e92f3b6717f37adc4a39d13a4a0619ba
+MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983
diff --git a/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch
index a7d338e99289..75c4dc28ee4a 100644
--- a/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch
+++ b/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch
@@ -1,4 +1,4 @@
-https://github.com/google/protobuf/pull/235
+https://github.com/protocolbuffers/protobuf/pull/235
 
 --- /src/google/protobuf/compiler/command_line_interface.cc
 +++ /src/google/protobuf/compiler/command_line_interface.cc
diff --git a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
index 7a88e8379500..9582431d41f6 100644
--- a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
+++ b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
@@ -1,6 +1,6 @@
-https://github.com/google/protobuf/issues/3937
-https://github.com/google/protobuf/pull/3955
-https://github.com/google/protobuf/commit/642e1ac635f2563b4a14c255374f02645ae85dac
+https://github.com/protocolbuffers/protobuf/issues/3937
+https://github.com/protocolbuffers/protobuf/pull/3955
+https://github.com/protocolbuffers/protobuf/commit/642e1ac635f2563b4a14c255374f02645ae85dac
 
 --- /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
 +++ /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
diff --git a/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
index f515b6cd1a47..8b583522f464 100644
--- a/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
+++ b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
@@ -1,4 +1,4 @@
-https://github.com/google/protobuf/pull/235
+https://github.com/protocolbuffers/protobuf/pull/235
 
 --- /src/google/protobuf/compiler/command_line_interface.cc
 +++ /src/google/protobuf/compiler/command_line_interface.cc
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index 6aeca898035f..f37667040e4f 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -13,6 +13,6 @@
 		<subslots>Soname version number</subslots>
 	</slots>
 	<upstream>
-		<remote-id type="github">google/protobuf</remote-id>
+		<remote-id type="github">protocolbuffers/protobuf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/protobuf/protobuf-3.4.1.ebuild b/dev-libs/protobuf/protobuf-3.4.1.ebuild
deleted file mode 100644
index 861514638202..000000000000
--- a/dev-libs/protobuf/protobuf-3.4.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples static-libs test zlib"
-
-RDEPEND="emacs? ( virtual/emacs )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.4.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# The build system wants `protoc` when building, so we need a copy that
-		# runs on the host. This is more hermetic than relying on the version
-		# installed in the host being the exact same version.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs[@]}"
-		myeconfargs+=(--with-protoc="${PWD}"/src/protoc)
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
index ea6e36624008..b64b56a4da19 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-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/dev-libs/protobuf/protobuf-3.5.2.ebuild b/dev-libs/protobuf/protobuf-3.5.2.ebuild
index 1f060c91027f..eb1466f8f448 100644
--- a/dev-libs/protobuf/protobuf-3.5.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild b/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
index 463b4135d83e..fc490f98194c 100644
--- a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/16"
diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild
index 05027c009a55..3b3bdeaf3517 100644
--- a/dev-libs/protobuf/protobuf-3.6.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index a9325551c51a..4ac334fab553 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,5 @@
 DIST qtkeychain-0.8.0.tar.gz 34686 BLAKE2B bb20ace4393e04a8c8167ce112499fed75615ed165824bfcbba6a243e374523ff397aa85eb324ee8d742295a1bd4618a363fae6f92aae74caf09b9ca18d76c1e SHA512 be83ebc665a7916e96a2fd9990c72cd29373196591cf557fa6f9691f332ab67cc5475cab240c3e50e76cb37e0b7f189f0a1f2c3a70a6f655918e1d2465ed2f33
 DIST qtkeychain-0.9.0.tar.gz 35614 BLAKE2B b8fbcc3737808f8415f703cd92dd1f036fd6d1d83c056562e0142f67a234ddc29ad7f029ce9f520c8bcf179d8b99b5cf8b702ad010763956ff0fb8ce3f030934 SHA512 d8e7895169e9746c234a156e00edb939926d14da1a5eadab7cb1e67790958973bfd11c9c04c6fa5cf776aafbd0af40dcd50c683f1c80bef60d47d1465bb350df
 EBUILD qtkeychain-0.8.0.ebuild 771 BLAKE2B 0cce7f8a6e103b0a982454fe6d6c3faf82d0b2bc69060a59a80e1cd2e766eb80d87329614e04e441b7471741bee23c67d6b463c13d24df8493b3fef4ec7fbbc5 SHA512 41a537d69f072adf00720c891382795d6c4cd38fc7936cf91517f5ee56005defddda4d51d16dd8317bad2d8afa23ee0bfc4a7e47689b3ee315efd1bc5fa04e8e
-EBUILD qtkeychain-0.9.0.ebuild 903 BLAKE2B 9a24be53e7ae0c5280efebb82d307f967750cbeb0b2aade9705a70efc6076917168e11b33931d5164916739fa6eaef2d9d889fbfc5daa31cdc461afaa8fd90a4 SHA512 978d622d0ddf54d58a24cb6a2cb36404cae848558cf236d033e781bac9185b5b51cc260706e971ea70bfd277940e7a394f027949ce8bfea7846d69b8aa1e8b69
+EBUILD qtkeychain-0.9.0.ebuild 899 BLAKE2B b3eb1cd027c97c362d6555ea1d6ffd8e8d6b1a3f44bb1dce7d2caaa89a593ff84f806aea78a7bfbef3732f72ba1a52b7b038bf8ca6baafa79294331d6fda4723 SHA512 16a16f1e8f8a1a1bf59643ec18f1c8c179987ed6075abdbb127cb3cd1503b4c5a61d2e2bbdc3a5c9a5606e1d343a27111d90e7bc226f20a83ca65d626a94f751
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
index ac90679ec32a..955b422dd8ce 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Qt API for storing passwords securely"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="${HOMEPAGE}.git"
diff --git a/dev-libs/rasqal/Manifest b/dev-libs/rasqal/Manifest
index 31c0c8eea201..88f9c0c05b59 100644
--- a/dev-libs/rasqal/Manifest
+++ b/dev-libs/rasqal/Manifest
@@ -1,5 +1,5 @@
-DIST rasqal-0.9.29.tar.gz 1550144 BLAKE2B 205fc4864a86447246d43b52c2defa00b17628c2a6f459dc40b0fa79b42cd306405f31f600d5ad535891d2f79c46970d77f559249d6a22578d9b83e28d2fb46c SHA512 9795e2ffd439157af7d386ef7191fed3c960e88f04e46ec80bf845986841b9fb094219c561144cbe9ada5582264b32eec4850cf8f2258661d09f2df9dbffda4d
 DIST rasqal-0.9.32.tar.gz 1544623 BLAKE2B c94833d2906fc211d743d63a52478e6acc9f26c7528beb1bea0ec8c365b5d13e6ac85e57b75b920d1ccb5768112d06cf615212c7bf248120671730c5095b3c88 SHA512 071f5ff30a1271bdd747cab7991a34c75f9c0132e81d7662acb13a2e380b98c325a9b2998f6a08a393251623680074a76f58f70bdd93b5c1416779aacc7be428
-EBUILD rasqal-0.9.29.ebuild 1867 BLAKE2B 9d1eb0fd9ad725ee2af187407b6d7e0157bfa84b72fdf84f67f2f2d0c2f208c0800bd1e103c2c5421ee2e862c3c193096237f7e0d9dfb6ac46e43c4783fb1869 SHA512 56ad947cb4af7c7676a14ddeaceefdf2fd96c60e27d66e42c604d7fbf6303faf96c1d934c6a44da3cc3668e77c9bfbbbf13b07972ad7e028363c23855543c2a9
-EBUILD rasqal-0.9.32.ebuild 1925 BLAKE2B 3549cf20fc56e92ca7adef2cfe92b4e5bf402fb62e44f6305477364893cb4080d85cf2f41d3df6ffd5bc4cd5872a76e1b27871ca6cd5c6f32dc0193c161252c8 SHA512 d2f02414c7290705d43cbfe2f2d77a4adf531600bcf5a113eccf1dc83e49046554a852fda2a9cbffcd0347643a101d3ba03f7b97c131ba05b8f9470d7904aa31
+DIST rasqal-0.9.33.tar.gz 1595647 BLAKE2B 87bca86b2f0dceb0801f5a34dae9ae1f87d8a7d0dc1e03fdf04998a0d4885ed76be2719d3e01489a5510a26715bb093a75ce194cc42f3cedff88f64161d6a2fb SHA512 05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522
+EBUILD rasqal-0.9.32.ebuild 1923 BLAKE2B da3d291be1ec4e166366babaf6f674e0625f636dd387eb54ce3a7be8aba2b7434425b03aacaaa1ade21a45ce3c03a6d45ab91573ccb931bd08d9d59ce7f3e86f SHA512 f8d876154ce4b8847c067776d2fd8d48cae9eac11fceb14d9a15994ebb3e461f9a0226e55388387692f13493098fd670ba5c2f3cd87585056aecf696cb743948
+EBUILD rasqal-0.9.33.ebuild 1697 BLAKE2B b4aad4ea467364c724c5b902db89e81b3fbe25d5673c33f5bb5d493f3e6f8ed3a9ad9c782825a5df24cba0568c10a0d9a5b73eb582d8232a70b252456175931d SHA512 32d3ccc61649161ca647e76736fcb02819124d5c325f2ce45ac113d56d159b7cffd916194a6ccf3c96581cca1082d335d1e7c5df1c923ad92ffb1395e21e1ade
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/rasqal/rasqal-0.9.29.ebuild b/dev-libs/rasqal/rasqal-0.9.29.ebuild
deleted file mode 100644
index 5851683b32c7..000000000000
--- a/dev-libs/rasqal/rasqal-0.9.29.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit libtool
-
-DESCRIPTION="library that handles Resource Description Framework (RDF)"
-HOMEPAGE="http://librdf.org/rasqal/"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+crypt doc gmp kernel_linux +mhash pcre static-libs test xml"
-
-RDEPEND=">=media-libs/raptor-2.0.7:2
-	kernel_linux? ( >=sys-apps/util-linux-2.19 )
-	pcre? ( dev-libs/libpcre )
-	xml? ( dev-libs/libxml2 )
-	!gmp? ( dev-libs/mpfr )
-	gmp? ( dev-libs/gmp )
-	crypt? (
-		!mhash? ( dev-libs/libgcrypt:0 )
-		mhash? ( app-crypt/mhash )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	test? ( dev-perl/XML-DOM )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	sed -i -e '/random_approach/s:==:=:' configure || die #416659
-	elibtoolize # g/fbsd .so versioning
-}
-
-src_configure() {
-	# FIXME: From 0.9.27 to .28 --with-random-approach= was introduced, do we
-	# need a logic for it? Perhaps for dev-libs/gmp?
-
-	local regex=posix
-	local decimal=mpfr
-	local digest=internal
-	local uuid=internal
-
-	use pcre && regex=pcre
-	use gmp && decimal=gmp
-	use kernel_linux && uuid=libuuid
-
-	if use crypt; then
-		digest=gcrypt
-		use mhash && digest=mhash
-	fi
-
-	econf \
-		$(use_enable pcre) \
-		$(use_enable static-libs static) \
-		$(use_enable xml xml2) \
-		--with-regex-library=${regex} \
-		--with-digest-library=${digest} \
-		--with-uuid-library=${uuid} \
-		--with-decimal=${decimal} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	dohtml {NEWS,README,RELEASE}.html
-	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html/rasqal
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/dev-libs/rasqal/rasqal-0.9.32.ebuild b/dev-libs/rasqal/rasqal-0.9.32.ebuild
index bd7ad7318390..2400b22d3e4d 100644
--- a/dev-libs/rasqal/rasqal-0.9.32.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
 
 RDEPEND=">=media-libs/raptor-2.0.14
diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild
new file mode 100644
index 000000000000..df3e0ecc3f50
--- /dev/null
+++ b/dev-libs/rasqal/rasqal-0.9.33.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="Library that handles Resource Description Framework (RDF)"
+HOMEPAGE="http://librdf.org/rasqal/"
+SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
+
+RDEPEND="
+	>=media-libs/raptor-2.0.15
+	crypt? (
+		!mhash? ( dev-libs/libgcrypt:0 )
+		mhash? ( app-crypt/mhash )
+	)
+	!gmp? ( dev-libs/mpfr:= )
+	gmp? ( dev-libs/gmp:= )
+	kernel_linux? ( >=sys-apps/util-linux-2.19 )
+	pcre? ( dev-libs/libpcre )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/bison-3
+	>=sys-devel/flex-2.5.36
+	virtual/pkgconfig
+	test? ( dev-perl/XML-DOM )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+HTML_DOCS=( {NEWS,README,RELEASE}.html )
+
+src_prepare() {
+	default
+	elibtoolize # g/fbsd .so versioning
+}
+
+src_configure() {
+	# FIXME: From 0.9.27 to .28 --with-random-approach= was introduced, do we
+	# need a logic for it? Perhaps for dev-libs/gmp?
+	local myeconfargs=(
+		--with-decimal=$(usex gmp gmp mpfr)
+		--with-uuid-library=$(usex kernel_linux libuuid internal)
+		$(use_enable pcre)
+		--with-regex-library=$(usex pcre pcre posix)
+		$(use_enable static-libs static)
+		$(use_enable xml xml2)
+	)
+
+	if use crypt; then
+		myeconfargs+=( $(usex mhash mhash gcrypt) )
+	else
+		myeconfargs+=( --with-digest-library=internal )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 4e25d8ff89e2..9f806dbf005a 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -3,8 +3,10 @@ DIST re2-2016-05-01.tar.gz 399509 BLAKE2B ec7676da99493bb2be56bd661f8f3bd57b123b
 DIST re2-2016-11-01.tar.gz 379816 BLAKE2B 251c45684fa4f3f85e0138c6f788f7a35fbc2ad8766f6a9bc0daf7305ac2140a1102602cf8843242f7a311ec09bf4fe516b605e39e8c857aa2f475783085c231 SHA512 1be7d2551737cb9dc1031dac9335f82dfb58f3612bdb745bf6c5121334bf8689bb0564b751c23e4c002478cc46cc237ce4da294090adb983b0c1db25a9fac0a7
 DIST re2-2017-03-01.tar.gz 382241 BLAKE2B 0a034267f435386b1bfc1680c98aabf4d18dac40cbce3c5a5705cb6a383d54f81b90e22fdd0f16220434eca2eb1c6a5d28ae7e903cdca2397bbc6c10c11ac703 SHA512 566a3ff6598fc9b26dcabe175efa48becd38459185d6bb86b3abb1856a3e7b0f9b5e302594b1ac4817dcb5968920df43d23279a6cff2a74b6b0c174dc9379f88
 DIST re2-2018-04-01.tar.gz 389724 BLAKE2B 629d5cf82a465dfd2d50a3761f0b6504dba6309e5a2605a6f1fde20cae7e7cbb7bef6703abc12161891cb14e7308db3d18b25e575d3ffd8bbdd5cfba6f067983 SHA512 862d9bcb574ea986b1497d6c079104a0cf27b418a6ec8c24047f0d43ede2c8f7f0bdc6a3ccddaeb746f0d821e3e7fd701f438d7fed101db969785c4b344e0462
+DIST re2-2018-10-01.tar.gz 391254 BLAKE2B 297b9abef94fb3ad95e35bb7ff642a5d47b5bc20b1bc3544c76f8a91ec5b9812a1fad1cd5c6a7d4b7c24baaf15302602e8d1b483bdfc6d1246bf268620a9440e SHA512 91e400856137d16c6319e310dab99b4baa74c0bcf634c97464fccdf4092ffc8e1d5ee2a6714b8114719e2dd92e962d5e970ce1b360a3644a8b395d8fb47431be
 EBUILD re2-0.2016.05.01.ebuild 1202 BLAKE2B 0594d59305793044b9fed2d0570a6c68c5384e0a1f38481fcbdcdf4cb3073484dc660a22f7adfdc977bf1a200cb24f27120b94e87f4319178e196b57ccb59fda SHA512 1bc1f823a2927bb76e2793933d6048ddb93f829464ba8d9d9c0850dc08889026c8e27250e5922b5aa7bdcfe74d7bd0a4be1f59433065141dd7cfaacc6c6c25ac
 EBUILD re2-0.2016.11.01-r1.ebuild 1305 BLAKE2B 8bc950fb1337eeb4f811b3a3a7435b28dce8ec9dad238095a2b19457eced7585ddf64e32844e7970e50b87f3fb913f5dcc9d7529094055e4e1a299ed75950c75 SHA512 a5ef7207e94fc73bcbc4fdd809fa3ed580c9ec0880e073124986a4bdbca7e726be0c122fe7b6f384db8a0ca654645c9fadfb16e3f035e78a1c74e6bca80850c9
 EBUILD re2-0.2017.03.01.ebuild 1305 BLAKE2B 8de6b4e1d07af2677a77755753ff474d818373c0be13008c326972de4cb02b949eb923b1c0353dc0130753d563f6deef1fc54104d32bbcc2c16f676c3afa27ad SHA512 bda266f9e96eec73858ad9c7e0f91f327c216e3d6044bd07abf58dfdf822313e6e7f7b9129b852e0b1ca4ae2bc8ad9c4a38e89e200bac433efd180fc2e7abf60
 EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff815933859635e6296570a5783d03b02b221f560ccce8582e2635614f29c379f34e2b375480c06e0d14fe114aa43a15d2b SHA512 c4af6a5638e487c3ce981649ef8ccb30dbf4cf59cd21f06dfef2af8ac0bfa69eb13d11bb9b64b9d575adf15d84fd57163a37dc439abb15086924aad6b54a821d
+EBUILD re2-0.2018.10.01.ebuild 1312 BLAKE2B b900d7db4b5d2e8389fe9b4368d1e59b8161577bb63f14ff4be0c93ddbeba5a80b80d2802191985eac10fbe003d8193039ed8b28acee55ff8243fede1e477a8c SHA512 0f094160180d99097666322e7d68c6ce06f00392f9e53844926593a00e11a9a2484fa5a7486d8dfae27c49b8d00e1ce8c380f466f8a77a9823ebaa6b5842fb94
 MISC metadata.xml 337 BLAKE2B a584c0de18fba97bedbfc3589eb7e35d2f9f794946f8161c50e807e6ed8dc90631b9aecf3f20b6e04bc27b4b5f92e9044221a50a92f8ed61052794392a0f68e8 SHA512 5dbef91cae8363700badc73e352829c4e4e8265bdb96104136c3759d1731148b7260840b4319116ceac00aa9ba17de6eafa2cf9684878b7e9f032469b6f2fec0
diff --git a/dev-libs/re2/re2-0.2018.10.01.ebuild b/dev-libs/re2/re2-0.2018.10.01.ebuild
new file mode 100644
index 000000000000..641a25172807
--- /dev/null
+++ b/dev-libs/re2/re2-0.2018.10.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+# https://abi-laboratory.pro/tracker/timeline/re2/
+SONAME="gentoo-2017-03-01"
+SLOT="0/${SONAME}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="icu"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="icu? ( virtual/pkgconfig )"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+	default
+	grep -qv '^SONAME=0$' Makefile || die "Check SONAME in Makefile"
+	if use icu; then
+		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+src_configure() {
+	tc-export AR CXX NM
+}
+
+multilib_src_compile() {
+	emake SONAME="${SONAME}"
+}
+
+multilib_src_install() {
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
+}
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index f47146ddaa76..cf6b5744ee28 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 2037 BLAKE2B 76bbc94678e60052acf6f4dcf4204718573c8cc9e2023376ca53cfd0c31ebfdab9b438a18407e9a04f2e25c69f7155ebcb107d3a3f33bb0b420dcdb1a3ba37e2 SHA512 5db077e60139ade14d05b94469c9acf58a564faa49f9834947cac0f2a5cca38aea509fe3ebd5bb3fff92eb0b0a755be7b571ee0a47d20244a643949876c41e18
-EBUILD redland-1.0.16.ebuild 2383 BLAKE2B e1ffdb4435548b5cd9fe6f9fcb5dee7ef2c1d921bc8a01e9d1ebd4d9543f3fd6e8a3c8099e19e002fb7a5f26441f75beb982a137ffd03b873cab383b023a787e SHA512 95faf59e5b1dd7b606c4efedb1b9d067e4f631c5878cbf42db47f1ea1a63d7d2f7b1ebfb7685a33df2ca3c1570f8ddf3932c6595d3cf767f8cca21bd785195d7
-EBUILD redland-1.0.17-r1.ebuild 2468 BLAKE2B 7a008bff1be211de3623e3fce8ac203678192923c8fa6ebd294467a3e8d45e0ee5c7575cbf92470f7d1aa8e1ef712f4266f3086a29ad3d7f326d643282486001 SHA512 fe74a9d2447205ede8ddb98b0f6efc27c14030a7c704b50a060d6235ce490afb76a3eddfdc5d4f04d653da320777f1e6aa1c0ddae594b241542bc3c20540b9fb
+EBUILD redland-1.0.15.ebuild 2035 BLAKE2B 32b6c160e8e0a060e710e214494c5a0302121c6ebd09eb361b9a771d2c6e1747bf334ab50260bd1a5575240a4bbf94d9fd84b091769240f4d7836672e0b4a6d2 SHA512 15d93fbeced1dcd4b97df929afc06ed1603ac84891e9c71d8dc919364f11b670827abb9ad6e642ff5cd73cde9f35d85abce7ecd67b44d96b1c321cb176e052d6
+EBUILD redland-1.0.16.ebuild 2381 BLAKE2B ff6c344a517ebe2715fea5d02fc80171021b9980b6acc0a8a52022e9fb23b59555ee7d0465d3f715f62450c5f36f70b14e3e452cbafb0e67201fa2c319bcc066 SHA512 fe1b176d738e8875379e32e03f540c389c89d45937b86a850f25f2450b8f5dd0318efe828357bb1352a0f3e81289f672808ebb34be8a5863d868ebcf1b28cb86
+EBUILD redland-1.0.17-r1.ebuild 2465 BLAKE2B 9e51a587e8a261690b6618a3582b13348024f662878ed78af00eb1a853e82350e85ffb6833055e09fec1bfbe57a0d0cd2d062635a41d8cc3e56a845030d28620 SHA512 6dfccc33a0c499c6caa93392fa1d8fcf7ad43661f4da4f01dac6aa2eb9289c7bfbb815333467ebb2afa66ba1242c016f9d2e129af0e298f67d4b7b2bef23c71c
 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 931d328b87fe..a2881c810b0a 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-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+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"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/redland/redland-1.0.16.ebuild b/dev-libs/redland/redland-1.0.16.ebuild
index fd6b87809580..f83ab05da876 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-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+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"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/redland/redland-1.0.17-r1.ebuild b/dev-libs/redland/redland-1.0.17-r1.ebuild
index efb79fe91023..5498592ffbf4 100644
--- a/dev-libs/redland/redland-1.0.17-r1.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~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"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/shhopt/Manifest b/dev-libs/shhopt/Manifest
index 52123e0afd42..2c908cdae689 100644
--- a/dev-libs/shhopt/Manifest
+++ b/dev-libs/shhopt/Manifest
@@ -1,4 +1,5 @@
-AUX shhopt-1.1.7-build.patch 1880 BLAKE2B c1cc6e625872107bfb1e0f8578267dca5b8bac87b41fbb01b5a881f4c7d389b53bac67deb86d47139e6ae3d257a4bff2335af507b1f7d5fd719c2088988bfecc SHA512 980b6796678213fd1538da374eba084a67c8a48e446083b86f280c00f355b0a45bc679431991156fd99b983a1d20b07f612389a129e1789a905b8e9967a42a37
+AUX shhopt-1.1.7-build.patch 1884 BLAKE2B 1854a892ddc14d7202efbb4ebf20778a10ae1c490a40b28157e313c711fb946a925f61a71cc2f3919f6f55718636d05486e79e89f730575528bc3b0d2894fa34 SHA512 79eca8ada571f2f514d540a4c52fdf9503764f67422173bff160ed3ca04b0578c0a88a147234ffaad7a5ba94ab7d265785277062b25438abb888c92fab99d4a8
 DIST shhopt-1.1.7.tar.gz 9923 BLAKE2B 4f9fb23a67c03caf6c56227729a681eac3ee9c78e16f56d6fedd2b1cdbe56471150d9e91ecf84945348078d03102aa7e7cc98b4cf11dda6f5da79d1edc48b96d SHA512 bd985d50e87808b5c6993496ba3e7c255d47895d90e108f03fd72bb273e786730898048af3b30ca29cb5dbd058f2ea178ca73b6362211c50aa0eb75f743b5ec8
 EBUILD shhopt-1.1.7-r2.ebuild 755 BLAKE2B b7dfa83327287fc7864412c98ad5371b02fbeb728638a0ce061a88a05479485e9983d9a4011fa0fad0449b65b55f2e47540906fd38f3a0c6a5764d60744b8eea SHA512 de5d809cc761dadc3cc74dd2b8abf83c8bc77dbdc689f172babfe47b4591beb9e8a87c97b0716f3b3fa2f704b7ec0e2c21321ac9f0168f615a57d65dee373e4d
+EBUILD shhopt-1.1.7-r3.ebuild 666 BLAKE2B 8f97412b4694bea2d26542ba2e819dd3d7756d75bc86e988ae70c9a96fb655193accd3ed8c2ad50196ffe582c5f85e6af6ea80c468d5b1afdf469c2c05e9a593 SHA512 4c6b28dc9d047d0ffd069ae01d75ef485c54fb640e7bbbba3bdf3d8826d50f9377603a3b2557a35e31cf1d830d02a1bc162c196de218b8941a48b59b66d1e91f
 MISC metadata.xml 341 BLAKE2B 738802ec66db2e5052eb57b90dd0076cca1afbdca62fa325f920f0ec6f4ff4b78f886402783ad6f97c7b10e4e2ec10bbaf1bf2bc8823bd48d048c35141a6cb77 SHA512 276ee6e17baeb1981c1c912b4f281d7eb71b171492d00d5ce522c3d6defbba4eef3dd87b43d4ec02eda21cfe148f2b0dcbe04d7dbd9a42918168844b563427f4
diff --git a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
index d1d5606faab6..3405511e2238 100644
--- a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
+++ b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -5,20 +5,15 @@
  VERPAT		= 7
  VERSION		= $(VERMAJ).$(VERMIN).$(VERPAT)
diff --git a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
new file mode 100644
index 000000000000..83fb8b878ace
--- /dev/null
+++ b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="library for parsing command line options"
+HOMEPAGE="http://shh.thathost.com/pub-unix/"
+SRC_URI="http://shh.thathost.com/pub-unix/files/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dolib.a libshhopt.a
+	ln -s libshhopt.so.${PV} libshhopt.so || die
+	ln -s libshhopt.so.${PV} libshhopt.so.${PV:0:1} || die
+	dolib.so libshhopt.so*
+	doheader shhopt.h
+	dodoc ChangeLog CREDITS README TODO
+}
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index f05f61b7fc44..ae18d1055bab 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -6,4 +6,4 @@ EBUILD skalibs-2.3.2.0.ebuild 1030 BLAKE2B 9a929766737a4e0a0f32fcdfe31d37d6bf1a0
 EBUILD skalibs-2.6.1.0.ebuild 1102 BLAKE2B 6e9f79ea36986f7695841068d69eb5fdf791b0dcd4982deb854983e9d2f30b2616b265e51c1b860df6b485d6178d94f9bb1a12df4d240182814d0e7f9aec5283 SHA512 f9afc8de965ca315a935cbccffc1083a165f8d2a6ac1742b431f21b666def320bd5ecad49a02bfa30c64fb97cc0bf2be3a77660741cb60af7c8c369873f956a4
 EBUILD skalibs-2.6.3.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
 EBUILD skalibs-2.6.4.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
-MISC metadata.xml 340 BLAKE2B 8d5e67ea656a7177e109b8d3192b014fd87d673cd07b06a15169bfead655bcc560142cff85b996bbd192a7cd87208617021b7561a878e190b4a13eeb1e7f3769 SHA512 f68ae944fc47d4d472e90b676023d6ca7648f0b94c0f8ace048c8b6791e1d738a96474435846d779f05df51beff2e33bd09234fd8a3be0ce215824045dfa843d
+MISC metadata.xml 682 BLAKE2B e5d2f804eddae75e951e0d779f6c26b9055186976bb27ab8c4afc8fa160aee1a6c119d03c19b95d54e7af721a86aae99b9c78277adc03e59fa4f86c0a5e93263 SHA512 cc1e8bf973b516a44122fa19165cd6c08547837d38c909d0a8ac7116c87ad93bb1f25ca31e5358c63abf4b13673a285cce8fb783506b61659f998ce47dc4b656
diff --git a/dev-libs/skalibs/metadata.xml b/dev-libs/skalibs/metadata.xml
index fdf4b3253e89..b538bc1f73d4 100644
--- a/dev-libs/skalibs/metadata.xml
+++ b/dev-libs/skalibs/metadata.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-<maintainer type="person">
-<email>williamh@gentoo.org</email>
-<name>William Hubbs</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 245605bfc773..5c21c8447326 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,4 +1,4 @@
 AUX totem-pl-parser-3.10.8-gmime-automagic.patch 3454 BLAKE2B fe16c0c78e73ebd735ff619074462d455087c7436d9dcba862771f0aa10df9400960733e1c829fa240af6bc43cea50957dbd5034e95c26bc5c076715b71b1cb7 SHA512 0cb2b632ec79711ced87a8b8df13011defeb2117a3242d28129f53bc3c845a18d929a2697edc99e08b69410d7933ab065a65257fce62c12a8bd72f19bb4d5d6d
 DIST totem-pl-parser-3.10.8.tar.xz 1618992 BLAKE2B ab7dc3010afb9a2112f19991ee74c43436962a66fa233162b2d2c6743e5727762102f6f0bfed2a30750c0d4e3cf0fbfdb7fdab8568b0cb827e49d0f99a938c41 SHA512 1692fe6d183838bdfb9125ae2bf9fbf74762333a7ebb6becc755bfdbfb8d2ea1ae257f42aab7b7a1ab419aee2b35902176a731f26736a62015806d1423adae70
-EBUILD totem-pl-parser-3.10.8.ebuild 2062 BLAKE2B ad735481c3102babafcb066ee850f17a063f1f0df8db15bf400a43b32c6d5551a6f9cec8e3c63025ca6a220800928cef151d314fe5df8271d3a393c78061d523 SHA512 3c302b3e5593cfb305dcf5e6a405cb1d14c81d0ebb063ab0ec05758a0e013ddf334bb3e29aeebcf87f721fb376a175368802446e7ec64eb7a45020b02d0d72a8
+EBUILD totem-pl-parser-3.10.8.ebuild 2080 BLAKE2B 8234199f84709abb2cc9140fc61065c05bdff5ada8dd1d36e76b7558715850a9079eb35de0742807ffc06f3c394f3096054ce3c6720f4859cc6e306b4a4efbe5 SHA512 e377bc056735214d3859ee50a06f61c815e1add95b1fb6265c895c7fcdc908a0790080e5db1a73e861fa416375b3f98eb1127d6156ba28eaf2a0bc70a950bfab
 MISC metadata.xml 482 BLAKE2B 38550c9c390117026b4c51a779fe05f9d023877b0d071f02a320ba624fc36046763c569d3e735cd4e5b46ad941f3882e7257055b68fafd909d3c5fe1706f4f3e SHA512 40da37106a328a46dea049d602980112ef3b9b0fd644b05d5375f1e7f7748373478a8cb779bafd7607f38a1c989e65fba5cdfaba55dd2c4dc2f5bb748e4f9d77
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild
index bba9b046d3f1..3ae67778266c 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 	!<media-video/totem-2.21
 	dev-libs/gobject-introspection-common
 	>=dev-util/intltool-0.35
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	sys-devel/autoconf-archive
 	>=sys-devel/gettext-0.17
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index f547d154c52d..c02b2477e64d 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 839 BLAKE2B 1d7fe6c29fa6a167988991bc32da737c668c7a4f9b3a355e4ee205a651be3994664ba49eee96c9da7df9b4611f54865dc583c596bd18f1e219f21285a218b4cb SHA512 b4e0674a2324f013ce0bf5665d7e8937a84a540a038f288763af6370a1891641aab318b26289d7b18a2e9e7bfa00f4e45101b27305af28decb339b995228ad09
+EBUILD xxhash-0.6.5.ebuild 834 BLAKE2B 1afc6f4abd178d88f9153357189adc568606438d44e31909e7e404a1927ca99d0066d71c331cbf4432702e99e8544ebb10d0d5bbf8625a36f6cfe8cc9a7a9662 SHA512 07a2ff9cbc7cd709e9b8288dfef2f17a8f96d5a4fc8845706d9d1a54afa496b173bbf8c5d1733c5f3b2eca5dfd5859b89a56b657cc995fdfbe61adda382e9666
 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 fac71089f077..31959e459926 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,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 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 5966bf0eff0c..fefca037d787 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,5 +1,4 @@
 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 934 BLAKE2B 4d26864c70bc35e811fdcc99ceb497763af0b1d124dd33926e637e2fb598a47c29a72cc3acd4c575db6053c0b1a4797660b01c9cbdc0d5beba72f17c5db98390 SHA512 8d688fd2f7913c050a5a85614b1a43fbbea97e4de89906ad9ee55fe536499f3105a6d5123e653cb8556ae7b54c04df492c5c916609aeecb897c776d4119db1cb
-EBUILD yajl-2.1.0.ebuild 894 BLAKE2B b264eef4b077162606be918a7a2af354c7a6ed46b39bf4307649703727b8de7b222d231fd34e9d7c1a234021069c13de5840a18b5b534950da694f1276677411 SHA512 74b0cc65f70342aa512fb7da7322bc06f6e6acd635427d836c383dd42eee55f61af85968d0a624fe72c18aa9e5b19f6f42d49049717e45bc09be06a5b55cfe8a
+EBUILD yajl-2.1.0-r1.ebuild 930 BLAKE2B 0a7882f77bf56732226ac8187954c2733a33c1438d39e76d1d26c7c9b3e713bcb6706190350f3b8409e8c53957c42556c2888b6687f0f99e0aca30fc567b98fa SHA512 5f6462f1b1a53e558f25c1e91d3e0b6dd624d33f5a83f01742212f6ceae3a6940ba74f84b5857be1f5480ec152141aaeda6cbef5152b5d3b353e774725d09b8d
 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 d809c1acf2d2..a07a6e1bf4b7 100644
--- a/dev-libs/yajl/yajl-2.1.0-r1.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 )
diff --git a/dev-libs/yajl/yajl-2.1.0.ebuild b/dev-libs/yajl/yajl-2.1.0.ebuild
deleted file mode 100644
index 0b1c354fe507..000000000000
--- a/dev-libs/yajl/yajl-2.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-multilib vcs-snapshot
-
-DESCRIPTION="Small event-driven (SAX-style) JSON parser"
-HOMEPAGE="https://lloyd.github.com/yajl/"
-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"
-IUSE="static-libs"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	multilib_copy_sources
-}
-
-src_test() {
-	run_test() {
-		cd "${BUILD_DIR}"/test/parsing
-		./run_tests.sh ./yajl_test || die
-	}
-	multilib_parallel_foreach_abi run_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	use static-libs || \
-		find "${D}" -name libyajl_s.a -delete
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-07 11:03:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-07 11:03:14 +0100
commit	957235cf19a691360c720f7913672adda4258ed0 (patch)
tree	812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /dev-libs
parent	62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)