gentoo resync : 05.04.2019

196 files changed, 1830 insertions, 2970 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d42c2cd78829..7214874414b6 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 a834e111682b..34f452eae9f3 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +1,7 @@
 DIST appstream-glib-0.7.14.tar.xz 2239240 BLAKE2B d99788b3349df6f40c5dd3d5a6fb90446d1885569c04aedde9848f41916a1407f8397c416e34e87164bad2fa2e71bc93849901b829e71839d0aa1911ca73e485 SHA512 b2b01e529032a684b7864d6c330e9cbefdfe6a4312dc5d2cde8cbe82875218a0d4dc92a4c3129e45605571ab77482a86470d7336c360a0070ea029a1090a60d5
+DIST appstream-glib-0.7.15.tar.xz 2240040 BLAKE2B e1b58e0ce6523354490e529381302aa603e4ac1886c37e9c261ab612f76490ae4ea8fd22eff9c2bc1981d5ceb77ff8c4f8279e091dc62bd4df39d2c32623c1ea SHA512 bab0c73e54d90fbf22295f616d4a09332f94b90a3fa0cb38f1b654c6d9a459c9557dd81c677f486361dbf4f1dd23651306fe34b1cdd15254694269a8c9e8a927
 DIST appstream-glib-0.7.9.tar.xz 2245728 BLAKE2B fb6f54329bed91f1acaa6218b111fd4527dff7ed412a89cb44a6e4f6cdfb7e0fe4e6f9fb37b6cdc2efa75164dccef323b6d7428a63b08369b941d36b0b9071f0 SHA512 d78cb6f11cad01d67cb33f16e987485177d20b78a8b21cfbabb64ce7b18b813c0d2d1de2faeea199fdc31d12633e899a5596a6cf133cb831a4377d641f79eb7d
 EBUILD appstream-glib-0.7.14.ebuild 1623 BLAKE2B 0736dbef4c5714c238e915640590795da70b829fe5332d922535df62f7310a3945e752fc4db6767661e8b3bb76032b8b7dc5985bb6b7e812fed09eb74a974fb1 SHA512 9b1c954bc9c21b0de6c9171121dcd9394a1ce7bf16f1545f0bb21a4fd29f3ca4a25a7fc6a50899260dd28b75fe450da5738f893b879ca0bd2309b3b49e20ca6e
+EBUILD appstream-glib-0.7.15.ebuild 1647 BLAKE2B df93453694137ea42e1e5da7ce3a2b32172c9b2b0ad7a40fa1445afe8d3a807b7b2534dcbe79747ce0d4846c52d2326a72cc41e0b577a3da293b4b5996ea84de SHA512 7cc6d1b6f81b8f08f64eb16eb5eec35cfbf429fa198b55b9fb0bcb269eb391093c065bd9d2b637efbcbc6268e5fc9007dde2b48345da20c71a5f57c580530f3a
 EBUILD appstream-glib-0.7.9.ebuild 1623 BLAKE2B c66d8dae417e53b8fcc0be7afbd2cc06aee3df35254ea1e204dd00feacd37133b702f39ca1899e91c9fea5294e45cbf35a31df7b8e30370be76821301f47dae0 SHA512 d865778c663bbfcab9e99473f66c4156c5d887fcdd1e4402bacc9bb7dcaf073656a624b8d0e2d78883b180512e31ecb7553cfb5ca0733d369d5bb745b5141bf6
-MISC metadata.xml 352 BLAKE2B 2d04b5c85e8a4e5a62ddf862b7dc1d757896d4f7a5aa052b9139cb050d16aedf9b571b543484b91d3795a979703b4bebb6c42695f8238939a4179a613110053f SHA512 491790151594360b57d05b217381b3b6c6f3d3a72e8066d923230060a4b05d0e2ff1e31cdcb94eb8b1ac077a011d695f33b857bf049c04292a9e324c065895d9
+MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
new file mode 100644
index 000000000000..400e817276b0
--- /dev/null
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg meson
+
+DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
+HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
+SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/8" # soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc fonts +introspection stemmer"
+
+RDEPEND="
+	>=dev-libs/glib-2.45.8:2
+	sys-apps/util-linux
+	app-arch/libarchive
+	>=net-libs/libsoup-2.51.92:2.4
+	>=dev-libs/json-glib-1.1.2
+	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
+
+	fonts? ( x11-libs/gtk+:3
+		>=media-libs/freetype-2.4:2 )
+	>=media-libs/fontconfig-2.11:1.0
+	dev-libs/libyaml
+	stemmer? ( dev-libs/snowball-stemmer )
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${RDEPEND}
+	dev-util/gperf
+
+	dev-libs/libxml2:2
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.9
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+"
+# ${PN} superseeds appdata-tools
+RDEPEND="${RDEPEND}
+	!<dev-util/appdata-tools-0.1.8-r1
+"
+
+src_configure() {
+	local emesonargs=(
+		-Ddep11=true
+		-Dbuilder=true
+		-Drpm=false
+		-Dalpm=false
+		$(meson_use fonts)
+		$(meson_use stemmer)
+		-Dman=true
+		$(meson_use gtk-doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/appstream-glib/metadata.xml b/dev-libs/appstream-glib/metadata.xml
index 03dc146005b4..822c18627761 100644
--- a/dev-libs/appstream-glib/metadata.xml
+++ b/dev-libs/appstream-glib/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="stemmer">Add word stemming via <pkg>dev-libs/snowball-stemmer</pkg>.</flag>	
+	<flag name="fonts">Enable fonts support for appstream-builder.</flag>
+	<flag name="stemmer">Add word stemming via <pkg>dev-libs/snowball-stemmer</pkg>.</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index b3809d524f80..4b2ae3a22d67 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,7 +1,3 @@
-DIST AppStream-0.12.3.tar.xz 1940064 BLAKE2B a0160c4a922abfe315bdbfe6b7b32fea8d5eda5631347be4a39dcf102660ad26a3f40c5fed9dd0bdfb1b91956780ff7cf58e61d7f38b03d2f48a5bf67f2871f6 SHA512 3d54bb499e4056d341ffde2878549011708e6699b3ec58756ef2e4080864279ff5e5003224fcbad601007fd9296bb9ed062da7843e3e02272837ecc5d4c802f9
-DIST AppStream-0.12.4.tar.xz 1944416 BLAKE2B 3a315b167084f9f6d8f50a86fa2853444a12beb63e3c7e77bf97c861e1a31dd7fd5ff9c4406d0da1b551b1fbb366531740cd4efdde354b857613507c06eabe62 SHA512 8a7a10b0c577a22b89e0b5505415d5b799f3316b4c87b0a2a9281e7b2672e041225896ac847781504b2828c5ed8a250e3a0558355df838d58e174a984b04e3d0
 DIST AppStream-0.12.6.tar.xz 1953604 BLAKE2B 28b03a935b8c203f2ac2c52c1de8317cc899f2b81b00e83e2eb858dbd185a985ce608ba3f6b1c35f084b4ee91946a4870c89d6b0c0a4c6fd32a938558e3997f1 SHA512 c19cd89ba39aff5afa2ff6d5fca72581a8624463c33011b11036526db98392ff5aa6c0f599682e90fdee29b8732538cf96c20b66965016b96f60b3f899d722bb
-EBUILD appstream-0.12.3.ebuild 1454 BLAKE2B f8bed2ff11275869ee9658151aa92d1b96ef3fa140a976d62ba417537c5b7fa2030f9189253f084f754bb42442e4b673a325fa7c75290e9652e8d543f2d7dd66 SHA512 82d1b5f662065ba4d14a0b065324cd99335d2fa7a8ef6aed20256ffe8b88207cf989cc604cc2459cefca4a02836c127fcfba150287fdb30af3a456552e7a8293
-EBUILD appstream-0.12.4.ebuild 1571 BLAKE2B adafb3c31f13e991d6c665169c5ac1ab986d7bcfdd1462aebe2b431ac7823dedd28a7bbdc1ab8b5786bb020a47a3dcc05b137e01b23169d227046097740be5c5 SHA512 41000771c6651d3a90a9aef13186222c5950543350fe2037c03963116baead8c5463c465674bfb8180a5e902b1564bab9c6ca113ba5cb42586895407d2b36f97
-EBUILD appstream-0.12.6.ebuild 1580 BLAKE2B 9e0c51d995ae99df8a2e39ba57595dd1d707230c01ba35d03b8807ebfefe808a96c4d7c332c6aa0061ab19d95624a9c623e8c8d7ddab0aaed34734895bd94df5 SHA512 15a9365e9ea4a87c8b8de3dd0c4789be28c4cffbee2fb4b8936144e29020e0c91446c8b0f87756f148ab70477d5a8bf7b417313deb55bbdfc065a75990a9c8b0
+EBUILD appstream-0.12.6.ebuild 1578 BLAKE2B f49c8b79d6f8bf133d1d85f711cd5c31425cd10428f87bbcc0660bf8ea7b748b687bce5838895d46245fe0204e538f1c602520a5667debd23a65a788adeba82c SHA512 17ee9c6aed9b5abfe4bbea349311eab42b75e0b101ea74151614b51d9bac49d11839d1ef6bd28f3535606856b9a22431d85a36f91b72787e709e2b138c16a067
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.3.ebuild b/dev-libs/appstream/appstream-0.12.3.ebuild
deleted file mode 100644
index 71095f75c025..000000000000
--- a/dev-libs/appstream/appstream-0.12.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson xdg-utils
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	MY_PN="AppStream"
-	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/4"
-IUSE="apt +introspection qt5 test"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=dev-util/meson-0.42.0
-	>=sys-devel/gettext-0.19.8
-	qt5? (
-		dev-qt/linguist-tools:5
-		test? ( dev-qt/qttest:5 )
-	)
-"
-
-src_prepare() {
-	default
-	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local emesonargs=(
-		-Dapidocs=false
-		-Ddocs=false
-		-Dmaintainer=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt true false)
-		-Dgir=$(usex introspection true false)
-		-Dqt=$(usex qt5 true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/appstream/appstream-0.12.4.ebuild b/dev-libs/appstream/appstream-0.12.4.ebuild
deleted file mode 100644
index b64ac55e0487..000000000000
--- a/dev-libs/appstream/appstream-0.12.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	MY_PN="AppStream"
-	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/4"
-IUSE="apt +introspection qt5 test"
-
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=dev-util/meson-0.42.0
-	>=sys-devel/gettext-0.19.8
-	test? (
-		dev-qt/linguist-tools:5
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt5? ( dev-qt/qtcore:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
-	if ! use test; then
-		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local emesonargs=(
-		-Dapidocs=false
-		-Ddocs=false
-		-Dmaintainer=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt true false)
-		-Dgir=$(usex introspection true false)
-		-Dqt=$(usex qt5 true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/appstream/appstream-0.12.6.ebuild b/dev-libs/appstream/appstream-0.12.6.ebuild
index 2b8019ab0684..d45c21e89008 100644
--- a/dev-libs/appstream/appstream-0.12.6.ebuild
+++ b/dev-libs/appstream/appstream-0.12.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	MY_PN="AppStream"
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index ddf49149119c..5a5238ef861e 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -8,7 +8,9 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3 SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
+DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 EBUILD apr-1.5.2.ebuild 4073 BLAKE2B b5cbc0f22c8d180930a15008f374c9cf738dddea1bc1389e64c058389f1aa25476b6e52a31f1e2203479ad256e5a1c633c89d32558256b389a2026b05c84a729 SHA512 a29bce9c56a8c9075eb7ebcc01f628b52c46564b4f34afba7735676dcd2959e76edecfce1de6207e70052ffcabfaefe0e1bfe42ce05513b130ea3126e7b5ae19
 EBUILD apr-1.6.3-r3.ebuild 4395 BLAKE2B 30248b2a3bca45f85ad301b214cac07349b0b2ef5e20e2f8a29b6f403c17bdd9a61cc406186bf2397c968381a6afae7320633b5b85aec81d1c51797727562a59 SHA512 1199ea5e34049f6f1b22b54588c074437508dc8d3bf3d8d71b65b96c9e6c3638d314f5433a5085f2059d7d83c478b9ff0505bf6b2bf9b46fa8ad9510af60a082
 EBUILD apr-1.6.5.ebuild 4344 BLAKE2B 9ce9356d89d4433ceb9f987f8f13d152d0bdec5d9f3e733c71ae2ede16deacf29e6cc9a84fcd7c5773edbcc3f3963c03248b1c14ad5ede26ec393a858b338503 SHA512 9d18249bda4c4bd1d10de424bfea14b5a2b998279745010aa937be31519a8e7407434f53537af6616e48b97915d604bc4312c21eb3b715c99fc1d3c3cc4ed3f5
+EBUILD apr-1.7.0.ebuild 4260 BLAKE2B f04cbbc17205fd627ac2235ee4862bfff141e52cae21fd588116606264402b81647ce4270bd94c7d11b5a0daf0964f5d2ab2e7c237b5d02767f3fab5e929dcac SHA512 5c58b65b4ccb8a974d2b4d33af1b648c0fd1478c8291ef830f787c4b43ba0aae2501545d50509e583698c4bf1fb560550470341da7e79f913a19d9d1d6ac17fa
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.7.0.ebuild b/dev-libs/apr/apr-1.7.0.ebuild
new file mode 100644
index 000000000000..1a7fe29b7a21
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
+
+CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-apache )"
+DEPEND="${CDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-mint.patch
+	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
+	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+	)
+
+	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, $PN detects this.
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
+
+	if [[ ${CHOST} == *-solaris2.10 ]]; then
+		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+		*atomic_cas_ptr*) ;;
+		*)
+			elog "You do not have Solaris Patch ID "$(
+				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
+			)" (Problem 4954703) installed on your host ($(hostname)),"
+			elog "using generic atomic operations instead."
+			myconf+=( --disable-nonportable-atomics )
+			;;
+		esac
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_test() {
+	# Building tests in parallel is broken
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm "${ED}/usr/$(get_libdir)/apr.exp" || die
+}
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 945d6dae2407..73d2608bed6c 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -8,8 +8,8 @@ AUX beignet-1.4.0_no-debian-multiarch.patch 862 BLAKE2B 54fb9124832e57b3466c1169
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r1.ebuild 2688 BLAKE2B f9dddac927aa9f34731cb1e10113bbaa686cf6a9f5adb9890f89f00110033c844d2395a0a81dbd73269ff33ed78f24f6b2a15a42d7d00f63ab391a62dd3021f1 SHA512 337bf60e64644f541fbca9b0b7d5571c40fdfae97c571bc0ecc9ba408fa9c3d0f98bab41262bf7ea453da598c9ffb240e17644c15033f6d04adaa93a045a14b0
-EBUILD beignet-1.3.2-r2.ebuild 2916 BLAKE2B 9afeb684a142d7e807bc2acf55524099f0524e2761acbafedffcb3414d66195bb63f689bb7e06414077a1b0b6b0ba0c05a08f1be717bcab4d8a8b10c400b8e61 SHA512 b9798f3ff8b1c28e47779c586dd0e6ca1a97333676fd075cd100228938197592c576a898133b6e6f24e4c546149540789cc8fbc00002facd519b30bafb2b0a31
-EBUILD beignet-1.3.2.ebuild 2630 BLAKE2B 09a301f4174494e0f8007de277f9c3d888361661631ace7e1858a0a4cfec7cac07f494b2187862e447e1079716b9561bc6526422ce8100df54bdaf282de8cf0b SHA512 823a890987d1c6e3c16f9127ebe20947ea09d9114f9e5e42fe97e212d32ae53d44dcfb37aead35608c8b3c2f2214f9c493c99381073cabd4d6ab8872f49762db
-EBUILD beignet-9999.ebuild 2452 BLAKE2B 91b4102d667aa6e265c725f7e77a5bf66198b75569d15a6ea7ea6e89a064639a5783d7670dd7627e47b6ee90124a076fba3abc8a13aeb7f82d3aaf9a7e4ab7a0 SHA512 def37f0a7884bcf1f87f3ec1da46d499a7cb6f8dc216ce51212f72039490f70746a5ca3fe3ab1bc7da481834b16d54c0bdf11f7834de319b5e978e5b641d203b
+EBUILD beignet-1.3.2-r1.ebuild 2735 BLAKE2B beaded25151a0a27c56d7a211228859857aa3bf5171f53e8aaddc4632f5fd2803007147cb045f5f5ec91e401c2aa681afb56546b7c5d2e3843c81550ce41f6ad SHA512 592f6254baaa3e308795f8b5fbdd197347640b3918b05a350ff5134afec541e91886fc3a5d037d0fa6d4e2047d95089dbf19d903392ab61b56df349e89636491
+EBUILD beignet-1.3.2-r2.ebuild 2963 BLAKE2B 659900b2d71c764c470c0e7cc3370ad4d98be15a1e233ef8fecd356b1d4316a4d6498300d3b85f8e309e14f519f10dd4ff3ffed7eeb2a0fc68188df5c1ffb861 SHA512 9981da07752d0a6a9b0bff0c64a9e56a050651db6e10ff6683e80fa1f7cf09da29165fd89109f76fd440fb7c026cbca4376715896282ea2ed87672705d8d7ada
+EBUILD beignet-1.3.2.ebuild 2677 BLAKE2B 136a60bd3e37b356fd3894da33d2d14ac0e5cf6615a3c97645c83e35e7d580be74033374764ef1c0e479c057c7a3acefc6d416561c1dc6f445496cf0beef8672 SHA512 c756db3374352e3cb35dcf3cc2c89c3b124bb4a4df2beef135c37279674e56c47f29b78b2aae7e5e56618dc22fe1e33927a11c30664dfcd362e8a78d1ea8b44b
+EBUILD beignet-9999.ebuild 2499 BLAKE2B 3902b84585b58a17bb7152ee677bd79619da8434a11f4cd3f22c3292293af46e5eb13729c7513ed9d5902491718d63f58f632424989faa95d5793e5f60c89e2b SHA512 4ef2e9a67fdd219cefca7104e746b74f0cccfcec1187e6cbf90a86d2c7a382f8b45fdbf4afbf1ef0f3aee0bd69dd1cab5f331f06a2807d6e2e4129aa27e8369d
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
index aabc386a74b1..3d33e0075c62 100644
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ CMAKE_BUILD_TYPE="Release"
 inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
 
 DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet"
+HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
@@ -17,7 +17,7 @@ IUSE="ocl-icd ocl20"
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64"
diff --git a/dev-libs/beignet/beignet-1.3.2-r2.ebuild b/dev-libs/beignet/beignet-1.3.2-r2.ebuild
index 189160961421..17d7f95bfa0e 100644
--- a/dev-libs/beignet/beignet-1.3.2-r2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ CMAKE_BUILD_TYPE="Release"
 inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
 
 DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet"
+HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
@@ -17,7 +17,7 @@ IUSE="ocl-icd ocl20"
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64"
diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index b586f5b888a2..a9918a01ce3a 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ CMAKE_BUILD_TYPE="Release"
 inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
 
 DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet"
+HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
@@ -17,7 +17,7 @@ IUSE="ocl-icd ocl20"
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
 	KEYWORDS="amd64"
 else
 	KEYWORDS="amd64"
diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
index 5c7dd730a34c..3a7b1b4f1fc9 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ CMAKE_BUILD_TYPE="Release"
 inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet"
+HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
@@ -17,7 +17,7 @@ IUSE="ocl-icd ocl20"
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64"
diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest
index ee2710b5eafe..d457553a0c2c 100644
--- a/dev-libs/bemenu/Manifest
+++ b/dev-libs/bemenu/Manifest
@@ -1,2 +1,2 @@
-EBUILD bemenu-9999.ebuild 702 BLAKE2B 4ed08a98bb29030a3db13812e3a200c7f1ac83077d776634432a98943380082fab0943cb2f38c0448828599272fb587308db65f51264dee31162f3ca296cf7d4 SHA512 0504a23225d73d10fb91fb0a46bd933f17f51d0272fff20da847206bf0351519b22da49b4f5a5a049ff99f697009495ae6bcacbe2833aa72cdb0f4dd826bff6a
+EBUILD bemenu-9999.ebuild 1033 BLAKE2B 793582c8a631f3f4147386bec6c40f8458239a317b2d92811fe80aa6802a7599c1a253e1033e66ee1044642f864ca1d295ab5a65e6aba4f3ec77d17023be9b5e SHA512 25f0ed77a1fe37215ee30f4c970a800df2329a1f6e261602884bf9abaebaeb1b93ed1a4258c85e9669cea5b6c1adb5f365053d61624595b18b1de95814dbc0de
 MISC metadata.xml 377 BLAKE2B 6b29e18f25e7237d1e1fec87b4cfe534471a6e7da07682cac5cfe97cd01d968b7b037a9b624432922e73f135f72d41b2662dcc95b862bb33cc2667cc700dfd0f SHA512 e7a4e4d244d06524f6c8f53251d6e0a41c570c76b0c5e5c49e97c53793c1e0d745fd82c511979073163e69fcea9ede4659d14a8ad85a1f6f648390e45682ad64
diff --git a/dev-libs/bemenu/bemenu-9999.ebuild b/dev-libs/bemenu/bemenu-9999.ebuild
index 1bfa5ce8fae1..f9113da669b5 100644
--- a/dev-libs/bemenu/bemenu-9999.ebuild
+++ b/dev-libs/bemenu/bemenu-9999.ebuild
@@ -12,22 +12,37 @@ EGIT_REPO_URI="https://github.com/Cloudef/bemenu.git"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc"
+IUSE="doc ncurses wayland X"
+
+# Require at least one backend be built
+REQUIRED_USE="|| ( ncurses wayland X )"
 
 DEPEND="
-	x11-libs/cairo
-	x11-libs/pango
-	dev-libs/wayland
-	x11-libs/libxcb
-	dev-libs/wayland-protocols
-	sys-libs/ncurses:0
-	x11-libs/libXext
-	x11-libs/libX11"
+	ncurses? ( sys-libs/ncurses:0 )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+		x11-libs/cairo
+		x11-libs/pango
+	)
+	X? (
+		x11-libs/libxcb
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/cairo[X]
+		x11-libs/pango[X]
+	)
+"
 RDEPEND="${DEPEND}"
 BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
-	local mycmakeargs=(-DCURSES_LIBRARY=/usr/$(get_libdir)/libncursesw.so)
+	local mycmakeargs=(
+		-DCURSES_LIBRARY=/usr/$(get_libdir)/libncursesw.so
+		-DBEMENU_CURSES_RENDERER=$(usex ncurses ON OFF)
+		-DBEMENU_WAYLAND_RENDERER=$(usex wayland ON OFF)
+		-DBEMENU_X11_RENDERER=$(usex X ON OFF)
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/dev-libs/btparser/Manifest b/dev-libs/btparser/Manifest
index a2207aa4a3b8..ccbdf4299da6 100644
--- a/dev-libs/btparser/Manifest
+++ b/dev-libs/btparser/Manifest
@@ -1,7 +1,3 @@
-DIST btparser-0.24.tar.xz 353700 BLAKE2B b025dd9701505d5791350ea1b5125ff5ae1ac2185271811eb9fb8f5ad2acca2b5c8999d913a4f6b8f4999fd395e767a6040d4e37b4f6098cc6abd47e388ee4a8 SHA512 3aee4a8cbc8cda7017cc7203b670ba30443b5f302d728ecb7ce06a9569367543669c9c02d10a71b2bbf0bbc65cb927c0e25a53a422fc3be5e4a2ee51e5495198
-DIST btparser-0.25.tar.xz 355736 BLAKE2B 8793739a832e6361a06ef7506296ac12f1dc9e06943345b1440d0b95cf72d4fde4d573f125c384c327c64df6ba0446f8ff6598a8cf6abc8c6ba08df5ea3efd25 SHA512 fc3f1f440fdf19eba8d698bdde9b1f197cbf663b7f8a53dea98c9fa6ffe4cd23a12b8d46d211fcff30dd4adbd3998723f7a2afb19c6c5d73da34156bc7877b56
 DIST btparser-0.26.tar.gz 564940 BLAKE2B 979b530764d0ebb413c670c44aeb05bc3ac6dfbce54d35ff62ca851aa671a58aa223972ad3a6880e0d8f2e9c849ff60ee3adbc35cfae0f996aa085e771383375 SHA512 c5520f0aae3217482b97eac7c9cc5ae9be596df936ce958d84cb8e46a67c4b97a9184f9cd4bcab185d35c64f5ea98acd6cfb6f98512b9fa492a3aa9931d6668c
-EBUILD btparser-0.24.ebuild 785 BLAKE2B f73fc482755266740a9f54a98a27f3bd15c913eefe2d69c86f05625b9ee7fd4037ac58b25cd8a93e0f69ecbfaa5bae2bf41ba14ce8af489c9af3461d6f10755a SHA512 271623847a24be05c1fe2bb45e7104257fafda5277f75ad173cd6672fc2ebaa992f437b725db802ef216e2ab3803702b759e488bc7f04a5655debe72b6dab586
-EBUILD btparser-0.25.ebuild 870 BLAKE2B 92ccc1614420f623ff716d8ff2ea889f3f58522ae1f3bc6285e70c85fb031d06375f3b6cc66deaf52df5acc4a014589ced83b4a9c27879646b32c87ed1a4eeaa SHA512 dd9a140de0a5c165cdab2030798e602c02532b40f2fc003163c6504c3df5f6e8ebcbb39b04f38b558afeaeec43bae5bf8f5a97cd50c1aae8e0df41b2d8f6f343
 EBUILD btparser-0.26.ebuild 885 BLAKE2B df2e1060db6b76036b423f90e2f452cfd9bc6449212a57c736f8ec68e75fd34dd13890c0250af8a565bfa16a046b8fdfaa7132e248dd751bceb06851faa2a37c SHA512 70402eee95a1ef0da66e1b7c8963645351690b073acba904e6bc2c85f0c63c06ce0454f71684e8f280787eb4d06f3ae8f7be5ba22425576caf1f9bbeae9eb577
 MISC metadata.xml 341 BLAKE2B f3a4f723dbe9bd67b919dc3dbbae6ec4390122123dcd9441727a0697eefc03bd8805ddde5e5ee4175b7c06f275c83142f4dedb6c94492d28562c56f31cbd4df8 SHA512 ba348a6b7ada0d823316f48c43d8a94e081c099a18ea2488905ee2b27c8a8106639ce15ce83749a5534259c9245c118e19aa32a9fc6177e8012bf9e21f9124a3
diff --git a/dev-libs/btparser/btparser-0.24.ebuild b/dev-libs/btparser/btparser-0.24.ebuild
deleted file mode 100644
index 0a4b57a12dea..000000000000
--- a/dev-libs/btparser/btparser-0.24.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Parser and analyzer for backtraces produced by gdb"
-HOMEPAGE="https://fedorahosted.org/btparser/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/2"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.21:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_configure() {
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	econf \
-		$(use_enable static-libs static) \
-		--disable-maintainer-mode
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/btparser/btparser-0.25.ebuild b/dev-libs/btparser/btparser-0.25.ebuild
deleted file mode 100644
index 63dba67842c2..000000000000
--- a/dev-libs/btparser/btparser-0.25.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 python-single-r1
-
-DESCRIPTION="Parser and analyzer for backtraces produced by gdb"
-HOMEPAGE="https://fedorahosted.org/btparser/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/2"
-KEYWORDS="amd64 x86"
-
-IUSE="static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.21:2
-"
-DEPEND="${RDEPEND}"
-
-# Incomplete tarball for tests
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf # to prevent maintainer mode
-	gnome2_src_prepare
-}
-
-src_configure() {
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	gnome2_src_configure \
-		$(use_enable static-libs static)
-}
diff --git a/dev-libs/cgilib/Manifest b/dev-libs/cgilib/Manifest
index 9e0752be780f..27b4b13ff0ce 100644
--- a/dev-libs/cgilib/Manifest
+++ b/dev-libs/cgilib/Manifest
@@ -1,4 +1,4 @@
 DIST cgilib-0.7.tar.gz 268783 BLAKE2B 525487df43b9a936af8e32aa1e9b979bb93197cee7d7eb730e31d756201bab441e46d21b05b2c9e92a518fe761d7e6a643545160587e462b604780d52a88c261 SHA512 9feaa6c18e0c8ebbffa2682c07e584ab4970e0b98b61507ba67b83c920d9ba9012244fa96c95ab71121728b9945269683a2eef274cd56660576ae9b055861c83
-EBUILD cgilib-0.7-r1.ebuild 582 BLAKE2B 614d4b71f3b594912179cadd609ada62cac2cd9da86b4ad6c74f964a8c351a6ed5e632e1763a4e44b1fe3e3de83cb51de76672926e1444d1ffcc6a6203308944 SHA512 fe080acddcc71cb397fb4604f67b528a256f857052ac87a2087939eeb49ad47a14ee0b56ce4852b7b6f166fab99261dcd7476c04ce20d73a018a7faada896014
+EBUILD cgilib-0.7-r1.ebuild 578 BLAKE2B bd1cc16ed188b18e97343ed64d6feb27d360360c240de98baa0c5f4bc72ed7c372acab03706e51175d2d9a2dda1f0cc4b0a75c858a045fae542af912a4330874 SHA512 2c487f707de41539bfce998c5c039cc6e3f9bf2715ec4a4c25770b10739718519989cc878da51a91906bf9456fd91bd4f96756947a766e7dbed06674762b8bb3
 EBUILD cgilib-0.7.ebuild 582 BLAKE2B fd601c877a2eb64c4bf996c290b3b31529c658bd91e73f99bbd022663385af170f1f413c35d9921f3ebb5a928dd3f82286d051e498a74b6f899cef66ebd60bb6 SHA512 c056ce8d29e102cabaabb07c4c9a03aee93583d7be137250c2013c4c34b350d06f9081bcaa826881eb3e342c2c962b1e42ea33cb7f98a384189661098e4b8955
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/dev-libs/cgilib/cgilib-0.7-r1.ebuild b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
index 2d2df7991b5c..f0c3da5679c5 100644
--- a/dev-libs/cgilib/cgilib-0.7-r1.ebuild
+++ b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog README cookies.txt )
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index 45b3651cd4e3..cbd43f50943e 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -7,5 +7,5 @@ EBUILD cloog-0.18.0.ebuild 862 BLAKE2B 7613752201f4d1b140136a3178e9d91f46c120ad5
 EBUILD cloog-0.18.1.ebuild 1002 BLAKE2B 8062382984618aea7eb682c374ebb3408c37408c5b925b825bf5f0de2a5099d9b76e087ec6e2a90477963b5bbb035e72b04c60a217f02aa454690f298f46b329 SHA512 33e934d5e59ce9fccd558cd669378076bfc717b778a65a1c8449f1abd0948b57f770396735c62f073c5fdbf4f7038a2c6bd2c67e0cd71b150a21d9266843b43c
 EBUILD cloog-0.18.3.ebuild 1481 BLAKE2B 806521dd1613a52fab0c27a116b58d4d3a4f43ab300a1e40781352f763a5bc88f522f9ef97a546777cf1617d7fa283cd1924c1b06bc5edcb6e99772ea2d906b9 SHA512 f19c0945bde9d4fdb7d9ab7ccf25f1e7c346512a0fae91b8c0da4f282602d3ad4529eff4abccd9e43a1f1313722baa57094bb8b0b8a62fa4b0a1dd18f5a8bf9d
 EBUILD cloog-0.18.4.ebuild 1426 BLAKE2B 2d0c6e34606f959c698416c3c2ea8f52a935c3f36bedf3afbf234b3a35c1efd7bb7289060ce5993e2ca5e830df0fb8895cb55233ce3c17c1f898d1a4b073536a SHA512 5f1ffef0aec96c0ae78e3feccca6680b0d0e52ec26f92231137975ff51b9cf24a3c645e934a1be95f49000f19a23020f06c27a3a63948cab96117f9682b1d936
-EBUILD cloog-9999.ebuild 1435 BLAKE2B d7022a55b8738e7716a47dbac07f1e4ab08aca9994d467ec5a45be7c1436ce59baf491d7c79538598684dc7a6a7274bd8967be87122fc65550efd6dfac8f72f6 SHA512 7cef7053a60f009fe8c2fe9467b5a087786e18d18bc32d774e455abcbdf40ca9572f5ae1a635b344e182068c9c15c78fd37bae81017a295222f7b67bb0164f01
+EBUILD cloog-9999.ebuild 1466 BLAKE2B 9b79f41f96f2ceba0c147725c669722fc527a86bd8d96cd8104d3c6317222a7c4910e54c03e64d73cf532c85023a432a940c58968e7a348b39ee1fda2a74f806 SHA512 e5c4f4ce715b271ea05fa2ec866356a4c0b113bc4c58964a99651a06c47633468a74f844df40213531b688904d4df6995c1207b401496cc3a6a6a1035de1ed77
 MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
index 85781b4d72c3..44fb3bc55495 100644
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ b/dev-libs/cloog/cloog-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 inherit eutils multilib-minimal
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
 	inherit autotools git-r3
+	EGIT_REPO_URI="https://repo.or.cz/cloog.git"
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
@@ -29,6 +29,8 @@ DEPEND="${DEPEND}
 DOCS=( README )
 
 src_prepare() {
+	default
+
 	if [[ ${PV} == "9999" ]] ; then
 		./get_submodules.sh
 		eautoreconf -i
@@ -58,5 +60,5 @@ multilib_src_test () {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
+	find "${ED}" -type f -name '*.la' -delete
 }
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index 0e242e8bbcb6..8041386896f8 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -1,5 +1,6 @@
 DIST cudnn-10.0-linux-x64-v7.4.1.5.tgz 422699128 BLAKE2B e13b22428f011a4ad6532bfa35d836f23ea6298ad220eaea6c3a6fac7694f1c6b6920255690fac10d84388fb2bec7cc60a0319bd1816b20eac134c7b112822b9 SHA512 fd065c23b27416e2ace5f0eee854ea4a5e04f6ab4cf3a38cf806bb37a45d29756c3f138dfa01b991e96410de3668e0bb9d3cfc19cb7da7113c1f10d4147fcf67
 DIST cudnn-10.0-linux-x64-v7.4.2.24.tgz 424488399 BLAKE2B 9883cccf146e3ca3a05b8e7ebb2d265da3b7e05949ebb76369a865aa1c2c55c217b21a7847417264712882cc882b25380e5978e58c74279eb208ec593d85e919 SHA512 1e1533a62355bbebc3df62b4c0f306195c7301334390511fae2e0f071d58451edda69b72c3a257fd16470fe3ac5d3ec00aaf208dee2e30d7db0c1f9300a9c663
+DIST cudnn-10.1-linux-x64-v7.5.0.56.tgz 471291852 BLAKE2B 966a84e983631c827d7852e1dee0a87d80b61521a3c7c836c746f6ce5b60afb1da955a692dce5f0166600707c1f060231d7062d78acdf6085deb37c023301b8d SHA512 875e50669f7ab0b8f52e793285041c0a33dfc951a562869258dd22f85c94cc924c87325253f39fa64c4386768eafd3b0fe181188ef6dd5707f57fc88a6495e36
 DIST cudnn-8.0-linux-x64-v6.0.tgz 201134139 BLAKE2B a7e616c671272a3a0f0c51b93646c8c60302c3dec85b71144e011bc3460d0ce80ff75d39869c05c4ef183d2d09aff31bb470a3fd3fd3d79b581a7a2d5a349279 SHA512 ddeeacb5b449920d942a26b98c353d78fd6f7d7fb3b3ce42a078626473efdda25c7ae641232702d62eb5749e39ecfd03e88346119c920c19348ac3ee82d3ff47
 DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749
 DIST cudnn-9.2-linux-x64-v7.1.tgz 421083972 BLAKE2B 1a1dd6708132d6ad6f8f541694b1406de4a26b7bb78b6198bc8ec5ddde2172d0cc0dc540c7c446a2f941ad11cfafa562235d17129ab8e6aa641433c35c8d31d6 SHA512 2f67c905976eb041512eb012a7cc98e1f408ec867f6a1d9d440afbcddc622c03c40de10386e44e4ab138c1a4ad040d39b0e9243f68e22975ca27ec297be25c5d
@@ -8,4 +9,5 @@ EBUILD cudnn-7.0.5-r1.ebuild 565 BLAKE2B 883ccb932c1f725857ed0dbf411455074aee04e
 EBUILD cudnn-7.1.4.ebuild 554 BLAKE2B 3e7bc00ebb9dd2c01e26148f213cedb9b047bff89084bc63dd631ab70d0bb795a7afd525f155815d83a63441b3ae349bce2c0697d964629d022330d90832fb60 SHA512 c255e5c3fa2aa8f10cb022489e7384a4f80888270214bebb18d695e031cbd4cef3ff11921a0b82d555073a5cccaa9a191aa43f92f4f4674f2db9eaa05dc33785
 EBUILD cudnn-7.4.1.5.ebuild 543 BLAKE2B b040a2b17939e30b7c76bdb04dce006e861f5dab16acd048cdc08dc6b7a1fd94b247c0a681a4e263633af7c9d04e5f193e725df37b3b33f305ee94b29ecbf428 SHA512 80126c7fc9f55fadc1fbce58997a1f5daad803af3335fd429c70dd126b4f2a2f6b105b25488613ec3fe20624f1d5758f2b67de0112d8d4930a2b05b24a0e1315
 EBUILD cudnn-7.4.2.24.ebuild 543 BLAKE2B b040a2b17939e30b7c76bdb04dce006e861f5dab16acd048cdc08dc6b7a1fd94b247c0a681a4e263633af7c9d04e5f193e725df37b3b33f305ee94b29ecbf428 SHA512 80126c7fc9f55fadc1fbce58997a1f5daad803af3335fd429c70dd126b4f2a2f6b105b25488613ec3fe20624f1d5758f2b67de0112d8d4930a2b05b24a0e1315
+EBUILD cudnn-7.5.0.56.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-libs/cudnn/cudnn-7.5.0.56.ebuild b/dev-libs/cudnn/cudnn-7.5.0.56.ebuild
new file mode 100644
index 000000000000..2f134235f5ae
--- /dev/null
+++ b/dev-libs/cudnn/cudnn-7.5.0.56.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CUDA_PV=10.1
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cuDNN"
+
+MY_PV_MAJOR=$(ver_cut 1-2)
+SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
+
+SLOT="0/7"
+KEYWORDS="~amd64 ~amd64-linux"
+RESTRICT="fetch"
+LICENSE="NVIDIA-cuDNN"
+QA_PREBUILT="*"
+
+S="${WORKDIR}"
+
+DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt/cuda
+	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
+
+	insinto /opt/cuda/targets/x86_64-linux/include
+	doins -r cuda/include/*
+
+	insinto /opt/cuda/targets/x86_64-linux/lib
+	doins -r cuda/lib*/*
+}
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index ca591649cf36..e98dbd483b67 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -35,5 +35,5 @@ EBUILD cyrus-sasl-2.1.26-r12.ebuild 8431 BLAKE2B 0b769d0f97c9607da49eb82b5720351
 EBUILD cyrus-sasl-2.1.26-r13.ebuild 8465 BLAKE2B 48ad450be4078bea4077b8e22d664eab654136b264af31cd08037d78846d4989d3ca16d31123cbd266af0e62f29b0b5017a26dad4673fe56dac61a6e5519edd0 SHA512 80635f22cebf55ab59ae7575d3ea3e6eeeffaee25ad452577ef5af16c04eb9c5dbf300cd824814c09dfe701415b19343951dea40b8cbe957de848693c2d609b9
 EBUILD cyrus-sasl-2.1.26-r9.ebuild 7662 BLAKE2B 8a7b96ca43d133164a9818727486f2d15bd6f66d66e083dee2ac0a8d83c921a86e3e1f34dfa04689c81b5227cf80f06d1fea3c1da74b48c828e4a31f51b67c9e SHA512 6515a66682bc8c0d18b13a3cc540d00f07d26374a6bbefdcb6c974b3184164cfcce80e965b29bc10e81345e2abb8c04eb7edb21adf4097af741d5df1557ae04d
 EBUILD cyrus-sasl-2.1.27-r1.ebuild 8080 BLAKE2B e5ec4df72f32f8e29cb06fe0ab9015dfdc906721065ea09d1a625b04687a02cdcdf93df8aa1661849d8341c3a9432d49fbf052f3f9adbaf8d59e1e0827503cec SHA512 345fe84f61ff18b8fb6917d264db8db552d029937d9de242cfc6df0c36e2728d02bac6a7c7a1975b64ffdf1e0922da27339304b9fa5984689382b2650c94ac0a
-EBUILD cyrus-sasl-2.1.27-r2.ebuild 8114 BLAKE2B b396d82febfbb4838a19264810cce829f6b1e1cb58782ddfbb5112ab2fda5acbfe41742f2dfd5d3620359ee7a396c7551f3bb10feefba489fa8870503984ba3f SHA512 002dcb256b34b9af1d0cd1c7b292f96fd8d3e7f9a6268a6d5d03bdffb176f6b8db364769f77f5caa14d5069aa25dc1462e1b32b4e8a89532c2c2993e318a5068
-MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
+EBUILD cyrus-sasl-2.1.27-r2.ebuild 8150 BLAKE2B 9923a5f9fe1f8b84f753bd4372155fd7a6355900a02ca6712ab67a72591d9e37648c86e74e75b1887c48bafef083d952dd5a78df3395595b156f6e84422202bb SHA512 947efa55ea12172afb8d11ba45cba0872a8d6ccd41774630b6dfce6f9a4d5eff59f8690ab95088c655ce7c0d5611fac9548115d088e236d59e3d75841df489a4
+MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
index b31b213093bc..26a629baa177 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 
 CDEPEND="
@@ -34,6 +34,8 @@ CDEPEND="
 	)
 	java? ( >=virtual/jdk-1.6:= )"
 
+REQUIRED_USE="ldapdb? ( openldap )"
+
 RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-sasl )"
diff --git a/dev-libs/cyrus-sasl/metadata.xml b/dev-libs/cyrus-sasl/metadata.xml
index d50ec8da4624..bcabb66dbd73 100644
--- a/dev-libs/cyrus-sasl/metadata.xml
+++ b/dev-libs/cyrus-sasl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>net-mail@gentoo.org</email>
-  <name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
   <flag name="authdaemond">Add Courier-IMAP authdaemond unix socket
     support (<pkg>net-mail/courier-imap</pkg>, <pkg>mail-mta/courier</pkg>)
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 70a911f8b303..c9bb6457b433 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,7 +1,8 @@
-DIST ell-0.16.tar.xz 409716 BLAKE2B 64dddac470f7de3384886a8790fcf429b7a254e86c22b50fd4045c551aa0d8d7569f93c8d8b5b472f880fb87fa6ce9830a544b83ae237774e5f8236a1bf1b033 SHA512 bf2b4c8b50841ce8eb5e90ab9fd76f0e8fa1993e7dab0a45a50c21f33537fd110f0bbf1326c6e4cefeb6b95b8db5874c2802ec957b47173fe3681f2522fa5816
 DIST ell-0.17.tar.xz 434024 BLAKE2B 1e6b1917d897eeb4d1308db388accad26077ec1f39b9fdd5fea7c79926d5b3eaa51178d0af9089a2614225f26188fc2c380ec5b1116c321658edac9a4c0573be SHA512 5ca82bf3dbfacb7770fe1132ec3d93d7ebd139f1781157f1def8d810b21c84b212c555c981f7b80152e49e0da0a82b46fbd6322aadc25c56f26c21065a8886ef
+DIST ell-0.18.tar.xz 439368 BLAKE2B 9e65ed73119f322fea7177771d21e46ce9ad7d4060e50d8850451939a66bc82dcc1731ddff56458f4cd60c1b6b82b5023bb96adaf3992d3ec982ed845283c8dd SHA512 cc62d01ffaa11a491d1a3ab2898da001f0a418b968350c2bdba2f381df931e53c4281cc4287937264eee72da263844886816af9baea96d7f65309b3e47e42d31
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
-EBUILD ell-0.16.ebuild 774 BLAKE2B 0aad3afe87ad07413b33bf1b37c3b10db5c54ea14a07702fb8291556c70dfceafe20c07e0ca9ff3940afa4b305f2d1cdbf27191a557bafeceed36b028303eb9d SHA512 bb9f7f5041ba54bb900a42f783ae2359fd2237d9c8facd22c3f9c246810d3cff436b522c7e85066f9257ca787fe6dead888378db1c1e1a47084e14214d51c679
-EBUILD ell-0.17.ebuild 774 BLAKE2B f92c9b7ac03abd049655085e45162b952fd75a5b8f8918d91117a6b52041e3fcc9dad07bc2ae907deaa4518439e53817bc31e1bba5d1a69520318ae374e8de8b SHA512 9b249cfab84d7178cb78cc0d830b27d3e1e11906d2e501a5ccb311477c2b5540b1215931562f2d3926be0f2eaa06d3714e7354ac5c96ff14fe2dc563f32f9967
-EBUILD ell-0.9.ebuild 768 BLAKE2B 1d8bb3eb2ac59821d47058c5d6e3244db2b66240710b2c2bbd2b27715b9f48740f91ca58cab9749890b82231a461ed60875cb4ca8b8e6015fd917262e819b334 SHA512 c2313d3629b3ea728432e28b6a2a94d57237b062d659cc6ee2b7e6097da03ccff3afb2a34e556c9b259daf18ea8fed6a23862bdd576adc8b0eda9a985367313f
+EBUILD ell-0.17.ebuild 826 BLAKE2B 82b9b509da0da2788efc4956968184dc14e2949394e6b719da0b243c2139ab301b51c64e6d778ea3ec04f051d59212dc0a39be6e2c99cba112cfde7f48f986b8 SHA512 cc777d37b4a92eef6f75c2d22309ecf69f9bcd9482ca1bef75a1cb6fca209038b2cecc4e3297b405c46ce8434113ed159bacabe1515498ebede4f7fde1a7ca4d
+EBUILD ell-0.18.ebuild 1027 BLAKE2B 308455a53f88d1f6f901c5f00bf8a53719f7c35265937eb08e0f2f4a2364ff518ab8a447f8b38e708455b9fb2363a37b0aed92a429ac8b228a3ae4264d0fbca4 SHA512 fba6a65c1be5b80daab305675c1b8a82b75bed76c53c765a034a443a593c4a84009184517e6f233d98ccc0755d14d8f25699f9e7a835950bc20b9092625e7dd7
+EBUILD ell-0.9.ebuild 817 BLAKE2B 2f2b6e969efeaaff67b5a230c6945fb38cd78a1faf2e9ce4265dd5defc56b51057ea5459503813726326be1068140136a5f0faa376449cd4ef0bf3d501152690 SHA512 8e33d9f84792330409fb0ce95ca53c321f0286e52d9d764645d6b9d27386292684bdfea2ba0369703252585b33fa4841a325ba6ec43952ee09d76b0c8ff718ca
+EBUILD ell-9999.ebuild 1027 BLAKE2B 308455a53f88d1f6f901c5f00bf8a53719f7c35265937eb08e0f2f4a2364ff518ab8a447f8b38e708455b9fb2363a37b0aed92a429ac8b228a3ae4264d0fbca4 SHA512 fba6a65c1be5b80daab305675c1b8a82b75bed76c53c765a034a443a593c4a84009184517e6f233d98ccc0755d14d8f25699f9e7a835950bc20b9092625e7dd7
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.17.ebuild b/dev-libs/ell/ell-0.17.ebuild
index 233c824d182c..0211e5991e16 100644
--- a/dev-libs/ell/ell-0.17.ebuild
+++ b/dev-libs/ell/ell-0.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
 HOMEPAGE="https://01.org/ell"
@@ -20,6 +20,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
 	local myeconfargs=(
 		$(use_enable glib)
 		$(use_enable pie)
diff --git a/dev-libs/ell/ell-0.16.ebuild b/dev-libs/ell/ell-0.18.ebuild
index 69fc97dbb17b..7cc62bc675eb 100644
--- a/dev-libs/ell/ell-0.16.ebuild
+++ b/dev-libs/ell/ell-0.18.ebuild
@@ -1,17 +1,22 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib-minimal
+inherit flag-o-matic 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"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="glib pie"
 
 RDEPEND="
@@ -19,7 +24,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
 multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
 	local myeconfargs=(
 		$(use_enable glib)
 		$(use_enable pie)
diff --git a/dev-libs/ell/ell-0.9.ebuild b/dev-libs/ell/ell-0.9.ebuild
index af1ce781e17e..4fab6351b424 100644
--- a/dev-libs/ell/ell-0.9.ebuild
+++ b/dev-libs/ell/ell-0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib-minimal
+inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
 HOMEPAGE="https://01.org/ell"
@@ -20,6 +20,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
 	local myeconfargs=(
 		$(use_enable glib)
 		$(use_enable pie)
diff --git a/dev-libs/ell/ell-9999.ebuild b/dev-libs/ell/ell-9999.ebuild
new file mode 100644
index 000000000000..7cc62bc675eb
--- /dev/null
+++ b/dev-libs/ell/ell-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 7d7c7a34d5e1..42e55bd2f192 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,3 +1,3 @@
 DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d
-EBUILD fstrm-0.3.0.ebuild 810 BLAKE2B eae8d7cf0ebdb1e324b573bef75e5c60d6cb49de27e1285ec7a2f57ce629e61ec5feb284720ca51dc851fc191f1fa6734f27385edc07afed6ae4a4cc9b43880c SHA512 7a2ce508dff46cbf08f1f2b501a619fb0b3322cf015794279fc75cfdb1cfecc12e4e8b9666e6950578f57d8c495064eb60a55dacbf254e99b99d8fea5a26c36f
+EBUILD fstrm-0.3.0.ebuild 816 BLAKE2B 60fea1160338a0739b23885d3a6dc9b068758f668643c865adff569bae7b5ab282356aad4c6ae6532b0c9a2371500208f5669f185cfe4cf83a97c0bca6995ed3 SHA512 aa1d1dada3b516874c2983c3a86a9481146731097e1616e46aa0ba2edb68ea2eeeb964d51fe3995b6f0b72ee34cd774a7b8276855682784a2e2e5090592ccb4e
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.3.0.ebuild b/dev-libs/fstrm/fstrm-0.3.0.ebuild
index 3b1342d07467..fdf4025a8936 100644
--- a/dev-libs/fstrm/fstrm-0.3.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/farsightsec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="static-libs utils"
 
 RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 749c16c972a2..fe7fbe7fba89 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,14 +1,9 @@
-AUX 1.48.6-disable-unittest.patch 854 BLAKE2B ea819adc1a2922093d3f79ecd96ac9f599b82839bac4ca51c0814b398d56984a81536b3ee25939f964985cbe6534e178e2dcdabfc3d60cd139257c7f0194e42a SHA512 d905f40bec47f6c643307dee88c95eb22e995b191caceb5c1faa0b6eecdb7b3d4c79c96ee54917aae26cba75d59880bd71a3728ce468c6caa824e677edaa36b0
 AUX gjs-1.43.3-disable-unittest-1.patch 2128 BLAKE2B 73921b6b0f8b77bb98fdbe79e3a4debbad4577e856fdfba7ef57e22630a71672e6a3e330f3aa561c6c09cc7feb1d2339de4fb136643df5faa322c09179b0e804 SHA512 6fd3134bb5c19c46ee2b1f0d87e8644bc5c7a92e32fd62963fe6051ca49f20affde5f6cfbc134aaea0b7b6a5b9833e946796c689e7ebec56951b805b96cc56f2
 AUX gjs-1.43.3-disable-unittest-2.patch 1119 BLAKE2B 8ab995513b63faee201f84ec45fce226c7e7838f85160342a15e9b283c0020de52d35b43999ddfe9c06ec190e3eab5366665734bd5abe40767510b8ed548f6eb SHA512 a6f8df3c3454a635852b83ad1c3733182f2e7a28874476d1c28fb2edf8a8c0bcd7fece723c2baa43141c0ac252c2450a6b57e73821a991cb0ddd5a49aca62251
 DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
-DIST gjs-1.50.4.tar.xz 612260 BLAKE2B c5731dd9f0703a3c6fa8e407fdba888629f7f0ad197ad60a433bc9eb315a6f633e9f192cf3ef51d17dd3529f66dc4c291f302e5dd57873e6f274047af46c2647 SHA512 d95aed6ec8001ccc5f70abad8e2c6dcee8d62f54500f19f5acb25096b398b03a932afeb226d27c0bd6c5c57d9685403f7b77b06ee7b861648402a9137446fcbb
-DIST gjs-1.52.5.tar.xz 627796 BLAKE2B c6e6af2572b627ac81794dec1c8101476d5c7a441e879c73bbf394775a0d508ea34b3e78deb5976f0010d7d026f6186196e12ff1ad9a1fa614e1543b6be048bd SHA512 55fdf22d23185c2b108264918dfaf4b4b7a9ba342210aafb0293b81401f7db5b2d35757caefb66b435c124a6314b9daf578dd066272c9ccb8fe5c4d05d18ebcc
 DIST gjs-1.54.3.tar.xz 647704 BLAKE2B 792225afd9828755ef67b3e7221d4c53535d79d879e0aef0c7c56f06e02313a966776b5dddf9876649984a1599eb44a27d6288f9216bb929a66ad9e14cb632e5 SHA512 f19e667963fa3feecd23a9e4cc263a55d9d1311de7d10905969966f74e26ff982839c192c555cbc059e4fd65ff7c89d18944ca6bf8ffbb65ec91081036d19505
 EBUILD gjs-1.46.0.ebuild 1558 BLAKE2B 035abf83ae724d27a06ee1973ccd28afc29bedea4e5720fe5b3758bfda79e5c33718dce56fe938698ee58b7c48b1737767b1facfcea6fa6be97b093b92c7c70a SHA512 f6fb1dafb934f9b5296195e8a651dc410b061d0a1cba8b066547043c50090e1c101fde253d08312a0f0b98658f624e3513b4d9fdeddd99ad8893749e23ca43a6
 EBUILD gjs-1.48.7.ebuild 1549 BLAKE2B 8ee4cfb9bc4717075eb05cb5c8cb3434c927a90c780c9db4cc38b083864407284e490909dab2713c0dc8fa1ef0691bcfb733981ace846e78547012e46b978c45 SHA512 e957ed75af0c4d2fa6408a1c9e468fb32b104ce12cf061749f19673ce3103bef89630e54d9049c4b283f8fd6eb9178e9181de107382dea6d0644b5eeee78a9fd
-EBUILD gjs-1.50.4.ebuild 1426 BLAKE2B 7e0935809f042ae3078234aec4958a916f6d0d72fb02a2618f7e83e55b98aed3c74463314c6061f006170225350f854771ba2b7e5689bcabf14273880560c662 SHA512 b3c1c9390ba0be0958e4eb5eb811bfd97999894f6520b1aafa6e8f8aa2db2685c31bb2955c1cd224d9439d188a76c33a1c9687628211534326bb96ccf8b236ff
-EBUILD gjs-1.52.5.ebuild 1448 BLAKE2B 2fb9899df411fced2fd44ada5027ae11eef1719aec9525c75df07ee22cd6b17b8ab9b595dade0554a0ad6ce902f8de259ecb131f0fb45b2147c386265b51cd1d SHA512 e1258046eb45fbca71a360d25b255873a233e2917156d8b5899ac44b843e24726e60ef1c725090e9ce7dc70754e203579bee9d77a4e391c8620fbd693b6656f5
 EBUILD gjs-1.54.3.ebuild 1557 BLAKE2B 32cc37341e3071068228ba2ed4edc3a10eb803b3fceb08ace02c9daaaf8751ce37782a13c0e15ce6b69a322e98ddf9125db722cbbf3ffd4dc9448a6dbf2857b9 SHA512 e9f6ee160f653118abdf683816a7677268db84df81315538ce6c94c3c2cfcaa03a83d4cb13c76f6b267570a8bcd8e7031f37a89459352b8a45922d7fd9f5799a
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/files/1.48.6-disable-unittest.patch b/dev-libs/gjs/files/1.48.6-disable-unittest.patch
deleted file mode 100644
index 3925fed0140d..000000000000
--- a/dev-libs/gjs/files/1.48.6-disable-unittest.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit e9b7360c9a057c4a6718c9561e5cb6dcee279ec2
-Author: Timo Tambet <ttambet@gmail.com>
-Date:   Sat Apr 22 22:32:36 2017 +0300
-
-    Comment out broken JS unittest
-
-diff --git a/installed-tests/js/testLocale.js b/installed-tests/js/testLocale.js
-index edd8a6e..0b0847a 100644
---- a/installed-tests/js/testLocale.js
-+++ b/installed-tests/js/testLocale.js
-@@ -4,11 +4,12 @@ describe('JS_SetLocaleCallbacks', function () {
-     });
- 
-     // Requesting the weekday name tests locale_to_unicode
-+    /*
-     it('toLocaleDateString() works', function () {
-         let date = new Date('12/15/1981');
-         let datestr = date.toLocaleDateString('pt-BR', { weekday: 'long' });
-         expect(datestr).toEqual('terça-feira');
--    });
-+    });*/
- 
-     it('toLocaleLowerCase() works', function () {
-         expect('AAA'.toLocaleLowerCase()).toEqual('aaa');
diff --git a/dev-libs/gjs/gjs-1.50.4.ebuild b/dev-libs/gjs/gjs-1.50.4.ebuild
deleted file mode 100644
index f31803a08d20..000000000000
--- a/dev-libs/gjs/gjs-1.50.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 pax-utils virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.52.1
-	>=dev-libs/gobject-introspection-1.53.4:=
-
-	sys-libs/readline:0=
-	dev-lang/spidermonkey:52
-	virtual/libffi:=
-	cairo? ( x11-libs/cairo[X] )
-	gtk? ( >=x11-libs/gtk+-3.20:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--disable-code-coverage \
-		$(use_with cairo cairo) \
-		$(use_with gtk) \
-		$(use_with test dbus-tests) \
-		$(use_with test xvfb-tests)
-}
-
-src_install() {
-	# installation sometimes fails in parallel, bug #???
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for gjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/gjs-console"
-}
diff --git a/dev-libs/gjs/gjs-1.52.5.ebuild b/dev-libs/gjs/gjs-1.52.5.ebuild
deleted file mode 100644
index 4a706d4682fe..000000000000
--- a/dev-libs/gjs/gjs-1.52.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 pax-utils virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.52.1
-	>=dev-libs/gobject-introspection-1.53.4:=
-
-	sys-libs/readline:0=
-	dev-lang/spidermonkey:52
-	virtual/libffi:=
-	cairo? ( x11-libs/cairo[X] )
-	gtk? ( >=x11-libs/gtk+-3.20:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--enable-profiler \
-		--disable-code-coverage \
-		$(use_with cairo cairo) \
-		$(use_with gtk) \
-		$(use_with test dbus-tests) \
-		$(use_with test xvfb-tests)
-}
-
-src_install() {
-	# installation sometimes fails in parallel, bug #???
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for gjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/gjs-console"
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 797e1a0a1762..742f365f5c17 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -3,10 +3,8 @@ AUX glib-2.54.3-external-gdbus-codegen.patch 3233 BLAKE2B 6b96851b7485164ef6c94d
 AUX glib-2.58.2-external-gdbus-codegen.patch 5452 BLAKE2B caf66af10958c1e6672a615965ec45f76d4fe9f58599f3d09ecee543e1b5e47a49014f7ef7a6f4e0030370935c4f82ab11b3a81ca42fc09153f02e355400dd55 SHA512 d36ac5d4fa810524795d099c218604b0db22dbc7fe9ba57821fdad292725d9c159b24cc224d1bd68824dc24ddb1f1e7c6878dbc36a3b0a8188f9e01a4b6c5ea0
 AUX glib-2.58.2-gvariant-test-fix.patch 3423 BLAKE2B b0dd08cf1629da3c8e42e43e4f9b64be07116c836d1c218368ab1dd312d06313845c70f21b54db95b068816171b268d35192a3521c5856e410ba5b99f1d0943e SHA512 af8fd3cd431d1bc3aef4447ce26911b107a57903f66cc5e1825c3a26386084838500f2f6f250552f96d93bea18b5412ad338e84f2ff3783573161a2d0a336337
 DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
-DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 EBUILD glib-2.56.4.ebuild 9947 BLAKE2B 50af8725895ea42d6999c4de74a08f4cd65cd96d9320aa31eed39e2fcd474ee6ae58a5846df34abf6703bd7111ba0eefbe4293e860bc2386433a680e90846a2c SHA512 650dc7e115ed3f7e857e4bc180849c2ddf05a206a8090bcad21988e83fcfbc387ea25d3ae7f7bcaa051c22e12bd2ed2a33057ac586beefda55b13239f2613179
-EBUILD glib-2.58.2.ebuild 10788 BLAKE2B d264b9ecc154bdb41593bbe1c9c32181499be6edad3660113dc98f5b252eb5a701854eca9822549d0d767066c594f6f771fa0391e495589a74309a8ca4a14f4a SHA512 4af70f9db60e55918e29c4e6af7e373a9532276fd061c77b91ba66b96cc61d10978aa8e47abdd76d225706a0c12d8aa2e645a4c2c403557514dc22862e93d0d3
-EBUILD glib-2.58.3.ebuild 10680 BLAKE2B 827ffade52866d638c385ed0b5f46caaf6d0fa86518eb53f3eef06a32560fb986edda5adc5be15e31c5446f776602e96d256fc0a0d870a0df5d5871d7b52962c SHA512 7fd53044d5d6ba5e9cc297c11e210424b868d19fac35780ce24ae7633a85f0b5f46962202cea6659daf0b503adb2371a4119909908800cfc28ddf57be3bc3d4f
+EBUILD glib-2.58.3.ebuild 10677 BLAKE2B 9808d6754c29a9fdca2d5b37765cbb71b9fa95630311978eef5047b43faf70404ce193dd12748fda650a52366d788de100a9d60b320e3eb4df3a601acb532c74 SHA512 90791045f385aa4d794d869d44f64c0d27d7b71f3055ae1d3b1312b01cf52ee8ecb83da46bfc7b47ec1a5ba221e5cb18152bcd15abda4fe2dae50d1e7ae7f4ce
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.58.2.ebuild b/dev-libs/glib/glib-2.58.2.ebuild
deleted file mode 100644
index e8e80b9e3e48..000000000000
--- a/dev-libs/glib/glib-2.58.2.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-GNOME2_EAUTORECONF=yes
-
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
-	multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# Added util-linux multilib dependency to have libmount support (which
-# is always turned on on linux systems, unless explicitly disabled, but
-# this ebuild does not do that anyway) (bug #599586)
-
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	utils? (
-		>=dev-util/gdbus-codegen-${PV}
-		virtual/libelf:0=
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/gdb
-		>=dev-util/gdbus-codegen-${PV}
-		>=sys-apps/dbus-1.2.14 )
-"
-# configure.ac has gtk-doc-am stuff behind m4_ifdef, so we don't need a gtk-doc-am build dep
-
-# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate
-# python depending package, which can be buildtime depended in packages that
-# need these tools, without pulling in python at runtime.
-RDEPEND="${RDEPEND}
-	>=dev-util/glib-utils-${PV}"
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
-	if use test; then
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-	fi
-
-	# gdbus-codegen is a separate package
-	eapply "${FILESDIR}"/${PN}-2.58.2-external-gdbus-codegen.patch
-
-	# https://gitlab.gnome.org/GNOME/glib/issues/1626
-	eapply "${FILESDIR}"/${P}-gvariant-test-fix.patch
-
-	# Tarball doesn't come with gtk-doc.make and we can't unconditionally depend on dev-util/gtk-doc due
-	# to circular deps during bootstramp. If actually not building gtk-doc, an almost empty file will do
-	# fine as well - this is also what upstream autogen.sh does if gtkdocize is not found. If gtk-doc is
-	# installed, eautoreconf will call gtkdocize, which overwrites the empty gtk-doc.make with a full copy.
-	cat > gtk-doc.make << EOF
-EXTRA_DIST =
-CLEANFILES =
-EOF
-
-	gnome2_src_prepare
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-		export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
-		export PCRE_LIBS="-lpcre"
-	fi
-
-	# These configure tests don't work when cross-compiling.
-	if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		case ${CHOST} in
-		hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		*)            export glib_cv_stack_grows=no ;;
-		esac
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
-		export glib_cv_uscore=no
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
-		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
-	fi
-
-	local myconf
-
-	case "${CHOST}" in
-		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
-		*)        myconf="${myconf} --with-threads=posix" ;;
-	esac
-
-	# libelf used only by the gresource bin
-	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(multilib_native_use_enable gtk-doc) \
-		$(use_enable kernel_linux libmount) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		$(multilib_native_use_enable utils libelf) \
-		--with-python=${EPYTHON} \
-		--disable-compile-warnings \
-		--enable-man \
-		--with-pcre=system \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
-	if multilib_is_native_abi; then
-		local d
-		for d in glib gio gobject; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	virtx emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson
-	rm "${ED}usr/bin/glib-genmarshal" || die
-	rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}usr/bin/glib-mkenums" || die
-	rm "${ED}usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}usr/bin/gtester-report" || die
-	rm "${ED}usr/share/man/man1/gtester-report.1" || die
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/$(get_libdir)/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
-	# Completely useless with or without USE static-libs, people need to use pkg-config
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"/${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	# force (re)generation of gschemas.compiled
-	GNOME2_ECLASS_GLIB_SCHEMAS="force"
-
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.58.3.ebuild b/dev-libs/glib/glib-2.58.3.ebuild
index 3bef765e2006..7fc1ec87abe9 100644
--- a/dev-libs/glib/glib-2.58.3.ebuild
+++ b/dev-libs/glib/glib-2.58.3.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 0ade55a0adaa..37ac0833022d 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,6 +1,8 @@
 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-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
+DIST icu4c-64_1-src.tgz 24013136 BLAKE2B e577bd4c9b822e5ef3a101b3ef46b7b42ca18077d6e05fca543ff1eb702261f017981fb22dd3970662397530b390f648d4417c84dcf3d6ed0d298dd7a8c38897 SHA512 5eca8342d8bdf902689243506643e04512744b33962687e118f6810af6f7fd073678f67b991d2ae9139d257713b63abb4222b96687234df01ad5ff62df16ede0
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
 EBUILD icu-layoutex-63.1.ebuild 2525 BLAKE2B 7c45a83f8dcb5035d44c676edbeed9cb971eca673172a8ab5642589fd63c04f05d6c26b0346ea9caf5da340e5d29d5fc085a4e9e17390c5cbb358926f03257f5 SHA512 0f27c41556ab551538f95c086b39c85539138254d160284e6579a0ada90d93485a9ad41670518d7f27e9b93e9029a63bab484727101c5026d4d1f52e44536588
+EBUILD icu-layoutex-64.1.ebuild 2509 BLAKE2B c5f9d5cf312a3ba8ea2676845bcd423dea004b86b84be36162d0ddb09ff603e534559c064bfcf104b16889c4c7acdb512dcf42b62c6fe22bd05f5d366efd2cbd SHA512 745dd1f5f94c0aaf8d1c9a7ef0436a2ebefefc4cbdcec4e957d7d691b377a460aa89cb953d6be90bac98b843334333a3e666f96b8f86cf758d63b7acce7096ec
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-64.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-64.1.ebuild
new file mode 100644
index 000000000000..9f738852cf9d
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-64.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="External layout part of International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
+	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN/-layoutex}/source"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+)
+
+src_prepare() {
+	# apply patches
+	default
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--enable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	pushd layoutex &>/dev/null || die
+	emake -j1 VERBOSE="1" check
+	popd &>/dev/null || die
+}
+
+multilib_src_install() {
+	pushd layoutex &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 216923df45e6..0c36843dbff6 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -4,8 +4,11 @@ AUX icu-58.2-CVE-2017-7867.patch 8934 BLAKE2B 7f934d75a99953d69ac54f8544c698d3bd
 AUX icu-58.2-darwin.patch 2076 BLAKE2B d85d07ae3ade827a81bf2ce4eb2813a6535d7cd70e68241b29ee72c0a41115e3cab0490727771309c32f1eb0853c1a8ce3cf6aae64186037d8ee75d035cb0478 SHA512 fe884a72d354324ad0b1e5502d834fbecafae22a290fb152058d6507b218c4f07efc34cc7d978bae0adb54f74dadf00df7a2679c480dc7681ee287da7f678cb7
 AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce6f3f641e01d76f01fe1f35f74cc2465e89b3353ab86569c7478090df459a659d69143810ba121e15c27923dd SHA512 20d8e76c43ef5549ca7f104b052661269c99d4af45b2a65bd9d72e28b01d0c3b70c066b51799e09d7117a4a39e44fd463fae2522a238a41972c0679c290c5da3
 AUX icu-63.1-CVE-2018-18928.patch 2813 BLAKE2B 21940b9c1f17eed7f056a8c60b5a8da3790955fe6bab02336b0c042d80d90afd02a54dbe441fa38a536b2a77f08fb629510186a0419ad6352b3bc461c7b9b9e3 SHA512 f55cc50673e33dfba4d213bb4f18dd905e9db372dde4c64c1f389c0cd19b31e5fd0aaa113778068758497b35667061659d55fafd0eae818624c9374e17a8d5c5
+AUX icu-64.1-guard-memory-include.patch 1449 BLAKE2B bc255a8ef9a8d7fece5fb10ad2a51b67c28307aa1954a1c690c923b9695b946bc5aceafae39687f60563f62112672b60405d47c393755147568272678516f334 SHA512 7cb0142486d0162a7e9441c55225e010db5dfcd0a9b67f3f738de2a619388e4323b1314e9531537259403fbdd5a263e58576991b6e90629feacdee522f40cee5
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
+DIST icu4c-64_1-src.tgz 24013136 BLAKE2B e577bd4c9b822e5ef3a101b3ef46b7b42ca18077d6e05fca543ff1eb702261f017981fb22dd3970662397530b390f648d4417c84dcf3d6ed0d298dd7a8c38897 SHA512 5eca8342d8bdf902689243506643e04512744b33962687e118f6810af6f7fd073678f67b991d2ae9139d257713b63abb4222b96687234df01ad5ff62df16ede0
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-63.1-r1.ebuild 3321 BLAKE2B b8e6b6ea9bb9379f0b09195382db18e7758fc919d626f49240f9b8a75b97c84833dc2741c528788348d090749229b18d610bcd5bb196506fec03803d3a78af3f SHA512 0efd9eeac3944f3ea14e20f99c3d3bf0f9a2ed22d62074a1d1342c8fb04f4bb76c30d51ca173a09a59abb832cdb134bd1120b065ce0c63536da08839f4abd2de
+EBUILD icu-64.1.ebuild 3338 BLAKE2B b79f6248fc64eafd37d25fdd58ba9752b038e1677c97d009bdcb925c2a665172bbf99a44c1c23b9fb1b0b38f7db057aeaea2833316d079f9e0444727fd578c53 SHA512 58a5dfc85fc423b9c81132c1df1cd9c6e3338e8e3132681c68fb13d729bf63fdd6662cb6457855b772de19eb03481142dd92d7592f953eff7752ce0de2cfcf0f
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/files/icu-64.1-guard-memory-include.patch b/dev-libs/icu/files/icu-64.1-guard-memory-include.patch
new file mode 100644
index 000000000000..618a42541277
--- /dev/null
+++ b/dev-libs/icu/files/icu-64.1-guard-memory-include.patch
@@ -0,0 +1,52 @@
+From 5ecd46bab07561758e0c37a9178e74175e989bdf Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 30 Mar 2019 09:59:46 +0300
+Subject: [PATCH] ICU-20530 Guard memory include for C++
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduce by ICU-20357, commit b7a3571b adding <memory> include without guard.
+
+Fails when compiling within extern "C".
+
+a.cxx
+---
+extern "C" {
+ #include <unicode/localpointer.h>
+}
+---
+In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.2.0/include/g++-v8/memory:84,
+                 from /tmp/icu/icu4c/source/common/unicode/localpointer.h:45,
+                 from a.cxx:4:
+/usr/lib/gcc/x86_64-pc-linux-gnu/8.2.0/include/g++-v8/backward/auto_ptr.h:325:3: error: template with C linkage
+   template<typename _Tp, typename _Dp>
+   ^~~~~~~~
+a.cxx:3:1: note: ‘extern "C"’ linkage started here
+ extern "C" {
+ ^~~~~~~~~~
+---
+
+Found by usage of xmlsec.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ icu4c/source/common/unicode/localpointer.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/icu4c/source/common/unicode/localpointer.h b/icu4c/source/common/unicode/localpointer.h
+index e011688b1a5..8e35ded0b10 100644
+--- a/common/unicode/localpointer.h
++++ b/common/unicode/localpointer.h
+@@ -42,7 +42,11 @@
+ 
+ #if U_SHOW_CPLUSPLUS_API
+ 
++#ifdef __cplusplus
++extern "C++" {
+ #include <memory>
++}
++#endif
+ 
+ U_NAMESPACE_BEGIN
+ 
diff --git a/dev-libs/icu/icu-64.1.ebuild b/dev-libs/icu/icu-64.1.ebuild
new file mode 100644
index 000000000000..fbe419ce9732
--- /dev/null
+++ b/dev-libs/icu/icu-64.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug doc examples static-libs"
+
+DEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-58.2-darwin.patch"
+	"${FILESDIR}/${P}-guard-memory-include.patch"
+)
+
+src_prepare() {
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable examples samples)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index a2992eb64555..0660a7cc781e 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -5,4 +5,4 @@ DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c
 EBUILD iniparser-3.1-r1.ebuild 1142 BLAKE2B 69df8a9c32866c85c5225f67d3262b5e2220ba2b6317e79d46265a79601dbd46287514c59cf55826508c3ac0cec1fd7cb0431b63e279bc7ea9725fa2676febf2 SHA512 714c0c4bb58316c80f6af3ff5a11853278f4a17f1bc900225fd4e4cdd52aff7028763d669fcfaf3b1ffb61627f867a6c7cf6159c568c2380cf8e6f4d758386f9
 EBUILD iniparser-3.1.ebuild 998 BLAKE2B 2e1e7eb3c6d52fc1e9caa9b8c41b0537bbc24d35dd1681addfd90422a5880ef0ebec1a957e0603abe31b1d0597cde0ccdc4be3aed324a87eae32258b5a0c7257 SHA512 d3245f9011c03e7f3eba25d78246e65833467d737eeb91bb337c557cb1e72b36d026e0dcc8266f61d120278af75bddf9a9c6a62d892e5086301178c4b10019ee
 EBUILD iniparser-4.1.ebuild 1756 BLAKE2B e1ce140179a820037a12eceb32eec1806f366f278246d6d8b8c4aebdfdddef40b2ba8e88972613801439851a29dc645df0eee9a730ad58311c70fdd19635e1e8 SHA512 d9d2330b8109919702db41c6a03a24c6dde3cd6d8d8abffa2a3fef0a5f60982c13dc048fc84646c4f4139d40a37eb8b0776d386c70f8073e16f9172c48b4a397
-MISC metadata.xml 326 BLAKE2B 922d683a7f0a18fdde9cda90de1fa291ff1884a0fea2425c082dec777f2e4ea76b036c70d26fd40cf1ab980c35def4abfc574640f0fb0048e9fd66565c1eac96 SHA512 7b19035fb203e35182b45f83c863916a8555b54d87605d310c2499c234bad06a39a33403aeb4f8624f31a9ef3660e1a98710e2f234cf9cd0e983f1ca173521e5
+MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/metadata.xml b/dev-libs/iniparser/metadata.xml
index 4c5c1b89a443..8089cd3614e6 100644
--- a/dev-libs/iniparser/metadata.xml
+++ b/dev-libs/iniparser/metadata.xml
@@ -5,6 +5,10 @@
 		<email>samba@gentoo.org</email>
 		<name>Samba Team</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ndevilla/iniparser</remote-id>
 	</upstream>
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index 1229e88bd588..eb4c912611b6 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -10,6 +10,7 @@ DIST isl-0.17.1.tar.xz 1440564 BLAKE2B ab2dfd50a4c5adc5ebba172ab969475adf15f5413
 DIST isl-0.18.tar.xz 1475708 BLAKE2B 216d4d75e2bc03b3027c67ac7ab373aca6040ead12b2844504890d6fe6dd80e82c66d0f89eb1fc7451a23470445d2656f704971d3b8bfa2916154973e9b52038 SHA512 3606609765fc34740ab3014e2256d6bba7ff730463b014a0e4f5fcfb2e3dbef974503dff1f3702b307ef79ff86c5bc2c3ce3c3c8511533971fd5d53ab45f6eea
 DIST isl-0.19.tar.xz 1515156 BLAKE2B 1be213df736f59123072778b9721db06130c935edf0805fd489d74c9effeb9eaf5b191de0a28e8a5138f79dc23ac9ebb213c57c020d0411afb305788b5f312cd SHA512 eeda0405d38f77a18c6e69128948dc29af7e44ce827e9fb538d3844c6e22db3b4126287ca0937d9bee7b528bbab7aad8d3729db36e74864196f57e81943dade4
 DIST isl-0.20.tar.xz 1539064 BLAKE2B f1347c0126ba3ae9b5fa073d0f206a7f48d53edb40d87ddff18005d94754ea4d1fd3801ee913d3b7234124b6c1447990e5d299fad6c6b7ff1d022ede82bba9b2 SHA512 394bccd22d8e63cb052a60ad8b1a75f4ec43916a9482c66f5167b534b538161179c47919815983b7fbc20dfaa1a590e88b251850aa092bbffc2891635bf30dc4
+DIST isl-0.21.tar.xz 1621680 BLAKE2B ffd0c8aa7d489283ac958c280c05fe0c9ad621a10bd157d0522ac209a58e9bb6a8aad76c7a49b42d5e1c0f3605d0fb05a41ed6f2bb9aabb4f06060a5bbb65de5 SHA512 87ebc2fd6d4325cdfa82295a659ed6dbd70760a776b733e5503bbf8baa8fe80d905879728e9c7f23d2f3bcd7e78c00a66ab166c013ae97b603f7c460c69668ec
 EBUILD isl-0.12.2.ebuild 1048 BLAKE2B 371ee9c0891fe772e5ccc2ca2401f10e03102edcc397ff8c22169ce0a98533da0eaafc149f3eff3e019b25b78b9520d82a8ed7db04014dcdd979182440dcd5a0 SHA512 6834670244e7f4ec9a8238442ad472282db1fe313af11a2b17b9e7c3205b6e3b2efee00fb539cfc7c720d5fc8f0e39334e739fa22fea2fb8eee9152b77ad184c
 EBUILD isl-0.13.ebuild 1060 BLAKE2B 6074a73a484526d0392bcbd01d497bda7be34d1e57e064fa9cf4fb1e4afeb4646d191b8dc946b647651f5b8416949a019fcb85646e04ef5ad2e8449ba941d04c SHA512 289ea8dfac458f4c79f63f15b65ca4c675ab23bf6d48ce149cbc1ae4c5640ddd0c1f37de6336d7271eb0411a6a1305f364bc3fb0d82294ad0aae7b2dc6b97b5d
 EBUILD isl-0.14.1.ebuild 1078 BLAKE2B ed37bfff657e07ac2939db638581eae19cd93c77379c0a25693692830181775520f2cd71f1ae59c270a7ec64368141bdd4a87b301959bdf41342dade22a061ae SHA512 0bccd7ddb31c98564515f1ef9436276c29249391a685f1022ddc7e78f415b25be3bc2acd63d888d18f99cc9b0aa311b90960a446656d02e973af507abbe57543
@@ -20,4 +21,5 @@ EBUILD isl-0.17.1.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ec
 EBUILD isl-0.18.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ecde0ecd5f102073d4f720da7b8b3429014da53ea0f05c540cca486f3497bb472dea72c21cf230b846bcfed7 SHA512 74a306b624ecceeb45e7f92e5412746e804c366b76a477e0b6b5feb8e4328bc3e8a252d65ddfb59938504ebe99a99e0a7c34970d48bd3aea532bf073c1a36e5b
 EBUILD isl-0.19.ebuild 1362 BLAKE2B d31f140f3168fb1fb25ca106c5953c8c7baa92d338d4bbf361c13061a21cc8a0ee7b27fbbb7259d6e1aa5d0aae7fbe92c5824046473f62a8880116bfbf8bdce6 SHA512 e6215d0e567d46470e446cda506b618d67b2380b2ec8967636197d56ebc6afa46f98bb4c522d03427b6841aa6f89e8edec209b1f9f87aa64fc6220fad8381c61
 EBUILD isl-0.20.ebuild 1362 BLAKE2B d31f140f3168fb1fb25ca106c5953c8c7baa92d338d4bbf361c13061a21cc8a0ee7b27fbbb7259d6e1aa5d0aae7fbe92c5824046473f62a8880116bfbf8bdce6 SHA512 e6215d0e567d46470e446cda506b618d67b2380b2ec8967636197d56ebc6afa46f98bb4c522d03427b6841aa6f89e8edec209b1f9f87aa64fc6220fad8381c61
+EBUILD isl-0.21.ebuild 1265 BLAKE2B 2b7254f04110c93a9e9d13470ea926f49b1d7d9c52f19f5f0a8f765722e7ce9a65ac53c6695ce88b92fc76bab16dac2b7ae56593b6055018ae0b1abe5adbff93 SHA512 598689dd37249bb1183db10ee48ec753038e39b37ef9586c02c6e10ac3ba85326399c84e954e86916521d2f0b50e93851e8171d6ff3305e3d1466c1f4aaed9d9
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.21.ebuild b/dev-libs/isl/isl-0.21.ebuild
new file mode 100644
index 000000000000..b3e801e7fc30
--- /dev/null
+++ b/dev-libs/isl/isl-0.21.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils multilib-minimal preserve-libs
+
+DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
+HOMEPAGE="http://isl.gforge.inria.fr/"
+SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/21"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS doc/manual.pdf )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+}
+
+pkg_preinst() {
+	preserve_old_lib \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19)
+}
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index f8b441e152ef..7547bb07086d 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,5 +1,3 @@
-DIST jsonrpc-glib-3.28.1.tar.xz 40328 BLAKE2B 36b512e27c46836fc8285bf4d6a6f8e39bdd748a09475af151d9a07f05e92dafe269d7675f8ff0253b21485405776d9348b38b067d73f75d6bdc3203fb876ea1 SHA512 874791c898d8fd6f8c6401b8ae219dc08e34e207ba214add1f14bb28b407581dc372487398d276395ddbe2f349d5b04f2ffb78fc73398d85975df40d3409f352
 DIST jsonrpc-glib-3.30.1.tar.xz 41516 BLAKE2B c0b73c06682fd0a1bca2fb000d7909460c496e73364c24905e1a4c88cce64252ac024825ab89650ee0b3b5de1cd1686fc7a231ffb5b0bb7e1c66262eafce026f SHA512 f1ae34faf9b3902b45b01bfafc87fd8d30051bbb11cf247cf8af9dc2bae8b2f3c93564a17a9f047dbb61240662a0ffbc2c2b764f8e254305c7aee1b32fd8a86b
-EBUILD jsonrpc-glib-3.28.1.ebuild 944 BLAKE2B c3a3820e9797b8ea53801c3c628a9bb41129dc362759a59f95a4894b0f5f41cbc45284601d4c37e5eba9502824db278b37c1f7a05230ebbb189e8976eef5ae11 SHA512 ad0c1b0e4967c9c8ec9967c75f76cf9e65b28203341058ca4e82a027c85957a17a3e5a894f395fb8eb2e24a2ddbf02c2da948f6fcd2b0902688a4360b0a6f843
 EBUILD jsonrpc-glib-3.30.1.ebuild 941 BLAKE2B 829c371ba63e8012ff682d0c39fcca99d074e88d50b5fe1378e1caab2edffdb952d6b492ec221eeaed4dccf87eefa43517303aa0d1312311519d9ca93149ce19 SHA512 3bb42941b86e0354935ea5876e8972c2e64777d1914d66c86d7112aa26c6db24ee3b0a01f563b8f73858b6c9bb856d04dbee422efb1fc10c45e1cc8484b6fef1
 MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3
diff --git a/dev-libs/kasync/Manifest b/dev-libs/kasync/Manifest
index 4c7e5cbacb2d..6cc238b50ca5 100644
--- a/dev-libs/kasync/Manifest
+++ b/dev-libs/kasync/Manifest
@@ -1,3 +1,3 @@
 DIST kasync-0.2.0.tar.xz 28952 BLAKE2B 1ca17023a9350024195b3a840cbcea8e180fea9ac1a4ea1601c30d70c68a613bb677a65ca8a4c36552bf998a14098342f66855f84a603d2853d4df43f3466e3e SHA512 cf0d59c4ed6978552599a1d36c08df180357e112867f3730f57b13673943eb365acd16892450f100e9e5f122220a06df64ee006a0d3651d0f05d78cb5195094d
-EBUILD kasync-0.2.0.ebuild 321 BLAKE2B 06129f8b317c0488accecc352cf039cb54939fc74a6fcc25329c68b6dfe052bde5a8a4fb8c5d15d375970f3974ac71989c5b861a657d83ff19bf087b585d69bf SHA512 54cf15d336b1f26e4e33fe53ef6443576c38d8e664da376446679f2ea7249fe62aa8972db96b15751d8f64cf9a88656fb6d2192c59da88556fff904a127cd0a1
+EBUILD kasync-0.2.0.ebuild 318 BLAKE2B 16703ac8f943452caf248d651c5a9658c2f6ca047832e8c9f77858d6c3d5fa1badb3175ce7f87c3a43ea495674958cda35124e9fe245679bdd7821e5fc4c709d SHA512 8c7af6d006da084f93d8d48e1062999da82903b62738ef5134c7e17c29ff7b5a88c91f1453ffc4cb5e8fc5aabf54a99208d72af25104102ed10309ac8168531d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kasync/kasync-0.2.0.ebuild b/dev-libs/kasync/kasync-0.2.0.ebuild
index f30f9babba4d..2a0fc33b2de3 100644
--- a/dev-libs/kasync/kasync-0.2.0.ebuild
+++ b/dev-libs/kasync/kasync-0.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional"
 inherit kde5
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index d330dd1f038b..9824b870fde4 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,3 +1,3 @@
 DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
-EBUILD kdiagram-2.6.1.ebuild 647 BLAKE2B 7f4015fa77095643a42ddacc4918187758d063a74dd414fa108d229f576332bb4042584a8d087e2b184f4fce985605b7ceea0ce1d6e658a84f8a9dadb65bdb25 SHA512 7dd2117d12ec0fef4268561d7fbc9e27a43bd22c0ce20ab1f798c4db47326be7af6c548f9ebc66d3f88d7ca7c0c17a158ee23fd77bd6b893b511bb562ece8cde
+EBUILD kdiagram-2.6.1.ebuild 654 BLAKE2B 107e745348aa6492db244419f2ab596e9d4f95970ea2c7bbb798c53347bffec9b993c61976a489da293abfd2f46e7fd606c6a3d228da22a01cb5eb8d387d186a SHA512 9b035287ab682100ec8d1dc5616439c3ca695a7c45a35bbd3593fdd12563babfa5b06dff799bece565bf75091a82c3d84345631b6304f3b2beefc0feedb7adcc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
index 2009639a09bb..6a4cc4834ec7 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 Authors
+# Copyright 1999-2019 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 ~arm64 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 a99c86f0a4d5..d443eada14f0 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,6 +1,8 @@
 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.5.4.tar.gz 814395 BLAKE2B 251cacad45e1571d54e7b78201bb0b3578d983022267bfd3438e921f93ba466995629759d9657c71938a5866fc13d1b70dabe2f3a43137ef52164f67da3a8aa5 SHA512 67a3a0a946024d0cee44ccb314d13abb3df83d7c7d0bfe58d5e966d57ef26240dc011a8e6865f017674a00043429379ae9e033a9197c4173c3fa173918d0b0f9
+DIST leatherman-1.6.0.tar.gz 814463 BLAKE2B 1c990c261ded1fd32bb5b1912f84a4bef8ac3ccfae9172e0496f90283e1a2ac210bf9dc1c7e88bcb8776798674d93c1313359135051b4c7f023e1e3080104e2e SHA512 d0d22b60db2c164183268d29fe1bc1ee9ed16797d38174849eaa74841f801869d038e5672664aae89517487811a70f689a345a2c87d3a2f0a04d55214e7f9eaa
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
 EBUILD leatherman-1.5.4.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
+EBUILD leatherman-1.6.0.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.6.0.ebuild b/dev-libs/leatherman/leatherman-1.6.0.ebuild
new file mode 100644
index 000000000000..335426971404
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/${PV}"
+
+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/leveldb/Manifest b/dev-libs/leveldb/Manifest
index ea465aaa3600..fae9c60ab559 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -14,7 +14,7 @@ EBUILD leveldb-1.15.0.ebuild 1230 BLAKE2B bbaa78014b6f36a8c6d8e5a71ff56995b95f9f
 EBUILD leveldb-1.17.ebuild 1720 BLAKE2B 683381ebc3ae11d8844e52fb2c7161348a6495f4f83bd29369f991d4169619d526ae6bd1ed878bae9269715da5a9d7f80efc298253fa78c35aa1c7eea9b98bd5 SHA512 a59df720d900c7da98a4e0c9c865f5cb962b1843461289cd0a4e78cbcb5bcfff93b0d4213fde486df0a9f5d2dc7bfe86ecfec757c83513932fb1ab02859feb25
 EBUILD leveldb-1.18-r2.ebuild 1878 BLAKE2B 8a31c57e1e5e6015b549e55b83277c47be0b882f695f3af8f2295ea801380cb02ac0e0691a2a9113bccbb39e4a505a9ceeeaa2c0f9be3644afb1eb4c5949d7b3 SHA512 865cc8d9fa5b956e3b31863d3ce4d18624bda106aa06c0176ff514c7cc3b7016edb0dd34dd5724b5fe4a9ef231ceaf2b59ef47ac9589c66ca4979254b4703075
 EBUILD leveldb-1.18.ebuild 1647 BLAKE2B 65c40aea5784964fcdf7550ff41f20980b61e3eae2e69ea790d1e1db1c3b152abb18c7ec679bbdaca21c2c91ace348e7b8a8bee53fa5c39528f1b0c1ac76108c SHA512 5a8feaeca45690fbb5d6f7ecfe7074e176532765900cb343107da542b32e61935bb0832a6682550d57a7e74bc20fec0469a7b0b20a1de9636f628fafd3de4193
-EBUILD leveldb-1.20.ebuild 1737 BLAKE2B b93a8270e5c14c84b7f5b990c77334b8abd40f5658595ef7706395d773ee041fada886e9f83f22c75d741ac1b29beab1f0a21aca4c0ae21e45d5fac975386219 SHA512 9e261711f18ad49da99f9d51391bb22019d3a82756b70ec6e25e9c848adabef0529ec0389e83480db626ae29704d1eb0616f9155f5ad18a6326235e8f118c34a
+EBUILD leveldb-1.20.ebuild 1736 BLAKE2B 51041f0f5685af26fcab70362ecc3c3bc7b9c99ed4334facb66f8c6f0a323e0260d90f85c1a8fa529c6468fe6880380a7dffd08d51924ffd971b482a5988197a SHA512 9298f80a533896f38fb21edb077e97a7ece2f3c1fd2ae720a554cc82a53d98e50829b8d7b5bc07097d0dd7ef724fa24ac72d32cd8f89dd2524b125c6bd593632
 EBUILD leveldb-1.9.0-r5.ebuild 1223 BLAKE2B 7bbb2958034b96f22b3bb5e55fd9f1383e2cd01b7a523dc32ead090b31cefcf4299d581e85430dbec267746ded520ed21ddb89a5fad9c40a1f6a652677961ecd SHA512 a97ee6357c3e37208d7900f216e4d4270bd7b6c9add1449e3a0c52d49755a1be88f6008e9ae9bb6a021d3345fa57db18e3751073a63ccc8e4270e7ba684216ea
 EBUILD leveldb-1.9.0-r6.ebuild 1277 BLAKE2B 9e581129c37d33f46037eeef50916c5ce6916e6f671f01144b9f0f7cffed096dff724076f36261d552df6cd8f396a38725ee476258211a1cdbf42af9bef6b289 SHA512 ca4965119338028813e0cdb5d1b303c88ef2e2450f471f4d58e16a276485fcb001d6c4818097f5b0c47eb66ce1b23b561ad37809415654c4cee771d0ac17137a
 MISC metadata.xml 487 BLAKE2B 33632d0f2ef6a0ed11b059a6245ec9582b1e977622a9a755e4ae98cd1f8dd8f853c0ed0aea919b11451c57c576699f4e9a22bd1303148eacec6fc2770f47492f SHA512 61c9350d750209e948d6aa51a3594546837e425c49dede490c0171771e7ff5a2e03932f5052ee90b36e477a20153bde3c265036839e2723703677414bd77d0d3
diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
index 4061d64896e0..fa326715485d 100644
--- a/dev-libs/leveldb/leveldb-1.20.ebuild
+++ b/dev-libs/leveldb/leveldb-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # https://github.com/google/leveldb/issues/536
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+snappy static-libs kernel_FreeBSD +tcmalloc test"
 
 DEPEND="tcmalloc? ( dev-util/google-perftools )
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 86644c2c2241..a3218419636c 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,4 +1,7 @@
+AUX libbpf-0.20190404-makefile.patch 452 BLAKE2B 2cd303b251a88153c3d4b16f9a6f9431dc865df1399106bf0471584007c85e2e3f25407229fe85841f31a6070c53f4bf465c616ee92627f6ba811f7c1e9c0420 SHA512 dff622c9e8fff722d1f715588a9647f083fcddd6f872adcd8ca6bf16c68aef7a0c8caa973932649680517c2f87420462afec6e97734e36779fc15ea7c9842986
 AUX libbpf-makefile.patch 655 BLAKE2B c601e3c6de94a21569e7ca8def5e798484e8a1f945cd2e30beff1086bf835cd21c37472a9d6483514f251901eab38aebd588a89f59a7eafce2e74e7bf640dd56 SHA512 30e1368b6da2fca87b72d0479652a8c154d17a08bad005312306e14d80b831b4c088e88cabf9fc190b2e83ff27c68abb22b2b17a63fb869fa98d4056787f1ef2
 DIST libbpf-0.20190311.tar.gz 110782 BLAKE2B b660b2677abd3068aa37f390e817c755ee06cf683e357cad6a9537d8e509d53f24ac66e472148f5b66cbcdca7849db10fc34ff8e6f85bd54a0570a52846ff933 SHA512 dbac8efce3b4c6d4faf40b22de6f71bee630fc8b71aa96e13692ffff0474ed7aa5f66a3c1f5871ec1c27dc71b87bec3ce5138096590fb9238d4d696a722f358d
+DIST libbpf-0.20190404.tar.gz 115495 BLAKE2B a159d75163cee051e7784c20018020e650d88e3b011928b1a748199f88b22de713000d3557d083cbbfc3450b6ded9b891d0afb487611044cf2af93fd5691ff8c SHA512 724fe12c9a028a9b6d5a05ee679a3c7f687a32f403bbee3c90730005dac20e0a5e9e6c21df02780d329a88acf4ec525411e448f537b49ce2767de8eae6012661
 EBUILD libbpf-0.20190311.ebuild 1505 BLAKE2B 18e4884b9b82382eb00535941150a09d34ea2c0d7dca8119336f4149cab42eb0dc2cad35dadc8cf93090febde32d966e5392fef9644fc80e76ec79d7e9554f28 SHA512 4b68c327b79792445a8f4c11d8422a07b04394bb1a99d9b822f758aa4e26e39b558b2492ff0f6b9ba2c73dbbdf938fb33d1beccb99c5d82f994c7a6502df0507
+EBUILD libbpf-0.20190404.ebuild 1495 BLAKE2B 5ca8a9a8ec7830d60db8b3fa1f6870fb9d70f335bb226b2fbdee0fe424b6879c5e062d82931c0b19576152f613baee25e016d9762fae48e97599d587f7be4a45 SHA512 7394a76b1e54ba01bcc743e933a2920bba9347babdcdfe76e8a3d80250e2cb859feaa797ca5e81f4ec9efb7d79bec63d26edf685bc184c6aba28c84e7e85f690
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch b/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
new file mode 100644
index 000000000000..7bfe5eb6335f
--- /dev/null
+++ b/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/src/Makefile
+index 35b4818..c034531 100644
+--- a/Makefile
++++ b/Makefile
+@@ -36,7 +36,10 @@ OBJDIR ?= .
+ OBJS := $(addprefix $(OBJDIR)/,bpf.o btf.o libbpf.o libbpf_errno.o netlink.o \
+ 	nlattr.o str_error.o libbpf_probes.o bpf_prog_linfo.o xsk.o)
+
+-LIBS := $(OBJDIR)/libbpf.a
++ifdef BUILD_STATIC
++	LIBS := $(OBJDIR)/libbpf.a
++endif
++
+ ifndef BUILD_STATIC_ONLY
+ 	LIBS += $(OBJDIR)/libbpf.so \
+ 		$(OBJDIR)/libbpf.so.$(VERSION) \
diff --git a/dev-libs/libbpf/libbpf-0.20190404.ebuild b/dev-libs/libbpf/libbpf-0.20190404.ebuild
new file mode 100644
index 000000000000..2ffb199b195b
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.20190404.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+EGIT_COMMIT="7c27c6306160f630c3c4f4b4971deb657126d681"
+
+HOMEPAGE="https://github.com/libbpf/libbpf"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+COMMON_DEPEND="virtual/libelf
+	!<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}/src"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.20190404-makefile.patch"
+)
+
+src_prepare() {
+	# upstream doesn't provide a pkgconfig file, so
+	# let's make one
+	printf 'prefix=/usr\nexec_prefix=${prefix}\nlibdir=%s\n' \
+			"/usr/$(get_libdir)" \
+		> ${PN}.pc
+	printf 'includedir=${prefix}/include\n\n' \
+		>> ${PN}.pc
+
+	printf 'Name: %s\nDescription: %s\nVersion: %s\nLibs: -lbpf %s\n' \
+			"${PN}" \
+			"${DESCRIPTION}" \
+			"${PV}" \
+			"$($(tc-getPKG_CONFIG) --libs libelf)" \
+		>> ${PN}.pc
+
+	default
+}
+
+src_compile() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		install
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 8e9c046124c9..4f2f3cb28932 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -3,7 +3,7 @@ AUX libbsd-0.9.1-missing-header.patch 1165 BLAKE2B 03cd6fe04b969a3216300fa9b7d70
 DIST libbsd-0.8.6.tar.xz 371112 BLAKE2B adab6c17267e0cff128351efccf5c1225b7dd85dc61dd8168bf212ba5aff8d726fa5be687c041821af9a427ddad9dfcd3630cac9134b9e81c86ab2599e43aef9 SHA512 ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b
 DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B aa4aa1c19872edf9e7e6ed270275199366345531a48ee28c25e209f17c5403a22269b91ab1c806cb1b54ba33a8464f4b035fe7ee2bc5dddd0a4fda09c540b058 SHA512 605a14eb5d33c0e45c3bd29e585ebc15832e2ed1efa9356291a0562622168da96db1a20766e9dae8910ea0c1516429f43905edc8d4f2a40a5a341a689d08fcc3
 DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
-EBUILD libbsd-0.8.6.ebuild 1227 BLAKE2B 2dcb7ad4b36a7de7c926ba5480814d060c325433ba3013e635c8b13ff940f303566b77f36a6b37920a3055ce3fb3e1c06882ddbbd58c6b9c98d379d78219b1f1 SHA512 a45b2b20b2b4b2a32277bd346f6433e8cef1d42260a6098aeb8c419d45c7a5c5db26e8ede2dbdef8039b03511e7ffb3ef65f450abea77b250e929889cea39939
-EBUILD libbsd-0.8.7.ebuild 1232 BLAKE2B d30cbbad96b19726f36e83d9fb8c69d14f53702c74f0401ce9abee5b7f7cddbd0f90da75d02833535e12fc1d9f4dbf202305466d8ef712fe892c08c707b94fc3 SHA512 1967086f1067249a65c99a6c68fe0e3238b120ad15d6dc5d6a9ebed7105ae3e4cd86b6c51aa4e1bfbd2ce5b3b0597ae20cfd6326c14d6a06f38d6406e1ad30f2
-EBUILD libbsd-0.9.1.ebuild 1226 BLAKE2B 4067937712c082d87349f1c9cfc464d38d09635a245fe0cbad07c6e00db1970009507eb53c7a02a282c56be810db0d31735eea8385abcfa64484936b8393666c SHA512 e269a2fa18c520f66101b5d4e4be22b3864b34dc90b2b26b96d53e699ce01bf114e4ed40863d6ee5c095fee6be3a8d69e114f6264b423fce469faec9e4aff516
+EBUILD libbsd-0.8.6.ebuild 1274 BLAKE2B 34c2102e9d8960bd9336a3b42d564883f572d14092a465c61ada7b6413b6840381a8ac683aa2d711ac0ee049c507ec1c1f4d256dd2a3a36a405e260b4b904115 SHA512 538bdf8db0f079ac60b0953b19f0374a57b389df6e7bc640a13071abe60812cbd51b4ddc379845f4dc8c822d634de784d3a791e31a64e0a95a9797a916cb266d
+EBUILD libbsd-0.8.7.ebuild 1279 BLAKE2B 9d22702c2d0c2332b157c4313d3620e6e2d35f0f4805fa36546f3b82c25daacfdf7592c06cf88a5e7fa371081641a1b54eac11caae485dcd2d1230effac87c8a SHA512 28d15bb66b724e61daa36ba43513981ac54e3e0688174ab5aa8186f29d947b3e26d608fafade0687767dafd2931ece77ded44c68848840fa1041864adfa57f90
+EBUILD libbsd-0.9.1.ebuild 1276 BLAKE2B d4788cb3b831855572768db8b891d311143763b7bf6a2ad848812c174b2c45ffbe6819383c2f5a773381e23270f35d1208b5929b6111c49b5c5a1d00d553ddb9 SHA512 482b7f15824e0a56ddc653afca41b400c5aa2ec15afd2b1d5d6ecd61b5bfeb31495a3ad737fe3f5a8790de119b8349678eb058884ce7b690e2ef301f10860d9a
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/dev-libs/libbsd/libbsd-0.8.6.ebuild b/dev-libs/libbsd/libbsd-0.8.6.ebuild
index 4e32f0a5ba99..1d417a410989 100644
--- a/dev-libs/libbsd/libbsd-0.8.6.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit multilib-minimal
 
 DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
 SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
@@ -34,7 +34,7 @@ pkg_setup() {
 multilib_src_configure() {
 	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
 	# which is correct, see:
-	# https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
+	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
 	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
 }
 
diff --git a/dev-libs/libbsd/libbsd-0.8.7.ebuild b/dev-libs/libbsd/libbsd-0.8.7.ebuild
index 8ce1c8916cbe..8fe9b46741c7 100644
--- a/dev-libs/libbsd/libbsd-0.8.7.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit multilib-minimal
 
 DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
 SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
@@ -34,7 +34,7 @@ pkg_setup() {
 multilib_src_configure() {
 	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
 	# which is correct, see:
-	# https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
+	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
 	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
 }
 
diff --git a/dev-libs/libbsd/libbsd-0.9.1.ebuild b/dev-libs/libbsd/libbsd-0.9.1.ebuild
index fbc48c4614da..ea20e10357af 100644
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ b/dev-libs/libbsd/libbsd-0.9.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit multilib-minimal
 
 DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
 SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
@@ -34,7 +34,7 @@ pkg_setup() {
 multilib_src_configure() {
 	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
 	# which is correct, see:
-	# https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
+	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
 	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
 }
 
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 3c33a16e27ef..e503963f2dd9 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,3 +1,5 @@
 DIST libclc-0.2.0_pre20180915.tar.gz 170385 BLAKE2B 43a90347936be5ad383fe4e4b06523aac455596d6cb1fc58038811ea19b4f6ab2091ffc345e68ff2ad7f7f1615713085000711b31b9d1ad3911a85bc0db93d5b SHA512 5b8e68f7683d72390d8f9c263e15a54b4b4613b73eff2bf3881d7a35d6480468693a62dcaed159fd8421ae80768d6aaebcd6c33163b082c0a2cf15581d37dcab
+DIST libclc-0.2.0_pre20190313.tar.gz 176803 BLAKE2B c9ecd5053685c2de89d92ae4e9cc9e9f8bee24ca05e5ddca6fffd0b45356b7d4a96b54d9bebf316624e0a49594a33ebb156ae6c4b963093bdc6c1067548b2bd0 SHA512 22813bcd76e77c018acbdf2a3d3d300c2996e169c17729726ae8a93c39f85033cfa1f6d43907a7c026451bcdfcce6fbdc64a202961492aa951ef1b818c3f9335
 EBUILD libclc-0.2.0_pre20180915.ebuild 1929 BLAKE2B ed2f30e8c895d94fbb3eb7153b454985da5504123b9e53ced2d860f62c6c73db7e59489a448f986d3d6f125dbe359c4e563277755a4268a4eba4c941ecab971c SHA512 c9164c36b2c43561ecfe1c606a0dd1836e58cdb9458dc8b04ecbb3373dd69021f22f40b91df1fb8b098ced114af2d5fbed0166f45d6f5f782c2db8e81dc5e047
+EBUILD libclc-0.2.0_pre20190313.ebuild 1936 BLAKE2B 44159cedafce465f3387ea0986856f66ec946a9f292b6a9d88ed8eb08cbde836f6a9d7f03999f2c1e9750e81638412c43b041d4f51dcf5e19e94184ede7a3e90 SHA512 639a50a040eed72be279ff10e499deca9821b7c4fedbed56482c7a42e3083a3081452f2cabc43297b500695d66b783272b8a74862843ba930abf6fc271702f95
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild
new file mode 100644
index 000000000000..04840dd6a547
--- /dev/null
+++ b/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+EGIT_REPO_URI="https://llvm.org/git/${PN}.git
+	https://github.com/llvm-mirror/${PN}.git"
+EGIT_COMMIT="45017385361603d6328997a2272d140e50786686"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+else
+	GIT_ECLASS=""
+	S="${WORKDIR}/libclc-${EGIT_COMMIT}"
+fi
+
+inherit llvm prefix python-any-r1 toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="http://libclc.llvm.org/"
+
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://github.com/llvm-mirror/libclc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+		${SRC_PATCHES}"
+fi
+
+LICENSE="|| ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+DEPEND="
+	|| (
+		sys-devel/clang:9
+		sys-devel/clang:8
+		sys-devel/clang:7
+		sys-devel/clang:6
+		sys-devel/clang:5
+		sys-devel/clang:4
+		>=sys-devel/clang-3.9:0
+	)
+	${PYTHON_DEPS}"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify configure.py
+	fi
+}
+
+pkg_setup() {
+	# we do not need llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use video_cards_nvidia && libclc_targets+=("nvptx--" "nvptx64--" "nvptx--nvidiacl" "nvptx64--nvidiacl")
+	use video_cards_r600 && libclc_targets+=("r600--")
+	use video_cards_radeonsi && libclc_targets+=("amdgcn--" "amdgcn-mesa-mesa3d" "amdgcn--amdhsa")
+
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	./configure.py \
+		--with-cxx-compiler="$(tc-getCXX)" \
+		--with-llvm-config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
+		--prefix="${EPREFIX}/usr" "${libclc_targets[@]}" || die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
diff --git a/dev-libs/libcxml/Manifest b/dev-libs/libcxml/Manifest
index 9272e768cf90..d59eabd24313 100644
--- a/dev-libs/libcxml/Manifest
+++ b/dev-libs/libcxml/Manifest
@@ -1,4 +1,4 @@
 AUX libcxml-0.15.5-respect-cxxflags.patch 444 BLAKE2B d09005bc9687c6633d8a3ab0dfd0d0a06304317225c300b6936d89e178413b4b4a560b409baf6f2cf45a64d09330e9434d3073c40897557e5534a8cefb2ce28c SHA512 23b8d1078eb397e03cd9c251ee859e799840c07d73c96cef122aa5031d381fcb82d33b79779720d0d2ac26bf2a7dbc82167752bf15472d010ddfe12d129342ea
 DIST libcxml-0.15.5.tar.bz2 137328 BLAKE2B db8e8f1edfe6d03a1f60f9f62c1c3b33e9c092d0031aed4369b7c0075eb16432d8244a2098e75be6845905451a61e379829a80183acdcf9acf33372c354042ea SHA512 9ecb333bbd3c99c388bb08b28e6cf2cae97e5a5a6df29634f041e2718a5d995dabfd73686fe1494eac9d45198dbb1530fa8d5502a8ed3ca8010db087712cb87d
-EBUILD libcxml-0.15.5.ebuild 804 BLAKE2B 6b1695a937aeb219dcba2b036e0a0ca965c07d90d02651324c9b16804a2b584b581384c3ae9c3126ab57002f2eb7f69c13d70153a933789131e25137a829291e SHA512 1a93e6c7e61ca568039b95fd20fbaa151be2fedcbfcde2c0711741e9d1fc8932d3680549ea81f4a868f9779dc4f8002974e8250ab72f0772d77c68fd3b3c8923
+EBUILD libcxml-0.15.5.ebuild 803 BLAKE2B 55fa36df1514cd230ce8c2da98caaef76993548bd78842371f90c06225c888841c1b21cd7a52a25e1e868fbe0a19a20ca3e04a7a65f4ccf532c27a2df3df96ac SHA512 7f4998091f1a7af3d9a9f09083b214a3cca49507b238efc0d9c4d61efea6820388012171c3e512a5ec3bbbb29048aebc3349367ec39b5b07441007bb302d89cd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libcxml/libcxml-0.15.5.ebuild b/dev-libs/libcxml/libcxml-0.15.5.ebuild
index c2f81a9bc6cb..edbcfc29fa89 100644
--- a/dev-libs/libcxml/libcxml-0.15.5.ebuild
+++ b/dev-libs/libcxml/libcxml-0.15.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ PYTHON_REQ_USE="threads(+)"
 inherit python-any-r1 waf-utils
 
 DESCRIPTION="small C++ library which makes it marginally neater to parse XML using libxml++"
-HOMEPAGE="http://carlh.net/libcxml"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://carlh.net/libcxml"
+SRC_URI="https://carlh.net/downloads/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 3b11151340c6..a7b217760a27 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,7 +1,9 @@
 DIST libebml-1.3.4.tar.bz2 606205 BLAKE2B d13c33777e9afbc4d370e0b8e68fdcb42597fbd62f61197a4aa72e2b229ef06819efc0864f9783c87c90f8fcfa572b02d9b1767b57c31c6bc22a020b9eace94e SHA512 ebf5b71afe725e40ee6415463e51ca14810eecc2fef186caacd0269077f5febeb62623fd48674b21ea732f43a620d0c91603fa48d3f8d163284d1cf204642194
 DIST libebml-1.3.5.tar.xz 274184 BLAKE2B 954411bba6fc9ff3893a17a5147babff18352ac2c436523eecafac8e2921dd968e83f5672428f4f22e61cee97f7ce1a4f905781b4468cfd9f3ea7d8cd15d961f SHA512 cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24
 DIST libebml-1.3.6.tar.xz 57764 BLAKE2B 554f9d4d162d02ba05e2b1eecd688a6c25a4c727ee1a2a93cd6c4ceec94c5628ec20306dc5fa41a2dfcf189afb7a3add33b09a3bcf62f8b5f8fb2ac6657916d3 SHA512 6a31a56dcde39642848f25353a462f4621d6cfd3bc9ef62add1b00d098c6a80b3c2b50ecf4d6dd50650c609eb39a6150c6d1b69ea3a77a3928bd3300af7dd91f
+DIST libebml-1.3.7.tar.xz 69460 BLAKE2B 53cb7ab3c553cc533b025bdf1953c1de33108e506900e8df0ecafa5f88bc43b0a54611c69bd169401ddea162a1e669bde0e93dc38255b8ea24d04dd41fae9599 SHA512 ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1
 EBUILD libebml-1.3.4.ebuild 834 BLAKE2B 11fe2d8ebf1fa93a7fd9c866a9bd556d00ce6da0553be6e39b85c61e711a8277eb3f27e212c00609cb092f16e7fb403285ad29623f7e8941a7bc7c96443becd7 SHA512 edc8bf5f0137d8fb44335b0ceb64a66c98d2eb88bde15b93f7350fdc2b80077006c5e31c8ea567b0ef6050f08789a1566ccdeafb8f6ef98e3559d344f85047b4
 EBUILD libebml-1.3.5.ebuild 833 BLAKE2B 63ffb0503ef6995d4317638ddb15d27fc3a29acc173db763fb792ffc240c9678b787f6bf6cc9e50575e47ff682d262163268a80cd3c8ae40cf5ec12dc384e778 SHA512 e4157e6a8d7b5b4c1ed559a474cb9b9511ab7eb76d8238eca97278bf694a37fa00114b0ddd881984886636e2ef65becff655374a4d91b8e66297e91e1b65852e
-EBUILD libebml-1.3.6.ebuild 635 BLAKE2B 9374b1ffd2ca8bbbdd9bb95fa623d19066b2e5206c04e1d97de2b1fd6bf3942c9135ef9b6f49e6c730aadd01503d31ffd6089847c6b82e3d1c0cb28ee6751fff SHA512 4429474674e25851d9e5f56f3ff0a438c4b4667e3865b1a71bc6456786a65748b8972627a72e516481109f57ed4e38a2577b32a2c97d8ddfe73a9104340faf01
+EBUILD libebml-1.3.6.ebuild 633 BLAKE2B d1399530eeb8e9ed994e103fc38d67cd958fb52afe180cb92f2126a856ef7725c426fea9cc8fd636c956eadcc601b75e759239703deaefcc0de325e6bed1dd0d SHA512 34cafcc43781eddcde12b9b50507ff7c784b9b906d865cad4221520d36c8c2bb276fa7aab915ba72acca47ced29b6927bf48fcebdcfb3819e2791c1cc34ea654
+EBUILD libebml-1.3.7.ebuild 635 BLAKE2B 5805ef9b68f9391dd868c94a44d2841283d61488e74a44ca0676d6f6fcf9f04a975cdda45f31c22cfdc428b7b90bc2ef904dee8f2a504afe9f3fee4cbe26a7c3 SHA512 7dc35d4f04ae4b0b9920bc86d765642896559352278ed5e14a3290bfb935f89297498e6a2822a7026325f4b87463aec64cfa04970ded60893dbab6e0d3dd3f77
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.6.ebuild b/dev-libs/libebml/libebml-1.3.6.ebuild
index 690f07b22151..3d3a4aab7d5e 100644
--- a/dev-libs/libebml/libebml-1.3.6.ebuild
+++ b/dev-libs/libebml/libebml-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_configure() {
diff --git a/dev-libs/libebml/libebml-1.3.7.ebuild b/dev-libs/libebml/libebml-1.3.7.ebuild
new file mode 100644
index 000000000000..daa59d42571e
--- /dev/null
+++ b/dev-libs/libebml/libebml-1.3.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Extensible binary format library (kinda like XML)"
+HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
+SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index 684daf63475e..acd703e8c9b4 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -8,5 +8,5 @@ AUX libedit-ncursesprivate.patch 497 BLAKE2B c333a5d914047fd13faab9a9782c18893ed
 DIST libedit-20130712-3.1.tar.gz 483857 BLAKE2B 9120e9ac2f0d20841fea7d3a41fbfe2c1e79392d3b6dcfcd44517ee61d662427ea6cda312d2ec47ac92d61b9292684b8bbd8f92de0832909fadfb1b0cbbb4f81 SHA512 9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e
 DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B 83857f2e56c1f3857e981556c4d5bb90580293a1b9b038bd08beaa2b3954ccee0b30ccdd716cca95d1811841ab8ada010084ec5cd9ab8407e996c713d0991cd8 SHA512 597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
 EBUILD libedit-20130712.3.1.ebuild 1261 BLAKE2B 51dd1e5fd520ea9e26ef766c45482f2321cef3e98fd8733d32a07ddf8da31fd7b9eee1bc118304e111566e9ffbdd882a7dadb599836984c3613368e335f199f0 SHA512 94d5067ba06fce95e621c4d8655a38092eca85480f2dab71ba4bc69248f568730544766db6ecce6f702c8ec58b7caf7b10a3202dc44f7ee829e3a14cdd43e6a4
-EBUILD libedit-20170329.3.1.ebuild 1277 BLAKE2B 1d20912efeb54c1b7352a7cbcd4c58525949e218a1c2a88e9c96f2f9929c08c60d0d656c38570e127d221cdf3abbc68ec75b5084ac4bd087a897eaafcb89e261 SHA512 e74dba461356efd2bc13f02358ce502d8949248ff16c91cf2da8af888e03659d0a0a33fd6c9750d98d140cd9ea0fd8fca04791b37534e7d0a60c9ca85d5053cc
+EBUILD libedit-20170329.3.1.ebuild 1273 BLAKE2B 0615586243e36567e681b4ca8fd0217893d8d8a3353e27d0c6c1a29ef931af8efa6022b4a9a96a992b694e046dc1fec4c96140dd7970f0f74e93c71a96efb5a6 SHA512 9c1f45fa3e49b3e1d9f50ad664bc9b824701926a2ed00395e85f730a2d39d2bb09484b931a5d2add87191bbd3ebb5737a3d277d8084d5939176ae5210ae99c72
 MISC metadata.xml 636 BLAKE2B 22880383d39383e11fad886d88db603fe58db1e52f36528f71db2bdec95c74dd50fe7c76bce52f5f3eea47fe61d1dfd0cb7264cfd9458fd8b5db40d38a1adb86 SHA512 c335a652424f91f1ae79f907870bcd826cee21365b594353b3c52fb7fef51f637e9a65275c11f033b6bd7b6d918733904efc320b547999ee5b88a7b36ccb9389
diff --git a/dev-libs/libedit/libedit-20170329.3.1.ebuild b/dev-libs/libedit/libedit-20170329.3.1.ebuild
index fd2d0e7d6c9a..45c8e3c95091 100644
--- a/dev-libs/libedit/libedit-20170329.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20170329.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 4c941fcecbe8..decf0ad4f222 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.6.0.tar.xz 411512 BLAKE2B 0e9190fd4c28b36bcf325953aa634c0d8c604cef7f56e46679fc88351536d78b0bddedbbdfffe4164e0039c7d56ef604b143e23de2c4bb9a66653a03d6844fa9 SHA512 73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060
-EBUILD libevdev-1.6.0.ebuild 1059 BLAKE2B ffb48a4671417af67ce0e332db5baf3473d703434c0618d4879ef37c7401a8890f17826506afb43c25295355836f9e12d7bf98da8cccaa0a2b4e50e4eb426763 SHA512 f5b1a6bc6a0b85cfbbd47c76fc213f9583fb586681e9688f2bb541533dd5931c0850568493625efa564ac26633141543887602813c7f5d486441c7db4e81d1d1
-EBUILD libevdev-9999.ebuild 1070 BLAKE2B 19f6c9c38fafeac9484b236f0dfaeacf1fbad2d36f991e870db4651e20ddbdee765bd503991691f0d2f8e7091d33b5e1e6b473d74a4caaf22ad13a80a69cdb7f SHA512 1263c46fa3771c1c924b4efef99ad1c3b368317838df9feab79536befeea850cb5ed03dad42b66c6144b5d026991363982a01ffba11de7740b05567771a5a147
+EBUILD libevdev-1.6.0.ebuild 1112 BLAKE2B cb883c0653f7c3bb074d0a9bfb4d7a1e3eb311c64f86b12457f2caa1488d421e98f71401ac86ef2affac9135e58feb9aef080de01ed2d621e8c301fcc3f6e8af SHA512 e6ceeda8fc96790c628e2e868efe5f5cecdc396de3bb6d70bc1e8ff95925c5e7dc733c7924df7f8c2ca671552758f324e860dd8c4c13159069f40d8efb75858d
+EBUILD libevdev-9999.ebuild 1123 BLAKE2B 152eeef5e73696d4fd6dfb6dc5116392e962af5faab2b7a1ff6505e0a6f63c97a9e383dc11ef48aa178806416ac84ada38197791f8ea1889395ec1aef0052038 SHA512 88e8cf51fe94bd54be8955a52f7bed18c5329c08d304f95f37cf197aabf9c076c86d716996b0a4b3fdf31712677b3fbae098b86bd381cc125c190d61daa0c5af
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.6.0.ebuild b/dev-libs/libevdev/libevdev-1.6.0.ebuild
index 162f2e22d07e..7b7765d8f412 100644
--- a/dev-libs/libevdev/libevdev-1.6.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.6.0.ebuild
@@ -8,10 +8,10 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 inherit multilib-minimal python-any-r1
 
 DESCRIPTION="Handler library for evdev events"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
 
 if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libevdev.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index 5ad289f73408..f0df420f3775 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,10 +8,10 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 inherit multilib-minimal python-any-r1
 
 DESCRIPTION="Handler library for evdev events"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
 
 if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libevdev.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 0dfef65e04fb..802aca541fa8 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,3 +1,3 @@
 DIST libfilezilla-0.15.1.tar.bz2 404746 BLAKE2B 644f4b8949670d5b07f9e7b861d388ce70eae6612e34bf938cb628b65724a527e33c1f039087fd8381c06a15c12cc2b4fc6f616cc5949bf325e2eebf41abdf2d SHA512 d557f7636bfc3958b8558fab3384b0ea84caea594566d39c051f20f02dfd71213369c50df282a3f7d2dd757038bd26e9722214839dab965cb7cde9733d59883a
-EBUILD libfilezilla-0.15.1.ebuild 874 BLAKE2B 4ea3d150a61a3509ce35db3c0168fb0fc8ddc608b372e8348e04d0e5ed9a6952eb244bd121c97659f2da9bf1e989468c55033fa72d6cd704815c4f3e58ca93c4 SHA512 025b834e34bb07cd0800bc3083dce52000d6731be55233ae6f64b5d3b706113bea6488b1947a666024ef4d77961a146de5da8a1ce906c58b8358c70473364376
+EBUILD libfilezilla-0.15.1.ebuild 892 BLAKE2B e93ea6ffe19681a690f1fc9df8f811b1245c35a6e5cfbf6f553fe88355382c7ff362aeb97a3f323c56faf5a4855c2e582a162bd8ccf961022a776dc23cfe024e SHA512 fb897a916e059235c8daef7eefd6a52a67623a7b7048a5f132cc91190c514209663808d525ed5f0607ad82a8b208238d3d78e57a154aadff0cab9e9b474b93dd
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
index 9eb5bf9030e5..742bc805a500 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
 IUSE="test"
 
-RDEPEND=""
+RDEPEND="dev-libs/nettle:0="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )"
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index c1ea6ee8da33..610a3477ae78 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,10 +1,8 @@
 AUX libgit2-0.26.8-disable-oom-tests-on-32bit.patch 1775 BLAKE2B 4c3df3edfa76a57f2c14433b7be1cec2afadcaffa30f2f2559ba9f1e0cf915f6ccba43abc038cf3a42949f12e78e532d29a25ae74e41f303838c839036d6e3a4 SHA512 db77d1cd4876ed45a579c9dcec67e7fa0feff2d98db4635257961588734497b5818efcf4ce748742018c6775bb65f2394515fc2854c691194b93b6d9c65c6cf2
 DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e
-DIST libgit2-0.27.7.tar.gz 4782856 BLAKE2B c844eca24b5053b3391ace6ebeea047bbba4fd429786e08144151109bfbd22f5c1b2609a176816a5d7eff63f1fe91122f88d89d3613dc4c770051cf095ae5ac3 SHA512 de2e266939bd40bc580603539e1156906b97299523336ddc6a66c3bec26729495bef2daa2d240b83b7e011e93852381e95a4407132b0440a5aa1e1b7642c0011
 DIST libgit2-0.27.8.tar.gz 4783928 BLAKE2B 0f0f79a43de3e869d593dafc1b506ee0894143d2daedf2fe56683ad8f2edfd7d87bab784354b9fb1796fa8e08a36b9de88af65c7621a90d537cb585c89118197 SHA512 53ab69a0687afd315029fdbe0ce8192b7e88f7f1ff6bc9c4875718e638cecd64755a9942ad605e6c388c58c6b892b351d54c5405de8e0d5ba90406055a25ffaa
 DIST libgit2-0.28.1.tar.gz 4987204 BLAKE2B bb4f32b0b78a9faed3e5204f40cbda15d032719dfd581948cf175bc17a30356f97f20545e1f64ff6f3cd1dc4ff483af99edb29d7a10c56349ce74976c186886b SHA512 5a1bc5c6af6ad25cb8b2c446e75a774d2a615d4999ec3223d681c7b120d83e7cecd94f1ca549bac0802f5324e27e73cc5a6483ad410636c2f06f098b30b1b647
 EBUILD libgit2-0.26.8.ebuild 2053 BLAKE2B 1de5648ae2d9500af644cb1e8519962a463497f25bed279e6148d14dcc0235b4c388f9c94a53f7c0075896f46ba395ed6030d8a577061284c4ab11fe68a566c9 SHA512 2afea3b4bcd0bcf9602ae226762d4c7de609cf97408ea9ac560646d3c001467578adb6512df0c63eb9ed618606355f7087a041b0c2b12e549ac93dc23d1faa84
-EBUILD libgit2-0.27.7.ebuild 2055 BLAKE2B 1fc9de00757bce342fc97176725cd608244d6c22acb3517249cd6bd6df4aed15737345f42a76dd7ac76dccbe100a858e7bc92a23863f7bdc16ab578a6b03cf8f SHA512 5a40ae4d935ce482df78558d7aff2fec2368ad0286121bfd6b02433a4e5889dd8cc9a521696bfe5b0f753a3c61fa3092d89ad991160fb1d4f039e6d91f67c632
 EBUILD libgit2-0.27.8.ebuild 2055 BLAKE2B 1fc9de00757bce342fc97176725cd608244d6c22acb3517249cd6bd6df4aed15737345f42a76dd7ac76dccbe100a858e7bc92a23863f7bdc16ab578a6b03cf8f SHA512 5a40ae4d935ce482df78558d7aff2fec2368ad0286121bfd6b02433a4e5889dd8cc9a521696bfe5b0f753a3c61fa3092d89ad991160fb1d4f039e6d91f67c632
 EBUILD libgit2-0.28.1.ebuild 1689 BLAKE2B 65f1c812181d41fc28b38607bf30d4ae45eb6be38ec7e66ffae2d63479d572c9f4138c10ac83e8821ecb2cefe90f1ff1ea6ab943b5647b60e63ab24297de6022 SHA512 9a7b6cefffbb9cd6a594585519a1732408cc60bceb135c64d4a4d50af2eec147100c3d85fdd737fa5ce39162cb861247bf6f6dbf1c390c9ae1fd510ea7115528
 EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
diff --git a/dev-libs/libgit2/libgit2-0.27.7.ebuild b/dev-libs/libgit2/libgit2-0.27.7.ebuild
deleted file mode 100644
index 3815701da066..000000000000
--- a/dev-libs/libgit2/libgit2-0.27.7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
-inherit cmake-utils python-any-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/27"
-IUSE="+curl examples gssapi libressl +ssh test +threads trace"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	curl? (
-		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
-		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
-	)
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-PATCHES=(
-	# skip OOM tests on 32-bit systems
-	# https://bugs.gentoo.org/669892
-	# https://github.com/libgit2/libgit2/commit/415a8ae9c9b6ac18f0524b6af8e58408b426457d
-	"${FILESDIR}"/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace)
-		-DUSE_GSSAPI=$(usex gssapi)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-		-DCURL=$(usex curl)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake-utils_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index f89c426d7069..89d79502d185 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,8 +1,11 @@
 AUX 3.28.3-meson-tweaks.patch 3016 BLAKE2B 37c976859e35023f5d9742553199aa2bff79241b20af7ce2b6cddf460f42895c7bb4a7a69c51f11f2364c70111cf576b338765d242b09603618332d1d9fea6d5 SHA512 e8d058ac9616e64ca4db3a015fe6498d4f8bc087d5235eb84bf40b91ecf523932568a9d4f0eb17dad56e835e8657badc75458ce2687d896d83240a719d004646
+AUX 3.32.1-meson-tweaks.patch 3169 BLAKE2B 4bfc87153b5f63626ca21a17706e1c510915929fccb691ba9ccc4b3d2f5869927a49cd82a638e7a9b265ebf31f4320c226090a9bcc94f8d438583dd709272695 SHA512 570beb2093ee4f39920cddc95f464aa0cac09ebe299418c8924713e1db060906ddcb8aef7db617079a50dba4ab2b3923aed99f3adf3377e52c7562719072b885
 DIST libgweather-3.24.1.tar.xz 3350680 BLAKE2B 9265cb3c280446d5f380f62b60efb5578a7a401e3291d12e3824d8e7eacc582761226b0aaebb0439318bd48b9ad5429a1b6d89eb0220a82650c43be8aa337e2d SHA512 564464d7a18a8e0320871ea418b1163163941c950c5acea5ee65a087e44c4d81e019e2e3e4cb6751989f823cbb7c5691713d3dcef72aeaf6ff264e61b6f7b4b4
 DIST libgweather-3.26.2.tar.xz 3409528 BLAKE2B 1c5cdc7125aac8df95e97db8fa1d63bcb06865e70691621bc3a1c0ece2e602862cef9a2a5daa2ebbc5fa7eaefa32bf89507f1eef8fa4eeff294d43132e83fab4 SHA512 75b936f93814005b4317dcb51777036f589f343526428d9a74de96aac1badd4fe81c117184e2bff84a7a3078d6f2a2000e7b63f1e1d80f839b3513cc470fb25b
 DIST libgweather-3.28.3.tar.xz 2711240 BLAKE2B 9e55c32485401fa31e5ca5a824f239c373e41c2ef3a1d4442ba4512f102edadaa3452bdc4f4a445ea34e5e24cda23fbf6e1363da5bd49f70018b387f7450cf15 SHA512 7eb98f15b624090ba0959f4ee47c1a2317504a381829cebb949f4104ea9b5c2847a98f95de60a35c5bf1094e500041c53e1afdb265dd2f237bc49db8acbfd6f2
+DIST libgweather-3.32.1.tar.xz 2713696 BLAKE2B 496aa07c517ad570ebf54041b8ae14ec5eb5a923a113e1adcf23e5ac9a515ccb5c2dbeb29c923f0abcfc213409ddafbb1747c5ed5a6129bd4ac40b4e0fd687d6 SHA512 f5ae94436fa3cceee84ff80f14296f11ab27727e3881689dd71126de158f7d0015b462163cb2b47cf30add5a4c97c89c6473c1ed0515fcaac0dde2daffdf7108
 EBUILD libgweather-3.24.1.ebuild 1322 BLAKE2B 105efe6d6f95643f2b98f5bc5ddc0ad9ddbd95ada17e085830e1617ae84ca8518584fb001c9d149c6fc9597965248a8502c92dc9b4cc78deb54f89076747746b SHA512 5c6bcafce98f58aaa43954eab525215f1b60df96b8b35ee72eb4fe794fcae3e8fd13cfe9524bbfb93e2fb8112f65418417b02b0a9ca715db71a2be37e0912252
 EBUILD libgweather-3.26.2.ebuild 1324 BLAKE2B 3dd629227ddea275fc27c2dd90049e29b6c23289a8c5b18036c07506a4adde288dc89ce393c6d57f0417f4f38da820c8650fae56350a771bfcc7d98437890348 SHA512 d932b1409e199220dbbd947813792ba707bec218cc4347f58ed31814d3cd715e0a1aded278a93bbe2add82470dd7b7bc72bbe292c9d0be0c808a7fd141bd939c
 EBUILD libgweather-3.28.3.ebuild 1569 BLAKE2B 693849e3d04ea4001974cedb4771ee913df170cf837284a4285081466f4ef73bb2e9d67758c2f91062fb45639ec8917091704b58016c235e1c94ea1c37701f36 SHA512 bcc77e4d9c060a722af772b7c86410365fb9f1f4ca556812c3a74c7250f1bdda93158473ca298e23559672b9a7211c66fb14a3cff6cd7c02e34a3c58c15450ba
+EBUILD libgweather-3.32.1.ebuild 1580 BLAKE2B 3a4afade029bc309b39224d08064322845b4becb3d945ac1524e03b0b6ab09dd37c33e071a9026145f5e0f9124bf317b724de23458f13ec96f92588d998681ff SHA512 3915bbfd5289c4c843303ff55f3514401f093f86a23323041a80b0f3f2e54838d17ad8f044f743328158a59c9a8afc59cb20ec8e7b79d2c3fe68b86bb8dfedfe
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/files/3.32.1-meson-tweaks.patch b/dev-libs/libgweather/files/3.32.1-meson-tweaks.patch
new file mode 100644
index 000000000000..9d1bdc017c20
--- /dev/null
+++ b/dev-libs/libgweather/files/3.32.1-meson-tweaks.patch
@@ -0,0 +1,109 @@
+From ad9fa6e469c4eba423b0f7bd5fbd7a76f6165ffe Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 23 Feb 2019 12:21:01 +0200
+Subject: [PATCH] build: Provide introspection option and don't build manual
+ tests
+
+---
+ libgweather/meson.build | 21 ++++++++++++++-------
+ meson.build             |  4 ++++
+ meson_options.txt       |  2 ++
+ 3 files changed, 20 insertions(+), 7 deletions(-)
+
+diff --git a/libgweather/meson.build b/libgweather/meson.build
+index 6688807..6776839 100644
+--- a/libgweather/meson.build
++++ b/libgweather/meson.build
+@@ -66,6 +66,15 @@ lib_libgweather = shared_library('gweather-3',
+   install: true,
+ )
+ 
++libgweather_dep = declare_dependency(
++  sources: [gweather_enum_types[1]],
++  dependencies: deps_libgweather,
++  link_with: lib_libgweather,
++  include_directories: root_inc,
++)
++
++if get_option('introspection')
++
+ gweather_gir = gnome.generate_gir(lib_libgweather,
+   sources: introspection_sources,
+   dependencies: deps_libgweather,
+@@ -83,13 +92,6 @@ gweather_gir = gnome.generate_gir(lib_libgweather,
+   install: true,
+ )
+ 
+-libgweather_dep = declare_dependency(
+-  sources: [gweather_enum_types[1], gweather_gir],
+-  dependencies: deps_libgweather,
+-  link_with: lib_libgweather,
+-  include_directories: root_inc,
+-)
+-
+ if enable_vala
+   gnome.generate_vapi('gweather-3.0',
+     sources: gweather_gir[0],
+@@ -98,11 +100,13 @@ if enable_vala
+     install: true
+   )
+ endif
++endif
+ 
+ test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir()),
+               '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()),
+               '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root())]
+ 
++if false
+ executable('test_locations',
+   ['test_locations.c'],
+   c_args: test_cargs,
+@@ -113,6 +117,7 @@ executable('test_locations_utc',
+   c_args: test_cargs,
+   dependencies: libgweather_dep,
+   install: false)
++endif
+ 
+ exe = executable('test_libgweather',
+   ['test_libgweather.c'],
+@@ -121,6 +126,7 @@ exe = executable('test_libgweather',
+   install: false)
+ test('test_named_timezones', exe)
+ 
++if false
+ executable('test_metar',
+   ['test_metar.c', gweather_c_sources],
+   c_args: test_cargs,
+@@ -131,3 +137,4 @@ executable('test_sun_moon',
+   c_args: test_cargs,
+   dependencies: libgweather_dep,
+   install: false)
++endif
+diff --git a/meson.build b/meson.build
+index 54a5063..96e5d27 100644
+--- a/meson.build
++++ b/meson.build
+@@ -112,6 +112,10 @@ else
+   enable_vala = enable_vala != 'false'
+ endif
+ 
++if enable_vala and not get_option('introspection')
++  error('Vala bindings require introspection support')
++endif
++
+ root_inc = include_directories('.')
+ 
+ subdir('libgweather')
+diff --git a/meson_options.txt b/meson_options.txt
+index 19b2c6a..bf4c517 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -8,3 +8,5 @@ option('enable_vala', type: 'combo', choices : ['true', 'false', 'auto'], value
+        description: 'Install vala bindings')
+ option('gtk_doc', type: 'boolean', value: false,
+        description: 'Whether to generate the API reference')
++option('introspection', type: 'boolean', value: true,
++       description: 'generate GObject Introspection data')
+-- 
+2.17.0
+
diff --git a/dev-libs/libgweather/libgweather-3.32.1.ebuild b/dev-libs/libgweather/libgweather-3.32.1.ebuild
new file mode 100644
index 000000000000..8d09094874c8
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-3.32.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Location and timezone database and weather-lookup library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="2/3-15" # subslot = 3-(libgweather-3 soname suffix)
+
+IUSE="glade gtk-doc +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.35.1:2
+	>=x11-libs/gtk+-3.13.5:3[introspection?]
+	>=net-libs/libsoup-2.44:2.4
+	>=dev-libs/libxml2-2.6.0:2
+	sci-geosciences/geocode-glib
+	>=sys-libs/timezone-data-2010k
+
+	glade? ( >=dev-util/glade-3.16:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.11
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
+)
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use glade glade_catalog)
+		$(meson_use vala enable_vala)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index e329f0d9789e..aa22b33eae4c 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,12 +1,5 @@
-AUX libical-2.0.0-libical.pc-fix-libdir-location.patch 917 BLAKE2B 6fcc8482d11e0bc2cba46e0cd12ad6f3f2a845b87d20c25562a032491c63b7a9b81bd07bb53fc8f77ea1399fb29410a0ef72e1f9737dce1b8448b6ee708f393b SHA512 6d5955519201e2543991a3ba49a8c5372e44b75c72ec0fe63fe247152ad67ee67f839063c5f9699b9c8121ae0fb8e3e91ffa2d0ebb6030178f2fea154df23279
-AUX libical-2.0.0-libical.pc-icu-move-to-requires.patch 1443 BLAKE2B ebdabe7edd03b1b416c42335a292723715b74ef62044e5ee52887cbcbc0425e94bbd51e9167dc479b31be7120926814afd7dd6eda6b65a6b498e47a3036f3d1d SHA512 e21cd8dbb5df05f9e90289d1869521e0258bfe89fc72cd78fa89f41177a7100950b3cc0c08498f7f9e19a9ed53813f706334aae67536f1b2f581e579cda45021
-AUX libical-2.0.0-libical.pc-icu-remove-full-paths.patch 1358 BLAKE2B 5f29ec8e534b9d249c4feae41c8c35cb876435e74c998308d1e368874e2fd49ceddc7007f92daff7d2f2802e47981d702f0d75d4606ff58e1350c442cf023882 SHA512 24f9f49de882abb8e49c8a74899dc4bd9438c828e111e158826bbf396928d55b91adbbbda727310f249d8226ed23fdcc8f538b0ef55ba4c99f963ab475649409
-AUX libical-2.0.0-libical.pc-set-full-version.patch 629 BLAKE2B e7d17235c6993c1ad4ae446d36020849db14c534d517c0f6e48ac96af7e51a9e3285eb1d9cb9886101c38f88b65aafd985cf35099e140ee537468fa585e60bbb SHA512 a30127d93d1366d65e464c6d4ad08a42b9de142eac6e14a905cad3e0e094e6deafa689e8deaaa3bc8746adfc9667f8a6657088a2a1e0643035a5a3c2fbde173f
-AUX libical-2.0.0-tests.patch 1176 BLAKE2B 4e96464d103095452ef7be6ebaf5331a9bc51cc3e1f2aa3afd74326ce5809bc577e36299f0293f34348d6b65c404d995399bcf28e2809968c91253409f60bbbe SHA512 c818aed46b64c7ecd72356506ccc36508521040886d9049b2ac0c20f2943f26b5f3ef10d3850b164132a08545f1ea86852db3b4b9ac17f3e4b2f56398a7ed1fe
 AUX libical-3.0.1-pkgconfig-libdir.patch 1228 BLAKE2B 34bae335d1889d0090d02b72a61ea5fc90940210cccb2d09e3ef6a01464579f2fb6bf83b6e9dbcd35950227f0f1c830bbc0b77d1fe3eaa42fd649edfef4f3181 SHA512 556e3deadef8bbb210dbd3bf918aa9cbe0f8a1cfbbf8ecbeeff36a74f134cdebabad96f6ad05f6a1e2afcde669bb145bbea6ab83efa6f7b90b4637f7f761fa49
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
-DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
 DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
-EBUILD libical-2.0.0-r3.ebuild 1708 BLAKE2B a6fc6d8a7ca16ad6a629c5a708b138535a098d65cb0c89c39df889d2d6087c11ddf884afb18fc1d7fcbb297262c2b5b53fa7d0108b825d8cd0057948a3c3efdc SHA512 24d4b757d3bc4657c3d24cdd442b91f7b64113a88c023de39a7f01ec13ad91f255595acb9c0767835837a660fabe316cb3f160f4beab6614a8e20b3cf7ea77ef
-EBUILD libical-3.0.4.ebuild 2044 BLAKE2B 3ee53dc20dfe7ec06cc0d18a8aaf1b119287c115b836fbaf926c207e394428dcb2faaced511a6104c70395db5afdd4e8fd5842be97cdb2dafd9cefa38c3458bc SHA512 d5d729032a61c76040c2cb32a0c2b44ff2188da48b1f80850f142cb178c5905d0e4936e4e91babeba9c63cb94a41b4464ddcfd50779d4b676ff1fcca115b2747
+EBUILD libical-3.0.4.ebuild 2043 BLAKE2B 28a9c2f6ac5cafbb580930368709ff755bd6540a904532b8283b202975d71d68d7a704b69478d3c98fbc5e7fdb2e82b3a3a056631efc9d63927f04f27ead572f SHA512 439f5a141105608da6626b8f662620439d5614ed80ddb46713e2dc9e47af996ba540f972ea9d1ac5fa43c73eec8d4e68de1ab0431b98e2f208c63ca213af1b0d
 MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch
deleted file mode 100644
index 6044d133749d..000000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-fix-libdir-location.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-This is a patch for Gentoo bug 560572, provided by Georgi Georgiev.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 773cf0c..e282ce4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -336,7 +336,7 @@ endif()
- set(VERSION "${PROJECT_VERSION}")
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "${LIB_INSTALL_DIR}")
- set(includedir "\${prefix}/include")
- set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
- 
-diff --git a/libical.pc.in b/libical.pc.in
-index 7774dce..bf88476 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -8,8 +8,8 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal
-+Libs: -lical -licalss -licalvcal
- Libs.private: @PTHREAD_LIBS@
- @REQUIRES_PRIVATE_ICU@
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch
deleted file mode 100644
index e19dc0379028..000000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-move-to-requires.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit f70a26aaf836da0f9e242945151b49190d682d95
-Author: Allen Winter <allen.winter@kdab.com>
-Date:   Sat Dec 3 11:11:48 2016 -0500
-
-    CMakeLists.txt, libical.pc.in - ICU must appear as Requires in pkgconfig
-    issue#244
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b3d49d0d..0f6dfc34 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,7 +145,7 @@ endif()
- #  RSCALE info at http://tools.ietf.org/html/rfc7529
- find_package(ICU)
- if(ICU_FOUND)
--  set(ICUUC_LIBS "-licuuc") #for libical.pc
-+  set(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc
-   set(HAVE_LIBICU 1)
-   if(ICU_MAJOR_VERSION VERSION_GREATER 50)
-     set(HAVE_ICU_DANGI TRUE)
-@@ -155,7 +155,6 @@ if(ICU_FOUND)
- endif()
- if(ICU_I18N_FOUND)
-   set(HAVE_LIBICU_I18N 1)
--  set(ICUI18N_LIBS "-licui18n") #for libical.pc
- endif()
- 
- # MSVC specific definitions
-diff --git a/libical.pc.in b/libical.pc.in
-index 8899f430..c07eb52a 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -2,11 +2,11 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--threadslib=@PTHREAD_LIBS@
--iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
- 
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs}
-+Libs: -L${libdir} -lical -licalss -licalvcal
-+Libs.private: @PTHREAD_LIBS@
-+@REQUIRES_PRIVATE_ICU@
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch
deleted file mode 100644
index 08cf51f94082..000000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-icu-remove-full-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d
-Author: Allen Winter <allen.winter@kdab.com>
-Date:   Sat Sep 3 16:56:29 2016 -0400
-
-    CMakeLists.txt, libical.pc.in - fix iculibs (remove full path)
-    ISSUE: 227
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0173e1a8..0c903ee5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,6 +145,7 @@ endif()
- #  RSCALE info at http://tools.ietf.org/html/rfc7529
- find_package(ICU)
- if(ICU_FOUND)
-+  set(ICUUC_LIBS "-licuuc") #for libical.pc
-   set(HAVE_LIBICU 1)
-   if(ICU_MAJOR_VERSION VERSION_GREATER 50)
-     set(HAVE_ICU_DANGI TRUE)
-@@ -154,6 +155,7 @@ if(ICU_FOUND)
- endif()
- if(ICU_I18N_FOUND)
-   set(HAVE_LIBICU_I18N 1)
-+  set(ICUI18N_LIBS "-licui18n") #for libical.pc
- endif()
- 
- # MSVC specific definitions
-diff --git a/libical.pc.in b/libical.pc.in
-index 5c2debd8..8899f430 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
- threadslib=@PTHREAD_LIBS@
--iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
-+iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
- 
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @LIBICAL_LIB_VERSION_STRING@
--Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
-+Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs}
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch b/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch
deleted file mode 100644
index 403ee84cd651..000000000000
--- a/dev-libs/libical/files/libical-2.0.0-libical.pc-set-full-version.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit cdc85e9e7a14932808471f823bc974031a0c4842
-Author: Allen Winter <allen.winter@kdab.com>
-Date:   Mon Jan 25 14:57:20 2016 -0500
-
-    libical.pc.in - set the version to the full major.minor.patch
-    as requested by Milan.
-
-diff --git a/libical.pc.in b/libical.pc.in
-index 7774dce2..5c2debd8 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -7,6 +7,6 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
- 
- Name: libical
- Description: An implementation of basic iCAL protocols
--Version: @VERSION@
-+Version: @LIBICAL_LIB_VERSION_STRING@
- Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-2.0.0-tests.patch b/dev-libs/libical/files/libical-2.0.0-tests.patch
deleted file mode 100644
index a274382b3152..000000000000
--- a/dev-libs/libical/files/libical-2.0.0-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b1081cccb90fbe4cd859d3280a0470c30dce5cac Mon Sep 17 00:00:00 2001
-From: Allen Winter <allen.winter@kdab.com>
-Date: Thu, 24 Mar 2016 16:28:02 -0400
-Subject: [PATCH] recur.c, testvcal.c - use TEST_DATADIR to point to the test
- data thereby fixing in-source building ISSUE#228
- https://bugs.gentoo.org/show_bug.cgi?id=532296
-
----
- src/test/recur.c    | 2 +-
- src/test/testvcal.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/recur.c b/src/test/recur.c
-index d427137a..873ec48a 100644
---- a/src/test/recur.c
-+++ b/src/test/recur.c
-@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
- #endif
- 
-     if (argc <= 1) {
--        file = "../../test-data/recur.txt";
-+        file = TEST_DATADIR "/recur.txt";
-     } else if (argc == 2) {
-         file = argv[1];
-     } else {
-diff --git a/src/test/testvcal.c b/src/test/testvcal.c
-index feee8147..024bbe99 100644
---- a/src/test/testvcal.c
-+++ b/src/test/testvcal.c
-@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
-     char *file;
- 
-     if (argc != 2) {
--        file = "../../test-data/user-cal.vcf";
-+        file = TEST_DATADIR "/user-cal.vcf";
-     } else {
-         file = argv[1];
-     }
diff --git a/dev-libs/libical/libical-2.0.0-r3.ebuild b/dev-libs/libical/libical-2.0.0-r3.ebuild
deleted file mode 100644
index f92f67e5d8cf..000000000000
--- a/dev-libs/libical/libical-2.0.0-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
-SLOT="0/2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc examples static-libs"
-
-# The GOBJECT_INTROSPECTION build is broken, and upstream has given up
-# on it at the moment (it's disabled in Travis). It will probably come
-# back in v2.0.1 or later.
-# This snippet belongs to RDEPEND:
-# introspection? ( dev-libs/gobject-introspection )"
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-DOCS=(
-	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-libical.pc-set-full-version.patch"
-	"${FILESDIR}/${P}-libical.pc-icu-remove-full-paths.patch"
-	"${FILESDIR}/${P}-libical.pc-icu-move-to-requires.patch"
-	"${FILESDIR}/${P}-libical.pc-fix-libdir-location.patch"
-	"${FILESDIR}/${P}-tests.patch" #bug 532296
-)
-
-src_configure() {
-	# See above, introspection is disabled for v2.0.0 at least.
-	#local mycmakeargs=(
-	#	-DGOBJECT_INTROSPECTION=$(usex introspection true false)
-	#)
-	use static-libs || mycmakeargs+=( -DSHARED_ONLY=ON )
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local myctestargs=( -j1 )
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples; then
-		rm examples/CMakeLists.txt || die
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
index 010125d397f0..fd77a32def14 100644
--- a/dev-libs/libical/libical-3.0.4.ebuild
+++ b/dev-libs/libical/libical-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples static-libs test"
 
 # TODO: disabled until useful
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 053d378e3c17..35c75c304936 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,9 +1,7 @@
 DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949
-DIST libinput-1.12.1.tar.xz 520072 BLAKE2B 2d2b2d82f27ac01ff25b3bf6fd7b77ca56467ab818cdc5d4a641629fed623ef5042915889f54f71b1881595af1d85770bbf4ecfd798c079878efa0a0546c4a36 SHA512 de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68
-DIST libinput-1.12.5.tar.xz 518612 BLAKE2B 6bd4c770aa4e22f3ef80cff12731dd8ed8f50ddfbc6d06c02af7b4f1b38122baea412b806825ed511ac3e586505c2dfec66061ed459c6526a74af91d275e7709 SHA512 9365b91b3ac2c4ff0f9927913242afac7677979682dd7b541001b13d09d7982acd854f6d348101cfa4b0854c6a92b4c683f62593a97870e32ae3d607eaeae3ff
 DIST libinput-1.12.6.tar.xz 518784 BLAKE2B 7462f47be3628f9c66ef5b7c8265b588bd0ca328bafe91932f5341a010ac882648b4e7cfd0db241ae526836172e0829d68d21f8966d2be8b49f4e1c0c40df018 SHA512 02ad90c77a0c8c27fd96ec34e1546c5f0947ced49bad386372c1ef7c41b3b2157c39020f0766f20aaf2ab3c97128567e169279bea21115ced39499dda325d2ef
-EBUILD libinput-1.11.3.ebuild 1430 BLAKE2B 6be00d5d69e9e6c4fde5c59a3856ce50e95798809863ead833404e8f49be8a3c85801b13ad1e9ca802642f627d8435132cf9257fa4965898720628da0c0e0908 SHA512 20cc0c87ed32c22e5c7e2b9b1420eeb82e064ac1e59535e3af02bfdc84640ab84c09f0c18dc82ce9a399bd48a3ff5cde1785354869a7f459af63c1abe1986c68
-EBUILD libinput-1.12.1.ebuild 1460 BLAKE2B 066dfe5ee976f24475f2572d040c685b2a429cc27d22d2199bcaaa0e92886a9e76b2dc489457e5657f8b4ac6a0e61af75cd7041af96647bc1dd911d5c84e3585 SHA512 3bd9c1fb51fee929bcf85349996e679b202d2e064bcb88926a4d0cda0453f82c7ec9f8bd0ba0e4870781fc936a36da034b91e23223ad3f9764b4781468bf8b19
-EBUILD libinput-1.12.5.ebuild 2035 BLAKE2B 0befaa539fd44efec19a1a9aefe0762633974120c288087c0a6b7ad553ca7dc0409a83ad729494012853c424f7855eced3d6d34c3b9e5d13fb43f8da5875628e SHA512 722b84a7ebfab778425eb87b5a08c8c6fa02679cee22a0d1355cb20137bc87061412630dbd7f564be40665737c8703f190162d32bc0138cc43eedee4a2a7c471
-EBUILD libinput-1.12.6.ebuild 2026 BLAKE2B e65b5efe93b9d00714298863525cf3bf254c41c9fc8e4c3ccc9b5c755eeb06a68996b08214f5f60c9afb80732b6c228195b42c86411c3ee58f13f291efb32991 SHA512 4c83ef1040d6fa4da9cf4594f2f433ad37918147a00fe447c0f7c35273face7c4d5c1479eeb02f224ffbfdc8a2e1ad81afd3d71b137359bb7c964d0feb83a5a6
+DIST libinput-1.13.0.tar.xz 529912 BLAKE2B 830dca7387c6527ebdf41e8b01bf9d8df094ec2309e229e3933b56217d51e3ef0b0c53106d6e4d55946a238d947c17a1d7c0a8f43b63119a6f3aa1063a703d64 SHA512 0e3f53acf90fe142ad677b416d1ee830ad7f7f8a83b80023278ea7d3696ff7af5612379b387b1eb5daae6277a8c30d84c21f0086fe3d8b4b6189f239b1eeb4f8
+EBUILD libinput-1.11.3.ebuild 1479 BLAKE2B 3bf99bc9ac1007e56927e43f42aa98fc3e827be6492fc895f19daeea49417e596c5ce39832531a242d71bffe6c6b6c9b588070d42e4204747bf539d641cf0085 SHA512 09b0ea6ee921080658e96ef91e19bf97f6077b7ebcaa82acf5e7b8a9b42b032d848386a633c5b577287de236b1e7d4055627d8dc06911584f9a78edd18f65f5c
+EBUILD libinput-1.12.6.ebuild 2075 BLAKE2B 7097b88f64918da7053c398d268d1857a328439222443b6cabc9a9815bc6264807ce8ca7d8e600944b5f1537d5bae083a5fdf6fa7604a4b05496e684de5742a9 SHA512 46ce18a95c8c206c906b94455ec657c6fa73eddb579ea677a9f09a39fb2b2b2738f3d495a85f91d82edb86f849e32be064b849db89eff3e1d8774a685c5582fc
+EBUILD libinput-1.13.0.ebuild 2084 BLAKE2B 164a483275c47e36024a962f1b1b25481ef388371b9b2b7fa012a70bcaa75ff78c1e585b37af285c41674b9cc08630dedf6a297122adcec1a01ba9377ce92723 SHA512 e5f33cfede51c2917f078065c9f322446693afeebc76ab054276e203b15ca5ca92e4dae94b3cb555a0b5ba7bf759f1a4649d0810e635b6fca6531b9593b3d0c4
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.11.3.ebuild b/dev-libs/libinput/libinput-1.11.3.ebuild
index c60f29f7f675..072c1deee40e 100644
--- a/dev-libs/libinput/libinput-1.11.3.ebuild
+++ b/dev-libs/libinput/libinput-1.11.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit meson udev
 
 DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
 SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
diff --git a/dev-libs/libinput/libinput-1.12.1.ebuild b/dev-libs/libinput/libinput-1.12.1.ebuild
deleted file mode 100644
index c19ff354838c..000000000000
--- a/dev-libs/libinput/libinput-1.12.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit meson udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc input_devices_wacom"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		dev-python/sphinx
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? (
-#		>=dev-libs/check-0.9.10
-#		dev-util/valgrind
-#		sys-libs/libunwind )
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		-Dtests=false # tests are restricted
-		-Dudev-dir="$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/html/.
-	fi
-}
-
-pkg_postinst() {
-	udevadm hwdb --update --root="${ROOT%/}"
-}
diff --git a/dev-libs/libinput/libinput-1.12.6.ebuild b/dev-libs/libinput/libinput-1.12.6.ebuild
index a9abf03e5454..21bd0253ca3b 100644
--- a/dev-libs/libinput/libinput-1.12.6.ebuild
+++ b/dev-libs/libinput/libinput-1.12.6.ebuild
@@ -7,7 +7,7 @@ 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/"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
 SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
diff --git a/dev-libs/libinput/libinput-1.12.5.ebuild b/dev-libs/libinput/libinput-1.13.0.ebuild
index fe9e7e7cf8c1..5bd8983e0dad 100644
--- a/dev-libs/libinput/libinput-1.12.5.ebuild
+++ b/dev-libs/libinput/libinput-1.13.0.ebuild
@@ -7,7 +7,7 @@ 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/"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
 SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 61b4b355049e..08a6d4c85d20 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,5 +1,6 @@
 DIST libmaxminddb-1.2.1.tar.gz 614448 BLAKE2B 6ab92e0313cf745d8820db7239c5760b9fe8a813a14008e415068a263954d48c99c3d3d771d746959c85a5ff6cec28a0b287b15ced83697c8594761599b99fa9 SHA512 c77e2714c30dbd9d83a755d7e4d24016534510f4cc7213fe9549d610bf79aaeb28f761a9fb769270d9043b1baab537c5a4b3a9994b525d48f395fe94c104b5b3
 DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
 EBUILD libmaxminddb-1.2.1.ebuild 534 BLAKE2B f04f1993e974ddfa3c3d18460b2d1ab47f4eafd75593b1e1d35b039edd7cccf9794dba6557b3fff29156debc92f6b7e2a17c4ac0b621b5adadf34476f3384807 SHA512 c39d9450664921840c4a18ec2a7293607ac1aa668330d5c19ac3fcfd8998522055e83313b03551635f417ff80915f52e5506fea52768236287ea56a2d838573a
-EBUILD libmaxminddb-1.3.2.ebuild 548 BLAKE2B 2fa7e1696c01af5b5d76ebac2a32ffc99789acee340dbeaab94edb4837dae39d385d12fce1853477f7520853dd6df1b3f51b7f15b934895ea09f3ff9c40fa11a SHA512 9c5f4343c012a3a36eebe4d3d51aa451eb0585ca2fb8c167005fb478913c7af8440ed86c742ebfd8f4055815f71cffebc58aefbe3af82d0c38ba53c1b859aa9f
+EBUILD libmaxminddb-1.3.2.ebuild 552 BLAKE2B f6dd9403b2cdaf2bc7ad955d40302143eb93f2d28e521aac85d2c983792648b8072504837ae273d9bedf2217282313fe7d03e53d3bef300541793e4eb9ea616c SHA512 c1009ad0410117ac5c42e7d339e342ab4d254bcd680e39ee873e8497bcea52c2fe437eaa424a8e0ae7e4b99be34ee7a9a33b878f53d5e7d7e32227f19ea15a5f
+EBUILD libmaxminddb-99999.ebuild 534 BLAKE2B 17a96d2066900a4c310b913932bf72ccb410e13ffe150e8044bc9db80bd8af2ad82b9b5d6385b676ba5c723c0219b5001e552ce8a1c52f5529af6d949937aac9 SHA512 74e11c6417593375ae978788fc7b3790d0568229232114e5966505da839f7971ff6b77452a7649f7d430883781f39ab950f9cad4fc255fc84f1b12b8911f55a5
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
index b903f913d664..17017ee84aba 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="amd64 ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild b/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
new file mode 100644
index 000000000000..22ef31d40939
--- /dev/null
+++ b/dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3
+
+DESCRIPTION="C library for the MaxMind DB file format"
+HOMEPAGE="https://github.com/maxmind/libmaxminddb"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="Apache-2.0"
+SLOT="0/0.0.7"
+KEYWORDS=""
+IUSE="static-libs"
+
+DOCS=( Changes.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libmodbus/Manifest b/dev-libs/libmodbus/Manifest
index c62cba787b2a..fdacfcfa74f3 100644
--- a/dev-libs/libmodbus/Manifest
+++ b/dev-libs/libmodbus/Manifest
@@ -1,4 +1,4 @@
 AUX libmodbus-3.1.4-doc.patch 358 BLAKE2B 7f69a497411d308bc02f4881802cbd2b17ef2dc9edd527a6f9ecfa96ed70d3336f79b20c4ab8297062802465fa174f0adcd4d3ac81946eea8c1409a23b067278 SHA512 a73147873d0ddb3338608cb7bd4a44e6e333b46313e9326e7442b6b3c3fd4da97cbf93f8c92e517352d8828cc6ab6eb95a36e7fcaaa62a48774bc8f4a109b6ae
 DIST libmodbus-3.1.4.tar.gz 471576 BLAKE2B 4fc57abd784e2cfb65d19cd55a31f4b778a209141cc13b9c969dbd6052f187ba0de0031105be748aa2113f345bdb16c2b582b53635b5334f06dfdb34c5992a18 SHA512 63f73894b27704f5e5b3ca0a364cc366c5b5d24903bb24384155890cf06c0f8e5c707a435a38129402ff6628ef3d611dd0db82f840b79cf1d205ebed2ac5681c
-EBUILD libmodbus-3.1.4.ebuild 708 BLAKE2B 2998c503f2d9f9a7fe976c12090a8ba17a5ef8c90c67b43b69c868aebe9b471f02a572dcc8ebd15a8b17a39a2c71d6ef2e0627a759d16f4f32f99dba9966f3d9 SHA512 7e4422288515be16249f737ad979384e1f8ce32be821b134acb1d55706d1534918499f9efe5632fbe44eb7e7e61ea611493864f824944169412bf3cf4798a944
+EBUILD libmodbus-3.1.4.ebuild 710 BLAKE2B cbeb5b7a89a2015024d24f316d04a0f3bc1888b8869b3e6a764561738d057ac3bb250441da4556987eb1cc28e926a973afcbecf3f4b138d451b4f22ee718af0d SHA512 ddf366f800f5a3242b2625978f2fdd804f97521cf5368eea9ba6d241378402d1e48f12f578ff68ace2c614d01ba8d26e3af1de55d983d7642abe6843d882d97d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmodbus/libmodbus-3.1.4.ebuild b/dev-libs/libmodbus/libmodbus-3.1.4.ebuild
index a52447ff29a5..a0367b70eb14 100644
--- a/dev-libs/libmodbus/libmodbus-3.1.4.ebuild
+++ b/dev-libs/libmodbus/libmodbus-3.1.4.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 
 DESCRIPTION="Modbus library which supports RTU communication over a serial line or a TCP link"
-HOMEPAGE="http://libmodbus.org/"
-SRC_URI="http://libmodbus.org/releases/${P}.tar.gz"
+HOMEPAGE="https://libmodbus.org/"
+SRC_URI="https://libmodbus.org/releases/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index fcfa08897270..407ccf73f3dc 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,13 +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
 AUX libmspack-0.9.1_alpha-fix-bigendian.patch 444 BLAKE2B bc62193205d7d96b8e2b535236463d0695dfb1a3cc4b2290d172873c11f9d3184550426e10bd1457282531f27a22585365e5b1537f1b9f85eeed4fd31afa5748 SHA512 c2e138e19c7e8b8f90e1dcc35d32f655ccd7a1930eab7a0b49686e9d2be26cefba48bc895ef1ebcb1959c0422e824779f7e31940bbde0c8bfd8a2828c2ad6c3c
-DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
-DIST libmspack-0.7.1alpha.tar.gz 486840 BLAKE2B f97abba7b261cced6e5c500c50243920c44ae8bc245e54386c4568e17989f2bad2c3316d83ebbd75220b50b09ed4ded156965e9aa430bd207aaa6b7c6218d800 SHA512 e903629a34c29099a261a108e4eb9cda485ab999bbc3383e3cd6a39715077d00b26a1c641b0f3df0eef60d2e15a7ef623379df0cfe25b99d4eda080529ffec7b
-DIST libmspack-0.8alpha.tar.gz 488869 BLAKE2B 346609f86e1668f012794c89704991d9e1c206f73f47febcc6c32b6523819f00bf13aeafb250611b73ab8eb25764a6ada0cecaf138452ece64674784aeaeaedd SHA512 d178afc4d2eded204594c81af1c91be17d3be4f1a09829e08c103023aa7badc6b2595e9ec13cc7f77e3262d2cd874ed40ce6da01695c5c839682562740d2bf0a
 DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a
-EBUILD libmspack-0.6_alpha.ebuild 1181 BLAKE2B 6ce72cf323c65a4f42ab61ec19e0924e1423e61f117da0e4aee90bd9acf0d54ec68b96256dab9c4af13941bb0f5ff483b3df86a7605858f987fa609343f2e2d5 SHA512 17a9f9f04c6b4c5dae20b9f4f3011a871493a23141808102bac3a0ac4a912dd16d5a843da9862e2c92b09765f291ce8c42f5b92c926cbbafc7e8cb15364d93ed
-EBUILD libmspack-0.7.1_alpha.ebuild 1350 BLAKE2B 2547d6a0d39530f7e019ea0073cd809c563094fc4ae8198f7b0c27c29d714b34c8f5f2a308d6a8df3a3cd5c847715e97a3d154483a90c3314e32a9761d0a3d4c SHA512 c4bd1afc5c42640541b70140295a860412beabfc7f90407acc2dc7263f711531bd3cd00b4f1280841a2fd556c7e4e32d554519e5a54ea258f5e24b963d08a274
-EBUILD libmspack-0.8_alpha.ebuild 1298 BLAKE2B b62b3be7492625949a8fa1e25c536c27fa4781c07c8eac0cf3e503981d7b66be8d3223be02eccf7b37a9dfa75bd6bff4fb8f9da408098e2596deed6d0a6e0445 SHA512 5a9ba806bd8973788c6839ea19cf7b69fc2cc7fb7b35156b59e58ea78bb8d619a3fdb95363d88ef9f640c0326cc2b35f6cc5f41e66707febaeec74f7c1e0712b
 EBUILD libmspack-0.9.1_alpha-r1.ebuild 1674 BLAKE2B 64f04908e1dd4405f403929611b7e070b24d3585bd72fc1a615920198bd791c064a07a66489a63f07a81e462e5cbaf96618573db95dbe2e232080c40f4429f0a SHA512 48ef70cfc86fbf174d5a4ec81cf3337a8e593cd0b5146804233a4116bcc83562b212ce89dd77be1eb2abd61fa0890abfd9d24ccad4bf8dd4a922a048020000a9
 EBUILD libmspack-9999.ebuild 1606 BLAKE2B 54a39c3d22d8cfd335eab023702e83e0a3f05c1ec9c96890e4c0f622aab2a88bfd9216678127126ab0ee33965fe51a821d4c32636a5050b68830bda83a2ea828 SHA512 71ad3f2118af448b402b2d674015fa2f92ed7005bf11bd8d951416f7d92d6dfdab285f68a29a23f9fa6fa1d75e8d07109f27e7707b91d067b96ee8870a926ec9
-MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
+MISC metadata.xml 251 BLAKE2B f8ea69eed31c6ee4eca7ce37a9ee2b99d4139e42e53a0c93441863f1c2eb1148149038cbef9ec91a4c92971077fd6ba8e6ea995a138f8863c06d8ee57bc4f74c SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
deleted file mode 100644
index d7c6bfb768c0..000000000000
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-MY_PV="${PV/_alpha/alpha}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A library for Microsoft compression formats"
-HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
-SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86"
-IUSE="debug doc static-libs utils"
-
-DEPEND=""
-RDEPEND="
-	utils? ( !app-arch/mscompress )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-tests.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS=(AUTHORS ChangeLog NEWS README TODO)
-	prune_libtool_files --all
-	use doc && HTML_DOCS=(doc/*)
-	default_src_install
-	if use doc; then
-		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
-	fi
-	if ! use utils; then
-		rm "${ED}"/usr/bin/* || die
-	fi
-}
diff --git a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
deleted file mode 100644
index 4a10f2105900..000000000000
--- a/dev-libs/libmspack/libmspack-0.7.1_alpha.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-MY_PV="${PV/_alpha/alpha}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A library for Microsoft compression formats"
-HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
-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"
-IUSE="debug doc static-libs utils"
-
-DEPEND=""
-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() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS=(AUTHORS ChangeLog NEWS README TODO)
-	use doc && HTML_DOCS=(doc/*)
-	default_src_install
-	if use doc; then
-		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
-	fi
-	if ! use utils; then
-		rm "${ED%/}"/usr/bin/* || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-libs/libmspack/libmspack-0.8_alpha.ebuild b/dev-libs/libmspack/libmspack-0.8_alpha.ebuild
deleted file mode 100644
index 79a9df1e7940..000000000000
--- a/dev-libs/libmspack/libmspack-0.8_alpha.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-MY_PV="${PV/_alpha/alpha}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A library for Microsoft compression formats"
-HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
-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"
-IUSE="debug doc static-libs utils"
-
-DEPEND=""
-RDEPEND="
-	utils? ( !app-arch/mscompress )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS=(AUTHORS ChangeLog NEWS README TODO)
-	use doc && HTML_DOCS=(doc/*)
-	default_src_install
-	if use doc; then
-		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
-	fi
-	if ! use utils; then
-		rm "${ED%/}"/usr/bin/* || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-libs/libmspack/metadata.xml b/dev-libs/libmspack/metadata.xml
index 1e5806295c83..613d45e5ffa8 100644
--- a/dev-libs/libmspack/metadata.xml
+++ b/dev-libs/libmspack/metadata.xml
@@ -5,7 +5,4 @@
 		<email>reavertm@gentoo.org</email>
 		<name>Maciej Mrozowski</name>
 	</maintainer>
-	<use>
-		<flag name="utils">Enables building cabrip, chmextract, msexpand and oabextract</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 87dc3fba5f84..514355c81251 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -3,5 +3,5 @@ DIST libp11-0.4.7.tar.gz 475538 BLAKE2B 81d36f0795cae00a20be935790441b46257728cc
 DIST libp11-0.4.9.tar.gz 492083 BLAKE2B df84d9303e6e143fbfeaaf2e8d0b57f3c4cd63356b15d629ab210196611ab42e396cf7efa69392ac81dd9fd591aea5580e0b38f545bf9bad9ec4748d08da90d2 SHA512 0c4a76ee7a5d98ec144dac1de8d4f52ad2515e6c578b3ee9705ef861bc06a27477b6ec42cf1d96944844f006992aef449b579b430b2e32d367f29d1a0d82f8ee
 EBUILD libp11-0.4.4.ebuild 782 BLAKE2B e2ea80c9b0a6c514806ecf69da143c3bc0f981cbff1aca891c7ca9ce1a4e36314b26a23166e8a6b0af141fb288244dae23c4e610687af39301403afc6b51f12e SHA512 6dd12ffe649c25f7320f1d5809d7b792fd3efd46725306193ed5fe92b246441e54e662fd9a2ac657c16977dffb146947f4a8a15fab2e1934711a7088ab310604
 EBUILD libp11-0.4.7.ebuild 786 BLAKE2B f44f40db44fd3455989171a60014fca0128b43741123a57c7d7418d626c716431e992809e175f6b8f6e71c2686b214991c5d6f7c793568915a4725418521f3d2 SHA512 9a934922c8731336e4b950ad9543b07e90b303d164bef57d4ff41dc99a2933e008613113a8f302d1e0a1324bc3e0d7a01590208a45428816b7a8bbfc023f92e0
-EBUILD libp11-0.4.9.ebuild 783 BLAKE2B a19fc7777d34c711e1d574394b8af0120767626c2d29ca13ee9567780d203d1ce9fdc2130e4b1bba051799fffef1da1aa789bf9c5a62d42f4ec669e031350394 SHA512 362e47657435679c64771d6aebd7d9a29e9cb02c4627fc09cdd2a28b44e5261daabc2936f001525aa2cffae1fb8e57e9bce081414502b5db9d0e424156baa7ac
+EBUILD libp11-0.4.9.ebuild 775 BLAKE2B 8605353f5a55c1e0ee467ec751bfcf5307c963f735095a9630201f230308dba02bc10837812f01d6735a912a8b7114987a452ac7980574d0985bfa4e24f6d24b SHA512 0b53c57f47b1f29d239f54f870b98fd010556b41a26d6f6213980dc3d606b5b7156eee3cf89685b361d546fbeb16fa67ec9f9af8db6886af310e7727bc31e802
 MISC metadata.xml 612 BLAKE2B 603fa1505d9001be83c192a30130fd3a2aed2c817fabbaa7970e9c883290eda3aafa41a6e9bcec57ee993fb97fe6edf448eaddbd68bf8246ae272ef4066ebb7e SHA512 85d70948ec35a42c1707729c325159abf0a097a7b0c07b4db36453e25a8dbc713b6f7c347b545cae71104d166be9b8c93e4835f79633bee2e06d64a1c28e15b7
diff --git a/dev-libs/libp11/libp11-0.4.9.ebuild b/dev-libs/libp11/libp11-0.4.9.ebuild
index 75e1ca5a431e..63a7d2537fc1 100644
--- a/dev-libs/libp11/libp11-0.4.9.ebuild
+++ b/dev-libs/libp11/libp11-0.4.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="libressl bindist doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index fde31ad26c01..da6d0ccf9df6 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 789 BLAKE2B 4b5c7ed203d1c8f0314240d93ab6945e0e3dfbc17d5428201d0eb4f715c413ed0b00dd6e08f7bfa091f9586bfa7c96b48412ae5918efa3b965b4078b2322670d SHA512 dbb83391393a2c1c8ff9c08a5d6d24c540be37b2356da677dab3502665a857007e8ec7f0d2ee9bd2252f949444d9288a52aae2ef7b48822964c7451f02eab5b2
+EBUILD libpthread-stubs-0.4-r1.ebuild 843 BLAKE2B a8cce2ea3b511a3ea7aefc6a24d6c0883974776c4b157256b1a662fe9076c1d1fc0f73f7267c5544ae5b87cef9dcef9261e2a29733bd4fab2c42e25f66295b24 SHA512 f6a1443015f473bee6c52bbb1cbb33e98a4d72d45a39b309bfcb7b7a10ddf74819d543da3295452310ec6cb629edefb06fdb9a6573ec174b6f1228c9209633e8
 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 342a0aa0d9c0..83e44b614d32 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 Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="Pthread functions stubs for platforms missing them"
-HOMEPAGE="https://www.x.org/wiki/"
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/pthread-stubs"
 SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
 LICENSE="MIT"
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index f3f1f77b457a..6546a8ce02bc 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,8 @@
 DIST libsass-3.4.7.tar.gz 319824 BLAKE2B ca3e7091816474e318fb1eaefa01e5e361a66715b6267500a93f80dfc8b34bdc595e6ddc4b1872e4399093468d4ac06a9760685d8941d92f18e1834df7715b04 SHA512 5d743d4345b11e9e5315aa858637d3388d2b464150a46bc8a712e1e5d1b3df9c1e6b4dcac26f91827f1c38db24a5a084d04c0962a428f2994f42ad66a25b35a8
 DIST libsass-3.5.2.tar.gz 326773 BLAKE2B 65d2dd82872ef76a45597104cc2a531786c0cd33f8e61172b0c973c8262fbddced3b988e143f27b3b7cac2f9d17c481cf58201bfb432aa2656763319ac072b51 SHA512 a06f0047358eeacf5fff9ab44e833ac285e4a971829610b56ae7ed00128b4bee9fe33630c299e61337cf975caf0bc3067242c3af4db1f8aaf3898d3e63920f67
+DIST libsass-3.5.5.tar.gz 327298 BLAKE2B 4127722343394bca4ed054987eed6113788e10dc4d03a869778c10b56135406c1fcd72dc101bfe405c96267b628735e8ee74d3812ab392f097dc941b78bef882 SHA512 dcb73a5080c00023b60a19ea037ba5af481253a7b47492bd7114bf45ab78ed931c7b207fa8f12ed200a39760553d72ae92dbe4eb80b826b59a6201fb34008fe5
 EBUILD libsass-3.4.7.ebuild 1096 BLAKE2B e9eb6a53d6155feb93703d991b63b41d45e14e9d8bc556a99639bc05aa02b630efa163dbb8def6328c997c8a987c03a9bab68ff24131e33d541f3f58c0358d47 SHA512 740bc1eba61b1fd5f8faf5fce4520836f63fd1b17220948c48674fa579007b2c8d3e6e389a21b923c1dc94fef295a154161b11f1fbc84cc4198edfd730bf6190
-EBUILD libsass-3.5.2.ebuild 1119 BLAKE2B cf6145088e8a11d9e8224fad8cac4205ae218dee52b30a260b60b1de213d34225b75fa5cd8d2bd9aee0e3e31005b2a689dcb86d3bf8cc127ab6cabce25330138 SHA512 468716041d189c58b84239e54a7cf4244bda880fff87ade70ab6cdf70fc75b7f0f87c48d0a1d42b9daa76a3ea1d2997dcdf3a5c661e2f8d7511549b650a8564e
-EBUILD libsass-9999.ebuild 1098 BLAKE2B 9bfaff1b30ff11fa8cb8c2082a2e91a61d8be9df2cb290444203b8d56111e63a914e439526ffa99a0ae21ec229ac4f7d672c2e58e2baafb2bb80edb947c0be64 SHA512 48833dfaf5b5c815d7922a93a988a15ea59b5d38d6f6cfb063109b89be479d617df8c8d9ff7394ece9901970c5f569efa59c80a6a3adfe6ecf4baffdcb803b32
-MISC metadata.xml 545 BLAKE2B b756c149e5a437f916e9867d1debbcfd301024479e412b1959030e8bba733e1850aac99c394878d5aba13546c528276cfccc2002019a419a2a69036e694295d2 SHA512 cff4c5ac8d73f30c45c14785cd6cf4fcfa0509476e280d227f6978bee58899e58b22d86bd9ca09024a4872a1116b0a19ef0975901ff6ab1763253d8dc6898d8b
+EBUILD libsass-3.5.2.ebuild 1117 BLAKE2B b96208f177660af4efacfcdf1645a50bbe485c49b5ab4bd2c0bdc10384c6fc85264dafb69897be9e94324638795f1fc950e0234b05071d8f821f05ac17df9f5a SHA512 67aab406245bd60dfcf110720ff89cd5fe86122a62c8f81997f7d7d6e09e503b17f5874f27cb6363d6fb765ed410464a91bd2325c416439144c2b20728c4624b
+EBUILD libsass-3.5.5.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
+EBUILD libsass-9999.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
+MISC metadata.xml 635 BLAKE2B 88705faeb11d0f69615b94933da84ce8784e73c5dcf36bb248fd1e3796a17da347d005c8c95a9f4cc0b591d208718e347384531cad60bb3d9ead910456eff621 SHA512 794b10c517680dc0b460208eea733891cb7bc8b65875f5617d086f86eb8b08e436c441c2ad00dba80bb643090182a42a77484b5934eb1df2e36f2119a1c5fbdf
diff --git a/dev-libs/libsass/libsass-3.5.2.ebuild b/dev-libs/libsass/libsass-3.5.2.ebuild
index b7b573c1c746..5b4c3b249e5a 100644
--- a/dev-libs/libsass/libsass-3.5.2.ebuild
+++ b/dev-libs/libsass/libsass-3.5.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libsass/libsass-3.5.5.ebuild b/dev-libs/libsass/libsass-3.5.5.ebuild
new file mode 100644
index 000000000000..7bb47a910936
--- /dev/null
+++ b/dev-libs/libsass/libsass-3.5.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/sass/libsass.git"
+	inherit git-r3
+	KEYWORDS=
+else
+	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
+HOMEPAGE="https://github.com/sass/libsass"
+LICENSE="MIT"
+SLOT="0/1" # libsass soname
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+DOCS=( Readme.md SECURITY.md )
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != *9999 ]]; then
+		[[ -f VERSION ]] || echo "${PV}" > VERSION
+	fi
+	eautoreconf
+
+	# only sane way to deal with various version-related scripts, env variables etc.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-shared
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc -r "${S}/docs"
+}
diff --git a/dev-libs/libsass/libsass-9999.ebuild b/dev-libs/libsass/libsass-9999.ebuild
index 6c86860c5d05..7bb47a910936 100644
--- a/dev-libs/libsass/libsass-9999.ebuild
+++ b/dev-libs/libsass/libsass-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils ltprune multilib-minimal
+inherit autotools multilib-minimal
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/sass/libsass.git"
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
@@ -45,7 +45,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libsass/metadata.xml b/dev-libs/libsass/metadata.xml
index 9704a1738620..58b843a9d6a9 100644
--- a/dev-libs/libsass/metadata.xml
+++ b/dev-libs/libsass/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-	LibSass is a C++ port of the original Ruby Sass CSS compiler with a C
-	API. It is coded with portability and efficiency in mind. You can
-	expect LibSass to be a lot faster than Ruby Sass and on par or faster
-	than the best alternative CSS compilers around.
-</longdescription>
-<upstream>
-	<remote-id type="github">sass/libsass</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
+	<longdescription lang="en">
+		LibSass is a C++ port of the original Ruby Sass CSS compiler with a C
+		API. It is coded with portability and efficiency in mind. You can
+		expect LibSass to be a lot faster than Ruby Sass and on par or faster
+		than the best alternative CSS compilers around.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sass/libsass</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 43e469d73b88..f0c15873d2cb 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,9 +1,6 @@
 AUX libsigc++-1.2.7-fix-install.patch 457 BLAKE2B 70e53fc5931a8f11390da226297edfa8ac895a4d40187f70a3045ac12c1d808d856ad98b2a1de608663c8ca78e5640367967d5cb543cecd094833eb47376f3be SHA512 aa3b8e38ae64e8a0c833b530e1717944a3849c9396988c343e0ad71ada31362472c2013b82911333cb468aad56238b505ef1c2b45cd1866d5456a5a972011f38
-AUX libsigc++-2.10.0-make-disable-benchmarks-work.patch 445 BLAKE2B 250bfea450badf2960a15bcb639b1dbb33c6efbfa313b02dd66c10613996d42d11e106ae9cc778095621a0a8d79e46e3da39ee63e9475619d63410b5b7a23bd8 SHA512 ffd0c863dc973849bbd71d748f0dbdf0a1c7bfa332e119706ff8d63bd2113e6fe90c284683685a7fd5f7fe266a0ddc6d585b94d924776c5cf530b213eba888c5
 DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f
-DIST libsigc++-2.10.0.tar.xz 3794612 BLAKE2B 205cd8cedbe25d04108df888c392fe6a14829826cf1b6b7604a03f357788dfa83a5ba213d6365c48965dd16fcd7b545c9e76d4e4d10971cc1c9ccb172ec0400f SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae
 DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
 EBUILD libsigc++-1.2.7.ebuild 953 BLAKE2B bbded60c997517150857e66d1d1bce9123666391c0328862ef3da2abb75519ef06585ff4209803277352e49c5059606975ec963b564a075229d4fe7243d92dc1 SHA512 8fd16c8a79761172d2674ba2935d07d13d16c20db687a00e53241a2f5d7b1c9f7b61510968960e02be85a6f5e52aa622cc0d09af19c2ba19a274e997596850b2
-EBUILD libsigc++-2.10.0.ebuild 1656 BLAKE2B 06f822384e9c2fcbf52fe91a783ca9266d4ea7f728d9c9c14db04bea4a8b69cd1d863f719f4031028d30b074563b5cc401eeee2fd3693e33497e9b3449910e79 SHA512 f28e3fc55596383da213da6941015162cb7b2983d40990b030673fe6aecae01ab88b842e1b75cfccb70d235134cbfb8da6db626b22822bed277c5f2f4e7bcbc6
 EBUILD libsigc++-2.10.1.ebuild 1509 BLAKE2B a5f34af84bc26a1c40d0d5762e5351e784626b58ae18414db603591e35e541b20ee3b9e62102b4e134786170724f199680a05a29dac50fea5d3460ffb2efac51 SHA512 88b973a4ebb97dea119b0dbf312dbe0850eae7f7dcd80aa35e94e168602f8f237845f8e6cd0aa01c906e93774a3ab241d14214f4f4380c669aae8d6585643525
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/files/libsigc++-2.10.0-make-disable-benchmarks-work.patch b/dev-libs/libsigc++/files/libsigc++-2.10.0-make-disable-benchmarks-work.patch
deleted file mode 100644
index 2c9a62a6b069..000000000000
--- a/dev-libs/libsigc++/files/libsigc++-2.10.0-make-disable-benchmarks-work.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -1480,6 +1480,7 @@
-   --enable-benchmark=yes|no
- 
- 
-+
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-@@ -17799,8 +17800,7 @@
- 
- # Check whether --enable-benchmark was given.
- if test "${enable_benchmark+set}" = set; then :
--  enableval=$enable_benchmark; enable_benchmark=yes
--
-+  enableval=$enable_benchmark;
- fi
diff --git a/dev-libs/libsigc++/libsigc++-2.10.0.ebuild b/dev-libs/libsigc++/libsigc++-2.10.0.ebuild
deleted file mode 100644
index 82c255add4fa..000000000000
--- a/dev-libs/libsigc++/libsigc++-2.10.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 flag-o-matic multilib-minimal
-
-DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="http://libsigc.sourceforge.net/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND=""
-DEPEND="sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
-# Needs mm-common for eautoreconf
-
-src_prepare() {
-	# properly interpret --{enable,disable}-benchmark configure option (bug 599764)
-	eapply "${FILESDIR}"/${P}-make-disable-benchmarks-work.patch
-
-	# don't waste time building examples
-	sed -i 's|^\(SUBDIRS =.*\)examples\(.*\)$|\1\2|' \
-		Makefile.am Makefile.in || die "sed examples failed"
-
-	# don't waste time building tests unless USE=test
-	if ! use test ; then
-		sed -i 's|^\(SUBDIRS =.*\)tests\(.*\)$|\1\2|' \
-			Makefile.am Makefile.in || die "sed tests failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	filter-flags -fno-exceptions #84263
-
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable static-libs static) \
-		$(use_enable test benchmark)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Note: html docs are installed into /usr/share/doc/libsigc++-2.0
-	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
-	use doc && dodoc -r examples
-}
diff --git a/dev-libs/libtar/Manifest b/dev-libs/libtar/Manifest
index 6b691eb1a909..bc483f81724a 100644
--- a/dev-libs/libtar/Manifest
+++ b/dev-libs/libtar/Manifest
@@ -5,5 +5,5 @@ AUX libtar-1.2.20-bin-memleaks.patch 2571 BLAKE2B 72217c256a8f504e1647ecd8157bc9
 AUX libtar-1.2.20-fd-leaks.patch 2021 BLAKE2B 73e9ca5475e86fc6c5cddee5f608b0a1e349e987c17c0a1d1d9406ba2b3efd414a138402f2d78f925a736dc1a0bbe1511e2047fec5c6c25891f0874f233f53fe SHA512 93312a12b14f47d80a81368438afb4af9883d95691f4c33a2443c595808943087e31a00b44038028106ed99a23343efa41cd7ba432a8c8be00c5ea0d51817a26
 AUX libtar-1.2.20-tar_open-memleak.patch 630 BLAKE2B 31616574597017dc5444d0b79aa6084c55f3eedf5c23099663da2905bdf8be8d499c9a81228b268840524e286e06b18c3221a60c95f2e3effbb09beb8c0712f9 SHA512 a37df7b6e1e98298f622c1cbef348861c187409abf6614eafac21d802aaa1418081281db3e03fda0ba9fc5a690f4fb00b61fbe277c4c34c82443d4fe4548e317
 DIST libtar-1.2.20.tar.gz 63542 BLAKE2B 57565fd703aec159a0b30280c026ce82d4a74fc658a24e589c2d9fcf11ff0e8c79de172df8b4cfeefa776eb27bb4b1a65951739ec37de4300da47d508a8d4227 SHA512 360a0296af99bedd6d93236c3d6d6746fd38deaa5287e7a138d303e1072bc8871437a693dc926d82af5b54dedba2ebdff5a3edb1f7d7dc494b4235439e477dec
-EBUILD libtar-1.2.20-r4.ebuild 1498 BLAKE2B 864b888e04616a5718eb28e50eff8075b8a7c217edbd758fdfbf67c259fd09187d20d5d4340b5dbd1cfae86bcfe7a8e070856920f92ceb36b0abde86166555f9 SHA512 de3f024551cf56f9b3195ae068801a7c9ed8010698de417aff44f4d02699e2d050163939d1700db36082115f32e2fc41b29da059ef6414aace4b7c794eb2d644
+EBUILD libtar-1.2.20-r4.ebuild 1496 BLAKE2B 706b9f319a7464f5345aeb8f972dcfd8e23f8bb8885075fdbe58cda1aea34c4ec79d200111a17a77c71a7b2a8a45fc61e122de3bdf65e1c9bd07fe0750a1eac9 SHA512 b1be3a3c9280340f25b4e36cb7b9ca49bf4692a1644fa6716fb32700ed9be927fa850fd075537262854055a21f5f48ce2edb78bd3d118ba2f7fd0a43fc1215e3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libtar/libtar-1.2.20-r4.ebuild b/dev-libs/libtar/libtar-1.2.20-r4.ebuild
index e9b592b25cc2..cbc4d499d82a 100644
--- a/dev-libs/libtar/libtar-1.2.20-r4.ebuild
+++ b/dev-libs/libtar/libtar-1.2.20-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="C library for manipulating tar archives"
-HOMEPAGE="http://repo.or.cz/w/libtar.git/"
+HOMEPAGE="https://repo.or.cz/w/libtar.git/"
 SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 07a2ef9fc332..3d39cad4fa2a 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,3 +1,3 @@
 DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
-EBUILD libutf8proc-2.2.0_p1-r1.ebuild 728 BLAKE2B 94abd7f27372c69f09c13ee84ce0f8dcef22467410ce755af0858072bea77382ebc94af4d58f7768c90c9fb5fbf3d2d5afb3e0436e0df01e1a1068d4c8383dd7 SHA512 8bfe79664480c0360e4f4578d4e2179ea6fbbc13a2746ccee715e34fd61509e12cdea0756a932ac551b82a93129db84a7cd3523477a22680584802b644c49471
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 727 BLAKE2B 77aa365c44a626a4f464de40eda833c278b48158f81391cf13e6ba5d8633e8c67f8d10736cff944246621a9f2b99a974fdf6d03e962602923982538577d623b6 SHA512 114b67a43e61d9c7ba44a6d4150d9c19283376299e8320812c9c1c095b48a0533ffcc6cbf9efc5d5612ec5f49e7db2de08323138caf22a831a9e0e97f48b208c
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
index 0b1b1a78c86e..71b876c663db 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-util/netsurf-buildsystem"
diff --git a/dev-libs/libxdg-basedir/Manifest b/dev-libs/libxdg-basedir/Manifest
index 8700a0d21729..c2038e1dc501 100644
--- a/dev-libs/libxdg-basedir/Manifest
+++ b/dev-libs/libxdg-basedir/Manifest
@@ -1,4 +1,4 @@
 AUX libxdg-basedir-1.2.0-buffer-overflow.patch 898 BLAKE2B 24db3713a2a85901f0b7c0353bed955ca377e4fe1c84b02343e191945203db500722a0efe15a263885952a526eaa7121231054d27e4d86bb72c937f019d52f8c SHA512 265ded0f9fc7448021281eb48ed77977eb2f8f6275a18ba329dc9ad5a8c7e41585add4cb989af34e8f135a8545b1548763253204ab5905f78d90c9852546aa25
 DIST libxdg-basedir-1.2.0.tar.gz 30159 BLAKE2B cd9eacf6d32e0f27aa4a9092fb919f027fe77905cf8cad2f3d860d93f9784bbcf85336704fd9241d58769e48b2a8a7e4b4ed306ff32328f1ddc7cce7b014dc09 SHA512 8584405d45e0b57e570666b6eab6d99d70411d00f88965826c9ed0292372385668f190157a10ff536f3a5a59fd0031b332ecbb8a38ac64eda1b04a0603997406
-EBUILD libxdg-basedir-1.2.0-r1.ebuild 981 BLAKE2B d681edb8350df622f3b079be7e62622029e131c2e48c5afdb904a232088a58155ea6a5321dbd170e11605f8ae467e7af134601e366106f52ef5afe994b55228c SHA512 f205ec6d46db3589bf79f5f8e2ab16de9191d5ba6f42d27532dc56d2bc1e4f9960e351a77c4b771c20164de11ac3a39145862b8dce4036db8f2383dde2beeb4e
+EBUILD libxdg-basedir-1.2.0-r1.ebuild 960 BLAKE2B 2fe8a6114b578494dea220e7163651799b14d96177eb6f10512ce8b6e94d0c1fe28572e9ed54240753faad146b9198d51f6693a5e6b30512ac6407537751f96f SHA512 b3fbc5bb6d9a7863c7c478ba4bdc267ed252fbca914595bfefd33684b64d80ec6e0b36fbe3378ea692827ae6be79e656e46e42c872a64c1afc966956bc7ebe1e
 MISC metadata.xml 258 BLAKE2B fbb6080ca66a25c598b8dbd1366020c736e21b80c080dd1ab706a48379f2a5e9e1f1ca3dd6835a3c462f8465702b3277e5c30653e5def11a1bbe2f497d502b6f SHA512 2186459dac52b0c063cc8a6d83c1895a1dcb4d1cef3c5c0a50d2658ce8cd4140cdf50a28032a2add1f71ca6a03bfb80c9293c8c0af668623741f5b6f90b38f7e
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
index 26e6d732db0b..96a53b458718 100644
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="Small library to access XDG Base Directories Specification paths"
-HOMEPAGE="http://repo.or.cz/w/libxdg-basedir.git"
-SRC_URI="https://github.com/devnev/${PN}/archive/${P}.tar.gz"
+HOMEPAGE="https://github.com/devnev/libxdg-basedir"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 05bd12415b3d..59c81ca38527 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,17 +1,11 @@
 AUX libxml2-2.7.1-catalog_path.patch 2225 BLAKE2B 9a9c5836e5227e51de05d1e19c27b828c3c082c671d9b9bfb30afbe971fca580fb87cd86560e2ed431b4dc1495585c62f01da0f36e401d4dbdc4d8be2269cca5 SHA512 bcad080ee84c926c75df8baa47937bdfcfa207235263249f4025e64cbb5ac9be883e1ac4dc1ee55944116da2f84ced27b7cae781aa855579796f3f53a54aacb1
 AUX libxml2-2.9.2-python-ABIFLAG.patch 728 BLAKE2B d81b042b5000717d5aa88ac4cebf78749f5a4ef661c227537171c5695d97a16ca75c790c8b540e3481a54dc2d935112b46e0a23509c887e16e3f2886c08f1d69 SHA512 2f801329ad4e13dc70450d41f7659a510fe429b3aa9b66859fed25c4e3d95381d6f253f3a60a54002a16999296d3bd2adaca5e4cca92186492bfc7de3ac84426
-AUX libxml2-2.9.8-CVE-2017-8872.patch 2209 BLAKE2B 5d91d5252737a38f5a37aee31409cf9489af112f157161e069d75b8929a5e46b14934f5cea1ff97fa2ef51f0f99be02f6c3287a637c6aad79ef4f52e44ec83de SHA512 8c466cb05dc1ccb8b08d77761f63a69b884b251f85291a4b60362fad06f6b359685854eb26a9dff0d87ecb74ddaa6f33e5611c71c20d0f813ab3a57b4da8b775
-AUX libxml2-2.9.8-CVE-2018-14404.patch 1837 BLAKE2B fea63c5520733da251ad22087cff9ffb9b40ffb105ad6832cc60db5c6fbeec03147e2c502b8f34b8b1189d105eb73c2b4abe46903c381d63d1b9d753a49c36cc SHA512 7dd09401a6acdea20e356a3608ffa23606a499ba6437542bd5db93e4c72143aef74fdd249da2d0069b27a4a8e08f70f4ff6db19b0e191d1cedfcb1c7f0abbf55
-AUX libxml2-2.9.8-CVE-2018-14567.patch 1651 BLAKE2B b6f79d2ff56d7846410d8d0395139819b9aee5a59cd1e44fd8c5173d222f70164e65d0db5d923cd7decbe4fba223d1f8947c64b07ffe6b06453604b160fe74a4 SHA512 3de674cd91e9fc8f63c292aa70fc03861114ff1d1d86694c940c7ed41b65c1f60699fc667a0e686ea237fda235fc5c3ceddfab791a0857b0a4fc3c0850bcb724
 AUX libxml2-2.9.8-out-of-tree-test.patch 1311 BLAKE2B 7b3e7abf273c1ab2cbc42b1fcd4ff7bef365503d8c04b315b0857574054409ac76c367f7ef0c944d448ef3ca84268082f59424758894cffa31a93925a81972c8 SHA512 4b665c7c4bea2d938f7b2021a38f274b9e40dd38c5e2085716cae02c60cd3ff9aa109185e7bfdd38d2724d76500c99da0db0968f634b56f7ef418a7a72ef144a
-DIST libxml2-2.9.8.tar.gz 5469097 BLAKE2B 0b7836db46edebf6e7108c28da4bb7e3fb5ddc695aaa3e456ba51a66c0294a741d7b60eb4c31c7040443bbd54712c019424078bd533856a9650b39a703a926d5 SHA512 28903282c7672206effa1362fd564cbe4cf5be44264b083a7d14e383f73bccd1b81bcafb5f4f2f56f5e7e05914c660e27668c9ce91b1b9f256ef5358d55ba917
 DIST libxml2-2.9.9-patchset.tar.xz 16792 BLAKE2B f761b5cda41d57543dadf2cdd8915b69727a818f31badc1092903a9e4341b807852fed0887e9ec7a06a0c19c4a49f9afc2f3c048947f21a09006bb51ef8399ef SHA512 c8c0ee6d0a2833e5664aa7549999f8ba63b9f0bbfda4651050eeee7d3a958c33ef55daba8cfb1ca73ebffeb44d411b5f4259fe6e11ef0204ad2deebd1708ebfb
 DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f52eab6d8d9b96dc91f03a84baa132abeaf303a836ff9bbf04f832432a036077316c464398e433c9779d8519074b SHA512 cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.8-r1.ebuild 6929 BLAKE2B 118f631199ac16882386289926e79ff92f01efda5f43d50a7e3ea1e3f63c11d0e8914d99962478870377f11815b4a6c536ff729d7890613aab993ac382e0003f SHA512 a7ba10378ba62ad7070abc0f3ef4cafdb1b92599f15ddee89b63dda4d9bb34f00851cae0a638b6bcb90b8ff8436902d37a92325b50048718d53b8caff3b16a2f
-EBUILD libxml2-2.9.8.ebuild 6533 BLAKE2B d3221db79de340179ff899f16848e2c2f4d472d7b5836d4251bfcc1abadb10705a8cdf711c15ce057869367b0b9581bfd5ec242029403d369906c8f41909f839 SHA512 4724cba5b6c9ab9db540c96ec7a87811695b272c339b0e4e2cc9248f548948b953372d7be025d5374d1979c522b3b532ffdced7a7e88fcf532d59ecb4c584ef6
 EBUILD libxml2-2.9.9-r1.ebuild 6790 BLAKE2B 562853a0e03d1fee849af5e0bc46135eeecf70f993afbb0ad14436a37f3e2bf005607ed2e611ec53ec16cbcba8c1182887186c10e32ca1d3c379fe7d740ce732 SHA512 7de83e6a9e712a282b7659dcf53b9a094d972556dfe1a3de8cad3bed637f3c7507dcc923970566ba6d53e96b37c71e7af9bb8c8123bf8442bd9b8028a55e990e
 EBUILD libxml2-2.9.9.ebuild 6533 BLAKE2B c7d5198c45ae47005315b3fa8f7d266e5427d67984e03a458fc4702b36b8e8fb126920b8f117d2b3def425ce14a6946cc94a9388ad3f16b06372e599b61a625a SHA512 0c04c4aea4921da709a4f3f63c63c5e45d3e52a3b1380774e2dba0e1c2a31a7ca8981d1b8be179c4c8784d2bcf3018c44a94a57bf183e896fb5fff21e937686a
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2017-8872.patch b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2017-8872.patch
deleted file mode 100644
index 6062f63df9ea..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2017-8872.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://bugs.gentoo.org/618110
-https://bugzilla.gnome.org/show_bug.cgi?id=775200
-https://gitlab.gnome.org/GNOME/libxml2/issues/26
-
-From 123234f2cfcd9e9b9f83047eee1dc17b4c3f4407 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Tue, 11 Sep 2018 14:52:07 +0200
-Subject: [PATCH] Free input buffer in xmlHaltParser
-
-This avoids miscalculation of available bytes.
-
-Thanks to Yunho Kim for the report.
-
-Closes: #26
----
- parser.c                     |  5 +++++
- result/errors/759573.xml.err | 17 +++++++----------
- 2 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/parser.c b/parser.c
-index ca9fde2c8758..5813a6643e15 100644
---- a/parser.c
-+++ b/parser.c
-@@ -12462,7 +12462,12 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) {
- 	    ctxt->input->free((xmlChar *) ctxt->input->base);
- 	    ctxt->input->free = NULL;
- 	}
-+        if (ctxt->input->buf != NULL) {
-+            xmlFreeParserInputBuffer(ctxt->input->buf);
-+            ctxt->input->buf = NULL;
-+        }
- 	ctxt->input->cur = BAD_CAST"";
-+        ctxt->input->length = 0;
- 	ctxt->input->base = ctxt->input->cur;
-         ctxt->input->end = ctxt->input->cur;
-     }
-diff --git a/result/errors/759573.xml.err b/result/errors/759573.xml.err
-index 554039f65b91..38ef5c40b8e3 100644
---- a/result/errors/759573.xml.err
-+++ b/result/errors/759573.xml.err
-@@ -21,14 +21,11 @@ Entity: line 1:
-             ^
- ./test/errors/759573.xml:1: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
- 
--<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
--     ^
-+
-+^
- ./test/errors/759573.xml:1: parser error : DOCTYPE improperly terminated
--<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
--     ^
--./test/errors/759573.xml:1: parser error : StartTag: invalid element name
--<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
--      ^
--./test/errors/759573.xml:1: parser error : Extra content at the end of the document
--<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
--      ^
-+
-+^
-+./test/errors/759573.xml:1: parser error : Start tag expected, '<' not found
-+
-+^
--- 
-2.19.1
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14404.patch b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14404.patch
deleted file mode 100644
index 59bfc0fa9b88..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14404.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a436374994c47b12d5de1b8b1d191a098fa23594 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Mon, 30 Jul 2018 12:54:38 +0200
-Subject: [PATCH] Fix nullptr deref with XPath logic ops
-
-If the XPath stack is corrupted, for example by a misbehaving extension
-function, the "and" and "or" XPath operators could dereference NULL
-pointers. Check that the XPath stack isn't empty and optimize the
-logic operators slightly.
-
-Closes: https://gitlab.gnome.org/GNOME/libxml2/issues/5
-
-Also see
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901817
-https://bugzilla.redhat.com/show_bug.cgi?id=1595985
-
-This is CVE-2018-14404.
-
-Thanks to Guy Inbar for the report.
----
- xpath.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/xpath.c b/xpath.c
-index 3fae0bf4e0a0..5e3bb9ff6401 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -13234,9 +13234,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
- 		return(0);
- 	    }
-             xmlXPathBooleanFunction(ctxt, 1);
--            arg1 = valuePop(ctxt);
--            arg1->boolval &= arg2->boolval;
--            valuePush(ctxt, arg1);
-+            if (ctxt->value != NULL)
-+                ctxt->value->boolval &= arg2->boolval;
- 	    xmlXPathReleaseObject(ctxt->context, arg2);
-             return (total);
-         case XPATH_OP_OR:
-@@ -13252,9 +13251,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
- 		return(0);
- 	    }
-             xmlXPathBooleanFunction(ctxt, 1);
--            arg1 = valuePop(ctxt);
--            arg1->boolval |= arg2->boolval;
--            valuePush(ctxt, arg1);
-+            if (ctxt->value != NULL)
-+                ctxt->value->boolval |= arg2->boolval;
- 	    xmlXPathReleaseObject(ctxt->context, arg2);
-             return (total);
-         case XPATH_OP_EQUAL:
--- 
-2.19.1
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14567.patch b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14567.patch
deleted file mode 100644
index 0d289352d2f9..000000000000
--- a/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14567.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2240fbf5912054af025fb6e01e26375100275e74 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Mon, 30 Jul 2018 13:14:11 +0200
-Subject: [PATCH] Fix infinite loop in LZMA decompression
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Check the liblzma error code more thoroughly to avoid infinite loops.
-
-Closes: https://gitlab.gnome.org/GNOME/libxml2/issues/13
-Closes: https://bugzilla.gnome.org/show_bug.cgi?id=794914
-
-This is CVE-2018-9251 and CVE-2018-14567.
-
-Thanks to Dongliang Mu and Simon Wörner for the reports.
----
- xzlib.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/xzlib.c b/xzlib.c
-index a839169ef2ec..0ba88cfa849d 100644
---- a/xzlib.c
-+++ b/xzlib.c
-@@ -562,6 +562,10 @@ xz_decomp(xz_statep state)
-                          "internal error: inflate stream corrupt");
-                 return -1;
-             }
-+            /*
-+             * FIXME: Remapping a couple of error codes and falling through
-+             * to the LZMA error handling looks fragile.
-+             */
-             if (ret == Z_MEM_ERROR)
-                 ret = LZMA_MEM_ERROR;
-             if (ret == Z_DATA_ERROR)
-@@ -587,6 +591,11 @@ xz_decomp(xz_statep state)
-             xz_error(state, LZMA_PROG_ERROR, "compression error");
-             return -1;
-         }
-+        if ((state->how != GZIP) &&
-+            (ret != LZMA_OK) && (ret != LZMA_STREAM_END)) {
-+            xz_error(state, ret, "lzma error");
-+            return -1;
-+        }
-     } while (strm->avail_out && ret != LZMA_STREAM_END);
- 
-     /* update available output and crc check value */
--- 
-2.19.1
-
diff --git a/dev-libs/libxml2/libxml2-2.9.8-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.8-r1.ebuild
deleted file mode 100644
index 86521ab289ae..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.8-r1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	cd "${S}" || die
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Patches needed for prefix support
-	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	# Fix build for Windows platform
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
-	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Fix python tests when building out of tree #565576
-	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-
-	# CVE-2017-8872 #618110
-	# https://bugzilla.gnome.org/show_bug.cgi?id=775200
-	eapply "${FILESDIR}"/${PN}-2.9.8-CVE-2017-8872.patch
-
-	# CVE-2018-14567
-	# https://bugzilla.gnome.org/show_bug.cgi?id=794914
-	eapply "${FILESDIR}"/${PN}-2.9.8-CVE-2018-14567.patch
-
-	# CVE-2018-14404
-	# https://gitlab.gnome.org/GNOME/libxml2/issues/5
-	eapply "${FILESDIR}"/${PN}-2.9.8-CVE-2018-14404.patch
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Avoid final linking arguments for python modules
-		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-		# gcc-apple doesn't grok -Wno-array-bounds
-		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-#	epunt_cxx # if we don't eautoreconf
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	emake check
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.8.ebuild b/dev-libs/libxml2/libxml2-2.9.8.ebuild
deleted file mode 100644
index fbb37285cb7f..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.8.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	cd "${S}" || die
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Patches needed for prefix support
-	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	# Fix build for Windows platform
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
-	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Fix python tests when building out of tree #565576
-	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Avoid final linking arguments for python modules
-		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-		# gcc-apple doesn't grok -Wno-array-bounds
-		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-#	epunt_cxx # if we don't eautoreconf
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	emake check
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 26028205db59..4660476e06e6 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,5 +1,5 @@
-DIST libxmlb-0.1.6.tar.gz 83399 BLAKE2B d4c1bb0d95863107bf71225317beb99cabf04e650087e08da10a14cdca2925566fad022123a86966cc8499fa30c89e47fbf7c521bb89b1d74d8636b0ae82926d SHA512 da9e36e97fa4335f21eefa74147676105924a760464647322a3f0a29ac13c815d692eac81b0ae5d47340eeb654989a7ddd2b83f686e5f222a48f749786a047bd
 DIST libxmlb-0.1.7.tar.gz 85474 BLAKE2B 3d7d6ef226163f5c0d582dcd0e61422c78d89635d93aab420488d7ed9bdc567c06144e3e33800ba8d158ec8503c5741774e2788c3115245f0b34da4c53186be5 SHA512 bf248ba1d51bd7d718631d22a2debf000c064a52f5b317608267adf4acce995305c5cd1c73b6e0eba965abaa14dc9daaf813b3f6aafa17b4455d0af261feab85
-EBUILD libxmlb-0.1.6.ebuild 903 BLAKE2B daf92bc66015754f493d281f8746bcf7274621e84b51be1f7fcf9c643909054003b09e8c49a0ca57c63837b2b18994e51fc891ff34c6a9ecc06baa161244976f SHA512 24c96335ca8cccb1f3d1b008a8da01f59c90baec5227515a921c34a63c11b07d94ab9814e50c9044d1bfabdf035e2957ee6350b71fe3010af3b9d725593e8868
+DIST libxmlb-0.1.8.tar.gz 85945 BLAKE2B 4d17aaf4e5ed3001a4db24e7ca220cba3fc14ee446b127b65b545fab997c7c31835b57b0dd9d23da74200d774e3986558e7618789f42d1e95c0734fa5bb6e098 SHA512 4109f171da4622429d18afdb9ae183a64f89e0b92df285efae5736017970f877a92391876969c20894184c6d5df96390ccd46be1d1087882a5461476c39e433a
 EBUILD libxmlb-0.1.7.ebuild 903 BLAKE2B daf92bc66015754f493d281f8746bcf7274621e84b51be1f7fcf9c643909054003b09e8c49a0ca57c63837b2b18994e51fc891ff34c6a9ecc06baa161244976f SHA512 24c96335ca8cccb1f3d1b008a8da01f59c90baec5227515a921c34a63c11b07d94ab9814e50c9044d1bfabdf035e2957ee6350b71fe3010af3b9d725593e8868
+EBUILD libxmlb-0.1.8.ebuild 903 BLAKE2B daf92bc66015754f493d281f8746bcf7274621e84b51be1f7fcf9c643909054003b09e8c49a0ca57c63837b2b18994e51fc891ff34c6a9ecc06baa161244976f SHA512 24c96335ca8cccb1f3d1b008a8da01f59c90baec5227515a921c34a63c11b07d94ab9814e50c9044d1bfabdf035e2957ee6350b71fe3010af3b9d725593e8868
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.6.ebuild b/dev-libs/libxmlb/libxmlb-0.1.8.ebuild
index 487a34f0da43..487a34f0da43 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.6.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.8.ebuild
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index 407fdfe177b4..97344aa716e7 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -1,7 +1,9 @@
 AUX libyaml-0.1.7-mingw-no-undefined.patch 1363 BLAKE2B 0d64f4875afc98bf51f1aa76eb714b1635cc3f3cabfc5d2b6b2b497a34ace8ad9a5e19b1df932d95da95728830789cfc9947b53d500356860106e4fbb65e0950 SHA512 7c29e975deccf9789db70be45dade04b9ab62260aac5021b16173be79a32e864210b68fc78d659949487474fba841ac18cfcc7031b10f1160f97af47f3bea953
 DIST libyaml-0.2.1.tar.gz 601443 BLAKE2B 4940d1f0a698a985502d6e1c4d3d064061462642829aecc75a820bebcb7b7e4ae5d62777162063650d24962c93da6449bca791811d0438222d897388ec07c2ea SHA512 f91297c37dbbf03aaff718947474381a4a6a4ee1a39171d7fc32c3710ce55321028f3485ea1fcd52b962da36ed021c0b7ec05718296dca636329a19aecc809b8
+DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
 DIST yaml-0.1.7.tar.gz 527518 BLAKE2B 80bb082e22e7f8275924aaa4f8e95eefdc94e929690ddefdba61f50d57d01428990687d2c7bcc5b277888825b8bc0619c572594dae64ce00013adde685f9a8d9 SHA512 1ee5007dd10db137b5ee80f8117f07390ec04af98d087a5f5475dd2b38d87c699b79ab1676e6c7bfa263323fcdf8edd69fada2b0b7f9c57bef4e46cd65f1e975
 EBUILD libyaml-0.1.7-r1.ebuild 1102 BLAKE2B a3429606925e85426aaed0e2b4a82f39b1c1d0a3292f2e7823b205a5d9cf544406586dd88342b73fa141a48915b4bf97ed9b5cce3b044d9c1b392c4c3e921bc7 SHA512 275fe1435255cfb5a1752d3f96d77cc0f76909a553b2e220580472bca22924953203279c117fc379e38e5b5c055d1c056a55146a0c3dc8c170abd3f108136a6a
 EBUILD libyaml-0.1.7.ebuild 1066 BLAKE2B 6909e22b3ece9efd806dc6e09d5d444cc97199e24c91885dfd53d4c74ef300519f388b7043ea5f7c64df1ba1b46a0722a506d8c96316f42154bd546e69b551b9 SHA512 18f60b395a0f87cd31f01d8174d400a086d69b76df7332bb7672d217cfe4ef9e3ba0a81ce51ab0d7c49abc1b3290e5af00f6dcaffe1106d5a30187160c1bc4a8
 EBUILD libyaml-0.2.1.ebuild 1052 BLAKE2B 5a2c1d4c78738d437775a89779651bc7c2db7eed8b6be20dcaa83285d821c05ea7a669371e6e23a8788efafaf650196fd4b7d9619e9c90da5abca84315d83c39 SHA512 02b2aaabefde73b7b27ef2795b470edecbc5e67a56cead4e5d3febc8e95cf6e5e4cc4b114af66dc65bfc81e401c1bc3573f131f22ca550278ca1f0dc6443f321
+EBUILD libyaml-0.2.2.ebuild 1036 BLAKE2B 563fc42939379e07ccf234429fdb937102afa47ba3980031ce134017c6216528670ca6b15215059cdfc215ba42399b9c8fb1fa68d2f394e7ef09cd4810504253 SHA512 415c3c52afb371dd466c4d647e178e51f70831a66177d994518f50977782e3f67f154e04ef2fe7f8d25fee9b64cba2ad2bb6480ec79b7e48cb570cf22b528b5a
 MISC metadata.xml 393 BLAKE2B cce8a44acadbabe965899f786d3855d19b49549e42e39b2311a1d125a22789aa28924136767b42c074210fee6dd1b17f337968195aacf3190418979898bafe03 SHA512 ce775cab169e0601244583a8b771dc9f3fa58ccbe6e9bd315d5a778cc92e887b97ee63c7d5bcbc87d0b0483d89444855562aabf0d7f0067f660c173c4aeaad37
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
new file mode 100644
index 000000000000..4a3f8a2366cb
--- /dev/null
+++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool
+
+DESCRIPTION="YAML 1.1 parser and emitter written in C"
+HOMEPAGE="https://github.com/yaml/libyaml"
+SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+
+src_prepare() {
+	default
+
+	# conditionally remove tests
+	if ! use test; then
+		sed -i -e 's: tests::g' Makefile* || die
+	fi
+
+	elibtoolize  # for FreeMiNT
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	docinto examples
+	dodoc tests/example-*.c
+	docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index f90139424ba9..9bf8640e7707 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -2,10 +2,11 @@ AUX libzip-1.2.0-fts.patch 393 BLAKE2B 1d158551eceda9f4b6f305ae1c1c253ca85de8f47
 AUX libzip-1.2.0-headers.patch 341 BLAKE2B d4a0227da9e3415f4372f6141071f2e070f0b14256dec7933dea9cdbd1d54830ae886a89a7984dd8c66e8d523e18a9070336b1a42b02426e6678ee97f742cf28 SHA512 25a54a4901e45d78263c35ea788c9ae84760c4e2cbb7e09f0dd33b35eefb47165a1788ab33a7f306d112ffdfa35a3f3ab65c1f50463d5a30ffd265a2be6208f9
 AUX libzip-1.5.1-bzip2.patch 1861 BLAKE2B fdb4734858512718079af900ab96ba1be9664e2d5def086c44a52eba256759dbf733acf097dfec4e76e1f20aecf60dffbf7e7ef21c2e8a51b634c08678ea765c SHA512 af66da5aa509a3dfc47c0d456d7b462361847f68d5abe3aed7d33f52165a7e0fd0eb2d246e05bde1e47669f56cac5a85eb3b5aecaf8a83196e6297ae2175265d
 AUX libzip-1.5.1-options.patch 1297 BLAKE2B d2394b095b59d484269bc29cbbb311c5c58564dbf715c131874fc4b76649bae909c0a1c5509d9b2d085aabb9c54ace50e3ea65fa2494e584e92a6cfef68ca0b6 SHA512 41a1f8f33e485f0e5b63ca899aa4feb3eab121f7a19fa67821de7aeb5499810ae998dada973dda375e247c978ad1e5769c2080d91394ffc1028921712bc42b63
+AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc910522e38dd05546c995d90d5377cd0419666e4b724448cf6d38110faa640191d98b06bbe08610ae947340658f0a SHA512 e8af90b4559df0a6b2c8d0d1b7797833d0f59c4827082cd5dd8459d57ac1557249030510dcdad5f31a84a99cd79e30bb7b9293b1f19303be750faa40be2892cc
 DIST libzip-1.3.0.tar.xz 955876 BLAKE2B 9bb59cb34ed7e85e3161770f0eef7ed1f59fb2f7f648cd201fa5dc6c62339481ad72a71024df443c04ef0c7efe6f00838a3ac316da2ef06c0045ab69ade8f71b SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900
 DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
 EBUILD libzip-1.3.0.ebuild 1035 BLAKE2B ddd93eedf9092234100990f5fa22689819ff1b8d906abd75318b8694816c60bef575788290666ed7d39c028b2c5492e02da42376f43c31ae4255ea58f61032ae SHA512 01795236335f9f2b97f2deda5dc4b2be04efcf58e93c290526e675435b27b530510677e0858b86e3070a299221e94acb394d45095c81b2c8b54fd3174a4ed443
-EBUILD libzip-1.5.1.ebuild 1904 BLAKE2B b92a6dca2cf72218de69a04541943618e80463a2e2be1c55ccb2cd29b6059f3efbfe35393904b7451f05d6ea3a9dafe61ca4c429c5c9f82fbfe73b35de85dc3b SHA512 2cb205652544769e9a69bdd439d6dab79ac4b0bfac4b195052b941666b5f6f01c4fea2e85f2d7c317c776469ebcbbfa25e266c846b47cae4d55200b7e2910471
-EBUILD libzip-1.5.2.ebuild 2220 BLAKE2B ec5db9582b919bae761e3c1cf193be3fe528c5fe79d047f8e74a3a9f745aa3f10e28ebaf88ab48bbd16861568428073af8eb49597365b332f3f4a13876ad3dea SHA512 19c5f86b154db5ec477148999dc93b0a0b2231546cd04cecd333e3e663234fe5521cc9df2c38bcded96a7d447b12b7cbe6ae21994d5716d4e31285dc0828aac3
+EBUILD libzip-1.5.1.ebuild 1903 BLAKE2B 7dcbc94b2e7bd9e2f85c44274052b7ebf28655f681900e92b9de05685b269d6e2b94079799c659f0448c478318397001267ec5712e4481a1cea1d3c59790d608 SHA512 78fe6cdf6d2a001c03d86b2384b9839b848f8c14211b38ad0261da03636f0719b841a845acf6cfb6e63b9c867cf45002c1525dfc6a03ecbc4c55763523d6d33e
+EBUILD libzip-1.5.2-r1.ebuild 2287 BLAKE2B cd489ff9474e34b75a1df7ec33757bdaa4d7fb9af8fcf05478457cae249c7a50488274b88504145548d78dcbba787f49b1dd399be85a29bf6d6fbd6df1eea8fd SHA512 7e5b7aea06ecd54984bf54f79ebefc5e03d210580395f1acad093c87fcfc859a746a4757e1f21b2553902cf1945498b60d6cadbc549f48faba796a79ab14ffb2
 MISC metadata.xml 440 BLAKE2B a69b3d641d9262e897f015c91fc0a4aa7a7cecc73889d24b479101674f2de16825844c9ad6c10e42968a22279bdfef71b839f50289aab5457efb0164ae5fd1c3 SHA512 737e1fb7de749b2e38f5642dff624daf6521183fa974f9cc2831580aaa1b8532fdf8725ca3166bde8ef8faa492b8a2298f542fb8bd15d89b1ab983885756282d
diff --git a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch
new file mode 100644
index 000000000000..564cc9b79f1d
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch
@@ -0,0 +1,23 @@
+From e34b2ed6116ba5e6d3c25cd504d91bb680db92e8 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Tue, 2 Apr 2019 15:26:06 +0200
+Subject: [PATCH] mbedtls: link against the correct library
+
+Inspired by https://github.com/nih-at/libzip/pull/88
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3f252b3f7..f8eb16eeb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,7 +42,7 @@ ELSE()
+ ENDIF()
+ IF(ENABLE_MBEDTLS)
+   FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h)
+-  FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedtls)
++  FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto)
+ ELSE()
+   SET(MBEDTLS_LIBRARIES FALSE)
+ ENDIF()
diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild
index e4441526a7e9..68002b6f0c2d 100644
--- a/dev-libs/libzip/libzip-1.5.1.ebuild
+++ b/dev-libs/libzip/libzip-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 doc gnutls libressl ssl static-libs test"
 
 DEPEND="
diff --git a/dev-libs/libzip/libzip-1.5.2.ebuild b/dev-libs/libzip/libzip-1.5.2-r1.ebuild
index d34cd65a8358..814a668c4300 100644
--- a/dev-libs/libzip/libzip-1.5.2.ebuild
+++ b/dev-libs/libzip/libzip-1.5.2-r1.ebuild
@@ -18,7 +18,7 @@ DEPEND="
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
 	ssl? (
-		gnutls? ( net-libs/gnutls:= )
+		gnutls? ( >=net-libs/gnutls-3.6.5:= )
 		!gnutls? (
 			mbedtls? ( net-libs/mbedtls:= )
 			!mbedtls? (
@@ -30,6 +30,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820
+
 pkg_setup() {
 	# Upstream doesn't support building dynamic & static
 	# simultaneously: https://github.com/nih-at/libzip/issues/76
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 706c7de58256..98ca437a9303 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,5 +1,5 @@
 DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
 DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
-EBUILD nettle-3.4.1.ebuild 1733 BLAKE2B 28564bdcaa9f8b379c5acc98050ff3a019ff12b85a05956acc575be4e5e094b8cae87a86b06bedc5d6561975890a2df0b6c0873839f5ae33130987f0ebc025bb SHA512 c636e48bf6a8a44d3eba3ebbb8c3811cedeab36264c7532f5454a2955b081c41b0fd9f5c17412d55045200e533198febacb859cca392883d388bd42afcd6d441
+EBUILD nettle-3.4.1.ebuild 1724 BLAKE2B 12696133164dded38062000b046515123be47630bb736226aa6fc62036eb6ca1d5794e85247a57d7276fcbb043124b4b17565919466d35568722220d1e65ea2c SHA512 f1bbb3f52729bf6793c9cdd7d2dd19d145ed1f5410bf395d3c9d487b694d9c0aba8d9e6df79d67ff4d84971e1730325df1a177f91f770a76813bc446c4583e33
 EBUILD nettle-3.4.ebuild 1725 BLAKE2B 71eb0b92783f817ab7eeb4c0a29445e65a56b9cb6cc07a7269c3401c34f605bb49589aa999c4e2a35330b4b4dc4a324cd2c860bfcf0164a79118330b40a1160b SHA512 dcfd2513e10dc106274500d3531b1b629ded8ac9c85d37ee5c150a32f2507fc1045d269b394d91b508a991525f271637048937a4ddf9a58613b35dbbfddb32f4
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild
index bcd2711cdabb..a039517fcb34 100644
--- a/dev-libs/nettle/nettle-3.4.1.ebuild
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
 DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index b324c3614655..e54f932e2cb3 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,4 +1,5 @@
 AUX nspr-4.10.6-solaris.patch 973 BLAKE2B 8370bedb05c718d7b73d57b5ac5c720ca62499d6d7b7a039da608a9c514996c2d987ba0135b7dcac509d1b9363908f0c0cff6fe47e1f7ca94b7efbd8c19aeeca SHA512 d4e4c44d02be7aafe09e633f2ee747c323036f7438cb87864d91bcd9bb8ac072065353aa4e8a785e38724d33bfdc8adb0e460dbf44ff7fbd8c8dd32b569074f1
+AUX nspr-4.21-ipv6-musl-support.patch 1645 BLAKE2B 0b383804d5e66037041b91dcb7ddd52dd4533384ca5671ed1d36a71740b130863dd2b531867edab804fbb8cfab112282e17d607d7e298eb249ead620f99a55be SHA512 f241e607491d1192272221023d5f3e84b3e88957e7b66ce4d9ba1bcf2ab6639facc08eeb838a0e6753456f41dde4ced4fe99f923e0889030d844c23c62fad4e2
 AUX nspr-4.7.0-prtime.patch 859 BLAKE2B d7869ee8e46f34e53546c28e7f9032497744d31b82d0fb47edb8c2ff5787392423698353e1374ebb5f9ed11470dff5ca62995e8f44f310756799bc9eae55ada5 SHA512 d8421bc11de5ec5e116c7eba3f31fcdde27796a64948d16aa1fb1822a29a92d8810056719ca60bcb96b1734b0e84c95250075c18acbcb631786249af7d679492
 AUX nspr-4.7.1-solaris.patch 411 BLAKE2B 0c1f0e621aec9e150bd8c279f46c18256c451b2555b9f264f0da7432fb0e7d5d69e1bbbb7adc9a448d88ca269be41943f2ee60e1cc8e115542e300c1d7c61185 SHA512 11bd4ab3f98cbad2586f999370291d387fe7a817bab9feda9f5493f284410a73318e90072c0052a8216d9ae1cdc5b2a862a99315e09b72560d9bad6ebc16eb79
 AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98c61cdd4245da21a51d5f9b10149e12f5326992d587f0fe04bab79c26acee4aa2e4dded5ddf8c697b5cd4f2e34ea730c6ca7fe0 SHA512 dd00bc2108d6c7a64945afeaf97f31189250c90c3d63c86fa2b2b091ef812cc7c5f8c0f17211a02b497f50efc1c3668c840e21a45f514ff1103e22c659e820f2
@@ -7,5 +8,5 @@ AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc
 DIST nspr-4.20.tar.gz 1140892 BLAKE2B 2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49 SHA512 22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949
 DIST nspr-4.21.tar.gz 1140741 BLAKE2B 9d6d079ac50c97ed7fff957e23506a24ab0d723cadc2ddb0c4283a2abdf387f0d55116ff82bf748500026b5d493909aa5495bd220f3b6e83ad4990f29eb446a0 SHA512 4f152c6ca32d9dd4cf3d92b4b54f249ac1fa39047811f7c0c7a67bdc73173cf7de0dce36dc278ad781189ea2fdc71fa70e044597676a8b1f5e6d664907e5ab7c
 EBUILD nspr-4.20.ebuild 3792 BLAKE2B 2f6c9e7d9cbe04da44e9e34e45c416d77d610d045fe3cce5e2c60c7655be78853bba9428a91a0dad388f6fc1e26876b26e0bab2d6495616c4941b8585aacba38 SHA512 5f2f0b397fb9dfd274b73e9026c4e5d6ccdae99f32c98a9fbb4497f87609d7e9afaaaf08cd0dd9dc8b21f8b63f91043988f7e2171cf26703447467314b4d6c4f
-EBUILD nspr-4.21.ebuild 3803 BLAKE2B f68259cf24bba4a60b921f9339960c8a0bd81c78a03d374e0e30f14091526b62bc09d4b7ea7694d5d03bd502279226cbc01447ad092313d907f1de479bb9ade3 SHA512 c2daaa7c884bb202f10e64643b64e466dc18459316bb16376c3dfd77296803df4731d05ec01922d1f3cdeea88ab5a93c656878639a2dfe85b062b3ee1323710a
+EBUILD nspr-4.21.ebuild 3890 BLAKE2B 4f15642216d57f646fa65f690dd3213f8158458b6c9dc68a76f3b2a0a1f0c76d95146d3246d65724bae08fbf65d67a57ad8f62ab5939eaa6eaf3951b5035c51a SHA512 aa0deedd867dadde431b3fc6028c3316b02931c9952e6702262cb57c5dea245ab6aed2eb5b17983876872928490f40fc35c427ce9a001a381da319cb1d4b5b9e
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch b/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch
new file mode 100644
index 000000000000..2c8ebd4ccbb2
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch
@@ -0,0 +1,53 @@
+From 8c57451f44d7ceb37bfb4ae6e457fc70b1f58d0a Mon Sep 17 00:00:00 2001
+From: Moritz Kick <gentoo@blackphoenix.de>
+Date: Wed, 20 Mar 2019 13:36:06 -0500
+Subject: [PATCH] Added IPv6 compatibility for musl libc
+
+Signed-off-by: Moritz Kick <gentoo@blackphoenix.de>
+Signed-off-by: Jory Pratt <anarchy@gentoo.org>
+---
+ pr/include/md/_linux.h | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
+index 2370ab8..612184c 100644
+--- a/pr/include/md/_linux.h
++++ b/pr/include/md/_linux.h
+@@ -289,33 +289,22 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, PRInt32 nv)
+ #endif /* __arm__ */
+ 
+ #define USE_SETJMP
+-#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID)
+ #define _PR_POLL_AVAILABLE
+-#endif
+ #undef _PR_USE_POLL
+ #define _PR_STAT_HAS_ONLY_ST_ATIME
+ #if defined(__alpha) || defined(__ia64__)
+ #define _PR_HAVE_LARGE_OFF_T
+-#elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \
+-    || defined(ANDROID)
+-#define _PR_HAVE_OFF64_T
+ #else
+-#define _PR_NO_LARGE_FILES
++#define _PR_HAVE_OFF64_T
+ #endif
+-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \
+-    || defined(ANDROID)
+ #define _PR_INET6
+ #define _PR_HAVE_INET_NTOP
+ #define _PR_HAVE_GETHOSTBYNAME2
+ #define _PR_HAVE_GETADDRINFO
+ #define _PR_INET6_PROBE
+-#endif
+ #ifndef ANDROID
+ #define _PR_HAVE_SYSV_SEMAPHORES
+ #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
+-#endif
+-/* Android has gethostbyname_r but not gethostbyaddr_r or gethostbyname2_r. */
+-#if (__GLIBC__ >= 2) && defined(_PR_PTHREADS)
+ #define _PR_HAVE_GETHOST_R
+ #define _PR_HAVE_GETHOST_R_INT
+ #endif
+-- 
+2.21.0
+
diff --git a/dev-libs/nspr/nspr-4.21.ebuild b/dev-libs/nspr/nspr-4.21.ebuild
index 809295b31a11..dd4c8f167bb7 100644
--- a/dev-libs/nspr/nspr-4.21.ebuild
+++ b/dev-libs/nspr/nspr-4.21.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
+IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/nspr-config
@@ -35,6 +35,8 @@ src_prepare() {
 
 	default
 
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
+
 	# rename configure.in to configure.ac for new autotools compatibility
 	if [[ -e "${S}"/nspr/configure.in ]] ; then
 		einfo "Renaming configure.in to configure.ac"
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index 91f5806721f8..f376ad63bdd7 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,4 +1,5 @@
 AUX openobex-1.7.2-version.h.patch 621 BLAKE2B 90ef501688d2313b70d755a5d6233c027eade70870bb135c018eea180993d5138fdaf614fd1cc396a1521a2d522f8d03c132dc3d3c14839664c7021fc2e657b4 SHA512 9c060d3f4af4ca78ccbc931df26311d1e37c1a86279a56358eb468162746ef3e3d6324fd419f9b38c072ae4c1bb0e9df64643b5de0cdb876aff54530daa83262
 DIST openobex-1.7.2-Source.tar.gz 127248 BLAKE2B c0405aef2f15f16e31641f4a60ac01da26c2a61a5114b8f3990f0fcf64bd55c730ff7aa5f524b450c1e6b5653b9616c0861686102594818ba3bdf2314a3c51ff SHA512 22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d
 EBUILD openobex-1.7.2-r1.ebuild 1055 BLAKE2B bf58d40d55db3a9d51a0b032f3342b0ab1c7f6428db4de40aadb242a49f8bac3c5935c2e12a4d1450bbb9531311f4d6a1e138cffca2d71a720061ce62a4d44ce SHA512 1ad98eddb4b2ea6561add36053f42b7713747c96834c0111a68906ccf316ca74931b93f1e724ba1f4dd256c549e75a26e9f9c99d7ecea2ff0062367239369b45
+EBUILD openobex-1.7.2-r2.ebuild 1098 BLAKE2B 04a5e11beadd1011f7046371ae13808387340def5f4e1ad555ea44854a96df1ac3fccc6dc4ec6e1102237aee6f9f87ab7682c296f968ee53c4b7d583424a791b SHA512 d957daf6c40d340c88fb2cdb79cfd5a6b6c3387db2d89f1b19c1b6b4a0cf0f2ab855011c52b3f8f0714c0e0358a9d1e5cfcedb46d0909dc6df504d21ef80e6a3
 MISC metadata.xml 550 BLAKE2B 4505f0b70a901fbbf3cebe1a066d4c9275853a7667abf221ff439cb6783f485c5d43a24c8abf05df5757a8578712fffbc8a1ff43e0f16f8f8507417e32654ef2 SHA512 19bbed2e27c2fd9ebf00552d3443d09bb295f81c7637d2d09850d5bfc6128f6f3a7642ae55760c36308f7fe333319d6d8324cde0fc75781d32a486abb32be4fe
diff --git a/dev-libs/openobex/openobex-1.7.2-r2.ebuild b/dev-libs/openobex/openobex-1.7.2-r2.ebuild
new file mode 100644
index 000000000000..ab1632e42d34
--- /dev/null
+++ b/dev-libs/openobex/openobex-1.7.2-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils udev
+
+DESCRIPTION="Implementation of the OBEX protocol used for transferring data to mobile devices"
+HOMEPAGE="https://sourceforge.net/projects/openobex/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bluetooth doc irda usb"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+DEPEND="
+	bluetooth? ( net-wireless/bluez:= )
+	usb? ( virtual/libusb:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-Source"
+
+PATCHES=( "${FILESDIR}/${P}-version.h.patch" )
+DOCS=( AUTHORS ChangeLog README UPGRADING.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DOPENOBEX_BLUETOOTH=$(usex bluetooth)
+		-DOPENOBEX_IRDA=$(usex irda)
+		-DOPENOBEX_USB=$(usex usb)
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use usb && mycmakeargs+=( -DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)/rules.d" )
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index abca036f37b1..0b37498bbc11 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,13 +1,8 @@
-AUX opensc-0.17.0-build.patch 3577 BLAKE2B 0ad69e4305a21d613f93e76818d442983b1b1b642ba8e5c7030e44c96d4e86ed03f72c7623ba6b08ef9b620f6a5c5f43ea00a670880f070c165cb1f60235c529 SHA512 0412a0d0ee3caca534098357e7778f2aa6800ef6d8d559614cd892de13c6dd05d3a6f78dc12cdf834ab6a4c0160234342b46efda0ac844e2411f54aa08a94016
 AUX opensc-0.18.0-build.patch 3060 BLAKE2B 4716e3cef86eca1da01f479909f21e23b362870eca9a9f44d391e5b0ea0b1fd5d04cc4cac2f681e3ea5325c366a154b919a34f827d6b85d92cc462f9b3832116 SHA512 3d70a8483b96a2ab0cee7c4eb9c71ce1429ef6bf5dbee65f685ec8f21b4c3f7b822e2b7011f420beca957f2ffbdb5726ec52350e2ae92c26c718fc0c421d953e
 AUX opensc-0.18.0-libressl.patch 3145 BLAKE2B 2e1c0c789adf7c21db1cfd4ab2bf0ba077a463f74ee5bc3293278260b5531cfb231f70d594c491fdaaad0d09f4e7107804f3937d316816ea62eb0e6956ac1c6e SHA512 fedb3906104c02d08d5c44a0da49764556e19653a9d52a3e1ddc5254a2f13abee92b23fc3101779bdc6b9c623388ec9242f198402c022505dffc7e932d1b0dfe
 AUX opensc-0.19.0-p11test_common.h.patch 2969 BLAKE2B dd5e309fdaa847da43fa811f3cb8219930b0314aceb52a2e317984172fa432ba2032f8ef2c2c71780a2c3d442a353163987f81f743c43f45603040f446e998d8 SHA512 d1959887631ddc60e7df445d12641d366749cb09002c1d3e37dbcb606c61bbdb0fb335b8d4b433110bd8e37f8116cb7a6a87226c6504a9e0f735be67775352b0
-DIST opensc-0.16.0.tar.gz 1760418 BLAKE2B 7f5799445e285010392f315fa57919c7f0b038170a19e83dbda664d5d73898f075cccad4304275402c900b9fc50564ed5515a10d31156a6c76a68f170ca3e439 SHA512 15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139
-DIST opensc-0.17.0.tar.gz 1950547 BLAKE2B 861dbb60e211d503332228c9d75d667f70cb9e15883c571821bb2f7703ca62dd4ce56c5ea7965e2d5e8c6a81b5063fc689013670294426baf1bfaec88282e20e SHA512 8991c1724d187d3c34a2ed591b21f0085f767c0d866edc2decfda85a2b3dedf717838f4937d1dda3e1bbc17f02e6eca6740299660128bc448a29e8bfc2962922
 DIST opensc-0.18.0.tar.gz 2037073 BLAKE2B f2b339d1f9c616f6f706acb3c55289deb5b1749a8b5561142c69db4ed1c7dee554ce1f8d820e6e69bb9e462ca460379badf3017ed35fa6cd395702c995326c3e SHA512 dc90cff3e0e639c14bfb11d1d0455964d24d08aa27728592ab0d8b487a1ffee1ca71cb9bbf5d0f101b2ebd85cf9478988f686d45effa72315e6ffc843d398768
 DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e
-EBUILD opensc-0.16.0.ebuild 1390 BLAKE2B 14cd6dacb0ebc6d688ac0c0c6628cf11cb10337e13cf390a72d83bd755a589f8b8a61e4961a66b4de0b479e39f43ae30725dddd91aea27e33242cab1955de7ca SHA512 ab05e282f226d4c194b292330cdd132c23e92abff34aa8acdb75b3e2e97d5c1dad29089fe79f8e48d0ba93ed4150c7a287a497da20322ec9f44e8c6850230b4e
-EBUILD opensc-0.17.0.ebuild 1467 BLAKE2B 87f9b57bfeedd29319951e7e88e96f67dbdb6517ecef4a185f6f61c396a1943b7967b2e6ac9080dfc4f54b6bcf017c81169702a0e6b035eec6f4bd40a3f34f42 SHA512 50b49c15558621c22addc53dd2ed3b5379e1c185b098c1b4caee9a3af8557f87dc1de3c0d4f6d8c6ae8c73399caf7780aa2a984ff1f64d30814eb2082c8792d4
-EBUILD opensc-0.18.0.ebuild 1503 BLAKE2B cae3cd5dafd6c2c87785ef9518cc5b7e3564feec31ef29da8bd35a0180eae13291d18484921a8f4e060e3495ca4ccbe5a63ae02b711bb059b1eb5541ad9789b7 SHA512 1975af57c5c3e11fe90832b2518fbe72e782bb58260f9f87c7aa64d5c5f53180f07c5e95a9ed10daa8ad41501a342ab4af23c5140ef2750db12cb4febcbf3a27
-EBUILD opensc-0.19.0-r2.ebuild 1640 BLAKE2B 0f460a63abe2d9a86e0a8e19983e66c3dd2981d656621df3729ee1b15ba05e35442aef931b2c1e65f1d9b53b5f914c0a930efdbe8fa6865ebe574f7a34ac6b5e SHA512 b4b85ad084c39a571413d7d218d09b7992b5bb99890d29d0b813e0e261e5e945b4e56adb99f234ee1ea6aafdec9a17bb3a4e03fb599856670f34b9f19debf2d9
+EBUILD opensc-0.18.0.ebuild 1499 BLAKE2B 6908def240f76d09456dc5b3e937d660fc566284a1477973a5ce474833f9e3dc4c851fbf53ebf6b58f608681b93d37e7cb083ff476bbd04eab4445d5771169a1 SHA512 7f4797929355f08bb430b28f6e1cbda6be61d4ca3ba2af0003be67b18809c01d995133868632650debde80541c7f76e06e1f7e514c22fe7a059f3f2d134efa5b
+EBUILD opensc-0.19.0-r2.ebuild 1657 BLAKE2B bb055802875c7edd591530865c7c4ae758e4dfa821f2247005f06cbe4fb8dda4fa2ad570852190b51a8a1bf2fed3651486aa1a7dd5ce1719c946d9b1413ea3ff SHA512 f87536806841cc5e9a261fed82a837ad986642b3e8a30c32ce8a592fcc4b80c1d5e03748aa0e777fbc3e3ebde1569cabfc03772e836f4c88c97a636c4648385a
 MISC metadata.xml 1214 BLAKE2B 5d2a0bb352a11969d1f959c4d19171f3f274461f4dedc2558bb89d8ad114dc3796a49e04a35773340de2b321f4be86ea389f1b9733126785d0991771b254a891 SHA512 f37c2a234cfaa304bb41e17147e6970960fd909da2ab2bd924b61be20175d0b6351be98551451c95dcf8e5a77edd4c8c546d93b2bd04012ae667fbddb372e33e
diff --git a/dev-libs/opensc/files/opensc-0.17.0-build.patch b/dev-libs/opensc/files/opensc-0.17.0-build.patch
deleted file mode 100644
index 8a51d7ac4450..000000000000
--- a/dev-libs/opensc/files/opensc-0.17.0-build.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 65b302e33b710833d4d14bf8eaf00acdaa436c39 Mon Sep 17 00:00:00 2001
-From: Frank Morgner <frankmorgner@gmail.com>
-Date: Wed, 19 Jul 2017 00:09:36 +0200
-Subject: [PATCH] sc-hsm: fixed building with --disable-sm
-
-Closes https://github.com/OpenSC/OpenSC/pull/1103
----
- src/libopensc/card-sc-hsm.c | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/src/libopensc/card-sc-hsm.c b/src/libopensc/card-sc-hsm.c
-index cfa084a06..1f61e0138 100644
---- a/src/libopensc/card-sc-hsm.c
-+++ b/src/libopensc/card-sc-hsm.c
-@@ -284,7 +284,9 @@ static int sc_hsm_soc_select_minbioclient(sc_card_t *card)
- 	};
- 
- 	/* Select MinBioClient */
-+#ifdef ENABLE_SM
- 	sc_sm_stop(card);
-+#endif
- 	sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT, 0xA4, 0x04, 0x0C);
- 	apdu.data = minBioClient_aid.value;
- 	apdu.datalen = minBioClient_aid.len;
-@@ -533,7 +535,9 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
- 	sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data;
- 	sc_apdu_t apdu;
- 	u8 cmdbuff[16];
-+#ifdef ENABLE_SM
- 	u8 rbuf[SC_MAX_APDU_BUFFER_SIZE];
-+#endif
- 	int r;
- 	int cmd = data->cmd;
- 	size_t pin2_len = data->pin2.len;
-@@ -563,7 +567,10 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
- 	if ((card->type == SC_CARD_TYPE_SC_HSM_SOC || card->reader->uid.len
- 				|| cmd == SC_PIN_CMD_GET_SESSION_PIN)
- 			&& (data->cmd != SC_PIN_CMD_GET_INFO)
--			&& card->sm_ctx.sm_mode != SM_MODE_TRANSMIT) {
-+#ifdef ENABLE_SM
-+			&& card->sm_ctx.sm_mode != SM_MODE_TRANSMIT
-+#endif
-+			) {
- 		LOG_TEST_RET(card->ctx,
- 				sc_hsm_perform_chip_authentication(card),
- 				"Could not perform chip authentication");
-@@ -604,6 +611,7 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
- 			data->apdu = &apdu;
- 		}
- 
-+#ifdef ENABLE_SM
- 		if ((data->cmd == SC_PIN_CMD_GET_INFO)
- 				&& (card->sm_ctx.sm_mode == SM_MODE_TRANSMIT)) {
- 			/* JCOP's SM accelerator is incapable of using case 1 APDU in SM */
-@@ -612,6 +620,7 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
- 			apdu.resplen = sizeof rbuf;
- 			data->apdu = &apdu;
- 		}
-+#endif
- 
- 		data->pin1.offset = 5;
- 		data->pin1.length_offset = 4;
-@@ -627,11 +636,17 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data,
- 		data->cmd = SC_PIN_CMD_GET_SESSION_PIN;
- 		if (data->pin_reference == 0x81) {
- 			u8 recvbuf[SC_MAX_APDU_BUFFER_SIZE];
-+#ifdef ENABLE_SM
- 			if (card->sm_ctx.sm_mode != SM_MODE_TRANSMIT) {
- 				sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL,
- 						"Session PIN generation only supported in SM");
- 				LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
- 			}
-+#else
-+			sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL,
-+					"Session PIN generation only supported in SM");
-+			LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
-+#endif
- 			sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0x5A, 0x01, data->pin_reference);
- 			apdu.cla = 0x80;
- 			apdu.resp = recvbuf;
-@@ -669,7 +684,9 @@ static int sc_hsm_logout(sc_card_t * card)
- 	sc_path_t path;
- 	sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data;
- 	memset(priv->sopin, 0, sizeof(priv->sopin));
-+#ifdef ENABLE_SM
- 	sc_sm_stop(card);
-+#endif
- 
- 	sc_path_set(&path, SC_PATH_TYPE_DF_NAME, sc_hsm_aid.value, sc_hsm_aid.len, 0, 0);
- 
-@@ -1586,7 +1603,9 @@ static int sc_hsm_init(struct sc_card *card)
- static int sc_hsm_finish(sc_card_t * card)
- {
- 	sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data;
-+#ifdef ENABLE_SM
- 	sc_sm_stop(card);
-+#endif
- 	if (priv->serialno) {
- 		free(priv->serialno);
- 	}
diff --git a/dev-libs/opensc/opensc-0.16.0.ebuild b/dev-libs/opensc/opensc-0.16.0.ebuild
deleted file mode 100644
index df55b1ce24bc..000000000000
--- a/dev-libs/opensc/opensc-0.16.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-DESCRIPTION="Libraries and applications to access smartcards"
-HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
-SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc +pcsc-lite secure-messaging openct ctapi readline libressl ssl zlib"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	readline? ( sys-libs/readline:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	openct? ( >=dev-libs/openct-0.5.0 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
-
-REQUIRED_USE="
-	pcsc-lite? ( !openct !ctapi )
-	openct? ( !pcsc-lite !ctapi )
-	ctapi? ( !pcsc-lite !openct )
-	|| ( pcsc-lite openct ctapi )"
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir='$(docdir)/html' \
-		--disable-static \
-		$(use_enable doc) \
-		$(use_enable openct) \
-		$(use_enable readline) \
-		$(use_enable zlib) \
-		$(use_enable secure-messaging sm) \
-		$(use_enable ssl openssl) \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_enable openct) \
-		$(use_enable ctapi)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-libs/opensc/opensc-0.17.0.ebuild b/dev-libs/opensc/opensc-0.17.0.ebuild
deleted file mode 100644
index 0612c40f2bb0..000000000000
--- a/dev-libs/opensc/opensc-0.17.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-DESCRIPTION="Libraries and applications to access smartcards"
-HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
-SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc +pcsc-lite secure-messaging openct ctapi readline libressl ssl zlib"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	readline? ( sys-libs/readline:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	openct? ( >=dev-libs/openct-0.5.0 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
-
-REQUIRED_USE="
-	pcsc-lite? ( !openct !ctapi )
-	openct? ( !pcsc-lite !ctapi )
-	ctapi? ( !pcsc-lite !openct )
-	|| ( pcsc-lite openct ctapi )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir='$(docdir)/html' \
-		--disable-static \
-		--disable-openpace \
-		$(use_enable doc) \
-		$(use_enable openct) \
-		$(use_enable readline) \
-		$(use_enable zlib) \
-		$(use_enable secure-messaging sm) \
-		$(use_enable ssl openssl) \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_enable openct) \
-		$(use_enable ctapi)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-libs/opensc/opensc-0.18.0.ebuild b/dev-libs/opensc/opensc-0.18.0.ebuild
index a6b6123d08f3..5ecdcca6ed00 100644
--- a/dev-libs/opensc/opensc-0.18.0.ebuild
+++ b/dev-libs/opensc/opensc-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc +pcsc-lite secure-messaging openct ctapi readline libressl ssl zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )
diff --git a/dev-libs/opensc/opensc-0.19.0-r2.ebuild b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
index 8e68f0328789..70d56a99baa9 100644
--- a/dev-libs/opensc/opensc-0.19.0-r2.ebuild
+++ b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )
@@ -44,6 +44,7 @@ src_configure() {
 		--with-completiondir="$(get_bashcompdir)" \
 		--disable-openpace \
 		--disable-static \
+		--disable-strict \
 		--enable-man \
 		$(use_enable ctapi) \
 		$(use_enable doc) \
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index b26475883e09..cd052bc7aebd 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -3,12 +3,9 @@ AUX poco-1.4.4-patch-for-libpcre-8.32.patch 1970 BLAKE2B 0a07795b410bcff83a89c4d
 AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a02662ad1d8d447bb8c7ca23234ca1859c4aa9497d5703ef5f675d9096606254a9142770c6fffa4334cf71b1ca6953f SHA512 f3a0b4032fd4f71f0281d58c00241b1cd2f92da1a23a8501c420949621167d1fc7e2a2ed3ec48b6f75d35569f6443e3391eaf19a8c8fbd17e24d1cbd9ffd892d
 DIST poco-1.4.6-all-doc.zip 2072762 BLAKE2B 51b8426d050e7ae373fbb0f3959657e37f1c3aeda75f5bf5cd3dc99e08414a9e65f61ea71dee6d8c40148f41157e2eac0888e64c5020707352c74b262ffae741 SHA512 458e1a3c6a6017b5ae5efcbd0d7b2bbf50aedd6ddc7ae7befddac07ed133b7243208aadd6ecdb17b3fa273e04eb0da4d73b1d3e5591aee98b754e430b2248e52
 DIST poco-1.4.6p4-all.tar.bz2 3158594 BLAKE2B 76accf617ddd087131a5960c131680451959704fee4b17b65bf85367a172d2fe023c9c7efde59fe5bd4142c7ca153734fb4ccbbf06bd5d0365a59d6e75a328a5 SHA512 ae4e1190a0ba719f807d0abaf1c47ff445a8f5867157f209260672546f3755ff021c7073bc8d5e656be383d5667dc15ad7eae8208728053fb61439c4c80a7fca
-DIST poco-1.7.6.tar.gz 8044937 BLAKE2B ad9bf61eb00ce4e1ef5079e07be04ceff79bf823cba49ffb0e144a1e579d9de4f6f8d3df6b629c522de5c2b7b4c7df0933777686b72190d717e407bc28ae2a49 SHA512 a02b7ff66acf080942517b3b8644d6e5c7136c5edc6e58fd13083a74b97b5619253fc9db7863284a565226f95410ad4da1fa9738d14885f560aeb03c1f7c18aa
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
 EBUILD poco-1.4.6_p4-r1.ebuild 3448 BLAKE2B 8f15cfcb7f3ab49d75bf3dab8990dd48766391f0c20819efed6ec965b463a594ca0b2ec60030d224436deb9b1a1cb03298ad33c72f6e8b94fed28321a634140a SHA512 b3ef11fedf1a849d83f87b90fcf3be6d9a5d85b2981ceedda5eb699657bdaf150bc45e1451563e76f26f2b7a3e7fe82d9fe5d8790607fa9ef38dc70ce78e0815
 EBUILD poco-1.4.6_p4.ebuild 3384 BLAKE2B 82795ed8256b63859142d760d1c4999ab504be036d00bd2338058318bb7e864372c333822c3b3ede153aa4f4608a22e62d2c797269a10846ee120304fba1a9a2 SHA512 9365431a50298aadfa1d91d3d859dbddd8b3a028aacb4eeb4d01564d063a91d198da08bdb6e8f886b7dbe1ab4f9285fe5e5a334a471bb136b908cf89c4e3bc64
-EBUILD poco-1.7.6-r1.ebuild 3459 BLAKE2B fe1c70a9ce4c586d12de415839d7e4a5aa5697f03a454a9fa5f63a11b50f468201d73f4c35015a5647ac3461cd7cc76e53e2cc5395d1f0f17f12d0de4f498cd5 SHA512 0183d4d71578e8388e5502875bb6a42baec9519e2b1da7a560cc26cb3415aacd40ec30a337db3d02ea60d0e048ec51c2f931fcbf587f115f4337b9e5aa7e1af5
-EBUILD poco-1.7.6.ebuild 3300 BLAKE2B 33dc2684437edacfe8a5d10a896a1ee7d6a61884227f0b219f685a833bf858b6780364c3d2a4bb5df20378bb5505b2581486f10338011c18a40d40be1d6c9e2d SHA512 ee364da0aba59006680a7b399180384ded5072b65daea64e42b97ae207644f2137d45e4095bb3cde105eb8ed21f60e8513de7eb0f4acce6e69e6b281c9a0f257
 EBUILD poco-1.9.0-r1.ebuild 3722 BLAKE2B 723574fb374480e40b3edde419aa2a0da210505b5b005606da5305792e258db125c635ddc4761654824327b28f6f45dec0187eb3405541f38d5906ca7a4eb66c SHA512 64778f824f6d6410f01fc644d1129f3bf551bf74dc4d7fe1ecde0eadf88a8877e0bff0432113c37163659358bebcd8e811b6e273a6c0b7e15031af08791a17bc
-EBUILD poco-1.9.0.ebuild 3300 BLAKE2B 33dc2684437edacfe8a5d10a896a1ee7d6a61884227f0b219f685a833bf858b6780364c3d2a4bb5df20378bb5505b2581486f10338011c18a40d40be1d6c9e2d SHA512 ee364da0aba59006680a7b399180384ded5072b65daea64e42b97ae207644f2137d45e4095bb3cde105eb8ed21f60e8513de7eb0f4acce6e69e6b281c9a0f257
+EBUILD poco-1.9.0-r2.ebuild 3715 BLAKE2B 634523173c8bf922a3dc48a9de972b0af949d044c923e4eaa2675274546f70e2080323264579f63d4ca57c437e820443f3e3d9d07df6ed5045acd2b21cbcda03 SHA512 7d2373e8c179e079bea3f194ca7f7e74bafa31dba4e4c960c7fb0720a754ebd05accc2cba0b7bb9f72653ce1d556ee1ef3f02021d4a303fd6c8859f0c2666a89
 MISC metadata.xml 2515 BLAKE2B e85987607f2d7d0fc4f957b797a9bd7406dd6224a4fa73bd054c31206e4ef1cdbe8b300d00efb4249ed0b21bb1c991340b746a3db3deea0c79c07dc7aae34458 SHA512 3f4ec81bc65b14a82b599d47ae2a2b80f58f35bf1138b469f2341e2262f9ed13c2ef286f0b5f4354d14a58fd50676a77f373adad86e056c45a427d8b784bd592
diff --git a/dev-libs/poco/poco-1.7.6.ebuild b/dev-libs/poco/poco-1.7.6.ebuild
deleted file mode 100644
index e4cc18980d1b..000000000000
--- a/dev-libs/poco/poco-1.7.6.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="C++ libraries for building network-based applications"
-HOMEPAGE="https://pocoproject.org/"
-SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
-REQUIRED_USE="7z? ( xml )
-	apache? ( net util )
-	file2pagecompiler? ( pagecompiler )
-	iodbc? ( odbc )
-	mongodb? ( data )
-	mysql? ( data )
-	odbc? ( data )
-	pagecompiler? ( json net util xml )
-	pocodoc? ( cppparser util xml )
-	sqlite? ( data )
-	test? ( data? ( sqlite ) json util xml )"
-
-RDEPEND=">=dev-libs/libpcre-8.13
-	xml? ( dev-libs/expat )
-	apache? ( dev-libs/apr
-		dev-libs/apr-util
-		www-servers/apache )
-	mysql? ( virtual/mysql )
-	odbc? ( iodbc? ( dev-db/libiodbc )
-		!iodbc? ( dev-db/unixODBC ) )
-	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	zip? ( sys-libs/zlib )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}-release"
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" )
-
-src_prepare() {
-	if use test ; then
-		# ignore missing tests on experimental library
-		# and tests requiring running DB-servers, internet connections, etc.
-		sed -i \
-			-e '/testsuite/d' \
-			{Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF}/CMakeLists.txt || die
-		# Poco expands ~ using passwd, which does not match $HOME in the build environment
-		sed -i \
-			-e '/CppUnit_addTest.*testExpand/d' \
-			Foundation/testsuite/src/PathTest.cpp || die
-		# ignore failing Crypto test since upstream does not seem to care,
-		# see https://github.com/pocoproject/poco/issues/1209
-		sed -i \
-			-e '/RSATest, testRSACipherLarge/d' \
-			Crypto/testsuite/src/RSATest.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPOCO_UNBUNDLED=ON
-		-DENABLE_APACHECONNECTOR="$(usex apache)"
-		-DENABLE_CPPPARSER="$(usex cppparser)"
-		-DENABLE_CRYPTO="$(usex ssl)"
-		-DENABLE_DATA="$(usex data)"
-		-DENABLE_DATA_MYSQL="$(usex mysql)"
-		-DENABLE_DATA_ODBC="$(usex odbc)"
-		-DENABLE_DATA_SQLITE="$(usex sqlite)"
-		-DENABLE_JSON="$(usex util)"
-		-DENABLE_MONGODB="$(usex mongodb)"
-		-DENABLE_NET="$(usex net)"
-		-DENABLE_NETSSL="$(usex ssl)"
-		-DENABLE_NETSSL_WIN=OFF
-		-DENABLE_PAGECOMPILER="$(usex pagecompiler)"
-		-DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
-		-DENABLE_PDF="$(usex pdf)"
-		-DENABLE_POCODOC="$(usex pocodoc)"
-		-DENABLE_SEVENZIP="$(usex 7z)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_UTIL="$(usex util)"
-		-DENABLE_XML="$(usex xml)"
-		-DENABLE_ZIP="$(usex zip)"
-	)
-
-	if ! use iodbc ; then
-		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		for sd in */samples ; do
-			insinto /usr/share/doc/${PF}/examples/${sd%/samples}
-			doins -r ${sd}
-		done
-		find "${D}/usr/share/doc/${PF}/examples" \
-			-iname "*.sln" -or -iname "*.vcproj" -or \
-			-iname "*.vmsbuild" -or -iname "*.properties" \
-			| xargs rm
-	fi
-}
diff --git a/dev-libs/poco/poco-1.7.6-r1.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild
index 0f6dc7386860..e2ade79bc880 100644
--- a/dev-libs/poco/poco-1.7.6-r1.ebuild
+++ b/dev-libs/poco/poco-1.9.0-r2.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit cmake-utils
 
 DESCRIPTION="C++ libraries for building network-based applications"
@@ -10,10 +9,11 @@ HOMEPAGE="https://pocoproject.org/"
 SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
-REQUIRED_USE="7z? ( xml )
-	apache? ( net util )
+KEYWORDS="amd64 ~arm ~x86"
+
+IUSE="7z cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl mariadb +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
+REQUIRED_USE="
+	7z? ( xml )
 	file2pagecompiler? ( pagecompiler )
 	iodbc? ( odbc )
 	mongodb? ( data )
@@ -21,25 +21,28 @@ REQUIRED_USE="7z? ( xml )
 	odbc? ( data )
 	pagecompiler? ( json net util xml )
 	pocodoc? ( cppparser util xml )
+	ssl? ( util )
 	sqlite? ( data )
-	test? ( data? ( sqlite ) json util xml )"
+	test? ( data? ( sqlite ) json util xml )
+"
 
-RDEPEND=">=dev-libs/libpcre-8.13
+RDEPEND="
+	>=dev-libs/libpcre-8.42
 	xml? ( dev-libs/expat )
-	apache? ( dev-libs/apr
-		dev-libs/apr-util
-		www-servers/apache )
-	mysql? ( dev-db/mysql-connector-c:0= )
+	mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= )
+		 mariadb? ( dev-db/mariadb-connector-c:0= ) )
 	odbc? ( iodbc? ( dev-db/libiodbc )
 		!iodbc? ( dev-db/unixODBC ) )
 	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	sqlite? ( dev-db/sqlite:3 )
-	zip? ( sys-libs/zlib )"
+	zip? ( sys-libs/zlib )
+"
 DEPEND="${DEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/${PN}-${P}-release"
 
@@ -63,17 +66,26 @@ src_prepare() {
 			Crypto/testsuite/src/RSATest.cpp || die
 	fi
 
-	# Fix MySQL detection
-	sed -i -e 's/mysqlclient_r/mysqlclient/' \
-		-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
+	if use mariadb ; then
+	        # Fix MariaDB detection
+		sed -i -e 's~/usr/include/mysql~~' \
+			-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
+		cmake/FindMySQL.cmake || die
+	else
+	        # Fix MySQL detection
+		sed -i -e 's/mysqlclient_r/mysqlclient/' \
+			-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
 		cmake/FindMySQL.cmake || die
+	fi
+
 	cmake-utils_src_prepare
 }
 
 src_configure() {
+	# apache support is dead and buggy, https://github.com/pocoproject/poco/issues/1764
 	local mycmakeargs=(
 		-DPOCO_UNBUNDLED=ON
-		-DENABLE_APACHECONNECTOR="$(usex apache)"
+		-DENABLE_APACHECONNECTOR=OFF
 		-DENABLE_CPPPARSER="$(usex cppparser)"
 		-DENABLE_CRYPTO="$(usex ssl)"
 		-DENABLE_DATA="$(usex data)"
diff --git a/dev-libs/poco/poco-1.9.0.ebuild b/dev-libs/poco/poco-1.9.0.ebuild
deleted file mode 100644
index e4cc18980d1b..000000000000
--- a/dev-libs/poco/poco-1.9.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="C++ libraries for building network-based applications"
-HOMEPAGE="https://pocoproject.org/"
-SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
-REQUIRED_USE="7z? ( xml )
-	apache? ( net util )
-	file2pagecompiler? ( pagecompiler )
-	iodbc? ( odbc )
-	mongodb? ( data )
-	mysql? ( data )
-	odbc? ( data )
-	pagecompiler? ( json net util xml )
-	pocodoc? ( cppparser util xml )
-	sqlite? ( data )
-	test? ( data? ( sqlite ) json util xml )"
-
-RDEPEND=">=dev-libs/libpcre-8.13
-	xml? ( dev-libs/expat )
-	apache? ( dev-libs/apr
-		dev-libs/apr-util
-		www-servers/apache )
-	mysql? ( virtual/mysql )
-	odbc? ( iodbc? ( dev-db/libiodbc )
-		!iodbc? ( dev-db/unixODBC ) )
-	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	zip? ( sys-libs/zlib )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}-release"
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" )
-
-src_prepare() {
-	if use test ; then
-		# ignore missing tests on experimental library
-		# and tests requiring running DB-servers, internet connections, etc.
-		sed -i \
-			-e '/testsuite/d' \
-			{Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF}/CMakeLists.txt || die
-		# Poco expands ~ using passwd, which does not match $HOME in the build environment
-		sed -i \
-			-e '/CppUnit_addTest.*testExpand/d' \
-			Foundation/testsuite/src/PathTest.cpp || die
-		# ignore failing Crypto test since upstream does not seem to care,
-		# see https://github.com/pocoproject/poco/issues/1209
-		sed -i \
-			-e '/RSATest, testRSACipherLarge/d' \
-			Crypto/testsuite/src/RSATest.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPOCO_UNBUNDLED=ON
-		-DENABLE_APACHECONNECTOR="$(usex apache)"
-		-DENABLE_CPPPARSER="$(usex cppparser)"
-		-DENABLE_CRYPTO="$(usex ssl)"
-		-DENABLE_DATA="$(usex data)"
-		-DENABLE_DATA_MYSQL="$(usex mysql)"
-		-DENABLE_DATA_ODBC="$(usex odbc)"
-		-DENABLE_DATA_SQLITE="$(usex sqlite)"
-		-DENABLE_JSON="$(usex util)"
-		-DENABLE_MONGODB="$(usex mongodb)"
-		-DENABLE_NET="$(usex net)"
-		-DENABLE_NETSSL="$(usex ssl)"
-		-DENABLE_NETSSL_WIN=OFF
-		-DENABLE_PAGECOMPILER="$(usex pagecompiler)"
-		-DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
-		-DENABLE_PDF="$(usex pdf)"
-		-DENABLE_POCODOC="$(usex pocodoc)"
-		-DENABLE_SEVENZIP="$(usex 7z)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_UTIL="$(usex util)"
-		-DENABLE_XML="$(usex xml)"
-		-DENABLE_ZIP="$(usex zip)"
-	)
-
-	if ! use iodbc ; then
-		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		for sd in */samples ; do
-			insinto /usr/share/doc/${PF}/examples/${sd%/samples}
-			doins -r ${sd}
-		done
-		find "${D}/usr/share/doc/${PF}/examples" \
-			-iname "*.sln" -or -iname "*.vcproj" -or \
-			-iname "*.vmsbuild" -or -iname "*.properties" \
-			| xargs rm
-	fi
-}
diff --git a/dev-libs/polylib/Manifest b/dev-libs/polylib/Manifest
index 0444d8cee7bf..36e67226bd8a 100644
--- a/dev-libs/polylib/Manifest
+++ b/dev-libs/polylib/Manifest
@@ -1,2 +1,2 @@
-EBUILD polylib-9999.ebuild 469 BLAKE2B 68836fee95758a29535fd3b15d31b3362668e1540c97dabfde411a0637ac37b4f541813d890fe5f869ec13a800d5c420f5c003216b5c4b89f92253d1823d48aa SHA512 4b4845594df7d08608eec4e00862b7662bb3ad05d6496850f8dedefd921ab67627c383138ea203638ca2e01622efd47f29cb2a538888efce149eaea46a9a242f
+EBUILD polylib-9999.ebuild 439 BLAKE2B b3d64edb3cd211bd2f0edd75d72b7ad41bfe708dd9e1b2b9c144c0663a5e9a1af7c421638e1c8b57425192a9e3b57df930c77933c6d1e3bbe8ba20c32782bf57 SHA512 92eb8a3490b3abbf6bd9519acdc0cb8b06b026dd1ef0b15b1a476903ffaba5e1686f61c3ddc69d5d9879fb4b080fac8120bed639182f9a4eafdf227e7dfa9b72
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/polylib/polylib-9999.ebuild b/dev-libs/polylib/polylib-9999.ebuild
index 030fb2d71957..dabb9d8742d9 100644
--- a/dev-libs/polylib/polylib-9999.ebuild
+++ b/dev-libs/polylib/polylib-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit autotools git-r3
 
-EGIT_REPO_URI="git://repo.or.cz/${PN}.git
-	http://repo.or.cz/r/${PN}.git"
+EGIT_REPO_URI="https://repo.or.cz/r/${PN}.git"
 
 DESCRIPTION="ppl port of cloog"
 HOMEPAGE="http://icps.u-strasbg.fr/polylib/"
diff --git a/dev-libs/qcustomplot/Manifest b/dev-libs/qcustomplot/Manifest
index 89c0042f6009..115739d48f64 100644
--- a/dev-libs/qcustomplot/Manifest
+++ b/dev-libs/qcustomplot/Manifest
@@ -1,4 +1,7 @@
 DIST qcustomplot-sharedlib-2.0.0.tar.gz 1949 BLAKE2B 6d2d1b7da0dbdb83485ce1a1b69b5d4270fa73af25240decd1764d0872065a7457252aac3b81ccc9d5cbcfe24f8ed67ff843f092b344065b8b0f26aa2c6bef14 SHA512 f4ba719287067c2bb999a6e4ffb3694b32b1d72867c396fee1834ba2916f2931eda07bbe25c4d2ea6f6af18bd78917660dc6eabd98f72c9da987ae288ed4e611
+DIST qcustomplot-sharedlib-2.0.1.tar.gz 1963 BLAKE2B 294877d929564767009a8a4409111408eda1eb4e0cc64b48e644d25f30ef18151c2df1f0c5caa4e95c5b75dd492e795f97077e47bb927ff9637a2da9a2ec757e SHA512 ce90540fca7226eac37746327e1939a9c7af38fc2595f385ed04d6d1f49560da08fb5fae15d1b9d22b6ba578583f70de8f89ef26796770d41bf599c1b15c535d
 DIST qcustomplot-source-2.0.0.tar.gz 317398 BLAKE2B c2d587e06026789a164f16ffdd00d324172654b6953ace637815b022dc14cc96362cf4022512ec3feea3725a651c1af0f50f09d0ca1c5e86ebcfbe3f50aa3ff2 SHA512 66c648877ed0a14cf527ac8526788065f494119cc61993d20268a0046c8e6c5a1c73a61f50a73e6a39ec55435bc5f74c613ee21254293ddab34ba7c2484c4f5a
+DIST qcustomplot-source-2.0.1.tar.gz 319140 BLAKE2B 868133f5126eea0aa8f80d34272f854de93b60575e3eed1b52211bec5ed96886503ba5c7f15c6f0ff15f3f67e35db6e5333adfc7465cee40768a65ed1b7275da SHA512 b44abbd8fd95970a829bbb6e7becc0765e24bd8f05958c8c1223303b68fb4c0a64f503cf0a2fe4fc53957e6e61a6618500475cff3e81ed0ab387a9eada2c83a3
 EBUILD qcustomplot-2.0.0.ebuild 973 BLAKE2B 27dedecc5719cf8c77e74d5a9f027ef2d5d81f9b49ebe6abb1ccf57d93f7822e3a2b9066d67a8fc6fd613e1a441dd9ac827137d98f9c3660a63f56345eed723c SHA512 407df97d2c3b82b7acbebf705cef7b0d9d8ecc7f445652ddcd94d358d165873bce011823632786501aefa040fe8ed6834e3f8d78a0bee8ff615a93f4114138d9
+EBUILD qcustomplot-2.0.1.ebuild 975 BLAKE2B 7907810de5c2a6bb5b2822fd826f0cb0da4b5a9fc9c00f37e97298dd8265016bf213a6ef89c85448ddb30cd5af9b7a9d888edf781cf6239d1b5ec63bd2a481c3 SHA512 c518e1c1a0b3726685eed1b4ed5313cd761ffa5ce437190e60204d3149e30311235b2768ae62a1e4535ad1dcb86e0a4459152f645ab4da3336d28dbda97b07bc
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild b/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
new file mode 100644
index 000000000000..51051c6445ad
--- /dev/null
+++ b/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Qt C++ widget for plotting and data visualization"
+HOMEPAGE="https://www.qcustomplot.com/"
+SRC_URI="
+	https://www.qcustomplot.com/release/${PV}/QCustomPlot-sharedlib.tar.gz -> ${PN}-sharedlib-${PV}.tar.gz
+	https://www.qcustomplot.com/release/${PV}/QCustomPlot-source.tar.gz -> ${PN}-source-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}-source
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:../../::g' \
+		-e '/CONFIG/s:shared.*:shared:g' \
+		"${WORKDIR}"/${PN}-sharedlib/sharedlib-compilation/sharedlib-compilation.pro > ${PN}.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	dolib.so lib${PN}*
+	doheader ${PN}.h
+	dodoc changelog.txt
+}
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index 1fd8479f0728..569cc6c54c2e 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,4 +1,4 @@
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
 EBUILD redland-1.0.17-r1.ebuild 2464 BLAKE2B bed3fcba31401116c045a440fb1aab2196c25ad3070eaf0a11683087fea07d0e6998c612c034c6bfefeff5adbc12b87c69ef207585fbff9f2880aaf775ddf249 SHA512 f2975cf0c971b53381f5a7fbd54292812a2bdc8e96982069ede430de93b174c27f2404b26209aa45ebf6c15d1ee545cf78fa03f241f34a3e8b01b49fd25e9258
-EBUILD redland-1.0.17-r2.ebuild 2508 BLAKE2B 0a9f5459c00966eb6f5bba76c181076b0f99fb0d75c3848c8361cdd093577e4424f5285ac0ef176c1919302c6b0a844779c2b7819bbe15e2397d97866d059625 SHA512 b055d44068344f1d37cab1bc16a736d315556c124ce87d87b5bbe494780fbf4f0764ec9a234d160d178b88b673a12f2bde9c4653df41aa3138f2d933969725d6
+EBUILD redland-1.0.17-r2.ebuild 2507 BLAKE2B fd990448f863d5a93238aeb9e0f4eaddee083cf43b6c9e4df796c7e69239c9f138fad905f7b91fd1702aee500ba7bb3482628794baf15345c4b36069e223e763 SHA512 559c5a8fb783645de1fa6a9c878d639c33975a2faa503eb790fbba8502b5fdec2eebba3ca05ba876b940d27d003e9c31afcc77d83ad5d0bc814212d4d2f66dfa
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index 1f2d86face16..e80533ce8157 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/rlog/Manifest b/dev-libs/rlog/Manifest
index 3b73edb20c02..34b866dc6bbc 100644
--- a/dev-libs/rlog/Manifest
+++ b/dev-libs/rlog/Manifest
@@ -1,5 +1,5 @@
 AUX rlog-1.3.7-gcc-4.3.patch 203 BLAKE2B 805bae9fa8ab6f9d069056cd8c0c2df96f5b50994a7f14cc4f4e1efbd69ff1be433edcd200dadc986462ed9d8cc0caacfd515dd1480638d48a9156a3aeebd4a1 SHA512 e3d07bcd0aad871c5cbda75335cd20f598bbe25401ee5a6fb735f0d0f5a37946c78c9eb8190fa8ae31351704c2e0806b89d06db56d225d7e6f477a2a9b78ae1d
 AUX rlog-1.4-fix-build-system.patch 1283 BLAKE2B 2e7d38de9be902224dd82ade699ed9aedb56cdbf9ea272373e74d541c126c4edf2a5814cd078e4309887c8f732c3731ed035bf3018ebfbee55adc3f74328198d SHA512 e956ae108f61d8e71379d0b2722e670d52d9954713725629309f91176f419b9a188578e4e3381992ad4bbf577fb2b747d8680ad01b5e92864f4c6be721095b4f
 DIST rlog-1.4.tar.gz 640641 BLAKE2B ff17c9cefb20045a95d69954dd6d1756a342a5a97b640e8a286db98e5e55d1cb05da48a5df7ba1ad4b5f23678cfefd677cbf6f9f45ab647373858a2ddf25881e SHA512 a0af9afd6c5329ec4269a7778c3236b9e0b438cba65ed0a6f9cd7e802d196b7908eed5ab663f52905869cacffc7f1964b20ab2a53b37dbe65f1c8a9226cc423e
-EBUILD rlog-1.4.ebuild 580 BLAKE2B e428c653b3fdf30a7d0d49932981fb0352ea77aba0739bb111e20a01972eb6e0711c3e1b25c0874e32a33a80267256c90f1b7fb0831eb0d0b66d89da371f282f SHA512 cfed6a79af238dbdace3fdf28a0042ba711cdad6070aa2e3ff3ba7e28e481e7ce6223bc3b82f276e96c0b6f8602dcc59cd74c8660617d57ed6d7b38fc127e24f
+EBUILD rlog-1.4.ebuild 578 BLAKE2B 2468285a3a8bcc744e48b78f9553c814dd0f20471c604ed84f338d82af57e904521335cf74f6288baa6a3eca7923cfc0ab7c3a47ff8f66986acdc3846dd6c208 SHA512 8854dea14986aa02096672f162ebb653fc486b2af2369e2a47ebff5674ae6f360ec2d5c4131dc8f7202221fc0f372a9589bb64c3a866fb3cf46bbbbfa77b588d
 MISC metadata.xml 323 BLAKE2B 24c50af72b0366021e5909c8c82cd536a8cff3ff1ec24e5120810782bec14088b0a2c60f46ecc819a08e009a98b38c58f89c4c1b2886604e8583f3c3eb23a943 SHA512 5a15daf1a6599a6b93b64475aa4dec483281d4d1622fb24bfab2a27c4806846027a16bffb910d0881621879a6209d8d00c816b37a0397983d1d1e951fa32a006
diff --git a/dev-libs/rlog/rlog-1.4.ebuild b/dev-libs/rlog/rlog-1.4.ebuild
index 0a937d761f36..386f5c328d21 100644
--- a/dev-libs/rlog/rlog-1.4.ebuild
+++ b/dev-libs/rlog/rlog-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="A C++ logging library"
-HOMEPAGE="http://www.arg0.net/rlog"
+HOMEPAGE="https://www.arg0.net/rlog"
 SRC_URI="https://rlog.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index faa70a35ecc2..ecc0c5efb290 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,3 @@
 DIST sink-0.7.0.tar.gz 383090 BLAKE2B b853609889ead6f623c7288b9dfe8dba0388dc0d5e8f28d9967fa9be1d78b10bafd9d4674f11355bfe60506843d2abe033149c448ff293329db558ed00fef18b SHA512 591838cb9c76d89c1794b94b02bff3d67155e1f27ae32b7ac9369d15aa109130c7792f30e74b61009765e7b7cb78141bf5e3c93304d814bce22bf91059339fd0
-EBUILD sink-0.7.0.ebuild 1280 BLAKE2B b291dee7303f8f6fe2575ee21092204f3f98ed28633d72bbdb39850c11a1096c70e5e135d6c18e29b52449490a807d7397716c1cef1eb71739d8921fc7cc5259 SHA512 3e280a86919ff93e88505b7183cd10dd0393a843cae1ce225e2b18015925c342e688eaecd40e880c6aa011862a1204d3b97a99c1727598406f96d189e78c70ee
+EBUILD sink-0.7.0.ebuild 1278 BLAKE2B 4f1bcd6d98914fd2c51a96ef7dde5636bdcec6e76f1af63d9b1628f410a35d0253832fb2e85c6a122dfad3f3810892539de11a1608a61d1b2d35f4f47f6e5bca SHA512 2b9ddddf426c1a3396aefc41b94a02f2a4e108bdc7fd7da1ec518a8c8634122f4d065dd4425bd82712feae7a3dc2ded963445ae5a7ea668ac046d961edc70a2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/sink/sink-0.7.0.ebuild b/dev-libs/sink/sink-0.7.0.ebuild
index c2e8a3d3fa4b..4e7f4708a8f5 100644
--- a/dev-libs/sink/sink-0.7.0.ebuild
+++ b/dev-libs/sink/sink-0.7.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="false" # build breaks otherwise. tests not isolated.
 inherit kde5
 
-DESCRIPTION="A data access layer handling synchronization, caching and indexing"
+DESCRIPTION="Data access layer handling synchronization, caching and indexing"
 SRC_URI="https://github.com/KDE/sink/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2+"
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index e8aaaa48e4fa..7783b6bc848c 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,6 +1,4 @@
 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 1034 BLAKE2B a23e92f44ed9bb03277cd3d124d4d1eb7e0a0eec0ec67b793d2c999d44490c63a546595bbba20b5913b8aedda9d7695b357ea05c3be9f1ec0610a9a6fc10b2d4 SHA512 bdf82fc5041a0c0eb40344f1a9a3393dfdc726118a1d9491cd57f68f40c1e97d5101e0e7ce071711a3182d8e772c93d2477205c3eee73100e43f4865c18dc882
 EBUILD softhsm-2.5.0.ebuild 1085 BLAKE2B a86e64d8a8bd46cd7f63b35fd6c1aa241ec688a8bcd0f526fb31aa96880b5f8093dbceb107fbfac76929421d06e4f6a14772795e3f35087d68dcce326ffd36ea SHA512 e1399d22f68ec1ede572605ba1d37f99d14338bff0fbc30ec2c332806959bcf248787b0da9be2c22ad679c1ed2f8b543f1b8c0960c9362518203ef9be046c9bc
 MISC metadata.xml 365 BLAKE2B 1661f2dba2653a4fd4ca4ed53b9d10ca647c3e13ec93eb21062505578489e4d403c497f304f18be655e116f7bdad253f79de7cf185af9512676c43ff5fe3f8f0 SHA512 a5641e507a0fb5bb77278a39c5dd3f9f228438f650e8ea8710855c0499521b88b7197d89d7c5866471826485e840863258520b026c3ca1b2eb7555bc842dd262
diff --git a/dev-libs/softhsm/softhsm-2.4.0.ebuild b/dev-libs/softhsm/softhsm-2.4.0.ebuild
deleted file mode 100644
index 70b3e1b0f080..000000000000
--- a/dev-libs/softhsm/softhsm-2.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 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 gost libressl migration-tool test"
-SLOT="2"
-LICENSE="BSD"
-
-RDEPEND="migration-tool? ( dev-db/sqlite:3 )
-	!libressl? ( dev-libs/openssl:0=[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
-)
-
-src_configure() {
-	econf \
-		--disable-static \
-		--with-crypto-backend=openssl \
-		--disable-p11-kit \
-		--localstatedir="${EROOT}/var" \
-		$(use_enable !bindist ecc) \
-		$(use_enable 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/template-glib/Manifest b/dev-libs/template-glib/Manifest
index 67b831a0020d..12af6046400f 100644
--- a/dev-libs/template-glib/Manifest
+++ b/dev-libs/template-glib/Manifest
@@ -1,3 +1,5 @@
 DIST template-glib-3.28.0.tar.xz 54320 BLAKE2B 3f06857756cc49655b0289a4c0e576c681948e347112de713e0ea3c8c47db8a68efb258688afa8277362d2fb1e5a73d2f659570607d90abf6a804ea13a9467e2 SHA512 95d780c03567a8cc1bc02ffabfed2ef4bbe359941b326bad006aba6689686421bc25d357b574cf8ab9d9a27b7707f2f6041a9fcc90a7fcedbf02e9a0e8286860
+DIST template-glib-3.32.0.tar.xz 55152 BLAKE2B 53c5eda95f49d3358b1a52a8c821252efc28c823e92c03d387336aaff8540bab9f4762d9fb3f9694d0402dafb1cf09d56188bdcaca29343513b0b74d3c8d1684 SHA512 00e275c15e7daac4c3cf3cd85d8e0700e8ec504a02b68f46754a8f177c6a2cecbbc9b2b5701c85c94d0c06dfa9b51425b37decfa1f619ccb2c7351c0ce1643e7
 EBUILD template-glib-3.28.0.ebuild 1062 BLAKE2B f78bb1747c8d528836942f86bc8287c9be7ed647998393d732dbb38c4fe9c5a6b4342fe1b07b8817a7358317a4a7022fce2e0cbe7296bdd7754ee4d8c8396c56 SHA512 5fdd4822fb80f41b3a55962e98f79879b02a69ede660567ef936aa8bf85d001ff4a9f3191f85610b844e563031ebc0c73db35e4e73154ff890ac04ba56c46dd0
+EBUILD template-glib-3.32.0.ebuild 1094 BLAKE2B baa95e2c81fd57efd3cd2d7a2beb8a1c91af66869f679019144f989008c928068214036a85bd5ec11c6deaf3ba84515cdc28fb9a8808433e7c0788104502098f SHA512 a89193706544be62faa0c9a98bf64ad5376cec7466ee28caff82de6111a1d5df734ff3d879da94e2d0a84929772922c7b0669aeaf9737d6c6f12f8f3c466d862
 MISC metadata.xml 644 BLAKE2B 76c8a25f64948739ac646ea100b365426db6b9f674502d2db83a93ad7203bcf2c6a49396daf959b4f3b3b89777e5f2a02c8a5a168041f6f93168f95c46fd7987 SHA512 272335daa1c3844c85dde4fe91b5020112c0652547d644fdb04126219ea39a3c0cfc16bb3d054cc362393507844e9a63d4c24e5e0f323d2bb3fc8b43e65810a6
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.28.1.ebuild b/dev-libs/template-glib/template-glib-3.32.0.ebuild
index e7924319fe58..64aad1f834da 100644
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.28.1.ebuild
+++ b/dev-libs/template-glib/template-glib-3.32.0.ebuild
@@ -1,28 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnome.org meson xdg vala
 
-DESCRIPTION="JSON-RPC library for GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
+DESCRIPTION="Templating library for GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="gtk-doc +introspection test vala"
+IUSE="gtk-doc +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/glib:2
-	dev-libs/json-glib[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection:=
+" # depends on go-i unconditionally for own functionality, USE flag controls GIR/typelib generation
+DEPEND="${RDEPEND}"
+BDEPEND="
 	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	gtk-doc? ( dev-util/gtk-doc )
 "
@@ -34,11 +37,11 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
+		-Denable_tracing=false # extra trace debugging that would make things slower
 		-Denable_profiling=false # -pg passing
 		$(meson_use introspection with_introspection)
 		$(meson_use vala with_vapi)
 		$(meson_use gtk-doc enable_gtk_doc)
-		$(meson_use test enable_tests)
 	)
 	meson_src_configure
 }
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 20d5aa7f3160..b68ec779206c 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,9 +1,7 @@
 AUX 3.26.2-optional-introspection.patch 1302 BLAKE2B 8563a7d5206765c47757d160ce67c6e8c86c6761364089e602df7158c53f16501b02e9ce3267d4443a30d5784e42c50821358d9ac9be63eb2e706acb61e85144 SHA512 a863084b2db4d9c3c6e25ad45485e59e6039512c03b302b86f37e4f756061449f710a97b7555450b25dcbf86ee13e3c6dcfc5e99c03d0be0e711e50f58d978f0
 AUX totem-pl-parser-3.10.8-gmime-automagic.patch 3454 BLAKE2B fe16c0c78e73ebd735ff619074462d455087c7436d9dcba862771f0aa10df9400960733e1c829fa240af6bc43cea50957dbd5034e95c26bc5c076715b71b1cb7 SHA512 0cb2b632ec79711ced87a8b8df13011defeb2117a3242d28129f53bc3c845a18d929a2697edc99e08b69410d7933ab065a65257fce62c12a8bd72f19bb4d5d6d
 DIST totem-pl-parser-3.10.8.tar.xz 1618992 BLAKE2B ab7dc3010afb9a2112f19991ee74c43436962a66fa233162b2d2c6743e5727762102f6f0bfed2a30750c0d4e3cf0fbfdb7fdab8568b0cb827e49d0f99a938c41 SHA512 1692fe6d183838bdfb9125ae2bf9fbf74762333a7ebb6becc755bfdbfb8d2ea1ae257f42aab7b7a1ab419aee2b35902176a731f26736a62015806d1423adae70
-DIST totem-pl-parser-3.26.2.tar.xz 1314032 BLAKE2B 1513223e7cdebf1b16587a8ef899dd0318d0474d3987a346525cb0f77966c87bf858510c6432f204e4ec758467da273c8644fa6976eb0da237b729f507763646 SHA512 b4d05f6c41942d243be411fb58aa557c0402eac56acc4fc213214a59d20df4354c17d5dec4064a5580f88e721411a16953e69e94c2ebe98e1aaf8b0729b8a83d
 DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
 EBUILD totem-pl-parser-3.10.8.ebuild 2080 BLAKE2B 8234199f84709abb2cc9140fc61065c05bdff5ada8dd1d36e76b7558715850a9079eb35de0742807ffc06f3c394f3096054ce3c6720f4859cc6e306b4a4efbe5 SHA512 e377bc056735214d3859ee50a06f61c815e1add95b1fb6265c895c7fcdc908a0790080e5db1a73e861fa416375b3f98eb1127d6156ba28eaf2a0bc70a950bfab
-EBUILD totem-pl-parser-3.26.2.ebuild 1986 BLAKE2B 5b3a796280b836ce249766f2a4ceaf7af9659f8be997c73c8c63ef11f73db006d2118e0361cab7be768c35f86aee197cd91f1443bddbbdab81aa0ca68b8ccbf6 SHA512 5134c8d5c909739db2e9dfd48c6022503450c9076fc3b2b2d1a60cd246cecd0d391e5625c6de50f7e497820f272795e4ea9733d9fef1692c7f4d9137dd225b06
-EBUILD totem-pl-parser-3.26.3.ebuild 1905 BLAKE2B b5540d293cba5b0a5042738c1be92c3cda514e61d68a51a26c28dc8e7bb014bd59046bb6db4d21e29e65e036eaafe4a205e7c6820dff47664dbd0e6645fd09cf SHA512 f3df15e0efc7a399baaab7c4df095971f42d0232da3e19c623d11a8738d66eb8d6368c16f8ba16a2499a5b9fd3a5184acddce8300d873b1b595a8e47040e347b
+EBUILD totem-pl-parser-3.26.3.ebuild 1916 BLAKE2B 53d44ca10898dbd61f70332c95c0ae20c9b905318dd07eda70c28367dd6fe0797b2db765a24aa89ac90fa1263ebf62ff7e7d0b1b5a81dac3e31396403bf79246 SHA512 ea4814afe5472cd3a5b715b8bd7b5d00baac83e5e913bba450e9c6acfdf4f0a19cfe9566a8386d1b9c1a4ba84cc6cff3e8acc7b87e5fbf23a9307d91608845a8
 MISC metadata.xml 522 BLAKE2B 733f895375a3a264b84359f121bf92fd602b62eb562a37e5c5cf8ae7947e8138b32067d276cdc13f7a98f8941130fe93f0a5cac7d8f02ee3238ea7ab5cae4266 SHA512 07c6a9bf474a64950ba6e557b3df879e9c8399c0b09a9e7f585821ee540ea40b7459ad8b7c3af728e8201fbe50193417b3298f186c9caedb1b89b538c7c70206
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.2.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.2.ebuild
deleted file mode 100644
index 10d510358338..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org meson xdg
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0/18"
-IUSE="archive crypt gtk-doc +introspection +quvi test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	quvi? ( >=media-libs/libquvi-0.9.1:0= )
-	archive? ( >=app-arch/libarchive-3 )
-	dev-libs/libxml2:2
-	crypt? ( dev-libs/libgcrypt:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		gnome-base/gvfs[http]
-		sys-apps/dbus )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-optional-introspection.patch
-)
-
-src_prepare() {
-	# Disable tests requiring network access, bug #346127
-	# 3rd test fails on upgrade, not once installed
-	# Leio: I consider network tests important for ensuring full functionality, thus trying with them again */
-	#sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
-	#	-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
-	#	-e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\
-	#	-i plparse/tests/parser.c || die "sed failed"
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# uninstalled-tests is abused to switch from loading live FS helper
-	# to in-build-tree helper, check on upgrades this is not having other
-	# consequences, bug #630242
-	local emesonargs=(
-		-Denable-quvi=$(usex quvi yes no)
-		-Denable-libarchive=$(usex archive yes no)
-		-Denable-libgcrypt=$(usex crypt yes no)
-		$(meson_use gtk-doc enable-gtk-doc)
-		$(meson_use introspection enable-introspection)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
index fc87ee2a481d..9775ac376509 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
@@ -20,7 +20,8 @@ RDEPEND="
 	crypt? ( dev-libs/libgcrypt:0= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	gtk-doc? (
 		>=dev-util/gtk-doc-1.14
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index e736cf8c97ad..b0a5cb7893d1 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,12 +1,3 @@
-AUX uriparser-0.8.4-doc-install.patch 615 BLAKE2B 593418040cd88f9753918320d6ee454fd2ddc5386a8190cd4da8e07c76e47ebb374df6b9a11d171815256927adb09b056927d33b19bd52b189842e9975817421 SHA512 80d77d07c43001c4e50363c66e05245ffc61fac35ee0c771019ae175e5eacd3c02fa050dcc910f5430c8531ea73fc289f7a18e989bff0dd7e14f7e438c6e28d1
-DIST uriparser-0.8.4.tar.bz2 358408 BLAKE2B 1f270442a4812fa3e86a495109f95cfac6980c8145a701990dbe6f6396743de9ce0dfbce7b9cff2b331e8c9038a2b6c5281d2e562596543b660c168d3e678187 SHA512 b6238c6495eaa9f7178269d66dbea05a39c51c27137d8ebf39cd02d1c3fa96aa0d1608f5ccb36bf7b454f3238830dd46d7de8299b608f185b2520fc2c955aa1a
-DIST uriparser-0.8.5.tar.bz2 359469 BLAKE2B 44fb7d8bd5dac8bb0dd68bfbc4fb2adec310a913a7ebb92850fb2b8833c159db7cb29fa4f8b5de3e3b3def018024d1e69a0814bcd12aa24b6a14deca6f6768fb SHA512 e9b0228092cf12b824975000b0a6dbe2e413d3642203666d77c5b42f04bc13e0ec3f61d6a2c44d9613bea15e8cf7ec42cc4c92c5bc4318ee3349c1b380409d5c
-DIST uriparser-0.8.6.tar.bz2 360214 BLAKE2B 18a0e02f5dc6efa840cd6647c4595f238f811e8131750959b31f5283c5632b8892fa38767f883110ff2fbcb9dd07afabcaef64b206b9a951a773bd9d4b1cd9e9 SHA512 b95e6d7c7f835002f6ea1a9c0962f4d385cd16519c40b921e9a9679140fd5d6cd326002b452fc73431aa2f36d049ae510c034a423eca143a6285f9b4b3dd7b83
-DIST uriparser-0.9.0.tar.bz2 371895 BLAKE2B 13479fe75d8dcc9514da6c26d9a60a68256b895f012d3b36e156353f1f37b2e572a3c8014f5cab30fe1d6da58ef840ea9878eabb48625a7449e46c7dbc13247c SHA512 8ad631726c59d244b945221e803dcb13daa6df6550b3de94da19745f4b4d53a5ce17dba54280273181479f2803dea4ca7b0154ac3b54ca39fc4eda2c8a03e3f7
 DIST uriparser-0.9.1.tar.bz2 372722 BLAKE2B 6fe21d1f5a98564f3e08094b1e27a13ea00baff3c4e09645236d8b08cba5455d49862a2d66fec02057efbb3b3d2e36040aeab31630f516eedd1ef36c84211638 SHA512 c6a4f3b737d4c53ba14148a5be363d93947c8c32755b369726ccdd6e01e8a2293d2c94d448700fc97bb56092696b67965646ae07c9ef31be253e2279d0bc3821
-EBUILD uriparser-0.8.4-r1.ebuild 1065 BLAKE2B 1ae3176b5642f9fb5e037dd3eb06d8e1ac1f00027f7e5226e1063172148054efc4dd49b42b6f21f0ab5f21e44849e93957651457836e20649507aa26c8e0243a SHA512 1e4f875b4e8a88540ed16d0043d728485df7d92a20d4a89cd7fa1b00ea40f01587532e7e4ab1705bcb2bccc35f9345f945338f86030917daa71dbae8fe8d0ffc
-EBUILD uriparser-0.8.5.ebuild 980 BLAKE2B 145266c02bcac0f9129cd644b3950161ee68a04fceb41a8002bf7275ada1c3fb3d681dd214aa9b604a10c7a5cd1006945a2536e45728b88152d9fdd9fb7717b0 SHA512 0af97e47d0b3bccd0d9b2eada5e9145a239729818991aef769b26ff6ef6258ae919a8b6bf0d644d01f93a4a4b36735f0fe2b8ee5ce8aa83aa85f12dc17058f68
-EBUILD uriparser-0.8.6.ebuild 980 BLAKE2B 145266c02bcac0f9129cd644b3950161ee68a04fceb41a8002bf7275ada1c3fb3d681dd214aa9b604a10c7a5cd1006945a2536e45728b88152d9fdd9fb7717b0 SHA512 0af97e47d0b3bccd0d9b2eada5e9145a239729818991aef769b26ff6ef6258ae919a8b6bf0d644d01f93a4a4b36735f0fe2b8ee5ce8aa83aa85f12dc17058f68
-EBUILD uriparser-0.9.0.ebuild 951 BLAKE2B cea02d809f6651663191db84f6fd497f2d222355ebbbbc2dfcb1b5cb16a60d3df231887c077fdbd02d70c8d2907fa303715766d51eb3a550978a6211d9235053 SHA512 330943bfb6f3a962cdabd509a1ae8019249eff565d1e19dd5bd123c01809f518f60c4a2f648b77e7bbd526910019627e9e5736587cb79f344811dc9fccf7dc5e
-EBUILD uriparser-0.9.1.ebuild 951 BLAKE2B 5f97944518f66f96560e0787ea636a421b01ef0f83b1279136bcfabd1e6bb039ea2325d935ba7142744e92e8b01dd06f53d8046ae4ca298e4d338d83d918dc30 SHA512 8ee1b567efe79a4b5d1d9c73d7f82296c4ba63d0e69a3d4beb02346f0e737f10efabe614dc74608481da2ecec0c8484262dc65edc93c522eb4ac388f524de066
+EBUILD uriparser-0.9.1.ebuild 948 BLAKE2B ab6519668f0707732161e4a9c9eb6bc00c9ce90cdc6ed8b5bef1c71b784188a670abdde1a5fd921dfad8a72b26c9c5d8180e4c98bc25bf3c0e730810c983515f SHA512 9e999afb83368a25e17ffc8feed3307837673581b715ac41743ae42da77540704e7ac51f4e441f452553edcc42b2aa9bf7f8f787fe2ba988aacec49039878cdc
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch b/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch
deleted file mode 100644
index 28cef94c6423..000000000000
--- a/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index ae5e101..012f0bc 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -24,7 +24,7 @@ distclean-local:
- ## Install doc files
- install-data-local:
- 	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/search"  ## Didn't work with installdirs-local
--	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.map html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
-+	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
- 	$(INSTALL_DATA) html/search/* "$(DESTDIR)$(docdir)/html/search/"
- 	-$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
- 
diff --git a/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
deleted file mode 100644
index 9468ac2013fe..000000000000
--- a/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="http://uriparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.8
-		qt5? ( dev-qt/qthelp:5 ) )
-	test? ( >=dev-util/cpptest-1.1.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-PATCHES=( "${FILESDIR}"/${P}-doc-install.patch )
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-sizedown \
-		$(use_enable test) \
-		--enable-char \
-		$(use_enable unicode wchar_t) \
-		$(use_enable doc) \
-		--docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
-	default
-
-	if use doc && use qt5; then
-		dodoc doc/*.qch
-		docompress -x /usr/share/doc/${PF}/${P}.qch
-	fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.8.5.ebuild b/dev-libs/uriparser/uriparser-0.8.5.ebuild
deleted file mode 100644
index 94133b732358..000000000000
--- a/dev-libs/uriparser/uriparser-0.8.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="https://uriparser.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.8
-		qt5? ( dev-qt/qthelp:5 ) )
-	test? ( >=dev-util/cpptest-1.1.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-src_configure() {
-	econf \
-		--disable-sizedown \
-		$(use_enable test) \
-		--enable-char \
-		$(use_enable unicode wchar_t) \
-		$(use_enable doc) \
-		--docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
-	default
-
-	if use doc && use qt5; then
-		dodoc doc/*.qch
-		docompress -x /usr/share/doc/${PF}/${P}.qch
-	fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.8.6.ebuild b/dev-libs/uriparser/uriparser-0.8.6.ebuild
deleted file mode 100644
index 94133b732358..000000000000
--- a/dev-libs/uriparser/uriparser-0.8.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="https://uriparser.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.8
-		qt5? ( dev-qt/qthelp:5 ) )
-	test? ( >=dev-util/cpptest-1.1.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-src_configure() {
-	econf \
-		--disable-sizedown \
-		$(use_enable test) \
-		--enable-char \
-		$(use_enable unicode wchar_t) \
-		$(use_enable doc) \
-		--docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
-	default
-
-	if use doc && use qt5; then
-		dodoc doc/*.qch
-		docompress -x /usr/share/doc/${PF}/${P}.qch
-	fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.9.0.ebuild b/dev-libs/uriparser/uriparser-0.9.0.ebuild
deleted file mode 100644
index 8118165df673..000000000000
--- a/dev-libs/uriparser/uriparser-0.9.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="https://uriparser.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.5.8
-		qt5? ( dev-qt/qthelp:5 ) )
-	test? ( >=dev-cpp/gtest-1.8.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-src_configure() {
-	econf \
-		$(use_enable test) \
-		--enable-char \
-		$(use_enable unicode wchar_t) \
-		$(use_enable doc) \
-		--docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
-	default
-
-	if use doc && use qt5; then
-		dodoc doc/*.qch
-		docompress -x /usr/share/doc/${PF}/${P}.qch
-	fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.9.1.ebuild b/dev-libs/uriparser/uriparser-0.9.1.ebuild
index 7fcaa4b05570..42ceadef9be0 100644
--- a/dev-libs/uriparser/uriparser-0.9.1.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc qt5 test unicode"
 
 RDEPEND=""
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 575339d1e8b4..eeeebd5279d7 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,7 +1,7 @@
 DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
-DIST vala-0.36.17.tar.xz 2898524 BLAKE2B 4a5a373bacd4e4a392350c7819e0498054e38f50dce89658412d7aeb5642892ef9f32a7689ebd45f53c41f064e0b6d2f52fb441be67a1dd48e67311a1e764637 SHA512 93d4fa600cd0ef62b71ed056b837f2c0a42c3aba25b021b2bbd2045428550307727827b250dae546926ea3fe2e33a5ac80c9b24b5100f02550ec584dd5da5e92
+DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.42.6.tar.xz 3354840 BLAKE2B 0cc5c91967cbadda8c12143d4de6ebffa60c7031bc314338e7ca1e036866b460bf78e28b7f7737bee8243198ffa655c99b3e743d639c5d2b5ed93f210fc692bc SHA512 664fa303d6b2b037254bc6e19d79b7894444f5c38fb7b1fcb73f37512dc97bc01c8ddbb23563093e271c562a9fb49c96fcc9019889a57a95a4e8e162c8619f2f
 EBUILD vala-common-0.36.15.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
-EBUILD vala-common-0.36.17.ebuild 2528 BLAKE2B 22a27070320c74579be8eacdbc325a6e58be193d787521c73aee40028c4e02e3f3ce4d8d987b889e1d253fec1109fb7031358f3c6317a11616e788c2f8763d8e SHA512 ebdc12ff8170abfade55b3f5013c1813a23d545a5c0d1d828a5257c7f5cdf7687ce27e4d085a84c977ac171ae32daf383214ab353a2c44befb5d6e1f148a5c20
+EBUILD vala-common-0.40.14.ebuild 2522 BLAKE2B a1b6a02272789a43fff04efc2ee692d69fc71cdf945354fa0b08cb3e39d04794804ae694e9203681d34ca1b09ea18ea02610ccfe5b11fe22576e3424b5072e5d SHA512 8b7a09689e6f3813a013dcfa35b98a8ae0baec143116dc4ee7796fb56980e96057721b55a3610513b5cab8bdd5dc5be1c791ba43b6610bb019fb16b1d0460a86
 EBUILD vala-common-0.42.6.ebuild 2528 BLAKE2B 8395b76376fc6b562a52b7df938e23363d328746225b800f46872a591e6049f00d0a8909d0eac0405b17c18b50266631523b1b28494721e3adfb834824114d52 SHA512 3720a01307c23ac617508450c627064f22685542cf4fc28979ab3784a2069c832f4f34b1e9c58557a0c1fd160c42141e8007c4d116f98f45c7208e892a8013e4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.36.17.ebuild b/dev-libs/vala-common/vala-common-0.40.14.ebuild
index e3b21a2a5dc5..7d1d8d71e51f 100644
--- a/dev-libs/vala-common/vala-common-0.36.17.ebuild
+++ b/dev-libs/vala-common/vala-common-0.40.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 28bcf51ce89f..bb14d2b5fdba 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-1.16.0.tar.xz 435216 BLAKE2B 862cc8ca9da060f9b8345aa0a62a4af76a31562246b75d2679bcf30cc894cc94ec28f97951f766b6e5297b2e113cd8b08e5682dacbfc79544c0085995693ec55 SHA512 64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c
-EBUILD wayland-1.16.0.ebuild 1752 BLAKE2B f091f185f5ff13ec427e7a4eb10f7df7fed6f86aec4a5fd7c14ff470aa16c10273ae536cf677d5948b6e4416e4a8dc606f7eacd35f2044754dec0a575d95b9f2 SHA512 64fdb6c6dd3fc052e82d238e2675ce20b8aa3315e1e69931d8b338ae451b0e6afa2b605c3fa54bf1d93cf1a8c0f72499e0219bf7a6b9374a7922ad17217841c8
-EBUILD wayland-9999.ebuild 1715 BLAKE2B 2c9c6bca8dd1faf75ec9fc9abeaf4ec84951de07723b801a881bbbbba1281368245f50fd6bb11005f0fa7556863b9c6c77669fca94dbec215c56ccd5c920b54c SHA512 71bfe7ea68d5f391ac499b195f17a878cd3c77acb4dbd609fbf34d0365fc084b3ac413a1d62381c47d4fd48801d4bed02b8dffda9fbb097f47e709ffb693f8fd
+DIST wayland-1.17.0.tar.xz 437680 BLAKE2B 2f4eb54c5ded90453b4e2812f7b5086aa211196ec9f7333d316cdb829269d55db570ccb45a67ee07a039633245e630ab54da6403ff4754d59366f3c13fb87549 SHA512 c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946
+EBUILD wayland-1.16.0.ebuild 1794 BLAKE2B 3da847adc8540be30afd9b0d3e3d5dd70c4f2093f3d26c704bbd14845ea52269a139d874a4ff849b68a64a2b782466493f6c258ef5ea5eaabcf52b4a1c7b0521 SHA512 fa6ca62067b6f1555288b77b7833c44e31ab32beb3e1e25d9cd117e3397e2b46a7dd67a5f645baef0f08313e554334d48bf6b399dfac007d4cdf54677e57848b
+EBUILD wayland-1.17.0.ebuild 1762 BLAKE2B 0d2095e219140a146b77577335a5115082a4aa9fea73ef8f888465b003c728e8ef489183a732dc63cf136d5f8f6da904b1fe256bf360ccc76a6239f5fff70137 SHA512 1ed70b02e14978141de7013b9b1750699555cef55b36840857f9e1956a49d85e3769ea70940f1929915bde9170209094795989e6fe3720a3df74a683887b3974
+EBUILD wayland-9999.ebuild 1762 BLAKE2B 0d2095e219140a146b77577335a5115082a4aa9fea73ef8f888465b003c728e8ef489183a732dc63cf136d5f8f6da904b1fe256bf360ccc76a6239f5fff70137 SHA512 1ed70b02e14978141de7013b9b1750699555cef55b36840857f9e1956a49d85e3769ea70940f1929915bde9170209094795989e6fe3720a3df74a683887b3974
 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
index b4525981f1e5..943993af5478 100644
--- a/dev-libs/wayland/wayland-1.16.0.ebuild
+++ b/dev-libs/wayland/wayland-1.16.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland.git"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -12,7 +12,7 @@ fi
 inherit autotools libtool multilib-minimal toolchain-funcs $GIT_ECLASS
 
 DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
 
 if [[ $PV = 9999* ]]; then
 	SRC_URI=""
diff --git a/dev-libs/wayland/wayland-1.17.0.ebuild b/dev-libs/wayland/wayland-1.17.0.ebuild
new file mode 100644
index 000000000000..56fdba5f507b
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.17.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+	inherit git-r3
+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
+inherit autotools libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.6[dot]
+		app-text/xmlto
+		>=media-gfx/graphviz-2.26.0
+		sys-apps/grep[pcre]
+	)
+"
+DEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	!<media-libs/mesa-18.1.1-r1
+"
+
+src_prepare() {
+	default
+	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(multilib_native_use_enable doc documentation)
+		$(multilib_native_enable dtd-validation)
+	)
+	tc-is-cross-compiler && myeconfargs+=( --with-host-scanner )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+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 7e909b198261..56fdba5f507b 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -13,7 +13,7 @@ fi
 inherit autotools libtool multilib-minimal toolchain-funcs
 
 DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 066f9d6d83e2..9b38c1ea3b4c 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,7 +1,7 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
 DIST weston-5.0.0.tar.xz 1467496 BLAKE2B 514bc4c4f09dc8bc5b068c66cf14b86687bee1e691f7dfcb251a5ae7fe02389b48626ed02c97eff9334b43e227ea8b83beef48c53a83b4691f59a65af53ad61d SHA512 b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf
-EBUILD weston-3.0.0.ebuild 3460 BLAKE2B 3831b7e40fdf6a767a8c4686ce935f6323e1250e9338e7a2e4aaaaa94753098bf28ca3f37e6b05e20eea3feeef3079f889b31f0b44fc66b9be2443b912f8df30 SHA512 3ee0b31c75053f23a0e558a9e83ae737137e24682ef8905c54e2f3437306e6a46137f4300014f9c2471bd7958eb7078c69c8762ea18e79e84d618583b1ad72c6
-EBUILD weston-5.0.0.ebuild 3382 BLAKE2B 78cea378bfb77c2145306ff46b621c18ea814ffcf2a069c2ab7ab85137b38cdc6c01af09be1c0891ddc2742e9967103f5a0505f4da66142c3a99efc71f156c25 SHA512 713f940e5f067270493a06752a6d1d8d051149c196de3b35d86ce5d592964daaca5a192ae17cf94a75f0be959040ca09458db431d97c9f3d3fd563030b2326ee
-EBUILD weston-9999.ebuild 3271 BLAKE2B 28633cbd47215e4200355735df23a3f7192f1a4594abed185d6d9101504541fd13c3c4c41379f09426844d711969dcb039f7ef54efeccf9359165bc9f2e4b32b SHA512 7211c5c1b492aae05c49490ebb282f4547aee09e4ac02bc5554eba3b3e8d50710002c54ad3d378928282990f503d74a39c093a92bba9bb547553c07ae74575c7
+EBUILD weston-3.0.0.ebuild 3498 BLAKE2B 066de40c7595bd86c63143e8dcc1b56991b09b23755530247f38ac2a35ceb94f16329e46ded39f0e9d4135fac47e9127477afc124c119f48d220c09022ac0bb8 SHA512 e3ef428c5f03621f8860463c69d7a124e7f16f6e92523d9e309dcb623b75f9c41c73268a54579e1c3849e1100aad534f289fd0e3465dfcd9d02b846695ac5237
+EBUILD weston-5.0.0.ebuild 3423 BLAKE2B dad9ab891253ea596eb78e99eb25bb87defa8aa89ba29ae1daf83ec5b807461c01929f87d019020ae8a5f139d4b2b908702860f8d26d759b2887b18abaf75a00 SHA512 8bdd160aecc69a91a08c8c53dd1eaa8e6db3639a70ccfa92131ecc8e7444ab98a59c2961c33c4dba5857bed306ee54bf848575473e03ecda4c42580ef5f0b03b
+EBUILD weston-9999.ebuild 3312 BLAKE2B 8680274dded64a0830a29901a3ab8aff0a27c0bc23d28dc50ad1636c52e194416847d5f8cc70429e5fffdd47081936641494f48ae04ae69a893e495520f75cdb SHA512 9e883a62db0128c539d1a995da00c98b69dfe6eba801e64a0574264a68ecb4444da690523c1fe176146b7977de8a9b867b9e3fe6f8dafb338031b7a9e2afbea3
 MISC metadata.xml 1360 BLAKE2B 0ce06161e748f11ded0baf006473ef73c5fc1f5f63a6554821c8389c65747463808738648b7508c416e6db48f35f290ef8b9e212b91992224dae146ad65cae47 SHA512 d4b17a918dac982654ed9a46e84d6d27b99426a693a23cb93f1b10dd73d7a8cf5bc6d5176a732400c6c1047449ea1a9c3bfb26803ea7247ff0e76c430d676cd1
diff --git a/dev-libs/weston/weston-3.0.0.ebuild b/dev-libs/weston/weston-3.0.0.ebuild
index 85b8492ffe17..a3061e69cc02 100644
--- a/dev-libs/weston/weston-3.0.0.ebuild
+++ b/dev-libs/weston/weston-3.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
 	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
@@ -12,7 +12,7 @@ fi
 inherit autotools readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
 
 DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
 
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
diff --git a/dev-libs/weston/weston-5.0.0.ebuild b/dev-libs/weston/weston-5.0.0.ebuild
index 61c5f7776cc6..221535a3bedf 100644
--- a/dev-libs/weston/weston-5.0.0.ebuild
+++ b/dev-libs/weston/weston-5.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
 	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
@@ -12,7 +12,7 @@ fi
 inherit autotools readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
 
 DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
 
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 1a039dffa312..b06805e2e15d 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
 	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
@@ -12,7 +12,7 @@ fi
 inherit meson readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
 
 DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
 
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 1b8fe9de1aac..fe23256d031c 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,5 +1,6 @@
+AUX xmlsec-1.2.27-gnutls.patch 1638 BLAKE2B 0368f307fbadbc9f90b130e339abe7d1f5774207eff4853f5415986d9d97ed85027f9679d74b76705ab53931060be52586a053c191b9be9954e6594092e0922a SHA512 e5c6398ff234f69d72531e1997dee28b1f0fc10f7ee67d2b70036760ac2e3c0bfa4c3caca29ab05feeafe402ef8e87f95b3c96e7c9fac9df90e74bae3199fc13
 DIST xmlsec1-1.2.26.tar.gz 1922183 BLAKE2B 8cb8557a7d24df756655a7dfa45091445adc89cb67169a7620d9d1116f3fb3d982ea45199a53475e29300478c07e8e1168cec79cf9c3b5ff1dd6c840123b982b SHA512 1e3dc3c8c192eefee7b055787bef52ce3bcfafa786224f68af065aa45f4d7da93232da973359b3135615c5981ad4df7c124047d3934e552ab78439472685a7a4
 DIST xmlsec1-1.2.27.tar.gz 2013651 BLAKE2B fa46a25e3aaef432134d1c98a0e7bf0aba83f2ef6d1aff3774d6d37c5f6f392d1c2c11a0fe433ee910c39b56400c96b74ab061577948622b14a1116fa1ec2947 SHA512 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920
 EBUILD xmlsec-1.2.26.ebuild 1551 BLAKE2B 332cf6b782a3ff702657933a8b7c43da5f4dcbdd44ef61c042dd2d75432bdb71b29134a47da618e4063cb855ff18010ff136b7856540568bd25b0df4b3aee35e SHA512 8e40917ce5326f5e511406f9bda9f7693475eba4ab05656a83060f506b069d29e01b97cf8b01d063417980a40b4c087bf16dfe9a6147352da3b38860591224f9
-EBUILD xmlsec-1.2.27.ebuild 1554 BLAKE2B 4fb9cbcc8cdff065f6989ad2454d241addb71970dd33269f305764e2d0e1c180318fd9224834b9004a221513e4fa70ce44a54f797c2ec288b851410a8fcf71c4 SHA512 2dde765583fc63486685241266473e401821b28cf0a26ec0b0b7139c3a689c5e17d0c728d1d49472b2189bab878ceeaad020e27f57ad4cf3b2d7707c345c8f3e
+EBUILD xmlsec-1.2.27-r1.ebuild 1568 BLAKE2B a0c648ce6a85c11f598e8b4515946bdca93fab9cd4a8a257f5b32011a86bd9f484d0bb568a545ef244401c36977b42052fa75b7e02018bca2a9f3cb75acb5e68 SHA512 3450a47f9ca8539356b699a5a669ce63b39b4f44e1e473ff67319e056061db03291a727013f1bde0bd066940f0f52f52ecef2fe046bd582f018608c8d1e628c2
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch b/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch
new file mode 100644
index 000000000000..2837420e0dc7
--- /dev/null
+++ b/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch
@@ -0,0 +1,47 @@
+From 321e62add243cf8f024d6278da4c5ff030bae3b9 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Mon, 1 Apr 2019 01:28:18 +0300
+Subject: [PATCH] gnutls: allow SHA-1 signed certificate when not in strict
+ checks (#250) (#251)
+
+This is required for gnutls-3.6.x.
+
+Allow tests to use no strict checks until all certificates will be converted
+to stronger signature than SHA-1.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/gnutls/x509vfy.c | 3 +++
+ tests/testrun.sh     | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/gnutls/x509vfy.c b/src/gnutls/x509vfy.c
+index a9c956a3..4c753344 100644
+--- a/src/gnutls/x509vfy.c
++++ b/src/gnutls/x509vfy.c
+@@ -295,6 +295,9 @@ xmlSecGnuTLSX509StoreVerify(xmlSecKeyDataStorePtr store,
+     if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS) != 0) {
+         flags |= GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD2;
+         flags |= GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5;
++#if GNUTLS_VERSION_NUMBER >= 0x030600
++        flags |= GNUTLS_VERIFY_ALLOW_SIGN_WITH_SHA1;
++#endif
+     }
+ 
+     /* We are going to build all possible cert chains and try to verify them */
+diff --git a/tests/testrun.sh b/tests/testrun.sh
+index 02484d09..ea65802b 100755
+--- a/tests/testrun.sh
++++ b/tests/testrun.sh
+@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then
+ elif [ "z$crypto" != "z" ] ; then
+     xmlsec_params="$xmlsec_params --crypto $crypto"
+ fi
+-xmlsec_params="$xmlsec_params --crypto-config $crypto_config"
++xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config"
+ 
+ #
+ # Setup keys config
+-- 
+2.21.0
+
diff --git a/dev-libs/xmlsec/xmlsec-1.2.27.ebuild b/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild
index b0791a6aa5fd..856125079412 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.27.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,18 +11,18 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
 
-RDEPEND=">=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.0.20
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 )
-	gnutls? ( >=net-libs/gnutls-2.8.0 )
+RDEPEND=">=dev-libs/libxml2-2.7.4:=
+	>=dev-libs/libxslt-1.0.20:=
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
+	gnutls? ( >=net-libs/gnutls-2.8.0:= )
 	nss? (
-		>=dev-libs/nspr-4.4.1
-		>=dev-libs/nss-3.9
+		>=dev-libs/nspr-4.4.1:=
+		>=dev-libs/nss-3.9:=
 	)
 	openssl? (
 		!libressl? ( dev-libs/openssl:0= )
@@ -38,6 +38,10 @@ BDEPEND="virtual/pkgconfig
 
 S="${WORKDIR}/${PN}1-${PV}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gnutls.patch"
+)
+
 src_prepare() {
 	default
 	# conditionally install extra documentation
@@ -52,11 +56,11 @@ src_configure() {
 		--enable-pkgconfig \
 		--with-html-dir=/usr/share/doc/${PF}/html \
 		$(use_enable static-libs static) \
-		$(use_with gcrypt gcrypt "") \
-		$(use_with gnutls gnutls "") \
-		$(use_with nss nspr "") \
-		$(use_with nss nss "") \
-		$(use_with openssl openssl "") \
+		$(use_with gcrypt) \
+		$(use_with gnutls) \
+		$(use_with nss) \
+		$(use_with nss nspr) \
+		$(use_with openssl) \
 		$(use_enable openssl aes)
 }