gentoo resync : 22.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
commit: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree: 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /dev-libs
parent: 957235cf19a691360c720f7913672adda4258ed0 (diff)
182 files changed, 1292 insertions, 2040 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 37cc09566fcc..0b18a337173a 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 a886143423ec..2651b8747aff 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +1,5 @@
 DIST appstream-glib-0.6.13.tar.xz 1974864 BLAKE2B e9e0967b7657250659b3597bc2f6b049a20750e6dc66ee3672f3794b8c50f5060e48c7d4cd76d16e9e7d7cbc7d3364b7600e1c20fe24b33538c66d2a80cf0888 SHA512 d7e95a31d3f6fba974af2fab423282c7b0291d1325a634d8040fe2c2c2fcde49981be18900415251b3d71f20bb9e945e16d7c00fa830b27deac2e5547ec4c8b0
 DIST appstream-glib-0.7.9.tar.xz 2245728 BLAKE2B fb6f54329bed91f1acaa6218b111fd4527dff7ed412a89cb44a6e4f6cdfb7e0fe4e6f9fb37b6cdc2efa75164dccef323b6d7428a63b08369b941d36b0b9071f0 SHA512 d78cb6f11cad01d67cb33f16e987485177d20b78a8b21cfbabb64ce7b18b813c0d2d1de2faeea199fdc31d12633e899a5596a6cf133cb831a4377d641f79eb7d
-EBUILD appstream-glib-0.6.13.ebuild 1606 BLAKE2B af414cb338d410c75c55d94bcdfd1cc43d1c91de1fa503841ef1e5593b1b9269462a64faca6eeac0aaa93e77ec652af0de7f999482ee8420bed3b592fbb0475f SHA512 bc547565c79d072fefac5be7855f4cd00495495bf581c0e9ba57dd830746d137a1ad28eb5d9ed8e60cbcfb8b00d70158436835b5bbe2d7bcba253943ac8449ee
-EBUILD appstream-glib-0.7.9.ebuild 1517 BLAKE2B a3dea107a54200b19c154210e1957fd487453f6c31bad7960177b9d844697489f9b2563f1380b092a3fd3058731727ac16c56a91986ce4fa269fc5154d497089 SHA512 8ff93c762d932ac4df398e336ca1a6e74b3483674b1e47c442726a25747cc2a45460ed8d46c2020c01b256b60038e10e8e56c61fe18f7c3e3c4d81e74a5aade2
+EBUILD appstream-glib-0.6.13.ebuild 1608 BLAKE2B a9962fcdcc67adb507d3ebf22d4ea9cb168d1cb6d8f8bf818b4d9794b7d952d0c7965e58e26935908284caf16f5db5ce62d2fe8ba0b1e61b925238e34ee38ee9 SHA512 e5a83f1b4cec3ebf9447620f1c41faecf3f9b0c7996122dff5769eddb0a0d8c37ebf13f0f829c8f8ba8352c1d702e3832a10635c4add19ff8ad67510fda1c190
+EBUILD appstream-glib-0.7.9.ebuild 1520 BLAKE2B 28f3aa1996a2062e0ad0e0698699db63b24d5df7ea49e881409945b31936a89f331520e5705ee737f626a913efb8827e311b89c0e2cfcd09ae0ac8b2e25ef431 SHA512 fa46dcfa681baaa24cb6e627024aa3fdb6e20abe14e256623ffa337d2bf0853d9f9ec4a1a2ab281947fda683b65f80b24b75d0bb15db719c1eafcd0921b74da5
 MISC metadata.xml 352 BLAKE2B 2d04b5c85e8a4e5a62ddf862b7dc1d757896d4f7a5aa052b9139cb050d16aedf9b571b543484b91d3795a979703b4bebb6c42695f8238939a4179a613110053f SHA512 491790151594360b57d05b217381b3b6c6f3d3a72e8066d923230060a4b05d0e2ff1e31cdcb94eb8b1ac077a011d695f33b857bf049c04292a9e324c065895d9
diff --git a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
index ca763db967b6..a7707c71c57e 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 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 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="+introspection nls stemmer"
 
 RDEPEND="
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
index 1436a94fb8e2..e771c9b5bfd1 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://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 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/atf/Manifest b/dev-libs/atf/Manifest
index c0a13feafe78..bc0c1423a70a 100644
--- a/dev-libs/atf/Manifest
+++ b/dev-libs/atf/Manifest
@@ -1,4 +1,4 @@
 AUX atf-0.21-getopt-solaris.patch 191 BLAKE2B 100e710c5cd10d5b0cd35fc2b6fcbba440496c3bdf99b7b88162b214e1fbf030cf54a0289b801b9946f89df0fe26ecc452f498ecd9e546462ccfd989aa313f64 SHA512 c98c062793abb014731e249d833e94fb4c0e7f5ced37f7310caa6e3a26a3b391c4fe90133656c21f6bb467af5d8039f887a3a42630b6e9725ecb84b99309a94b
 DIST atf-0.21.tar.gz 567791 BLAKE2B e9449bb61008a91c10050462e84ff65c6fd88124db56ff3f6c149ff47fe8647fe8fe786cd7b1106cbfd62723a57ab613432323f266a93a4c86d8a6ab39bfcc0a SHA512 9b4b67d7d0d1f65cc9571d38c67dfc620b08ff7c0abf57d87bcae54055b4af21f95f3363f2cf8ee9b13b89a5351bc58669b784a0fd8c1beb0664c14933c10ce1
-EBUILD atf-0.21-r2.ebuild 671 BLAKE2B 92ff69da001d811e5e6cab4ea9ca4ee1f46beef82b7596c93c83a6361f3a9cee2f4cd27ecb408aee38639910d1870fe6017b0b9567bf3421759c5e5304571545 SHA512 d9bcd1c6767dd10e2661053da3cd03fdcddf22fedf03fe6cf1af76db567a2b3e666046ea77c252bfcc6d2b82eec04497f2062f3d01af9618b62a0b2df5667a23
+EBUILD atf-0.21-r2.ebuild 673 BLAKE2B 0835488e4336fc7848ed96281c33f9c00723a58144d3407c80e3052d1766e7b548f32a705e47433381d99f6174171bcb16868fc70ab1ab63b0e8b60f95f07544 SHA512 4a1ceceb6a0cebbce20ac71eeb8c53dc213b66e615732767be047ed1301e96a9ba447f3bd6d181a6bb919e90adc30a1406fd0d4709cd84955475e45caa721c8b
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-libs/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r2.ebuild
index 71c1edb34d1a..5f4d52fca20f 100644
--- a/dev-libs/atf/atf-0.21-r2.ebuild
+++ b/dev-libs/atf/atf-0.21-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/pkgconfig"
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index afa0d0a5db0a..ab07b97a9a15 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-r4.ebuild 2227 BLAKE2B f66a1cb5bea84db49c4bfb3928526e6d7927ac57ce04a0a525e8d75c8b49989d03e96e7e8be7c272af07adf8595635c142d4210fc1ec9f7e4f93e643b6c8d872 SHA512 bc49a21bada431dbfcd5be9233602d7c0feda3585c8a10887dfffcca99f781a5b6a1749b583b479360022ce20838282c47932643ba1816d0308c3de5698ca78f
-EBUILD beecrypt-4.2.1-r5.ebuild 2265 BLAKE2B c4d39a019a88c31a9022cbc5fbe390943025d0edcc532192cc75732df868bfbbe7ed7228b2f378ba6cc4cea385aa8817bd41c7ef7c51c4feb011f643e6883f17 SHA512 205c634304704bf0317a82493a26aa132049cb4f73f23d4fb0498d0c9657cf491235948122cbd6a93bd9bff68ce5e90a409af6bf182e0b29656bbd413443f499
+EBUILD beecrypt-4.2.1-r5.ebuild 2259 BLAKE2B 0e7149000256b0d7a64ed5192c6dcc7bfbd9ea675d7547c68bdf013faf12ce02dadbc6125da1516aa94b43da20a9885e85ffc4d7bf59d65995ab7e679f83a8bb SHA512 79065b8d809de043f36e326657536df01bf39d239f8d9551706511324ecc337f59544ba98b1acb25fd7a9a4eeb632754f41e72c5049c1e23b3da8a63da8c30fc
 MISC metadata.xml 245 BLAKE2B a937157650e974ab296da9c19930deffad940d0c256541ea0338121f36fde942eb41529c5f3f39d37fdd3fe6e30eb8e9b987a0cb5c2b7736ff837c2e332ddf95 SHA512 7da531ddd382748b46b2be3d6324c0f654e772ca0d1b87884a5de0ae1f4cf8a6e32d9cd0e4b87b7fd632aa176f873d7e315adbb974c367b4539045fdeffde98b
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
index 564e81f57995..adb3ef1d9d94 100644
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r5.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/bitset/Manifest b/dev-libs/bitset/Manifest
index 13797a9e177a..581b5b19b306 100644
--- a/dev-libs/bitset/Manifest
+++ b/dev-libs/bitset/Manifest
@@ -1,3 +1,3 @@
 DIST bitset-2.8.4.tar.gz 37040 BLAKE2B 3a3db906c86fef73c20a038f01f7053efe2f7d2802b8a627657dbfe807c2d043834f7afab6a3fda66f3b4a87c27255c000f0cebffa7620e88e5f3790a3544914 SHA512 709c4f064416b22ae37fc9659a9eb74007fff5ce12eb998c386a268427a012238258bbd0f019682a5172a98b7b2a476fd60017bf34e199159e838b254b48ffe7
 EBUILD bitset-2.8.4-r1.ebuild 943 BLAKE2B ef2417a00b17526532c0042ac3248518508391ea2d392b382ecbf385dc1dd10dd45e910bc1bf0fa034c1f30c0119a2de90ef0e1d9d10451bd9d78d2d005e7ef4 SHA512 7179d196b836ff6e601f62d85e5ccfaf008d0eff5ae4f817301bac92b73f2dc38310389e0c8f501089f93b922279d85bf1e3edb91b08ef2cb0199813f2c18119
-MISC metadata.xml 522 BLAKE2B 7034e76df939a176a138b0016b1ee37b632f5822c2ca8f1b38f15242e06fe9ea836e9295ab907493a30e32a7ac76504a7bba9ddf1f3f643b264f8b02706c3712 SHA512 5c0fb4abffcc6da6ed48fec3e52e19b6526a526909463da6f9e4b8c0094f5701548d782c65a5b4c9787eb1143429ec4d0cdf71a7677e99331a9891a4acd3b537
+MISC metadata.xml 442 BLAKE2B 62782589bd4f5873f440b71efa6d0938e90f7b672babd073f316367aca8bf414cb6d57531700878267bad53e44d0c40b5d170f530827612cf7d6765b95acfb40 SHA512 4430820b6c01fbbc8f99e261c7abd221821ece94c954f0b9f78b99e7e06d9e82782baf873dc372ad00f0938d4050d899c1494e848c265662387666dcde63c70e
diff --git a/dev-libs/bitset/metadata.xml b/dev-libs/bitset/metadata.xml
index d1af046aa04c..2ef258274aa2 100644
--- a/dev-libs/bitset/metadata.xml
+++ b/dev-libs/bitset/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Sergey Popov</name>
 	</maintainer>
 	<use>
-		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
 		<flag name="tcmalloc">Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations</flag>
 	</use>
 	<upstream>
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 93b4c954c86c..454926f70bc0 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,6 +2,8 @@ AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432e
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
 DIST Botan-2.7.0.tgz 7021654 BLAKE2B 3f18b7ba660a72a409beeaba8bd1b1bd021f645c135bed56d75b6ba906b7c28d1e14eac9550862500dda9c4b3ac3135cfc9c340e073c573deb66b236e09f8054 SHA512 992138d83e18aedf80337d825f80c34dd3d2177eb30967573c57cf9fb7e7f9a9965ae3d75f23635f4c93b4efb7bb5adbb3423702663c78a5eb905dd567561858
+DIST Botan-2.8.0.tgz 7152674 BLAKE2B 7838423fc7cc3521b3feb95ab3958f8cd4df86534f1ef30d717b47e54a9a7ae0d2ed6618370b9adfd0a178b509750e5aacda8457caa89f408292837fe3426de0 SHA512 12f734eea3e60a956f75a5b58e9bd83fac7b0dbcd71fb9577b025d171702d87a9a11e2e73162320bdefb2d25f3900757d89dd7fe13089321c88d948efc2ba214
 EBUILD botan-1.10.17-r2.ebuild 4274 BLAKE2B cc2cc4d510a95803463c477848e09cfec79a11e5246d9c9d5678502f1f279989b0ebb92840e62c445bc13a0fe1276a41b63a3c1a14ad4b8bde058f51ac91e586 SHA512 5e256c4785e2560bcb151d687136688b3a2daa11e8f87a46965aa9e687b781c7fb00cabce5ee90b6fba6aca800ff636ee9921093d1de8d22a1780d809f0613de
 EBUILD botan-2.7.0.ebuild 2480 BLAKE2B 3207ded4663f1cf2cd55153f4369fef6a4a93967703a1afbe8f91b2dc0cca944a89eeaef3dd64b3ee8253deb034b8c69e4adcc0c018f80b3dafbe145d0955ce1 SHA512 e5cd37b8ff517686c295b094e66305d5b3d5741d95ee42e62c03dc6e0d5b452257033bd7c740c59bc65e47b179c2e4b2ade7cd11ebbf629f12a0c2c842590ff7
+EBUILD botan-2.8.0.ebuild 2494 BLAKE2B 2ff89959474d178a826802df9c6885d6eae6ce379011a3a3609f106d8af2761d6206d628b8cc4d522f97af4e3dcfe25a8962cacbbfc5d1fdee43b47b67f08c0c SHA512 1a67d9d1f391c2f0af33105b2a63be06e5e477b74e1cb2c81769587069c2b542daa635d6768ce76d9b4b977415a03d26505dbeadd698b4b1bbec7e18f33d8b08
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.8.0.ebuild b/dev-libs/botan/botan-2.8.0.ebuild
new file mode 100644
index 000000000000..f64ebf1a8fe6
--- /dev/null
+++ b/dev-libs/botan/botan-2.8.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit multilib python-r1 toolchain-funcs
+
+MY_PN="Botan"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+SLOT="2/$(ver_cut 1-2)" # soname version
+LICENSE="BSD"
+IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+	boost? ( >=dev-libs/boost-1.48:= )
+	lzma? ( app-arch/xz-utils:= )
+	sqlite? ( dev-db/sqlite:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+BDEPEND="dev-lang/python:*
+	doc? ( dev-python/sphinx )"
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling modules: ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)	myos=darwin ;;
+		*)			myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*)		CHOSTARCH=parisc ;;
+	esac
+
+	local pythonvers=()
+	if use python; then
+		append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+		python_foreach_impl append
+	fi
+
+	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
+		$(use_enable static-libs static-library) \
+		$(use_with boost) \
+		$(use_with bzip2) \
+		$(use_with doc documentation) \
+		$(use_with doc sphinx) \
+		$(use_with lzma) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		$(usex hppa --without-stack-protector '') \
+		--cc=gcc \
+		--cpu=${CHOSTARCH} \
+		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
+		--docdir=share/doc \
+		--libdir=$(get_libdir) \
+		--os=${myos} \
+		--prefix="${EPREFIX}/usr" \
+		--with-endian="$(tc-endian)" \
+		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		--without-doxygen \
+		|| die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+	use python && python_foreach_impl python_optimize
+}
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index faee7e4790f6..0c2112d7afdf 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -3,5 +3,5 @@ DIST dbus-glib-0.108.tar.gz 812488 BLAKE2B e958c4054c09ec98d7bff659917a9c162dc43
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
 EBUILD dbus-glib-0.102.ebuild 2004 BLAKE2B 96ae72736aa5720e4a977014e4ddf8ea50296d1a769201864f19f36b1a910c8489a894b983a6106970a2407efea6d1c56510f78f2b5a27d6dff62972ac4e9de7 SHA512 abfa6ade67b9dfbbba290cf4bf5af1224763ec6ffb7b5bd5e1a420cef6117325dfa292f5916f905656348487346b041fff0fe98ea120229c5aecaf4ba1e92f54
 EBUILD dbus-glib-0.108.ebuild 1957 BLAKE2B 97f1a627cb0d1f45cb9668483e2ab90cd56c633759f0286a3ab87016fbcfc8126f890f5095275ab1ceae109783b2be1cf8d587e970f10798e48cf15edc4fc707 SHA512 3b419676f6a1b24181b61dcc20becb6f25df57ce61322f9f186e89f67a084efa8f86b69a282ae48f4ef451011238d7744e49df8f23f332d1a33297b934319325
-EBUILD dbus-glib-0.110.ebuild 1897 BLAKE2B 3572063aeb3e4481c231bbe838ff5ebfd9c52458896ec8dcb3a335ca8ab45f86d9f3b7cb08a5e5d445b07dca670c01f963e0a1cb2c8290d8cc02acaf4754c0a8 SHA512 6238cfd544298435a9c903906e2ed32362aa40b8663d426e20020c74aae6d5885aceeb8db514bb9cb803436aebcbe34034cea5d9ea4f7fb9669007ededb6e2dd
+EBUILD dbus-glib-0.110.ebuild 1894 BLAKE2B bb1612ef3b213d954453594e7f6a7c276f6ba2984e2497cc285405f43e6f23db5f5e30c66cde71584d7b0ec44ec09d99f5f7e1cf74771d83d30665204a07ad31 SHA512 5cc1121a6983b01c9bc245f08dbbb33e40d0d25e4d8a7b371c47b4bd5caa34ef303ce7a5db4edad693e74cff0dfddfe21b01e5b434c23c816d9b4cc2650928a9
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index cd25f239647f..2b44b1c57053 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 
 CDEPEND="
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 7f178bf71204..103201fade94 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,7 +1,5 @@
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
-DIST efl-1.21.0.tar.xz 71030532 BLAKE2B 3480e261aef05b169a850d27f3d9fa6da0ad9bc9ac04548137829e662546cd7d85c87596576e561bba33f9f1be657d81f261595e34c711ff9e35d551ae5f09a8 SHA512 497735f518976d70b96023b013a6d821f6695fe56def2abf5bd1e1c7ad89d324428017d7909c7b73bfb332b811b5596592b105bb4c3d2f6a40929f1cefc2b789
 DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
-EBUILD efl-1.20.7-r1.ebuild 7783 BLAKE2B a10092c4415cfc8ed7660ec94053b945d207b4b13644c5c2dac89fd22ccaddc1fbbedc2ea3af1e6cd76ea633319bfb33e2d9a6be547f52d9aba843755b9ff4af SHA512 5ea232554e4567b165cd2e6782d4cf914acd659d9728e7041536217e5658a7aff1b2c98566a7766a173dedf3ce12d80afb929b105fcfa50e3579b3d7de950479
-EBUILD efl-1.21.0.ebuild 6729 BLAKE2B 3a59d6f24f00ae61aa43297a8f4108e5e16c8271faeca0d8a846a609591b6f52281df9352c10016a219f41273ebe7b03ef92b7aea0942c25fe59cf79451f997c SHA512 a243e2040a5aa957f13cfbb6742bd6f30bd675e321c352506ff8e83d35bd68fb5f1f0639825a23a56d4981327827117176f328ce02ad054beeaa1768ec3f4645
-EBUILD efl-1.21.1.ebuild 6606 BLAKE2B c053f82e19e81dfa8277c596f6e70db69c606e4e4459cca97fe1e67b36a0833fba82e024fbcb8abb3f6caf8e5657ad88683181add206381be9312c28e51c5f88 SHA512 8b83f2f4d78079d4c132476ef78fbf13d4942b984cd10c0af6d74874feebc3931918ffbd5629e87ddf3474263ef2bb601bb31a8b82ad517262d37cd07353a4b2
-MISC metadata.xml 2221 BLAKE2B e6dfe70c4d177dca3ca940c7e4b65493fc91b87b84fe4244783051f6483d65e4d38dba05e143815a5048b7c6414984256a523e4d9a30cccd21bfcd5318920384 SHA512 a7d3654e00527b45d747e68d5cc26007974c2e347554b44e811c4faa18558a3030960acc437fae6d31c18db29ba171eefa37800344b0f3ded431abd79e4edc23
+EBUILD efl-1.20.7-r1.ebuild 7790 BLAKE2B 8949614b2b22abd64583b987f5b2bbfa50f87575951833899c19245f191acc4fa08244307af6a23c9b8a2d4179f8cbf7a8cdc69698bb29897a9ea6ff80f85e17 SHA512 d4e847eac0d3f36aea057a7596d7277966343c80bd90338a4043cf0ad52d3ec7ac2aaa42fdcb4e94a750f81cd5cc712271c1631bf3e778354fb93d40a26eb773
+EBUILD efl-1.21.1.ebuild 6587 BLAKE2B 3d0eac3de903e7e01d5cf0299504bfe1db128080a9fe12995bd61fc85facd8e9a70310aff74d9fa50c6e09de01386dde00a1b8d92c760d2985118db0b492e61c SHA512 7eddc1df3186324e52cc3336c1207f5c4c46dfe7bfb69824e94ca313c510e2b9fb11de376d72ded9b2f9131cd95a77b93bcc33395cb23a4d111c7ef9ce719394
+MISC metadata.xml 2169 BLAKE2B 884096e54342ea876d8c6aaad16ac3f1928fbf2b791dcbf6ca5913fbc62800f63db5a1672a2b053f103e502fe581d6eaed7f978e02682f977688a3f038037b3f SHA512 2aa1f3dd9e121ec9f321329d4a209d671b8195cc1bdf41b70c4dfd3b0ba8a64c8b23231f11b3097023bfae013c49ded5eb1cfcafeeccd81ab81631757b8b2974
diff --git a/dev-libs/efl/efl-1.20.7-r1.ebuild b/dev-libs/efl/efl-1.20.7-r1.ebuild
index 8df2e68fbf5c..69bf06a886f0 100644
--- a/dev-libs/efl/efl-1.20.7-r1.ebuild
+++ b/dev-libs/efl/efl-1.20.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="avahi +bmp dds connman debug doc drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
 
 REQUIRED_USE="
diff --git a/dev-libs/efl/efl-1.21.0.ebuild b/dev-libs/efl/efl-1.21.0.ebuild
deleted file mode 100644
index 64ac0b67a25e..000000000000
--- a/dev-libs/efl/efl-1.21.0.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="avahi +bmp dds connman debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
-
-REQUIRED_USE="
-	?? ( opengl egl )
-	?? ( opengl gles )
-	fbcon? ( !tslib )
-	gles? (
-		|| ( X wayland )
-		!sdl
-		egl
-	)
-	ibus? ( glib )
-	opengl? ( X )
-	pulseaudio? ( sound )
-	sdl? ( opengl )
-	vnc? ( X fbcon )
-	wayland? ( egl gles !opengl )
-	xim? ( X )
-"
-
-COMMON_DEPEND="
-	net-misc/curl
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib:=
-	virtual/jpeg:0=
-	avahi? ( net-dns/avahi )
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	egl? ( media-libs/mesa[egl] )
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib:= )
-	glib? ( dev-libs/glib:2 )
-	gles? ( media-libs/mesa[gles2] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:0= )
-	libuv? ( dev-libs/libuv )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( dev-lang/lua:* )
-	nls? ( sys-devel/gettext )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( media-video/vlc )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		media-libs/freetype
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		gles? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-			xpresent? ( x11-libs/libXpresent )
-		)
-	)
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!media-libs/elementary
-	!media-plugins/emotion_generic_players
-	!media-plugins/evas_generic_loaders
-"
-
-src_prepare() {
-	default
-
-	# Upstream still doesnt offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-		configure || die "Sedding configure file with unwind fix failed."
-	fi
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-		--enable-image-loader-png
-		--enable-libeeze
-		--enable-libmount
-		--enable-xinput22
-
-		--disable-doc
-		--disable-gesture
-		--disable-gstreamer
-		--disable-image-loader-tgv
-		--disable-tizen
-		--disable-wayland-ivi-shell
-
-		$(use_enable avahi)
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable dds image-loader-dds)
-		$(use_enable drm)
-		$(use_enable drm elput)
-		$(use_enable eet image-loader-eet)
-		$(use_enable egl)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable hyphen)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable libuv)
-		$(use_enable !luajit lua-old)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable physics)
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable static-libs static)
-		$(use_enable svg librsvg)
-		$(use_enable system-lz4 liblz4)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_enable vnc vnc-server)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xcf)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-glib=$(usex glib)
-		--with-js=none
-		--with-net-control=$(usex connman connman none)
-		--with-profile=$(usex debug debug release)
-		--with-x11=$(usex X xlib none)
-
-		$(use_with X x)
-	)
-
-	use fbcon && use egl &&	myconf+=( --enable-eglfs )
-	use drm && use wayland && myconf+=( --enable-gl-drm )
-	use X && use xpresent && myconf+=( --enable-xpresent )
-
-	if use opengl ; then
-		myconf+=( --with-opengl=full )
-	elif use egl ; then
-		myconf+=( --with-opengl=es )
-	elif use drm && use wayland ; then
-		myconf+=( --with-opengl=es )
-	else
-		myconf+=( --with-opengl=none )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if host-is-pax && use luajit ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-
-	V=1 emake || die "Compiling EFL failed."
-}
-
-src_install() {
-	einstalldocs
-
-	V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed."
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.21.1.ebuild b/dev-libs/efl/efl-1.21.1.ebuild
index d020ef97f293..c627b1a33b84 100644
--- a/dev-libs/efl/efl-1.21.1.ebuild
+++ b/dev-libs/efl/efl-1.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,7 @@ REQUIRED_USE="
 	vnc? ( X fbcon )
 	wayland? ( egl gles !opengl )
 	xim? ( X )
+	xpresent? ( X )
 "
 
 RDEPEND="
@@ -123,11 +124,11 @@ RDEPEND="
 			x11-libs/libX11
 			x11-libs/libXrender
 			virtual/opengl
-			xpresent? ( x11-libs/libXpresent )
 		)
 	)
 	xine? ( media-libs/xine-lib )
 	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
 "
 
 DEPEND="
@@ -215,6 +216,7 @@ src_configure() {
 		$(use_enable xim)
 		$(use_enable xine)
 		$(use_enable xpm image-loader-xpm)
+		$(use_enable xpresent)
 
 		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
 		--with-glib=$(usex glib)
@@ -227,7 +229,6 @@ src_configure() {
 	)
 
 	use drm && use wayland && myconf+=( --enable-gl-drm )
-	use X && use xpresent && myconf+=( --enable-xpresent )
 
 	if use opengl ; then
 		myconf+=( --with-opengl=full )
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index a50ab944fbb1..9a89497c2f4d 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -35,7 +35,6 @@
 		<flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
 		<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
 		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> support</flag>
-		<flag name="webp">Enable WebP image loader</flag>
 		<flag name="xcf">Enable XCF image loader</flag>
 		<flag name="xim">Enable X Input Method</flag>
 		<flag name="xpresent">Enable <pkg>x11-libs/libXpresent</pkg> support</flag>
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 8bc8fc962a64..2d0180d9d130 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,7 +1,5 @@
-DIST ell-0.5.tar.xz 393112 BLAKE2B c9b718a6b471ef428f563989843281b7b00c1ed382d68e241d9b1f624ef085c554ed46eefac544a8711fe2ec15428eb5b069f60d827e5a363e8c0a539e2fbf7f SHA512 aa84ce99980ada2bd80ac5a479d31c84784bc7b09afd0586ab1672a1227dbe14fdbc3788ccc812b22073e1e55b8902f81f86d9f1350c5c280886a8528d6979ce
-DIST ell-0.6.tar.xz 393016 BLAKE2B ad3a5402eca26a77caabb1d01054500333824c56403c1585c7aaf9ac19fd3f17e4d1dfc226f58ae1303d678e88d5b07c6b6e9c68a643f99b645ca4c4a10f7b19 SHA512 df39c460e781d5fa9838df362721687747148280cb7762dddce6aa35c38db1713b01efff5156d9dc144d6e11d50be7058db1362f4143f7a606bc6fbeeedaf8bf
+DIST ell-0.11.tar.xz 398012 BLAKE2B 61ca89e3cd59add835bac44f6de8078e76061dd3af1e135113d92f3b6431da426b4fb4b52e5e5bfd5577288fcea647e5a62c3f2086a19c225a051cd45058ac3f SHA512 9d70c441e2acaa91d61d82d84cd14b97e883b6d8a3fa457eec61d4fc29943dd72ff52a528d29ab4206fcf9994b0ad03008ddc0ec1934ce99d1262237b924742a
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
-EBUILD ell-0.5.ebuild 711 BLAKE2B b2d4c540efc7456c20c10e42e79006ae43de0bd502ff4948a50d098c1eee1016f32b72d705d555a6b5dc6320467de1d962b3c382d785daec9025f1c288e8f8b2 SHA512 26fd2588d3630c874fb0a6ccc1bdd66d175022586b29b75362920ddf3e28928378d1e3c2156ffa6c70fbc57e0fc743ac8496ff8d0ef946fe51a417122f3c0fc0
-EBUILD ell-0.6-r1.ebuild 766 BLAKE2B aee6adbcf7019cbdf2a7d0221bec2b67e91e2ea86297888981b2f8851f9aae014506c3a3c7bfb8e9f0f728eb78a31648504f71e41e3daffe4e24167823fe26d2 SHA512 bdf1cdbf0ca2cb46cc2327bd0531afe03ba05fabfd3d6b3f85fe6e64c327e1f197239556ad99fea8099bdf1076f2f14a4e9125fbbac8cb912d8edcfc11a10896
-EBUILD ell-0.9.ebuild 764 BLAKE2B 89fbb06f993412a6b7fbed3807a1749be7d93dbce31728163381b2a9afbfe81009c9a075606d393c9bd3ca017fcd5bb5b3611297c44e2afa21d056302b94ef1f SHA512 2c6d9ac8e253326b15483d7351956a9186c566ee94d6d7fc0cf9cd7b7c7c2848df343f8d66ec82df96a0c225ad03b164023e926693a38e7134d9009317f1e6b6
+EBUILD ell-0.11.ebuild 768 BLAKE2B 7794aa0a34c2ba483f838a6b1556dd9a186d35f1f320822f9549c7ac34b7f93191b033bc2639298bfe46a5c4e85ac1173530e2518a0b16d4390d239c38734602 SHA512 69b84b4af59d25d1849f06842036e84d646097d2ec227bccd33825e72f2c5583eeaaac6e0b59fe104536532748ced0b554d0b57d19330ba54d25f47c84578f69
+EBUILD ell-0.9.ebuild 768 BLAKE2B 1d8bb3eb2ac59821d47058c5d6e3244db2b66240710b2c2bbd2b27715b9f48740f91ca58cab9749890b82231a461ed60875cb4ca8b8e6015fd917262e819b334 SHA512 c2313d3629b3ea728432e28b6a2a94d57237b062d659cc6ee2b7e6097da03ccff3afb2a34e556c9b259daf18ea8fed6a23862bdd576adc8b0eda9a985367313f
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.6-r1.ebuild b/dev-libs/ell/ell-0.11.ebuild
index 78c8eb7ee33f..afb7985f2b41 100644
--- a/dev-libs/ell/ell-0.6-r1.ebuild
+++ b/dev-libs/ell/ell-0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="glib pie"
 
 RDEPEND="
diff --git a/dev-libs/ell/ell-0.5.ebuild b/dev-libs/ell/ell-0.5.ebuild
deleted file mode 100644
index 2ca4c371acd8..000000000000
--- a/dev-libs/ell/ell-0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="glib pie"
-
-RDEPEND="
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable glib)
-		$(use_enable pie)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.9.ebuild b/dev-libs/ell/ell-0.9.ebuild
index 16d539a5687e..af1ce781e17e 100644
--- a/dev-libs/ell/ell-0.9.ebuild
+++ b/dev-libs/ell/ell-0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 IUSE="glib pie"
 
 RDEPEND="
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index c331a0bc541e..794b5027162c 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,7 +1,3 @@
 DIST flatbuffers-1.10.0.tar.gz 817750 BLAKE2B 1896b01afbdb8527836fa684980169890b1d5f1213d64cc88310f819c5fe7bc2a7e0a87e1abc2565ca165a0406dee9c814af382d2c8f08718ae5d9173530f98a SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2
-DIST flatbuffers-1.8.0.tar.gz 616362 BLAKE2B 545b568fbc1671005c351ba255f9dc2b5f97b618eae13bc74b717d1e08875e465a0afd3965b35ec8243c1dc80223fdab7f15abbfb4196a129700e4a1532a8965 SHA512 8f6c84caa6456418fc751ea9de456dd37378b3239d1a41d2205140e7b19a5b8b2e342a22dc8d7fdd0c36878455e9d7401cc6438d3b771f7875e8fcfe7bbd52f1
-DIST flatbuffers-1.9.0.tar.gz 681752 BLAKE2B 7886895f79ad5b8b62c4acb479d60a6fe16226a1a9daadf2c457189b7a3381676ba9dd3f8e2af5ebd5f2d78c6ac37d9d83de88ee08b566fd4e4507ecdb887938 SHA512 0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696
 EBUILD flatbuffers-1.10.0.ebuild 707 BLAKE2B f929f2b2ab5eb4fb4c5d428771ca3594882bfcc6f36cd8e3f852756e0bfa1a8ee9e4dde03b587f14466da9f0bec02fc0a1190078468d695dba8f919d83fb4bff SHA512 89ac8125c39a3e3636c5c31ef01a82b53a6c28f65241f441508485941e0d6d4a8827e40a53797aeed9292cd2303b69fe2e2f750f1f733aae57760e991d068321
-EBUILD flatbuffers-1.8.0-r1.ebuild 710 BLAKE2B 8d56bcf7a01f88839f94ae26e976e1e159700f21827addd0e8938e6a618da3c057c1f3d0714b38457d678bec40bc7ff1a7f6aa037c1378e81661499ec2808752 SHA512 b7ac615fb1a0db489fa47abe2649ab82f29ca4df6e649aabf9874aeeb859549b5f54c2437113dd972ed8b9e146d1d8c4fbd31de806265a2d3779ed49930e080b
-EBUILD flatbuffers-1.9.0.ebuild 710 BLAKE2B 8d56bcf7a01f88839f94ae26e976e1e159700f21827addd0e8938e6a618da3c057c1f3d0714b38457d678bec40bc7ff1a7f6aa037c1378e81661499ec2808752 SHA512 b7ac615fb1a0db489fa47abe2649ab82f29ca4df6e649aabf9874aeeb859549b5f54c2437113dd972ed8b9e146d1d8c4fbd31de806265a2d3779ed49930e080b
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.8.0-r1.ebuild b/dev-libs/flatbuffers/flatbuffers-1.8.0-r1.ebuild
deleted file mode 100644
index 4a387f3894c1..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="https://google.github.io/flatbuffers/"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-
-src_configure() {
-	append-cppflags -std=c++11
-
-	local mycmakeargs=(
-		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
-		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
-		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dobin "${CMAKE_BUILD_DIR}"/flatc
-}
diff --git a/dev-libs/flatbuffers/flatbuffers-1.9.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.9.0.ebuild
deleted file mode 100644
index 4a387f3894c1..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-1.9.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="https://google.github.io/flatbuffers/"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-
-src_configure() {
-	append-cppflags -std=c++11
-
-	local mycmakeargs=(
-		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
-		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
-		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dobin "${CMAKE_BUILD_DIR}"/flatc
-}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 08c239d018f2..8e5c264b2766 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,6 @@
-DIST girara-0.2.7.tar.gz 76723 BLAKE2B 7438709e15b9272260cfa9f5419b40672a2c33b2cdeed1d915b51b4d53b301a4347cb0c051155a9a20b09b61efb0ee13df7eb0fdc3a94d1a428a7cb1e296f0d2 SHA512 4229565b8a5fad1ecbf42e4f3f852644964a7d5c90154dab9b7dcb5ccd5f25731911452472bbeb28927d1e30d4df6ed066926e11c6a73f0fd5740570493a036f
 DIST girara-0.2.8.tar.gz 73646 BLAKE2B 08a3fea194922cfb84793d14905f15aac6e73daf3c4304842b88e7f517046daa287deaef770176bc06358b37c52418f1e42204df302c2c7d4f82c2f4a10a44a9 SHA512 d853f8337a63ae2ed319547a2daa2ccd3ce6f31b3dbb52522705c78dbbb94da1dc1efc4ac62d3c2af94531d4dea309323b878619ea0c9778c37960791ca0cb4e
-EBUILD girara-0.2.7.ebuild 1414 BLAKE2B 5da4f4a73ebcae523165ef9c7c8a91491b1d59fc1444f9c4dc52e551240d140f47ed0239e787aa3d2e57b6aabbc11f077baec982a469d6028e1a92e6a6298a55 SHA512 16beb54f7c54753de6743a767bab7c52f7961b651ff5a4df8336765086acb72e4645bc457410704364ecfe2e277edd1e0d546295d5be75e7afc8a54f4a5dfbf0
-EBUILD girara-0.2.8.ebuild 1414 BLAKE2B 5da4f4a73ebcae523165ef9c7c8a91491b1d59fc1444f9c4dc52e551240d140f47ed0239e787aa3d2e57b6aabbc11f077baec982a469d6028e1a92e6a6298a55 SHA512 16beb54f7c54753de6743a767bab7c52f7961b651ff5a4df8336765086acb72e4645bc457410704364ecfe2e277edd1e0d546295d5be75e7afc8a54f4a5dfbf0
-EBUILD girara-9999.ebuild 1374 BLAKE2B c62dc4c85ad520f17c5db15a541fc07336e5af6e25e536db8d269a95432846803816c90f25012d0db8daf6a41cb7dce4e949193deb6f5cfda48e312c77f1fe05 SHA512 033dc64f18e2a077463dc556475502cf322133f3942996b7398189c19c30ddf7efc55b76dc96d8ba9ba6e2240d4cf9af6c1bb745db4ffe3d139e32444c7610e4
+DIST girara-0.3.1.tar.xz 58148 BLAKE2B 7945ca0b417bf09a37f4ce7cc6603adc93cd224d7e449c7f4dae00a4abf254b251230fb40e2f985c293bad95c0bd05ff646418bb5f8e0a1c6d5d2df832900256 SHA512 5c4b2972bfb0296cd1b984c9426b67b50e29e2928fb0e9a3aa3f9bc21aebc28dcc93570e888060e0bb02561022b379cdfcfa3317b52e78cac04e7fc1ba476107
+EBUILD girara-0.2.8.ebuild 1411 BLAKE2B 572289bb28e3150c8b4b67b2d7da7b47a413a408e968cdf04b3821e32f15f6e51266cb24a030f626d86355ee66cfae5ce696351c07056a6d1cfdb5a977ffadb8 SHA512 e55455523f3f92870d93ef1dd54796b61d14c4b8bf875da6b67c88611f20a55d623e6263852e9f88001c6725d7488f000eca2ae8332be60dd0a737807dee7125
+EBUILD girara-0.3.1.ebuild 1088 BLAKE2B d8a7b3d6df62bd55c8986aa7ad8211a9b724bce56564fea857119707ffbac4f0ddf4c22bf2f789d140ff743807db14a69d7b6e597513f3cb2ceebbddd1a9c685 SHA512 73978f226c851a22414e3d5a5be70a0315acf4acaa995e30ea03a393beef3cf8533937225e6262297ab39f7095129421c97904c8439b15b4510fe04f85388a3a
+EBUILD girara-9999.ebuild 1371 BLAKE2B d65ba5390bdced2ff54c92882f6735aa216716f7aa1933b193ed3c9929f19b494bce5298a6f963ad84ad129c44465e31368d22dfc84f39adc10ab39b4ac1b04f SHA512 078b7fdb2cd1dde3a8132bbb1085359e70ae89fc4dd59eb7d5e96decfa4869535007cdc39d5406b9d2b9bf5fcdcf7a159cdc033f09d3e6ae7ce7a54877d044c9
 MISC metadata.xml 700 BLAKE2B a40c7ce11c9e6ccee885e8da21856f4b74b9845b358f560e7cbd597a87cdc70942fbdc2a4a30c0ad156a964c4c07754ccd03be8be9a98021813dabc12c5483e1 SHA512 96d4e1a4d9d59be1e2613ae45def5357af5a20d2f9511f1f56418bf2eb3e41198a062ff3af741cfca9b644201703a2e7979cb533c4e00fc9b85336844b10e5c2
diff --git a/dev-libs/girara/girara-0.2.7.ebuild b/dev-libs/girara/girara-0.2.7.ebuild
deleted file mode 100644
index f8ff7c982364..000000000000
--- a/dev-libs/girara/girara-0.2.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs virtualx
-[[ ${PV} == 9999* ]] && inherit git-2
-
-DESCRIPTION="UI library that focuses on simplicity and minimalism"
-HOMEPAGE="https://pwmt.org/projects/girara/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="https://pwmt.org/projects/${PN}/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
-
-LICENSE="ZLIB"
-SLOT="3"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="libnotify static-libs test"
-
-RDEPEND=">=dev-libs/glib-2.28
-	>=x11-libs/gtk+-3.4:3
-	dev-libs/json-c
-	!<${CATEGORY}/${PN}-0.1.6
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( x11-apps/xhost
-		dev-libs/check )"
-
-pkg_setup() {
-	mygiraraconf=(
-		WITH_LIBNOTIFY=$(usex libnotify 1 0)
-		PREFIX="${EPREFIX}"/usr
-		LIBDIR='${PREFIX}'/$(get_libdir)
-		CC="$(tc-getCC)"
-		SFLAGS=''
-		VERBOSE=1
-		DESTDIR="${D}"
-		)
-}
-
-src_prepare() {
-	# Remove 'static' and 'install-static' targets
-	if ! use static-libs; then
-		sed -i \
-			-e '/^${PROJECT}:/s:static::' \
-			-e '/^install:/s:install-static::' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	emake "${mygiraraconf[@]}"
-}
-
-src_test() {
-	virtx default
-}
-
-src_install() {
-	emake "${mygiraraconf[@]}" install
-	dodoc AUTHORS
-}
diff --git a/dev-libs/girara/girara-0.2.8.ebuild b/dev-libs/girara/girara-0.2.8.ebuild
index f8ff7c982364..1098c77dd33e 100644
--- a/dev-libs/girara/girara-0.2.8.ebuild
+++ b/dev-libs/girara/girara-0.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
-SLOT="3"
+SLOT="0"
 if ! [[ ${PV} == 9999* ]]; then
 KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 fi
diff --git a/dev-libs/girara/girara-0.3.1.ebuild b/dev-libs/girara/girara-0.3.1.ebuild
new file mode 100644
index 000000000000..6a933684b7c9
--- /dev/null
+++ b/dev-libs/girara/girara-0.3.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/"
+
+if [[ ${PV} == *999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc libnotify test"
+
+RDEPEND="dev-libs/glib:2
+	 dev-libs/json-c
+	 >=x11-libs/gtk+-3.20:3
+	 >=x11-libs/pango-1.14
+	 libnotify? ( x11-libs/libnotify )"
+
+DEPEND="${RDEPEND}
+	 doc? ( app-doc/doxygen )
+	 test? ( dev-libs/check )"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i -e '/'-Werror.*'/d' meson.build || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		--libdir=/usr/$(get_libdir)
+		-Denable-json=true
+		-Denable-docs=$(usex doc true false)
+		-Denable-notify=$(usex libnotify true false)
+		)
+		meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild
index 28df72617d4f..d4db899b1913 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
-SLOT="3"
+SLOT="0"
 if ! [[ ${PV} == 9999* ]]; then
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 else
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index 44d8197ec547..c7baa68b2acc 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,3 +1,3 @@
 DIST granite-0.5.0.tar.gz 365015 BLAKE2B 47b88d0b08a300fecc561161e1722cc1a544f58580d21244b6584f6aba7756afe6548dd663620fe9a09406fc0be2766b1d1093a21d262a5ab001992f309239ed SHA512 6042f40c1338768281ab3e6ad0bfdd8c5c69fc4951a069b0779a22b8999b35110ea8f09cf025dd88bafef7eca6cc0d076a608d55f01c078186e150908f8e4650
 EBUILD granite-0.5.0.ebuild 1233 BLAKE2B df2d0807d42020aa0179cf75b6ed3e6ce8f4c86fd17ee98ffc75220ddf08cc6cde6e472e7088ea493b843aaeabbfba863516873bd23a398e5a8e3531c880d6c7 SHA512 7cb63a7489f868bec6c6617d173f9faebc7012ca28a5f7ce5624f15eb9c3d6e9e8fea68913ec88d016162abea69f491ecb854414a4a8b9c87b49d12c3b89bdf8
-MISC metadata.xml 829 BLAKE2B 39f7f389875b4e27aa0657a3f2dde9d99e6cc18de9e2cbd24e9a7e7b441823255a04972cd470e04bccfd4db803ff05c0c5be74d592564129d1dff137294fc934 SHA512 152c9807840842a1388a9e10723af0eb7aeb198444f85eb27cd19a3a0233374e3c60c9c2c34319b1549a5cb59d71cdeba075f0f36fb784c69fd78059367e1a91
+MISC metadata.xml 617 BLAKE2B 6f609311b7e71993b807c57d0f7aec4f7df646d3d70a36bf7509237e0d455a55bfac903dd7a2a00cc0bd0fa33f846152c9d0297ac77faf76dfcc3923e3d6fdd4 SHA512 83d352d15ff87be181c05184d4615aaf73fb56877fcfd63f257149c45a72c939751bf84812775207487305296d0d70f06f8be7c1b6c7fcfb7cdc0edbdec816c7
diff --git a/dev-libs/granite/metadata.xml b/dev-libs/granite/metadata.xml
index 1071e73abde0..6ae6a460b068 100644
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>herb@hlmjr.com</email>
-		<name>Herb Miller Jr. (herbmillerjr)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 		Granite is a companion library for GTK+ and GLib. Among other things,
 		it provides complex widgets and convenience functions designed for
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 496ddfeb1e3c..0cc87c756b8b 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,10 +1,10 @@
 AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1ad3a5ae2ddfdb08eeaa9bec4d037493583bf181417df49087fcca6f6aa3d977a8e72b98df68e3389c4e47343c062d036 SHA512 54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
-DIST icu4c-61_1-src.tgz 23400587 BLAKE2B 6c6c78b4169ad3e900ff8a8a8fc7286f3dfb692dc04cc88103804799d1ce1fc7d1a3a7b1fc1b379e92196dd5976cfea3fe014a09dc65d387f34f141eae5b9465 SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
 DIST icu4c-62_1-src.tgz 23468750 BLAKE2B c0b665af53a494fc064425e6b3e66ae11d31509f4edc42268b12b85ece5ea635ebc76a8f3ab65a49b74a849a67ffd526e15e6d1b5b07e13c7f94cc94bef1d31c SHA512 8295f2754fb6907e2cc8f515dccca05530963b544e89a2b8e323cd0ddfdbbe0c9eba8b367c1dbc04d7bb906b66b1003fd545ca05298939747c832c9d4431cf2a
+DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
 EBUILD icu-layoutex-60.2.ebuild 2525 BLAKE2B 71f0e92ffabdfbafb429837c1c9241252fdc898da64ad2128fb4427ce7cfc492a9369c0d38e6545bfa3f39d5434a7a8dd9dd809b242bdab4a5b57c5bb2c2f477 SHA512 bf1d94af09720cdd5cb6461004182bc2debad0e12dcf46bcae21ac485a36011dee14ce54433940ee035f9306a1a986acdb697ecb8023aa6f0be25b15b285cee2
-EBUILD icu-layoutex-61.1.ebuild 2532 BLAKE2B 1816a69d005b941c307cc07b2b39a3e7ea6de68b34a5f974f83ec094fbc9ac5309a8343abeae46d345b6b30475392e87ef819b05c275f4861070317b5f9fa581 SHA512 93e0e30b393881b7e649fff1962f6764751303972f1f081f33f40f6b99615765d4cce70cfa08c15be42653c5fdd60a89e3d8886758fbb3b65ea59640074fd171
 EBUILD icu-layoutex-62.1.ebuild 2524 BLAKE2B 3ca648c43e0cd815b338d1096b44892c252ec6d82054f6ea6051b19fb05462b56b30777ae91786ed3f8f0990a35d99810944eb795995093766ed96fd237312a8 SHA512 cbc383eee712119e35b85c69601e839b75023816695f38c2db73a808d392c35f3a2b7f76c9a0bea71f750eb2891a1d38ad9549dc75555f1d021f76af4b9da1c8
+EBUILD icu-layoutex-63.1.ebuild 2533 BLAKE2B ba7672ae5186965cb2238295df9865d42d42ecf41477e203bd9275eda4f26e919264e04842541d213bb13f9939885065d2c43a347a5ba4fe803c91285d693b5b SHA512 c6693f8a07484686bb01584c9127515e6d59230ca69bc7c07e8719349f393b5fa27ac94ec982ec17e8fb9f0f85df162427b170402d9a8fe6e1fbfc352cbdc98f
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-61.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild
index 7d87f4217b72..c2aa44f7de44 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-61.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
+inherit flag-o-matic toolchain-funcs autotools multilib-minimal
 
 DESCRIPTION="External layout part of International Components for Unicode"
 HOMEPAGE="http://www.icu-project.org/"
@@ -21,8 +21,10 @@ RDEPEND="
 	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
 "
 
-DEPEND="
+BDEPEND="
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+DEPEND="
 	${RDEPEND}
 "
 
@@ -88,8 +90,7 @@ multilib_src_configure() {
 	# icu tries to use clang by default
 	tc-export CC CXX
 
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_test() {
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 25ffcbb7e3bb..65240f362b6e 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -5,10 +5,10 @@ AUX icu-58.2-darwin.patch 2076 BLAKE2B d85d07ae3ade827a81bf2ce4eb2813a6535d7cd70
 AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce6f3f641e01d76f01fe1f35f74cc2465e89b3353ab86569c7478090df459a659d69143810ba121e15c27923dd SHA512 20d8e76c43ef5549ca7f104b052661269c99d4af45b2a65bd9d72e28b01d0c3b70c066b51799e09d7117a4a39e44fd463fae2522a238a41972c0679c290c5da3
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
-DIST icu4c-61_1-src.tgz 23400587 BLAKE2B 6c6c78b4169ad3e900ff8a8a8fc7286f3dfb692dc04cc88103804799d1ce1fc7d1a3a7b1fc1b379e92196dd5976cfea3fe014a09dc65d387f34f141eae5b9465 SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
 DIST icu4c-62_1-src.tgz 23468750 BLAKE2B c0b665af53a494fc064425e6b3e66ae11d31509f4edc42268b12b85ece5ea635ebc76a8f3ab65a49b74a849a67ffd526e15e6d1b5b07e13c7f94cc94bef1d31c SHA512 8295f2754fb6907e2cc8f515dccca05530963b544e89a2b8e323cd0ddfdbbe0c9eba8b367c1dbc04d7bb906b66b1003fd545ca05298939747c832c9d4431cf2a
+DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-60.2.ebuild 3710 BLAKE2B 11a56611d570980031040391168bd5c18ca2000c30e9e56edf2662b9ead959c684cada13656726e5e868803ab9c4f81309b51f3b65693175298cb163417f32b0 SHA512 65919063056eb718f860664d42f466278da3bf5d78e54e4ad24b22768b244c76c81053ead55871fefd2d185dfcdfb065e93c38ccc4515000996d7ef307d4a1cb
-EBUILD icu-61.1.ebuild 3721 BLAKE2B 72fd1527eb1bd7425397de5eccf60ed03c22a58dc113f6fe4c9a1853f0553c3cde723583d24c875e2f928393ff8b494a889a98800bfb9948a314fa804c15f6eb SHA512 d766de018dfe7a908dd23914ac0994dbd98c9d515ba0cee76a4b7d6c1a9f44809cefe414c9a8ca556aef08e3e7f3a4d249b6af12449651cd2ea303818f12effd
 EBUILD icu-62.1.ebuild 3688 BLAKE2B ff8e850ead70730bfe852bbf2795d72d41325afd7b723e6abf815cad316a4b777ba0f94a71952eaa06dec331aa122d1dc4958728ba9ade5239e39d62cf18a4c2 SHA512 7ce709631d488554ca575361126362973f74589380367acc5b0cfedef93ea5d9ce339326e1fc9969640c3eff4537d4b6f669342400cc9cae7fc3a6a721e32c50
+EBUILD icu-63.1.ebuild 3697 BLAKE2B ce9836ddb2c78d65f8d3620a4dbb72cbaa77f9dde72d345eda94ed74973b6fed8d8e726362228b02721ddb627b9fda85855e57e1a3d01cf125ba70a83a835975 SHA512 2d0bae7f3bb25e8a0adbc3c7320f99e632c70b53133819f56d31d3a2f0b43f4172e59175952ab1aea880727b5495f0c553b2802b469bcf547e454bb7cc934c19
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-61.1.ebuild b/dev-libs/icu/icu-63.1.ebuild
index bebf5f978415..1f5b0bbb21f4 100644
--- a/dev-libs/icu/icu-61.1.ebuild
+++ b/dev-libs/icu/icu-63.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
+inherit flag-o-matic toolchain-funcs autotools multilib-minimal
 
 DESCRIPTION="International Components for Unicode"
 HOMEPAGE="http://www.icu-project.org/"
@@ -17,11 +17,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="debug doc examples static-libs"
 
 DEPEND="
-	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen[dot]
 	)
 "
+BDEPEND="
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/${PN}/source"
 
@@ -102,11 +104,9 @@ multilib_src_configure() {
 		--disable-layoutex
 		$(use_enable debug)
 		$(use_enable static-libs static)
+		$(multilib_native_use_enable examples samples)
 	)
 
-	multilib_is_native_abi && myeconfargs+=(
-		$(use_enable examples samples)
-	)
 	tc-is-cross-compiler && myeconfargs+=(
 		--with-cross-build="${WORKDIR}"/host
 	)
@@ -116,12 +116,11 @@ multilib_src_configure() {
 
 	# make sure we configure with the same shell as we run icu-config
 	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL=${EPREFIX}/bin/sh
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
 	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH}
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
 
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 5b1f5daaf300..173b2eeca51c 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,5 +1,5 @@
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
-EBUILD ivykis-0.42.2.ebuild 395 BLAKE2B 5d9784acb3515e42e4052aba72a9331d57e81e8972867b6e572d211039e668bf78a238a28c149217ec40e17eaacd8fe0a4a8e976abdff772c7bf87a7d2dd472c SHA512 739ef5dfb0d8e5751fde43b642514f18e267f7da6cc27f91a966d5cc4046374e777bba2171fe262959a278291eb42610d1f308e9a9712aa22275aac4fc73dbb2
-EBUILD ivykis-0.42.3-r1.ebuild 554 BLAKE2B 3bbf9240398dab08f302c801927b7ce5ef810bba527679b788812e3c1d16a8877497d5e46a250a720b15189c6dea415c5ba9ef1d13e323ad4c9a4469db129468 SHA512 b4f26efc40a2a5b50d47967e18bd3acb54678695871d0e4ae4b09062348a07d3cc3b547575918f325bdef7b29c7ac457a0990c55fa6a58ddf91c7b0b260f69e2
+EBUILD ivykis-0.42.2.ebuild 402 BLAKE2B 9fe4f5097ce2060c52b99c925cd12a9e79742396c7bb3ae84a7a89a1d7d082fc88152a4e06032ad988366f4323a2c10a329f6ff690a2278d0f6bfa4c3f5a6c09 SHA512 ca5974208c11a02c33f7a66c2336e64e054be78b9ed1bad43b55de065ab9a4b939f893c3286544dd87965dcc9a0b1e02a1435b36d02f8b657c41fc0a7c4e7da0
+EBUILD ivykis-0.42.3-r1.ebuild 561 BLAKE2B b8cddcaf7952922684c8c3af2115db7907e1114a38382297d25f310f6a90ae6bbc0d126a8210d086d77f1cb56017b4121138b9914df7565f4388bd6c81a0922f SHA512 724b82b8f2879f61e10af185ce672677c07650d644b0a475435e5a48bb2655d4a84bd2551512789bcf37ba99bea502815f32297628ddaaaf048ccea00bb4bf1e
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.2.ebuild b/dev-libs/ivykis/ivykis-0.42.2.ebuild
index dd7b5f2f1ce0..b8f906e5f996 100644
--- a/dev-libs/ivykis/ivykis-0.42.2.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86"
diff --git a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
index a5ee1b0d17d3..7f38c8e61c22 100644
--- a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index c321526bd6bd..d330dd1f038b 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,5 +1,3 @@
-DIST kdiagram-2.6.0.tar.xz 683792 BLAKE2B bc6074e4732a2eda4d8b2a321cfc8a2bad0f614c8d6dd48347f3e2f9ec013b2915a9793807b8640ee00cb1e20229741aae1e77abfd9f826016899a4178581f44 SHA512 243839e23171f5deafb167e5a05f1a2841f0294c9f7944cd2580c9e72830a7082a84e4dddd70da620751bcad4086325747e2308872dc272404540b13d91e4ca3
 DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
-EBUILD kdiagram-2.6.0.ebuild 636 BLAKE2B ee07b1a8f9181b13fc76fc6bed6731bdc17fc603ce4b9cec75483fcd2524565fc9590bed66e9a468571b7cc6d2ab3bc77432539b93f975b400204eeef8ed1396 SHA512 4a02370e857131d138f60614756811da8cd64e0059ac0c3adc8a7e2cf95854bb94e54e5aeedbd5edb81c858af95bad41690eecbe1ca947a6426aa342dd735265
-EBUILD kdiagram-2.6.1.ebuild 652 BLAKE2B 8fbf71fe669531b9df5011f6c7eb87243ba2d41d0c170c59b5515f1682568718e8bea7c0474ceeca262c8e5f216d07b5d81532a253d4b02f371847c3d38718e3 SHA512 803e14d99ec0380425cb4fe11e4f0b0317b983f29fae78bd6703d7bb0e1c2f44adb7a03b1a04e423d752e776fe4df2310c1f443c3da423817cff8cea544147af
+EBUILD kdiagram-2.6.1.ebuild 647 BLAKE2B 7f4015fa77095643a42ddacc4918187758d063a74dd414fa108d229f576332bb4042584a8d087e2b184f4fce985605b7ceea0ce1d6e658a84f8a9dadb65bdb25 SHA512 7dd2117d12ec0fef4268561d7fbc9e27a43bd22c0ce20ab1f798c4db47326be7af6c548f9ebc66d3f88d7ca7c0c17a158ee23fd77bd6b893b511bb562ece8cde
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.6.0.ebuild b/dev-libs/kdiagram/kdiagram-2.6.0.ebuild
deleted file mode 100644
index 49fd8352bcb6..000000000000
--- a/dev-libs/kdiagram/kdiagram-2.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_EXAMPLES="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
-HOMEPAGE="https://www.kde.org/"
-IUSE=""
-
-REQUIRED_USE="test? ( examples )"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep linguist-tools)
-"
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
index 9a92400c6611..2009639a09bb 100644
--- a/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE=""
 REQUIRED_USE="test? ( examples )"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 fi
 
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 7dc1f21bde38..c549c04e0313 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,11 +1,10 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
 DIST leatherman-1.4.2.tar.gz 814263 BLAKE2B 5ca8123f264ed0f7843c6fc1b0966c577fb9d12933e5baa375e0beef8ba17afe4388f1e05e1022e392c50e32e159b765531137cf069bd0f5b8baa3626c860949 SHA512 e0cb19605163b68ac5a8fc74e875d856af5e34345f19c38f0db45da7536ec27ba6cf4b4e8c5883ceb9a5978cdc8831181ec89ad4105252366b198af4f3f22bff
-DIST leatherman-1.4.3.tar.gz 814259 BLAKE2B 049cfab8240e5447bcb14bb4a96fa21ca7e4b7a24d8a38abf3820d6e1c25cf1e0841b04317c3d3a72ceb5f61f9b9a055ea76dcd5f731ffd567d96be60d2b8abd SHA512 a28d7f852904eafb3b703d5890d9514db24ef387fa440108ae8750041d1c5c1b36240b0925b37833ed68739d92a1d22463914e0838e5f09e03035aad47c49d81
-DIST leatherman-1.5.1.tar.gz 814327 BLAKE2B 133c65adb16b9eabd8dab341361d36a3736447596b019f15603e7cb45bef472a4267c5765adcb03bf9492d7f553d326c0f64ca026b4cad22e6f4744f9f12cc6e SHA512 3673a6ed530ae8f30b9a037ad42a3648ad61d50eae5c3a39a4a58f190567ccd21c4132289ecc8534202502bb7435ae79c9568a3dadf0ce75ae9c7d7fb65271f9
+DIST leatherman-1.4.4.tar.gz 814289 BLAKE2B d53ff660e28eaea1c11f95cc70348a2a5883e0dc5ae56482b0afe96e61938e4d15688f8abf9783976443c00b6a69e9037b5080194babb97200e25e2c548b9153 SHA512 a1955a3f7a7fd190f7d85ad07e30dee74b0f4b7ed670a4a9a7613317d2898faf776cbed0c5c7b6da25ddd5099c9638e9abb2aca16aec61c568fc2f8c9789ffe4
+DIST leatherman-1.5.2.tar.gz 814349 BLAKE2B 1bc2d85426683e9f82d31ba9e3b63b4c9185b0bfa5ae832ea252ecbd922b44dfa67b6011145489d5c5809a76011aef8b143f6b705ea0436d914fc0d8ca8091a2 SHA512 9cef854fd7a95c54fcfc2e639e469dfaa4625757ea8aceeb9ac2162bfc89cbcbc1d5e8217af5f1fad4f31d98528475e22157ca6b1046a36e0928074f866ddafd
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
-EBUILD leatherman-1.4.2-r1.ebuild 1155 BLAKE2B 1b6663520e7a3245ccc085cc5a5a3f9cc36a8d7112394224155f63851c7d52e42622c347e303f64f38959bbfcae4a38942fe571490e11a9bd4b4099a0a9c2041 SHA512 2d64e5114ebd7ced81278737367bb5470e6d431e5c517d67e23b7fc20dcaf0b3f58029b8be21f39bcfb4f684a82005ff8c7767d7ebe3feb017f3dd7f774cfb77
 EBUILD leatherman-1.4.2.ebuild 1151 BLAKE2B 8cde9882d7506f59fc13ebd6395efbdf8ebaf413eb17edff53b790f24394a6f68620ac39b9a4eb61c107cd8b898462fd603107764c805de52e24227e205a9dd1 SHA512 49c05ce146a7e89f9b18a856a96d8864f98a2e7dfde2818029c61c15da2b73409c44d5eb7d56015e6d32d9b21bff96176021a22937a3f768174e68a0d55dc04e
-EBUILD leatherman-1.4.3.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
-EBUILD leatherman-1.5.1.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
+EBUILD leatherman-1.4.4.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
+EBUILD leatherman-1.5.2.ebuild 1150 BLAKE2B 57977d3e1690caf8fd64c78e9c765e5bbe8f8d21faf82a53994a70a89d9f9667adfd8850784029b151b158dc8391edc97e6e875543bd43eeba0165ac717c100f SHA512 5c3e73bcbfdbc1f334b38ede1855e673e9d403c00b5352522844c7b25644212f31c1bf9d1e40e103d197b08a008f90c378acc9eabe90815309c5c19b0b57c160
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.4.2-r1.ebuild b/dev-libs/leatherman/leatherman-1.4.2-r1.ebuild
deleted file mode 100644
index f0eb93027909..000000000000
--- a/dev-libs/leatherman/leatherman-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0/1.4.2"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.4.3.ebuild b/dev-libs/leatherman/leatherman-1.4.4.ebuild
index cc7a76208a23..cc7a76208a23 100644
--- a/dev-libs/leatherman/leatherman-1.4.3.ebuild
+++ b/dev-libs/leatherman/leatherman-1.4.4.ebuild
diff --git a/dev-libs/leatherman/leatherman-1.5.1.ebuild b/dev-libs/leatherman/leatherman-1.5.2.ebuild
index cc7a76208a23..29a1dceafddd 100644
--- a/dev-libs/leatherman/leatherman-1.5.1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index edaf960d5e64..4fe704be81f2 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -1,6 +1,6 @@
 AUX libappindicator-12.10.0-conditional-py-bindings.patch 2019 BLAKE2B a57b1b2e3ac115ebc7395967f36b2f648abfba2abc32fb77505a77ddb63d3f7e99c0f5ceeeeabdbe541edc6db1f76fc23e28c0df81c0c4bea600d4a0f72b5f26 SHA512 69d86a3d1e930a0f0c79091dba9691610ecb0fcf13c672fc0ff511bb764b7f74f6c42cab558b6412863a8353fe9a8d72c40419db873fdc4716a93ba3bbbd0aea
 AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326b79a65f9ac7110c9d82a61efb993051d691d5cc728075bdd5ac904e9986cb0e41780d3e36e1637e5bd58532781934587b8c1bdf458e SHA512 b021bc0ec7fc1b311add7d6f8a9018fa6f5e807168055c95440e5f5d3d6d5b48375e11542b906058a0786194b1911c8bdcab9632573c1f128772ff6d54aa9173
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
-EBUILD libappindicator-12.10.0-r201.ebuild 2200 BLAKE2B 003ded270ba2b1eab5f003f028f445344003b0ab0dfd68651f09651ee999f608638e86dbb7a3a15237796c31831ca495fd43c5dcb875f21c477211fed07e1a66 SHA512 857d7e8283ab0701df9ef5f91285ca183de65966581ece8567d7ff290de6069e44f5ad756eac3e87f1c5b622ff45c15ecbddc3d32db804c46162ef2a09779892
-EBUILD libappindicator-12.10.0-r301.ebuild 1883 BLAKE2B 0e1e41b58a9bac1d7a0525f515c649ccc6db3e48dedb6097f1a1abf63eaad76f3b7771287d3f5f83d56748297f3f61dd76146a8058c9267da7e1fdd351bf7b21 SHA512 cc5df908bb9d28e61c39fb81e5bf8bd6b6b631049dff7d4081e3c1de87092b0f69568ae557db3ac1bb520132a940a86c86cec5faa64313e84776601eadc67975
+EBUILD libappindicator-12.10.0-r201.ebuild 2230 BLAKE2B c4d8027aca60142ed183ec9248b4ef6f5d4346727c36f69559bd19e77c77fe1a6c4a0045134ee190c2ca31c974fe1ed5a6e4b7161a9afda2c095031d3c66eec2 SHA512 34710e0c796dfc2091eaa98d2e72f6a27bbb5d45a00ed13981e83f892ca9ee3ca867a47faf65cc3a5318c654ae2fe8f13bc40c837862473d0a9e56f9c1998c4c
+EBUILD libappindicator-12.10.0-r301.ebuild 1920 BLAKE2B f83995d9896948c37b25184c21cbe6f708f040d393a1b1586d7e3e7a3b2de56c7307f9f5af25ed7fe4bcb309734af0577a6c5a4ef7eb9c81f36da01f1e0f6a1a SHA512 93dc214df5f47eecca89e5b4ee51f71ed14d09e734305a80b81ab7e08f57c2c42e7e1728f57811fe9adc91bfccfaa29a1b17a2d256ba465dc81b60fa55407666
 MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild
index 171bc7b67fb7..40fe8964c862 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,6 +44,7 @@ PATCHES=(
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
+	export MAKEOPTS+=" -j1" #638782
 }
 
 src_prepare() {
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
index e346621fec49..7a9ad414002a 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 IUSE="+introspection"
 
 RDEPEND="
@@ -39,6 +39,7 @@ src_prepare() {
 	default
 
 	xdg_environment_reset
+	export MAKEOPTS+=" -j1" #638782
 
 	# Don't use -Werror
 	sed -i -e 's/ -Werror//' {src,tests}/Makefile.{am,in} || die
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 75182dfd4369..c5d32cfd5426 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -2,5 +2,5 @@ AUX libatomic_ops-7.6.4-gcc7.patch 1669 BLAKE2B b37d7940e2a793fcda7f20d509e326fd
 DIST libatomic_ops-7.6.4.tar.gz 497571 BLAKE2B 151cd518a346dcf2540c2e8229c2309aa83a7cecc3d66e3e8bab3d09c8688d725e26b27c836c0a3a3a46cde40fedfe26b0cca53cf2b2017f67e72d4a4993371f SHA512 2e6ef0bfd4b77e9260383feb2865c96388fb1ebed9d37605eeb83ac87e3b6a565495d588808129ac7b3ee5f6a58a37440da7784b680cc6590842b09c2625983b
 DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
 EBUILD libatomic_ops-7.6.4.ebuild 777 BLAKE2B 0f1a533dd9fe6603a0b8b4b02263d67830c3751aa31e4b12fcee2eb9c0f93af9f0cad132d2ae7705ccee3645c333ee893f9763aa6f949dbcc3a3a14c0c4b4c26 SHA512 a5ce9721e64aaeb642587edcb6219f0f4ef64448bd995c96b90bd69e75ef390b462ae58f773fc808068797416693ec81bc0e758fd36b79006ef4d6ae15c9c0be
-EBUILD libatomic_ops-7.6.6.ebuild 734 BLAKE2B e232e71e2fb3de24ea1710660294c5adcae596599112f90e7af8c328b41cbce194b7e0d40df91b08f7a39e539fb706c9eac12e381acb634fb1287e19dd078da0 SHA512 627b84b11582a66fc496d5dc6529eb8c7a93e96426a82deba0abb689db8a6edf8391026820de4852ff176891bda2ab2b7ce1f5a3568e5fda59a8be4e2d701be8
+EBUILD libatomic_ops-7.6.6.ebuild 732 BLAKE2B a99096ddbd682442ef8c2eefe2b9398cb5329cb9027360c86d1ffe550c2781ba8fe658e9ba277013741f429920e517c2309e6411e698c6fe3f8f6db3efb82ca5 SHA512 39af1cfb4290e4282f05e7a8ce44cbdb8b75d3c25794473c304411ec2aac3c57cc62b327b97d7e52bc82bc01ef4a0df1ade947bdc41dcd115d9ed0c2c307af14
 MISC metadata.xml 347 BLAKE2B c8fa80a777d85e172d52bd7eae6523981b9fcc79fa8d6cb7378960adda45dd6489def86930704bb845e64437ff33b39f5401cda0d11ed021342235c7020759e5 SHA512 7a4acee1ccb58c4694e9100d556046c55f508050f6e09dc3d4dd509db9eb747b94eca152e1e98c2ebacd8b8c9c75c362426ad9545cac490f959ec16464f809e5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
index eb11eae64c09..ff63e5777ddb 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 1bff35281722..5d743ce8c45b 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -4,5 +4,5 @@ DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B aa4aa1c19872edf9e7e6ed270275199366345531
 DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
 EBUILD libbsd-0.8.6.ebuild 1227 BLAKE2B 2dcb7ad4b36a7de7c926ba5480814d060c325433ba3013e635c8b13ff940f303566b77f36a6b37920a3055ce3fb3e1c06882ddbbd58c6b9c98d379d78219b1f1 SHA512 a45b2b20b2b4b2a32277bd346f6433e8cef1d42260a6098aeb8c419d45c7a5c5db26e8ede2dbdef8039b03511e7ffb3ef65f450abea77b250e929889cea39939
 EBUILD libbsd-0.8.7.ebuild 1232 BLAKE2B d30cbbad96b19726f36e83d9fb8c69d14f53702c74f0401ce9abee5b7f7cddbd0f90da75d02833535e12fc1d9f4dbf202305466d8ef712fe892c08c707b94fc3 SHA512 1967086f1067249a65c99a6c68fe0e3238b120ad15d6dc5d6a9ebed7105ae3e4cd86b6c51aa4e1bfbd2ce5b3b0597ae20cfd6326c14d6a06f38d6406e1ad30f2
-EBUILD libbsd-0.9.1.ebuild 1175 BLAKE2B 0313bdfaebb0414fd50bcaff4e2486dbf40105b41717ff1264b251c38cc71b740a1f9e4106fe06a7bb3073e35c857b5fb7359576db7e9835d6e498f52baf675a SHA512 f9b23b91b0a8b92ed9b58c874677a4ba30c05cfd89e3782bae1604f07151dbff030e4a3655c16bbb0ab8ad8e41822c07fe7962e219bf7c9568f2e79976dd0333
+EBUILD libbsd-0.9.1.ebuild 1172 BLAKE2B b60e7440da2e884bc67e433b35987a472b304bd4722f6a910056f4bad3410b6a9191b12041e374c15a3af47c0b489332aecd47be3de0bff6e59eba92da34cf86 SHA512 b01b7ca5b04e27ebb7c6c0192317d86387658eb1626d3d2354e3d2c9d1521fc0197c30fb4040f62ed1fdab881628673b49f081182ff2fc0f97f714938f97e6e6
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/dev-libs/libbsd/libbsd-0.9.1.ebuild b/dev-libs/libbsd/libbsd-0.9.1.ebuild
index af8633e3a839..a3299a2bcae9 100644
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ b/dev-libs/libbsd/libbsd-0.9.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=sys-kernel/linux-headers-3.17"
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index f14f1b4b2d5a..8beeb459fe07 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,3 +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 847 BLAKE2B 94d035e5db069e9a32a866e7201a316825eb102b45c75356cc6ed91d922fb31b71121ce942d0fea67180ef58711b71fd817e280ebe63fb7c3244b23bcfe60846 SHA512 db74dac795a3b6f4803dfcbf6db42357b49d58a3d57f31b9a14a91a797823124302287866eb0c7fe5dc1ba9ad601611b5eac4ac4643faa7cf8d3a431a7676c9c
 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
new file mode 100644
index 000000000000..8b37ce1e6841
--- /dev/null
+++ b/dev-libs/libburn/libburn-1.5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+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"
+IUSE="debug static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	--disable-ldconfig-at-install \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+	docinto cdrskin
+	dodoc cdrskin/{*.txt,README}
+	docinto cdrskin/html
+	dodoc cdrskin/cdrskin_eng.html
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index 26862165a1c3..5664a6646bcd 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,7 +1,4 @@
-DIST libcss-0.6.1-src.tar.gz 487329 BLAKE2B 4a751158c63aadbd21997ac4b695b9b1959097248a2eb8af452411c7eca6db49e31ef93255d62c2b049efc3ee6850412385c534d311daade218a1d0f65d40417 SHA512 9b72765a4f1e9e0a6eca0892f50d36d84b25354fd6e55fd9da5c541077e466e585093b34f3ff35591d59294b05f1485b224d5f9df41f07535a09b445795ae2b3
-DIST libcss-0.7.0-src.tar.gz 493022 BLAKE2B 12c4a940d93ecbae20c62f80ad17bb2932d2095e9eea98f35282e6e3e1bb411bf1f96ee38ab47662650437547441c8386a7da6083ee6642628d23c2e7893b6b0 SHA512 937469c87dccc77083e8c864558225ae6299fab7dcffe7670af6507e65cbfc7fcee22b74e58f4c34a89c05e917d3ed31440a92d89c26cf85e36d6ff3281d7712
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libcss-0.6.1.ebuild 838 BLAKE2B 6a8efa2dcb7cb86afea6bb04fc48de79766051894908c9474d63211649933e2d089c2500fd669572dc02f17e3b54835278884461ba4a6c2fa588d1ffa4d9468a SHA512 7208299068f47c98813a5bef188d7d7b7dccc6b8d6feab3e0122eeebc42b96054f3d63a62b2daf7efa42af9db7edc2246486caf58759e0b4c6d3ce1b944df462
-EBUILD libcss-0.7.0.ebuild 862 BLAKE2B ad3def218c4c6916cf2766a22fd6cb3e56dc42ac0bddbab9cca3c9c30546242dd2232ee34b105bd972234a022f042738f6f65aff64c63aa7f76f620af024ef29 SHA512 4424de259d085e22af9767e111e8e796d2bcccc2db3fb4d30301071db308d807986954704ea0bac95c3f0331956df034edd88eae67f4b0a07dd5243b55ecfe7c
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libcss-0.8.0-src.tar.gz 516474 BLAKE2B 937adc65f68fecece189e0f06cfd601ae2d76f0b4dcdbcb8a67f3f058c4355c19c12c088fb50ecf1e6bcd8436c867b1845b3da27bb44b5d1a009bd946bf5e53e SHA512 fb52920ce462f442dfafa7b0061fa465e6c04827d26186e8468855c2a40e8f34e6f0689d5eb58cb0b2ee0759d083fcff5c8c583e1d98693755003c352a22a4be
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libcss-0.8.0.ebuild 910 BLAKE2B fb7aa492eb5871987412e261da0d0338c83649e23e605f18a5c28a6ceb98fed5d0b1b6f9c7f998ef64002890d9ab0b99631e129b12a9745354088851bcd8d348 SHA512 d18ded471c155bb9351bbc9a586210e82c4d8de3f6a4dee8a12c08c97c8e4bbc7ed5aae07f66c59045fdeda381ee9dec1c88b56e2b3ace7f866a09f0779d47d2
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libcss/libcss-0.6.1.ebuild b/dev-libs/libcss/libcss-0.6.1.ebuild
deleted file mode 100644
index 349ae41ed4dc..000000000000
--- a/dev-libs/libcss/libcss-0.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="CSS parser and selection engine, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE="test"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	>=dev-libs/libwapcaplet-0.4.0[static-libs?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-src_prepare() {
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i src/parse/parse.c || die
-	sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
-		-i src/parse/parse.c src/select/computed.c || die
-
-	netsurf_src_prepare
-}
diff --git a/dev-libs/libcss/libcss-0.7.0.ebuild b/dev-libs/libcss/libcss-0.8.0.ebuild
index 67066814eb82..b1007296de25 100644
--- a/dev-libs/libcss/libcss-0.7.0.ebuild
+++ b/dev-libs/libcss/libcss-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.6
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="CSS parser and selection engine, written in C"
@@ -21,10 +21,12 @@ DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 
 src_prepare() {
+	# working around broken netsurf eclass
+	default
 	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
 		-i src/parse/parse.c src/select/arena_hash.h || die
 	sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
 		-i src/parse/parse.c src/select/computed.c || die
 
-	netsurf_src_prepare
+	multilib_copy_sources
 }
diff --git a/dev-libs/libcss/metadata.xml b/dev-libs/libcss/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/libcss/metadata.xml
+++ b/dev-libs/libcss/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index a9f8593a4d4c..833ecbff84aa 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,3 +1,3 @@
 DIST libdazzle-3.28.5.tar.xz 422792 BLAKE2B 65b994798c2f9c7ec0d5ec5b3506896ba3fe09e8e563f1c03246684837a876d0918763f8589deccfc1477071434acda56973097904c3ad5469aa4374a56d1914 SHA512 e4616994226a7e755913343487a2850030dc13816c94dd0de166bb617a001097f6b849fa45ee546e75a15ad3357bd5a61a0caf436c4e3656eaa3480ed4b7f903
-EBUILD libdazzle-3.28.5.ebuild 1312 BLAKE2B b3e420ebafb274f114956873fcca7dfa50e7777ef3a4dce3d7447ea072d736a6e9ff1b2c3a8834ea5320161a29a87fe60507441f0416d840afb8b8fabb1485e3 SHA512 ed769ee77c51416347f727784de2291f7ed30206f3e293236fcaaca5c0c6b42f5d44d4d97146e3d11f45b6d34bf93647556be2a2b7da25793661ccac0bb063c1
+EBUILD libdazzle-3.28.5.ebuild 1316 BLAKE2B fea311b5e322a68509d784e3c0bb4923f737c892c108efb06a245868014bb61ada0232acbc37f61f923025426f5b18c04efd706ca30006075506c80f465f7afd SHA512 948fe1592b4ca032d193f4c1758ada180fcd0dc9b600a3874f793c97980f023edc2e13eb1e94f9b5cecdc9f1598200f3034502b633bbf87b1c371182fe79cd63
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.28.5.ebuild b/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
index c769ee0bf0c5..221853d5f5ed 100644
--- a/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 28e24143425c..4283e79691e2 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,5 +1,5 @@
 AUX libdbusmenu-12.10.2-gtk2-signal-fix.patch 1379 BLAKE2B d625c02fe3e43f01c9ad0f5cefffe748a7ef59e7a5326fe65b5fefd0e060ff85a93affbf2594417f8a5dbac9325180be9cebf1e0f758ade1753304da7e6560ae SHA512 a96488c1522a202248fdaa9e3ca6a4a8c50d548e4e347894a3f30708b883a46c291cc5c5d611e58cafa5ca020451d3c358c8011a227af7f19129f897db8ddc78
 AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
-EBUILD libdbusmenu-16.04.0.ebuild 3992 BLAKE2B 04ee0766b85b7798e214bba618a0f9ca07cc955154296971391542f6fe8e459a33cb9a5728479ee0117eef4f81cd88d8db7cee9479dae3800b6614384defaccc SHA512 02f859bddd0dae7ab698c4084a3d142ccafe85becf9b38ed68e67a9d32f3753cead65d46084322a36b5ed4103cf90435877d4e66a1a124f7dff2137515049559
+EBUILD libdbusmenu-16.04.0.ebuild 4010 BLAKE2B 57f8dc0556ec2ff1f14cb1cc8941851f4e51fea3ce06a2b3fb6c03ad975247373c7063b6bd8c771001f1f0ff3a19c1377d812acddbd5926347c67305074e0dab SHA512 451323a8a7017cf9c0c39180936693099253cec15ac6ab4cf215f85c518b7095c5265c771c14a3d4ba02e45905ed7b29aa2773fbeb2f4c3b50c812a744d86656
 MISC metadata.xml 491 BLAKE2B 2cf408454b7544b7db725159845410fc104e6b73f3629a7e81b42154ee9700fe94587408cbb95e91f28a9233972c0c0c06dbbbbb9d11d171b809d33ad7cd8e01 SHA512 9183ab899735954d60ecb8b7ca394a72bc519b291fb2032cf5888711ab0f748bed9bc1cfb657ea6c34224b657df5634ab4d54a5bf89fbb0762d5a23d90425d12
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
index 4adfd72eaac6..a5112080a494 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,6 +34,7 @@ RDEPEND="
 # tests also have optional dep on valgrind which we do not enforce
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
+	dev-util/glib-utils
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 9c51047d579c..cbf217fc6156 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.5.9.tar.xz 408200 BLAKE2B b99974eab572693c9e2a915b21adf2e6c09e26af70011ce661084ac9add51cb6257f36bcfeb89d76c8987cf8724e69b027d30eda17c4457a40f3e047302efa19 SHA512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c
-EBUILD libevdev-1.5.9-r1.ebuild 1060 BLAKE2B 6a86951c06d37389eba726579aeea3b6ad54c5d33e64ae4bc79900aef9cff38e98740fbf32c13986215f78c8e0bc4acf3254373a02e097e500bc49028c72f0e7 SHA512 395970e87ef33692d3276e5a367505d9162a6012f7feefe2e4be9b5f0ce3144d6dd826432be972af1288c32f6028436b0c0b0e1262ea5849bc03dcda1e8503e3
+EBUILD libevdev-1.5.9-r1.ebuild 1056 BLAKE2B 2e4ea381cd4e29845cc5109716cc657ef499329b9d9ddfd9c8b7bf9ab703ae404f2c62fe94c904c31905292f0848adfe51efce67990768dda9f298ce67a62bf4 SHA512 22b4f94635dc0cf44c75c4926d02c1efd3e18e8ae1f533f46faff30d40c3c1d0947518e5783af47d0678401a52fd987c86b0947911877c79c9b08b46655c25fc
 EBUILD libevdev-9999.ebuild 1069 BLAKE2B ce9fc469b63870e17fd86864afe1e18d154b6a2d9bd05e4f3fc71937c45aece02391275d960bece94ce998ba4f40fc7e1b0c73f8fbb1de83bd1e1d84fed19879 SHA512 0fe984fb6a8efe9692532041e9adc37e209d93641e4c4b00693242332610b6f6e6139738ed53ea2014ceef19c5615aac9e2948b3b7e3cc58819f2123a0b22bfa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
index 7d982501d6ad..5cf10a144879 100644
--- a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 8eeec982a7f2..b92e85217ec5 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,7 +1,7 @@
 DIST libfilezilla-0.12.3.tar.bz2 398275 BLAKE2B 0ba30e64b6aeae0bed58913248992b7152b389fc560291174388196a02a583dcbc485c9fb9680e0541e788c2d6691a6050f465e8719c2c3e7974eb5fd293bf8a SHA512 a08343a418b4147b42d38afd04c66a26c405770109818b48a291c127a5fde6c98515b716990fb056b319c3be859f44060d4ee83e96ec5c4bfa40c755ddc01bba
-DIST libfilezilla-0.13.1.tar.bz2 398991 BLAKE2B a1da4be42a3579ae6e0911f5bae78a2ce573abbe96fbbda368b613f3fcbbb53805601902a9f0e16cae8b788c69377145f4482420d81b26c6fa487f9f60e940ce SHA512 d6a0cb14d8008a945df94081a64d3b8857c5e45ce32275eddccae931434eb98a586bfcd8430adad09ee4e17ad42bb83abfed3a2d227d98714b1ba1720bbd2e7f
 DIST libfilezilla-0.13.2.tar.bz2 398889 BLAKE2B 8e4368fb3b0246aaac7ebb3f6bf515a6176bb8d72b2064d2390c4c585951472edaafe71d335599b6951e9a155689010f85fa4cd39304481c4ca3882d39565186 SHA512 97fd49fbfbfaabb0354c69f9a26d674e7cda7a085201eb0e3454558e5773404f4c13f87ae4e11cba9bd0737dbd7c65778d02a8de2f07dd39636514134cce5c88
+DIST libfilezilla-0.14.0.tar.bz2 399398 BLAKE2B 25c1397769adaf532823f85abcc8bec0a885f5c92af49219a1aa9379c12692bdcc94d223ac2ddeefbb221f0ce0d709b058b7018f3c358a40cc046e7c45c4ee82 SHA512 f20932e14ab81df9562e030ce10009b9ab55b6798f7bfff7249e9f472fc8cae4278eb142a655dffb63fec53894783874973eb33444bfdacdb06fa682c2dd66a6
 EBUILD libfilezilla-0.12.3.ebuild 921 BLAKE2B ddbbfbb499653641009d4ce494b7308bc92d6ffb58ae13888dfe892761c993fe03b5ead34638b238e96a171310d21f794981051d321d01f1d4b64ef63a47afa4 SHA512 7d04b1cd40129c05ffef86da072ef5da8fc91420ebe5444c6e5f8c471c0627502ee0575d19d3de2903e7bf8dc2a256aaaf7369cf165f62b868d35b54baa0f34e
-EBUILD libfilezilla-0.13.1.ebuild 923 BLAKE2B 42d482992114fc7d22bde3aee13d8e2ebd1a634702da8f05b33ab7b26e368171e5509e09662309ef735d760072fde58d6b48d7a1e4c1dbb7875e54274f4af2e6 SHA512 ad6b73746667125d5ef08f0f8ce0efb6d2da3f8c16f8c38fa031627859c2f6858e867e7c2c04ff18401ea98148941a10ba290c38135a963f011fca8bed084917
 EBUILD libfilezilla-0.13.2.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
+EBUILD libfilezilla-0.14.0.ebuild 920 BLAKE2B 43c040cd73c96a0dc869b0bc7d32b2eefc5dcc636cd22f6ad5922ba4b302b67fc8b77485cabbba891a3067dc7a8c4c48af5d5429fa6d2c7a85186a96cde2209b SHA512 322fd404e89418b1219115d1bf7652100f2c2d79639a032e0d7387f580712f1e0c3d9de88e998475efcfdaf9019aa5a4fef8bc23ec2b6b0a698c631494911a66
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.13.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.14.0.ebuild
index 28b3e2505fd9..5fcb3b82864e 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.13.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index b52dd7e73cef..3dfc699fec3a 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,5 +1,4 @@
 AUX libindicate-0.6.1-no-mono.patch 1888 BLAKE2B 60cb0434e3974cf474fca729be08defcaa01d713e4039001f4994bcaae0a657fd04b0c2eafa447c25c2e56d92bddd39f2b17915fdb7d26b916eae3e3315588d7 SHA512 b2623349c139321403e285ce384191f2741b6216dd87ce5e05a439bd175a2846bca111ade729e87322a413bfc518fdfc2546274114fe5726de171b51d3be7cb1
 DIST libindicate-12.10.1.tar.gz 550378 BLAKE2B 9966c645c2538bf9246221e138771ce38e7f74629ae2365cd803a5e26372922cd5194ca1449f79a35f2bcd391e3ee2056183ab53b11fa8d92a8b2c258ead9c6d SHA512 4dcb5f292153210bc15a05f117101429da77a60b8b05b569baddf0e9043d852c2dccb0d5a6adbdf4d4a1b6f06b33c61e242bb4bcb376e3d96563bda591685c06
-EBUILD libindicate-12.10.1-r2.ebuild 1772 BLAKE2B 4e8fee45234f05b75aa26528d066db18718fdf68cf6312c4a124a81b57f2afdf404fc542634e5b0c22a9b09b90b543f5c7b8b4a337fbbaa3d487cbc7a7221cd7 SHA512 80cb5b9c8f5fb1eb512657a9df105e4540c5246c294b06dce21a433e85f92baee8308d5ee7bd0b70ba24a7a493346944b8831661d39a009d5f5671c1bc2d9fb6
-EBUILD libindicate-12.10.1-r3.ebuild 1680 BLAKE2B ff6b7415ef202771091e30bbb4883b20a1ce6d1e590a54c67a5f895bc6f0f9ff04e1974706795e499f5d16e00482265ae212b52be61d3f4808e54ed2708024be SHA512 060af29ebf73d4dff380ad77afd2495b94da1310e54f00d4a8adf666f4be2aee1b78f1c41666b14cacdcc372333484a47ae4a10f8946962935105d61762f1c0e
+EBUILD libindicate-12.10.1-r3.ebuild 1679 BLAKE2B 3a980835e3ab99b0b860b21cfb84cde7f8ffad2cb3494c3ec4e1885adbc54e6f4f45e8f0296d353670dc3c02c49bd8b854101e1e6e95a3936162c67f3c4c021f SHA512 72c0e40f47d614373ce3df91a38ac3e07c6b77d494be931c51ab3050a2fa3a497ff3730bf6cdced8c5b2d93bcbea5e31e6b3f18c617c6cef566b4f24f0475178
 MISC metadata.xml 328 BLAKE2B e528a6922cf244dd2e8e3387f539f9922378395dadf028852a3e17120186a4cdd82c89b29802ef5a0698a35737294733fbf9a717c3c31af90cb634ee5aa5cea9 SHA512 fc8169dee128e50da93fe6baec57989b4b2e0a59e36661328ae7bd5bf1db1ea5bcc08efb72e6ba2d0e0d9a18870144066a5c77a1f275801a4fc98953cf891a3b
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
deleted file mode 100644
index 8f70cb05fde7..000000000000
--- a/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils flag-o-matic vala xdg-utils
-
-DESCRIPTION="A library to raise flags on DBus for other components of the desktop"
-HOMEPAGE="https://launchpad.net/libindicate"
-SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 LGPL-3"
-SLOT="3"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc x86"
-IUSE="gtk +introspection"
-
-RESTRICT="test" # consequence of the -no-mono.patch
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.30
-	>=dev-libs/libdbusmenu-0.6.2[introspection?]
-	dev-libs/libxml2
-	gtk? (
-		dev-libs/libdbusmenu[gtk3]
-		>=x11-libs/gtk+-3.2:3
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	!<${CATEGORY}/${PN}-0.6.1-r201"
-EAUTORECONF_DEPEND="dev-util/gtk-doc-am
-	gnome-base/gnome-common"
-DEPEND="${RDEPEND}
-	${EAUTORECONF_DEPEND}
-	$(vala_depend)
-	app-text/gnome-doc-utils
-	virtual/pkgconfig"
-
-src_prepare() {
-	xdg_environment_reset
-	vala_src_prepare
-
-	epatch "${FILESDIR}"/${PN}-0.6.1-no-mono.patch
-
-	sed -i \
-		-e "s:vapigen:vapigen-$(vala_best_api_version):" \
-		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -Wno-error
-
-	# python bindings are only for GTK+-2.x
-	econf \
-		--disable-silent-rules \
-		--disable-static \
-		$(use_enable gtk) \
-		$(use_enable introspection) \
-		--disable-python \
-		--disable-scrollkeeper \
-		--with-gtk=3
-}
-
-src_install() {
-	# work around failing parallel installation (-j1)
-	# until a better fix is available. (bug #469032)
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS
-
-	prune_libtool_files
-}
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
index 20f1036d1a87..2b05d40e90de 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc x86"
 IUSE="gtk +introspection"
 
 RESTRICT="test" # consequence of the -no-mono.patch
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index 694efd02d173..9c3738a63079 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -1,5 +1,5 @@
 AUX libindicator-ldflags-spacing.patch 298 BLAKE2B 2d0fb361e2980d429beee418d9bf8d2f786de0d2b337b6775f9457158aa30d02b4dcbccdc488fa79236f04bf766aad49df732d25f48f1ecba923c46a4e239280 SHA512 fa283a8d6b88da0e2b6f5d0711ebe8a5cc0d4ab87cb07c3cecae9974dd68be751169b89503ae66751bca6cd73df2b2a262ac55a667c5c8e00e129d51f4452c67
 DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
-EBUILD libindicator-12.10.1-r201.ebuild 1189 BLAKE2B f0a115fcafa345c177450ca0c360826d0fc7e39a7822fdbc3c32a7e5ea4e5a222c8cac3e196d712b4fe14d837ece06ed3762c43c5b1af4783b3db225008f66b2 SHA512 582f3fe2c4bdadf84b960f7e5ac0ffeef1f249c6e0c263d477af2121cc92b2516ac13c7636fcedfa41a0f8d77cb275a1fd0ff0b6b761e5c3dccc2359c757f9cd
-EBUILD libindicator-12.10.1-r301.ebuild 1151 BLAKE2B 435debec5fac0c2c61c75363c023cd6867bcf00ce50dab27215b2e317bb7767e5b1e8a5487a168ae3955bf98b6145eacb4875a1eddee5621216a4aa5e6cc8ada SHA512 c35b3c0a766b7dc6555f7a80cb3f7e6a65fa56408c859da38aa849344ad2a48c87325077c7fdf4017603d7dd72c3a9bfb538b2db85e09e207d1118d53f785e46
+EBUILD libindicator-12.10.1-r201.ebuild 1207 BLAKE2B d69e47daa9bf13333d31fdfde8f00e5dc49bb0ab8c3219ccc5e88698fdb8b12c3089fd1aa221e46452515a39bc938eb0127db19d927db57622df701d6e9730f4 SHA512 aad48d226c41fd1a282e4349a1686ffc2aa5c556a7d849ad40ebce9dcfe6fe8b2dc5d5ab60bf54d689fca4a579b3c3977bcd5bf9da2c0edc2156a540d573a355
+EBUILD libindicator-12.10.1-r301.ebuild 1176 BLAKE2B d795a1098a5a6e9f73e62a7c0046b88f42dc2679d466240cc79385f3001e4cf203e3c48b6286d2cd9295719f2d2a05fd2c553b4572f0fe9728c0c873020e4412 SHA512 554c24774f4d4f3bec43625015ea6f22a174f5423424136a92c4033977335935462b10fd9c8a099e66bef91fb208d83dafe799e8a17a92335434d1e244ba0027
 MISC metadata.xml 247 BLAKE2B 216107f32a44b828d5bd65432dbdf2f3b71d81e96ee3580fc551392310b9ee554715698dfcba215fa2181a90f361564b6d04546c61848c3a2d176f3590602f69 SHA512 f24203e0188dd8311689fc59007368585764703b92f6fde9b4ea01666d37304193fc728a9f99b7f6c936f5a5a51a58a8402a101dc4eddc0bf2bf09f221bb0054
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index df50dfaad519..c43c76e155f1 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ IUSE="test"
 RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
 	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	test? ( dev-util/dbus-test-runner )"
 
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index e4478c886b84..0f80459205ab 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,12 +10,13 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
 	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	test? ( dev-util/dbus-test-runner )"
 
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index e5c397c41e20..96830071059e 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,9 +1,8 @@
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
 DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949
-DIST libinput-1.12.0.tar.xz 519320 BLAKE2B b40036740350180ca0e183088651647e3604bca236ab27c99a941934b27ed67a21d8596be9baab68dd798dea9c5967cca3a038623ba2870dc2ad3db8336e0b96 SHA512 4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924
 DIST libinput-1.12.1.tar.xz 520072 BLAKE2B 2d2b2d82f27ac01ff25b3bf6fd7b77ca56467ab818cdc5d4a641629fed623ef5042915889f54f71b1881595af1d85770bbf4ecfd798c079878efa0a0546c4a36 SHA512 de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68
 EBUILD libinput-1.10.7.ebuild 1440 BLAKE2B 203a9e8e20785cb93d221d8614aec3488a316d301672d3bbacbd223cd959c31edae176c17d1d575426cec24bd6e89c82b80244bcb7273a4531743555c4ba3b42 SHA512 c0e320acdb66994bcb5fe11b60ac4dc88955cae25da1dc3de028738bfb86c57eba90d23f258ed076ddba0da2737af9027ccde6a73705e6ff4feb8beffb591f0b
 EBUILD libinput-1.11.3.ebuild 1443 BLAKE2B 95c2a74f98abe1b021f14df89375e8acba26cad0df3ebbd753844cdbe477fcb7d2d9606c76b51676ee0fb27623a5de658a6326d74d7d90e9d1cf5be0cb8d8428 SHA512 2e91a777ad1f5a3a849ad7a559f34f43dffbeda2c5be97a06c0870d52d558c916045ff98229f155527cca58e38e155e76a48473a8f03c7d3b8ad045bb595fcd6
-EBUILD libinput-1.12.0.ebuild 1443 BLAKE2B 95c2a74f98abe1b021f14df89375e8acba26cad0df3ebbd753844cdbe477fcb7d2d9606c76b51676ee0fb27623a5de658a6326d74d7d90e9d1cf5be0cb8d8428 SHA512 2e91a777ad1f5a3a849ad7a559f34f43dffbeda2c5be97a06c0870d52d558c916045ff98229f155527cca58e38e155e76a48473a8f03c7d3b8ad045bb595fcd6
-EBUILD libinput-1.12.1.ebuild 1440 BLAKE2B 0a7cacdd6a101e465108981d625476b8e360872f7f0be8a7a583415215403a31f6c2f81275d00a626b2a8a7d5d31487cf64c768f4072d76ce695b7123478920b SHA512 60b1254d675c0bae51157b20145f4ba4a40983ec2950af0862a923a72df3a6de742752c27e0408c539698d9715b938b3abd65113859c2528a25eabc66aa7e4a1
+EBUILD libinput-1.12.1-r1.ebuild 1854 BLAKE2B d6f9387dfff57346bf5daa581c2426004244a77a23d86463370518ef9798dc2b497b0369c194784b8adb806063d9fc0f4e5aeb6d3356421c251aba3cef830ba5 SHA512 3b6f6bd4e80a894f474dc1ac66e206f3e9e12add2e682ea69c80d8a3661b3622397e2466038e2b2186eeb76d264610444755c378f6905c90a7a3fe812d8d1814
+EBUILD libinput-1.12.1.ebuild 1460 BLAKE2B 066dfe5ee976f24475f2572d040c685b2a429cc27d22d2199bcaaa0e92886a9e76b2dc489457e5657f8b4ac6a0e61af75cd7041af96647bc1dd911d5c84e3585 SHA512 3bd9c1fb51fee929bcf85349996e679b202d2e064bcb88926a4d0cda0453f82c7ec9f8bd0ba0e4870781fc936a36da034b91e23223ad3f9764b4781468bf8b19
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.12.0.ebuild b/dev-libs/libinput/libinput-1.12.1-r1.ebuild
index e26ac3c3c0ff..edf6037ad99c 100644
--- a/dev-libs/libinput/libinput-1.12.0.ebuild
+++ b/dev-libs/libinput/libinput-1.12.1-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit meson udev
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit meson python-any-r1 udev
 
 DESCRIPTION="Library to handle input devices in Wayland"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
@@ -10,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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~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.
@@ -26,6 +28,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
 		>=app-doc/doxygen-1.8.3
 		>=media-gfx/graphviz-2.38.0
 	)
@@ -35,6 +42,16 @@ DEPEND="${RDEPEND}
 #		dev-util/valgrind
 #		sys-libs/libunwind )
 
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	# gui can be built but will not be installed
 	local emesonargs=(
@@ -51,7 +68,7 @@ src_install() {
 	meson_src_install
 	if use doc ; then
 		docinto html
-		dodoc -r "${BUILD_DIR}"/html/.
+		dodoc -r "${BUILD_DIR}"/Documentation/.
 	fi
 }
 
diff --git a/dev-libs/libinput/libinput-1.12.1.ebuild b/dev-libs/libinput/libinput-1.12.1.ebuild
index e4f4f74efb75..c19ff354838c 100644
--- a/dev-libs/libinput/libinput-1.12.1.ebuild
+++ b/dev-libs/libinput/libinput-1.12.1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
+		dev-python/sphinx
 		>=app-doc/doxygen-1.8.3
 		>=media-gfx/graphviz-2.38.0
 	)
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 2b80c62e240f..b20ccb241635 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,3 +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 1840 BLAKE2B ec5c21338a4ced948104c073fe612264731b27f2a56c53f22a0d3aafc7ae69fe62d5a50af16340f690c2a30d90a433763ef7b1faaac1eed8546a47d06ee55986 SHA512 aece802088d8a271ef063548bf2c6ae1a89ed6ff9cc23267ed0f572979bf87197c7e2fbbae09e056a64a914a6b80b771ef98527e64f11100c9ae0108c4056bce
 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
new file mode 100644
index 000000000000..a43cbf926906
--- /dev/null
+++ b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+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"
+IUSE="acl debug external-filters external-filters-setuid frontend-optional
+	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
+
+REQUIRED_USE="frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/libburn-1.5.0
+	>=dev-libs/libisofs-1.5.0
+	readline? ( sys-libs/readline:0= )
+	!readline? ( libedit? ( dev-libs/libedit ) )
+	acl? ( virtual/acl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+	launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	frontend-optional? ( dev-tcltk/bwidget )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable readline libreadline) \
+	$(usex readline --disable-libedit $(use_enable libedit)) \
+	$(use_enable acl libacl) \
+	$(use_enable xattr) \
+	$(use_enable zlib) \
+	--disable-libjte \
+	$(use_enable external-filters) \
+	$(use_enable external-filters-setuid) \
+	$(use_enable launch-frontend) \
+	$(use_enable launch-frontend-setuid) \
+	--disable-ldconfig-at-install \
+	--enable-pkg-check-modules \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt}
+
+	docinto frontend
+	dodoc frontend/README-tcltk
+	docinto xorriso
+	dodoc xorriso/{changelog.txt,README_gnu_xorriso}
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 3707b805a2ca..29ec7c12055c 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,3 +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 967 BLAKE2B 04b740e5a5037be4de303481ff9e5dd0c95f6392f5fbcfe45a0dde439d79ffcd80e68723d4e3f9b815eca33c10e2772cb9e5cf7421b07968d16811fe924adc2e SHA512 6175ee513504abf53cc36a401f6c1a120160332ddb06afde2b2b23948bba113315df9727145f2465ffb9b5e50aa7f5f37b391cf06f8ec3318c9db2a072d47207
 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
new file mode 100644
index 000000000000..6c6df197b20a
--- /dev/null
+++ b/dev-libs/libisofs/libisofs-1.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+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"
+IUSE="acl debug static-libs verbose-debug xattr zlib"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	acl? ( virtual/acl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable debug) \
+	$(use_enable verbose-debug) \
+	$(use_enable acl libacl) \
+	$(use_enable xattr) \
+	$(use_enable zlib) \
+	--disable-libjte \
+	--disable-ldconfig-at-install
+}
+
+src_install() {
+	default
+
+	dodoc Roadmap doc/{*.txt,Tutorial}
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 39429f503b13..945adb0a35ec 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,6 +1,7 @@
 AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd432fd679ab61620aeaf654041cfb6c39a18f3be475bf7e0a93c004d7c953d6f2ed66e4528d3b546e9d22b28e1e666c6d9caeb SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda
+AUX libmspack-0.7.1_alpha-fix-parallel-build.patch 954 BLAKE2B 545d90548a32c296d6bcbcd9e880574ba76bbb2d06a0ed41446b1632e8fdcf32c61dbdb6455cf9d9080d49840a1739983f9746614be0f08532c4db70ab16cf0e SHA512 251d7dd86f44f06bea8b1589b860e126e849743c4433703b4420da85737373af4b52c3f55dd8dab94e3bfb4a5e9626eee341f19f1ad649573727b7613170f2ef
 DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
 DIST libmspack-0.7.1alpha.tar.gz 486840 BLAKE2B f97abba7b261cced6e5c500c50243920c44ae8bc245e54386c4568e17989f2bad2c3316d83ebbd75220b50b09ed4ded156965e9aa430bd207aaa6b7c6218d800 SHA512 e903629a34c29099a261a108e4eb9cda485ab999bbc3383e3cd6a39715077d00b26a1c641b0f3df0eef60d2e15a7ef623379df0cfe25b99d4eda080529ffec7b
-EBUILD libmspack-0.6_alpha.ebuild 1179 BLAKE2B 26b87e8a8c53c60a7f7d75aa8f294c0edaa89afed3e2ded99c97700e3d5ec0154c7610883c9b0f504076389033ae6edad381b13ef40e465ec1da7bda6e4d9335 SHA512 ec70ba20463026e7a918908484fc114d78ca572ad276ed0e9cc77087977b58afd5be9ab8d384df58810c2801c32d1096de36d217d9656d64bc82c33eb34d255b
-EBUILD libmspack-0.7.1_alpha.ebuild 1347 BLAKE2B ffaa1c2516bcd34312195cd5f3345c5c201c9e701a2cfadc68c6dcde8730eb8da694d85fdc869367f1316273fcf8eafdcbee5b52dfff82f75b68a1d2f39110f8 SHA512 74f9481d5e94c72ad769a97e3a0f98bac1f6253a909e20221c1588f9d2a49829d499b2d71aec155054076580400250e2697e2bcbc0e732104fdebc2f160c0dbe
+EBUILD libmspack-0.6_alpha.ebuild 1185 BLAKE2B decc95044aeab67c2031bccf940a2c00f71263b4321d58e58ad8753aae67578b37d75964bad79457943be49e821d99c8d7bef56dcff383f02a23483c633adb97 SHA512 47ea82678d2701d15391697a498c8099b88742c82772bb79270d0c5138ea1061e5112a3609cfa4724517ce13790084e680deb385d48cc065bb9abd508ad6a50f
+EBUILD libmspack-0.7.1_alpha.ebuild 1350 BLAKE2B 2547d6a0d39530f7e019ea0073cd809c563094fc4ae8198f7b0c27c29d714b34c8f5f2a308d6a8df3a3cd5c847715e97a3d154483a90c3314e32a9761d0a3d4c SHA512 c4bd1afc5c42640541b70140295a860412beabfc7f90407acc2dc7263f711531bd3cd00b4f1280841a2fd556c7e4e32d554519e5a54ea258f5e24b963d08a274
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
diff --git a/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch b/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
new file mode 100644
index 000000000000..38935a8d26f4
--- /dev/null
+++ b/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
@@ -0,0 +1,20 @@
+From 43099fb1bba26792fe98b4157c950db9c333134d Mon Sep 17 00:00:00 2001
+From: Stuart Caie <kyzer@cabextract.org.uk>
+Date: Tue, 16 Oct 2018 11:25:24 +0100
+Subject: [PATCH] Fix parallel builds by adding adding libmschmd.la explicitly
+ to test_chmd_test_DEPENDENCIES
+
+---
+diff --git a/libmspack/Makefile.am b/libmspack/Makefile.am
+index ba19535..6130bc2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -89,7 +89,7 @@ test_chmd_order_SOURCES =	test/chmd_order.c test/md5.c test/md5.h \
+ test_chmd_order_LDADD =		libmschmd.la
+ test_chmd_test_SOURCES =	test/chmd_test.c libmschmd.la
+ test_chmd_test_LDADD =		libmschmd.la
+-test_chmd_test_DEPENDENCIES = 	test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
++test_chmd_test_DEPENDENCIES = 	libmschmd.la test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
+ test_chminfo_SOURCES =		test/chminfo.c libmschmd.la
+ test_chminfo_LDADD =		libmschmd.la
+ test_kwajd_test_SOURCES =	test/kwajd_test.c libmspack.la
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
index 645770312919..dbb66269d83f 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86"
 IUSE="debug doc static-libs utils"
 
 DEPEND=""
diff --git a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
index a75ec2a107d3..4a10f2105900 100644
--- a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils multilib-minimal
+inherit autotools multilib-minimal
 
 MY_PV="${PV/_alpha/alpha}"
 MY_P="${PN}-${MY_PV}"
@@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86"
 IUSE="debug doc static-libs utils"
 
 DEPEND=""
@@ -22,18 +22,19 @@ RDEPEND="
 	utils? ( !app-arch/mscompress )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-fix-parallel-build.patch )
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
 
+	eautoreconf
+
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	# https://github.com/kyz/libmspack/issues/19
-	export MAKEOPTS=-j1
-
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable debug) \
 		$(use_enable static-libs static)
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index cf4cf44f7d55..e4302e01e33d 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,8 +1,5 @@
 AUX libnsfb-0.1.0-autodetect.patch 734 BLAKE2B bba90c622e559b8238672068792a558ac408954b85cc9798b12163564837e4fb44ec80eca33ca856e5344fafeb862a3eff43bddca27a9ae7603478505982a440 SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993
-DIST libnsfb-0.1.5-src.tar.gz 82897 BLAKE2B cc1287d8ac9d82f2286c7e4a0046e6bd05e994e3db50480c76f6bbf2fe8c1eae8593c53a0d59618b189979e196b7e23f4b55a7e5d311926b15c44ce623d5299b SHA512 7e1ff83552beb10fa44a05e34315502514c1eb9f160ec53f367d74718915400ac6630748704ffc2d4ea8633f74e0c446931042b6cbb7d9a2828a3cc565c872d4
-DIST libnsfb-0.1.6-src.tar.gz 83510 BLAKE2B 4d4c5cea7ae0f9a799cbf515f6ccad6bb24008f622871c0f4498bd2f292955d5c1c70fdff406839cc9173b3cdf17c7552563841eec5e1849624c4b25196fc36c SHA512 ed22b593e6475ee023818b8fe8109922b5714624137f71193edbd9d12c73003d5e161aba3cc86aed6c03dee3e247f251b3dc4d34db008d4cbfcae89331f34ee3
-DIST netsurf-buildsystem-1.4.tar.gz 38067 BLAKE2B cd09909e0565a7e63f16082c653f7dbf8de3e6b4d61aadd213bcd884a7cd3d10d8e22859322ffbe71a7d99823b3789c6e2454ea50cbe75578dc7d6eab324d0f5 SHA512 2c804ad7bef70c987e1d393ee4041bffc9797893b4fd513c90a665027205a1f7eee0a7d86ddaf833a6ee18346d6fe69587190c4e6722afc4ed18ce87783c35fc
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libnsfb-0.1.5.ebuild 1140 BLAKE2B 35170b1a458085e34c7cf63cb59a14099fd3ef3457d239585831886a9903a5ab58df41b68212ba495d1d9671ad47a3271aa54a6e0fe3f42586336eba1f6ea8a4 SHA512 9bea716436afff46ecc3d67313c174fc9c7892eda87c17c63d7b2d3719dc22aef689899b3f5ea357e271401b3beb0ed3613740e390619daf003fde17c5fbfce2
-EBUILD libnsfb-0.1.6.ebuild 1140 BLAKE2B 386e1939823ed2b4f35d3e9e111c6598b5c8b176eb0f573f299b23d13b151b0b0aba7e75a781caf7f4a446fe684be27dcc05f83f7651ba4388620aa7d851b3a8 SHA512 c2b640d335dfdf9459ff0bf08fc8c8deadf56e4880593ab8cc47186a3e0b3e8e8d453437b9eceb492b4b517f442588b2fc6aa2ac786d258a90755916d0c07f6b
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libnsfb-0.2.0-src.tar.gz 82322 BLAKE2B d805478728015663b4bf9c8de018bda33dcd84a7ace7246c450a7c31cc3358f834ade21ac1df9f0ca0e4dcea1138369cc3cd9ac468ebb484cce139d4bc89441e SHA512 b90eca76c8dcb22e554e13b5bea4268e5c9fc6e4711bafa5acbed92cc83513c3a3965208b3956de250fb3013cc3db6a33922ded471fa7a24bde97f748d2212c5
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libnsfb-0.2.0.ebuild 1228 BLAKE2B c17eff3f606360522f0491221a46b9742f2d206703c7bb71a1134cef423f3f08bc2c6d9042ebcfe0f1f6559175fc92efc5df20a962ede2e086271bec5addf9e3 SHA512 fcc5bb1188928defef453bf7400ed6db4f097288447343712a5125a71270bde80f88ca22c355a80e8d3c20c314750d40b258c9c1030fd605d763da45f0c02ddb
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libnsfb/libnsfb-0.1.6.ebuild b/dev-libs/libnsfb/libnsfb-0.1.6.ebuild
deleted file mode 100644
index bd2d58faebd5..000000000000
--- a/dev-libs/libnsfb/libnsfb-0.1.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.6
-inherit netsurf
-
-DESCRIPTION="framebuffer abstraction library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE="sdl test vnc wayland xcb"
-
-RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4[static-libs?,${MULTILIB_USEDEP}] )
-	vnc? ( >=net-libs/libvncserver-0.9.9-r2[static-libs?,${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[static-libs?,${MULTILIB_USEDEP}] )
-	xcb? ( >=x11-libs/libxcb-1.9.1[static-libs?,${MULTILIB_USEDEP}]
-		>=x11-libs/xcb-util-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}]
-		>=x11-libs/xcb-util-image-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}]
-		>=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch )
-
-DOCS=( usage )
-
-src_configure() {
-	netsurf_src_configure
-
-	netsurf_makeconf+=(
-		WITH_VNC=$(usex vnc)
-		WITH_SDL=$(usex sdl)
-		WITH_XCB=$(usex xcb)
-		WITH_WLD=$(usex wayland)
-	)
-}
diff --git a/dev-libs/libnsfb/libnsfb-0.1.5.ebuild b/dev-libs/libnsfb/libnsfb-0.2.0.ebuild
index 31d7b3ce4714..c58a85060137 100644
--- a/dev-libs/libnsfb/libnsfb-0.1.5.ebuild
+++ b/dev-libs/libnsfb/libnsfb-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.4
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="framebuffer abstraction library, written in C"
@@ -27,6 +27,12 @@ PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch )
 
 DOCS=( usage )
 
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
+
 src_configure() {
 	netsurf_src_configure
 
diff --git a/dev-libs/libnsfb/metadata.xml b/dev-libs/libnsfb/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/libnsfb/metadata.xml
+++ b/dev-libs/libnsfb/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libnsutils/Manifest b/dev-libs/libnsutils/Manifest
index 6dab162f918c..6866f9ba2e72 100644
--- a/dev-libs/libnsutils/Manifest
+++ b/dev-libs/libnsutils/Manifest
@@ -1,4 +1,4 @@
-DIST libnsutils-0.0.3-src.tar.gz 7174 BLAKE2B 4557adc8c0ad7e292040ab9738f7c4fc85e67245642111e4ff79ea35cbd132c0d4006f13acb58cc2b92d4ae9e4b7be47a4f677c099c3e2853c6c8ae88d89815e SHA512 324c4d1d145ecc2643e244b515c72fde41ad31f43983e46ef181eff3f5bd767cab72a0ee73afbabdff8a92c476799ed6cd69326d7d194acd5ac330e2d4cb4122
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libnsutils-0.0.3.ebuild 362 BLAKE2B 443eca146c2e3344b86b816110db16ba88bb48fcef903b5a0a66a464b50b7281d6ecce686c7aae086a12596e5389e391f02f50be0fa84d92df884b78ea2982ce SHA512 66e674a620f8a6fd2ecfdd05e44e544aed26579573409e87dea7bbafb0fb20e145450bce6e7705a9b50289e93cd5dc712e8dc9091268cf0e52b95c8107048af3
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libnsutils-0.0.5-src.tar.gz 7653 BLAKE2B 4f7810f436f5ffd33084bc67095f3cb48a7744ef6f9ab0d632cd7b87467ff8bca54809de5a8ea837a00429c951d4e701909bd5f185e1c600a7323393017596cb SHA512 b9611db39adf11aa4e29387614bf55e241c075a223c687f5520e5b6808cc392c847be1a1d74559928e385a93886c4a67158504342384a1b200cf9ce13c00db50
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libnsutils-0.0.5.ebuild 450 BLAKE2B 1e12f4ec6a27013cb85915277c30a5e2efd491bc37198d49302ac3582d9d53e4bd3f1beee776c52f711b706ad802fd1270378dc5ef64b1d46c0755f5800d2004 SHA512 a56aa01b66ccbbbf5e7ce44b852ce3745d8cf6cb6380743be0ccf9a00979506dc9fc159b29cec15e005038fada27888db583f6d6356ec840951f45fe659d1c3b
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libnsutils/libnsutils-0.0.3.ebuild b/dev-libs/libnsutils/libnsutils-0.0.5.ebuild
index 9e9191abbf7b..a984dac5bcef 100644
--- a/dev-libs/libnsutils/libnsutils-0.0.3.ebuild
+++ b/dev-libs/libnsutils/libnsutils-0.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.5
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="base64 and time library, written in C"
@@ -16,3 +16,9 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/dev-libs/libnsutils/metadata.xml b/dev-libs/libnsutils/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/libnsutils/metadata.xml
+++ b/dev-libs/libnsutils/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 0bb45f2ea883..6395938a9fd0 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -1,4 +1,7 @@
 DIST libparserutils-0.2.3-src.tar.gz 74509 BLAKE2B b9b68a91823181e7a95ec94b1a117da27180afe4ff2b05da279cf59a0b126cefb78712cae382c24b377292e4b5802273b1f9bd8ac52969a3a693da635ec88f65 SHA512 b68cbf3a3260bacea10c8115a1c247de3d7220e94a7f73da84ee4b400678132d8db71b8e84fe92eacafc4945c111f049779c8fead4cf9bd98c6e96340943d270
+DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 EBUILD libparserutils-0.2.3.ebuild 570 BLAKE2B 831f0a7473a068b051550eb316c096dcd4b7e5007210eb86d23136967cf7be7769964ceedf1caa77065c1e9e0b3f9f8af2d03cc3274c12e0e29e2d0085d2c1e1 SHA512 cd4cf38173e2231dd443c3c534cf1470566e6ffb8645341d9679fed0d469125141a52a6bc4078035b6f81c6fcc5eaa8521217e6864584a0df1edbe956f0a870b
+EBUILD libparserutils-0.2.4.ebuild 661 BLAKE2B f2b19b287717c30aac118842f905e46729fd53a868269dd88bcb116f574f6d5215ee49ff8f4482dc527de3a734dccb5df24b032d8c3e930b49744e7a4a496c50 SHA512 9889ca7ce51056c1c2c2ff4b2ebc926a264697fe4389c855406c32f91e85ce9a4fc1969628b537383a2d29dd44daa1b26fc5c27365b69f4db5b551d86ee112f1
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4.ebuild
new file mode 100644
index 000000000000..4f671e56ed9e
--- /dev/null
+++ b/dev-libs/libparserutils/libparserutils-0.2.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit flag-o-matic netsurf
+
+DESCRIPTION="library for building efficient parsers, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~m68k-mint"
+IUSE="iconv test"
+
+DEPEND="test? (	dev-lang/perl )"
+
+DOCS=( README docs/Todo )
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
+
+src_configure() {
+	netsurf_src_configure
+
+	append-cflags "-D$(usex iconv WITH WITHOUT)_ICONV_FILTER"
+}
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index dc18e4f25f81..fde31ad26c01 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,3 +1,3 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
-EBUILD libpthread-stubs-0.4-r1.ebuild 793 BLAKE2B 6708ddf2f15707ea862a5ea1493b713e12c2369740d3ad0d860160f4f4b91bfe85567e7d0a38329441a4fc964f083326c884a4692bc745bd26c4e8417e722117 SHA512 5a6a82a68d8be67cca77f7ac27745b2c9670731a02799c844afa3bd662f87b232fb0ddb698655653d6026bb8e5263b38657e6b1b2b726a9b8273844cfd5c4df7
+EBUILD libpthread-stubs-0.4-r1.ebuild 789 BLAKE2B 4b5c7ed203d1c8f0314240d93ab6945e0e3dfbc17d5428201d0eb4f715c413ed0b00dd6e08f7bfa091f9586bfa7c96b48412ae5918efa3b965b4078b2322670d SHA512 dbb83391393a2c1c8ff9c08a5d6d24c540be37b2356da677dab3502665a857007e8ec7f0d2ee9bd2252f949444d9288a52aae2ef7b48822964c7451f02eab5b2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
index 7a504f5cfa41..342a0aa0d9c0 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 6b214cf97f8f..409a80d72f65 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,3 @@
-DIST libqtxdg-2.0.0.tar.xz 62404 BLAKE2B dc84654693c6504c36633394ce4bafb46705b45ac3e7576b03b92710603c86375fd70d5ea76a2864e498c5b33728b02d215da5b65eb3728218ff97defd883bf0 SHA512 f4e32346eddedd31195093214a45e9831742ee886a14b5d7ba1d640a91e05473b9b8adc7bca9970090f1fa8187597cd10796c32ecea4ac02229e9869cd4f1db3
 DIST libqtxdg-3.2.0.tar.xz 67736 BLAKE2B addc2636a9bbaa0163c3d344337eca9f350ffb38f4d0e785ade9775fc7d3e38c6f7a3c6c8d8d05e7b491f0cf2c34f5ceb8d51d34eb05b56e4170e190a5b5ae4c SHA512 1a52e79e97cd148c9f406402134d6feaa6ccb8d10cfa7c0e2a3fbf728690e193c05e444012b87e38790ce0570d1cf71c6c2cee7105f11d43923040543e0dd143
-EBUILD libqtxdg-2.0.0.ebuild 872 BLAKE2B c03f688865941559943912248790cad65cdd345c3b07dfaf0c2132c7690e86c295cf5a7c25aa441ac2b741b4186aa824753b669b6ee205f0f7f0674379dbdcfe SHA512 d33df38004393c16c002146a2d356676d315042da59fef98e6944e49e860101e19ed732673adc690435d95db8e0cdbcc614af29d0dadcb87c683943f27d46e34
-EBUILD libqtxdg-3.2.0.ebuild 903 BLAKE2B 153891db8770b7b5692fe65986aadfa1407d670d52d4a50ee1d814044c5688ffd6810cf3ae5bf5e386436b5da1ebcadb80e5ecdedd82e725b5f80773bdc29af2 SHA512 5ece9eb766adb3dc71dc3a5daa09841c48c378a32c33988b0c69fb42d652c9bd49ca86a3e6a2adaf9addd84e7758762363ecdc07637c71615e18cb8bcf00566e
+EBUILD libqtxdg-3.2.0.ebuild 898 BLAKE2B c53adcda19dc7700d4023a8edf956b86b78b6c61dd3afb8fe42028e9da196f9c9d68c7d1278d357edef9a4b2c52d1b2b9f88a77a86c04192ac661a68e773aceb SHA512 6d80157a0164728ccdbdd129426c35aa91b24796eb7657475cbaf0659c048378f9e4bb37f1c519c120a98f9ae19840d1ab470d15f8785b061463f7658e3a0aeb
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild b/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
deleted file mode 100644
index 710701f20200..000000000000
--- a/dev-libs/libqtxdg/libqtxdg-2.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils virtualx
-
-DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
-}
diff --git a/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild
index 8b7be2b0ab39..d9209aa16591 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 7c45bff8869d..d65bd87b07d0 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -4,9 +4,11 @@ DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec
 DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
 DIST libressl-2.7.4.tar.gz 3359012 BLAKE2B 07b98fdc6bcdf9d888fb1b1d301c95ab6f998fb7ff2c6dfd2ecf4558768e200dfa96c394e5b321bc27ba390e92646c319ef5be5915872a7c086de8017ff8f855 SHA512 1cd82a1bff4f655251b5feb0c850f4164e0fd548e4b404407370f74dcc75c205f42efc7787a157eecac84cbbe46af48cb63f46b3fef75f4a0a9ea19a5863a691
 DIST libressl-2.8.0.tar.gz 3377310 BLAKE2B 2a2027d86e99a09a349f3f123223a8544f49410ae53dbf4b97f898895758d00b1e8f73889f0b0ad8cec6f7ba5e85f033080d0e4af92b0fd10d048136337a0213 SHA512 3004cd78a9d52dece9f24272389778d6afca549de245852004ddd57b01a0c3a6fa1cee2d56980d067d23b3ead7f7a4aa6bcf4e0c57a56f5f7d9fd3f8d23f3ca2
+DIST libressl-2.8.1.tar.gz 3375642 BLAKE2B 39b550e09cfe286e92c6b1168525bac927b37ed7c03db159e456e71abba1d411a78c7a3ad9084b28d41a3f132a959ea82e877ed159daa2c69fa59fef67fec1b8 SHA512 57af2c7a1a8522dca25c4e6371cb44f5ab074be1aded153e6e5fca4fa0844518710f7ce834d4dd309086686c492f10fca83f4d45c084eb49607cb5861f07ac99
 EBUILD libressl-2.6.4.ebuild 1454 BLAKE2B 9c0b73409f09cc0148f30c1b5464892f5ec66b275c571163c79798af7ca20600d4a1803870019cd5f3d80f31edd408c92db70129a74fcbfc104689ac7a749f24 SHA512 ad98eb1ae5dd53874030af1ddf9b813ff42fe07f3158987f314e5faecc1cabd83c5d454b0c4d5eb4fec2645959fe0eb37912046045c21b65080a4d99d1ed4190
 EBUILD libressl-2.6.5.ebuild 1454 BLAKE2B 9c0b73409f09cc0148f30c1b5464892f5ec66b275c571163c79798af7ca20600d4a1803870019cd5f3d80f31edd408c92db70129a74fcbfc104689ac7a749f24 SHA512 ad98eb1ae5dd53874030af1ddf9b813ff42fe07f3158987f314e5faecc1cabd83c5d454b0c4d5eb4fec2645959fe0eb37912046045c21b65080a4d99d1ed4190
 EBUILD libressl-2.7.3.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 EBUILD libressl-2.7.4.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 EBUILD libressl-2.8.0.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
+EBUILD libressl-2.8.1.ebuild 1379 BLAKE2B a86a70b97ca897d22a9fc2d704ded84ef17e16835a27a80c10eb2e6c430e99583d6661ad726fb0a3331033b1d9ac5e7ba715a897f2d3ab7a94044678623a7056 SHA512 0e22d04b2d5f4bcbc519c07472d3b9d24f1c67323d256afa2e4f9fd43b45a92058cfc0f750a2b1aed4f3f4e388e7a6e0310cd8730ff545104e8081691a4b151d
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.8.1.ebuild b/dev-libs/libressl/libressl-2.8.1.ebuild
new file mode 100644
index 000000000000..45e86959cf53
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.8.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/46"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	eapply_user
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 9a63a5831cfa..0f091c187992 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -6,5 +6,5 @@ DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d
 EBUILD libsodium-1.0.11-r1.ebuild 1039 BLAKE2B d5abb8deb7cbe76beec8cc9b5a5b2300d1a6d62117b33525bc1087e1f09a499a4aa0e7e279dc5dd003a3e2f18dae20104262da5822ed6d62ea63bdb197f792de SHA512 93eddc42552a4921d4de77603e8b26fbc29627b44edb889d85fbe9948ece1f0864053a8b09f5f6457eacd6e6bd1da078a91d5c67266395e1e1f5edf20b1dcacb
 EBUILD libsodium-1.0.14-r1.ebuild 1049 BLAKE2B 6a2fca4e15d07b6f757012c33597beab78c3ef05dd57928876e8301c91d710c87a1c8ec168c8deb98d4f211a0d945ccaa85dffb588155fd36c63f5f7c286a019 SHA512 ec83eb24460a3614219d1139982ed129e1c2a8fb1e459e769084280e296684671e4f82529e4c3945434a3ea345042617e2ec5bd94cad8e9db179c08c9218a3c4
 EBUILD libsodium-1.0.15-r1.ebuild 1044 BLAKE2B 1e07b5338e770271c8a0ea1833d066d88b95a61992dd5cb98da4ff5e3c897c221e6c11651871619f145bf4f55fb42b1c993fd7970470913356c8b94244a1e633 SHA512 bcf15ab7e59a53ee010fe61cf76715d46ec021b4565c51fb363513e6b9e65cedd4ed4369dad97e3c65d6e71d29ef7e1a85f7883f97c54820a1edc527ae787abc
-EBUILD libsodium-1.0.16-r2.ebuild 1199 BLAKE2B 6df35838a1c4c1194457b91372692a3cf59158462d08865d8d7480a7027800fd96eb9eb17385c8d6308cce01dcf6abfd4c8776b6a957e9ad49ee141cb3072b93 SHA512 6dc67f08544c796824367276b042835d01aafe68e93575a09d8685c66f48fb60c4534d352042fd360100e236951b414a83ec42fc94431aac3654f266221e2f3d
+EBUILD libsodium-1.0.16-r2.ebuild 1195 BLAKE2B ae355b038ae057b6779d33d4f2fbc198b02c66152869c2143528a8e443b563eeb6a344d53ec83fb3e502d08bee9e8ba80eb7445e33cc76c5006374ec93b841df SHA512 58a1df0ca09c5c6275f9af6ec153146fe212a955ffe04614a8e1ddf218aa4ce054333ffce8f642e8bcff9156f2ad46c06a291fbe8d6908e790c93e509896bd81
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
index 2afa35b750c9..393a0f21ab8e 100644
--- a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
diff --git a/dev-libs/libuev/Manifest b/dev-libs/libuev/Manifest
index 7a46f44e44cf..fe60b70f716d 100644
--- a/dev-libs/libuev/Manifest
+++ b/dev-libs/libuev/Manifest
@@ -1,5 +1,7 @@
 DIST libuev-2.1.0.tar.xz 247388 BLAKE2B e2934fb79e32bf61e22a7c8fcdd6371f089c5e8a4f5b3039c10c90abd852d08c5612f7b871ef705afdca68857a270dfd133a1436cd9f49876e0bf47b903e6328 SHA512 82bd68c75f015284d3757886720d1a0e5689cf71b40b896410e5e4e952761fe05b090a33e0787f632afa7726567667e4dbbbc6270129828656953ded6d28d02b
 DIST libuev-2.1.2.tar.xz 248092 BLAKE2B 7229acc6ae0e55a5ceba00e970a9e7b4b11049dc4f4435643e0541a7b3c75ac300ffc2839da0eaa7b3819a5910d20b608247812d32c028ff19c0cf3735d2941c SHA512 65a35f1e2cda5383267ba47bc90e2cdd769e5fb1318c11969c8f44262d8a5b2edad522688619aa6e9219c278286ba9ff997967f9281aa4f667fbe9b0842bf0ee
+DIST libuev-2.2.0.tar.xz 245680 BLAKE2B 40d0912dcec56d58863411e034c6ddded3470bc2ea3a9f49d36fa0ef924e9ff206cb96ef93582134881ce8377938688d44cfa04d7e533321baf7cfd754f0dff0 SHA512 700c91100c61af2101a6d1756eed97aaf51d6b1dc3a59f90f668d8bb6e3d817aa6f765af5acbbdaeccd4382a97c8e99d2a13ad679fc8582891e0546baa6f001f
 EBUILD libuev-2.1.0.ebuild 534 BLAKE2B 4150427bd0e11f554676c94e81e83133558c64295861e0d0ad126f4800f7546e86aa24709754aee3d766d6228f9aac25990a9d5c572c6d507ae57d820b198a5e SHA512 da87d2ddac8efd98e103319718bc62e4737b2c8609df22b8f7064ccc66ddd10d003f7aee299c8a898658f4ce22a0e8feaaae1d1e220c0a0d59b710a2ae32e286
 EBUILD libuev-2.1.2.ebuild 534 BLAKE2B a87a2d9f2abc15dfbc0aa0f9e118fbf4b7c43f622d410aace856d9b9983b3a7574656add4335904526974cc0f96423fd95eae42f5d00e3d3e084e8a93bccc3f4 SHA512 b1e88c77b5c4a352f78c9b8e9f7835570df86e63e7e5dd5ae3550da7122395a97bdf0004bba8c7e0938a541f6c8d8b7a55d642d137d7f92889007560a3ced797
+EBUILD libuev-2.2.0.ebuild 541 BLAKE2B 217a18faa003337f8ec1e7cd92859a614d0764f52272f7b8690af10b83f71aee097b835e4b2249b55617ba80c0ceb99370c0606eec23a16158ccc5ec02a85437 SHA512 6cab65a348a30b3b2e1413e40551be6957320fa85fbe039d314072d2ab3a2f714a49907c57f42b1f7f34bef1af3dfabd069a412b0bbd2ce3e0778ee104d67f0c
 MISC metadata.xml 697 BLAKE2B dcba433b09e4af6c7a3e849ec4b084545f84d08faa409b7408ae95d3f2922632f08237b6c51e1274a09299b0b09cb2031d809a8f5957f75206573695e7a9b11e SHA512 5250db4faa8c97ffb7b2a7df81b1afd4300358e2f223e1dcb15e461521c816abb09aac8c333315e506c325464ea404a4651009ce2f82b7a1270cbb35020cd4ff
diff --git a/dev-libs/libuev/libuev-2.2.0.ebuild b/dev-libs/libuev/libuev-2.2.0.ebuild
new file mode 100644
index 000000000000..aab6a4daf462
--- /dev/null
+++ b/dev-libs/libuev/libuev-2.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Lightweight event loop library for Linux"
+
+HOMEPAGE="https://github.com/troglobit/libuev"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_configure(){
+	econf --enable-static=$(usex static-libs)
+}
+
+src_install(){
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
+}
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 285314c2a997..e9e08578bc05 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,9 +1,7 @@
 DIST libusb-1.0.19.tar.bz2 521496 BLAKE2B 9f38dcb8f053019511dc2eed93772183c5487917794abd2839e981924bf05e39aba5cee4fb9a366b78e4d265fb16a921fb64c9a083323993ce21543d37073720 SHA512 f42f0187bfec16ebabad64efef7a7651ee85dcf2af1b7cbe543b7de615f9c6432f7eea5fcc6b23335591dcad287c905eb9bd56199cc5d3b47435027ad678f2c1
-DIST libusb-1.0.20.tar.bz2 795247 BLAKE2B 9b3b4b9e372487ca355611917eb00a41d439df391796edf0b4fea28fcd88ca92214d05c4beb8eaf918028d833544e385e59ca38426880c293e070c5f1fc64647 SHA512 4230047dbc18db402f399a6b228f70da37ce4f9da9d57203e5c31cf0edec5ddd664865b4f16038a2ae72c26097e713b709b9e882a11b65a274e84993d617c765
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
 DIST libusb-1.0.22.tar.bz2 598833 BLAKE2B 38d01c1dd1837434c24008151a27cdfb2b2e9aab30fe95e4403bad613a0147a13b9b029814e15520bcfc2c181b00e3c5cc1ffdc3a586a604190bf441d3c89318 SHA512 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
 EBUILD libusb-1.0.19-r1.ebuild 1549 BLAKE2B 6a12714ca41ce219044e7e7e899b3ade24ef87a30279c0e736ca3d30aa16cc83316d879d790bc3917d57cb313a643c5863263488177504c833fca8f8e7d276d3 SHA512 95e8a31d19a4780bf8c4763be4c9b78fa07e25330e237a2bd3b73a5b2de6d0c74f90b8c1da857d9e6668778cb6cbe01130b62cc31a69b8dbbe56e3f012f0a762
-EBUILD libusb-1.0.20.ebuild 1608 BLAKE2B 2cf7b9d95cdd1145c0be082a4ac76f56db425515dd47f96843548e9dae8ae20f811a64f8e6854269e6624bbce1c6cc44096b2d3c718611e77360171712ccfcbc SHA512 f3ea152ec746f8f7d3bb436217376dda43332ecb0c5bdf1c8c8354eba4bff6106744f5b499ae69b4a457b106ccc935e2b90fd0c20f51ead919fb67df912a35a3
 EBUILD libusb-1.0.21.ebuild 1581 BLAKE2B a68ca4839ac711f9d88e12211c01e04fd58725bc848e005ad079115e08441ee4bbdb04d143037ac4ef4610bf6caa0b2f499f1866e42270c56deed1d23cb858a7 SHA512 bdfc6422076d472b292a5807b4f8d4505bd7bc66a00ee0327d59386c70efcf9974bc0d635f276e657fd8182ebcb71cf390e20df1f3ce5e047a771940cb8f3588
 EBUILD libusb-1.0.22.ebuild 1575 BLAKE2B 5f37b8ba133dc6fe02160b6a119f5a486798769c5993be4f20cbf48aa5d46e8784225b4b5772f70afa13a4d33b5294cd83b65b87e77062e147e9746d1d0d5060 SHA512 52cd79ff6b82b08d0a8409433bb281ba1a5dac67de872bdf40f534a8f03930eb9cf7e08d6315f47f48552347bb4e884ca93ca719393d88398e5cdd17eddbe868
 MISC metadata.xml 437 BLAKE2B 19a1ea2b26db27c6441a15502f61ca4240b1180b9aaaaf3942ce5b8cce5ee45724385401ec067901e31a0da785a636ca2e2a9d27efe231094d3952288374d169 SHA512 a67b2294e73782a948e338bc8820bc023e39ad612319a38387b3ee15e63903687ce4d90d8246df93cf2ea498c5c8dab25cb760c3f333d6dffc5d4d7b8c77a0a0
diff --git a/dev-libs/libusb/libusb-1.0.20.ebuild b/dev-libs/libusb/libusb-1.0.20.ebuild
deleted file mode 100644
index ad04abe7f033..000000000000
--- a/dev-libs/libusb/libusb-1.0.20.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Userspace access to USB devices"
-HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc examples static-libs test udev"
-
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	!udev? ( virtual/os-headers )"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable udev) \
-		$(use_enable debug debug-log) \
-		$(use_enable test tests-build)
-}
-
-multilib_src_compile() {
-	# Bug 573802
-	emake -j1
-
-	if multilib_is_native_abi; then
-		use doc && emake -C doc docs
-	fi
-}
-
-multilib_src_test() {
-	emake check
-
-	# noinst_PROGRAMS from tests/Makefile.am
-	tests/stress || die
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi; then
-		gen_usr_ldscript -a usb-1.0
-
-		use doc && dohtml doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-
-	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.{c,h}
-		insinto /usr/share/doc/${PF}/examples/getopt
-		doins examples/getopt/*.{c,h}
-	fi
-}
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index aee35d30b0a6..d62e2f9541e2 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,8 +1,5 @@
 AUX libutf8proc-1.3.1_p2-overrun.patch 1358 BLAKE2B 4583a42923db3ad30cd407ee736b6758151e4060a2aed528a54a61ca012d0bf7113ec68994805039a725958ac5bdf15bb9b482d7ff0ab53af2188bea2d4c816e SHA512 e897917e6346f3a0c539d3e2a762a37fc553bda17c64327249835f6f64e981cd9e98c627ffc95e5b36bc54837254cbc43fe9192e7671308f18b7167f0d6cbf6b
-DIST libutf8proc-1.3.1-2-src.tar.gz 144983 BLAKE2B ee9fddecf3b7f0865a63e56e511c251e28a4adb3b9220f313735960fff16356acc0c1b6cf19dd13adb787119a09efe0c4c3f9fd4c34d09ccba0d24a19f01a3c5 SHA512 50db8b324c244061835af8e1fff6d116328e5d40dff62477fdb78ba40b07b85612d610cc616ba165d13d0d933379a2d9629167ec4cbe31120518ae3bbcba3cce
-DIST libutf8proc-1.3.1-3-src.tar.gz 144985 BLAKE2B 92f21863df1a65a552cefa526a02e460de6e92f510b385d9f65b619176ca6dd429fc3f4d16a1e27bab6547109bfd353dd8e7c5126ac71e8065e8a2928543834a SHA512 c371c7ad6814a362179e70e4cb39bfd64d44a276860116dea441797d8dfc6c3ae1c7f0a981134a71952d8c773845ddaa60eb5b98241eccea488bb59411f1c880
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libutf8proc-1.3.1_p2-r1.ebuild 556 BLAKE2B 1009d675af19af1f876b1fbeb34aab259a96df9a49282ff7e27c3d0b0b56c81bdc94c32d637ee6c200a6a67f737b83a444f98f60139c0b187bc8430a254c8de7 SHA512 21984bb51d6f313321146870d03b9c9ac2b82b235ff29710efa62f86afc50dc18574867747546eab6bde16fe923737b356a4632a784ae2c73459661a53d13086
-EBUILD libutf8proc-1.3.1_p3.ebuild 581 BLAKE2B 1a92a09758f36de86465611afdc282b12ef3e2970cb40f4117ed0ac1eadc6b4fd4e78e15382d9d9279cb2fd57d881651a36a299b10eb97646f95f98936f719b0 SHA512 169645082503a0cb0a639e877efc0659cdddb781099df255670454728dad4bc3708f18ae94a815257b3d8dfb6a3aa7a950ae799f2223635810c643ba79aa41d2
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libutf8proc-2.2.0_p1.ebuild 620 BLAKE2B e4926d0a420ec2795d5ce3b7cc0151260c40bcb76fd2cb26bbe433f11c9e35d3fc1c3a3dcfee56595940fa2906dcd3395782ac5ec0c1c9ee992ba90de52eea9d SHA512 aafb3c0ecb9a4c4075ecb3d187545dd396d93b8afdbe11390623d8ac795c04732898626a648fdf80dfffe91be9991c85c1c3341e5890dc0c8606a34654ce7041
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild b/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild
deleted file mode 100644
index bb3c286ff9b6..000000000000
--- a/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.6
-inherit netsurf
-
-DESCRIPTION="mapping tool for UTF-8 strings"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="${NETSURF_BUILDSYSTEM_SRC_URI}
-	http://download.netsurf-browser.org/libs/releases/${P/_p/-}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.1_p2-overrun.patch )
-
-S="${WORKDIR}/${P/_p/-}"
diff --git a/dev-libs/libutf8proc/libutf8proc-1.3.1_p2-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1.ebuild
index 944f03316eac..003cd696a2f6 100644
--- a/dev-libs/libutf8proc/libutf8proc-1.3.1_p2-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.5
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="mapping tool for UTF-8 strings"
@@ -13,12 +13,16 @@ SRC_URI="${NETSURF_BUILDSYSTEM_SRC_URI}
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.3.1_p2-overrun.patch )
-
 S="${WORKDIR}/${P/_p/-}"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/dev-libs/libutf8proc/metadata.xml b/dev-libs/libutf8proc/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/libutf8proc/metadata.xml
+++ b/dev-libs/libutf8proc/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index fe619b482fbe..3b10410e5d41 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -5,10 +5,12 @@ DIST libuv-1.21.0.tar.gz 1187827 BLAKE2B e534eb4a7cdde3988a34047c999fd20e83f443b
 DIST libuv-1.22.0.tar.gz 1186080 BLAKE2B 5e909c36e5ff75fb199f52d5910bb092ca4117ca0c53f8d3e7c9dd7e57f4959dca6e46db095cca93f3a079850268e5cc0fc68b2916a20773f09b2ba5f1531cc0 SHA512 e79cae6aa1d9cf2c8f7c0262c866fea2858d7104ece7c556e537e7d1cf884f191d5cd3e56539bfe857fa15dc50b57fdcb33019824cd585a2ca250a77d923af73
 DIST libuv-1.23.0.tar.gz 1189014 BLAKE2B 1bb2330773b8e7e7ee00e7000ea4076e0d93c3f54f7dc4e8ae0c6c73c652a406c907ee16a2364fc8688c7cc7a367fd3dab7a8b4885caf06a0196cb3d09fe7fb3 SHA512 d1622ea9c03661ce2dfa18e1725fc1bfdf3b16d7e40babc552dcc5b2f86d52f4dd81cac9bf89914024b11e4ed3671264dfcfba867cfa3b1a2206b89c59c95851
 DIST libuv-1.23.1.tar.gz 1190885 BLAKE2B 6a14ad9972f9f7e78627c2f1d0891c058189a26822fb99432f704ef959ad5d98a4f8308255e924ca87d14c6f64e38ed3ecf9d9203f5a51e70f555e12b32c33d7 SHA512 5c3170dea49d7954f5780bc94d5c021a8e1bf91e2d17188335825f1dc1098a8826d5eb9dac4be318ec68275888d0dfa9579a841d43de0c3520c89ab0dc70e5ab
+DIST libuv-1.23.2.tar.gz 1192529 BLAKE2B 045e7d46b9b45fb415be1827692021ae85a86b5a5b2fc5677de5d160e3b39c40a3379223fedd1ae7265707003f62e130b0c101b4fd367b9f44cd0daaa7d35dd5 SHA512 f91accf4ba9987fad23cc546a9821c3d643f8505cae22e0cbe28c4d5d5cb6b370b3483c6d95195cff3bcddd1e94f1bdab740075c3eaf22f8f673f7a57c1fdfc5
 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
 EBUILD libuv-1.22.0.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.23.0.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.23.1.ebuild 1184 BLAKE2B 4c01fa9bc2194f3f6053440a06ea037264753618ea5508ccf0b53294679854d6c6243e7ef4ce08e7a57eb67cf42705bb0b60dc55eb1fa1f000e2547b9a92fd22 SHA512 83883df664c3cfc1fddae6a834593efd5dfbe27fb767c7dd566ce95cef395e7989ddbd32ca1102251722ae180f03ba6710a03f03c45770736d36654420a2615f
+EBUILD libuv-1.23.2.ebuild 1225 BLAKE2B 7a7e7f855e8fe0ac81771e5cf64dbf9886e4a6600ec04de48d8c1b746389268d30ed0d5facc0eaaa47186f51760ce17523bb3ef641ee827c4635b57e14daee56 SHA512 c141a1f6216d4ee028937a17de132896eaaf9743eabdebaebbcadf0930bc73be9fdce7bfa33e296bd14852d69f1c2f87941b02d8ac7d4fb554faae24e0795893
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.23.2.ebuild b/dev-libs/libuv/libuv-1.23.2.ebuild
new file mode 100644
index 000000000000..446058848236
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.23.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 945cfe019690..f102310083ff 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,3 @@
-DIST libwacom-0.25.tar.bz2 478780 BLAKE2B fb9f3010f2db7aecd967508976daec40fdf956d600b2cc12a90b560e6195e7fac01d5df08413c78247fc17a97850f250b2b4533d78d9fff38871114ce5ab9357 SHA512 080d12706c3b685ee1cb963b79068e0e7c08e47296c1535cde4d2280239758d6bccbd38982a63d366cab1a77a4db287cc5bb329abaee6dbb285c4b8e010eaf67
 DIST libwacom-0.30.tar.gz 119261 BLAKE2B 4f76fcbed42c5453701e3b5dda880a26f9956a803827584aeaf080196b26bedb65f6bdccb7ffe18e7f93861dfee8a633894869b1ea4f6b95e72d64273087b60c SHA512 952ead4b39461d64d9592d0e05824669d0a8bc721aced46f5a99832da0fc63a4023f9803d416ceaf71dc7182660d05d45b799424bca7f54128fa7c44447b688b
-EBUILD libwacom-0.25.ebuild 1089 BLAKE2B 59837e9e7569797e5cefd876dcfd0a131096c147e418bee54391c4bc3aaa4755714aa5c2ef58799411b88df74b45c367b07c48103b9727c2a7704d755bc6b560 SHA512 40d0da1e92752643fe8305a75eb109ae94905376ca53c0cc0ee6e3d60c4ef6d251936249c56b11c3a90d1465ece431e5d0903e7cfd78f5cc07f8f1cafbb62944
-EBUILD libwacom-0.30.ebuild 1179 BLAKE2B 32a3cec17d3b2f9815a091fdd1361083cdfd83a07348c7091623fce80f0401aad468832bdaf98167f8dce9338a74dcce282848b626e05df0357371db7dbf5aab SHA512 955efa214c049fc5ff584e7dd091bec3fbabaf8a1e55d9ded9d22fac44c6436c697648f0331f6a311e6537a404eb609d343ef03e92053850ae7c4d606c34a99f
+EBUILD libwacom-0.30.ebuild 1175 BLAKE2B e9793b8744475b467d267622056ef59b02fa4b147bd87ff2cad3a38c29f45a50fd113008c925414fb230b47db8c7ae3a2d6581d0040d1b04b093c0a259e25d4c SHA512 5cf6d46b944b4dcbbaa7ee691f908bed59d911c3bbcb0cd19cdec73a4a964c93ba79008e025f751837b64bc4afe6749b0e42480b5b486a59125e5b52bf4b4bdc
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-0.25.ebuild b/dev-libs/libwacom/libwacom-0.25.ebuild
deleted file mode 100644
index e4c403cdcd67..000000000000
--- a/dev-libs/libwacom/libwacom-0.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils udev
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="http://linuxwacom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-libs/glib:2
-	virtual/libgudev:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	default
-	if ! use doc; then
-		sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.in || die
-	fi
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	local udevdir="$(get_udevdir)"
-	dodir "${udevdir}/rules.d"
-	# generate-udev-rules must be run from inside tools directory
-	pushd tools > /dev/null || die
-	./generate-udev-rules > "${ED}/${udevdir}/rules.d/65-libwacom.rules" || die "generating udev rules failed"
-	popd > /dev/null || die
-	use doc && dohtml -r doc/html/*
-	prune_libtool_files
-}
diff --git a/dev-libs/libwacom/libwacom-0.30.ebuild b/dev-libs/libwacom/libwacom-0.30.ebuild
index 42c113e10635..874bf7986c96 100644
--- a/dev-libs/libwacom/libwacom-0.30.ebuild
+++ b/dev-libs/libwacom/libwacom-0.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index 022eb3d3dafa..71bce97e1901 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,4 +1,4 @@
-DIST libwapcaplet-0.4.0-src.tar.gz 31435 BLAKE2B 134846d6237f07cd60769ee7d21cb20f6f60dab3d4a335914851d8cc796a8cf1d3cd86dcd97a3cc2a3bb8415b12f0cc9c54fa01243ffe33d656c298dd99e6820 SHA512 b621b9575f248e4ac7164f0a33bbc9ad533266dcf231b511f6bf9d87e60235aa14863b9596562273d5793035d579293c3125e77f0b5428377c64b6f123d1fa5b
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libwapcaplet-0.4.0.ebuild 433 BLAKE2B 34d192b000abb5e80f6469c9e81d0d1c4b239ffabbd3e25105934d1e5484554b385c0ecc19a17fb6bf3b889bf1f3fec59b5f40151f6499590dd85e4d9cc00e20 SHA512 bb57641f6acf00b817d6a7d89f9a31902ac4fb063f5b488c1ca17f098524f0a856659f2522afc679a8731ba3a660e3a35228b1927b67fcb217c18a44dd0127f3
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libwapcaplet-0.4.1.ebuild 521 BLAKE2B 6ce29fd6054fb4efc353cdf8b484788efd7ec8fa333930244531a7c412a7dced958e12a81ea132c79dff45e6a44cddb816de9fda67fd58a6feff162b248c0931 SHA512 7b09ff1c9425f28d6c8337396b78e4033bcae04838820cf52b4c5487e45f0430c0242c072348a70bc5164b6b5b46e9cbeb86842a64ee37d3a306509b5559621a
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.0.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild
index dacea21d715b..a291732ab001 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.0.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.5
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="string internment library, written in C"
@@ -15,3 +15,9 @@ KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
 IUSE="test"
 
 DEPEND="test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/dev-libs/libwapcaplet/metadata.xml b/dev-libs/libwapcaplet/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/libwapcaplet/metadata.xml
+++ b/dev-libs/libwapcaplet/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 6fb3ada9adfe..5461b299fe18 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,7 +1,8 @@
+AUX libzia-4.14-ldadd.patch 474 BLAKE2B 65dab719d72ef136692fe4e047d93005976b0408894cfe408130db6aed93accee9388276e78042b4a59b9c2bdc9ddcb83ec14e1d19603a243f464d38ba31631e SHA512 6e2cd1766fa51d935bfd903577286ed3b167f7baee043b75573132e2425f4a75978db7863a1ebe4cb5a8a0df115a2e35a99c9f9d7004cad91f340155a5b77b9e
 DIST libzia-4.11.tar.gz 577185 BLAKE2B 80de10d5852742870ff7a7995b743eddf76a966695fd7ad786537ed4ad430b60a88b2f5bcb74fb41ecd01a84f02e126a0bfffa932761cb8bf73bbeb097cca181 SHA512 6d616ca12e1db20c8bbbe0a18b4e1e0ce1b086b38123762c2e4c3f46390ff5772dd27eb9b97b332b20f3430905f6eae0fdce70aca48fd56d5e43043369233964
 DIST libzia-4.13.tar.gz 583226 BLAKE2B 088c199c188fbbee54ed533565d3509a510db5f1d3bafeb1be76cb6b2f38d40244fe768ccfa2ee62aaba856ffa7b890dc6d5ea20ec7e1289cbce609d5a56b476 SHA512 b1dc294812342d8c4cf34b013d26c3e8d56da924ef22991b47bdf5ee18990e006a7cd216e9989a6fb3ffb3cb151fa04d5aff7707a7541ec7125b39a6f17eb80b
 DIST libzia-4.14.tar.gz 597138 BLAKE2B 200e0682c6bc28248646775c5e5a71bad329edf031d0950ad8ab5244e5e925903147467d23eb3a04f9be05cca6b34947692df15620331ffc5357b73f20d363b0 SHA512 c382ef352e80df69daf3d3e4da0c0de5d8037b32182a760f88a1edf7d2b9cc7d5112de942a5a85973ccf82ca1e0771c2e92de7972ff9bec745fdb525419a2365
 EBUILD libzia-4.11.ebuild 707 BLAKE2B be3320d6589dfd6a561a6809febe80273e8e312da0c01b2d42c853e99b1b47b3fbcc64ea5ae66e5b7212db89fd0516ac46a3aa06d13c1b6c67a243ea22116005 SHA512 8c6a1b708ff15d1e2bcd88d5179079110292e067e7b2901c6d7db4746fb0fa8ee3572ebbbe3b6f48b6844f8ecaeced13f55928f6c11953a5722268f9414efb3c
 EBUILD libzia-4.13.ebuild 709 BLAKE2B 3818ea32c4f00fd2457d1507aa9830efd17c24e15bd38b0bbfcf5ef5d4fbb12ff6bed0ec2252fbe9d8813b27091f24846064479cc359b7baf431205c9970e13a SHA512 f0a1b9b019217baaa60436057eb91c80715e760f9fa9dacd0948a24937b7aafdc653be0f7bf9fedd336ace4c9ca6e6611ed4ff90f2fc68d8ac247902d1cf1035
-EBUILD libzia-4.14.ebuild 709 BLAKE2B 3818ea32c4f00fd2457d1507aa9830efd17c24e15bd38b0bbfcf5ef5d4fbb12ff6bed0ec2252fbe9d8813b27091f24846064479cc359b7baf431205c9970e13a SHA512 f0a1b9b019217baaa60436057eb91c80715e760f9fa9dacd0948a24937b7aafdc653be0f7bf9fedd336ace4c9ca6e6611ed4ff90f2fc68d8ac247902d1cf1035
+EBUILD libzia-4.14.ebuild 786 BLAKE2B f3d6dd1ab50bc88416f93c79da98f439c8f5dbb40858456991bcae580e63651ff0c267b6809aff098bb143858bfd90ddc69f75e8075500915acec3104e8892b3 SHA512 4c1f5d96337747c96e19e1c293d95eb81edef56576ed9ba47d7a6da4a942b7b8d3f1d5cdfb2cd6b576adc06ec75383913ec5775b634a96ea626f842e8881e620
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/files/libzia-4.14-ldadd.patch b/dev-libs/libzia/files/libzia-4.14-ldadd.patch
new file mode 100644
index 000000000000..a8636e1d1273
--- /dev/null
+++ b/dev-libs/libzia/files/libzia-4.14-ldadd.patch
@@ -0,0 +1,16 @@
+# add local .libs directory to library search path during build of zsdltest
+--- src/Makefile.am.orig	2018-10-19 18:19:54.067784664 +0200
++++ src/Makefile.am	2018-10-19 18:20:26.419265774 +0200
+@@ -71,9 +71,10 @@
+ 
+ zsdltest_SOURCES = zsdltest.c
+ zsdltest_LDFLAGS = -lzia 
++zsdltest_LDADD = -L.libs
+ 
+-gpiotest_SOURCES = gpiotest.c
+-gpiotest_LDFLAGS = -lzia 
++#gpiotest_SOURCES = gpiotest.c
++#gpiotest_LDFLAGS = -lzia 
+ 
+ EXTRA_DIST = regcomp.c regex_internal.c regexec.c 
+ 
diff --git a/dev-libs/libzia/libzia-4.14.ebuild b/dev-libs/libzia/libzia-4.14.ebuild
index faa975e860ad..8182298faa85 100644
--- a/dev-libs/libzia/libzia-4.14.ebuild
+++ b/dev-libs/libzia/libzia-4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,10 +22,15 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/$P-ldadd.patch )
+
+MAKEOPTS+=" -j1"
+
 src_prepare() {
 	eapply_user
+	eapply -p0 ${PATCHES}
 	sed -i -e "s/docsdir/#docsdir/g" \
-		   -e "s/docs_/#docs_/g" Makefile.am || die
+		-e "s/docs_/#docs_/g" Makefile.am || die
 	eautoreconf
 }
 
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 859357ae8b01..34c7022daef9 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -7,5 +7,5 @@ DIST newt-0.52.18.tar.gz 180425 BLAKE2B 96c10d6eb63b62a51cd75f3cc34671954abd8e0c
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
 EBUILD newt-0.52.15.ebuild 2009 BLAKE2B 60893c4f48b7e26939b65cca8f47047fb4d13558b363fc2ce7be362b77c9c3a2bbb0a833b15c3bd3a44e93a75f6bc3e8bcd2529aefd78e28c5ffc1b9dff2cf01 SHA512 342cc64da9f59c34785897b768e48687dc700e9f66c4bbf9ec0ddff1ef53eafd7cfd90971df67d2cf1c668712f793a75583ee61ae07d4dae5fbb44c2fa5c1d4f
 EBUILD newt-0.52.18.ebuild 1946 BLAKE2B c94b8d8ea555381f8a5561a983de9dedbba63eb36c76bfb7550351947f044ef4df7b3bb7316e213adda862a235ea816a5450fe1ec06a28f6f7e7689786327465 SHA512 8914e08dce91d768dead676763eccbe41ba6cea208d28348e80bf0b5e7bc5f1cb70f54c382f14642726ad64d2512edd661af18172e37577c2fb1176a76da5a30
-EBUILD newt-0.52.20.ebuild 2031 BLAKE2B 5dfc354e41c737edacbf887f2ed076666bafa9d2865ad85469c2d726c06e5032fd57d709f2bc6781ca58152b22aa3939956271384e10adb15168ba6be6e4606d SHA512 542b14580a20c5cdc646f7d86f48413d5917db2e62a30cdac6b23f183d32be397b80310f58be7667eb5b4869c62f8b04be262364f781f449c602b15cd91c5d24
+EBUILD newt-0.52.20.ebuild 2027 BLAKE2B 2315559eaced516b0a32a25b1be8b4a0f1fd1fd529f9e4d136daf22f297ccea61fdcf227ede01d3b1424c6607212ce2c846959cbe09f5c6b33b8deec314dae45 SHA512 cebf7015bb84540574900df81e235c667f0d49436e884126975e46d1b82bc4832e9b8c6cd094b7f33853ebf513df566305a1d152c2ca0bec9c16ecdbdd5cdb66
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
index 3e348b3697de..3f8f6f75f4b6 100644
--- a/dev-libs/newt/newt-0.52.20.ebuild
+++ b/dev-libs/newt/newt-0.52.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest
index 3ee7c502a2d8..4b171dedc8f5 100644
--- a/dev-libs/nsgenbind/Manifest
+++ b/dev-libs/nsgenbind/Manifest
@@ -1,7 +1,4 @@
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-DIST nsgenbind-0.4-src.tar.gz 97489 BLAKE2B e3ba3f5aa73fc2989ab93f237d90a3a6c902a66b64e01af5ca2be68e732771710748da59dbcaa0c47d356084c2096d7cb80e79dc314af1c0be26e3878e68e629 SHA512 14cb5e0ffc309c34b8387f53c2d6221d90fb8584348bd4ec73af3c0e1efc8348f11ea76799b5250ec5a253621ba106df261c0b1f3f93be641bc96b5efa118e8f
-DIST nsgenbind-0.5-src.tar.gz 106814 BLAKE2B a5de9089ff9c7607fbac8f2ba6f68575884937775355c4100f54dc9d5406eabb63670c0d80bd9180544066da1c691b2125669cf0caf21e602e939878ef4ca1be SHA512 3f3a2df9f005d03be6d36c5c4b2d11010b8cceb137ed7e0302599d526edd8a8c14dc866b971955f2a37c149f9a5bd56bf5eacb3a43ceb396efc178c732cb59bc
-EBUILD nsgenbind-0.4.ebuild 402 BLAKE2B 9dbec855096d1b238200d06b4a603502d4115ee8e96f706e9c82f447a0f4ea577fc4880f5e1794f4d71f3e4d2f075bebbbdf7d75d7124a781b8e9e030723f0af SHA512 3a7f2c0b099a896c473f6c0c4e600b09a289440c21f05e7e2c2087a9fa87b24b3adba3c8aea9ea6daf8087d09331fbc33e422a5da1d18e029cc463a179aa0a8b
-EBUILD nsgenbind-0.5.ebuild 402 BLAKE2B f7094759a34910eb790a0651cb55ae57fa3824eff6b3b1e9e0280b07f6395d3c6f5f43ee6af27e83281a2382127d598a2edd2e8d2a1676ce1e64c44aa9055c93 SHA512 f26139e6e5405848542a4f3de060f2370c0df46cadb16c9c6564807a8aa3e26c019da549d7e7cc7beb8332b3199be6506cfc47f278c9a6f13ce848174072a3b4
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+DIST nsgenbind-0.6-src.tar.gz 106862 BLAKE2B 9b40ae6298921736f7d876ae664207eb71102adbe44f4072ea46b08b63cb5cf608df4c96f3ade1c8cca964d8d8b32d68aad25431f6fd455eb8392d8313faa9e9 SHA512 3083b48e48fcf8c7f32b09d040998470d5917469e020c4ccbfb8ffdb7d1252fd27dd02f590f5a2485c6984cdbc005ea87adf0db45077aee0a91f68037c542ffb
+EBUILD nsgenbind-0.6.ebuild 490 BLAKE2B 745aca365d2097f0cffb3e1df5324b9ad6308a529f8647299b024a0a3a637b5f4b26737094474e04950310ef9b54315d86972a3dc0e9f30dbcf9da026134902d SHA512 cc986e21c41262fa74d8e90907e7ad69882345529a3a02c46ceedc2605aa6074b3ac3944e28bd4a9a36b621de51e7757d454707dd0c627c5dfdc7ac4bdaa3167
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/nsgenbind/metadata.xml b/dev-libs/nsgenbind/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/nsgenbind/metadata.xml
+++ b/dev-libs/nsgenbind/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/nsgenbind/nsgenbind-0.4.ebuild b/dev-libs/nsgenbind/nsgenbind-0.4.ebuild
deleted file mode 100644
index 03d8a77eaaa6..000000000000
--- a/dev-libs/nsgenbind/nsgenbind-0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
-HOMEPAGE="http://www.netsurf-browser.org/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE=""
-
-DEPEND="virtual/yacc"
diff --git a/dev-libs/nsgenbind/nsgenbind-0.5.ebuild b/dev-libs/nsgenbind/nsgenbind-0.6.ebuild
index 497bc1bd4d91..e0ee94d77258 100644
--- a/dev-libs/nsgenbind/nsgenbind-0.5.ebuild
+++ b/dev-libs/nsgenbind/nsgenbind-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.6
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
@@ -15,3 +15,9 @@ KEYWORDS="~amd64 ~arm ~ppc"
 IUSE=""
 
 DEPEND="virtual/yacc"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 1e24b5ad6fb4..0c065a1a6db6 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,9 +1,5 @@
-DIST ocl-icd-2.1.3.tar.gz 419083 BLAKE2B 2cd12aeb199a263581c1e02babb206b5fa1747977aa6d09bca6aa15376a5c9206a57e944b50f02cb7d2bbe634ac3522659c85b40cf336d03be48bb15e874fcda SHA512 5d0704bed8a664950131c985fc32ffe5e078874945642417122df79c66bad804307192db49a561330268664ceb59756b268cf52201b809398efe58c85f823ad3
 DIST ocl-icd-2.2.11.tar.gz 455800 BLAKE2B 64da3670d3631dba06030d5f6764522fae6c868d4cf45b1a47a0e2b004831797ff7881353a34fb6fff64e4af5b9ebd475b800303ad1e37c7c11b265981ed22a3 SHA512 54d6a281f0fc04858323ef8d1764c5d2276d9a003853d5af5821a6dd24c74a744da0ff2204179a5877d0e3f156d03c83236797cd5ca88e6897457c75da6713cd
-DIST ocl-icd-2.2.3.tar.gz 446966 BLAKE2B 53a6f960370580f2ffa954089f8d31ea3c275e3f28561883b4ad3d79bee1904d991aeec00898ef6cb0080c604ffea8fcc22c1da8f812eb162cd158f4737eddf2 SHA512 da890da32cd61e42f610df472ac651d47edb1b014d98c25a778551fe6973bdb47753417b2eeab220a07f2862468845e3ac31a2e9631eac5eed05153f09da2cb9
-DIST ocl-icd-2.2.8.tar.gz 452374 BLAKE2B b204fa88f140f854d66f8f6c2ce71423b2e9b98f203350608f302f965749e190e3afd88a19306ad3e65fe267643ed37154a0f07456a987f31bd6c81d8ec6849e SHA512 4d0364616c105ec421a39cc6a38b3a835a63280188a1e19f595eff655d50581ab1af83d2aa26fec956d33b5f492789797b3a05e29897e4342d38521d8902da96
-EBUILD ocl-icd-2.1.3.ebuild 785 BLAKE2B 8dd76c1ee749195ee0d01c155e56a19089e57534aa29d1325e212a9196610ae7cfc2e4854e518fd14007602d9eff02f4b86d2d3ffbfe88e5841c265f914a39df SHA512 f1319e24d9b2aed25101d88af02c6aaa7f92422e0fd489d6c6c91cca22a39e9bf4385a5a9737cf21d6d63a847c50800ea4faee0765e56330775f24a48ba2c140
+DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 EBUILD ocl-icd-2.2.11.ebuild 801 BLAKE2B 34e88e64693625630d301237d243f1a8f2e59db4a5797a116993286e3efb843ef058a15121d28e4d19fa33c60b1fcbc5123fdbef0596703bb57b2a91e7e7f0e8 SHA512 63fe2318b11c70188abc8d22c13db5bf55acf6bbba71eedb527390bad7785d1d2bd3d3143674c1201c0af82ae25b9b45f1e92affecee223834949b439174d7fa
-EBUILD ocl-icd-2.2.3.ebuild 803 BLAKE2B 8a208b038ff82c909ec2b65dcdef890bd486b0a59b1078b8777b31156f200c5b16e58cee2906aa16c23a61c54dd2d754b7975ff449dfeaa76f1e1ccec17fc1ff SHA512 b225f62ff73ff9ff3f866b497c22fb3de34fa7905b03b31e5482a6f1362bb06385c7e2ae47144bad4c3b95c4d72658f5f0064d44bf094babcf2a5c24d2430a80
-EBUILD ocl-icd-2.2.8.ebuild 803 BLAKE2B d51593836d6f3bf3e2ff575c30014a7fdd995f134caa9e9103342c37a839c36dd17c1031c7b4e47509f9c9d7cae5fa0277fed9dae2708832e528000f9e65fde4 SHA512 cc99d57245181dc8e1ef7fbfc228cc4e2950418d47db4fd91f5d88bfcb8efab8edee1a1100f2f42675901c75d28df6343f0e76006861c23fd86bf34bb043f60d
-MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
+EBUILD ocl-icd-2.2.12.ebuild 1207 BLAKE2B 3ff11573a0001205aa5d38ec5a5ae53384d1c34346b48eed3815a9bb95bc69ae91da8174b22f15464c1f98286dc63582adb79127e4f8bd2215b177cbfc292f85 SHA512 4b7ce8f69739927209769c583790a839c5421e5a8d3384b477496fe0869d5a8c5e822133f7c382f8f8f5a517d4d4a71ee52fc0821782d7e9a7f4f3a9d13f5629
+MISC metadata.xml 396 BLAKE2B e87119ee4f6793c9fa1229c9c2430f8eba749df95522f5f658a6bc26fa22265bdcaa185e8338eef057320342beea263b64f162b2a8ad3c6aa4db73307b949244 SHA512 69effb7af79439eae9702055f6f1e20318f30ef76827e5be6d69ae63ff39a6bafbb177c681f76ac9bdf861a9921d7c897cecaea320d796e6d104dbcab9a24b79
diff --git a/dev-libs/ocl-icd/metadata.xml b/dev-libs/ocl-icd/metadata.xml
index f3de5f693ed8..1cfa787eaf17 100644
--- a/dev-libs/ocl-icd/metadata.xml
+++ b/dev-libs/ocl-icd/metadata.xml
@@ -5,4 +5,9 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <use>
+    <flag name="khronos-headers" restrict="&gt;dev-libs/ocl-icd-2.2.11-r1">
+      Install Khronos OpenCL headers.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-libs/ocl-icd/ocl-icd-2.1.3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.1.3.ebuild
deleted file mode 100644
index d66ceb609c61..000000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
-SRC_URI="https://forge.imag.fr/frs/download.php/524/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="dev-lang/ruby"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins ocl-icd.icd
-
-	emake DESTDIR="${D}" install
-
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
-
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
-}
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
new file mode 100644
index 000000000000..6d59cbc62107
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25"
+inherit autotools flag-o-matic multilib-minimal ruby-single
+
+DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
+HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
+SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+khronos-headers"
+
+DEPEND="${RUBY_DEPS}"
+RDEPEND="app-eselect/eselect-opencl"
+
+src_prepare() {
+	replace-flags -Os -O2 # bug 646122
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --enable-pthread-once
+}
+
+multilib_src_install() {
+	default
+
+	# Drop .la files
+	find "${D}" -name '*.la' -delete || die
+
+	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
+	dodir ${OCL_DIR}/{,include}
+
+	# Install vendor library
+	mv -f "${D}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
+
+	# Install vendor headers
+	if use khronos-headers; then
+		cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers"
+	fi
+}
+
+pkg_postinst() {
+	eselect opencl set --use-old ${PN}
+}
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
deleted file mode 100644
index 6bdcf99bb97e..000000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
-SRC_URI="https://forge.imag.fr/frs/download.php/598/${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="dev-lang/ruby
-	dev-ruby/rubygems"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins ocl-icd.icd
-
-	emake DESTDIR="${D}" install
-
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
-
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
-}
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
deleted file mode 100644
index 3ccb21b5d9bd..000000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
-SRC_URI="https://forge.imag.fr/frs/download.php/698/${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="dev-lang/ruby
-	dev-ruby/rubygems"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins ocl-icd.icd
-
-	emake DESTDIR="${D}" install
-
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
-
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
-}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 486a6da958c0..261d27b43864 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,7 +1,5 @@
-DIST onig-6.7.1.tar.gz 951650 BLAKE2B 475f6de4dca5579071777de9805a7676f8bf0ba0fff360a8231895882ce5535c80ee8f12bede3d1db17497efcc904c4653f4d15d559cf5ac180039563f0c14cd SHA512 36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc
-DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9044ac807444403ea0ca602aeaa7ab86f70b9835c2042a2b48a65531c355d1f32ba22294403dc5a3f3ce895 SHA512 50005d7bccdfd5090181781c942e7814eb82ef1652453ce4bdf7f4e763344c87af84fb06c5240494d3774568913cbfc3b158e0a69edfbc1283eaeb7842dc0631
 DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
-EBUILD oniguruma-6.7.1.ebuild 1014 BLAKE2B 7d7ffa3f662ddd4f5e9a13c7869c03e1a924ffc3ea7ea97e57b701405c73bff9e46c0f1645dd80da07d51d1c2529f8540b226e8dc6d5519dd01568895433208b SHA512 e88607585975fe4afaa432e92f8319d2e63691ebbbba61ab3ac41af2796e37df5d369ac6c6152230fd723113999c9f060ff02708a11cc3a231e9312b5bbe94a9
-EBUILD oniguruma-6.8.1.ebuild 968 BLAKE2B a83d76cf686f58abf1adc1e5c210dc84ec82d5b6f85789a72ad5f5314a4df8166e6c6e98348a107dcd732ec1dc755026db0b887a27fb0c567fd655c06c77a5da SHA512 9d12c6b3e6e41e69f0658ebe45fd09c4f075ced52023080e76c76e38fcca32f2704ec5aaee48d151a64bff4cb4dce8a812f5136699bf927b9237fdb150f94f91
+DIST onig-6.9.0.tar.gz 869809 BLAKE2B a60b0f99e3a6cda81f09a4dd1af98d0ca98b9127090723d50f4c22874042719a31bcd23f2e3b1fac1daf62d723b1c8884036b8543c4c83a7fe5e2ad8e4daf625 SHA512 75d0f0406ad4313332a10990157cede5c2738d2b9b6aa780a99d2651f185e1de12dba57c919ee58ccef0633b1d703e67935af5ea4b36895279457a189b8825df
 EBUILD oniguruma-6.8.2.ebuild 970 BLAKE2B 5925f193741dfb7f8da7be4389c6bddfc8bb618d537edd2ac9e2477287f18e9997fdf282872b30f846cf92aec1c30fcd1aeb4c6e58cdacb069acf6220ed01602 SHA512 37c46f50bfd281fd331e9f799b7f9957aee3fba71824f69b6e2bb3d7b078125c53976a0c6651956034f47c6dca8a2885939b1334a6719a8d9d44e0265b2b97d2
-MISC metadata.xml 898 BLAKE2B e2c9418b8a69edf7d702de74609e6a4122c5a51160869dabe820d07a5f9f2ef478fcea57b9348babe49066b78b6d1b5bd6f60b7798fa0eb8edf13ff4510d7858 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a
+EBUILD oniguruma-6.9.0.ebuild 978 BLAKE2B 4a07a3eb8d1d61f09126c71b431e3dad423febc29dcd8434a345931c17469e4530214c8dbc0e96fb8980955606daf4db84be0fdf17a08b78ce1842e7b627f357 SHA512 94fc81c18f9c908b6fc743f7df96f2702e708be2a2dec1eb9d8baba527f5d6e6db2444c57120fd898fe88974b34e71bd66a438a1ecb95bc9ff3f9d138c7f96d3
+MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/metadata.xml b/dev-libs/oniguruma/metadata.xml
index 355bf4764886..2dc293268b64 100644
--- a/dev-libs/oniguruma/metadata.xml
+++ b/dev-libs/oniguruma/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -15,9 +15,6 @@
     <subslots>Reflect ABI of libonig.so.</subslots>
   </slots>
   <use>
-    <flag name="combination-explosion-check">
-      enable combination explosion check
-    </flag>
     <flag name="crnl-as-line-terminator">
       enable CR+NL as line terminator
     </flag>
diff --git a/dev-libs/oniguruma/oniguruma-6.7.1.ebuild b/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
deleted file mode 100644
index 3fc38a5bd562..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable combination-explosion-check) \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.8.1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.0.ebuild
index c985bacd2f95..c37d24a66105 100644
--- a/dev-libs/oniguruma/oniguruma-6.8.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2003-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit multilib-minimal
 
@@ -18,7 +18,7 @@ IUSE="crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
 
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d0698cbdb29b..785c3620b33a 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -24,5 +24,5 @@ DIST openssl-1.1.1.tar.gz 8337920 BLAKE2B 266fb97bad4e1e7c0694c67a065d6669560695
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
 EBUILD openssl-1.0.2p.ebuild 10101 BLAKE2B c0e4eb3bd9dd21687d7a4be4c329baa6ca569b97ec16a090d0b5eaece0171a6f656facaab06fe085592038dd3d9d9aded69a5426e8605a32c3af8f295f74f34f SHA512 fc0affd0d6fe6dc12a6301135c6fed7beb5ca74fb0940d0af05551b402e09b6e130acc19de6f7b2853278f743c44a5f8c7da773c5324877b95bdc25b1b51b623
 EBUILD openssl-1.1.0i.ebuild 9107 BLAKE2B 8bee8407c13fbd1cfc7e13b4d11fb57ce9dd494d3ca8cf6cbd34f9f0e57dff824e421c31fc29e408ebf3a752896dc631f045b32757f2d89bacd2b9a52abe4722 SHA512 0cf7fd1a3957e197ac6b0d61a384a673b8216b0a07a90f61708759ef80e59afa1ab8e9f5761c1896439ee0cc6902bdd5bc83f4723302c648944d10d78d8396f4
-EBUILD openssl-1.1.1.ebuild 7879 BLAKE2B 5e14c797a51486b7b1affdeec121e10e5d83bd017e042a0cb182ec3e3dbb8c9394082f0757911c0e46341c881c842f63cf90f3f708333827cf4d1be135bdb47c SHA512 c9f76da7864f61edfb4a99f203b684b7d0c20708eb4aa5b064b4b43096b69f7fafecb1cfbe5df8a9f67da33707cf19fdca9de0fb41049d7497b0de75564fbe67
+EBUILD openssl-1.1.1.ebuild 7877 BLAKE2B df40954123b720ad283e694d22406c79287bf394d7cc52a76badad76aa33a81e20a44aa25f79e16bcaaa2c87eddf68973653cafe6884c476baafed3aba5c95e9 SHA512 e41af66f74829bce5210e659e5a9330c319ee572eecfeec5c59bd11eb117e95ef5ff7e9e880299291231069100873148b562865322e87a5db7cadd64013e62f1
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.1.1.ebuild b/dev-libs/openssl/openssl-1.1.1.ebuild
index 4c92eedb393a..3b7cd3fc0197 100644
--- a/dev-libs/openssl/openssl-1.1.1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -59,7 +59,7 @@ src_prepare() {
 		-e $(has noman FEATURES \
 			&& echo '/^install:/s:install_docs::' \
 			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
 		Configurations/unix-Makefile.tmpl \
 		|| die
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index ec7a05c5acbe..da1674e57e2e 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -7,6 +7,7 @@ AUX protobuf-3.5.0-atomic_operations.patch 812 BLAKE2B f55d364fa5b7ee405d7cb9b08
 AUX protobuf-3.6.0-disable_no-warning-test.patch 965 BLAKE2B 6ec0b1fc9d9d0be4f6dc9bc023d65b6b04c98d624ca4d1926cff0554d774d7cffd8d3597383acff1b7aca1a92dff4dd8368d5d86f1612aace16ede836f025af5 SHA512 82e601a26e51903e6b193c50960024240aecd3ddeeba8b29f437c550ad0bd277573ea4f83bcd70b2a4187c7df2b25af2790de22fb6f009640c403a9502d703be
 AUX protobuf-3.6.0-protoc_input_output_files.patch 9632 BLAKE2B 6466f6f6cf08e7a9a89ced8281790593fa9ea85e029d59ff20bba8c9add16bbb039a44d1839516bb109b9a2b269773640b43e6137fb9ccf5f100ef4109ad2b8d SHA512 8ac3c42684869e1b45d0d1ec70912610eaaa6962bc14d9a89b1244f424af7d638b4905b6dbd7445cd5f54bc4520fc1fbae88c66d9f4a9169db879abd1fba2faf
 AUX protobuf-3.6.0-system_libraries.patch 6323 BLAKE2B 0fb8e389a58b76c592b592782900b48bb6c68e85fc159d4b9a59a43ab5a116916f7d9ef15cca392e5751f015a887f855631abb124b4d4109d51f6ba401059549 SHA512 ab58b9aa9d1398a15346d6e85611ad826f8e52744aa137ca4f138348b4738afc7c6cd27129f925f5142edac7e272d56da880a83b216b2ce264804d6967997728
+AUX protobuf-3.6.1-libatomic_linking.patch 1753 BLAKE2B 50f8ac92dfada973ebcd187fa508a46ddd5d4e034e2eade2a3fcbb35ffab771578b241fa9a5343b46e91c90c4507e1d3a75a1bebc3426dbb1694c0fbb8cc03bf SHA512 c8bcb885dcf7d2871136a6410750aad69a61450b5a4bc80df56246a5875e1e9895d2d63e9e9e6deda3c4e516cd07344b92619457ef41f4f2ff0710c774957466
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
@@ -14,5 +15,5 @@ DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94ae
 EBUILD protobuf-3.5.1.1.ebuild 2621 BLAKE2B f5d279625735d30a1025c414b20f60dd0385c7d8449fde3e45e6540fc1dcc90614c7e5d3c22c26ef89e7c0374f112ea84a5702ef679d01448923bfccb3364133 SHA512 fe1689582cbd86d2cb31bf85e44a1968524350b7fe62d2f97b20ec368e3046d567c746c26d7d773cba6f1d498f2527ad59dbb749e738458912e90b8b44d7e070
 EBUILD protobuf-3.5.2.ebuild 2491 BLAKE2B 7d13d39cca5329ea99664f9ebc22c38d5a88f013e0e8dabe7f8a8b4229b993943a7cba2cdb81c28e3070e9fc5a652185d17e988efc32883da34615a1453dd198 SHA512 5f4aa9d253c246d6420badffb87eb66939c3e2faf765426da34c85977431341e2ae7b9aac2595cbd24d1ae8be9ec836771b02e66508af84b74ddc0d695c3418d
 EBUILD protobuf-3.6.0.1.ebuild 2491 BLAKE2B 00444b7406baff1560defc88f3e3cde102cd24db454684fb2a919141fae3ba9000486b062f9a8128e0627930794af0f825555526d5a822363d944f2d064c7c52 SHA512 98ebec7694e6a0a47fa98b52371f74ca538f00ae649973e82eed51e4a3600e44c385a028dc3156c0a6c2232a305e317a95b389249090ebba6c77f77375ce49c1
-EBUILD protobuf-3.6.1.ebuild 2491 BLAKE2B 5bca8ad4099728658473282f8649d56321c5c5ff1e560a0b552fc3431b7cb3fef3ba2092c02c9fb799e8c3dddc42a3e454ea35b6c63b91038caa4c183a83feae SHA512 f6d59bf331d98a6805b5fd29d9b9fc37ecb5dbb1e23afa05e1bfb46eb48ee63f81e2b3088e0be13538619daef3f3c4f1e92f3b6717f37adc4a39d13a4a0619ba
+EBUILD protobuf-3.6.1.ebuild 2537 BLAKE2B f8ab500061fc434db98568270a6babc1b33a407997a5084d60378d851000cd9d4669bae169ff4091d3745005bb1c37618a1771d40a456d0664a9d052cd4bec38 SHA512 bd1c242e1741f51f5d4e4592226b8b2958ad788d2ef2224428dc2445b121e3efc38039549ca32b4991a61a721f4e63f728696253501acb21c2b8c7f52f2fdfed
 MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983
diff --git a/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch b/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch
new file mode 100644
index 000000000000..2b357b213170
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch
@@ -0,0 +1,49 @@
+https://github.com/protocolbuffers/protobuf/issues/5219
+https://github.com/protocolbuffers/protobuf/pull/5227
+https://github.com/protocolbuffers/protobuf/commit/56b40a8f055cfd05633054aed5d3466a6e058b72
+
+--- /configure.ac
++++ /configure.ac
+@@ -165,6 +165,22 @@
+ ])
+ AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1])
+ 
++dnl On some platforms, std::atomic needs a helper library
++AC_MSG_CHECKING(whether -latomic is needed)
++AC_LINK_IFELSE([AC_LANG_SOURCE([[
++  #include <atomic>
++  #include <cstdint>
++  std::atomic<std::int64_t> v;
++  int main() {
++    return v;
++  }
++]])], STD_ATOMIC_NEED_LIBATOMIC=no, STD_ATOMIC_NEED_LIBATOMIC=yes)
++AC_MSG_RESULT($STD_ATOMIC_NEED_LIBATOMIC)
++if test "x$STD_ATOMIC_NEED_LIBATOMIC" = xyes; then
++  LIBATOMIC_LIBS="-latomic"
++fi
++AC_SUBST([LIBATOMIC_LIBS])
++
+ AS_IF([test "$with_protoc" != "no"], [
+   PROTOC=$with_protoc
+   AS_IF([test "$with_protoc" = "yes"], [
+--- /src/Makefile.am
++++ /src/Makefile.am
+@@ -163,7 +163,7 @@
+ 
+ lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
+ 
+-libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
++libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
+ libprotobuf_lite_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined
+ if HAVE_LD_VERSION_SCRIPT
+ libprotobuf_lite_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf-lite.map
+@@ -209,7 +209,7 @@
+   google/protobuf/io/zero_copy_stream.cc                       \
+   google/protobuf/io/zero_copy_stream_impl_lite.cc
+ 
+-libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
++libprotobuf_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
+ libprotobuf_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined
+ if HAVE_LD_VERSION_SCRIPT
+ libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map
diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild
index 3b3bdeaf3517..380f12778c9f 100644
--- a/dev-libs/protobuf/protobuf-3.6.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
@@ -23,6 +23,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
 	"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
 	"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 4ac334fab553..fe43e4fe79c1 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,3 @@
-DIST qtkeychain-0.8.0.tar.gz 34686 BLAKE2B bb20ace4393e04a8c8167ce112499fed75615ed165824bfcbba6a243e374523ff397aa85eb324ee8d742295a1bd4618a363fae6f92aae74caf09b9ca18d76c1e SHA512 be83ebc665a7916e96a2fd9990c72cd29373196591cf557fa6f9691f332ab67cc5475cab240c3e50e76cb37e0b7f189f0a1f2c3a70a6f655918e1d2465ed2f33
 DIST qtkeychain-0.9.0.tar.gz 35614 BLAKE2B b8fbcc3737808f8415f703cd92dd1f036fd6d1d83c056562e0142f67a234ddc29ad7f029ce9f520c8bcf179d8b99b5cf8b702ad010763956ff0fb8ce3f030934 SHA512 d8e7895169e9746c234a156e00edb939926d14da1a5eadab7cb1e67790958973bfd11c9c04c6fa5cf776aafbd0af40dcd50c683f1c80bef60d47d1465bb350df
-EBUILD qtkeychain-0.8.0.ebuild 771 BLAKE2B 0cce7f8a6e103b0a982454fe6d6c3faf82d0b2bc69060a59a80e1cd2e766eb80d87329614e04e441b7471741bee23c67d6b463c13d24df8493b3fef4ec7fbbc5 SHA512 41a537d69f072adf00720c891382795d6c4cd38fc7936cf91517f5ee56005defddda4d51d16dd8317bad2d8afa23ee0bfc4a7e47689b3ee315efd1bc5fa04e8e
-EBUILD qtkeychain-0.9.0.ebuild 899 BLAKE2B b3eb1cd027c97c362d6555ea1d6ffd8e8d6b1a3f44bb1dce7d2caaa89a593ff84f806aea78a7bfbef3732f72ba1a52b7b038bf8ca6baafa79294331d6fda4723 SHA512 16a16f1e8f8a1a1bf59643ec18f1c8c179987ed6075abdbb127cb3cd1503b4c5a61d2e2bbdc3a5c9a5606e1d343a27111d90e7bc226f20a83ca65d626a94f751
+EBUILD qtkeychain-0.9.0.ebuild 898 BLAKE2B ebc33253cd15e667f49e9fcb25743fa7578ea4a46512a41d992ff6ef14803e37aa58393377b66785e59e4990436b25d5b9ef5c1e3429bfdced8d3789dc6bf739 SHA512 01084d23b92c7da46a44bb2b16cd4eca4f82750c23c962306dc7ba3ed3dded92215bd16d6e933257106694cef594ed67fabdb97040ddd48fd5b52ad7e4a3d4cb
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
deleted file mode 100644
index 3c29800f75b1..000000000000
--- a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Qt API for storing passwords securely"
-HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gnome-keyring"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-"
-
-DOCS=( ChangeLog ReadMe.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT4=OFF
-		-DQTKEYCHAIN_STATIC=OFF
-		-DBUILD_TRANSLATIONS=ON
-		-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
index 955b422dd8ce..78480512c988 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt API for storing passwords securely"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="${HOMEPAGE}.git"
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index 3d6a2cd7bb8c..6d2282f07e34 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,8 +1,5 @@
-AUX urdfdom1.patch 15931 BLAKE2B abd7a35201cc3e768555ce6c1d99ff0c2fba45cb86891abe26970f0fedde3190ab8a07f2f6f9037640bb43bd94334b010dd8b51c1fea9577a03abff88c86ba33 SHA512 3acc8f2c3e7908a09e5e71d64d13bfc6f439c0a83c56ec2b70ec1ec1491483d370f837e70db9872d02f1e1c77c0127263d8e28ccb8d5ac44c527d664a2b1694d
-DIST sdformat-5.2.0.tar.bz2 445542 BLAKE2B 89daf9e03613bd88aceb1a2034cf0f9efe7b28ffb7aef8add4fc484a6e78d7189b4b6183fca83db4bb8017a4901d2fb3df7dc43e995bf2da8bb0fcde9510c6c9 SHA512 65df9f0d351ab894af41cc2081dc8ab179336092ceba17979720bed4d58f77e9648863501d83f073ea8478197e7e0a7d7a9f8efd3a54d22ee28d74765cebcee7
-DIST sdformat-5.3.0.tar.bz2 447471 BLAKE2B 9b511782f5d2517778fc0c977d1deab00ee7789f50628546b5ca8c1f464cc3ca132b83e1054867ec1d6678bca664232e1d9a499ff095d4f9a623f5061fc340c1 SHA512 63106bc438decb00157eca5fd3f7f783197a1f17a76008bee5d18d5c146f199e67852ef74cbbc53918760a0cdf382628ea84d2b4618512738cd574de1fc719d8
 DIST sdformat-6.0.0.tar.bz2 473765 BLAKE2B af3ed14323c2bed8ee5a22580dcb6d73a5e5c772f39ad7f806bf2cdb88d6f2c885585f36a666f2ec711dbd7ad6051ba69d79d2a9f0af7ad3b3681543b9feafe7 SHA512 2188de97cb1eb1117a694d54a0a42112bd7e5b5a4b00c04e049de73a10947904940565e36df93ca08ea5910e628983e234d07c57694c463e0794c48e20cedb21
-EBUILD sdformat-5.2.0.ebuild 984 BLAKE2B a1ba8fb82e2424fd57be0d9eea2acf71088eda48d49e933d40c83cf89814b100f04f13a6490ec652218e47da7024b9cf16ff5951e8d0db08659f296eb030e5c0 SHA512 a6dedd6d405c876665d85fe6c7b21fde03563e374d04a84587e7dffb1efb63e55cb6f53946e74f4749114cee3e80219f2adddc94a8a7dabe65ba028a55de8e7a
-EBUILD sdformat-5.3.0.ebuild 984 BLAKE2B a1ba8fb82e2424fd57be0d9eea2acf71088eda48d49e933d40c83cf89814b100f04f13a6490ec652218e47da7024b9cf16ff5951e8d0db08659f296eb030e5c0 SHA512 a6dedd6d405c876665d85fe6c7b21fde03563e374d04a84587e7dffb1efb63e55cb6f53946e74f4749114cee3e80219f2adddc94a8a7dabe65ba028a55de8e7a
+DIST sdformat-6.1.0.tar.bz2 465231 BLAKE2B 5b12c4974662245ecb01e342632e274b58512dd2c223dfbf8e1ef9bb2ba267f16bc130b62367b09a9cac9e2ccbd2829439d055f2fa062f34df9f4a6ceb1a571e SHA512 6c5a03e877cba3b734f1cb132582274249bd0cb3a8d463be9077519d8ad126bb15650947b5455b3cdd1abea727918b21369b40a12de4fc5d6806880fd8686b97
 EBUILD sdformat-6.0.0.ebuild 944 BLAKE2B 1f9dd5d2c061f0964e8e3314d0cc68e09c5cee6861418eac1578f002ec016119000e5e2b7b516da129b7ee57c3399de75adc7355651ff5954a80f1a28c776226 SHA512 0d3563149ef99bb6805f02c71365378ffd7ea630251d52d8e7b818070ecc87c581d3a792b347c345955845e07e7ebfda08c79fe26ad23251bdb925e26e252e83
+EBUILD sdformat-6.1.0.ebuild 941 BLAKE2B 0fe4f1798fb5dd32f9b156ae629d37a30581018f31699e33144098e76152ba05d61fe8e01d604b2f1f183fd65dca5d3a62147a97a4af667b33187b03d00d368a SHA512 a5d7d31c0d4dd7d05d08737382b8b96e22d875ce28462a06300fc6db8063617b2c65fc8645b5f94053bb37a917f03057ecdcf621cba3303bb519d0f3d4339a77
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/dev-libs/sdformat/files/urdfdom1.patch b/dev-libs/sdformat/files/urdfdom1.patch
deleted file mode 100644
index d76376aec016..000000000000
--- a/dev-libs/sdformat/files/urdfdom1.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-Index: sdformat-4.1.1/src/parser_urdf.cc
-===================================================================
---- sdformat-4.1.1.orig/src/parser_urdf.cc
-+++ sdformat-4.1.1/src/parser_urdf.cc
-@@ -25,6 +25,7 @@
- #include "urdf_model/model.h"
- #include "urdf_model/link.h"
- #include "urdf_parser/urdf_parser.h"
-+#include <urdf_model/utils.h>
- 
- #include "sdf/SDFExtension.hh"
- #include "sdf/parser_urdf.hh"
-@@ -32,10 +33,10 @@
- 
- using namespace sdf;
- 
--typedef boost::shared_ptr<urdf::Collision> UrdfCollisionPtr;
--typedef boost::shared_ptr<urdf::Visual> UrdfVisualPtr;
--typedef boost::shared_ptr<urdf::Link> UrdfLinkPtr;
--typedef boost::shared_ptr<const urdf::Link> ConstUrdfLinkPtr;
-+typedef std::shared_ptr<urdf::Collision> UrdfCollisionPtr;
-+typedef std::shared_ptr<urdf::Visual> UrdfVisualPtr;
-+typedef std::shared_ptr<urdf::Link> UrdfLinkPtr;
-+typedef std::shared_ptr<const urdf::Link> ConstUrdfLinkPtr;
- typedef std::shared_ptr<TiXmlElement> TiXmlElementPtr;
- typedef std::shared_ptr<SDFExtension> SDFExtensionPtr;
- typedef std::map<std::string, std::vector<SDFExtensionPtr> >
-@@ -78,7 +79,7 @@ void InsertSDFExtensionJoint(TiXmlElemen
- /// reduced fixed joints:  check if a fixed joint should be lumped
- ///   checking both the joint type and if disabledFixedJointLumping
- ///   option is set
--bool FixedJointShouldBeReduced(boost::shared_ptr<urdf::Joint> _jnt);
-+bool FixedJointShouldBeReduced(std::shared_ptr<urdf::Joint> _jnt);
- 
- /// reduced fixed joints:  apply transform reduction for ray sensors
- ///   in extensions when doing fixed joint reduction
-@@ -217,9 +218,9 @@ std::string Values2str(unsigned int _cou
- 
- 
- void CreateGeometry(TiXmlElement* _elem,
--    boost::shared_ptr<urdf::Geometry> _geometry);
-+    std::shared_ptr<urdf::Geometry> _geometry);
- 
--std::string GetGeometryBoundingBox(boost::shared_ptr<urdf::Geometry> _geometry,
-+std::string GetGeometryBoundingBox(std::shared_ptr<urdf::Geometry> _geometry,
-     double *_sizeVals);
- 
- ignition::math::Pose3d inverseTransformToParentFrame(
-@@ -254,7 +255,7 @@ urdf::Vector3 ParseVector3(const std::st
-   std::vector<std::string> pieces;
-   std::vector<double> vals;
- 
--  boost::split(pieces, _str, boost::is_any_of(" "));
-+  urdf::split_string(pieces, _str, " ");
-   for (unsigned int i = 0; i < pieces.size(); ++i)
-   {
-     if (pieces[i] != "")
-@@ -262,7 +263,7 @@ urdf::Vector3 ParseVector3(const std::st
-       try
-       {
-         vals.push_back(_scale
--            * boost::lexical_cast<double>(pieces[i].c_str()));
-+            * std::stod(pieces[i].c_str()));
-       }
-       catch(boost::bad_lexical_cast &)
-       {
-@@ -349,7 +350,7 @@ void ReduceCollisionToParent(UrdfLinkPtr
-     UrdfCollisionPtr _collision)
- {
- #ifndef URDF_GE_0P3
--  boost::shared_ptr<std::vector<UrdfCollisionPtr> > cols;
-+  std::shared_ptr<std::vector<UrdfCollisionPtr> > cols;
-   cols = _parentLink->getCollisions(_name);
- 
-   if (!cols)
-@@ -427,7 +428,7 @@ void ReduceVisualToParent(UrdfLinkPtr _p
-     UrdfVisualPtr _visual)
- {
- #ifndef URDF_GE_0P3
--  boost::shared_ptr<std::vector<UrdfVisualPtr> > viss;
-+  std::shared_ptr<std::vector<UrdfVisualPtr> > viss;
-   viss = _parentLink->getVisuals(_name);
- 
-   if (!viss)
-@@ -950,7 +951,7 @@ void ReduceVisualsToParent(UrdfLinkPtr _
-   // (original parent link name before lumping/reducing).
- #ifndef URDF_GE_0P3
-   for (std::map<std::string,
--      boost::shared_ptr<std::vector<UrdfVisualPtr> > >::iterator
-+      std::shared_ptr<std::vector<UrdfVisualPtr> > >::iterator
-       visualsIt = _link->visual_groups.begin();
-       visualsIt != _link->visual_groups.end(); ++visualsIt)
-   {
-@@ -1057,7 +1058,7 @@ void ReduceCollisionsToParent(UrdfLinkPt
-   // (original parent link name before lumping/reducing).
- #ifndef URDF_GE_0P3
-   for (std::map<std::string,
--      boost::shared_ptr<std::vector<UrdfCollisionPtr> > >::iterator
-+      std::shared_ptr<std::vector<UrdfCollisionPtr> > >::iterator
-       collisionsIt = _link->collision_groups.begin();
-       collisionsIt != _link->collision_groups.end(); ++collisionsIt)
-   {
-@@ -1160,7 +1161,7 @@ void ReduceJointsToParent(UrdfLinkPtr _l
-   // a parent link up stream that does not have a fixed parentJoint
-   for (unsigned int i = 0 ; i < _link->child_links.size() ; ++i)
-   {
--    boost::shared_ptr<urdf::Joint> parentJoint =
-+    std::shared_ptr<urdf::Joint> parentJoint =
-       _link->child_links[i]->parent_joint;
-     if (!FixedJointShouldBeReduced(parentJoint))
-     {
-@@ -1431,31 +1432,31 @@ void URDF2SDF::ParseSDFExtension(TiXmlDo
-       else if (childElem->ValueStr() == "dampingFactor")
-       {
-         sdf->isDampingFactor = true;
--        sdf->dampingFactor = boost::lexical_cast<double>(
-+        sdf->dampingFactor = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "maxVel")
-       {
-         sdf->isMaxVel = true;
--        sdf->maxVel = boost::lexical_cast<double>(
-+        sdf->maxVel = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "minDepth")
-       {
-         sdf->isMinDepth = true;
--        sdf->minDepth = boost::lexical_cast<double>(
-+        sdf->minDepth = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "mu1")
-       {
-         sdf->isMu1 = true;
--        sdf->mu1 = boost::lexical_cast<double>(
-+        sdf->mu1 = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "mu2")
-       {
-         sdf->isMu2 = true;
--        sdf->mu2 = boost::lexical_cast<double>(
-+        sdf->mu2 = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "fdir1")
-@@ -1465,13 +1466,13 @@ void URDF2SDF::ParseSDFExtension(TiXmlDo
-       else if (childElem->ValueStr() == "kp")
-       {
-         sdf->isKp = true;
--        sdf->kp = boost::lexical_cast<double>(
-+        sdf->kp = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "kd")
-       {
-         sdf->isKd = true;
--        sdf->kd = boost::lexical_cast<double>(
-+        sdf->kd = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "selfCollide")
-@@ -1488,13 +1489,13 @@ void URDF2SDF::ParseSDFExtension(TiXmlDo
-       else if (childElem->ValueStr() == "maxContacts")
-       {
-         sdf->isMaxContacts = true;
--        sdf->maxContacts = boost::lexical_cast<int>(
-+        sdf->maxContacts = std::stoi(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "laserRetro")
-       {
-         sdf->isLaserRetro = true;
--        sdf->laserRetro = boost::lexical_cast<double>(
-+        sdf->laserRetro = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "springReference")
-@@ -1510,37 +1511,37 @@ void URDF2SDF::ParseSDFExtension(TiXmlDo
-       else if (childElem->ValueStr() == "stopCfm")
-       {
-         sdf->isStopCfm = true;
--        sdf->stopCfm = boost::lexical_cast<double>(
-+        sdf->stopCfm = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "stopErp")
-       {
-         sdf->isStopErp = true;
--        sdf->stopErp = boost::lexical_cast<double>(
-+        sdf->stopErp = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "stopKp")
-       {
-         sdf->isStopKp = true;
--        sdf->stopKp = boost::lexical_cast<double>(
-+        sdf->stopKp = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "stopKd")
-       {
-         sdf->isStopKd = true;
--        sdf->stopKd = boost::lexical_cast<double>(
-+        sdf->stopKd = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "initialJointPosition")
-       {
-         sdf->isInitialJointPosition = true;
--        sdf->initialJointPosition = boost::lexical_cast<double>(
-+        sdf->initialJointPosition = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "fudgeFactor")
-       {
-         sdf->isFudgeFactor = true;
--        sdf->fudgeFactor = boost::lexical_cast<double>(
-+        sdf->fudgeFactor = std::stod(
-             GetKeyValueAsString(childElem).c_str());
-       }
-       else if (childElem->ValueStr() == "provideFeedback")
-@@ -1917,7 +1918,7 @@ void InsertSDFExtensionCollision(TiXmlEl
-           if ((*ge)->isMaxContacts)
-           {
-             AddKeyValue(_elem, "max_contacts",
--                boost::lexical_cast<std::string>((*ge)->maxContacts));
-+                std::to_string((*ge)->maxContacts));
-           }
-         }
-       }
-@@ -2339,7 +2340,7 @@ void InsertSDFExtensionRobot(TiXmlElemen
- 
- ////////////////////////////////////////////////////////////////////////////////
- void CreateGeometry(TiXmlElement* _elem,
--    boost::shared_ptr<urdf::Geometry> _geom)
-+    std::shared_ptr<urdf::Geometry> _geom)
- {
-   TiXmlElement *sdfGeometry = new TiXmlElement("geometry");
- 
-@@ -2351,8 +2352,8 @@ void CreateGeometry(TiXmlElement* _elem,
-     case urdf::Geometry::BOX:
-       type = "box";
-       {
--        boost::shared_ptr<const urdf::Box> box;
--        box = boost::dynamic_pointer_cast< const urdf::Box >(_geom);
-+        std::shared_ptr<const urdf::Box> box;
-+        box = std::dynamic_pointer_cast< const urdf::Box >(_geom);
-         int sizeCount = 3;
-         double sizeVals[3];
-         sizeVals[0] = box->dim.x;
-@@ -2366,8 +2367,8 @@ void CreateGeometry(TiXmlElement* _elem,
-     case urdf::Geometry::CYLINDER:
-       type = "cylinder";
-       {
--        boost::shared_ptr<const urdf::Cylinder> cylinder;
--        cylinder = boost::dynamic_pointer_cast<const urdf::Cylinder >(_geom);
-+        std::shared_ptr<const urdf::Cylinder> cylinder;
-+        cylinder = std::dynamic_pointer_cast<const urdf::Cylinder >(_geom);
-         geometryType = new TiXmlElement(type);
-         AddKeyValue(geometryType, "length",
-             Values2str(1, &cylinder->length));
-@@ -2378,8 +2379,8 @@ void CreateGeometry(TiXmlElement* _elem,
-     case urdf::Geometry::SPHERE:
-       type = "sphere";
-       {
--        boost::shared_ptr<const urdf::Sphere> sphere;
--        sphere = boost::dynamic_pointer_cast<const urdf::Sphere >(_geom);
-+        std::shared_ptr<const urdf::Sphere> sphere;
-+        sphere = std::dynamic_pointer_cast<const urdf::Sphere >(_geom);
-         geometryType = new TiXmlElement(type);
-         AddKeyValue(geometryType, "radius",
-             Values2str(1, &sphere->radius));
-@@ -2388,8 +2389,8 @@ void CreateGeometry(TiXmlElement* _elem,
-     case urdf::Geometry::MESH:
-       type = "mesh";
-       {
--        boost::shared_ptr<const urdf::Mesh> mesh;
--        mesh = boost::dynamic_pointer_cast<const urdf::Mesh >(_geom);
-+        std::shared_ptr<const urdf::Mesh> mesh;
-+        mesh = std::dynamic_pointer_cast<const urdf::Mesh >(_geom);
-         geometryType = new TiXmlElement(type);
-         AddKeyValue(geometryType, "scale", Vector32Str(mesh->scale));
-         // do something more to meshes
-@@ -2451,7 +2452,7 @@ void CreateGeometry(TiXmlElement* _elem,
- 
- ////////////////////////////////////////////////////////////////////////////////
- std::string GetGeometryBoundingBox(
--    boost::shared_ptr<urdf::Geometry> _geom, double *_sizeVals)
-+    std::shared_ptr<urdf::Geometry> _geom, double *_sizeVals)
- {
-   std::string type;
- 
-@@ -2460,8 +2461,8 @@ std::string GetGeometryBoundingBox(
-     case urdf::Geometry::BOX:
-       type = "box";
-       {
--        boost::shared_ptr<const urdf::Box> box;
--        box = boost::dynamic_pointer_cast<const urdf::Box >(_geom);
-+        std::shared_ptr<const urdf::Box> box;
-+        box = std::dynamic_pointer_cast<const urdf::Box >(_geom);
-         _sizeVals[0] = box->dim.x;
-         _sizeVals[1] = box->dim.y;
-         _sizeVals[2] = box->dim.z;
-@@ -2470,8 +2471,8 @@ std::string GetGeometryBoundingBox(
-     case urdf::Geometry::CYLINDER:
-       type = "cylinder";
-       {
--        boost::shared_ptr<const urdf::Cylinder> cylinder;
--        cylinder = boost::dynamic_pointer_cast<const urdf::Cylinder >(_geom);
-+        std::shared_ptr<const urdf::Cylinder> cylinder;
-+        cylinder = std::dynamic_pointer_cast<const urdf::Cylinder >(_geom);
-         _sizeVals[0] = cylinder->radius * 2;
-         _sizeVals[1] = cylinder->radius * 2;
-         _sizeVals[2] = cylinder->length;
-@@ -2480,16 +2481,16 @@ std::string GetGeometryBoundingBox(
-     case urdf::Geometry::SPHERE:
-       type = "sphere";
-       {
--        boost::shared_ptr<const urdf::Sphere> sphere;
--        sphere = boost::dynamic_pointer_cast<const urdf::Sphere >(_geom);
-+        std::shared_ptr<const urdf::Sphere> sphere;
-+        sphere = std::dynamic_pointer_cast<const urdf::Sphere >(_geom);
-         _sizeVals[0] = _sizeVals[1] = _sizeVals[2] = sphere->radius * 2;
-       }
-       break;
-     case urdf::Geometry::MESH:
-       type = "trimesh";
-       {
--        boost::shared_ptr<const urdf::Mesh> mesh;
--        mesh = boost::dynamic_pointer_cast<const urdf::Mesh >(_geom);
-+        std::shared_ptr<const urdf::Mesh> mesh;
-+        mesh = std::dynamic_pointer_cast<const urdf::Mesh >(_geom);
-         _sizeVals[0] = mesh->scale.x;
-         _sizeVals[1] = mesh->scale.y;
-         _sizeVals[2] = mesh->scale.z;
-@@ -2513,7 +2514,7 @@ void PrintCollisionGroups(UrdfLinkPtr _l
-     << static_cast<int>(_link->collision_groups.size())
-     << "] collisions.\n";
-   for (std::map<std::string,
--      boost::shared_ptr<std::vector<UrdfCollisionPtr > > >::iterator
-+      std::shared_ptr<std::vector<UrdfCollisionPtr > > >::iterator
-       colsIt = _link->collision_groups.begin();
-       colsIt != _link->collision_groups.end(); ++colsIt)
-   {
-@@ -2906,7 +2907,7 @@ void CreateCollisions(TiXmlElement* _ele
-   //   lumped meshes (fixed joint reduction)
- #ifndef URDF_GE_0P3
-   for (std::map<std::string,
--      boost::shared_ptr<std::vector<UrdfCollisionPtr> > >::const_iterator
-+      std::shared_ptr<std::vector<UrdfCollisionPtr> > >::const_iterator
-       collisionsIt = _link->collision_groups.begin();
-       collisionsIt != _link->collision_groups.end(); ++collisionsIt)
-   {
-@@ -3028,7 +3029,7 @@ void CreateVisuals(TiXmlElement* _elem,
-   //   lumped meshes (fixed joint reduction)
- #ifndef URDF_GE_0P3
-   for (std::map<std::string,
--      boost::shared_ptr<std::vector<UrdfVisualPtr> > >::const_iterator
-+      std::shared_ptr<std::vector<UrdfVisualPtr> > >::const_iterator
-       visualsIt = _link->visual_groups.begin();
-       visualsIt != _link->visual_groups.end(); ++visualsIt)
-   {
-@@ -3411,7 +3412,7 @@ TiXmlDocument URDF2SDF::InitModelString(
-   g_enforceLimits = _enforceLimits;
- 
-   // Create a RobotModel from string
--  boost::shared_ptr<urdf::ModelInterface> robotModel =
-+  std::shared_ptr<urdf::ModelInterface> robotModel =
-     urdf::parseURDF(_urdfStr.c_str());
- 
-   // an xml object to hold the xml result
-@@ -3453,7 +3454,7 @@ TiXmlDocument URDF2SDF::InitModelString(
-   // fixed joint lumping only for selected joints
-   if (g_reduceFixedJoints)
-     ReduceFixedJoints(robot,
--        (boost::const_pointer_cast< urdf::Link >(rootLink)));
-+        (std::const_pointer_cast< urdf::Link >(rootLink)));
- 
-   if (rootLink->name == "world")
-   {
-@@ -3514,7 +3515,7 @@ TiXmlDocument URDF2SDF::InitModelFile(co
- }
- 
- ////////////////////////////////////////////////////////////////////////////////
--bool FixedJointShouldBeReduced(boost::shared_ptr<urdf::Joint> _jnt)
-+bool FixedJointShouldBeReduced(std::shared_ptr<urdf::Joint> _jnt)
- {
-     // A joint should be lumped only if its type is fixed and
-     // the disabledFixedJointLumping joint option is not set
diff --git a/dev-libs/sdformat/sdformat-5.2.0.ebuild b/dev-libs/sdformat/sdformat-5.2.0.ebuild
deleted file mode 100644
index c3c7512d27ef..000000000000
--- a/dev-libs/sdformat/sdformat-5.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Simulation Description Format (SDF) parser"
-HOMEPAGE="http://sdformat.org/"
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# subslot = libsdformat major
-SLOT="0/5"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/urdfdom-1:=
-	dev-libs/tinyxml
-	dev-libs/boost:=
-	sci-libs/ignition-math:3=
-"
-DEPEND="${RDEPEND}
-	dev-lang/ruby:*
-	virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/urdfdom1.patch" )
-
-src_configure() {
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	local mycmakeargs=(
-		"-DUSE_EXTERNAL_URDF=ON"
-		"-DUSE_EXTERNAL_TINYXML=ON"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/sdformat/sdformat-5.3.0.ebuild b/dev-libs/sdformat/sdformat-6.1.0.ebuild
index c3c7512d27ef..bc8209246277 100644
--- a/dev-libs/sdformat/sdformat-5.3.0.ebuild
+++ b/dev-libs/sdformat/sdformat-6.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.b
 
 LICENSE="Apache-2.0"
 # subslot = libsdformat major
-SLOT="0/5"
+SLOT="0/6"
 KEYWORDS="~amd64"
 IUSE=""
 
@@ -19,20 +19,19 @@ RDEPEND="
 	>=dev-libs/urdfdom-1:=
 	dev-libs/tinyxml
 	dev-libs/boost:=
-	sci-libs/ignition-math:3=
+	sci-libs/ignition-math:4=
 "
 DEPEND="${RDEPEND}
 	dev-lang/ruby:*
 	virtual/pkgconfig
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/urdfdom1.patch" )
 
 src_configure() {
 	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
 	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
 	local mycmakeargs=(
-		"-DUSE_EXTERNAL_URDF=ON"
+		"-DUSE_INTERNAL_URDF=OFF"
 		"-DUSE_EXTERNAL_TINYXML=ON"
 	)
 	cmake-utils_src_configure
diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index 5af6f4dc9fd3..faa70a35ecc2 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,3 @@
-DIST sink-0.5.0.tar.gz 330203 BLAKE2B 5b0448dfb984c1aa4bdb913f8ce5e5e4e3f1a6ee33d840ed3d9fdf9e0ea6003a928970d2e6dc25e824241768da9abed7dce31ef857e4986990aad16e7aecd667 SHA512 e47f3d99b934abb184a5f8293f1a092fccabe0bb550573cd8c35918471a4caa94eaaec0361c43376c93cdb480612dd0f78626d6649077f777c5cccc8c5d4389f
-EBUILD sink-0.5.0.ebuild 1226 BLAKE2B 39c490f401de52a044d153367360a12eab7f3b9837c8c16673f5f245165918da7fcc73fcdba1c720366f402a614d96d0a6925ed73709a19f1c490d4fba1b9deb SHA512 60c1461bf91bc959e22813611989bd9e30e06398134246bcc47c55dd9e7787971c3928ac26a203fc035f945d387faecd6fb922ebf22ba2c425de4ddd6a772050
+DIST sink-0.7.0.tar.gz 383090 BLAKE2B b853609889ead6f623c7288b9dfe8dba0388dc0d5e8f28d9967fa9be1d78b10bafd9d4674f11355bfe60506843d2abe033149c448ff293329db558ed00fef18b SHA512 591838cb9c76d89c1794b94b02bff3d67155e1f27ae32b7ac9369d15aa109130c7792f30e74b61009765e7b7cb78141bf5e3c93304d814bce22bf91059339fd0
+EBUILD sink-0.7.0.ebuild 1280 BLAKE2B b291dee7303f8f6fe2575ee21092204f3f98ed28633d72bbdb39850c11a1096c70e5e135d6c18e29b52449490a807d7397716c1cef1eb71739d8921fc7cc5259 SHA512 3e280a86919ff93e88505b7183cd10dd0393a843cae1ce225e2b18015925c342e688eaecd40e880c6aa011862a1204d3b97a99c1727598406f96d189e78c70ee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/sink/sink-0.5.0.ebuild b/dev-libs/sink/sink-0.7.0.ebuild
index d83a654f28bb..c2e8a3d3fa4b 100644
--- a/dev-libs/sink/sink-0.5.0.ebuild
+++ b/dev-libs/sink/sink-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ IUSE=""
 # uses it as a public dependency but doesn't search for it properly
 RDEPEND="
 	$(add_frameworks_dep kcoreaddons)
+	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kmime)
 	$(add_qt_dep qtgui)
@@ -24,6 +25,7 @@ RDEPEND="
 	dev-db/lmdb:=
 	dev-libs/flatbuffers
 	dev-libs/kasync
+	>=dev-libs/xapian-1.4.4:0=
 	net-libs/kdav2
 	net-libs/kimap2
 	net-misc/curl
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index ae18d1055bab..62bff63a8cb1 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -2,8 +2,10 @@ DIST skalibs-2.3.2.0.tar.gz 205976 BLAKE2B 01e1694515093494d0d216e5b5f17524118c6
 DIST skalibs-2.6.1.0.tar.gz 210504 BLAKE2B 47be3c920d7e0db9baa5982c5e1273e3132636d84767b5a0087bcbda0c18039b0ca26428c1db9a33a0ed5186a9c94860c73aaccd7ecf38da21e56e9b3e5ffb4d SHA512 52db44f398bcc08a2b4243a32254fef87d11f152dd6e9f8fa85dcc548fff5dcd1ef83ffbd32aa572837f344f9a3e4a31f156edd5ad6b4274d8138fbf24213a57
 DIST skalibs-2.6.3.0.tar.gz 224463 BLAKE2B 0b051cb027b2c7335c5b6d581aeb8ff4fce8262b58551a9a0ec87d03148280a66be07a0f589731c65ef9b5298e64be93a5bd2a45818bc131cb2df5f31ac1040e SHA512 4f904cde17fa91070317b9ddd542715c5b4e19a8ccb3ae3b2eb014a782ae66b38033f7f5614d92cfb64e251aa4e97e11c03695f161cdd2b122b61fd3e627af9a
 DIST skalibs-2.6.4.0.tar.gz 226780 BLAKE2B 80d01d3696452b54d0247c8e523c059bb5ecd59fdea0d18a80992c3db70deab935fce13b5559835f98ccfacf81a2a81e8a6b432b67f851a42f8441f7f7ecc19e SHA512 19062853bd9df0dadeceaab96aca9d2a68d93aada7552d306902d1b13c55d421bbff7fd37dccaf1a81d66bbecf43ed2242961fdb7bd51ff22e9b6114c1b2bb77
+DIST skalibs-2.7.0.0.tar.gz 226543 BLAKE2B be626eed2f6b898c3b1cf6026f527730146a5c4175a76e43a2c9e0b22d7063de84378668e7e1c28c183b8ea9e187e92f86a1de06294ab708562f17ae7ae70b04 SHA512 33624b606a0846478e6fde10057633b43e76bda299d067cff269582c252f05108ebf28c539865c7f24b67e99575328fc7789326dfbb2e81bf209aa51445f04a1
 EBUILD skalibs-2.3.2.0.ebuild 1030 BLAKE2B 9a929766737a4e0a0f32fcdfe31d37d6bf1a0a12d921b22f4c25947183b59eff0ae70dc74f350b2043a4ab1b864b763a65014542ed3a69b9ff34672adf465f78 SHA512 ff52e56a44d1ec81ed2e21fb0bfd91e42b88228f19b63b32b843b90b103cfb971e7f9e94086e2afbbe0ae37d64d24aa637a8f54ce7c720f12eed2efefeffc578
 EBUILD skalibs-2.6.1.0.ebuild 1102 BLAKE2B 6e9f79ea36986f7695841068d69eb5fdf791b0dcd4982deb854983e9d2f30b2616b265e51c1b860df6b485d6178d94f9bb1a12df4d240182814d0e7f9aec5283 SHA512 f9afc8de965ca315a935cbccffc1083a165f8d2a6ac1742b431f21b666def320bd5ecad49a02bfa30c64fb97cc0bf2be3a77660741cb60af7c8c369873f956a4
 EBUILD skalibs-2.6.3.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
 EBUILD skalibs-2.6.4.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
+EBUILD skalibs-2.7.0.0.ebuild 962 BLAKE2B 9021ed99abba3ade6a91c7114f82dbbbd67d74e0fe6a25d161899e15c8a3633bb51221dd8a23ee3c71047d006333f8cc2322a01a91ed0bb8ca5525cc0d71bbdf SHA512 99aba2aea0c3160111ad3e405df848f77862a13caa96c654ddfc8a803190ffc8662e064f7a64096a0d3dd41a78f049e9a55265f5e98dcd55043aa6c958e18710
 MISC metadata.xml 682 BLAKE2B e5d2f804eddae75e951e0d779f6c26b9055186976bb27ab8c4afc8fa160aee1a6c119d03c19b95d54e7af721a86aae99b9c78277adc03e59fa4f86c0a5e93263 SHA512 cc1e8bf973b516a44122fa19165cd6c08547837d38c909d0a8ac7116c87ad93bb1f25ca31e5358c63abf4b13673a285cce8fb783506b61659f998ce47dc4b656
diff --git a/dev-libs/skalibs/skalibs-2.7.0.0.ebuild b/dev-libs/skalibs/skalibs-2.7.0.0.ebuild
new file mode 100644
index 000000000000..58829b19d4a7
--- /dev/null
+++ b/dev-libs/skalibs/skalibs-2.7.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="skarnet.org general-purpose libraries"
+HOMEPAGE="https://www.skarnet.org/software/skalibs/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc ipv6 static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--datadir=/etc \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--sysdepdir=/usr/$(get_libdir)/${PN} \
+		--enable-clock \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable ipv6)
+}
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index b971cbcb3616..dec320c24bd5 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,3 +1,6 @@
+AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f072f5c5779fb6aa6606857a12af7aa0228d349b722813449ed33a026ea5e8bec9b0e6235ac6c271f34c61fca7eafb4b4 SHA512 23c8048ef08417422194eb84d4581b4a1c443de6917608f953cdcb5b2433446272d937e05eabc6bae17d88061a0b3aa997355b7b47e71702dc52d69223972809
 DIST softhsm-2.4.0.tar.gz 1042566 BLAKE2B 01a0f4bdc589847c4a1f860c3e3f572644d874b11d7ab8e149e598fc123b75e898de9a46f73f5f2a107edcaeabdda29e4b9b6d54af5b95ad79a3c7b7b77b8bbf SHA512 f14f65de32206500f708523ee88d8d5e3d1fd40175f1a9cd24c7760c829e2de9dbcb05453022df8186836c49a57e4eae7f2e75ce6a5346a426114f4d610a8a84
+DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
 EBUILD softhsm-2.4.0.ebuild 1041 BLAKE2B c20642ae2741ce0941fa12b8ab4ba3162df9484c775a88c5e4a15b0e774471fc872b0c9d486a081afdda800d4e08b4798b05b44c32a387dd93b4ea1f433c2309 SHA512 721f120e09c2fc85154cecd824a85c36d499fcb11eb5173a52cb3c73c941fa7234d97492a1e675f04ceca192475cd31fde61313f0951eb0ba5618b434e483662
+EBUILD softhsm-2.5.0.ebuild 1089 BLAKE2B fc038b382c50a1f0b065dcf1145b5a74189119961f24432d78c89516cf3fb225a6de38118f63a5be9e2965b138810b395850e3f9d2a4c06cf06ad8bd4408a4df SHA512 d6f213a0edab60adc5c741f5a54d650ec4ee268c689e5b893ac1f4417f7f70cf90cf93d5b8dab105cfaa03dcea7ad4cb809b7e4693962233af1a79f83e00ebea
 MISC metadata.xml 322 BLAKE2B 64433451cd97495272e25d2bd1a4ad951781f7a61e47f1f048b13b4a1b4f577f9eb37f1145f1d9710969cfd9e38dd89aacc83641ec8b3bf0b36027c39a8dfe8b SHA512 b145c1ee8c20a9aad9c9b8e6f6526c596dd80a993faecb8e8caf6e930cf05e32f3e6ef5ad72c337a43c48cf57224f209e65d177567e3c5c577d3872eb11841a8
diff --git a/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch b/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch
new file mode 100644
index 000000000000..9aeaf2939ac4
--- /dev/null
+++ b/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch
@@ -0,0 +1,32 @@
+From 308b0b2760d6cb218003768747346d31764f1cfe Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 19 Oct 2018 23:19:48 +0300
+Subject: [PATCH] crypto: use ENGINE_load_rdrand with recent openssl
+
+libressl and probably older openssl do not support this.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/lib/crypto/OSSLCryptoFactory.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+https://github.com/opendnssec/SoftHSMv2/pull/423
+
+diff --git a/src/lib/crypto/OSSLCryptoFactory.cpp b/src/lib/crypto/OSSLCryptoFactory.cpp
+index dc5f737..04d383d 100644
+--- a/src/lib/crypto/OSSLCryptoFactory.cpp
++++ b/src/lib/crypto/OSSLCryptoFactory.cpp
+@@ -141,8 +141,10 @@ OSSLCryptoFactory::OSSLCryptoFactory()
+ 	// Initialise OpenSSL
+ 	OpenSSL_add_all_algorithms();
+ 
++#if !( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
+ 	// Make sure RDRAND is loaded first
+ 	ENGINE_load_rdrand();
++#endif
+ 	// Locate the engine
+ 	rdrand_engine = ENGINE_by_id("rdrand");
+ 	// Use RDRAND if available
+-- 
+2.18.1
+
diff --git a/dev-libs/softhsm/softhsm-2.5.0.ebuild b/dev-libs/softhsm/softhsm-2.5.0.ebuild
new file mode 100644
index 000000000000..efb92f3af4d2
--- /dev/null
+++ b/dev-libs/softhsm/softhsm-2.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A software PKCS#11 implementation"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bindist libressl migration-tool test"
+SLOT="2"
+LICENSE="BSD"
+
+RDEPEND="migration-tool? ( dev-db/sqlite:3= )
+	!libressl? ( dev-libs/openssl:=[bindist=] )
+	libressl? ( dev-libs/libressl:= )
+	!~dev-libs/softhsm-2.0.0:0"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	sys-devel/gcc:=[cxx]
+	test? ( dev-util/cppunit )"
+
+DOCS=(
+	NEWS
+	README.md
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-crypto-backend=openssl \
+		--disable-p11-kit \
+		--localstatedir="${EROOT}/var" \
+		$(use_enable !bindist ecc) \
+		$(use_enable !libressl gost) \
+		$(use_with migration-tool migrate)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	keepdir "${EROOT}/var/lib/softhsm/tokens"
+}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 1591e14da720..95f1f64ca01b 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -3,8 +3,10 @@ AUX spdlog-1.0.0-unbundle-fmt.patch 707 BLAKE2B a62f2c48007de2a48fb1f6f28bd0aa60
 DIST spdlog-0.17.0.tar.gz 172323 BLAKE2B 2ca821fb3da0ee82601dd9ef54ca155ffdf19ea1e51c6fbb7269a58bf7a662b5225c9ef7e4d8ccbe7a05c56aeefaad27ddc9cfe21a329f52490078ccd0fb2ce6 SHA512 c3d7c7b2d221b33ad4f4685207ff606d271635bd1ad7edab763a823880386f604d264343139f37b36a3e8654d6382dbed0d431556728676523e390b8fb4b2aef
 DIST spdlog-1.0.0.tar.gz 183855 BLAKE2B 30d54fef03a83f968cfebacf95a484ff397126771a7ea022556aebd07e2f7694af35b278f75ee24372283ff1428e21247fd4329794d64a65bd6220a93f21db3c SHA512 4d3cbc1926be513256b5837a53fce425f6d352bb4ab262074f205450cd4eadc09feea9dc8d8c03b3f1e9792bcfbcff414be79e51d58234f540946428bbd88cd1
 DIST spdlog-1.1.0.tar.gz 183937 BLAKE2B 51af49f641df69e78835bd6b9545da53c0e111bab60a5f0dbf4a1d0e70101309394ffea195176ea371f08b772c2be1c22c2da16006fc9699f47593cf82a6c0fd SHA512 65fbe6e9dffb25e814f72f2ef7982eed213fc16edfabb1377f865c94fd0488190e160dfea83ac06979a41f2fb2fa47a454989ebee0a2c5012bd404b977648439
+DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
 EBUILD spdlog-0.17.0.ebuild 778 BLAKE2B ca2793ad8aae142f0d08453d22f0369fd11d5cde01d7c94055af10d24bd987cf7ef995d142d43bcbb06961a693677f6b332373fe145d5e3270517f99ea2bf18d SHA512 f07f53320df02c39b51683d4ad461be31f8362f087e8c5f3d15112f14468df9bd8a881404bc1d75c0ddadecdae4301fa275ce8fdad17be5dddf92a7ce49f8e2d
 EBUILD spdlog-1.0.0.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 EBUILD spdlog-1.1.0.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
+EBUILD spdlog-1.2.1.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 EBUILD spdlog-9999.ebuild 779 BLAKE2B 022a4427c571962a98cfdaa4c42d3a8565ff8a3dc667babaf04807db2a5d0d73f3ff2b5e11678b27a5d37466111a7d83f17f8d71688fde577108629768ac99a4 SHA512 7799249a38be8b01cff4f55c581aa3617219d9c2a5d96c96dd82d27d309a787e4421ad22ac6688aacf9d126899230276f882efda8c6c8d5901523fba0b8d745c
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.2.1.ebuild b/dev-libs/spdlog/spdlog-1.2.1.ebuild
new file mode 100644
index 000000000000..03aaec9bd608
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gabime/spdlog"
+else
+	SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+
+DEPEND="
+	>=dev-libs/libfmt-5.0.0
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
+
+src_configure() {
+	rm -r include/spdlog/fmt/bundled || die
+
+	local mycmakeargs=(
+		-DSPDLOG_BUILD_EXAMPLES=no
+		-DSPDLOG_BUILD_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index 43c75f16ff0c..79d0495b3e9e 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,17 +1,11 @@
 AUX ucommon-6.0.3-disable_rtf_gen_doxy.patch 373 BLAKE2B 40496f603ec50786007fc97ac0390ecf29b2a296ac77f16d91c8861e7b98725c03aff488697ed9e7492c56bd298b920aab8eae0425e1bfaca574860517c33f46 SHA512 e486d3fc9d6235979d0d1e75aa1f90b5d525d3b7806de2a80737a825c62e1b6b94ef5976609a9a7654ea82bc5620ad62232ce61310da393617c5e5d98e6362c0
 AUX ucommon-6.0.3-gcrypt_autotools.patch 1712 BLAKE2B b1c8a0385c931fd1284c4cbe7ec412367566b360b4befc1fe75dee6f489215f86dff84c0612b0535204d83b89aa220b8082fcdab521023c83dfa466215b74298 SHA512 57c2d80c6795fa890e3ece384f92da3d8f7d216c91e72920ebccd5fcb1358e41932cd6fc6861ce009305f90a00ed11fdabf6df7b5c7e216ddbb0a6916e163f69
 AUX ucommon-6.0.3-install_gcrypt.m4_file.patch 4902 BLAKE2B 5c56eb0d9e397a653eb1a932e49cdce0c30fbe52f98f8d1b7403c27f53f5371da6f0bde83dff18250bfec5c9d3817bedb803d49344183e0dc5cb117e688dea6a SHA512 13604093ed0dba4064a8868785309d1de645dc0d010940febbf29166f69302c7272293bf161514396064d4f2ef0805dc6bb30336773568b0e5959ef76c1a0aad
-AUX ucommon-6.1.10-disable_rtf_gen_doxy.patch 224 BLAKE2B 241b6e1e94d7ad9067534a4cb6dd5e76fea92fd8cff5ffc819b7aa379bd05fa8d15079afb9860cc2f3e08739f340915b0c057fe9c095a03950ff14b75fd91080 SHA512 7bf2dc2e398eb3be86ec2593024953828db272ad19010b43e1c71658e474cb321f86265611c874781f9c6adfb68919ba1f44cb1efcc3d6d3711a09fdfcf2abe8
-AUX ucommon-6.1.10-gcrypt_autotools.patch 1657 BLAKE2B 3d6076aa2f4ef32e44d3ee471ceb547d352da42e361e18e6c17dfb718723dc5f73b4a4375e7cef2ad7662420bb14498979ae599976bcfff20a19af4427af68a2 SHA512 f9749158710aaf1dfce05f8b204e3f0463e71cbd06fe2c34dff1d675e9f5abf14fd33de4e4d46f0482524532abd378b81d1cf98f2b9a0371ba760872469ba5a9
 AUX ucommon-6.3.1-gcrypt_autotools.patch 1258 BLAKE2B 894f22a1755bf0d41fc3148a9c4ae8721ae7cc6307ba925493fa1c7896142219f6738f5d403a62ffacb5f0b44e95a9d8fd78528e5e7c3d470129b4391e8cfe0b SHA512 7bb6ce14558c9aec961b83fbba7efa38eeff6bb165d0d66a68436eda10e2d209e7d340e13fdc1e5e453f1a091a045aece50ead78ad5634a81d2d123d1a166e78
 DIST ucommon-6.0.3.tar.gz 806841 BLAKE2B 08e384f535529dbd27271861c473e18624d81029f7fecc08057b646f9c22d9bda956da2655114ec693a17f20764e4635701d1a932eeff2cdc8e82ad0fefd6496 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762
-DIST ucommon-6.1.10.tar.gz 833384 BLAKE2B 790d47b529550ab02651ed41954d1f6c171154d9ced01eee61d9789495e6d5b66599d3f12925f2cde1c432deb3414931a359d237572904f6ab1e17793b3bce9e SHA512 6d6e716dcb71d6a4e49307baa0e9e62b4b50f3dbe8301eb93e3b562d94eb9ccee73a733928059a5ed97deba55c00308af0326a32cec6a73dbf7884c322177050
-DIST ucommon-6.3.1.tar.gz 830661 BLAKE2B be97174c44ad79ed3e526f263da085dbc112c8f5f0b4f8415a5d30ff7f919fea65e1468aeaaf301940ce060952842fc0e59184539c63ba965c01a0cb598dce30 SHA512 6f4832ac53aaf1456f2d913730b66588a89a3c1292fb79f3f56da466a2542af9c836579c0a3c4daf3f896a0c3e35f861b71514f960052adcb4e3abb872b781ec
-DIST ucommon-6.5.2.tar.gz 847128 BLAKE2B a4bd6975ad0a83a109a85b5654fbf176957df0bad8edf1a519438c49af00a5523258e97a231021f9a3a3492746b6b6b88aa79600e58bf47b60ac6466b2f4fa12 SHA512 dc6dc048bad52d117edd1936ad31fd9fc6dba418fea3f7fd1578a96909c1eb53d2a42c4773a168db38ff24fc73b467ab30ec9b5ad5132ae473c36cea0e77b341
 DIST ucommon-6.5.7.tar.gz 855822 BLAKE2B 56b5eb5f8372f983e0f348e5fc494c15bea57dc711e88a9a9f4ceeb8abf03680a82948ea080053a9d4c846172b64443a3947b3774b50c6d0a60c1f2ced63e69d SHA512 9927c9726252cdf050f217fa5993d34dcf9f76fab8399ee3a4c91cf087d9409947ed486a21e8448cb57ea95b52826682120f99d39287983c306434f9121b4d24
+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.1.10.ebuild 1656 BLAKE2B 3bb2de5faad0c10aaac113ca9a6673b42585c60ba62e0e21a22a7d24776f8fa18e1a0fe73baad048d4d1884b953b7e0c24fc28f117f35240e841fe7f2a6d0cd2 SHA512 b6ad95d01aab30ef78e7e4a70334811dc25cd894a05e2c26cc60a270336daf9924d9d771aae36f193651c88ea870768350ec63b3a9f276949749aaa8d53ec34e
-EBUILD ucommon-6.3.1.ebuild 1735 BLAKE2B d94b09b08954f972ddcb28c43a266b2a65324ab88941cfc220f05dfa2e8d9775322bafdb0b958540d956c61a83d6b41663ac90e750c5a570db85ed270c8c4a8e SHA512 f5d698b80b6eac598e7e94ceeb0e1eccef801bfdc27f0c40905aeec7253cd3e764054629bd2a9238d4f7875146f7bf221eabe942ebdfa06525fc00143e7bb8d8
-EBUILD ucommon-6.5.2.ebuild 1735 BLAKE2B 77d03ce5dd28a014e1e1124b3ee657a95745f57a7b9510b624473b2932bf70539ed08fe3e4b318fba937cc405bfcdbfb47ef77cd2c5f3dee8736dd1bf3b411e8 SHA512 ddf5899ea21b6f1c631fad60d41ef17c30150f832a398c01f231cd249c4b226274e0486b0658f5fc63fbc6d5444da2515359a67cc043cd96767ed1db92f17377
 EBUILD ucommon-6.5.7.ebuild 1735 BLAKE2B 77d03ce5dd28a014e1e1124b3ee657a95745f57a7b9510b624473b2932bf70539ed08fe3e4b318fba937cc405bfcdbfb47ef77cd2c5f3dee8736dd1bf3b411e8 SHA512 ddf5899ea21b6f1c631fad60d41ef17c30150f832a398c01f231cd249c4b226274e0486b0658f5fc63fbc6d5444da2515359a67cc043cd96767ed1db92f17377
+EBUILD ucommon-7.0.0.ebuild 1486 BLAKE2B 442b3bbf9aff5faadc4eaaad23c996db7c15799b7b3c830d741a211062c31c43ca25e5c80bbcb1c08b87ed6f7952a90bb3aa59e804a0c144470ed54dac0b9391 SHA512 e87f63f6d663054718dbcf93367d3bf1da5293d708423685b0dfddbf50415621cac061c2640459d2e9d5ede70a737e7077123ed4c2fa2b9ffa14410b14490431
 MISC metadata.xml 316 BLAKE2B 8c4be49ccdfcd5353854b5b44e7cab7917695d50af5cb0e539b4a5d58fc31d3d6a98e77af95d0254324ba49f39d64d05a28adf2edbc9a71512c1f8e14bd2f78c SHA512 8095298e0382cc3e245df76d9b5bd4f27c9cf803aafc5b3fe9a9d63c94733192287a0d0348904320f07ec3a24edc9c437f09065b12dc3226f7acbe1e055c774c
diff --git a/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch
deleted file mode 100644
index e9b581f7eb99..000000000000
--- a/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Doxyfile
-+++ b/Doxyfile
-@@ -40,7 +40,7 @@
- GENERATE_HTMLHELP = YES
- GENERATE_TREEVIEW = NO
- TREEVIEW_WIDTH = 256
--GENERATE_LATEX = YES
-+GENERATE_LATEX = NO
- COMPACT_LATEX = YES
- PDF_HYPERLINKS = YES
- USE_PDFLATEX = NO
diff --git a/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch
deleted file mode 100644
index 916df95576ce..000000000000
--- a/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,6 +8,8 @@
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \
-     *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \
-     CMakeLists.txt ucommon-config.cmake ucommon.pc.cmake cmake-abi.sh \
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,9 @@
- 
- CHECKFLAGS="$CHECKFLAGS"
- 
-+m4_include([m4/libgcrypt.m4])
-+
-+
- case "$with_crypto" in
- ssl|openssl)
-     ssl="openssl"
-@@ -698,6 +701,8 @@
- gnutls|gnu)
-     if test ! -z "$GNUTLS_LIBS" ; then
-         SECURE_LIBS="$GNUTLS_LIBS"
-+	AM_PATH_LIBGCRYPT
-+	SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS"
-         SECURE="gnutls"
-     fi
-     ;;
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -9,9 +9,9 @@
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
- MAINTAINERCLEANFILES = Makefile.in Makefile
--AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@
-+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@
- AM_CPPFLAGS = -I$(top_srcdir)/inc
--LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@
-+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ @LIBGCRYPT_LIBS@
- EXTRA_DIST = *.1
- 
- man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \
-@@ -30,7 +30,7 @@
- scrub_files_LDFLAGS = @SECURE_LOCAL@
- 
- mdsum_SOURCES = mdsum.cpp
--mdsum_LDFLAGS = @SECURE_LOCAL@
-+mdsum_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@
- 
- zerofill_SOURCES = zerofill.cpp
- zerofill_LDFLAGS = @SECURE_LOCAL@
diff --git a/dev-libs/ucommon/ucommon-6.1.10.ebuild b/dev-libs/ucommon/ucommon-6.1.10.ebuild
deleted file mode 100644
index e032afde5db3..000000000000
--- a/dev-libs/ucommon/ucommon-6.1.10.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
-
-RDEPEND="
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=
-			dev-libs/libgcrypt:0=
-		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.10-disable_rtf_gen_doxy.patch
-	"${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
-	"${FILESDIR}"/${PN}-6.1.10-gcrypt_autotools.patch
-)
-
-# Needed for doxygen, bug #526726
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# Aclocal 1.13 deprecated error BGO #467674
-	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	if use ssl; then
-		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
-	else
-		myconf+=" --with-sslstack=nossl ";
-	fi
-
-	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
-		${myconf}
-		--enable-atomics
-		--with-pkg-config
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
diff --git a/dev-libs/ucommon/ucommon-6.3.1.ebuild b/dev-libs/ucommon/ucommon-6.3.1.ebuild
deleted file mode 100644
index 8dd276b800f0..000000000000
--- a/dev-libs/ucommon/ucommon-6.3.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
-
-RDEPEND="
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=
-			dev-libs/libgcrypt:0=
-		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
-	"${FILESDIR}"/${PN}-6.3.1-gcrypt_autotools.patch
-)
-
-# Needed for doxygen, bug #526726
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# Aclocal 1.13 deprecated error BGO #467674
-	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
-	# don't install latex and rtf documents
-	sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
-		-i Doxyfile.in || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	if use ssl; then
-		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
-	else
-		myconf+=" --with-sslstack=nossl ";
-	fi
-
-	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
-		${myconf}
-		--enable-atomics
-		--with-pkg-config
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
diff --git a/dev-libs/ucommon/ucommon-6.5.2.ebuild b/dev-libs/ucommon/ucommon-7.0.0.ebuild
index e8e90402975e..77953319a895 100644
--- a/dev-libs/ucommon/ucommon-6.5.2.ebuild
+++ b/dev-libs/ucommon/ucommon-7.0.0.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
+EAPI=7
+inherit autotools
 
 DESCRIPTION="Portable C++ runtime for threads and sockets"
 HOMEPAGE="https://www.gnu.org/software/commoncpp"
 SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
 
 LICENSE="LGPL-3"
-SLOT="0/6"
+SLOT="0/8" # soname version
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
+IUSE="doc static-libs +cxx debug libressl ssl gnutls"
 
 RDEPEND="
 	ssl? (
@@ -28,20 +25,20 @@ RDEPEND="
 		)
 	)"
 
-DEPEND="virtual/pkgconfig
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
-	${RDEPEND}"
+"
 
 DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+
 PATCHES=(
 	"${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch"
-	"${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch"
 )
 
-# Needed for doxygen, bug #526726
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
 src_prepare() {
+	default
+
 	# Aclocal 1.13 deprecated error BGO #467674
 	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
 
@@ -49,7 +46,7 @@ src_prepare() {
 	sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
 		-i Doxyfile.in || die
 
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_configure() {
@@ -61,23 +58,20 @@ src_configure() {
 	fi
 
 	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
+		$(use_enable cxx stdcpp)
 		${myconf}
 		--enable-atomics
 		--with-pkg-config
 	)
-	autotools-utils_src_configure
+	econf "${myeconfargs}"
 }
 
 src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
+	default
+	use doc && emake doxy
 }
 
 src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
+	use doc && HTML_DOCS="doc/html/*"
+	default
 }
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 3d10a84ac8dd..f14d5ced2cf4 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -3,7 +3,7 @@ DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
 EBUILD userspace-rcu-0.10.0.ebuild 663 BLAKE2B 2d1ad36229c78b15bf3e9c738a383aa39c201329bf814e7e29d4726cd9828c6e9575e3af4ac02b5f54db3ba703a1f0aa46b90eb88028709299ed13bcb0285889 SHA512 2e945347710ff7f1459e33def817e4c4ce4e640bcb8f94726559534ce5f14aa45752bc6e169fdaeeefb491751743b30f744cd56dbc4a56fcaf1bff1c0227619d
-EBUILD userspace-rcu-0.10.1.ebuild 676 BLAKE2B ee98949e39e87a0aea1d7d0c14f62d0682f25267e2709d6a2405fe72ef2b1f4d0f914b4e9161e04c11c79a13789124383d0320bd4c92f4b2fd3067e917f3a838 SHA512 56ba3cee83fee5c273444c017f1b0cee57e56e5b2f4444f3686a12f98921f6f157c97831dd540eedf615264ea8db2d01cb4f3bb4d031c2c09a41e4c99bc3d050
+EBUILD userspace-rcu-0.10.1.ebuild 683 BLAKE2B 3860c7e252f07feec4a4416959caaa78d76bfaf4a855904ee2346fbee44856e63a486667c33a371efab35ef03ad8f4805e77ced0569c7b4cf976d82d2e562b65 SHA512 4dceb17136ada3b7c12ecd30ec62dcfb3787256f000ab8c18913e37d14acda98d7573c2290f17daa8e115f91e1e317bcb7a9a64705362262235dd9e120d5d06c
 EBUILD userspace-rcu-0.9.1.ebuild 736 BLAKE2B 2254c2ca484cde4821753e7c2d8a2a5c8f71700d77068234f9215608104104f4eda13dd4d78e20222a5dec2295bd05b75dc9aaad733e8555e0bf57218079e330 SHA512 c6e0ddf946e8e07392545e52f2bad49d2da3637e800b77689112128374c6367d5efa6b9d44d6143b3f17a8d74cdcfb877f2922e6a112c0ee8bea834242af4818
 EBUILD userspace-rcu-0.9.2.ebuild 749 BLAKE2B b7782ed9c88695473c2bb23dd9025eca95aa54eec2109fb4f2574f39b985b86ac1c53f5728a0b224b628717556427ffcb78325cc07f6e2f079d2fe05da514827 SHA512 61c3e1d51f225d39c5e521016605c01a4cf6188344af5a71785dc71f0a6cf4c1108139e38f32a093898c76f547decc794c19dfe70367461445abbb5816b7a6ae
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
index 25c6126b63e0..e2b5412e6a97 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs regression-test test"
 
 DEPEND="test? ( sys-process/time )"
diff --git a/dev-libs/uulib/Manifest b/dev-libs/uulib/Manifest
index 8229b20d5a93..10628a413442 100644
--- a/dev-libs/uulib/Manifest
+++ b/dev-libs/uulib/Manifest
@@ -1,5 +1,5 @@
 AUX uulib-0.5.20-shared.patch 2729 BLAKE2B 22870e400a4bf64fdd30b03f8d699666eeb7832e1110347295123bab7cf196d3bc30c7a4bbb0fe1d42f45606adf8522e134611f827d2ce403bf27fbd2381e1dc SHA512 bb8c93c59077fa00dec75734f27effc3370c9b1aabea476cc3212d6388a94127d1d6678dd98e73304c7fd2dd3e7212764e7abd08201ae9e12544f39aacabedc9
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uulib-0.5.20-r1.ebuild 676 BLAKE2B d742678c1b2dc8732b898c3e238d09422e78a196abf849172a538a124e5c0a0ead6942bb259c9a3b2cbc44a37d50f78307c7b723b4532f312c9f697527986c16 SHA512 af1854aba9b4f0ec374a9253f984a4d7ff2a679be333bed80f77a64feb42ff8db9a4d677c3bfc0b22f848c84c34dd81945f1a17ca76b92db0bdd7cbfb3b1f70f
+EBUILD uulib-0.5.20-r1.ebuild 773 BLAKE2B 8ff1ad29ec1d732ac9c5b7d15da06105da8183ee4d91303732500c61f31e34ecfe591953d95042aeaf2e2051c57553f62763a584f3705a9248f1fadb255fd328 SHA512 3f53f0883a1af59a9fab2091aa78cad6e280398202199430afd1549714783f47b6c22a2c976a695d186a5336a2d29e6a19237b65dfda03f13bd21faf6d8032ef
 EBUILD uulib-0.5.20.ebuild 691 BLAKE2B 14d1cfc8f2ee94b4d2cf9104f6e9b12d859ccd0bec6af4dc4e3e8863a3226e68794ba27b62d7cb680669a1132c1c57a7013be97cdd4461829d5e89214b93034e SHA512 ff905fdecc1fff0af38fcf09b4e30a37d0ed014221e3d4e2dec81536617b7a1f3c66aa0a0dd773b8971892b90bb30a94955a5568488f717c69fd4ccf5ffa29e4
 MISC metadata.xml 277 BLAKE2B cecac90fb82fe0bd545f752051c2ce763ce3232fef47d6ec79511d72870e92c49a509f06e949671b517ba80295da3c27a10f5c72b374e59a4ad6017a13ac705a SHA512 37a5409e55c42abd634bfbf22e956a23cd8d2d27a600e02a23e304e3f7da3a434885ff8d5997091ee608a4ed32f10738911c1ad81624c3cba23a7a42f20fdf59
diff --git a/dev-libs/uulib/uulib-0.5.20-r1.ebuild b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
index d590fa0e69c1..4f542854349e 100644
--- a/dev-libs/uulib/uulib-0.5.20-r1.ebuild
+++ b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}/${PN}
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 34c690b218a4..553993b2924b 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -4,8 +4,10 @@ AUX volume_key-0.3.9-cryptsetup2.patch 11118 BLAKE2B a271091011046c5765f1202a655
 AUX volume_key-0.3.9-find_python.patch 1845 BLAKE2B 0924bdd416f4eab70648964a1ad76263db76a3c7c62819146d200c6a88ef65ed24aa90c3dcd426e5cd137e07ddf04ddfd95474f6204f4e76b0c2a3b746e16dfb SHA512 5b2de4c5c18bb17fbf2a7e5de8adc36d919c5e98aafc33bbd3464ab60ce520ee0b4da0447f7e55ae262c9f6243936badd20f8ce5f9f3367188d80ba28932d0d7
 DIST volume_key-0.3.10.tar.xz 474720 BLAKE2B 726252263976b63c3e73dc42bd0166aa1c05df7a61715ca19921e9cd92abf1f8c84347127c94f724e385e0a36411ffae92341d91d06d679c052c83edb5ab6c49 SHA512 b050d333e021bc3721f5e72c1d2498adea3265afe7f702e1b1e859546755745ac70dcffc194739a4833d4b0b77168506f7fe90fde382d8aab4df2af7b635932b
 DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
+DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
 DIST volume_key-0.3.9.tar.xz 445092 BLAKE2B b9cec52ca02e331501d378482484535413f3ef7675b6592b9f26f272d36448a2ffee1a0ca1c7a552764324ab20cd6dac98447914faafbea96e4c526796bec587 SHA512 bc0e690997b9fa1c9fff361d04e7eddcac4cac09779d7a1f9e161be117f5c589a7e444ac16dab25fb3e3ce201591f7dc937595ddf2745d7daa625d4ab0a255e0
 EBUILD volume_key-0.3.10.ebuild 892 BLAKE2B f1698f22f16aa35276bc2b2eb4aee7a5fa3916b45c9bef3eaf2743d1c51dd6ddc8af059d47acdd64aec74f8304f50011a577b53ac112a2929d13f641a3f287f6 SHA512 76e10dd531efbf4f685fc0f5ae13c7548b20be8d80f232d128d07ac3aab57662bb90d10112b79b8ec417386f98b32ff342f5f7614ef9d053c28424ae53dd8a1d
-EBUILD volume_key-0.3.11.ebuild 853 BLAKE2B 638d69733a68fe645d717307bb5a207b0e5913196f1f751d2c48bb9d2b2595e127fd1dcb516df9e6e781d34c8275074f8f7b0f9c7578a46b2cf0fd1c3e59fcde SHA512 f07b6760999b9836d9c39bc1e94d4d4e5a5267ab1fef34ee3a45fff7a45d328b579bdd293dba9769a60062a2460dd6c1c4359b262a8cf0ce1bc6a3b97ed0e8be
+EBUILD volume_key-0.3.11.ebuild 844 BLAKE2B 01e2a04c36b783e99986987abc5b067059626018ab7b6d35249f5168f2ccf29164ba4008a625f5f668be66f568b7ca2eaff1c1bfa21fcee02e2072243ca39f13 SHA512 5d148f792a58c91af4ce9c9e7f6801e16b09770b2e9332bfbae0c8c79717fdbde57058d1efdb36dad8194e143642464f420097ca801e43cc7134fabe12b5f448
+EBUILD volume_key-0.3.12.ebuild 906 BLAKE2B d47cb3308f7d4347caade6a40cb8b57bfe73875babbe71fe5e0a8503d00a173281d8ff40c4b0d20fc4b43fccc1c237a717db64a83682d96e817457ffce128ed7 SHA512 29e77e6a082ae75d0d8e875913c3fd0e784f1b1d7f3666a55cec4f73da5459e4992b9e9c88611d3ac712f58f88492199eaea4682d866d79c205fabd804512b88
 EBUILD volume_key-0.3.9.ebuild 1030 BLAKE2B 4eb58cce79277f652acda134685f10db2c61093d8418cd7d5c550b0aa3f4acd5739a17bf45bbc2b9b707954ffa8179119ab9c41c3e752d5e958fe2ffdb76d33e SHA512 421e9f70ecc487ca8e8db52ff20deb6503d8106443e14f3781a5c4bc338b722ff2c453a0311a8b46f346986b31c4709f0d1b30e2df70f7fa6d7e166474dad455
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.11.ebuild
index 3c09344c519f..389ac8735673 100644
--- a/dev-libs/volume_key/volume_key-0.3.11.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/volume_key/volume_key-0.3.12.ebuild b/dev-libs/volume_key/volume_key-0.3.12.ebuild
new file mode 100644
index 000000000000..d0b33aaa8bf8
--- /dev/null
+++ b/dev-libs/volume_key/volume_key-0.3.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-single-r1
+
+DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
+HOMEPAGE="https://pagure.io/volume_key"
+SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-crypt/gpgme
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	sys-apps/util-linux
+	sys-fs/cryptsetup:=
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	test? ( dev-libs/nss[utils] )
+	"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# --without-python disables python2
+	econf --without-python --with-python3
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 4294a3b9f218..841a6401aab0 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-1.15.0.tar.xz 432932 BLAKE2B d86e5ba52c16664926e4688317db3fad4f9629c3903239dde46ee238ef7874f28e39daa6bbda96519dfda4ff83a1f540522f21fbabe9b71aa263523481d4eb5b SHA512 f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8
+DIST wayland-1.16.0.tar.xz 435216 BLAKE2B 862cc8ca9da060f9b8345aa0a62a4af76a31562246b75d2679bcf30cc894cc94ec28f97951f766b6e5297b2e113cd8b08e5682dacbfc79544c0085995693ec55 SHA512 64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c
 EBUILD wayland-1.15.0.ebuild 1745 BLAKE2B 833f9fa82246d92583090cc859fd98fe1084e4ce1f82f1ed135da2d6b48e075174239de3dc824a7a6f08c663d6b14807af593456da1a5c99617799b679792179 SHA512 d13a68804828eed61dddb4ca73e91898ad316fc7adbcb0bc94c73a13f4cbb6d6bf73787bcfa39724baa07aa9a49305d963edf0b0c7fe567d499dc4ba9d9497d1
-EBUILD wayland-9999.ebuild 1755 BLAKE2B 43f897b83819708141c70c1b8d678509101c5497a21d4ded684901c43295ada64934f95693a2458597a1bcfa7bb508a638a8447789ed511769219fb7d271bf0e SHA512 24b4b3d664e4cdd331d78f8f22ea3670513411577849c8f980b5b9f7c7687b692bce959dd25970055b940aa835fac1d22766dc40bba23d989b0300d29fd6474b
+EBUILD wayland-1.16.0.ebuild 1763 BLAKE2B f8c1e3518caf8c3506c8d966a1ad804a626727358a9d34d31b3afb2a2ad25d304d282ad424b41f95d406ad3dc4044bb4b204c04572e8baaf1d8ec0c9878bd7c5 SHA512 0168aee43cef82ac67c1e1a44611d14a2a5454a23f54c6959d5d66a7210860567524f0b7a38354d391b339ae9393256338b531f63845784ca6ab02e053cbaacb
+EBUILD wayland-9999.ebuild 1763 BLAKE2B f8c1e3518caf8c3506c8d966a1ad804a626727358a9d34d31b3afb2a2ad25d304d282ad424b41f95d406ad3dc4044bb4b204c04572e8baaf1d8ec0c9878bd7c5 SHA512 0168aee43cef82ac67c1e1a44611d14a2a5454a23f54c6959d5d66a7210860567524f0b7a38354d391b339ae9393256338b531f63845784ca6ab02e053cbaacb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.16.0.ebuild b/dev-libs/wayland/wayland-1.16.0.ebuild
new file mode 100644
index 000000000000..df8f72793cfe
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.16.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit autotools libtool multilib-minimal toolchain-funcs $GIT_ECLASS
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=
+	!<media-libs/mesa-18.1.1-r1"
+DEPEND="${RDEPEND}
+	doc? (
+		>=app-doc/doxygen-1.6[dot]
+		app-text/xmlto
+		>=media-gfx/graphviz-2.26.0
+		sys-apps/grep[pcre]
+	)
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
+}
+
+multilib_src_configure() {
+	local myconf
+	if tc-is-cross-compiler ; then
+		myconf+=' --with-host-scanner '
+	fi
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(multilib_native_use_enable doc documentation) \
+		$(multilib_native_enable dtd-validation) \
+		${myconf}
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	einstalldocs
+}
+
+src_test() {
+	# We set it on purpose to only a short subdir name, as socket paths are
+	# created in there, which are 108 byte limited. With this it hopefully
+	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr
+	export XDG_RUNTIME_DIR="${T}"/xdr
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	multilib-minimal_src_test
+}
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index 62aa7b2393bb..df8f72793cfe 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit autotools libtool ltprune multilib-minimal toolchain-funcs $GIT_ECLASS
+inherit autotools libtool multilib-minimal toolchain-funcs $GIT_ECLASS
 
 DESCRIPTION="Wayland protocol libraries"
 HOMEPAGE="https://wayland.freedesktop.org/"
@@ -28,7 +28,7 @@ IUSE="doc static-libs"
 RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
 	dev-libs/libxml2:=
-	!!<media-libs/mesa-18.1.1-r1"
+	!<media-libs/mesa-18.1.1-r1"
 DEPEND="${RDEPEND}
 	doc? (
 		>=app-doc/doxygen-1.6[dot]
@@ -57,7 +57,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 	einstalldocs
 }
 
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 93e83c45c87d..92acdfb9aa6b 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,4 +2,4 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
 EBUILD weston-3.0.0.ebuild 3460 BLAKE2B 3831b7e40fdf6a767a8c4686ce935f6323e1250e9338e7a2e4aaaaa94753098bf28ca3f37e6b05e20eea3feeef3079f889b31f0b44fc66b9be2443b912f8df30 SHA512 3ee0b31c75053f23a0e558a9e83ae737137e24682ef8905c54e2f3437306e6a46137f4300014f9c2471bd7958eb7078c69c8762ea18e79e84d618583b1ad72c6
 EBUILD weston-9999.ebuild 3450 BLAKE2B 32f9b8b7f712e7a948bd6addc68792234684314c3dcb59db31f0884432805a3dc64fb79f82225fca22043384af9532e34d7f5872424af180ecc768111348f3f6 SHA512 e56e09138148f71d36f2d6543bcfee9389d8df903def4ee23f3f326a1e47950dac07899a66234adfcea841a2e2b248741a4d5bdc73586761a43f116340540b02
-MISC metadata.xml 1309 BLAKE2B 3d7f849f84c4270533b9f13b7edae39c405f9ac0fdd61eca140d7244bc8cc9310600b349f611706200210f36d190d5b99917551edc3338876f4ce5aae75e8438 SHA512 537d4e99af7a368f16758fde18d271bdc76957c416b920934ff9248c1ee2172a95b3fb83cdaa8d138bdfc6cbef4224cc492e0c55d499f2f8e45314156330666c
+MISC metadata.xml 1245 BLAKE2B ee9948ac519b55c804770a134bddcc0f2a9656dd948b2eca13919f3d8d059db373bddb711b4a763e43bd4cfcc931e06503bb3a4f917baa5ab3a9c19db8091724 SHA512 668357837485ffcce4eb49d4dcd0d0b5de24fcac5f9cc22f6fbc63df951d37cc5dca6d2ff5f17d5a574e273167fff462e142c873893d2e9c517463d9fbc1883f
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 92b7b9cd58b3..c1c3e3956fa3 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -19,7 +19,6 @@
 	<flag name="screen-sharing">Enable screen-sharing through RDP</flag>
 	<flag name="unwind">Enable libunwind usage for backtraces</flag>
 	<flag name="wayland-compositor">Enable Wayland compositor support</flag>
-	<flag name="webp">Add support for the WebP image format</flag>
 	<flag name="xwayland">Enable ability support native X11 applications</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/xbyak/Manifest b/dev-libs/xbyak/Manifest
new file mode 100644
index 000000000000..1da7662a51d3
--- /dev/null
+++ b/dev-libs/xbyak/Manifest
@@ -0,0 +1,3 @@
+DIST xbyak-5.73.tar.gz 214021 BLAKE2B bf7ab78df7ac3f5a8860b3a613957bad8b6faba523126f6f4ce94be4ce25da8b91a418ac2445d8d706f09fc7434a8ab9ef6f63c56ef0b7860290fe6801849fe7 SHA512 1c2eb73c2e9b66d4b4f7689e071ea8ba8a3b7f0e05ef885ad35ca89f706772bd6e8ad448581c954b1a24f424ebd2db4e420410450a951fda7e02d6fd2e5e9a67
+EBUILD xbyak-5.73.ebuild 467 BLAKE2B d826f6cebb8f5bbe2cada4325e58e44df2c1f7834586a236bb41aede02737047938c741d336a519e949f604fbaf276c6cfa3caea2a1cc35b8cc1ae2a67456876 SHA512 678b36a0a5eca831168cf6d97b4495d592f0114003c6104c108e5546acb9e09093fa98a9b24d69e32244a80e3a5fb638a88f32990406787bafc5b0431d5c4bef
+MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/dev-libs/xbyak/metadata.xml b/dev-libs/xbyak/metadata.xml
new file mode 100644
index 000000000000..38b28ff6e621
--- /dev/null
+++ b/dev-libs/xbyak/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zx2c4@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/xbyak/xbyak-5.73.ebuild b/dev-libs/xbyak/xbyak-5.73.ebuild
new file mode 100644
index 000000000000..4cfd5772e810
--- /dev/null
+++ b/dev-libs/xbyak/xbyak-5.73.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="JIT assembler for x86(IA-32)/x64(AMD64, x86-64)"
+HOMEPAGE="https://github.com/herumi/xbyak"
+SRC_URI="https://github.com/herumi/xbyak/archive/v5.73.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_compile() { :; }
+
+src_install() {
+	emake install PREFIX="${D}/usr"
+}
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index c02b2477e64d..ed058cab645e 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
-EBUILD xxhash-0.6.5.ebuild 834 BLAKE2B 1afc6f4abd178d88f9153357189adc568606438d44e31909e7e404a1927ca99d0066d71c331cbf4432702e99e8544ebb10d0d5bbf8625a36f6cfe8cc9a7a9662 SHA512 07a2ff9cbc7cd709e9b8288dfef2f17a8f96d5a4fc8845706d9d1a54afa496b173bbf8c5d1733c5f3b2eca5dfd5859b89a56b657cc995fdfbe61adda382e9666
+EBUILD xxhash-0.6.5.ebuild 841 BLAKE2B 0ae60d26d8550d51096667e808e58984cafe39e7f1e8282ec59e809d04fa0f1f20e6a5723d6e3d62b3410257fef08ca8691c87b6ec7de5d8debb36fdfb918021 SHA512 f84649c48e0409680c65251976b28c2b92c199cdf08e7c1fafc77d6e7ddd907f554d4061daa4e149a5bc1aac52c4d94ac3c6839b63e7833dbfb3ddc62b564409
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index 31959e459926..5c5cfd42d765 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
commit	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree	9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /dev-libs
parent	957235cf19a691360c720f7913672adda4258ed0 (diff)