gentoo resync : 02.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
commit: b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree: 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-libs
parent: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
159 files changed, 1103 insertions, 1214 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5809772dfcd2..0b2f962213b7 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/atcore/Manifest b/dev-libs/atcore/Manifest
index 882316d71b9e..503eaadc89fc 100644
--- a/dev-libs/atcore/Manifest
+++ b/dev-libs/atcore/Manifest
@@ -1,3 +1,3 @@
 DIST atcore-1.0.0.tar.xz 169116 BLAKE2B 8aaafe18edfbb0dcbe08b99c9cfba2d2390a9e9aaf5ed8ebbc61b6320c37ac4e893a7c64e5c56a131e32ec112fa0d9e253749e634661834de3d03e2cced97dea SHA512 8be63850d939aa9b89651252e91cd3295d52d2d0603f88b846783cca25fc0e29dd3569bfef97aeaf6c115a3bc3328fb127e126b20aaf67faf1c319ac8be7b88b
-EBUILD atcore-1.0.0.ebuild 1094 BLAKE2B 00f588e7cc4871159776d18261bf267c62ceae46c06ef13f2cf5ac77d9a5d4a643270989c1f5c698670809fd5269ee7fe3c09a017cc52535167102cb66d89ef5 SHA512 d7d99f65c15c9ebbe4973ad4d240255e79aa1c3851552d499cf99b38bf0fc1aa18d2e46ae866a47ae7979265f4146605f5b1d601d7a7e050cccef711e19965cc
+EBUILD atcore-1.0.0.ebuild 967 BLAKE2B c3e1de9ce3a362a4babadd70a6a09a7819f430d5c207eef9af1f07b7b79bc3b94ea6852ec0752c671ad1609844788a90c7825c1f301cdfa80b32095023c88b0b SHA512 c5917436969de1dd1d22766521edef344ca31cfc79c903fbbe152667202b26999421610bbeb52fe5b29dc647721b8599ea695656cd1576f2e224dd344c263faf
 MISC metadata.xml 305 BLAKE2B 75067008e2b19ae5f79db1eaac07e5e01b9f0139d8e18c1b31edc0298bc2ce688f8115c6ae0a8d5a9a1d496338a57837fcfc60c2e97e75e370c1e195715bcdec SHA512 f266cc30e4f6a4cbc4e61c44a83450b714dc88a9873de30957d0ba34b5b923757676f581e49251f6ea06841d85095e9695b4938ba9174cd0dad937dbcef16e19
diff --git a/dev-libs/atcore/atcore-1.0.0.ebuild b/dev-libs/atcore/atcore-1.0.0.ebuild
index bf0f54ae861b..97a8acd4d301 100644
--- a/dev-libs/atcore/atcore-1.0.0.ebuild
+++ b/dev-libs/atcore/atcore-1.0.0.ebuild
@@ -1,9 +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
+EAPI=7
 
-inherit cmake-utils kde5-functions
+KDE_TEST="forceoptional"
+inherit kde5
 
 DESCRIPTION="API to manage the serial connection between the computer and 3D Printers"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
@@ -14,8 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc gui test"
 
-RDEPEND="
-	$(add_qt_dep qtcore)
+BDEPEND="
+	$(add_qt_dep linguist-tools)
+	doc? ( app-doc/doxygen[dot] )
+"
+DEPEND="
 	$(add_qt_dep qtserialport)
 	gui? (
 		$(add_qt_dep qtcharts)
@@ -23,12 +27,7 @@ RDEPEND="
 		$(add_qt_dep qtwidgets)
 	)
 "
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep linguist-tools)
-	doc? ( app-doc/doxygen[dot] )
-	test? ( $(add_qt_dep qttest) )
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -36,10 +35,7 @@ src_prepare() {
 	sed -e "s/${PN}/${PF}/" -i doc/CMakeLists.txt || die
 
 	use gui || punt_bogus_dep Qt5 Charts
-	if ! use test; then
-		cmake_comment_add_subdirectory unittests
-		punt_bogus_dep Qt5 Test
-	fi
+	use test || cmake_comment_add_subdirectory unittests
 }
 
 src_configure() {
diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest
index 94c472fe4828..2b717c51e99a 100644
--- a/dev-libs/chmlib/Manifest
+++ b/dev-libs/chmlib/Manifest
@@ -1,5 +1,5 @@
 AUX chmlib-0.39-stdtypes.patch 624 BLAKE2B 29de38c9de0faf7b924c0220a6ef77d338755fa57b87a120db99866b85cf7b8b4bdcacb2d5ba301eeecc6ed167384aceedf059f232a933ee920ff3ad8b9e1388 SHA512 123c28fb581c59f7aba886a0ef9ccdc31586411ad23a716759738075fa9006b2bb170f371c2e272dd21816fed3e426ab4259f16fd2ea9220c4eb005a9edf8194
 AUX chmlib-0.40-headers.patch 361 BLAKE2B 182336c3e3ac3c30226c4860315ecae2d6fec900a84e49b4f7daaa84ecf7ef1e249d46fb059978afa43ed00bffef6eb915ac19b1f78eff98714d9e633f642b5d SHA512 985cdee377e53f7df8d3d53aa305069fa138388397494094498415ec1b026bcb5e2e218ac91ed8977c930840a73f371124b0f7bdadbc1b79a65384b333a4b8d0
 DIST chmlib-0.40.tar.bz2 252036 BLAKE2B 69216120f7efcc7bfaa30faa46d9f2e2490923a6b42a766fe39838bda2b3b033ea39cb0c05eeab85a66b5a69f9297a6a412c375a2d790a463c7f6338610432fc SHA512 3a3e151cf455b19e9e7c163a1d1e5ac52e8196f0b98f77932c72af58f3517824b9244667a18279ae754ccea784f6d6ab0c47465e74e3768ce98bb7dca0ca16e3
-EBUILD chmlib-0.40-r1.ebuild 673 BLAKE2B 1bfc4aaef7e8e194be12f6f39f101eaadf04551c8022ce0351dccbf4d493af9d772a84cc91533179867d36d0f1c8562dadfda1774ff7f99287b31a973801386e SHA512 79f74ad99a764877e166fac9d4034aaae0eb2f8fc549599814d88ceb666477ad748f977363901de16ad471915171a308ae5867f3b4c449cf090701f4ad8aa8a9
+EBUILD chmlib-0.40-r1.ebuild 672 BLAKE2B 052abd5a10b896d68e5481f51fa3eaff8bd50a72e405453bd677387a0b6cc49250d4fcfa3dd26b6e44586a29c4922aaf7d1c7c0578498787502a6678b43e3349 SHA512 0bf187a17ecce9329122ff1706c17903cb7b121bfc5de2ca9a6b077db3abda38bcb24c0b9dd31eb43bd99b3d892cd94c1e3d62041474aebcfb670a37bcf25059
 MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
index 35950dbe8c05..7ac628a352ce 100644
--- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild
+++ b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.jedrea.com/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86"
 IUSE="+examples static-libs"
 
 PATCHES=(
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index bca1f45b59e1..fefe408a5577 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -7,5 +7,5 @@ DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb1
 EBUILD crypto++-5.6.5-r1.ebuild 1530 BLAKE2B df7d53463e39d86aa3eb905911e5ccdd6cd6ae435b4a51059978b68109c3448c555bbe91984f285671856d5ab7c98232cf2b171d154a01a97655d5aea14cf94b SHA512 f8065ac14fcffa77b75a439edcad34214d62a40184c27f79b073d4f788b2ef3b8667110ef9766d901ed69a25cb1f1639d494f4a0ad2e97391879821569b5a06b
 EBUILD crypto++-7.0.0-r3.ebuild 1077 BLAKE2B f6fda1242e5f9c5379b03793d1652a62596f8f3f97a507c19c7399e8418128908e82ca92494b485eff40d195e16a84009377208e9c83c49feb69d8b338a40edf SHA512 0088c1bc6c4a3e573955f14dab24da6e077699c147de1f3b18c3d76ab0d4073d20ddfb169691f2fee9c459a88d9662cc69d519224434c327d8c4b1dd36f6951b
 EBUILD crypto++-8.2.0-r2.ebuild 1757 BLAKE2B 4e5aeb50987810116a42540643ad205cdc11828da0d89ef07b15a8f8644de794bf855f01b8615f9f50ea0f02da2d62f170a8a6d83bd3c7f79e073bb4e7d4c446 SHA512 93432cd5e446b19c1f1d5d1c9efed7929b262fae0d558687b947bb39d498fadd3627718bfef831d807ab3be481b02e318be7aac10e244e330b2b298c6039f606
-EBUILD crypto++-8.2.0.ebuild 1123 BLAKE2B 5f96f1f27b7dcc79758766f7ee3f6ae19b8ca566344843add9a520af1ddc0940dc3f0a73503892933899189272c27a364a2bb09c577517b907293da74703749e SHA512 3cbfde17f99ce451a892fc88f42b1068f63a2af16ba26a73ee561f1d148025cd5dffc0806df301c5f4737527dd1093fde540f9e380f0b1b8478b2d1c5fa7d6c5
+EBUILD crypto++-8.2.0.ebuild 1122 BLAKE2B d87980a0e685c8920329464642f96d948811dc16788803e0526e687372908afd2404937b3cbe8b17804ff62b3df5844879a969f59ee23affd30aad6b248ac6d7 SHA512 2fe322606599bbb28f6f229dce588017072f9a9efb2c8acf837a1319692db32f7e026df1cc725d3fed7b4ba7cd122ece5273f6df3966614bab88dbaa2707e309
 MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
diff --git a/dev-libs/crypto++/crypto++-8.2.0.ebuild b/dev-libs/crypto++/crypto++-8.2.0.ebuild
index 25541d774a79..3adfa849d2f7 100644
--- a/dev-libs/crypto++/crypto++-8.2.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/8" # subslot is so version
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 3204f6348b1d..b4ebe3d72dc9 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,10 +1,4 @@
-AUX cyberjack-manpages.patch 812 BLAKE2B 07b3026d6f50aa89e7feff70bad0469e6feaed54f2316c13fd8a2a76a4ae1ce0d6efe6acc5746b230cdac062affc0ca376ad595548c6d7ae43417411edb75a1e SHA512 f92c59197e9b32f304ee18405c9d718715a3088a4d95a39e695e5733490ec941340086479f2e15caac5ce5158f6814f757abfd91f06ce904e95a9a90f6761b04
 AUX cyberjack-r1.rules 895 BLAKE2B b4a372c05db5efa74e4b433709e99a089d839a84b509c76612de220e80eb0940428bc5d461bc3a5dcc4095f08cfd66ffee2c3cc058c2aed6c0574e78c75513f9 SHA512 baeae4d96ffe6d965d123f54969595bc52f57b6f5c0418adad76b3f69ee2365c9840956ca37eb8ac8478f5a90971b4101bef95aba40711b1a4feb4be49f99a8c
-AUX cyberjack-returnvalue.patch 930 BLAKE2B 2d94676c129896f88bdcc1422ab9ac46926ceec2a36d44cf1dd61ad75aa73dc00b6d099ee432444c8b9c623d30ee34298cdf5700db8187114b35a9edbc1e579d SHA512 437e4515bf3a2809ad69ad89c00b7b4c09f54bcc983a45449127135d5202ef166f6d1962f898329860d76ef487f02b2d1a366de9759e63e89c2fc8f6e8759d2b
-DIST pcsc-cyberjack-3.99.5final.SP11.tar.bz2 965662 BLAKE2B 568eb77c9b35557fb9f4c4f038cf6d7cd3700938fe905c8c3587ee6bd4254595d6665f199913bde3c4f03050d8e8c6006dee9222941ad1dfd0190fa33283f15c SHA512 4d63ef0442c7e919456e8b6ab1d571ab621eb45fc34fc9b61a7a024f1ae2115f7474b4aa538ee7fb8bf4ce016067c876d9970b52e6b4e8b531e2d736677ab794
-DIST pcsc-cyberjack-3.99.5final.SP12.tar.bz2 957583 BLAKE2B 02499e2e366a2caaf4881ff3db99600990ef18ef2b4dc202c5d66a2e708f5107b4c76b56021349c8e4169be2e1d12de0317680ea9502a65a89c96969b8341e13 SHA512 53993471c96caa5a802c0aff32595698dfd550f89906f2141f4d89db75da0870da60f62565604485643dfd1af35a06dde7f895b4a9fa6b39634ee8d5692b50fd
 DIST pcsc-cyberjack_3.99.5final.SP13.tar.gz 1617714 BLAKE2B 344f00217fa5dfb18e5318d2b8ccb88a3cc12b86a9c14d41a9800d701d0fc7a0a486a0b3c05188d07d1f7c51c4c514c48a55d987d8d9d2af574f427e550c8654 SHA512 74ac56a0f74a69006c87e2c22e147b65d26582d29753de03d56e4ad76413f4477a031d47f5eb074323b4ffd000b0908a1fb2b12fb7d91e9b3ee67e983e09e968
-EBUILD cyberjack-3.99.5_p11.ebuild 1800 BLAKE2B f19269d69cfcb7e080213d5b06e11b9f39c839b76f0bb5dc35aa4f2411fc7af4a9f5d7e38b4a93c4aee8519cf4a4177424fa54724f7d777315ce4205f5ea7e29 SHA512 801ed1eb4d1e075ea51ff068bb9ba817eeb9bb5e0dbae0b41121b562439d9ba9b096cde776c8bffcf441a26a6e246e97b48d9499c280586870cd60b1d7139bfe
-EBUILD cyberjack-3.99.5_p12.ebuild 1911 BLAKE2B 0c1088a95e833594dd288ed9f4304cf0114a906006decfa6f672d9236cdc0b809c2d7a63f6f08a384e968fb2a46d955b4834e7a6e6800ce25f6fbfe5e5786d25 SHA512 26685c406eeba3219780172c5ed699942ac99bdd17b9e018e36785b253f26aa67e3d37320e3293dbeea5da88ab5ea8ff7060460ab5b2b319adf2f932cf26c77e
 EBUILD cyberjack-3.99.5_p13.ebuild 1909 BLAKE2B 89a8930abaf196be95b6657497a5756469ffb0d1021aea7fb383aa4cbe0a44bdf4f19eb89e91908f79afcefd42d48c9c66d89ddc645270c610c2d7fce4fcd945 SHA512 e639adafff9fbc49deafaba8c35886bc3efb260a37dfdcd18200b70a6fb43cfa8781609e5ab87fbeb844c9bf10908d5a880468130c6522e592062bda29040862
 MISC metadata.xml 741 BLAKE2B 1660cf6afa7c5988573bb7a651560b0ce38832ad7149784aabd2589407c3d6fff7a9a76a0ee3bef81c1e3efaa46c8733e7e8de724d07bff7766280ebb8dcc4be SHA512 442fce5186e7a04e0d96b2d179db3438a4d7b8f0b5b11443d494d8b0203881c63dd4e4238eae594ad5c15b7eab683c7d35d50d24e147ce896128784ffe7442bf
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p11.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p11.ebuild
deleted file mode 100644
index 72c222da879f..000000000000
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p11.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools versionator eutils linux-info toolchain-funcs udev
-
-MY_PV="${PV/_p/_SP}"
-MY_PV2="${PV/_p/final.SP}"
-MY_P="pcsc-${PN}-${MY_PV2}"
-#MY_P2="${PN}-$(get_version_component_range 4 $MY_PV)"
-
-DESCRIPTION="REINER SCT cyberJack pinpad/e-com USB user space driver library"
-HOMEPAGE="http://www.reiner-sct.de/"
-SRC_URI="http://support.reiner-sct.de/downloads/LINUX/V${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs threads +udev +usb"
-
-# FIXME:
-# xml is actually optional but the code is still used anyway. We'll have to wait
-# until upstream fixed it.
-COMMON_DEPEND="sys-apps/pcsc-lite
-	usb? ( virtual/libusb:1 )"
-RDEPEND="${COMMON_DEPEND}
-	udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-#S=${WORKDIR}/${MY_P2}
-S=${WORKDIR}/${MY_P}
-
-DOCS="debian/changelog doc/README.txt"
-
-pkg_setup() {
-	CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-manpages.patch"
-	epatch "${FILESDIR}/${PN}-returnvalue.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/${PN} \
-		--disable-hal \
-		--enable-pcsc \
-		$(use_enable static-libs static) \
-		$(use_enable usb nonserial) \
-		$(use_enable threads) \
-		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	use udev && udev_newrules "${FILESDIR}"/${PN}-r1.rules 92-${PN}.rules #388329
-}
-
-pkg_postinst() {
-	local conf="${EROOT}etc/${PN}/${PN}.conf"
-	elog
-	elog "To configure logging, key beep behaviour etc. you need to"
-	elog "copy ${conf}.default"
-	elog "to ${conf}"
-	elog "and modify the latter as needed."
-	elog
-}
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p12.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p12.ebuild
deleted file mode 100644
index be9c7598650b..000000000000
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p12.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN="pcsc-${PN}"
-MY_PV="${PV/_p/final.SP}"
-MY_P="${MY_PN}-${MY_PV}"
-
-inherit autotools linux-info toolchain-funcs udev
-
-DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
-HOMEPAGE="https://www.reiner-sct.de/"
-SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="static-libs threads tools +udev +usb xml"
-
-RDEPEND="
-	sys-apps/pcsc-lite
-	usb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
-	xml? ( dev-libs/libxml2:2= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-debug
-		--disable-error-on-warning
-		--disable-hal
-		--disable-mac-universal
-		--disable-mac-arches-i386
-		--disable-mac-arches-x86_64
-		--disable-visibility
-		--enable-pcsc
-		--enable-release
-		--enable-warnings
-		--sysconfdir="/etc/cyberjack"
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(use_enable udev)
-		$(use_enable usb nonserial)
-		$(use_enable xml xml2)
-		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use tools; then
-		# cjBingo can't be compiled, as it's defines stuff, which got dropped
-		cd "${S}"/tools/cjflash && emake
-		cd "${S}"/tools/cjgeldkarte && emake
-	fi
-}
-
-src_install() {
-	default
-
-	use tools && dobin tools/cjflash/cjflash tools/cjgeldkarte/cjgeldkarte
-
-	use udev && udev_newrules debian/libifd-cyberjack6.udev 99-${PN}.rules
-
-	dodoc debian/changelog doc/{LIESMICH,README}.{pdf,txt,xml}
-
-	docinto html
-	dodoc doc/{LIESMICH,README}.html
-
-	docinto source
-	dodoc doc/*.c*
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/cyberjack/files/cyberjack-manpages.patch b/dev-libs/cyberjack/files/cyberjack-manpages.patch
deleted file mode 100644
index 98568f34910d..000000000000
--- a/dev-libs/cyberjack/files/cyberjack-manpages.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e5d3ac2ab70cb773671a63dfed45816d6e24d36d Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Thu, 13 Feb 2014 21:40:48 +0100
-Subject: [PATCH 1/3] Fix installation of man pages
-
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
----
- doc/Makefile.am | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index a0a68f4..cba2e30 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -6,14 +6,12 @@ DOCFILES=\
- #docfiledir=$(datarootdir)/doc/$(PACKAGE)
- #docfile_DATA=$(DOCFILES)
- 
--manpagedir=$(mandir)
--manpage_DATA= \
--  cyberjack.8
-+man8_MANS=cyberjack.8
- 
- EXTRA_DIST=\
-   README.xml LIESMICH.xml \
-   verifypin_ascii.c verifypin_fpin2.c \
--  $(DOCFILES) $(manpage_DATA)
-+  $(DOCFILES) $(man8_MANS)
- 
- 
- %.ps: %.xml
--- 
-1.8.3.2
-
diff --git a/dev-libs/cyberjack/files/cyberjack-returnvalue.patch b/dev-libs/cyberjack/files/cyberjack-returnvalue.patch
deleted file mode 100644
index 0bdf275ff0c8..000000000000
--- a/dev-libs/cyberjack/files/cyberjack-returnvalue.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b6d3ab6d0324f8b462f57aaa551bd1d4aa1465f3 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Thu, 13 Feb 2014 22:19:40 +0100
-Subject: [PATCH 2/3] Fix return value of rsct_platform_create_com if
- --disable-nonserial
-
-Return NULL instead of CJ_ERR_OPENING_DEVICE (int).
-
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
----
- cjeca32/Platform_unix.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cjeca32/Platform_unix.cpp b/cjeca32/Platform_unix.cpp
-index e3f4997..cbe6876 100644
---- a/cjeca32/Platform_unix.cpp
-+++ b/cjeca32/Platform_unix.cpp
-@@ -54,7 +54,7 @@ CBaseCommunication *rsct_platform_create_com(const char *deviceName, CReader *re
-     com=new CUSBUnix(deviceName, reader);
- # else
-   /* libusb and libhal not supported for serial devices */
--  return CJ_ERR_OPENING_DEVICE;
-+  return NULL;
- # endif
-   else
-     com=new CSerialUnix(deviceName, reader);
--- 
-1.8.3.2
-
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 81dc7fa20352..d3595cce9fc5 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,6 +1,4 @@
 AUX 0001-CMake-install-to-correct-lib-dir.patch 1957 BLAKE2B a8139d2c7474b96526ba983a3d66ae406c5239f04585b0c9156b9f85ce456924ebf6cc0fe052c48670229fbe86523ba40a7d0d37cfd2badc54d0b6cb4b99e8b9 SHA512 1145dffdba811bc09dd76c0f39fc6bae275a1c94ca4700bfa0487db85f48e3a899c0010af39549990d2610bac3d5f0fd6b0faeb000b6c8cd22e2bc6f2c0f8069
-DIST double-conversion-3.0.3.tar.gz 7019705 BLAKE2B 65d7729b55dbb9fd0cf31b258738f3e9f3350b4ecf0204d3d2d23de24cb24651788e844aa1a10d6ec452ca6484c43ed1d218d434fc18be7bb1f15bf8ba97102a SHA512 3a8e956da485195753508c90cd6fa3d9fde42103291a8e65a0d95488faa02e98dddff21935625519c0ce49d8911d66d0773ddf6012264094f3edd851b461f62b
 DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
-EBUILD double-conversion-3.0.3.ebuild 1345 BLAKE2B 054cea2fe264a7f76cd26b48a72718eb806c22a89e47b697b8163618c62dd4c6c112c9030aef9bf42487c63c004413ca86faef3cc99b00132077de4755dc694a SHA512 5f525223d86923f672e0652effd7b30dfcbffa4b507ab4c5151d00b3b427e45619f50eaa4f80ef4750f02041440f47360636436ce4ba19cff6fa2f0b1e19a1e4
-EBUILD double-conversion-3.1.4-r1.ebuild 1399 BLAKE2B 41fcdb92091dffbad28efd3a25f5425e933f0aa44feb61c15ae154201d86e4d974a2616bbc6cccabf9adc525e6d72548986d014ce064700251f7b0cd9c5e1a94 SHA512 6d9f7c9ee007f7166c62f0bc723c2f8f6028ea9e2d1e3ea49785c758bcc7b0b50f089f28059798ba0341c3d6fd8e50323896ba35d443971bce1d38ba68d0854f
+EBUILD double-conversion-3.1.4-r1.ebuild 1398 BLAKE2B 3ce942a00feab680f84419f6c0856a3183d92a9882ca2693bafb15a3839a43bd793f2b74f77e04d8e4203979601f0a6ae1378c8ff628148be61fa4cb57970543 SHA512 62fc3748978c6d7c111566a83006eb0799a545b6b2fc4acb82250f5af523aebe32fa1473a33f538ce02f2b639b882b76b18613fa1a5670848838f534a0b9344c
 MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.0.3.ebuild b/dev-libs/double-conversion/double-conversion-3.0.3.ebuild
deleted file mode 100644
index cc79bf788840..000000000000
--- a/dev-libs/double-conversion/double-conversion-3.0.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multibuild
-
-DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
-HOMEPAGE="https://github.com/google/double-conversion"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
-		if [[ ${MULTIBUILD_VARIANT} = shared ]]; then
-			mycmakeargs+=( -DBUILD_SHARED_LIBS=ON )
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
-			mycmakeargs+=( -DBUILD_SHARED_LIBS=OFF )
-		fi
-
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
-}
-
-src_install() {
-	myinstall() {
-		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_install
-		[[ ${MULTIBUILD_VARIANT} = static-libs ]] && \
-			dolib.a ${BUILD_DIR}/double-conversion/libdouble-conversion.a
-	}
-
-	multibuild_foreach_variant myinstall
-}
diff --git a/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
index 9497111c5428..39708b29059a 100644
--- a/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 PATCHES=(
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 9c4dbde2c989..0631199853fe 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -3,4 +3,4 @@ DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3
 DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
 EBUILD efl-1.21.1-r3.ebuild 6637 BLAKE2B e8846787fa6d2a5767468468625492bb0794fd76a53ae8b08a204c3ce6d2950a96ce15fb7fb2d7fd7f98313f7c06124ce97638909fd34e8d8c979e3382110f77 SHA512 67874905f334701605d886c5f75a82b027c4c418c87f8e495b1449b3d3b79d544172b5be8a180098656ee620eeb46eeb805695dbeaa242d2301a8ea0f8c4710b
 EBUILD efl-1.22.2.ebuild 6879 BLAKE2B f6d0200b055bfe235b08053982243b64e4cdaa5290e91c173e86918a839a69a45385256651b0d013f6c0a854ac9d7dfd6281c9d8a529ba175d54e410081b2f10 SHA512 914afb7338f7c9889a35fc1e72bf4699439496e3c37aac13b83635a8cade901abcb17b45ebd0fd899fd7c725d546d767fc2e0b7db6ac42e2a64bdadd380f4f9c
-MISC metadata.xml 2006 BLAKE2B 38ab4b1c584a3e44389d22fff8e44111f8c60555f6de2110e1689c5fdb460e5fe473c4e688a9807313f839c64f5689487fe4082c33c816fa8b1e7267b4f06e80 SHA512 f9b09075773de10f6ecb37a5e470065fdedf3cbdd9067289299d10d78b98c96c95f2bc6fef868ae211787ba15b10c1ea4d24a7555d8fd500220a71eb7686d9af
+MISC metadata.xml 1920 BLAKE2B 01decb622aae3e01bf59d93d48b4babc5e2f63a1499f0daeedd1e9b513f2e7a41819caf3a8f738d49333a2b538d3231d0355ed216edb6313e0c587281f4a9bfe SHA512 ae1c2f5791cf991940eff5333747cd3591b8d03048b99fe4ff1acf442c964f7e56ff0de60cc275205f871b937ef369e9e24342368e69c565fc2efe87931df5b4
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 5920ddfb2a91..a67c1169284c 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>juippis@gmail.com</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>juippis@gentoo.org</email>
+		<name>Joonas Niilola</name>
 	</maintainer>
 	<use>
 		<flag name="bmp">Enable WBMP image loader</flag>
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 030d27023679..bffb96ac0185 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -8,6 +8,6 @@ DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f
 EBUILD elfutils-0.170-r1.ebuild 1790 BLAKE2B 2581434109a567bc3c57d6ebaf6b1416377d2fbfcc1cadc51efbefa02caab505dcdfa22e58b33c80ce37637c5abb1559ebdb117999eb5f552095f85da8f0dafc SHA512 22d72fdb2e2c1e8d4e1d47113a8c0d6aeb2e8e7b9f0759d445e32509c7bce9cc6dc8edd38e12ffa556447981fc60c7a04df76fd6d529b79d07d28cb10314f6ce
 EBUILD elfutils-0.173-r1.ebuild 1909 BLAKE2B ed2992e3c50b9ea4885f434d074782db9b3af7570ae2eefd99c17b6c7cc58a16b3774a4c54545e644ce9ac159f79dbdd0ba22442d2a0cbe098218c2e2016f546 SHA512 9a62caf142a53c2b3ab7da0250235536e6911f0a905a1d56a8ba2469f23c7d11c2a068b22985fce38e5fa1bc00f3a4db6ffd823c69625ffc2914df9699ede12b
 EBUILD elfutils-0.173-r2.ebuild 1961 BLAKE2B 3dbfbcc53a801468deebbc25a9b3c128b85d580fab3c8aafc8b29da3897011f119cf31c47b141289f718d0a72683682db07ebe466f3cb6bdb3de89d69c4cc7c6 SHA512 6696b9f1cc0cfba128049a21186822760a038cf775563f7785efff20697f7324831171ca2a0bd64c43fba1668a4190c6536f034a0f2abd096a5bd1d1faf2a570
-EBUILD elfutils-0.176-r1.ebuild 1948 BLAKE2B 177b79958b59b3bba3dd8ce923892c127df2ba9631eb717c54c9c4b1fcb3f2361959f3f966c8f173f636c558cff2e6e2f81222c19c9594d758d045ad6d7105e6 SHA512 3d5fc5eb409762d2991da463211f0a5cb56c0eb1c3d9a0e9c1c9a3e0eb248d7630dcb44972a7ebb3e36b9e35765d9a3a3b990c5bc3c66141e76a24f5a634365f
+EBUILD elfutils-0.176-r1.ebuild 1944 BLAKE2B 5c5068ba8d9eef2406a918bb7fa4eaa65a54dd84198e16bf3cd33025129f7fbeb2180f1e0ca9c0d427a61a26b5660d1624fa371565ad9657b275b5907572ac5f SHA512 1a98e8a45115fdbcbf68924d1cfa87b7df8fcbb50b45860a2fb8dbb3691d4d5bb9153af14d9959035b2bd1b711868dfe7c98d064ef7a6c3659bb6192defd11f7
 EBUILD elfutils-0.176.ebuild 1915 BLAKE2B 2c30c4718da7fc0cf5c16eedda0f460d1e495b92616c5ebfaa667b6df10d7e194ba6a069dde660a8596794acf90c3c9a6bcc172dc914749eb06a8612858c3e8c SHA512 114f21a0334433cb5b365710e4c57bc386b750feb40d72562138b986de55b88e4d468eb57cfbe0668b5f3210cd5c6e3587ba94ed6725bfbab4e8fa89fad4556a
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.176-r1.ebuild b/dev-libs/elfutils/elfutils-0.176-r1.ebuild
index 7bf915293aa6..f6d8d331ff9c 100644
--- a/dev-libs/elfutils/elfutils-0.176-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.176-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 2f4b0ad02a17..ce297b08f3f6 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,5 +1,5 @@
 DIST expat-2.2.6.tar.bz2 513322 BLAKE2B 386736da1f2204fa8f15ee4d1b3d11f01ed691efe6951b9f24f2bd30ab5494e75da6a97ceb1ffe4a0a8ecdc80f96f51d21c54f35a2cbc352a9fe9425545bf15b SHA512 dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6
 DIST expat-2.2.7.tar.xz 424264 BLAKE2B acf2fa5cf374a671603f4a12b81239ba3b1634bab66d736e87fb516ce52d599711b3014218bef822640781b8852c7238b6f071b5bd439a13838fcbc7767d06a7 SHA512 bf3af5b5a8e1a1b76658a41f67dbe7b10104e3b724e1882f529fecc509b07c75dde02d8f8b89b1522e05484e8dc417d47651c5f8d4aac1749676ba5c4752c107
 EBUILD expat-2.2.6.ebuild 2496 BLAKE2B 62a7621cad6cd7f5fab49320a6ad0221a5813495378da71e56c745f773b8aae512e1c6c543ac732ae1305a52c8330cbc68aea6b1284c40597fd9d7b58ae96911 SHA512 e72be5b7ef4176b6717858b7a0fee719cf924baa4c320c68425270e0d827bc9ef3d5bea5b466a8a01c854ea347e7b11e69b4216d28ed2b70f69db57921d316dd
-EBUILD expat-2.2.7.ebuild 2516 BLAKE2B 9e8d56aacd20cc7f5e7c7866b53183fbc83fa0833235d62b946a77913c8f2fbe62b074b3ca3438029511e826f79865c98a84f284f9824a48d11f44958adb1f51 SHA512 5383702085fa9c241acf623ceb52512b348b6ee5eb20f71478796aa7a5e448a7e2032bb3a6277745107dd7ee7fde07761d6ba067a398ff93e50b5b313788174e
+EBUILD expat-2.2.7.ebuild 2514 BLAKE2B 5e143de91fff2676a2162b1da379bb0f2931e5d16558cb0799af7cd171e6459bedf5865c12e318b3f50a9f65486e6a1d907c20c72f6247cc21869e92dea46ec7 SHA512 c80e08e274a162b0b220dc099c50ee6aadfb4b183f941cfe1787bd2d8fa2b0c06ef11ad469c5b8076c46bab20f671a906490a542c397f3681919b8887cc14b4e
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.7.ebuild b/dev-libs/expat/expat-2.2.7.ebuild
index fae01371c50f..2009a2850eb8 100644
--- a/dev-libs/expat/expat-2.2.7.ebuild
+++ b/dev-libs/expat/expat-2.2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index a1a0761c9626..a176cddfe7b9 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,4 +1,5 @@
 AUX 0.11.4-vala-0.42-compat.patch 1073 BLAKE2B 06381277531ded9adda4dc6246176de7f1d6243d05746b667071d76f9e7246d63b8a56aa51b364c02e8ef5c3aa924109d4e9c01a9b311868f66287b769443e45 SHA512 f925fe81d6422fd73aa1b0b624d8bbc7a18f029ed8e806a418c752d32a084d6c2d8b8d205e8a5d65a5a6e6f212c00165b70377f7c6e6caf1d84d7bcd31a7f0fc
+AUX 0.11.4-vala-0.42-tests-compat.patch 1445 BLAKE2B 913bb02f130c5f0d0485afa7c270c885cfac6e22d71fd53c0dffb2098659ac0dd27a57fa18641a0cee3b23bf394222a91dfd32c4e7c604e77c6a69ff4fd799f0 SHA512 61c32261a8eaefa381131c4f3115940d72a5b5af451d80a86d2d391b403436466f57d319fac97b4ab1a083c8b87bad656d2dc33f863bc9b0761c9b9275eb7162
 DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
-EBUILD folks-0.11.4-r1.ebuild 2478 BLAKE2B 1374b653afb4d043e01eeba556839b32914bd7cd3fba274b431f0ff53d3843a9e7c097cc12df6a12f824122de95a1a151f3e50decb92dc34c490af50428089ed SHA512 cdc7da518c16b6be0110802d3974b9128c86b33acf8aafac1dae7b4680eaa17271948d28867e950084bdbca1eb54f76e41f6830f9906e7e8a0e1d6c99116295c
+EBUILD folks-0.11.4-r1.ebuild 2556 BLAKE2B ca413a1c56321b6c610b3e76c466d67bc192cc39686bb217b78a35a92b45d83ae6f8853fae47308290e112a3ec8b0155fb10c456ca82e5dedd290e3520e82eda SHA512 ebf3b45d6501a313a03423b14bbfbb9c0ae64db08eb259eeed8e017827e659fc8c166c7a17f7bf7355191f9f2eddef9d3e7cf49f40762db13a55e7ee54f22061
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
new file mode 100644
index 000000000000..7b453ebf1a9f
--- /dev/null
+++ b/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
@@ -0,0 +1,39 @@
+From 600e2d42e6097502ec0c42ab257d08fc0ca7933a Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 30 May 2018 14:20:27 +0200
+Subject: [PATCH] tests: Use FileAttribute.* enumeration
+
+---
+ tests/folks/avatar-cache.vala | 2 +-
+ tests/folks/object-cache.vala | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/folks/avatar-cache.vala b/tests/folks/avatar-cache.vala
+index d25245c0..ee32e9e4 100644
+--- a/tests/folks/avatar-cache.vala
++++ b/tests/folks/avatar-cache.vala
+@@ -78,7 +78,7 @@ public class AvatarCacheTests : Folks.TestCase
+     {
+       // Delete the files in the directory
+       var enumerator =
+-          dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
++          dir.enumerate_children (FileAttribute.STANDARD_NAME,
+               FileQueryInfoFlags.NONE);
+ 
+       FileInfo? file_info = enumerator.next_file ();
+diff --git a/tests/folks/object-cache.vala b/tests/folks/object-cache.vala
+index 62d208e6..f2a5188d 100644
+--- a/tests/folks/object-cache.vala
++++ b/tests/folks/object-cache.vala
+@@ -108,7 +108,7 @@ public class ObjectCacheTests : Folks.TestCase
+     {
+       // Delete the files in the directory
+       var enumerator =
+-          dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
++          dir.enumerate_children (FileAttribute.STANDARD_NAME,
+               FileQueryInfoFlags.NONE);
+ 
+       FileInfo? file_info = enumerator.next_file ();
+-- 
+2.21.0
+
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
index e3dd9684ea10..58d08c1764a1 100644
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ b/dev-libs/folks/folks-0.11.4-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
+VALA_MAX_API_VERSION="0.42"
 
 inherit gnome2 vala virtualx
 
@@ -58,6 +59,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-vala-0.42-compat.patch
+	"${FILESDIR}"/${PV}-vala-0.42-tests-compat.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 47795c9403b1..b2f4a9e64b2c 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,5 +1,9 @@
+AUX 2.58.3-CVE-2019-12450.patch 2807 BLAKE2B 68835ace4cd450bebc79d03059a03af313044a3f0d27bc4c33124c98dcbb3e20db525b2cbf7ec31627ce79754c3dfb86de7e97a7cbaab4709608a7ddb2015fc1 SHA512 ee6a1ee0ba89817be4e77cbfbfe8f25ad056d2a89f16aaf721b88e616e46374ac1e8488f1c4fc1fb689c260a3d0f9a54c7eddd826a77816830dc656d5698cd28
+AUX 2.58.3-gdbusmessage-limit-fix.patch 4343 BLAKE2B 07841524575efd1124d2f0956f27b27b016987786f388b9b76d6afc8e9f4eea2814b2d7d08ffb5721ae2d957a533066c407339baeb6f55d37d1f6d730e6ebf25 SHA512 c76a9b5ebbac0b596090fa4f5032ce62b3f985e9a5bd383a759f9014da8c33e27e0ea1a75d7796748a0f0ee751545a12c346d555e3ddafa82822cd9d5ab49e1b
 AUX glib-2.58.2-external-gdbus-codegen.patch 5452 BLAKE2B caf66af10958c1e6672a615965ec45f76d4fe9f58599f3d09ecee543e1b5e47a49014f7ef7a6f4e0030370935c4f82ab11b3a81ca42fc09153f02e355400dd55 SHA512 d36ac5d4fa810524795d099c218604b0db22dbc7fe9ba57821fdad292725d9c159b24cc224d1bd68824dc24ddb1f1e7c6878dbc36a3b0a8188f9e01a4b6c5ea0
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
+DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD glib-2.58.3.ebuild 10681 BLAKE2B ea7385a9f381d9b102e7dae86d4de4d9fca14de5165ca4db712d38da71fb589de6fed92541e754374f1630d303229d64e8047e6e97147b35431d4ed4da961a11 SHA512 39a83019b721c1386e40dc08836125a880faf741f4066d7b77246a30f358f71277fe45bc0f71bdd9b8aa802c2f738e93697c16d17a1304ce2700374134f214a9
+EBUILD glib-2.58.3-r1.ebuild 10907 BLAKE2B c600133aa1db3ec6d7171d83c59fdb6da341d2c074847770b88828c34e0616819882ff3604d79291e621b18724b8ae2e57fd5cf1fd9250ac31622d2de2157887 SHA512 011fdbe52c49f32682f5735ba4332e25e87b5ed8efe3da9c5fd543c282ea7932deb11d05cb93b6ab92460f0d545e0c7cb3798c4c3f736b58e9b5ca3ee388e1eb
+EBUILD glib-2.60.6.ebuild 10141 BLAKE2B abe763f0a4fa391af9471f3d7c2063014c7a4fa10479892fd6c3aae5a4b7f5ce82b67e86bd239ed059cd9c971e7820abb31eda89eb6772cc2431c7363a10bd0f SHA512 4e7fa4071683e1fe082ba100e84aaed82d18730e463ce74d65e05d38ff8b5495239ec479a5af1ba5372f6c9138a53de195be875fb9b2378743ce8be880dd1d29
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch b/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch
new file mode 100644
index 000000000000..949ac56431f1
--- /dev/null
+++ b/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch
@@ -0,0 +1,53 @@
+From e6b769819d63d2b24b251dbc9f902fe6fd614da3 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Thu, 23 May 2019 10:41:53 +0200
+Subject: [PATCH] gfile: Limit access to files when copying
+
+file_copy_fallback creates new files with default permissions and
+set the correct permissions after the operation is finished. This
+might cause that the files can be accessible by more users during
+the operation than expected. Use G_FILE_CREATE_PRIVATE for the new
+files to limit access to those files.
+---
+ gio/gfile.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/gio/gfile.c b/gio/gfile.c
+index 1cc69166a..13b435480 100644
+--- a/gio/gfile.c
++++ b/gio/gfile.c
+@@ -3284,12 +3284,12 @@ file_copy_fallback (GFile                  *source,
+         out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
+                                                                    FALSE, NULL,
+                                                                    flags & G_FILE_COPY_BACKUP,
+-                                                                   G_FILE_CREATE_REPLACE_DESTINATION,
+-                                                                   info,
++                                                                   G_FILE_CREATE_REPLACE_DESTINATION |
++                                                                   G_FILE_CREATE_PRIVATE, info,
+                                                                    cancellable, error);
+       else
+         out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
+-                                                                  FALSE, 0, info,
++                                                                  FALSE, G_FILE_CREATE_PRIVATE, info,
+                                                                   cancellable, error);
+     }
+   else if (flags & G_FILE_COPY_OVERWRITE)
+@@ -3297,12 +3297,13 @@ file_copy_fallback (GFile                  *source,
+       out = (GOutputStream *)g_file_replace (destination,
+                                              NULL,
+                                              flags & G_FILE_COPY_BACKUP,
+-                                             G_FILE_CREATE_REPLACE_DESTINATION,
++                                             G_FILE_CREATE_REPLACE_DESTINATION |
++                                             G_FILE_CREATE_PRIVATE,
+                                              cancellable, error);
+     }
+   else
+     {
+-      out = (GOutputStream *)g_file_create (destination, 0, cancellable, error);
++      out = (GOutputStream *)g_file_create (destination, G_FILE_CREATE_PRIVATE, cancellable, error);
+     }
+ 
+   if (!out)
+-- 
+2.20.1
+
diff --git a/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch b/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch
new file mode 100644
index 000000000000..0828132003d3
--- /dev/null
+++ b/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch
@@ -0,0 +1,120 @@
+From 2d655ef8954695cabf9e99cc61411de2bb4cb847 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <withnall@endlessm.com>
+Date: Mon, 28 Jan 2019 14:36:42 +0000
+Subject: [PATCH] gdbusmessage: Fix check on upper limit of message size
+
+There was a typo in the figure checked against. Add a unit test.
+
+Signed-off-by: Philip Withnall <withnall@endlessm.com>
+
+https://gitlab.gnome.org/GNOME/glib/issues/1642
+---
+ gio/gdbusmessage.c        |  2 +-
+ gio/tests/gdbus-message.c | 72 ++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 72 insertions(+), 2 deletions(-)
+
+diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
+index 169e6fd15..2ad51f888 100644
+--- a/gio/gdbusmessage.c
++++ b/gio/gdbusmessage.c
+@@ -1984,7 +1984,7 @@ g_dbus_message_bytes_needed (guchar  *blob,
+                    "Unable to determine message blob length - given blob is malformed");
+     }
+ 
+-  if (ret > (2<<27))
++  if (ret > (1<<27))
+     {
+       g_set_error (error,
+                    G_IO_ERROR,
+diff --git a/gio/tests/gdbus-message.c b/gio/tests/gdbus-message.c
+index 88a9c5d86..74e0f712e 100644
+--- a/gio/tests/gdbus-message.c
++++ b/gio/tests/gdbus-message.c
+@@ -141,6 +141,74 @@ message_copy (void)
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
++/* Test g_dbus_message_bytes_needed() returns correct results for a variety of
++ * arbitrary binary inputs.*/
++static void
++message_bytes_needed (void)
++{
++  const struct
++    {
++      const guint8 blob[16];
++      gssize expected_bytes_needed;
++    }
++  vectors[] =
++    {
++      /* Little endian with header rounding */
++      { { 'l', 0, 0, 1,  /* endianness, message type, flags, protocol version */
++          50, 0, 0, 0,  /* body length */
++          1, 0, 0, 0,  /* message serial */
++          7, 0, 0, 0  /* header length */}, 74 },
++      /* Little endian without header rounding */
++      { { 'l', 0, 0, 1,  /* endianness, message type, flags, protocol version */
++          50, 0, 0, 0,  /* body length */
++          1, 0, 0, 0,  /* message serial */
++          8, 0, 0, 0  /* header length */}, 74 },
++      /* Big endian with header rounding */
++      { { 'B', 0, 0, 1,  /* endianness, message type, flags, protocol version */
++          0, 0, 0, 50,  /* body length */
++          0, 0, 0, 1,  /* message serial */
++          0, 0, 0, 7  /* header length */}, 74 },
++      /* Big endian without header rounding */
++      { { 'B', 0, 0, 1,  /* endianness, message type, flags, protocol version */
++          0, 0, 0, 50,  /* body length */
++          0, 0, 0, 1,  /* message serial */
++          0, 0, 0, 8  /* header length */}, 74 },
++      /* Invalid endianness */
++      { { '!', 0, 0, 1,  /* endianness, message type, flags, protocol version */
++          0, 0, 0, 50,  /* body length */
++          0, 0, 0, 1,  /* message serial */
++          0, 0, 0, 8  /* header length */}, -1 },
++      /* Oversized */
++      { { 'l', 0, 0, 1,  /* endianness, message type, flags, protocol version */
++          0, 0, 0, 0x08,  /* body length (128MiB) */
++          1, 0, 0, 0,  /* message serial */
++          7, 0, 0, 0  /* header length */}, -1 },
++    };
++  gsize i;
++
++  for (i = 0; i < G_N_ELEMENTS (vectors); i++)
++    {
++      gssize bytes_needed;
++      GError *local_error = NULL;
++
++      g_test_message ("Vector: %" G_GSIZE_FORMAT, i);
++
++      bytes_needed = g_dbus_message_bytes_needed ((guchar *) vectors[i].blob,
++                                                  G_N_ELEMENTS (vectors[i].blob),
++                                                  &local_error);
++
++      if (vectors[i].expected_bytes_needed < 0)
++        g_assert_error (local_error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT);
++      else
++        g_assert_no_error (local_error);
++      g_assert_cmpint (bytes_needed, ==, vectors[i].expected_bytes_needed);
++
++      g_clear_error (&local_error);
++    }
++}
++
++/* ---------------------------------------------------------------------------------------------------- */
++
+ int
+ main (int   argc,
+       char *argv[])
+@@ -151,6 +219,8 @@ main (int   argc,
+ 
+   g_test_add_func ("/gdbus/message/lock", message_lock);
+   g_test_add_func ("/gdbus/message/copy", message_copy);
+-  return g_test_run();
++  g_test_add_func ("/gdbus/message/bytes-needed", message_bytes_needed);
++
++  return g_test_run ();
+ }
+ 
+-- 
+2.20.1
+
diff --git a/dev-libs/glib/glib-2.58.3.ebuild b/dev-libs/glib/glib-2.58.3-r1.ebuild
index c06063efcc31..1008e0119875 100644
--- a/dev-libs/glib/glib-2.58.3.ebuild
+++ b/dev-libs/glib/glib-2.58.3-r1.ebuild
@@ -124,6 +124,11 @@ src_prepare() {
 	# gdbus-codegen is a separate package
 	eapply "${FILESDIR}"/${PN}-2.58.2-external-gdbus-codegen.patch
 
+	# gdbus message upper limit check fix from glib-2-58
+	eapply "${FILESDIR}"/${PV}-gdbusmessage-limit-fix.patch
+	# gfile copy fallback security fix (wrong permissions at start)
+	eapply "${FILESDIR}"/${PV}-CVE-2019-12450.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
diff --git a/dev-libs/glib/glib-2.60.6.ebuild b/dev-libs/glib/glib-2.60.6.ebuild
new file mode 100644
index 000000000000..9baebc14a8f0
--- /dev/null
+++ b/dev-libs/glib/glib-2.60.6.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug elibc_glibc 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"
+
+# * libelf isn't strictly necessary, but makes gresource tool more useful, and
+# the check is automagic in gio/meson.build. gresource is not a multilib tool
+# right now, thus it doesn't matter if non-native ABI libelf exists or not
+# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	virtual/libelf:0=
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+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() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# 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/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e 's/install.*true/install : false/g' gio/gdbus-2.0/codegen/meson.build || die
+	# Older than meson-0.50 doesn't know about install kwarg for configure_file; for that we need to remove the install_dir kwarg.
+	# Upstream will remove the install kwarg in a future version to require only meson-0.49.2 or newer, at which point the
+	# install_dir removal only should be kept.
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	xdg_src_prepare
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=true # only used if host_system == 'linux'
+		-Dinternal_pcre=false
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use fam)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+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"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_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 now 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
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_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() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	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() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	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/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 1a1b61479aff..8149bbe8e8e4 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,6 +1,7 @@
 AUX grantlee-0.3.0-nonfatal-warnings.patch 695 BLAKE2B 74d631feb939a6bac5045d15147c27e9101a824d9518f4d1c0caad03395d96712f66bb2d16581d0e09389e1e15bfaca38c121786614a2f9b5f1b4b5c807f2efe SHA512 1a58a8bc28f4833f0a8562a06e6da4e9e150b3945077223ec4267bbaa5670cedc62d3356e1e61a93f9d60e9e887e99e28c35b13a50d42249a5694cd55c6242de
+AUX grantlee-5.1.0-cxx11.patch 670 BLAKE2B 05cc62e9f343ed680583fd2a163910958c8aa96c48375611bf01b9f865ee3d519a961e1a33815cb82460b8915f6502ddb351c4cb3a9db11849ded590d33f28df SHA512 fe1186c9769243e8c670fd8fa7706a94addf17b29358365027c2f4ab6a8839b448118a333a9efdcaf111f818a507210b78ce72bb27e230f4df3fea5e320fd2e6
 AUX grantlee-5.1.0-qt-5.13.patch 778 BLAKE2B 01c0c1fb6a3a9830134cc0d1bc19ead874d526a452dfb08ef0d4f298d979ee40ca70742ab8d6ad823982d80ff19bb695aa8e4b66ff90500f4f470d7eaf83554f SHA512 03b0168b886ec7a394bdd06acb98908dd002b0e9fb8763f71fee3f022fd1726c09da895154eb4022ea6e114b6f7c1b37f90f35ff77521e6f8272371961ff54c9
 AUX grantlee-5.1.0-slot.patch 1616 BLAKE2B b395e361dee3120f7cc0bfef36c5fc0ec2b7a3c8ea714fdb21a93a34cd309407d07488c926f6a67d921a5767d06c05b620d24fce7c253aaea93bb2ca20aa92e1 SHA512 62ec0d0e510fc7aaecfb2eaf9e52b395070833732aa840ff8fc4b4bb94b6716fe59765a7413263c2a6edb073cc379141955a99860c0fcf592d6f5227493482e1
 DIST grantlee-5.1.0.tar.gz 1175380 BLAKE2B 6468c0131a334c3ac52b841a64171093a41605686e4ec2af1a60bbb829f652d388fb48e501a0c1f5eef54ff3253c10b0d6ebd5a4439ed2852f8746188011f9e4 SHA512 2b806a0770b9c6d02f207d5b4939ae8cae325de4fa01901320ffef5c8442ef0f1c10dd799966d0bf0d223e6541f93db8568aaf922ea1b334bcb2f85f6373a936
-EBUILD grantlee-5.1.0.ebuild 1233 BLAKE2B 73032b4f39b8ac3514b5740155e1b6fafcf11fc86bd3d7bff29f57acb292b02721aec25a2d3cf43a908fce5101e899363c26d49927992c21c48b90fc89f359d9 SHA512 e8285340ef1a54323e9eeace82841b64ad3323d8580eb98c76bd151c4c706308d2e77e9a9aa5b5a71501170379b1f36a82c155f4562567ab0d7364d71ec1b2ab
+EBUILD grantlee-5.1.0.ebuild 1239 BLAKE2B 10392499200868d40b52d9e0779d07885e56bfa8b4b9530393b515db7d04f65418904eb3b1116c367181b011ee56131d8b793f8d625f17816725089f6a9c74c1 SHA512 7261684b88313f1630213aacb14b42c03ddea49e821f22536a063ea86c1c111ed6542724813e788598e9b7ffb2a225f99543fa2a804d00a076d74d2e6b1a7bdb
 MISC metadata.xml 331 BLAKE2B 6dab7a95213e13aa8367317827224739d146430a1dba20837be5469221ba7e9403ab6edf7e439511fee5082d10d5fd883c3a25c871b4ff4aae7c24399d1f1cf1 SHA512 073a759e22f25e29be31689015b96dd3c8ab4748d59c31fabfc6a7c43cea6ca2a0a0f48ae49b36cc2a835d97fc2ea5a2f2a790a3cf74fb4d16e1e0f5d771b1b6
diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch b/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch
new file mode 100644
index 000000000000..d049d6c96f81
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch
@@ -0,0 +1,24 @@
+From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sat, 20 Jul 2019 17:35:30 +0200
+Subject: [PATCH] Fix compile with newer Qt/cmake combination
+
+Without this i get huge errors about Qt needing C++11 support
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6d51110..0859788 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,9 @@ endif()
+ 
+ project(Grantlee)
+ 
++set (CMAKE_CXX_STANDARD 11)
++set (CMAKE_CXX_EXTENSIONS OFF)
++
+ # Workaround for http://public.kitware.com/Bug/view.php?id=12301
+ if (MINGW)
+   if(NOT CMAKE_BUILD_TYPE)
diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index d8de4e45a9f6..8bcda9a613cb 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit cmake-utils virtualx
@@ -15,25 +15,26 @@ SLOT="5"
 KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtscript:5
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
 	test? ( dev-qt/qttest:5 )
 "
 
 # bug 682258
 RESTRICT="test"
 
-DOCS=( AUTHORS CHANGELOG README.md )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
 	"${FILESDIR}/${P}-slot.patch"
 	"${FILESDIR}/${P}-qt-5.13.patch"
+	"${FILESDIR}/${P}-cxx11.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/ilbc-rfc3951/Manifest b/dev-libs/ilbc-rfc3951/Manifest
index fde8fffa916c..ce502a40ac63 100644
--- a/dev-libs/ilbc-rfc3951/Manifest
+++ b/dev-libs/ilbc-rfc3951/Manifest
@@ -1,4 +1,4 @@
 AUX ilbc-rfc3951-asneeded.patch 441 BLAKE2B 94e1c3b911c1eb18ecf162c43c8b653c1ace3be2ba868a05aa541b456c843e2972fb6f3195e336c0b3014cf2179395623920a48a8b69c6cdf125c005b288784a SHA512 bbb81eb3fe6a6004c5766299fd437247b3c4a8e11022a202943c332132026d8d2f3d74eeba4161533255e61dad5f26b60499012823c0928d740ac96e7bb188f9
 DIST ilbc-rfc3951.tar.gz 330306 BLAKE2B cf8c56d9fc3dd2dc6a2dd241f3b0cddb7e7f6cea126056d2ab94aaf8add382f1bc1d9b03c9a91110197e0d82253ca8e824cf37bc1622af26fdf0939204736c35 SHA512 7828a9c5a193ebdfcb383d1edad0868afdee0f71d1a8a878c7d9ea2078fd63f57d31b34ae2cf4890d5abc28c8f5f4ee940c665a126f0512d1e79c4f76a72fbcf
-EBUILD ilbc-rfc3951-0-r1.ebuild 683 BLAKE2B 40187053c7f3a19eb303c3ad16bce5227b9fe8a160b01c577998cd991de8fb7db836aac0c08bb51650e716e36d0059278ef8a8881db2c3f30fabe1492cdff23a SHA512 31186b59caf95d23fd8cc9da7fe44be311e050d3b6e6c4ff2fb7c71ee6d1a6f5cb1ffedff061ce4c4ea65ec264342ae3246c7a72845b7a873e044de372824e0f
+EBUILD ilbc-rfc3951-0-r1.ebuild 682 BLAKE2B 830cad2ddf91315eed64b223a2a6b9aebc1049141d83143b2849824ef457a90e18829ba7679a43062eadc735d57540f14d432ff26e8c147d1ac46191aa1414f3 SHA512 fc99ff46599e79652aec994a3f9e865b241241194b037646daf22d44b4404620312fc00dcf08e5906c52640af02f14876f08695c3f3bb3f404017a3842510f6a
 MISC metadata.xml 239 BLAKE2B 9d90102c70502e3f729b461b00c463f8958602cf2464e9834a5d680a802a46655051b741c47ec0eed98fb758f8a9e388a982c2db65bd644205a4f9bbd6a8d638 SHA512 c9696a97f8ba113ea6badf5fcb179b749639703ddea443d6d8170f0982214e59bd0bbe58b5e99f847c953df2d772d0bac6b2dc72f89b146ba55ea69e177a7615
diff --git a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild b/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
index d6f2d5ee5d01..075b530085fd 100644
--- a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
+++ b/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz"
 # relicensed under 3-clause BSD license, bug 390797
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 19042ce58f26..f279f0437d01 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,7 +1,5 @@
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
-DIST jsoncpp-1.9.0.tar.gz 203176 BLAKE2B 81026de1f4f1882b504598879c7425586ad4fed8e005116509c85e03431d879f92040d802a3a0a9a369d652a076a60221e7d3b32027e3ea2ff4633fb7275c7a9 SHA512 b1da96c12d9ad4c7e002ed84b6c0ff24a7c86034f462a4eb29d93be2f81d7961a03d6f7aa3e7fa58366a2ed76242f6c72e8c3c6d34bdf562c86ca9951f5f3785
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
 EBUILD jsoncpp-1.8.4.ebuild 1370 BLAKE2B a84a5ca2b32fdaf245dea03c51304e026c11428eafe2ad4a1ae36d9d394a968a6f10aee504d08b590dd2ac9d8e060e96bcae182a2178e35c7aa9d5ae40f4e0fe SHA512 b942c9e5cda3e95b10e89c88179ea279fbd7f860364eaec5ad92210c9700c916af7ac5e04925552c0599291a4ea60e4a46a451d6c6bc9b882e66f95a7f24beed
-EBUILD jsoncpp-1.9.0.ebuild 1352 BLAKE2B b7533c89373f2a136f413a4a1c41c8adbbdda97480493a60fdc1964a6cedc04d5f64122e6587a78738a5bf720091e13236260157bc9dd30d3e331c17a3c7061f SHA512 1556db3750f62327ba5cc1206f805b493a644566fb41df4baba56a15d17549ffc09a056a8aa7b81cabfa88c437e0187be103590a7920ee45e309615f8149fc9d
-EBUILD jsoncpp-1.9.1.ebuild 1352 BLAKE2B b7533c89373f2a136f413a4a1c41c8adbbdda97480493a60fdc1964a6cedc04d5f64122e6587a78738a5bf720091e13236260157bc9dd30d3e331c17a3c7061f SHA512 1556db3750f62327ba5cc1206f805b493a644566fb41df4baba56a15d17549ffc09a056a8aa7b81cabfa88c437e0187be103590a7920ee45e309615f8149fc9d
+EBUILD jsoncpp-1.9.1.ebuild 1342 BLAKE2B 978f21e2b3cd2fd0666218c861c9f0bc58f6d975d914e057912a4b543e34ce051897e33e2f6b824ceadbf4e1fcf2bc6736772bade96fc7b1b0a9b30c0432db1a SHA512 06b5ba2d79ad6765e33c86b674cc198f4a21f525e9f9b228b9808553aa49d390dce3f240abc623cd5b7c6467365e4937feb7e1ba65e5797ab39c2bce959f302d
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.0.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.0.ebuild
deleted file mode 100644
index 14eea97be973..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-1.9.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/21"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
-IUSE="doc test"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		${PYTHON_DEPS}
-	)
-	test? (
-		${PYTHON_DEPS}
-	)"
-RDEPEND=""
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use doc || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSONCPP_WITH_TESTS=$(usex test)
-		-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-		-DJSONCPP_WITH_CMAKE_PACKAGE=ON
-
-		-DBUILD_SHARED_LIBS=ON
-
-		# Follow Debian, Ubuntu, Arch convention for headers location
-		# bug #452234
-		-DCMAKE_INSTALL_INCLUDEDIR=include/jsoncpp
-
-		# Disable implicit ccache use
-		-DCCACHE_FOUND=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
-		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
-	fi
-}
-
-src_test() {
-	cmake-utils_src_make jsoncpp_check
-}
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
index 14eea97be973..eff2699bfb89 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/21"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index b6491cdf5969..672bef799a6b 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,3 +1,5 @@
 DIST jsonrpc-glib-3.30.1.tar.xz 41516 BLAKE2B c0b73c06682fd0a1bca2fb000d7909460c496e73364c24905e1a4c88cce64252ac024825ab89650ee0b3b5de1cd1686fc7a231ffb5b0bb7e1c66262eafce026f SHA512 f1ae34faf9b3902b45b01bfafc87fd8d30051bbb11cf247cf8af9dc2bae8b2f3c93564a17a9f047dbb61240662a0ffbc2c2b764f8e254305c7aee1b32fd8a86b
+DIST jsonrpc-glib-3.32.0.tar.xz 41552 BLAKE2B cea89237cbd622e951b0b4eca02e0aba0f3a9a3dd0db74baa0534ad49671834bf3daab5243d0be6f4e68ed5f441820fb8af1c5f59f7f5a7657280d1c55e5d104 SHA512 c6c52d36d3f8f736bc07c50174ca4a50e3cde6b23928751f260b4482e15cda9726b8279228653e4fde114111592131f344f3c7cf820edcc680fb0b32f9089ea5
 EBUILD jsonrpc-glib-3.30.1.ebuild 939 BLAKE2B 5550e20348a0d716bc17e491e179ec0e38c32db28caeee66fc3df930a637fee5f42c7147880ff22f32bda0f590a5cbf2bb6e6e28dfc98b4721e0be6a0dc430e6 SHA512 40f382868affa0c614c5f3f34725f2544416c720a76da60268e9525b2ee3370314dd5883ba17f74f7894d4d0c98ea2e6134dbd76f7396cd67935c8785b17a75b
+EBUILD jsonrpc-glib-3.32.0.ebuild 952 BLAKE2B fbf4ff8df8ac1dd84da4358410a18f4e054b7e5e453d41ccd7e594a13d5aa43d2e7d90facb21eabeb94af6c09925bdff4551d5c13637eebb341fe333ac1530d0 SHA512 0e735dfe9410e322e7692037ace6698897535113c722158d865b9ae737044eaef24ff716fccb7ebc7c66eebdc109689f5459af6333936c7440addf80c116c921
 MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
new file mode 100644
index 000000000000..b1e135ac476c
--- /dev/null
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala
+
+DESCRIPTION="JSON-RPC library for GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk-doc +introspection test 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}"
+BDEPEND="
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-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/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index 23ac7c9b87e7..e44bb0f24043 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,4 +1,4 @@
 AUX kdiagram-2.6.1-fix-horizontal-bars.patch 4650 BLAKE2B 4063f8dbd92621f7d05d9b771650e9094eb3caa175a601b3ba51066853e4b222ceeeb6ac006c78a6ae12e70e5b0b4f192a004bb07437c296b5d4c9907f21c681 SHA512 8e0a94c65249f7a8b52e0c6261e251a7bcc07103e5f2bf21c1fc06b171d60a8d726f4c475c91a9114a1b129443208a95340b1aad07f2d31b2be0988f7f1611c4
 DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
-EBUILD kdiagram-2.6.1-r1.ebuild 780 BLAKE2B 60dca7566dd4c48e0e2d59e0e2a16c0175c52891d6f89f33fb102ee8929ccb5ae2249e0cf515fc43ca8cd2771f677b3e2b7499f0eb90b66f1c38942c33774877 SHA512 315d1c7395928419ce5846e9fd46a0b596b33979b633bfd6081327116db40c0500c7e6cdb6328336c00886ad45094dfc6abb904683df24d585fb4f07110b65e8
+EBUILD kdiagram-2.6.1-r1.ebuild 779 BLAKE2B a1618d38ddcfa34016846eed0e118ee8d222d26d21a9e51a992c888e0d6acb8f2b80390359df6930fa8784dbb37f2783ffa75679882982fa1ed5aebaa31e4742 SHA512 380d7b1a2c4aed647033fd117ed8340f7fca163b7f06f3fb36f29a3ebfadbb1375c175c3da1a5e7d4b37bbcd214f61114e0720bc4303da8d6e3349850cc1884e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
index d03b24c8394f..2c13e38294a3 100644
--- a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 fi
 
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 633c7fd4f81f..c8235eb64e17 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,7 +1,7 @@
 DIST libatomic_ops-7.6.10.tar.gz 503734 BLAKE2B 5ee4adc3b2e9afe22d52a4b390927f79dfce139e9975c75aedd379fcbb34a1f0de82ca98ddc58a386e193080ba75eb1b6161bea75b62b8f3b4941979248290af SHA512 4661445503ef4303e873559af319ad799a7eddad3df45ad602cf338c594a642ad4333a36fa91722f0d8c48acd38bbf45c60a468c7375d14824520a83c1109ec9
 DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
 DIST libatomic_ops-7.6.8.tar.gz 503550 BLAKE2B ce8e8757cd20fc5d8e5b62fae0a619f3866e496f552e04c1cca6c63a6d954bf256927fe1fe62192cb24b9f7a9fd1727e108098b09d0f22e0987983ccce035274 SHA512 bc448fadcf8e2936fa933a5872d5550ecdff04b0df27120d3182dcbb2147a6594ec6bfc5b214e21b37ffa1b5100c1c56d301ba9cae7df26cee5e6b999dcda14c
-EBUILD libatomic_ops-7.6.10.ebuild 805 BLAKE2B b97f655a8c5889397ea7f211f29d8923890c8947dbd9c0d6878e50ada7cc6a7e91959bc9ce8aa55cf3b9c27ba11a94e3e4844c507440bae2dd54f448bb177aec SHA512 137edcaa28231559441660124f22cdbdea564fab119c7645534a2c77ef85aa3eaa4658c956a0c3a6868cc4b9ecd22fd7dfece568ef6b2b5557d3ab5eb3e805e6
+EBUILD libatomic_ops-7.6.10.ebuild 812 BLAKE2B 18d5d6e76c0826481f41dfea5cb76d33d7d7f63a33ec902de263bbc4f944af33081b65e9e1ccf19889af7584c0e706c91de98b65dce3ceba5f8a937929a77ebb SHA512 4e07f7536e026736b8cbe844ac0a1d72dd5c711bc8a7fe15627248f8e1cdac08f2bec672ecb33b1fb046c372ac107a4699bae01a84b8369384c4a77b659f6b37
 EBUILD libatomic_ops-7.6.6.ebuild 731 BLAKE2B 38802fab9bde60ad696c1212d51bee17287b47fb1af0219f8a897a241ab9d3c48e73a3503d4b939b811488f9db8e76df4c349380c32b9e5016539c0680a9ce3b SHA512 02090cb3d33b1cc769d99c42f18953585bd266278d7f946d8a8e93607bd1fe0aa3597300a3d639aef3824be04ca8dc489f0bd47ea2a2ce36ca91f1f9e438e5e5
 EBUILD libatomic_ops-7.6.8.ebuild 812 BLAKE2B 18d5d6e76c0826481f41dfea5cb76d33d7d7f63a33ec902de263bbc4f944af33081b65e9e1ccf19889af7584c0e706c91de98b65dce3ceba5f8a937929a77ebb SHA512 4e07f7536e026736b8cbe844ac0a1d72dd5c711bc8a7fe15627248f8e1cdac08f2bec672ecb33b1fb046c372ac107a4699bae01a84b8369384c4a77b659f6b37
 MISC metadata.xml 475 BLAKE2B e8db314b5a92dc7564e61a4f12238f6fb6ac593bb8e50e4899c0bd86eedf542350903aefda7784e406e72b64456e75e4099215767e6897c5f6a558f24b40beb6 SHA512 d7b2e2dcc35f4c402f8305a5cc35579bbf4d2607986810c040282365a230ebd916abd2b9936c1cffd3fd616705b5b6aadeece6170467cc27bbe623af18354dc5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
index 3711c398d448..331540a7867e 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 712d573616bc..9373acb43b1e 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,4 +1,6 @@
 AUX libbpf-0.0.3-paths.patch 1340 BLAKE2B 62ac9803114000b093b6c2a68d396fdc9f9b447ba0a2726d5f5a176368139e5e3c588e2c9482e26e2b27a7d6b850b8a5daebc9e5084758afcf04312235028cca SHA512 8808f00748e4f717562dd763598e864a7ecd2b12c0983bab4e32fd08aae778f29c5f1d173355275c205df1325e3c2327b99e62929ba1daeca6c20b81c9d9b80b
 DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3bd7c7466a5484ead1cca5a9fe775e331838cd5645d7399cb5b1a5b2fcb3814fb45643660fd3f7d84b9986bae6 SHA512 ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad
+DIST libbpf-0.0.4.tar.gz 148625 BLAKE2B d8c2343441258a01ca54b0046b0f1d54cb2e0e7a09c99e489409b25d3f2486bc7d8a175b4a3e793b56ba72462d34b9a55c53e86eaf446c64f2c30d673e7f23bd SHA512 1e4a16ed0f3e378aa9d7080e4b54cb3a9542975105b09977d1ddecf3ae4dabb3b5edf80b92b61644b1f0cbda7ee7e135ee0f736e71c1d201a97b1b3dd573b543
 EBUILD libbpf-0.0.3.ebuild 1006 BLAKE2B 0ab59a6d9ed6edf242765758286251d1d2dc65470162549396c13fe87ed790eeb7fb13cc2f14e47f2b8db5078948a6cbaa6cd896abb446b85d7bae9f95f34e07 SHA512 d1ae5e553b46fe69594e4576d1600bee0e6e717fd83d2f095adf2eac0a752797c07f0dd6d8bb2c0449d355fef2fe193e7386cebcf06379172f701bce5c9b38a7
+EBUILD libbpf-0.0.4.ebuild 1006 BLAKE2B 0ab59a6d9ed6edf242765758286251d1d2dc65470162549396c13fe87ed790eeb7fb13cc2f14e47f2b8db5078948a6cbaa6cd896abb446b85d7bae9f95f34e07 SHA512 d1ae5e553b46fe69594e4576d1600bee0e6e717fd83d2f095adf2eac0a752797c07f0dd6d8bb2c0449d355fef2fe193e7386cebcf06379172f701bce5c9b38a7
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.0.4.ebuild b/dev-libs/libbpf/libbpf-0.0.4.ebuild
new file mode 100644
index 000000000000..b455107a4012
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.0.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+HOMEPAGE="https://github.com/libbpf/libbpf"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~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}/${P}/src"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.0.3-paths.patch"
+)
+
+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 install_uapi_headers
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index fc261675da52..55f4d078317a 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,3 +1,3 @@
 DIST libburn-1.5.0.tar.gz 979953 BLAKE2B 7fdd6d8314d65547e48baa3bb7c0b8f94c5d5a799e62d79d8dfcd5de644c555be437fc7c84134598703b9335c2330c49e8c7c7adbaefa9e1f288109e0010f8df SHA512 c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2
-EBUILD libburn-1.5.0.ebuild 838 BLAKE2B 2e6dbca0ed6c7f28751b540f568950723c2a7b79423f68de9d2137a914cae90274608bfb7aa6e7b3ca2992b01b9547df0b0b093ad548656fa292bcfa38da8e96 SHA512 0bcd4718d1f16d13c86465ba397742e35e7ca0325727b47cab3a9f7581c0f89909b46ddd6609d49eeb6c24a4cbddde25d2227abbc038dc2c25236c0d1d17a704
+EBUILD libburn-1.5.0.ebuild 837 BLAKE2B 07610778a96cd06a233651aa98cde8e94b058794400b4dcb0d8bc7ce845c42d2702b2eae78a9018900f6b574ef2cfa84feeec70108e0c8cdb1fb6f037310b65f SHA512 6f7964daf2343c017cb88e87b1d9d064fa4e3819e42a3f1fa1d0677926efc0d1ded1d0a53c31fbc515fe82768f82da08824590a71489b56f9ee773d548bcb66e
 MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.5.0.ebuild b/dev-libs/libburn/libburn-1.5.0.ebuild
index 58718b2bd61c..c2d21714b6d4 100644
--- a/dev-libs/libburn/libburn-1.5.0.ebuild
+++ b/dev-libs/libburn/libburn-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index bd73b5cba7cc..88880f9e7046 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,9 +1,5 @@
-DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
 DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
-DIST libbytesize-2.0.tar.gz 440544 BLAKE2B a371c617c965171a8746339ff8a2ec412daf3f79ae80e4e6a404546b0fc2f59f3e5882fc93726701490ef267f90cfd8c5db70bf7bd334c08806ff35eaab97377 SHA512 9d2a18930d0d900262ced4abd5cd358896570eadb06435f1b9aba5484ca530478b65dfb4982e8acf77ca4519a2d8a1dc236d42f5fa1ecbd7461949b282ef44a1
 DIST libbytesize-2.1.tar.gz 440209 BLAKE2B 7c689f269eae7b408b7f85fb9c877c9eb519d2a2eb143ef0ddb1657fbb4d79fab7cdaa56b35b4bbbb964e47361e37d7c70a0a135bacb8f817bd6cf8d2e22b68e SHA512 6b93d877e921820c19ed6874a36d9f8b6958112f6230f24980e8e6e30570b39ce74594f0ef126f70dc81b5434899c1f0f3ad0925f3ff7b6a596a9329c8f106c8
-EBUILD libbytesize-1.2-r1.ebuild 1122 BLAKE2B 6f17b8fd6560664dd8dd33861e9016269f82be242785e1f8c30e5e55bf55d81082b68e5ab329286f505b31b2b6a30145e291ecb3665554a84bc4ae5130ea69af SHA512 918fd1fdeeb6b4df3d9f1a66fabac851dff049f14b62b12aea633c6b629fa54b54eb822ec17ff80f11f8784400d59f90eb49ea3812e54c86ca68de1f819700b0
-EBUILD libbytesize-1.4.ebuild 1218 BLAKE2B 3b7a314c721f4a269fb299d7450a039443833b7ce93056304fea0f5343acc36704c63e05b775790787845c36c995e87a604863df95f47a69ff8f6baea67cb993 SHA512 e9e086e291914efe221745c55ac9d29863eff6f4d9974c1734a004dd1ffd5f475da3fabf8b744ebe1e286550488da8ff1b01d700d35bbdb01e4b8ef801069795
-EBUILD libbytesize-2.0-r3.ebuild 1471 BLAKE2B cfbb90bc8d10883bbcedcfaa0ff7d023aa814a4b145bed1fdeb716444c76c01fc07fed5178cebd789b26a7e632bde7c4779e9138e50c4a3caf5ba94ac2909c70 SHA512 ae6cf6ad4ad79130ab6f83b2476228d38c41b6ef23347d7c65ac4abaa61ce6dc72e3100728fd954cae50be0f203bee76f1bb646ec0b07ec928f2a1cd51cbf848
+EBUILD libbytesize-1.4.ebuild 1217 BLAKE2B 68b65c5481fe69757b383184c06b878cbf86ab1f271b188c1bf24ad37dd1104a93ec6e42a2d5e25f4074cb396e201d2640f211dc301de393a2e757a77a628b18 SHA512 7a8fe331b96238be23fd8711fc1270416503b9b9ba30f5a1d06ffb00f84465ff1d75deeb8f3f9309d9b6f08c35ca25b01765b6a171c19a2720edd62a6db6dc18
 EBUILD libbytesize-2.1.ebuild 1471 BLAKE2B cfbb90bc8d10883bbcedcfaa0ff7d023aa814a4b145bed1fdeb716444c76c01fc07fed5178cebd789b26a7e632bde7c4779e9138e50c4a3caf5ba94ac2909c70 SHA512 ae6cf6ad4ad79130ab6f83b2476228d38c41b6ef23347d7c65ac4abaa61ce6dc72e3100728fd954cae50be0f203bee76f1bb646ec0b07ec928f2a1cd51cbf848
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
deleted file mode 100644
index 2696962327c9..000000000000
--- a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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}} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
-HOMEPAGE="https://github.com/rhinstaller/libbytesize"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc test"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/gmp:0=
-	dev-libs/mpfr:=
-	>=dev-libs/libpcre-8.32
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pocketlint
-		dev-python/polib
-	)
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-python3 #634840
-		$(use_with doc gtk-doc)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	python_install() {
-		emake -C src/python install DESTDIR="${D}"
-		python_optimize
-	}
-	python_foreach_impl python_install
-}
diff --git a/dev-libs/libbytesize/libbytesize-1.4.ebuild b/dev-libs/libbytesize/libbytesize-1.4.ebuild
index 92f86ba2540a..0a63e8b0b772 100644
--- a/dev-libs/libbytesize/libbytesize-1.4.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/storaged-project/libbytesize"
 SRC_URI="https://github.com/storaged-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libbytesize/libbytesize-2.0-r3.ebuild b/dev-libs/libbytesize/libbytesize-2.0-r3.ebuild
deleted file mode 100644
index f3c68f3c42fe..000000000000
--- a/dev-libs/libbytesize/libbytesize-2.0-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit python-r1
-
-DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
-HOMEPAGE="https://github.com/storaged-project/libbytesize"
-SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc python test tools"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tools? ( python )
-"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:=
-	dev-libs/libpcre2
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pocketlint[${PYTHON_USEDEP}]
-		dev-python/polib[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.md )
-
-RESTRICT="test"
-
-python_do() {
-	if use python; then
-		python_foreach_impl run_in_build_dir "$@"
-	else
-		"$@"
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc gtk-doc)
-		$(use_with python python3)
-		$(use_with tools)
-	)
-	local ECONF_SOURCE="${S}"
-	python_do econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	python_do emake
-}
-
-src_test() {
-	python_do emake check
-}
-
-install_helper() {
-	emake DESTDIR="${D}" install
-	use python && python_optimize
-}
-
-src_install() {
-	python_do install_helper
-	einstalldocs
-	find "${ED}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index fef090309896..70dcb4de1264 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,3 +1,3 @@
 DIST libclc-0.2.0_pre20190313.tar.gz 176803 BLAKE2B c9ecd5053685c2de89d92ae4e9cc9e9f8bee24ca05e5ddca6fffd0b45356b7d4a96b54d9bebf316624e0a49594a33ebb156ae6c4b963093bdc6c1067548b2bd0 SHA512 22813bcd76e77c018acbdf2a3d3d300c2996e169c17729726ae8a93c39f85033cfa1f6d43907a7c026451bcdfcce6fbdc64a202961492aa951ef1b818c3f9335
-EBUILD libclc-0.2.0_pre20190313.ebuild 1934 BLAKE2B 07b17d62e8e3b11a3a117bf874d5bcf91428b7865fa9893b557c39868fb202b406c1ad61c086af6c32d8d43e912f56ae678bf18256ffa9f9253be89c92fae642 SHA512 b8b1728446ce23bebfd88f559fa6dee45a31460ebe8d992039f4c0dc092ac63b29437de121e96df3413f71c8dd28c61891ef926574be887455ae6fe8a4fec759
+EBUILD libclc-0.2.0_pre20190313.ebuild 1888 BLAKE2B 0b53eb6d84dddad0e37cde71f16750105fbd64fa8b1e30e5508789927ac4b2e9f30ae152575dcf63e85e9b9bf69a79de64a6e8b65c79787490224a211c1ad9aa SHA512 bc80152ef6b2fbe8e600f3c57a8607d979c73aa7939bb172905663dc2290feb246fcc7c4ec98cfbc0db11d51359cb43bd57a659f71e9a564e4d76d0d80bb06d9
 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
index 4a5752c12239..f33fd1c7cd74 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild
@@ -42,8 +42,6 @@ DEPEND="
 		sys-devel/clang:7
 		sys-devel/clang:6
 		sys-devel/clang:5
-		sys-devel/clang:4
-		>=sys-devel/clang-3.9:0
 	)
 	${PYTHON_DEPS}"
 
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 6bb991e605b2..1e159e6cf9ba 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,4 +1,6 @@
 AUX 3.30.2-leak-fix.patch 820 BLAKE2B 42fa64e28ba3c94e4ff759bb6abaacc6046eb3e6b68d7090fe961d36ce9c0ca06f85acad67fef1102952bca991b1f7b5886c1a9a421b4bcc7ce146a74b645f98 SHA512 a8df67b6793cecda6787dcf8023f6cbf50066ebb282c94ff1c22f5e51ed331df841b33627bd0116a73fc38522bda0071a353a2bad807d599acc672e029a499ed
 DIST libdazzle-3.30.2.tar.xz 432192 BLAKE2B 4c31b74b0a5c972b5c86bbacf50862a0c2db5c9ed1e67124671e2ece75d72de4c3605c6ecc81bde10cf2566ae06cbd7f14fccaff5d154c1bd9e53a9f8b2dc2eb SHA512 591c3bb9dd65ae02e6234a1599497dce78d843ee6ca47e8d50656b9f98bab91c7b89424c23eb387184bdb28132e1fbe11ee7c01d4a7f0598bcef92739aa8bff6
+DIST libdazzle-3.32.3.tar.xz 439492 BLAKE2B 7a8cf5a4ad29ca11b489553785e66d49a2ba7998f6791bb392ca37740441ff0e72f59ced192dc681ab20da79cb9183621a7d73baf57c9f045ae917fc993d1205 SHA512 e82d5f04706ec2003db27ece490255264828334d1e1c2076485660539664fd382c1289b9d8d4a6cc2dc31c65db270207e7d51105ffd1cadb7c384cd91199ceaa
 EBUILD libdazzle-3.30.2.ebuild 1418 BLAKE2B 17728c31418560be84d81ad57278bbddeaeec59657956a22c548e70861639eff121d4199fc57d321e88f90dbfbc791fb2f9b51104d09a3a44849d34452e52717 SHA512 e81703274d2f3801069553ebcfe5a77f3c4f096741d9ed44ac2f02ce971b6e54c6561a4a0c6bab3a0ca0a44bbb17fd03c1dfa0522a57b8b6220ca0e17ff0af3c
+EBUILD libdazzle-3.32.3.ebuild 1572 BLAKE2B 54867a4fadcfe33777a64464539a01b3992fb5f3b202a70089ce0f7f93abb56c2f388834a46456f24f5c6395582efe2a4e0e5bfedf6137de9df482edf59ef58d SHA512 35c88f44538ead06c4d290dcee7bbe0ab8c9e0f41edf5a017e97147327d522ea6281610d7c12b7d2b2fe1242b6ae26675e2fcc84957c3889c2d00d6c8f0e562d
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.32.3.ebuild b/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
new file mode 100644
index 000000000000..22a3edefeebc
--- /dev/null
+++ b/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Experimental new features for GTK+ and GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.24.0:3[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
+BDEPEND="
+	>=dev-util/meson-0.49.0
+	vala? ( $(vala_depend) )
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_tracing=false # extra trace debugging that would make things slower
+		-Denable_profiling=false # -pg passing
+		# On linux it'll always use a vdso based implementation that is even faster
+		# than rdtscp insn, thus never build with rdtscp until we don't support non-linux
+		# as the rdtscp using function will never get called anyways.
+		-Denable_rdtscp=false
+		-Denable_tools=true # /usr/bin/dazzle-list-counters
+		$(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
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 1a5e96476b2d..fa3b4c05cb2a 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,7 +1,3 @@
-DIST libebml-1.3.6.tar.xz 57764 BLAKE2B 554f9d4d162d02ba05e2b1eecd688a6c25a4c727ee1a2a93cd6c4ceec94c5628ec20306dc5fa41a2dfcf189afb7a3add33b09a3bcf62f8b5f8fb2ac6657916d3 SHA512 6a31a56dcde39642848f25353a462f4621d6cfd3bc9ef62add1b00d098c6a80b3c2b50ecf4d6dd50650c609eb39a6150c6d1b69ea3a77a3928bd3300af7dd91f
-DIST libebml-1.3.7.tar.xz 69460 BLAKE2B 53cb7ab3c553cc533b025bdf1953c1de33108e506900e8df0ecafa5f88bc43b0a54611c69bd169401ddea162a1e669bde0e93dc38255b8ea24d04dd41fae9599 SHA512 ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1
 DIST libebml-1.3.9.tar.xz 69836 BLAKE2B d37bf9d74cb21a0c4cea3550bbd25f081e48085ba8d97d2f133e3f5da292527f0f31fc5aa3978c21f82262698877a76670b4b120e915573d339751234c4450c7 SHA512 a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e
-EBUILD libebml-1.3.6.ebuild 625 BLAKE2B e55976f6a05f7bd2633d38dbaab9b959a282e24bbf3ff8c8820406bf0b26da99574ce48fe0f67967e26db49e1fbc9b9fd7e93ea392a6afca03aeecbec4ae0d22 SHA512 6826cedc2ff765cfb5ec03f001dfdb17947791dac98a994333446c8b8beb3ff393ecc93fc11b3f7afde74ac092648a4df3a0feeba5207e81f6835f38ac6804e2
-EBUILD libebml-1.3.7.ebuild 635 BLAKE2B 5805ef9b68f9391dd868c94a44d2841283d61488e74a44ca0676d6f6fcf9f04a975cdda45f31c22cfdc428b7b90bc2ef904dee8f2a504afe9f3fee4cbe26a7c3 SHA512 7dc35d4f04ae4b0b9920bc86d765642896559352278ed5e14a3290bfb935f89297498e6a2822a7026325f4b87463aec64cfa04970ded60893dbab6e0d3dd3f77
-EBUILD libebml-1.3.9.ebuild 628 BLAKE2B e603a6fe6b538200998b671f27c7a573d7119dcce89c0a44c9e71b631c98880337974e126360f55fe41cd19b9ffdaa861fe929a55ad7952caceeb192d6197ae0 SHA512 9f763968e40ee7e66cb67a71d4b0cdf182d013b8d37c2fe3e8213cee52b5dec5a0bc514b2b1266e7a8ed0248d0d7bd63f8a4b7960422addc9353411719524e8d
+EBUILD libebml-1.3.9.ebuild 626 BLAKE2B 0db7111ce2784fdfea85a88e1c473a7f57947971c6ff14f0206dc01368ea17bee8af87f71f9ad009d70531e5e99d28a940d6c2048e6ef9b476a8053bb2872610 SHA512 b2dfc67e8d5728a1418faf7013169759efc25410611f04db632e499385eb88256f50a19e231e590167d6f0121928d1982579c85c6d1611a46749e8d5ac0dcb01
 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
deleted file mode 100644
index 77792f6ff04d..000000000000
--- a/dev-libs/libebml/libebml-1.3.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/libebml/libebml-1.3.7.ebuild b/dev-libs/libebml/libebml-1.3.7.ebuild
deleted file mode 100644
index daa59d42571e..000000000000
--- a/dev-libs/libebml/libebml-1.3.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/libebml/libebml-1.3.9.ebuild b/dev-libs/libebml/libebml-1.3.9.ebuild
index 6c1bc806c839..c789e2c6750f 100644
--- a/dev-libs/libebml/libebml-1.3.9.ebuild
+++ b/dev-libs/libebml/libebml-1.3.9.ebuild
@@ -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/libedit/Manifest b/dev-libs/libedit/Manifest
index e364692a3c51..b6dd379a6003 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -7,6 +7,8 @@ AUX libedit-20170329.3.1-tinfo.patch 954 BLAKE2B 1ec89a124ebfa5b96b8b14ef44008b5
 AUX libedit-ncursesprivate.patch 497 BLAKE2B c333a5d914047fd13faab9a9782c18893edc8cef17c0825d4aa6046da2456b5429f48de056211d050c77fa40689baa1f0eb56259dfaf2f93a778f10720d7006a SHA512 41175b20f7b925e347db008d5e8a535b8326cd2c010a67b9db3a59131fce77a7791b7940e7eea9d68e82dbd3731efaa503d4bd218d78b29f946152dd56bd9b14
 DIST libedit-20130712-3.1.tar.gz 483857 BLAKE2B 9120e9ac2f0d20841fea7d3a41fbfe2c1e79392d3b6dcfcd44517ee61d662427ea6cda312d2ec47ac92d61b9292684b8bbd8f92de0832909fadfb1b0cbbb4f81 SHA512 9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e
 DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B 83857f2e56c1f3857e981556c4d5bb90580293a1b9b038bd08beaa2b3954ccee0b30ccdd716cca95d1811841ab8ada010084ec5cd9ab8407e996c713d0991cd8 SHA512 597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
+DIST libedit-20190324-3.1.tar.gz 521999 BLAKE2B c48161626a5cf3140f75ec1df1d9652d961e568a0464a34f9e679f51e1e991a14c9d04a05f0de3815c4a38a9f17789a18e89ebd026450fa1053ef6420c045141 SHA512 240098989e3c5c8c5e28a61036655ad5a57f1c484e1cce2eaf3da157ff238dfb9cd81c766f82efbefa0935b7b5c07328087788cbac007b11dfb558cfaccaedf3
 EBUILD libedit-20130712.3.1.ebuild 1274 BLAKE2B 2666f0eeabf2ab4172797e07ec77c09332bf522d7f72ed088fbe84ea40ea987ee231372402d05a37cbb6d55d037333d85c8f0a57a1dde4167104c53ea9555dd6 SHA512 dfb00fc7b04fa6fd9e9043c6c1a2d32b71be729a883206714f260e6f51824b5d87461659cb9fea7a5d30004f40b29ef206df2a5c0317d7ab4b6d1cafc730ef83
 EBUILD libedit-20170329.3.1.ebuild 1284 BLAKE2B 58565222e997c9b9990f13e88856d7c33a33754e4abca771d6130825d6d17a5c63dd85e1021c58732782f7f34ba5c9645bb5a650902fc941e97bb52055e2cbd6 SHA512 beafdadc0b34da3e4f2df35c5816f4c6235a5f96124d2abc2fd936be46e3264205dc4da9c4680c73f8461588f5acc378e71a1a4c383d08ac650d685ecaa98951
+EBUILD libedit-20190324.3.1.ebuild 1226 BLAKE2B 521904d2aa1db079106fd9de94c3b5e369d0924602a75c3427ee4364257781dbf1b01b999c6de4110c2bf7936a39ff207634e99df4c972d928850d5a6d8e52c9 SHA512 da73748b85062490290c5e0d8f95a6e6d5a7e67bcb728560cb153a542ec9ee5c6c3dd6566ed7e3b17424b20771fa9c1d29c3bc243180b00a5d1828f1b2fc8daa
 MISC metadata.xml 636 BLAKE2B 22880383d39383e11fad886d88db603fe58db1e52f36528f71db2bdec95c74dd50fe7c76bce52f5f3eea47fe61d1dfd0cb7264cfd9458fd8b5db40d38a1adb86 SHA512 c335a652424f91f1ae79f907870bcd826cee21365b594353b3c52fb7fef51f637e9a65275c11f033b6bd7b6d918733904efc320b547999ee5b88a7b36ccb9389
diff --git a/dev-libs/libedit/libedit-20190324.3.1.ebuild b/dev-libs/libedit/libedit-20190324.3.1.ebuild
new file mode 100644
index 000000000000..8ed4cd6e2194
--- /dev/null
+++ b/dev-libs/libedit/libedit-20190324.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools multilib-minimal toolchain-funcs usr-ldscript
+
+MY_PV=${PV/./-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="BSD replacement for libreadline"
+HOMEPAGE="https://thrysoee.dk/editline/"
+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"
+IUSE="static-libs"
+
+DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
+	!<=sys-freebsd/freebsd-lib-6.2_rc1"
+
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20170329.3.1-tinfo.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		--enable-widec \
+		--enable-fast-install
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	gen_usr_ldscript -a edit
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+	# file collission with sys-libs/readline
+	rm "${ED%/}/usr/share/man/man3/history.3" || die
+}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index d363de9b6adc..dcecc86d8a52 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,4 @@
-DIST libevdev-1.6.0.tar.xz 411512 BLAKE2B 0e9190fd4c28b36bcf325953aa634c0d8c604cef7f56e46679fc88351536d78b0bddedbbdfffe4164e0039c7d56ef604b143e23de2c4bb9a66653a03d6844fa9 SHA512 73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060
 DIST libevdev-1.7.0.tar.xz 438264 BLAKE2B 3f71ccdfbd68598afed7316dd4902a8ac439c6f094788abed5cb8ed24acaf070edaeceefad17de51cadb039259aa0de6a8ec576fa1f8dbd60878ee75aeb39fde SHA512 bc43723fd1ca251a77ee549022609f73c15a33ae470fc843ac687542fb1938fba4d046d3ee1dc814bc38a4292a7f2ad9e71fcce45525b518a4f4a5bef099aa6f
-EBUILD libevdev-1.6.0.ebuild 1108 BLAKE2B 0c193d4337e4d2c4608b56c4bfa1fb6ca8324b979bdb83ff2df1d2b75f120d406a294ffc32c2fe503b7c5a5efb75a6c77421469609a33c9783f662b342e341f0 SHA512 3046e3c9b2144aa12e5133dfe3131d3a6115d8437073c41f21e7c202a3af100732d2f1523544500a0c8964126c89c5679b6eafbe977117fe712b55238bfb9fb8
-EBUILD libevdev-1.7.0.ebuild 1110 BLAKE2B bcb3cb2ca657dca13d853a82bf71d1695ba6c1d68b21fce866413501fba93a59878008a9b806aaabe77ac9f67eb11a82596db375b41365aedea58e460f4b3af1 SHA512 5650fa050815af2f8e7c345387489dab730a3d3bf34ab8a9b722a4358dfd31fe494e1309befd44e99e462b07055a1033673e51b565332d1dce980e9692bd7231
+EBUILD libevdev-1.7.0.ebuild 1108 BLAKE2B 0c193d4337e4d2c4608b56c4bfa1fb6ca8324b979bdb83ff2df1d2b75f120d406a294ffc32c2fe503b7c5a5efb75a6c77421469609a33c9783f662b342e341f0 SHA512 3046e3c9b2144aa12e5133dfe3131d3a6115d8437073c41f21e7c202a3af100732d2f1523544500a0c8964126c89c5679b6eafbe977117fe712b55238bfb9fb8
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B 84c1cd909ea8f81ab025940c58b2969fc6d68be3360bfab21b865f23c1d3c26564fc1de9d1c149184efd9c517e28bcde305bc4713d8d5d1474f1c748d4c25b1c SHA512 9ecbd94c60955824c7100b0427a6417a47301618111787ca6e64d8207ac765b6de2c95994c17f8f6412f95d819b533a794add1582d526cd9e930dacbeaaf2a77
 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
deleted file mode 100644
index f0285f910878..000000000000
--- a/dev-libs/libevdev/libevdev-1.6.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_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/ https://gitlab.freedesktop.org/libevdev/libevdev"
-
-if [[ ${PV} == 9999* ]] ; then
-	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"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc static-libs"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-RESTRICT="test" # Tests need to run as root.
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999* ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use doc ;then
-		local HTML_DOCS=( doc/html/. )
-		einstalldocs
-	fi
-}
diff --git a/dev-libs/libevdev/libevdev-1.7.0.ebuild b/dev-libs/libevdev/libevdev-1.7.0.ebuild
index 51227e894ef6..f0285f910878 100644
--- a/dev-libs/libevdev/libevdev-1.7.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.7.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libezV24/Manifest b/dev-libs/libezV24/Manifest
index 5d097d26cafc..88de40b28026 100644
--- a/dev-libs/libezV24/Manifest
+++ b/dev-libs/libezV24/Manifest
@@ -1,5 +1,6 @@
 AUX libezV24-0.1.1-build.patch 4869 BLAKE2B 13f3e7a7493825ff2d7242baf499a3844d360ae0cad1b95dee6a7042c08f53eb428bcc93ebf23d3f4ea10ef589f384aeff6f8e70e36cc00f5546ad495e5839f4 SHA512 d55ba03d30973739918902a21c0b9da9f1b4d74f8923f2aa14747a894f2ff2118699e7f98c1a436f8942e948190752b1e0b027d52225ba025957d5068ce321df
-AUX libezV24-0.1.1-test.patch 468 BLAKE2B df6b55e96cc6ba565673321a71c5e33f279de628c1b86aa6ef4d32f6e019761747c3c8754c97899d50fd7a665bca1c2404f5fae6ac28e37f11cf1ee5e0f3bf40 SHA512 16547da68cc1f0156daa06f9280a18c58d5daa8bd528489546dcf190f4e76bc3d7574d604eff36d5f8e8768e0044dc31783e85523d09cabcebd89c0f2cde8006
+AUX libezV24-0.1.1-test.patch 472 BLAKE2B 9e7b928e271fc7b963e3f8f82c818de06fc0a0477c972a143a48669c67dbcec9c83e70da6cd38ef37968d91d438439090fbdf7ff521e69291a555ced5cf7aa1f SHA512 f2bc15b6c99ad760215406f2a4fc2d230671d0bac9a8249b6ac25aaec4fba16c435ce0871f42ff41cd54d9d0d9e4a72fdc19dc84426ae594bf9293b1b6efe906
 DIST libezV24-0.1.1.tar.gz 50515 BLAKE2B 5a4dfdb4e4875203cfc2c06a1d5966d79c84407539ad3b3419aea04e7fcfc5ba05e6e69d1a09d999a1c8820f35bd5adc7fe3d833ceb739e52f1246491d339034 SHA512 99b277a04354e2587567ae5f1ebc99e41d127ec94bf5de53021b94df8d731ce2f2ceacedd8b7fa29902cf98f5c4243bddaa96636e1f900f1434a3da857b0e6c5
-EBUILD libezV24-0.1.1.ebuild 850 BLAKE2B 39bf0a484c5bcc88d0aa7e7f85c4095d2535dda65dc535c22b901e0b06ebeab8756e3787fccb403a8e0fc39a79c727617ec29d362bfcba0e96d97b0bd984e4dd SHA512 51af56c72895d250580df08e10edc6d69bda29b4f134165440d59a731851ae20c50cdfe51943e18e87b98a5e23f74767f4790755b50f12853958e1a57e24d6cb
+EBUILD libezV24-0.1.1-r1.ebuild 729 BLAKE2B e3a5c7a756387ed7788ff5eeff9b120214ba3b1cd2e0f8ba4fc2fc1c4bb723cd37eedd6e099e6d17865ba85207869c9081b91df6a17a0684f32f11cf4e1b76c7 SHA512 a2d6cd0cdbf1e2258c322a6fa48baf70ae70307059b79ef2bd7768cc6d79a1dae516be4452c8ff1abd2fb042c5dd371a6e9d331c146d3a0ff6f2feb0f42151d6
+EBUILD libezV24-0.1.1.ebuild 848 BLAKE2B bfa085c1053eb6ccf4a5c4163a9bb6d0fccb73d171397dc90b87e33fda27dee6d7ecaee284084865663aa0f8390d43ba8c14ba8d213e1880f6feb7142d76cdc9 SHA512 b5acccc76a086a85ab7ffbe421e6ea99c64ba43bcdc1a8d147f04848cb7fabcf3aafb87c23afed5bfe75657a3a25d3a8180d1dadff6e37373d13b2e60b1ddd36
 MISC metadata.xml 641 BLAKE2B e75047389f2e4125de93bb6bfca6ce5f33dbb416841c35712b066ba20f7a728fc3282665f684c377fd9359b780416eea9c1edc77593944250ffcfc046cb0172a SHA512 2ec206575cedf384e77716e3959bab5d359cfd16dde6b24f88f160d7e2bc8fe9d7916f6de771a9616f780d0da736d063cc1fd6d313c3e114a2c0f136df9847f5
diff --git a/dev-libs/libezV24/files/libezV24-0.1.1-test.patch b/dev-libs/libezV24/files/libezV24-0.1.1-test.patch
index f3c2b676546f..425c32036560 100644
--- a/dev-libs/libezV24/files/libezV24-0.1.1-test.patch
+++ b/dev-libs/libezV24/files/libezV24-0.1.1-test.patch
@@ -4,8 +4,8 @@ RCS file: /cvsroot/ezv24/libezv24/test-v24.c,v
 retrieving revision 1.2
 retrieving revision 1.3
 diff -u -p -r1.2 -r1.3
---- test-v24.c	11 Feb 2003 13:29:43 -0000	1.2
-+++ test-v24.c	13 Oct 2003 07:50:26 -0000	1.3
+--- a/test-v24.c	11 Feb 2003 13:29:43 -0000	1.2
++++ b/test-v24.c	13 Oct 2003 07:50:26 -0000	1.3
 @@ -30,7 +33,11 @@
  #include <string.h>
  #include <signal.h>
diff --git a/dev-libs/libezV24/libezV24-0.1.1-r1.ebuild b/dev-libs/libezV24/libezV24-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..b6b2424b2a9a
--- /dev/null
+++ b/dev-libs/libezV24/libezV24-0.1.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="library that provides an easy API to Linux serial ports"
+HOMEPAGE="http://ezv24.sourceforge.net"
+SRC_URI="mirror://sourceforge/ezv24/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+HTML_DOCS=( api-html/. )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-test.patch
+)
+
+src_prepare() {
+	tc-export AR CC RANLIB
+	default
+	sed -i -e 's:__LINUX__:__linux__:' *.c *.h || die
+}
+
+src_install() {
+	export NO_LDCONFIG="stupid"
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	einstalldocs
+}
diff --git a/dev-libs/libezV24/libezV24-0.1.1.ebuild b/dev-libs/libezV24/libezV24-0.1.1.ebuild
index db6b724d1f4c..30ac27fe8784 100644
--- a/dev-libs/libezV24/libezV24-0.1.1.ebuild
+++ b/dev-libs/libezV24/libezV24-0.1.1.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=0
@@ -9,7 +9,7 @@ DESCRIPTION="library that provides an easy API to Linux serial ports"
 HOMEPAGE="http://ezv24.sourceforge.net"
 SRC_URI="mirror://sourceforge/ezv24/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index dde512b55bb5..68c71775a890 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -2,6 +2,6 @@ DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c
 DIST libgit2-glib-0.26.4.tar.xz 138492 BLAKE2B 725c14076fb940186faac079cff1ea87c456ed41e943ae95a4a674632c1be261ab6d4d5bcb5c0800bbde5d86c1ff3095d59045a2fda1342a1cf5c691a2b424aa SHA512 9eb78f292583862890ca0cd27d7621da2f8f633a76f4679f897ce6cf9e06b64a3cb7b0ddda39d231d21d3faa830fe1a9a9326b4abd420df8356d50a734360b37
 DIST libgit2-glib-0.28.0.1.tar.xz 138928 BLAKE2B 708523bb5a723f59e51501675c046da072bcdf18b3ded94920ce9eb181854780d6b44759531c8e949199a889578515994299facd14d10a07958019f6af0b6aba SHA512 6ae88bb56052461a9531016140edbd8517db8d5c0e5c217b4e8918ffef70b92652e4a95493c4290112068d0b793bff2b894f136b79929924fb7347926e3a8f51
 EBUILD libgit2-glib-0.26.2.ebuild 1297 BLAKE2B 9cae857d1b8eac43814de33f157d257fdc88e7f7bc7ee68a5634904cedc03692db12b7b2c91f48cff91cf84585e9b2ff3a5d8e6525ba080e679924ce26ab5ad0 SHA512 2c4edfe78cdfd7c7a0505c465dfe4011059095d24e0ea152ce7366b86a194bf11c2b761007eae492afb15e288b6726b89b713d0108f8cfacd103e01ee4d810ea
-EBUILD libgit2-glib-0.26.4.ebuild 1321 BLAKE2B 3f9bb5fa640ea2cdaa2ce6034eec6a45e1e78b0ec83b8232b8f833bd554bdd659a0439c7ad3613253ef4d0f0687f40ae6be3a9c90e4d2923598fb7f9729f9f75 SHA512 d4e465ed497daa0a47077a07ff01ff7065cc1f0ba48d8660a7fbb97d6e983fdc9c0d2a19dc5acdb5f7ac382cff7d9fa8527fc62f9e0be116e7b6681a6ea30ec4
+EBUILD libgit2-glib-0.26.4.ebuild 1320 BLAKE2B 00883cee9d3c36676ecc0fca9213c5e6f039736b69a02f285b5a86fda36fa6793b535a70ba21c23cdee8d0842703d72e2ae7f8d8a904f80b2d975fb8543d022a SHA512 0f8a2debb19db854e8114de3531a625fd3bc84233a1f2fd0a5e364e2eeae4d33fcad04206470dbfdcd796c65116f500e56a9ee8131296ae611c1b4673972c4aa
 EBUILD libgit2-glib-0.28.0.1.ebuild 1262 BLAKE2B c4698febceb4823b5c67ade03fce33425c82cc0ae1283b3beebf352b7beb5b0962f7b17db4722f6aef2ecd82a69e833b411cdf1c65a4dc3a0227675777c1ae92 SHA512 9858b1c3edcd9b36f5e091aacf6ee5cf32640c4380821bd4dced070e8424b17c642d34d2d9f70d50ffe05ab8050ef4e633b648ba0a231cc8127f42c2f3fb39c0
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
index d26630c95978..7445ff21ee8c 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="python +ssh +vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index 6fde832c9ac7..2c3084310cb2 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -2,5 +2,5 @@ AUX libhid-0.2.16-gentoo.patch 628 BLAKE2B 6c2a25cb230a50c5eceff0229d9d6bf3860c5
 AUX libhid-0.2.16-libusb.patch 421 BLAKE2B 8b3283ddf9ca120bb77af75fb5aae88ca6d45904a425fdc90f4ca7fda8bd111f37deea5454d692499156337f473bdbd3731d7bf45ea7b80af5c359478cb96c69 SHA512 0fa3be119d1ab3efa428c81b96709a0cee4fd40fa4515d255a64be095a4e26f68a2c8175beda6615c720aaa593edc5aaaa2909bfc5ab9e7f9b818d8c507b9fde
 AUX libhid-0.2.16-swig.patch 1424 BLAKE2B afc3bbaedcd83c87b3186742872681a7a74780873d7aea8fe5fb1df9c69aa66e8265af58200476a2c85f7c0f7abc8036cd569e8827cfb239cb60262758618784 SHA512 62ff58921aa99947f8b33b0d1c02cf30f19fd3f75393cbb681846266b67af49bf6a2e70a995c9a7252b27c67e573e2c198b366830c15ca3c5e87a93325a849cb
 DIST libhid-0.2.16.tar.gz 435245 BLAKE2B 9bd06b226e42ed0dbbf4395824636dbfaa796ce9c0170ad7af561741ec3f494b92ec09c548f3bc7c698a32aa78d82d4da4094231fbb810de5a67d3066947fd97 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b
-EBUILD libhid-0.2.16-r4.ebuild 1209 BLAKE2B d47429e294999d1516580ce4045da49d23973f01a0bfc3fa38b96583b846b757827e0fe443adac1263a275e35954c96fdaccb0d891e01582853627ef380332a3 SHA512 d16cfc49ff2239d253c801e51043a1c5600779cf8c534e736b3c367ffcb114f6a92663ab067043eb47cde2479cd487b084c8f6d4c405a703fc95b0ea6e8b3e9d
+EBUILD libhid-0.2.16-r4.ebuild 1204 BLAKE2B a343e37a99d08a223df900bd2442ec693473b5059be4c097d092532910dcda944650f07daf58d048e84fda4025b4a4b9acbc941ba682ac490ba346bd8dfb9e40 SHA512 6ea1d3c6d7b505502f4032d4e15fbead19da7521495efd7f2f89c0c2a05a3da4657de546238c699cf88777e8236f982df22f70bc5c07fc8dbeb1f389473c5151
 MISC metadata.xml 495 BLAKE2B 1cf63c758e96eaeb6195814d8f568f80016982d94561737c3077637165c4fe5f791ca88d45374f95e0208aaca523f77e887e5c99b5839c8c8ce34573febe5987 SHA512 e465b7596e61565aa21ce9c32d7d76b099ee21c471c341677604f5816f2b7547c57f8a065f2bb9df2356c3e6d5fd26efb303884117096e8178127490a14ca268
diff --git a/dev-libs/libhid/libhid-0.2.16-r4.ebuild b/dev-libs/libhid/libhid-0.2.16-r4.ebuild
index d082da46f04a..473d2bf3bf41 100644
--- a/dev-libs/libhid/libhid-0.2.16-r4.ebuild
+++ b/dev-libs/libhid/libhid-0.2.16-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://beta.magicaltux.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="doc python static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 955f862307a6..6696690ef1e7 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,9 +1,6 @@
-AUX libical-3.0.4-pkgconfig-libdir.patch 940 BLAKE2B 2b7748bdaba3ae14a83305aba4a2620a6cd85d679b736b5ad9890104f5ac1042cc39b50506f1239ff35d9f98408f4feee1a384943b855c83fb4519785bf19a48 SHA512 492def0e87c6abc9c7c3e4a69133b54bd4c5a05ba42be554bf3ebe170d846b6d5ec5d1cbfabb9289b5ea82693e1b2af60a2cfe07ea5c36da5ba335e29df9a1f5
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 AUX libical-3.0.5-fix-lots-of-params.patch 898 BLAKE2B b0fd85229bde64bba92ee93171766e3e6d99748c873cbbf2e213c8196555db06a82b113d75c7512eb8f75e3beadeedc5529755ed9ef593414b272fcc43eacc12 SHA512 4d5559d147a3ce51697af24c13e2eca0575f4da16bea5db3066e00fad09b6d58d16fb2401e44e9623b9db9b939d4ab115989ee1f8bad2cfe59118e2cf626ead5
 AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
-DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
 DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
-EBUILD libical-3.0.4.ebuild 2044 BLAKE2B 74e2578c8f33971566f608ff67695a97c935217746f9a4d4222fac1c0558803fcba89fa8e9f3107ed210aec7d89ea863e475c840bd49163c582696d798e3aa8b SHA512 8cb6f316e299b25f1477aa3191e5a541061f5d1c5e327caaab252c46a429a2c85173e36015c0f7aa787d962e0c8a55c8cbb2358d61660842574eb319aef87963
-EBUILD libical-3.0.5.ebuild 2110 BLAKE2B 8697e0dc248b4b81a9babcf4e08f2a10716ba41b4afcdb357c15668f8fe59fe6bd4172adc9d52c5195ec6524b9d09239c96a64f3e3d460d7bf112674f718f750 SHA512 4e023d9d3cdd169ab768c49f1885a4356de1cc0436ffad1f7579e82e0b19e8366a786f0130fdf5f5b1464ff11d3f1b78fa8d6bab3a775fa469b975af6c0f694a
+EBUILD libical-3.0.5.ebuild 2108 BLAKE2B 891417bbe3bf343fefc5b03f5145424ab7cfe4fe8a63f0bffafe3e9e97fb71290dee0c5d16207cf8f3ce1371a839a100b7e2b14827bbf4214e4431d614325200 SHA512 883d5c3d9872ff8eb505442966ea3d3b53996830ec880e49736efd2c97132b4e8bdd04f9b299de44afb3f118e96f759a389bc61500077f53b889bebdc7733ce1
 MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
diff --git a/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch
deleted file mode 100644
index 1ef0817bce7b..000000000000
--- a/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 111ee5ff9daf7db21ad0b6874c4b7cc05baf4703 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Tue, 8 Jan 2019 22:13:47 +0100
-Subject: [PATCH] Fix typo in libical-glib.pc.in
-
-Missing '$' causes compiler warnings about missing-include-dirs, due to
-the {includedir} not being properly replaced with the variable value.
-
-Signed-off-by: Allen Winter <allen.winter@kdab.com>
----
- src/libical-glib/libical-glib.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libical-glib/libical-glib.pc.in b/src/libical-glib/libical-glib.pc.in
-index 42f1ffe5..e164cfb5 100644
---- a/src/libical-glib/libical-glib.pc.in
-+++ b/src/libical-glib/libical-glib.pc.in
-@@ -7,5 +7,5 @@ Name: libical-glib
- Description: A GObject interface of the libical library
- Version: @LIBICAL_LIB_VERSION_STRING@
- Requires: glib-2.0, gobject-2.0, libical
--Cflags: -I{includedir}
-+Cflags: -I${includedir}
- Libs: -L${libdir} -lical-glib
diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
deleted file mode 100644
index 3e1efabd39b7..000000000000
--- a/dev-libs/libical/libical-3.0.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-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"
-IUSE="berkdb doc examples static-libs test"
-
-# TODO: disabled until useful
-# 	glib? (
-# 		dev-libs/glib:2
-# 		dev-libs/libxml2:2
-# 	)
-# 	introspection? ( dev-libs/gobject-introspection:= )
-DEPEND="
-	dev-libs/icu:=
-	berkdb? ( sys-libs/db:= )
-"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${DEPEND}
-	sys-libs/timezone-data
-"
-
-DOCS=(
-	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.{4,5}-pkgconfig-libdir.patch
-	"${FILESDIR}"/${P}-tests.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use examples || cmake_comment_add_subdirectory examples
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DICAL_GLIB=OFF
-		-DGOBJECT_INTROSPECTION=OFF
-		$(cmake-utils_use_find_package berkdb BDB)
-		-DICAL_BUILD_DOCS=$(usex doc)
-		-DSHARED_ONLY=$(usex !static-libs)
-	)
-# 	TODO: disabled until useful
-# 		-DICAL_GLIB=$(usex glib)
-# 		-DGOBJECT_INTROSPECTION=$(usex introspection)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile docs
-}
-
-src_test() {
-	local myctestargs=(
-		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
-	)
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
-
-	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.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild
index b068f3dc391c..c15ce6147212 100644
--- a/dev-libs/libical/libical-3.0.5.ebuild
+++ b/dev-libs/libical/libical-3.0.5.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"
 
 BDEPEND="
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index d6cdd35b27bd..388d068d335a 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,3 @@
-DIST libinput-1.12.6.tar.xz 518784 BLAKE2B 7462f47be3628f9c66ef5b7c8265b588bd0ca328bafe91932f5341a010ac882648b4e7cfd0db241ae526836172e0829d68d21f8966d2be8b49f4e1c0c40df018 SHA512 02ad90c77a0c8c27fd96ec34e1546c5f0947ced49bad386372c1ef7c41b3b2157c39020f0766f20aaf2ab3c97128567e169279bea21115ced39499dda325d2ef
-DIST libinput-1.13.2.tar.xz 529488 BLAKE2B 489f962ca0b0385817fc76a5bc7254143d12c07e32a91dd118dca53fcdd6eaf5d2eef8aa5c5598a2aadda9e4a20b8a4c9340b60dee8286cd322fe2d294f1f6b7 SHA512 26f11c5274c26acc38b9b5729195010c0799a9563f1eb0e0cd67e323f8ed73b0fc8db8584ec8fdf1b726417f64c2daeb54832167079832626c8c1190fccf459f
 DIST libinput-1.13.4.tar.xz 530000 BLAKE2B 96345625b98ecc5476b9525cac84ec6cffb5854ce8d9e197fa73dbcb3548ebfea7820fa32d4e808222c0471fc94d89003775587cc0ed9c8445dd5902d3463792 SHA512 ccfdfc704dab9ea19a503399ecd4ce3a95b8d9480b8dfddeb80be01236c34c6f2f472be0e12e04dddd68092611470d303351e092141bc7491729639bcf7e64d7
-EBUILD libinput-1.12.6.ebuild 2055 BLAKE2B c8dea3e1942f7ec25de860c377afd70ad5baacf632d12670ac5394bcfc9476ec987dd92630558a47d54d5a6aa58a779da51414bf534e6b32b82b556c2af6b087 SHA512 1638b3ec959a58c1b198990e028df0319360485e352e1f1fe4b20690cea0549b6272636213e38952f5b236ff335cff557d37e1e11919cd996d10b28eee0184dc
-EBUILD libinput-1.13.2.ebuild 2071 BLAKE2B e6703ecfa1191fcc8e5f3ae3a630513497121cf2d709fa4f2b6992d86e8071bb1e502ee9f858e28f5bfbcc40018095cb5cc5337e338fbd4a9097623ccd7e2248 SHA512 2a63e6bac28abe072bc0cc6648fcdebf3722113167d7cfd2f27d95fd955e114420b0e2f94c9e020e17a676d1f1e69e9d47e182c29cbec2cfc7b3bdb6d893312f
-EBUILD libinput-1.13.4.ebuild 2063 BLAKE2B 4c98eabc370eac79dcf52a9f112f59ff3025106309a20c75670199f6f752be42d4dd07effcee6bb32d2851fa48cd145457f7bcf8dca3a85dd34696b0c8b2f11d SHA512 e9e7370682e7d2947569671805072cc8d202673f90c7ec3fd7bf095f244322d4239a8fa2d37ba7f8d4df69fc7ec047b3a99945079fbc83805e2f9561302d830a
+EBUILD libinput-1.13.4.ebuild 2059 BLAKE2B daeccd68674bec236e3501b14aa4529c7dfc66545acf523e76fe84696024761cd28b05aa4a30e27f30168b3ed947bde3ced491f7d410546eeff2d39dd6b0d116 SHA512 67193ea533150a70b2ff073d3078acff974eef2a46d40faa8cc6b69c695abbf4cbc6f3be7d25c351055b63ad1d2546147bfbde8fafad58fdc542da97fbe4d510
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.12.6.ebuild b/dev-libs/libinput/libinput-1.12.6.ebuild
deleted file mode 100644
index 213dd9f0cc1a..000000000000
--- a/dev-libs/libinput/libinput-1.12.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2014-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{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/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
-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"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-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}"
-#	test? ( >=dev-libs/check-0.9.10 )
-
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-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}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	udevadm hwdb --update --root="${ROOT%/}"
-}
diff --git a/dev-libs/libinput/libinput-1.13.2.ebuild b/dev-libs/libinput/libinput-1.13.2.ebuild
deleted file mode 100644
index fd529371d3d1..000000000000
--- a/dev-libs/libinput/libinput-1.13.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2014-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{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/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-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}"
-#	test? ( >=dev-libs/check-0.9.10 )
-
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-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}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	udevadm hwdb --update --root="${ROOT%/}"
-}
diff --git a/dev-libs/libinput/libinput-1.13.4.ebuild b/dev-libs/libinput/libinput-1.13.4.ebuild
index 49c89bb06b15..2a1ff8430843 100644
--- a/dev-libs/libinput/libinput-1.13.4.ebuild
+++ b/dev-libs/libinput/libinput-1.13.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 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.
@@ -74,5 +74,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	udevadm hwdb --update --root="${ROOT%/}"
+	udevadm hwdb --update --root="${ROOT}"
 }
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index ce8a28683aa7..06199b900ef0 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -2,6 +2,6 @@ DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a12
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
 EBUILD libintl-0.19.7.ebuild 2113 BLAKE2B 75e03a8f03cafbde95513b65efa2a93446d2a5e129da222dd1c536a60053b52b395e78841387e36ed50a8ea712f9dbb4d6e6a06d6d3f425c6c8a649623c5a8a1 SHA512 6fbd14bc71b6dfd475d1ca985432a7ca69908c49e1b0596b712b8f37e4fec0ebb89e651f367c41a7a5a9e6343ddc386d00f1cf57d7b8fc92f41da87137004ad0
-EBUILD libintl-0.19.8.1.ebuild 2119 BLAKE2B 2408caf1c6d314f274c37f4e3ee4344b2184203111c597c8835c7ce926059c3e865497e910f75282a8874119b638cc759b62fe8956ef08f61531fa84469a339e SHA512 6584b841170668faa5f494b5ab2fe7cafc053907d129cdbf9738ee5f3cc86543b12c6ccd1611078241b11f764bfaac1740af86cc878e2e7643d99d560dfaa774
+EBUILD libintl-0.19.8.1.ebuild 2113 BLAKE2B bad3eb14a73a0aece5e2bd7e574949b13b875598a3cb7914872748eba9a5bda2d49abda88c8baf079802df315240acb80527d8b3c65011305c6e24be1e128e2e SHA512 b38adde6c1ca3d61431789440bbdf91a62f2ee661fcc6119d3404c564a850840d1a8edc06fb257e62588c4f6d0d25aabd9ac85103cd77292803bfd4474ff5279
 EBUILD libintl-0.20.1.ebuild 2135 BLAKE2B ff1608339c894144102cbb9b77c612153c592115c6f1c4560b8c327d431a2d1da861d958346482528cba8670615a34ec2ba3ef8b2c706f9f90358893f6fafdeb SHA512 c4bd136542ea900a577ace3de54fdaf442629221ad44d939f73e833e4915b7b95426d3940e84a537f4b916d8ee174ba9a429851dfaf7341c6ed01932591a7c2d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index 49b6bc0d32c3..65a105fb1349 100644
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ b/dev-libs/libintl/libintl-0.19.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="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 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 38748915e15f..0edb53931af5 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,6 @@
 DIST libixion-0.13.0.tar.xz 413756 BLAKE2B 04aef61a1cc691bb159d7e8131e2e47fe2590634adc93f2e5771ed106316eb1c92ee7c4aa05ba753a1751cb5e7c55cba9263515671a26f9bc9983a1cfcacceff SHA512 15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0
 DIST libixion-0.14.1.tar.xz 360568 BLAKE2B e4da21f0eff9111272618d1bad87790ed0c4b461478473654f8366b0023c0650b41d355b0737a4fd4ac943e66f919e2f0d6bf04250e597e54a290d4415f3a093 SHA512 e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
-EBUILD libixion-0.13.0.ebuild 1146 BLAKE2B a9c5a0d611ab91a60cf104a378c9da4c8e60c2ab2395b90eafe2530b7fcbc3883a8bd22ca21a2842774a941e6da4825d6bac186c02823b3e7d7263546ccc5ab7 SHA512 44ab1518052194f4baeae3911a773347fceeda07514b3b4734746470209e126875195dc380b68bbe86700537a4af77b3d13bfcd2e7dbff9b86ed9a8ed60f4f8b
-EBUILD libixion-0.14.1.ebuild 1082 BLAKE2B 93dc012bb6d8ec5f3463e332b1873f22afa860f4f1093f648ab988cea2b74294cbdfe304dab7696057392a968ceb3c3b0b5576902b33a2b26ef47f9e431fc140 SHA512 8997e8c71b884be14ab1d40c4e812847065068b39bc9cd2e61102a709408428db26c1db39fe413d9c60a5388366f0a3bc5e929f1c53a2444f0ad1c254cf40f0e
-EBUILD libixion-9999.ebuild 1084 BLAKE2B 31dec65a5e55763ff9b3ba5d775e8553210cecec7e5d302ff49346f8072cd829503ded8ae215089f04cf97d4ebd54ff59be951870d04cfa81579413fd101806c SHA512 4b3f43b37e3c527d9f33ce09a6aed3d472b84fc037f30fd56380eb3b706b5e8913284cfe49d601d9c6790060d9b09d1fa1a68e7a2443972092573da75b586a31
+EBUILD libixion-0.13.0.ebuild 1145 BLAKE2B e5b005971d77f8ead2d0c9132f968934c152f011ffed7ff6ef67403f9b04a5dc28fb12ec30975909021e2c7de9995713ebf35ee02621941cf16e11ae27019b62 SHA512 49f0f2abb804c5da0674a100d6d403d78df2f65a10f2bfbab60ef6cea054882db881c5875deba16d7b43798011809ba492b079b05fdbc3b4c0b49ed8c167afbc
+EBUILD libixion-0.14.1.ebuild 1081 BLAKE2B 9b054acb579d7e2d409386418433caf13e0d2c35559ffe77321e7878c7654ff943582c15785235f3aacc85660f324cabf6205227f0f318387ecca4c275317f0c SHA512 5e85969c94c1abc2ebfed5b1ba2e41bb45ff798e1bfcf1633ab9c11b53562d32d8d0fbcbf61c35cd3450cc29e7dbc32e570163d2c5b0ef53f878cdbcd260e6c5
+EBUILD libixion-9999.ebuild 1103 BLAKE2B 8ca8c29a35df52397f9e0d83671595f11ee97cad1302df5c159cf5ca9bc573bf8dee310d1d39d8bdad088c379d6e917c44fbf4e0bb8a3713df91d0977093c441 SHA512 7885380b0401262c300439b8c3c32f636c58abe65bec7478c8bcb7601ee9cda24bba34e469b0bc024ed6d96e8e4b542d2e247173d3e8c3d35dc27087667f0544
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.13.0.ebuild b/dev-libs/libixion/libixion-0.13.0.ebuild
index f092df1e8178..ad201abb3871 100644
--- a/dev-libs/libixion/libixion-0.13.0.ebuild
+++ b/dev-libs/libixion/libixion-0.13.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gitlab.com/ixion/ixion"
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of libixion.so
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="debug python static-libs +threads"
 
 RDEPEND="
diff --git a/dev-libs/libixion/libixion-0.14.1.ebuild b/dev-libs/libixion/libixion-0.14.1.ebuild
index 16136df8a117..487a0e6613a6 100644
--- a/dev-libs/libixion/libixion-0.14.1.ebuild
+++ b/dev-libs/libixion/libixion-0.14.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index 860c13488fc6..ff21270e7421 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -23,12 +23,14 @@ IUSE="debug python static-libs +threads"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-DEPEND="
+RDEPEND="
 	dev-libs/boost:=
-	>=dev-util/mdds-1.4.1:1=
+	>=dev-util/mdds-1.5.0:1=
 	python? ( ${PYTHON_DEPS} )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-libs/spdlog
+"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/dev-libs/liblazy/Manifest b/dev-libs/liblazy/Manifest
deleted file mode 100644
index 612b27670792..000000000000
--- a/dev-libs/liblazy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST liblazy-0.2.tar.bz2 232417 BLAKE2B 17484c7fc1bee7168c323259d6f15177ba67fd1830a045171fd025c1d26312bc68d02ea1d65dba8fe27f5428a5b2194e4f6be03809135aaac26a4dfbffce7493 SHA512 1b3977d297caa985d77c5be61af1853a96fb23beb4b340a21bc0bac3160a68147396dc677d029ffac170c63f631e28422903fcc08b9f1c7e363ce0e776c9652b
-EBUILD liblazy-0.2-r1.ebuild 580 BLAKE2B 1521c21681916bc317c84d583d67047e0bb18cd3b39d87d0d13b23249eba536fd7c0eee0edf95d12f1725bc4e52a0a8f570ce9507cdaf2b9572c480fd6729790 SHA512 0fe77b67473da666ee7dcf8f1365fe88f02562bf6e96baf1d05b46cd8a6ddbfa35a32e0800a5a7f579bcd42cc4c16e1ebf8abde83464009c731c20508bb5a6ea
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/liblazy/liblazy-0.2-r1.ebuild b/dev-libs/liblazy/liblazy-0.2-r1.ebuild
deleted file mode 100644
index d6d1a51748ef..000000000000
--- a/dev-libs/liblazy/liblazy-0.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="lib for D-Bus daemon messages, querying HAL or PolicyKit privileges"
-HOMEPAGE="https://freedesktop.org/wiki/Software/liblazy"
-SRC_URI="https://people.freedesktop.org/~homac/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-apps/dbus"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README
-}
diff --git a/dev-libs/liblazy/metadata.xml b/dev-libs/liblazy/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/liblazy/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index ef700929ecdf..0b3362288b51 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,7 +1,7 @@
 AUX liborcus-0.13.4-boost-1.67.patch 1705 BLAKE2B 5c1fb62ff088163d07fceff4e230bee4728bae2bf4cf4f6e9b5cd0e15037560439efaa17a3b1cd4526df57fd0b5747454db54c6b7a382de4ff8afb9d1da87348 SHA512 eeb343ae4ec779e1b5a40ee93d3220d3e18a7bd3b906935d02e0019412a09c3e182a9e9ba67db30aa8f4e7b859a2fafcd68fd2daaa9d6506a004fd8176fc3ab0
 DIST liborcus-0.13.4.tar.xz 1816340 BLAKE2B f8e7251c8688f82604d5ac1212938890e42f23ce45edb09eba9ab26a810e5fd4215a23dd20e86ddf9100db67818fc73fbbee7357642a6390f8f60dc28596be31 SHA512 f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b
 DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
-EBUILD liborcus-0.13.4.ebuild 1340 BLAKE2B 097ec463094655c02dbcdfb8889c9888fb83c53cf9abc4a1d8b091f9c93362ccb80911bb4a4d9ab001ab8d746217790babdf3bbc07a3019dbb3d4fcbec806100 SHA512 fb6703efb82d4860ffbe3a6f383ea430e28159a84cad6972d2c26cfdd2d75839c804768c5b5b6ea57b95f6df225511a13b68b222e681656c7ec7c52d3be63592
-EBUILD liborcus-0.14.1.ebuild 1233 BLAKE2B 7bccdd0bb4e57c99a0d230d7877b0711e70d3d8b191520328747593d4acea8107029cc9faf8e625a5d5058194f904bac7186d0d0aea85f302f07c6eb3595fa48 SHA512 970b77eab2acaad771f9e1f1a4b17196656a608a62167633484c4120400d0c5f95fd2153c1b743538b5b871ee33d2c7a8c460c1f2a6ee57139e6babc3b6b7f08
-EBUILD liborcus-9999.ebuild 1235 BLAKE2B 81bae670ce423ae5da47b52f7a49c4b50c8085a0d84b5c52acfd8decd808b2df71d8a3a087559eb4049204c02815da1233fc4140040bef2908bd7efc3ffd67cf SHA512 7af4857f6b3b04603036dcd560d93531a158d9f9829cf163782e50295777b285c5fd05b819b289a7a7990e3efbb1bd90eaa91f472955dceaafe6884ced18d0ee
+EBUILD liborcus-0.13.4.ebuild 1339 BLAKE2B e3ffb431c8d4afb5f0e77ce8a6c1a6c2bebcf31eba4795161cd81fdb423997aecfdb7d9fea4bf2b4d328866128916f366e38837cea09ae5fb32dc59cbbd37bf6 SHA512 498f4d5deffdfc6bfdf42f41abd05bc4759ad88a0e29d0e1058a7e73eef0507e922cd5f79ea4f0dfddb6050868f0ffa3c6b2fced6f0dd347e5f6eff4a8aa7527
+EBUILD liborcus-0.14.1.ebuild 1232 BLAKE2B 9ce83461f3537a81c8d885b37b02f0d2d7b9db6d1ac3d89d8998c74f91d6f369790fd0c1d9a3086b96710dadcc129fd2b4375442ad2863335d1a3558276ac15f SHA512 59703cf3d056ed1c69de0f2d4a08067afcc1ea81541d9078d51e6bf270352d348d975420aa488e79f6710e321f7e283d8dab3c559694d6b12d46d39ee5eddfd5
+EBUILD liborcus-9999.ebuild 1235 BLAKE2B 9690fc7b0ae34d59f4fc3b96ddf1e590d101763859503e4097e7b63fc92412a57986e10f1b6f8750725dc8feab001636ac0dc4b44aebf43986fa860fd0617278 SHA512 63cc21fc924c9c599dad935ab51d4754e38ed6307dd21d0e6674c3fd74bd7f6fb623ee91a8778a409f1908ce5d6ee6646ecfd5fdecadc7ccaf4f50c651efabb7
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.13.4.ebuild b/dev-libs/liborcus/liborcus-0.13.4.ebuild
index cb8289ad6304..81e4c1673a31 100644
--- a/dev-libs/liborcus/liborcus-0.13.4.ebuild
+++ b/dev-libs/liborcus/liborcus-0.13.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of liborcus.so
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
diff --git a/dev-libs/liborcus/liborcus-0.14.1.ebuild b/dev-libs/liborcus/liborcus-0.14.1.ebuild
index 0f6a0844ca7c..23cb5009d8fa 100644
--- a/dev-libs/liborcus/liborcus-0.14.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.14.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index 24dd4371bd52..ffb340248f38 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -18,17 +18,17 @@ else
 fi
 
 LICENSE="MIT"
-SLOT="0/0.14" # based on SONAME of liborcus.so
+SLOT="0/0.15" # based on SONAME of liborcus.so
 IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
 	dev-libs/boost:=
 	sys-libs/zlib
 	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( >=dev-libs/libixion-0.14.0:= )
+	spreadsheet-model? ( >=dev-libs/libixion-0.15.0:= )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-1.4.1:1
+	>=dev-util/mdds-1.5.0:1
 "
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libotf/Manifest b/dev-libs/libotf/Manifest
index 44e5a2814e11..dceb63de74c1 100644
--- a/dev-libs/libotf/Manifest
+++ b/dev-libs/libotf/Manifest
@@ -2,6 +2,6 @@ AUX libotf-0.9.13-build.patch 678 BLAKE2B 59437afb9db0600ce6b3b7fd61f0ee139de11b
 AUX libotf-0.9.16-freetype_pkgconfig.patch 1021 BLAKE2B fe4e25b4c90c1b614369158bcdef2babdcb9c44cec81cff9c25b33d33614be99f689b209f0c19722d201c6289ebac3f5c758b9c080c84c1e57aeccb535b95ca3 SHA512 5aaf5fe70f5498859e6913ef274c47f1bbd339ea02d7027ede543a3ef0e88109ac747e03dc852f3a5a22df538a5d04ea7e9ba2bcdec899ee5063738fad57666a
 DIST libotf-0.9.13.tar.gz 388832 BLAKE2B 73d15db54457afe98016b3958668fd5d62e81c8f53d34bc8ddd6ce5c18e54085a9d3ff1648e2170c7a97823dcbd9ef117f3e66befbea272dd98193baf63d6039 SHA512 86ddf071df371ee44910afc02432352356bfa1c2a55b44274c95fc4e7ec4fca982a7fcde35aaa63a8cb332e98388a9faf9a94fbf0f39e85668630f77d841ef31
 DIST libotf-0.9.16.tar.gz 423979 BLAKE2B 838e7c855f93ebb30bcccd1d3055f662da1736bb85fa398f9ffe84411249f63e4f66908b55534c2f07446b45ae7912745a92bbf0404f8d62eeb3a9119a604b37 SHA512 0f68c45c1224f02dc0f1a8e9915dd9c1c70d71259b4e2f7bbd4fbec6426e58d4a26e4cbf28dbb8ed051ba6f532f99fc4e74b4ddf97a93ec947fa6260c875d0b4
-EBUILD libotf-0.9.13.ebuild 876 BLAKE2B 88aae8f868a59296505ed6540be0e0a8324f3ebb875666bca312a8fdd8ff9b0f5d63d7a0780281f0dbfa48dde61aa51ae77553478ef81724d36587acfab56fe2 SHA512 e78f351a2a76cb148c25edaa6431a590d0e33227fa5521e878ace70fae2b33ec0b82fb29f6456c81205739d7d11f3ed89fe37a752ada3804463b353ca38dae34
+EBUILD libotf-0.9.13.ebuild 872 BLAKE2B c84fe715f0059b3324a335f5a1533299abcb36630950bdd4d0afcff7960705c7a279d66dc24dc7747b2ecd6dc025e032dead2db50c3d5ba9d45dc812fdb0af6a SHA512 a7182039e276b5e02ddef22e88196d28f02bd0282e007cd7ce636ca5310b1bb5daeaacbfcd5350584a71c35ebaccb94365a76e787c7aa908df22cf8c4ee48dc3
 EBUILD libotf-0.9.16.ebuild 995 BLAKE2B 8f490dd96b182f6adafa3c25311f77d0b960106dd0e063ba2fc7286560c68b82600caa245dae681c321a027808e8980dc6ed027701c29625f8a286c619a42c00 SHA512 abc7511dd95fddb7354bf5ccbf2308d1569b751a000564cafcdeaeae0cd5f3233d47f279763f2e23e1f6bf29c93aad723a208afe2b7a3de10bdd1e99389ec4d3
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/dev-libs/libotf/libotf-0.9.13.ebuild b/dev-libs/libotf/libotf-0.9.13.ebuild
index 34aacce2afe5..a0b9e00c03dd 100644
--- a/dev-libs/libotf/libotf-0.9.13.ebuild
+++ b/dev-libs/libotf/libotf-0.9.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs X"
 
 RDEPEND=">=media-libs/freetype-2.4.9
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index f69470825dd0..defabea2dba1 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,3 +1,3 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
-EBUILD libp11-0.4.10.ebuild 780 BLAKE2B 81d859abc6f65ca3a0a388ced3f91b37505b97d33e2a5f18e088dff0d4e74851aea55beb1ed427fda9b04648d13edfeb3762667c041f3a8ac92af5bfcc33dd21 SHA512 ad72e746e165f1261f0c0ea4a080d5d5b0c2d53c687461156ca691cbdf5cbda6b0c7c0d953975063128a734f87a6cdacdd4ad352876c547357806b7d4698c50f
+EBUILD libp11-0.4.10.ebuild 786 BLAKE2B 9a8f418682368369a9db4a8e98f51f28a4034d2ca4c9e7d5f431fc966390f99c9a5c2678b9f30b27c2bdb0b1111a6b3661d229366ba20951ca26d8a9e2ab1863 SHA512 9ab3cd1b4ec99218d14d6e8af3ccbec6fce882bf8eebc84b4440f55d9e27b2137197ea94904e0ae17fc15dcab8bb015fe9bb6371ce0c3ffb5c594adc64af7ad1
 MISC metadata.xml 612 BLAKE2B 603fa1505d9001be83c192a30130fd3a2aed2c817fabbaa7970e9c883290eda3aafa41a6e9bcec57ee993fb97fe6edf448eaddbd68bf8246ae272ef4066ebb7e SHA512 85d70948ec35a42c1707729c325159abf0a097a7b0c07b4db36453e25a8dbc713b6f7c347b545cae71104d166be9b8c93e4835f79633bee2e06d64a1c28e15b7
diff --git a/dev-libs/libp11/libp11-0.4.10.ebuild b/dev-libs/libp11/libp11-0.4.10.ebuild
index 7df1bf7032dc..0daf45af4454 100644
--- a/dev-libs/libp11/libp11-0.4.10.ebuild
+++ b/dev-libs/libp11/libp11-0.4.10.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 arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="libressl bindist doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index 2a46212738d5..e64f09979ff7 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -2,7 +2,7 @@ DIST libpfm-4.10.1.tar.gz 1005988 BLAKE2B 7bdc64540cdf0404bfab0a631e506f37a79ca0
 DIST libpfm-4.4.0.tar.gz 649910 BLAKE2B f74246d1ee23c7793e89db5d96f7abca581932273e3b0c8669c4e0ae54907e3bf53c3c1a5d09cee93458802263159f0ab808ff62774a422257a7f781c6ce454a SHA512 e7f9b50d0c71c08697283d043231234b39695fda6796ad1e2c48fdd67e2936a3cf5d864b5e1b9c68a34f1d726f2b273eb1267adec3060085f3a51e9886f5704a
 DIST libpfm-4.6.0.tar.gz 767447 BLAKE2B 2374abdbc9d886d4e0101a2dc77e699a47abdbd67c0f490706ae78032b89b5ecf9d577ab8f0ca297841ddb3b39da6994e833fea8659cfd21b5fbcdc53f2f84c3 SHA512 73bd11bd0c11c0ec2fa71935c967f36431a00b548b8b47575e00e8cc3e1f8ef3fc2d449d493f51a198eaba5b1629cdf79330cbe2a8ca8867e15fddbfdbf571dc
 DIST libpfm-4.8.0.tar.gz 828853 BLAKE2B e6caa0ffa4584dab805ef08ce5318bf73fda906afddb30b1490a34ec62e522a6bb713563c5ffecb22596e6c5c1c06c245c5b9bc59fea74face90a9edcbfb4eac SHA512 a06f3713c70fb4fe694154057604ae42627ad764486a3d3e28b0ef2e46fdd0a0431ec1a3c52ebc711ae174a1fbd7b3ddd0c736a568f57d4606ecf8064ff38228
-EBUILD libpfm-4.10.1.ebuild 913 BLAKE2B 4081d258fd03e139d11918cca945262c1c8de771b5895997cba39c1a5b89aaeee10a58f35502b079f6e77da50488963520eda215b68d7ad6440aa376b3e254fd SHA512 75564e8769166d07fcd64c125a12e291f19cb5a7771cfb53ae8a11fa6da1f76d29897d3c83a8f3a8fb91a0930df8a6bb4aff9857bd2c8df60d547cda4473e584
+EBUILD libpfm-4.10.1.ebuild 912 BLAKE2B 2a333e5c700cb45d9e662e27716f6a90a1aabb075beb39df62a776ede76237fda65cc2bc16cfe670f016ffee51d7b98bd056437dea53e0c29fb261cdb5796237 SHA512 ffb3ea4efe55416b33f824e87e924a8c070da90610be9043b20ec89084d35a9219bdf59bd0012301f1e487daacdf21fa14846cf4c4ba5ffb5b85af2142af6476
 EBUILD libpfm-4.4.0.ebuild 887 BLAKE2B 6e3b57d6d5bb98aee5f3072020306b329e0e2b8979d8b81d889c81ab1823c9388f8f22034ff5c501fb349266ca53b3c708619d58ace567e1b25435a9578dcf11 SHA512 3db81f6920687de1f1fe33c6eaa3c5129b2ce1c6191c68be789035799099124cd34f49010f019f637fd867cf47c759ae75d7c17ed0abfdfc2674f633d2d217d5
 EBUILD libpfm-4.6.0.ebuild 893 BLAKE2B 17221f8f7813320e8a99bdd01b9e2694ff425ef1496c74668fb04fa315236fce95ff1745df357f46b1d9f959097cd808aa47d99b0de000d5d56c363723005aeb SHA512 60e921666e7a19741cb764126f608944ce197c426e401d11d42f60a4f4950b16b6a8b5d0ac27ad3fd91ce7d0650cdb05f9538e10be770610c66639b3ce097bf0
 EBUILD libpfm-4.8.0.ebuild 905 BLAKE2B ff05bc659b6caf37ac53b4052017dd9d454e6db023869dec984ac3cacdd97d4543361f2a055724624318bddc9adc18f7e19b2cdb6db7e7963093ec01c66063b5 SHA512 a12aa728c30342c051f850587c7c5a7052c837a61208d0e483fc116d48a0bd392ddb3848763fa4b9e13f680ed442d245e1ea9ab9a30f6977c298ae634e34ad95
diff --git a/dev-libs/libpfm/libpfm-4.10.1.ebuild b/dev-libs/libpfm/libpfm-4.10.1.ebuild
index 7dd11c557072..97e838e53dfe 100644
--- a/dev-libs/libpfm/libpfm-4.10.1.ebuild
+++ b/dev-libs/libpfm/libpfm-4.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0/4"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index ee3f7f2a364d..93ff8fd3b006 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,5 +1,5 @@
 DIST libpqxx-6.0.0.tar.gz 676528 BLAKE2B a40095ba9851acde1296d93af7e4c4414f334a734b5062874b63a146836105fdde24672707caf623f2073dc1caf87b1053f25c80b10c3fa779fc91a52f9ec7ae SHA512 f237cc03c01a8262eee44a9428206c1cc11b6034dddf540afef145f58eee5c32b880d84832563480d73d834c24311170e2ef6789e100793afbe0b6e393bd4169
 DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e
 EBUILD libpqxx-6.0.0.ebuild 2180 BLAKE2B 7d701220cf445748f4e67104c36bc3d9c8ffbee6633ed578c676416586b440477da4bf48fc31c2291dff2f52e33f5760891177a01098254bdff5f2523da1708b SHA512 9b85c12d7be7acca245f52557cc11063b3064ce8ee09292c31a35402648de7f555134731d675835353ab1ca0639553b4c84adaddb2e92389c7e715eeb51282f0
-EBUILD libpqxx-6.4.5.ebuild 2182 BLAKE2B d432b983ec67d0180f2bad7c35eba72e637298381370944c906e9be96a802564e1237e9e036d038b9adada666f92c2806d1af3950ab4a9ac98de4e865334570d SHA512 f75852441bad878cbb8df6bddcf43b7bd52cd6d102c48f10cefa9e3c67ae88de549cd01a7564f79cd3bf23acd8d013b155d573da7c41d33e529787128fc5a88a
+EBUILD libpqxx-6.4.5.ebuild 2175 BLAKE2B 666e0bf84fa747c1d2a3735e9f1f490194d7f9992cdd022861f241b31fb9e31dbfe59a1c6928959e7fdf3825b0b8ab3505ab777b8b5d0e4e8944c8ca6ceebb80 SHA512 772047ecffe3658073da917d237d04c78b3c76deb5145f7e2906da2af16b29f5f93e9e9f9a3113f5ef647cbae0256ad9d79bd8d408a3548eecceda6841d09ef6
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
index 26fc139ec319..4d6ea997a9d5 100644
--- a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
+++ b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
 DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
 SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 2dc1745996bc..f62d50727a5f 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -8,6 +8,6 @@ DIST librdkafka-1.1.0.tar.gz 2511445 BLAKE2B 00c20361058d537d045da6961afc45e40e0
 EBUILD librdkafka-0.11.5.ebuild 1249 BLAKE2B e10b7391be22a1b2fa32af02872ffa2e813ae0a387e7a31005900b63c9d2d3ada9cd47ca2e7a155f6178267b3a2b258f7eb9f8c7a2470be8ad61256d7d207a38 SHA512 41f0086bfe66d0a12f2ab448d842119bb3afe4e3008662b0fb0ca5bc99ef36fe81c4c4d0c8de46ff4eeb6594cd4253ef5f0895beb45235f99b195d3b13476953
 EBUILD librdkafka-0.11.6.ebuild 1249 BLAKE2B 038b73de2adf38cf66b95a470c1bf4e82b4d30c50410ba8ddbad3d59cb6ec323dd28da6c9deaa162049cb26c4d38f1456459fb309f01ee7d2b7f7d826825ca99 SHA512 e3d82210e7d6caee61bece6eadf2098144bb7dc7f1fe3c19e6e0ef154e0f36acc2b60017d8fc044f3a63ab7c83a7e1f5c8c732c39817904d31fec3b47d1f20cb
 EBUILD librdkafka-1.0.0-r1.ebuild 1369 BLAKE2B 0217f4996dd3904f871ccd0fbb300f681c1f2cdb9c4d08bcfb494ea99b15828c35712cd635c371daa776ec8f8dfa07dd70f4f678827393e9c45d3731e321ed70 SHA512 af7fd02a7f5c56b903c57f2f986a417ed9b31c956afb201b2c0523a452c1fced34359722e88d34e06203c1941101c0fdf56c4768397cd37432edfb309a13ba8b
-EBUILD librdkafka-1.0.1.ebuild 1535 BLAKE2B 6a51097a8c00be8e7aee2fbcf22ae6b8b647676e1b7bcae046c34367d001fc9f8a5ebc08525fd478653a9cd9a9201a67d8d92d8c2ba19ab8cb6b414d12c91a51 SHA512 5f3f2656fc0baa82f9e324eec70837a12c1ccfb8e3b51b7ab284a1aaaa606f6f147b239272b3f220ceefd2a91366a38a3ccc5fabadf4ff0203d4bbe383752a00
+EBUILD librdkafka-1.0.1.ebuild 1534 BLAKE2B 8efba93d73fb34a800283061f19741a1831b3d0dedbad241d28ad8e61aec1b5ab8f232b8156b942ebae50a82bd1d5a4b11352bf2369c420cfe39e03eb5b0ebc6 SHA512 777c6c640484a94f688985e8e1cd2b25fd75de034329c6fccaef41dbf4de673733d6d8533791a37c5594b7ca5d6dcaa925ca39b919406ff9439b7dd74790a0bb
 EBUILD librdkafka-1.1.0.ebuild 1538 BLAKE2B aa081858762d70eb9bf5f5386e3b7412dad89b9a6b38b71d3dd4a7bb7ee2edd042a8c051c925cea732e90bd625cc71688a77226520e2151c1700de2c316ee199 SHA512 72c26cb1a2e6a1ea02c2d52f156df2319b3a81362ff0c6bf4c448801b2de96f301a899bb70fc4b9de3dbc430b1941bef64225dd2222e7002e7490300230e42d1
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.0.1.ebuild b/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
index c46e4e5f1245..d545a285df70 100644
--- a/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86"
+	KEYWORDS="amd64 arm ~arm64 hppa ~ppc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 72d80ae2b6de..06013fcc2b69 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -4,5 +4,5 @@ DIST librelp-1.3.0.tar.gz 514470 BLAKE2B 3e8d844d3cccd4c148036191f376ba49b3851a2
 DIST librelp-1.4.0.tar.gz 519235 BLAKE2B 9c1e52cc9f666e75f261db65f45e3d954afa033cac59f93394c30ba99ed772d71b2882bdbb9bed696e57ed99805d47e57fd5e331cc3bc3850c5f15041a0d70d0 SHA512 92d01a51b4ee3c66d1f65d2e26f214646d72b41a8411ab700fe5f9f30f805ef98dec962526ef95c8d8428bf7398d38f656c919f95a3e49382adc745ef9eb4239
 EBUILD librelp-1.2.18.ebuild 1240 BLAKE2B 1e5c2a3c09963f3ccb25da31ba90e2cd0ca2ebfa0de68903656fa9727f3b56f1c44dbbb59d2ecf23e913ba0fbfd42cc821826f72b786bd54da66a06032c00ed0 SHA512 772112ff4a073d526c0054a211e11d295641f7583c84716019d007ba2e33654adc4f639d40be6e54ad4d23b4028aa85c039624138550360b20a0e9fb21ef3752
 EBUILD librelp-1.3.0.ebuild 1483 BLAKE2B 668859d6c0a0604e5bf7171b4801b6b8e678379e04b5fd6ae95620dda676905bc320e82b9212b0a6baa5f15ee920625695eddc2c8a1d2575ab1c3439cecf24a5 SHA512 11dbb4bc5b1a0495753b2c264d1b5094903d93acabef402c4022f523666b80862f0a277acc39a0c27fdc2b36ee89d2d964420e3edb8642fd031c4b97f13f1acb
-EBUILD librelp-1.4.0.ebuild 1413 BLAKE2B 349d2301b7344e8a839fbb72c22a2fa6bcf8e1a2a1ac1ee0897e42d6d53d397d3263b7d5a41ec484848ee4d09ecb1edfc58415db994540ab569ce6a41e223253 SHA512 094fbd8ff996cf82354dccd0b0598223eef889497534b94db492bb087854c6b921d497845a2b739605d0ddcf80d11e807a8133457e48b8e1ea0d57f7c276c17a
+EBUILD librelp-1.4.0.ebuild 1412 BLAKE2B 58cffd61d12097598bf49ba1289e43167cf5ea8c6327381e011b6f4f71ed7976c42e2f2a6304aa2b71d3ca01f872bd1964d9ced27532f037ab8530ee6528fce5 SHA512 fa257b87409fc6159bd349d9400df7c8181acb617ebd86d3298647f8230f3235b4c50448cefd06d0dc233f2699f58c26ac0d40dc1dc87b44f7bc1c72db1844f0
 MISC metadata.xml 503 BLAKE2B 987b40e4f9b5e33e1f293023237b7d0cb614ea36113d6d5becb780fddc729a2a2a033cab8e41b64a0465d0f14e220c96787e30b7b133979e36ad86a1273ad0a8 SHA512 31f5e4ece41aab561a70c7b9af6119bce8c3cb7fb6720be754dd925ee656faa75ee953cd3d296d1b8bb5f48368d015ec5d2768d217b349f1689e767424786e3a
diff --git a/dev-libs/librelp/librelp-1.4.0.ebuild b/dev-libs/librelp/librelp-1.4.0.ebuild
index cc681947895e..0df8b6e02be9 100644
--- a/dev-libs/librelp/librelp-1.4.0.ebuild
+++ b/dev-libs/librelp/librelp-1.4.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.5.0"
 
-KEYWORDS="amd64 ~arm ~arm64 hppa ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~sparc x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
 
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index d2ba0aa5efb9..8ce9f71261ea 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -8,5 +8,5 @@ DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f0
 EBUILD libressl-2.6.5.ebuild 1450 BLAKE2B 193d943fb6ceec65937ff2d47d2f1b677b7e643962c277f045371e9029af3ea7f0aecac2498b0bf74f1c4d7fd0160846ae3ab757bdbe24361f3304faa6f740b4 SHA512 42d2263c867c290d42c08379778b13f36eab1e185d8dff69d8970e09766596bc162d494d2ba3ff9491d2cbe781ccced9e1e4813eade213a9d94ddd22e7e3cfa2
 EBUILD libressl-2.8.3.ebuild 1545 BLAKE2B dc63614ba49a5d077e4be5fbc830fb3a20e7a34b403560f0b803c3eb7c761610eff701b1e79ee0a495eba310726518638951f66ac5f890f1b881ef5edc9a0d5e SHA512 d342dd4eca89a4db529c823161d49ec9292d7d8d98cfa5a10f18e88b1ebc4ecd4cf935269bbc3ad9a5d44a4cdad40929ea5e31830cb40a516def5de71dd51ee6
 EBUILD libressl-2.9.1.ebuild 1679 BLAKE2B 62ac39e1a95e996b33a84551619b4f642c733f8ce4708dd1a4620dd9ef047303c99fe6d9539b87b88bc18ee0932f6724c389eff27b61d6026328ec1f9f8d813f SHA512 cfc4b9b8fdd259d65905035190f29efb273b6e3a6317619d4d7e86413cca8259fe87fd16c1ed7f4e98e0f7438376fb82a1b912a7672aaffca79765a5eda37d42
-EBUILD libressl-2.9.2.ebuild 1717 BLAKE2B 96c38e88353e777ea55a41f6fc26df5903db5745cdfc7f8b7b0299328415d366487a184f6f717ba7878e288df650fd60704d78f5b6231771ef3303012b069e51 SHA512 c87d30436bca375fddbac45d5b040443114de018cc25030d57be2978a2032c29fa5a5f42917ea46ce6ece7ad4f65f73e9397be34f51c22b2c13daaa8ace04002
+EBUILD libressl-2.9.2.ebuild 1713 BLAKE2B 7450f36e1dad66cd156bd346401022f6829ae4feacf1b7d680276ae24611bf18a197906564321fef865d4bfa3ed2717e43bc5a6637535ee0df42ecc4bdcad305 SHA512 8dbe7abdf2738a06e72dd60857ea90f3a62488d8603c5d1ee9d330f5603af617a1a8bc6fbc2ca13fbfee363d10274c0ea182705d244838fbff906e991b42f411
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.9.2.ebuild b/dev-libs/libressl/libressl-2.9.2.ebuild
index c3163fd00f3a..5bd4df28dc3e 100644
--- a/dev-libs/libressl/libressl-2.9.2.ebuild
+++ b/dev-libs/libressl/libressl-2.9.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/47"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/librevenge/Manifest b/dev-libs/librevenge/Manifest
index c4100b2c3657..66df77f58a02 100644
--- a/dev-libs/librevenge/Manifest
+++ b/dev-libs/librevenge/Manifest
@@ -1,4 +1,4 @@
 DIST librevenge-0.0.4.tar.xz 421604 BLAKE2B 414674e4313f3062dac20a1ad7f1cf1c0a1681bb486f4edef109558fa70aaf8ee407fec8dfa93014db8c8746804e0a2bfec9636d75066b93d84e9bcbdc3f4dc4 SHA512 c4c2c98bac3522c8bd487058f4db19d85ad0d99159c4de4ffde91a10ea3adb7f995ebe8ccf6afcf533d81f50fb654bf265b9cd197508f85b5b68a101ca279712
-EBUILD librevenge-0.0.4-r1.ebuild 1118 BLAKE2B 3ea9ac17fe74e397607fd0bd8e1e54c45d639be430fe461fae03f46bee668f04a68b06bd41a9e59bee768a68cca3ecf8d5fb294d32ceb00a6f94f70cd1f05954 SHA512 781a27f8b5efd6ff3769e2a443e61a524dd59ccafbbf8a584a044521114ec31483722d2bca7cfa4eaf54a9cace3d3c7ee7be046547c459540ccdc29dbc5acebf
+EBUILD librevenge-0.0.4-r1.ebuild 1114 BLAKE2B 0d5a703c09ccc660be2162ad1a4439df6b23a4cff650012ee7af8ea476691bc85c10e3b144e1b786aee13c269c7e71096d00de24b40a9d59e5a6f54f191b93aa SHA512 902c7556c5385992cf0061e7795911ce262c59e35949c38b1895045ade0bb4256dcddcd06eb76da7e377ed6cf99f943220e4407316aac0d2ad394e776c7fd1c2
 EBUILD librevenge-9999.ebuild 1091 BLAKE2B f28e2ff7db9f1f741ee729f037799c432981e6acc86c67b57c8bce5a1c33343dcd0cd956ae79417491f873625b956a398bb095fda34e145a8debb3c0094a2c85 SHA512 5920bee7ae22c3ab194c19a9dad9194358577431c1ea40049a28356ceb51429374b7b6d855ae0e3c44fbaab3239c986337c6e525bb0a01334cce4017d01f269f
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
index fa647a541612..2fea73e194ce 100644
--- a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 fi
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
diff --git a/dev-libs/libstrl/Manifest b/dev-libs/libstrl/Manifest
index 51e33a380679..692e44668293 100644
--- a/dev-libs/libstrl/Manifest
+++ b/dev-libs/libstrl/Manifest
@@ -1,4 +1,3 @@
 DIST libstrl-0.5.1.tar.bz2 259026 BLAKE2B 9f2b576b1a86361f982069a1e7b1c12e0f47918637ed43add261379c195ba9ddeb5b8ca04b0811b75373235c79ff5b254a42c2e3ed360da410039a913137dd60 SHA512 c79b37aef2cf909529e3afabdf472730f9df2eb3605eeb41a74b56f1c9c43a5be1f23c7f383c4b1c2aacb81b9df1d455a3fe9ec1083d5fcabae4c82ef916df92
-EBUILD libstrl-0.5.1-r1.ebuild 711 BLAKE2B 1f583c84185e8d438a67e20934a7a49532e298c5e32a589aa6e806313fb86d228a377dd126d8d7a0f143577e717f77ba3cd9ab81e08857c77deab42a6ba0eb85 SHA512 ba1132e76055aabffe7de97c2adf95cabb97798a98eb7843daae17f601538a5425f9d67a795fcde470cf2ae2d694e8df4527eca9753a3774dcd3b518b7c379f9
-EBUILD libstrl-0.5.1.ebuild 890 BLAKE2B 7b87a0b23c43b29dfad6ace64cc9f36e489ab04b7f50b2287231d055853d891d5ead102ef7488f6616f1c8fd74293d90b94f0fca345731383c71b87246fe83a1 SHA512 b1e0d9dba15024ac54a07c074a62906c3b772928c58b43c51ed1edbcb098ea4d845aeab7674e4f8bc4f13258ef6ac508316c83285352854acd39b21fbaa7f97f
+EBUILD libstrl-0.5.1-r1.ebuild 709 BLAKE2B a883f273e70d04c621d126c69ea7377fa4e2abf7052dda2246103420d39489b33a40962186250aeb372ea209cd444157eb08f00a29eae15d90566177bb9516b0 SHA512 df1642ea8970dddfb43d05af15b90ea38782a27d23def97cda10b6401459e8e1144619ac8129663959d4517817a30d46febcc03f217b0b5f44df3e6d391bd765
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/dev-libs/libstrl/libstrl-0.5.1-r1.ebuild b/dev-libs/libstrl/libstrl-0.5.1-r1.ebuild
index 20832e138dd4..de33883bf831 100644
--- a/dev-libs/libstrl/libstrl-0.5.1-r1.ebuild
+++ b/dev-libs/libstrl/libstrl-0.5.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mirror.ohnopub.net/mirror/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x64-macos"
 IUSE="doc static-libs test"
 
 DEPEND="
diff --git a/dev-libs/libstrl/libstrl-0.5.1.ebuild b/dev-libs/libstrl/libstrl-0.5.1.ebuild
deleted file mode 100644
index 2515eaba0880..000000000000
--- a/dev-libs/libstrl/libstrl-0.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils multilib
-
-DESCRIPTION="Compat library for functions like strlcpy(), strlcat(), strnlen(), getline()"
-HOMEPAGE="http://ohnopub.net/~ohnobinki/libstrl/"
-SRC_URI="ftp://mirror.ohnopub.net/mirror/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x64-macos"
-IUSE="doc static-libs test"
-
-# block various versions of opendkim for bug #454938 and bug #441790.
-DEPEND="doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
-	!=mail-filter/opendkim-2.7.0 !=mail-filter/opendkim-2.7.1 !=mail-filter/opendkim-2.7.2"
-RDEPEND="!=mail-filter/opendkim-2.7.0 !=mail-filter/opendkim-2.7.1 !=mail-filter/opendkim-2.7.2"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc doxygen)
-		$(use_with test check)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
new file mode 100644
index 000000000000..dfe08e2b6f67
--- /dev/null
+++ b/dev-libs/libtpms/Manifest
@@ -0,0 +1,3 @@
+DIST libtpms-0.7.0.tar.gz 1203837 BLAKE2B ca5a3b78dc63c09c4ff084124838fedeb5be0580f709ad6165680159ba7ba4b1f751b9fbc67f6b5a8f39b82bdd420afb47087412a47b72cbe5b418a97a4860fe SHA512 92d1eb5d1a1cae08e97cceaca56fc9bc6d43c54a93edae2accf19807a4e93e19d88064a0b11db796c79d32c821e6b320ebbacb65cd20da3e5b1205f3b861cef2
+EBUILD libtpms-0.7.0.ebuild 526 BLAKE2B 8b2733898a602de83f3c5fba8c036776cf861d0499017c3ce159c6b81ab70e5c28c897ede2256136f0e189b2195c2c127020459a80f26399748bbab5f612bc57 SHA512 97930480883c9b12f459df78854e3e89e21225169d9d4c0c594f3bf2f3aa8d25e9c0712b93420f90594604f9a481032d510544eb2c6d08e513a2386870fbad4c
+MISC metadata.xml 370 BLAKE2B eb4d1a4a8e56cbdcb5b7f86029feb6e2151967f7b4801fbb3a8c2de35840969a4987ca2aada95792cb35ab03702715b1f66fe966c176969de743c64775bed0cb SHA512 5a2f5a0089bb0c54dd36821005a65cbe8c4fd05f1d7e0367eaff02031a39c749e005e5432da334081304af8c55b330b549821819455f1f0919d4525a254ca5c6
diff --git a/dev-libs/libtpms/libtpms-0.7.0.ebuild b/dev-libs/libtpms/libtpms-0.7.0.ebuild
new file mode 100644
index 000000000000..ea28c3dd94fe
--- /dev/null
+++ b/dev-libs/libtpms/libtpms-0.7.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library providing software emultion of a TPM"
+HOMEPAGE="https://github.com/stefanberger/libtpms"
+SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/openssl:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+	  --with-openssl \
+	  --with-tpm2
+}
diff --git a/dev-libs/libtpms/metadata.xml b/dev-libs/libtpms/metadata.xml
new file mode 100644
index 000000000000..6ddd104074b9
--- /dev/null
+++ b/dev-libs/libtpms/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>salah.coronya@gmail.com</email>
+		<name>Salah Coronya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 6a17607ee304..147a1bbb1d09 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -2,6 +2,6 @@ AUX libutf8proc-2.3.0-no-static.patch 859 BLAKE2B d461d31600b3ff46cdc791f058eb7b
 AUX libutf8proc-2.3.0-tests-nofetch.patch 1229 BLAKE2B 501fb727f371975792546eea70f4b178983eaad5616ddad51b9de8476848d5f507f083d61eae86f2b23a6e4caa8ed871e2d033d920cd802717bcad4ca1dc90e9 SHA512 ec2a51dec3570d0846436ae29ea7776967284abe11c0be77a8a2515017a2588ec9f943e31e0836167b0c614183f30c32b51c2b172a39c4880c5241d32de72ab7
 DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
 DIST libutf8proc-2.4.0.tar.gz 154936 BLAKE2B a4fea823806bb784c83504de2ade985d3f0e86aa8d64747f389724ef10122953312e398a7a342cf28f25502693ee507be246338dba37c976998f6a1922cd94c5 SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a
-EBUILD libutf8proc-2.2.0_p1-r1.ebuild 734 BLAKE2B 178c2fe8fe6699cb413b6bfb9f68b13b2e90abd9bafb402ff43275f2d363fcc9ba10a36c369edb6516b8acfe0c210b640fda5047dbeac89e45a803c41ea5671d SHA512 fa2c3e9e096b7b664a30c62437246e31f2cd8eb62d45c37077e76fb605f67acf0e2b80f848b946b994c85f7d2c33aee28621698a05224af5c07a29550e8fb4ea
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 733 BLAKE2B 68dd96f0621c780c63571ad0c632359e4b37c3b63afe0c3c8b1b88e576a900432dc08b9d85bd950dbad9ebf67d6c25b54fcd4630a88893e00ab664ac33795372 SHA512 d83d9dd9e8adeb9ccdc017e3c006bf7eb559fdbe2ec91b6250962f80333652819d768ecf8834c71f600254fbb29b1c4bca4ca4758fd9e1f6cca5584e002ebd6b
 EBUILD libutf8proc-2.4.0.ebuild 1451 BLAKE2B 8a6f1cc2bdca5f2036732f230b5115c048b260446cba58b351fcd02606a928cf4ce566e3ae888bed70e6f98a386b14d2ed679338dec35443d24f0d96cd41c262 SHA512 8758b048b085e8fc0ae96107c4c868e5ffeed99eeb009c3097a8cb926f82e81c42599810df1b2fc0e9c6e8859ac54ad8bf895ec6e8bd7f5fa619cbee5ea21cfc
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
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 9e5c990c74f5..53c0c268cb1f 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 ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 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 c2038e1dc501..c43482dba9c8 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 960 BLAKE2B 2fe8a6114b578494dea220e7163651799b14d96177eb6f10512ce8b6e94d0c1fe28572e9ed54240753faad146b9198d51f6693a5e6b30512ac6407537751f96f SHA512 b3fbc5bb6d9a7863c7c478ba4bdc267ed252fbca914595bfefd33684b64d80ec6e0b36fbe3378ea692827ae6be79e656e46e42c872a64c1afc966956bc7ebe1e
+EBUILD libxdg-basedir-1.2.0-r1.ebuild 959 BLAKE2B 9a8f2ecac6d349741548e3d2c4038d55ee8cf989afc9b4c2b794893637814f969938e1067effe1c64beb4cc3e264eabaa5cf1d50f632a868ae3d7fa54593e25b SHA512 5b5abb931c0f0f02bed40ad4877ab805ec835e1b6eb8bcbbb44dbef5c680cf668636fb5e28f627f2f81c01f13a161970436ff7e2ea39fdc183be528a2a9e9759
 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 96a53b458718..6cb1265efad1 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
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index 909493322a2d..ec2acb4b6eb6 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -3,5 +3,5 @@ AUX lockdev-1.0.3-fix-perl.patch 307 BLAKE2B aa1d9fb4131a0dcedbac0034e450ef47cac
 DIST lockdev_1.0.3-1.2.diff.gz 7642 BLAKE2B ee0da062e802d1112c49bf3dc4cdd1f3567eb11fd4173fe0170b079c2752231ee93e39201674d8e71a5970f4d7e6443406d159af63687bb37c8c72203132c4f9 SHA512 22fce119a8075a5b99a4ef83b31f62da64725067863949d4833b4d66f9e8e2d34920eee11c5acdcc14b1a643a21c56c39ec2adf31ae7fa489795dd5534eb7b6c
 DIST lockdev_1.0.3.orig.tar.gz 29150 BLAKE2B 812acf8b39507e7b00e8fd49e6828be2b6ba21811c3dca49f94543756d428f7fea9d8005e43574653180f71aa634b0f92a2c42380235c2584c6958ca38d499fb SHA512 4066985059add674ef8a9195e611db8ead89ca6191c04b7f29243b12a3448c82a3d0ea852bf99e26e1c71f163891acd198867650a5c4843f787e1944a8bc7f2b
 EBUILD lockdev-1.0.3.1.2-r2.ebuild 1889 BLAKE2B 38faa340fafed78795e2157b66178c3f423b7e00aa5f0d78783ceef03978ef4526993216bf2960e0da587d90ce81bb2cdf6518c3230947baaf24818cc59b6c24 SHA512 76e30de7368016f264b5f6f92a5b60c1f287f58fc7b52447e169b6457158cc8b7bef01cc50efdcd6eab82e0ed84dac2a34c4412ed15736499dea6a1c0c527a46
-EBUILD lockdev-1.0.3.1.2-r3.ebuild 2100 BLAKE2B 9db22fd028ca0ea4064cb1ea451c8a783b068e033c4a93631ce13ce28fd96299cf61138623c4bc54109806ba96a32363ec5940b9723921e8b8dd9991d35fe3ec SHA512 5dacbd12b2d3ddadf4357d3a5fe327492e1009cff92801f11bc567262dd4e3714223768c1e6d262a57427c9a7530582c39530e6721f8a58ef318c962b11d59e0
+EBUILD lockdev-1.0.3.1.2-r3.ebuild 2099 BLAKE2B 283cc4876b1a68e51a2b743109c2403966193d9a03c2054b59d93ae9d18dce3d745b296887154f14e7f34f5e14292fb765230bb675966f1c51bca7415a577b27 SHA512 168e95f181d6e24db2bd8817ab53ad4f06591217308c0d45f4e1851b490dbd5a1fc50dab85042512c3c72f4e196e12ace4d2d173b8a1ddc00c5080ba996be329
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
index 386ed2155028..d15792de6194 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="perl"
 
 DEPEND=""
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index 6630591be66e..4df2068aca69 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -6,6 +6,6 @@ AUX m17n-lib-parallel-make.patch 2379 BLAKE2B 2867ed88387bf6014841b1f00ceebacda7
 AUX m17n-lib-pkg-config.patch 465 BLAKE2B 9e66c6cea978acabcafe6b1c8d1bcf58a29987881c4cebe9fd0e0f6fc5ed49a36b602c61259acfedc0f7020258b4313595c45326bcfc65d9744b273a49e1ab11 SHA512 978d968bdfe590861ec078135db5afb7edf21e2d0bb73403926f5fb7d77566bbd51813849bcd97e1ae127721b886be1ad8216b47b53a82f5df6dec813b249e7f
 DIST m17n-lib-1.7.0.tar.gz 1063169 BLAKE2B 61192d26dec8a8bdb55b6a819c5b1aa5503e4320d57864889065c9490ee6720f5b258fbef10d5944f69f5a9ccbe49ea5494c8b0a10d536592c301f46df6826c5 SHA512 26fc1be02a5e487a2fa5f2f63d991f3c745aa1b78e20d931fe4b265125266501cc8d402aa3cb5c1b71a7d4c0f7a0bf5b2c3b17ec5f4f8e0f5ee3052ad4e205b7
 DIST m17n-lib-1.8.0.tar.gz 1091731 BLAKE2B a4b55fbc3246fe0865dcf1647e91d03de6ead06fb4349ba207613cdea6bb079c0e7623510a6fb046dce4bfefd262f68c41c9174d29a2b4a6f673da298642e1cb SHA512 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
-EBUILD m17n-lib-1.7.0.ebuild 1757 BLAKE2B 4c7890f2bc2a5240c87f174cd0366b0f5ff93eda8d4881fd4022c2b3683674a4766bc337d775d8ca507a2a5713776d8ed13aa426c0b53c1ebdafc13fa4c1cec8 SHA512 97e1c3ad3b83e52efa29feefc4c888d635b4092bab5b8a55a93e18593edbefcd6f76f16822f730d6caba05e2166375bf22a320b5aadf93580767ac1e69ac25ad
+EBUILD m17n-lib-1.7.0.ebuild 1753 BLAKE2B a8bcf69784e1b39a969135a927df3b8c9fde100fb4c87b29eaa7d8a2edbb8ecc88212b6fad65fd304e6ada9447a5356775255c2d17caaf436dbc46e22885b9f2 SHA512 86918215b2ec7fea17e0937233897830ca844746867a8e9138156b8ede5a3b52df80140b847150500f0951eb26cfaafb910f82f1186419b43e29ed3009de2bcb
 EBUILD m17n-lib-1.8.0.ebuild 1840 BLAKE2B 0d84d47d4322331569a9d1be081980f64e975e5b8e0d835cd313a3c1aaf7a723631967e9d898961f8709161c5222869e8b8454bf5d01c314bfcf81129e99c1b5 SHA512 f385a0b6f80f0cd8f688f61a119101b4d4d6619291051aa4c47b313a439e80fcab039142c2b4da8f2b2ebc5fd5f66d92408fea86064250496d6e70db3fbd83d1
 MISC metadata.xml 810 BLAKE2B a17dd171386fee0a400c07e5dc5008855e68d15a048380714c35355551fa40aaaf6e0dc8fb4b28f7a89553c9482cbf40b7b13117506aac007cf8e6901dda4acb SHA512 d5530380b5ad05c6dbdeffebf310bd45985301b62b2ab11757727551522bc45c3b00d0e751503d8ead750155fb857125b73f14210df6fd3a2f85af48638f0f88
diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
index b5dcd1285ee7..508286fcd976 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.7.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="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
 
 RDEPEND="~dev-db/m17n-db-${PV}
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index ed0fbf7c822f..c8459960e1ea 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,5 +1,3 @@
-DIST mxml-2.12.tar.gz 9112072 BLAKE2B 29e63abdd567c76209ca41adf608bd752863cdb2911d5bda482a2c6ac50ccdae2179941a3899d7e58480bab8903fee8a6c431619072d2861acd01f18d0eeb9e5 SHA512 49233a0087f3ef73a01ef71bb79511af36bb72027e3d9f6df919385e9ff0b03a489a3ccc590941bc4af1f558f82b2ed9bf8ff641863300a7791ce6dddfd56e77
 DIST mxml-3.0.tar.gz 9266886 BLAKE2B d5d3481cfd1d015c620ef897bfc21e839ad2a70f5ffd58973f8435e0e6a66abd477f8fcaacfab05ce608314fed27241702becb60b49b8492560bcc9418b317f5 SHA512 3c540348022226b122ce014f183368cda6631600a11d8f4d43c99c62fba2f3ca4b23dff4122082f63915b59a46a5475d1d12d0081f9315c65f5c044ac3c751d6
-EBUILD mxml-2.12.ebuild 1399 BLAKE2B 45f9336f240800aedee82bc14eae8aec5981235d577f72075a77885836fa0a7532d0970c4e58047081f22cbeccaf5752f1242e19195c04c73e6612c7df438b0f SHA512 c9b7c017c4d7b069e377ab2905c1aa5e444754d9cac89b4486c13dfbe8d702d8a5e4a8e209450701a98ea39694232408dff59603ea3370964905611e8f38575b
-EBUILD mxml-3.0.ebuild 1406 BLAKE2B 8a250e56f57064c7f3e4af0767794dff7078b8f21a0fa81be3c85116896bbbd6828ab9f21ace6521ff37ecb500f15b249c1be923c96d065f6c3f8cd6186e8fbb SHA512 157e2a69b4aa77c080fd7738278ba0f835f9e7d91cfe9d8f6b2f0bba000ff3b48e290b3c5ba9373fef3e5e1587514fa58cd25ed481c79e8dbed646890b9b6881
+EBUILD mxml-3.0.ebuild 1402 BLAKE2B 5ab3a112c010bd0a9a16ddc35c702138b22b88f4fc44dd0caa0f6227247ab19476978a81faf632753fba510e82fe2aa441e7e1ed81f041627c69dc9fb43d585b SHA512 1dbcf5b958c0e952d80c56079f0d3e21f91ab8a5b4e55dde68c71f152a0f4ea208f97b7f9fadd11178ef7379466c27df43674bac5e5f5cdaa08cc5645e2b0dad
 MISC metadata.xml 1498 BLAKE2B b0ff99450cec828ef5614c2b3819d02cc97e402b60ce7b9bca20962166c47a9e3053e2457eb7b29210886aa7b0297e97340b55cf74a0aabc20ecb4c451d576c6 SHA512 5ead3d76daa42879139a96cceb0a12a84a23df8372a8e2e9e9d1e38ede0266b480ca404f03047f4e66ed7d989171d37333051e2a111dfa0900b9cbba703b22d6
diff --git a/dev-libs/mxml/mxml-2.12.ebuild b/dev-libs/mxml/mxml-2.12.ebuild
deleted file mode 100644
index 1944085d2527..000000000000
--- a/dev-libs/mxml/mxml-2.12.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
-HOMEPAGE="https://github.com/michaelrsweet/mxml
-	https://www.msweet.org/mxml/"
-SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-LICENSE="Mini-XML"
-SLOT="0"
-IUSE="static-libs threads"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-Os -g//' -i configure.ac || die
-
-	# Don't run always tests
-	# Enable verbose compiling
-	sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || die
-
-	# Build only static-libs, when requested by user, also build docs without static-libs in that case
-	if ! use static-libs; then
-		local mysedopts=(
-			-e '/^install:/s/install-libmxml.a//g'
-			-e '/^mxml.xml:/s/-static//g'
-			-e '/^mxml.epub:/s/-static//g'
-			-e '/^valgrind/s/-static//g'
-			-e 's/.\/mxmldoc-static/LD_LIBRARY_PATH="." .\/mxmldoc/g'
-		)
-		sed "${mysedopts[@]}" -i Makefile.in || die
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	local myeconfopts=(
-		$(use_enable threads)
-		--with-docdir=/usr/share/doc/${PF}
-	)
-
-	econf "${myeconfopts[@]}"
-}
-
-src_test() {
-	emake testmxml
-}
-
-src_install() {
-	emake DSTROOT="${ED}" install
-}
diff --git a/dev-libs/mxml/mxml-3.0.ebuild b/dev-libs/mxml/mxml-3.0.ebuild
index c158f00b2a06..11e653135297 100644
--- a/dev-libs/mxml/mxml-3.0.ebuild
+++ b/dev-libs/mxml/mxml-3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Mini-XML"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="static-libs threads"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/nmeap/Manifest b/dev-libs/nmeap/Manifest
index 741d85da3574..7fe4503e7669 100644
--- a/dev-libs/nmeap/Manifest
+++ b/dev-libs/nmeap/Manifest
@@ -1,5 +1,4 @@
 AUX nmeap-0.3-fix-unitialized-variable.patch 275 BLAKE2B ad143d8be7c773eceb10413d2ac7c06474ac4a565da9afa09c6b2e3d2c16de8b9ac905a996420dfd5239a5eb3d060bfb2306241fff13805a05a1af5691f65e06 SHA512 cc8626e1b6e71c45550f9bb1de83c1f3aba41dbd05da904d29825179107bb79df88a19eb96955aa9f9a811cea25d46f58a0f6a94c534f8ed872b84ce01b01e59
 DIST nmeap-0.3.tar.gz 29380 BLAKE2B d4828a1a3d8a66ae529e40c034bf180da9657c2a3dec1ab09f32a9062430952a568612d2071acb887c6f1afdb19de82cb4b6d1788c6e9c2e1e859d9914209b3a SHA512 064a7fe27a192b4abe1393f8f343c8956bd9dd1d0de1441ca96597ab1f155001905b9b0b35d47b61e1f68891b820c602c024e4c74fb809719108711c5b1df815
 EBUILD nmeap-0.3-r1.ebuild 1217 BLAKE2B 52d29e1606fe38f1813d5fc0259e37c694767ba5f51754c2100e7a9c9fd2e7ca2c60a09a127af73e92d84c4e42abc3fb1527bafae972d7755331f40acabda739 SHA512 56a9bd6d0acf9d191678175af27b444e7b7872f03f815617723bfda649104c9c781c3b6f729d87971c3bdb8ec060d24f93d712bee4eedd7afc399ff8c7ccb735
-EBUILD nmeap-0.3.ebuild 1149 BLAKE2B 3e683597319ce27d6fbe39cda8f0be7deacd9f02461f6a7308d3d1a0be444b7a37167acca1bac775531f7e281a80b1979031342493100d725407e9b8cff3cf8e SHA512 5a27f848c74690332169d0b935e24f4e69bae52a6b3f3acd24534b5e408497a44c1d9e7301f39ce2ffec7efe638050d8cc3b3c6a16c09ff49a8e0a3c434c8e17
 MISC metadata.xml 713 BLAKE2B dd782c425806e40afa0f98bc8d54b90fbcb47f830f79f6258418de215617ba86059a666354db7947dc91f114516a14652f236658f78baacee8c9f5b59e58a5b8 SHA512 994674b694ac64762ec12af6dd76c6ca1c3a9062bb3d0d35dbd1d8203385820dbdf792bb344dac7a021d2ebd29550de114021491c3da1d0287602550027b3a5f
diff --git a/dev-libs/nmeap/nmeap-0.3.ebuild b/dev-libs/nmeap/nmeap-0.3.ebuild
deleted file mode 100644
index 0a0e61c6988e..000000000000
--- a/dev-libs/nmeap/nmeap-0.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Extensible NMEA-0183 (GPS) data parser in standard C"
-HOMEPAGE="http://nmeap.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	default
-
-	# Repsect users CFLAGS for the static lib archive
-	sed -i -e 's/CFLAGS =/CFLAGS +=/' -e 's/-g -O0 -Werror//' src/Makefile || die
-
-	# Don't build test programs, they are not needed
-	sed -i -e '/TST/d' Makefile || die
-
-	# Silent output of Doxygen and update it, since it is quite old
-	if use doc; then
-		sed -i -e 's/QUIET.*/QUIET = YES/' Doxyfile || die
-		doxygen -u Doxyfile 2>/dev/null || die
-	fi
-}
-
-src_compile() {
-	local myemakeopts=(
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-	)
-
-	emake "${myemakeopts[@]}"
-
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	dolib.a lib/libnmeap.a
-
-	doheader inc/nmeap.h inc/nmeap_def.h
-
-	if use doc; then
-		local HTML_DOCS=( "doc/tutorial.html" "doc/html" )
-	fi
-
-	einstalldocs
-}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 92e08b98bd00..f1d11aa8fc88 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,5 +1,5 @@
 DIST onig-6.9.1.tar.gz 870525 BLAKE2B 8427b92670545e66deba35dfde0cb0ce346629a188c4adaa3025d0acaa81d2ffd86111be17419ea67b2d5f3fb4387aab0d8d20d70fb2f518ccc0ca165b66207d SHA512 5454c161d2d45f2c992513a695ff586ffa99e44a27d7ac5498370e200adb664bb02f2d8cd7d73e61d467f626d1a9b41d9e6e3051e1ea1a021624f94f7d52975f
 DIST onig-6.9.2.tar.gz 901931 BLAKE2B 93326408c7c9cd9c5053f14edd0e5fbf348a4da135146cfbff7659518686a83301b8d4111dbd65b834e201334871d9fa8202a8ed3cc4f793d444591e96071c74 SHA512 c10134e42a3c0b0eeae2027ffb7a3e1bcc9228dee286f6b6e997f8a73d717217fa74de0e19c40975d2e78044c8c4f029eb622f90c8eb4fdc4667eb4804e97001
 EBUILD oniguruma-6.9.1.ebuild 967 BLAKE2B d33b2347afacdf230928fb427f582970b105eb5cbd893079172f9e9f9fa17f6e4ae31c03df4e967626ee573413f2668e3429b522285e00dcd1f72c3151664be0 SHA512 b0b2ca4be822fa8cd223291371e019ab023538c0dabf1300eb662e4d252a6ff05648200c1621e748965a80df80db46ec0e93d94e9d6925385c33c550ca9fa657
-EBUILD oniguruma-6.9.2.ebuild 989 BLAKE2B 150d421824531103395fb3914a3f45ebad6e187ec8f2053323290ab64ba859432b8c7daf1c90fd3e267d97a5eb65fa6fec12273842c6c389c9befbb1505f723c SHA512 c7b790eb8e09753bcefc49ba7a5e6d966631aae9dcc04793975311a53163f2a27caf0716034fbaa21e13fced9da543f90c18268e640074e58cd2560167970d43
+EBUILD oniguruma-6.9.2.ebuild 987 BLAKE2B e328f16352bdbe51260a4b1aef78c0631f0f71aef036677ea73153f9e49709bc965a6943d04ca4702bc72b04dc819834f7a0381a37778d299acb17b667bab0d7 SHA512 11dbf5f9f1fc2cecf1d0c2500dbac1f3632330c6b8350b44dd33196aad6453e064718e6673e03c2bb011d18953bf24813cd32c1c54b88554269b37b4c4c16bef
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.2.ebuild b/dev-libs/oniguruma/oniguruma-6.9.2.ebuild
index 0586b41ac75f..a8f178b9c387 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.2.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index 7a3f2a7890a7..d63df53fb2a9 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -2,5 +2,5 @@ AUX pkcsslotd.init.2 664 BLAKE2B de96f878e55ce5346a3846c99deae28e540964cf4a7dcd4
 DIST opencryptoki-3.6.1.tgz 1068197 BLAKE2B 0e7d867bd21863f56471ac2c8664148e5a6988ffc30e71feaf960245a1908d676c1791f2b751de4bdd694096bf7360af3a8f79df895eef1b8f61391aba09aaad SHA512 1874fabba6d3da49596622c7f8142a37329df95f129cb08319bb3900a944dde1ae5ce9d845d400726f4bda4579c730012b9bfd6c69c6d5a16b1f75b28a0ba4af
 DIST opencryptoki-v3.4.1.tgz 1014416 BLAKE2B f95f9c4923fb7ce283f2031c21221ec2dacf1afca50a5fcdb4e2e173c952bbc4402fda56664428087a2c5b33af8a94aba9fa361ef5c0e4f0b865391cbc304250 SHA512 98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6
 EBUILD opencryptoki-3.4.1.ebuild 3122 BLAKE2B 002036c45163500bf76e52b67e1178f55b22795e0490ceb955aef751874b19c2262f81e25b370b826e3e892de85c94fdb38afb6a4fd33a4dedefaf6fd2311935 SHA512 4aa6b7c580ccccd8e60f7a6c9510eeb86d8c33b6b79375dbb2fcb9f1711036ab014cd0f5e6419a6e37fc13e1a5d2a54bd6e2018f4deb553d4fde65c1949b6127
-EBUILD opencryptoki-3.6.1.ebuild 3127 BLAKE2B 17de82c4d39fdf8276bfbe93182b06b77a3df51a5a30fb1a1e3375fd74ac7f8e23461b3a7efd4f3a75c14bb5343e148f77dfb3c285794df454ec3bb67dcf7715 SHA512 39f1b4a19f9dac592606d108d6df028dc50c453cabf845061e080af1f5bb4b949b2455384ca6d0f0be983b734e42564a8303c876e2b6005dbc3bbbb21a431289
+EBUILD opencryptoki-3.6.1.ebuild 3134 BLAKE2B 3b8a0ba2d3988fab6c212b8620ca28934c39a5db333c77f3ffcffb44eb768734363358abd909e2e54eee18b0ee0e60d3cd89b1f8ddef4620a749d52925f21d11 SHA512 97d822d8019a30293218f69c1ca5740f78ca31a1f980318030aded7eacbd2a4bc67bd14b12429ae07964d5e56097721e5ae91fe658d07eff2ae343a84a8b9a6a
 MISC metadata.xml 448 BLAKE2B c471621f15b751b55dd75e9b62d961bcb52df94359ae901119be884dbec71e41ced8bc3ddf9af33b70a78aa0c0ef6927a92d44e9901124ad5811b6fc38aa9fc0 SHA512 a325026f45754e53ae94b7a8d9f5836ab4974a4535a5492727062ee449ecb9d542e04f103662111b9eb3956be7fcad32189f4470b3d8e8c110e0023ae93318d2
diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
index 3b129d8ab795..35d8afef5833 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${P}.tgz"
 # token sources are under CPL-1.0 already.
 LICENSE="CPL-0.5"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86"
 IUSE="debug libressl +tpm"
 
 RDEPEND="tpm? ( app-crypt/trousers )
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index 87b829a49618..2d705240a9fb 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,5 +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 1094 BLAKE2B ba702a1caced8c25df7290d4cdc56087619579ce5d102b186c8dacca0eaa59ac4e7142119872a9f393a99b3584216263bf3ebeb2be20f1df780cf90a96efa300 SHA512 af3a8a0f4068b7eb5bbd7f6f5f720513260bc9035f9a1462c5763a140acf1b48512026560d3b15f3202c7feca62d70292f67b5919f071c5b352b4407b93b0023
+EBUILD openobex-1.7.2-r2.ebuild 1093 BLAKE2B e90f1bcf3c18d19114c7f52dfe168e04af5312f61b633c77df9994118ce9d68e5b419a34ea5e02bd361ab33f56261b42639346c4d2bd5ce680149922c1ccd81a SHA512 df464b66c3b92e73d7b662b3fb62cc6d062777f1dadfd1963af95feca2e7e7a90baf77d5b94ca272a4f8ad2a48be06675a8baef63aee1eb3881978dd122b8579
 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
index e2a2f7cd5b0a..0ca2449f9f24 100644
--- a/dev-libs/openobex/openobex-1.7.2-r2.ebuild
+++ b/dev-libs/openobex/openobex-1.7.2-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="bluetooth doc irda usb"
 
 BDEPEND="
diff --git a/dev-libs/pakchois/Manifest b/dev-libs/pakchois/Manifest
index bb3049a371da..77307046179e 100644
--- a/dev-libs/pakchois/Manifest
+++ b/dev-libs/pakchois/Manifest
@@ -1,3 +1,3 @@
 DIST pakchois-0.4.tar.gz 371126 BLAKE2B 41195807192f077039d7397bcaced2f3def57170135cf53f9addf23bae8f742ce76689fc5c4fa7a49ebbf182a38036dc0f7012e676d7c4906e8cdc7af664a501 SHA512 b4322cf58124aa05b6f34155a4eea753c6eae2fbbe57436491caf0549d79598c95f4d4fefa4a823ead341ab66a9e1a3f437d5278e449ca0d088a4a971d244160
-EBUILD pakchois-0.4-r2.ebuild 486 BLAKE2B 3a4918a2a0654429caab3e768a259c64ff8d19cd6e1cb982a57ad153532e544dba8e9054eb34bc2c44d9656c509ca33e313624f8078f1d0140103168437757bc SHA512 d99758795e8ace6866714f0e864dad8b7761356396092fc7563428633bfe2cedcf4960b5f3281c3d1fabae7c3bf9f9ee394bc6af5deba23897047acaef8e180f
+EBUILD pakchois-0.4-r2.ebuild 489 BLAKE2B 66041d61616f7b9986068b1aaa5f1211762630720d5ef33f8eed32b0d129df8bbd7b356ed766cf80a71c8150de34fd35d22da7d2609828989580b20d66036f6c SHA512 b251cf56c2c677d6dfc12391e35721b4280f3d9929616c36a521f1b2fe1767de20ef0a5415390a05690f0c9e0098fe0e275209424f8e9db8b64d574d4d9f3d73
 MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
diff --git a/dev-libs/pakchois/pakchois-0.4-r2.ebuild b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
index d291393a8190..217f984dc18a 100644
--- a/dev-libs/pakchois/pakchois-0.4-r2.ebuild
+++ b/dev-libs/pakchois/pakchois-0.4-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="http://www.manyfish.co.uk/pakchois/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="nls"
 
 multilib_src_configure() {
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 25d024b77588..4a07c468d955 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,4 +1,4 @@
 AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
-EBUILD pkcs11-helper-1.25.1.ebuild 1066 BLAKE2B a7d4606c1d48a2b9fca76f84140afafbfa6f5d9af37020b32a70054752547e81357642f3005d7e7912342d76e58e6648ef27d335c83825d81ab460a36d1ec910 SHA512 599384f0573a01bcdb6b600c2606bffae9d10d9f0a9557b29a9e8c3be74b7307d48896f2afbca5e9a2960c94ac6d15957533d64c814497adee4fa1c11865b599
+EBUILD pkcs11-helper-1.25.1.ebuild 1065 BLAKE2B 473c17885fe3d618fa8ffcc514d12af4bb21a7e38e7a0667be24f334d18b360d1d5f9e3bd36ac78ead70cb05e36acc618e56fba711e830ca1d574f5e7f0f39b8 SHA512 fac27eee74cc0a196297e167d7024e3cebca0d9da4b72bd82268df0ca62246546f4a42e75b39fc59e660f0b6d21254125ae2a5ecc165e207fd50dedc2a39b737
 MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
index 3776a870c787..b79c9b4d01af 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="bindist doc gnutls libressl nss static-libs"
 
 RDEPEND="
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 0880666c344b..ce7cedfabbf8 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -14,7 +14,7 @@ DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fd
 DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
 DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
 EBUILD protobuf-3.6.1.3.ebuild 2632 BLAKE2B a56bc323756a435869076bb5e85d7aec0c777b1709dde5ba78c40cceac648802366710d00508296928cb8b7f8b3fe9f089a38c4bea32d3b877902970cb6a9c82 SHA512 afec4771997a723c61c223465fa7b18d4d8c66676dcc606a1e2d7ca06dc45f7b16c2fc12c816a08507e09c6b98d0271154310125849356e72ddc7b28b9d84a3c
-EBUILD protobuf-3.7.1.ebuild 2945 BLAKE2B a7d12f08677c35877a854d9e102c13149ac1e106528da475b40ddd361026298d0db0f62efb7332fafe5b40db512fa5c80dbee533f2ed7043567f6f8cf05076e3 SHA512 be530b133532d65f321cf9aa8628de2aadf1d811ffd303a0cbfbb8ce36706d0bb4173108f48b063cb39a5680a120faacc8eae51364444e9302b414c7a7cac4bd
+EBUILD protobuf-3.7.1.ebuild 2943 BLAKE2B 896edce997fcecd5c16e03906333fce045a365c387b42a9880af6b6ff4ffb8a8a585a80db1833ea1b215830e0fbf8eb7b915bea3b1b13db8fb68ffe98153cc1e SHA512 f0c19b39ecc5c9ef7e2fc0fd5bb5479f6d467c82cf260d943aadfe5e8c7616b9a9e2753213e2d88c1b6cd77bbe5d9253dafee65ab892e88d2e6b36285e8f3faa
 EBUILD protobuf-3.8.0.ebuild 2952 BLAKE2B 649df58847b2b8563146794a416ba5ec555c5c6f68fd953d953b96d246fb47951fddd0c6c9a73919dde9e95fbc79dba0492093601d28fcebf69589774c1454ca SHA512 5e95b7a76ae54c481e12467e9a7b03800ec59b045b51be6b695606ad3125e60ed8babe9ae2bdf8c106fe510891d9bc40bdeecc5ebe75a9534756026154f285e8
 EBUILD protobuf-9999.ebuild 2720 BLAKE2B 2f45592f132b7758201e6c3125290ce4aef7728997cc64a325585679a81a92ae9eb5037a67c78eb762ab2490e7ddd4e174024b869d01b8629a31838fa0a52541 SHA512 0353bf1028af6eeae9689b7a08aa6e5726638c6a7e9472cf2fe4153c3c346222ec14e5a9c2627c1eff94a6e00c52a9c39c642ea05da082f53b87dd59787b2ffa
 MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983
diff --git a/dev-libs/protobuf/protobuf-3.7.1.ebuild b/dev-libs/protobuf/protobuf-3.7.1.ebuild
index aacbac676daa..c9fe2ba4ebde 100644
--- a/dev-libs/protobuf/protobuf-3.7.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.7.1.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/18"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index b5fca226d9fa..0d25490b2bdd 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,9 +1,10 @@
 AUX spdlog-1.0.0-unbundle-fmt.patch 700 BLAKE2B d98e7dc4ad4b2911192053d1aec564f1e07c5dd7a5bfca39f30fd08e7210bc79749fed03b6e6137671156f814f4c07b6e47f56e11c69806cdb28a1a478cae8dd SHA512 cf86983ccbb975df3804f10fd581a4edbe11ba1d2b43312fb27c05ffc95269c8eeca75e38970697f34d9c5861b925537bc0a9b0bcfd84617d328d640cf668db8
+AUX spdlog-9999-unbundle-fmt.patch 1307 BLAKE2B 40bdef65614b1c3f0bf288a7b8bc35294abbae4c9f46ba0499594865f47b3b73bdce4915f652d97f5088aa51a9922ed32a4874f318dd9e426ea6a5a0a0b02896 SHA512 15c12c44fce33f65a0068a790e3deaa120c3ff3eb8820b62b95d424a1190957d346f0bec0725132c818e3a6184da81681c4766da9b7d09f11d2d76f5be88ec4c
 DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
 DIST spdlog-1.3.0.tar.gz 202637 BLAKE2B 97027a3672b826e294dbdc202afa913a42ddae5a02a569ac28c41d79b96128de045ac5df30a76d888d6b3bea5093fb75b006365d7b1b296842750a39f43835d6 SHA512 019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f
 DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9 SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd
 EBUILD spdlog-1.2.1.ebuild 775 BLAKE2B fce5764a6d61b2748a5463fa319f03832af4deb3fdf505023483a6a48adddd1dcdcc03b9c8b3b73532927dcae68a1a592c5fd349cfd6befd54e7281fadd4e883 SHA512 394dd8bd0ba20cae5d3c37b59135eef5d784b9fcbe3eebf652319df34b4ee499d91478d934e326aafb9a221ef0aa3b260d5d0b4d0935ebf88e7562f713e9b00f
 EBUILD spdlog-1.3.0.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c
 EBUILD spdlog-1.3.1.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c
-EBUILD spdlog-9999.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c
+EBUILD spdlog-9999.ebuild 798 BLAKE2B 5122612fce41d8c3bc09395ba99692900790ae51daf3a7f01ef30b0f228120c170395b2c9488286bb05a279e0a3f66d12deb98ce456b9e4d4b45947d44b09784 SHA512 9693c2549a926893acb2ac9dee57f18dcb0ba36cd7fa134195ecbdb7e711106c6db661a5fadfcb882e348d2620defd53d643c6d9816657361195604842adc005
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch b/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch
new file mode 100644
index 000000000000..f6f37b5e493c
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-9999-unbundle-fmt.patch
@@ -0,0 +1,45 @@
+diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
+index 5d039b8c..8107b19a 100644
+--- a/include/spdlog/fmt/fmt.h
++++ b/include/spdlog/fmt/fmt.h
+@@ -19,9 +19,6 @@
+ #ifndef FMT_USE_WINDOWS_H
+ #define FMT_USE_WINDOWS_H 0
+ #endif
+-#include "bundled/core.h"
+-#include "bundled/format.h"
+-#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
+-#include "fmt/core.h"
+-#include "fmt/format.h"
+-#endif
++#endif // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
++#include <fmt/core.h>
++#include <fmt/format.h>
+diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
+index 9902898f..5e92a592 100644
+--- a/include/spdlog/fmt/ostr.h
++++ b/include/spdlog/fmt/ostr.h
+@@ -11,8 +11,6 @@
+ #ifndef FMT_HEADER_ONLY
+ #define FMT_HEADER_ONLY
+ #endif
+-#include "bundled/ostream.h"
+-#include "fmt.h"
+-#else
+-#include <fmt/ostream.h>
+ #endif
++
++#include <fmt/ostream.h>
+diff --git a/src/spdlog.cpp b/src/spdlog.cpp
+index be91412d..d68dd522 100644
+--- a/src/spdlog.cpp
++++ b/src/spdlog.cpp
+@@ -104,7 +104,7 @@ template std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st<spdlog::async_
+ // All rights reserved.
+ 
+ #if !defined(SPDLOG_FMT_EXTERNAL)
+-#include "spdlog/fmt/bundled/format-inl.h"
++#include <fmt/format-inl.h>
+ 
+ FMT_BEGIN_NAMESPACE
+ template struct internal::basic_data<void>;
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index 497e7da9b419..a9cbb03ae992 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -25,13 +25,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" )
+PATCHES=( "${FILESDIR}/${PN}-9999-unbundle-fmt.patch" )
 
 src_configure() {
 	rm -r include/spdlog/fmt/bundled || die
 
 	local mycmakeargs=(
-		-DSPDLOG_BUILD_EXAMPLES=no
+		-DSPDLOG_BUILD_EXAMPLE=no
 		-DSPDLOG_BUILD_BENCH=no
 		-DSPDLOG_BUILD_TESTS=$(usex test)
 	)
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 23dd986adf7d..639dc99c2cef 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,5 +1,5 @@
 DIST tinyxml2-6.2.0.tar.gz 585870 BLAKE2B 6f79ffe0894d625e3a2cccaf897c13962672f090c477b6b13e8685585a304b5cf0f5069d88d61650882e55f23768514dcbeea4795e3a4758b016cb177eee44d4 SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1
 DIST tinyxml2-7.0.1.tar.gz 590384 BLAKE2B ea055e9b85c8f1ea789f91d406e549abf1d6e8aacbbf89f5d887b6cc0d8678562810b4352c158de0ee4adedf8146016f970e1b2a221dcb8fd36aac0486d45d9f SHA512 623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380
-EBUILD tinyxml2-6.2.0.ebuild 627 BLAKE2B 652072754229eecd012c67e3e83dc245a8cc1ee1cf8719bba2b806cf1552bde63c182f7f3e4b18e5642378b149410d245b2aa8fcb66251979334649f62e23ce2 SHA512 6dfccf9b44f590ee91b0dfade68933cbd3c6a68bc7394050134d19c7c75ae2ff18609fa937c949f88ce039ae26e25a0cce2ec434ccc60b8f9617b28a91c4bf5a
+EBUILD tinyxml2-6.2.0.ebuild 623 BLAKE2B 62b554c62e9e1a022b2e02587fd915edbd71dae0112bd87a444485920fac5466e3e430ea2f2d5c0225fb3a5d98dd2f94ff50f1ebd950c527ced46394bf0d6f92 SHA512 24c5dafe5be94a5650dccaf189f9115ec28feb22fbbe9bcf9191e61b5ceba93e00143ecf45d0a529b2e78cbde133fe1639e7356b926055f52042e5fc4e302b41
 EBUILD tinyxml2-7.0.1-r1.ebuild 572 BLAKE2B 7ffac3676ccbebde87288fca78c7137f088412ae0e3d94f582d8b7b139d8f297429a4298d8f2a8d3fadc891e6b1a43c3eebf6b6d4bb5bdbb89f6a372fa757e4f SHA512 b2cb8225ecc17d37c5fbcd938b6da6b14fb1b680085617042885995011ec4c541b36bd17a244747f0f9b7ec0ef62579b5198f7bd575fd2670a06fb49a9409676
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild b/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
index a80b6b7e2033..8e411cbc2677 100644
--- a/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-6.2.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/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="ZLIB"
 SLOT="0/6"
-KEYWORDS="amd64 arm ~arm64 hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ppc64 sparc x86"
 IUSE="static-libs test"
 
 multilib_src_configure() {
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index 1f6a139f2d21..8a461ccf4eb1 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -1,4 +1,4 @@
 AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
-EBUILD tre-0.8.0-r1.ebuild 1421 BLAKE2B e04c58ac6c94338f38509f3d3d8e55b0df00d1c50d50020d0de76dd19ef1cc28809048bcd73ab1f14a5e6f7c5c404cc665839dcb1023436913f0c435f71ead3e SHA512 356f7d008b8f8102ed62b91d82ff906ec0cc476f00040e08c0395e97c883373cf88f78774965db5147241006e6762f5292de3afc06feed7861b1abcbcb08a31e
+EBUILD tre-0.8.0-r1.ebuild 1420 BLAKE2B 61ec376c53e7f893729aaf08fca7cd758ac8a505ab4eb67af446d21aa1c7136fa2c99d82734791d56c57aceaa2e04c86c08e864caaa57598f875dd27d7ee3060 SHA512 6b45f7f8e3209f40660c59cc2d5137ec8b61fee587e125edf6eb4020e708e6e232e3a9ade78811b9077f082cfff52169479e1bb789fb87f3a2329ea8ba68c513
 MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b
diff --git a/dev-libs/tre/tre-0.8.0-r1.ebuild b/dev-libs/tre/tre-0.8.0-r1.ebuild
index 5404f1bb506a..3b33954d254b 100644
--- a/dev-libs/tre/tre-0.8.0-r1.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 52ae0d1be66a..773ecb0657b0 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,9 +1,11 @@
 DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f708a925bef0cfcc90553de7694a85e1562bb2256b0c8d8726b910363d12b3a67f963f5c0213141ea2a4ad8d2bcd23bf7b SHA512 2bb042e1cf8888eab664ea6e88b94646c995bea61c89d49dcf4e844d144329303c600d73e29e0f05c935ad8278857cc08fb5b4b9f7f0c2f120c46b458b51a211
 DIST userspace-rcu-0.10.2.tar.bz2 503833 BLAKE2B 17e2102e096903f301d1a08d606cf98e28a413ef26a3dc8fa6f400ba74aa14aabdef5e28d4fed5fb01cee33b0bd5de9fb0682523aaa50c6053fd3471711a02e7 SHA512 47413b4a593d19185ee3d455e5744042c060cb50008dac25e9135c5cd2250ef5129a419258b18c665c8c794ad3b09234fdd70a106c72d8fc64631172b13d0e22
+DIST userspace-rcu-0.11.1.tar.bz2 527799 BLAKE2B b81ab5b3fd23e5666d422c1f627bc3c2cd095770f4f054f5d0d4ea6bc0007f12a4c6b05446e179b7a33775f7603e3be8ebf2c844be77b47ed80305da208151ea SHA512 112f7be1b72edfbad61582bb9962e2cf3c83415d12886cecb8239ab3263d1d07310b097813ac206aa9d4622953099100f0f54375d5ba345a3c87159c4b27bdc3
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
 EBUILD userspace-rcu-0.10.1.ebuild 673 BLAKE2B 2524941a62c95d2511da008f6ee0ff4751e49e8321c93c2f24399f888e3d786ddb81251d76c89b75ecd119012626f81a784d5e3d29d34cf499f1b86af9b4ace9 SHA512 8dd0e48b45c781297f9bf37ec36677c8c995e623ade8c36a45a66b3043de5dd7c970919b8212efb65107cb87a23270d7eb09c3fc48248299cc74f6742517a425
 EBUILD userspace-rcu-0.10.2.ebuild 680 BLAKE2B 45f02f09faae2fd0a10eaf5bbe8b385e4bebe2af15e9aa9a9a65d4e7b7e25f13af41d150c363823a2d9914cc555b863f4547a457114afb931fc285ba619843f0 SHA512 e0d4eedaa1420a5e7d4a4f5c3cfefb28c47a8789c4a48711d541cd8204fce7958cca7de85599f25427cfeae8109d604977fd484bf5921a0f534de863f00edf2a
+EBUILD userspace-rcu-0.11.1.ebuild 680 BLAKE2B ebf41f7a87a238275ed19713fc52c8ea58e482e1a8e101eab2153dad8f32edf11506ff0854d3a5af87831c3ba3593b0fe836962b0267ad4d78c725568b86e860 SHA512 a0833a3953bb6be60a25eaa217ff970e713e63e15ff78445a2c880d8f54991e37cdafb7e7227b51b0d6e2e2adfa54f9a2b8bdd70144bf9ef903c822cb2f09fc8
 EBUILD userspace-rcu-0.9.1.ebuild 740 BLAKE2B b14e6a5df0fe84b42d932333de46b1c370ee594ddc37e33805ef00e6af75a42fc72df610ea083dd5b818e7b77d8177b86bab602f864e279fabbd99356943de77 SHA512 b12eff3a56fefb0fb9c1a181b47f25eb1278d171f919c1a0dae2f788f95437eb418d8ddb64cedba9e7b95b81f4ae9ea8b8b125fd07f816a2511871f692a69322
 EBUILD userspace-rcu-0.9.2.ebuild 746 BLAKE2B e47e73ff204d61dd97063ce7c00df11750fe27406ca7c3166d947e55c094eee04142658917841bca424b4d6614fd33694f932f16876182f963c53a50f251d1e3 SHA512 ff838cf89d63324f8a9741bf5064abe2fd814b5758930046cfec333ccbaad16fd0d682371978ea6382ae84772278409fa8e7c0822de379503eee852a828dc8a4
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
new file mode 100644
index 000000000000..d69a055733c8
--- /dev/null
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="userspace RCU (read-copy-update) library"
+HOMEPAGE="https://liburcu.org/"
+SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs regression-test test"
+
+DEPEND="test? ( sys-process/time )"
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+	if use regression-test; then
+		emake -C tests/regression regtest
+	fi
+}
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 007d3853e25b..8933b52f0398 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,3 +1,3 @@
 DIST utf8_v2_3_4.zip 22422 BLAKE2B cf736876a99068c7e5cb1b0b892d1d63cb38906c993c60b78c8c5625aef86fac3a849551771d0840c3cccf04f1a3617216cbd4684fa5cdde0037e3901c70ff4b SHA512 0e85e443e7bd4ecbe85dedfb7bdf8b1767808108b3a4fc1c0c508bcf74787539ae0af95a31a70e715ca872689ac4d7233afc075ceb375375d26743f92051e222
-EBUILD utfcpp-2.3.4.ebuild 538 BLAKE2B e08d38016aa2c00e894a14022eb08678026fb583b7920f220cf3e617404ab85ccd086556c778783561df5ed62240ebfc65f230b0cc49c8f9dbdb22c0b1534ccb SHA512 8c82b783f79abceeb1e705e0f321ccd688843796d697c29bd2c053489f863e8f6ea3b2f42f3a26d995655fd03adf4962d408e6224510654fb730605074cbd621
+EBUILD utfcpp-2.3.4.ebuild 537 BLAKE2B cceb94f796696ab61bc98cf7ee4f601a0b2a2c528aed81d89ab3cae6f626868c1f33703e6e19785f35c9bf080716580764dd6f6b68a1a6ae7ace9264e1ed9c5d SHA512 5ab92460e7cc22c0d19c78a4632d12eaff02b9c2e0f985ab86dceefb3d73235012a7c037907d42ee956532d160a9775021d2c5c7cc5ffdb9aac2c834c395a4b0
 MISC metadata.xml 241 BLAKE2B bebf9b2f9e4975ea533d4cd1d684f5b702b6f3ec3535623cb53ae32dc4dadc2d753f8ad0f010125ce7228c7d7faf358856a7098f498ef7eaf954f83c9c36232e SHA512 863bee3a93ff22253bbb40c46dc65adbb4cedcef5ab478971cdaba2ab152d0e4490e0d987805622c3c4d2f937852187d6cd42e9524995563d8c91e6192d58100
diff --git a/dev-libs/utfcpp/utfcpp-2.3.4.ebuild b/dev-libs/utfcpp/utfcpp-2.3.4.ebuild
index 62ff54c3fc84..4dd29e5528f2 100644
--- a/dev-libs/utfcpp/utfcpp-2.3.4.ebuild
+++ b/dev-libs/utfcpp/utfcpp-2.3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/utfcpp/utf8_v${PV//./_}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 62554ebc084a..6ba1355e063d 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,9 @@
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
+DIST vala-0.44.6.tar.xz 3354452 BLAKE2B 7fb8946b55a73a582e4bf7fc15ca129bbd8c766e665dab15671466fac62bb19481fdda5476263d6689e36a63f6fb2c095c10e2ce7cb8f8cf33b38f691d2f86aa SHA512 7b0fa6da3b7ecfe5d6731e64a7803e3dde38e843c269e7bd0d9d92dbbba2823bd17689bceec3e2ee6cf8f7884a5e1e11e1699e98808a32fef2167221bdc7b8a2
+DIST vala-0.45.3.tar.xz 3356112 BLAKE2B 4632b476ea20d5a486e3094efec2a8bfc5b8f0edb25e600f14e5aa0ffbc1030e6966d54888b41f2af0083ebaeb0fbebd011e26da2153641e707d0b20d0e82fb7 SHA512 ba9eeacf45b2d1f8a87b0097e7b4ba15af7d35c9340957432b2b6acf3d8ede942ad6ee5820e64d9b3ac740653111b920c81f003647b61c569d43489894ddf4b1
 EBUILD vala-common-0.40.14.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
 EBUILD vala-common-0.42.7.ebuild 2518 BLAKE2B 79889f31651bf8044e066f1275ca2c7b931a10f7a1dbe9985d945ad5141b388b13bb9e27dd2bcc508ab83f63ba63efca7d529ed1eb505c1397a4e00465b58a54 SHA512 0c264a16df1c0bfead6d1edd4967ba7d0ffeff3f4f506b6bc210b0d2db807d8986c286560baa83335412388a00fdb7841718c3e9cadb42e51427e1dcfc9940d4
+EBUILD vala-common-0.44.6.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
+EBUILD vala-common-0.45.3.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.44.6.ebuild b/dev-libs/vala-common/vala-common-0.44.6.ebuild
new file mode 100644
index 000000000000..5d6856bd6561
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.44.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
diff --git a/dev-libs/vala-common/vala-common-0.45.3.ebuild b/dev-libs/vala-common/vala-common-0.45.3.ebuild
new file mode 100644
index 000000000000..5d6856bd6561
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.45.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 7c06ff4d4bcd..76ee7fb37a14 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.11.ebuild 841 BLAKE2B 1d346d305756d41a99d5a02af2a0c213d29455e988a5d01b038ccd3fab4b3e04756a73126e8ab5345ef0fd63e7f31aac11073f48f204ff10bc883222adfbabc2 SHA512 68ee8a58b36bac2ae5bd4ebba7483f3effa95167f094247b0e14dd27ec5e4185b1335531a90e41b44e9586d10bb01850ec4c3f97a451430352a68235d9e9286d
-EBUILD volume_key-0.3.12.ebuild 906 BLAKE2B d47cb3308f7d4347caade6a40cb8b57bfe73875babbe71fe5e0a8503d00a173281d8ff40c4b0d20fc4b43fccc1c237a717db64a83682d96e817457ffce128ed7 SHA512 29e77e6a082ae75d0d8e875913c3fd0e784f1b1d7f3666a55cec4f73da5459e4992b9e9c88611d3ac712f58f88492199eaea4682d866d79c205fabd804512b88
+EBUILD volume_key-0.3.11.ebuild 857 BLAKE2B fa53fd9c8c8d98545c56b4f2691f8a115b65369296e2e6a37aef2d4351e257b8c29b0e83f01b9a994d00f319aa56b875d9127b387302320a4cc7889cad4a432a SHA512 3098296cfd81b0d62d6b0e8b404dc0836e5b9fdb6690c5b86ad0deef9d48f7d738d5758ae7f94ba0e0208596ce90138e6ce519d8ee2cc3a082df625b29c35baa
+EBUILD volume_key-0.3.12.ebuild 922 BLAKE2B 2305af3ad6640ba4c0328a3c52c46c03a1082c18565d6ce0f44bb586a66357f9d0f557d8614b2401e6c75b95fa9f8848b4a56d3956d983700e738cf5d831e036 SHA512 42048c250105e28afda9916692b68c0d197480c997e443b12a72017c77c526fda698dc8d42d7d928eaf6ed35b1258d68243dbea103fbe02548d4746dc6a653b6
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.11.ebuild
index e5fbce850dfa..ad55dd225f32 100644
--- a/dev-libs/volume_key/volume_key-0.3.11.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.11.ebuild
@@ -19,6 +19,7 @@ IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	app-crypt/gpgme
 	dev-libs/glib:2
 	dev-libs/nspr
diff --git a/dev-libs/volume_key/volume_key-0.3.12.ebuild b/dev-libs/volume_key/volume_key-0.3.12.ebuild
index d0b33aaa8bf8..125cbd4b1be8 100644
--- a/dev-libs/volume_key/volume_key-0.3.12.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,7 @@ IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	app-crypt/gpgme
 	dev-libs/glib:2
 	dev-libs/nspr
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 712eae7be9bd..2fe54f256d9e 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -2,5 +2,5 @@ AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
 EBUILD yajl-2.1.0-r1.ebuild 929 BLAKE2B 3056d21fbf420a21a5fe3e8ba091b5d1509c5c270dd559faf6ba189c1770f5eae18adb40efc9c67bdc5f662eb94594e593943ec5c9938eb90370007f394bdd70 SHA512 ddf6476d025c541b62e831540a97c16a89706a51c61b1207afdfe52bd04c1175360e67351433158237cb17156e41446a81702e50ede4078a2bb67f08618deb61
-EBUILD yajl-2.1.0-r2.ebuild 965 BLAKE2B a76898d7ab9746d57558097c5fa4ca013aea232ea0fe93653cd7a6b35d2e8b10158da34a2f8aef459d5faca007ee8353f672cd361b7b99cf907de659dffd6192 SHA512 34e1126fc69a00f56c8bc4c211bec911cf20f01198ab0c3d8cb107c631d02d362de648fab797072f72b0ad3a4bd9c0c93fb697846512dea5c7e1887c85a83050
+EBUILD yajl-2.1.0-r2.ebuild 964 BLAKE2B 3c6656021246cf7eb18acfe704b15d61c4d0ab5ad5da51b968782ca5cdfff2d0a056865ab8e19da0e6b37f34f173edcaaba44038502e5be6c688ca52fd67a87d SHA512 ff676e1296af826a7ce6733cdfea81efb4c8eca387342d1d139763d54a72745dcf6b962caf6373380969fdabb29cf707833adb4a88319b6ad8b23560bf980cf1
 MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/yajl-2.1.0-r2.ebuild b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
index 6a64e199234d..ac53ef40c042 100644
--- a/dev-libs/yajl/yajl-2.1.0-r2.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch "${FILESDIR}"/${P}-pkg-config.patch )
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
commit	b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree	0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-libs
parent	121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)