gentoo resync : 16.02.1018

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-16 12:59:29 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-16 12:59:29 +0000
commit: 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
tree: ade7cb031f363fad64c77139dea7aa3d81908537 /dev-libs
parent: 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)
122 files changed, 1329 insertions, 1427 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1e035a507469..ca1f45332f9a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 7abbf7430089..a834e111682b 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,3 +1,5 @@
+DIST appstream-glib-0.7.14.tar.xz 2239240 BLAKE2B d99788b3349df6f40c5dd3d5a6fb90446d1885569c04aedde9848f41916a1407f8397c416e34e87164bad2fa2e71bc93849901b829e71839d0aa1911ca73e485 SHA512 b2b01e529032a684b7864d6c330e9cbefdfe6a4312dc5d2cde8cbe82875218a0d4dc92a4c3129e45605571ab77482a86470d7336c360a0070ea029a1090a60d5
 DIST appstream-glib-0.7.9.tar.xz 2245728 BLAKE2B fb6f54329bed91f1acaa6218b111fd4527dff7ed412a89cb44a6e4f6cdfb7e0fe4e6f9fb37b6cdc2efa75164dccef323b6d7428a63b08369b941d36b0b9071f0 SHA512 d78cb6f11cad01d67cb33f16e987485177d20b78a8b21cfbabb64ce7b18b813c0d2d1de2faeea199fdc31d12633e899a5596a6cf133cb831a4377d641f79eb7d
+EBUILD appstream-glib-0.7.14.ebuild 1623 BLAKE2B 0736dbef4c5714c238e915640590795da70b829fe5332d922535df62f7310a3945e752fc4db6767661e8b3bb76032b8b7dc5985bb6b7e812fed09eb74a974fb1 SHA512 9b1c954bc9c21b0de6c9171121dcd9394a1ce7bf16f1545f0bb21a4fd29f3ca4a25a7fc6a50899260dd28b75fe450da5738f893b879ca0bd2309b3b49e20ca6e
 EBUILD appstream-glib-0.7.9.ebuild 1623 BLAKE2B c66d8dae417e53b8fcc0be7afbd2cc06aee3df35254ea1e204dd00feacd37133b702f39ca1899e91c9fea5294e45cbf35a31df7b8e30370be76821301f47dae0 SHA512 d865778c663bbfcab9e99473f66c4156c5d887fcdd1e4402bacc9bb7dcaf073656a624b8d0e2d78883b180512e31ecb7553cfb5ca0733d369d5bb745b5141bf6
 MISC metadata.xml 352 BLAKE2B 2d04b5c85e8a4e5a62ddf862b7dc1d757896d4f7a5aa052b9139cb050d16aedf9b571b543484b91d3795a979703b4bebb6c42695f8238939a4179a613110053f SHA512 491790151594360b57d05b217381b3b6c6f3d3a72e8066d923230060a4b05d0e2ff1e31cdcb94eb8b1ac077a011d695f33b857bf049c04292a9e324c065895d9
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.14.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.14.ebuild
new file mode 100644
index 000000000000..9a5b5da340f5
--- /dev/null
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.14.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg meson
+
+DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
+HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
+SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/8" # soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc +introspection stemmer"
+
+RDEPEND="
+	>=dev-libs/glib-2.45.8:2
+	sys-apps/util-linux
+	app-arch/libarchive
+	>=net-libs/libsoup-2.51.92:2.4
+	>=dev-libs/json-glib-1.1.2
+	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
+
+	x11-libs/gtk+:3
+	>=media-libs/freetype-2.4:2
+	>=media-libs/fontconfig-2.11:1.0
+	dev-libs/libyaml
+	stemmer? ( dev-libs/snowball-stemmer )
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${RDEPEND}
+	dev-util/gperf
+
+	dev-libs/libxml2:2
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.9
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.7
+"
+# ${PN} superseeds appdata-tools
+RDEPEND="${RDEPEND}
+	!<dev-util/appdata-tools-0.1.8-r1
+"
+
+src_configure() {
+	local emesonargs=(
+		-Ddep11=true
+		-Dbuilder=true
+		-Drpm=false
+		-Dalpm=false
+		-Dfonts=true
+		$(meson_use stemmer)
+		-Dman=true
+		$(meson_use gtk-doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 2dcbe0ee5727..0c020191f7bd 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 2464 BLAKE2B 89ee853582b6d0381efe37d5ced844823741ffc8fedb9257c3210c59b2fae4304e1e4906610292d08c060f51cc20e6e0e3f6a8da3a283fb44a1a112ea56abe85 SHA512 5411bb927da5ffa2bd12c7be03523b28294cce4d5804687f449ece31cd548b0dcdf8cfb42f09c32614e46dd84075bdaa78f6ce6b1c4b69784ddb84e41da3ef4a
+EBUILD beecrypt-4.2.1-r6.ebuild 2463 BLAKE2B 3dfa3267ad73c5fc0adcc813923ba1983eb697fcba7069480f9ef26fdd34b7bfd02bd0963331e8aa37bdaa2e8c8b936ec4c8a5e2a4ac768480faae75fbe152c6 SHA512 6d0d72047f80353937ddac01e1f2bb02f243edfe6d4a5a669ea2a032a90f5fe384abac7df7e09e7711640e4c99b104cb62d28719d642a53fcc06c77f8f740eeb
 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 c0d4ba388c30..0c70770848d2 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/capnproto/Manifest b/dev-libs/capnproto/Manifest
index b5e29525467d..891f33841817 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -1,5 +1,7 @@
 DIST capnproto-0.6.0.tar.gz 1199198 BLAKE2B 90db934f8fd2affeef8908a9f8aa955892c8d25d556a76003f7d2e8e5634ea76e3759ace94b3bff42235e6da666e97657f69327ecdf620067e13ad2dde2a8105 SHA512 4882b2e5d1544517348e436600705d18b41fc82e6fc141a934ad960556ed73781c974d4a45f8c949a297edd5c95fb156fd75f1d7179666dc7ab881f98ac9e69d
 DIST capnproto-0.6.1.tar.gz 1720489 BLAKE2B 5fad902bb4221fa872bd52311442a4073c4e58e3d21726f24e06430246f1d757bc4d4e7e122df0a7cd9401ff2c47cb48d1791bb0b7ceda8889a819ac52edc02b SHA512 baea7f867bb789d3bf8cdc9c1a4a0d31cdce3beb7ae1fd9464690a006a86eca841aaac5d86599c2a84a39d62c4d01213b29789c2b7385ad6636fef95fc867dd6
+DIST capnproto-0.7.0.tar.gz 1983172 BLAKE2B d88b5f8e3278f8e3aceccdc459001b99328b0440812352dcb6b54bd11e18aa7fee6d337252841c86e9c3eb1afcdbd99884c965156d6cec37e3c0996c9ec1241f SHA512 a3ea278ded6a866759c0517d16b99bd38ffea1c163ce63a3604b752d8bdaafbc38a600de94afe12db35e7f7f06e29cc94c911dc2e0ecec6fe1185452df2a2bd3
 EBUILD capnproto-0.6.0.ebuild 791 BLAKE2B 0b6b2e3dbd35b4bc6e75d497b28baeb0bd3e1998da0b139e1b279896223f21c28db49f10ddd381922f55661bbb9e010da9d421a584c5ec2652e04dff513cb8f9 SHA512 d3c794f90de85325011c4510f8d3c230fd63aff7cccad7cf9183980a039c686cc4a7686740dfa1114295ed9ecf9a19a7cca02231b7ddbc48f5a06547be9bf90d
 EBUILD capnproto-0.6.1.ebuild 791 BLAKE2B 4d6bea6b1e5616528804f24a4f1b8b80da4c546ff854b27804ee51b6780d2f50875e71586f42e3f2bae3615dac3f4df5f8605e43e7ac37d45ffb3d73f96529e4 SHA512 032be8ca5ea93114e4f4febdcf5f2123455c32db6bac3cc619323913a6be59237c057fed11e339750d0f0a406498729606a4d25157f840e21a0dfefc4e142508
+EBUILD capnproto-0.7.0.ebuild 869 BLAKE2B 59dcbef3ca34af52b0378f70298fad711c64bed4886e633d2cfb0d8f24fe8a35dcd6713cc3d73b267bf715552ca3115c0017f1cc4380c2f9d86c414a83afb67e SHA512 9bff6f8abf740b2253e5a5bb24af76d4de268a7064eb938ae2a620b2ad3e626afd4e71bc9f34e6ada001b846cc12c818139765ebb2d1c98673c8880b64aaf794
 MISC metadata.xml 346 BLAKE2B eab1f05d43ea625945b539ea49039ac08905f9b4e0d6b85ace2c1c31cc7aa6719b15697e75d472afb2900e3810c19c091fee57f900f8688cc3586d713ec4206f SHA512 c3c8f965d691c76d1f31fd9d8edcb1c623eac59b81caf4bbd51a184a6b7f8c74b1c1459c15957341700fe443c18946fbaac0a28b46976fa23cd55c9e57a03879
diff --git a/dev-libs/capnproto/capnproto-0.7.0.ebuild b/dev-libs/capnproto/capnproto-0.7.0.ebuild
new file mode 100644
index 000000000000..59b088483836
--- /dev/null
+++ b/dev-libs/capnproto/capnproto-0.7.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="RPC/Serialization system with capabilities support"
+HOMEPAGE="https://capnproto.org"
+SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/070"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ssl static-libs test"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND} test? ( dev-cpp/gtest )"
+
+S=${WORKDIR}/${P}/c++
+
+src_prepare() {
+	sed -e 's/ldconfig/true/' -i Makefile.am || die
+	sed -e 's#gtest/lib/libgtest.la gtest/lib/libgtest_main.la#-lgtest -lgtest_main#' -i Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 6a4a5967fabf..3bdbd335af96 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,12 +1,3 @@
-AUX expat-2.2.1-gentoo-dash.patch 1334 BLAKE2B 87980af994bad94c9a339accef714903d63c187b66f430893363edd36105623197f9a3bd3ca98ce48bd30dd1bed413440b31ecd17a6b0190b7e6b93c20ae9ecd SHA512 af33e9708deff13d7bf1a8af732b3c171902d6044ca59bd63b3e10bfcc09328f141ad6022046b97eff53ed3e1a9b749f372db954567690a479ff92860b5cd7cc
-AUX expat-2.2.1-getrandom-detection.patch 795 BLAKE2B 278e3afd0f2b79ac1f528ebc06d56315e96e0d08ca6d49ae84747ca5a7124f209af189fd192b5632a6f4a82785f27838b8d7d5ee0427bba2acd467a63a68dafb SHA512 c0a918d48845c2270930ccf87411a89b60379db860c09d0bebe914cbd48f9c6b3941fa3b31b69ffaef4d754882b5d3b397a8e69352f354402a8aea29cfbe88ca
-AUX expat-2.2.1-posix-shell.patch 1027 BLAKE2B bfdeb67f4f41cfcf1db8bf4a9e0501789b35a8d1a47dd678877475e022810d5709bfff34ce6188df0608d30f280a341a1f47e825bb56ff43e60a4ed7fe2ab1d0 SHA512 9ec6056f5c86918bbd6f6017a29b73a26472cb0470437639845889068f6209d0dde12bbb37cade792525ce295944d60cd3dfe61d308896f2befabe28736a626f
-DIST expat-2.2.1.tar.bz2 405441 BLAKE2B 273960016692f3b9a1121eb07b67c28e5b3066fa324df0d7249329b2dc346c2601e4548def5e14b7f76d58f89f3cd12edad72fbd32da9f4c04ac61dfce23e15a SHA512 74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea
-DIST expat-2.2.4.tar.bz2 505038 BLAKE2B 4d40629621bde41b44cdef4fa37937ce064cdbd621cc0d466b50a1a4626aff8bc8c8f6e9fbd94a36b709d449384da76ade683f31cf0aec0470006b750fc0a6ea SHA512 788249e2c6edf8521c4a99830fd5e51a55c062b834516f6775759cd71accf6375f12d3bd38f8b069777d081a4380b9549049921386ca0cb4b9b9daa4861d6592
-DIST expat-2.2.5.tar.bz2 510868 BLAKE2B 9d4709c2d157a04c08afd80b05f120407dc320023c3dbfe9e6872fadf0de2d6fa497f85ad9a21679fa0689c13cbb25adfd92912ae374d08de791dfeb4eb6918d SHA512 8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637
 DIST expat-2.2.6.tar.bz2 513322 BLAKE2B 386736da1f2204fa8f15ee4d1b3d11f01ed691efe6951b9f24f2bd30ab5494e75da6a97ceb1ffe4a0a8ecdc80f96f51d21c54f35a2cbc352a9fe9425545bf15b SHA512 dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6
-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 2453 BLAKE2B bfd977c7eca4b48a3d8cce2780959e4b4469019cc46da7216d0082dfd3a950601ff88a26560ac4ff94807a5a8e6dadeb7e73c95f90cb653487709fb0c1b9959e SHA512 1c44e5f08a10d9de6823e627c44f71ae9c6d75d74d11ba1db5f63ab383cb4096e5723092686cfd832f9e551b1285d6572f34ffa507c0c9301d3c39f4a50a4a02
+EBUILD expat-2.2.6.ebuild 2451 BLAKE2B 1ad04daeafc61dbe187db7f8523859472268bda770e10e080b4db2122595f9745d3353c9ed1c9bce2e0fddbb8040e6c9b136a2e5bc1036dd7a6bf5e1697d7865 SHA512 5d975b475e50a30372993dfc9559bb0972a02c57e17dcdc312c5f96f663e0b1cd8404b2d10ec55b9cef5c570381674b234e3c7ef551299781a61c5ad1b417f79
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.1.ebuild b/dev-libs/expat/expat-2.2.1.ebuild
deleted file mode 100644
index 84e0ee7bea04..000000000000
--- a/dev-libs/expat/expat-2.2.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2"
-
-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"
-IUSE="elibc_FreeBSD examples static-libs unicode"
-RDEPEND=""
-
-DOCS=( AUTHORS Changes README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-getrandom-detection.patch
-	"${FILESDIR}"/${P}-posix-shell.patch
-	"${FILESDIR}"/${P}-gentoo-dash.patch  # bug 622360
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable static-libs static)"
-
-	mkdir -p "${BUILD_DIR}"{u,w} || die
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
-		popd >/dev/null
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake buildlib LIBRARY=libexpatw.la
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-
-	if multilib_is_native_abi ; then
-		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
-		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
-		use elibc_FreeBSD && gen_usr_ldscript -a expat
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html,png}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	prune_libtool_files
-}
diff --git a/dev-libs/expat/expat-2.2.4.ebuild b/dev-libs/expat/expat-2.2.4.ebuild
deleted file mode 100644
index b99fa87d64f0..000000000000
--- a/dev-libs/expat/expat-2.2.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2"
-
-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"
-IUSE="elibc_FreeBSD examples static-libs unicode"
-DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND=""
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable static-libs static)"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-
-	if multilib_is_native_abi ; then
-		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
-		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
-		use elibc_FreeBSD && gen_usr_ldscript -a expat
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html,png}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	prune_libtool_files
-}
diff --git a/dev-libs/expat/expat-2.2.5.ebuild b/dev-libs/expat/expat-2.2.5.ebuild
deleted file mode 100644
index 427cb0428d7e..000000000000
--- a/dev-libs/expat/expat-2.2.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="https://libexpat.github.io/"
-SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.bz2"
-
-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"
-IUSE="elibc_FreeBSD examples static-libs unicode"
-DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND=""
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	# fix interpreter to be a recent/good shell
-	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
-	if use unicode; then
-		cp -R "${S}" "${S}"w || die
-		pushd "${S}"w >/dev/null
-		find -name Makefile.am \
-			-exec sed \
-			-e 's,libexpat\.la,libexpatw.la,' \
-			-e 's,libexpat_la,libexpatw_la,' \
-			-i {} + || die
-		eautoreconf
-		popd >/dev/null
-	fi
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable static-libs static) --without-docbook"
-
-	mkdir -p "${BUILD_DIR}"w || die
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake -C lib install DESTDIR="${D}"
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-
-	if multilib_is_native_abi ; then
-		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
-		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
-		use elibc_FreeBSD && gen_usr_ldscript -a expat
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
-	docinto html
-	dodoc doc/*.{css,html,png}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	prune_libtool_files
-}
diff --git a/dev-libs/expat/expat-2.2.6.ebuild b/dev-libs/expat/expat-2.2.6.ebuild
index 9a38ba1b81fe..5282269e8569 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/expat/files/expat-2.2.1-gentoo-dash.patch b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
deleted file mode 100644
index 9bf9bfe44929..000000000000
--- a/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9502963fd2e84ac529950f3a6f4173d86b93b5d2 Mon Sep 17 00:00:00 2001
-From: Kerin Millar <kfm@plushkava.net>
-Date: Thu, 29 Jun 2017 16:51:18 +0100
-Subject: [PATCH] conftools/get-version.sh: Use printf rather than try to infer
- non-portable echo options
-
----
- expat/conftools/get-version.sh | 13 +------------
- 1 file changed, 1 insertion(+), 12 deletions(-)
-
-diff --git a/expat/conftools/get-version.sh b/expat/conftools/get-version.sh
-index a70e0fb..91e5c64 100755
---- a/conftools/get-version.sh
-+++ b/conftools/get-version.sh
-@@ -32,15 +32,4 @@ MAJOR_VERSION="`sed -n -e '/MAJOR_VERSION/s/[^0-9]*//gp' $hdr`"
- MINOR_VERSION="`sed -n -e '/MINOR_VERSION/s/[^0-9]*//gp' $hdr`"
- MICRO_VERSION="`sed -n -e '/MICRO_VERSION/s/[^0-9]*//gp' $hdr`"
- 
--# Determine how to tell echo not to print the trailing \n. This is
--# similar to Autoconf's @ECHO_C@ and @ECHO_N@; however, we don't
--#  generate this file via autoconf (in fact, get-version.sh is used
--# to *create* ./configure), so we just do something similar inline.
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ;;
--  *)      ECHO_N= ECHO_C='\c' ;;
--esac
--
--echo $ECHO_N "$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$ECHO_C"
-+printf '%s.%s.%s' "$MAJOR_VERSION" "$MINOR_VERSION" "$MICRO_VERSION"
diff --git a/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch b/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch
deleted file mode 100644
index 6ceb7d9993fc..000000000000
--- a/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 602e6c78ca750c082b72f8cdf4a38839b312959f Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 18 Jun 2017 18:55:10 +0200
-Subject: [PATCH] configure.ac: Fix mis-detection of getrandom on Debian
- GNU/kFreeBSD (#50)
-
-There is no such thing but we need to link (not just compile) to realize.
----
- expat/configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/expat/configure.ac b/expat/configure.ac
-index 1357c9a..444c002 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
- 
- 
- AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)])
--AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+AC_LINK_IFELSE([AC_LANG_SOURCE([
-   #include <stdlib.h>  /* for NULL */
-   #include <sys/random.h>
-   int main() {
diff --git a/dev-libs/expat/files/expat-2.2.1-posix-shell.patch b/dev-libs/expat/files/expat-2.2.1-posix-shell.patch
deleted file mode 100644
index ab680451d8e0..000000000000
--- a/dev-libs/expat/files/expat-2.2.1-posix-shell.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e5e25fac1698d9ea8dbb2e51c18d1072254b5f4b Mon Sep 17 00:00:00 2001
-From: spzeidler <spz@netbsd.org>
-Date: Sun, 18 Jun 2017 14:30:22 +0200
-Subject: [PATCH] Fix sh syntax in configure.ac (#49)
-
-The old '==' sh-is-not-C issue
-It doesn't matter in bash, but some other sh don't like it, so it's a portability issue
----
- expat/configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/expat/configure.ac b/expat/configure.ac
-index e48c32e..1357c9a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -220,8 +220,8 @@ AS_HELP_STRING([--disable-xml-context],
-     [Do not retain context around the current parse point]),
-   [enable_xml_context=${enableval}])
- AS_IF([test "x${enable_xml_context}" != "xno"], [
--  AS_IF([test "x${enable_xml_context}" == "xyes" \
--      -o "x${enable_xml_context}" == "x"], [
-+  AS_IF([test "x${enable_xml_context}" = "xyes" \
-+      -o "x${enable_xml_context}" = "x"], [
-     enable_xml_context=1024
-   ])
-   AC_DEFINE_UNQUOTED([XML_CONTEXT_BYTES], [${enable_xml_context}],
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index fad665b98bc0..544864f724de 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,4 +1,4 @@
 DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
 EBUILD folks-0.11.4-r1.ebuild 2423 BLAKE2B 1f58106f9395204dc114c7f0773d18ea4b7a2c2d2eebe51ddc8cc079af8d6dd9bdf62baa6bb4d2af971dfce092921d268fd26827afc155e91aa10f9f4b543d26 SHA512 0467bd85c89c02609f15bb88db1989bbdb284bb6efaf1c6b013e9b57564bbdefef95414ada4778d4d5776ee689e24cb74d4dbcfddba0963714801586b63f805b
-EBUILD folks-0.11.4.ebuild 2287 BLAKE2B 88ff4471bda2f64b67215049dedba5241370b992b0d59abdbc7411d9bda0ccfaa22072c7ec5d4fa1f09685f8be2908a9ae4742eadb77c520833389089817848b SHA512 8cd137238de0aa09e5467b76afddf18885cfc66561dc3b6c78f3783ad876a52687f71b45ba9845a1c5ab21b8fdffac58001dd0d8bc2cebad81a392c119f71d9f
+EBUILD folks-0.11.4.ebuild 2287 BLAKE2B bc94e9869374962d0e233884b34251316a4a3c7751755112c6438721d682924b9c9a208aeaac69162e3834dab3f7ce844f38cc8d965628ca152ba551e294a7b1 SHA512 5a73ee4bcc651d16162a10729df1ed5b333a7a9d33293276285d133ceb3c2b867059451aca89518b7038d5d7c2a0fd19599474a3e0610d06e5f8d6ffadba7aed
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/folks-0.11.4.ebuild b/dev-libs/folks/folks-0.11.4.ebuild
index be35991b3224..0eb6f1710ee3 100644
--- a/dev-libs/folks/folks-0.11.4.ebuild
+++ b/dev-libs/folks/folks-0.11.4.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
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 	bluetooth? ( >=net-wireless/bluez-5 )
 	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
 	telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
-	tracker? ( >=app-misc/tracker-1:0= )
+	tracker? ( >=app-misc/tracker-1:0/100 )
 "
 # telepathy-mission-control needed at runtime; it is used by the telepathy
 # backend via telepathy-glib's AccountManager binding.
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 8321fd514944..3fe253c6ecaf 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 813 BLAKE2B 9597b380500da21f858c8c1072ecb262ee1a2b836ef46e1f9d2c73254d10d70172b73c3faef32da8ca7d4220e8c2a3512ef1026d30b08c13b2c6ea033e11cc1b SHA512 3f6ab47d8adeeb5e59c25b8c2c0acd1e13ee97f389ae25c11da1f3c9f241670fc17e7233245a225e0ac6f1006705c68f1621c740851b556173562de65d8bb075
+EBUILD fstrm-0.3.0.ebuild 812 BLAKE2B 4404dced75f1d4718bef2fa0991942b9ae0eafa5b9e92df8ac0329a9cf8b581449894e1679fed43a48e4f9630d7dd7eba81b5d9a2e26b2bdceb23bf352eb590e SHA512 54319071fd7ecb77d78e582614426d0100509aaaff943ea0697113f7a1783050fc32f52fd49f13a27c38aad82d1c3d2f7a47c784711e191cd2c89234bdf90152
 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 1c8d4486dbce..ec317d6d46d0 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/glib/Manifest b/dev-libs/glib/Manifest
index b7f9cb07be1d..0d570dee638e 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 10683 BLAKE2B 42e44abeb4242f123fc616efbdda0c0c3b8c764dd7d3ae4d6364077d9d7ec96e5f6c54af57457c32544bf014aba7934276972bc7e8e480756226bfd074b31bd4 SHA512 dc7655343e9942dd0669b7544b32b93a0e58cc4dae469cfd29ff40d5aab0ac0850e9d0c3357db74ef2cb21cee9b8888f545a24b5c8cbd1300bbc80ea84c34058
+EBUILD glib-2.58.3.ebuild 10682 BLAKE2B 897f78a7a5b317bec54a42ced157bf84204f28792c8e24a71f842580bea6ad43704b266258b713114baa885f7744a82c65261d263856dc14cf131439ba0ec8d0 SHA512 752c0c60b6457938c60592b98576d58cedaa292cbe67e5f77332b2c580cd76dd05b9982a8fb944bff7263248e8c5f872350223fdec4482c64359f131f19850a5
 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 f84f8175e68a..fe3632aed032 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/jansson/Manifest b/dev-libs/jansson/Manifest
index 1fe7b4c520f2..12092f608940 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 832 BLAKE2B 749d5d34a7b6ca753da392fcd52560a2cca9d500445e5fa164e4117ac24d3f70a9589f4771438d9848041cc308f936ae165a7f9931106db673e2825b14b5015f SHA512 88658c1f3391aaf15d41acac9cc049c8c72b462da3c327149a979b07a264b052ba72333dd0ed21c5e8f8925ce1d738035ec0b6bcfbb237bfd6478302840e8ccc
+EBUILD jansson-2.11.ebuild 831 BLAKE2B 1e391e445e5953e43de7a967afea476a5fb032bf2ffd7be5626e814e09a8db90709b1e4da658ebb3b31cc29ca1b392fce0d996d296ab81bd86b080059d461e17 SHA512 f4f8dafecd41fc3489f6b99c49aded20c93fa0a7638571427ad5adff991df55008820999546089e73e26c7250d2524d36d1c17c2db02dcd7e30c57c098445ce2
 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 ce4063aeb1af..8e268e68cdc1 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 ad7a04701d76..67226ca977a8 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 987 BLAKE2B 582b8fa900d7f9ed5143a0b6ba6031084dfc6d5baaf36699bca24e0ed5da41d7524f59462c62db6aadd5f015ee8eaf56474695ee9e7f3dd0aeab0f06bbd2bc87 SHA512 286df10b146ba41ef59b9ca1cc814c4f36525162e34e899b2176fa11a01fcf686d16713a3e325a2092b6ec5ca671c8fa33a59fe021360f990f1a3b02bf5b0c25
+EBUILD json-c-0.13.1-r1.ebuild 986 BLAKE2B dde8b0fd57d178fa8e8e1a63662f09d30461117eb51ad79b9c49b8f748c5de7c62ee39584926fe94f4f576712e58fef0425c9974a7f2da174e48af4b7a894cca SHA512 96940b744570dbc17cd4fc11ba2d37b8abafc7b74dccba8273740ce27113dd1f8e229fe2a5b1ebe7cd62589d4ddd99e14ebb3ea83d5a403cdddb1f94bd24f8a1
 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 06cf329e3328..c03181cc1584 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/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 5d743ce8c45b..8e9c046124c9 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,8 +1,9 @@
 AUX libbsd-0.8.6-sparc.patch 832 BLAKE2B d02e16c7d338239ab56c6a1ce88cbf0e0c6736208ac40bf2272fbae5ddf16f10f89701515c69d81d541286012b3b9ce8fe0322197331f9c9b6293aa8454e53c1 SHA512 5b476340a35a02a15706ab7704f4e78b5f78f87e471a0749624ad4f37f9459e2d90c35fbe7984a226f247f26a4809c6a79d1c792e6c1ed64d2a9b4b984513055
+AUX libbsd-0.9.1-missing-header.patch 1165 BLAKE2B 03cd6fe04b969a3216300fa9b7d7072610047661e0b41e2dbd1ff2c471ce3c215ae31170ea0f15c775a2c68a000c3ecfa563f76ed854079609648f384615fd4a SHA512 d77b5b631aab66ce71d8170d899a0440e342be5be304719c7f576e6fa5756d432b4ec5a161582f281de00d9a2eb1aad6237e6be1c550284cdc7e30822b51bcb7
 DIST libbsd-0.8.6.tar.xz 371112 BLAKE2B adab6c17267e0cff128351efccf5c1225b7dd85dc61dd8168bf212ba5aff8d726fa5be687c041821af9a427ddad9dfcd3630cac9134b9e81c86ab2599e43aef9 SHA512 ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b
 DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B aa4aa1c19872edf9e7e6ed270275199366345531a48ee28c25e209f17c5403a22269b91ab1c806cb1b54ba33a8464f4b035fe7ee2bc5dddd0a4fda09c540b058 SHA512 605a14eb5d33c0e45c3bd29e585ebc15832e2ed1efa9356291a0562622168da96db1a20766e9dae8910ea0c1516429f43905edc8d4f2a40a5a341a689d08fcc3
 DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
 EBUILD libbsd-0.8.6.ebuild 1227 BLAKE2B 2dcb7ad4b36a7de7c926ba5480814d060c325433ba3013e635c8b13ff940f303566b77f36a6b37920a3055ce3fb3e1c06882ddbbd58c6b9c98d379d78219b1f1 SHA512 a45b2b20b2b4b2a32277bd346f6433e8cef1d42260a6098aeb8c419d45c7a5c5db26e8ede2dbdef8039b03511e7ffb3ef65f450abea77b250e929889cea39939
 EBUILD libbsd-0.8.7.ebuild 1232 BLAKE2B d30cbbad96b19726f36e83d9fb8c69d14f53702c74f0401ce9abee5b7f7cddbd0f90da75d02833535e12fc1d9f4dbf202305466d8ef712fe892c08c707b94fc3 SHA512 1967086f1067249a65c99a6c68fe0e3238b120ad15d6dc5d6a9ebed7105ae3e4cd86b6c51aa4e1bfbd2ce5b3b0597ae20cfd6326c14d6a06f38d6406e1ad30f2
-EBUILD libbsd-0.9.1.ebuild 1172 BLAKE2B b60e7440da2e884bc67e433b35987a472b304bd4722f6a910056f4bad3410b6a9191b12041e374c15a3af47c0b489332aecd47be3de0bff6e59eba92da34cf86 SHA512 b01b7ca5b04e27ebb7c6c0192317d86387658eb1626d3d2354e3d2c9d1521fc0197c30fb4040f62ed1fdab881628673b49f081182ff2fc0f97f714938f97e6e6
+EBUILD libbsd-0.9.1.ebuild 1226 BLAKE2B 4067937712c082d87349f1c9cfc464d38d09635a245fe0cbad07c6e00db1970009507eb53c7a02a282c56be810db0d31735eea8385abcfa64484936b8393666c SHA512 e269a2fa18c520f66101b5d4e4be22b3864b34dc90b2b26b96d53e699ce01bf114e4ed40863d6ee5c095fee6be3a8d69e114f6264b423fce469faec9e4aff516
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch b/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch
new file mode 100644
index 000000000000..7ca2b881a388
--- /dev/null
+++ b/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch
@@ -0,0 +1,43 @@
+From 13c32916b4baab58d93940d57fea9ff0777f1931 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Tue, 5 Jun 2018 19:21:46 +0300
+Subject: flopen: Add missing <fcntl.h> include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 993828d84ee (Add flopenat() function from FreeBSD) dropped the
+fcntl.h header. This breaks the build with musl libc:
+
+flopen.c: In function ‘vflopenat’:
+flopen.c:60:14: error: ‘O_CREAT’ undeclared (first use in this function)
+  if (flags & O_CREAT) {
+              ^~~~~~~
+
+Restore the fcntl.h header include to fix the build.
+
+Fixes: commit 993828d84eed0468c6c15b2818e534e6b134b8e4
+Submitted-also-by: parazyd <parazyd@dyne.org>
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+Signed-off-by: Guillem Jover <guillem@hadrons.org>
+---
+ src/flopen.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+(limited to 'src/flopen.c')
+
+diff --git a/src/flopen.c b/src/flopen.c
+index b9972c9..ff20d07 100644
+--- a/src/flopen.c
++++ b/src/flopen.c
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
+ 
+ #include <errno.h>
++#include <fcntl.h>
+ #include <stdarg.h>
+ #include <unistd.h>
+ 
+-- 
+cgit v1.1
+
diff --git a/dev-libs/libbsd/libbsd-0.9.1.ebuild b/dev-libs/libbsd/libbsd-0.9.1.ebuild
index a3299a2bcae9..fbc48c4614da 100644
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ b/dev-libs/libbsd/libbsd-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,10 @@ IUSE="static-libs"
 DEPEND=">=sys-kernel/linux-headers-3.17"
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${P}-missing-header.patch"
+)
+
 pkg_setup() {
 	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
 	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 40d058ba51b7..da78c2aadd7c 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -6,6 +6,7 @@ DIST libbson-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f
 DIST libbson-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4 SHA512 d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e
 DIST libbson-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
 DIST libbson-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0da7129cd1fcf1dce7222df4d25ca109b1bfbb545c755abf8e4cc39dd40dde7ba4c50dd51dcfc67c970e2b8eb278bd543fc SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
+DIST libbson-1.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52eb0199a49af102d44c8fb7678db82a41f915c984e95f5301f533dde63139221cb6e161fa5053b9fcc33080abe1095d9c35 SHA512 454670a145a5f2272daa5ca88f2e7d7e42c9b7df62dfc29b3c4b602ef8f819a740890c40872fa47dc411cc5ef9a34b55a6feea3657a802a5be378c4dbe79f42d
 DIST libbson-1.3.5.tar.gz 4547720 BLAKE2B e5e258344aea0969ac74d88d040a464b72d460a13776c5c8c639e569ed3208fabd2641e850bf035c6889b466ddcc33d487da0aeab58f308bee7446b5fd0a31a1 SHA512 b55ae1d424f786aabed6567a77cd09aa26c74ab0a09392e88faef8c156b1650c026f86f245bc8431a0ebcf404c4f80eb1b22e978a24289d32692c84375a66596
 DIST libbson-1.3.6.tar.gz 4546329 BLAKE2B fa9102cd02e40e0ddb7518d34502f6ff63109b91af18a2285422530dae8c6cc04041b7589f340f2e6ed7a80e2474fea2684001b7ced5e8c911d4ba51e1a6edcc SHA512 a7da914ed0f03212d4fb01879543f0b2c7629923e33200fe30335a9a90a1082ffa2566c7a556b90a6c7ffbef5665a45ec67f87ffff2a5fcb89830769b1df5130
 DIST libbson-1.6.2.tar.gz 4835257 BLAKE2B ebe20a6c9ac8a4fcbd8e838d1a7cd319a6b31956690aa2dfca2be42eaafb646405ea01fe2bf20b2dc21bf933c0eafc330fd45409f7c902a7bf0c0641cfe0891d SHA512 f95f5bb829cff3aac6c1d95a159e38396d8fccef66d3026dac8085ba13ec376274cddeb92277d711ac4d40cafd8b89b73e9a9d1cf29e22f7f79aa9422c69488b
@@ -18,6 +19,7 @@ EBUILD libbson-1.10.3.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d68
 EBUILD libbson-1.11.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
 EBUILD libbson-1.12.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
 EBUILD libbson-1.13.0.ebuild 949 BLAKE2B 66d9d8d61397c5c09ae66f01fddf9f200a893beda6fc42d7de9d64bdffbae75daac11a40520a0cd228c7c41c2607985962f67007d689f771ecc54e82bf28e3c5 SHA512 efd6fa747afce9dffde09f23475f944a8df869ef4f997712f0ebb536d77c074a198955eea663f16de138684df5601298a9046e8fec1d4e6f17fc3e533b1b62c6
+EBUILD libbson-1.13.1.ebuild 924 BLAKE2B 7c1d43932fdbb16e0b21f81fe81d5b52adc60341463affe63746f6e014137721f3a300dcbd08e51da092336f5fb19357cbec2e667b09263c0773df21e7b3552b SHA512 78d83659129ef419351106ddc48584a5ba8de957df2f6dfe9dd6dd2bc00e7fa3aaf6023fd74ecffe57470a6324126fa5efed8b4dbfb547bbb588304eb7384f4f
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1127 BLAKE2B c712b6aa9fc634c293446adeacdd8c7d97056a2c219bbf2bd2954f911778b7001c091e2044c3ab607e576d4a3124121576aaad528d0f1a5c9f2b549c43008117 SHA512 0b814d017de2a19d79dc7502e9b25d924b20d4358c88b5a8180695b2559b9ffde1bd906180614548551c7e5cea2fc528485dd5460989d14cce8ba0f61c6b6ee3
 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
diff --git a/dev-libs/libbson/libbson-1.13.1.ebuild b/dev-libs/libbson/libbson-1.13.1.ebuild
new file mode 100644
index 000000000000..f0095e641c58
--- /dev/null
+++ b/dev-libs/libbson/libbson-1.13.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="examples static-libs"
+
+DEPEND="dev-python/sphinx"
+
+S="${WORKDIR}/mongo-c-driver-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BSON=ON
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+		-DENABLE_UNINSTALL=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libbson/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 3c360d8304b2..762be15687e4 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 839 BLAKE2B c7c261f75b8068503ab0387df7f65ac58ac85f0817a54ba80be9d2fb15c47ca7a334bb7096e7db72847f41f5bfbdb1ef65c5ec0591d2312ae9e3a2eaeabdc4f2 SHA512 129b17f4899394401a41eacbc4d93f4a663368aaf5b798bd12c7f790c84b5f55ab1d31c92415ab8ef2f90840233732cc6bd625991bbf377c58f07c9ca2284b7b
+EBUILD libburn-1.5.0.ebuild 838 BLAKE2B 2e6dbca0ed6c7f28751b540f568950723c2a7b79423f68de9d2137a914cae90274608bfb7aa6e7b3ca2992b01b9547df0b0b093ad548656fa292bcfa38da8e96 SHA512 0bcd4718d1f16d13c86465ba397742e35e7ca0325727b47cab3a9f7581c0f89909b46ddd6609d49eeb6c24a4cbddde25d2227abbc038dc2c25236c0d1d17a704
 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 ec6602c51361..58718b2bd61c 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/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index d316d6fc216a..cbc2c67ff449 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -8,5 +8,5 @@ EBUILD libcdio-paranoia-0.90_p1-r1.ebuild 1574 BLAKE2B dbc8b3712c4e67372d2d53291
 EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1762 BLAKE2B c43f64a13e6aec5229d0d774478e4c29719b6a9055aa314a56d11b7b3b00161674b85ceef8693f713f11436ce19c730ce502a4e2c5274d2c5d015790f7c3dc6a SHA512 a243098fd587b73e37cd71794618dd56a4351fb2391a63b5f2a7c817f4636c091abce590d6fdef8bb575bb275e06142202d22c93b3ca837a9972d27a6659640e
 EBUILD libcdio-paranoia-0.93_p1.ebuild 1754 BLAKE2B 5f61c570e2dc7e958893cfaa5ef3617c597de277e81fbd2c084efeaee47f0876f2657d4a0b298c201e9e66bf0fef16a86b5f6f82b87f25445c4257bc7e5e6bf5 SHA512 1243a48a69fea0103a7782c741148f7a5901541976907eb8ce948374cf691110be9a94c685bd7a7ec80fb297250f5f1d600db2a8bd851ce2317078308a54e39a
 EBUILD libcdio-paranoia-0.94_p1-r1.ebuild 1996 BLAKE2B cdcc9c4af325236f037f8746b30accb3ac3ba9b243db868d43aa80657a09bf23b3d6fbe83fe355b77fd572dda0d638df8781b4c1354cb12ba225940d1159ed84 SHA512 2da677ab4afc41ec79202dccb1482758da48d34e496b4b82010d0b3248e52794667841cba837ee639ed8debff363c30b67861ad9a9ff67744072bf99d5765daa
-EBUILD libcdio-paranoia-0.94_p2.ebuild 1984 BLAKE2B 2cbcee0810f24583630fd8e667b75de64298a6bfdeb5ce536b482154143f4a800283e3476080ad8a61f41305999c872589d9903b46ff04b777b1328e6881eab2 SHA512 e0934e47b5526e0e54e07666c7190cc3647e3549648e2011629c48cc463d8020cf5fa3358e0deb7686dfb76b4b3ec43bf3f63f4e77ba6005fd10a77c65b478e0
+EBUILD libcdio-paranoia-0.94_p2.ebuild 1983 BLAKE2B f52c30321180172fdba8646e329f565ca58153dd6a58efe66e1a4e33c7bf18a6ffc60754cc4da39d6295577162d513a4b33e893743378cf6aa2056b6ae0452f0 SHA512 902bc4b48df3f4948708871b6272a1ee6494aabb43ef2264ebec0e841ee52a4ff70ad1ee69ba1650cc31a5eb553d8e3baec6bda922b0377bd50e9ff5cd80b4f6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
index 2a24133ba42b..3f1da82d0927 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 13662b597453..a5800730c5d2 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,4 +1,6 @@
 DIST libdnet-1.12.ipv6-1.patch.gz 5124 BLAKE2B 674866a441a5907df97942772b1e4b95aee004ddb110204df0580cec6b6bb3ba4074831d83e675e1914f1a29281b02227e95016db6ce6a0e8b99417d1aa6aaab SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a
+DIST libdnet-1.12.tar.gz 959945 BLAKE2B a19f8c83425861d02f832330cf0eb5bc317eec157737e0eacd48a7827d423c626b24ce833f66429c9f2a0018502cae5426d5cfc1019aed307d63e4fa6b3845c8 SHA512 a2410a98b76d4bccecf7bcb82ff0b6e9fb809b389f7fea938cc42d94e18622cc5f353d2de737121a1990d9e16e9db8cc2f82677c94f78cd03c9227e815eab9e0
 DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f9676066c15e02c7a8b613e26a5e7743df524869fee2eb7d93438bf346f772b8df199b8ec337279dd50d5d77 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3
+EBUILD libdnet-1.12-r1.ebuild 1539 BLAKE2B 5806f39ca49c9d3bd74613029a8a42e1578ddbcddd8385e0bca7f856294f124e92f1d123dc03a5bc3cc6b1caf8a24fe404bc00d7ddd6de5ab8a7dc24f3b383c6 SHA512 200ba566dbd1b6579d4cee3ba1cbdeae423e39dd2efe8b8730a9fc32101359151ea7f71acfaf892e04e1aecfe92a6d560023497dc6cfa7bd4515649387e909ed
 EBUILD libdnet-1.12.ebuild 1523 BLAKE2B 9f05030b1d32ca80bffd7a4eefeb9d55ffefe9ac2bde8bec41782c1a0a96fe2fe4cd164c94ef184c591fc998dabff1a091235d9584e23dfdb41c94a44e9b7942 SHA512 0128a0f669d3ce291b65e71b725b8f8e66934df2bd0036d96fd288a03047344921e038204cb44a6db781bc07c28e38a84c785efdd84b255dd68ca607e7b8ab10
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.12-r1.ebuild b/dev-libs/libdnet/libdnet-1.12-r1.ebuild
new file mode 100644
index 000000000000..37fb38166b21
--- /dev/null
+++ b/dev-libs/libdnet/libdnet-1.12-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+AT_M4DIR="config"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+inherit autotools distutils-r1
+
+DESCRIPTION="simplified, portable interface to several low-level networking routines"
+HOMEPAGE="https://github.com/dugsong/libdnet"
+SRC_URI="
+	${HOMEPAGE}/archive/${P}.tar.gz
+	ipv6? ( https://fragroute-ipv6.googlecode.com/files/${P}.ipv6-1.patch.gz )
+"
+LICENSE="LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 python static-libs test"
+
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	${DEPEND}
+"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+DOCS=( README THANKS TODO )
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	# Useless copy
+	rm -r trunk/ || die
+
+	sed -i \
+		-e 's/libcheck.a/libcheck.so/g' \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.in || die
+	sed -i -e 's|-L@libdir@ ||g' dnet-config.in || die
+	use ipv6 && eapply "${WORKDIR}/${P}.ipv6-1.patch"
+	sed -i -e '/^SUBDIRS/s|python||g' Makefile.am || die
+	eautoreconf
+
+	if use python; then
+		cd python
+		distutils-r1_src_prepare
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		$(use_with python) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd python
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	if use python; then
+		cd python
+		unset DOCS
+		distutils-r1_src_install
+	fi
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 262cd937bf91..83b1dc75d5f5 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,7 +1,9 @@
 DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
 DIST libgit2-glib-0.26.4.tar.xz 138492 BLAKE2B 725c14076fb940186faac079cff1ea87c456ed41e943ae95a4a674632c1be261ab6d4d5bcb5c0800bbde5d86c1ff3095d59045a2fda1342a1cf5c691a2b424aa SHA512 9eb78f292583862890ca0cd27d7621da2f8f633a76f4679f897ce6cf9e06b64a3cb7b0ddda39d231d21d3faa830fe1a9a9326b4abd420df8356d50a734360b37
 DIST libgit2-glib-0.27.7.tar.xz 137784 BLAKE2B c27511045e81c2bc1dbf0793ae9630358bb13c3fcbb317ccad861e5796772c120895ab6e3dafe7fedc78406d0cd4bd31aee6cb022921ef28bcd45b72f22bdd04 SHA512 33bf9401dd96cc700d0365e51dfa5c81be3930f1ad01d16d878a27efd7e03bb089a23b6db6af500bc20903e6178300ac79fa4e8edfca29e8222aaa2cd3dab63b
+DIST libgit2-glib-0.27.8.tar.xz 137796 BLAKE2B 4dc6d9b435a662acb3fb51bd7349b9c273bad68073ca05d1c27fa59148a39549036e5e8786ef502e1c5758596bf58a80c7153837c6a5956c764d69d71b860531 SHA512 abeb530971edcdc3e813d34ebffbb5d2edfdea527372976e6495f9370a4a7f63c7f34e61bdec02a602a8b5e687960e33f77dc6cbc8f3b65accee7c195b03b593
 EBUILD libgit2-glib-0.26.2.ebuild 1304 BLAKE2B 9a3bedeca6910a8bb1dc73783869b733c8135375748ee3be8ae1695636b7cb0e92f12fbadd701ce08ea438a10d898be30a5d10bbc25ebb3db31d82b32c6d6ecf SHA512 b111e69cd3c5ba40f24b12060c9b3cd5d61a3b425c173e14743c82dcf425b27da9786d52b79cb3c0af94302a29cba058ec70196b752cacad2262bfecdd72ebd3
 EBUILD libgit2-glib-0.26.4.ebuild 1329 BLAKE2B 1c9c368df50d5c65f0605b503255582c14e0ab0f487acaaf7e198d720d8a7510ef1f15449aeb9afb314f2ce3b7fcd57a2f8cdeab0e768a73e977636699ead4cc SHA512 0f58111ed32d83a14ff6f1a6f8eaa8cab306a527a15c26678e92965dc25e56587b3e33d973c1af15c7089b99c23451d06980947a835a129abc3c78988de06526
 EBUILD libgit2-glib-0.27.7.ebuild 1269 BLAKE2B 51c11102e0126e0e993a9255e0ccabeb86fab0d3c19486c30812c349ed8f1126e0c907ced4cd2107c748b65496438d76b3e5c94c7e02d33531345ede5ecbb32d SHA512 6e25faf80bff9f4d1fc5ee60912edf811716b44383454ea075381e92ff70e147055b41af7b94fe2b51339819b16e105aa50bd86314c85be6065d92aa39e3692a
+EBUILD libgit2-glib-0.27.8-r1.ebuild 1266 BLAKE2B 4df6e06fa3b904017f9f7e9059a3cc8ca3b0401677baf2413b8d46f654ad119d43134cdb9adaafa026fc536ae6b4afbdf1f607d11a57e507076755d20bd5cb59 SHA512 622f882d471f63b1375100db72b87dbe4cee5a1642b2397b7e1ad225dfa9550cc5c984547ddc08ed5e84d8a858a8451099483de80bee37c9b77f5032387332ec
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.27.8-r1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.27.8-r1.ebuild
new file mode 100644
index 000000000000..c4cad71cdaf3
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.27.8-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson python-r1 vala
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python +ssh +vala"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# libgit2-glib is now compatible with SOVERSION 26..28 of libgit2.
+RDEPEND="
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/glib-2.44.0:2
+	<dev-libs/libgit2-0.29:0=[ssh?]
+	>=dev-libs/libgit2-0.26.0:0
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		# apparently broken; fails to build
+		-Dgtk_doc=false
+		# we install python scripts manually
+		-Dpython=false
+		-Dssh=$(usex ssh true false)
+		-Dvapi=$(usex vala true false)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule libgit2-glib/Ggit.py
+	fi
+}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 4091c3d365ac..c1ea6ee8da33 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -2,10 +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
+DIST libgit2-0.28.1.tar.gz 4987204 BLAKE2B bb4f32b0b78a9faed3e5204f40cbda15d032719dfd581948cf175bc17a30356f97f20545e1f64ff6f3cd1dc4ff483af99edb29d7a10c56349ce74976c186886b SHA512 5a1bc5c6af6ad25cb8b2c446e75a774d2a615d4999ec3223d681c7b120d83e7cecd94f1ca549bac0802f5324e27e73cc5a6483ad410636c2f06f098b30b1b647
 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-0.28.1.ebuild 1689 BLAKE2B 65f1c812181d41fc28b38607bf30d4ae45eb6be38ec7e66ffae2d63479d572c9f4138c10ac83e8821ecb2cefe90f1ff1ea6ab943b5647b60e63ab24297de6022 SHA512 9a7b6cefffbb9cd6a594585519a1732408cc60bceb135c64d4a4d50af2eec147100c3d85fdd737fa5ce39162cb861247bf6f6dbf1c390c9ae1fd510ea7115528
 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.1.ebuild
index 9423acd6092f..5f6041d38921 100644
--- a/dev-libs/libgit2/libgit2-0.28.0_rc1-r1.ebuild
+++ b/dev-libs/libgit2/libgit2-0.28.1.ebuild
@@ -10,7 +10,7 @@ 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"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
 fi
 
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index d0fc37d111b4..ec04173e7fc1 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 2034 BLAKE2B d41624036fca18c4fdbdc06c14ef0f2b8a32877f3f104529b84cc9aca7f76f641710f58c902773baa84606331360bd010863b27043d4f17c8ba58a513fe51ebb SHA512 6078e27325ec5d32f348e83623bf3666e5c58aa7182007897aa1936aaee71d1187bcb4915816ec5e095884f81c1eed7ed60dfc514d22ee9e537e7c8fa4412aa1
+EBUILD libinput-1.12.6.ebuild 2029 BLAKE2B c193e15ee316e4d0bfb1d4b4ac562d66747490f0b3484f5d10a458ca2987c80ea4780a46aea14538ad5362bf170b93aa8d5e9147f590210f270641468caa67e7 SHA512 75c5823074fb850e10828573d40c0bd3bb6610109e6c998780c426fed4fcf5e67abdc7c3acfe324fa234b104f1279f295bbfbb0d22ad81574f5bccfb2181bf7c
 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 fa3fa3045685..d9976d9a0742 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 94bf89927967..482ff541083a 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 1832 BLAKE2B 87b001fb5c85f3b9301f5a71a9a5d5da2b21512479499f2f1377c6b7a1d7870015adefe021be7eac2be93f4acb51d80f78546644f096fef9fb6d9300377e3db4 SHA512 6ee4c100a8a9d38aaca46799d1e6da2344800d36f8fabddb4d8fdb2fe8d6f5dc40439f3318eb0f290029acb6e9e5236352d58984cfd2909aac6633e00ee33ed6
+EBUILD libisoburn-1.5.0.ebuild 1831 BLAKE2B 8668b61a0732dfa562df9362afcaaa6e9c00938211cfe4e1b6efa91a968ad01aa68b7f85debd6c25946f425cdd976f5b2cdb4a36f9ebe72fc3aea6fc532e04bb SHA512 1c23c13158803e6fc631a2efacb66f654269d111dd36b62fc5d8e48ead6745d8b79670f60158b4c190cc4fe3a52eaeeb5fa74f40accd5d1da4e50e8077ee1bd9
 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 4885eb9e4d32..e8f60b6d0dae 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 f15647189d8b..686e8176e9c5 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 959 BLAKE2B 941fb966eddad33931ffa0d5b7b89f8612b8f86515f9f28e46c0c8591e182af0cce2cbc59b7733a96661f261774545bd84cd7def0228cbea7d647cdfbe0eb810 SHA512 a6ac6a6560b25f52070678b70516108ce415d4126b671636c068d88baf392d6604ff4d6b28413efce19bcbf743245464739dd07ac8b29094eec49c875501cf3c
+EBUILD libisofs-1.5.0.ebuild 958 BLAKE2B 4621b9fa67538fb5d88f623a97fbfaafec4240cd634bb7ab85cdd0bc3e81d1af2264d9716f1274e6f83e73d53285e4e9ee9c74c3a4da53c8eb2a0f021e785365 SHA512 f1173bbfb7f3def135b7eeef2cd68c9286234727d7392b2a3616564f31b12acff805e72225060d06d037f07110fa8832cc2ea6dda0c6e45d2fb6fc12d83e1c14
 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 e2cfbf236039..b098d713750d 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 d58e0a91ba42..bcdfb04438c5 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,4 +1,3 @@
 DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
-EBUILD liblzw-0.2-r1.ebuild 478 BLAKE2B 802d673164fbd4321cb23560cbbf3f8624f9d50c0b5de96f5c6f2ad4d0be46028f918e9d38bba5d2df349cbe60205757ffc0c17bc0b8d6bf4d7eabad2f556f28 SHA512 c834dcb63568ad04ca2cd376b093165d39f713df1e7079dc32ce821632026391a5bb015e500a36aa93cc69f986507ac392747404e8cb29b92e7ce2e6c357f4b6
-EBUILD liblzw-0.2.ebuild 465 BLAKE2B a0ce966c22682ea2a0c95a5842441581a58f6eb479e8906786f45e4c706cb6979be80c0743ecda7f520011697573c146eec76d1a0e5b3e482a3c39283dac7393 SHA512 68d82e623358e6abdedd188709c53409669343ace16f7277484305dc014813b80c3b17733d13246c61ef3d081b3e100146ad567702a5fca4e932a0501fc23669
+EBUILD liblzw-0.2-r1.ebuild 473 BLAKE2B d463c9cca801e948914047c38f5321082abb7b08dfd9a7d59b4a92c95d9c635ea49b663b24cf006ff78b04e055b0ef0ac176c60d09b951720ac831064ebbd635 SHA512 e92e08543e77e5ba026964dc7b2a594c7bf8b8018216341f21186dd52a07d56474fd71b01844e39474d392302bec2f8a55830a7423f91c2f215933a6fdc27bd1
 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 56b1cee33eb1..84d097d32022 100644
--- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild
+++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
@@ -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/liblzw/liblzw-0.2.ebuild b/dev-libs/liblzw/liblzw-0.2.ebuild
deleted file mode 100644
index ea74b2a8250f..000000000000
--- a/dev-libs/liblzw/liblzw-0.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="small C library for reading LZW compressed files (.Z)"
-HOMEPAGE="https://github.com/vapier/liblzw"
-SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 m68k s390 sh x86"
-IUSE=""
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/libmodbus/Manifest b/dev-libs/libmodbus/Manifest
index d9314e5f1d26..ddcb04a2863c 100644
--- a/dev-libs/libmodbus/Manifest
+++ b/dev-libs/libmodbus/Manifest
@@ -2,5 +2,5 @@ AUX libmodbus-3.1.4-doc.patch 358 BLAKE2B 7f69a497411d308bc02f4881802cbd2b17ef2d
 DIST libmodbus-3.1.2.tar.gz 428224 BLAKE2B d1e91f2e0f5392e3fdcd6da942cc1e8ef8c305a2583e3caf046df81f539458554158d9b8e1025f118692a22bfc9e9d07540156c40da475e9b79df524d35c86b8 SHA512 a9916bcb861f39a73ea952cc3ab58af2949a3dfbf0e964ce5327c2443b0b9d812f6b740b90aa062c106477d2d6a3badfba6b0cee0455e48484cbdb07bcf82e82
 DIST libmodbus-3.1.4.tar.gz 471576 BLAKE2B 4fc57abd784e2cfb65d19cd55a31f4b778a209141cc13b9c969dbd6052f187ba0de0031105be748aa2113f345bdb16c2b582b53635b5334f06dfdb34c5992a18 SHA512 63f73894b27704f5e5b3ca0a364cc366c5b5d24903bb24384155890cf06c0f8e5c707a435a38129402ff6628ef3d611dd0db82f840b79cf1d205ebed2ac5681c
 EBUILD libmodbus-3.1.2.ebuild 593 BLAKE2B 93c696139c5e3718a3f47559b3fbcfca9b0df51688fd8e58b6660617cce5d66047c56bc47699c19af2d85e63833bd3cf4e30851447ed5cf809a2d4705fb976a1 SHA512 d773f1c3d2d830b537b8434a9079043b8eaa8383f375d6bfadb2cdf558753846345411122b4a456a9a4eca114aafa58ef72d56bb63a44db7f0db9cd56e8c4955
-EBUILD libmodbus-3.1.4.ebuild 713 BLAKE2B ab6bc6c59e9f18ad2c1d2323162805901fd6cbd92d20b866a8240893b3ab66c469e7f37187cad690fba3351536ada92dcda566d922a26508ae5956285ebcbb22 SHA512 4e6f8918c5afc8f3982390db4b43b39dfa4d958fdb1574417d6bed7e4f76e8da323bf39e96b85076e1b5bcf3c8d31c2bfac2493ce1bd1dd1d7aba7fdd7ae1ab5
+EBUILD libmodbus-3.1.4.ebuild 709 BLAKE2B fea8d85499170d4928bfddbbcd603a4426df725608ca49bf8d250fd00ec7c233a7d206db1be696d30d4e2a288c6482cd3614c8c8b52ec39039e93102d3f7567a SHA512 4b4ef290e99abac62a64863c0d6335e607dcbed79bfe05d060d77d6475003a588a723c4fe1dfc52511154668f179c1dc059048de320d8ea708936e366823ab7b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmodbus/libmodbus-3.1.4.ebuild b/dev-libs/libmodbus/libmodbus-3.1.4.ebuild
index 03f13f3fbd1c..dc3a2870141f 100644
--- a/dev-libs/libmodbus/libmodbus-3.1.4.ebuild
+++ b/dev-libs/libmodbus/libmodbus-3.1.4.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=6
@@ -9,7 +9,7 @@ SRC_URI="http://libmodbus.org/releases/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="static-libs test doc"
 
 RDEPEND=""
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 7112851c2694..8e614b7434c9 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -5,5 +5,5 @@ DIST libsigc++-2.10.0.tar.xz 3794612 BLAKE2B 205cd8cedbe25d04108df888c392fe6a148
 DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
 EBUILD libsigc++-1.2.7.ebuild 953 BLAKE2B bbded60c997517150857e66d1d1bce9123666391c0328862ef3da2abb75519ef06585ff4209803277352e49c5059606975ec963b564a075229d4fe7243d92dc1 SHA512 8fd16c8a79761172d2674ba2935d07d13d16c20db687a00e53241a2f5d7b1c9f7b61510968960e02be85a6f5e52aa622cc0d09af19c2ba19a274e997596850b2
 EBUILD libsigc++-2.10.0.ebuild 1656 BLAKE2B 06f822384e9c2fcbf52fe91a783ca9266d4ea7f728d9c9c14db04bea4a8b69cd1d863f719f4031028d30b074563b5cc401eeee2fd3693e33497e9b3449910e79 SHA512 f28e3fc55596383da213da6941015162cb7b2983d40990b030673fe6aecae01ab88b842e1b75cfccb70d235134cbfb8da6db626b22822bed277c5f2f4e7bcbc6
-EBUILD libsigc++-2.10.1.ebuild 1518 BLAKE2B c761da7400510944c7cbafc1dda91bc2ba8723aaaa572ea055d57043703a118ac2c05bd9730a4b57d966d27ca4c6da31a4e397ad29f6c1fffe8ed85f6f2855c1 SHA512 6772a72fc8bae1e50af421a5169bfb4bc71b731ce40dd4d9c6bfd945ac0d1f5d9be352dd66d94230421a941ddd4192774604607ad2c60cf77a286fec4140178f
+EBUILD libsigc++-2.10.1.ebuild 1515 BLAKE2B ea7be14435e21a4af08fb489490df47842c7c378c3a374ca1e0f42bd7584384cf65f239d1c9ee282cdd29025c4a2b7c0f7312472968a8cd649abd0a134d3bda4 SHA512 02055abafbd0ec88e4869a16e965dd672c79ace6fc6045738e4ed1481fac25e3a6dd779b9bd190bd765bdb7888223277c4666e3606624c896edb8d6aabce3b35
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
index 8bb40813d761..ba7384eb0ce4 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.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=6
@@ -9,7 +9,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index 94ac2838e0af..6bd9bed44d1f 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,10 +1,4 @@
 AUX libunistring-nodocs.patch 287 BLAKE2B b351d572e702a17cc4b1df97f182b6fa5ca232c77a4775572097043814a868e16adb7e6dc4022ea07c614d6accac255a6c0262916e5a36275949e069a17b4a80 SHA512 f7bded4ec621039121c93c9808e384822613c670df886c125b00d8add6ab8257a5152298fa483cbed21222da78097a98433a2f0b364467ed82bda5f98a8c1847
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
-DIST libunistring-0.9.7.tar.gz 3589989 BLAKE2B 5ba029be96adf3804e9591ee0c271f41111a9c48c773d50adbf2408577e98ddd06d54dc665d3791a835698012021384c9290da0e3ce3d331f20283462c6a3c75 SHA512 43cb60163299a781b57bca326ddeb6333cde0b12d274fcd2b176971c8080ee8868f8c11bf9c524596d3a56dc0213ed1d3246fb805db1de950257c3764eb34ae0
-DIST libunistring-0.9.8.tar.gz 3720294 BLAKE2B 873dbccbe869c9dd6fe72f17759aefadc6495f97ba26e2cc62a1d94c9ca966a5f35d8d40a480077b90018602abf04342de51dfd64a4034db2ef0ff8a0f102c03 SHA512 91c0da429cc13272bf94cc1afa2bcc6cb0afa2af8b9c05fde2c1cd3ed0f54c6571803c303e20579bba51600d0e63fe917b415ccbb3751353cd8310388dddb72f
-DIST libunistring-0.9.9.tar.gz 3736674 BLAKE2B cb328e2378aeabd8f1282ed6f66f556c6301a88bdbb11d1a7ea73569700a8af9bbbfa9336faa7b390e5f5df628001d5e9bf2081f0c36d139296f16d657e70de6 SHA512 dbf067ba5c748e198f8837e603710ff63714d1bb4642a2cd2facb8f1034b617250c8695f4e1caad77c417bdcb0f1e1664eafa5a18eca77126741a4363a1c9cf4
-EBUILD libunistring-0.9.10.ebuild 998 BLAKE2B aabbb6cda29021aa13bd5b9e8844b89d91107b7fee4de63eb91dd5ffce8575ebbbc12d26f01a12de0243d3a1b559f7b83dcdd21b1f08cae4b68543ffe5d35a2e SHA512 69632867f581be61e3c0d9d69e7b0e97dbe24c610d8adf1d1d3459c379f54c61b698ddb5ba229b964ab8db1ecdb53a116f3dae5c3129ce111f868236573bde95
-EBUILD libunistring-0.9.7.ebuild 998 BLAKE2B 75ab1eb5ac3e5099677cfb03dfac09c9b1a4851754a5633d94de4c925c8f44b56ed23a06b4b39a6fb8b4329eeb0344887a4f1582fe77987670f27c4bf75e25b1 SHA512 fe39a9540299c3cf1d8538aa8eecb0f9824e67ea460d05abe458df6cc7f9ac0f8a239d944e2f1029566c8f26d610529ea90002beb6856e545e323945a3949bf0
-EBUILD libunistring-0.9.8.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
-EBUILD libunistring-0.9.9.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
+EBUILD libunistring-0.9.10.ebuild 995 BLAKE2B 9112d81570a4ae1c172ee0866dd76a7d252e0d2f986cea68f50764279b00eef09850ef165cfdfd7d210be5868103cf125bc55016f901790cc9a409c961583cdd SHA512 93da5bddbf790da8961ce97bc8639c2370c9c62c6758a458e782fb7a7b69c55e2762b88afdaaed9bd38f27ad8cbeb95277e412be6b4c0013ace2ff784c515e49
 MISC metadata.xml 941 BLAKE2B 8234694090eba5e3506623b298b69657ece0a7c84d04b7dae238322112a74859e8c7bfebe40877f172a449ab8dc2095edc147f01040c949c704a54fc7a606617 SHA512 f4a8e3611f2e109b281e5777a0b7a30e14b64393af8c320be8fd18f293b9b8e1a732061e0b6598da24547dc71f068efc8f397bcdbefc4b286084d8f72478d4cf
diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
index 0ee94231712b..f413f95dcd6f 100644
--- a/dev-libs/libunistring/libunistring-0.9.10.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0/2"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libunistring/libunistring-0.9.7.ebuild b/dev-libs/libunistring/libunistring-0.9.7.ebuild
deleted file mode 100644
index 44f5e846f12c..000000000000
--- a/dev-libs/libunistring/libunistring-0.9.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal libtool
-
-DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
-HOMEPAGE="https://www.gnu.org/software/libunistring/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
-IUSE="doc static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-nodocs.patch
-)
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared libraries
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
-
-multilib_src_install_all() {
-	default
-
-	if use doc; then
-		dohtml doc/*.html
-		doinfo doc/*.info
-	fi
-}
diff --git a/dev-libs/libunistring/libunistring-0.9.8.ebuild b/dev-libs/libunistring/libunistring-0.9.8.ebuild
deleted file mode 100644
index ba7327e2d797..000000000000
--- a/dev-libs/libunistring/libunistring-0.9.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal libtool
-
-DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
-HOMEPAGE="https://www.gnu.org/software/libunistring/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-nodocs.patch
-)
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared libraries
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
-
-multilib_src_install_all() {
-	default
-
-	if use doc; then
-		dohtml doc/*.html
-		doinfo doc/*.info
-	fi
-}
diff --git a/dev-libs/libunistring/libunistring-0.9.9.ebuild b/dev-libs/libunistring/libunistring-0.9.9.ebuild
deleted file mode 100644
index ba7327e2d797..000000000000
--- a/dev-libs/libunistring/libunistring-0.9.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal libtool
-
-DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
-HOMEPAGE="https://www.gnu.org/software/libunistring/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-nodocs.patch
-)
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared libraries
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
-
-multilib_src_install_all() {
-	default
-
-	if use doc; then
-		dohtml doc/*.html
-		doinfo doc/*.info
-	fi
-}
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 6f0060fd744b..e2ce2b6dbfa2 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 731 BLAKE2B 2668312709be33db05c9f5e1b056a71c84184be59a68ec33ce990c3a3c7fa4aaca08a1411ff74b32adf76cc36fc23d5314b3e4ea6979ec53222b9b9eec2b6a53 SHA512 72d2271554aafbb1c57b76ee3032aa11e26a1b31449281ed00a4d5b1f8bc0852789b867e0769591e232b20764ef00cdc462d4d83d16aa13810748734bf716ca9
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 730 BLAKE2B bff6364e922c7a82cc95316b9e055b8b75d1cfa2f2edd1eac16af283526e12a9b2e03e1476befa8f3237f0f22182d9f44aed2ee6b774d898602c5ecc07159c83 SHA512 558f39bca2db826ade93fff8f1af57f88a358988943bbde4861463500339d9f453a50eb3c1f56f51b8b45cc24730fb97853bef4ab03cf459585eb802518135f8
 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 09b7649857cf..7a2691d29761 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/libuv/Manifest b/dev-libs/libuv/Manifest
index 8fe6b16e5012..76750da7856d 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -9,6 +9,7 @@ DIST libuv-1.23.2.tar.gz 1192529 BLAKE2B 045e7d46b9b45fb415be1827692021ae85a86b5
 DIST libuv-1.24.0.tar.gz 1201665 BLAKE2B 746d17fbe79f820ba66c4445a1ca7cc88bf5f6bc30a14b4a5101356d9f7305ffe5b6eafc05471886b9196e19e02fa2d74b77bdfbd5c210a2fc34c0408886d7e2 SHA512 b75dac19e99497b059b9b8ce646266c4fa10f1259f5fd74554f7f614f7b70f4b62b9c756316d9a3eed6cf6b9d61f5acde9f6eedb88d30431f6a5c87169487ec6
 DIST libuv-1.24.1.tar.gz 1204222 BLAKE2B 8f70043702712adc336bee67141e7901036246ea67737f89174aabe26823909f07d6ba3394d9625dd63e200ab4265f97790c138f84d5e74d9a7bf82dcf06ef20 SHA512 19cb03a7a62ad2a1f392e1de3e4fdb622e3ac5afe890bfb819c30118f4745f81ecc343d5b633eebb8471fdfb4025652bbface245fd616c55346aae82376f6836
 DIST libuv-1.25.0.tar.gz 1207205 BLAKE2B d524a675c236a6af935fdc95efdaf77a22506a86d309edb3535692fa5a9d8eb06711bf4687274c2d10a65640ad37ef06a2460b14b1f90084ff03b86ce7b0f306 SHA512 d1024f9193e2ad69cc670441b74ff7c63ca7d295e9a7a43c90da6781a39352687465bfe7e852d6e9085c21821bf8d11c10139c7229759fdce567d809c605acfd
+DIST libuv-1.26.0.tar.gz 1209551 BLAKE2B c4acc6716da5a4c01611dbc09bff2451536c3dcdbb17e5ca45fe2da97333d49a358dc8ca5607b8bde0b8bb4bd7a9bac76c3572ff23b6d5c97b337f133124a2d5 SHA512 c38e36d4d700090f48f9d997302968d9fe2382d21695b2d5b30776149f1739f66cd03458937a11309efe326bdad8c12abe8bf0f0e210d30cc2de4d9ab651d1e3
 EBUILD libuv-1.20.0.ebuild 1167 BLAKE2B 822424c522ba27df7624d2b3e1fabb522e15865b8eb8a56127f6565da3d1ae55f519d47ddfe7cb7cecf406626487fba48d77a164a67e9d48be613cc2e36bf93e SHA512 3eb698ab1c3e9d31a90f79293a9484cf7a27e7a7945577bb241b74e6390bc4efee13e43b28de51c38c5fe3b921ca886f0ea8d26c752ea5f0437f5a4d0ab7bfd4
 EBUILD libuv-1.20.3.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.21.0-r1.ebuild 1223 BLAKE2B b722de91966dfb7612e4beec9e266099a83624183ae0d7b647c886e2b03d9b0de6cff5fc0e8c668db39c14adeb0469d38a2708adb7095c59c651bac3995cdda5 SHA512 e9743686b9e24773e37800b8437d58e6d1c3d6ab5fd664586d67b93b98981537ac1b3bdabbfcb13b1bc1b7b7bb0b06f8eab6d9f3b9c075da31c83279c95a86ea
@@ -19,4 +20,5 @@ EBUILD libuv-1.23.2.ebuild 1225 BLAKE2B 7a7e7f855e8fe0ac81771e5cf64dbf9886e4a660
 EBUILD libuv-1.24.0.ebuild 1225 BLAKE2B 7a7e7f855e8fe0ac81771e5cf64dbf9886e4a6600ec04de48d8c1b746389268d30ed0d5facc0eaaa47186f51760ce17523bb3ef641ee827c4635b57e14daee56 SHA512 c141a1f6216d4ee028937a17de132896eaaf9743eabdebaebbcadf0930bc73be9fdce7bfa33e296bd14852d69f1c2f87941b02d8ac7d4fb554faae24e0795893
 EBUILD libuv-1.24.1.ebuild 1225 BLAKE2B 7a7e7f855e8fe0ac81771e5cf64dbf9886e4a6600ec04de48d8c1b746389268d30ed0d5facc0eaaa47186f51760ce17523bb3ef641ee827c4635b57e14daee56 SHA512 c141a1f6216d4ee028937a17de132896eaaf9743eabdebaebbcadf0930bc73be9fdce7bfa33e296bd14852d69f1c2f87941b02d8ac7d4fb554faae24e0795893
 EBUILD libuv-1.25.0.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
+EBUILD libuv-1.26.0.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
 MISC metadata.xml 1337 BLAKE2B d054e429ce7e3a6b94910693123645ab6dbfefcb8921b37b57ae156aeb5a25a4b100b45fe6714c498a355015dc3cc37c98852a14be651bd3f55259b8ab78e2dd SHA512 dba39812f31549539955d26ab8e281b4a1a372b8b41f29e68f0ae63bc10d18df5eef106936b31a13344cc11705192bafd4b32a0aca1f16e7927244ad049278ca
diff --git a/dev-libs/libuv/libuv-1.26.0.ebuild b/dev-libs/libuv/libuv-1.26.0.ebuild
new file mode 100644
index 000000000000..6fe68c68f88e
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.26.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libxdiff/Manifest b/dev-libs/libxdiff/Manifest
index 09f1a47bfc6e..b0f478faafdb 100644
--- a/dev-libs/libxdiff/Manifest
+++ b/dev-libs/libxdiff/Manifest
@@ -1,4 +1,3 @@
 DIST libxdiff-0.23.tar.gz 412088 BLAKE2B 4b06dd7bc079491cb2257bdba82b41a038d232fc9811e3684760d9470055e9a2835f5ac651aca64c2a5ac242641a3bb91b5d62a1844c216f58337179bd88a657 SHA512 b6bae5ee9d21e615d7beeacd9ceefd01eff1830734b1c28a4751a6b0182727afa957e072f7c7dc492d9448e502d1ae52deaaceb0dfce4b32a3c089cbdc3c7e18
-EBUILD libxdiff-0.23-r1.ebuild 653 BLAKE2B 4b1efa9008765e0d2c4161540cd44953976724846c89c5a42b765e45c8053a74cd7142ee9cb932b593cc75ae182e072ae7bd7aa5ddf21d194e8e01432b43d5b9 SHA512 5d188e183bbe1bcb9b95cf420b8afcba27c8d65afb69a869d8fcad6ff38cc9e11118649b5ed5806ad8d775e218395eda7cc838395c63e0387cfafb9ad0ad2c17
-EBUILD libxdiff-0.23-r2.ebuild 561 BLAKE2B 164ad32f966201c1cb40298549fa3dc2fb51af4bad0e00f87f1491c8c2646787f2c718de5f6b7417cbed0b453fed4e8db5aed9f92941c7c22de560d2edbdfbd5 SHA512 c8e068a5b9a956f02b7b4e60b911166ee636996d99314ebbf2620f2d0676f4cdd676c103050ad1cbedda79b2a3fa4c677bfaaa4b2d5a50003b642fc1207c69d8
+EBUILD libxdiff-0.23-r2.ebuild 556 BLAKE2B 802fa7aa5cfb2f5dc50b7fddcf1d417e6c07f5c8c32a576b83cfb4ccede873112c1a6cdc8994faf8b881a9c0ab79c57d50f7c584e8e43360aa98acca032fb62a SHA512 1aac0c86917761f05e190b86c7d1095683a875da5375d07ab09cdea70e197fddd6c92275310d989fb5c9c946214f48c981c9ccf9d54d212228b4b97232884ab0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libxdiff/libxdiff-0.23-r1.ebuild b/dev-libs/libxdiff/libxdiff-0.23-r1.ebuild
deleted file mode 100644
index 0ff79aa93082..000000000000
--- a/dev-libs/libxdiff/libxdiff-0.23-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="Library for creating diff files"
-HOMEPAGE="http://www.xmailserver.org/xdiff-lib.html"
-SRC_URI="http://www.xmailserver.org/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog
-}
-
-src_prepare() {
-	# test utils require static libs ...
-	sed 's/test//g' -i Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	rm "${D}/usr/$(get_libdir)"/*.la
-}
diff --git a/dev-libs/libxdiff/libxdiff-0.23-r2.ebuild b/dev-libs/libxdiff/libxdiff-0.23-r2.ebuild
index 829e75cccad9..608ade4db081 100644
--- a/dev-libs/libxdiff/libxdiff-0.23-r2.ebuild
+++ b/dev-libs/libxdiff/libxdiff-0.23-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.xmailserver.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index 9ae2b6ca689e..909493322a2d 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -2,6 +2,6 @@ AUX lockdev-1.0.3-add-autotools.patch 1344 BLAKE2B 7248172afeeb5b78ca5626d20604e
 AUX lockdev-1.0.3-fix-perl.patch 307 BLAKE2B aa1d9fb4131a0dcedbac0034e450ef47cac62d4e45c56865c2e7c8c8d896143afae2e767eac3fc878fc8281656db603cb9bbe5a7ae3dfe62a164b8023493cca0 SHA512 f8647472a451ce641d687a9c61f2e650456a68a6fd9fbb57a3871a1480871de639815aef924bd6f1cf85d1c13203b605c0461077f362d2523881269040a8114a
 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 2094 BLAKE2B 6cb7a1be787cb756acb5562396c16bb4520f2d3ed03d99eb8073e91aba89f624cef5eb7c153d2c12404655341aa10f086b4b56c66119823675a363a702846e23 SHA512 86cda2c6c08394cb6dedee94c081bd07d46f55bc2a9960d1f5cfcfc58a9d2ab7bf3a5560632756f15972c6e7440b7645f0632f4cbef6495c38ceb0817ea7878d
+EBUILD lockdev-1.0.3.1.2-r2.ebuild 1889 BLAKE2B 38faa340fafed78795e2157b66178c3f423b7e00aa5f0d78783ceef03978ef4526993216bf2960e0da587d90ce81bb2cdf6518c3230947baaf24818cc59b6c24 SHA512 76e30de7368016f264b5f6f92a5b60c1f287f58fc7b52447e169b6457158cc8b7bef01cc50efdcd6eab82e0ed84dac2a34c4412ed15736499dea6a1c0c527a46
+EBUILD lockdev-1.0.3.1.2-r3.ebuild 2100 BLAKE2B 9db22fd028ca0ea4064cb1ea451c8a783b068e033c4a93631ce13ce28fd96299cf61138623c4bc54109806ba96a32363ec5940b9723921e8b8dd9991d35fe3ec SHA512 5dacbd12b2d3ddadf4357d3a5fe327492e1009cff92801f11bc567262dd4e3714223768c1e6d262a57427c9a7530582c39530e6721f8a58ef318c962b11d59e0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild
index afbc4349e232..adea574b396b 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 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 hppa ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="perl"
 
 DEPEND=""
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 826ad5142835..386ed2155028 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
@@ -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 ~s390 ~sparc x86"
 IUSE="perl"
 
 DEPEND=""
diff --git a/dev-libs/ltxml/Manifest b/dev-libs/ltxml/Manifest
index e6f6b4963f6c..56dc8e33856f 100644
--- a/dev-libs/ltxml/Manifest
+++ b/dev-libs/ltxml/Manifest
@@ -1,5 +1,3 @@
-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 845 BLAKE2B ca7eb8495977f308cb317176584f01ec2123ccd0046758d5bcd7f0c7cc332f4dc39d4f61cfbcb2756754a261ea61c7e51d06535e3696c2ecf415e361b24866ee SHA512 be471a2bf2afc1b5d3f981f984f862f1d13e75c7b8e33c4cf6574cfdbfdd0cb2a1421f4ed26abf9b2d7b010c813453605fc5420162374ec7e49e53aa05913b9a
+EBUILD ltxml-1.2.9.ebuild 844 BLAKE2B d172e5d054d83422149480e832f185ce739a77de77f6f9b9a33e720a8cea1388cb6f0aa88ec6bc22a4353319892fded13d72f1534a59df62376f19591e0c51c4 SHA512 b9acd008767519dbe16f93550eaa195cc19b7025a46e2877d2708c08cbfd822330ecd077aad7911a28581682579d64fa21606ccad61de1056d269e6317af00d7
 MISC metadata.xml 268 BLAKE2B 4ca0567bdd97196b8cb1cc66ed554fbbd99823935bf9b58e52013f678c148193f52dadcd4487e6f38df45790c6bacaa30676c8bd25a7672992ffc9e805e24c19 SHA512 c70be371eec365e07f54ce32fced749e5137228fabd7e087427f1ed6a75f8a1eb0668f4587054ccf1ee29ab12a75fd2f52bd2bef5bf2c20e36db7993b01b1903
diff --git a/dev-libs/ltxml/ltxml-1.2.5.ebuild b/dev-libs/ltxml/ltxml-1.2.5.ebuild
deleted file mode 100644
index 33e03e7ce2ba..000000000000
--- a/dev-libs/ltxml/ltxml-1.2.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-S="${WORKDIR}/${P}/XML"
-DESCRIPTION="Integrated set of XML tools and a developers tool-kit with C API"
-HOMEPAGE="http://www.ltg.ed.ac.uk/software/xml/"
-SRC_URI=ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/${P}.tar.gz
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ia64 ppc x86"
-IUSE=""
-DEPEND="dev-lang/perl"
-PV_MAJ="${PV:0:1}${PV:2:1}"
-
-src_compile() {
-	econf || die "configure failed"
-	emake all || die "make failed"
-}
-
-src_install() {
-	einstall \
-		datadir=${D}/usr/lib/${PN}${PV_MAJ} \
-		MANDIR=${D}/usr/share/man \
-		|| die "make install failed"
-}
diff --git a/dev-libs/ltxml/ltxml-1.2.9.ebuild b/dev-libs/ltxml/ltxml-1.2.9.ebuild
index 8c6dd381f0cc..c1063f3255cf 100644
--- a/dev-libs/ltxml/ltxml-1.2.9.ebuild
+++ b/dev-libs/ltxml/ltxml-1.2.9.ebuild
@@ -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/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 7f1a86ee3ab1..fc27e9bc91a3 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -4,6 +4,7 @@ AUX mongo-c-driver-1.11.0-enable-tests.patch 866 BLAKE2B d07afeb06dc61ddf15bbb46
 AUX mongo-c-driver-1.12.0-libressl.patch 637 BLAKE2B df52868ae9253125cc77973de4d385bdbebd1b90bfc7bc49bed4a4d6cbcb02768fd98b9bf110e9b463893131d44538f1d2ff2b4cba3ce2242832d1149cbd7498 SHA512 fd4b083695e7db3e407e2068fbc76ec063040f200f2087fdad6b21b15bb0da4a8eb74123908a3798af2b81811e8813c047d44117aebdc0d5393069c1ac653ed6
 AUX mongo-c-driver-1.13.0-enable-tests.patch 886 BLAKE2B 9a568e6498ec9ed7b08bcd8e5ae92c8e439bcce6bc04a91f128411efdbeafa64f3258f687963c861aea14c268587972ca679fbcd380098a3eefcc50a0c0a4e24 SHA512 c7f4ca10791c2eae60ea50214c1605d9d4ff48a804511d8dd9b181046f794a61499033ae0f0a8657257ee378dc30976e78984270d7fdc8cb4791b7690c89102f
 AUX mongo-c-driver-1.13.0-no-uninstall.patch 866 BLAKE2B de38a7659be91d293b33c03036c14607bc3f6214a5970d28b8cbc02d77ee32a04f077e082cb7bf9ae126d13d5537a634c29e31230d444cfb72734fc417b0d604 SHA512 ccfca1aafb4b918a14950ccd99ca6b4f4a3d7d0178a726f6c9de7096a5e5ed700953672ae457a43064b61595df4e955774a4836e5d653d6d73b50cd5772f87d9
+AUX mongo-c-driver-1.13.1-drop-failing-test.patch 842 BLAKE2B ce51289a0e16e9c5fdd072081b85bfd7fcc2d5450a5c34f148f8b81a0ab13e7e79f7ffdbfb7f951566f3fd5af28c2f9cd0b491af91d2d8f3a89312189760c056 SHA512 77a0ea5dcc76ce1fd18a15ae910fa1507282f36f47068b357cac3ae63f4a4368da848dd077747080f423e80a34665dd677f083eab6c16d258e75d5c2f99817fa
 DIST mongo-c-driver-0.7.1.tar.gz 108537 BLAKE2B 29d7f6680d700d15d02b3d5deefbdc27b4e0841a2ac30205ed148216d15e95fe487f4cea4decacdf573a4ce78248cfd12cba72b9dbf90065e127fa7fb56cad27 SHA512 5c6996dc47ecbe4d77971e3aa983a877e7de736bf358c467808eceba8b1a5eea342376249cdc682a034fc7ec39290d234527cec3c3732686f184281a72aec724
 DIST mongo-c-driver-0.8.1.tar.gz 124053 BLAKE2B 1c6b0d3998c6497c39fc2f6597021e84571c717e5d6f288d79d3862e7f15f131604648595ca0e12200352a7fbf40652803afd0f60a80eac657b9853a1de51173 SHA512 7b61ac4b1b154ee1f518eddb2bbc0cdafe0da8786eed4475e5703c2a735ec5a09efde59f5bfa45fb226cbce24d8c0ba0de403d8fc3e561c0e48507dfb07962b1
 DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
@@ -13,6 +14,7 @@ DIST mongo-c-driver-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49
 DIST mongo-c-driver-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0f223b777d5884d795102910aedb8d4f516d5d50cdecfa9219835a884b237aa98ab3742067c36944f0abdc67a8e4 SHA512 d20d83c9470972641407550bf835701df28c196b1cf19097450a062fd3c560c452c658aa5080bb28066079cea27888731f3670e81bd1b0cd5be1b97a2988074e
 DIST mongo-c-driver-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
 DIST mongo-c-driver-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0da7129cd1fcf1dce7222df4d25ca109b1bfbb545c755abf8e4cc39dd40dde7ba4c50dd51dcfc67c970e2b8eb278bd543fc SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
+DIST mongo-c-driver-1.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52eb0199a49af102d44c8fb7678db82a41f915c984e95f5301f533dde63139221cb6e161fa5053b9fcc33080abe1095d9c35 SHA512 454670a145a5f2272daa5ca88f2e7d7e42c9b7df62dfc29b3c4b602ef8f819a740890c40872fa47dc411cc5ef9a34b55a6feea3657a802a5be378c4dbe79f42d
 DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c19a5b8722a2ed69fdf046c35973c9bedcc1686065e4355db28afc83c1415872eee2972a6fb3f21647d2cafce12706adc0 SHA512 23844ffe20580998308aa9c8409afcb87dccde874077eefc6806b705e5de5743846ba0513f3a3fe83147fc47842ab8c7438ad1de5f3f55b81586b9e19046aabf
 DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af
 DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76
@@ -26,6 +28,7 @@ EBUILD mongo-c-driver-1.10.3.ebuild 2191 BLAKE2B 43dba477bba4672c2846b940e30f87a
 EBUILD mongo-c-driver-1.11.0.ebuild 2293 BLAKE2B edd5b631add3c2f7813c82be5938141edc54ae59634b8c2ef8980f3b553551b340e01837006e88d9f30a2c0ab7c5f8865e3817ac126ed251b88386167594a59b SHA512 58baa8d3f4f66ab6cae3d4b27c9dab1fa0435b4d7f94169d32563c0f9e7bbdb479244e7ae09a8106a810e774bdbe975ae4a49fd4c5a166795a38a01f5283dc68
 EBUILD mongo-c-driver-1.12.0.ebuild 2340 BLAKE2B a9ac25791b3c66a7b9192bbe4ac3ec0274d191fdc4d0994bc223afa144d2159e83190c0f13d52454a8aabde00e4331fdb7cfcf54ae697afca1c967c5f195f8b6 SHA512 b0288069c8776c6d5ddc5953526dfe44911e0f88d4e6b0274577d9133370ada1c7679912fe53a24021b4d7b5f549f784560a73e6910e45a351787bee1bc6557e
 EBUILD mongo-c-driver-1.13.0-r1.ebuild 2425 BLAKE2B 2642c29314499b9d7ce9ace8e2e6e9f77027291c27165cabef037b75b67e7d39d22510d732067225e739bab14ea5f5bb9d46f414ce15b7542b281480b2710f81 SHA512 f24ad85612207b398b33f16e8b0847eadb1be134c7b8a578c0024ad9741f75703238abdef2143bc1247fa3da98571d14842a6c71d64ca28df4da7ba054d82965
+EBUILD mongo-c-driver-1.13.1.ebuild 2460 BLAKE2B 5580dc2a2830d54b61178506bad90b64e5394288835f981ec0f90e93b8a921dde8a403f1c901b2316bc81e2e2b1d6fb1da493e2ee7f1a101a7de536a8e2035b1 SHA512 4aed11c176045f0a8c6a3b2a6f50dce596646ec5c530c4a929f26678d7bc4b6ec14e0fb29c53e960397b3edd1db3c4982e2bbf56a17ef6fc46ef6defd6f76a66
 EBUILD mongo-c-driver-1.3.5.ebuild 2149 BLAKE2B 773a2fb9a1e5365d77f9bb0351524331e319bc740623ead4bd779706565c2dba71b20f31752e31313fe75eafc052165b638d6596d46d5a475793274f0175a855 SHA512 86d0292f1d2a4bed46a7b0ef7d68d2f1bb1b18aef3bf60210054d59a020603f8c89a130d835284bad3c4cbb62703bbbd408ec125f386b199ad4868a7787c7fcd
 EBUILD mongo-c-driver-1.6.2.ebuild 2089 BLAKE2B 0e49a73628df5df2ba90627ae42cb553aa4c593fe7b4b68f5b06ac74149549e395658cd075510f5876072f39386e6c5da8fd060d42cbdd4f816271514203913e SHA512 df452c236e0c8db8aa5404ada5a33689b892a10628c83cdd09e8db58a527ce8073de62a6e8747a231787ffc2089ecd5ff4a8fdfdba51e0b64ca3ee2618cc900a
 EBUILD mongo-c-driver-1.8.2.ebuild 2150 BLAKE2B 1ff46d08933c2d525b4dd60cfbd1ba4c3e8183cea11923f3b851b9fe1e0b25bdaf1d08e70f68a3dde383ff4ee7ca9127ea0cb7d0ac011c4aac2f42f46dd4a6f8 SHA512 55338086d4a8c91527f62758b153031751385b975eec7b8dc35a0d07132eb8120b4d0ccf8cdce419f4623ddb8b7deea62556dd7c9c41ad8a01abf04bad6869a9
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.1-drop-failing-test.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.1-drop-failing-test.patch
new file mode 100644
index 000000000000..6ef137fdba7c
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.13.1-drop-failing-test.patch
@@ -0,0 +1,17 @@
+diff --git a/src/libmongoc/tests/test-mongoc-topology.c b/src/libmongoc/tests/test-mongoc-topology.c
+index d1ca7cf..245a470 100644
+--- a/src/libmongoc/tests/test-mongoc-topology.c
++++ b/src/libmongoc/tests/test-mongoc-topology.c
+@@ -1964,12 +1964,6 @@ test_topology_install (TestSuite *suite)
+                                 NULL,
+                                 NULL,
+                                 test_framework_skip_if_slow);
+-   TestSuite_AddFull (suite,
+-                      "/Topology/multiple_selection_errors",
+-                      test_multiple_selection_errors,
+-                      NULL,
+-                      NULL,
+-                      test_framework_skip_if_offline);
+    TestSuite_AddMockServerTest (
+       suite, "/Topology/connect_timeout/succeed", test_select_after_timeout);
+    TestSuite_AddMockServerTest (
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
new file mode 100644
index 000000000000..7e327de1bdc9
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Client library written in C for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="debug examples icu libressl sasl ssl static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="app-arch/snappy:=
+	>=dev-libs/libbson-${PV}
+	dev-python/sphinx
+	sys-libs/zlib:=
+	icu? ( dev-libs/icu:= )
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		dev-db/mongodb
+		dev-libs/libbson[static-libs]
+	)"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.13.0-enable-tests.patch" # enable tests with system libbson
+	"${FILESDIR}/${P}-drop-failing-test.patch" # one test fails
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# copy private headers for tests since we don't build libbson
+	if use test; then
+		mkdir -p src/libbson/tests/bson || die
+		for f in bson-fnv-private.h bson-iso8601-private.h bson-private.h; do
+			cp -v src/libbson/src/bson/${f} src/libbson/tests/bson/ || die
+		done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
+		-DENABLE_BSON=SYSTEM
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_ICU="$(usex icu ON OFF)"
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=ON
+		-DENABLE_SNAPPY=SYSTEM
+		-DENABLE_ZLIB=SYSTEM
+		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
+		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+		-DENABLE_TESTS="$(usex test ON OFF)"
+		-DENABLE_TRACING="$(usex debug ON OFF)"
+		-DENABLE_UNINSTALL=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+# FEATURES="test" USE="static-libs" emerge dev-libs/mongo-c-driver
+src_test() {
+	local PORT=27099
+	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+		--dbpath="${T}" --logpath="${T}/mongod.log" || die
+	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
+	kill $(<"${T}/mongod.lock")
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libmongoc/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index b4906eef35b8..5f2b752f6b31 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -4,5 +4,5 @@ DIST mxml-2.11.tar.gz 9164003 BLAKE2B d124b7d779e7ea9609a91b823fe7f6b45ab4049e79
 DIST mxml-2.12.tar.gz 9112072 BLAKE2B 29e63abdd567c76209ca41adf608bd752863cdb2911d5bda482a2c6ac50ccdae2179941a3899d7e58480bab8903fee8a6c431619072d2861acd01f18d0eeb9e5 SHA512 49233a0087f3ef73a01ef71bb79511af36bb72027e3d9f6df919385e9ff0b03a489a3ccc590941bc4af1f558f82b2ed9bf8ff641863300a7791ce6dddfd56e77
 EBUILD mxml-2.10.ebuild 1284 BLAKE2B 9f29bdc742076d837d79c979298c8ca50c760c6680333ec7abb31e8be92429b0c4434c1169ad0c2a2886aeafd6efae4ff9abff26c6ec1be1d1f5470efee96b73 SHA512 2dbf597eec60cb1226b374335b9ee372d82f5823aec2e973c30f300b12449f8798bce538b2623db367e9d264e2de8823abcda3192171b762c65267efa18f4230
 EBUILD mxml-2.11.ebuild 980 BLAKE2B f0ef58bc339a064dee07e6d2ccade2932d48cbec80c2e61d5a53ef04dc972734986a16f9e549a05d511b23d5c0125d16c1d03a846d7cc4e11022aba523a3fc99 SHA512 40d366403f141c5c83b59303767bf4c248440080bc3fc7121dc9196998dc1c8585220792aeb1cba7b4d6dfa151b97cd82a83df3dcf6f53d2ff1a04cb6a513717
-EBUILD mxml-2.12.ebuild 1403 BLAKE2B cf322daef45ead5791235a5f3e12924c3650aa6f585720804ab042260448c03c90a1b194ae3d3e2418a10ee06bcbea6bab18d88d9b5f54c8f11328e4784ae16d SHA512 7576e7e5b3b55b517766e4ef7fed4606c52168fd552b527325fcc93072a1217994be86c150122817e9e9abeb6d5fd139fc014f88f2310a8d774a73c06f5da11e
+EBUILD mxml-2.12.ebuild 1401 BLAKE2B 6dda08d1f2beca9b475204d3f723c8479ac2481a04b6a9822cecf4110c1589855e3b5ffe43914b85dfac60393ee0d94f8447f526c9cfa1da610dc5201b32f967 SHA512 b422445ae5795aafbf29fad325fda799b08e66780fc11b69075caa35322d77b2e6f4e4741423f8db31699350ba84079e7c1bf7dc7b3fe073d4afa6125e7e7f4e
 MISC metadata.xml 1498 BLAKE2B b0ff99450cec828ef5614c2b3819d02cc97e402b60ce7b9bca20962166c47a9e3053e2457eb7b29210886aa7b0297e97340b55cf74a0aabc20ecb4c451d576c6 SHA512 5ead3d76daa42879139a96cceb0a12a84a23df8372a8e2e9e9d1e38ede0266b480ca404f03047f4e66ed7d989171d37333051e2a111dfa0900b9cbba703b22d6
diff --git a/dev-libs/mxml/mxml-2.12.ebuild b/dev-libs/mxml/mxml-2.12.ebuild
index 7a98fc553860..6fc41f15639d 100644
--- a/dev-libs/mxml/mxml-2.12.ebuild
+++ b/dev-libs/mxml/mxml-2.12.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 @@ HOMEPAGE="https://github.com/michaelrsweet/mxml
 	https://www.msweet.org/mxml/"
 SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 LICENSE="Mini-XML"
 SLOT="0"
 IUSE="static-libs threads"
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 23775a36674b..daa8f05d57cc 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 942 BLAKE2B e91c563dd5e888a52fe2aea083744857520122c93677c6982f81957d066d33749d1d7c9a23a3b259c567dc33d41e9d5d348ec3bc0ccaed6cd3bafefc8395ef3a SHA512 97905204cef01510e77117d225fae77389b5ac08070f7d94384e29b1a92487bfaf2b0e317b7eafc00a9fe21345c0399279e8912402da36d4a07eabea8edee309
+EBUILD protobuf-c-1.3.1.ebuild 937 BLAKE2B 0b29758ecf674537e208a64c226397c4eb9880e32a34ca406bed29d4755382a289bc5aea565fb85407b66aacbe488d2fbfa70ac9fc9e48cb45492b4aeba86d95 SHA512 d7fef0f59f445f17854d4a05351491124d41e4f5afc107b7c2ba475132049532079badf0abc22674a4fa3041cc8518a5da4acbbe4703566ef1c66b8bd8d0789f
 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 937881532388..b5226f546288 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 d7cea8c88dcc..c78dec2b5120 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 890 BLAKE2B 192acbaaa2368481408deea728360e8265a68740da4f112e3f0588253d0bc3217a7a85fe45622e647345117c67bbfa8fda1c18f7336490f6a4fec77d29609509 SHA512 9d967366b2cf73d1ca9e852a6b4e202265d65a4e080d7b8055352fe6a545784a3b9619595905a7765735a9a66160967d966b5b7f7fb7fe0815ca40a5bbd547c9
+EBUILD pugixml-1.9-r1.ebuild 888 BLAKE2B 309a8ea7a43053b63e11e602b23662e14340c06f97fb7bc14e8c985d456274ec2ed019bcf3aa41e7222ef1458559889ecd6cf5d3221da8a7423bd3a36f1e2c39 SHA512 93712992bd203b5bf882afb07e781c10a32ce2ace17d5d18e9fe340f7bae1d0ec85b7f5e12a58694931d7cf03943617c3cb2596d19512b01043798343a76ed22
 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 990a2b74c5c3..4034fa88e5a6 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/redland/Manifest b/dev-libs/redland/Manifest
index 8693105186ce..1fd8479f0728 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,3 +1,4 @@
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
 EBUILD redland-1.0.17-r1.ebuild 2464 BLAKE2B bed3fcba31401116c045a440fb1aab2196c25ad3070eaf0a11683087fea07d0e6998c612c034c6bfefeff5adbc12b87c69ef207585fbff9f2880aaf775ddf249 SHA512 f2975cf0c971b53381f5a7fbd54292812a2bdc8e96982069ede430de93b174c27f2404b26209aa45ebf6c15d1ee545cf78fa03f241f34a3e8b01b49fd25e9258
+EBUILD redland-1.0.17-r2.ebuild 2508 BLAKE2B 0a9f5459c00966eb6f5bba76c181076b0f99fb0d75c3848c8361cdd093577e4424f5285ac0ef176c1919302c6b0a844779c2b7819bbe15e2397d97866d059625 SHA512 b055d44068344f1d37cab1bc16a736d315556c124ce87d87b5bbe494780fbf4f0764ec9a234d160d178b88b673a12f2bde9c4653df41aa3138f2d933969725d6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
new file mode 100644
index 000000000000..1f2d86face16
--- /dev/null
+++ b/dev-libs/redland/redland-1.0.17-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit db-use libtool
+
+DESCRIPTION="High-level interface for the Resource Description Framework"
+HOMEPAGE="http://librdf.org/"
+SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
+
+RDEPEND="dev-libs/libltdl:0
+	mysql? ( dev-db/mysql-connector-c:0= )
+	sqlite? ( =dev-db/sqlite-3* )
+	berkdb? ( sys-libs/db )
+	>=media-libs/raptor-2.0.14
+	>=dev-libs/rasqal-0.9.32
+	postgres? ( dev-db/postgresql )
+	iodbc? ( dev-db/libiodbc )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS="${MAKEOPTS} -j1" #500574, required for both src_compile() and src_install()
+
+src_prepare() {
+	default
+	elibtoolize # NOTE: this is for fbsd .so version
+}
+
+src_configure() {
+	local myconf=( --without-virtuoso )
+	if use iodbc; then
+		myconf=( --with-virtuoso --with-iodbc --without-unixodbc )
+	elif use odbc; then
+		myconf=( --with-virtuoso --with-unixodbc --without-iodbc )
+	fi
+
+	if use berkdb; then
+		myconf+=(
+			--with-bdb-include="$(db_includedir)"
+			--with-bdb-lib="${EPREFIX}"/usr/$(get_libdir)
+			--with-bdb-dbname="$(db_libname)"
+		)
+	fi
+
+	# FIXME: upstream doesn't test with --with-threads and testsuite fails
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with berkdb bdb) \
+		$(use_with mysql) \
+		$(use_with sqlite) \
+		$(use_with postgres postgresql) \
+		--without-threads \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		"${myconf[@]}"
+}
+
+src_test() {
+	if ! use berkdb; then
+		export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
+		export REDLAND_TEST_CLONING_STORAGE_NAME=test
+		export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'"
+	fi
+	default
+}
+
+src_install() {
+	default
+	docinto html
+	dodoc {FAQS,NEWS,README,RELEASE,TODO}.html
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	# !!! REMOVE THIS ON VERSION BUMP, see bug 468298 for proper fix !!!
+	if [[ -n ${LDFLAGS} ]]; then
+		sed -i \
+			-e "s:${LDFLAGS} ::g" \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/${PN}.pc || die
+	fi
+
+	# https://bugs.gentoo.org/467768
+	local _rdocdir=/usr/share/doc/${PF}/html/${PN}
+	[[ -d ${ED}/${_rdocdir} ]] && dosym ${_rdocdir} /usr/share/gtk-doc/html/${PN}
+}
diff --git a/dev-libs/shhopt/Manifest b/dev-libs/shhopt/Manifest
index 5665dbf5b47b..414bab9f61c8 100644
--- a/dev-libs/shhopt/Manifest
+++ b/dev-libs/shhopt/Manifest
@@ -1,5 +1,4 @@
 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 662 BLAKE2B 56a4d961a7d84c4d9bf2f5ccc88cc3a53dc9e30c67e7b1955251c17109234da934cb4582ce4cdd8224097270d9f05db2e5d9e49cd5a1a3a3b2870622abad5959 SHA512 46ce536eef3aec9ba687d6e397da3ad9230f44e1f5ab0a9b44fca867291c1d680f63005c6281e2d93962ba20a358497ead8761e77999625bc919aa7c81eabca0
+EBUILD shhopt-1.1.7-r3.ebuild 660 BLAKE2B de4f5af326bb86c2352d29849af49a15d2bd1235a449fed9ca54aa28238ed6badec20b8208cc2ecd8eff3d9353b67b949b3008b9bdc01740cf84e33bbf7085f7 SHA512 e1bca2629ab3542401f9f20c59f72ff36f7e3b834bb895f1ae648cdc2c3d0b41486fb053a270832639d0645f12c7f7ff3cc04b1aa6c5b10c9fd211ef31535d5b
 MISC metadata.xml 341 BLAKE2B 738802ec66db2e5052eb57b90dd0076cca1afbdca62fa325f920f0ec6f4ff4b78f886402783ad6f97c7b10e4e2ec10bbaf1bf2bc8823bd48d048c35141a6cb77 SHA512 276ee6e17baeb1981c1c912b4f281d7eb71b171492d00d5ce522c3d6defbba4eef3dd87b43d4ec02eda21cfe148f2b0dcbe04d7dbd9a42918168844b563427f4
diff --git a/dev-libs/shhopt/shhopt-1.1.7-r2.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r2.ebuild
deleted file mode 100644
index e1e22d5e57ea..000000000000
--- a/dev-libs/shhopt/shhopt-1.1.7-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="library for parsing command line options"
-HOMEPAGE="http://shh.thathost.com/pub-unix/"
-SRC_URI="http://shh.thathost.com/pub-unix/files/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die
-}
-
-src_install() {
-	dolib.a libshhopt.a || die
-	ln -s libshhopt.so.${PV} libshhopt.so
-	ln -s libshhopt.so.${PV} libshhopt.so.${PV:0:1}
-	dolib.so libshhopt.so* || die
-	insinto /usr/include
-	doins shhopt.h
-	dodoc ChangeLog CREDITS INSTALL README TODO
-}
diff --git a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
index abe600d47493..998b6d692917 100644
--- a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
+++ b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
@@ -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/starpu/Manifest b/dev-libs/starpu/Manifest
index ab4898904e76..6bff67c0064f 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,6 +1,3 @@
-DIST starpu-1.1.5.tar.gz 5209660 BLAKE2B 3caf313402a840b8196dc94b6c4f973f87a21878bcbfe1a44ce14218c02290c8701eb3829ce0b89f3029f768c7760ea94c4f307c850e6e42ec877be017c50b4a SHA512 e22a51c601c1997f6a9279e87b22a96f2b25a9c8bb4b715ee3a048ed8af638997610ba72c7b42f61d9401464464c57402feebc76368f9df6ca84fa1305baeedd
 DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
-EBUILD starpu-1.1.5-r1.ebuild 2009 BLAKE2B 8108a1aad37f34e75c54b7b2ed011fa5afbfd21a436ac9cea63fde602317c61adf3e6b08c7a0e2f726662cc33268697c55f03a46b8d12aab7e958c74e41b6969 SHA512 172f45aa450a7da1d32c9cfdf696fe901b1a484c34cc18f8ecd5f7fe38ee3a90738036a62b45306ae833daffe57ea28ed49f1817e58fcbebd7a6b2f4a28f834b
-EBUILD starpu-1.1.5.ebuild 2064 BLAKE2B 29fb61f9568888e0e0082eaa88eea1c95f628db242ab23d24e193eb6fbe593b47fdd76c9b7efb67baf201849974d55f1924b7945b83a9a7b2608e39492ad75d0 SHA512 34ffc4452b891f419a5674550763619eebe913e4e8c7cdd38dbf5be3a6de0dd0cbdd64fd592010587097ec4b6928c62a2b16443c19053eb313e6263a07edf5f7
-EBUILD starpu-1.2.6.ebuild 2228 BLAKE2B b18ad13549226219c501e5001cff5071b05aaf612ace3eeafd99ac10f3cc4234ffcc9a12c1a316fe8a73723154f2a35b3291e85d1ada7c349045aa92d4e619b3 SHA512 f22759ded89d44f5d37e06ef46ac0747e129244758609df96b2b80280ab931119829652f820dd00545a06abce2253442441acd517c5390862458c150bc29a48e
+EBUILD starpu-1.2.6.ebuild 2227 BLAKE2B 212da55cb40d84cadb2e8ce3e6aa90f0af42569deaa7174395990cc17bc96aaa99dc0ccf17f267d88ed13aaedb3210a7ecc4a20318fd532db5326474ecaa08a3 SHA512 1c4ed76780c1a2dfef082c47502d086c8a01b4f9a411f370ee1ad2a8b10511de03c30fc9762f26aa27caf30be840f8debedf8a802f7cc35b6e043ce53ca1d465
 MISC metadata.xml 987 BLAKE2B 7b8a207da7c02ecbc5e1daab83666d19d8c1128c6e05376167707ea6b411b4bed2673d9f0c9840284ab5c6f684bed3a67fddb8fc6f25289799470a4e33792e11 SHA512 97e9412721fcec2cdee55d75ce4d8c6eb20af75adfc21bcd556a336a8ee57c138be47afb881fa77180cdc4c27975d000be965f2170f7f29db85056bfbb01cee9
diff --git a/dev-libs/starpu/starpu-1.1.5-r1.ebuild b/dev-libs/starpu/starpu-1.1.5-r1.ebuild
deleted file mode 100644
index 0b56d95e947a..000000000000
--- a/dev-libs/starpu/starpu-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_STANDARD=90
-
-inherit autotools toolchain-funcs cuda fortran-2
-
-DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
-HOMEPAGE="http://runtime.bordeaux.inria.fr/StarPU/"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/8"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl
-	static-libs test"
-
-RDEPEND="
-	<sys-apps/hwloc-2.0.0:0=
-	sci-mathematics/glpk:0=
-	blas? ( virtual/blas )
-	cuda? ( dev-util/nvidia-cuda-toolkit
-			x11-drivers/nvidia-drivers
-			blas? ( sci-libs/magma ) )
-	fftw? ( sci-libs/fftw:3.0= )
-	mpi? ( virtual/mpi )
-	opencl? ( virtual/opencl )
-	opengl? ( media-libs/freeglut:0= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base )
-	test? ( gcc-plugin? ( dev-scheme/guile ) )"
-
-src_prepare() {
-	default
-	# upstream did not want the patches so apply sed's
-	sed -i -e 's/-O3 $CFLAGS/$CFLAGS/' configure.ac || die
-	sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die
-	eautoreconf
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
-
-	econf \
-		--disable-build-examples \
-		--disable-starpu-top \
-		$(use_enable cuda) \
-		$(use_enable debug) \
-		$(use_enable doc build-doc) \
-		$(use_enable fftw starpufft) \
-		$(use_enable gcc-plugin gcc-extensions) \
-		$(use_enable opencl) \
-		$(use_enable opengl opengl-render) \
-		$(use_enable static-libs static) \
-		$(use_with mpi mpicc "$(type -P mpicc)") \
-		$(use cuda && use_enable blas magma) \
-		$(use mpi && use_enable test mpi-check)
-}
-
-src_test() {
-	emake -j1 showcheck
-}
-
-src_install() {
-	default
-	use doc && dodoc -r doc/doxygen/*.pdf doc/doxygen/html
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-	prune_libtool_files --all
-}
diff --git a/dev-libs/starpu/starpu-1.1.5.ebuild b/dev-libs/starpu/starpu-1.1.5.ebuild
deleted file mode 100644
index a9865022a16d..000000000000
--- a/dev-libs/starpu/starpu-1.1.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-FORTRAN_STANDARD=90
-
-inherit autotools-utils toolchain-funcs cuda fortran-2
-
-DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
-HOMEPAGE="http://runtime.bordeaux.inria.fr/StarPU/"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl
-	static-libs test"
-
-RDEPEND="
-	<sys-apps/hwloc-2.0.0:0=
-	sci-mathematics/glpk:0=
-	blas? ( virtual/blas )
-	cuda? ( dev-util/nvidia-cuda-toolkit
-			x11-drivers/nvidia-drivers
-			blas? ( sci-libs/magma ) )
-	fftw? ( sci-libs/fftw:3.0= )
-	mpi? ( virtual/mpi )
-	opencl? ( virtual/opencl )
-	opengl? ( media-libs/freeglut:0= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base )
-	test? ( gcc-plugin? ( dev-scheme/guile ) )"
-
-src_prepare() {
-	# upstream did not want the patches so apply sed's
-	sed -i -e 's/-O3 $CFLAGS/$CFLAGS/' configure.ac || die
-	sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die
-	autotools-utils_src_prepare
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
-
-	local myeconfargs=(
-		--disable-build-examples
-		--disable-starpu-top
-		$(use_enable cuda)
-		$(use_enable debug)
-		$(use_enable doc build-doc)
-		$(use_enable fftw starpufft)
-		$(use_enable gcc-plugin gcc-extensions)
-		$(use_enable opencl)
-		$(use_enable opengl opengl-render)
-		$(use_with mpi mpicc "$(type -P mpicc)")
-		$(use cuda && use_enable blas magma)
-		$(use mpi && use_enable test mpi-check)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1 showcheck
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dodoc "${BUILD_DIR}"/doc/doxygen/*.pdf
-		dohtml -r "${BUILD_DIR}"/doc/doxygen/html/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/dev-libs/starpu/starpu-1.2.6.ebuild b/dev-libs/starpu/starpu-1.2.6.ebuild
index 00bae6ae10a6..5417166bdf11 100644
--- a/dev-libs/starpu/starpu-1.2.6.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6.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
@@ -12,7 +12,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/37744/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="
 	blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl
diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest
index 56df973ebbc0..3f6515093599 100644
--- a/dev-libs/sway/Manifest
+++ b/dev-libs/sway/Manifest
@@ -1,10 +1,6 @@
-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-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
+DIST sway-1.0_rc2.tar.gz 5462530 BLAKE2B 95868df3d03a61be33e04602d6891a2827cd1b5eab08644f74e04c3cbae39e686ee046be5ae9762595774fd22190e2460e246b564db92c50509ad61a16bb0835 SHA512 78c93f2326952d9e56ebf38f5d6b646934230b1bf5fac50cf35f16b2c1753ffa31dd9ec874a05025ed0d1d828b9a8643c78e739abbcfba55301255b3d0ed4a3e
+EBUILD sway-1.0_rc1-r1.ebuild 3019 BLAKE2B 4cdcf8fec26f9239093ddc4fefd7883190146f0ca0d0a618d6442a23ee4a0187c05f6a84a55a6defe9dc37a546c61b8e4c6e5fb017b12a159700921e254ea83e SHA512 c1e77282fe4b644f06a0805b2971e88e567c01726b165569ddb8318eb86e0111c1bcbdd7db72aefc51783aa20e59ca8418bc74bc26e6bc1884118d9ceb4b5fbf
+EBUILD sway-1.0_rc2.ebuild 2942 BLAKE2B 045ac141e67d0872e13c2d17d5ad4cefbaff1bcfce81896eb3117e1a05b52c8ec1a27546b5d969370db4891214680431eefea043cca2ba9c154ef6cd40e55511 SHA512 4577e6e6f9c4046bb892dfc1956f9cfb66445576167bda49e23918b1aa5987074409a0a996dd40bdb3fea043801b4233cfbc5b8261cea6d6dd39a691b9147dce
+EBUILD sway-9999.ebuild 2942 BLAKE2B 045ac141e67d0872e13c2d17d5ad4cefbaff1bcfce81896eb3117e1a05b52c8ec1a27546b5d969370db4891214680431eefea043cca2ba9c154ef6cd40e55511 SHA512 4577e6e6f9c4046bb892dfc1956f9cfb66445576167bda49e23918b1aa5987074409a0a996dd40bdb3fea043801b4233cfbc5b8261cea6d6dd39a691b9147dce
+MISC metadata.xml 2486 BLAKE2B 2d34da83a8d8726b91189d27a400e705a1b0259a1ca577a85e7c21784274a08a0adccc134cd523e193f8635b26dcb1802e37bfa1831f58c922285341b1eadd5e SHA512 9d382307136a126a614a8361828cb018865243b1a8c2a4dd08fbd484afc53320abf6d64dd82dd93a47d8de284552f1857c028c6c72db06199152e1458b636ec0
diff --git a/dev-libs/sway/metadata.xml b/dev-libs/sway/metadata.xml
index ebb759791eb7..e73eacb7359f 100644
--- a/dev-libs/sway/metadata.xml
+++ b/dev-libs/sway/metadata.xml
@@ -13,7 +13,7 @@
 		<email>hilobakho@gmail.com</email>
 		<name>Mykyta Holubakha</name>
 	</maintainer>
-	<maintainer restrict="&gt;=dev-libs/sway-1.0_beta1" type="person">
+	<maintainer type="person">
 		<email>speedjack95@gmail.com</email>
 		<name>Niccolò Scatena</name>
 	</maintainer>
@@ -30,14 +30,11 @@
 		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>
-		<flag name="gdk-pixbuf">Enable additional image format support via the <pkg>x11-libs/gdk-pixbuf</pkg> library</flag>
+		<flag name="man">Build and install man pages</flag>
 		<flag name="swaybar">Install 'swaybar': sway's status bar component</flag>
 		<flag name="swaybg">Install 'swaybg': allows to set a desktop background image</flag>
-		<flag name="swaygrab">Install 'swaygrab': allows taking screenshots or screencasts</flag>
 		<flag name="swayidle">Install 'swayidle': idle manager to run commands when user is inactive</flag>
 		<flag name="swaylock">Install 'swaylock': sway's screen locker</flag>
 		<flag name="swaymsg">Install 'swaymsg': tool for communicating with a running sway instance</flag>
diff --git a/dev-libs/sway/sway-0.15.2.ebuild b/dev-libs/sway/sway-0.15.2.ebuild
deleted file mode 100644
index 7d8204ffd001..000000000000
--- a/dev-libs/sway/sway-0.15.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="http://swaywm.org/"
-
-SRC_URI="https://github.com/swaywm/sway/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+gdk-pixbuf +swaybar +swaybg swaygrab swaylock +swaymsg systemd +tray wallpapers zsh-completion"
-
-REQUIRED_USE="tray? ( swaybar )"
-
-RDEPEND=">=dev-libs/wlc-0.0.8[systemd=]
-	dev-libs/json-c:0=
-	dev-libs/libpcre
-	dev-libs/libinput
-	dev-libs/wayland
-	sys-libs/libcap
-	x11-libs/libxkbcommon
-	x11-libs/cairo
-	x11-libs/pango
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )
-	swaylock? ( virtual/pam )
-	tray? ( sys-apps/dbus )"
-
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bad CFLAGS that upstream is trying to add
-	sed -i -e '/add_compile_options/s/-Werror//' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-swaybar=$(usex swaybar)
-		-Denable-swaybg=$(usex swaybg)
-		-Denable-swaygrab=$(usex swaygrab)
-		-Denable-swaylock=$(usex swaylock)
-		-Denable-swaymsg=$(usex swaymsg)
-		-Denable-tray=$(usex tray)
-
-		-Ddefault-wallpaper=$(usex wallpapers)
-
-		-Denable-gdk-pixbuf=$(usex gdk-pixbuf)
-		-Dzsh-completions=$(usex zsh-completion)
-
-		-DCMAKE_INSTALL_SYSCONFDIR="/etc"
-		-DVERSION="${PV}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use !systemd && fperms u+s /usr/bin/sway
-}
-
-pkg_postinst() {
-	if use swaygrab
-	then
-		optfeature "swaygrab screenshot support" media-gfx/imagemagick[png]
-		optfeature "swaygrab video capture support" virtual/ffmpeg
-	fi
-	if use tray
-	then
-		optfeature "experimental xembed tray icons support" kde-plasma/xembed-sni-proxy
-	fi
-
-	optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland]
-}
diff --git a/dev-libs/sway/sway-1.0_beta1.ebuild b/dev-libs/sway/sway-1.0_beta1.ebuild
deleted file mode 100644
index 76a39cb5232c..000000000000
--- a/dev-libs/sway/sway-1.0_beta1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 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 pam
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +swaybar +swaybg +swaylock systemd +tray wallpapers X zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="~dev-libs/wlroots-0.1[systemd=,elogind=,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
-	elogind? ( >=sys-auth/elogind-237 )
-	swaybar? ( x11-libs/gdk-pixbuf:2[jpeg] )
-	swaybg? ( x11-libs/gdk-pixbuf:2[jpeg] )
-	swaylock? (
-		virtual/pam
-		x11-libs/gdk-pixbuf:2[jpeg]
-	)
-	systemd? ( >=sys-apps/systemd-237 )
-	tray? ( >=sys-apps/dbus-1.10 )
-	X? ( x11-libs/libxcb:0=[xkb] )"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/scdoc
-	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 swaylock || sed -e "s/subdir('swaylock')//g" -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		"-Dsway-version=${SWAY_PV}"
-		$(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"
-		"-Dwerror=false"
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	use swaylock && newpamd swaylock/pam/swaylock.linux swaylock
-}
-
-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
-		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-1.0_beta2.ebuild b/dev-libs/sway/sway-1.0_beta2.ebuild
deleted file mode 100644
index 1812f7f4dc80..000000000000
--- a/dev-libs/sway/sway-1.0_beta2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 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"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +pam +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="~dev-libs/wlroots-0.2[systemd=,elogind=,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
-	elogind? ( >=sys-auth/elogind-237 )
-	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 )
-	tray? ( >=sys-apps/dbus-1.10 )
-	X? ( x11-libs/libxcb:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="app-text/scdoc
-	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 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" \
-		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		"-Dsway-version=${SWAY_PV}"
-		$(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"
-		"-Dwerror=false"
-	)
-
-	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
-		elog ""
-		optfeature "experimental xembed tray icons support" kde-plasma/xembed-sni-proxy
-		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
-	if use swaylock && ! use pam; then
-		fcaps cap_sys_admin usr/bin/swaylock
-	fi
-}
diff --git a/dev-libs/sway/sway-1.0_rc1-r1.ebuild b/dev-libs/sway/sway-1.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..47262ad9b430
--- /dev/null
+++ b/dev-libs/sway/sway-1.0_rc1-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils 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/${PN}.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/${PN}/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 +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )
+	tray? ( || ( elogind systemd ) )"
+
+DEPEND="
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.6.0:0=
+	dev-libs/libpcre
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-239 )
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( x11-libs/gdk-pixbuf:2 )
+	swayidle? ( dev-libs/swayidle )
+	swaylock? ( dev-libs/swaylock )
+	systemd? ( >=sys-apps/systemd-239 )
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~dev-libs/wlroots-9999[elogind=,systemd=,X=]"
+else
+	DEPEND+=">=dev-libs/wlroots-0.3[elogind=,systemd=,X=]"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+	man? ( >=app-text/scdoc-1.8.1 )
+"
+
+src_prepare() {
+	default
+
+	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaybar/d" -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=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dtray=$(usex tray enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		$(meson_use wallpapers default-wallpaper)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-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=${MY_PV}")
+	fi
+
+	meson_src_configure
+}
+
+pkg_preinst() {
+	if ! use systemd && ! use elogind; then
+		fowners root:0 /usr/bin/sway
+		fperms 4511 /usr/bin/sway
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd && ! use elogind; then
+		elog ""
+		elog "If you use ConsoleKit2, remember to launch sway using:"
+		elog "exec ck-launch-session sway"
+		elog ""
+		elog "If your system does not set the XDG_RUNTIME_DIR environment"
+		elog "variable, you must set it manually to run Sway. See wiki"
+		elog "for details: https://wiki.gentoo.org/wiki/Sway"
+	fi
+}
diff --git a/dev-libs/sway/sway-1.0_rc1.ebuild b/dev-libs/sway/sway-1.0_rc2.ebuild
index 95621d2f0721..f1d3935e2f12 100644
--- a/dev-libs/sway/sway-1.0_rc1.ebuild
+++ b/dev-libs/sway/sway-1.0_rc2.ebuild
@@ -3,59 +3,64 @@
 
 EAPI=7
 
-inherit eutils fcaps meson
+inherit eutils 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"
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/swaywm/sway/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/swaywm/${PN}/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 )"
+IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )
+	tray? ( || ( elogind systemd ) )"
 
-RDEPEND="
-	>=dev-libs/wlroots-0.3[elogind=,systemd=,X=]
+DEPEND="
 	>=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] )
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( x11-libs/gdk-pixbuf:2 )
 	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}"
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~dev-libs/wlroots-9999[elogind=,systemd=,X=]"
+else
+	DEPEND+=">=dev-libs/wlroots-0.3[elogind=,systemd=,X=]"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	${DEPEND}
+"
 BDEPEND="
-	dev-libs/wayland-protocols
-	doc? ( >=app-text/scdoc-1.8.1 )
-	virtual/pkgconfig"
-
-FILECAPS=( cap_sys_admin usr/bin/sway )
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+	man? ( >=app-text/scdoc-1.8.1 )
+"
 
 src_prepare() {
 	default
 
-	use swaybar || sed -e "s/subdir('swaybar')//g" -i meson.build || die
+	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaybar/d" -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
@@ -65,36 +70,40 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use bash-completion bash-completions)
-		$(meson_use fish-completion fish-completions)
+		-Dman-pages=$(usex man enabled disabled)
+		-Dtray=$(usex tray enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
 		$(meson_use wallpapers default-wallpaper)
+		$(meson_use fish-completion fish-completions)
 		$(meson_use zsh-completion zsh-completions)
-		"-Dtray=$(usex tray enabled disabled)"
-		"-Dxwayland=$(usex X enabled disabled)"
+		"-Dbash-completions=true"
 		"-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 "
+pkg_preinst() {
+	if ! use systemd && ! use elogind; then
+		fowners root:0 /usr/bin/sway
+		fperms 4511 /usr/bin/sway
 	fi
+}
+
+pkg_postinst() {
 	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"
+		elog "exec ck-launch-session sway"
+		elog ""
+		elog "If your system does not set the XDG_RUNTIME_DIR environment"
+		elog "variable, you must set it manually to run Sway. See wiki"
+		elog "for details: https://wiki.gentoo.org/wiki/Sway"
 	fi
 }
diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
index 95621d2f0721..f1d3935e2f12 100644
--- a/dev-libs/sway/sway-9999.ebuild
+++ b/dev-libs/sway/sway-9999.ebuild
@@ -3,59 +3,64 @@
 
 EAPI=7
 
-inherit eutils fcaps meson
+inherit eutils 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"
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/swaywm/sway/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/swaywm/${PN}/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 )"
+IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )
+	tray? ( || ( elogind systemd ) )"
 
-RDEPEND="
-	>=dev-libs/wlroots-0.3[elogind=,systemd=,X=]
+DEPEND="
 	>=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] )
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( x11-libs/gdk-pixbuf:2 )
 	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}"
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~dev-libs/wlroots-9999[elogind=,systemd=,X=]"
+else
+	DEPEND+=">=dev-libs/wlroots-0.3[elogind=,systemd=,X=]"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	${DEPEND}
+"
 BDEPEND="
-	dev-libs/wayland-protocols
-	doc? ( >=app-text/scdoc-1.8.1 )
-	virtual/pkgconfig"
-
-FILECAPS=( cap_sys_admin usr/bin/sway )
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+	man? ( >=app-text/scdoc-1.8.1 )
+"
 
 src_prepare() {
 	default
 
-	use swaybar || sed -e "s/subdir('swaybar')//g" -i meson.build || die
+	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaybar/d" -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
@@ -65,36 +70,40 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use bash-completion bash-completions)
-		$(meson_use fish-completion fish-completions)
+		-Dman-pages=$(usex man enabled disabled)
+		-Dtray=$(usex tray enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
 		$(meson_use wallpapers default-wallpaper)
+		$(meson_use fish-completion fish-completions)
 		$(meson_use zsh-completion zsh-completions)
-		"-Dtray=$(usex tray enabled disabled)"
-		"-Dxwayland=$(usex X enabled disabled)"
+		"-Dbash-completions=true"
 		"-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 "
+pkg_preinst() {
+	if ! use systemd && ! use elogind; then
+		fowners root:0 /usr/bin/sway
+		fperms 4511 /usr/bin/sway
 	fi
+}
+
+pkg_postinst() {
 	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"
+		elog "exec ck-launch-session sway"
+		elog ""
+		elog "If your system does not set the XDG_RUNTIME_DIR environment"
+		elog "variable, you must set it manually to run Sway. See wiki"
+		elog "for details: https://wiki.gentoo.org/wiki/Sway"
 	fi
 }
diff --git a/dev-libs/swayidle/Manifest b/dev-libs/swayidle/Manifest
index 131312becde3..661625280a87 100644
--- a/dev-libs/swayidle/Manifest
+++ b/dev-libs/swayidle/Manifest
@@ -1,3 +1,4 @@
 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
+EBUILD swayidle-1.2.ebuild 1327 BLAKE2B 3aab6275887fdeca3a9b48d652d2e021480754b5f7af8e8e51b4975f9af5f6cca4b95c3227584da4175ad5e88dada571d599f52752630cdc412aed209423baab SHA512 3abfe48096c94afda3c9559b8310b423fc58b9be4062e2b8542abca7c28ab3dba7afbaec3517e05b695130a1c52856e3001bfe0ecf2da9f6aa204b40f5b57f14
+EBUILD swayidle-9999.ebuild 1327 BLAKE2B 3aab6275887fdeca3a9b48d652d2e021480754b5f7af8e8e51b4975f9af5f6cca4b95c3227584da4175ad5e88dada571d599f52752630cdc412aed209423baab SHA512 3abfe48096c94afda3c9559b8310b423fc58b9be4062e2b8542abca7c28ab3dba7afbaec3517e05b695130a1c52856e3001bfe0ecf2da9f6aa204b40f5b57f14
+MISC metadata.xml 1067 BLAKE2B 059ead0c34aebcaa6f8ebd10db8b9b0aaf2df66f84a6ae10d16f3a32d680426aa4733c0788dfe61532bb90d3b92f4bb451e7fd1be822c6866205575fd3c4861a SHA512 99a60f4bcfb76aa7d2a6d4d2a7a6879d9f0ac17f0be3e37d59bef4a4b158b9e685dd5932a02e650b96756dc7f6cba2aac9b1eee95c6d56f4429c23e32a101ad4
diff --git a/dev-libs/swayidle/metadata.xml b/dev-libs/swayidle/metadata.xml
index b8a1df1de5c9..880f87d424ec 100644
--- a/dev-libs/swayidle/metadata.xml
+++ b/dev-libs/swayidle/metadata.xml
@@ -5,11 +5,26 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>speedjack95@gmail.com</email>
+		<name>Niccolò Scatena</name>
+	</maintainer>
 	<longdescription lang="en">
-		Sway's idle management daemon, compatible with any Wayland compositor which implements the KDE idle protocol.
+		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>
+		<flag name="man">Build and install man pages</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">swaywm/swayidle</remote-id>
+		<maintainer status="active">
+			<email>sir@cmpwn.com</email>
+			<name>Drew DeVault</name>
+		</maintainer>
+		<bugs-to>https://github.com/swaywm/swayidle/issues</bugs-to>
+		<changelog>https://github.com/swaywm/swayidle/releases</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/swayidle/swayidle-1.2.ebuild b/dev-libs/swayidle/swayidle-1.2.ebuild
index e7c0885af584..774758c9815e 100644
--- a/dev-libs/swayidle/swayidle-1.2.ebuild
+++ b/dev-libs/swayidle/swayidle-1.2.ebuild
@@ -7,33 +7,47 @@ 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"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd elogind zsh-completion bash-completion fish-completion +doc"
+IUSE="elogind fish-completion +man systemd zsh-completion"
 REQUIRED_USE="?? ( elogind systemd )"
 
-RDEPEND="dev-libs/wayland
-	elogind? ( >=sys-auth/elogind-237 )
-	systemd? ( >=sys-apps/systemd-237 )
+DEPEND="
+	dev-libs/wayland
+	elogind? ( >=sys-auth/elogind-237[policykit] )
+	systemd? ( >=sys-apps/systemd-237[policykit] )
+"
+RDEPEND="
+	${DEPEND}
+	!<=dev-libs/sway-1.0_beta1
+	!~dev-libs/sway-1.0_beta2[swayidle]
 "
-DEPEND="${RDEPEND}
+BDEPEND="
 	>=dev-libs/wayland-protocols-1.14
-	doc? ( app-text/scdoc )
-	!<dev-libs/sway-1.0_rc1
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
 "
+
 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)
+		-Dman-pages=$(usex man enabled disabled)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
 	)
-	if use systemd ; then
+	if use systemd; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind ; then
+	elif use elogind; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
 	else
 		emesonargs+=("-Dlogind=disabled")
diff --git a/dev-libs/swayidle/swayidle-9999.ebuild b/dev-libs/swayidle/swayidle-9999.ebuild
new file mode 100644
index 000000000000..774758c9815e
--- /dev/null
+++ b/dev-libs/swayidle/swayidle-9999.ebuild
@@ -0,0 +1,57 @@
+# 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"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind fish-completion +man systemd zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	dev-libs/wayland
+	elogind? ( >=sys-auth/elogind-237[policykit] )
+	systemd? ( >=sys-apps/systemd-237[policykit] )
+"
+RDEPEND="
+	${DEPEND}
+	!<=dev-libs/sway-1.0_beta1
+	!~dev-libs/sway-1.0_beta2[swayidle]
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-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
+}
diff --git a/dev-libs/swaylock/Manifest b/dev-libs/swaylock/Manifest
index c1bc6f6f451c..269bd3cbec91 100644
--- a/dev-libs/swaylock/Manifest
+++ b/dev-libs/swaylock/Manifest
@@ -1,3 +1,4 @@
 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
+EBUILD swaylock-1.3.ebuild 1294 BLAKE2B 7de04b1552c17a2e19a501beacd2e5a990e25057773ea27ecb1af0aeae5a28f3d2754afadf1a76ef3fa4d22e8e5883ac2b0d84f7ca3d91a6532ad86348a66322 SHA512 7e374c8a78f58e4aa0ba38d5aa21596a879162478aec4dc57c9aa131399652091f77972f63b68bdc2faaf08f0ae64fcd36d0ef8b45ab3bf91cb4d495d92f8578
+EBUILD swaylock-9999.ebuild 1294 BLAKE2B 7de04b1552c17a2e19a501beacd2e5a990e25057773ea27ecb1af0aeae5a28f3d2754afadf1a76ef3fa4d22e8e5883ac2b0d84f7ca3d91a6532ad86348a66322 SHA512 7e374c8a78f58e4aa0ba38d5aa21596a879162478aec4dc57c9aa131399652091f77972f63b68bdc2faaf08f0ae64fcd36d0ef8b45ab3bf91cb4d495d92f8578
+MISC metadata.xml 1292 BLAKE2B 9f376dc92ce4d49acf4ad1d79c1b24465d9944e48fce54f23e2e8a076a2d65282ec9fc963246e8e8a85d85b7f9258a17724221e2c63453ed2d1cd98b95853759 SHA512 d53e022caa435f7904f8b9f86c18cf33b9663cf48a8d3d34d6779e2ed4625beafcd30f34d5ecc224f45349846e8716b7587c9ce711216ce7326e27424675c595
diff --git a/dev-libs/swaylock/metadata.xml b/dev-libs/swaylock/metadata.xml
index 4155370f2f7c..26cfed9c82aa 100644
--- a/dev-libs/swaylock/metadata.xml
+++ b/dev-libs/swaylock/metadata.xml
@@ -5,11 +5,30 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>speedjack95@gmail.com</email>
+		<name>Niccolò Scatena</name>
+	</maintainer>
 	<longdescription lang="en">
-		Swaylock is a screen locking utility for Wayland compositors.
+		Swaylock is a screen locking utility for Wayland compositors. It is
+		compatible with any Wayland compositor which implements the following
+		Wayland protocols: wlr-layer-shell, wlr-input-inhibitor, xdg-output,
+		xdg-shell.
+
+		Swaylock is the official screen locker for <pkg>dev-libs/sway</pkg>.
 	</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>
+		<flag name="gdk-pixbuf">Enable additional image format support via the <pkg>x11-libs/gdk-pixbuf</pkg> library</flag>
+		<flag name="man">Build and install man pages</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">swaywm/swaylock</remote-id>
+		<maintainer status="active">
+			<email>sir@cmpwn.com</email>
+			<name>Drew DeVault</name>
+		</maintainer>
+		<bugs-to>https://github.com/swaywm/swaylock/issues</bugs-to>
+		<changelog>https://github.com/swaywm/swaylock/releases</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/swaylock/swaylock-1.3.ebuild b/dev-libs/swaylock/swaylock-1.3.ebuild
index c6e0258c8c52..85539fb9095e 100644
--- a/dev-libs/swaylock/swaylock-1.3.ebuild
+++ b/dev-libs/swaylock/swaylock-1.3.ebuild
@@ -7,34 +7,49 @@ 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"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pam +gdk-pixbuf zsh-completion bash-completion fish-completion +doc"
+IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
 
-RDEPEND="dev-libs/wayland
-	x11-libs/libxkbcommon
+DEPEND="
+	dev-libs/wayland
 	x11-libs/cairo
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	x11-libs/libxkbcommon
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
 	pam? ( virtual/pam )
 "
-DEPEND="${RDEPEND}
+RDEPEND="
+	${DEPEND}
+	!<=dev-libs/sway-1.0_beta2[swaylock]
+"
+BDEPEND="
 	>=dev-libs/wayland-protocols-1.14
-	doc? ( app-text/scdoc )
-	!<dev-libs/sway-1.0_rc1
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
 "
+
 src_configure() {
 	local emesonargs=(
-		-Dman-pages=$(usex doc enabled disabled)
+		-Dman-pages=$(usex man 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}
+		"-Dbash-completions=true"
+		"-Dwerror=false"
 	)
+	if [[ ${PV} != 9999 ]]; then
+		emesonargs+=("-Dswaylock-version=${PV}")
+	fi
 
 	meson_src_configure
 }
diff --git a/dev-libs/swaylock/swaylock-9999.ebuild b/dev-libs/swaylock/swaylock-9999.ebuild
new file mode 100644
index 000000000000..85539fb9095e
--- /dev/null
+++ b/dev-libs/swaylock/swaylock-9999.ebuild
@@ -0,0 +1,61 @@
+# 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"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
+
+DEPEND="
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+	pam? ( virtual/pam )
+"
+RDEPEND="
+	${DEPEND}
+	!<=dev-libs/sway-1.0_beta2[swaylock]
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dpam=$(usex pam enabled disabled)
+		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+	if [[ ${PV} != 9999 ]]; then
+		emesonargs+=("-Dswaylock-version=${PV}")
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if ! use pam; then
+		fcaps cap_sys_admin usr/bin/swaylock
+	fi
+}
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index 79d0495b3e9e..2148fac4c39c 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -7,5 +7,5 @@ DIST ucommon-6.5.7.tar.gz 855822 BLAKE2B 56b5eb5f8372f983e0f348e5fc494c15bea57dc
 DIST ucommon-7.0.0.tar.gz 837905 BLAKE2B ddc82d5d1a88d66f353d9e69eacd7cfaaa0204acb8b9c4152559a009d287f2ffdb7feedc6fc0303c93a39d607498dd15bf83798d088857582f79be435d010ca7 SHA512 d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b
 EBUILD ucommon-6.0.3.ebuild 1540 BLAKE2B 6b8a686eec4fe95ac91d5a6e0f00a0a5ae848ce27939c332a1c2fc093b19492e444c3af325bc14b7e1cfb6cff7331fa68fc6ed8147e68f83c33d8bdc2e52a2c6 SHA512 6b56d6e4f20d048881783366276a09820a9c0bb269f8d65acd3e4b4b968a9e966b49bc3cf7564ad5da53eb7268e6af9336c5d7d23df7a10cd86f1b58ee64a71c
 EBUILD ucommon-6.5.7.ebuild 1735 BLAKE2B 77d03ce5dd28a014e1e1124b3ee657a95745f57a7b9510b624473b2932bf70539ed08fe3e4b318fba937cc405bfcdbfb47ef77cd2c5f3dee8736dd1bf3b411e8 SHA512 ddf5899ea21b6f1c631fad60d41ef17c30150f832a398c01f231cd249c4b226274e0486b0658f5fc63fbc6d5444da2515359a67cc043cd96767ed1db92f17377
-EBUILD ucommon-7.0.0.ebuild 1486 BLAKE2B 442b3bbf9aff5faadc4eaaad23c996db7c15799b7b3c830d741a211062c31c43ca25e5c80bbcb1c08b87ed6f7952a90bb3aa59e804a0c144470ed54dac0b9391 SHA512 e87f63f6d663054718dbcf93367d3bf1da5293d708423685b0dfddbf50415621cac061c2640459d2e9d5ede70a737e7077123ed4c2fa2b9ffa14410b14490431
+EBUILD ucommon-7.0.0.ebuild 1484 BLAKE2B af9da035d218d5893778df542e1c4e268448f49490b74977a3e22d7a0f7fa04392cc416c58fc1dc45d7ae2ce35df4b608b1ea48446ee107352a110c7c96fd9dd SHA512 63a6e1f23bc2cb0ad097fdb13716dc40e28e9d3792f4561ef94afd2130482d7b9a0d88ba5f9680510d3a1ad7a205ef59e903b2c2fe7b525e3874929ff02c5fd1
 MISC metadata.xml 316 BLAKE2B 8c4be49ccdfcd5353854b5b44e7cab7917695d50af5cb0e539b4a5d58fc31d3d6a98e77af95d0254324ba49f39d64d05a28adf2edbc9a71512c1f8e14bd2f78c SHA512 8095298e0382cc3e245df76d9b5bd4f27c9cf803aafc5b3fe9a9d63c94733192287a0d0348904320f07ec3a24edc9c437f09065b12dc3226f7acbe1e055c774c
diff --git a/dev-libs/ucommon/ucommon-7.0.0.ebuild b/dev-libs/ucommon/ucommon-7.0.0.ebuild
index 77953319a895..4632f70963ac 100644
--- a/dev-libs/ucommon/ucommon-7.0.0.ebuild
+++ b/dev-libs/ucommon/ucommon-7.0.0.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="mirror://gnu/commoncpp/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/8" # soname version
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="doc static-libs +cxx debug libressl ssl gnutls"
 
 RDEPEND="
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 2531441bb3dc..d73828b93570 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 632 BLAKE2B 0b04ce03440e30097e79891f8e7f012746db1771ea8d62c5772a1cad4260461cb4dba2bfe219eb1ac55f583b1b6b91c5ebcda2f9f88e817f4e39f0b56f1b66db SHA512 5356e68b767744e2b4f7c09381b1f8cf6f6397747dd2c93887c5480586ebce2f854c0304fb7f1892a385a239225c8e123e7b08909703cd18fea203aceee2f012
+EBUILD uthash-2.0.2.ebuild 631 BLAKE2B eb440dbd0f03d8ee7cd03dfd07490d86fb06850416e231a474b612fe633def9a7c69395b317318cedbc4bf500d34eb4015addb253a05fb785a738df842642203 SHA512 7337f3530027577fef00ef24458c931d47d2b0fbfa7be5420bc9b9822a482430b7bfef5321aeffb6bcd7d3a50ab2d80ec5d79ecaa04afd04f5d2399956c72774
 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 ca95863e281c..e118b02d7fcb 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/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 9a354db8df69..d52b6bfa1181 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,9 @@
 DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
 DIST vala-0.36.17.tar.xz 2898524 BLAKE2B 4a5a373bacd4e4a392350c7819e0498054e38f50dce89658412d7aeb5642892ef9f32a7689ebd45f53c41f064e0b6d2f52fb441be67a1dd48e67311a1e764637 SHA512 93d4fa600cd0ef62b71ed056b837f2c0a42c3aba25b021b2bbd2045428550307727827b250dae546926ea3fe2e33a5ac80c9b24b5100f02550ec584dd5da5e92
+DIST vala-0.40.13.tar.xz 3394588 BLAKE2B cb3055b859b220f999bc5b4533251a069e9c10690963bc92b087b0ab351f0d78eb8f5992b747cc345d9d2a3dba69c68d130bca20604036c2c62e380442675e8b SHA512 0590224ec5128f6939b66109b6bcf7f764af3ece28f9bce9a5d715f53defbc8746d5d20599039b067848da2f38fdae7a057427be1ea9ef0fe09e0ce45db091d0
+DIST vala-0.42.5.tar.xz 3350460 BLAKE2B 790c9f9e9e656ce96226f1ac6a0d090033ecf1943d024da0c9ee174bf65f76a14721819c6c2263c5b094f16cf112cc964000000ee42c9a7fdc0f2ad6fc01feb7 SHA512 1862307eab505e500326f84e267648f084926629f6b45b9abb6a90a20a7aa6dd2fc305962b9028c5ca7becb574573cca43fbecd9294b782d9942e71639a32aa9
 EBUILD vala-common-0.36.15.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
 EBUILD vala-common-0.36.17.ebuild 2528 BLAKE2B 22a27070320c74579be8eacdbc325a6e58be193d787521c73aee40028c4e02e3f3ce4d8d987b889e1d253fec1109fb7031358f3c6317a11616e788c2f8763d8e SHA512 ebdc12ff8170abfade55b3f5013c1813a23d545a5c0d1d828a5257c7f5cdf7687ce27e4d085a84c977ac171ae32daf383214ab353a2c44befb5d6e1f148a5c20
+EBUILD vala-common-0.40.13.ebuild 2528 BLAKE2B 8395b76376fc6b562a52b7df938e23363d328746225b800f46872a591e6049f00d0a8909d0eac0405b17c18b50266631523b1b28494721e3adfb834824114d52 SHA512 3720a01307c23ac617508450c627064f22685542cf4fc28979ab3784a2069c832f4f34b1e9c58557a0c1fd160c42141e8007c4d116f98f45c7208e892a8013e4
+EBUILD vala-common-0.42.5.ebuild 2528 BLAKE2B 8395b76376fc6b562a52b7df938e23363d328746225b800f46872a591e6049f00d0a8909d0eac0405b17c18b50266631523b1b28494721e3adfb834824114d52 SHA512 3720a01307c23ac617508450c627064f22685542cf4fc28979ab3784a2069c832f4f34b1e9c58557a0c1fd160c42141e8007c4d116f98f45c7208e892a8013e4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.40.13.ebuild b/dev-libs/vala-common/vala-common-0.40.13.ebuild
new file mode 100644
index 000000000000..29fd6de8fd02
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.40.13.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+# Previously ${PN} was part of dev-lang/vala
+RDEPEND="
+	!<dev-lang/vala-0.10.4-r2
+	!<dev-lang/vala-0.12.1-r1:0.12
+	!<dev-lang/vala-0.14.2-r2:0.14
+	!<dev-lang/vala-0.16.1-r2:0.16
+	!<dev-lang/vala-0.17.5:0.18
+"
+DEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
+
+pkg_postinst() {
+	# Hack to prevent alternatives_auto_makesym in previously installed
+	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
+	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
+		ebegin "Removing old vala-0.10 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
+		ebegin "Removing old vala-0.12 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
+		ebegin "Removing old vala-0.14 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
+		ebegin "Removing old vala-0.16 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.16 makefile template"
+			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
+		ebegin "Removing old vala-0.18 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.18 makefile template"
+			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+}
diff --git a/dev-libs/vala-common/vala-common-0.42.5.ebuild b/dev-libs/vala-common/vala-common-0.42.5.ebuild
new file mode 100644
index 000000000000..29fd6de8fd02
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.42.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+# Previously ${PN} was part of dev-lang/vala
+RDEPEND="
+	!<dev-lang/vala-0.10.4-r2
+	!<dev-lang/vala-0.12.1-r1:0.12
+	!<dev-lang/vala-0.14.2-r2:0.14
+	!<dev-lang/vala-0.16.1-r2:0.16
+	!<dev-lang/vala-0.17.5:0.18
+"
+DEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
+
+pkg_postinst() {
+	# Hack to prevent alternatives_auto_makesym in previously installed
+	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
+	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
+		ebegin "Removing old vala-0.10 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
+		ebegin "Removing old vala-0.12 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
+		ebegin "Removing old vala-0.14 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
+		ebegin "Removing old vala-0.16 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.16 makefile template"
+			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
+		ebegin "Removing old vala-0.18 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.18 makefile template"
+			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+}
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 1a5d4b06fbf9..8a7d1aae5491 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-protocols-1.17.tar.xz 107680 BLAKE2B cde978ceeaa9d71ac76cd007c511011fed6a110e772a6a9e880a5fd07a0318239a11235aac25b855d0f7ed5ae9980dd2103886092e85a92ed606c8a2f53de726 SHA512 5f3aacbba58717092036659d9b665dc10ff05ee51df61b1de38b22f0417285a74fd8a6d15ca049ad60d204f28203aa13d773c52140c7c02db2c498a6964c2643
-EBUILD wayland-protocols-1.17.ebuild 872 BLAKE2B 7eace1ba64ff988655dbbf7086e30acceca9fbc14f41b16185b526764a5143372558d3523f2440830fc3ca3eb43f85b533f9006d057192bd12a3ab4ffaf5a198 SHA512 1c39fc3fd59999332705c33b43532e4a83639de6b17a258d26df88b2b14ac14c43259ebefc90e710d0996722c7b3140ff5c513610dc2c397f65af6d77e75372b
+EBUILD wayland-protocols-1.17.ebuild 871 BLAKE2B 5545ecff86f62dad1e8fe4f3f823ac4137904b1a79e39dea836d3424bc68344065e3be4d1021a90f58f7814abfceb0f2a8e7a1b18076d3af653c8e1eb6990d10 SHA512 dc7a9bfb0e4f181a1951c1f43a04b7794e3cdd437b219bcfe4c5e7c64a253ef72271e9f46ed51e4f0d95d10cae60b2ba107bafeeda38b4b8919cf9ff599f063b
 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.17.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild
index 53b286d6c4e0..cc1a199083b7 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild
@@ -17,7 +17,7 @@ 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"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wlroots/Manifest b/dev-libs/wlroots/Manifest
index 9c35e0601f8a..856802476a2b 100644
--- a/dev-libs/wlroots/Manifest
+++ b/dev-libs/wlroots/Manifest
@@ -1,8 +1,6 @@
-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
+EBUILD wlroots-0.2.ebuild 2556 BLAKE2B 5081d65b136626ea245b9b847eec1ec7d2c4e2566467f78394f93e889e22ed9abb63267233fd42faa2ec8763e9870a693050547cd7e7d495eb512434172958d7 SHA512 a8960892a10d12e007d9a010f98ad935b109c10433fa3510dd88c38f51519077d33076e35b6890121b7c1eb06c81f22a1c1dfd628cc85f8bac089c0f825f3efe
+EBUILD wlroots-0.3.ebuild 2556 BLAKE2B 00e108c5beda97a66f08ca08e57761a89763b1a1767239c12734eb937156fad57917fe777a10fc9f19e12a2d1ad593520768f97885a7633d04f2234f48352a42 SHA512 ebc9b1bc9473120b10ddf7a94db75209788601b41b8d88d375b75022778a477fc4970979bed478359a95119e703f14b9d896a261f6b9e753f3254d8372e8972d
+EBUILD wlroots-9999.ebuild 2556 BLAKE2B 00e108c5beda97a66f08ca08e57761a89763b1a1767239c12734eb937156fad57917fe777a10fc9f19e12a2d1ad593520768f97885a7633d04f2234f48352a42 SHA512 ebc9b1bc9473120b10ddf7a94db75209788601b41b8d88d375b75022778a477fc4970979bed478359a95119e703f14b9d896a261f6b9e753f3254d8372e8972d
+MISC metadata.xml 1682 BLAKE2B 5713fb5006f1c178ba401ff4831ff991ec1e2270bf7d7961a0727a8934cf9262654fa12b9e13cd14803a8ace50c04dcdcdd37ff6162239fb22c30c84970b1f7a SHA512 88263936158e8d423f79ac9932286674e0b7e6e50f0279cefc07fa3961cda5c65874b14029553ce8b93dd22a7715ca40b1db32d239498d144fc6c901000e5018
diff --git a/dev-libs/wlroots/metadata.xml b/dev-libs/wlroots/metadata.xml
index c5b96abdf826..5fb5999bdba5 100644
--- a/dev-libs/wlroots/metadata.xml
+++ b/dev-libs/wlroots/metadata.xml
@@ -9,7 +9,7 @@
 		<email>speedjack95@gmail.com</email>
 		<name>Niccolò Scatena</name>
 	</maintainer>
-	<longdescription>
+	<longdescription lang="en">
 		Pluggable, composable, unopinionated modules for building a Wayland
 		compositor.
 
diff --git a/dev-libs/wlroots/wlroots-0.1.ebuild b/dev-libs/wlroots/wlroots-0.1.ebuild
deleted file mode 100644
index eae2493458cd..000000000000
--- a/dev-libs/wlroots/wlroots-0.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 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)
-		-Dxcb-xkb=$(usex x11-backend 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/wlroots/wlroots-0.2.ebuild b/dev-libs/wlroots/wlroots-0.2.ebuild
index c3bccd9f7fe9..a3427d6c6fc3 100644
--- a/dev-libs/wlroots/wlroots-0.2.ebuild
+++ b/dev-libs/wlroots/wlroots-0.2.ebuild
@@ -1,29 +1,29 @@
-# 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/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"
 
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 LICENSE="MIT"
 SLOT="0"
 IUSE="elogind icccm rootston systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 
-RDEPEND=">=dev-libs/libinput-1.7.0:0=
+DEPEND="
+	>=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
@@ -36,10 +36,16 @@ RDEPEND=">=dev-libs/libinput-1.7.0:0=
 	X? (
 		x11-base/xorg-server[wayland]
 		x11-libs/libxcb:0=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/meson-0.48
-	virtual/pkgconfig"
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.15
+	virtual/pkgconfig
+"
 
 FILECAPS=( cap_sys_admin usr/bin/rootston )
 
@@ -51,13 +57,13 @@ src_configure() {
 		-Dxcb-icccm=$(usex icccm enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
-		-Drootston=$(usex rootston true false)
+		$(meson_use rootston)
 		"-Dexamples=false"
 		"-Dwerror=false"
 	)
-	if use systemd ; then
+	if use systemd; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind ; then
+	elif use elogind; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
 	else
 		emesonargs+=("-Dlogind=disabled")
@@ -67,7 +73,7 @@ src_configure() {
 }
 
 src_install() {
-	if use rootston ; then
+	if use rootston; then
 		dobin "${BUILD_DIR}"/rootston/rootston
 		newdoc rootston/rootston.ini.example rootston.ini
 	fi
@@ -78,13 +84,13 @@ 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
+	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
+		if ! use systemd && ! use elogind; then
 			elog ""
 			elog "If you use ConsoleKit2, remember to launch rootston using:"
 			elog "exec ck-launch-session rootston"
diff --git a/dev-libs/wlroots/wlroots-0.3.ebuild b/dev-libs/wlroots/wlroots-0.3.ebuild
index c762765d60bc..c96b1fcfc3fe 100644
--- a/dev-libs/wlroots/wlroots-0.3.ebuild
+++ b/dev-libs/wlroots/wlroots-0.3.ebuild
@@ -3,27 +3,27 @@
 
 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"
 
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 LICENSE="MIT"
 SLOT="0"
 IUSE="elogind icccm rootston systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 
-RDEPEND=">=dev-libs/libinput-1.7.0:0=
+DEPEND="
+	>=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
@@ -32,14 +32,20 @@ RDEPEND=">=dev-libs/libinput-1.7.0:0=
 	elogind? ( >=sys-auth/elogind-237 )
 	icccm? ( x11-libs/xcb-util-wm )
 	systemd? ( >=sys-apps/systemd-237 )
-	x11-backend? ( x11-libs/libxcb:0=[xkb] )
+	x11-backend? ( x11-libs/libxcb:0= )
 	X? (
 		x11-base/xorg-server[wayland]
 		x11-libs/libxcb:0=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/meson-0.48
-	virtual/pkgconfig"
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.16
+	virtual/pkgconfig
+"
 
 FILECAPS=( cap_sys_admin usr/bin/rootston )
 
@@ -51,13 +57,13 @@ src_configure() {
 		-Dxcb-icccm=$(usex icccm enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
-		-Drootston=$(usex rootston true false)
+		$(meson_use rootston)
 		"-Dexamples=false"
 		"-Dwerror=false"
 	)
-	if use systemd ; then
+	if use systemd; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind ; then
+	elif use elogind; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
 	else
 		emesonargs+=("-Dlogind=disabled")
@@ -67,7 +73,7 @@ src_configure() {
 }
 
 src_install() {
-	if use rootston ; then
+	if use rootston; then
 		dobin "${BUILD_DIR}"/rootston/rootston
 		newdoc rootston/rootston.ini.example rootston.ini
 	fi
@@ -78,13 +84,13 @@ 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
+	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
+		if ! use systemd && ! use elogind; then
 			elog ""
 			elog "If you use ConsoleKit2, remember to launch rootston using:"
 			elog "exec ck-launch-session rootston"
diff --git a/dev-libs/wlroots/wlroots-9999.ebuild b/dev-libs/wlroots/wlroots-9999.ebuild
index c3bccd9f7fe9..c96b1fcfc3fe 100644
--- a/dev-libs/wlroots/wlroots-9999.ebuild
+++ b/dev-libs/wlroots/wlroots-9999.ebuild
@@ -1,29 +1,29 @@
-# 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/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"
 
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 LICENSE="MIT"
 SLOT="0"
 IUSE="elogind icccm rootston systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 
-RDEPEND=">=dev-libs/libinput-1.7.0:0=
+DEPEND="
+	>=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
@@ -36,10 +36,16 @@ RDEPEND=">=dev-libs/libinput-1.7.0:0=
 	X? (
 		x11-base/xorg-server[wayland]
 		x11-libs/libxcb:0=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/meson-0.48
-	virtual/pkgconfig"
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.16
+	virtual/pkgconfig
+"
 
 FILECAPS=( cap_sys_admin usr/bin/rootston )
 
@@ -51,13 +57,13 @@ src_configure() {
 		-Dxcb-icccm=$(usex icccm enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
-		-Drootston=$(usex rootston true false)
+		$(meson_use rootston)
 		"-Dexamples=false"
 		"-Dwerror=false"
 	)
-	if use systemd ; then
+	if use systemd; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind ; then
+	elif use elogind; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
 	else
 		emesonargs+=("-Dlogind=disabled")
@@ -67,7 +73,7 @@ src_configure() {
 }
 
 src_install() {
-	if use rootston ; then
+	if use rootston; then
 		dobin "${BUILD_DIR}"/rootston/rootston
 		newdoc rootston/rootston.ini.example rootston.ini
 	fi
@@ -78,13 +84,13 @@ 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
+	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
+		if ! use systemd && ! use elogind; then
 			elog ""
 			elog "If you use ConsoleKit2, remember to launch rootston using:"
 			elog "exec ck-launch-session rootston"
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 34ba3b264dca..afc2d834b410 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 2961 BLAKE2B 237782473205140e3fac1a53bb678e6aafc5a1c6519a21f2cc01c1f2430bfaefaa25cb166b8c374cb9da3290e5e0ca301b4662b978c8fcbf75427d1df45b8857 SHA512 978e991f0c8acf0c27fc28ae34c258cd46bf83ceaf891c3eabc9fe2aabee90d4420e512db75d6bdf27998bfd9e6e15d1f0fa8a75284b45f9d238dff2bf90e1fa
+EBUILD xerces-c-3.2.2-r1.ebuild 2959 BLAKE2B 79a26e863623d246fe92a398cadd7008da7a4b6ddb987b4f0dbbe5ace547c09264bc9e05aea9bd1a6f11788947cea16759487c40d4aac15ea9b9b60c1a91cde4 SHA512 57b41221a6857bcf61496a6c14998a81f447ab87cb1d60e0a933353476ba5e132db26afdd645a252f05f583c032a5040f8617a9e0320d46bcc6bff52b3b64d4c
 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 f0709b3acba6..cd9703988cf3 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"
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-16 12:59:29 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-16 12:59:29 +0000
commit	79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
tree	ade7cb031f363fad64c77139dea7aa3d81908537 /dev-libs
parent	6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)