gentoo resync : 09.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
commit: cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree: 047fc92023c520d07f13ec5ac96e094d1b312a7a /dev-libs
parent: 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)
84 files changed, 483 insertions, 1581 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2f9f94af89b9..abff4052fc33 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index d07748fd080c..f12c0452215b 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,14 +1,10 @@
 AUX boehm-gc-6.5-gentoo.patch 2815 BLAKE2B f8d853bcd7f7aff56ae246653feecea291451ab82c946f6ba4d7e981ee1252fddb6455231ff0aca0f7342b93c1b5bbc133b954394b6d0bde766c1b3c39a9f12a SHA512 ba006dda2d3ab295cb14e80f8b7e0908acbde89dbdae46b12b91b111ee1ebc1340ac0b91db8eec18a130a59fe27eda2f7d48f9ea35280c1e9ce3513d3a72779b
 AUX boehm-gc-7.2e-automake-1.13.patch 372 BLAKE2B 5e385b21e4868cee8928d5137c7eb6a5f9acfd20883ea116bc2fe974a35ea4d62866573dc414beec72439d8a1e128b9a4d3e9d9b358c79ebab7ed0f0ec3c3f2b SHA512 19efd52b91b985b31e190b77e5370fb510ad582a54868bb1a7fe54ae57e0625df113ad059a6d636a10f314624137704af8e193460b55c8ba422b9255aadae020
 AUX gc6.6-builtin-backtrace-uclibc.patch 425 BLAKE2B 24bc5443353681d3aa5b4ba592535d5905bc6feded1e8e80927d9aaf8928411e37529cf0cfea5e7a22fff630bda26540ee55ccf68d787018f34024049f1acfb5 SHA512 614dbce788a8e559c25966f9c82343d7ff2b26069f6f77bfa6d91abb755a8d4a46958e9b95f14d1e7e20349dc4df5b32a9e5bdd3eee9e5009a30003214e5f87f
-DIST gc-7.1.tar.gz 1077714 BLAKE2B e3171e16b3451d61baefb6c005681abb3bdf6d29cfd595dc9b8672795a127a8dae0d03ee333ad23344adf8b0bcf2f0a4597ab39d5be2d3a56c5d92c0c717acb8 SHA512 10faa0062c7df2ac7e2e29ac369167daad526c9de477e9af2298e6e5ad0bb1de5d32203e048892b16c34b398657a1a338e2e122c3137eeb8143b184f9b5e7ea0
 DIST gc-7.2e.tar.gz 1291186 BLAKE2B 8c320aac2d9deb8fcca2e93622aa122f96c4152d2b18bd284be32d5a041f357beaf8f3142548685fe167642070471862d04c0e6c3ba1c99bc9c05e63d6854005 SHA512 80d1d50e38714b4f198743cd8cd5ab80a35cfbb7f5f9d66c89f40319604e989125870f010d4499876978594a5823d7b61213224a68da8664b9e4f8e14076c999
 DIST gc-7.4.2.tar.gz 1082597 BLAKE2B 5ca30e786a995941fdf2d803d201e7263bdd7d9974a71f672ff259c75ee36dc5d499a614334e570100ddbcb25fd06176f48429b64bad95fb218c35ba584ad4c6 SHA512 2e21516addf268780641ee55c0cb3ecc2d96fa963faffee5beadcade9c6bf1ee49ee1a75b076b5d49ddde7c839fb94f4c3623ca8412d14c2a5bf6ca30d424a72
 DIST gc-7.6.4.tar.gz 1120784 BLAKE2B e7cad27d2144fd37aebad44093e1a0814fe9a1cc887701e485681cdd01f3ea4477150697d535d0873a1255abff0765084119096c7ed61d3caeda439cf2a7644f SHA512 2c85be3e24b85732b3dc6f08fe98cf1a82b6fb2a22ec73090f80920721c737ef92cee8f0cd7ea7228d686005d164e7da54ce3907c3a1ba5eefa43355a472085e
-DIST gc6.8.tar.gz 756879 BLAKE2B 8a56c4f7b23e79862aaa6fc505a56ea9a8ed53b9f3aedc8cbb57c37f0fabe040abe22096a8893b7f7b1ff1267bff37101e3dfbbcedab380afe0abff02b98fe14 SHA512 69a9554d2d213392512d4ce41ec8c4993557e65c2b3dc4f568ac18695421cc08b7677c25f9a0ce03e94fb5e68a298fcac7ed09fb90007a2c998ff6ef78d3c651
-EBUILD boehm-gc-6.8.ebuild 1098 BLAKE2B f47d09deee86abd05454a21c8160f697bae01416af50188608cef1155eb3fe0bbd5c1762f31508148aba0acf4c8b8115b9273982006511313f1bdf9b83d66e5e SHA512 6a1c6872295404b57c997bfe7253305ddde4287e8979c380ac257d0c807ed2e245ae6e8dfd1192c8ec97c3e589252f94ef60d5e75e599d010b36ed1e9434d076
-EBUILD boehm-gc-7.1-r1.ebuild 1156 BLAKE2B 4636e7b84de6bb64d759b9ce49d6a64ed8687314ba286db785b6a9ecb5906b696ba21adfd3717ea721da357974d2c4a85d20830ff6e8c65a901f8a2c4b3c06c3 SHA512 7b44b81e665c9722b34ffda4eb08082eedb4af10074894537421eaf2b6238f3234b661107ccee05d8564e102bc6c21a1db78f9e7cfd31c46f66387ad32871d10
 EBUILD boehm-gc-7.2e.ebuild 1333 BLAKE2B 398be6ccb9df21a385df0bc45f0502db6e2f09849543d8b91c76451fc59ceaa0d6e7c430689163b9696bf2fa92aef1eae2c555083d5cfa76f0824a428a71b315 SHA512 e0fee4afc7b0f8b00df366d2856c3355e4832ebd1952f3ad3e23231dc7f34dc5471ced41624593690edc39b47a06274ca82c5dc90efc6181b50fa6a2e94b11b3
 EBUILD boehm-gc-7.4.2.ebuild 1248 BLAKE2B dfc41bb8278e4dc25ce02f6ee6c48d741119043762409acfe37ca3a3475bf0d38f88b3cbdb58143d7f8a7036c4e3cd591b83fbfdf107d14dc5fbad6dd47d0b4b SHA512 68df71e5393048b52929dd73a60cf8cb5b980dfddf854aaa842c78d2d8a077f6c8fb235ab507f38c0f1c8045342492834433dd77264450114d7439b4457cc806
-EBUILD boehm-gc-7.6.4.ebuild 1352 BLAKE2B badbef45f696b46de6055a3ce9c7003d087ac8ffa9acab128e1804e57f8b669af37fe0d21976f29aa1b1e1b5e66f224332b58cb599d440bca01347598bd275e0 SHA512 f8fd3f51aba41267251e664237ae0a33e70eea62b020f29e27e4c600a0e1de572882c49c1539f4b673cce33561441e4eb161b888d4393d963c37081e98e837ed
+EBUILD boehm-gc-7.6.4.ebuild 1357 BLAKE2B 2c4e4b525c0e605ef820de03a0d6573d85418d5a8f6389ee339aba6d2a4a3157c9946a8f7ed8fcae12848649fe15d58a8442afc5cccba130e7f86c263de51047 SHA512 2bf643e5ed3997df33856c675f1f1d46bde865f0ea619e53f302bd793a69186e23f7eef5ede390a7a849ae2c6f640a17e083ca8e8d84d5921cf30c2bc42d5399
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/boehm-gc/boehm-gc-6.8.ebuild b/dev-libs/boehm-gc/boehm-gc-6.8.ebuild
deleted file mode 100644
index 46e760138356..000000000000
--- a/dev-libs/boehm-gc/boehm-gc-6.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P="gc${PV/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hboehm.info/gc/"
-SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
-
-LICENSE="boehm-gc"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="cxx threads"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/^SUBDIRS/s/doc//' Makefile.in || die
-	epatch "${FILESDIR}"/${PN}-6.5-gentoo.patch
-	epatch "${FILESDIR}"/gc6.6-builtin-backtrace-uclibc.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable cxx cplusplus) \
-		$(use threads || echo --disable-threads)
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	rm -rf "${D}"/usr/share/gc || die
-
-	# dist_noinst_HEADERS
-	insinto /usr/include/gc
-	doins include/{cord.h,ec.h,javaxfc.h}
-	insinto /usr/include/gc/private
-	doins include/private/*.h
-
-	dodoc README.QUICK doc/README* doc/barrett_diagram
-	dohtml doc/*.html
-	newman doc/gc.man GC_malloc.1
-}
diff --git a/dev-libs/boehm-gc/boehm-gc-7.1-r1.ebuild b/dev-libs/boehm-gc/boehm-gc-7.1-r1.ebuild
deleted file mode 100644
index cf5927c9f57d..000000000000
--- a/dev-libs/boehm-gc/boehm-gc-7.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P="gc-${PV/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hboehm.info/gc/"
-SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
-
-LICENSE="boehm-gc"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="cxx threads"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/^SUBDIRS/s/doc//' Makefile.in || die
-	epatch "${FILESDIR}"/${PN}-6.5-gentoo.patch
-	epatch "${FILESDIR}"/gc6.6-builtin-backtrace-uclibc.patch
-	sed '/Cflags/s:$:/gc:g' -i bdw-gc.pc.in || die
-}
-
-src_compile() {
-	econf \
-		$(use_enable cxx cplusplus) \
-		$(use threads || echo --disable-threads)
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	rm -rf "${D}"/usr/share/gc || die
-
-	# dist_noinst_HEADERS
-	insinto /usr/include/gc
-	doins include/{cord.h,ec.h,javaxfc.h}
-	insinto /usr/include/gc/private
-	doins include/private/*.h
-
-	dodoc README.QUICK doc/README* doc/barrett_diagram
-	dohtml doc/*.html
-	newman doc/gc.man GC_malloc.1
-}
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
index bb46d18df236..f55d67781196 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="boehm-gc"
 # SONAME: libgc.so.1 libgccpp.so.1
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
-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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs +threads"
 
 DEPEND="
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
new file mode 100644
index 000000000000..0910e655df13
--- /dev/null
+++ b/dev-libs/ell/Manifest
@@ -0,0 +1,3 @@
+DIST ell-0.5.tar.xz 393112 BLAKE2B c9b718a6b471ef428f563989843281b7b00c1ed382d68e241d9b1f624ef085c554ed46eefac544a8711fe2ec15428eb5b069f60d827e5a363e8c0a539e2fbf7f SHA512 aa84ce99980ada2bd80ac5a479d31c84784bc7b09afd0586ab1672a1227dbe14fdbc3788ccc812b22073e1e55b8902f81f86d9f1350c5c280886a8528d6979ce
+EBUILD ell-0.5.ebuild 686 BLAKE2B fd09b1e95e2fae190112eb2c52c7861928294bc3b4267f937ff2ea817ed038e2a9c3f8febdd5ec9c821819ba7a8d097ff2784af65762c8136c2e7d0d4e058835 SHA512 17b7be3b37170301a283fc2c2cb8e9ce7dad0a490f05d87542e7fa7229a64a9959f754c1095b821a29b3fcf53596ac0d2aed8ea68b53e7d68e37006e3d2184a8
+MISC metadata.xml 332 BLAKE2B 39fefa1e4461eb745bdedd0e34f72a17e8836bbf6017363cb7192153478076bf64aec9b6654bed84d04009a15b67b10d558cd3ad153598e5af15497e919f2108 SHA512 f81cefe69856b8779f19bfe1b96cce97d51d35a1c233b783f2ee5af67d21f793c2aa054576ad62adf98535dc6068899c46171b5363b9ba95c38fea3286b39f77
diff --git a/dev-libs/ell/ell-0.5.ebuild b/dev-libs/ell/ell-0.5.ebuild
new file mode 100644
index 000000000000..1eb5d54cc958
--- /dev/null
+++ b/dev-libs/ell/ell-0.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/ell/metadata.xml b/dev-libs/ell/metadata.xml
new file mode 100644
index 000000000000..75355cad9cc3
--- /dev/null
+++ b/dev-libs/ell/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <use>
+    <flag name="glib">Enable dev-libs/glib support</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index 7462e94f140a..d56c2dbda1be 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,4 +1,4 @@
 AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc
 DIST hiredis-0.13.3.tar.gz 58291 BLAKE2B 2af5853475a48b1f05c17100197633af61663a23a1259c702545938367b6a5b9fc09b886e12f57d27f23db3f5c636bb42d7e58887cc1481b7016cea405345ddb SHA512 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
-EBUILD hiredis-0.13.3.ebuild 1852 BLAKE2B 25f5711451a8361609f5b6316e8539181d4849bf00dacf563040a2c1799eb52b5e013750b558a249fe62e482b53220651405223fd4299b6bef375cd5ce08b717 SHA512 b7036423b9c68e5e76b9c3dc8a8e131c9ed2beff3ccf79cfd352346e561fa98511b029cc3440c49025e92fae51c237c180ba8fbaa96ecc50ab8863d97413cfb1
+EBUILD hiredis-0.13.3.ebuild 1857 BLAKE2B 9217947c72f5744bf2d01ba12e647672417d8ee16379320cc9c1edbf3a8840478ef09bb14f132b4d42a381271c3a2a5b39bd4ba047b44cf3cd0335d65c5e9f7c SHA512 9bfb698ebfe74a1b9400b7ac25c0b9ec4b04efa2751f4a1f7b646a1d536cc15cfb57e9017a86e5661f74da66ec7521834a9fca7a00474363429a29877756a881
 MISC metadata.xml 297 BLAKE2B ba20b03da98e6f0ffb782592b6985c7ee18af0b4415302304e23af4886f32fc6c0228086dca3a5162d68da95ea617d919f3d838a2c27b1f396d1c60b1e1e1c62 SHA512 066533b525b755fc03d453dbec7c7af33a1f550d493e12fd96d773cb9b1b754ff02f689019277840bc29e3b1f9efc8226729637ed3c50b4b4cba1a64d3afaee9
diff --git a/dev-libs/hiredis/hiredis-0.13.3.ebuild b/dev-libs/hiredis/hiredis-0.13.3.ebuild
index 5ba57f6d832b..f9c5caf202ac 100644
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ b/dev-libs/hiredis/hiredis-0.13.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/0.13"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~x64-solaris"
 IUSE="examples static-libs test"
 
 DEPEND="test? ( dev-db/redis )"
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 2acf30d8d8a9..3a25de4b50ec 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 EBUILD jsoncpp-1.8.1.ebuild 1353 BLAKE2B a561f153e32b1b81043fc02b64020a51235fb6557626aeceb49ddb58be7a424f8da93c2c8db7bb16a24a4d6cd86e01f8c7290f22926d983794fa2969ce4cbd1f SHA512 1479c2d2c5069ff392f158dc7f0e8320b1414d15ebb941a62a3e1359baf482e3e07093b828e38796180f5b08866e081fe3cd9f62efdca5104e9c583a1ec24a82
-EBUILD jsoncpp-1.8.4.ebuild 1365 BLAKE2B 64663b49ddeb617ea057021963abaa45eff276039f704b4bc85742e05567362cc70762947c8aa469a5be56d16e053e82112ffa342d88433bcd03180679f59177 SHA512 22944e3f49a2456a4fe10c1d48c26d465200da847b207fe28d24056202f6c20d5a2b4c5f8c16a8e7f04b4fb74273cb241403bb85bc6be93666bfb87e7ab753eb
+EBUILD jsoncpp-1.8.4.ebuild 1370 BLAKE2B a84a5ca2b32fdaf245dea03c51304e026c11428eafe2ad4a1ae36d9d394a968a6f10aee504d08b590dd2ac9d8e060e96bcae182a2178e35c7aa9d5ae40f4e0fe SHA512 b942c9e5cda3e95b10e89c88179ea279fbd7f860364eaec5ad92210c9700c916af7ac5e04925552c0599291a4ea60e4a46a451d6c6bc9b882e66f95a7f24beed
 MISC metadata.xml 522 BLAKE2B 6f34ae666bd7ccce5ccb075abfed8c32b8b5b3b32ac9fde277871ab735626fef6af12bf6b9da75f081726af7846bbe55cb8fe0663f107d6adb4f3bdf2db2dd26 SHA512 95270a54162bd5940602765fc238d7f30fdd0f42b8523774464a3f2e124b586dc0b03913a7b2db4bbb90f83b6384b97d8b8af8bcfabe7ce50dc93e2c87058530
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
index 61d305dd279f..caab49d63485 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/19"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 7c7364868884..a479ad04daf3 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,5 +1,5 @@
 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 1099 BLAKE2B b2df568fcd4c2e50fde71a384e85a829753915a74164582f01a0be20f30d5a8a4dfa61d645b6f90ede321cf7bcffc674cb7872c6ef313cc06bb0689f3facea45 SHA512 a3cab0a03de279a18d49db4bc521dbfd04340f66edddb1cb05ac1dfdf6ab4096d1f082c3115e8cfa281873f2d25f810fdbe514aa083313e66a2c470e0e752db8
-EBUILD libassuan-2.5.1.ebuild 1100 BLAKE2B c3cb3a73ace126b194bb97efb775c461b8c3b4e3aef116e170712e3def84b2426c2bfe549dd546d68e345d562b6e41bb0eb0747dbf1f2e5f877d7e54ba4fea30 SHA512 ca6f054bd3e22598e6922617f04ad8f5cc9a4efb9c4607ac3b2392a1f2231598cc732e15308d6636d7f6da19e753a4e618e1c51fbb599466b5740c2f4dac2da9
+EBUILD libassuan-2.5.1.ebuild 1099 BLAKE2B a4d4abf85c3f77fa87d82cab807296d88796b917fb28f5ff7ea1c0c59d4db26d834b3714e89c46124c8c8b536a1a552c7b41d42b6f3d274df9686bb9823acad6 SHA512 437a8d4fc3c708dc0d3fcfc83bfa6539c15ae895ff23017f1cc057c943a14b3cdd0baa0d89c0a5e7a45c3cd1e3e962a9712487b485f9da369c89c29abbffa60d
 MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
diff --git a/dev-libs/libassuan/libassuan-2.5.1.ebuild b/dev-libs/libassuan/libassuan-2.5.1.ebuild
index a95566fbe4ff..00a754425af0 100644
--- a/dev-libs/libassuan/libassuan-2.5.1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1.ebuild
@@ -11,7 +11,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 1a2862a20629..124865670d61 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -10,8 +10,6 @@ AUX libatomic_ops-7.6.4-gcc7.patch 1669 BLAKE2B b37d7940e2a793fcda7f20d509e326fd
 DIST gc-7.2alpha4.tar.gz 1091329 BLAKE2B fb55adfcd122ec5e695a0ab198a4a9ea816cc036bab297e38270d8f673ec6b5cca49de2b383b0fc9c05bc41a417bbed11bdf19370bfa92ba87f63ac34f119a2d SHA512 79c4439989c181add9b80467b1c19d2b61a5e7c510a84a61ee27017220ef56a2b0f4945a4e850019a6c0fe7a9cb3a982ef656b97d988d8e6f3c3fb8270a3e783
 DIST gc-7.2alpha6.tar.gz 1241386 BLAKE2B 0bb3ce73ebfb91ee5ca3222c1b466d77c37d34466dafff2f16462c567fe89f17a27155ce4c5ffa7caa8eb01bc32b7a93a67e547f0adbe509c42533717ecaadcd SHA512 19e8cbb5d4698998a07725dedc204fd707ef3d47a0184129b418e4da44814f0016a834b6ac3766f754e76376441dfbad4b86e8e1b6ada8446f54e70f590628e4
 DIST gc-7.2d.tar.gz 1263064 BLAKE2B dfc90b7a40418216cac31df790a8868d271b7a363ef55ecd62170983a8926f19af716af57777d94ab0a50f20b1f08b37bbb863d42a63b1f6e8aa49c97b1d29e2 SHA512 5b342754a1efeef0cf78983b7a0e48a36495beac04fc881ab356b26dc153b343e940ec7af070f4fc875be44adc559f7be995919fe9229f68d2e0237cdbeaabcc
-DIST libatomic_ops-1.1.tar.gz 178581 BLAKE2B 9dfb37788a9a360ff56ab16a69ffd6dc77d9ad9aada7475717809ea3bb654c702559257a53f02682d5367d2294c0ac0a9e0be7bf7a456d5f69788905b025783f SHA512 888efe425ee5e6a8008eb047dcb6db6577af73705a172010f1ef413510dfe8127977b37fe18a54be528ed3a0f0b1a7edc5e2ecc147fd6d9d3a7fe5ecaa9a1253
-DIST libatomic_ops-1.2.tar.gz 183780 BLAKE2B bdd1a8e6195f50336b6680841d403f4c1810fa8b559ce664e92c005508754283878c95ea905f5b21b877911f9bd2f9bde1cd7861087e5ea5607584b7fd53e9a9 SHA512 b3eb524b900f3da46730b4b158e73897f0443269b78ea429812d91f1468d17cccbf15dfd522301724049fe73aced38bf1567aff7b680795da392760890ed83bf
 DIST libatomic_ops-7.4.0.tar.gz 455143 BLAKE2B b13cd06bdc0715097ca1759594f24435f8e80b707fe77d1f8be1824b3be7bc992c98df222450dea1facba4da8877a0ac0752a6e82881781d68779492f8b273ac SHA512 3a2f6eac7c5f0fe0abaf8650047b8ec1c9c5abe732982a294a2afa920b588e17d64cb9f05a44be31b8cca9e52cc5ac79a26e1779bf60169c228344df4bbe86a9
 DIST libatomic_ops-7.4.6.tar.gz 479437 BLAKE2B fe3199df827a170f328997bc24cc2b717d5df8704aa90e4db5b82add5861b2a08f5d60e6b35491cfb656f086d489749a73dbff6507b30aa5c5d350cf07b03649 SHA512 29c6f937aa5d21343741aa0661aaf33ec9196b7784b7165d40dd87ce7bf8a7691f5ba94040663f078465ded1935ca01bb829a4b56b190f9db63cc141515d9819
 DIST libatomic_ops-7.6.0.tar.gz 493177 BLAKE2B e1f8ce79de18192a5dbb2dd5834928fb8a385cb1d2174186049a269e1329ed32adb975bf461e7d29a75332916719d4f3197a30a1839221c6ab71249f17e9be98 SHA512 58f1f1df94ff33bda5833af2e3a6a4af120ccfc0cec0fb15e2db24341e2ffd5a6436169cb4e7dbd96a6cb0431c1295dc4b5270d4b01806e470bacadc902720fc
@@ -19,9 +17,6 @@ DIST libatomic_ops-7.6.2.tar.gz 496917 BLAKE2B a59ecc1053df8a5ae2fe9aab5c8e18c09
 DIST libatomic_ops-7.6.4.tar.gz 497571 BLAKE2B 151cd518a346dcf2540c2e8229c2309aa83a7cecc3d66e3e8bab3d09c8688d725e26b27c836c0a3a3a46cde40fedfe26b0cca53cf2b2017f67e72d4a4993371f SHA512 2e6ef0bfd4b77e9260383feb2865c96388fb1ebed9d37605eeb83ac87e3b6a565495d588808129ac7b3ee5f6a58a37440da7784b680cc6590842b09c2625983b
 DIST libatomic_ops-7_4_2.tar.gz 115132 BLAKE2B e08622dddc3baab17576a893f893898ad4d09bb994b680641b98edc3da7eb2cbab4ccd45a02c4e7f6d4d500c3866f1e7c0354bb692eeaf4784321356cfeacfbf SHA512 3d06d5de930a369dd2af4413d8f573993eb927b45941ae8eba14ada91abd34a6baf31e1030d1ef6aa02bd6a2d8d59f9f306dd8dda6a68cf552a2745041111b2e
 DIST libatomic_ops-7_4_4.tar.gz 115469 BLAKE2B a76fc56937f2c6ae129ee249214f7bdb3277a90c349f2713d14b1f11c7dcede9e6a76390ca329969e585f3ce105ed3883c1d37a3f12795abbe62e58ca5387e7c SHA512 2c1a773c61b5fecab467746e872f7eb1541c1f6770d2055d0440dac461294e896ff73460097a73c932ad07d6c44eb820ebfd039e5d87f1699d518498da6fa25f
-EBUILD libatomic_ops-1.1.ebuild 506 BLAKE2B ec905cdeb62f6ac03f1d9334abcbcd23be3d70cd5e5d8dbaa700a31554ebfe3c49014b6670d418d3af9828c2755acff719703bc15529722b002df9b4efc91c26 SHA512 bed71c0e86169104dccfbd928d78a1a5dc744f8dd576a3af6d5355bac487f08b189a5a9b39f4aa0a7858cbcf134a7cabd544b114ba4ad328bce4a265a9e543ca
-EBUILD libatomic_ops-1.2-r1.ebuild 946 BLAKE2B 542e211e460c49fd7ab80a51e7f97b24d49f0d410fe9431a83a87582e3f1ab96b379b011b5a55583e6c08c023645008f89ff86750a78581b9f7556a52eb70254 SHA512 870522cef4ee6e26e3a2fec1b5ed185287bbf8bce11eebc27e2a42ff677ba652415db0ea614f50d404a38991f8cea307eb642be5eb746d0a8fe5fc57b95cecd6
-EBUILD libatomic_ops-1.2.ebuild 669 BLAKE2B 477f657987fc196a9422b844ae6f9197bef9bb036c53a2e5083798533aaa0f9ea2455b1f21f52ac2ad5f8d0db27e297e8e61f2d592a8fb27c47aea4a558abd76 SHA512 3956cf5ac321ed2a924bf5222b01d53f7e3ca1da5405cee63f5b1e615afc65dc452147c3dff08c18bde435059714181f2d986655aeaefb141e5c9aa4d4a14957
 EBUILD libatomic_ops-7.2_alpha4.ebuild 952 BLAKE2B 7d5a33f4b7765cc663b536b6d89d35db26ce62d769237d10ebc553c03cb3048cceee4e4ad8f4aa0cc9c683c8c1bab72dbe2e6995343ef9e7c1469eeebb816b5a SHA512 ccbb482eacd7283f9cf157604d66acc76f33914f4a7d21007640c60d8950a16e6f5abd1cd9b346e0fdba2f0d97d6e385c3d4efa8ef9801a4a96c03d33a51eef0
 EBUILD libatomic_ops-7.2_alpha6.ebuild 938 BLAKE2B 45d31774261ff308970555e6d6a2a3c5bf14d4075457bb5acf27c63c2cc953a98fdf3c96884a3ea08373839528005f794b4c8582b97d57d008fa6804be48b54c SHA512 fc233651c4f7220ea5d38951fc703ef461fa1da9a9f33f852d1154ef7aeecf17285287c42a00611f5bc7cdd186edfe96e6212fc6cc1604442209efe894c6776f
 EBUILD libatomic_ops-7.2d.ebuild 907 BLAKE2B fd40ad7f81cb14888d41723452104775775178929d2d4696b8f0eca4119967e7a3327acd062c220da7bdad6f08a86190ae6f3570480b74def331f757fddccab2 SHA512 e7345dddf64686f2c72d8313bb494618307ecff639201ebd6c0cd6f0f753a31cec284e1e11a89fe5224d700ff5d68059f01d9b819c446db1d5ade19f5894b905
@@ -31,5 +26,5 @@ EBUILD libatomic_ops-7.4.4.ebuild 789 BLAKE2B 6a39dacf0c431116607949e9b60db9a390
 EBUILD libatomic_ops-7.4.6.ebuild 652 BLAKE2B 8eefa79a0bda76b93d752abe2cb40f39f700d32e78fd987a8ced8fab9fa1f96b589ceca06748d4264b24e89eafd7a8bb04af694722bfc509567850640c942b0b SHA512 73263d13bdee63c73d4ca7551ec2d9c2172de4d3daf1d62ca2ab18282173e444baa4430d046ca5bea085223009e11a05feff2a11e89756f7ec05f4fb90749f4d
 EBUILD libatomic_ops-7.6.0.ebuild 643 BLAKE2B 5fd655911133c08b02288e8d6c194e2fe73c23e8577e3e36e79da77c94fe985905d53769586becc3b69cf07ac3d12bf6a9c077713ea0df1a1ef7916f35a29617 SHA512 e15b8c149dba4db082f88dabcbba339d90d9264dd418e0a9e72359f546fc6555786ab4e335daa94df5bf2161709075a6697190a57c776001b82e07fda103f02f
 EBUILD libatomic_ops-7.6.2.ebuild 661 BLAKE2B 1f61944836bc735e327f9086ecc10621ed8e60d2426c086d774db56abcef07cdbf98a4d88aac485bd0ec7aaad585081422a7810a84cb4fb9078159aab82ce26d SHA512 ac75f27f0324f245873d7395fb119242a0d677ce32b5aa9d0b7824305cffd6b5f986a8b5addb7ee6098ae9f795aeb4765157a3a815b810b7d9817a9f348205ad
-EBUILD libatomic_ops-7.6.4.ebuild 772 BLAKE2B dbe5f5698a3f7f876ac01e8d00eb52ae18c5188318114f95418971fce9c7bb1b37028aba5f0f7cdc986d1f2bf5d33cc0abf2b46fd4186d4bb9e2e1d6dad959b8 SHA512 0025c6bf668a50e233ad295548164784d4b158f34a6e9695eb53fc3d244a1de42c89073a4e27d6d2aefc30f78e79e99450d2dba5cbe40d53805f457f102a59f3
+EBUILD libatomic_ops-7.6.4.ebuild 777 BLAKE2B 0f1a533dd9fe6603a0b8b4b02263d67830c3751aa31e4b12fcee2eb9c0f93af9f0cad132d2ae7705ccee3645c333ee893f9763aa6f949dbcc3a3a14c0c4b4c26 SHA512 a5ce9721e64aaeb642587edcb6219f0f4ef64448bd995c96b90bd69e75ef390b462ae58f773fc808068797416693ec81bc0e758fd36b79006ef4d6ae15c9c0be
 MISC metadata.xml 347 BLAKE2B c8fa80a777d85e172d52bd7eae6523981b9fcc79fa8d6cb7378960adda45dd6489def86930704bb845e64437ff33b39f5401cda0d11ed021342235c7020759e5 SHA512 7a4acee1ccb58c4694e9100d556046c55f508050f6e09dc3d4dd509db9eb747b94eca152e1e98c2ebacd8b8c9c75c362426ad9545cac490f959ec16464f809e5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-1.1.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.1.ebuild
deleted file mode 100644
index 168624a97fd1..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/"
-SRC_URI="http://www.hpl.hp.com/research/linux/atomic_ops/download/${P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 -x86 -x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	emake pkgdatadir="/usr/share/doc/${PF}" DESTDIR="${D}" install
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
deleted file mode 100644
index 60802f76211c..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/"
-SRC_URI="http://www.hpl.hp.com/research/linux/atomic_ops/download/${P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ppc64-load_acquire.patch
-	epatch "${FILESDIR}"/${P}-ppc-asm.patch
-	epatch "${FILESDIR}"/${P}-sh4.patch
-	epatch "${FILESDIR}"/${P}-fix-makefile-am-generic.patch
-	epatch "${FILESDIR}"/${P}-x32.patch
-	eautoreconf
-}
-
-src_install() {
-	emake pkgdatadir="${EPREFIX}/usr/share/doc/${PF}" DESTDIR="${D}" install || die
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild
deleted file mode 100644
index 9cc5578eeb9d..000000000000
--- a/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Implementation for atomic memory update operations"
-HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/"
-SRC_URI="http://www.hpl.hp.com/research/linux/atomic_ops/download/${P}.tar.gz"
-
-LICENSE="MIT boehm-gc GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ppc64-load_acquire.patch
-}
-
-src_install() {
-	emake pkgdatadir="/usr/share/doc/${PF}" DESTDIR="${D}" install || die
-}
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
index f706c9127fb4..7dba50603caf 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
@@ -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 ~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=""
 
 PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index fd428873e983..734b3ca72ae0 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -5,5 +5,5 @@ DIST libclc-0.2.0_pre20180319.tar.gz 161608 BLAKE2B b8e4f2d475c0425cbe5b41a5ba3b
 EBUILD libclc-0.2.0_pre20160921.ebuild 988 BLAKE2B 206c8e5c6b19d0e0b6a18c4ebc2a5ba8d102492366650900f9ee725e888c3c39175238eb1c37f23152f4d932a4325b9b39c77fe672848a907727e22a2c04f127 SHA512 eb5a022ca76cd80bacacd7c538326df3b25cb5f29fdd5d9d5774e223c69ba1b087f7704d1ad660eef6ac3c6a4b32fac29c4ae64040da43eeebfdb01514f34907
 EBUILD libclc-0.2.0_pre20170118.ebuild 1207 BLAKE2B 9fea7ead38a05076b4d93813f9bcdbd9069ccc55e5932a01499f17eeeef2304fd1da2718cc85a785d348d81f9c5bd29bfcf9defddf8c067bce0ca6c5949b9610 SHA512 f0d7c5c773b6fd9ed2fe5e703f2270612a68aa3f5c868825de241396c64f444b7673dcff8540733f2cc2256e310579f392333b155adc35a8d9e41c586e3ec5f3
 EBUILD libclc-0.2.0_pre20170929.ebuild 1391 BLAKE2B 45569e8b40dee2c80bf035bc719becde88dfdf3dac19eec45563c35d0edcf565bfe2ececece4285b0cb20c0f45fbbd424c7526c9eb376443f645c92f9ca04aed SHA512 d97c5ad240eacb62d73fa079c48b30ef2af61fce5e06a833f1e857605e6ff02f7a9e7cf90ae6f4386151a044df16077bd0e98346af87c410b1df88cfb0ffba27
-EBUILD libclc-0.2.0_pre20180319.ebuild 1413 BLAKE2B 02e15202a649d4ba2561d08514f6798fbfe341e9d90db5da56c4e682ba4f8d1fa0368074cea4687c7a532f21e4279a3e7600f462d4bcc4c1c62394a2a4d5a108 SHA512 ce24da1a6499919398a7479ea4c32a0289ec7e962c18e3babc54b30c0aafe2d5320f0c2f45f02ef0c6e88798088a6fb5aad3a33ba35b311a504643a9b04c974e
+EBUILD libclc-0.2.0_pre20180319.ebuild 1433 BLAKE2B 3fa277010d42c6398ffa618c06397df166d2e37c38d9d9932813a979ec8a57ba57893dc67cbbacefa2fd47fad5aeac2799eefceadfbfa20a7096d53a571e3715 SHA512 ce2cdc8905a750c428a4a706cc2e4eeccabb27b800c37997414586fc3c43588b37b15b05f5e8c81a87199c9727c8f8de1b2af4bc37629f88f129aaeea54f3fdf
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20180319.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20180319.ebuild
index 8f8f1a0ec232..b754b5694bd5 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20180319.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20180319.ebuild
@@ -34,6 +34,7 @@ IUSE=""
 
 RDEPEND="
 	|| (
+		sys-devel/clang:7
 		sys-devel/clang:6
 		sys-devel/clang:5
 		sys-devel/clang:4
@@ -42,7 +43,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
 
-LLVM_MAX_SLOT=6
+LLVM_MAX_SLOT=7
 
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
diff --git a/dev-libs/libdshconfig/Manifest b/dev-libs/libdshconfig/Manifest
index 90f6de9f7ec9..0768d7433719 100644
--- a/dev-libs/libdshconfig/Manifest
+++ b/dev-libs/libdshconfig/Manifest
@@ -1,5 +1,3 @@
-DIST libdshconfig-0.20.12.tar.gz 316955 BLAKE2B d19a59e46ad625d671a3a0166e4fb1f2810e00a5289353ffce87a50f32bde8d56c53e1a03969242b7f578b69c087938851d8b0a0897c16e96d6b9b8ea7d7c765 SHA512 6ee7e813599715c2217f05212e0efb94d9588f71db3f3f470e50e9fbde93be3fd3ce3b8164251ea647e76ba9fd0db502985b5fc1e3afffdf9074a00ee9900b64
 DIST libdshconfig-0.20.13.tar.gz 323720 BLAKE2B d470f71930e9c2b909d99fc177a0d867dca459c7831a2752b39573729a3b875bd65fd6cc68da3966912987b07f956afebe84d6f5329437eed391ac92c2ebb296 SHA512 04f3580bf1e1dbac130d350eb4c6e86a980f2ae8636a206821813ed0e14db07dc7ea720ebb3816455a4a939294caa2f2247b7348ecea72769a6f05bee0dbf19a
-EBUILD libdshconfig-0.20.12.ebuild 542 BLAKE2B 0a5892413752603e6ed63aa70fb2843c8a09430d22c3c630d5eecef69882725349414ac557f19b3ebf0294a73c8557f145785c9406625d7ca4d6004f1c8c690d SHA512 0badd6a7cf9f74ee04666901e2b3c0db26cf16edfd9c1afc49fb7f6729821a1092dd5558d689c4ad25131fcf4470d61fd7b379f7a136cc825ce3eef7ffb8c360
 EBUILD libdshconfig-0.20.13.ebuild 593 BLAKE2B fed5618e440bff8d1afa4092931dbc3b1e8d356eeef0ce4a9da96fadeef1a529f688e9d664238735581a68aea40afd075a96319615553518ba4cbc57ea687fc1 SHA512 4598946e89e374431741e49d41f5112e25d9fa206e33447fa2d7240592ca864de8abe9a42648af6e790ae3adac58a276b52d5e2217bbb30eb559829ebc6814f7
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/dev-libs/libdshconfig/libdshconfig-0.20.12.ebuild b/dev-libs/libdshconfig/libdshconfig-0.20.12.ebuild
deleted file mode 100644
index ac29de24cd63..000000000000
--- a/dev-libs/libdshconfig/libdshconfig-0.20.12.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Library for parsing dsh.style configuration files"
-HOMEPAGE="http://www.netfort.gr.jp/~dancer/software/downloads/"
-SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/ssh"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog
-}
diff --git a/dev-libs/libdynd/Manifest b/dev-libs/libdynd/Manifest
index 1111fa2482f9..a8dfba295838 100644
--- a/dev-libs/libdynd/Manifest
+++ b/dev-libs/libdynd/Manifest
@@ -1,8 +1,3 @@
-AUX libdynd-0.6.0-dont-install-test.patch 494 BLAKE2B fa954add858c3a7f62c6285d9db67739850a7ac9a6d05bcf3073e9297ff79cbf6166bbb7ba887e4937180055745b68bf05c30ac8394f07482426b6ea15784c9b SHA512 345c2315e04775d2a2169f910b521a3e781b602a2495256d3ca022b47e0a49be621b4c2d11b8ef1f21d6c7f8055d5ebc4bf82f3b2581b6fe7f0eca1624a668f7
-DIST libdynd-0.6.5.tar.gz 1238404 BLAKE2B be3b1c921c1d8b4d8cdc7d70ef908fea5d38f97743db9db8f4b8716ee58d633f3040c727eb0b9287701d751ea8929b78f1e5f07e7d3b9900630594ec3d81444e SHA512 ebf64b94b38300e4e471f975a51e4b014879937e855af5d72a3f759af4445fa9024e42962ab1284ebe7b2ae2ddf51ea418d106c9894e1841f0984622afbef115
-DIST libdynd-0.6.6.tar.gz 1261349 BLAKE2B 73c9eba440dfa71cd8403ecfe4c77bb1ec19530333bea8689e9d8cd8863da6a37718af878f4ab5ca278631e0acf67035df4bc00ec4e3360c4558c0184e1f33e9 SHA512 efeb52a5b5dd3154ca293f388d5b967ff983450253435572b919f7c4a1445ad3cb416def4c736f908fdb3b06cddebae881a58420e528f1ca145973a997af7a28
 DIST libdynd-0.7.2.tar.gz 1342364 BLAKE2B 28617a6b01c09dd8030d376f73c6dc6ddb4cd031aaa59348283fbb1226bb401e2d7ab48385263b8abc4ca95ffd75d2ce9f3b52a417fe04c6597886f8626cdd3f SHA512 134195ba5839e05af07dd9ad0b8e749a83345511acd2a22a029a4d9a2c0fc77a8a1f36722bce20653d28189b7883afe7feb651c7d32ff921ef257a8a9aa4bd7f
-EBUILD libdynd-0.6.5.ebuild 1515 BLAKE2B c634814be991c522dfed0071cb918d097404e2470a597f505b49249b2fdb43e5edd2d7d3fe14f2de285e948ce024b2faba598d6afe1889eaca615bcd789321c5 SHA512 958d032424ed96725dfa6f11bb0eeab768859232515f4c4be3c0b491dc399fce7248784b4d5be794b771e100c76e9e0a346ed01476f44611c9fa2fa8d4d78af6
-EBUILD libdynd-0.6.6.ebuild 1517 BLAKE2B aec8487062966fb8da845fcd62c4d8ebfbab5523baf959efe8eeb881cb14925acc243d959c7a5400bd44df9f31336b76c5e94d6915a8206429b68ce7e458ed65 SHA512 81d8ca00eeb40ae5f55c18a4a9a4309c4bd111ddab1eb26324532be21ba37fa42089ec7517a14ab3a82f08b10e06064bbf505e3c74727f1440e6c1a7eb2e76c4
 EBUILD libdynd-0.7.2.ebuild 2070 BLAKE2B 23a9f3d75e6ffb109a2e52cbc2d6aac26bc6e900b8996b6b0812f99f95ccfb81d385f9b8f40652e4cda8e5891672da0ec5d51570921cc3a86b17cec91a428621 SHA512 0f327413a749969c9bcc9823b6677119d0ab7be52d6516ea6ef046131085877ffe744f08e1b7db4da7bf431271480415f3ff4181fe06cd9db419a24f16aec0dc
 MISC metadata.xml 1120 BLAKE2B 9b42962d156122337c1e142a67a984aa8a2537a3e14b8273d18e749a2e4887e8694623eaf2d74b8beb463ac9070c73d5d0f0bd34e6f800b735e3151e1fd8616a SHA512 ac2eb8493d3e23ec7bdac5d3d5dc2d22358e51e468456de99b5bc48326924c1db31ea4d9474300a2579203d25ebb863ac84226529b36b6b1402e1351c03b1b68
diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch b/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch
deleted file mode 100644
index 9659372b05ea..000000000000
--- a/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- tests/CMakeLists.txt.orig	2014-02-10 14:25:18.041841087 -0800
-+++ tests/CMakeLists.txt	2014-02-10 14:25:40.224975614 -0800
-@@ -105,12 +105,6 @@
-         )
- endif()
- 
--# If installation is requested, install the program
--if (DYND_INSTALL_LIB)
--    install(TARGETS test_libdynd
--        RUNTIME DESTINATION bin)
--endif()
--
- # Compile-time tests: test code that is supposed to produce compile errors
- # I couldn't find a properly specified way to do this, so hacked together
- # this function.
diff --git a/dev-libs/libdynd/libdynd-0.6.5.ebuild b/dev-libs/libdynd/libdynd-0.6.5.ebuild
deleted file mode 100644
index 9eb37ce666ac..000000000000
--- a/dev-libs/libdynd/libdynd-0.6.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib cuda
-
-# change each release, to avoid git in tree dependency
-DYND_GIT_SHA1=2e140844d4a21c436ca0fc46996bf8606ffc21d5
-
-DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure"
-HOMEPAGE="https://github.com/ContinuumIO/libdynd"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc fftw test"
-
-RDEPEND="
-	dev-libs/c-blosc:0=
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	fftw? ( sci-libs/fftw:3.0 )
-	"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-dont-install-test.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# each relase comes with a different set...
-	# remove forced strong flags
-	sed -i \
-		-e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
-		-e "s|@DYND_VERSION@|${PV}|" \
-		-e 's|-fomit-frame-pointer||' \
-		-e 's|-Werror||g' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	sed -i \
-		-e '/add_subdirectory(examples)/d' \
-		CMakeLists.txt || die
-	local mycmakeargs=(
-		-DDYND_SHARED_LIB=ON
-		-DDYND_INSTALL_LIB=ON
-		$(cmake-utils_use cuda DYND_CUDA)
-		$(cmake-utils_use test DYND_BUILD_TESTS)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	./tests/test_libdynd || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc documents/*
-}
diff --git a/dev-libs/libdynd/libdynd-0.6.6.ebuild b/dev-libs/libdynd/libdynd-0.6.6.ebuild
deleted file mode 100644
index a122f6f30306..000000000000
--- a/dev-libs/libdynd/libdynd-0.6.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib cuda
-
-# change each release, to avoid git in tree dependency
-DYND_GIT_SHA1=09fb7e5eccadbe1ec49ff4b05fec724939331e6d
-
-DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure"
-HOMEPAGE="https://github.com/ContinuumIO/libdynd"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc fftw test"
-
-RDEPEND="
-	dev-libs/c-blosc:0=
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	fftw? ( sci-libs/fftw:3.0 )
-	"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-dont-install-test.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# each relase comes with a different set...
-	# remove forced strong flags
-	sed -i \
-		-e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
-		-e "s|@DYND_VERSION@|${PV}|" \
-		-e 's|-fomit-frame-pointer||' \
-		-e 's|-Werror||g' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	sed -i \
-		-e '/add_subdirectory(examples)/d' \
-		CMakeLists.txt || die
-	local mycmakeargs=(
-		-DDYND_SHARED_LIB=ON
-		-DDYND_INSTALL_LIB=ON
-		$(cmake-utils_use cuda DYND_CUDA)
-		$(cmake-utils_use test DYND_BUILD_TESTS)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	./tests/test_libdynd || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc documents/*
-}
diff --git a/dev-libs/libgaminggear/Manifest b/dev-libs/libgaminggear/Manifest
index c6cdecbbbe5e..466d016450b9 100644
--- a/dev-libs/libgaminggear/Manifest
+++ b/dev-libs/libgaminggear/Manifest
@@ -1,6 +1,4 @@
 AUX libgaminggear-0.10.0-doc.patch 484 BLAKE2B 9a63685991e322157ba941ae167ce6dea78a20bffb85662c5a7c2cb6879950dd9e085be83a53d4d13294f73e23cf7e1661c357e1140e5c0903942531a5676f7f SHA512 c5fbfb231f075f34eb4237edf3de6e335ff735513b72a41fd602422dc9f0fd511f66b4c087bfd0dfc68ebda8d1bc0b70a6eb35e5e3158c50b7a5d641e78ada01
-DIST libgaminggear-0.13.0.tar.bz2 105106 BLAKE2B 21ccb8fca1f3419e5e06d28d4a0e0af59b5e6f3f1c93be33b0a2de7ece9f9c9335c2f48a2d34049b3496077afef75cc1a9653354916a4e300f2a9aef9941501b SHA512 93d0c4b1f136a413444c32cf5c13ad570ef5a89db1d5637a15f0c49ff4d9a159f8ade252734ed711c1efeab6b9f3a55503ea2cc5486cdd0bc9af50b340eefbe3
 DIST libgaminggear-0.15.1.tar.bz2 111959 BLAKE2B 6a8d5cd01adcee1d870aada9f20b229e95975a013bfb8076c8135a7b4cbd5f2043b68ad481d0df1b369f560c2ea2172ff2a542ca61ce30317deeeb66a5aa2588 SHA512 a6635a74557f276ab65eda4610ba8a053fedf10f9d898a1dc875082a36b2822544f61fc7a274691673670b12d4de968aa4921d102a588f3d0777397730082990
-EBUILD libgaminggear-0.13.0.ebuild 956 BLAKE2B 06847fbfc4f1e218f78aac6351ac5aacc445c7b6d1d5eeddadc36c102e3c87378036893049b09811843355e3f5a405f7b19458eff561fb750d69e3518fb2cdb6 SHA512 e7c5b202f746f470cb5a6d9d477a10f9399ebb5482b56defe9ea5a344813b8e9b51970d4a7fedb0b975a5afc08b5693aa572729d2af3e1be0ecbe00e5266af51
 EBUILD libgaminggear-0.15.1.ebuild 992 BLAKE2B 8ea6fc514da1aeab0243704dd6b4c80ce86fca006d6847a261e143b284daeec2ad7d199ea613198dd05a75773cdbd875e55fc0e099be7e459d6e0815f75cbc61 SHA512 975e54a942edafd9db1c9e610c6756ef68e849121fa4e1fb4eb73dbbe97750750d7a9b44a969209036b7baaa6ed5cc9ddd06568d4fcf8b477bde8cf9a9f97041
 MISC metadata.xml 448 BLAKE2B daa492aafc9fe5b44e1951ac7b7a46b56dbd38103671d3f0f74d8b74938e43495f31aa856dbb8bb2838028b39cda962217a6780f4c7ce809fa2c5243e8c95ca9 SHA512 d73a2c71eef405f17bad3267005143f023d0d988f3c25532cf2c672314b5f9500976235768f9d17362479533ff1d6c78bef7a89483c8e842d496b8031a69aec1
diff --git a/dev-libs/libgaminggear/libgaminggear-0.13.0.ebuild b/dev-libs/libgaminggear/libgaminggear-0.13.0.ebuild
deleted file mode 100644
index d3c0bd3ad36a..000000000000
--- a/dev-libs/libgaminggear/libgaminggear-0.13.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Provides functionality for gaming input devices"
-
-HOMEPAGE="https://sourceforge.net/projects/libgaminggear/"
-SRC_URI="mirror://sourceforge/libgaminggear/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	media-libs/libcanberra
-	virtual/libusb:1
-	dev-libs/dbus-glib
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.10.0-doc.patch
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DDOCDIR=share/doc/${PF}
-		$(cmake-utils_use_with doc DOC)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index f99ab9dd5738..5fec0324d775 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,7 +1,9 @@
 DIST libgit2-0.26.3.tar.gz 4728289 BLAKE2B b437732cb30d85487a7a1a16efd41d19fe7677635ae07393094cd2931a0fb6673f41b14122793a31dd317e27936df9844fcb2444ba916469e4673f42e9db04f6 SHA512 abcd3a904bed05c1f200be2ffbc2c44cebd1b548459ee834d5635c5eaf7bcd551a4993bcc1cb9fbeae9ea990c5ebc07655007ff4e623fa7c697f326c0ce12c3e
+DIST libgit2-0.26.4.tar.gz 4733342 BLAKE2B 76dfacbf6df9128625e52f4c554814a971f446a44c9706a915200976f5a873a2add1869c0534360ccad821df11246faacfff43765f311162bcb6afca46088a77 SHA512 c65a0ef8e7ef2dc60d07bced36b8cfd26ce9c40f99978058fc67b30e5bbda8d6b15e26aec7b1277bb277123685e763d106bab175540fceb449bb5b50f776473a
 DIST libgit2-0.27.0.tar.gz 4761312 BLAKE2B 4b39ab7609b8031751cff826523a6989872d2a8508b3928461680f03e5e5e2db0782f396e03c69d6d484568958d4eb018a41ebdd4502555c41bf5b7b9756cd82 SHA512 1304f0b6182e1e6e7fccbec1a568aefb662e144a1aea4fff5901f3c012ff0f3d28720f17d19b9a1bc6c892c32fe602766fe98a15538a94a468d65d3e4a1680ca
 DIST libgit2-0.27.1.tar.gz 4765926 BLAKE2B 2eb34a621d61b1fb3b770081e27b92d662fd235750fc6ea580ddabeac5cfd20e40a70ce830d45144531c333239d173a322d0de343bb98cc02ce9bfb7822432bf SHA512 4cdee4aec0f0c7b36226ee29276b8802d6b59817f95b1357f35225c23a8d6de70242b2dd9a5fb3b765c3242f4ed1848933e20fc24899071d8b443d46c43ce99d
 EBUILD libgit2-0.26.3.ebuild 1874 BLAKE2B 5da6902f0c5983909b465a287db11c2ca95192a73bfbf9b76f27b02925c62372a6c90085202cebf76a1eca9cbed828b825abdaca48f767422722ab8bf2ecbeee SHA512 8b7009bd803c553b94c575526dd704bea6c39546ca7a1f9cd8291a11a24dcbb4188c22604e055711ba806b7957af7f5cc461bcc8971969dcda0b020dafa76703
+EBUILD libgit2-0.26.4.ebuild 1874 BLAKE2B 5da6902f0c5983909b465a287db11c2ca95192a73bfbf9b76f27b02925c62372a6c90085202cebf76a1eca9cbed828b825abdaca48f767422722ab8bf2ecbeee SHA512 8b7009bd803c553b94c575526dd704bea6c39546ca7a1f9cd8291a11a24dcbb4188c22604e055711ba806b7957af7f5cc461bcc8971969dcda0b020dafa76703
 EBUILD libgit2-0.27.0.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
 EBUILD libgit2-0.27.1.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
 EBUILD libgit2-9999.ebuild 1882 BLAKE2B 4b920c95567685c3da09b6226d0dbaf900fe28e104f694212f7610a713faa438eda0ef360ad16c584d37f47699b2b6986f609f07527d3ec2ee13dae74bf0a8a6 SHA512 998a9e592d5e13865341a62862d08b6d1a8d1f5b4b81cfd77cf4dae5a304c61183c85c9eb28aad67fe477546c966cba205e760e28654b2f993d4539fceff7929
diff --git a/dev-libs/libgit2/libgit2-0.26.4.ebuild b/dev-libs/libgit2/libgit2-0.26.4.ebuild
new file mode 100644
index 000000000000..c94b6bca4718
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.26.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/26"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	curl? (
+		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
+		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
+	)
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+src_prepare() {
+	# skip online tests
+	sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+		-DCURL=$(usex curl)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake-utils_src_test
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index ac81d0460a94..5b46aeb508c4 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,7 @@
 DIST libinput-1.10.6.tar.xz 495536 BLAKE2B 3f23808635406eeb66cd6b4ce2a2dbaed69ee0917045f75ad262a59702d72923493b6faa7951ea3f7cc2591d4c9e1fc49cffc53b6dfbcb2aadc7b9f40c20517b SHA512 b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
+DIST libinput-1.11.0.tar.xz 485976 BLAKE2B f0bd88463b6aba7bfcf80d3354e53fe86e367a29055e295621d84175720544af035cc6303a2777d6ac4535d4706c41fa435a3a5a3abd20eb9ad33366dad4eae8 SHA512 382a6c9ec4aaf13ac209ee5a7f507c7a6d2dd399c5104703ac7c6ac62fb3f393de6f4e15d7895b18c8b8d845ce8fc1f551a90aa7532f0de4cc17e57a09cfe857
 EBUILD libinput-1.10.6.ebuild 1441 BLAKE2B 3310fc527a72be6d0561091a4fd20cf637b66651e6668bb12357feb3f92f52c570db613bbcb45398ea9e38bbb685a82faeaf6a0299acdf156d3f7db01e80bfd1 SHA512 2281dfa10a76434333a54fa69c444a6a54b89b797344646ca4316e86b7292ccfa9047136f3f62dc631988ce1a4d92f35514915c8829fe469f1a35f454a772002
 EBUILD libinput-1.10.7.ebuild 1441 BLAKE2B 3310fc527a72be6d0561091a4fd20cf637b66651e6668bb12357feb3f92f52c570db613bbcb45398ea9e38bbb685a82faeaf6a0299acdf156d3f7db01e80bfd1 SHA512 2281dfa10a76434333a54fa69c444a6a54b89b797344646ca4316e86b7292ccfa9047136f3f62dc631988ce1a4d92f35514915c8829fe469f1a35f454a772002
+EBUILD libinput-1.11.0.ebuild 1528 BLAKE2B e3daf3472281d8a9dee058de497bcb2c0155f273a89fd5cf7334fbe40486e540e02d793bfa30d08342a1123aba2936dad4a921132d6cf802541635f6836cf8c7 SHA512 d601843c5a1a729de144c7b63a2a8efa3a4ff7ce60727a964a1d48419ef7a8c1b7b3bbd54853f71707a1071613cee9fba7434d91960236b467c7086b8224c4fd
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.11.0.ebuild b/dev-libs/libinput/libinput-1.11.0.ebuild
new file mode 100644
index 000000000000..0635ed1b8faf
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.11.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	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
+		-Ddocumentation="$(usex doc true false)"
+		-Dlibwacom="$(usex input_devices_wacom true false)"
+		-Dtests="$(usex test true false)"
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/html/.
+	fi
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT%/}"
+}
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index efbfb4d939c2..f788a57b9b3f 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,3 +1,3 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
-EBUILD libksba-1.3.5-r1.ebuild 815 BLAKE2B c561eb28ba8b937697b1535d710d1582e5dbf17700653a0de0717a26e804ac4203a7cacd9cbd0b81407e6c1baad725d7be167740609744031c8118dfb9723c13 SHA512 43f6456c136c4f59ae77b72342adfe8cbf8c538e72af5f3a3bc37508fbad89562b7720252324383d17ce815f816fccf462977b267f41e17559e9faac821761a7
+EBUILD libksba-1.3.5-r1.ebuild 814 BLAKE2B 8877db269b3de8a198464bf638d2d00fdfee573e5d188f5639188cb5ce68c5a4abaa28fd1ec7853a9497d8749e0ebbe09d7c99269ea08a5cea957d090bf275d4 SHA512 c3f360077ee98f9b088907248cd37d342d8ae6c121c5c1c9fca6094a936ca06c5dde9612d36d1d01c47b1e2711df24bda77721c5b4f706e1fe09ce59b2ebc9d8
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/libksba/libksba-1.3.5-r1.ebuild b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
index 548687ea3640..6d7d07110393 100644
--- a/dev-libs/libksba/libksba-1.3.5-r1.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libnatspec/Manifest b/dev-libs/libnatspec/Manifest
index 0408a22b448b..cdb5bb952813 100644
--- a/dev-libs/libnatspec/Manifest
+++ b/dev-libs/libnatspec/Manifest
@@ -1,6 +1,6 @@
 AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d98d8bf5253e20b18148b29627b26addde0a0c1dbdc33e72182c346e477030318968553f4de1136c29a40d37759ded SHA512 8773c212b8ac7dd8b35f4fc4b0a266599374d0ec7da85c10b9ebd313c68bac5643a8301c1039152f2dfaa8ab03f2e17a5ee05a92d8e91bf314f99e30177943fd
 DIST libnatspec-0.2.6.tar.bz2 500525 BLAKE2B 30cf13f89a60c86c9ff56c2c2890d1fe169b2d503a87effec805fec49674b439f7311b358f2dad06b335e27b45e775f204092d3ae0b9933f516af3292ff351b2 SHA512 6bed3c8b2937ee27666a7deedcdebd7b24a8f495be63008fd70c467de4ab532e6448e6b682ed3be04a3a60ed64acaa0074d87231a421f6c73d6a7ee1d17bc66b
 DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c
-EBUILD libnatspec-0.2.6-r1.ebuild 1076 BLAKE2B a2e52c6948233c2dc6e4483f49dfe02dc28cd86135bf24e7c8390943cd874fce66c48a9cb6bb10d1ca3df8bba5ef2d55da3abfce09984fea162396205d3202d4 SHA512 b94da0e45e6bf8bd08dec0be6ef609be194b9c579a60eba62628b54f20ef52fcdbc09e6aeaec968531a3f267f8476eacafdee34edd262c90ad09eb8a9de4ed58
+EBUILD libnatspec-0.2.6-r1.ebuild 1073 BLAKE2B 66ff76a44d2b6ef35ac8f37bf4be15ff9f56f54873c8771501ea903d4d0e57c517ab77269606e265e6909c5c5ad6b8afa2a63fa4b73626649a37ce6e4263574a SHA512 bf47ca1aa71973d9c1e0fe57687b734320a1734c585c52c556bf6f1bac01248d1744f8228113bb6e04c5681c51fcc811dd2ed21c211bab33be18f30a3a1eacb9
 EBUILD libnatspec-0.3.0.ebuild 1101 BLAKE2B 23feb2af436f5ab0956052fb4b2fd5edb6952204380631b7d931c0d3a3420c7eb762a6b2127747f233dfbff0a94caa70722ebb46c5f43fbcb3d816be468b5797 SHA512 7911cb04124c0a777154d3296d89ed39938db224760483616e95316dbba4c5764d9995334ca732857900e6a1d7ab52123f15cb73d1d37c3f3a15b28f1105bca6
 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272
diff --git a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
index 65bb4b698659..8fc1912e0cb5 100644
--- a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index af0159bc674f..206932103959 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,5 +1,5 @@
 DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
 DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd3fbade148de34eda5371cc4d9c168f9e234f0d581626f3da85988ec8d46f76377b019459d3f6b044998e82426 SHA512 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967
-EBUILD libpcre2-10.30.ebuild 2338 BLAKE2B cf736b87f282baafefdaa694b4b2cadabb9af2e7fd3422175303d8bb135a7c7331b397227cefab447b26315e017c89586db8518b0182e26851a94ab9ca77e18a SHA512 085e7194c56c10a23cd78e74e9b92034d2d8f1e1096f813fc2be249040edfba9c5f6e4bee01c59d3868e077bf0304c609e616932fafafad1de334c127305cba9
+EBUILD libpcre2-10.30.ebuild 2335 BLAKE2B ffabdb786539182e475225186a21b27e1ef059e728af83696bcbf361d37cc98d13e124f4c51e89efbb9004e5a28fa9d0d995f5e21e469107adbf9ce1af6ca1f6 SHA512 89e37f6decc384fa5c499c3978a3eeae03144cf4340d94ec3e4f41fa507b57ad2f8ec2eb6a5dc37718e5eeaa37fad400077fe1d05c61f33606cc389b75dc79cf
 EBUILD libpcre2-10.31.ebuild 2348 BLAKE2B 501e61f76820a596b4975bd0654981ac89be8da15c44cfab69abea1b1489eae80079855577d89200ecd96714b7d6a2307c0662cca4ec12cefc6ac67e6cf89f0b SHA512 3f6d74efd53d8466b67c6743801d73d2bb80e78e6dbf47d916d23be086245750d0a778cc81f146fe4d5e24fad9bbed28a5690da29fb12c4cc28d555052a293eb
 MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
diff --git a/dev-libs/libpcre2/libpcre2-10.30.ebuild b/dev-libs/libpcre2/libpcre2-10.30.ebuild
index a122a1d8672f..197ccb92f7ff 100644
--- a/dev-libs/libpcre2/libpcre2-10.30.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.30.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 9c1aba1e37e3..e6e6aafdc70c 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -4,6 +4,6 @@ DIST libpipeline-1.4.0.tar.gz 805155 BLAKE2B c0e1c774a0e165b6eb7639246324a2945b0
 DIST libpipeline-1.4.2.tar.gz 827362 BLAKE2B df85af1ca5c000a54d18d127bdff9286d7aced24e60fd0eff984cc6ae7acde880f71ec998946a7fd925167b5c05360ccb47439bb68eaeeb3fa7df1d320bf889d SHA512 18d4592c142b745e709b9d30e894f1cb95e8006d8d3d3c978a1c4b8fc2393fc40383aa8236587cc7caf576ee9664867358a94c081c0730de9e337ddbd1e57e02
 DIST libpipeline-1.5.0.tar.gz 828765 BLAKE2B e3a0012b7e916a313eb29c5c995755d345777b86b6d5b595814591c38490179a4dc80c375412f6489dc27ac16883bcd75dda418cbe429e7f4f8f70cffdb7a1ab SHA512 4b4d4a4ac347065d89e2092a00f744932422292a014c7176a4b7c4d2e8fb9d2165a3378d9e93b6899e11f80417b9a8c5c4785dab2f3113e33ffa61265e4c9117
 EBUILD libpipeline-1.4.0.ebuild 507 BLAKE2B 0a893ebbf6cbb052ba0d6e91f4b09ead966e5814f52f47a6e1160abc282fd575d0a5e2d92c61d31223c9bbc0f869fa5f0ee45e452e38201d345722d02473d7bd SHA512 f6cb1cb95a5cbe04c2d1c3b8caf7cb01d25330550c647a542601d7b8bdbfd0c2618ce51a5f276bd3bc4d5234c9af309f1e7ef2660933a5d748d68d906cf499d5
-EBUILD libpipeline-1.4.2.ebuild 674 BLAKE2B 108e91b99cacef70b73193fe9c1e9fbd565d6fdcc839ddfb2e46ad4e90aafeed20e65b6a01e8788d075f0299966d94680474cf23bf2129121bd084f86d171739 SHA512 28eaac7b4475587360f9122d862e442d34342452eea54f1f4154ab9a9bc05722463bf9e69354983f18ef4d2f066374958f667ce7a01b7885d4e59c98acc2fed9
+EBUILD libpipeline-1.4.2.ebuild 670 BLAKE2B 2f6114f69b8dbbb675f4609d3b0a0ddd0ad31baf8df0f4aa5ce68402df145aa60434015c2109ff57c3c87a862c7a24c8990008a37aeee1b1acc5c110d07b3db6 SHA512 74a98b07a06fb576610069b54a0690abe2a642ce440f9e2698cb8c15b00c5724d9942896532e2befbaf7fb330f87eb293c02eab28bb24abd75222eb125753f83
 EBUILD libpipeline-1.5.0.ebuild 785 BLAKE2B e65b17fa1e305e51d0cd87e8e0e4d45d9e36deb4d59c8d7865a6faa6611d620e3d6a050bf11a8b3e855c1c98afb8186ec5bc6ab5928dcdeaef1266ed64ffee80 SHA512 22a844d139bbcb2bc729fcd7c9e75450d5ae2444d99b2a2a7177ab66dc1a49ac89da6a900baedb576d9edc78c639086086491e47bffae6830e5d8cb77c7a5f64
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
index a1bb7872f5a4..dc3b38a2de25 100644
--- a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 3beccc2f5596..53fc31c1c2b6 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,5 +1,6 @@
+AUX libressl-2.6.4-hppa-asm.patch 2236 BLAKE2B 508555aa87f763c7cc39cf1cbd2ae5692d7c33315b08e4527db61a878cb5373e6856669e8185b7c49ab82e3f7c01034c1496c639d3a46d605c39170f3f1ce32d SHA512 b49da63109f4b0d471402c07df927b1aba60f94e263376919206fac9a4dddb9a10c4c0004836b2c00a560eb59dcde71bd6b4aba45d966a3e0b2fba79f7277a3e
 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 1373 BLAKE2B 3cc04437cab6d3550d82a345b71f4f2019459392dd88f7f5948ca5a9fca99fb5747ee9b09de06357a955517c67296152503c3274d9c7e9042c474d9dd6e0ac8d SHA512 3c5db45ed3bdb9df4220ba773889c95c04a741f8761e677df7a067caa322594af1b90120b4945fb03c9387fd291b81aef0e8c545ab37dc63123ca47800503ade
+EBUILD libressl-2.6.4.ebuild 1431 BLAKE2B 84f8669b2e544e7f226969999abedadf72879296a07b736b080aa9e103ebd49a52c5ea1fcc6bb7008ab3870ee74ca7a3b9ae40bafb4b2a9cf8de314e62303eba SHA512 b15cc16115a1b8e46159c9b1e384df4d97107ab634fcdfd6fb048ace13eb0527a79763239892c36116bc3872f74dd5149df5e21ff071c4a43b409beb759abcca
 EBUILD libressl-2.7.3.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch b/dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch
new file mode 100644
index 000000000000..a0922af09612
--- /dev/null
+++ b/dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch
@@ -0,0 +1,62 @@
+From 787d8d240bbeaa812bcf37deeedb3c467be468a3 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 19 May 2018 17:31:42 +0100
+Subject: [PATCH] __warn_references: tweak assembly for "gnu.warning" section
+
+On some targets ';' (like hppa) is treated as a comment
+in assembly files. This occasionally causes the following
+assembly failures:
+
+```
+Error: can't resolve `.gnu.warning.EVP_DecryptFinal'
+{.gnu.warning.EVP_DecryptFinal section} - `.Ltext0' {.text section}
+```
+
+Note how branch (or other reference) attempts to cross the
+boundary across two section types: '.text' and '.gnu.warning'.
+
+Tobias Ulmer notes that openbsd already uses newlines
+for similar macro:
+
+https://github.com/openbsd/src/blob/master/sys/arch/hppa/include/cdefs.h
+
+This change switches from ';' to newline as well.
+Tested on hppa2.0 and x86_64.
+
+Reported-by: Jeroen Roovers
+Bug: https://bugs.gentoo.org/656104
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ configure.ac               | 2 +-
+ include/compat/sys/types.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b74b8a1..16ed825 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,7 +91,7 @@ AM_CONDITIONAL([HOST_CPU_IS_INTEL], [test "x$HOSTARCH" = "xintel"])
+ AC_MSG_CHECKING([if .gnu.warning accepts long strings])
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
+ extern void SSLv3_method();
+-__asm__(".section .gnu.warning.SSLv3_method; .ascii \"SSLv3_method is insecure\" ; .text");
++__asm__(".section .gnu.warning.SSLv3_method\n\t.ascii \"SSLv3_method is insecure\"\n\t.text");
+ int main() {return 0;}
+ ]])], [
+     AC_DEFINE(HAS_GNU_WARNING_LONG, 1, [Define if .gnu.warning accepts long strings.])
+diff --git a/include/compat/sys/types.h b/include/compat/sys/types.h
+index 2107119..dec09e3 100644
+--- a/include/compat/sys/types.h
++++ b/include/compat/sys/types.h
+@@ -62,7 +62,7 @@ typedef SSIZE_T ssize_t;
+ #if defined(__GNUC__)  && defined (HAS_GNU_WARNING_LONG)
+ #define __warn_references(sym,msg)          \
+   __asm__(".section .gnu.warning." __STRING(sym)  \
+-         " ; .ascii \"" msg "\" ; .text");
++         "\n\t.ascii \"" msg "\"\n\t.text");
+ #else
+ #define __warn_references(sym,msg)
+ #endif
+-- 
+2.17.0
+
diff --git a/dev-libs/libressl/libressl-2.6.4.ebuild b/dev-libs/libressl/libressl-2.6.4.ebuild
index 9aaf4681a71e..5f32a09d4194 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 s390 sparc x86"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
@@ -22,6 +22,8 @@ RDEPEND="!dev-libs/openssl:0"
 DEPEND="${RDEPEND}"
 PDEPEND="app-misc/ca-certificates"
 
+PATCHES=( "${FILESDIR}/libressl-2.6.4-hppa-asm.patch" )
+
 src_prepare() {
 	touch crypto/Makefile.in
 
@@ -34,7 +36,7 @@ src_prepare() {
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
 		configure || die "fixing CFLAGS failed"
 
-	eapply_user
+	default
 }
 
 multilib_src_configure() {
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 72c01138a0e5..5c985829a284 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -2,6 +2,6 @@ AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a
 DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
 EBUILD libsigsegv-2.11.ebuild 873 BLAKE2B b002a1adfc3c2d26211758114ec9ddfef9288e10083b7fe1f4663bfb357078df8b4d5b6a416b86981cf8bca5da3cc3e6c37c4fcc2876f207d8dd6b1d25d9a78e SHA512 70dc26ea9d120835ce750b60405ca296342203da4078319c02700734f226786f5a01defb5fab42718fa1e3b2791fd5d6ab120d9c66cae4ec61a2874632235024
-EBUILD libsigsegv-2.12-r1.ebuild 785 BLAKE2B 416f8283d883011129322ff7a5ae6e8a4c439db4a919cb39e5303228bf4fbc18ebc3145905ea25d03ad3c2d6f9e0a3dec0d4d245abd8287017cb25d645d4fbfe SHA512 9738ac3adf8778723e2482430f3452e71fd925ad0c69ae81ffe2f9110ce630d9a419ee4511e86dd8d79934e8a799382d9f03efa91ab6f8bab02430eca80a3fd0
+EBUILD libsigsegv-2.12-r1.ebuild 781 BLAKE2B e1f0c87a985e7a7ec432d1eeeaf8b7e201cdfa6c8ff0acc8294890e346e22430929582dc36bce40f8f2431acc093b066b1ec225223d3ae5472711666d8338f1b SHA512 6f4685cc5900bdd14b66121c2ecde758f69118f50c2ea434d717ddc1dca322c7de66d0c18cf9027b07a10a068c52460d2e823d61a716f1d949577165a8f5b81a
 EBUILD libsigsegv-2.12.ebuild 789 BLAKE2B 71fee301710353c326e2903a7209de5d3b5642ea2683584ee46e301f5504757360ef84e7c3d798bb81803a03c5dcafc974db1e564ba827ab08afc6184abdeee0 SHA512 b7ba322748ebc4b9b7a5dcd678fa53fcfb3da531d30a881f51b1bc106b61cf00619b7f7c4dbc28bc9b86c0253d80c336c74e2527b1aa8deefbd98d86081cf632
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
index 9306a3b2b2f8..ce8dd71479c7 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 704c5954b210..627c829ff521 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 1164 BLAKE2B bda76a39e2e728025af067484853141ba0a5c6a6c64d1eb5847d67d0042d18664ced8d3cf2f85b9091ba0566ba75b809513edadfe8c96af17d17b039270afaf0 SHA512 3c53767c5115f2b0b1ff8406d30601f1cdd265d2d2186fd245cf93ddf9dffbf344bd1c54565d277152d0249dddc46e49d1e57e97c7904950b1188f6fff2fd31d
+EBUILD libuv-1.20.0.ebuild 1169 BLAKE2B 5d67aefdba1f643f93da9ac8bc93c6c5319d10b294bbd61ad0d55ed3a6e8762daab2b943224d223cd9e1822ac1ac50ef75d292625f70957451a026f2cba7d383 SHA512 c64fd8b1cf556c31233abd12a44f1972b66e8b08892d9bab151bd19c2f24820e100a13393b31aacc0b0f4fd28a78f9ed05421942161aefac64a3e6ea787740fe
 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 f920d93c650a..e4d496fd500d 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 s390 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/libvolume_id/Manifest b/dev-libs/libvolume_id/Manifest
index 7c766ebfd042..8652c1bf1444 100644
--- a/dev-libs/libvolume_id/Manifest
+++ b/dev-libs/libvolume_id/Manifest
@@ -1,5 +1,3 @@
-DIST libvolume_id-0.81.0.tar.bz2 23274 BLAKE2B cda0bb7525121b318ba145c8a2f5c88e80907ea88a02cb3fae5b348bd7ec04adc8687c963c086b20bf691f72d53b96e6e597ede96a4b756613d648b05a267a5c SHA512 46f51bd130d1240518c6ffd97dc45017ebf623ea1ca4d5e518c19a040b1537d8a721a40e147277df0a530ac9d2d045dd399c037b08943c4b96e35ad025e94d85
 DIST libvolume_id-0.81.1.tar.bz2 23399 BLAKE2B ba586630200eea63fae41b464c74e15151708888fac4f5ab49b3156c53520ca248b68e5812ebac157fda1c74b1ef70828d48584cba9e9adac043b6f835d97abc SHA512 a30c08fcdb020e8b7d0e5350d996d7007040d72e3c1caf3244cf7c6e08cc7d5eee9b94edbc04a073519243884be8b27e61c33a3f61c25e7bfb42eb96785d992f
-EBUILD libvolume_id-0.81.0.ebuild 681 BLAKE2B 4acbaed919f79df429fb7e92d2837c74577a0e85661a70c167d6caae9ea13bbe816b280a201cd2fe3eeed9982694aab4db34aeb7c5939438f53c7440cacc48ae SHA512 dbed89c235d0324dcdcc517084f668dfce0d2c36871801878f1b057edd5b599f0853cd5eaa21861159027416b8e208605074992d134af46c91bb1c647aeec6b6
 EBUILD libvolume_id-0.81.1.ebuild 681 BLAKE2B 4acbaed919f79df429fb7e92d2837c74577a0e85661a70c167d6caae9ea13bbe816b280a201cd2fe3eeed9982694aab4db34aeb7c5939438f53c7440cacc48ae SHA512 dbed89c235d0324dcdcc517084f668dfce0d2c36871801878f1b057edd5b599f0853cd5eaa21861159027416b8e208605074992d134af46c91bb1c647aeec6b6
 MISC metadata.xml 365 BLAKE2B 43c77501d8bd51ecd0cf3f904eca81b2db24fdbe6c053baf071ba1dcafd9606816047e05c40b144063b4033f62c7681b3ef75c3cd5c350df2a629a41f2bb5aa8 SHA512 0a7813ca50da7ee0c17399d54f12ca4038617afe550c22997f6b209cb800873a9ecc4badbe8b53f727980934a7568ed7c5824cb1a71eb18546ba1e92cd935671
diff --git a/dev-libs/libvolume_id/libvolume_id-0.81.0.ebuild b/dev-libs/libvolume_id/libvolume_id-0.81.0.ebuild
deleted file mode 100644
index 8702793a0e2c..000000000000
--- a/dev-libs/libvolume_id/libvolume_id-0.81.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Library to provide file system information"
-HOMEPAGE="http://www.marcuscom.com"
-SRC_URI="http://www.marcuscom.com/downloads/${PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-IUSE="static"
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	make E="@echo" RANLIB=ranlib AR=ar Q=@
-}
-
-src_install() {
-	dodir /usr/share/pkgconfig
-	insinto /usr/share/pkgconfig
-	doins libvolume_id.pc
-
-	insinto /usr/include
-	doins libvolume_id.h
-
-	insinto /usr
-	dolib libvolume_id.so.0
-	dosym libvolume_id.so.0 /usr/lib/libvolume_id.so
-	use static && dolib libvolume_id.a
-}
diff --git a/dev-libs/log4shib/Manifest b/dev-libs/log4shib/Manifest
index ba17495b56e5..d2ff3b1b28e3 100644
--- a/dev-libs/log4shib/Manifest
+++ b/dev-libs/log4shib/Manifest
@@ -1,6 +1,4 @@
 AUX log4shib-doc.patch 366 BLAKE2B b5c3221816d6fdffdca807a056f64eeae414321695ef362000dab7e0dd08c3a7d575d49aa3ffb1144535a88d1e928c73bf8a968a8726075b3be024db915f642c SHA512 4327359e95f0d1be02524313fe8818d299bd3bf6d7143215c6f550efac1a03a26da8210292c92cebdef8dc4844afe52e0d43242975fa8ef4ced7ddd3338ab0c3
-DIST log4shib-1.0.1.tar.gz 498381 BLAKE2B b5f849f7f6bd7cd224ec135a3f4308ac4d56f8f51d45d4561ac76bc7ff903afbbc70c21790ee26f9449153384116dcb8d40bbfb9f07194ed22e9d80488cbe882 SHA512 ed64dca5f20c8135944abdfe7e7b66702cd1ae712ba362508759194c8f53c2a9a878142619a4befd3c4180de366fd2c9a6af7af1873b170d45e91b8bf527b836
 DIST log4shib-1.0.4.tar.gz 487529 BLAKE2B 8ba4dd17e2f35c6566ba4736b5450c41fab1c5506ab6e994136b97ccab4d399281afb32fcf13935c25acd7ba063d2ed6595bab564614ffbb0d944074b68a5bba SHA512 af31bb436393e1a6a2674c0f4804148dea4f4081bb07b78f158f4109157bef4ed40647a3e4da7ec5eef0ed38b6286aee6d8b8a3320572c2b55df2998850d5245
-EBUILD log4shib-1.0.1.ebuild 875 BLAKE2B 69241840e249ead6c5a641363e6b0687f63a4c54bf1da4076f8f8fd601c5cb47292f6cff71f93c3772998b290cdd70ee6180bd323c71269fefa90b39f9dcd88a SHA512 1e34e9efb7529c72698187c8c4a8f8f2fd847daaef0c920c717a40ccd58a0563f7aea48819c124b45db06dd0221b06726f940cd6e7ab11107a58c949c92b121f
 EBUILD log4shib-1.0.4.ebuild 699 BLAKE2B f35f4578fdf625bd2d743ffe732c09a6f22e0f9bb8660d08bd6183a86dd7fa3655de908fc395409604b787038b25c1dd08d1d85e3059aa888807a7a83e0e1f47 SHA512 7b4a9b2a52c72161c281f9b78b4ccca40f9919af31aa2c9429d3ff861affd2dcab690e2181e2d74c7a8c35bfadd973dce237c5c9a5cf86499293b3854ddb9745
 MISC metadata.xml 396 BLAKE2B d9c3e97cacd4d4d4e9b26f9e78a9a56293ab4569232c63e599c89376723af4b8dd250c9a8642d835d1bc4eb7b53eb5a6b78a80eba1c95fec7f5edc11f8b0efbe SHA512 4232880b47191b4e89f07dc4987e8f24833a0f42a21355f943b03f88487f50f2401e1a51aa7a150ad27659e7ebf9d61509fb232191dc4836d8ee4a9c7345df70
diff --git a/dev-libs/log4shib/log4shib-1.0.1.ebuild b/dev-libs/log4shib/log4shib-1.0.1.ebuild
deleted file mode 100644
index c1554df5afff..000000000000
--- a/dev-libs/log4shib/log4shib-1.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION="Internet2 version for OpenSAML of log4cpp logging framework"
-HOMEPAGE="https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib"
-SRC_URI="http://shibboleth.internet2.edu/downloads/${PN}/${PV}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# fix sandbox violation by doc installation
-	epatch "${FILESDIR}/${PN}-doc.patch"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	econf --without-idsa \
-		$(use_enable doc doxygen)
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die "dodoc failed"
-}
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 298d7529b717..5359b94711b0 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,3 @@
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
-EBUILD lzo-2.10.ebuild 1042 BLAKE2B 66b6e1df31bcd0ceaab6118d323c2bdfe5782865a76ef54237c33a110ddc57b9536382cf416477468d72d4aaaf9d81345cb97480dc9f69eb241b22c3373e0465 SHA512 f07bf31f1e20613756085b8cac47a63d35cb2d0e5199715273ba244a72d8601317bdf6cad02266a12d0bbb0b5dd74cddf04bb34c0ef28fa0c1e24f5e2f3e34a0
+EBUILD lzo-2.10.ebuild 1041 BLAKE2B dbfeadcfb8660622b324012587bed2db8f4dbe70aaa7cfc0f1e651fb2a6d072f9c5292d018a6fdd9a2c4287bb5881a1153f3e6ffb0f0bbcc487713439578ee31 SHA512 b354b5edee1e3587c65a0734145cdf0322bd574f35fcfbcb5dcb9cfcc2036789523982b26dd19b81c7297c0982a4d59c12837c22f2ab6b92b6517242d61e6905
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index 603b4648d986..e12c63e23914 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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 ~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="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index 7fd07c93649f..1aec75c86b68 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -1,7 +1,7 @@
 DIST npth-1.3.tar.bz2 295998 BLAKE2B 25c0176439a5be3766df15526b06dd07f318dca8b729eb5ec461a40b912132ebbf7bf6ddb2b57a064bfba73f3fe0ab59c00daf6138324f53f5e9e6df91941bf8 SHA512 97b0278cc9448adb42c4a83b8e7bafeed939acaf3dd3a201a1b103df4e48f24224d4bdaeb97903ad1884914ce363cbceffe948a7c1db4f19abf87ca5964f5699
 DIST npth-1.4.tar.bz2 299106 BLAKE2B ba5186de1371d08137e86ef1f6ad12a610a26b7ae3ca50d6fc49f685083380803b245acf01110a28ab25427208bab82de73f16d6f21011b1a0590d16c7c85cf7 SHA512 649009b4fbd2bbbb8fce2911c2f9070a758d037be0d147a63754e3c1f5a9ffb73b907cd09c79314fe60c25084ca7a7b3b387139dd83cc0e11a7e7ba64630ae1f
 DIST npth-1.5.tar.bz2 299308 BLAKE2B 1a3cef4475ad5440487151026889ef321626b372d1c6970c7482df92a702d02860589f7f1f541b1fccf0e8f39b194476ef91507e33a35e05ba3713465f9f11d1 SHA512 20f0ec59d304c68081e42535870af8e76c18e30aa7b04ccdafe60fe5261ad7275c2c0e3ea3a767d6145258a3a39fa641032cd97205318266dd727a5fe7ee331a
-EBUILD npth-1.3.ebuild 676 BLAKE2B bc2b381655e197320231be429caa05a637d7774b51d174ec3681a629e3c44fc558637794c1e825acfd19ad5d8ff51724dbb1048a9afa3938785ed10f79b75c7f SHA512 11aa4890d7e405f5248c6ead71a0ebafbba52093c1ab8ad0ce70393db52301c4ec58a70609955163342a399f7acdac4c920dbbd892ac86e7b992623c8195c5cd
+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
 MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
diff --git a/dev-libs/npth/npth-1.3.ebuild b/dev-libs/npth/npth-1.3.ebuild
index 7aecae616554..1b6b254ae4ca 100644
--- a/dev-libs/npth/npth-1.3.ebuild
+++ b/dev-libs/npth/npth-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 71aba33c95ae..4ee6844b8f6b 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,15 +3,12 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.28-gentoo-fixups.patch 5310 BLAKE2B 5f173bc4bba374c8233945293e8e944c5fc9068c71d1242bcfbac37d0c020a09cb6a0ef3f54994003fc58364285f86f08017762c0c196aa6ab03fca91ea6c631 SHA512 22fe711d4e59c41f8208b4e85eb101eb6cdd4ad43d83438841b94a57219eeb182c527be1a97bf58df25672fe027aaebeab7458da2bebafef7254c68b94c7b98c
 AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03
-AUX nss-3.37-fix-fstar-missing-symbols.patch 1156 BLAKE2B aedabb564c11b99bf4ee48e9cba0c2f29c3a7cd716828e12ada032ace08f507574b2b68f1a08db9a2575df031067e7e262196df1836db1c4a93058b673434200 SHA512 89c858fb6a7575b79170c0567b6bbde7c857c1dd803dc4a0a19d8c3ede77b8eff3ce41f473b8e292202d4b0b3e9c9687a2c503ae9b3dca7ba3700e91e50a3e43
 DIST nss-3.29.5.tar.gz 7480246 BLAKE2B 9ab16cbbd95aa31358b5b686bee64cd81c8343524dad8aac084f7c86883f1eaead78912dc1021b0461d027b0085356c4b7156f1d80010c3a0ece29d542deef50 SHA512 ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa
 DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
-DIST nss-3.37.1.tar.gz 23034142 BLAKE2B dd196606bf922a58c2d1f7443c6b8c570d5c5c5437f51b8c6c4ddfe84aad7d576cff46f2eba23e4d32f41984fb6ea8aaa29a63b2f010b6807df74ee71144b11d SHA512 61b8186f45afa5fade6f45737d60a86f519c8b5535963f4cc6f13fa6694be0723cdd8b0ed48bbc2eae621dfbfd80ccc249998eeb89ed565797ac4553895a01a1
-DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103
+DIST nss-3.37.3.tar.gz 23034239 BLAKE2B 3e30b0fe14501ca0e6b9d14322af73f191164989e6857b9ba46572b7363cdc65c88b672285982f2764ed44fcaf615cb249eea2f45b98050dfc6675003dc74a3b SHA512 11b21818f9fcff11d0e7f4c066ae9fbce0052a30a6b30df9a20022792039b5348554834a472e1b1195e467b9902067f9719678d5ca32efb4e60f1df161feed6f
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.29.5.ebuild 9188 BLAKE2B 75e8a0508e7355b4ed624f5b003ebbe99d8b170055aa1f2de2564762a35ca2afe836bf9313a8ad35e26b793c786cf4b98c3e49bed77385c2b35547e4c45d03d9 SHA512 fc184b2babae5168d02cbd78bf81298d616c149a5870f320ac36c8e4973851b943de7a6641bbcfee1f1153bfafa6a4832c0dcd7d47ee2a6b13facf118ce9e0e3
 EBUILD nss-3.36.1.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
-EBUILD nss-3.37.1.ebuild 9488 BLAKE2B 6222e5f2098ff7d8ad074207689ed97874918fce4b8d22a10f25afb187227238a7984e0ea4c73eeb4227b8baf1e47abd178b1ae1c96df8d5af1dd087f4bc29ec SHA512 1c170e22e1792687ff48fbaf5c840ed9f0e318bf8a69e474ab107abfa2e071f43b9691c2270cfeca46dd015840f0a2d90b22049f4398bfb47f92824cd782c231
-EBUILD nss-3.37.ebuild 9482 BLAKE2B 0660abfa6e53798f357a560e96aa23251ca3898d9f3ceb60d8ea536014c00601b90d85b97b3ef0d3be369c31c2e68d582ca8bec51261b5392033c00475437e5d SHA512 5bb3a418e77e69f77c006c1b562746be250606002f4362140aa214794f0f3b6bf9b56120e274b4c842a0512c47c823bba2097108ac3ab77e99815300be8bcabf
+EBUILD nss-3.37.3.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch b/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch
deleted file mode 100644
index 4a6be4e90cd8..000000000000
--- a/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User Jan Beich <jbeich@FreeBSD.org>
-# Date 1525728934 0
-# Node ID 259444458a1a7f2ce1813ebe88d924173d5daf0c
-# Parent  5db9e969c74a2a02c4b1d918792827014d1a9d5e
-Bug 1459739 - Build FStar.o on 32-bit ARM even with make. r=fkiefer
-
-
-diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
---- a/lib/freebl/Makefile
-+++ b/lib/freebl/Makefile
-@@ -534,16 +534,19 @@ endif # NSS_DISABLE_CHACHAPOLY
- ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH)))
-     # All intel architectures get the 64 bit version
-     # With custom uint128 if necessary (faster than generic 32 bit version).
-     ECL_SRCS += curve25519_64.c
-     VERIFIED_SRCS += Hacl_Curve25519.c FStar.c
- else
-     # All non intel architectures get the generic 32 bit implementation (slow!)
-     ECL_SRCS += curve25519_32.c
-+ifndef NSS_DISABLE_CHACHAPOLY
-+        VERIFIED_SRCS += FStar.c
-+endif
- endif
- 
- #######################################################################
- # (5) Execute "global" rules. (OPTIONAL)                              #
- #######################################################################
- 
- include $(CORE_DEPTH)/coreconf/rules.mk
- 
-
-
-
diff --git a/dev-libs/nss/nss-3.37.1.ebuild b/dev-libs/nss/nss-3.37.1.ebuild
deleted file mode 100644
index 15bc70a21c92..000000000000
--- a/dev-libs/nss/nss-3.37.1.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.16"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
-	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	"${FILESDIR}/${PN}-3.37-fix-fstar-missing-symbols.patch"
-)
-
-src_unpack() {
-	unpack ${A}
-	if use nss-pem ; then
-		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-	fi
-}
-
-src_prepare() {
-	if use nss-pem ; then
-		PATCHES+=(
-			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
-		)
-	fi
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits:-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.37.ebuild b/dev-libs/nss/nss-3.37.3.ebuild
index 0a8ca3ede492..3a343d29931e 100644
--- a/dev-libs/nss/nss-3.37.ebuild
+++ b/dev-libs/nss/nss-3.37.3.ebuild
@@ -43,7 +43,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
 	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
 	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	"${FILESDIR}/${P}-fix-fstar-missing-symbols.patch"
 )
 
 src_unpack() {
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index ba328173553a..2e025b9eb4d0 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -6,7 +6,7 @@ DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9
 DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
 EBUILD oniguruma-6.6.1.ebuild 1112 BLAKE2B 4bf1ae4b3f3b0b4f1202ab94498ccfd27bf5fb761547c84cfb132502ace2b47d709b3fb023d0bdb86dc9c7de15e55587402ec51a0f7235ba6019429c8c56cb3b SHA512 93e21e61a4d46e321088809332b560748adebf2db65f8b690b8945928c09e6199495b2a8b9ecafcb383938debb8ee279e724b5e5c08227e9cebdb43a971dbfd5
 EBUILD oniguruma-6.7.0.ebuild 1025 BLAKE2B 0dda1e53ecdea21e89f9d4045eab988da0217a24d0b55076644eecf913365a75a1345501a7ff9d88d097e44856d9779760fe19658f4fbab6175f6dc24b80b8dc SHA512 4597d01dfb2a8cba6dd36846be059bed3ab8c0867263e693806fe2ec11dbf416a5a3e838da7474375457bcc895db22ee6102dd94bd9ed26ef4cad51a236df5d9
-EBUILD oniguruma-6.7.1.ebuild 1015 BLAKE2B b392a1ca3c06773b360749de1eabd82376aceecd35f2584e3914862b7950dc40b43dbe09ea7415d6cccd1aebfa7aca012ce1af656a78d6c698c334605de6255b SHA512 e0e4aef8e7efd0c7096b2fe2ae4ed7ae0f8c4a571b29c7ab8b85ae247ea6351639d02ca0f22997c50db992ef8255bee82bfbabec290da5610b2f594b66a4206c
+EBUILD oniguruma-6.7.1.ebuild 1014 BLAKE2B 7d7ffa3f662ddd4f5e9a13c7869c03e1a924ffc3ea7ea97e57b701405c73bff9e46c0f1645dd80da07d51d1c2529f8540b226e8dc6d5519dd01568895433208b SHA512 e88607585975fe4afaa432e92f8319d2e63691ebbbba61ab3ac41af2796e37df5d369ac6c6152230fd723113999c9f060ff02708a11cc3a231e9312b5bbe94a9
 EBUILD oniguruma-6.8.1.ebuild 968 BLAKE2B a83d76cf686f58abf1adc1e5c210dc84ec82d5b6f85789a72ad5f5314a4df8166e6c6e98348a107dcd732ec1dc755026db0b887a27fb0c567fd655c06c77a5da SHA512 9d12c6b3e6e41e69f0658ebe45fd09c4f075ced52023080e76c76e38fcca32f2704ec5aaee48d151a64bff4cb4dce8a812f5136699bf927b9237fdb150f94f91
 EBUILD oniguruma-6.8.2.ebuild 981 BLAKE2B eb7e8614e362b145ab843d73d2cdeb7a57fd6f6f5a093f1a8768bcff61cc88e676964bbb460996755c55143f5e4ff531452716c3a061c2dd0345b73687d96292 SHA512 cd0148a53c4aaf4b6e27fea5aaf9aa4cdae3912b764b88f3500f53d8ec3b1864cfdd4c39e4f486c60909f94f87503722754fb29142186f3fc1b362e98e6fded5
 MISC metadata.xml 898 BLAKE2B e2c9418b8a69edf7d702de74609e6a4122c5a51160869dabe820d07a5f9f2ef478fcea57b9348babe49066b78b6d1b5bd6f60b7798fa0eb8edf13ff4510d7858 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a
diff --git a/dev-libs/oniguruma/oniguruma-6.7.1.ebuild b/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
index 932c36ec0630..3fc38a5bd562 100644
--- a/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 6335d3052ab6..3c14bfb05af4 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,8 +7,7 @@ AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
 AUX openssl-1.1.0h-CVE-2018-0737.patch 996 BLAKE2B 4b4d6e619a508f36f4fdc00c0066d1160ff7f6cd301cd799405d37b3236ebb69b11a4ccf9baa9ea3a69f21c6fe8550b440c1a3503ec27a5a9c5d1e4d472e2b57 SHA512 833712f0ae355aed6547ccf49447d50bdb7be1ea3c3b3b51f182f6e0eb17692c78ca90341a151985b35b86800cf6229926f3e3af936741d437ab9ac5444987c0
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
-DIST openssl-1.0.2-patches-1.2.tar.xz 12208 BLAKE2B 99b7a3538aeeecf8e1939fb08d26e2ce6aa4140488f0f6fc382a4f0dbdd67a0204c4689809e9d170148ad6686d4dbf0c8fc95802712270b0ea5720bc06c8fbbf SHA512 5e5739ab7132e986abe9704739dab2ccd16df9696318ed29762d4ee0245fd2645f9435f7340ba36edd5531a83e48489fc659ad78c09ded0e0d021dd5a3906ea6
-DIST openssl-1.0.2-patches-1.3.tar.xz 12592 BLAKE2B bce0c289ae689091fe62e9c0d7d631cd915fd17beb81b0879931e0414f25c8a08425a08514e28ea7e81c1be23cf162f3bcad7cc3933f2378f53decabd3a7903d SHA512 3ad3efa45eddb733e3db9c406f9f651dbf939bbb13debbcab12b49ecf72490a4868b1563de60ee106483c1b23bd2092fc58c8fc911fe62a019cb97d738163723
+DIST openssl-1.0.2-patches-1.4.tar.xz 12864 BLAKE2B ace6a782ef97b61af44988f978d089adffb06894617f9d66d3fce664c04d360b2774e1dd38c2171151fa93fe92428d405674bc2d452d520f10da426f95d09aee SHA512 d152af2841f1bf11c7f2a5ebba9a2b903fb4bcdef0468c56af0f9cc8c020adbf4490ac1a62f5bae8cbe18e379934fa997bfda1c2d49ec62365c07a0c0515a72d
 DIST openssl-1.0.2o.tar.gz 5329472 BLAKE2B 30226db49be04317da3a76cce68d5aa401decd198f92505bddb0c72a7ef6a79f3c9c06d4a816db734e2a0991ebcab8b207feced26d83639e50c821d9e76ddc45 SHA512 8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd
 DIST openssl-1.0.2o_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2o_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
@@ -22,9 +21,8 @@ DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131e
 DIST openssl-1.1.1-pre7.tar.gz 8308876 BLAKE2B 621cc6c541d81c2fa62e12eb75b62f1444af2bc1fcf001620515810700eacc3b36975a5b0c4764fed78c37ad1c9ad78b94f5115794b929626b085ccab15d9ab0 SHA512 38efa67b26e83a4dcb6da2d61d92b6be890535c61cec23d781d49efe66173fd9b9185b89ba50d591fed65f440417e16ba0738ffba58a684e48e8b82032ea36ff
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
 EBUILD openssl-0.9.8z_p8.ebuild 4860 BLAKE2B 8c78442920df3443d9601c3e9246caa838e0acbe9541b5c250a6a96253b2d28fca65878cf9cddaae62f6fab6fd6d264997b168888cfcd1e53ea90b34a804e3e2 SHA512 60bcce7807ee7d0a68df11cdb2ab76560ef23b6e3df43a506263fcbdf54d0571dcfe0d16188159d13a268425b16798eb28c3c1ed985123ae095c8ea146c1e4d6
-EBUILD openssl-1.0.2o-r1.ebuild 8042 BLAKE2B 8e8f266dad8dac9192f3484d3334a2253c23858e9fadc7cb20e3c1d9742c65e9b1f072cc65ba82f329c94b45d8bdaf33576cfba90ff13bdaf65535910f867a03 SHA512 af301ed141db94a1a3095458219ac1daf1b9d0fb9d9bb0dddfb01249fe436d64f9e0adba83f3ef818952397d39755dd413bd2d8e8c4f9dd31024107d5c1e40b4
-EBUILD openssl-1.0.2o-r2.ebuild 9625 BLAKE2B fcabeb6b7119b8b5a55ac37b36b16463d3d01e3b338246761eabad5653580996955da883f453d7096ea2ac9db7cbde1a8f0bdb94b71ce84a39cb8af85c0f7104 SHA512 2826b3e3b1e2c8478ace451519270e07272104328374bcd287e701eb337012681dea5a9da037f9005b45b2a8788ead5aafa55e30fc07e7dbb2d23c204f322df9
-EBUILD openssl-1.0.2o.ebuild 8029 BLAKE2B 3f4fc348feaffd30b504a19b204cff81491ad2439869d0d913d23b1cf20238e4f6b4ee4c926e2c73ce64cb74567b0e3af5b0c5fb6ec59b19e943ca7e5d30bc54 SHA512 db357c88840fe101d51a80e536d38fa9a08742912d9e70f473eefc55cc9f94a3616be5eb9402e27836dd7db302ec27d82b0347d6c0e239655ecf13e82810c6bf
+EBUILD openssl-1.0.2o-r3.ebuild 8092 BLAKE2B 66f9d07e6757aeffde65bd525f3a6bd66c0da6b6f503778de37a8172cb37656baf0c5a501699d426b18d63d0dac5bb1e7df9ea9f7d30dc19021c15985e8f2114 SHA512 f6aa3f6a4b89aa947d78ea28b8de2c9d3efd3eae2dac98de742784542d71700b5fb68b79392523d41a06dc9784522206637ee525e9fd1635f3907af172dab7a8
+EBUILD openssl-1.0.2o-r4.ebuild 9688 BLAKE2B b26ba5064dfcfa26556f2f9fd01a5b33b23f7b6b193ae6e7c7b680db6a0ebbd184ee4555c93d98718ed02f49cbd78d048f8bc867ec26b629e826d27bcca83bac SHA512 2357e22ede357e7326bf24f13b68e55f56521863df058297cef9123286ebf112fd2bd735a1a58658b2922131c8c5e57b991eedc326d001d7fd305824663de8de
 EBUILD openssl-1.1.0h-r1.ebuild 9158 BLAKE2B c0c4257218e9ef0a2460d5b19a9d43741d3c67a4cbed2714f352951c6d051973a6851bb9a33733e539ad98f0f5be6051b4da157adb421fb79704f995b119f894 SHA512 b1e6dec42afd6c9ca00697cc7942c6b192aebf6ef914c45949c8e3592a11162ce3954b07b484166331035ce421a4dd0a6d463652ab21c25fb3bcfc14239a4cac
 EBUILD openssl-1.1.1_pre7.ebuild 7587 BLAKE2B 34eb743824c977e7b5f793a1837251dd29621ea5949497023a2254f5fad1e49fcf8b91b0962f0405f298e10e6a1b86326c0d0409cb9b4d75a795efa4f1978e52 SHA512 ab71eff89c32dea33dfe95bc52dbee60be75c837730b0324a20d13922aff380c9615576c6712971cbeba86bf2c70366e25fafaaaac20188f471eca9e7684a288
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.0.2o-r1.ebuild b/dev-libs/openssl/openssl-1.0.2o-r1.ebuild
deleted file mode 100644
index 256e230d7cfb..000000000000
--- a/dev-libs/openssl/openssl-1.0.2o-r1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-PATCH_SET="openssl-1.0.2-patches-1.3"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	mirror://gentoo/${PATCH_SET}.tar.xz
-	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
-	einstalldocs
-
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.0.2o.ebuild b/dev-libs/openssl/openssl-1.0.2o-r3.ebuild
index b8a3ec6ee43c..f54edbbadc2d 100644
--- a/dev-libs/openssl/openssl-1.0.2o.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2o-r3.ebuild
@@ -5,13 +5,14 @@ EAPI="6"
 
 inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
 
-PATCH_SET="openssl-1.0.2-patches-1.2"
+PATCH_SET="openssl-1.0.2-patches-1.4"
 MY_P=${P/_/-}
 DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
 HOMEPAGE="https://www.openssl.org/"
 SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 	mirror://gentoo/${PATCH_SET}.tar.xz
-	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz"
+	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz"
 
 LICENSE="openssl"
 SLOT="0"
diff --git a/dev-libs/openssl/openssl-1.0.2o-r2.ebuild b/dev-libs/openssl/openssl-1.0.2o-r4.ebuild
index 8959ecc12131..335dce5ded3c 100644
--- a/dev-libs/openssl/openssl-1.0.2o-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2o-r4.ebuild
@@ -5,13 +5,14 @@ EAPI="6"
 
 inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
 
-PATCH_SET="openssl-1.0.2-patches-1.3"
+PATCH_SET="openssl-1.0.2-patches-1.4"
 MY_P=${P/_/-}
 DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
 HOMEPAGE="https://www.openssl.org/"
 SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 	mirror://gentoo/${PATCH_SET}.tar.xz
-	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz"
+	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz"
 
 LICENSE="openssl"
 SLOT="0"
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 50260d6d14ca..3bb81d8fbbfe 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,3 +1,5 @@
 DIST pkcs11-helper-1.21.tar.bz2 417527 BLAKE2B 39b2b405ada79e0077c810b3537853051bbaf1cb4d79bedaedf04156066b573c9186ee587c869ed49053a0b471fa239447edef71184d421fb6ac2e65e3a58830 SHA512 064b04c1ece2db0757e14263955c0f7488edde5f5f4415ebda9c4370e608d7df681706ddefcdba2392e5642d00ebd4c211f15266bb39baf8da46ffaec4f3e572
+DIST pkcs11-helper-1.23.tar.bz2 425238 BLAKE2B d67c6d299dbb5e23330ab44dd4f3b3133843a0018503e8d9c53ab18343dd3206ea7a1110db8cb0c8c5c1a6569b876a2b81ca7496302cc073691abd3693fd00ea SHA512 d2116e602edf98ec409163d7e1d4eed7b849dd9680fcb7b46e37022a49581a2e88605f3420dbc0936133084715bdf431b34ae96b7dedadcb13ffeb4798f92c54
 EBUILD pkcs11-helper-1.21-r1.ebuild 993 BLAKE2B ab38240b1b8872fc624526b86b28efe4b947f586f36bbac74468e3e06b9bc640f2a5f82d7e419a2f27f74bb4595043a11f20c3bb3a78972ef76bcb45bf53218d SHA512 6c1b9cfc5ce449010a0c7fee9d7fcdfd45821b582aa68bbcb70aa0ed211528aafd6ae434388b16078663911069b014f6fe7cd2df79f71a93489410226b4e8272
+EBUILD pkcs11-helper-1.23.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
 MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.23.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.23.ebuild
new file mode 100644
index 000000000000..02e44a3a603b
--- /dev/null
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.23.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ltprune
+
+DESCRIPTION="PKCS#11 helper library"
+HOMEPAGE="https://github.com/OpenSC/pkcs11-helper"
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnutls libressl nss static-libs"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.7:= )
+	libressl? ( dev-libs/libressl )
+	gnutls? ( >=net-libs/gnutls-1.4.4 )
+	nss? ( dev-libs/nss )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.4.7 )"
+
+src_configure() {
+	econf \
+		--disable-crypto-engine-polarssl \
+		--disable-crypto-engine-mbedtls \
+		$(use_enable doc) \
+		$(use_enable gnutls crypto-engine-gnutls) \
+		$(use_enable nss crypto-engine-nss) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 4a5075c78f50..92e52fc6fcf2 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -2,7 +2,9 @@ AUX 0.2016.05.01-pkgconfig.patch 1890 BLAKE2B 3fc4c7f0d6a847bbfe8b137a0140b6805c
 DIST re2-2016-05-01.tar.gz 399509 BLAKE2B ec7676da99493bb2be56bd661f8f3bd57b123bbdc1f6cc5ccd294a17d819b75f9f505b247e86368735a454417f5df8aa4027c20f0fce129625c14caa166a97ad SHA512 6d37ab1eae51a73f60d3c8280ea1162c420638363f0eb1313d7c2d5cee65a5abd4c2927da1a53572afbcb7d07fac2993a7e54c6cbc85e24aaae93c46dab19b14
 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
 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 1305 BLAKE2B 27e7d0f8b457025bff2cf52b913c27510b1297e82656b8dd9ab479d723dfbf162d9c79b91dcfa6db9df71328a5891305910bdf345d6f679e0d28fe02041160eb SHA512 d72ddc4c55c49f9f338d83dcf9fc806072e672bd819e7662bae5580f063c982c802a4b210f68a1cf268ebba763d797d2a66ba01a47fcb59f6132d22329274333
 MISC metadata.xml 337 BLAKE2B a584c0de18fba97bedbfc3589eb7e35d2f9f794946f8161c50e807e6ed8dc90631b9aecf3f20b6e04bc27b4b5f92e9044221a50a92f8ed61052794392a0f68e8 SHA512 5dbef91cae8363700badc73e352829c4e4e8265bdb96104136c3759d1731148b7260840b4319116ceac00aa9ba17de6eafa2cf9684878b7e9f032469b6f2fec0
diff --git a/dev-libs/re2/re2-0.2018.04.01.ebuild b/dev-libs/re2/re2-0.2018.04.01.ebuild
new file mode 100644
index 000000000000..4aca3dcc7871
--- /dev/null
+++ b/dev-libs/re2/re2-0.2018.04.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficent, 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}
+	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/sni-qt/Manifest b/dev-libs/sni-qt/Manifest
deleted file mode 100644
index 3b6cc404be0f..000000000000
--- a/dev-libs/sni-qt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sni-qt-0.2.6.tar.bz2 34082 BLAKE2B 6b84204240ef1980ddea430cb7dd0347bfb9391d20eb5d50071f2bc88a031d8eb0d134ea358d8eae59ed283e72db7f44ee2cff5c517529604d3e4c9d396be91b SHA512 aa4cffeb3a5a70d65bd5ff42dcdd1c8efd107ade32a104b9a91696aecfb39a7a15d151f7491030ac0d7df796f2c7e4e6c3c0b7e32ee07a7cdc949da757147621
-EBUILD sni-qt-0.2.6-r1.ebuild 923 BLAKE2B f213652befc307acda6cdb677a0acef950d2c76c4c89cf646ae8850baa895c95af352444d50a3194d369e1eac9ec3438c6fc12abac94716e791c34fa71c51987 SHA512 0cad548a3bf4327e4460d9a452f439dc0d861d28f144356f5481f53725f2a6a6b9f46cd72ccdef74d8e4afd9bfd5c208cf9c1d1bb7f00e60b5faa70bf4570e60
-MISC metadata.xml 323 BLAKE2B f4a875279c7a8cbd194b289df8b50a1a7aaacf32c235677dcc4eb3d65a56bf025ebcb4f655a250f17300a8c183a625dd4ca4746051eb9b6f90c35471e6ae5798 SHA512 20f1a920336e199e1c2faac9895687d2c65eea1f33bdb9852138f30e15bdb8bc37de9de408793d56b492af3fcf12540528e61177ddf5a54b24322a98b89d5f16
diff --git a/dev-libs/sni-qt/metadata.xml b/dev-libs/sni-qt/metadata.xml
deleted file mode 100644
index 2d654473c3cc..000000000000
--- a/dev-libs/sni-qt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">sni-qt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/sni-qt/sni-qt-0.2.6-r1.ebuild b/dev-libs/sni-qt/sni-qt-0.2.6-r1.ebuild
deleted file mode 100644
index 81d5e574ac06..000000000000
--- a/dev-libs/sni-qt/sni-qt-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="A Qt plugin which turns all QSystemTrayIcon into StatusNotifierItems"
-HOMEPAGE="https://launchpad.net/sni-qt"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/libdbusmenu-qt[qt4,${MULTILIB_USEDEP}]
-	>=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]
-	>=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}]
-	>=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
-"
-
-src_prepare() {
-	if ! use test ; then
-		comment_add_subdirectory tests/auto
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt4/bin/qmake"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 1a5c02c9ef3d..a58a37748e80 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -3,6 +3,6 @@ AUX tinyxml-2.6.1-entity.patch 1776 BLAKE2B e8430b2fea965f351c12a0413c3bba43ce19
 AUX tinyxml-2.6.2-defineSTL.patch 353 BLAKE2B e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8 SHA512 52cd82ef9e8f1783b3d6042551342a8c592c447e1da352d5d017db4211144bc0a908ddbfe2a4641b3108fb8e02dc47f385a851f920532d94178314255904a6ef
 AUX tinyxml.pc.patch 383 BLAKE2B 7f13d388d80605a9576ca6c6dca263d9d1afe87026801f4a5d1db9b341b8bc763c66dfdfef924ce388b30fc453b143f01019ba676f66805fb11270c54d19ecfb SHA512 e423baf55f488fe4788234b8b19819520db3f9a43e677c34dd0bb9250c187c349b796a5c2749b5bee35d468b8676ccc8db7eab8a1094c36f65f63e128572b860
 DIST tinyxml_2_6_2.tar.gz 210124 BLAKE2B 84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
-EBUILD tinyxml-2.6.2-r2.ebuild 1267 BLAKE2B 7e59ba9d1424815a07c4c8827c0a6c06143c574957c667d9f8f8d29fbb19a595086876f0ce246fc3dac8fdf36172de52ff2a12ad8ab6576e437ad19a0c0ab6b6 SHA512 515396ca0b136a79786eca7620cfaa912a9cfb60a582837c695bdee8868bdd85825000fca0a6d087b9f3f7f8cbbd4d7b84e69779ac6baf36f85723749deb98c6
-EBUILD tinyxml-2.6.2-r3.ebuild 1505 BLAKE2B b2359f773ed5bbb2e0dac14404f36af326db8b74a5042ede4ad0e68c2738f7b3a5ba3db54c5505955218f3a75c67807279fac4887c34d77ef6b3df33ea5a99bd SHA512 c3dce5fd38d775ea8aa30ed28a18f5c894b3bdff6d123a046660fe95f4b3ffc855587ace4b814cccb9eb4e6c75f1e015689c863f67c09bbb5dc029af102a305f
+EBUILD tinyxml-2.6.2-r2.ebuild 1272 BLAKE2B 52eb49192dbc1f2fb465aab5c49e43b90fda4ae8c4bfd9ece8ab49231d9fdaa3097003b21f065332c0b15dfed89befd2c3d6be3b6ee0425fe51a68331734776b SHA512 d01c6c429d6c1fcc0361a3da80de019e329b55492bee5b769a8717016529f3f7e5443341babd3b9431610cd5b7a11fdcedcfffe03a38372333a907a8ebd26f54
+EBUILD tinyxml-2.6.2-r3.ebuild 1511 BLAKE2B 4dc93c2cfddd1603fe48d1ea908883877637ff93858fbf862e59b9633874d5ad52d337fdacc54bcdd43802bef356e5edc433ee27d71ed8f040416d458faf8dc1 SHA512 fbc56b50f7835135a19fb01ad4c518a93ca57a6b2a64374517731a241ab093a899987e26408a984353a7f139d83d4c83c3bfcba27302edbdad12b9913d85c441
 MISC metadata.xml 405 BLAKE2B 3df8b80574d2d5d42ee82fc2056f99d03fdd76190bc4fce6318a7b4ce79765c8c518f34b78181c0252de98dd587f6a48e745f1c094bd20f167a2667c8e64187f SHA512 b11af65ea7f12e4840154047ded852f3a393fecdca6c247d2eee83330a1ca834d210cb5d55db1601534c13a391321b82311fb9d5b288326beacdce2ad743ebb2
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
index e74e7a8c9c78..52ba8c0050dd 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs +stl"
 
 RDEPEND=""
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
index b355cbf7af3b..1a6e115660f5 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs +stl"
 
 RDEPEND=""
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 267ac0452ba0..9b6ed0671e97 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-1.14.0.tar.xz 413960 BLAKE2B b6d6bb35d3b664ef4cb91cbb9fc9687475730466306d9d2722991ce912be26fd4b3440fd0b94aba2b707911fe43a7c91e053b379261a17197c414ebc08818f83 SHA512 bd38b2b8963d4d98d42c270e5d7dbff6323789a173b19b67a18258424fd8adee5021b282c9d7f6dad0bd25aa0160e76aecd8ed803d4eb25d911ef0a81cd713a5
+DIST wayland-1.15.0.tar.xz 432932 BLAKE2B d86e5ba52c16664926e4688317db3fad4f9629c3903239dde46ee238ef7874f28e39daa6bbda96519dfda4ff83a1f540522f21fbabe9b71aa263523481d4eb5b SHA512 f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8
 EBUILD wayland-1.14.0.ebuild 1716 BLAKE2B 7da42f2763831e108e5b13cf648da2bf72a7e113ef4e7aeca149f225a0a2127f10bcd2df3e1a8f191d814345f7aafe3b75c92152db970561279ed86e7b81b416 SHA512 33aae7d701a910cfb9cec52d861c81d232d21a2802054d434944656fb0e8f103944e35606b7e522766d9cc5e2d8207baa6b893add6a6f93d16f22a6d5a88c303
-EBUILD wayland-9999.ebuild 1725 BLAKE2B b9e860e75f9686150b1b4d4d1f964f22e518a9c1be8d27e08c5679c18a2b3438e45d65f7cbe8adbe4695149e47de8b8df8a5fcf5a54c0629e9c3dfbece81db14 SHA512 f8c784d554c90056456c419359a91fdb957bbd7a51723253b0f120e956329daa02dbb99fb70565fb0e73e7766e769fd55aad4b7d1f6563701eb894204694515b
+EBUILD wayland-1.15.0.ebuild 1754 BLAKE2B 50866a6550a519455d7ecf23aa60d8ae9b6097bd8c9be01de66c677b82fc5e13f948df5ee7c1af912889ae9e56382766180f2ce351cbd04d21f235563c25e415 SHA512 854feab61f9939344d34a7a69dcb0eb97bbd4d8135628c885bd36de3a81058750e5ed0587c355e5400afb675cbe249c6c42f7256b88f16a1faf81c884df0a022
+EBUILD wayland-9999.ebuild 1755 BLAKE2B 43f897b83819708141c70c1b8d678509101c5497a21d4ded684901c43295ada64934f95693a2458597a1bcfa7bb508a638a8447789ed511769219fb7d271bf0e SHA512 24b4b3d664e4cdd331d78f8f22ea3670513411577849c8f980b5b9f7c7687b692bce959dd25970055b940aa835fac1d22766dc40bba23d989b0300d29fd6474b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.15.0.ebuild b/dev-libs/wayland/wayland-1.15.0.ebuild
new file mode 100644
index 000000000000..f61983c572e6
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.15.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit autotools libtool ltprune multilib-minimal toolchain-funcs $GIT_ECLASS
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=
+	!<media-libs/mesa-18.1.1-r1"
+DEPEND="${RDEPEND}
+	doc? (
+		>=app-doc/doxygen-1.6[dot]
+		app-text/xmlto
+		>=media-gfx/graphviz-2.26.0
+		sys-apps/grep[pcre]
+	)
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
+}
+
+multilib_src_configure() {
+	local myconf
+	if tc-is-cross-compiler ; then
+		myconf+=' --with-host-scanner '
+	fi
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(multilib_native_use_enable doc documentation) \
+		$(multilib_native_enable dtd-validation) \
+		${myconf}
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	einstalldocs
+}
+
+src_test() {
+	# We set it on purpose to only a short subdir name, as socket paths are
+	# created in there, which are 108 byte limited. With this it hopefully
+	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr
+	export XDG_RUNTIME_DIR="${T}"/xdr
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	multilib-minimal_src_test
+}
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index 4e25ea990ff3..62aa7b2393bb 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.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
@@ -27,7 +27,8 @@ IUSE="doc static-libs"
 
 RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:="
+	dev-libs/libxml2:=
+	!!<media-libs/mesa-18.1.1-r1"
 DEPEND="${RDEPEND}
 	doc? (
 		>=app-doc/doxygen-1.6[dot]
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 8b3191ebc7c8..5dd9a61d732e 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,10 +1,5 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
-AUX weston-1.11.0-sysmacros.patch 399 BLAKE2B 6117a352cf3cf3cbdc19be4b2ad4e8101205ea64b01fc54316b82ecc6e2e01c4a20fa5e425dace78f839624b185e40c2e51a47b1fd978f5b7ec718b06dd34192 SHA512 15bae4a20ed0ccef697823214a341b3ca5885b1922730f39b2fbea89b7df8a1d0357f8b3160bc2877289d9c75866baf3bbd69cadba750b12d95c80d1ce47fec3
-DIST weston-1.11.0.tar.xz 1242244 BLAKE2B 065d2ca010a73eaccf6ddb1d803ca2c2e9fe7725b8c802ad0ad8af668efa4f194e2dc46d98d6138909d49f2b6c435bad070ded036413632acc2f1731b1a392e0 SHA512 30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5
-DIST weston-1.9.0.tar.xz 1238240 BLAKE2B a52e6868527f0487f972578c8953e0d35009ab90cd27f09f67044528df962b042f6344846c15b887f228e459d10700578c80367910f65dab1279581bb9bdadc2 SHA512 9bcbb5971b8a55d9e10aacf0aae868ff03750a98daee5233dcbff5698ed84e41c4b147fa1fdb1e2be916e3b1e13f259e0eec62354517d6e2a7e1d301a8522f66
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
-EBUILD weston-1.11.0.ebuild 3579 BLAKE2B 189f3178ec49671a7623676eb060dae38e56b834cd1ca016b25eb0b87d4f36287b7e8b30fa5d5e9db2be261fc7f8fff19202e2387ca59d2fd231df9492b8fc33 SHA512 a3b6ded22f8103fd387b768c9779360d5f64187057b790f9ad7d1694c85a40e921e226bc9ca8876ff197a6ab4ca9574818f0d5b56217e3fc7b7e421cecbd5d8c
-EBUILD weston-1.9.0.ebuild 3150 BLAKE2B a5c8867231671a3f3838dffbe75bc359ef72c6c78cf8f2dbe4cd83e0dddf9d88db5e96e1469aa4ebbbc4bea1dea45cb0591958931f15734fda31e2fca7df8187 SHA512 43089ab78543c75b52f046b4fe37b7244aeedb4a6f6efb6d4892a59cd1b5108eaa807135b4ceebf845c03b76edadacb3eabac7c5852b0b8225ee52059464ec9e
 EBUILD weston-3.0.0.ebuild 3471 BLAKE2B fe1bf52314d12e30c3ae4ee664c156a83a817b3150e27ed60286d06bb115169a459c8a934d89faeb1deb30bba2b6965ca1a30d8ba16d8e9b244f29c8267e2c03 SHA512 fd281abc3d24c558d996670fac22106501d8d94ef394b23112023d95d4987bcbc4f0208796d5132cdd1ae3033073da2cc3f8067afefdc7b55fc9100a70ca39b2
 EBUILD weston-9999.ebuild 3461 BLAKE2B 9e0e7004d2f0f70228cd396a98d926a66a250978fabdc2ef1e09e2981a0a610df03c56e3b552f3e3fb9534e42a99718144b9c8208ec29834ac89f0f2fa478822 SHA512 420518c195308a359df897e377c3bd71c0e17a000cf8c0c25831332031ca1704cfbd598c10e9b475054f52407a9021e581db6b4dcc13dba2605dad2912e3f7ca
-MISC metadata.xml 1346 BLAKE2B d3f6039350c2de5081b3fa3caff08bec83fe8f18c03d22bfdcf11d7b7457a1dbd4f55ab352e215a9fc588788f01ecff334e66f3299367d124730f75331217b99 SHA512 27e5e3fde5db5d9e04138b1abdeb77a09a3a0c726c28b1ba63db4aec44c1be8804cfc171893573ac2b4365dc94c725129843267cb0ab938bc5599aa186f26094
+MISC metadata.xml 1296 BLAKE2B 7fe16b9e7e0a23f8ebc5361f3649031ec0897871964e00031a399462042d228e957344383a7c49509cb37703af54ecaf06526a83dea92b3eee2d1f6858715956 SHA512 e73e72586bd57e83c1a2d6de04982054029f65bfbb78b904f9eff049bf044c795fa6641d109eeae334b51a12a5240f185617e18f3a81150c03fa20f674349bbd
diff --git a/dev-libs/weston/files/weston-1.11.0-sysmacros.patch b/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
deleted file mode 100644
index 6f54bfc11cd5..000000000000
--- a/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN weston-1.11.0.orig/src/weston-launch.c weston-1.11.0/src/weston-launch.c
---- weston-1.11.0.orig/src/weston-launch.c	2015-10-24 02:02:43.000000000 +0200
-+++ weston-1.11.0/src/weston-launch.c	2018-04-30 00:02:42.528120347 +0200
-@@ -37,6 +37,7 @@
- #include <getopt.h>
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 54c40413ede5..661f699a5e5a 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -16,7 +16,6 @@
 	<flag name="launch">Install weston-launch utility</flag>
 	<flag name="rdp">Enable Remote Desktop Protocol compositor support</flag>
 	<flag name="resize-optimization">Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
-	<flag name="rpi">Raspberry Pi GPU support</flag>
 	<flag name="screen-sharing">Enable screen-sharing through RDP</flag>
 	<flag name="unwind">Enable libunwind usage for backtraces</flag>
 	<flag name="wayland-compositor">Enable Wayland compositor support</flag>
diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.11.0.ebuild
deleted file mode 100644
index 81098bc0289f..000000000000
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-VIRTUALX_REQUIRED="test"
-RESTRICT="test"
-
-inherit autotools readme.gentoo-r1 toolchain-funcs virtualx epatch $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="amd64 arm x86"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86 ~arm-linux"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	screen-sharing? ( rdp )
-	systemd? ( dbus )
-	test? ( X )
-	wayland-compositor? ( gles2 )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.10.0
-	>=dev-libs/wayland-protocols-1.2
-	lcms? ( media-libs/lcms:2 )
-	media-libs/libpng:0=
-	webp? ( media-libs/libwebp:0= )
-	jpeg? ( virtual/jpeg:0= )
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.30
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	dbus? ( sys-apps/dbus )
-	drm? (
-		media-libs/mesa[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	rdp? (
-		>=net-misc/freerdp-1.1.0_beta1_p20130710
-		<net-misc/freerdp-2.0.0_pre20161219
-	)
-	rpi? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	systemd? (
-		sys-auth/pambase[systemd]
-		sys-apps/systemd[pam]
-	)
-	launch? ( sys-auth/pambase )
-	unwind? ( sys-libs/libunwind )
-	X? (
-		x11-libs/libxcb
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
-		x11-libs/libxcb
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-sysmacros.patch"
-	if [[ ${PV} = 9999* ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use examples || use test; then
-		myconf="--enable-simple-clients"
-	else
-		myconf="--disable-simple-clients"
-	fi
-
-	myconf+=" --with-cairo=image --disable-simple-egl-clients"
-
-	econf \
-		$(use_enable examples demo-clients-install) \
-		$(use_enable fbdev fbdev-compositor) \
-		$(use_enable dbus) \
-		$(use_enable drm drm-compositor) \
-		$(use_enable headless headless-compositor) \
-		$(use_enable ivi ivi-shell) \
-		$(use_enable lcms) \
-		$(use_enable rdp rdp-compositor) \
-		$(use_enable rpi rpi-compositor) \
-		$(use_enable wayland-compositor) \
-		$(use_enable X x11-compositor) \
-		$(use_enable launch weston-launch) \
-		$(use_enable colord) \
-		$(use_enable gles2 egl) \
-		$(use_enable unwind libunwind) \
-		$(use_enable resize-optimization) \
-		$(use_enable screen-sharing) \
-		$(use_enable suid setuid-install) \
-		$(use_enable systemd systemd-login) \
-		$(use_enable systemd systemd-notify) \
-		$(use_enable xwayland) \
-		$(use_enable xwayland xwayland-test) \
-		$(use_with jpeg) \
-		$(use_with webp) \
-		--disable-simple-dmabuf-intel-client \
-		--disable-simple-dmabuf-v4l-client \
-		${myconf}
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	cd "${BUILD_DIR}" || die
-	Xemake check
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-1.9.0.ebuild b/dev-libs/weston/weston-1.9.0.ebuild
deleted file mode 100644
index 9a3663c34e72..000000000000
--- a/dev-libs/weston/weston-1.9.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-VIRTUALX_REQUIRED="test"
-RESTRICT="test"
-
-inherit autotools readme.gentoo toolchain-funcs virtualx $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="arm"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86 ~arm-linux"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	screen-sharing? ( rdp )
-	test? ( X )
-	wayland-compositor? ( gles2 )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.9.0
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/libwebp:0=
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.30
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	dbus? ( sys-apps/dbus )
-	drm? (
-		media-libs/mesa[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
-	rpi? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	systemd? (
-		sys-auth/pambase[systemd]
-		sys-apps/systemd[pam]
-	)
-	launch? ( sys-auth/pambase )
-	unwind? ( sys-libs/libunwind )
-	X? (
-		x11-libs/libxcb
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
-		x11-libs/libxcb
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use examples || use test; then
-		myconf="--enable-simple-clients"
-	else
-		myconf="--disable-simple-clients"
-	fi
-
-	myconf+=" --with-cairo=image --disable-simple-egl-clients"
-
-	econf \
-		$(use_enable examples demo-clients-install) \
-		$(use_enable fbdev fbdev-compositor) \
-		$(use_enable dbus) \
-		$(use_enable drm drm-compositor) \
-		$(use_enable headless headless-compositor) \
-		$(use_enable ivi ivi-shell) \
-		$(use_enable rdp rdp-compositor) \
-		$(use_enable rpi rpi-compositor) \
-		$(use_enable wayland-compositor) \
-		$(use_enable X x11-compositor) \
-		$(use_enable launch weston-launch) \
-		$(use_enable colord) \
-		$(use_enable gles2 egl) \
-		$(use_enable unwind libunwind) \
-		$(use_enable resize-optimization) \
-		$(use_enable screen-sharing) \
-		$(use_enable suid setuid-install) \
-		$(use_enable xwayland) \
-		$(use_enable xwayland xwayland-test) \
-		${myconf}
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	cd "${BUILD_DIR}" || die
-	Xemake check
-}
-
-src_install() {
-	default
-
-	readme.gentoo_src_install
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
commit	cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree	047fc92023c520d07f13ec5ac96e094d1b312a7a /dev-libs
parent	7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)