gentoo resync : 19.05.2018

22 files changed, 45 insertions, 61 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8f055a40c94e..0772968955c4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 2e7a1814ee7b..6a5411c3c54d 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,5 +1,6 @@
+AUX appstream-0.11.5-fix-meson-po.patch 501 BLAKE2B 40d5f00cd7e883ddbd580ba7acfef6c956003a8a50f618b1f7e4810338af1ec41d6595828987132d175c2c07721ce60ba368033919a49ede9c659089fefd50eb SHA512 d4b4fb770ad84a6bf365e998eb749939a3aa4553aad9730f6d99d5072de37eb6594ad2ac00ee17706621483afe58f44c9f9f90aa9f666d0e2f6379f40ad78e71
 DIST appstream-0.10.6.tar.gz 1821879 BLAKE2B 49e0476ef41c37d2e9bb12a7c046fcbb2cd8fcb1f521321dce4cda15e504a966cf59a1cbf56fc7359a82f677c54906ba041ad37eeb7f639ad69691e8d2ccd24c SHA512 9f8b4ddc39d580c62b166df0d9a2c5e4caac1b433d25a4e9118b7c73ceea5c7b1ff78f02d682a68cdfeb8da29e806a4838cfc11637fca2982f436af333605256
 DIST appstream-0.11.5.tar.gz 1856204 BLAKE2B 9f1e423e71e40b569cae0fb259bf5a0203a0abcba64f877c951c941f1dfdbc8005509ca46040586b8937cc168ad9315978dd2a3763592de1686c9648eac6c928 SHA512 308f65df2d03f09a5fdfe1d5b61ed37ddfd73a6f7cd861f685463c45ba17a2a937ba34216b4d5f533cb5f9f56c65ff9b261e03d07aaab74bec3f89e5bfb57d7b
 EBUILD appstream-0.10.6-r1.ebuild 1474 BLAKE2B 7b70518da8b410ae9e9843d8238a4408ea571a5c1e7ff8d037d33636e4ea6d75758ba9bf33b03a6d084880caa8b1a02d0ebcf392fb6f81c5430bc83f0546e498 SHA512 53f95d11310cb6926059ece55a46240883a7e6f7dd6322b319cd8697ac306f4bd106e38aa05f04ebee33c481ea4bb82ab3d94ae664f925ee58df4fc63066e80e
-EBUILD appstream-0.11.5.ebuild 1348 BLAKE2B 6076f907fcf6cea0e607bc9ba8a1a4fcbfdf5688f012325ea18c9b630d79346e814f29c33fecbbab222569a68d8729a617700a1193db08008f627437d27ca2ef SHA512 41bc8f2b0f8e3c838eb3da4997cef8136a99756db39474380761abd11039d4bffd5e9010d8f3ab71b0b3f80dddec29b31f1c18c02c4a7d366af7d727dc80ae54
+EBUILD appstream-0.11.5.ebuild 1376 BLAKE2B a4505ffee8274eeeff1d78a79ba1e2bf47588dda71a2dfb5993985ab4d689380fe94d473b5cb4f43a018228e0a59f1ae72d294190e4e89e9df52512ac121c449 SHA512 de2b3c1a9ea20715572b94dcd78b23a0c7e9a41545d9c1898a33d50a263c5b82b7b2b99a9d0cc2e61e02598b6b8885df48d9ab5f4c88c58e0f9548fea60ea62a
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.11.5.ebuild b/dev-libs/appstream/appstream-0.11.5.ebuild
index 1a70d5615e08..bf4e52ace68b 100644
--- a/dev-libs/appstream/appstream-0.11.5.ebuild
+++ b/dev-libs/appstream/appstream-0.11.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,8 +9,8 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ximion/${PN}"
 else
-	inherit versionator
-	MY_PV="$(replace_all_version_separators '_')"
+	inherit eapi7-ver
+	MY_PV="$(ver_rs 0- '_')"
 	MY_P="APPSTREAM_${MY_PV}"
 	SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-meson-po.patch" )
+
 src_configure() {
 	xdg_environment_reset
 
diff --git a/dev-libs/appstream/files/appstream-0.11.5-fix-meson-po.patch b/dev-libs/appstream/files/appstream-0.11.5-fix-meson-po.patch
new file mode 100644
index 000000000000..2a37662e8f34
--- /dev/null
+++ b/dev-libs/appstream/files/appstream-0.11.5-fix-meson-po.patch
@@ -0,0 +1,14 @@
+Gentoo-bug: https://bugs.gentoo.org/640916
+Thanks-to: David Haller <gentoo@dhaller.de>
+
+--- a/po/meson.build	2017-09-04 18:09:52.000000000 +0200
++++ b/po/meson.build	2018-05-15 12:24:42.000000000 +0200
+@@ -21,7 +21,7 @@
+         'find ' + meson.current_source_dir() +
+         ' -type f' +
+         ' -iname "*.po"' +
+-        ' -printf \'%f\\n\'' +
++        ' -printf \'%f\n\'' +
+         ' | grep -oP \'.*(?=[.])\' | sort' +
+         ' > ' + join_paths(meson.current_source_dir(), 'LINGUAS')
+     ]
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index 63fa7790a620..e681e3bcfb24 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -8,5 +8,5 @@ DIST granite-0.5.0.tar.gz 365015 BLAKE2B 47b88d0b08a300fecc561161e1722cc1a544f58
 EBUILD granite-0.2.1.ebuild 1127 BLAKE2B 48ee04ee9ce192ded09395562504a27eb2e1142f50d66745730d406f0a8a5b3193cd62a25125364d7314fa80b5b4b7a07634e7340785266444ade3c0c6bf0747 SHA512 9ce2f40a076bd92979ab82801004d10ace1d6b808cf80aae983381a1bd17993fa4ed7ca571d6e7e01bddac34b65fb9b41ca9497933bf7c35cd7479a1ca07d2f2
 EBUILD granite-0.2.3.1.ebuild 1108 BLAKE2B c3d4f34c9324418ed55441e319d7c1b1e144146cfce5043fa019d69abe970475789db63f497f3afb3a7dda194179baaf602117becd5096eb4d8ac2daa9780a83 SHA512 734946b6d7233bdc2255df030171e1c8143e382aa800e2a635774374fb906f73a9148bbb913e0070e9508c651354f0f9a5bafe089171197ef91c4e26a02bb059
 EBUILD granite-0.3.0.ebuild 1256 BLAKE2B a44f997842e38f848a8e0d8c74cff3851bc0f8bcf92c3042d123133b2f9aac1b4134041200352e4cfd46a1cb323d46dfef6bb64d991a83bea095df6b36d21f92 SHA512 f7d7c73328fa0ad6d90533b7d3fa2254cc69153ad21567f5876bb29fb13e870c3a83f6a2e9d58f2014f0f7c5b59fd8dfde3fe60c37bdf8308383d96b7729091a
-EBUILD granite-0.5.0.ebuild 1257 BLAKE2B b493aeefde571d851a2b1e378a693701eca7cd9fdc615799fb569ad4df122786a0d01401c996d9137f25ea2bdbef8e4dc34906f058baac1033ec3e4f5cbcc215 SHA512 c8d4e769ede4ad17560052fd29a484e07ec220d732a1c2a6c88fd702940f42be3008891cb204c8acf6170714bc2ca42ccb86af7481e186f8e28c38736cd79427
+EBUILD granite-0.5.0.ebuild 1269 BLAKE2B faacde90516725b304e429325274ecb41f5d79802d15e4891d4d3b7b7cfe053e55f583a1824ba732b8c725d16bce4f6fef2e10feb61d8a8c50920b656ca889e2 SHA512 bedb4d7b8eb802489dc161cb129239c3db93dc28cacb2fb2421049a9a1a13a8c07bb625714a555473f71e427a6ebf35be6d2ea9c0c4a5efdf2ef99cca2f60523
 MISC metadata.xml 829 BLAKE2B 39f7f389875b4e27aa0657a3f2dde9d99e6cc18de9e2cbd24e9a7e7b441823255a04972cd470e04bccfd4db803ff05c0c5be74d592564129d1dff137294fc934 SHA512 152c9807840842a1388a9e10723af0eb7aeb198444f85eb27cd19a3a0233374e3c60c9c2c34319b1549a5cb59d71cdeba075f0f36fb784c69fd78059367e1a91
diff --git a/dev-libs/granite/granite-0.5.0.ebuild b/dev-libs/granite/granite-0.5.0.ebuild
index 6881a8819db5..1073ddfa413e 100644
--- a/dev-libs/granite/granite-0.5.0.ebuild
+++ b/dev-libs/granite/granite-0.5.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 VALA_MIN_API_VERSION=0.32
 
-inherit gnome2-utils vala cmake-utils
+inherit gnome2-utils vala cmake-utils versionator
 
 DESCRIPTION="Elementary OS library that extends Gtk+"
 HOMEPAGE="https://github.com/elementary/granite"
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index dc713d70c717..eb62bc4ede13 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,5 +1,5 @@
 DIST jansson-2.10.tar.gz 487855 BLAKE2B b1d83ad1a37e66cb7c497284a7958882d5a7e13cec2260d9cc2b5eaef648feea66b70305dec9193f10cf77f37bdda17605277ea41735708ca6a9898b79fef807 SHA512 e331d5c097b4acb0b1df7d90d1d3453c26bd34bfe2e06af0027665bee9efecc2bc61cc7ab5b70dab1262bf80a3315ffb53b4176874fe07e20eee4b9ea7071d44
 DIST jansson-2.11.tar.gz 483686 BLAKE2B 873283a1b41eef1c57fbcb3d4cdb8c33b850d95ee93c800cbcc009e3e9c9e87278beff11800e63894087e51c767dcbd555fbde48163376d53be2bf72b2eac72d SHA512 0ae77cf7ec264536313639458ba20b66e221078cddd209df3ce45c895b897799954abc1ca4b0d5993b974135652804be6bede2825503469d56303470888382f8
 EBUILD jansson-2.10.ebuild 857 BLAKE2B 7b1b318f3a0dab579b82019dc0fd07caee375f19c0a19f4c92ba0f59a094432d85e722eea298c1d38ffd8d0508139dd160e99c29d1bb2c3a8d6512f1d5ce9465 SHA512 4ff618e64579443a2811717259086ad988991a773b1d35f05456647b9e19d2b757107cdedb1e840ede68c36b82714117acf5a42f46d89b020a835ff67b2a2fac
-EBUILD jansson-2.11.ebuild 766 BLAKE2B efdb317dbd84437ace65aa5d83fdc7d86b2b0512268b85b8cf87a10e7124d3c3580af5f31921b0fccec826742e794b37884e5a160993843d534bed11549a0a80 SHA512 a7d2e597d62a5fd0386f82b849969dc99c577e84c6836f08467067b001468e49ff811f815c2583599cd2fab256a113ef3f73b4ef914c8a3bc93bbf5023a9ce01
+EBUILD jansson-2.11.ebuild 845 BLAKE2B c1dc7acd0b9bb849774c43cb60a51011e067228348e4f81f4a3005e4f3c47ad310b707e53270efa7163c50a5fb3b79d1b95e296d2f2efa82983090644b1b4645 SHA512 665569db3edf7d1bc9701536c75226b71b2860a56cda6b5a76c37882eacd9f018267a97dd10ab987c1b6e628a08762f8754019a570bbdab54d2717b0beea9849
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.11.ebuild b/dev-libs/jansson/jansson-2.11.ebuild
index 682c09bc583d..595c96d72f9c 100644
--- a/dev-libs/jansson/jansson-2.11.ebuild
+++ b/dev-libs/jansson/jansson-2.11.ebuild
@@ -29,3 +29,9 @@ multilib_src_compile() {
 		HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. )
 	fi
 }
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libmemcache/Manifest b/dev-libs/libmemcache/Manifest
index bf93a2abd9cc..d216f4d12fe6 100644
--- a/dev-libs/libmemcache/Manifest
+++ b/dev-libs/libmemcache/Manifest
@@ -2,6 +2,5 @@ AUX libmemcache-1.4.0_rc2-implicit_pointer.patch 385 BLAKE2B af014156d4168b9216d
 AUX libmemcache-1.4.0_rc2-inline.patch 2051 BLAKE2B 80b6b6afdb818f8f27d574f30aa2b8f32d627a94d3d92c31879328f0f0d1ecf1a6afa6c445a04efc1a8bea966de936c33ff1b13729c4651d7467b15c7080df97 SHA512 f5f817ffffeaccd930e83f099c0786302748afd13946b408ca63fd89c5d77d0fe7a6190ef9db7ea9da3882c00ef6ebeeed109c527bbc1ebeadef193e193a0cc6
 AUX libmemcache-1.4.0_rc2-ppc_ftbfs.patch 983 BLAKE2B 15a7b9e02216ed68375d7aba2b5b0b65d9da522db74d6ccb200ceaaf1cc1ff61872db6f657cf832894a02cf0c59448bed52795496d0edd9a86d3366348c052c4 SHA512 4ae7d6b99982934e7a28f7e0dd103341e9f4b7eb514e20cef3c02e428ee8c555c71c8bfdc06f0771ff0b73827251fa5eb4e7bce8014cd5cf2f5148d18b1f56b1
 DIST libmemcache-1.4.0.rc2.tar.bz2 301136 BLAKE2B bd30932811012e0d6e383c42fc3e61096d3a4d38f111bb70f04313119aaa1ea65c8709198b3edcad5dd136a809656dcad58603715115cc44affab333bf750302 SHA512 4b8c09c425d48d0ad040d3f01ec3c0d88babefb702b666d5cb3d10eac9993be88d00120b57b6224f7d55ae979d3136de10d5ddc793d9aa7f8b9531b5d79449d0
-EBUILD libmemcache-1.4.0_rc2-r1.ebuild 1030 BLAKE2B 7e038a0f30317fb2132f4a6a749e54de01cda756a1dae538a36c8766373c17b693f4b4622171d7d8ff6a2d8dd1b63f8011301a685ac35714e568913b752d0a2e SHA512 a1b47e5493075a59e482e43a32978c9412e3e015a0b999c20fd4ecbec897a14fe70488db918c30e5792ae1c70c46762bc297db9f15e51004770b58270ade357c
 EBUILD libmemcache-1.4.0_rc2-r2.ebuild 1049 BLAKE2B 5ed7c99d2660abd11eaaa687789c9acd4985c2c7686d08a87153ebdcbbd6a24028a9019823ba023ab2f1bb3704de91c822800e697dc8352581050f7a1da87045 SHA512 cb342ba5a13ab8a980739c8bdfba0061a2278cc7c6bcbf230e6f23331e15e482e20a8e312ecf26e5235994194ef7b645d6d3ddf1a6deb3c05453452ce05caa41
 MISC metadata.xml 304 BLAKE2B cf6f26fa6563aa19ef922e08b525d5f70af1e8df8ad6396a67ac6f956b75879ab0af1f7d65d2306518f56d52480bb27a7936fc32e31b858eb4cdb4db9ed19fdc SHA512 de92a462028eebdb520fd2a745eeffd845615fbace7691bc954997113a2b0f273f5b9fdcaebc299ae510d3fafa611397ac468b8b13fd44c00488fbc210b3358c
diff --git a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild b/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild
deleted file mode 100644
index f8bd1277e504..000000000000
--- a/dev-libs/libmemcache/libmemcache-1.4.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit autotools eutils toolchain-funcs
-
-MY_P=${PN}-${PV/_/.}
-
-DESCRIPTION="C API for memcached"
-HOMEPAGE="http://people.freebsd.org/~seanc/libmemcache/"
-SRC_URI="http://people.freebsd.org/~seanc/libmemcache/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-inline.patch
-	epatch "${FILESDIR}"/${P}-implicit_pointer.patch
-	[[ $(tc-arch) == ppc* ]] && epatch "${FILESDIR}"/${P}-ppc_ftbfs.patch
-
-	rm -rf test/unit || die
-	sed -i -e '/DIR/s,unit,,g' test/Makefile.am || die
-	sed -i \
-		-e 's,test/unit/Makefile,,g' \
-		-e '/^CFLAGS=.*Wall.*pipe/s,-Wall,${CFLAGS} -Wall,g' \
-		-e '/^OPTIMIZE=/d' \
-		-e '/^PROFILE=/d' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog
-}
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 29e50a791cd9..29a3a46e2d90 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -2,6 +2,6 @@ AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f8
 AUX libpcre-8.41-sljit_mips-label-statement-fix.patch 584 BLAKE2B 6523a93f78730f1689ddb79631e31e134d6de844dfc4b3e63a15aea4f0737773ff0a8e4fbf3e9e80ea920d1da751ba2165a7b3b459dfbe0d8673c9a9da95f63c SHA512 38f133a539f4e09886084e0ff2d30bf69ceb600095f87f32eae42f8f03ada9c1aae0a1eff6763d473f0edfcef047a0c573859d0ada503419a7d663140a92fbb9
 DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
 DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
-EBUILD libpcre-8.41-r1.ebuild 2759 BLAKE2B fdaee7a9cc0247a6e5264b7a279345d31ef6272b7e68c8b50596c0330fb3d3e383d301efb2871320b714da8768a2e5d1dc151b9e3650b42d22854110d69bb67a SHA512 3e00a5f5e95118a95337dddb0d73f2a94620312c25d4259d2112be1307d4e3ddb523b1beff69df3df44b6e05f3a1394ab67d77892a5c112546ae5ea559c8fd03
+EBUILD libpcre-8.41-r1.ebuild 2756 BLAKE2B 29cc305f8748feae7cad0fe5e11066a75ae212e441d95492c9e6b5f421a51813c32538b4e84294e4ec47a6fcb1d3281a05eccaad8709d8a5e73a9b0d28363d45 SHA512 fedbec7ca069d47f3cd96ba8a514cbe7af0dccfa30a3044f6de6bc94867072821cbfdfccd89ef458e72a79819bf37f9d26ab8e0f9cb11632f3218becd6c7aceb
 EBUILD libpcre-8.42.ebuild 2591 BLAKE2B 59f1cd6f60d2dc16c2c927fdf293ece576124566eaeed7027b66ed3f95ac2136226b1fabef44514468d48edf47f497797c811e4a3f5ceeb7fa9fea969c5f7648 SHA512 e3121271f15390c66401cca2eff0e4ab795d4c99254a96bba1007de519f362f212021d2287ccc0b13c7fed994751a1e31c2681a8e233b2efa3d78dc394ed85a8
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
index ef823d588f9e..c2d87d6d28f7 100644
--- a/dev-libs/libpcre/libpcre-8.41-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 96705e22f16f..dc9ae1b50254 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,5 +1,5 @@
 DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246
 DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
-EBUILD libressl-2.6.4.ebuild 1352 BLAKE2B 534573071ef72addd3c5ba00c2660e8d2b1ab09acff56d7e072c59ba4eaa3a9dc3abd859791ceb968318425d5b90d1f7b7c87f3f7933f054615173e580776f08 SHA512 605fda0d2e4935171e6b22ace0e35eeb7483c320ab64baf78737599f367843d82266fe2953526f75b9d64585d1e948e73ce94af244d996d8fedf5c59d4b7ffe4
+EBUILD libressl-2.6.4.ebuild 1353 BLAKE2B a7885671883289a1723ebe3c8d02885b30668bb1dfc37a418b5c0ca964c75a01c688279f43ba863cf28e4eacf61d0ff1946c651eacb48684efa7767026ac68ee SHA512 52257e618750254f0fc49c881c30e7058f6d82724930710e7cb19b5ab02dfba3cfa0b201058444c840e2b695de3fd85f13dddb0e9bae9b0562c9b02be3d61cc5
 EBUILD libressl-2.7.3.ebuild 1358 BLAKE2B 55a2f05f0042d113c2bbf0c01831e41dc08960d34a8aebd00b15b9c866581a928d9a1ef02bf7f2fea67b3a7f6eadd9cebcfe92a52ca28707efe18fdf2e49c330 SHA512 45499b0db8205bcb7f3d7d1cd0b2aca1cc6433918af9d94016c96d5b95ce9308615571221882ba9e6d0717ca6a6ce8a6c360e5f3de0e34e0d08e922f359ee70e
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.6.4.ebuild b/dev-libs/libressl/libressl-2.6.4.ebuild
index 92e14dcaaa9a..faa38895b6c3 100644
--- a/dev-libs/libressl/libressl-2.6.4.ebuild
+++ b/dev-libs/libressl/libressl-2.6.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/44"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/libtar/Manifest b/dev-libs/libtar/Manifest
index 75ced5297f94..9d169bacf6c1 100644
--- a/dev-libs/libtar/Manifest
+++ b/dev-libs/libtar/Manifest
@@ -6,5 +6,5 @@ AUX libtar-1.2.20-fd-leaks.patch 2021 BLAKE2B 73e9ca5475e86fc6c5cddee5f608b0a1e3
 AUX libtar-1.2.20-tar_open-memleak.patch 630 BLAKE2B 31616574597017dc5444d0b79aa6084c55f3eedf5c23099663da2905bdf8be8d499c9a81228b268840524e286e06b18c3221a60c95f2e3effbb09beb8c0712f9 SHA512 a37df7b6e1e98298f622c1cbef348861c187409abf6614eafac21d802aaa1418081281db3e03fda0ba9fc5a690f4fb00b61fbe277c4c34c82443d4fe4548e317
 DIST libtar-1.2.20.tar.gz 63542 BLAKE2B 57565fd703aec159a0b30280c026ce82d4a74fc658a24e589c2d9fcf11ff0e8c79de172df8b4cfeefa776eb27bb4b1a65951739ec37de4300da47d508a8d4227 SHA512 360a0296af99bedd6d93236c3d6d6746fd38deaa5287e7a138d303e1072bc8871437a693dc926d82af5b54dedba2ebdff5a3edb1f7d7dc494b4235439e477dec
 EBUILD libtar-1.2.20-r3.ebuild 1363 BLAKE2B a18bc2460adcbd2ca5e453219edafd307d261be4c50035e6861d3590ebd3e2d9d0aaa479f03d995bd22c76191400274ac401ca94cd526bd960d266c92796b83f SHA512 8e7a8081bd465e86f4104931e0cf874c104f620e85dbab7d82cebf8522bb1eca457e1cd02b0882897007d43adf729affa9114b1a4157cc2cf89c31d46b0875ab
-EBUILD libtar-1.2.20-r4.ebuild 1499 BLAKE2B 814dc0bb642f92c9877c497bc837db6e52a8bc2f9be50bc760288b74a04cb36de13c0ffe93bfa868df637999fa2c10e0017641c665dccac29e36a348ea0ade20 SHA512 085ce0cf5e77e40025fdb1d0d2eb95d526aa947c9ab7cb41ebcd0185ef9b6a0e57302e7d3c40186d9fd3e9b4837be3da0f5cf242b77a64378f5929584873f13c
+EBUILD libtar-1.2.20-r4.ebuild 1498 BLAKE2B 864b888e04616a5718eb28e50eff8075b8a7c217edbd758fdfbf67c259fd09187d20d5d4340b5dbd1cfae86bcfe7a8e070856920f92ceb36b0abde86166555f9 SHA512 de3f024551cf56f9b3195ae068801a7c9ed8010698de417aff44f4d02699e2d050163939d1700db36082115f32e2fc41b29da059ef6414aace4b7c794eb2d644
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libtar/libtar-1.2.20-r4.ebuild b/dev-libs/libtar/libtar-1.2.20-r4.ebuild
index b9717afbdee3..e9b592b25cc2 100644
--- a/dev-libs/libtar/libtar-1.2.20-r4.ebuild
+++ b/dev-libs/libtar/libtar-1.2.20-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs zlib"
 
 RDEPEND="
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 8b72499c1f8e..704c5954b210 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -3,7 +3,7 @@ DIST libuv-1.20.0.tar.gz 1180231 BLAKE2B 8ba258477c685acc1ed5486211b65719419757f
 DIST libuv-1.20.2.tar.gz 1180957 BLAKE2B bbf29ea1ee989a5197daef92fee12aa83687002e14e8a4311b61c743cfbf6e4e8e9f0045b38fa5301afcc9981a5fcd59d12e0649515b2e1695ede62795929d4b SHA512 449dfd15e2953d2a8b9c6160ab39728a87799b3e8595f9e3013467daf69d3561e2c5602172a0596e7c884237cf0d52d3b0f00edde03a7b037dc90b61bce2057c
 DIST libuv-1.20.3.tar.gz 1181741 BLAKE2B ee68f975c9f150034b02772b297a05692305155449dac75f35ca32761ffa2803385b22cce5c0fe1b2ad73a52144e6218e2c62d73c92e098017bee74a99e16062 SHA512 60ebc0059ec9fdd022aa9d60b2a0340f29e037bf79fa08707f6f2ecca9ec263c7a6466bdc1f94e0875a6a627ee749efa86117dedb22119676a7bafed8b5d77a0
 EBUILD libuv-1.10.2.ebuild 1140 BLAKE2B a8dd07a2cb5bb9959099d681d9d711bb78afed0decff1f997735749c185540592212137735165989050ea59d6bc1795cf2e1fa82898bdd81fb7d55011ca63d4f SHA512 65f5e4e77ef871f8e40657981432a3bd51d54671b056cac25a2a268509f6f005df3ea73894ea29da3a4f1e1076c9e9c7f177e0e2a968df1d6df498ca14381be7
-EBUILD libuv-1.20.0.ebuild 1165 BLAKE2B 85772367d61854f6e207ccd91d2de99d0c81c6c72a2f87f2f9060fc5dad3f87e1927c68b1f8a05efd665918c19b46ec5ac2e742ab67f1c36d403e76ff49952bb SHA512 0ee0c0b994cc5f5348f1a5a91518b0403dd8e36789c9dd96ad7e7b31b06f41c0a8c69848d121818f8de966b9cf8fff64ee5bb4ff1c99866ee547dad83faa5d18
+EBUILD libuv-1.20.0.ebuild 1164 BLAKE2B bda76a39e2e728025af067484853141ba0a5c6a6c64d1eb5847d67d0042d18664ced8d3cf2f85b9091ba0566ba75b809513edadfe8c96af17d17b039270afaf0 SHA512 3c53767c5115f2b0b1ff8406d30601f1cdd265d2d2186fd245cf93ddf9dffbf344bd1c54565d277152d0249dddc46e49d1e57e97c7904950b1188f6fff2fd31d
 EBUILD libuv-1.20.2.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.20.3.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.20.0.ebuild b/dev-libs/libuv/libuv-1.20.0.ebuild
index 1e8095893c3c..f920d93c650a 100644
--- a/dev-libs/libuv/libuv-1.20.0.ebuild
+++ b/dev-libs/libuv/libuv-1.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index fa68aa1cf313..5d816665dda1 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,3 @@
 DIST sink-0.5.0.tar.gz 330203 BLAKE2B 5b0448dfb984c1aa4bdb913f8ce5e5e4e3f1a6ee33d840ed3d9fdf9e0ea6003a928970d2e6dc25e824241768da9abed7dce31ef857e4986990aad16e7aecd667 SHA512 e47f3d99b934abb184a5f8293f1a092fccabe0bb550573cd8c35918471a4caa94eaaec0361c43376c93cdb480612dd0f78626d6649077f777c5cccc8c5d4389f
-EBUILD sink-0.5.0.ebuild 1196 BLAKE2B ec09fa49e1d20266d74b2b314da4ce08282e68082e83768c2dfeb23e09c7d66661ff935fffe12f3a413d6a849ef6f5655793aa109cd7c1e0694c94c2db726abe SHA512 b224fb3e7a56ff03dcf84b30f7b25643c7cc460b725a2d29c2036fdd489a2a8eb835325981ded8b27a5cb20e0cf026dd71f2882b61f275a8e7c7afddf00df95b
+EBUILD sink-0.5.0.ebuild 1225 BLAKE2B 2f273d3b025048bbd73dbb6f1b4078b9fc700ac7907547ea4d9e62514af3d1c801856c26582301b294091ee2d68f8163d3953e57894aa878adb44af6f1c03e8f SHA512 5ceb4826009802f333720d36404a58a2efa464b70e1a3a3cbf9c898f5ff0406b0fcba598f30fed8677ab0ccf23d61a79a3350e8764077e1986451d91b82714fe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/sink/sink-0.5.0.ebuild b/dev-libs/sink/sink-0.5.0.ebuild
index 06692c9740c7..c9b2a827310e 100644
--- a/dev-libs/sink/sink-0.5.0.ebuild
+++ b/dev-libs/sink/sink-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,9 @@ RDEPEND="
 	net-misc/curl
 	sys-libs/readline:0=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+"
 
 # fails to build
 RESTRICT+=" test"
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 3e8a4a0adaf0..52e632f01742 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -3,7 +3,7 @@ DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
 EBUILD userspace-rcu-0.10.0.ebuild 663 BLAKE2B 2d1ad36229c78b15bf3e9c738a383aa39c201329bf814e7e29d4726cd9828c6e9575e3af4ac02b5f54db3ba703a1f0aa46b90eb88028709299ed13bcb0285889 SHA512 2e945347710ff7f1459e33def817e4c4ce4e640bcb8f94726559534ce5f14aa45752bc6e169fdaeeefb491751743b30f744cd56dbc4a56fcaf1bff1c0227619d
-EBUILD userspace-rcu-0.10.1.ebuild 663 BLAKE2B 18005f9386b7a0faca02b10623716b078d3794a422a602dd6ef972b111a81a06d8d1152ce8c0e38b2aa56f92fff522d513cf4917cf96ca09e33864a38e38c88f SHA512 0975aa37fc6cf0d86ab995e3f2027be58f57a7d2232c5ad41e4b35afbf71c0865e4c849925e72d3abc95fd439758a3fde99d10a8301a0e2e408cd9f84957c544
+EBUILD userspace-rcu-0.10.1.ebuild 669 BLAKE2B 4d3ac9e75c34236c1f1f3b884b5223a2ff12466334beba7e0a78dc9586d6d91b9faaee877fb7c736c91404da9f68106903dd11be026bd13394c971d506d60d7b SHA512 0e4ecabdf0078597ca8681217e0754176af01fe9e78d94682b23a466ca583986b6f97e41b7ca105765d168be2459d22bf1be59ca0a997729bac3200fa0145da9
 EBUILD userspace-rcu-0.9.1.ebuild 736 BLAKE2B 2254c2ca484cde4821753e7c2d8a2a5c8f71700d77068234f9215608104104f4eda13dd4d78e20222a5dec2295bd05b75dc9aaad733e8555e0bf57218079e330 SHA512 c6e0ddf946e8e07392545e52f2bad49d2da3637e800b77689112128374c6367d5efa6b9d44d6143b3f17a8d74cdcfb877f2922e6a112c0ee8bea834242af4818
 EBUILD userspace-rcu-0.9.2.ebuild 749 BLAKE2B b7782ed9c88695473c2bb23dd9025eca95aa54eec2109fb4f2574f39b985b86ac1c53f5728a0b224b628717556427ffcb78325cc07f6e2f079d2fe05da514827 SHA512 61c3e1d51f225d39c5e521016605c01a4cf6188344af5a71785dc71f0a6cf4c1108139e38f32a093898c76f547decc794c19dfe70367461445abbb5816b7a6ae
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
index 0576c317633d..40699ad58d7a 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs regression-test test"
 
 DEPEND="test? ( sys-process/time )"