gentoo resync : 10.02.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
commit: 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree: cee0a97398040001220ece3cd48c3d568bcddb4a /dev-libs
parent: 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)
141 files changed, 2226 insertions, 780 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0c8b1067451b..1e035a507469 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index c016abe9f7ca..2dcbe0ee5727 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -5,5 +5,5 @@ AUX beecrypt-4.2.1-gcc-4.7.patch 262 BLAKE2B a99fa0e61728bd38510622a1770c3ecad15
 AUX beecrypt-4.2.1-icu-61.patch 1348 BLAKE2B 7412a407e6da0349913733590c1fe650af65863eaf5112f89be8f834dd60629bfe8ff05852016ba710f4ccd16c2db5341a7120cd570669ea21d9560cf361873b SHA512 f84a078f8263eb8613a3114875926d4a12c0e2e5bb6dde823849686ae2e7ae1e27fc0b7d8dc9467322b815a09b63f91658b65250cd64809d14a8f85661205349
 DIST beecrypt-4.2.1.tar.gz 882758 BLAKE2B 7ca25613cf95df8657c762d932618979783ea2ddfbaecdf066701d61a5f9ac76bd474a51eb65e140c83ef01880477cb7104e3d67c2fc078ae7b710637d18bb53 SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc
 EBUILD beecrypt-4.2.1-r5.ebuild 2258 BLAKE2B fd98acad8db1f298fa58171e1ac39258497e20f0538eb0e316eda0f2d953a344ffb9eb5acd83970be32f9530b2f04dd65b5cafd09a1f9d5862705fa14734dae7 SHA512 fefca8cac89bac9f8e422cf42dd2911cf5f9ccd880ac50670bc26849124a29d24bb4277aa6d56bfcf7411ce5445095d91592e083e8a72276b4ff7e2a36583b0c
-EBUILD beecrypt-4.2.1-r6.ebuild 2467 BLAKE2B 6b25bf69238015a4e2f936f4b782d1da28bbb9fc993bd46c5617be8ee6900c60f0f06e01089dd44a6356be7ee1b4ee960a98d2a4e8ec30f0feafcc1e8c0214a4 SHA512 ca7ae4eed1e6fe36f04fd7ad51d9b5821f009698a42cf7fc9f487f7920d955b09eaa0c5035c450662e12bbbf749940c0b311fd66e3e4d22129a5a2489412576a
+EBUILD beecrypt-4.2.1-r6.ebuild 2464 BLAKE2B 89ee853582b6d0381efe37d5ced844823741ffc8fedb9257c3210c59b2fae4304e1e4906610292d08c060f51cc20e6e0e3f6a8da3a283fb44a1a112ea56abe85 SHA512 5411bb927da5ffa2bd12c7be03523b28294cce4d5804687f449ece31cd548b0dcdf8cfb42f09c32614e46dd84075bdaa78f6ce6b1c4b69784ddb84e41da3ef4a
 MISC metadata.xml 245 BLAKE2B a937157650e974ab296da9c19930deffad940d0c256541ea0338121f36fde942eb41529c5f3f39d37fdd3fe6e30eb8e9b987a0cb5c2b7736ff837c2e332ddf95 SHA512 7da531ddd382748b46b2be3d6324c0f654e772ca0d1b87884a5de0ae1f4cf8a6e32d9cd0e4b87b7fd632aa176f873d7e315adbb974c367b4539045fdeffde98b
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild
index 54428c68dcfd..c0d4ba388c30 100644
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+threads java cxx python static-libs doc"
 REQUIRED_USE="cxx? ( threads )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest
new file mode 100644
index 000000000000..ee2710b5eafe
--- /dev/null
+++ b/dev-libs/bemenu/Manifest
@@ -0,0 +1,2 @@
+EBUILD bemenu-9999.ebuild 702 BLAKE2B 4ed08a98bb29030a3db13812e3a200c7f1ac83077d776634432a98943380082fab0943cb2f38c0448828599272fb587308db65f51264dee31162f3ca296cf7d4 SHA512 0504a23225d73d10fb91fb0a46bd933f17f51d0272fff20da847206bf0351519b22da49b4f5a5a049ff99f697009495ae6bcacbe2833aa72cdb0f4dd826bff6a
+MISC metadata.xml 377 BLAKE2B 6b29e18f25e7237d1e1fec87b4cfe534471a6e7da07682cac5cfe97cd01d968b7b037a9b624432922e73f135f72d41b2662dcc95b862bb33cc2667cc700dfd0f SHA512 e7a4e4d244d06524f6c8f53251d6e0a41c570c76b0c5e5c49e97c53793c1e0d745fd82c511979073163e69fcea9ede4659d14a8ad85a1f6f648390e45682ad64
diff --git a/dev-libs/bemenu/bemenu-9999.ebuild b/dev-libs/bemenu/bemenu-9999.ebuild
new file mode 100644
index 000000000000..1bfa5ce8fae1
--- /dev/null
+++ b/dev-libs/bemenu/bemenu-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 cmake-utils
+
+DESCRIPTION="dmenu clone for wayland"
+HOMEPAGE="https://github.com/Cloudef/bemenu"
+EGIT_REPO_URI="https://github.com/Cloudef/bemenu.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND="
+	x11-libs/cairo
+	x11-libs/pango
+	dev-libs/wayland
+	x11-libs/libxcb
+	dev-libs/wayland-protocols
+	sys-libs/ncurses:0
+	x11-libs/libXext
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local mycmakeargs=(-DCURSES_LIBRARY=/usr/$(get_libdir)/libncursesw.so)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/bemenu/metadata.xml b/dev-libs/bemenu/metadata.xml
new file mode 100644
index 000000000000..f8955b2310f3
--- /dev/null
+++ b/dev-libs/bemenu/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Dynamic menu library and client program inspired by dmenu (for wayland)
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
new file mode 100644
index 000000000000..d334bfe2b269
--- /dev/null
+++ b/dev-libs/crc32c/Manifest
@@ -0,0 +1,3 @@
+DIST crc32c-1.0.6.tar.gz 29596 BLAKE2B 5806e0a48cb3048c9b07abb75eb232491483176bbeb98bc11ad1b0ef7d4ce89929ad20b0354906fd67e8773541f9913f3948f1db9a3f3987fe7e2ca67e9d2467 SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b
+EBUILD crc32c-1.0.6.ebuild 580 BLAKE2B 118db28971cfc223ddc16bf67583393a8c6c90a31e1cd8ee221d16242486ce9ea10839067cbe369ae2baa59692edd0548f79e01089609684eaaa0813fc58dfbf SHA512 df15cae485a888e5df4aed4794d394dbc6230e776abfdc4c73768e7baf9e70b7f933b9b7389a83bf628d3f3441bb83d5b24a908f7f16ca442042e2c68a2aee5a
+MISC metadata.xml 376 BLAKE2B 98a66d83b64fc45ea9c6e127fd18002fbe521851084496c4a2dab72fa3714f1d5eb6c495e770668de2d02d2b5a91dee35fee2c4917504d71ac4fd7717161c028 SHA512 414702e63bba2c5f4647eeebb6c59049e40d11da18aa3049f58dee2d269f5be86c851ea4f14dda36a1b4ec15f2f6afd0e516b8106dd3064cf6fa47cba9bc164c
diff --git a/dev-libs/crc32c/crc32c-1.0.6.ebuild b/dev-libs/crc32c/crc32c-1.0.6.ebuild
new file mode 100644
index 000000000000..dd3651dd58d4
--- /dev/null
+++ b/dev-libs/crc32c/crc32c-1.0.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="CRC32C implementation with support for CPU-specific acceleration instructions"
+HOMEPAGE="https://github.com/google/crc32c"
+SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCRC32C_BUILD_TESTS=OFF
+		-DCRC32C_BUILD_BENCHMARKS=OFF
+		-DCRC32C_USE_GLOG=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/crc32c/metadata.xml b/dev-libs/crc32c/metadata.xml
new file mode 100644
index 000000000000..87e8aaf70c68
--- /dev/null
+++ b/dev-libs/crc32c/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>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+	<longdescription lang="en">
+		CRC32C implementation with support for CPU-specific acceleration instructions
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index e905d04c9f22..ca591649cf36 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -32,6 +32,8 @@ DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd04
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
 EBUILD cyrus-sasl-2.1.26-r10.ebuild 7743 BLAKE2B 26b36b8f68ae6af768e41dba4b7946c814411c70fab471dc9c93dc1487d39079306a1e3eb768920720dc7369883804a0b2a92b8a3c1ed6c997879001ea198eb6 SHA512 2b3f5221dfd76f463642ba9fee1d983c383bd9e490dda8cf41ab63e1f63723866faba25bb2042bc35ab954fb4021d9e2450c99da778185c92aa1527dd53eb9e7
 EBUILD cyrus-sasl-2.1.26-r12.ebuild 8431 BLAKE2B 0b769d0f97c9607da49eb82b57203513d7f3c8a82c410085c487f39a54706741700025164188dcef9a8b4622c7491ea995e8c33f374b893044a4a608dca3e1c3 SHA512 741e51ddbe4393927fd637ef84d953126c5fc2c5a877077113e36973239cfd3b0879d20c69dafc74a8b108ba363bc8e87db8bfd533da818ede78f20010efdc5e
+EBUILD cyrus-sasl-2.1.26-r13.ebuild 8465 BLAKE2B 48ad450be4078bea4077b8e22d664eab654136b264af31cd08037d78846d4989d3ca16d31123cbd266af0e62f29b0b5017a26dad4673fe56dac61a6e5519edd0 SHA512 80635f22cebf55ab59ae7575d3ea3e6eeeffaee25ad452577ef5af16c04eb9c5dbf300cd824814c09dfe701415b19343951dea40b8cbe957de848693c2d609b9
 EBUILD cyrus-sasl-2.1.26-r9.ebuild 7662 BLAKE2B 8a7b96ca43d133164a9818727486f2d15bd6f66d66e083dee2ac0a8d83c921a86e3e1f34dfa04689c81b5227cf80f06d1fea3c1da74b48c828e4a31f51b67c9e SHA512 6515a66682bc8c0d18b13a3cc540d00f07d26374a6bbefdcb6c974b3184164cfcce80e965b29bc10e81345e2abb8c04eb7edb21adf4097af741d5df1557ae04d
 EBUILD cyrus-sasl-2.1.27-r1.ebuild 8080 BLAKE2B e5ec4df72f32f8e29cb06fe0ab9015dfdc906721065ea09d1a625b04687a02cdcdf93df8aa1661849d8341c3a9432d49fbf052f3f9adbaf8d59e1e0827503cec SHA512 345fe84f61ff18b8fb6917d264db8db552d029937d9de242cfc6df0c36e2728d02bac6a7c7a1975b64ffdf1e0922da27339304b9fa5984689382b2650c94ac0a
+EBUILD cyrus-sasl-2.1.27-r2.ebuild 8114 BLAKE2B b396d82febfbb4838a19264810cce829f6b1e1cb58782ddfbb5112ab2fda5acbfe41742f2dfd5d3620359ee7a396c7551f3bb10feefba489fa8870503984ba3f SHA512 002dcb256b34b9af1d0cd1c7b292f96fd8d3e7f9a6268a6d5d03bdffb176f6b8db364769f77f5caa14d5069aa25dc1462e1b32b4e8a89532c2c2993e318a5068
 MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild
new file mode 100644
index 000000000000..fd823635a6a8
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
+
+SASLAUTHD_CONF_VER="2.1.26"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="2"
+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="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
+srp ssl static-libs urandom"
+
+DEPEND="
+	net-mail/mailbase
+	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
+	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	)
+	java? ( >=virtual/jdk-1.6:= )"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-sasl )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/sasl/md5global.h
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.25-sasldb_al.patch"
+	"${FILESDIR}/${PN}-2.1.25-saslauthd_libtool.patch"
+	"${FILESDIR}/${PN}-2.1.25-avoid_pic_overwrite.patch"
+	"${FILESDIR}/${PN}-2.1.25-autotools_fixes.patch"
+	"${FILESDIR}/${PN}-2.1.25-as_needed.patch"
+	"${FILESDIR}/${PN}-2.1.25-missing_header.patch"
+	"${FILESDIR}/${PN}-2.1.25-fix_heimdal.patch"
+	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
+	"${FILESDIR}/${PN}-2.1.23-gss_c_nt_hostbased_service.patch"
+	"${FILESDIR}/${PN}-2.1.25-service_keytabs.patch"
+	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
+	"${FILESDIR}/${PN}-2.1.26-CVE-2013-4122.patch"
+	"${FILESDIR}/${PN}-2.1.26-send-imap-logout.patch"
+	"${FILESDIR}/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch"
+	"${FILESDIR}/${PN}-2.1.26-fix_dovecot_authentication.patch"
+	"${FILESDIR}/${PN}-2.1.26-openssl-1.1.patch" #592528
+)
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Get rid of the -R switch (runpath_switch for Sun)
+	# >=gcc-4.6 errors out with unknown option
+	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
+		configure.in || die
+
+	# Use plugindir for sasldir
+	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+	# #486740 #468556
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
+		configure.in || die
+	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
+		saslauthd/configure.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# getpassphrase is defined in /usr/include/stdlib.h
+		append-cppflags -DHAVE_GETPASSPHRASE
+	else
+		# this horrendously breaks things on Solaris
+		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Java support.
+	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+	local myeconfargs=(
+		--enable-login
+		--enable-ntlm
+		--enable-auth-sasldb
+		--disable-cmulocal
+		--disable-krb4
+		--disable-macos-framework
+		--enable-otp
+		--without-sqlite
+		--with-saslauthd="${EPREFIX}"/run/saslauthd
+		--with-pwcheck="${EPREFIX}"/run/saslauthd
+		--with-configdir="${EPREFIX}"/etc/sasl2
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
+		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with openldap ldap)
+		$(use_enable ldapdb)
+		$(multilib_native_use_enable sample)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable java)
+		$(multilib_native_use_with java javahome ${JAVA_HOME})
+		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
+		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
+		$(use_enable srp)
+		$(use_enable static-libs static)
+
+		# Add authdaemond support (bug #56523).
+		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
+
+		# Fix for bug #59634.
+		$(usex ssl '' --without-des)
+
+		# Use /dev/urandom instead of /dev/random (bug #46038).
+		$(usex urandom --with-devrandom=/dev/urandom '')
+	)
+
+	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
+		myeconfargs+=( --enable-sql )
+	else
+		myeconfargs+=( --disable-sql )
+	fi
+
+	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
+	if use gdbm ; then
+		einfo "Building with GNU DB as database backend for your SASLdb"
+		myeconfargs+=( --with-dblib=gdbm )
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
+		myeconfargs+=(
+			--with-dblib=berkeley
+			--with-bdb-incdir="$(db_includedir)"
+		)
+	else
+		einfo "Building without SASLdb support"
+		myeconfargs+=( --with-dblib=none )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	# Thanks to axxo@gentoo.org for the solution.
+	if multilib_is_native_abi && use java ; then
+		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		if use sample ; then
+			docinto sample
+			dodoc "${S}"/sample/*.c
+			exeinto /usr/share/doc/${P}/sample
+			doexe sample/client sample/server
+		fi
+
+		# Default location for java classes breaks OpenOffice (bug #60769).
+		if use java; then
+			java-pkg_dojar ${PN}.jar
+			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
+			# hackish, don't wanna dig through makefile
+			rm -rf "${ED}/usr/$(get_libdir)/java" || die
+			docinto "java"
+			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+			dodir "/usr/share/doc/${PF}/java/Test"
+			insinto "/usr/share/doc/${PF}/java/Test"
+			doins "${S}"/java/Test/*.java
+		fi
+
+		dosbin saslauthd/testsaslauthd
+	fi
+}
+
+multilib_src_install_all() {
+	keepdir /etc/sasl2
+
+	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
+	newdoc pwcheck/README README.pwcheck
+
+	docinto html
+	dodoc doc/*.html
+
+	docinto "saslauthd"
+	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
+
+	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
+	systemd_dounit "${FILESDIR}/pwcheck.service"
+
+	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
+	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+	systemd_dounit "${FILESDIR}/saslauthd.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+	# The get_modname bit is important: do not remove the .la files on
+	# platforms where the lib isn't called .so for cyrus searches the .la to
+	# figure out what the name is supposed to be instead
+	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
+
+pkg_postinst () {
+	# Generate an empty sasldb2 with correct permissions.
+	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
+		einfo "Generating an empty sasldb2 with correct permissions ..."
+		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
+			|| die "Failed to generate sasldb2"
+		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
+			|| die "Failed to delete temp user"
+		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
+		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
+	fi
+
+	if use authdaemond ; then
+		elog "You need to add a user running a service using Courier's"
+		elog "authdaemon to the 'mail' group. For example, do:"
+		elog "	gpasswd -a postfix mail"
+		elog "to add the 'postfix' user to the 'mail' group."
+	fi
+
+	elog "pwcheck and saslauthd home directories have moved to:"
+	elog "  /run/saslauthd, using tmpfiles.d"
+}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
new file mode 100644
index 000000000000..b31b213093bc
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd eapi7-ver
+
+SASLAUTHD_CONF_VER="2.1.26"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
+#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="2"
+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="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
+
+CDEPEND="
+	net-mail/mailbase
+	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
+	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	)
+	java? ( >=virtual/jdk-1.6:= )"
+
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sasl )"
+
+DEPEND="${CDEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/sasl/md5global.h
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch"
+	"${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch"
+	"${FILESDIR}/${PN}-2.1.27-as_needed.patch"
+	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
+	"${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch"
+	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
+	"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
+	"${FILESDIR}/${PN}-2.1.27-memmem.patch"
+)
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Get rid of the -R switch (runpath_switch for Sun)
+	# >=gcc-4.6 errors out with unknown option
+	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
+		configure.ac || die
+
+	# Use plugindir for sasldir
+	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+	# #486740 #468556
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# getpassphrase is defined in /usr/include/stdlib.h
+		append-cppflags -DHAVE_GETPASSPHRASE
+	else
+		# this horrendously breaks things on Solaris
+		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Java support.
+	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+	local myeconfargs=(
+		--enable-login
+		--enable-ntlm
+		--enable-auth-sasldb
+		--disable-cmulocal
+		--disable-krb4
+		--disable-macos-framework
+		--enable-otp
+		--without-sqlite
+		--with-saslauthd="${EPREFIX}"/run/saslauthd
+		--with-pwcheck="${EPREFIX}"/run/saslauthd
+		--with-configdir="${EPREFIX}"/etc/sasl2
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
+		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
+		--with-sphinx-build=no
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with openldap ldap)
+		$(use_enable ldapdb)
+		$(multilib_native_use_enable sample)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable java)
+		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
+		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
+		$(use_enable srp)
+		$(use_enable static-libs static)
+
+		# Add authdaemond support (bug #56523).
+		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
+
+		# Fix for bug #59634.
+		$(usex ssl '' --without-des)
+
+		# Use /dev/urandom instead of /dev/random (bug #46038).
+		$(usex urandom --with-devrandom=/dev/urandom '')
+	)
+
+	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
+		myeconfargs+=( --enable-sql )
+	else
+		myeconfargs+=( --disable-sql )
+	fi
+
+	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
+	if use gdbm ; then
+		einfo "Building with GNU DB as database backend for your SASLdb"
+		myeconfargs+=( --with-dblib=gdbm )
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
+		myeconfargs+=(
+			--with-dblib=berkeley
+			--with-bdb-incdir="$(db_includedir)"
+		)
+	else
+		einfo "Building without SASLdb support"
+		myeconfargs+=( --with-dblib=none )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	# Thanks to axxo@gentoo.org for the solution.
+	if multilib_is_native_abi && use java ; then
+		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		if use sample ; then
+			docinto sample
+			dodoc "${S}"/sample/*.c
+			exeinto /usr/share/doc/${P}/sample
+			doexe sample/client sample/server
+		fi
+
+		# Default location for java classes breaks OpenOffice (bug #60769).
+		if use java; then
+			java-pkg_dojar ${PN}.jar
+			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
+			# hackish, don't wanna dig through makefile
+			rm -rf "${ED}/usr/$(get_libdir)/java" || die
+			docinto "java"
+			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+			dodir "/usr/share/doc/${PF}/java/Test"
+			insinto "/usr/share/doc/${PF}/java/Test"
+			doins "${S}"/java/Test/*.java
+		fi
+
+		dosbin saslauthd/testsaslauthd
+	fi
+}
+
+multilib_src_install_all() {
+	doman man/*
+
+	keepdir /etc/sasl2
+
+	# Reset docinto to default value (#674296)
+	docinto
+	dodoc AUTHORS ChangeLog doc/legacy/TODO
+	newdoc pwcheck/README README.pwcheck
+
+	newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
+	edos2unix ${ED%/}/usr/share/doc/${PF}/release-notes
+
+	docinto html
+	dodoc doc/html/*.html
+
+	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
+	systemd_dounit "${FILESDIR}/pwcheck.service"
+
+	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
+	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+	systemd_dounit "${FILESDIR}/saslauthd.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+	# The get_modname bit is important: do not remove the .la files on
+	# platforms where the lib isn't called .so for cyrus searches the .la to
+	# figure out what the name is supposed to be instead
+	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
+
+pkg_postinst () {
+	# Generate an empty sasldb2 with correct permissions.
+	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
+		einfo "Generating an empty sasldb2 with correct permissions ..."
+		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
+			|| die "Failed to generate sasldb2"
+		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
+			|| die "Failed to delete temp user"
+		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
+		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
+	fi
+
+	if use authdaemond ; then
+		elog "You need to add a user running a service using Courier's"
+		elog "authdaemon to the 'mail' group. For example, do:"
+		elog "	gpasswd -a postfix mail"
+		elog "to add the 'postfix' user to the 'mail' group."
+	fi
+
+	elog "pwcheck and saslauthd home directories have moved to:"
+	elog "  /run/saslauthd, using tmpfiles.d"
+}
diff --git a/dev-libs/device-atlas-api-c/Manifest b/dev-libs/device-atlas-api-c/Manifest
index 418230c8aebd..d599d1c30fa8 100644
--- a/dev-libs/device-atlas-api-c/Manifest
+++ b/dev-libs/device-atlas-api-c/Manifest
@@ -1,4 +1,4 @@
 AUX 2.1.3-src-cmakelists.patch 629 BLAKE2B f3bb4160bbbe58a92e33216f11b52f25b3fc80d58efd11830575b819a41165df51f3c7e8c1a4c431157296d34f179c95c596b2d37b22b5211ff3e7e05989e671 SHA512 08b5f1156341b91911adbba7d527f11f385642a8afcd0ad0e833f83e6c799dd85bb6195dddf9cde13672ec9f52b5b7094f57a09c85866c3c42e627495b45e9bb
 DIST deviceatlas-enterprise-c-2.1.3.tgz 183663 BLAKE2B e190aa8e9a4b9bc90af76e21eb425c0f040ef70e605c8f9e588bd0c859520a82807aaafddd24402d3365e94bcf3b7a875a65804f2b1b3bed6f0703f28a841440 SHA512 364811d42b2c0d937a12f2bbfee760701a1dee4e93bcc84423c8b236d59257a3440111ffc6072a7822b9694ea65986572550f67d0b1e5d68a784d1339b2b70aa
-EBUILD device-atlas-api-c-2.1.3.ebuild 1054 BLAKE2B 77f2191b854b8364939e6a41e18802d8f7df0d51102d90bf2504e10e3e47d11eecc6f3f2bb3a32f205baa0065bd5c7d68990164233177e139d7b98b7d6cd9ebc SHA512 d0f153771e46878c47ea4887799f703d3d9cbcc6fb2fc5ce96f31ded933ba9982f6de4e7ef881377f5e72cf652b2b8ebdd2b85360ceb7d8772e4c178def2f560
+EBUILD device-atlas-api-c-2.1.3.ebuild 1061 BLAKE2B fa019f2768618bfd43c93ae8936efb609824ecabc6fb49871d3b1fa57ef00775c4764365779b3bca8b8adcfeb64805beeb7ab1b7e196d76b2cc27a7110f0bc93 SHA512 26b10edaf8aae154e9b21fa32da662305b51e6255a12e5fe9d0e3d2ed49e57dc30c630d6cb98af8c26c3989f12e579861a8647fe10c36d3e80529f31baa50507
 MISC metadata.xml 794 BLAKE2B 5021d469addcb51164731491a3a9ae1c24c3a24ccf2159574bcd8cb2c3ec7aa5dd217beb093c696db8438ae31778c18f8d047e73deec3984683009f50279af41 SHA512 2da64d528f2e49d368ba7b8684d818f0d8bb979dd0c64d613f25bdca97a9c5a3af2eb85f4955e03ed52dc5eb43b3ba7bad21eb94bdd67d370e1ddfa6545b26a1
diff --git a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild
index 4679d064f462..2177b9530f2d 100644
--- a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild
+++ b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,7 @@ PATCHES=(
 pkg_nofetch() {
 	eerror "Please go to https://deviceatlas.com/deviceatlas-haproxy-module"
 	eerror "And download DeviceAtlas C API"
-	eerror "Then place the file in ${DISTDIR}/${MY_P}.tgz"
+	eerror "Save the file as ${MY_P}.tgz in your DISTDIR directory."
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 93bb7028b417..e0596fc720d3 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,4 +1,5 @@
 DIST double-conversion-3.0.0.tar.gz 7019526 BLAKE2B 631973dadefa8bbf7e4acffd44968dfbf6b7dbeeb045fbbe0df7824a890991f510131647a52646fcd2b069b8b886a7b66a82434b829bdcb58bd8f503fecc7d18 SHA512 5057af6e72f2aaace56ebdd9a0ddfa34318cbdfeabec5c361b60e6c92f160c8999c046c50f8c6f8d590eb8e97aa70bb6e97ba8148f0dc95dbc42f204fcdc1abf
-EBUILD double-conversion-3.0.0-r1.ebuild 1353 BLAKE2B 5349043968384e1246fe72a352d967dd45ab5e0387da1fd1ea9fa6df5a04fa7038c07a9836861ccd70432c7c5cc052b224ade8701138f26b46d5f7fd69bf0bfe SHA512 5cf8c41a67bea073dbd871aef16103457e5fc26ef4e138b75154821d66c7bd8617cf4291de90bb1e8359e25e87d243ed7d7eb838f3bb77e60f3a14f9a87a6dbe
+DIST double-conversion-3.0.3.tar.gz 7019705 BLAKE2B 65d7729b55dbb9fd0cf31b258738f3e9f3350b4ecf0204d3d2d23de24cb24651788e844aa1a10d6ec452ca6484c43ed1d218d434fc18be7bb1f15bf8ba97102a SHA512 3a8e956da485195753508c90cd6fa3d9fde42103291a8e65a0d95488faa02e98dddff21935625519c0ce49d8911d66d0773ddf6012264094f3edd851b461f62b
 EBUILD double-conversion-3.0.0.ebuild 617 BLAKE2B eeeab151a1432c666abf6e5c4340a838d4961b857b7e7ff54f41e39b05915333cb02e18aa53ed38fbcc4894a15d3fdb54ecad429f6c21142e551f8cf08f72cab SHA512 35369bd050c61dbd0ca29f12e360ea81a9320646aeba2763455cedbd746959fcb868eedeb334e2557af717a73350cc5508aac61f3ce910b594ba91210c035ce4
+EBUILD double-conversion-3.0.3.ebuild 1352 BLAKE2B d5068ea87d4066e2834c84f278e03bd197aa75895db2f31a61b8b585d48774f6385fed7b4e3ec5c185e5d73d394ab92a37e088e2f283f84661ac7bd41ea1c529 SHA512 7014b6c4371c5b46d1801df278f7ed82c36bb923ba402c64c5af9a2c71940757e2027fcacfb6e545f8ef488be2461194917ddd8b15a04d9e7e63916ba167f1ad
 MISC metadata.xml 606 BLAKE2B 6c92fbf6c8247fdaa5f1cdf29f58b91b8374d8b8b4785a408145584030dfd06ba939999626575ea97bd7fcd65c2774f4e0bee6844a00e0f1c28d89f8e117d79f SHA512 0d6b6503f8ac11ede082ac8a1ec267620d5e6cbdb151ebd20cd775e9b832e396c434e6ef6e843d13ceedb9cea7dae002e93564d823161f4ff845053699c3312a
diff --git a/dev-libs/double-conversion/double-conversion-3.0.0-r1.ebuild b/dev-libs/double-conversion/double-conversion-3.0.3.ebuild
index 786bdf2fd13a..b6d4355862fe 100644
--- a/dev-libs/double-conversion/double-conversion-3.0.0-r1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils multibuild
 
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/google/double-conversion"
 SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0/1"
+SLOT="0/2"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
@@ -46,7 +46,7 @@ src_install() {
 	myinstall() {
 		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_install
 		[[ ${MULTIBUILD_VARIANT} = static-libs ]] && \
-			dolib ${BUILD_DIR}/double-conversion/libdouble-conversion.a
+			dolib.a ${BUILD_DIR}/double-conversion/libdouble-conversion.a
 	}
 
 	multibuild_foreach_variant myinstall
diff --git a/dev-libs/eekboard/Manifest b/dev-libs/eekboard/Manifest
index 2eb3f53aa324..3014d94e136b 100644
--- a/dev-libs/eekboard/Manifest
+++ b/dev-libs/eekboard/Manifest
@@ -1,4 +1,4 @@
 AUX eekboard-vala.patch 971 BLAKE2B 61e8185b8946593bff928bf51e86e133c2e4b0880265a96a56da0fbb2792fba147a4aff605f9e73080fd0e41845805636b23dc4ba47378b5649aa2d73c4ea45a SHA512 0e33141e6e8bbdee661b12083e5e261b013a1c83603dd06ef93b5b9360d89153ff53225e1c8068ebccd5d92c3dfd1c439f7b0fb27ed5e8f21d9ca201c7db01fc
 DIST eekboard-1.0.8_p20121001.tar.gz 330923 BLAKE2B 74bc0a9e4d3bea73828020895726e12b986100812ff7260758a881899c7ff92dc706c6b7a57bc4d17a9524d1305658c8c29e441ba4b7b4b8023d8f2ddebc2d10 SHA512 3c6ccbaac55a4680ba4d2bd5d214b1738b7fb17f83b66b11621149b6f8a945eb6b39c47be51dfcf53f84317d860ae28b8f83e3071d5d4474fbcfbdc72f6e4c87
-EBUILD eekboard-1.0.8_p20121001.ebuild 1702 BLAKE2B 73a5be35c9b99f2c2eb3871524f01533572c946f61bf7bcf6bdc4772bbe7122ec255dd66133022bb1346d4b0847b2860eee096946c35a1a2c86c74ead0491559 SHA512 3614c5a5791c6bd9ec7d059678da944e7640ed84d4922be159fd37d7343c62e67136fdec4d88f4a24493899c004fca42fc7fb1bf5af09fcad3cfaef705d683a2
+EBUILD eekboard-1.0.8_p20121001.ebuild 1733 BLAKE2B f640cdf1e36c00d6c93eb151285abf1335b90a225fe9a1a5ad02868dfe0a1a77c45a600d9c45e3bc6f538ab33fe97c5018b07913a9786c50175c7042b467eb5a SHA512 818879306689613447fa6a84969010b51b4aa87d8514d4e96731ed9f01d96b46fe274837b890c95ef3ef33b67b82343158a18a93a3297cf8315e486b99b127f8
 MISC metadata.xml 678 BLAKE2B 18e1494e9a6761d511dfbb99dea84044838cb13974662f6244014647fc414dc4dca585549a44d534ed7d3a63a2b94c7bc4e5a533a817bb2b77194e1b4988b88e SHA512 6ae8cfdff8c6df95729329152c2d853301b2d795c1aa22fe0a45fe0d37c1e3b60339523e35fb58fcf90ca7ab82aea8061baf816f694f8fde25afa53ddc98f0e5
diff --git a/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild b/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild
index ca6e8505a0ab..08d074cafb78 100644
--- a/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild
+++ b/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools gnome2-utils ltprune python-any-r1 vala vcs-snapshot virtualx xdg-utils
+inherit autotools gnome2-utils python-any-r1 vala vcs-snapshot virtualx xdg-utils
 
 DESCRIPTION="An easy to use virtual keyboard toolkit"
 HOMEPAGE="https://github.com/ueno/eekboard"
@@ -31,6 +31,7 @@ RDEPEND="app-accessibility/at-spi2-core
 	xtest? ( x11-libs/libXtst )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	dev-util/glib-utils
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
 	dev-util/intltool
@@ -58,7 +59,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
 
 src_test() {
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 8fb014cbeb5b..db8c590f9988 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,6 +1,6 @@
 AUX efl-1.21.1-fix_evas_preload_segfault.patch 381 BLAKE2B a4b8afbe06cd44154a41766fcf12775369c2243325eab17647423a3d2b78cc3646361c0a4884de71fd876698defb9816f50343c46690b595c3701a6295a95040 SHA512 90901ab26915a6d2aba80deb610eb8bb873cd4cc7210888a4f062057891024d4e0b3f051be2fda39680d2267301251abbfbfc47072cb5c22ba6eba8f9d9567fc
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
-EBUILD efl-1.20.7-r2.ebuild 7802 BLAKE2B 537434c5ca8d4c5c8c61d3dc017df4bf64707888d7536bd6c2c607eec06d8131e256f1fa41ebc5d1dd1b29787c2927e338beee0cec8e52d4434e763180d7fe0c SHA512 9508f51fa6f028340c5c6d21e43c0df6f0bf6ff50744381b10aab4d3cdaff804fb187dbb72ec9a535253fdfb5e4fa3c09de8de8e6d17de76f04b6840010a9ae1
-EBUILD efl-1.21.1-r3.ebuild 6687 BLAKE2B 3b6cd48bd9c4186ce7c8b8928769eda0cccd9a9535d6311dd91266444c5011b773b3dcadec682b78f2131073a30312ad33718543c1a199ba5f13257e51392737 SHA512 2df46d9a38b32efece57ccf2e1e6e082b1dd8be6bda45edd9b7c2c3e4bc610c5d423aeb47c740b3f1738408b6f5cef9c3cbc88be112c75eaafdea46fd547f710
-MISC metadata.xml 2169 BLAKE2B 884096e54342ea876d8c6aaad16ac3f1928fbf2b791dcbf6ca5913fbc62800f63db5a1672a2b053f103e502fe581d6eaed7f978e02682f977688a3f038037b3f SHA512 2aa1f3dd9e121ec9f321329d4a209d671b8195cc1bdf41b70c4dfd3b0ba8a64c8b23231f11b3097023bfae013c49ded5eb1cfcafeeccd81ab81631757b8b2974
+EBUILD efl-1.20.7-r3.ebuild 7708 BLAKE2B d16c5185d86e88f6cf202ddf864c1608dc42f5c5e6c93f2b2100c69d587be3f88274b8dda345beabedd8d1118bfa3833cbbc0cb543c243f95015d820ff8a1c72 SHA512 dc55ff7bf0bb0d35194bb804679284ef2ea6fd290cd54cf3c85b1fbda4f325fbf617374b7bfb33fbd7311927c1f4939601b38c7109ffa92c49db12402edcb218
+EBUILD efl-1.21.1-r3.ebuild 6626 BLAKE2B 95e6afdf8d5975f2ec5966f9a788d4e10223f0c7f51a3585de5c91d25a651d7bdf7bf5462cfdd1d105d8e559a5a85eb2154cc8af2e7cffdaa6a95603268bb3dd SHA512 c4c9a93691c5372de96cb04bff37ad50c97696494991049fb8be976d94ad5a9c81cc2d25bf303f69bd98cfe79b42a76ede38f0bf0cef1906017d56e1a6e4e620
+MISC metadata.xml 2123 BLAKE2B 73aacd157b7dfc9bef846c985a550179c6fc2d479f578edbaeb11e005249c51bf73b94e8d6988cc1f4e9256f459f646f800389e9d0255b6d7c045763fc0efcfa SHA512 7125edb182fb323470e4604f0829ea635b1eaa966100b767427c5dd43ffeb6a99f9183512b739d18a47d070e3c3d9a7bcc667100d73bed3f642ccf53e3a0d3ad
diff --git a/dev-libs/efl/efl-1.20.7-r2.ebuild b/dev-libs/efl/efl-1.20.7-r3.ebuild
index beecaff39a29..eb9d5b8d1fa2 100644
--- a/dev-libs/efl/efl-1.20.7-r2.ebuild
+++ b/dev-libs/efl/efl-1.20.7-r3.ebuild
@@ -12,24 +12,21 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="avahi +bmp dds connman debug doc drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
+IUSE="avahi +bmp dds connman debug doc drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent"
 
 REQUIRED_USE="
-	?? ( opengl egl )
-	?? ( opengl gles )
-	egl ( gles )
+	?? ( gles2 opengl )
 	fbcon? ( !tslib )
-	gles? (
-		|| ( X wayland )
+	gles2? (
+		|| ( wayland X )
 		!sdl
-		egl
 	)
 	ibus? ( glib )
 	opengl? ( X )
 	pulseaudio? ( sound )
 	sdl? ( opengl )
-	vnc? ( X fbcon )
-	wayland? ( egl gles !opengl )
+	vnc? ( fbcon X )
+	wayland? ( gles2 !opengl )
 	xim? ( X )
 "
 
@@ -47,12 +44,11 @@ COMMON_DEPEND="
 		x11-libs/libdrm
 		x11-libs/libxkbcommon
 	)
-	egl? ( media-libs/mesa[egl] )
 	fontconfig? ( media-libs/fontconfig )
 	fribidi? ( dev-libs/fribidi )
 	gif? ( media-libs/giflib:= )
 	glib? ( dev-libs/glib:2 )
-	gles? ( media-libs/mesa[gles2] )
+	gles2? ( media-libs/mesa[egl,gles2] )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -119,7 +115,7 @@ COMMON_DEPEND="
 			x11-libs/libXrender
 			virtual/opengl
 		)
-		gles? (
+		gles2? (
 			x11-libs/libX11
 			x11-libs/libXrender
 			virtual/opengl
@@ -174,6 +170,7 @@ src_configure() {
 		--enable-libmount
 		--enable-xinput2
 
+		--disable-eglfs
 		--disable-gesture
 		--disable-gstreamer
 		--disable-image-loader-tgv
@@ -188,12 +185,12 @@ src_configure() {
 		$(use_enable drm elput)
 		$(use_enable doc)
 		$(use_enable eet image-loader-eet)
-		$(use_enable egl)
 		$(use_enable examples always-build-examples)
 		$(use_enable fbcon fb)
 		$(use_enable fontconfig)
 		$(use_enable fribidi)
 		$(use_enable gif image-loader-gif)
+		$(use_enable gles2 egl)
 		$(use_enable gstreamer gstreamer1)
 		$(use_enable harfbuzz)
 		$(use_enable hyphen)
@@ -249,13 +246,12 @@ src_configure() {
 		$(use_with X x)
 	)
 
-	use fbcon && use egl &&	myconf+=( --enable-eglfs )
 	use drm && use wayland && myconf+=( --enable-gl-drm )
 	use X && use xpresent && myconf+=( --enable-xpresent )
 
 	if use opengl ; then
 		myconf+=( --with-opengl=full )
-	elif use egl ; then
+	elif use gles2 ; then
 		myconf+=( --with-opengl=es )
 	elif use drm && use wayland ; then
 		myconf+=( --with-opengl=es )
diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild
index a2bedffdb459..5d7865140e86 100644
--- a/dev-libs/efl/efl-1.21.1-r3.ebuild
+++ b/dev-libs/efl/efl-1.21.1-r3.ebuild
@@ -12,24 +12,21 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
+IUSE="+bmp dds connman debug drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
 
 REQUIRED_USE="
-	?? ( opengl egl )
-	?? ( opengl gles )
-	egl? ( gles )
+	?? ( gles2 opengl )
 	fbcon? ( !tslib )
-	gles? (
-		|| ( X wayland )
+	gles2? (
+		|| ( wayland X )
 		!sdl
-		egl
 	)
 	ibus? ( glib )
 	opengl? ( X )
 	pulseaudio? ( sound )
 	sdl? ( opengl )
-	vnc? ( X fbcon )
-	wayland? ( egl gles !opengl )
+	vnc? ( fbcon X )
+	wayland? ( gles2 !opengl )
 	xim? ( X )
 	xpresent? ( X )
 "
@@ -48,11 +45,10 @@ RDEPEND="
 		x11-libs/libdrm
 		x11-libs/libxkbcommon
 	)
-	egl? ( media-libs/mesa[egl] )
 	fontconfig? ( media-libs/fontconfig )
 	fribidi? ( dev-libs/fribidi )
 	gif? ( media-libs/giflib:= )
-	gles? ( media-libs/mesa[gles2] )
+	gles2? ( media-libs/mesa[egl,gles2] )
 	glib? ( dev-libs/glib:2 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
@@ -115,7 +111,7 @@ RDEPEND="
 		x11-libs/libXrender
 		x11-libs/libXtst
 		x11-libs/libXScrnSaver
-		gles? (
+		gles2? (
 			x11-libs/libX11
 			x11-libs/libXrender
 			virtual/opengl
@@ -177,12 +173,12 @@ src_configure() {
 		$(use_enable drm)
 		$(use_enable drm elput)
 		$(use_enable eet image-loader-eet)
-		$(use_enable egl)
 		$(use_enable examples always-build-examples)
 		$(use_enable fbcon fb)
 		$(use_enable fontconfig)
 		$(use_enable fribidi)
 		$(use_enable gif image-loader-gif)
+		$(use_enable gles2 egl)
 		$(use_enable gstreamer gstreamer1)
 		$(use_enable harfbuzz)
 		$(use_enable hyphen)
@@ -237,7 +233,7 @@ src_configure() {
 
 	if use opengl ; then
 		myconf+=( --with-opengl=full )
-	elif use egl ; then
+	elif use gles2 ; then
 		myconf+=( --with-opengl=es )
 	elif use drm && use wayland ; then
 		myconf+=( --with-opengl=es )
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 9a89497c2f4d..f3a7227c4bbb 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -13,9 +13,8 @@
 		<flag name="dds">Enable DDS image loader</flag>
 		<flag name="drm">Enable DRM engine</flag>
 		<flag name="eet">Enable Eet image loader</flag>
-		<flag name="egl">Enable EGL rendering</flag>
 		<flag name="fribidi">Enable bidirectional text support</flag>
-		<flag name="gles">Enable the OpenGL ES GL implementation</flag>
+		<flag name="gles2">Enable the OpenGL ES GL implementation</flag>
 		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag>
 		<flag name="harfbuzz">Enable complex text shaping and layout support</flag>
 		<flag name="hyphen">Enable text hyphenation support</flag>
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 6087cd80c2d4..ecf6b2ffdb77 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,10 +1,11 @@
 AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b3324f57a5db8a13b8d618c75239d339f01c0f0a13bc87c1988e9ff05e92bfd69b0bbce0f5260a3bbb9d38b9d000ac809818 SHA512 ce542011f6ea4398455e418a8eae06508407e975e179306ffca5e3e9702583ff9f5e6010ee2e25d098b7f396c361029c932cd0c40ba3d910d9fb60c97f07f50c
 AUX elfutils-0.173-partial-core.patch 1271 BLAKE2B e8c499676c41bcda97db927a4df2e55a89d931306f3336d289c4235009d473920022455caa8dd4f69848201f23e68d99ac877c65b684f7386fb0660a4f274e25 SHA512 0b6d257e2ae702e3f9d0404a4dea2883b56d521794e5c812f18fe0b2b4deb0af2b15e84b5857901d96f014797e515831768206a1dda2dca3912bb15d2d844bdb
+AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b16fdf6bc203ed2cde70b0da80d982dc3493c993532492cdb8f597b66fd38ebedf7517403096c1704d77f7541972d875af2b952cad3586751bb SHA512 d3263c42b1638a416e95c2b8e68b15a9723e748490c8eca727da94bf7bb3dd8389222dd01bf69612ba45a20114ee1427d77935c41436d1ca9180fcfd71d3cdfe
 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
 DIST elfutils-0.173.tar.bz2 8684782 BLAKE2B c5905bb864059bdfb2699a0681a0ec576b6b8da444b0641e8184f58735084588910930bcca14583db6be75b24a0e374413911ded5ba2ca893798404fbe7374eb SHA512 7f38e4ce2098b685f15030bf01f0a66a74aa32fbfcead0304c1d0e0a929b348a72f99e685cd4605465f4337393382112f64b8847e6c2f7cc1a57a4fd03d03eb3
 DIST elfutils-0.175.tar.bz2 8786600 BLAKE2B d6d4ade37741da788c6c2eec9688c6f8ac9707e0b17e0518398972dab3cf77a70cc82346c2e37b41f0ea414b9a1e925a7567567fcf43d504d75c92971ab25f5d SHA512 2c3168a34bbc8f22425faa263fc24ec50df39258a4f9ace4e6cd88e9764c435fee70c1a82db8273dbab70a75e5216a200bebf05af1d3ea77e444e35d71a4ed84
 EBUILD elfutils-0.170-r1.ebuild 1790 BLAKE2B 2581434109a567bc3c57d6ebaf6b1416377d2fbfcc1cadc51efbefa02caab505dcdfa22e58b33c80ce37637c5abb1559ebdb117999eb5f552095f85da8f0dafc SHA512 22d72fdb2e2c1e8d4e1d47113a8c0d6aeb2e8e7b9f0759d445e32509c7bce9cc6dc8edd38e12ffa556447981fc60c7a04df76fd6d529b79d07d28cb10314f6ce
 EBUILD elfutils-0.173-r1.ebuild 1859 BLAKE2B 56ee16d685c6cf7cdd9e0caa995c6d3df78b7681028d3ac52f792daf54d16283833663342666c313dba744764e668b91b1bb35ecd11df70da876700572c57a99 SHA512 33886b083eb9b5a7126e2fa02ab38851aaa97e742a9139fae11b3a0fa6dc02d4d8f431df1e6022baf3dfa768915828f47df79b37f10bebb6927de16430767a95
 EBUILD elfutils-0.173.ebuild 1813 BLAKE2B e364165c42a078dfeea283efdd0268261a57862dcd98f26f10c363edb54f1c12990148b9ac2d6c1170e719e81c902953f1212d4a43a61d5fb6839205ac836190 SHA512 21afb93206de176856703f5ba64ba990a108160e004f66251a3557b110063414cc4d9b90558ea2be6c38b676fbd15b9cb5f03b49681ac52d723dd7ee6add14a4
-EBUILD elfutils-0.175-r1.ebuild 1893 BLAKE2B 21fe5dd072de314eaa91657842e0cdb8cea06af21fcab465e4960f45af79ebbfa0a11d806e4a59a4646c31246084878c63d867d71471a76ec81eea41f094d031 SHA512 6fd470ae37061cc13c3446decd1f7fa138358d8956dd8d315702d466bcaec6b5384f8d9739b8b1b39cae6abf2837eb204c535d19042bda8b589499d280af5d71
+EBUILD elfutils-0.175-r1.ebuild 1954 BLAKE2B b4e6aec7008d866b1f0060908cfcf9b1d6b239162d16108e08a7e7e16f4d735c0db19a5ecac2e697e0f3360dad9e441b2266ac3baac8f6849669ebbd3f8db53e SHA512 d3b4faefebb70143d4f5ba2559910206ef0ae6abe232f57b94affc65d57beb157ca7e682710410ecf4941911bd92a94995f6d454496922797cc03570a4af7a6c
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.175-r1.ebuild b/dev-libs/elfutils/elfutils-0.175-r1.ebuild
index ad1c1988b467..458b215bbe7a 100644
--- a/dev-libs/elfutils/elfutils-0.175-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.175-r1.ebuild
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
 	"${FILESDIR}"/${PN}-0.173-partial-core.patch
+	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/elfutils/files/elfutils-0.175-disable-biarch-test-PR24158.patch b/dev-libs/elfutils/files/elfutils-0.175-disable-biarch-test-PR24158.patch
new file mode 100644
index 000000000000..809c3df1efad
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.175-disable-biarch-test-PR24158.patch
@@ -0,0 +1,9 @@
+https://sourceware.org/PR24158
+
+Tets fails when 32-bit elfutils tries to dump 64-bit process.
+--- a/tests/run-backtrace-native-biarch.sh
++++ b/tests/run-backtrace-native-biarch.sh
+@@ -17,2 +17,3 @@
+ 
++ELFUTILS_DISABLE_BIARCH=yes # https://sourceware.org/PR24158
+ if test -n "$ELFUTILS_DISABLE_BIARCH"; then
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 052e7811f5f2..70a911f8b303 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,7 +1,7 @@
-DIST ell-0.15.tar.xz 403812 BLAKE2B 428e999a1d761a97f5ed26c080e40d6c0f8297ed373d31721200d37141249f6b5aa57005689d85c92531c33e067840b130e3ce41a9fd4b05e25d49f978278dc7 SHA512 42ba7a6049b4751ee8876dbb26caf8289541e68079314ec299e83c97acc546eadb5254d35e354468d906b4185fd6f08b22f2979d5f0f20321135055b38b26fc4
 DIST ell-0.16.tar.xz 409716 BLAKE2B 64dddac470f7de3384886a8790fcf429b7a254e86c22b50fd4045c551aa0d8d7569f93c8d8b5b472f880fb87fa6ce9830a544b83ae237774e5f8236a1bf1b033 SHA512 bf2b4c8b50841ce8eb5e90ab9fd76f0e8fa1993e7dab0a45a50c21f33537fd110f0bbf1326c6e4cefeb6b95b8db5874c2802ec957b47173fe3681f2522fa5816
+DIST ell-0.17.tar.xz 434024 BLAKE2B 1e6b1917d897eeb4d1308db388accad26077ec1f39b9fdd5fea7c79926d5b3eaa51178d0af9089a2614225f26188fc2c380ec5b1116c321658edac9a4c0573be SHA512 5ca82bf3dbfacb7770fe1132ec3d93d7ebd139f1781157f1def8d810b21c84b212c555c981f7b80152e49e0da0a82b46fbd6322aadc25c56f26c21065a8886ef
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
-EBUILD ell-0.15.ebuild 774 BLAKE2B 0aad3afe87ad07413b33bf1b37c3b10db5c54ea14a07702fb8291556c70dfceafe20c07e0ca9ff3940afa4b305f2d1cdbf27191a557bafeceed36b028303eb9d SHA512 bb9f7f5041ba54bb900a42f783ae2359fd2237d9c8facd22c3f9c246810d3cff436b522c7e85066f9257ca787fe6dead888378db1c1e1a47084e14214d51c679
 EBUILD ell-0.16.ebuild 774 BLAKE2B 0aad3afe87ad07413b33bf1b37c3b10db5c54ea14a07702fb8291556c70dfceafe20c07e0ca9ff3940afa4b305f2d1cdbf27191a557bafeceed36b028303eb9d SHA512 bb9f7f5041ba54bb900a42f783ae2359fd2237d9c8facd22c3f9c246810d3cff436b522c7e85066f9257ca787fe6dead888378db1c1e1a47084e14214d51c679
+EBUILD ell-0.17.ebuild 774 BLAKE2B f92c9b7ac03abd049655085e45162b952fd75a5b8f8918d91117a6b52041e3fcc9dad07bc2ae907deaa4518439e53817bc31e1bba5d1a69520318ae374e8de8b SHA512 9b249cfab84d7178cb78cc0d830b27d3e1e11906d2e501a5ccb311477c2b5540b1215931562f2d3926be0f2eaa06d3714e7354ac5c96ff14fe2dc563f32f9967
 EBUILD ell-0.9.ebuild 768 BLAKE2B 1d8bb3eb2ac59821d47058c5d6e3244db2b66240710b2c2bbd2b27715b9f48740f91ca58cab9749890b82231a461ed60875cb4ca8b8e6015fd917262e819b334 SHA512 c2313d3629b3ea728432e28b6a2a94d57237b062d659cc6ee2b7e6097da03ccff3afb2a34e556c9b259daf18ea8fed6a23862bdd576adc8b0eda9a985367313f
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.15.ebuild b/dev-libs/ell/ell-0.17.ebuild
index 69fc97dbb17b..233c824d182c 100644
--- a/dev-libs/ell/ell-0.15.ebuild
+++ b/dev-libs/ell/ell-0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 9f559b6e5946..6a4a5967fabf 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -8,5 +8,5 @@ DIST expat-2.2.6.tar.bz2 513322 BLAKE2B 386736da1f2204fa8f15ee4d1b3d11f01ed691ef
 EBUILD expat-2.2.1.ebuild 2198 BLAKE2B de5700f2f068344861ec29ae0eefd66340f5f9494cdeecbb4ab58cf37ff0f8bc85032dcc8e2cc0d079dff39bf757401f9cab532fd327bc6fc8c4ca0a48f0eb39 SHA512 5a1a6fa5cdce7a89122803bb03af3f2958a2f34bb23d9b2daca749ccef3b864bab8b52fb3300d90d497cc24e3b70af4f767ea1fbdd9d8a871efe494e965936f4
 EBUILD expat-2.2.4.ebuild 2398 BLAKE2B 74b30d474290b5483f3d5f10784ca37ddfa0888cf1e455a8137eb118389af12dd8327a56d42b1a36c7dd71e88ccbbc3c21e301464452973879392cbbeceac2e2 SHA512 3f5b4d64c156ca1cc4003bc4c9e6dc0d73ac7dec967691129039054f019b4997910719347ffdb780ee7adf9509e89b936dbdfa514d34badce4e3e7965c17f1f3
 EBUILD expat-2.2.5.ebuild 2455 BLAKE2B 17c00af701f3ec4ceab16e48247abbc23febe01271cc1ec8cae8d1a45d38d194d12959d98b8339907dde57456e84aee385ae11c5712c8787745b63fda21101f1 SHA512 37ea03cdbd79fa0e1b01e953b1f07cff067968ff3885745fa2269a23daccb1f495f3afd5b6950fd244614b094232b9c38842812dc7ae6415e186e7bffb6e335e
-EBUILD expat-2.2.6.ebuild 2459 BLAKE2B 0816e83c7937d081a7346588e5f1205f0532307d795b60ce83f6ca7dd2078edccbf0c9344ce06c59ad7248136ca377872dac5efa39ce68a7734fe15d478925a6 SHA512 1a9515a52177317fdd4df37d38373f0b2e3914bc26233ee70f355034c55be09310e58bf52a199bc189497fda9ea73eb6ca959c6e9dd12f2c047e3b8b8b498c45
+EBUILD expat-2.2.6.ebuild 2453 BLAKE2B bfd977c7eca4b48a3d8cce2780959e4b4469019cc46da7216d0082dfd3a950601ff88a26560ac4ff94807a5a8e6dadeb7e73c95f90cb653487709fb0c1b9959e SHA512 1c44e5f08a10d9de6823e627c44f71ae9c6d75d74d11ba1db5f63ab383cb4096e5723092686cfd832f9e551b1285d6572f34ffa507c0c9301d3c39f4a50a4a02
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.6.ebuild b/dev-libs/expat/expat-2.2.6.ebuild
index 04eac1c90df7..9a38ba1b81fe 100644
--- a/dev-libs/expat/expat-2.2.6.ebuild
+++ b/dev-libs/expat/expat-2.2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 RDEPEND=""
diff --git a/dev-libs/faxpp/Manifest b/dev-libs/faxpp/Manifest
index b4cfb4a2fc8e..65dfbfad7f2e 100644
--- a/dev-libs/faxpp/Manifest
+++ b/dev-libs/faxpp/Manifest
@@ -1,3 +1,4 @@
 DIST faxpp-0.4.tar.gz 512740 BLAKE2B 922c0fe6092517c6d4fa6d1cc7169bce7d97b873c49e3d6a776174e43cfc72bcd5f38b1baf8cee4239aecfd7820a3e6b0594a1fa94e4a45392ac2cf0d6889dbd SHA512 25b871a6419b70d9ee85817cda267dfff7ed8aa99a031493a6ccaf1faed80e113ceb7407df1629958d7841c73ba3bee760af9f595dd71648d853561e8c8f33d8
+EBUILD faxpp-0.4-r1.ebuild 515 BLAKE2B 7cdec46e7b0c45139cb858c2c5e588504a483265aed0e86329c827ad2e66aa21b55744e2fe8ba1cff7484a2b37252c60321333823fa16bfcfbaa3c30609fbbb5 SHA512 c54c64eab185d287e6975a4cfa72853b9eef3acdaaaa17035aba8b0c74c26275dc5c565ac712589bcaac88ba4124806d6c7ac2f4cc969fde8fbb6842124a31e8
 EBUILD faxpp-0.4.ebuild 583 BLAKE2B 51975e7c5779fd95b901d095181082c3f33461f6a719e302a758f133e39c29591435056539780dc2e132d5dfc537aa63c278af845a92e2053e30998f85bb63c7 SHA512 bdbb777c0a805ed8ec8026a8f05059af01dac7698f70f25fa8443054c36001f2eb8a9404ec52c186bc8ddd3bbe714520427d2fabf386d9c6bbd7891f4cc49dc5
 MISC metadata.xml 325 BLAKE2B e4c5e516748c44d4fc9faf43f18b2f229ea0fd6d4da71de12f251d6e47be296b6d08088b4c42fd45356ec939a59ce55f90480aac196bbc01246bfee57782c078 SHA512 9dc47c5ac852f0e4c49f8a909b3b4647a01bdb99b10bdf29ac7e588bba8bfb7d70b9ce273e0067a1382fffba239590c15b601d7d5d5ec8362dca35d27bbf7cb1
diff --git a/dev-libs/faxpp/faxpp-0.4-r1.ebuild b/dev-libs/faxpp/faxpp-0.4-r1.ebuild
new file mode 100644
index 000000000000..70d50bbaeaaf
--- /dev/null
+++ b/dev-libs/faxpp/faxpp-0.4-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small, fast and conformant XML pull parser written in C"
+HOMEPAGE="http://faxpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+src_install() {
+	default
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/api/
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 318270ea4f34..8321fd514944 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,5 +1,5 @@
 DIST fstrm-0.2.0.tar.gz 434627 BLAKE2B df3d3994adf0f7f2ee734dbd4e20fa4fd5ec8856b8127b172412dfd091f2640e3c2df3d5a65063a8f24c6a1ea83ecbf13f826e5e533c9b9d9d67488ea8e2bc1a SHA512 4425c3aa57f7c87dfa2a5cc6e3c9b7f8e293086c2092b57b5d227b13dba3ec23cb8460abbfaf153b2f3a27c6a613e31e7a805948cbc5d567707880f353453f42
 DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d
 EBUILD fstrm-0.2.0-r1.ebuild 660 BLAKE2B ff68979e48965fdf68accfd789018844571ab94bbbb4149217b5d8dc0559132761de84986861a859b033afe3c1a752068240bfcc3dbe0e5e10b0ef2756a871fe SHA512 240ef2fe6a8c900bdf5f9cd8d6e157b62ee2f37e186d1349f5f5773d2ec1c964993ace19b05466914fd39f250c9c0c26936e82342a406dfcd2f27d39630d6dde
-EBUILD fstrm-0.3.0.ebuild 816 BLAKE2B 73312356287d22de30f5e63a2ef9b1f643be374e66c390369ce37af0fe8bd4c532d2e5720ed75714c80110b18b229534b91291cb54788a8d5b97a697030c09c1 SHA512 3cb65688d4abb9f6327fac1a32eed35dca891af461792d8ed656226acc4e147de7f64b8fbe84b70e1a7c52b0fcc0002bd643364f65ffbc59aad23b6fde3ff39b
+EBUILD fstrm-0.3.0.ebuild 813 BLAKE2B 9597b380500da21f858c8c1072ecb262ee1a2b836ef46e1f9d2c73254d10d70172b73c3faef32da8ca7d4220e8c2a3512ef1026d30b08c13b2c6ea033e11cc1b SHA512 3f6ab47d8adeeb5e59c25b8c2c0acd1e13ee97f389ae25c11da1f3c9f241670fc17e7233245a225e0ac6f1006705c68f1621c740851b556173562de65d8bb075
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.3.0.ebuild b/dev-libs/fstrm/fstrm-0.3.0.ebuild
index 5702ce419c51..1c8d4486dbce 100644
--- a/dev-libs/fstrm/fstrm-0.3.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/farsightsec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc ~x86"
 IUSE="static-libs utils"
 
 RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 5d48addacafb..9d2859e519da 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,6 @@
 DIST girara-0.3.1.tar.xz 58148 BLAKE2B 7945ca0b417bf09a37f4ce7cc6603adc93cd224d7e449c7f4dae00a4abf254b251230fb40e2f985c293bad95c0bd05ff646418bb5f8e0a1c6d5d2df832900256 SHA512 5c4b2972bfb0296cd1b984c9426b67b50e29e2928fb0e9a3aa3f9bc21aebc28dcc93570e888060e0bb02561022b379cdfcfa3317b52e78cac04e7fc1ba476107
 DIST girara-0.3.2.tar.xz 58220 BLAKE2B d5962a2c8425ab49a23a08d9e2e3db44ca5d721f978070c221cbbf0bf5e16fba9121911d932607e14350abe0e6190e74412c52ea7ccbf24f0159721485170e97 SHA512 ce8b1498c2c5e278a4689f945e6773cbf19b3357711636bbe785d96c8d381cf8ba457268ca154f7bd48b06d79cc03296d2e4350784299a13c4972030bcb0dbed
-EBUILD girara-0.3.1.ebuild 1085 BLAKE2B 03b0b6355af3d1d3233bb2289715e3ca201e3b3ca0d4831fbf6d427fb07cf699294dc644d7f8815b164407339cab07de5b3952134148721bc56f2d0e3f7d402e SHA512 7f99122c66d8112cd04411cdaef5ef9071dd9de9857f51fab19328b262c768ed8e300cde29c331cdbc42679fac45850ac737bc465b669cef51cb6a9630f6211a
-EBUILD girara-0.3.2.ebuild 1082 BLAKE2B 8709b67144704ec4e983dda63726f54320bc0f1808bcb0d3339adaba00172dc6d52c1996419f0505f9c5277e3f798cf477f0aa3c07deda30f0a4fb2248bf93f3 SHA512 df87801a37c5369ddcb4143c0a92bc7c1a68ba3339c4768dbdbb6395617f7eb7f9a4b314036263bffe08f4c88b7fa66673a1b296c7388cd2bc6b832234932e7b
-EBUILD girara-9999.ebuild 1088 BLAKE2B d8a7b3d6df62bd55c8986aa7ad8211a9b724bce56564fea857119707ffbac4f0ddf4c22bf2f789d140ff743807db14a69d7b6e597513f3cb2ceebbddd1a9c685 SHA512 73978f226c851a22414e3d5a5be70a0315acf4acaa995e30ea03a393beef3cf8533937225e6262297ab39f7095129421c97904c8439b15b4510fe04f85388a3a
+EBUILD girara-0.3.1.ebuild 1055 BLAKE2B 31476edfd1e68fc846b2eb339d098d82dbb2fb04d8751b57568661b357d1016b44abafe5a8fe6871120d4807dfd6415da5187b4a00ba98801d6c01eb1912b835 SHA512 1c5f4296473db9674a97be80f7bbd8ec697230853196d175ddf542fc96e2ba215c28f60a1475798c5bcb92eff220cc888eaf458b33d05190a03cac8035f390bc
+EBUILD girara-0.3.2.ebuild 1052 BLAKE2B 9adcdb00508e3c0ca9936d3bc1bb4c35ff8261cec4f8ce082ac283f6cee5e1290f9bd51972bb7560dc1fc71e7b5cded916913b6a71cb0008a9607967bcd6b290 SHA512 97918c6739a71a2a90eed64ba71bbf2d4b537230a510a1fc22bcc62afc16be8bf900ba18256a856f225c6f42c3022d49b8ee9b2fb90a4f83fa0854eb2f26026f
+EBUILD girara-9999.ebuild 1058 BLAKE2B 3d2cec206425a1d8e392b5012d3328f7667fa2070c1b485377411de87ea5bc3a23463f0df76363178a435dc5958d6de93000cf21b68b43121052d90e3fce93f4 SHA512 b1e88ec6fb934ffc3e3c5d85e0e514aaf18d7fb20b591ef5ec08972bf64a34d3e8959c1c2c74936510f950cf2d30fa0f1566e56dad522c784d257f4ce3b6000e
 MISC metadata.xml 661 BLAKE2B 23e1208a22b54c7301973769a1b00adc8a2bc79cc7c4e5743e4bfd4f8e99933842466aa853510156f14020657954f35d89466888f03e515e9dbb00bd948845a4 SHA512 fb995def4c0b05dcc8bfc77ced8283bbc8e872586f7eed834291510f037215480fa38cdd4a4ff930337ef3e759e65ab55b417e531c8ff0c058c93cd15b630f59
diff --git a/dev-libs/girara/girara-0.3.1.ebuild b/dev-libs/girara/girara-0.3.1.ebuild
index 9cb982d862bd..46f9c356cc93 100644
--- a/dev-libs/girara/girara-0.3.1.ebuild
+++ b/dev-libs/girara/girara-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,6 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		--libdir=/usr/$(get_libdir)
 		-Denable-json=true
 		-Denable-docs=$(usex doc true false)
 		-Denable-notify=$(usex libnotify true false)
diff --git a/dev-libs/girara/girara-0.3.2.ebuild b/dev-libs/girara/girara-0.3.2.ebuild
index c5a83d64ff82..79deec03fde4 100644
--- a/dev-libs/girara/girara-0.3.2.ebuild
+++ b/dev-libs/girara/girara-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,6 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		--libdir=/usr/$(get_libdir)
 		-Djson=enabled
 		-Ddocs=$(usex doc enabled disabled)
 		-Dnotify=$(usex libnotify enabled disabled)
diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild
index 6a933684b7c9..a650dd0c40b7 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,6 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		--libdir=/usr/$(get_libdir)
 		-Denable-json=true
 		-Denable-docs=$(usex doc true false)
 		-Denable-notify=$(usex libnotify true false)
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index bb862cf22cce..b7f9cb07be1d 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -8,5 +8,5 @@ DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b4
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 EBUILD glib-2.56.4.ebuild 9947 BLAKE2B 50af8725895ea42d6999c4de74a08f4cd65cd96d9320aa31eed39e2fcd474ee6ae58a5846df34abf6703bd7111ba0eefbe4293e860bc2386433a680e90846a2c SHA512 650dc7e115ed3f7e857e4bc180849c2ddf05a206a8090bcad21988e83fcfbc387ea25d3ae7f7bcaa051c22e12bd2ed2a33057ac586beefda55b13239f2613179
 EBUILD glib-2.58.2.ebuild 10788 BLAKE2B d264b9ecc154bdb41593bbe1c9c32181499be6edad3660113dc98f5b252eb5a701854eca9822549d0d767066c594f6f771fa0391e495589a74309a8ca4a14f4a SHA512 4af70f9db60e55918e29c4e6af7e373a9532276fd061c77b91ba66b96cc61d10978aa8e47abdd76d225706a0c12d8aa2e645a4c2c403557514dc22862e93d0d3
-EBUILD glib-2.58.3.ebuild 10685 BLAKE2B df6e4e0b6e55bf338aaf4099c17af4cdafe654fb964745495ae7d2d85d15b0306f798d04889d96ad7d40be6886b3ee8d08c8b09ab1abe4519d7a08e7a033d524 SHA512 23b454fc70fa6e8a85c609ff0cb5754f04312b07c15eb372b7848dc15c435d338fee7ca8787555d81bb4221a341045dd891031013d6f15acbc42125758253602
+EBUILD glib-2.58.3.ebuild 10683 BLAKE2B 42e44abeb4242f123fc616efbdda0c0c3b8c764dd7d3ae4d6364077d9d7ec96e5f6c54af57457c32544bf014aba7934276972bc7e8e480756226bfd074b31bd4 SHA512 dc7655343e9942dd0669b7544b32b93a0e58cc4dae469cfd29ff40d5aab0ac0850e9d0c3357db74ef2cb21cee9b8888f545a24b5c8cbd1300bbc80ea84c34058
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.58.3.ebuild b/dev-libs/glib/glib-2.58.3.ebuild
index a75e06def721..f84f8175e68a 100644
--- a/dev-libs/glib/glib-2.58.3.ebuild
+++ b/dev-libs/glib/glib-2.58.3.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 91ba27807cde..709b20e8b790 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -7,5 +7,5 @@ DIST gmp-6.1.2.tar.xz 1946336 BLAKE2B 2a864e80799471037a71c10d871f9782c37fe3a0a1
 DIST gmp-man-6.1.2.pdf 825720 BLAKE2B b96340da5f534353b140b361fc1ff74757168024e8039d97a0ed1f14d874ff5fbc50abae2ff3505adc51d72e4acf2882ae6ca6405ae37b594f7b248e1ca05247 SHA512 85de10b2c03f7381881c3e95aa7fc53d8e018115028496ffbb5a79ab4967106c69ed7e97a5e434e6bb39752498aade8c2caa7cf77a8942b7ffd9150368a0d9c3
 EBUILD gmp-4.3.2-r1.ebuild 1699 BLAKE2B 7f600a9d920bf53a0de5954675d3cf72738ab7f74f2e552b0fbbcf3ec891835153ac6e3b5d0180171fc0356d9b9b1384882d9c4fc13b2d1e03c79b53b8c3d312 SHA512 2df5767cb8e4ae67f0264ad5cdd99888ec465774ddd079c9bc6648058138a28dbe4203552233c62ee02b7b2c6ccf2747ec70d2d078dba1528ffca7fae2fb40b6
 EBUILD gmp-6.1.2-r1.ebuild 2958 BLAKE2B de0265f9c529f831d2ca59ae5a639193038ce0b2536eb47a1dc71ca7be3914115f1241806cc2ddf0017676674968dd3ae492eda449581a9ffb46f764a41364ba SHA512 554f7ce0602cbde43f7a731ab2e40d3ba11509f4f0664b362abb0fe285d7c1be5d824133e01591bca5a5693b2874761413411c16fe8740aa3cc2b4e2209b63cb
-EBUILD gmp-6.1.2.ebuild 3280 BLAKE2B a16ae5ff9ceeaa79202cd447e64257862d9f551514a44902c5d5f3b4f3698f1c6137b50eecd513ae3f08b40baf52fbfbc839f3bd00e29c1ffbd5d8b56f039f69 SHA512 ec377c3d66be37a5232fc431039fb38672ff6200d24a8c1d780effbb2da1c6f336f478781a5f01af9d67e59f5657cfb22485e67632fe051356fc21f8f76582ea
-MISC metadata.xml 501 BLAKE2B f72cb10582beb651fddf6d5abe85920d6f8c9d7a87b82e6778a641bc75202213432105da5cfefbdcd9d343180cca7f2f56638f27c9e059d68afa92d6ee0d6665 SHA512 bde33c241d1e7026e86e7a445bcd929f8a2f6d2dc7a0e71994f2130459910a0ac51d6d3d8cad0fd45baea0d0a38c818348d2427035ef393ac6343ee993c95dd7
+EBUILD gmp-6.1.2.ebuild 3034 BLAKE2B 5de624947cbaa0b8edcc8e79312ae08f5fee41a1fbd31534cd13df246f9ec833142bc5e47501bc0d3da913763481328c83f84942bcb5380ba7ba87d30c5bb382 SHA512 874fb4368d5685dadafc758bd657bd60677207f0d9316ea5ef978acb26a7158e14fd6df5599aeb05dcff0094ca4b66201a09930639737f35eb11947853fd1d96
+MISC metadata.xml 361 BLAKE2B bde6f7cbb7a65e5ac80991eff4a8498b28242b5555ba0ea57718eb47df9f9e5cc681f5ebc047ca1a7bf87fa701e945050dd0a84aac02dabd9bfe5cd8d18393ca SHA512 f78bce3229fea097143ee33259707e6fa9da3adc03b4f10f8881be0f8e772df87a590c0d5a9e37e81a98d955bad63182d4bd5c18467e8f03557de412c18fd86f
diff --git a/dev-libs/gmp/gmp-6.1.2.ebuild b/dev-libs/gmp/gmp-6.1.2.ebuild
index 6481d95238be..f7a77a47e8ca 100644
--- a/dev-libs/gmp/gmp-6.1.2.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,7 +19,7 @@ LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc cxx pgo static-libs"
+IUSE="+asm doc cxx static-libs"
 
 DEPEND="sys-devel/m4
 	app-arch/xz-utils"
@@ -53,6 +53,7 @@ src_prepare() {
 	EOF
 	# Patches to original configure might have lost the +x bit.
 	chmod a+rx configure{,.wrapped}
+	epatch_user
 }
 
 multilib_src_configure() {
@@ -86,17 +87,6 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	emake
-
-	if use pgo ; then
-		emake -j1 -C tune tuneup
-		ebegin "Trying to generate tuned data"
-		./tune/tuneup | tee gmp.mparam.h.new
-		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
-			mv gmp.mparam.h.new gmp-mparam.h || die
-			emake clean
-			emake
-		fi
-	fi
 }
 
 multilib_src_test() {
diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
index 02ee38fa71f9..5fa58802c03b 100644
--- a/dev-libs/gmp/metadata.xml
+++ b/dev-libs/gmp/metadata.xml
@@ -7,6 +7,5 @@
 </maintainer>
 <use>
 	<flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag>
-	<flag name="pgo">After building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 57d035f66518..0ade55a0adaa 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,8 +1,6 @@
 AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1ad3a5ae2ddfdb08eeaa9bec4d037493583bf181417df49087fcca6f6aa3d977a8e72b98df68e3389c4e47343c062d036 SHA512 54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
-DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
-EBUILD icu-layoutex-60.2.ebuild 2525 BLAKE2B 71f0e92ffabdfbafb429837c1c9241252fdc898da64ad2128fb4427ce7cfc492a9369c0d38e6545bfa3f39d5434a7a8dd9dd809b242bdab4a5b57c5bb2c2f477 SHA512 bf1d94af09720cdd5cb6461004182bc2debad0e12dcf46bcae21ac485a36011dee14ce54433940ee035f9306a1a986acdb697ecb8023aa6f0be25b15b285cee2
 EBUILD icu-layoutex-63.1.ebuild 2525 BLAKE2B 7c45a83f8dcb5035d44c676edbeed9cb971eca673172a8ab5642589fd63c04f05d6c26b0346ea9caf5da340e5d29d5fc085a4e9e17390c5cbb358926f03257f5 SHA512 0f27c41556ab551538f95c086b39c85539138254d160284e6579a0ada90d93485a9ad41670518d7f27e9b93e9029a63bab484727101c5026d4d1f52e44536588
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild
deleted file mode 100644
index 73cf4990af28..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-60.2.ebuild
+++ /dev/null
@@ -1,115 +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 autotools multilib-minimal
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs"
-
-RDEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	${RDEPEND}
-"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 978b5589d946..216923df45e6 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -5,9 +5,7 @@ AUX icu-58.2-darwin.patch 2076 BLAKE2B d85d07ae3ade827a81bf2ce4eb2813a6535d7cd70
 AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce6f3f641e01d76f01fe1f35f74cc2465e89b3353ab86569c7478090df459a659d69143810ba121e15c27923dd SHA512 20d8e76c43ef5549ca7f104b052661269c99d4af45b2a65bd9d72e28b01d0c3b70c066b51799e09d7117a4a39e44fd463fae2522a238a41972c0679c290c5da3
 AUX icu-63.1-CVE-2018-18928.patch 2813 BLAKE2B 21940b9c1f17eed7f056a8c60b5a8da3790955fe6bab02336b0c042d80d90afd02a54dbe441fa38a536b2a77f08fb629510186a0419ad6352b3bc461c7b9b9e3 SHA512 f55cc50673e33dfba4d213bb4f18dd905e9db372dde4c64c1f389c0cd19b31e5fd0aaa113778068758497b35667061659d55fafd0eae818624c9374e17a8d5c5
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
-DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
-EBUILD icu-60.2.ebuild 3710 BLAKE2B 11a56611d570980031040391168bd5c18ca2000c30e9e56edf2662b9ead959c684cada13656726e5e868803ab9c4f81309b51f3b65693175298cb163417f32b0 SHA512 65919063056eb718f860664d42f466278da3bf5d78e54e4ad24b22768b244c76c81053ead55871fefd2d185dfcdfb065e93c38ccc4515000996d7ef307d4a1cb
 EBUILD icu-63.1-r1.ebuild 3321 BLAKE2B b8e6b6ea9bb9379f0b09195382db18e7758fc919d626f49240f9b8a75b97c84833dc2741c528788348d090749229b18d610bcd5bb196506fec03803d3a78af3f SHA512 0efd9eeac3944f3ea14e20f99c3d3bf0f9a2ed22d62074a1d1342c8fb04f4bb76c30d51ca173a09a59abb832cdb134bd1120b065ce0c63536da08839f4abd2de
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-60.2.ebuild b/dev-libs/icu/icu-60.2.ebuild
deleted file mode 100644
index 31e541168d99..000000000000
--- a/dev-libs/icu/icu-60.2.ebuild
+++ /dev/null
@@ -1,163 +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 autotools multilib-minimal
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-	)
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-58.2-darwin.patch"
-)
-
-pkg_pretend() {
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-}
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	multilib_is_native_abi && myeconfargs+=(
-		$(use_enable examples samples)
-	)
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL=${EPREFIX}/bin/sh
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH}
-
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 830b7c2d1c42..1fe7b4c520f2 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -2,6 +2,6 @@ DIST jansson-2.10.tar.gz 487855 BLAKE2B b1d83ad1a37e66cb7c497284a7958882d5a7e13c
 DIST jansson-2.11.tar.gz 483686 BLAKE2B 873283a1b41eef1c57fbcb3d4cdb8c33b850d95ee93c800cbcc009e3e9c9e87278beff11800e63894087e51c767dcbd555fbde48163376d53be2bf72b2eac72d SHA512 0ae77cf7ec264536313639458ba20b66e221078cddd209df3ce45c895b897799954abc1ca4b0d5993b974135652804be6bede2825503469d56303470888382f8
 DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
 EBUILD jansson-2.10.ebuild 857 BLAKE2B 7b1b318f3a0dab579b82019dc0fd07caee375f19c0a19f4c92ba0f59a094432d85e722eea298c1d38ffd8d0508139dd160e99c29d1bb2c3a8d6512f1d5ce9465 SHA512 4ff618e64579443a2811717259086ad988991a773b1d35f05456647b9e19d2b757107cdedb1e840ede68c36b82714117acf5a42f46d89b020a835ff67b2a2fac
-EBUILD jansson-2.11.ebuild 833 BLAKE2B 55e9ac2202c84d1624da291ffb3f90f80730c5ff974637bdf302ed07d9400e84f38639fc5f11644f99595a00e5528b6841723ce6e4918cb3c1c40e6b700d394e SHA512 6ae1d964a666341d98515e7aae783cfbf7fba36908c84d247a4681e02f59115f9c2add52d892868dab11e7705ad2450fa1dfae760053baa5fe35847c6f1e22ea
+EBUILD jansson-2.11.ebuild 832 BLAKE2B 749d5d34a7b6ca753da392fcd52560a2cca9d500445e5fa164e4117ac24d3f70a9589f4771438d9848041cc308f936ae165a7f9931106db673e2825b14b5015f SHA512 88658c1f3391aaf15d41acac9cc049c8c72b462da3c327149a979b07a264b052ba72333dd0ed21c5e8f8925ce1d738035ec0b6bcfbb237bfd6478302840e8ccc
 EBUILD jansson-2.12.ebuild 843 BLAKE2B 845079169e230b7e38d2746e59d64e5d50c1ec4f31a65358a57e3ba070ca8bbe4311508a357818df6a2b6b95f5d5a7e6d38c4706209f77af71f4977ffc554924 SHA512 a63d2a052aef16c61b356faf80e1255c986a77415994be0c6e53e170eb77cad7d48d67889cd319f0abd068485a3b7f32eb7b1fa3aa555095da321719b46f06a2
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.11.ebuild b/dev-libs/jansson/jansson-2.11.ebuild
index 8bc21a459550..ce4063aeb1af 100644
--- a/dev-libs/jansson/jansson-2.11.ebuild
+++ b/dev-libs/jansson/jansson-2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index bdf3dfd5eedc..ad7a04701d76 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,5 +1,5 @@
 DIST json-c-0.12.tar.gz 501419 BLAKE2B 24f035792ff1ba5c39e55bca6ee4ba2509ab71d0374c70b520791f38e1ec4ff2245a282f234fde9f4a02cd9eaaaaa998ce307563a20702c04ee972fdf51f2539 SHA512 c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
 EBUILD json-c-0.12.ebuild 930 BLAKE2B dbe72e808826e7cdb24f298d9f258d5cee1dcb03716a8fb5a086fd13b53858961550f4310e4fddc626ed52825d9f7cf7d24751cffe54dadb52bacf0f232913e2 SHA512 1d1c65c6e297a9035b143969006f4c4d67cef6ec1d8c80edcd0a344c259da33ad24464c7a7485a30f182a7d41a14533f27936b50c37efd1b9802e8a5a143d72d
-EBUILD json-c-0.13.1-r1.ebuild 988 BLAKE2B 258dd6b38246f04b4801c10c3bcc5e1e6ca1c7e10ee61563960293221d5ed09ec90c640a46ce30987b50c53ccb2a5ddde8f2467344059a8b6bf72c015fc27ecc SHA512 5558cc29f8bf0ed335868f5bc88b8c974b0ac2f55f44f771a08599f9a62cb87931049962a33c297a89f148a464a5cd4f9ed64f39c048d33c537206b994afc48e
+EBUILD json-c-0.13.1-r1.ebuild 987 BLAKE2B 582b8fa900d7f9ed5143a0b6ba6031084dfc6d5baaf36699bca24e0ed5da41d7524f59462c62db6aadd5f015ee8eaf56474695ee9e7f3dd0aeab0f06bbd2bc87 SHA512 286df10b146ba41ef59b9ca1cc814c4f36525162e34e899b2176fa11a01fcf686d16713a3e325a2092b6ec5ca671c8fa33a59fe021360f990f1a3b02bf5b0c25
 MISC metadata.xml 605 BLAKE2B 2290e9eb5ca3ad7c82de9d23062cd6b4a5cf3bc3f3b56900e72be88a96b04f7f6ca4b904b8eec476da9ce450f335312b9774f022b8c16fb88a710ad1de57f031 SHA512 485dcf4f7c9e63ee399862f09448965d675ae6580eb74c13c430547a8eab78c3c9890f3a06daf76d028e2bb194daa407f6abb9911648e4827eaf92fd3714154c
diff --git a/dev-libs/json-c/json-c-0.13.1-r1.ebuild b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
index 0a75e713b23b..06cf329e3328 100644
--- a/dev-libs/json-c/json-c-0.13.1-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 06c3480937b8..3c360d8304b2 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,5 +1,5 @@
 DIST libburn-1.4.8.tar.gz 977757 BLAKE2B 2a59adbd104238857cd848cb76c2da3e5ea61112607832c42bba2c47999218bf87563fe2a3901370d2a8cbbfbe2a6dfb1615efc6be10f7ee52d7f822917504f4 SHA512 e02c08078313abb19108bb394741d4bde1c5098c1a200129940744e03078d8350b6ac951bf5523872a343b3f9b7a4954dda60a3336997f975abdee6dbae9b87c
 DIST libburn-1.5.0.tar.gz 979953 BLAKE2B 7fdd6d8314d65547e48baa3bb7c0b8f94c5d5a799e62d79d8dfcd5de644c555be437fc7c84134598703b9335c2330c49e8c7c7adbaefa9e1f288109e0010f8df SHA512 c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2
 EBUILD libburn-1.4.8-r2.ebuild 824 BLAKE2B d7df406726778b3752cdf5af3468893f09c1afc329e75f36f84a6e774b8a8706bdc3abb90cfefd1256a42a6783b4e8f6a089bd0ddbf1d78cb5315237fd0df915 SHA512 7f6c91c2cf05430cc03bf90c114fe577d674eff13a17d3477532adcc4d368078681fd2d8474692fdc6ca66a99e562c8de11edf0b32690583303bbd27b6113836
-EBUILD libburn-1.5.0.ebuild 840 BLAKE2B f419f1dbc0dee1198fa296f0eed450e50a897bec08b23f8bf92346b88d0c08261404dff20020664de9dff2e814662a18688cc26d188f4b643fcd5fbf5108a960 SHA512 015cad236f73bf57fa93fad175132235c700d20b15426c6929401ca11bb145e21e58159d13df11e625d9c6b69f5ff9e3ece810f5f8bac548082cb8f0558310b3
+EBUILD libburn-1.5.0.ebuild 839 BLAKE2B c7c261f75b8068503ab0387df7f65ac58ac85f0817a54ba80be9d2fb15c47ca7a334bb7096e7db72847f41f5bfbdb1ef65c5ec0591d2312ae9e3a2eaeabdc4f2 SHA512 129b17f4899394401a41eacbc4d93f4a663368aaf5b798bd12c7f790c84b5f55ab1d31c92415ab8ef2f90840233732cc6bd625991bbf377c58f07c9ca2284b7b
 MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.5.0.ebuild b/dev-libs/libburn/libburn-1.5.0.ebuild
index 62c42484bf5a..ec6602c51361 100644
--- a/dev-libs/libburn/libburn-1.5.0.ebuild
+++ b/dev-libs/libburn/libburn-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 1a622522b426..a0b380aae297 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,7 +1,7 @@
 DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
 DIST libbytesize-1.3.tar.gz 71648 BLAKE2B 40794a38af8ee1fcc03ef8000b20123c0e02e208f329a75e7da3a18b224e4a8456ce5982d72e4eefa2ff9d9dcd90b98142037dd37be6bc31f25e2ff347010829 SHA512 a50f5d4ea07a295909e09168518f8fc25da8dcd52859beca9c9c3b8c8c180b025c774c730d449ffbd4c7fd5aba07b5d071b6d9ad36f9d9ebc96bb06699aa08f3
 DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
-EBUILD libbytesize-1.2-r1.ebuild 1129 BLAKE2B 23a7f26d0e51ac35b0859656ac1d5db040e29169d6570fb6940bf4598015a1b5da1aa491bdfd26de9e8fe6d39664d50783300a75be1ece2ea02edd28e42eefe9 SHA512 6da341568735fe0a4bfe99b9fe65abcac16f5370af50625eeb5fa41361d67aac80599cb652b5444b0210ef0ca674283316c56b1790ceb588d0b679fed722d1e7
+EBUILD libbytesize-1.2-r1.ebuild 1125 BLAKE2B cc37d56ae5b8e8461518c7d7debb7c8368616332cfe4760c61f96b5c44afa1dce272aa5ed5a9fdd670403690d7a5ce8a03d4aab78bf06af9412e79b4c4de9353 SHA512 d9416468e23420dd3a7af94b7d7513c0d2dc161de65c4dd8e22b900ba4ff0d55ff8d2eae448952a3c86f724f9127d103998be3d37bfb848b7e719f06504179b2
 EBUILD libbytesize-1.3-r1.ebuild 1180 BLAKE2B 74c7becb34b6e8e57e4f2d9eabb8ee593557f6b44be29999ca65d7f81183ad692074606147ad7c27e4dd000bfc961c25ee114c84bdb0a151d1669c11edf1da7e SHA512 eb1d7b1a37b988a41cf01cf922980cfff098d7f1185a259515d90a00b0b8025c91b395235b9bac3579b1b98b2552762f7ae3d9e2c184a4b2ebfa968fab03f165
 EBUILD libbytesize-1.4.ebuild 1231 BLAKE2B e89e69fe587e3612b0f87ba091d2081490071ecc6031aaf9679f7dc816b1710185e74ac3801a4c0c50fbfa8fbf31b196c346bd0002fb06121b0fba7ebe28149b SHA512 78a7d8c2ad3f650edb0c17703b61292819ab06bb028b2476fb13d46bb672b171b6a6a8a36f317534bc06a441569a4a734b85a8c98c3e4ae957a07f9981c1b9ba
 MISC metadata.xml 349 BLAKE2B 3dd4c7645734d29bef7f4224c72284f6bf3583287803ddd3fa94b75f784bb41762d96cd7eb0778f363e9fdbc014b52b93ea86900983553afab993cdba2c68282 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a
diff --git a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
index 322102f9666a..3e6c24e5637b 100644
--- a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/rhinstaller/libbytesize"
 SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index 8d810ff92948..97e76c43c17a 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,3 +1,3 @@
 DIST libcss-0.8.0-src.tar.gz 516474 BLAKE2B 937adc65f68fecece189e0f06cfd601ae2d76f0b4dcdbcb8a67f3f058c4355c19c12c088fb50ecf1e6bcd8436c867b1845b3da27bb44b5d1a009bd946bf5e53e SHA512 fb52920ce462f442dfafa7b0061fa465e6c04827d26186e8468855c2a40e8f34e6f0689d5eb58cb0b2ee0759d083fcff5c8c583e1d98693755003c352a22a4be
-EBUILD libcss-0.8.0-r1.ebuild 1125 BLAKE2B 88f3b0afc6891cb87da7f98bf7e0b3214e452645d01c7b1ed2dbbb86b1ca51894c4e1393c1d10de5f289ba75e243479775add2ec4846295636470a73e3214f83 SHA512 e1598e4dc81878d51a5ce29e2ae50dc292de44053ebfe64214139721929a45d5c5aabb439d3726ffc3bccdb48f67590a815fb4a0df6cecf84f1eed88d1346ed0
+EBUILD libcss-0.8.0-r1.ebuild 1134 BLAKE2B 59a600535aab0d46d48fea43a035e51277e7645f71bbb5071eef1ac4101b09d8f634441258e3eeac0c13252e5e1bb6e2da1e6111e7c2c6e48572a3bf82d423cd SHA512 b8e10bae9b36e29e901f99669f1f8636da646bd0dde67d697bb494911e8dad286d65fa64bc4a6342cda531e8e2503777dea73d9ef2910031657fba6d117a0f6e
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libcss/libcss-0.8.0-r1.ebuild b/dev-libs/libcss/libcss-0.8.0-r1.ebuild
index e0ce10bd74e6..0c86ac9cb059 100644
--- a/dev-libs/libcss/libcss-0.8.0-r1.ebuild
+++ b/dev-libs/libcss/libcss-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ RDEPEND="
 	>=dev-libs/libparserutils-0.2.1-r1
 	>=dev-libs/libwapcaplet-0.4.0"
 DEPEND="${RDEPEND}
-	dev-util/netsurf-buildsystem
+	>=dev-util/netsurf-buildsystem-1.7-r1
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index a03774d0f460..630bb954fe43 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,4 @@
-DIST libevdev-1.5.9.tar.xz 408200 BLAKE2B b99974eab572693c9e2a915b21adf2e6c09e26af70011ce661084ac9add51cb6257f36bcfeb89d76c8987cf8724e69b027d30eda17c4457a40f3e047302efa19 SHA512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c
 DIST libevdev-1.6.0.tar.xz 411512 BLAKE2B 0e9190fd4c28b36bcf325953aa634c0d8c604cef7f56e46679fc88351536d78b0bddedbbdfffe4164e0039c7d56ef604b143e23de2c4bb9a66653a03d6844fa9 SHA512 73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060
-EBUILD libevdev-1.5.9-r1.ebuild 1055 BLAKE2B 0649ba066abbba41c50e0bdabcd823ef2fd456db0b2eeec4665731554c613fa8d6d24d1fd7210e061ee724aa0b7945ac9a682776235c47ac43e7daca3bbba682 SHA512 98f45981aa26a9fee942e7f361770e4b01c4f5607445bd69643c7f417814933aab7ff8913482077a560bf927770e307b21e459704baedb3d88e2cceb82c2932b
 EBUILD libevdev-1.6.0.ebuild 1060 BLAKE2B 6bb768ccb05f74b864f62d9ea4d4a66846e7daf177ccc95cdfd1447bd666ca5659a0066c28050a90dc253e70553484011b18f75afc369522da7dd972a1967703 SHA512 f6b8ae6f7a59247e626ecb1d5806dbd019c247f5c384238934edf894a01659fb655aff07115c25b328bedf8a51b6431c5f38fa843e4d1f56312af4b11f0da376
 EBUILD libevdev-9999.ebuild 1070 BLAKE2B 19f6c9c38fafeac9484b236f0dfaeacf1fbad2d36f991e870db4651e20ddbdee765bd503991691f0d2f8e7091d33b5e1e6b473d74a4caaf22ad13a80a69cdb7f SHA512 1263c46fa3771c1c924b4efef99ad1c3b368317838df9feab79536befeea850cb5ed03dad42b66c6144b5d026991363982a01ffba11de7740b05567771a5a147
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
deleted file mode 100644
index 55edd7c73445..000000000000
--- a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit multilib-minimal python-any-r1
-
-DESCRIPTION="Handler library for evdev events"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libevdev.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc static-libs"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-RESTRICT="test" # Tests need to run as root.
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999* ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use doc ;then
-		local HTML_DOCS=( doc/html/. )
-		einstalldocs
-	fi
-}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index a50800df4ddf..f16f81de7d77 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -5,5 +5,5 @@ DIST libfilezilla-0.15.1.tar.bz2 404746 BLAKE2B 644f4b8949670d5b07f9e7b861d388ce
 EBUILD libfilezilla-0.12.3.ebuild 874 BLAKE2B 2631c5551944aae099a94b6a8cee77dfe92ccb797fb3c2ea91481e11aaa3c08488ddef545cd00195f6f121f3cab6c2d7502de29fe5cc1fc0afe9b46d4d27fd3d SHA512 1dad84e48c21388f5625235a30210f50ab9c38e3fccc6ab58b074b8ef8c2c0bf62944f764003331a99272ce1bafe12b14d2f20e3c3f9a3bea1b60d5ab854775c
 EBUILD libfilezilla-0.14.0.ebuild 876 BLAKE2B dd08708af0aa4c5095132079a38c39b6534265529fd3950c4f96f5464f933b89b963ecaa37058932933485fbf011ee45a6b719210d29f0c43a2928fd5b1395db SHA512 cab062baf1c2630553f70f66635bc59388686d2388a917baa381e00ab734aa97c49f4851b65191155105a93d744d32847d45739e607310f06f43a4aa44c0f180
 EBUILD libfilezilla-0.15.0.ebuild 876 BLAKE2B dd08708af0aa4c5095132079a38c39b6534265529fd3950c4f96f5464f933b89b963ecaa37058932933485fbf011ee45a6b719210d29f0c43a2928fd5b1395db SHA512 cab062baf1c2630553f70f66635bc59388686d2388a917baa381e00ab734aa97c49f4851b65191155105a93d744d32847d45739e607310f06f43a4aa44c0f180
-EBUILD libfilezilla-0.15.1.ebuild 876 BLAKE2B dd08708af0aa4c5095132079a38c39b6534265529fd3950c4f96f5464f933b89b963ecaa37058932933485fbf011ee45a6b719210d29f0c43a2928fd5b1395db SHA512 cab062baf1c2630553f70f66635bc59388686d2388a917baa381e00ab734aa97c49f4851b65191155105a93d744d32847d45739e607310f06f43a4aa44c0f180
+EBUILD libfilezilla-0.15.1.ebuild 874 BLAKE2B 4ea3d150a61a3509ce35db3c0168fb0fc8ddc608b372e8348e04d0e5ed9a6952eb244bd121c97659f2da9bf1e989468c55033fa72d6cd704815c4f3e58ca93c4 SHA512 025b834e34bb07cd0800bc3083dce52000d6731be55233ae6f64b5d3b706113bea6488b1947a666024ef4d77961a146de5da8a1ce906c58b8358c70473364376
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
index 5088d4edb82d..9eb5bf9030e5 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index b87dc79881ef..4091c3d365ac 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -2,8 +2,10 @@ AUX libgit2-0.26.8-disable-oom-tests-on-32bit.patch 1775 BLAKE2B 4c3df3edfa76a57
 DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e
 DIST libgit2-0.27.7.tar.gz 4782856 BLAKE2B c844eca24b5053b3391ace6ebeea047bbba4fd429786e08144151109bfbd22f5c1b2609a176816a5d7eff63f1fe91122f88d89d3613dc4c770051cf095ae5ac3 SHA512 de2e266939bd40bc580603539e1156906b97299523336ddc6a66c3bec26729495bef2daa2d240b83b7e011e93852381e95a4407132b0440a5aa1e1b7642c0011
 DIST libgit2-0.27.8.tar.gz 4783928 BLAKE2B 0f0f79a43de3e869d593dafc1b506ee0894143d2daedf2fe56683ad8f2edfd7d87bab784354b9fb1796fa8e08a36b9de88af65c7621a90d537cb585c89118197 SHA512 53ab69a0687afd315029fdbe0ce8192b7e88f7f1ff6bc9c4875718e638cecd64755a9942ad605e6c388c58c6b892b351d54c5405de8e0d5ba90406055a25ffaa
+DIST libgit2-0.28.0-rc1.tar.gz 4981768 BLAKE2B b947abd92d51b408aaaa22418be741329da537e95413be4881fd542edc35ab94387a01d083d4c6c273d250a9e05b848e81f7a3a58eee144b9747d29c6950ba51 SHA512 0190bfb025b459ab484d342ffbaed7a6126acfa7b30bc21a61f77c229cb469175839ee9a2e2a0946ed723a19ec7cb6614bc8c99c1e24d29aaabcdb646948b9f1
 EBUILD libgit2-0.26.8.ebuild 2053 BLAKE2B 1de5648ae2d9500af644cb1e8519962a463497f25bed279e6148d14dcc0235b4c388f9c94a53f7c0075896f46ba395ed6030d8a577061284c4ab11fe68a566c9 SHA512 2afea3b4bcd0bcf9602ae226762d4c7de609cf97408ea9ac560646d3c001467578adb6512df0c63eb9ed618606355f7087a041b0c2b12e549ac93dc23d1faa84
 EBUILD libgit2-0.27.7.ebuild 2055 BLAKE2B 1fc9de00757bce342fc97176725cd608244d6c22acb3517249cd6bd6df4aed15737345f42a76dd7ac76dccbe100a858e7bc92a23863f7bdc16ab578a6b03cf8f SHA512 5a40ae4d935ce482df78558d7aff2fec2368ad0286121bfd6b02433a4e5889dd8cc9a521696bfe5b0f753a3c61fa3092d89ad991160fb1d4f039e6d91f67c632
 EBUILD libgit2-0.27.8.ebuild 2055 BLAKE2B 1fc9de00757bce342fc97176725cd608244d6c22acb3517249cd6bd6df4aed15737345f42a76dd7ac76dccbe100a858e7bc92a23863f7bdc16ab578a6b03cf8f SHA512 5a40ae4d935ce482df78558d7aff2fec2368ad0286121bfd6b02433a4e5889dd8cc9a521696bfe5b0f753a3c61fa3092d89ad991160fb1d4f039e6d91f67c632
+EBUILD libgit2-0.28.0_rc1-r1.ebuild 1697 BLAKE2B e8a4b0d60e68855e3fe479725c6589c34763dc34722cfe8dfda8a14ba7d315661dabe949b5139584174587a0e06f14bb25e420408653717dbd19bc372c4a7981 SHA512 616c2e23eba520277905d8f0fe25a0d8f46c711f7c8056649562dc22fb4040ce96b8c4cc530cd1b1acdd47484b79433e615c5691419b22202dea5648fcb6c527
 EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.28.0_rc1-r1.ebuild b/dev-libs/libgit2/libgit2-0.28.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..9423acd6092f
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.28.0_rc1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit cmake-utils python-any-r1
+
+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/28"
+IUSE="examples gssapi libressl +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P/_/-}
+
+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)
+	)
+	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 -R offline
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc docs/*.{md,txt}
+
+	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/libhome/Manifest b/dev-libs/libhome/Manifest
index 257f9ac9ebd1..76fbfcf685cf 100644
--- a/dev-libs/libhome/Manifest
+++ b/dev-libs/libhome/Manifest
@@ -1,5 +1,5 @@
-AUX libhome-0.10.2-Makefile.patch 2591 BLAKE2B b640f87d09500d981db3cb4407db9c3c40409bba90fe9bffd35dc1fbf41137bb849530d28c98dbd280be8dca16abb6713cfb055ba65a4cd1fa437f36a9b1836d SHA512 e09c736127e015c4e68a572626c04162fc42736c6e8628772f268fe2df164e78e36a2d213b17072dfba31d31f0063615da89e5ceac176b2dd93b56a4c192b020
+AUX libhome-0.10.2-Makefile.patch 2595 BLAKE2B 1ea80fd25b2f0d15cad374e132c37b1cdb26167cae9a2e1bdcc532230b1193057e10577d5a019c21bfed1b6aabdc41452a52397a7268ab0cfe4ba480040bc63e SHA512 c5594a56637570d76225a72a490a6e2a1dc1525c2a539e2a8bba9580364b449868e4f66bdddc9662e5a600658142e582c426fbceb4f68335b646a7cd1b7af692
 AUX libhome-0.10.2-ldap_deprecated.patch 436 BLAKE2B dac750c9499423992a236c1c1370c4e2b9b219b546ac9b87c1ac9aba7277592f52dd175e568226588315bab6110fc48e11d859193b1b454734e10c6ff9f3cfc0 SHA512 9837639846acb2e89c92e0b821faf40d9ee82af9f6837ea69b3d435da6433c6095b45dbf09178de5d361993405141bf9ac7b91e8f6a0bda65d038f80c6897ae7
 DIST libhome-0.10.2.tar.gz 286453 BLAKE2B bb2356fef6358b849896c665760174decbf5f83f70380c855c519c6a8cde37e053af70962f7552ffdd581b1af559bbc4a74d7d8ccedad39fa4a178ded394436c SHA512 9f144b6aeb8e01f5ca2f8f90c5289d4449895e2eddbfd2d8d9b1828bb203fd8f68c224c0f068ffabfa5ee1514f9b756cb2499f862418d793eb8d06ae960447a9
-EBUILD libhome-0.10.2-r1.ebuild 1208 BLAKE2B ada5f7468f4e01ddcbc47b7319e4f4a9383a7fd8b3c177d26008c14881aec932e0300a4cc5cc67e7c4abdeb438e3cfbb8b95737df89bc8be8e343250c9faf299 SHA512 6d994881ee0834575f23c8832c7526d5a601fef122cf3f2de17b7a866f81640227ef0880b5d9cea3287a71e83f0cef10067117d2932c2b039b6575002cbd8e94
+EBUILD libhome-0.10.2-r2.ebuild 1198 BLAKE2B 577f78ce8270b6bd79db641ac1feef295e48bab090a358342dfaafb3bb242c58fe151c8be177b77cba84fec153144af52fc06bd4d60b6380914d5d3fdeb767b3 SHA512 e454ca4b1359063b151a91c53ad149b5e51a4acde59208a8b3cb688cc94c2f6785224dcfd6921801d75ba0a616d4373dd1f35c7afe6981c75abb67afde3c4124
 MISC metadata.xml 240 BLAKE2B 2e3833d1ad4ea9595d87b465cc7ddc1c7265e408573c1cccd947df928faa1db495ba24ad4417ba6dc46a8ddbe36876775dfda70309472348ac6273554b8e62da SHA512 b81e5b5547e3dc86326d624d771f3c7a55f6b85989c0de3827fd9df823f7fef49d66e6ba814d1ee6ee0e02bbc9705f00aa74ea6d247abe3db5cf3a57e4171455
diff --git a/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch b/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch
index 54915fd4bb04..371335b0bec8 100644
--- a/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch
+++ b/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -61,7 +61,7 @@
  LIBTOOL=./libtool
  
diff --git a/dev-libs/libhome/libhome-0.10.2-r1.ebuild b/dev-libs/libhome/libhome-0.10.2-r2.ebuild
index ef3cfe46b6ca..b94cfd3c8377 100644
--- a/dev-libs/libhome/libhome-0.10.2-r1.ebuild
+++ b/dev-libs/libhome/libhome-0.10.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools db-use eutils
+inherit autotools db-use
 
 DESCRIPTION="libhome is a library providing a getpwnam() emulation"
 HOMEPAGE="http://pll.sourceforge.net"
@@ -12,20 +12,24 @@ SRC_URI="mirror://sourceforge/pll/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="berkdb ldap mysql pam postgres"
+IUSE="berkdb ldap mysql pam postgres static-libs"
 
 DEPEND="berkdb? ( >=sys-libs/db-4 )
 	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:= )
 	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql[server] )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.2-Makefile.patch
+	"${FILESDIR}"/${PN}-0.10.2-ldap_deprecated.patch
+)
+
 src_prepare() {
 	rm -f aclocal.m4
 
-	epatch "${FILESDIR}"/${PN}-0.10.2-Makefile.patch
-	epatch "${FILESDIR}"/${PN}-0.10.2-ldap_deprecated.patch
+	default
 
 	# bug 225579
 	sed -i -e 's:\<VERSION\>:__PKG_VERSION:' configure.in
@@ -43,13 +47,10 @@ src_configure() {
 		$(use_with mysql) \
 		$(use_with pam) \
 		$(use_with postgres pgsql) \
-	|| die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	default
+	use static-libs || find "${D}" -name '*.la' -delete
 }
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 5d0c10af8df9..e329f0d9789e 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -8,5 +8,5 @@ AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c17
 DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
 DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
 EBUILD libical-2.0.0-r3.ebuild 1708 BLAKE2B a6fc6d8a7ca16ad6a629c5a708b138535a098d65cb0c89c39df889d2d6087c11ddf884afb18fc1d7fcbb297262c2b5b53fa7d0108b825d8cd0057948a3c3efdc SHA512 24d4b757d3bc4657c3d24cdd442b91f7b64113a88c023de39a7f01ec13ad91f255595acb9c0767835837a660fabe316cb3f160f4beab6614a8e20b3cf7ea77ef
-EBUILD libical-3.0.4.ebuild 2045 BLAKE2B ecd99387988661e0623b3b64ee0ad434c35034ec72f7769d997fac4af4da00756c147a8b509a879ce92625ab2086073a9d830266c5ee36389813af710a85a5e0 SHA512 b928a7a833d3097057d948290c425c960cfcb8327fdf6644b429f7f6217534ff96541136c1b85d5e9b0253e23006d128236d89d14ba1e363b0a7629962a09bcf
+EBUILD libical-3.0.4.ebuild 2044 BLAKE2B 3ee53dc20dfe7ec06cc0d18a8aaf1b119287c115b836fbaf926c207e394428dcb2faaced511a6104c70395db5afdd4e8fd5842be97cdb2dafd9cefa38c3458bc SHA512 d5d729032a61c76040c2cb32a0c2b44ff2188da48b1f80850f142cb178c5905d0e4936e4e91babeba9c63cb94a41b4464ddcfd50779d4b676ff1fcca115b2747
 MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
index b989b6e001c5..010125d397f0 100644
--- a/dev-libs/libical/libical-3.0.4.ebuild
+++ b/dev-libs/libical/libical-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples static-libs test"
 
 # TODO: disabled until useful
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index fa9780fdf43a..d0fc37d111b4 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -5,5 +5,5 @@ DIST libinput-1.12.6.tar.xz 518784 BLAKE2B 7462f47be3628f9c66ef5b7c8265b588bd0ca
 EBUILD libinput-1.11.3.ebuild 1430 BLAKE2B 6be00d5d69e9e6c4fde5c59a3856ce50e95798809863ead833404e8f49be8a3c85801b13ad1e9ca802642f627d8435132cf9257fa4965898720628da0c0e0908 SHA512 20cc0c87ed32c22e5c7e2b9b1420eeb82e064ac1e59535e3af02bfdc84640ab84c09f0c18dc82ce9a399bd48a3ff5cde1785354869a7f459af63c1abe1986c68
 EBUILD libinput-1.12.1.ebuild 1460 BLAKE2B 066dfe5ee976f24475f2572d040c685b2a429cc27d22d2199bcaaa0e92886a9e76b2dc489457e5657f8b4ac6a0e61af75cd7041af96647bc1dd911d5c84e3585 SHA512 3bd9c1fb51fee929bcf85349996e679b202d2e064bcb88926a4d0cda0453f82c7ec9f8bd0ba0e4870781fc936a36da034b91e23223ad3f9764b4781468bf8b19
 EBUILD libinput-1.12.5.ebuild 2035 BLAKE2B 0befaa539fd44efec19a1a9aefe0762633974120c288087c0a6b7ad553ca7dc0409a83ad729494012853c424f7855eced3d6d34c3b9e5d13fb43f8da5875628e SHA512 722b84a7ebfab778425eb87b5a08c8c6fa02679cee22a0d1355cb20137bc87061412630dbd7f564be40665737c8703f190162d32bc0138cc43eedee4a2a7c471
-EBUILD libinput-1.12.6.ebuild 2035 BLAKE2B 0befaa539fd44efec19a1a9aefe0762633974120c288087c0a6b7ad553ca7dc0409a83ad729494012853c424f7855eced3d6d34c3b9e5d13fb43f8da5875628e SHA512 722b84a7ebfab778425eb87b5a08c8c6fa02679cee22a0d1355cb20137bc87061412630dbd7f564be40665737c8703f190162d32bc0138cc43eedee4a2a7c471
+EBUILD libinput-1.12.6.ebuild 2034 BLAKE2B d41624036fca18c4fdbdc06c14ef0f2b8a32877f3f104529b84cc9aca7f76f641710f58c902773baa84606331360bd010863b27043d4f17c8ba58a513fe51ebb SHA512 6078e27325ec5d32f348e83623bf3666e5c58aa7182007897aa1936aaee71d1187bcb4915816ec5e095884f81c1eed7ed60dfc514d22ee9e537e7c8fa4412aa1
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.12.6.ebuild b/dev-libs/libinput/libinput-1.12.6.ebuild
index fe9e7e7cf8c1..fa3fa3045685 100644
--- a/dev-libs/libinput/libinput-1.12.6.ebuild
+++ b/dev-libs/libinput/libinput-1.12.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 6caf6d3ff889..94bf89927967 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,5 +1,5 @@
 DIST libisoburn-1.4.8.tar.gz 1537097 BLAKE2B 569684a115ac09506aa2fe6439f4dd80424ba7a5fb539b587e618a2a618c18512099117892ed0abc7268bb258c80a1ce8c2e4535f4eef963a14a5f8285806e23 SHA512 26dd6f6884d98d9d3f54bf18b529a688d28aa0ff54b7fe6fe7926c7765755a1c7f7b2d0ef02ca6ea2bdac9ddf6f928c01c89a3547aea1e9f0b47346b160d0d46
 DIST libisoburn-1.5.0.tar.gz 1550656 BLAKE2B 447c383b3847b7ca0c4aca73f5317dec03ef79b34debc3ad2149fae4e7216f29c4a0dd918271087b530fb6c476b219430159e1515bec4bcf51c47d5b2ee05d89 SHA512 c74a9e2887244c28c82abe70d2603dbcd49b639c370e5b7fea03aabce59ff2b361345cd6ec88fe8152727e8a416d4759b88d91e2b5aec8a697408e00b7dc9e4d
 EBUILD libisoburn-1.4.8-r1.ebuild 1816 BLAKE2B 61a5f767137fb65a53bbd9780153c71b024886a204649d1a9345d2caf8a7e559c09c4cb6d09e570f9ad356ec828ae4330a704b4b86d79b04ecb630675fcc6a16 SHA512 2124db392eefc46dc9e88f0784270b2955ee96df145282cfc790c7cf0c023dcd78a12c249b83de9743b1bcd97f7065ca9969ed6d2b47c5507a12d3b47c298729
-EBUILD libisoburn-1.5.0.ebuild 1833 BLAKE2B 0edeea360ccc655b4caa3e9eaa81092cc72908e9295c3212f091a5bbd8a28c03c7c61f7fe5317183bb281a0795cb7eb45f01797107ca516c959302f1a4023b1a SHA512 202dced3be2d7fd924709dad4a8f56d23e6f4e75d934f4986821d6853563fc898c4a1adc13efa6f1c98c39202d906af3d41a656113f97831aca50a27ffdbc5f1
+EBUILD libisoburn-1.5.0.ebuild 1832 BLAKE2B 87b001fb5c85f3b9301f5a71a9a5d5da2b21512479499f2f1377c6b7a1d7870015adefe021be7eac2be93f4acb51d80f78546644f096fef9fb6d9300377e3db4 SHA512 6ee4c100a8a9d38aaca46799d1e6da2344800d36f8fabddb4d8fdb2fe8d6f5dc40439f3318eb0f290029acb6e9e5236352d58984cfd2909aac6633e00ee33ed6
 MISC metadata.xml 829 BLAKE2B 3a7a3c710e8886e60f6447baba781e98cd29d64daeae498ed8423ba40ef08258e8b249530666c487a1ddff81e837a97dfa6a9746872ee1feb7c66dd949471edc SHA512 0a3690bc939275faf4c7179c1e26d4dd93464820d3c21e8694119faab3a417b823661ac399f33d423793b2cc234828445a5d6af7d5067150b5e5a3018ecdae7f
diff --git a/dev-libs/libisoburn/libisoburn-1.5.0.ebuild b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
index b39d54bd5338..4885eb9e4d32 100644
--- a/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index b0255dc5c9cd..f15647189d8b 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,5 +1,5 @@
 DIST libisofs-1.4.8.tar.gz 829979 BLAKE2B 78275a8a1c2ed3824d25dcd2eb02675059d102f2f0b93ae469ea18c342bd6c72e79655eb9f3c700539f87ad46bb97b6a3e28950f84a03bf3d9f1fd982c4fc479 SHA512 0c6f505a951a1b7fce63bf63c715e5acb3158c15be2660627d2380771f025ec88bd67a4c2b8c86ef9dbb649a23cb26b826e875e7c87ff46c8bcd13d831fe8bcc
 DIST libisofs-1.5.0.tar.gz 834099 BLAKE2B 57dbdb4173df635d2811c61a0b88e49f617b628909a6f87eeca7715a2c94b25b381860722cd56752cac28993bb314c9b0371ae5c0ca73e37044192f50aa47179 SHA512 1d0bc488c18b95971b7aa89765d7b5772b64d17eadeae9ec52c0f880c6f68acee80ee39b603752a1f9fbe0f35029c27023d5a6710d149a0f568bb396c3dcede8
 EBUILD libisofs-1.4.8.ebuild 943 BLAKE2B 09cf690c8c32b58001b18f2d09931c1beca88841dcb8ad9cbedb1f402b705bfe20eef27bbe5a5756fc71587c9eb24325cf9869c0c745e6e45f5f7e48699f7bea SHA512 1ac774332041b72c4decbf1c6e58aae3e1d7eac9be9f341289da5db72c66a76a03fc782bc9799f4adf8ee07d3858ad0a3429ab1cc34b320a1d6f379212c88e45
-EBUILD libisofs-1.5.0.ebuild 960 BLAKE2B bc00a64dd0f995bc2fd9869a0ce3c444a99700059c56eb2dace9a1f9c62aa50b4fd4e3811fab077c660b35d6b388f347f5bee5199ba4d51bc5df981e1faa4c21 SHA512 f5e89fe23d7d839584b5bcb5cd2dee2819f296d4ce76f695c9febd8fd1cd4bd7db62850b5c5e6f3ad9e9c6f768e11fbdf84ca323e02a1227c13d8f176a55170c
+EBUILD libisofs-1.5.0.ebuild 959 BLAKE2B 941fb966eddad33931ffa0d5b7b89f8612b8f86515f9f28e46c0c8591e182af0cce2cbc59b7733a96661f261774545bd84cd7def0228cbea7d647cdfbe0eb810 SHA512 a6ac6a6560b25f52070678b70516108ce415d4126b671636c068d88baf392d6604ff4d6b28413efce19bcbf743245464739dd07ac8b29094eec49c875501cf3c
 MISC metadata.xml 320 BLAKE2B 04767bbd76091dc5cbb1d5aad9f7c8b1adf5f36a98b82efb2047ee8c60f7c341b8cbff45c966bc549d975a7d7f4234609a47090cd8919a19c51b9d290c263366 SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce
diff --git a/dev-libs/libisofs/libisofs-1.5.0.ebuild b/dev-libs/libisofs/libisofs-1.5.0.ebuild
index b701cbbf8093..e2cfbf236039 100644
--- a/dev-libs/libisofs/libisofs-1.5.0.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 
 BDEPEND="
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index e53841a6d1eb..d58e0a91ba42 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,4 +1,4 @@
 DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
-EBUILD liblzw-0.2-r1.ebuild 481 BLAKE2B a68d77abd812adcbc20377de1b9488b6c92fc1d941bcc54a68260afdc877f678daedb639bfb9e74b8b79eaa6e46968f910263eeae44b60c53b48003feae02ef0 SHA512 2f3a763e301016f849b5648cfa0d5c6db41175801c4a79b10059a48a2672e26b89ef0797880720dac6e0f7757fd1fd967f7f44a5488a6512235addf098d312a2
+EBUILD liblzw-0.2-r1.ebuild 478 BLAKE2B 802d673164fbd4321cb23560cbbf3f8624f9d50c0b5de96f5c6f2ad4d0be46028f918e9d38bba5d2df349cbe60205757ffc0c17bc0b8d6bf4d7eabad2f556f28 SHA512 c834dcb63568ad04ca2cd376b093165d39f713df1e7079dc32ce821632026391a5bb015e500a36aa93cc69f986507ac392747404e8cb29b92e7ce2e6c357f4b6
 EBUILD liblzw-0.2.ebuild 465 BLAKE2B a0ce966c22682ea2a0c95a5842441581a58f6eb479e8906786f45e4c706cb6979be80c0743ecda7f520011697573c146eec76d1a0e5b3e482a3c39283dac7393 SHA512 68d82e623358e6abdedd188709c53409669343ace16f7277484305dc014813b80c3b17733d13246c61ef3d081b3e100146ad567702a5fca4e932a0501fc23669
 MISC metadata.xml 298 BLAKE2B 60130700ab462ebfa04aef1cd0e9eb03149d92258231dd3d8a0f15a7a374d3f3d0990600cb028b63617b25e4a3c47ebbe5fc4a65e8631105273e181f53211a74 SHA512 6bef7a0d6aa13e842ecbcadde45cb547b121eb8e7683289c279b9850fde59361e7be855b6dc0e54f7ec2094c55aeaa35e95595754a9a155ab651ccb7203f2280
diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
index d2613787f461..56b1cee33eb1 100644
--- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild
+++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm hppa ia64 ~m68k ~s390 ~sh x86"
 
 src_configure(){
 	econf --disable-static
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index e84cbb6a4a97..624daff480de 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -2,5 +2,5 @@ DIST libparserutils-0.2.3-src.tar.gz 74509 BLAKE2B b9b68a91823181e7a95ec94b1a117
 DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
 EBUILD libparserutils-0.2.3.ebuild 570 BLAKE2B 831f0a7473a068b051550eb316c096dcd4b7e5007210eb86d23136967cf7be7769964ceedf1caa77065c1e9e0b3f9f8af2d03cc3274c12e0e29e2d0085d2c1e1 SHA512 cd4cf38173e2231dd443c3c534cf1470566e6ffb8645341d9679fed0d469125141a52a6bc4078035b6f81c6fcc5eaa8521217e6864584a0df1edbe956f0a870b
-EBUILD libparserutils-0.2.4-r1.ebuild 891 BLAKE2B bb8e0a6de6934ea05c806aaa3dd5f93ab54d8eebfecbbc9aee71628177e532cbadeb430f05b64b1f45a6e75a2bcdb4c2659b4fab5c4e878fe43f3ff4b093efa3 SHA512 c41f072d51ec61d63f69f2c9c48dfdf724014e7c17010aeb2d7c4b8cb4ceaa66cd02f8330d338a6149191ebeb2a5a12494bc97b9ff89cca1dc138cb84e0376a9
+EBUILD libparserutils-0.2.4-r1.ebuild 900 BLAKE2B bf28797c4d7441b441c4e04a70281f42d513fc05c814ae3b0682436e4b2751f502aaf8dbc1a29601fe8a0b259d3c3b6bc888fc25ffe4a35ccd807533e91e95f1 SHA512 1430cac8c7bba603681e9dcd54e717da6c6abc470a8625d45f232fb9c8e27dbc454a3478e2cc3d350605e332b2d49cf63aaed2fa942a9a5bbc4a68dc575d4f8d
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
index f1bf560182ed..a129c324b0fe 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~m68k-mint"
 IUSE="iconv test"
 
 DEPEND="
-	dev-util/netsurf-buildsystem
+	>=dev-util/netsurf-buildsystem-1.7-r1
 	test? (	dev-lang/perl )"
 
 DOCS=( README docs/Todo )
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index 8b815ec93287..c499711841a3 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,9 +1,8 @@
 AUX libtommath-0.42.0-makefile.patch 1694 BLAKE2B 37c2e368bb4f2d6f7738e3f110bb55686983fb701c4eb3513fd1779572a8d8449a305e34c2194fa07fe7b74a63572addb764f3ba8c7cd3285a25c5502c25f842 SHA512 3ba5253df119d57e598167d4ea0c3cbc000c50395598a953462d24e21832d41bdb16631688a99266f533e133fa39a58cc271e32d05e61b3756697ddb06898999
 DIST libtommath-0.42.0.tar.gz 1732144 BLAKE2B 624697bfa0bab0244783c3d2c92df2a1c0418611dc7f25989d038a5689beae325a426d8de38967ec856bd1e6f2d9413615333eebbf9316add838deda5b122de3 SHA512 d26e7737e5750530a7b96432502f0d458931e67af528872c46ad8dfc921b8f6ef4b3e05cb07d22bd13a8b24db65812928ae4c381250a4df95f6ca55efc3dae23
 DIST ltm-1.0.1.tar.xz 2210120 BLAKE2B e616f0359a1fffe8e1280dc24df1a83eb568d55f9f8acd0e4016fdd63b8ef10d939a8acbd4d49d70a69adf0e492ea5127200798f02af6af1c30e2e1f57870e3a SHA512 f98f7b0f91268e898803478fd52f578f476d378d096a25e48fa2e291159dc89bd1a6dc7d8c5c2254df840c731e5d009ec9728b72190318b6d1ba2916f5c66fb6
-DIST ltm-1.0.tar.xz 2191540 BLAKE2B 8794d81558f8e4236256c12201e03aad423b9e69ebd35fde941bd0e70174509a09973ad5cdf432c5c0cbf43f78693351782d9c2ea1085f2fa2a5bb77bafa89c5 SHA512 da2ced516106fb056373d97f9ac443805c57ebeb0a33982c14703d6dd8c3925e49aeb690b790ba91768ed5d41f5875dc50a3d3435dbb4088cfa3fddee9162082
+DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
 EBUILD libtommath-0.42.0-r1.ebuild 1436 BLAKE2B 8a51bb249ec1c3dbccc9615dd815342224796215ccb4469ec7ed6cef2c1a1af460579cdf14430e15e1d54f7825b8bee1744b4ef2d7790408a900e3af0d27713c SHA512 83dc7913ebfad16d431bb6524b5a2fe032b52dd15cbc6d127b1e78785f36bd7787624d3459ff23cea37c29acd0db763b646e093cdad9292fb446829a526b3707
-EBUILD libtommath-1.0-r1.ebuild 1509 BLAKE2B 6b8f688f1b653f0c9f3c04f8c5f512fd651c723aeb61ab8ced2d7c0383d7e4147b898b6176d4d8aed4066a9829c8553151b8a67f9e2dedb2874d40d8aee95e54 SHA512 dcaca3dd34a3b669ea284bf63e61f473bbdf25936d16e7bb9fbe49285afdad4d3ce32c7a2dda8b3fce3fbc54231d172209836692b82f2809309b27589588d72e
 EBUILD libtommath-1.0.1.ebuild 1507 BLAKE2B 980126c931a91612084f917867db29fc6cb0b46f03237321fa33fa6d72dfa9f67932425b723a7b463e7982b583afad5b386ad872882329da1c771e7167034c88 SHA512 2dee1c3229776885d089af70b3112243e67592eb23e20e5b231dab738e9a09a12a4035267b3992195290d6a16fe3c0680e1f6f87d3ed9202613b18ee3c561eb7
-EBUILD libtommath-1.0.ebuild 1396 BLAKE2B e64cd2f80efb2ea6145c79a1b192e2f943a01a0cfca065cb652e1aa70f0da9ee54877df7dc441b892140239ed06ac588be969deab13d7015ae90163d59d9a78b SHA512 28f0b82b39166e74f7a6e87f5a992815f6465c05301a735ec4f2dcd9f6f64734d2cd0073fac5c015a06c79fb005cc2796497e104ad5e9bc6c2b5f41ae9e6d0f0
+EBUILD libtommath-1.1.0.ebuild 1547 BLAKE2B dfb9732b03aeff6ddc194fd1d1687bfccd3cabd3495265357e9fbd10a76258aed63879f6be81f5df05952da05737eff3b6a4731bdd39d6354c28c24607543a34 SHA512 d5d7fa2e02c0d0cd6718e5cdf4332d776727f1a5b4700289860ff69a95696c1f375279eee906481a1df69e012cc5c691a26d13a8906952ebf2eaaec238b49667
 MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f
diff --git a/dev-libs/libtommath/libtommath-1.0.ebuild b/dev-libs/libtommath/libtommath-1.0.ebuild
deleted file mode 100644
index 855b05e61649..000000000000
--- a/dev-libs/libtommath/libtommath-1.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Optimized and portable routines for integer theoretic applications"
-HOMEPAGE="http://www.libtom.net/"
-SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz"
-
-LICENSE="WTFPL-2"
-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 ~ppc-macos"
-IUSE="doc examples static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-
-src_prepare() {
-	# need libtool for cross compilation. Bug #376643
-	cat <<-EOF > configure.ac
-	AC_INIT(libtommath, 0)
-	AM_INIT_AUTOMAKE
-	LT_INIT
-	AC_CONFIG_FILES(Makefile)
-	AC_OUTPUT
-	EOF
-	touch NEWS README AUTHORS ChangeLog Makefile.am
-	eautoreconf
-	export LT="${S}"/libtool
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-_emake() {
-	emake CC="$(tc-getCC)" -f makefile.shared \
-		IGNORE_SPEED=1 \
-		LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		INCPATH="${EPREFIX}/usr/include" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	# We only link against -lc, so drop the .la file.
-	find "${ED}" -name '*.la' -delete
-
-	dodoc changes.txt
-
-	use doc && dodoc *.pdf
-
-	if use examples ; then
-		docinto demo
-		dodoc demo/*.c
-	fi
-}
diff --git a/dev-libs/libtommath/libtommath-1.0-r1.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
index c647c55ef31d..d240a0bcc5ff 100644
--- a/dev-libs/libtommath/libtommath-1.0-r1.ebuild
+++ b/dev-libs/libtommath/libtommath-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils multilib toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Optimized and portable routines for integer theoretic applications"
 HOMEPAGE="http://www.libtom.net/"
@@ -14,10 +14,8 @@ 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 ~ppc-macos"
 IUSE="doc examples static-libs"
 
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-
 src_prepare() {
+	default
 	# need libtool for cross compilation. Bug #376643
 	cat <<-EOF > configure.ac
 	AC_INIT(libtommath, 0)
@@ -28,7 +26,7 @@ src_prepare() {
 	EOF
 	touch NEWS README AUTHORS ChangeLog Makefile.am
 	eautoreconf
-	export LT="${S}"/libtool
+	export LIBTOOL="${S}"/libtool
 }
 
 src_configure() {
@@ -59,7 +57,10 @@ src_test() {
 src_install() {
 	_emake DESTDIR="${D}" install
 	# We only link against -lc, so drop the .la file.
-	find "${ED}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
 
 	dodoc changes.txt
 
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index f9b07e6e408e..6f0060fd744b 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,4 +1,4 @@
 AUX libutf8proc-1.3.1_p2-overrun.patch 1358 BLAKE2B 4583a42923db3ad30cd407ee736b6758151e4060a2aed528a54a61ca012d0bf7113ec68994805039a725958ac5bdf15bb9b482d7ff0ab53af2188bea2d4c816e SHA512 e897917e6346f3a0c539d3e2a762a37fc553bda17c64327249835f6f64e981cd9e98c627ffc95e5b36bc54837254cbc43fe9192e7671308f18b7167f0d6cbf6b
 DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
-EBUILD libutf8proc-2.2.0_p1-r1.ebuild 732 BLAKE2B 2b53e419c44d8a7d4b37513c3405f30e717d682e2410442c19b480c87d59bf8e0c6828baf572dfbca1f452bb62ee0ab3475910fbdd48526cfd9ecbeb462c2f54 SHA512 6ce6e921f3530db7510f860bbf384fe4a6d7626b933fa591c9a84e0dd0771d0830b886e33649aa2d7d689646ca5a5f7fdd02489a36e6eecbeac615dd20317b46
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 731 BLAKE2B 2668312709be33db05c9f5e1b056a71c84184be59a68ec33ce990c3a3c7fa4aaca08a1411ff74b32adf76cc36fc23d5314b3e4ea6979ec53222b9b9eec2b6a53 SHA512 72d2271554aafbb1c57b76ee3032aa11e26a1b31449281ed00a4d5b1f8bc0852789b867e0769591e232b20764ef00cdc462d4d83d16aa13810748734bf716ca9
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
index ddca0b7b2fd5..09b7649857cf 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-util/netsurf-buildsystem"
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index 986ffd976004..db5159f81de0 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,4 +1,4 @@
 AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba058cefc253d9e6ca112e2d7d0cdfb082a024c739e101eec03470319ce766694507d6d4ed2cd3b1810242c5313e8b3af5ad SHA512 62d0e6b7a5ec8c5e5c695933a886002bf81c5ac73e2f47917d9942932045cf66f5023eac039e21b8cf915a145dba2d3c12da4a85e9ae1a7340e522f36bdc3157
 DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
-EBUILD libwapcaplet-0.4.1-r1.ebuild 824 BLAKE2B 1798a009f4dd3f30873fe420097839ab80359531f69c9e6b9417c4826862fbc48427d8566a949651535f262c8f169f179a8cd9b44068cd073817b7dd189316bf SHA512 f8bc0540edd329f073012a9108761a34267da95986b7e6150b172a90c1d20a5adb8e39a84a7d2068a2a2ee4be1cbdc88f494f3aa94c12171a37e7938c5e76905
+EBUILD libwapcaplet-0.4.1-r1.ebuild 833 BLAKE2B 4863257739dd28c6a968d2e07025b3b4c3a7374d8cb908b8e4a1648ab15a3666159b91c4d65b1ba19a51d308a57869b8b72a465bfac7d552793d2d96fad01006 SHA512 85b51f04c3716a74ae03ecfd9491b5f9e6b4c242a30f156497e09a4d066533a63da016dc546c0a54ff35330f87cea3f37d15c4b5d1eed90c433dc3cc2496f3b6
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild
index dd35cf940da6..8160a68a81eb 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
 IUSE="test"
 
 DEPEND="
-	dev-util/netsurf-buildsystem
+	>=dev-util/netsurf-buildsystem-1.7-r1
 	test? ( >=dev-libs/check-0.9.11 )"
 
 PATCHES=(
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index bec7891d8d40..26d92c9a55b1 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,5 +1,9 @@
 AUX libzip-1.2.0-fts.patch 393 BLAKE2B 1d158551eceda9f4b6f305ae1c1c253ca85de8f47e10b568d267ad2f1a5a271cb43c35a2a929477c9fc2a723b797b0a7cb4fdf1103eeb9c006db06820948ec04 SHA512 ae3fbad5122a6d4089db1bdfaa11882e5e5f5b7f17d13dc24b17c178236167ce364efbe87ef28970ddd5fa262fd8dc48b5a92e091a365ff92e39254319f79a89
 AUX libzip-1.2.0-headers.patch 341 BLAKE2B d4a0227da9e3415f4372f6141071f2e070f0b14256dec7933dea9cdbd1d54830ae886a89a7984dd8c66e8d523e18a9070336b1a42b02426e6678ee97f742cf28 SHA512 25a54a4901e45d78263c35ea788c9ae84760c4e2cbb7e09f0dd33b35eefb47165a1788ab33a7f306d112ffdfa35a3f3ab65c1f50463d5a30ffd265a2be6208f9
+AUX libzip-1.5.1-bzip2.patch 1861 BLAKE2B fdb4734858512718079af900ab96ba1be9664e2d5def086c44a52eba256759dbf733acf097dfec4e76e1f20aecf60dffbf7e7ef21c2e8a51b634c08678ea765c SHA512 af66da5aa509a3dfc47c0d456d7b462361847f68d5abe3aed7d33f52165a7e0fd0eb2d246e05bde1e47669f56cac5a85eb3b5aecaf8a83196e6297ae2175265d
+AUX libzip-1.5.1-options.patch 1297 BLAKE2B d2394b095b59d484269bc29cbbb311c5c58564dbf715c131874fc4b76649bae909c0a1c5509d9b2d085aabb9c54ace50e3ea65fa2494e584e92a6cfef68ca0b6 SHA512 41a1f8f33e485f0e5b63ca899aa4feb3eab121f7a19fa67821de7aeb5499810ae998dada973dda375e247c978ad1e5769c2080d91394ffc1028921712bc42b63
 DIST libzip-1.3.0.tar.xz 955876 BLAKE2B 9bb59cb34ed7e85e3161770f0eef7ed1f59fb2f7f648cd201fa5dc6c62339481ad72a71024df443c04ef0c7efe6f00838a3ac316da2ef06c0045ab69ade8f71b SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900
+DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
 EBUILD libzip-1.3.0.ebuild 1035 BLAKE2B ddd93eedf9092234100990f5fa22689819ff1b8d906abd75318b8694816c60bef575788290666ed7d39c028b2c5492e02da42376f43c31ae4255ea58f61032ae SHA512 01795236335f9f2b97f2deda5dc4b2be04efcf58e93c290526e675435b27b530510677e0858b86e3070a299221e94acb394d45095c81b2c8b54fd3174a4ed443
+EBUILD libzip-1.5.1.ebuild 1911 BLAKE2B 2a2650b754891b27277c8466efd305f8eb8cad26c6c8271d59bee4d0a423d4e5918eb9925bc57853d04911eeae75aaa375558436047819819b533d784bcae3e7 SHA512 072396a7b34c0739aba39bfc45a021405b36be999cc69258eb425da1ef02b559ce167bda5383ce51e33f0384e3261701336be4d229684d42b245f09fd7e433a1
 MISC metadata.xml 350 BLAKE2B 0726e0b8dc7bf1efeaaf5ea63c1bff0251523cc4151765d93c06bde1f97fcfd63d2846314ba642419a3e45d70acd843ed1667980a00e7c2740720161a0f7991f SHA512 8a4e76c7530802e09662da3b6e5131baa2d58bd657f69c776e48e18fd93d3db6262d06916ce86d28b5685bb2be74e1357e1a9eb1764e524ca95887c35e4ed401
diff --git a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch
new file mode 100644
index 000000000000..9b70eaca8e87
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch
@@ -0,0 +1,53 @@
+From 028c492c9d45ca29e2fbec79a203ba492016f15e Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmiklos@collabora.co.uk>
+Date: Fri, 7 Sep 2018 23:12:36 +0200
+Subject: [PATCH] Add an option to disable bzip2 support
+
+The explicit switch is still on by default, but this way it's possible
+to explicitly disable bzip2 support even if bzip2 is available on the
+system.
+
+This is useful if bzip2 is not needed, but would automatically lead to
+an unwanted dependency.
+---
+ CMakeLists.txt | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73a34855..879e0f21 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,7 @@ PROJECT(libzip C)
+ OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON)
+ OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
+ OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON)
++OPTION(ENABLE_BZIP2 "Enable use of BZip2" ON)
+ 
+ OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON)
+ OPTION(BUILD_REGRESS "Build regression tests" ON)
+@@ -186,15 +187,17 @@ IF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2")
+   MESSAGE(FATAL_ERROR "-- ZLIB version too old, please install at least v1.1.2")
+ ENDIF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2")
+ 
+-FIND_PACKAGE(BZip2)
+-IF(BZIP2_FOUND)
+-  SET (HAVE_LIBBZ2 1)
++IF(ENABLE_BZIP2)
++  FIND_PACKAGE(BZip2)
++  IF(BZIP2_FOUND)
++    SET (HAVE_LIBBZ2 1)
+ 
+-  INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
+-  SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY})
+-ELSE()
+-  MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled")
+-ENDIF(BZIP2_FOUND)
++    INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
++    SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY})
++  ELSE()
++    MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled")
++  ENDIF(BZIP2_FOUND)
++ENDIF(ENABLE_BZIP2)
+ 
+ IF (COMMONCRYPTO_FOUND)
+   SET (HAVE_CRYPTO 1)
diff --git a/dev-libs/libzip/files/libzip-1.5.1-options.patch b/dev-libs/libzip/files/libzip-1.5.1-options.patch
new file mode 100644
index 000000000000..0cca187d90a0
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-1.5.1-options.patch
@@ -0,0 +1,50 @@
+From b6e53cce5370fba88299f9ed2944ab8a7a4cef5c Mon Sep 17 00:00:00 2001
+From: Florian Delizy <florian.delizy@gmail.com>
+Date: Tue, 7 Aug 2018 22:09:32 +0800
+Subject: [PATCH] adding BUILD_TOOLS BUILD_REGRESS BUILD_EXAMPLES BUILD_DOC
+ options (default ON)
+
+---
+ CMakeLists.txt | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69e6548e..def25607 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,11 @@ OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON)
+ OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
+ OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON)
+ 
++OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON)
++OPTION(BUILD_REGRESS "Build regression tests" ON)
++OPTION(BUILD_EXAMPLES "Build examples" ON)
++OPTION(BUILD_DOC "Build documentation" ON)
++
+ INCLUDE(CheckFunctionExists)
+ INCLUDE(CheckIncludeFiles)
+ INCLUDE(CheckSymbolExists)
+@@ -234,10 +239,23 @@ ENABLE_TESTING()
+ 
+ # Targets
+ ADD_SUBDIRECTORY(lib)
++
++IF(BUILD_DOC)
+ ADD_SUBDIRECTORY(man)
++ENDIF()
++
++IF(BUILD_TOOLS)
+ ADD_SUBDIRECTORY(src)
++ENDIF()
++
++IF(BUILD_REGRESS)
+ ADD_SUBDIRECTORY(regress)
++ENDIF()
++
++IF(BUILD_EXAMPLES)
+ ADD_SUBDIRECTORY(examples)
++ENDIF()
++
+ 
+ # pkgconfig file
+ SET(prefix ${CMAKE_INSTALL_PREFIX})
diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild
new file mode 100644
index 000000000000..b0125575cca1
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.5.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multibuild
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bzip2 doc gnutls libressl ssl static-libs test"
+
+DEPEND="
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-options.patch"
+	"${FILESDIR}/${P}-bzip2.patch"
+)
+
+pkg_setup() {
+	# Upstream doesn't support building dynamic & static
+	# simultaneously: https://github.com/nih-at/libzip/issues/76
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DBUILD_EXAMPLES=OFF # nothing is installed
+			-DENABLE_COMMONCRYPTO=OFF # not in tree
+			-DENABLE_BZIP2=$(usex bzip2)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=(
+				-DBUILD_DOC=OFF
+				-DBUILD_EXAMPLES=OFF
+				-DBUILD_SHARED_LIBS=OFF
+				-DBUILD_TOOLS=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_DOC=$(usex doc)
+				-DBUILD_REGRESS=$(usex test)
+			)
+		fi
+
+		if use ssl; then
+			mycmakeargs+=(
+				-DENABLE_GNUTLS=$(usex gnutls)
+				-DENABLE_OPENSSL=$(usex !gnutls)
+			)
+		else
+			mycmakeargs+=(
+				-DENABLE_GNUTLS=OFF
+				-DENABLE_OPENSSL=OFF
+			)
+		fi
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}
diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index c320527af954..9ae2b6ca689e 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -3,5 +3,5 @@ AUX lockdev-1.0.3-fix-perl.patch 307 BLAKE2B aa1d9fb4131a0dcedbac0034e450ef47cac
 DIST lockdev_1.0.3-1.2.diff.gz 7642 BLAKE2B ee0da062e802d1112c49bf3dc4cdd1f3567eb11fd4173fe0170b079c2752231ee93e39201674d8e71a5970f4d7e6443406d159af63687bb37c8c72203132c4f9 SHA512 22fce119a8075a5b99a4ef83b31f62da64725067863949d4833b4d66f9e8e2d34920eee11c5acdcc14b1a643a21c56c39ec2adf31ae7fa489795dd5534eb7b6c
 DIST lockdev_1.0.3.orig.tar.gz 29150 BLAKE2B 812acf8b39507e7b00e8fd49e6828be2b6ba21811c3dca49f94543756d428f7fea9d8005e43574653180f71aa634b0f92a2c42380235c2584c6958ca38d499fb SHA512 4066985059add674ef8a9195e611db8ead89ca6191c04b7f29243b12a3448c82a3d0ea852bf99e26e1c71f163891acd198867650a5c4843f787e1944a8bc7f2b
 EBUILD lockdev-1.0.3.1.2-r2.ebuild 1886 BLAKE2B b5dbd5519a303548000d21001ffb0393eb5c3e20292f081bcf4a7d866e78018c548c4e04d6a41006c9317f202704b50afce49aba2c74a067f7c9146eb774453b SHA512 db7dc22da716a36af882c3a72c4ff023ffc56319a1d4cfdb5d976aeb1dedb7a3a50686a244a4794c4b5706f6d493d5bcaf5f802bd4a1682e5a9aa2b79b5ef756
-EBUILD lockdev-1.0.3.1.2-r3.ebuild 2099 BLAKE2B 90fae6b8f01df10fe09c49c80baa660d30589c6b70af7689d10e64963b3d73738e42cc9e0bb1703909687bf9efb239d691e7d7e58ff3bdfa881eec51787563e7 SHA512 16c3204214a669a626c5cfe1738a5155eaf31657fe4085dc51ab2fb1fcdf9c8e45cfa729dbc2d3d059dbc81db6600b6303d2ca9578bc708868325da8fa9f843f
+EBUILD lockdev-1.0.3.1.2-r3.ebuild 2094 BLAKE2B 6cb7a1be787cb756acb5562396c16bb4520f2d3ed03d99eb8073e91aba89f624cef5eb7c153d2c12404655341aa10f086b4b56c66119823675a363a702846e23 SHA512 86cda2c6c08394cb6dedee94c081bd07d46f55bc2a9960d1f5cfcfc58a9d2ab7bf3a5560632756f15972c6e7440b7645f0632f4cbef6495c38ceb0817ea7878d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
index 4f87d0d40218..826ad5142835 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="perl"
 
 DEPEND=""
diff --git a/dev-libs/ltxml/Manifest b/dev-libs/ltxml/Manifest
index 5cfa48b34369..e6f6b4963f6c 100644
--- a/dev-libs/ltxml/Manifest
+++ b/dev-libs/ltxml/Manifest
@@ -1,5 +1,5 @@
 DIST ltxml-1.2.5.tar.gz 1081135 BLAKE2B 8029284317aca2655f66d5724e8662f0defab9f947b562b33be71cc61a75186fd9c51729619fb1a576e205b5d36d83f6040684fa92ffb3af36a60d90a36d9a26 SHA512 b8cb5a17a35748b3c3df25ea01b97d41443f34ae3e086fa8b13e46b10edb653ad66a236ec88350b85a1879135e899e097f067628afc4db294d04314d1fd85fcb
 DIST ltxml-1.2.9.tar.gz 304050 BLAKE2B 607fdcdfd056784862d06a7c6d3ea980695cff429f843235a0f5d8ce981996e1e3028cf5d7cf6329f208fabd7021ad15bd3e70efec8500d529d802e30994b18f SHA512 1c0b965b7ed330069a23259bc937546a6a0eb639206a844b6c4d524acfaeb1ec6978467fa8e63c8430ca222cec04386368e7ce625ac829ea5be445e880b86ac9
 EBUILD ltxml-1.2.5.ebuild 648 BLAKE2B 339c07048b00245310c9323d40f8cb21944034790cd464e113d3bd3b62abe253ef905a81de0ca1bfcf30487f98241be2c42a3782093685c2759f5142a6872f6d SHA512 2f3e1048be21328ac9c838fee15802f2cdefee1266b5c76dc05da355898ac45285a40388de4825fe32fdfdf5aa3d9a75e7d0699f9c640e7a037d2fc65ee6f169
-EBUILD ltxml-1.2.9.ebuild 851 BLAKE2B 99bd803aa2fd49977222423aae2fc14e8deb02f981bdc981fe1f975743cc359a052f9264d96057e8162b55c490524f7dd67041df39c1a6f13badb365b3b15f2f SHA512 0a79bba7a9e0bdcc5611d573e5b4165cd349c8e78252752f2a2def8ff3ea76a12c5b3884b4eab2ab139748e612405f626fabecb2f5c1b53c565e5a2935cfb88a
+EBUILD ltxml-1.2.9.ebuild 845 BLAKE2B ca7eb8495977f308cb317176584f01ec2123ccd0046758d5bcd7f0c7cc332f4dc39d4f61cfbcb2756754a261ea61c7e51d06535e3696c2ecf415e361b24866ee SHA512 be471a2bf2afc1b5d3f981f984f862f1d13e75c7b8e33c4cf6574cfdbfdd0cb2a1421f4ed26abf9b2d7b010c813453605fc5420162374ec7e49e53aa05913b9a
 MISC metadata.xml 268 BLAKE2B 4ca0567bdd97196b8cb1cc66ed554fbbd99823935bf9b58e52013f678c148193f52dadcd4487e6f38df45790c6bacaa30676c8bd25a7672992ffc9e805e24c19 SHA512 c70be371eec365e07f54ce32fced749e5137228fabd7e087427f1ed6a75f8a1eb0668f4587054ccf1ee29ab12a75fd2f52bd2bef5bf2c20e36db7993b01b1903
diff --git a/dev-libs/ltxml/ltxml-1.2.9.ebuild b/dev-libs/ltxml/ltxml-1.2.9.ebuild
index 09755c5e6811..8c6dd381f0cc 100644
--- a/dev-libs/ltxml/ltxml-1.2.9.ebuild
+++ b/dev-libs/ltxml/ltxml-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI=ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ia64 ppc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index 264b8af8bf20..35df4e665c28 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -1,5 +1,5 @@
 DIST mathjax-2.7.0.tar.gz 24594403 BLAKE2B 7cadfe7565a7ebba3569fb298a097f07081926b843a06c3c32447757eb0a5d463d654f20c42821010c81c59819bb14fdc5e84a39e87106bb6808bd6c9ca52bb7 SHA512 2a7c2b4a4991485c18f78dda4115da05a31c1a2d952c403726e99d22fd26f166298199238ad482e53b63b5414be687f325b586f5ebe4e2d552447c929415b350
 DIST mathjax-2.7.4.tar.gz 25355532 BLAKE2B 0bed5224356757c64989de8b9355f5c2505f1fa951456c52caf1cc0a9b5a864633ce5299cc9b67b1e5c743e39bcb6aee787a76d6871fc998b614d62e12499f6f SHA512 cddc4c64c188620307f0ede3b0bc7ba071f78702ba6315426d8c83129543a6b81a3a9a115f88017e23b5094b7aefd934c39aeec9688419830e33f9fd0fb1de7e
 EBUILD mathjax-2.7.0.ebuild 1219 BLAKE2B d6a55b0baf2dece7e35e043db8be4f41cc3705b9a032ae18537e6d1a5abd21c179d428b7c6defb809de30505aefc62a04b60db93655fadea15cbe01f4371be68 SHA512 41c37e0d36ecc2ef1eff3936bd6b47d90644e6ad31f54d3276acde4a0bb15f8b1c169bdd749c59c8e0f1ae7f92681a5b68463a6b1a40d12dec1dab7b9f9df1a8
-EBUILD mathjax-2.7.4.ebuild 1217 BLAKE2B b143d806055aec729edf4dad1c32842d96cdc2314d3c7afb6d7590ca9b4941614dda8e3ffa5a7a7fef508cc66233d2228e22937b3f025345cd074f2ac6e39199 SHA512 b965414bcc49efa7d71de52e555950aecf892d23ccedfbdc4a0ccabf9063ddafcdd2e9825e7090812518aba14bc71e4d0fe6854ab2ed8070974d567c062d0fb8
+EBUILD mathjax-2.7.4.ebuild 1216 BLAKE2B 0ccca9312eb6aaaf82c31387f9fbc67a160a2620af79dc0f20e8bc246920da424a1c837a4d14678252427d8a06120d2e50767bb25b8d4325f7b8d90783fc2ea9 SHA512 b1d85236a3348c80835a81a6b2d30727e0ab7eea24d813862f38d70f7b6c2e82852048dd93e649ad5412c3680e26d650ceec8636e9f9c8aab987c215b1641130
 MISC metadata.xml 1030 BLAKE2B 8f3b54b726e2f135394cd6a0957d309070d3aba8fa7c40ef4b51ef8daaa0123b7f30f6cc793e2d93cef3c9f801267640444d7c604a3d6dcb277d9621ec6dd1a7 SHA512 aa7911df581513457da3e6f146e9d7d986c9b028698309ed42d1980f7bdd7a738dd6eb2a252ffbdd49fded3877e196c32b0a75f90fd1fd928b078429ed84565e
diff --git a/dev-libs/mathjax/mathjax-2.7.4.ebuild b/dev-libs/mathjax/mathjax-2.7.4.ebuild
index b73a21a61023..cd23b2b8e94a 100644
--- a/dev-libs/mathjax/mathjax-2.7.4.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RESTRICT="binchecks strip"
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 9ca1c01694c0..89c33a78d45f 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -9,6 +9,7 @@ DIST mpfr-3.1.5.tar.xz 1126668 BLAKE2B f902925036a4310e7b10461438bae5d5770b95ca6
 DIST mpfr-3.1.6.tar.xz 1133672 BLAKE2B ab8b87be9d29e9ae5807976f72d65e16cd3e5b4c2ffc4e5bd7829e664250b1969a1ec3928b3519cd75365692e23eadfd413a8116f8c77d6cd66183020b72b656 SHA512 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054
 DIST mpfr-4.0.0.tar.xz 1406244 BLAKE2B 2d1e356ac1f7119aa8896c438e7e30c4b316780d76fa2690e50482005e9ff5d6b5cd368d4c9a524df66ea3e7f2942c627329fa15be83402209c6e249cd1abd28 SHA512 9c9c4535f33fffd2126d1c290e5eeda7cd2804219244643f09c9a2d2acfa3d410d2cb1e4a7bb77cd86cffc2fac59c7f5d32c9910317cac37dbca474ab6d63808
 DIST mpfr-4.0.1.tar.xz 1412692 BLAKE2B 3e8d5cf558071571c21417088e74b8cb94a2e179667af41f734a68c7bd89d4beff245b9344c4c37d2f6558036a1a8c9ad3ea5ec8fbde16d2c7ebbf37a22cf424 SHA512 137ad68bc1e33a155edc1247fcdba27f999cf48ed526773136584090ddf2cfdfc9ea79fbf74ea1943b835b4b1ff29b05087114738c6ad3b485848540f30cac4f
+DIST mpfr-4.0.2.tar.xz 1441996 BLAKE2B 4c1a15208c2dc3dcc1424974de506198e9cc479c70255149876c7f541133499ada5c89f07393b120b7079e6bbaf8ea03e5e496e1350b295e687392a6e0341c1c SHA512 d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88
 EBUILD mpfr-2.4.2_p3-r1.ebuild 1497 BLAKE2B 7161fc539fd4de18e4c66a057bbddf9633e45a964fa628051c800a265140fdbea1652c3e8fa8ef1e9f156dcab58d8283761218382c5af7056dcbef2b63405342 SHA512 6634ef915f69bbd2ee2f27c01a4aef7f6c8e3258adc270fca97e55c8f2155fd66b6ab827c2152db1d9ce93aba7a96b884a05220dac3ae92c02b869efb8e9f6a4
 EBUILD mpfr-3.1.3_p4.ebuild 1812 BLAKE2B 488a0b5543cff2058fb64cb7164916caf22a81b0e931498d1f54d567c182fa846dbce4a838316c973d99c2715f9a5ed279bca94d9fe5cc189791fb162c01121c SHA512 95d57a2c819ba28565e00cbc9e8075f506e75bf685b8a8b4cbecb56abee8525b8b3adb070d1470dff6f7ee69b8547e77b312e64f6400c41120a4830ef92e6c50
 EBUILD mpfr-3.1.4.ebuild 1634 BLAKE2B 2c3ec81dbec054f865b81a5e16cafb0c4464ff6eca4fe034d328554087594112d90d64c76149c293a1d210e8ce0da7e39f55018512b8154bb5dbcc44271c411c SHA512 86aefae35f12481e03f5b45831e2c0ebc64060d9dfa7253b3ce2fffbdb08429c53c3fc5f0ed334b9fcae2fed6b74170a612494943db5423b9acf24c34b8d0f2f
@@ -16,4 +17,5 @@ EBUILD mpfr-3.1.5_p2.ebuild 1694 BLAKE2B 5fc3003fdde93f5d358af91b8e70483ad969f80
 EBUILD mpfr-3.1.6.ebuild 1613 BLAKE2B 395a98c009ac37dd9a66d1f5d6dceed463571235164946e2c6dd5dc15dd25e967f0c4832f5743a3a22e563a292b5dd4469e0d7ee3f5a4de10fcd84c0746dee00 SHA512 c39187e26caddce22e50724f2045d4e170f640d62085a6d19efcbecd77bd55a6632bb2076c174ee1ed41770a335921c3ced75b6737a9234feef6527b21dc2f4b
 EBUILD mpfr-4.0.0-r1.ebuild 1720 BLAKE2B 33b420b5be1b09b18a5f3f99bc574b84d81cae9979d26e6f937056a206e8b817c6f995cc01318bf443bda82967e4f0f2d3703806bdcd7e9539c50fffa58d1270 SHA512 7d8c0fd531d8de2a533282171b3183b6f9d9e518fb620ff5bd1ad7ff94cb8b8a897a780b2fb680244e6b963c704d109ba92aa718904c5af8cef6c0ef0e966dd9
 EBUILD mpfr-4.0.1.ebuild 1720 BLAKE2B 33b420b5be1b09b18a5f3f99bc574b84d81cae9979d26e6f937056a206e8b817c6f995cc01318bf443bda82967e4f0f2d3703806bdcd7e9539c50fffa58d1270 SHA512 7d8c0fd531d8de2a533282171b3183b6f9d9e518fb620ff5bd1ad7ff94cb8b8a897a780b2fb680244e6b963c704d109ba92aa718904c5af8cef6c0ef0e966dd9
+EBUILD mpfr-4.0.2.ebuild 1717 BLAKE2B a968d195fbda962ba195e65cc06e8f6a2dfb45443c8a0c669def2cec3f9266e16a6c4a1c9aa02397a4ed5e3bafb2cc2134fccc9ed519a4795346fae6631d58d1 SHA512 3a0b8f2fd1b0a65909bc0e07b3849223828a5b2df77b6dbe8dd6c38a11022092a8bf3759679eef7ac35bdc6bca983922e8ef9043eca5cbedca1f8730c240b660
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-4.0.2.ebuild b/dev-libs/mpfr/mpfr-4.0.2.ebuild
new file mode 100644
index 000000000000..02d1920bfc54
--- /dev/null
+++ b/dev-libs/mpfr/mpfr-4.0.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
+inherit libtool multilib-minimal preserve-libs
+
+MY_PV=${PV/_p*}
+MY_P=${PN}-${MY_PV}
+PLEVEL=${PV/*p}
+DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
+HOMEPAGE="https://www.mpfr.org/"
+SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/6" # libmpfr.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+HTML_DOCS=( doc/FAQ.html )
+
+src_prepare() {
+	if [[ ${PLEVEL} != ${PV} ]] ; then
+		local i
+		for (( i = 1; i <= PLEVEL; ++i )) ; do
+			eapply "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i})
+		done
+	fi
+	eapply_user
+	find . -type f -exec touch -r configure {} +
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
+	ECONF_SOURCE=${S} \
+	user_redefine_cc=yes \
+	econf \
+		--docdir="\$(datarootdir)/doc/${PF}" \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	rm "${ED}"/usr/share/doc/"${P}"/COPYING*
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 4)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 4)
+}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 819fcc62f65e..0ded05e9322c 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,9 +4,11 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
 AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03
 AUX nss-3.36.7-fix-cms.patch 15889 BLAKE2B d58e656215e805461bc43ec10c95d8646fcddb93bc3a9870cc4c406af7de3ab2f5e474bbbcfa53cd8d405f96dfddc393e880c9528e156f87a7951bcb4b693e5b SHA512 930b032538eaf76ba354767790a75566b34e83334a1d382d3583bcc31c3cd721d46da8f268903bce2950bf73d705933c7a3887107cbf9bc5caa717b14eb7ce72
 DIST nss-3.40.1.tar.gz 23311074 BLAKE2B 9cd723e983a3f70748b0734bb2a6cc1ddfa280f1c167c3b1b371a58900fb3d9b3bf3482293bb8614d39ffb538bcca815a2aedbe03d2d643731817452f82bc2ca SHA512 464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564
+DIST nss-3.42.1.tar.gz 23416408 BLAKE2B 9c008ce599f3cc4de50af3a32f680e16058a42df7a844aa8f151c729a1c783177d8410b0aa2ea9887f5e69a359d84b655b78808fd817b8ccdeae458d9c7b4488 SHA512 468e1d4ea9d2b832c7b8975443ee6fe2790b39cbbd9f8e3d8428a43f47cce0e81d5ca21e3566701b75bcd4af09110c0134e204b2850d30ecfd6347ec27e6e265
 DIST nss-3.42.tar.gz 23416008 BLAKE2B 4aaf31fbc13b57ef438cfd8ee0c42a681af6939c707a51a25cb551c120221a5b37b1471926e75920dc2a53466d2f47599973b6f53175d7e952b49527bf3f34a6 SHA512 ad22f4b2672b4f29c7dd5544cbb642d3ec4b451137ffde4f608ff7b9826c762caa885f4802e1df291d2067a291aae9ffa1cf7298af96e1c6afa019fc7c3935bd
 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.40.1-r1.ebuild 9501 BLAKE2B f743d2d9ec752b5c7bba215bef12c744ae91a92b547745c7d146f457e8ae3d805231643cd1579f7b0000e853305c94a2f26930f6b7009e0f79813cfb1962682a SHA512 b67cb7e84ac85aa5c74be19aca7186b1e082a3c0f736bf93ece7f8cbb310a40993bdc6d2d5aef64311de6e42ab6029c36acc4d8377500732b3a8358314f9a75c
+EBUILD nss-3.42.1.ebuild 9427 BLAKE2B 1397f9e77b881d76e0dd512441c4daa9edfe717e8197ece18baa619ed9320b0eed9fd8641ea4e85707f55833308500deaaec5116b08ef9021629ae0c9ef67e7b SHA512 c9d249473eef867e5c82cc6ee46b92f10819b8fdd00db122a7d03a772056dafa1e3a89c2a553c48a8fc882b8ac15fdb25520dfcef869325f834fe8eb5a057d78
 EBUILD nss-3.42.ebuild 9512 BLAKE2B d7a1b210f75113be775cbf68e775d2145617f5cfa5bf08c4f8b3fb778ed057b6d327dc251903a8df28a2f74d2f412a68349d0da8844ce484a2674ff3c6b67374 SHA512 9b50f6c04ecf157f9a934913d6d46bdc750f06f277e1c07ac459e6a6469c26ad8c0d0b7cc6a032454383ff87c0994ec1eb43e7f3ccb052356f845f194f750828
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.42.1.ebuild b/dev-libs/nss/nss-3.42.1.ebuild
new file mode 100644
index 000000000000..af7bfd8bc223
--- /dev/null
+++ b/dev-libs/nss/nss-3.42.1.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+)
+
+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/poco/Manifest b/dev-libs/poco/Manifest
index f59be82b70e5..b26475883e09 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -7,6 +7,8 @@ DIST poco-1.7.6.tar.gz 8044937 BLAKE2B ad9bf61eb00ce4e1ef5079e07be04ceff79bf823c
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
 EBUILD poco-1.4.6_p4-r1.ebuild 3448 BLAKE2B 8f15cfcb7f3ab49d75bf3dab8990dd48766391f0c20819efed6ec965b463a594ca0b2ec60030d224436deb9b1a1cb03298ad33c72f6e8b94fed28321a634140a SHA512 b3ef11fedf1a849d83f87b90fcf3be6d9a5d85b2981ceedda5eb699657bdaf150bc45e1451563e76f26f2b7a3e7fe82d9fe5d8790607fa9ef38dc70ce78e0815
 EBUILD poco-1.4.6_p4.ebuild 3384 BLAKE2B 82795ed8256b63859142d760d1c4999ab504be036d00bd2338058318bb7e864372c333822c3b3ede153aa4f4608a22e62d2c797269a10846ee120304fba1a9a2 SHA512 9365431a50298aadfa1d91d3d859dbddd8b3a028aacb4eeb4d01564d063a91d198da08bdb6e8f886b7dbe1ab4f9285fe5e5a334a471bb136b908cf89c4e3bc64
+EBUILD poco-1.7.6-r1.ebuild 3459 BLAKE2B fe1c70a9ce4c586d12de415839d7e4a5aa5697f03a454a9fa5f63a11b50f468201d73f4c35015a5647ac3461cd7cc76e53e2cc5395d1f0f17f12d0de4f498cd5 SHA512 0183d4d71578e8388e5502875bb6a42baec9519e2b1da7a560cc26cb3415aacd40ec30a337db3d02ea60d0e048ec51c2f931fcbf587f115f4337b9e5aa7e1af5
 EBUILD poco-1.7.6.ebuild 3300 BLAKE2B 33dc2684437edacfe8a5d10a896a1ee7d6a61884227f0b219f685a833bf858b6780364c3d2a4bb5df20378bb5505b2581486f10338011c18a40d40be1d6c9e2d SHA512 ee364da0aba59006680a7b399180384ded5072b65daea64e42b97ae207644f2137d45e4095bb3cde105eb8ed21f60e8513de7eb0f4acce6e69e6b281c9a0f257
+EBUILD poco-1.9.0-r1.ebuild 3722 BLAKE2B 723574fb374480e40b3edde419aa2a0da210505b5b005606da5305792e258db125c635ddc4761654824327b28f6f45dec0187eb3405541f38d5906ca7a4eb66c SHA512 64778f824f6d6410f01fc644d1129f3bf551bf74dc4d7fe1ecde0eadf88a8877e0bff0432113c37163659358bebcd8e811b6e273a6c0b7e15031af08791a17bc
 EBUILD poco-1.9.0.ebuild 3300 BLAKE2B 33dc2684437edacfe8a5d10a896a1ee7d6a61884227f0b219f685a833bf858b6780364c3d2a4bb5df20378bb5505b2581486f10338011c18a40d40be1d6c9e2d SHA512 ee364da0aba59006680a7b399180384ded5072b65daea64e42b97ae207644f2137d45e4095bb3cde105eb8ed21f60e8513de7eb0f4acce6e69e6b281c9a0f257
-MISC metadata.xml 2399 BLAKE2B 51e232e6cc89bc70510d74db1c6bee49039aab297db20572b1fe408cf8148ba43ad17768745283da06d178e46a3b811a9ba600206514fb9ac20d3a35d01de090 SHA512 fc80467849b42aa6ce51582512fc5f6f75b7e6502a90c96b5e6fba1115e347c46d173c77a6054d45c7fb75ec4f40e3e9d89c4c68f806fc8f7be52f9cb9aab66e
+MISC metadata.xml 2515 BLAKE2B e85987607f2d7d0fc4f957b797a9bd7406dd6224a4fa73bd054c31206e4ef1cdbe8b300d00efb4249ed0b21bb1c991340b746a3db3deea0c79c07dc7aae34458 SHA512 3f4ec81bc65b14a82b599d47ae2a2b80f58f35bf1138b469f2341e2262f9ed13c2ef286f0b5f4354d14a58fd50676a77f373adad86e056c45a427d8b784bd592
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index a2b0f1f2ac3f..f7a05b32b68d 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/metadata.xml
@@ -33,6 +33,7 @@ done quickly and working on the features that make their application unique.
 		<flag name="data">Database abstraction layer to easily send/retrieve data to/from various databases</flag>
 		<flag name="file2pagecompiler">Utility to convert ordinary files to Page Compiler source files</flag>
 		<flag name="json">Add JSON support</flag>
+		<flag name="mariadb">Prefer <pkg>dev-db/mariadb-connector-c</pkg> over <pkg>dev-db/mysql-connector-c</pkg></flag>
 		<flag name="mongodb">Add <pkg>dev-db/mongodb</pkg> support</flag>
 		<flag name="net">Classes to write network clients &amp; servers</flag>
 		<flag name="pagecompiler">Simple compiler translating HTML pages containing embedded C++ code into HTTPRequestHandler classes</flag>
diff --git a/dev-libs/poco/poco-1.7.6-r1.ebuild b/dev-libs/poco/poco-1.7.6-r1.ebuild
new file mode 100644
index 000000000000..0f6dc7386860
--- /dev/null
+++ b/dev-libs/poco/poco-1.7.6-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="C++ libraries for building network-based applications"
+HOMEPAGE="https://pocoproject.org/"
+SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
+REQUIRED_USE="7z? ( xml )
+	apache? ( net util )
+	file2pagecompiler? ( pagecompiler )
+	iodbc? ( odbc )
+	mongodb? ( data )
+	mysql? ( data )
+	odbc? ( data )
+	pagecompiler? ( json net util xml )
+	pocodoc? ( cppparser util xml )
+	sqlite? ( data )
+	test? ( data? ( sqlite ) json util xml )"
+
+RDEPEND=">=dev-libs/libpcre-8.13
+	xml? ( dev-libs/expat )
+	apache? ( dev-libs/apr
+		dev-libs/apr-util
+		www-servers/apache )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( iodbc? ( dev-db/libiodbc )
+		!iodbc? ( dev-db/unixODBC ) )
+	ssl? (
+		!libressl? ( <dev-libs/openssl-1.1.0:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	zip? ( sys-libs/zlib )"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${P}-release"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" )
+
+src_prepare() {
+	if use test ; then
+		# ignore missing tests on experimental library
+		# and tests requiring running DB-servers, internet connections, etc.
+		sed -i \
+			-e '/testsuite/d' \
+			{Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF}/CMakeLists.txt || die
+		# Poco expands ~ using passwd, which does not match $HOME in the build environment
+		sed -i \
+			-e '/CppUnit_addTest.*testExpand/d' \
+			Foundation/testsuite/src/PathTest.cpp || die
+		# ignore failing Crypto test since upstream does not seem to care,
+		# see https://github.com/pocoproject/poco/issues/1209
+		sed -i \
+			-e '/RSATest, testRSACipherLarge/d' \
+			Crypto/testsuite/src/RSATest.cpp || die
+	fi
+
+	# Fix MySQL detection
+	sed -i -e 's/mysqlclient_r/mysqlclient/' \
+		-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
+		cmake/FindMySQL.cmake || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPOCO_UNBUNDLED=ON
+		-DENABLE_APACHECONNECTOR="$(usex apache)"
+		-DENABLE_CPPPARSER="$(usex cppparser)"
+		-DENABLE_CRYPTO="$(usex ssl)"
+		-DENABLE_DATA="$(usex data)"
+		-DENABLE_DATA_MYSQL="$(usex mysql)"
+		-DENABLE_DATA_ODBC="$(usex odbc)"
+		-DENABLE_DATA_SQLITE="$(usex sqlite)"
+		-DENABLE_JSON="$(usex util)"
+		-DENABLE_MONGODB="$(usex mongodb)"
+		-DENABLE_NET="$(usex net)"
+		-DENABLE_NETSSL="$(usex ssl)"
+		-DENABLE_NETSSL_WIN=OFF
+		-DENABLE_PAGECOMPILER="$(usex pagecompiler)"
+		-DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
+		-DENABLE_PDF="$(usex pdf)"
+		-DENABLE_POCODOC="$(usex pocodoc)"
+		-DENABLE_SEVENZIP="$(usex 7z)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_UTIL="$(usex util)"
+		-DENABLE_XML="$(usex xml)"
+		-DENABLE_ZIP="$(usex zip)"
+	)
+
+	if ! use iodbc ; then
+		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		for sd in */samples ; do
+			insinto /usr/share/doc/${PF}/examples/${sd%/samples}
+			doins -r ${sd}
+		done
+		find "${D}/usr/share/doc/${PF}/examples" \
+			-iname "*.sln" -or -iname "*.vcproj" -or \
+			-iname "*.vmsbuild" -or -iname "*.properties" \
+			| xargs rm
+	fi
+}
diff --git a/dev-libs/poco/poco-1.9.0-r1.ebuild b/dev-libs/poco/poco-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..a00decb0b061
--- /dev/null
+++ b/dev-libs/poco/poco-1.9.0-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="C++ libraries for building network-based applications"
+HOMEPAGE="https://pocoproject.org/"
+SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl mariadb +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
+REQUIRED_USE="7z? ( xml )
+	apache? ( net util )
+	file2pagecompiler? ( pagecompiler )
+	iodbc? ( odbc )
+	mongodb? ( data )
+	mysql? ( data )
+	odbc? ( data )
+	pagecompiler? ( json net util xml )
+	pocodoc? ( cppparser util xml )
+	sqlite? ( data )
+	test? ( data? ( sqlite ) json util xml )"
+
+RDEPEND=">=dev-libs/libpcre-8.13
+	xml? ( dev-libs/expat )
+	apache? ( dev-libs/apr
+		dev-libs/apr-util
+		www-servers/apache )
+	mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= )
+		 mariadb? ( dev-db/mariadb-connector-c:0= ) )
+	odbc? ( iodbc? ( dev-db/libiodbc )
+		!iodbc? ( dev-db/unixODBC ) )
+	ssl? (
+		!libressl? ( <dev-libs/openssl-1.1.0:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	zip? ( sys-libs/zlib )"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${P}-release"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" )
+
+src_prepare() {
+	if use test ; then
+		# ignore missing tests on experimental library
+		# and tests requiring running DB-servers, internet connections, etc.
+		sed -i \
+			-e '/testsuite/d' \
+			{Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF}/CMakeLists.txt || die
+		# Poco expands ~ using passwd, which does not match $HOME in the build environment
+		sed -i \
+			-e '/CppUnit_addTest.*testExpand/d' \
+			Foundation/testsuite/src/PathTest.cpp || die
+		# ignore failing Crypto test since upstream does not seem to care,
+		# see https://github.com/pocoproject/poco/issues/1209
+		sed -i \
+			-e '/RSATest, testRSACipherLarge/d' \
+			Crypto/testsuite/src/RSATest.cpp || die
+	fi
+
+	if use mariadb ; then
+	        # Fix MariaDB detection
+		sed -i -e 's~/usr/include/mysql~~' \
+			-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
+		cmake/FindMySQL.cmake || die
+	else
+	        # Fix MySQL detection
+		sed -i -e 's/mysqlclient_r/mysqlclient/' \
+			-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
+		cmake/FindMySQL.cmake || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPOCO_UNBUNDLED=ON
+		-DENABLE_APACHECONNECTOR="$(usex apache)"
+		-DENABLE_CPPPARSER="$(usex cppparser)"
+		-DENABLE_CRYPTO="$(usex ssl)"
+		-DENABLE_DATA="$(usex data)"
+		-DENABLE_DATA_MYSQL="$(usex mysql)"
+		-DENABLE_DATA_ODBC="$(usex odbc)"
+		-DENABLE_DATA_SQLITE="$(usex sqlite)"
+		-DENABLE_JSON="$(usex util)"
+		-DENABLE_MONGODB="$(usex mongodb)"
+		-DENABLE_NET="$(usex net)"
+		-DENABLE_NETSSL="$(usex ssl)"
+		-DENABLE_NETSSL_WIN=OFF
+		-DENABLE_PAGECOMPILER="$(usex pagecompiler)"
+		-DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
+		-DENABLE_PDF="$(usex pdf)"
+		-DENABLE_POCODOC="$(usex pocodoc)"
+		-DENABLE_SEVENZIP="$(usex 7z)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_UTIL="$(usex util)"
+		-DENABLE_XML="$(usex xml)"
+		-DENABLE_ZIP="$(usex zip)"
+	)
+
+	if ! use iodbc ; then
+		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		for sd in */samples ; do
+			insinto /usr/share/doc/${PF}/examples/${sd%/samples}
+			doins -r ${sd}
+		done
+		find "${D}/usr/share/doc/${PF}/examples" \
+			-iname "*.sln" -or -iname "*.vcproj" -or \
+			-iname "*.vmsbuild" -or -iname "*.properties" \
+			| xargs rm
+	fi
+}
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index c4248ed1d46b..23775a36674b 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -4,5 +4,5 @@ AUX protobuf-c-1.3.0-restore-protobuf-2-compatibility.patch 1182 BLAKE2B b05104b
 DIST protobuf-c-1.3.0.tar.gz 488443 BLAKE2B 8eca559ad06aaa5cb09984b3d2e7c5767cd341c2e439b94c2d219226c612992808da091d01f5e0ad5f14e47292d4a621037953b58a5bea827e7c22837234ffe6 SHA512 ba49bf45a9ae93d41f200f4f18c4f9469c63fcc2a2392b3b45f083c378a6876891890448ceba216083ad351aa35f4669cd920973f53e5780de9ec4c8f61279bb
 DIST protobuf-c-1.3.1.tar.gz 498779 BLAKE2B f9ecb2cccd8e01a2ab5bd797883f245db418a76ac73ba3e756e997e944637732d45b3fca2a45d3caf4cd89f35259180fa05e64b8b02b63537005420f2233ba37 SHA512 b32920130b4be5e8a8373c2ca37ffe7eb263accf163d93e25a9eb4b6336ec40b05dda2458fe8f0c3cbcf6e0e08e9541fdff004d696f30a5d135b7a3bdca8b2c3
 EBUILD protobuf-c-1.3.0-r1.ebuild 1012 BLAKE2B 77fb5f79db19f8d814ae0a309e5c0725e4ab25fce3d7ef1ba5db5feed093d0261adb84b3095f563e2e55bf5c07fae08ebae67c1eddf6be52b74a11299fe460ac SHA512 c3d469dd035e0760cb1902bd37ca61de23dcf76fe2107d000755cd52ae8b0576cf7d6d6fc736a128340dcd977267cc3771226eb6c54d1997cb8199d5c874ecb8
-EBUILD protobuf-c-1.3.1.ebuild 948 BLAKE2B 733a6a4b8fb3ef072224a521c47847b1cda3805b6ea28fee4a646239b5746070f4418347361c903c90f21fc4ff14165745e91dfc278adfee4ec9c0ced99de817 SHA512 7f6da8206476a490d59c02a1c7cc541fd32cce18be0032c01247a939e722371945642ab60c05b018365fe0a5f20d18a61249aa7a9c2b788110a45bd3acdef112
+EBUILD protobuf-c-1.3.1.ebuild 942 BLAKE2B e91c563dd5e888a52fe2aea083744857520122c93677c6982f81957d066d33749d1d7c9a23a3b259c567dc33d41e9d5d348ec3bc0ccaed6cd3bafefc8395ef3a SHA512 97905204cef01510e77117d225fae77389b5ac08070f7d94384e29b1a92487bfaf2b0e317b7eafc00a9fe21345c0399279e8912402da36d4a07eabea8edee309
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild
index bc235c7da92d..937881532388 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="static-libs test"
 
 RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index faf9a09795af..d7cea8c88dcc 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -2,7 +2,7 @@ AUX pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch 1670 BLAKE2B f5e44
 AUX pugixml-1.9-always-install-the-pkg-config-file.patch 2820 BLAKE2B 768af20490d163f581a4c683426055fe50fee716e29124d4af28d1a347dbb4e48ff4ea95eab93820ec69d875ece957f66977ff68288b452ba20d2151b9c8c78d SHA512 5ce40e7838ec950902a02b74ebd81958ff821e0dc0a2d8be8d65e194c40c32056f137a8cdbbfa9beaf43665f261c3a8db18e8f6485c3b903f7e59840702ee250
 AUX pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch 1641 BLAKE2B 281f24717276e7e21d380d048e6e6896fdc89de88f1ee8745b9880b0c39d5c0043af6f408bd2bfb6dbbea1ef3e516635ea486ed1f247e5b5ef19f7c7e01358a0 SHA512 60a1b80b26d663cccc2da4ed3b2fa631ffe1dd09a62d7e42a00d28844cb097be6c682aa6ecf92e2ce3d9c20569e23d2f1e8133af6c1eb4ceb3f99692fa5c1623
 DIST pugixml-1.9.tar.gz 377369 BLAKE2B 39b5b0d63a20e9c15c5634e56f82207aed63843d252900db94dbf06d100d03916a16523ccb9de433cc94ded4a9e9d1dc11f47bfd6fd75e348a9a2af31c305db6 SHA512 853a9d985aae537391c6524d5413ef4de237d99d96cc58ea7fe7152f786df1e408cdacd2e4387697e23c3e67cdc1d42b29de554501309eae16d86edd0e24785f
-EBUILD pugixml-1.9-r1.ebuild 894 BLAKE2B 00ce29f0fead8e018b103411a3f15dc0b54d806bd1e648c3250b6b6995003db35aaeac9bf4f751bd104cfa5ace392612c70ddf183dfa20359e9890bc23ff6a23 SHA512 66fb1f82736c84ff63b2f5d7359120806f2a540a1c5f54606bd286cea88377af13d3913e556f6fa032057ab8ec5737edb18a13354753797948ca8be7c53e11db
+EBUILD pugixml-1.9-r1.ebuild 890 BLAKE2B 192acbaaa2368481408deea728360e8265a68740da4f112e3f0588253d0bc3217a7a85fe45622e647345117c67bbfa8fda1c18f7336490f6a4fec77d29609509 SHA512 9d967366b2cf73d1ca9e852a6b4e202265d65a4e080d7b8055352fe6a545784a3b9619595905a7765735a9a66160967d966b5b7f7fb7fe0815ca40a5bbd547c9
 EBUILD pugixml-1.9.ebuild 595 BLAKE2B fdcea3a006480c5ddf8c60ad27d01be9c75b6791409809a39bb1985b881e62269cf3b387ece63ff1b0bd123cf85df06713f78ee636bf768e0f3d6e01414eafbe SHA512 e0f17a0ee26983ddc62cd9b751868e0abe1e8272957a981df199b324e93653f2a4275fd45d8736bc2c02331a672794178d3f11d4823cc0b28de2106e62de2935
 EBUILD pugixml-9999.ebuild 682 BLAKE2B 43d98ba135daff2413a0505a8ea22efe483bbdba1e2b8cdc7bb96f70dd0605e516aa13c9e42a74008d0dcdfc0b0a5ad01d9e1bf71bb4dede49a6026493f9423e SHA512 02030b482bf1c8a62b16300139a84d9419a5d303802222703efce893c4a51532a12ab8bad5c8ee75d6a47b58d184851b19cea24af6e37605160bb23d23114234
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.9-r1.ebuild b/dev-libs/pugixml/pugixml-1.9-r1.ebuild
index 93ca3d730441..990a2b74c5c3 100644
--- a/dev-libs/pugixml/pugixml-1.9-r1.ebuild
+++ b/dev-libs/pugixml/pugixml-1.9-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/shhopt/Manifest b/dev-libs/shhopt/Manifest
index 2c908cdae689..5665dbf5b47b 100644
--- a/dev-libs/shhopt/Manifest
+++ b/dev-libs/shhopt/Manifest
@@ -1,5 +1,5 @@
 AUX shhopt-1.1.7-build.patch 1884 BLAKE2B 1854a892ddc14d7202efbb4ebf20778a10ae1c490a40b28157e313c711fb946a925f61a71cc2f3919f6f55718636d05486e79e89f730575528bc3b0d2894fa34 SHA512 79eca8ada571f2f514d540a4c52fdf9503764f67422173bff160ed3ca04b0578c0a88a147234ffaad7a5ba94ab7d265785277062b25438abb888c92fab99d4a8
 DIST shhopt-1.1.7.tar.gz 9923 BLAKE2B 4f9fb23a67c03caf6c56227729a681eac3ee9c78e16f56d6fedd2b1cdbe56471150d9e91ecf84945348078d03102aa7e7cc98b4cf11dda6f5da79d1edc48b96d SHA512 bd985d50e87808b5c6993496ba3e7c255d47895d90e108f03fd72bb273e786730898048af3b30ca29cb5dbd058f2ea178ca73b6362211c50aa0eb75f743b5ec8
 EBUILD shhopt-1.1.7-r2.ebuild 755 BLAKE2B b7dfa83327287fc7864412c98ad5371b02fbeb728638a0ce061a88a05479485e9983d9a4011fa0fad0449b65b55f2e47540906fd38f3a0c6a5764d60744b8eea SHA512 de5d809cc761dadc3cc74dd2b8abf83c8bc77dbdc689f172babfe47b4591beb9e8a87c97b0716f3b3fa2f704b7ec0e2c21321ac9f0168f615a57d65dee373e4d
-EBUILD shhopt-1.1.7-r3.ebuild 666 BLAKE2B 8f97412b4694bea2d26542ba2e819dd3d7756d75bc86e988ae70c9a96fb655193accd3ed8c2ad50196ffe582c5f85e6af6ea80c468d5b1afdf469c2c05e9a593 SHA512 4c6b28dc9d047d0ffd069ae01d75ef485c54fb640e7bbbba3bdf3d8826d50f9377603a3b2557a35e31cf1d830d02a1bc162c196de218b8941a48b59b66d1e91f
+EBUILD shhopt-1.1.7-r3.ebuild 662 BLAKE2B 56a4d961a7d84c4d9bf2f5ccc88cc3a53dc9e30c67e7b1955251c17109234da934cb4582ce4cdd8224097270d9f05db2e5d9e49cd5a1a3a3b2870622abad5959 SHA512 46ce536eef3aec9ba687d6e397da3ad9230f44e1f5ab0a9b44fca867291c1d680f63005c6281e2d93962ba20a358497ead8761e77999625bc919aa7c81eabca0
 MISC metadata.xml 341 BLAKE2B 738802ec66db2e5052eb57b90dd0076cca1afbdca62fa325f920f0ec6f4ff4b78f886402783ad6f97c7b10e4e2ec10bbaf1bf2bc8823bd48d048c35141a6cb77 SHA512 276ee6e17baeb1981c1c912b4f281d7eb71b171492d00d5ce522c3d6defbba4eef3dd87b43d4ec02eda21cfe148f2b0dcbe04d7dbd9a42918168844b563427f4
diff --git a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
index 83fb8b878ace..abe600d47493 100644
--- a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
+++ b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://shh.thathost.com/pub-unix/files/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 
 PATCHES=( "${FILESDIR}"/${P}-build.patch )
 
diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest
index 0c3305748e6d..56df973ebbc0 100644
--- a/dev-libs/sway/Manifest
+++ b/dev-libs/sway/Manifest
@@ -1,8 +1,10 @@
 DIST sway-0.15.2.tar.gz 5398956 BLAKE2B 6bb527e802b7837ef39cb1e29597d55fd33831231dbfb7f12225e50c38e49ae17d8bf2eb43672c195c6e074986d254b1680bac7c9d60b80b84feaf07e09718df SHA512 c457ace514f5c69ebd366d313cce93a76b199bb51c7540debc9c0586bff490401e6374f9725c784474afdfcca15bcab686a972c6c178117e45e2de83825ed370
 DIST sway-1.0_beta1.tar.gz 5444424 BLAKE2B b2803b6770ac3fbb3c21b892a208008e60780b6002e983e6d144d4f97e04992d3a3e5589abe36042221d67a107e31f5e76ae193cbf3e36c71fcf027095140944 SHA512 745b16be7641446c54e1b8777be1f8a26e8275f7826590f594bf4a2001a6de42e394b602e1ccd26a1e8ebe256fde6f9b393f5560a1dd0a610867819076645c69
 DIST sway-1.0_beta2.tar.gz 5454362 BLAKE2B 2cb7f3042a53879c962e7204917765b4a7a2e90f2a6a7eb6bbb63383e31d7526e71ad7ac4edd708c47a31f3166f70c1633719c9cddf5b751327da79b523d6780 SHA512 532acb6f1510578b7d9d222f04ff8104c836428ef215ddb6d7181839231d65101b3d47c8389a38f14cf59692116495b60759062ebd797edf83cf77aebaac379f
+DIST sway-1.0_rc1.tar.gz 5461910 BLAKE2B a9b3a14dfbb40a616b58fce896f0088dfc722e942129e12e7dae3f2121cb84ffcd565902ee49712275e01d6b6a344642d85d8cf394a35b151725dcc94d19b40d SHA512 6532bae679774fcdb1bcc3044740ff5c56f5f6a007a08e910f4d9ee43ac0488be7666a87106b493923432f975088c90ff47369fa1a01c5e1cb67d3a1f9b74bce
 EBUILD sway-0.15.2.ebuild 1925 BLAKE2B f6c56c97ce70d2b01ad6b836894faccff11f0ed74a782ac4621b1ce544c0f167b1a632835842cc5ac97a6ea8c897f50f1b06a8fda5d33e279ebd62213a0eef97 SHA512 7fb00b02563b71dc818d46a7211687499eac1cd6a677a13d76b8e62f0c3394c4fe3a6fbf1e98dc1b36d9d7141e2410dc12e261832f71828612418d03664a22b2
 EBUILD sway-1.0_beta1.ebuild 2512 BLAKE2B 11cc39dab4ce22ffe0e7103e052e2c4c039f0123347b4c92f6d09d45385619ee7f1b9d25d6ebe7de0c24352cdf46b3aac50abceae879cae7049e79d699e15fb2 SHA512 2c06f38eda3e672adfeb847e7d6f92870e15e4f100746265d03d062d01f372f8c84a60877a53d5f6d212c8c106888bb62d8ce630b8fdcbac2afe2d1f6c29fd6e
 EBUILD sway-1.0_beta2.ebuild 3023 BLAKE2B cfd076509a8d914293011e28b176663ea64678d466b31814f3daa8ab0a848fb32adbfb149b531559a64929c5bf8c3149c399ee4eaa6be9d0ddda8629ef3d8015 SHA512 09985ae6bcaa3a12f56791034af182fccce1b109041863fbb6a5ae5a1f1d034c25a6fc0c16fd1b2c492be7e01d6bcd08e3e90591729bf7e475cfb7467aa1643a
-EBUILD sway-9999.ebuild 2994 BLAKE2B f641bd42370747f47e4a079fe4fd7e9ac9fda74b1b42f6ca85b84e40faa51f982a286fe9f4268ec98be41667d74bad87f622a69525c4305e638a01183d2a035b SHA512 e685c535a3edcb35508f828043b6ec92d2f3cb925cdeea3c4dc784ce3e27cc99996ec75d838a2d9688862f16fca1d8e02db4b1bbcd261473c24a3fe9f6fd7ffa
-MISC metadata.xml 2669 BLAKE2B 398de74534eb7b959b61bb37665191d209f0b69351065756afa78d5247028402ad462d47399070b6093741e17a64aeaa7a21e34de55a22c5992c4972d009fb30 SHA512 6e83d7727329bbffa21dea9dc304e34d58fe1feb442ef5a808cb08d1d7949362e7a5eee26e67f2fc0be72dec184abad7e2fb743343157b66641d96915cc78626
+EBUILD sway-1.0_rc1.ebuild 2839 BLAKE2B f678b2a22f5c91f80a43306b943bda22b5a1a80b409e4efc0a6b744589898f2c6fcf880774bff509a8da3886d8a3b03bb2c952e14b6746a1a30a6c55102a482e SHA512 27d90cf3ca8341b573be8c40da8fc7534df8903b0e2911cf984cadb9af0f764b44f1913e4a68de22edd0f7d1376004d969cea69a1c6b547f436c08d9ea50f199
+EBUILD sway-9999.ebuild 2839 BLAKE2B f678b2a22f5c91f80a43306b943bda22b5a1a80b409e4efc0a6b744589898f2c6fcf880774bff509a8da3886d8a3b03bb2c952e14b6746a1a30a6c55102a482e SHA512 27d90cf3ca8341b573be8c40da8fc7534df8903b0e2911cf984cadb9af0f764b44f1913e4a68de22edd0f7d1376004d969cea69a1c6b547f436c08d9ea50f199
+MISC metadata.xml 2861 BLAKE2B 171bbc535d23e1837289cfe4cd1030f5094ec229276dd8ef1253a1959c118979a3faa2a1d47168375c6f901cb9ff05cfb65d8148140574eac932a02129b10b0f SHA512 8fdfd266c750edf35de7088e89488358272ad819bba539aa0f75f5bd01fe021c60e758080a0d45cade9a52969d8ddf16b70ab63ec6243a8b9ba7f6ddbf9cb2d0
diff --git a/dev-libs/sway/metadata.xml b/dev-libs/sway/metadata.xml
index cb1a5f1eeef6..ebb759791eb7 100644
--- a/dev-libs/sway/metadata.xml
+++ b/dev-libs/sway/metadata.xml
@@ -6,6 +6,10 @@
 		<name>Aaron Bauman</name>
 	</maintainer>
 	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>hilobakho@gmail.com</email>
 		<name>Mykyta Holubakha</name>
 	</maintainer>
@@ -26,6 +30,7 @@
 		something else.
 	</longdescription>
 	<use>
+		<flag name="clipboard">Install 'wl-clipboard': clipboard management</flag>
 		<flag name="elogind">Enable support for rootless session via elogind</flag>
 		<flag name="filecaps">Use Linux capability SYS_CAP_ADMIN rather than set*id for sway binary</flag>
 		<flag name="fish-completion">Enable fish completion support</flag>
diff --git a/dev-libs/sway/sway-1.0_rc1.ebuild b/dev-libs/sway/sway-1.0_rc1.ebuild
new file mode 100644
index 000000000000..95621d2f0721
--- /dev/null
+++ b/dev-libs/sway/sway-1.0_rc1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils fcaps meson
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/sway.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/sway/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="bash-completion clipboard doc elogind fish-completion +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+	>=dev-libs/wlroots-0.3[elogind=,systemd=,X=]
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.6.0:0=
+	dev-libs/libpcre
+	dev-libs/wayland
+	>=dev-libs/wayland-protocols-1.14
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	sys-libs/libcap
+	clipboard? ( dev-libs/wl-clipboard )
+	elogind? ( >=sys-auth/elogind-239 )
+	swaybar? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	swaybg? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	swayidle? ( dev-libs/swayidle )
+	swaylock? ( dev-libs/swaylock )
+	systemd? ( >=sys-apps/systemd-239 )
+	tray? ( >=sys-apps/dbus-1.10 )
+	X? ( x11-libs/libxcb:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/wayland-protocols
+	doc? ( >=app-text/scdoc-1.8.1 )
+	virtual/pkgconfig"
+
+FILECAPS=( cap_sys_admin usr/bin/sway )
+
+src_prepare() {
+	default
+
+	use swaybar || sed -e "s/subdir('swaybar')//g" -i meson.build || die
+	use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die
+	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
+	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bash-completion bash-completions)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use wallpapers default-wallpaper)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dtray=$(usex tray enabled disabled)"
+		"-Dxwayland=$(usex X enabled disabled)"
+		"-Dwerror=false"
+	)
+	if use swaybar || use swaybg; then
+		emesonargs+=("-Dgdk-pixbuf=enabled")
+	else
+		emesonargs+=("-Dgdk-pixbuf=disabled")
+	fi
+	if [[ ${PV} != 9999 ]]; then
+		emesonargs+=("-Dsway-version=${PV}")
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow sway to access input devices!"
+	local dbus_cmd=""
+	if use tray; then
+		dbus_cmd="dbus-launch --sh-syntax --exit-with-session "
+	fi
+	if ! use systemd && ! use elogind; then
+		fcaps_pkg_postinst
+		elog ""
+		elog "If you use ConsoleKit2, remember to launch sway using:"
+		elog "exec ck-launch-session ${dbus_cmd}sway"
+	fi
+}
diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
index 14be762b4b73..95621d2f0721 100644
--- a/dev-libs/sway/sway-9999.ebuild
+++ b/dev-libs/sway/sway-9999.ebuild
@@ -1,30 +1,30 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-if [[ ${PV} == 9999 ]] ; then
-		EGIT_REPO_URI="https://github.com/swaywm/sway.git"
-		inherit git-r3
-else
-		# Version format: major.minor-beta.betanum
-		SWAY_PV="$(ver_cut 1-2)-$(ver_cut 3).$(ver_cut 4)"
-		SRC_URI="https://github.com/swaywm/sway/archive/${SWAY_PV}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/sway-${SWAY_PV}"
-		KEYWORDS="~amd64 ~x86"
-fi
-
 inherit eutils fcaps meson
 
 DESCRIPTION="i3-compatible Wayland window manager"
 HOMEPAGE="https://swaywm.org"
 
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/sway.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/sway/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
 LICENSE="MIT"
 SLOT="0"
-IUSE="elogind fish-completion +pam +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion"
+IUSE="bash-completion clipboard doc elogind fish-completion +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion"
 REQUIRED_USE="?? ( elogind systemd )"
 
-RDEPEND="~dev-libs/wlroots-9999[systemd=,elogind=,X=]
+RDEPEND="
+	>=dev-libs/wlroots-0.3[elogind=,systemd=,X=]
 	>=dev-libs/json-c-0.13:0=
 	>=dev-libs/libinput-1.6.0:0=
 	dev-libs/libpcre
@@ -34,18 +34,20 @@ RDEPEND="~dev-libs/wlroots-9999[systemd=,elogind=,X=]
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-237 )
+	sys-libs/libcap
+	clipboard? ( dev-libs/wl-clipboard )
+	elogind? ( >=sys-auth/elogind-239 )
 	swaybar? ( x11-libs/gdk-pixbuf:2[jpeg] )
 	swaybg? ( x11-libs/gdk-pixbuf:2[jpeg] )
-	swaylock? (
-		pam? ( virtual/pam )
-		x11-libs/gdk-pixbuf:2[jpeg]
-	)
-	systemd? ( >=sys-apps/systemd-237 )
+	swayidle? ( dev-libs/swayidle )
+	swaylock? ( dev-libs/swaylock )
+	systemd? ( >=sys-apps/systemd-239 )
 	tray? ( >=sys-apps/dbus-1.10 )
 	X? ( x11-libs/libxcb:0= )"
 DEPEND="${RDEPEND}"
-BDEPEND="app-text/scdoc
+BDEPEND="
+	dev-libs/wayland-protocols
+	doc? ( >=app-text/scdoc-1.8.1 )
 	virtual/pkgconfig"
 
 FILECAPS=( cap_sys_admin usr/bin/sway )
@@ -55,10 +57,6 @@ src_prepare() {
 
 	use swaybar || sed -e "s/subdir('swaybar')//g" -i meson.build || die
 	use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die
-	use swayidle || sed -e "s/subdir('swayidle')//g" -e "/swayidle.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swayidle/d" -i meson.build || die
-	use swaylock || sed -e "s/subdir('swaylock')//g" -e "/swaylock.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaylock/d" -i meson.build || die
 	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
 		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
 	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
@@ -67,13 +65,22 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
+		$(meson_use bash-completion bash-completions)
+		$(meson_use fish-completion fish-completions)
 		$(meson_use wallpapers default-wallpaper)
 		$(meson_use zsh-completion zsh-completions)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use X enable-xwayland)
-		"-Dbash-completions=true"
+		"-Dtray=$(usex tray enabled disabled)"
+		"-Dxwayland=$(usex X enabled disabled)"
 		"-Dwerror=false"
 	)
+	if use swaybar || use swaybg; then
+		emesonargs+=("-Dgdk-pixbuf=enabled")
+	else
+		emesonargs+=("-Dgdk-pixbuf=disabled")
+	fi
+	if [[ ${PV} != 9999 ]]; then
+		emesonargs+=("-Dsway-version=${PV}")
+	fi
 
 	meson_src_configure
 }
@@ -81,18 +88,13 @@ src_configure() {
 pkg_postinst() {
 	elog "You must be in the input group to allow sway to access input devices!"
 	local dbus_cmd=""
-	if use tray ; then
-		elog ""
-		optfeature "experimental xembed tray icons support" kde-plasma/xembed-sni-proxy
+	if use tray; then
 		dbus_cmd="dbus-launch --sh-syntax --exit-with-session "
 	fi
-	if ! use systemd && ! use elogind ; then
+	if ! use systemd && ! use elogind; then
 		fcaps_pkg_postinst
 		elog ""
 		elog "If you use ConsoleKit2, remember to launch sway using:"
 		elog "exec ck-launch-session ${dbus_cmd}sway"
 	fi
-	if use swaylock && ! use pam; then
-		fcaps cap_sys_admin usr/bin/swaylock
-	fi
 }
diff --git a/dev-libs/swayidle/Manifest b/dev-libs/swayidle/Manifest
new file mode 100644
index 000000000000..131312becde3
--- /dev/null
+++ b/dev-libs/swayidle/Manifest
@@ -0,0 +1,3 @@
+DIST swayidle-1.2.tar.gz 9136 BLAKE2B e88eec89007deed59df30f3f89111352b8a1ed464141783cb25b0d0a484e8ea4cfd611f1bd80d9420368d7912979eb0536a6aa583d24504d32bac797a898dba5 SHA512 2539e80a45163bb3e76f7b41f6fd6a1d73d194b7e466f63178b5087d05470fceafba38a26d592a534a01b992a2c0cf0f8fb83805cdf41ee956fea5136cc8fe89
+EBUILD swayidle-1.2.ebuild 1167 BLAKE2B 53b569697e82f4b9276210d491c4dc64fcb6df2b034b0e30bad8a249d6f2c3f56d199017bc747c1249b29c7b061fe40b108f5a2edb368bd318203e3c156ce560 SHA512 412baa2a5bb27128dc7afa35f25c98b0cd2ffda8dcf8b71903bad8f4a660f460dcd5671487cbd22f929e579ada93102d385a5adfa5f750e75aee8de46f585383
+MISC metadata.xml 577 BLAKE2B 21662f2b7da606c210139fcd32c991789d77508f046bf6758e77da0920382771fbaf4d61a63fc71eb5d5ebb7f099e1f2681b68d13626d020e23e3c4ade9c1387 SHA512 8c4511406113b93b6c82475ce32d0275ce86b4348ba4b02f1ef341bc7d83ab03c893530c4af09e830c8a68cbb3e44651b9606684ebbf311b14945bd280347fd6
diff --git a/dev-libs/swayidle/metadata.xml b/dev-libs/swayidle/metadata.xml
new file mode 100644
index 000000000000..b8a1df1de5c9
--- /dev/null
+++ b/dev-libs/swayidle/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Sway's idle management daemon, compatible with any Wayland compositor which implements the KDE idle protocol.
+	</longdescription>
+	<use>
+		<flag name="elogind">Enable support for rootless session via elogind</flag>
+		<flag name="fish-completion">Enable fish completion support</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/swayidle/swayidle-1.2.ebuild b/dev-libs/swayidle/swayidle-1.2.ebuild
new file mode 100644
index 000000000000..e7c0885af584
--- /dev/null
+++ b/dev-libs/swayidle/swayidle-1.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Idle management daemon for Wayland"
+HOMEPAGE="https://github.com/swaywm/swayidle"
+SRC_URI="https://github.com/swaywm/swayidle/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd elogind zsh-completion bash-completion fish-completion +doc"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="dev-libs/wayland
+	elogind? ( >=sys-auth/elogind-237 )
+	systemd? ( >=sys-apps/systemd-237 )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.14
+	doc? ( app-text/scdoc )
+	!<dev-libs/sway-1.0_rc1
+"
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex doc enabled disabled)
+		-Dzsh-completions=$(usex zsh-completion true false)
+		-Dbash-completions=$(usex bash-completion true false)
+		-Dfish-completions=$(usex fish-completion true false)
+	)
+	if use systemd ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
diff --git a/dev-libs/swaylock/Manifest b/dev-libs/swaylock/Manifest
new file mode 100644
index 000000000000..c1bc6f6f451c
--- /dev/null
+++ b/dev-libs/swaylock/Manifest
@@ -0,0 +1,3 @@
+DIST swaylock-1.3.tar.gz 32848 BLAKE2B 81ed50839bcb0139e7fc2081bd37e738f3e6ef23e96a5108d1acf56cc3425285f7382576a54201f1bf188883b1da06492074c091877af13832c0140e4e6099fd SHA512 723d758d76f076f3f1539ea0d651f6ad2562659c72eef7e895d7827a0be21db663652fe4ce2609065aff45ff20230879599868cff327ab52b896330ca04d78c4
+EBUILD swaylock-1.3.ebuild 1113 BLAKE2B 6f25e1118e36c9891f3ed28584c864a80b4cb189405926af2cb686b7d6027dac11b14ffb915772f88be6ee5c7dfb65e31151b3bccec4eb1b32b5f8efe9b9ae3a SHA512 b10d4429010ea4f645624bb4cc9bd0a8a728e1b17848c63e7f119629b219086a1abaa7f8df994bb33f24b1b2f9e7ba8653a8d25446a69c6e8e13d11d43af4646
+MISC metadata.xml 570 BLAKE2B 954003d784e88ba07c283ca3685c9badb503d4860531a73de3bb1463ca94767002336ac0815b7ba31a45a8db5d26257b9029c134fd482e238438b70b06edfbb4 SHA512 158a487be5b46cbcba3fa9db92a7dac416a1b383637102d9007111bf99027c47bb6e24bc8f5858b7eca450df939646293cfdc0b167b272db0179f26930246e88
diff --git a/dev-libs/swaylock/metadata.xml b/dev-libs/swaylock/metadata.xml
new file mode 100644
index 000000000000..4155370f2f7c
--- /dev/null
+++ b/dev-libs/swaylock/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Swaylock is a screen locking utility for Wayland compositors.
+	</longdescription>
+	<use>
+		<flag name="gdk-pixbuf">Enable additional image format support via the <pkg>x11-libs/gdk-pixbuf</pkg> library</flag>
+		<flag name="fish-completion">Enable fish completion support</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/swaylock/swaylock-1.3.ebuild b/dev-libs/swaylock/swaylock-1.3.ebuild
new file mode 100644
index 000000000000..c6e0258c8c52
--- /dev/null
+++ b/dev-libs/swaylock/swaylock-1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Screen locker for Wayland"
+HOMEPAGE="https://github.com/swaywm/swaylock"
+SRC_URI="https://github.com/swaywm/swaylock/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pam +gdk-pixbuf zsh-completion bash-completion fish-completion +doc"
+
+RDEPEND="dev-libs/wayland
+	x11-libs/libxkbcommon
+	x11-libs/cairo
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.14
+	doc? ( app-text/scdoc )
+	!<dev-libs/sway-1.0_rc1
+"
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex doc enabled disabled)
+		-Dpam=$(usex pam enabled disabled)
+		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+		$(meson_use bash-completion bash-completions)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		-Dswaylock-version=${PV}
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if ! use pam; then
+		fcaps cap_sys_admin usr/bin/swaylock
+	fi
+}
diff --git a/dev-libs/urdfdom/Manifest b/dev-libs/urdfdom/Manifest
index e0a6a7b6656c..0f70a8a7791a 100644
--- a/dev-libs/urdfdom/Manifest
+++ b/dev-libs/urdfdom/Manifest
@@ -1,4 +1,6 @@
 DIST urdfdom-1.0.0.tar.gz 250016 BLAKE2B 525616785b4fa38c8900add42349aa3a2103c75b213c77e3d682084e674b5fae31e9f56331910c19e6e5c49f6f72e1e7240c588df0dc67d862e0eac911667381 SHA512 50a218e596bcc0cecff904db2fa626bebc3902c4fe1f5ff8e08195e462b4d9a8c416a41f4773cabbcc71490060d3feff7e8528a76b824569dc7fdb0bda01ec3f
+DIST urdfdom-1.0.3.tar.gz 275339 BLAKE2B aa14dbd5f55489e0bde97042afb03d47cd023e3003a4ff66808e9be1a03c4de0bdab1c56a6fb5f6aea83324cbb38d286def66553a8ef813fc1f70b0bd9e24268 SHA512 240181d9c61dd7544f16a79a400d9a2c4dc0a682bef165b46529efcb4b31e2a34e27896933b60b9ddbaa5c4a8d575ebda42752599ff3b0a98d1eeef8f9b0b7a7
 EBUILD urdfdom-1.0.0-r1.ebuild 805 BLAKE2B cdbb0b4f38e03b69a05746bca56b3244ef705ef5a71522cdcb676a8f446c4e8ee2ef30526a2be1dbb7d6719e891ffc9d914939e6c1e35a37e54ce4b0e01e7e77 SHA512 0e1364c218cfbf9d99dad4ac40a707de0997ae088095737f63f977f5bd19ac3d599ecc931a0a1de85ca5d5dddeb89b512d6de020ada69236abdd6cab78c076a5
+EBUILD urdfdom-1.0.3.ebuild 802 BLAKE2B e16dde4316702066aa8172f885a0d3a53d7c88e4964028c53d72687fa00d3be7fb6f9a65236f696b8f2d808fa3f150945631f48d16c96da09f3e015734fa571e SHA512 7db3be38dfd4448edbb5c2db1e814479604059c5d7154737b9128d86b1afdcf32846f579cb2f207e742fcf8078c5132ddfc5b5011b9e55fdf35e6eb3c194352a
 EBUILD urdfdom-9999.ebuild 805 BLAKE2B cdbb0b4f38e03b69a05746bca56b3244ef705ef5a71522cdcb676a8f446c4e8ee2ef30526a2be1dbb7d6719e891ffc9d914939e6c1e35a37e54ce4b0e01e7e77 SHA512 0e1364c218cfbf9d99dad4ac40a707de0997ae088095737f63f977f5bd19ac3d599ecc931a0a1de85ca5d5dddeb89b512d6de020ada69236abdd6cab78c076a5
 MISC metadata.xml 335 BLAKE2B e19eb242410b151b76ffa335373a754a074cc060f57c4441a4da4364d8b7f1cd0c71246e48140c6ba6a80a17bf8d721d09c3b61547f83714d0d9d49ab55182da SHA512 ec4d58e41be7a83c80a5e0a77edcf8c231d783e0b4b5f8bb7c42d54da4dba495575b9ee1c32e334a11a424449cc3eba44f89d147d465ec490e4507443211450f
diff --git a/dev-libs/urdfdom/urdfdom-1.0.3.ebuild b/dev-libs/urdfdom/urdfdom-1.0.3.ebuild
new file mode 100644
index 000000000000..b48a465442cd
--- /dev/null
+++ b/dev-libs/urdfdom/urdfdom-1.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/urdfdom"
+fi
+
+inherit ${SCM} cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/ros/urdfdom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="URDF (U-Robot Description Format) library"
+HOMEPAGE="http://ros.org/wiki/urdf"
+LICENSE="BSD"
+SLOT="0/1"
+IUSE=""
+
+RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
+	>=dev-libs/console_bridge-0.3:=
+	dev-libs/tinyxml
+	dev-libs/boost:=[threads]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e 's/set(CMAKE_INSTALL_LIBDIR/#/' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index b77e92fb6c04..2531441bb3dc 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -4,5 +4,5 @@ DIST uthash-1.9.9.tar.gz 225620 BLAKE2B 4c23cc11c54ac2c8af96522455126a5fdfb1f533
 DIST uthash-2.0.2.tar.gz 191173 BLAKE2B a4a2ddb19fcc9af1105bc07deb8ccbe9c3f04518b609f7cfd16f0a05ec3e16ffb25fb5f0a5f258413f9f52facaa26adf4ea0683415416c12ab36bf11883976ae SHA512 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7
 EBUILD uthash-1.9.7.ebuild 673 BLAKE2B b0ccbafc68e7a3bd4cd20f18aec6979068f789a830e578c99a4e80c1a7a9988da8b34ebf7141e61377df693ce7c5044f4d958a4e0069a99bb29fd3ecf4191220 SHA512 c8fd82b22f09ab684a8c594e968f1ee95086bbfcfa52b2d07b902a3f7ab8e77f082f5e90e28996c983874e59a8176a39640f6b4de4f802a35eb923d9c0a39518
 EBUILD uthash-1.9.9.ebuild 707 BLAKE2B 99347104c2e53f8e4c6b969508749d3e9ad58243faf5ef49332f7e7b351876b082f4b6562fdd6e8b3271f6accc372776169cd1ed9ac8c4fe56c2be4cf62d48e2 SHA512 47a6d8963b4f1eb2b9716f42c10fcf9f71afb5c1ed92796e920365add71601a63433c33866f8c0ab142ae15e026b199e468c3e5379687dc6b0d4579827fe6eca
-EBUILD uthash-2.0.2.ebuild 633 BLAKE2B 54d553a5f64223b8c2e078e5ae50834dc7ecd73318a4890498a6866cdfdb41d6fbbb32c7344d25c196ab58a90dba1bf6a06e0b578f2ee79c3d7f2637fcecf694 SHA512 0737910e043f74484343ea445e756d4b53edde73af00bab473820f64678d8502f2ef568aced495cf937523648640a22656999364cf688dfe0b025c905ec8f3da
+EBUILD uthash-2.0.2.ebuild 632 BLAKE2B 0b04ce03440e30097e79891f8e7f012746db1771ea8d62c5772a1cad4260461cb4dba2bfe219eb1ac55f583b1b6b91c5ebcda2f9f88e817f4e39f0b56f1b66db SHA512 5356e68b767744e2b4f7c09381b1f8cf6f6397747dd2c93887c5480586ebce2f854c0304fb7f1892a385a239225c8e123e7b08909703cd18fea203aceee2f012
 MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
diff --git a/dev-libs/uthash/uthash-2.0.2.ebuild b/dev-libs/uthash/uthash-2.0.2.ebuild
index 82653f64ebf8..ca95863e281c 100644
--- a/dev-libs/uthash/uthash-2.0.2.ebuild
+++ b/dev-libs/uthash/uthash-2.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 ~arm ppc ~ppc64 sparc ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-lang/perl )"
diff --git a/dev-libs/uulib/Manifest b/dev-libs/uulib/Manifest
index 2f64fd40b196..db21ab3ecd18 100644
--- a/dev-libs/uulib/Manifest
+++ b/dev-libs/uulib/Manifest
@@ -1,5 +1,4 @@
 AUX uulib-0.5.20-shared.patch 2729 BLAKE2B 22870e400a4bf64fdd30b03f8d699666eeb7832e1110347295123bab7cf196d3bc30c7a4bbb0fe1d42f45606adf8522e134611f827d2ce403bf27fbd2381e1dc SHA512 bb8c93c59077fa00dec75734f27effc3370c9b1aabea476cc3212d6388a94127d1d6678dd98e73304c7fd2dd3e7212764e7abd08201ae9e12544f39aacabedc9
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uulib-0.5.20-r1.ebuild 772 BLAKE2B b6197efbd020ed5fecb63745083e13c0c4ad0fee60cceabf7f262371aebd304239b807cbe20679bb6b489096a88ba604dcbf554a5b598d0de07bfd9b3fd899ce SHA512 37e790b1e5ec40b4129499870763462507d6f5f587a6a832b8ab94118f85d847524c2e2a3c9425fae6c0cfe70a529dcc0aebd824ae102f7e7c3d6a0184e3e864
-EBUILD uulib-0.5.20.ebuild 691 BLAKE2B 14d1cfc8f2ee94b4d2cf9104f6e9b12d859ccd0bec6af4dc4e3e8863a3226e68794ba27b62d7cb680669a1132c1c57a7013be97cdd4461829d5e89214b93034e SHA512 ff905fdecc1fff0af38fcf09b4e30a37d0ed014221e3d4e2dec81536617b7a1f3c66aa0a0dd773b8971892b90bb30a94955a5568488f717c69fd4ccf5ffa29e4
+EBUILD uulib-0.5.20-r1.ebuild 764 BLAKE2B 4b4de6069b5983616b8b0364571ebc6c106bd82f8193625af2b1fd41e9234dc21df15d707ff4abfadcb4c3047e8ecaa63658f20ea5c395f90f7763bc99236078 SHA512 03c05b23b0c19b3122fd735db43ea309636531416272b77d34319dfedc891ea2c8a6590ef88517170a9c37fea3a47d7a32790b521b976708f65b6b65c323a8d5
 MISC metadata.xml 277 BLAKE2B cecac90fb82fe0bd545f752051c2ce763ce3232fef47d6ec79511d72870e92c49a509f06e949671b517ba80295da3c27a10f5c72b374e59a4ad6017a13ac705a SHA512 37a5409e55c42abd634bfbf22e956a23cd8d2d27a600e02a23e304e3f7da3a434885ff8d5997091ee608a4ed32f10738911c1ad81624c3cba23a7a42f20fdf59
diff --git a/dev-libs/uulib/uulib-0.5.20-r1.ebuild b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
index 1222e40ad51d..226d799ca390 100644
--- a/dev-libs/uulib/uulib-0.5.20-r1.ebuild
+++ b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}/${PN}
diff --git a/dev-libs/uulib/uulib-0.5.20.ebuild b/dev-libs/uulib/uulib-0.5.20.ebuild
deleted file mode 100644
index 149dc7b5846d..000000000000
--- a/dev-libs/uulib/uulib-0.5.20.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-MY_P=uudeview-${PV}
-
-DESCRIPTION="Library that supports Base64 (MIME), uuencode, xxencode and binhex coding"
-HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
-SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}/${PN}
-
-src_prepare() {
-	sed -i 's:\<ar\>:$(AR):' Makefile.in || die
-	tc-export AR CC RANLIB
-}
-
-src_install() {
-	dolib.a libuu.a
-	insinto /usr/include
-	doins uudeview.h
-}
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 939518bbf791..364a4541ba97 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.11.ebuild 843 BLAKE2B 5fee8809cd26473fe8cbdf2652bfe36468e666a01c286815ae7ee2e54235a818fa1ef4aa519c2e5e77cfb14a437f69f6c6363f4462ef0b502be90b1bfb34432f SHA512 f7aae52a4c37266e3c952f2087e98c33ba7f5d5f7e4e47458c22a487e8e3e4830ab31ade675a41060183875da0d1dd04f62dd17ac6041228f96f2f8420efbadc
+EBUILD volume_key-0.3.11.ebuild 842 BLAKE2B 2767dfec0f660455477bf80adcbff6275ffbf49fb3d085ae42a1d2c05f957ce66e8296384cb7053343100cf5b97955eecf16ce653b649f53fdc365707fdf6ac8 SHA512 e13a7f0f9fcd4c13c85c560d023b0ac337e9eea56bdc9dd73031be54e3257df0a625397f18c96dc2cc7b980c974533311a917f585eb915742627ef1954435249
 EBUILD volume_key-0.3.12.ebuild 906 BLAKE2B d47cb3308f7d4347caade6a40cb8b57bfe73875babbe71fe5e0a8503d00a173281d8ff40c4b0d20fc4b43fccc1c237a717db64a83682d96e817457ffce128ed7 SHA512 29e77e6a082ae75d0d8e875913c3fd0e784f1b1d7f3666a55cec4f73da5459e4992b9e9c88611d3ac712f58f88492199eaea4682d866d79c205fabd804512b88
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.11.ebuild
index dd271b306448..92af05b9da2e 100644
--- a/dev-libs/volume_key/volume_key-0.3.11.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 202cfe8bf958..1a5d4b06fbf9 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-protocols-1.16.tar.xz 104156 BLAKE2B 7c6403e5498c2a9f1a97dfeef780a8df0bd05287e8866619657b29f5fc79c82fcc0892a7099b5eda80720dd136f8fa3c848c05aaf870e978e09ab2b04d883c2b SHA512 8ab33021854f3e8f6bca7a9e69427e7a3e53297cc0abd4c006de7e55fac66da3ad88489a6eb4e6c28c7ba2addd96e7f055309f3c8918643b18ef78a4fb637f84
 DIST wayland-protocols-1.17.tar.xz 107680 BLAKE2B cde978ceeaa9d71ac76cd007c511011fed6a110e772a6a9e880a5fd07a0318239a11235aac25b855d0f7ed5ae9980dd2103886092e85a92ed606c8a2f53de726 SHA512 5f3aacbba58717092036659d9b665dc10ff05ee51df61b1de38b22f0417285a74fd8a6d15ca049ad60d204f28203aa13d773c52140c7c02db2c498a6964c2643
-EBUILD wayland-protocols-1.16.ebuild 871 BLAKE2B 5545ecff86f62dad1e8fe4f3f823ac4137904b1a79e39dea836d3424bc68344065e3be4d1021a90f58f7814abfceb0f2a8e7a1b18076d3af653c8e1eb6990d10 SHA512 dc7a9bfb0e4f181a1951c1f43a04b7794e3cdd437b219bcfe4c5e7c64a253ef72271e9f46ed51e4f0d95d10cae60b2ba107bafeeda38b4b8919cf9ff599f063b
 EBUILD wayland-protocols-1.17.ebuild 872 BLAKE2B 7eace1ba64ff988655dbbf7086e30acceca9fbc14f41b16185b526764a5143372558d3523f2440830fc3ca3eb43f85b533f9006d057192bd12a3ab4ffaf5a198 SHA512 1c39fc3fd59999332705c33b43532e4a83639de6b17a258d26df88b2b14ac14c43259ebefc90e710d0996722c7b3140ff5c513610dc2c397f65af6d77e75372b
 EBUILD wayland-protocols-9999.ebuild 882 BLAKE2B fb9318354b7cebad42f935ebf85d5c09827c612e7cc9bebc85dd6ca4c2e2f3b2cf489825b7a001f0e9f03072ab022942a1d06a2ca8f4c0cdd57b14aee4a73192 SHA512 0bb80c936c9aa9cc77bc8dc91c982a91d385b7c923607729924d10aed1a17a6a3321b4ba1f2e4d961ba0422525bd9a63b6b9dc9bbdd25cf0ee407c16ebc2dc83
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.16.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.16.ebuild
deleted file mode 100644
index cc1a199083b7..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-	EXPERIMENTAL="true"
-
-	inherit git-r3 autotools
-else
-	inherit autotools
-fi
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV != 9999* ]]; then
-	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=""
-
-RDEPEND="dev-libs/wayland"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	default
-}
diff --git a/dev-libs/wl-clipboard/Manifest b/dev-libs/wl-clipboard/Manifest
new file mode 100644
index 000000000000..8bd43dd7e55f
--- /dev/null
+++ b/dev-libs/wl-clipboard/Manifest
@@ -0,0 +1,4 @@
+DIST wl-clipboard-1.0.0.tar.gz 25442 BLAKE2B 02e2e99287e1376f26f73a546654e66ddb9d0a85caf457e4a023f0a02cb4d7a9cb3c8ab5840982bf014afb9fc3601722dd4c2fc4239b74a05d309a0a16d20299 SHA512 328c18a9eb2ccfc788e7ab785077ab8d663c75f2ce8f6f434799575fc76ccc89238faf930948bced216d22bee0adfc810af5e84ffc63bc82c4e1d02da4286296
+EBUILD wl-clipboard-1.0.0.ebuild 522 BLAKE2B 0ae35fafd52edd80d4ca0773680d75f3025dd5fa7c21fbeb48daeed2d8d7a783a402b1446e3dc13e76aa3ba953873ec7eead59084fd76096f7d5a12a3c57eb99 SHA512 6ba9f30e8e85028621776fb5fa0ff69090854d1f8e8fb1ad60a526562e90e567533b7da83b599ed7b56f25366e2f7a63e464376249d7660dfd12a17aa9bcf420
+EBUILD wl-clipboard-9999.ebuild 522 BLAKE2B 0ae35fafd52edd80d4ca0773680d75f3025dd5fa7c21fbeb48daeed2d8d7a783a402b1446e3dc13e76aa3ba953873ec7eead59084fd76096f7d5a12a3c57eb99 SHA512 6ba9f30e8e85028621776fb5fa0ff69090854d1f8e8fb1ad60a526562e90e567533b7da83b599ed7b56f25366e2f7a63e464376249d7660dfd12a17aa9bcf420
+MISC metadata.xml 467 BLAKE2B c0262280459dbebc32dfd41583bc0ad9704ea6af0a5a4fb446074f2fea417abc7f4e6e98fdf04348a187ca630235302042ac6b15fc85d5c18c2637882996c687 SHA512 3561bb191a3d0b62c6844a23d29de38897b9e6ecb62934d73dc04bcc70dbb45e2ea6ce2b2b14a54a61f0f17fcc2428cbdb868c58dbb9426eea75c1a7851ec901
diff --git a/dev-libs/wl-clipboard/metadata.xml b/dev-libs/wl-clipboard/metadata.xml
new file mode 100644
index 000000000000..1c9838f357ee
--- /dev/null
+++ b/dev-libs/wl-clipboard/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Two command-line Wayland clipboard utilities, wl-copy and wl-paste, that let you easily copy data between the clipboard and Unix pipes, sockets, files and so on.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/wl-clipboard/wl-clipboard-1.0.0.ebuild b/dev-libs/wl-clipboard/wl-clipboard-1.0.0.ebuild
new file mode 100644
index 000000000000..d7fcf5337472
--- /dev/null
+++ b/dev-libs/wl-clipboard/wl-clipboard-1.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Wayland clipboard utilities"
+HOMEPAGE="https://github.com/bugaevc/wl-clipboard"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bugaevc/${PN}.git"
+else
+	SRC_URI="https://github.com/bugaevc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-libs/wl-clipboard/wl-clipboard-9999.ebuild b/dev-libs/wl-clipboard/wl-clipboard-9999.ebuild
new file mode 100644
index 000000000000..d7fcf5337472
--- /dev/null
+++ b/dev-libs/wl-clipboard/wl-clipboard-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Wayland clipboard utilities"
+HOMEPAGE="https://github.com/bugaevc/wl-clipboard"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bugaevc/${PN}.git"
+else
+	SRC_URI="https://github.com/bugaevc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/wayland"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-libs/wlroots/Manifest b/dev-libs/wlroots/Manifest
index 01305239f254..9c35e0601f8a 100644
--- a/dev-libs/wlroots/Manifest
+++ b/dev-libs/wlroots/Manifest
@@ -1,6 +1,8 @@
 DIST wlroots-0.1.tar.gz 436459 BLAKE2B 8545adb7a9ffe1c4b071ddad1093472f45b24638b29b3c2898b4aa3629c364936be7bec348c9aac5a7d3ecda677df108361fbef08cda8fca9c6bb21639883c86 SHA512 43897ac5a512ea26ad9703182dab5de9c714a087449b108472f638148538a632a67cfc778edf3e77940fdd7bdba91d64a4dc4e4ed1903a150f13ca59237ce01e
 DIST wlroots-0.2.tar.gz 437638 BLAKE2B dd7ca737ba2dfc00e30c83e973616cefb77fccb793161794361422a2fcbdf7299aacea8d794b910fdf06c9a191a89f7f1530d312545d08d126a729be41eeb424 SHA512 b7727b29ed7e5188d5fa6099687f8e6f48b6b3f17f7a6e136956ad6b607054595de3779118bffd4b9730115eaca2f00c2d30d52f4915b2753a749432ec0c3f2a
+DIST wlroots-0.3.tar.gz 473490 BLAKE2B 552bcc5d8bb847dbac5caaddeac830a4de25b4cc80abb6c8b8e610b5e40cc20ff50a145fdfb6bb5f0aa53d218400777ca7a5982c74eb01bd973109b2f8fd7938 SHA512 ccec1426e6ac86fa63f82763d123162fca5be25fb37bbb44a5de651a7764f5325ef21cbe2cf698cb315f0de4719a6bac8eb0ceeffe2111de7c9f4b59e019aaaa
 EBUILD wlroots-0.1.ebuild 2626 BLAKE2B 9f4a1587211f67948f6a8cccf173318231f76dde8fa39ccb329b7cc91579872870486e41eb064cbabdeb53708b6bb120dcd2ba138b263c7e457eb3fa5f6d5fd3 SHA512 4990121b1a5ef0d24361997ce6a2d41378c462f14c83b021cc03d19e4f4661cb48e2b9becbfbcd2891ed30e1690b6bf3f4d86f0b83889a96056f5ac233b2fefb
 EBUILD wlroots-0.2.ebuild 2572 BLAKE2B 81fe3641a8f35a9198d9312f8408f74f55bba972e7dbe88dec460868d686c4834a35cfd0d371ed261e33697e5a5bd9448091a2c8185326fcae44f1263b1414a4 SHA512 8f918c4d90938a0c78790c5541a8568766b30384c4f8a6a838de2ae3b8b45ad41cb7dab3aaa31f75458c2cb85b29fd7dd68e41deb18826232a6e65d31097d770
+EBUILD wlroots-0.3.ebuild 2577 BLAKE2B 4f369df76534a7b0d12f57f20ce9384fdafe7ac8327b42db7dccbf114a9c791d251f225c154b495e9df50ede94cd5d652450bd49dfc006a114ed76281248664c SHA512 a1a9c9a6a8cfd4bc829bb58ee9e0d1091dd68ff4535798518a12cfac646fde519b86f19e5fd01a919a14a4e840db06d845b449b6cd858d9fef3de63620ee6a78
 EBUILD wlroots-9999.ebuild 2572 BLAKE2B 81fe3641a8f35a9198d9312f8408f74f55bba972e7dbe88dec460868d686c4834a35cfd0d371ed261e33697e5a5bd9448091a2c8185326fcae44f1263b1414a4 SHA512 8f918c4d90938a0c78790c5541a8568766b30384c4f8a6a838de2ae3b8b45ad41cb7dab3aaa31f75458c2cb85b29fd7dd68e41deb18826232a6e65d31097d770
 MISC metadata.xml 1672 BLAKE2B 6972ecf01e4d0981aed6b3c60e8f549e04c3662e77ea38a226acc37dedfa6ed04dbda33d4ac451e18b4a889200973bdf6f25c75e4b14e1c3e2b328c04de85a8d SHA512 34654dad23535a63b5891ae658c67bb1d7ba3a61126e1d9f31b10817c134964ce751aac46036ec1d11590f42a4be2c858d5fe44c4760279cfa401826f5ffcf92
diff --git a/dev-libs/wlroots/wlroots-0.3.ebuild b/dev-libs/wlroots/wlroots-0.3.ebuild
new file mode 100644
index 000000000000..c762765d60bc
--- /dev/null
+++ b/dev-libs/wlroots/wlroots-0.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/swaywm/wlroots.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/wlroots/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit fcaps meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind icccm rootston systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND=">=dev-libs/libinput-1.7.0:0=
+	>=dev-libs/wayland-1.16.0
+	>=dev-libs/wayland-protocols-1.15
+	media-libs/mesa[egl,gles2,gbm]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	icccm? ( x11-libs/xcb-util-wm )
+	systemd? ( >=sys-apps/systemd-237 )
+	x11-backend? ( x11-libs/libxcb:0=[xkb] )
+	X? (
+		x11-base/xorg-server[wayland]
+		x11-libs/libxcb:0=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/meson-0.48
+	virtual/pkgconfig"
+
+FILECAPS=( cap_sys_admin usr/bin/rootston )
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		-Dlibcap=$(usex filecaps enabled disabled)
+		-Dxcb-icccm=$(usex icccm enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+		-Drootston=$(usex rootston true false)
+		"-Dexamples=false"
+		"-Dwerror=false"
+	)
+	if use systemd ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	if use rootston ; then
+		dobin "${BUILD_DIR}"/rootston/rootston
+		newdoc rootston/rootston.ini.example rootston.ini
+	fi
+
+	meson_src_install
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+	if use rootston ; then
+		elog ""
+		elog "You should copy (and decompress) the example configuration file"
+		elog "from ${EROOT:-${ROOT}}/usr/share/doc/${PF}/rootston.ini"
+		elog "to the working directory from where you launch rootston"
+		elog "(or pass the '-C path-to-config' option to rootston)."
+		if ! use systemd && ! use elogind ; then
+			elog ""
+			elog "If you use ConsoleKit2, remember to launch rootston using:"
+			elog "exec ck-launch-session rootston"
+
+			fcaps_pkg_postinst
+		fi
+	fi
+}
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 9b355fb884ba..34ba3b264dca 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -5,7 +5,7 @@ AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aa
 DIST xerces-c-3.1.4.tar.gz 6992545 BLAKE2B 463e721843632b13f4b5c845f14cf9ab4f093085558858b435ae5a3122951ab590f9e56f43add1aeaf7dc244814710be804ab0331a1d1e8073919ad9d3b61068 SHA512 8afd775bac0345a2714b77a1ae2cfb8ae67f0239ec7370de7d89612dec64d2e1df48612c875fe239ab6f2eb31914c2d3914617e6b34a1bae0bbb14e4dbc787b5
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
 EBUILD xerces-c-3.1.4-r1.ebuild 2824 BLAKE2B 07765e9c4ab0af4f1eac7b3630faee0b5c4eedf4d48e3934e69ef24554ec2fcb5bd354404e1ad4c99c5260519002c2bba6d994303a9eec80938a30c7141140c6 SHA512 0bc0fd5c0b5bf2346700ba8435fe3fd48f08494166494d1ff5c36a0f348f563ba972100a7095583ff5f4569262d515a15ea6fa5e83468572179215d1f99aa5b7
-EBUILD xerces-c-3.2.2-r1.ebuild 2966 BLAKE2B c297b66106b056c2b425f28f6e5b57d0ceaa17dd9143ca87fd76d0652a550058a70848230e8d17f8e1de9b18af2cd7719253ce28f6b48427aa79025c66d39a4d SHA512 629fa19814153f784f1dc279434bf968220693261e64decab1852911804c60516908e3083df57fe2f1633a541f87a66476db8ad53ada8fbc1d95752577fcf3aa
+EBUILD xerces-c-3.2.2-r1.ebuild 2961 BLAKE2B 237782473205140e3fac1a53bb678e6aafc5a1c6519a21f2cc01c1f2430bfaefaa25cb166b8c374cb9da3290e5e0ca301b4662b978c8fcbf75427d1df45b8857 SHA512 978e991f0c8acf0c27fc28ae34c258cd46bf83ceaf891c3eabc9fe2aabee90d4420e512db75d6bdf27998bfd9e6e15d1f0fa8a75284b45f9d238dff2bf90e1fa
 EBUILD xerces-c-3.2.2.ebuild 2759 BLAKE2B 6bb440b553a8e3766b5aabd52cbd4da8ead25c04d4c0ed77d9131dac911eb1e3156bab6be73cc20a951224c65d87e4320d0bce0327ca634ab90a1a5de2169ff8 SHA512 0784c58a373d2ae567de3a6b6582199c893f89ef5bb584a90876ada3cce88d0fc4d761b2a516ee47d815d9be23c73eb455a9189fa41bff1ffe6f425ece83b805
 EBUILD xerces-c-9999.ebuild 2868 BLAKE2B bd1be084d8090c1538260577ab8e89ec8aaf9abbf83c5c8fdaa046e2e44daf0acc996deafc832ad2635043cce5642a5b350223a58a7bb34e0bd4321a1e7893a1 SHA512 d1261c22979dffe67756acfac50fe395d98b56836f246e40acce0aeba1d0b79a8c5fc5d7cb54eff355f848d40aebd9fa36b3829ab00928193739a7823e7672d4
 MISC metadata.xml 849 BLAKE2B 4d7f00d4864bd2b347723a029ff58cc7c9f84867ebcc45392a94b2d063cdbde84a4290e2302d9fbdabf98c7cf3a3edb04a18ce60d6c5bd9c474a492f5acc4b2f SHA512 e1aaa46f73a6cc929dc87530053ab0f15d632a1998d3ac13991ac94610d578deeeb8e4e786bbe42512c7231d99701c9bf59047cffba0bb48044e80f96f36663b
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
index 2c447d12051d..f0709b3acba6 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index f8904eb44a6d..85143dcbf9c1 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,7 +1,4 @@
-AUX zziplib-0.13.49-SDL-test.patch 392 BLAKE2B b09eb8e5fa14dd4936e1235ab29e8730182e25b5c2811851a99fbe95c9fcc6a7274bffd41d490bc9c7fece866ded73260d85c94ffbe43c9075a614e038a39d18 SHA512 b5a3e6e7fb4af7ab48a9aa26bdecbde6f3345ee3997c810fafa3d0e348ea0aee9247ae7acab7ccdc3fc1b9ab62daa7f29ac54862013206de8dd094361dd6facf
 AUX zziplib-0.13.69-SDL-test.patch 453 BLAKE2B 645e55b034ec72abbab26fad4062cf9f7137aeeac2cc33aad89d9b86f4b616b5bdd256d383bfaa3252459caa2150f1b6426d3ca31ce8c055d0cae92d81547cd1 SHA512 2a524efc04721459cfb744ce7d0e3b6a4412e791250442632093116e181642184ba3cfa4a93fff8bdb792a03c293ab317696a78aed422ec75c26448552bc5721
-DIST zziplib-0.13.62.tar.bz2 685770 BLAKE2B 24ef46370cd490498cedeea4b83abffd40b4bf7092ca994defb0c7c90a2c6863c56d19933dca1b20700ed9a55369cd1e8d3f6e1c5ed966b966d15eed4e5b75aa SHA512 fd3b9e9015ba7603bdebd8f6a2ac6d11003705bfab22f3a0025f75455042664aea69440845b59e6f389417dff5ac777f49541d8cbacb2a220e67d20bb6973e25
 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
-EBUILD zziplib-0.13.62-r2.ebuild 2183 BLAKE2B 3d46cdd0afd006f807c8015b93214eec481d120d200a9f92e03176d9ea7d95988fbd10fc6dbdf655c8e73b8f809eeabd39703a9d9cb24261a14ad6f4022fbd53 SHA512 39fc10a12b8374a5b737fa0fbc0c229721ddf3f8a30d3a987633d5890e63a76b4b358a0803517e209365a804a67dcf7af37159c28f8e7f315c6ba1d1d1a0f838
-EBUILD zziplib-0.13.69.ebuild 2323 BLAKE2B e165aea5cf88063d5facf80325e98a98d63a21bcb4fabf4f423a3f7b0cbeb27df3752051a7f8eea11505cda1d4575833e172ad0a36b857040807d20673e43794 SHA512 741b5f604f77998d9957a1da5cdf50a2fc118a7b13629c3899e6c6aa699e889ee9e27af7b39e29437fc41fbfe125286908d28ebdfe2fcf115924b0237c6d867d
+EBUILD zziplib-0.13.69.ebuild 2315 BLAKE2B 4dab01a4f2d916240c4119ad10af21a14efa1e7d20c3b76daa7f32480c80324120c1ea024acd30c07bb60d90d8d1dc36e5fc8bedb80e04cceaa39acfcc70775d SHA512 9e4078370c40afc58cbf7d8d193e89db3c33e043e8024e30033c251159e33af6ca5320c821efea1a9f5f4113bdd08439735ba89a0483a094c42a9dd1bd781846
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch b/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch
deleted file mode 100644
index 410a2c746c95..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-this test isnt even run automatically and the dependencies are all broken,
-so just disable it and be done
-
---- SDL/Makefile.in
-+++ SDL/Makefile.in
-@@ -38,7 +38,7 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--check_PROGRAMS = zzcatsdl$(EXEEXT)
-+check_PROGRAMS =
- subdir = SDL
- DIST_COMMON = $(pkgconfig_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in
diff --git a/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild
deleted file mode 100644
index 6b1da7bf50b6..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit libtool eutils flag-o-matic python-any-r1
-
-DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="http://zziplib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zziplib/${P}.tar.bz2"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc sdl static-libs test"
-
-RDEPEND="
-	sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.6 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? ( app-arch/zip )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.13.49-SDL-test.patch
-
-	python_fix_shebang .
-
-	# workaround AX_CREATE_PKGCONFIG_INFO bug #353195
-	sed -i \
-		-e '/ax_create_pkgconfig_ldflags/s:$LDFLAGS::' \
-		-e '/ax_create_pkgconfig_cppflags/s:$CPPFLAGS::' \
-		configure || die
-
-	# zziplib tries to install backwards compat symlinks we dont want
-	sed -i -e '/^zzip-postinstall:/s|$|\ndisable-this:|' Makefile.in || die
-	sed -i -e '/^install-exec-hook:/s|$|\ndisable-this:|' zzip/Makefile.in || die
-
-	elibtoolize
-
-	# Do an out-of-tree build as their configure will do it automatically
-	# otherwise and that can lead to funky errors. #492816
-	mkdir -p build
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	append-flags -fno-strict-aliasing # bug reported upstream
-	export ac_cv_path_XMLTO= # man pages are bundled in .tar's
-
-	# Disable aclocal probing as the default path works #449156
-	ECONF_SOURCE=${S} \
-	ACLOCAL=true \
-	econf \
-		$(use_enable sdl) \
-		$(use_enable static-libs static)
-	MAKEOPTS+=' -C build'
-}
-
-src_test() {
-	# need this because `make test` will always return true
-	# tests fail with -j > 1 (bug #241186)
-	emake -j1 check
-}
-
-src_install() {
-	default
-	# fowners fails when we don't have enough permissions (Prefix)
-	if [[ ${EUID} == 0 ]] ; then
-		fowners -R root /usr/share/man #321975
-	fi
-
-	prune_libtool_files
-
-	if use doc ; then
-		dohtml -r docs/*
-	fi
-}
diff --git a/dev-libs/zziplib/zziplib-0.13.69.ebuild b/dev-libs/zziplib/zziplib-0.13.69.ebuild
index 9de964b08695..fccf9c061558 100644
--- a/dev-libs/zziplib/zziplib-0.13.69.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.69.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~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="doc sdl static-libs test"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
commit	6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree	cee0a97398040001220ece3cd48c3d568bcddb4a /dev-libs
parent	1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)