gentoo resync : 18.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-18 11:06:49 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-18 11:06:49 +0000
commit: ab3da91fb6c91a9df52fff8f991570f456fd3c7a (patch)
tree: e8f3bfa2c6c3d20ec3b9c352c839e23949068b6b /dev-libs
parent: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (diff)
79 files changed, 1383 insertions, 248 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index aebeb755bd46..73171e7e4f16 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index b175b41fe48a..8c10a762906d 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -2,7 +2,5 @@ AUX appstream-0.12.11-disable-Werror-flags.patch 512 BLAKE2B dcf8eece66122356743
 AUX appstream-0.12.11-no-highlight.js.patch 3876 BLAKE2B 30176763dd0ec5b9b4e65e748749fee6e68371ba37872c6a2d2556621efd166c1202b4d180d1dd9e980b5e7e12ffebd2579883b370126dda1550873d880dd769 SHA512 4be2760971b7dcc58fd21c8e3cd67242eadd3b1e19067a14e279594a40fc8bffc3fddce0c7a90db01e19129ba7e3d09997615f5ab9cf3dda9a8b76eb4dbd0e0b
 AUX appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch 711 BLAKE2B cbca8047059f613dd6b4859b5f7982cfa09e22717982c7404e5375ec976dc03fa421e5b6103b0d399dbca9ce7a7ced02a822754ebe29f5d72a2d5da834219297 SHA512 1e9169aecce1073d851d2a22498586440d1eeb02e84ae362f381799ec244aa755cb58203f3873a566b07462be31fb1b3324c062b15cdadebc4253ab750363c66
 DIST AppStream-0.12.11.tar.xz 2120548 BLAKE2B 6053d1d1bbe182c8e57f657ea5dda9c4a777d5a7955f39a57677502fbbe010d5c49a7872329d1ef716c41c7423bfb4d284e71af97f99ca6e466fbf369bf80272 SHA512 6000f4e9f995b2d481374db2409f212da9d48893c4a757cb7287e2731117f50d0ed284dedc0e24e505b3b7c9c9f38dd9a5f855eeb6c7445eb7203e74d4a5f790
-DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561
-EBUILD appstream-0.12.11-r1.ebuild 1987 BLAKE2B 02c477281a890e89340717691068bfda917d6cf6ee813446344cab007c08686e6f9081a08d5840f9cf876bf93ef1e267b8d39f39049789eb3b5fc8af2dfa4149 SHA512 a6c001e523e881cb13a5c68d1b8cef3d629a2d44544da96a47346eb058fefdfe956514e8b81a584e0839bb2a6ccdc09306aa4a113f9c470890094e36c9f9bb36
-EBUILD appstream-0.12.7.ebuild 1619 BLAKE2B 0355409cb6ed3d49aba5deee05dddb87dd000b45427a472a1ca39a9c887567ef7f26cbf777eb9b9a6ec50e90b5544c1c607636ec22f8227ac5f087e7b2d0bcec SHA512 90a0ab33c5cf51b48c4297da10e26765b18a55bf5d2b18c051d6119ef10bc94d6470cb708d3105af39349ec63de90c1f03883544dcecad6853bce85f09b9b4fb
+EBUILD appstream-0.12.11-r1.ebuild 1986 BLAKE2B 8ecc11e3c61e1d1e7edaf4904086e38e63a3eaaa079125435aa88188d1d173e455490a2f8aae79e7c0d10d15b621492cbc5bd366cb36b6cced52da79b892b3de SHA512 1e4574d879580cee470d87f7359a0d879675efcf72f7d3026e6a33bbf51b73abeeca26eeb79051a6702a14be1da87598635bdd65e331c903ff47fadb0f19b357
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.11-r1.ebuild b/dev-libs/appstream/appstream-0.12.11-r1.ebuild
index 622c2fe9a914..c6f2bbb71f20 100644
--- a/dev-libs/appstream/appstream-0.12.11-r1.ebuild
+++ b/dev-libs/appstream/appstream-0.12.11-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ximion/${PN}"
 else
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	S="${WORKDIR}/AppStream-${PV}"
 fi
 
diff --git a/dev-libs/appstream/appstream-0.12.7.ebuild b/dev-libs/appstream/appstream-0.12.7.ebuild
deleted file mode 100644
index 592863c75581..000000000000
--- a/dev-libs/appstream/appstream-0.12.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	MY_PN="AppStream"
-	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/4"
-IUSE="apt +introspection qt5 test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=dev-util/meson-0.42.0
-	>=sys-devel/gettext-0.19.8
-	test? (
-		dev-qt/linguist-tools:5
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-DEPEND="
-	dev-db/lmdb:=
-	>=dev-libs/glib-2.54:2
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt5? ( dev-qt/qtcore:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
-	if ! use test; then
-		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local emesonargs=(
-		-Dapidocs=false
-		-Ddocs=false
-		-Dmaintainer=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt true false)
-		-Dgir=$(usex introspection true false)
-		-Dqt=$(usex qt5 true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest
index 15346c8aa66e..801020b109e9 100644
--- a/dev-libs/aws-c-event-stream/Manifest
+++ b/dev-libs/aws-c-event-stream/Manifest
@@ -1,4 +1,4 @@
 AUX 0.1.3-add_missing_cmake_install_prefix.patch 566 BLAKE2B 1e638a3fc81c27addf3fba53173584b379b271a357246f448d5df0dd34dbcea42f698c4e5be87937070d5274940e25c1dc893c2af621b999405925cd57471c70 SHA512 872305633d8f3129280d3252632dbc07d24ee666f236f02e568e27153dd69657a2cdfdb2d594d9a86816f09923fba5b0e9cb2bd3eb0198b2a9077e02082ff54a
 DIST aws-c-event-stream-0.2.5.tar.gz 61949 BLAKE2B baebd87a916fb8440db56afa2b97bd02229d70e00b55c40a17a2f467ad683422a6c6747aa698adce5272a03ced3fe6957d8cc62040d8080d3ed95409d8182851 SHA512 1421d608d8a5cfa5ec5df3bd905aab9ce9abc913461569a99b895c8415e50305aca0be3595bd4f3ed74cb52cc0e342354d211531066fdde60e14dd60e5629239
-EBUILD aws-c-event-stream-0.2.5.ebuild 841 BLAKE2B b53ffdf9c4afb91251cca0e3af41432a1e80a922d165dab4a2d79a742ba9b90b7edfa3e9fa024b880457b99954b007398fbaa936c021ab459e8f330c0bca0928 SHA512 785d757da2f248b306876fa094a6af9149c64e83987f66a5097d440b9a604968a8423b3403d37468f5a386063237b6ef856ba10401eabb44e49a169a428cfd63
+EBUILD aws-c-event-stream-0.2.5-r1.ebuild 884 BLAKE2B ff04f42da608040d87807dc683d9d3f120188883bd6a207b8a87a2bb18633b991ee318c76fec88c49e381005303e09b4c6ceeb45927ac6cee14bdc59d42d1152 SHA512 936bcf26fe300d8754f2a5ce4774bb8066e8873c1fc84c9f8c092a5f9030830ed206d6d387a00a158c900d610b9fca6d1bc61e17161f8880a1a758a7a408813c
 MISC metadata.xml 365 BLAKE2B 173e5a8de1e8326296f192e96f64828c5148d5a37fc4b02c05507655d045c2e63d32833f148e76354e43d196f7f8305c2e26eb3b138eeee1856de18fa76f4140 SHA512 16a909436dd61400c177a54c56dd1302c6b1c5aa0f2f76fd049c22a124dab0ee9449adffa3631cd7bbe7998c69a349966d5434d57588adf438262326bdb78633
diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5.ebuild b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5-r1.ebuild
index 57f763c252a6..8aada917d7df 100644
--- a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5.ebuild
+++ b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5-r1.ebuild
@@ -25,6 +25,7 @@ BDEPEND="
 
 DEPEND="
 	>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
+	>=dev-libs/aws-c-io-0.7.0:=[static-libs=]
 	>=dev-libs/aws-checksums-0.1.10:=[static-libs=]
 "
 
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 0fe2c8eeb818..e6b45a1bef20 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -6,5 +6,5 @@ AUX elfutils-0.181-CC-in-tests-p2.patch 1390 BLAKE2B 1e790582925769ddf2346a6b3da
 DIST elfutils-0.181.tar.bz2 9088984 BLAKE2B 3f35f1a494986ff23d755188aab2b8f5ca9729927dd0e01725abf8477ac09721f751ff79686aafeff3878cf52e0c3f3e06d794fdf6371382a1bffc85c0de3411 SHA512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36
 DIST elfutils-0.182.tar.bz2 9096742 BLAKE2B 59efd76c921a90a5ac18a62a00845080b574f167ae633d32b14acce554523736d0ccfdf539ba61e8ec1511b3294b486e0fa512887582a2e5cc34e71954e87e73 SHA512 8ab0735bbe11b4383169341bf674ace360038b6ae5239f1d5a991c46260cd4bce545e078735b7de3b8fab132bb5da41f60689ff1b1d7ebccfada117a954a2c81
 EBUILD elfutils-0.181.ebuild 2457 BLAKE2B a6284d30d68fcd9d7ada06c499fea705cf4407441a5d7d971b77a9303986379a58ad70054915e54694e97480824ac3bb800fd06206cf1ec40727cf9c0660727b SHA512 517519049ab656b6d86e3ef5188dbbbe04a9c19c6e374620df5c60d28967c4158d0f70d2b80d9bce9a4c0eed3c3e2fa43344f14b30bf63b43eeb3bc9218697d9
-EBUILD elfutils-0.182.ebuild 2546 BLAKE2B 7b0c520886ecb5ef6a96b22d6104ecf155df02dfe055d982c48a168c5c582c1e6a55b497c1a8fa0c04e7ce4af71488125ae26dc8b1518437085c913ecae5a126 SHA512 5e44638022ca23cd9b75b79699d98a809e14ab63ab0ebb1196d1358fa24ede64c96956bf5f723e162cd3e555d629000fb71a1cd9f653dd7336fba0c8316b31e8
+EBUILD elfutils-0.182.ebuild 2545 BLAKE2B 89299bc12196b2850a01426ce17afbf10066a2332ff0aefe2a91092e48f16e99b3ffb94757ad3cdda78276956ed34a180525a3b4c6916911268b2e653febadbd SHA512 c58bd0bbb091f7dcf885255269939ac28422fac08446f8409878e2cfe895e5895bb1efdbf7ce797e92e0575ebcc0968537d7f9437095570adeaedf00ce2d4f5a
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.182.ebuild b/dev-libs/elfutils/elfutils-0.182.ebuild
index fb94d66e0f1b..3a2d05609627 100644
--- a/dev-libs/elfutils/elfutils-0.182.ebuild
+++ b/dev-libs/elfutils/elfutils-0.182.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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 36c41d0b89d9..cf4b0ef2b8ea 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,5 +1,5 @@
 DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d
 DIST fstrm-0.6.0.tar.gz 135214 BLAKE2B 237b371450ea2e92e466aaeab2d6ebf9ba7c6bbf14d1517431818b01a2609c1765299bb576bb3a4a3a99a9ce7644992c3f5eaf82c01d903a1bad358d49ed47b4 SHA512 8e327f40fb49b36998d8bb9353b30b9924630b85adf1e4462ce4b456daa7eea727892a59f43ddd48de5bf5059a450fef54726b09af6d7f210fa182c4055d65f4
 EBUILD fstrm-0.3.0.ebuild 803 BLAKE2B 52f8d34804c41344d3414cb9b07e476f49cef9f6e41db960e33fce21d404cc011ad97b92dee7288e868a12e10020a16e328b805c320c4395fc7967411faec988 SHA512 9d81084901f1d029c9e62117e294b1f6985870928db5f8aac00d71449874b67a378d5d3f7d46503ce8eed22ea916eefdf4e60142059b092addc9dd7a0dbdb829
-EBUILD fstrm-0.6.0.ebuild 828 BLAKE2B a7b481fa2a227491417d4d09e6d540c6667caef22343663f442b22500691f8ab21c86d94fcf9ce8415a5a9a2e04b1b861ba37fc865d2ef7bf7dc6bc4d4bc3bcc SHA512 1c8e905ac28673f0e881a5c57e0b4ef78b2c6ab335d95927a287f8224cb9b6ba257cfc3c4c279f1d6e48b4210469cba6f441482449dc331dbb9ce30eabc8017a
+EBUILD fstrm-0.6.0.ebuild 826 BLAKE2B 4fa3a7798f47ac3427d284b0509da99560c3f06f5b1c3fe2e272a1c2858f356bb99e08b7df23c6db3134e279478ece8579ac985fed1e80d8b529b21f4fe67a49 SHA512 aae8ac383dce2c3fb783a0340c9d5233f17e706440116e8b81001f477fb537f82755f39d0b878d6841015048db4802743edd9cf5d095df4196be865ad94d9fb1
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.6.0.ebuild b/dev-libs/fstrm/fstrm-0.6.0.ebuild
index 806ef1cc0cf3..752c085223aa 100644
--- a/dev-libs/fstrm/fstrm-0.6.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/farsightsec/fstrm/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs utils"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/gf-complete/Manifest b/dev-libs/gf-complete/Manifest
index 6b2cffd5f5ce..24290fac85d7 100644
--- a/dev-libs/gf-complete/Manifest
+++ b/dev-libs/gf-complete/Manifest
@@ -1,6 +1,3 @@
-DIST gf-complete-0.0.0.tar.gz 596339 BLAKE2B add52827288d08e8d546787f8bc42554ce8900a21dfdc47e66aea2990aa48604f8a51d573f84c667e2479a03ddb8412c43a0acae745cb1e3e5aed0bfd0dd0a83 SHA512 7942a29b80972fffab15dc86c560345911db5aa976d2c505804d0eff10c9135f674f3511b579e2bac26342ca53a81d323826a1ff1d790836a4650a07769851a2
 DIST gf-complete-2.0.0.tar.gz 122566 BLAKE2B 20cfc2dcf437109f5ed703434c5c383bc910d57127583a4eca6ccea860d0f42c82c93558ba992b9b35d6025d745a8bb39c32ed35809ffc063fa83b11a975e0d9 SHA512 3b0693bf374086417f04cee09dceeb694aafaf7fb3c829b89f303b65634ae509406c8a0de10f57c666b4c78b11043f355bb3c81f95eac061cb16de9db2b71b89
-EBUILD gf-complete-0.0.0.ebuild 628 BLAKE2B 7c3b73a700a367011a1eb16dd47f92caa5b6cda46b4b1c8f3596a5dea16d2824b0171327f66f19efa5178f340abcf2c16569dcb2be6b97937631abb834084088 SHA512 0d3bbf3b76ef8a44e7a8366b04ca609db2612e77f0e4666b320420e0c06e7c60c3092db149603855ea3eb83518a548e6bbac27e47348450467aa9e840b82d32f
-EBUILD gf-complete-2.0.0-r1.ebuild 724 BLAKE2B 19aa9273c2a103a24b971ae4b50250bb0326a865dd1d13487aa686a5b18341bc8a5b9146dd2ec85bf2b454a91a9d00992cb3ecaf332f192dc301bc4c041a0227 SHA512 47c770f82f67e3f3b865e2e15e9a11d54783371d2baa3d657b0e11ecfc7fe85232bc42fe38181a9ba69acc375172ca7f648d885357cadd8324497845ed23e278
-EBUILD gf-complete-2.0.0.ebuild 654 BLAKE2B 4385c144aa769748612ea4f0a2a2a2f6821e7183f89b313d85d45e45dac34756195795ff8f21d1a70748dbd80524a7559d253ebb1464e1cad9ae71f176d9b9ed SHA512 bdccdbf0466182afd3f28949ac9a9df48a5223489e9c7a9a1843891ce1622411082e3f631531a773a9d40856bc4f9fcec86ccf49151296c8a7b9408e5f6a7b57
+EBUILD gf-complete-2.0.0-r1.ebuild 723 BLAKE2B ce2657fad4cf466b6be446235949de6f6c42abfe0b78531bb9e778ed17a3e3d98d4d56d711f95727ddf2c97116b510c8868a536cdc4496e2a0f58da43a40348f SHA512 5a512b143669c98fb3bced1f1d5aa91d084266e321e958dd964114d8b06e8ab8a595992196269748d9a78b048061c75f850886623d7b9af579800c53ed4fa848
 MISC metadata.xml 371 BLAKE2B 57b48284c6902ef89797ac9e63452e3ae6dc0b1cb223c9dbebeba4aa52d4c37f64cbb0ecab23099c68cb1eb9ac675a3fd90bb86520d7fe17505024fe4578abba SHA512 6073568ff06bc2ee07189affd7dd44425d9e028a5dd558d3aa41b6813b123681f4e50cf7a911fed42f342d576088f0be61282748c5d0e067bd664aa5b7acd554
diff --git a/dev-libs/gf-complete/gf-complete-0.0.0.ebuild b/dev-libs/gf-complete/gf-complete-0.0.0.ebuild
deleted file mode 100644
index c0cc00272714..000000000000
--- a/dev-libs/gf-complete/gf-complete-0.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils ltprune
-
-DESCRIPTION="A Comprehensive Open Source Library for Galois Field Arithmetic"
-HOMEPAGE="http://jerasure.org/"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/${P}.tar.gz"
-S="${WORKDIR}/${PN}.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/ -O3 $(SIMD_FLAGS)//g' src/Makefile.am tools/Makefile.am test/Makefile.am examples/Makefile.am|| die
-	eautoreconf
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
index a4e5983dfb82..df56d538b824 100644
--- a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
+++ b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-libs/gf-complete/gf-complete-2.0.0.ebuild b/dev-libs/gf-complete/gf-complete-2.0.0.ebuild
deleted file mode 100644
index 0ede143fb2fd..000000000000
--- a/dev-libs/gf-complete/gf-complete-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils ltprune
-
-DESCRIPTION="A Comprehensive Open Source Library for Galois Field Arithmetic"
-HOMEPAGE="http://jerasure.org/"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/${P}.tar.gz"
-S="${WORKDIR}/${PN}.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/ -O3 $(SIMD_FLAGS)//g' src/Makefile.am tools/Makefile.am test/Makefile.am examples/Makefile.am|| die
-	eautoreconf
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index b664c7fae0d5..e3cbf697b72a 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -3,8 +3,10 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
 DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
+DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
 EBUILD glib-2.62.6.ebuild 9758 BLAKE2B ad374e654c1afbe60c8b65e04cf1934791f8c487a3881b82deb0684f0c903e4d7a4e08c954f325a896a42f935634ecc37d764ad6e16a4fcd6b1a04528aaab378 SHA512 bf35ad4fa21d1d9a7e1bd495a800d67fed2aca2f5002cf8df58523ed980abb05b076d19382274556a99a72fa4bf4a796d693534b19ed4e309fb642e4ed7f0feb
 EBUILD glib-2.64.5.ebuild 10340 BLAKE2B cd7a783302d17fe7804354bf5a64e5d912d978431d6759624d0721e1f7acbd294ee824f397fb0f2a4a3b7fd01d240dee92217177566a66e982ea6d436a7a1969 SHA512 353274e00044263633096844343b2e029d48ab7fe9ab1c8b9549ae89d6bdc501258bee4fb8651a259c118f3a5aaefbfc49683de6289d60e74da2009519861e2e
 EBUILD glib-2.66.2.ebuild 10454 BLAKE2B 204dd4544642d4cce4981bc44cddcb17cc13712d971e9d3a3d8e56b451807a47b91b2d200955a7c27261bdd587dc0259ec537b2ebe9b065785d09bd762366293 SHA512 696011bd3cc46e3ea4a3daa784e39b287aac2da934b395ebaccbe36c22a7fb309cd293c8307a0c5b92a39b29cdd9ad3828f343489ce65ee7cef3727a87b5f9ba
 EBUILD glib-2.66.3.ebuild 10450 BLAKE2B c1e96ebe1ddaf053feeeb70869d00ecfbe5c538a9a6c47d2b58030b2cddea851c516d8c786dde43ef2e95b1cd7a1710bdc6bd4a8e261d3fa643e8ffcea41e732 SHA512 31b186d9c63a842e599b8beca4236fb7a938a4ca60b08e15032b189f14856d20864048b947d6bc45d1cb3381c1d419efc6c7df03510ed1d0687a9185901fd1c3
+EBUILD glib-2.66.4.ebuild 10450 BLAKE2B c1e96ebe1ddaf053feeeb70869d00ecfbe5c538a9a6c47d2b58030b2cddea851c516d8c786dde43ef2e95b1cd7a1710bdc6bd4a8e261d3fa643e8ffcea41e732 SHA512 31b186d9c63a842e599b8beca4236fb7a938a4ca60b08e15032b189f14856d20864048b947d6bc45d1cb3381c1d419efc6c7df03510ed1d0687a9185901fd1c3
 MISC metadata.xml 1098 BLAKE2B f2bd17f50d68c553b9040e954c0ef91edd29a3f1f7731bc7f45e3a936f702209985d111ad376ca0b51bdb4736d9ee508151fbb57b273a32beb1148aa027226c6 SHA512 2745b70b29ba0517144343f5d3f4b7c3389200b1ecbd2830e29bd9a90ca59ebeedf4d66b26a3241e3d3a3066f9a26ae223d075b9b2b82d67e4642e784f236c20
diff --git a/dev-libs/glib/glib-2.66.4.ebuild b/dev-libs/glib/glib-2.66.4.ebuild
new file mode 100644
index 000000000000..10400fd0dd1f
--- /dev/null
+++ b/dev-libs/glib/glib-2.66.4.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+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 sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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).
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * 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?]
+	>=dev-libs/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}] ) )
+	!kernel_Winnt? ( virtual/libelf:0= )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.38:4[${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.33
+		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
+"
+# 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)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+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 '/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=enabled # only used if host_system == 'linux'
+		-Dinternal_pcre=false
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use fam)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+	)
+	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
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+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/judy/Manifest b/dev-libs/judy/Manifest
index 254542d9beb7..955ba41591ee 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -1,5 +1,6 @@
 AUX judy-1.0.5-gcc49.patch 3112 BLAKE2B 36550790454e36ddb1c13a3e2addce7aafe126d87f3ca39240460d84033123a518bf0b8162be8226bfeea43c08cf810b3ac2219909ff505903d54ebae42c74ee SHA512 191f64d44d444ee238b8cfe589fcd25471c82978f6a5e34736b7a9631dd72e06542c8f748ce2c2cd434ea40793ac5b9f95a32e95c5559fbbc9aee3f2dc2e7aec
 AUX judy-1.0.5-parallel-make.patch 6736 BLAKE2B 4ba894f81e98a02a83700a061c9fa1f4670ad0b880635fb7812f5a109c14b518598f65c3221cec35bbe1f148b2ab3bf48142734bc74baa15e86604cd6b75f985 SHA512 80f5f361f4cc9f8d5e433ac40f3f4371186025d4fd33b15ae5e80db9d80460c4db94bd6e24d83cfaeebb82328a762d5560464112c7d3f80c5601a7a98f6c5765
 DIST Judy-1.0.5.tar.gz 1147847 BLAKE2B f5f31af2b7d1db5524ff035e9f9b733a4c5c23de76cd4c55bcdc59f7474ee02d7c7ec9341f087736ff6e39a139d20d9ab8298397aaf17f7d48a851037b8677c5 SHA512 1a0d59b092c80d95270a3089cd25ee0ddad1d591101b03784e2e46dfc73bce445a7fb495b449043544a366c09b35b833556053bf3bf65dd00abbd786d26c6980
-EBUILD judy-1.0.5-r2.ebuild 858 BLAKE2B 994dcde5caaa975e6372144d304b49d776a47d3b0b8a0a88bd4a921f2ccb7ec9e0aa87c5b9bc5e61af01e476930335d21825ec2dc198193ce6039976fe7d201f SHA512 59abdc47e1b0c06074b827fd9258699e33edc57ea3f6e1aa45f17e00a1a622050b52a003f5300c19f389a0054003a5ffab339e5994128f26d829c5196ad4f3a9
+EBUILD judy-1.0.5-r2.ebuild 871 BLAKE2B 33cb7a0f244dba35019dee825479a235a9c67e114736457b8c5305e7554c43afb3b7135c6291749fd19664fdb71f504f37f221dcf1da8ff014bcf4c6ac3b861c SHA512 93e1b427080b3b4d2d6e8ee8310f995c140120851ce2da844e06cb42dd69c85a56cd7edef2f0ee58f2a9737392a5c675c0f1455e7150e4d68467a9d185f2622b
+EBUILD judy-1.0.5-r3.ebuild 878 BLAKE2B d327adf9693390971fc08b6c255f84ad3889b55c5b7f3638021e0dd8f7dd1c93d9b45500569e74ef32ef2d2638c0f46e0013633ef969c7348b9d81de51c23e8b SHA512 c076b8b90498e489268817757473c855ecbe4fd42fb35882b18f25c79f2020c1b0208c790bb44cb5a74c0a4574da2831719876e5df7a23709dc9a9baec3e1208
 MISC metadata.xml 320 BLAKE2B 7fd7a64eaec80ea91157624ff748afed6e8754407b8a0e261aac3022e2b69e2e6019ccb025c5a739f9bc005d81e41bb14be0add7323366422499aa96c8162e84 SHA512 ab0598eef76bffcdce226c8d0c20e70c723771835f20505119ea1fba9484293a28e5862f9227738284ce7a53809e4fc68fea31e2335764934e8e36b983366a46
diff --git a/dev-libs/judy/judy-1.0.5-r2.ebuild b/dev-libs/judy/judy-1.0.5-r2.ebuild
index 9e0e3bc742e4..548bcefdca81 100644
--- a/dev-libs/judy/judy-1.0.5-r2.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools ltprune multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="A C library that implements a dynamic array"
 HOMEPAGE="http://judy.sourceforge.net/"
@@ -30,5 +30,5 @@ multilib_src_configure() {
 
 multilib_src_install_all(){
 	einstalldocs
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/judy/judy-1.0.5-r3.ebuild b/dev-libs/judy/judy-1.0.5-r3.ebuild
new file mode 100644
index 000000000000..3c9b879d9d3d
--- /dev/null
+++ b/dev-libs/judy/judy-1.0.5-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A C library that implements a dynamic array"
+HOMEPAGE="http://judy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs"
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${P}-parallel-make.patch"
+	eapply "${FILESDIR}/${P}-gcc49.patch"
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	eapply_user
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${BUILD_DIR} econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all(){
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index 5a3bcd069375..0a6c7472c7b8 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,5 +1,5 @@
 DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d525b4fdb8967159bbcf32ca8dc3d057ba39ad35dc19f5f68f67160fc48d805e107fcaea22f81fdd8bd1125db908 SHA512 aec4070b3d3b6c00900c3cb814e4b6a98beea09817eba3c3f7e6d5ce1ff68c091d183583f09b475e3e56bac67c94c1d912ebbe079dcece8195ac0ed9379d5f82
 DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
-EBUILD keybinder-0.3.1-r201.ebuild 908 BLAKE2B 9b4f9ecae38e9ba46dea4df59528377a7b07888a035a200f6c22e3ed7586b54773553c3e2a944a58fa044e17918ec933610eb261d267411b4b14a9ad31ce4afc SHA512 cee265807061a943c6889d7b4af61c0f70721265cdac3f9e0a7af6d051c2eec29d2374eee8ccabfd9ce625f48cd6edfd76003359b9a559fced2f2d5534b4811f
+EBUILD keybinder-0.3.1-r201.ebuild 911 BLAKE2B eb81d635fceaca7cb9b0990820501771e088c0f11e0f4c697abf7bf8c278f7efe4d0b1c2cc37afe011279e5a9f5d31a3dd9881121ff0a17ac6a76e349535344e SHA512 2c944bf1571a00543d4d816d1fe91a1d1a8ca18fe93c04d00acfc6268a8c06b8922d4688804ee828828a0968fb4bff8f8683ca60b5528c7d7d8ffdd76f0fc92a
 EBUILD keybinder-0.3.2-r300.ebuild 1073 BLAKE2B a7201d3f21433e4b269cb62d99b5f3738541d8499da5a2a5d20ebfd45a87dd00b630e6d05d8f31e620f0092b32fd4c2dc6eb87a21f6900ff16a5cd4017df722c SHA512 8474b7abfaa53072e284d92b311783c1ce8effe12f74cc45c5d42a9e7392fb856eb1ef77580ed11ad2f09c7b935193ba84d7130c48e03f9a27ad136878f989d5
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
index 02e68ac665c5..e25af14fe258 100644
--- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
@@ -17,7 +17,7 @@ RDEPEND=">=x11-libs/gtk+-2.20:2
 	x11-libs/libXext
 	x11-libs/libXrender
 	introspection? ( dev-libs/gobject-introspection )
-	lua? ( >=dev-lang/lua-5.1 )"
+	lua? ( >=dev-lang/lua-5.1:0= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 9c51fcc58083..aac2cf127c40 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,6 +3,8 @@ AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164
 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
 DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
 DIST leatherman-1.12.3.tar.gz 816018 BLAKE2B 6245284856613b99df2ce412e497ba69fe1a016a82ca5ea7f78ba591dc287e2daef051214b303c1cc463efb537354a01ad6c57688f244382b3843b8bfdad6f3e SHA512 83f785ba7c69032e2c9c7f2fb07aa5c100ed9e1a81c88ece19d7a96647b9a46927b99fd7144c08d697863e44553f00adf6bc4964f45e900809827956c0949b36
+DIST leatherman-1.12.4.tar.gz 818043 BLAKE2B 7a8718d598bf48b70d555d2a21e2e930eba6b3407ad5414b43d30411acf4c9bf4193ad20058b63d3c8911b7c5b0d021f84d6eca6dd3d00165c7d145186f8177f SHA512 b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55
 EBUILD leatherman-1.12.2.ebuild 1329 BLAKE2B b182be7c996de4512b7b0861ef56e9465fc797890b483b9d168d2cf3fb2059ad7de01b6bdd94fdff8e63b1cab2fb544f71fed9442d8aa9e43ca1876babee05aa SHA512 438ec777192a6fa0bb1ac13e3312cd463b968f6747f3277b7d157a995a666bcd560772d47dbb4a07057f3cc6d8f848df33bf86ac472044c7d502e102b94aca9a
-EBUILD leatherman-1.12.3.ebuild 1334 BLAKE2B 40cf1da626e9e0b83b91c76d432fa7793456406335f8029cafc96010a396d2e880b40dd6515daa7ab5e74955562d517415907fd8764c2daccf7b5f3d8a89053f SHA512 d99e688e02e91b83edffd89b08f722ea43b1b927545f24a994e380450f257a555c35587a0d8834fbcaa8941e9c826283a4877d61d8767c203fe66a5d589253c4
+EBUILD leatherman-1.12.3.ebuild 1332 BLAKE2B ef44d85818f9602a06e77e6a252ee88fae8dad1f5dd36c546efddc48c824d99f7e5bc4caeceb08b5be4496743cb52a76951e20a72e2f93f699079db1b7fb0d88 SHA512 a52e48a284895fe447e2783fa302f4b64eadaa69025699193d69dcb1db8c27dcb48b7b1dbc69f55cd9ec1cf454cbfffeee2d9075d9b1aa2271e6048d24b1fb6a
+EBUILD leatherman-1.12.4.ebuild 1334 BLAKE2B 40cf1da626e9e0b83b91c76d432fa7793456406335f8029cafc96010a396d2e880b40dd6515daa7ab5e74955562d517415907fd8764c2daccf7b5f3d8a89053f SHA512 d99e688e02e91b83edffd89b08f722ea43b1b927545f24a994e380450f257a555c35587a0d8834fbcaa8941e9c826283a4877d61d8767c203fe66a5d589253c4
 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1
diff --git a/dev-libs/leatherman/leatherman-1.12.3.ebuild b/dev-libs/leatherman/leatherman-1.12.3.ebuild
index 75314013d9e0..c7ed781d77ee 100644
--- a/dev-libs/leatherman/leatherman-1.12.3.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.3.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 #RESTRICT="!test? ( test )"
 RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/leatherman/leatherman-1.12.4.ebuild b/dev-libs/leatherman/leatherman-1.12.4.ebuild
new file mode 100644
index 000000000000..75314013d9e0
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multilib
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+IUSE="debug static-libs test"
+#RESTRICT="!test? ( test )"
+RESTRICT="test"  # restricted til we don't need the shared_nowide patch
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/${PV}"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.73:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	# vendored boost lib conflicts with boost 1.73 and above
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest
index 12479e17e83a..84604624f732 100644
--- a/dev-libs/libconfig/Manifest
+++ b/dev-libs/libconfig/Manifest
@@ -4,5 +4,5 @@ DIST libconfig-1.7.1.tar.gz 2290501 BLAKE2B 6c55e0d41c1475434bcc61203bda40c478d0
 DIST libconfig-1.7.2.tar.gz 3017891 BLAKE2B 1b8bc54857feff506d5cd62312a35f0f8a123380567881bdb8241f2232c5281399e4283687a3254b8f43a92b8f7d5ff3f72ec4fd875bf1b9d5d6c7703014cc3c SHA512 9df57355c2d08381b4a0a6366f0db3633fbe8f73c2bb8c370c040b0bae96ce89ee4ac6c17a5a247fed855d890fa383e5b70cb5573fc9cfc62194d5b94e161cee
 EBUILD libconfig-1.5.ebuild 1149 BLAKE2B 861f459cd4e24bd963bab3f40fc4cfe2dde2d6f12dfaa1126499104930116f3f137fc4b7660b3e501c8ca7c33ae1b0fd4c8ce4be0ead5e6ee742d882d89e92c3 SHA512 fb12451fbe810025ed30a7521ae7608ef231db463a786bd8a4068a9816bf650a3378702bb0df86006e630d8267212f03f712b80ae2dc355161ad3b162c491ac2
 EBUILD libconfig-1.7.1.ebuild 1081 BLAKE2B 0159ec03bd1eda0dfb8c0879a0e0c7faf8c271d6c9f5e97f43faa5f61933b62c9de5e8c856f7484a2715ea7fc1d5bebb3d217c8dcaa63261f298fdf00b781e9f SHA512 b0d628091682d9035255b9bd0b41f1f4d41950b8c1e21ce16d052108590cc0e03e765169d5839d1725b9fe410233ae848d5b336c95c32e78a1cc0907c30b6881
-EBUILD libconfig-1.7.2.ebuild 1036 BLAKE2B 5f87e50f98f101cd3c789a56735aa4f57e69f8a5bb260eb7f569384342defdb52911a7f1ef5873b4fe43b47c4e1448c7b1a50b1bb38a30fbeb5b7bfe99051673 SHA512 baa7ba2726850ca7961085ed78b9ebe56641760912002aadb2a3b26e5d5b81b08cbfc7ffc2117d28d77531873c5906ec0d68c1c8ac63895f1e2000ed48d151ee
+EBUILD libconfig-1.7.2.ebuild 1035 BLAKE2B b90d31d4cd56c3e2d7cf5b234da5ca389ef3b5f62f9d55526614474afc9fab47a41ff5c07c912f56d9b996ce55f7941f32ff18f4b76e36a7ff01d5922a060e3a SHA512 c0b0161cc4de4982e461d36e74ca379291df3b1ea4d6f1726a4f4d7eca3e19fdf842140ff56d9094f8a3e759e96c337d8732f205f8875ddf8cbcf36ff5225ba1
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libconfig/libconfig-1.7.2.ebuild b/dev-libs/libconfig/libconfig-1.7.2.ebuild
index 225468fb0c9c..374b0c9892b7 100644
--- a/dev-libs/libconfig/libconfig-1.7.2.ebuild
+++ b/dev-libs/libconfig/libconfig-1.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux"
 IUSE="+cxx static-libs"
 
 DEPEND="
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 2b705c041bf1..0c111d210ef7 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -2,6 +2,6 @@ AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
 DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060
-EBUILD libgcrypt-1.8.6.ebuild 2252 BLAKE2B 282625b77faf7a06d9ed5b33e96d163254af1c0b1edcdaec38ed4a882b1a623cb7ade5a482987430fd59f0b2688f2cebbbf50435a59471b13e0a56005a9cd181 SHA512 a656809c97a012245ece9578eeaec9e1d8b1d2cf12b307762d28c2ac9fa9f8abcb38dcad676e79990feeca10840138cf5134b8fa15920316b43f541fe6c82a33
-EBUILD libgcrypt-1.8.7.ebuild 2261 BLAKE2B 8169ce9eed626366712b4138105364f5fc46d2bf70656ef8b25b90c510d129acf8c6c8474527028f3220a6fed341ec900d1140e0bf6b190e6e6d2647e59893bb SHA512 8da9245f2d5d29cfe4fc4b51f6c94ac25ba32d1e337f708bd800309d37229b2f34df9d20608023cda228180bfd3b5a053bba1ba0fca0660e5f880f1e857f8b5d
+EBUILD libgcrypt-1.8.6.ebuild 2254 BLAKE2B aeba9610c3e1bba20dbc85b0e30db3e09d7b01b53109a6774a257a3fc9ad3bc9be98870ca57f3c5e5b1b441b5c8fd84cc8693d434ef779968dcb21b21bde4213 SHA512 35125a4c00736481b637a4ac7acab58ee34d8fe55d45e2593897c534fb04fdde53b1e985e153cdc7fce76e3bebd76af8c6c2e0726338d396acb7bb4b83704233
+EBUILD libgcrypt-1.8.7.ebuild 2263 BLAKE2B 24f6b374a5d7465d5347d61e2017cb0302d2d6c657f50ee53926b1d8f0d9140e7082c5946e623541ad4ea94675a8ca5648b466c80938e99bce398d4863706ab8 SHA512 5b38998a62bfa2cfabb7327cec246dae72cda70cdfb46b0c6529c0f3e8775932a42467bbe0226bc160fc226c8ccc5428c92b28004a0b14759c38595d7f0928a5
 MISC metadata.xml 425 BLAKE2B c695b3057b3db22d3daf36a70b3d6000b55dc9c7fd4ca3a6274dde8a03c15976152bb7c44e6c4f01c11a98122f646c9660fd6d9e8d5b36041b02d63b27c97d0d SHA512 5d7c60f28eb813fc9f758cc6aaa07fb3a1e3ebe77ce89dba2f8fc56907a6d17affa252e92a2c2edd302ffa83d8d54f64f1b002411c418aae8e9cd3de19458c14
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
index 5b264afc9cdf..d716211b8e20 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
@@ -40,7 +40,7 @@ multilib_src_configure() {
 		append-cflags -Wa,--divide
 	fi
 	local myeconfargs=(
-		CC_FOR_BUILD=$(tc-getBUILD_CC)
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 		--enable-noexecstack
 		--disable-static
 		$(use_enable o-flag-munging O-flag-munging)
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
index d95cba2dee7a..8b917525e367 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
@@ -40,7 +40,7 @@ multilib_src_configure() {
 		append-cflags -Wa,--divide
 	fi
 	local myeconfargs=(
-		CC_FOR_BUILD=$(tc-getBUILD_CC)
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 		--enable-noexecstack
 		--disable-static
 		$(use_enable o-flag-munging O-flag-munging)
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 216e21286067..fc15150f5509 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,4 +1,4 @@
 AUX libgit2-glib-0.99.0.1-vapilink.patch 848 BLAKE2B f37a6220afa807eb45c5e0fa45792c863c2b64d6217f40466f72771e0ff708b9952316c2f354d0d0b303cbf26615155d5ef75e494d9e92d6b1e93ffcfc61dcfb SHA512 86ba5754300ec4852aa09f475e6ad29fb8dcadb7634a919d14c88525b8299e0af6fd2a5640feff6c07ae94f2116584933e58466dd5ebc6bae09c17e58b3e0e34
 DIST libgit2-glib-0.99.0.1.tar.xz 140996 BLAKE2B 0c163467ea43ab236b2c856416940b1ed7c93e6ed8ce9980d2d146f0633830ab3765d8bd34bdaab31efdb4096e88e0513c9585b9e06a3efc800d5c32a0d29479 SHA512 48b34ba84b5315d23d0429a684753c3a64c62086d70a67fdb4dfbf8f2ee883f5a90d7e59cfcfd229682794c455b668eb9bd7bf6159d6bfa45a99ddc2461d7c25
-EBUILD libgit2-glib-0.99.0.1-r1.ebuild 1326 BLAKE2B e08dae84a9c13cd52b37f0ec9db186f0f41f9dc4e9b04720365297576445cb28c0c29fa5394f9c03259a060648f68516eb76ca5a6095ae9e8e13d1595ee938a5 SHA512 8e89fc44aca4e6448490e31e0e71d19f55036333f6d6ede90069df648c909d5d37f06a8dd461433bb7aab6a3e14259a8783df72216cef08ba63a2382b2d32e5a
+EBUILD libgit2-glib-0.99.0.1-r2.ebuild 1296 BLAKE2B 51568ed6c65e52a9e6c589f420eed9879ea2fc1fbe6d0a7ebcb97b2c021b940c2f4791ad0850467ad8abe109fd2c4f4b6bd825b565b44d682e41d33c95c8a649 SHA512 415e66d98f658e10ce007e6d2fe4fcfbda70fc240f35ca09c8f0478397b86d9d2997a57feb77958413900e206d73b93d821587843fa3e635be10f2aeccc9fc6f
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
index 9c356e90db4e..28d257951044 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6..9} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-r1 vala xdg
@@ -19,8 +19,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="
 	>=dev-libs/gobject-introspection-1.54:=
 	>=dev-libs/glib-2.44.0:2
-	<dev-libs/libgit2-1.1:0=[ssh?]
-	>=dev-libs/libgit2-0.26.0:0
+	>=dev-libs/libgit2-0.26.0:0=[ssh?]
 	python? (
 		${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_USEDEP}] )
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 5dffb370ad90..77e7367a452c 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,5 @@
 DIST libgit2-1.0.1.tar.gz 5312878 BLAKE2B 7eb97bb97d66240ce135e21d348f6dea0c5626992b608f8944b75f9bae5de933fffa07edd536c0353841f8d02c950feec1451008003e35f53554f3c59b069a7f SHA512 7c307822b22e3771e5e908b115600310f7901b3250287532c498003b25a5b1e007bfa23592f16ec4d83c1567a9213710526f78cab7c120316e9a8fc74c5e57a9
 DIST libgit2-1.1.0.tar.gz 5426975 BLAKE2B 2a1c1f71d2a2e06448c78eb46028fdcfd59682dccf2365851c4bd059cdd78842320f9a5ba7345e761611a5b4eba634faf2e26cc669097da0ba2e1c832c23059f SHA512 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8
 EBUILD libgit2-1.0.1-r1.ebuild 1723 BLAKE2B 66423a046e92f83e993832162461d1b667e4e76b0044e67b1951b5b589f2b3d42017a8390b8bc18365ada4f01cbbcfae4327f2001eeb3388b71839ffd406d029 SHA512 50a855668687a4eacac6d0bd61095b4523ed595b438d14854e03d6e06c4fe146164b415753bf252e7a8261327d017a65ae85ff5cda56fe9074e2b0b84d4e7b3c
-EBUILD libgit2-1.1.0-r2.ebuild 1729 BLAKE2B ee97f7f5e46fa12f4276999a91887c1bf4509f4158c286521d28c90fce843a52afb766ac4065cc250343069a7d468c08ae420aa73f27c1214e8c31f897918284 SHA512 27d5a32adc67491da4218ea07b4d2542cba6d90f2887e0e91dcf037787514455cee6143f423cd4a3fe588888706bec2f2c71701ad52eecc82873ce67d9d97950
+EBUILD libgit2-1.1.0-r2.ebuild 1725 BLAKE2B ae3b4a3a9741e1b1facd8b367e1db709683ee100994b78cade574bfe78c170c2c78ad777c6c3317c53f7bb21b17c36738ffa8b6e8fee4997395abf6956bde080 SHA512 07c5cd9519c01b5da48259e125101ebde1513d729f28200c8b70ac25625de10725d1d7f2891377ba80fedf9b45cf1d68fa53dc53ee12c35bfbfcfbac9f975d01
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
index 40e1fb17fcef..ef9303196036 100644
--- a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
+++ b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~x86 ~ppc-macos"
 IUSE="examples gssapi libressl +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index 9aad0190b280..b428e0664498 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,6 +1,6 @@
 DIST libpfm-4.10.1.tar.gz 1005988 BLAKE2B 7bdc64540cdf0404bfab0a631e506f37a79ca090d68c798fe4943f627ebc3e15e01f6c4530d4eec2c82a6f759845af518cbf34b3ad19ecc5fa48a874611aaa16 SHA512 33d99824216b4d83784e0db9f1aae3b39f84c2ba42dee64dde0b3c43cc5ee3a18c206d9044e75bf10867768add7cb9967c6318f7aa196f178f334271fa05e1aa
 DIST libpfm-4.8.0.tar.gz 828853 BLAKE2B e6caa0ffa4584dab805ef08ce5318bf73fda906afddb30b1490a34ec62e522a6bb713563c5ffecb22596e6c5c1c06c245c5b9bc59fea74face90a9edcbfb4eac SHA512 a06f3713c70fb4fe694154057604ae42627ad764486a3d3e28b0ef2e46fdd0a0431ec1a3c52ebc711ae174a1fbd7b3ddd0c736a568f57d4606ecf8064ff38228
-EBUILD libpfm-4.10.1-r1.ebuild 938 BLAKE2B dd7e9675b68c2b97dd42eed5c13f97f09ab0157ddacd68851b30e4f7d61495d74a2c412391ea1dd7f2f7b118cf04d3925c70b203399f3d13ca139e956c0807a6 SHA512 c721e48649ba19ddd3f459da6c5315c016ae9da951c1e5b1b9324d4d510058f56833e40ea65ec8013fafb53aeee3c1c7d5252d9a87da68f61e08022f0e699b90
+EBUILD libpfm-4.10.1-r1.ebuild 943 BLAKE2B f7bed42ab115ce1621b1937f81fc5e3cc76a11047bb6f1f8484170f6c7fc94db4e5c382112e8caca83242df5173b3c6426bae8ecefa4d35f070b46b0262c9a4f SHA512 73644399740a6c5b855b4becd7feb02c966549553081d9f3214c943823ec12371ee35dfe518115dcdb1683bd7a0d84091350a8315e8c3aa17bf2d704423102a5
 EBUILD libpfm-4.10.1.ebuild 911 BLAKE2B ac53ebf9f52a16f7e858a3ed19f819a2fac6b701ca0d004161560c8d7fe6fff89ff8e2e554c7daf0ac27b15fad3c141ed56fa56cb392b674f2ee6176110ffa59 SHA512 3144203053c462d094ffc34932328837898dac743bbccaa46d0bf0a1e076294cac0bfd4cb639e68dc0ed5e1cef1ad443060c139bebb25fc3eac7889e6a683f96
 EBUILD libpfm-4.8.0.ebuild 905 BLAKE2B ff05bc659b6caf37ac53b4052017dd9d454e6db023869dec984ac3cacdd97d4543361f2a055724624318bddc9adc18f7e19b2cdb6db7e7963093ec01c66063b5 SHA512 a12aa728c30342c051f850587c7c5a7052c837a61208d0e483fc116d48a0bd392ddb3848763fa4b9e13f680ed442d245e1ea9ab9a30f6977c298ae634e34ad95
 MISC metadata.xml 245 BLAKE2B 1e997172fd9bcc973ca12e8e67047a3b873376bc0110c7005244d7352f728d3d87fd310a200da274dcb6b0c47701b2652bd51440370f519ee51af7e1556a0048 SHA512 98e5a067f6f6b505c2e52e1a33464d536b0bbfcb495a63808869c5e76052d64b6d18c608072b83c4ce284589a07549e363fb2e108d487473d0646bea6afcc2c8
diff --git a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
index c9a1afd2bcd4..1e0e67de31be 100644
--- a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
+++ b/dev-libs/libpfm/libpfm-4.10.1-r1.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 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 69708b02e775..23824b51ae34 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -7,9 +7,9 @@ DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B 2e51eb1af74b63140bc66a358b112a753c1
 DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7 SHA512 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878
 DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec SHA512 eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f
 DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0
-EBUILD libprelude-4.0.0.ebuild 1722 BLAKE2B 2b36c1e22214a06f031d3a98a97d189cb73a366cb8e96e897a1cc89a32908f4dd6fba4229112128571062ce09f4d730c0449a86067ecc2a5312edc388cb81ef1 SHA512 2f5d8c16260d0315e1f351943621b9021836596202f54397e6864e532ddc037a4374351399636c1450711d700e0d8e99524a43e4ba1d28873f981ad8ad8b33f4
-EBUILD libprelude-4.1.0.ebuild 1723 BLAKE2B a77bd79df9b56432009a6d94903891bc2bc1f207a2d3d5c088d58ac61ff1ecde897a184301aef80d9da7b10c202246ac18dea144a1d29ffeb10d2beafeff74a4 SHA512 44ceb27532b2bd81fc2d50c8258969a559be61249fb05080c350413c628e40e7d17e8e02d32c9c159f44ac0eb81c4b59d3236d39b8eaa999345cf632886f6f02
-EBUILD libprelude-5.1.1.ebuild 2006 BLAKE2B 82bffd675533d7ae41c4f660d0bfe4053b5dd820ae83337b582a17a030b807a1578be95bff26502c3e07bf0aa8048b352d79dd1a331921d45d3baee35057f594 SHA512 21deba252e8d04e8dfcf9815d54a77dadd731dc94e5bd246ea4483eb686feb93db02cd48aacf425e3cd589a3a4157e623982a83e445d4f0d9ecf360dd4aa462e
+EBUILD libprelude-4.0.0.ebuild 1723 BLAKE2B 83c34a0ae5a6223ee01fa76551b11c38cc77b48734a1cdd491e0593d94a690916804b36334606040c1f5aedea99074cee8a1273b4a03d5a767ebb55ee5f6e207 SHA512 1807a5c6905f69d40d3b309a43993c0214bc5c8cb22a212933288fb18463c528a2b7f4bf515eb3f7d4283114f23ed0c7ac504dbdde064ed74f93ab7ed39bb0b9
+EBUILD libprelude-4.1.0.ebuild 1724 BLAKE2B b5e68d2e461b569adc28ed64572c895c6f0b87ab8b8fd3aef014d980b6e4335cff56b2cd84e3e68e2e285b086fb00ee67f967745da62cbc9cea3fd3d582435be SHA512 e06bc4ad530a1235d017893f067ceb6cdfc282cdb4aad1398a66c3579d727699566322e7479f58a6eb2b4c338c4d0a13c5df6b69152d7cdb4af8a047ee1c38a6
+EBUILD libprelude-5.1.1.ebuild 2008 BLAKE2B 98c88b500c970efc07c29de27b6dae8011860f915cd3121613c751548078d34961681e9d6252f9646f952d34744770661cf856520291b7d3233e84f3c51e36b5 SHA512 0946b61534ed9da3a16ae6f972f581f02188a9ba64763fc81fae7ad237fea1b5c79371f200b6a83eba50ea3737d227939cfe296f5b6276e522a7deb49cd757e2
 EBUILD libprelude-5.2.0-r10.ebuild 2064 BLAKE2B 296f12c0d9d66f15bd9861cd5cf8479a42c353deeed7e08d797c3b07b47691bf2b59fed720ae68325be69efd89bfa850544e67cf501f08b3b401ac12ecd08951 SHA512 e08374052c20ad7a8bc5fb996c6a5bce4cb581c91c55213dc4ae1d038aac939cfc113fd4ed16385f05979689a85f8af287da647ea457d0a8621632fd51f67d6e
-EBUILD libprelude-5.2.0.ebuild 1949 BLAKE2B f4bbc30333ed72d5373759868880742f4f0bf68fe2b2ecc3a6a47a59963b99e33cf87057ddd56249eb7266abb79d75e69d6beabe0f0da06e86fde4c512754082 SHA512 2e3971c1395f317bf3a32fedfc73bd2e5566d5ae889fff3609a77097d87d6a72fe32b523b42c1bb5bef8e59243396bbeeea381a8220b50f431f990ec669220ea
+EBUILD libprelude-5.2.0.ebuild 1951 BLAKE2B e522b51c691b1d0f85750b4d2affadd7a4d4a5a2d28b7fc54f83dc89330e03a7849592eaac2109668011608ef2a0b1e39a253cfa5b4c25b07b22ef50abac226f SHA512 68bb5a3a20f1f36c812640e6096a862e45501a2f0f12f5337f36610e922273a0511264e5b69ca798c0ea53e42dd1bee6e84885d2ddeeaa3c2248617f0250f691
 MISC metadata.xml 871 BLAKE2B bf71e839f29918c8b71d3bd9e45c6afa99391f476ff8c94eb43d9378e754ddafb9cf4aeef69dce4fc2210819b08f62898d7ec4717a9d7f13d04ee3df24e0a734 SHA512 bf4e35e6d51f1797b24c262a6cfd38ef1ce06e80b504afabb2f3f0aa7f069335e96562f3716b819abaa1bcb1f8f88bcb1a72a11047cd87fd4d62d7903b200cec
diff --git a/dev-libs/libprelude/libprelude-4.0.0.ebuild b/dev-libs/libprelude/libprelude-4.0.0.ebuild
index f8d9794f1d45..9e81d89702cb 100644
--- a/dev-libs/libprelude/libprelude-4.0.0.ebuild
+++ b/dev-libs/libprelude/libprelude-4.0.0.ebuild
@@ -20,7 +20,7 @@ IUSE="lua perl python ruby"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="net-libs/gnutls:=
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )"
diff --git a/dev-libs/libprelude/libprelude-4.1.0.ebuild b/dev-libs/libprelude/libprelude-4.1.0.ebuild
index 4c32375c5be5..89be5ea06931 100644
--- a/dev-libs/libprelude/libprelude-4.1.0.ebuild
+++ b/dev-libs/libprelude/libprelude-4.1.0.ebuild
@@ -20,7 +20,7 @@ IUSE="lua perl python ruby"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="net-libs/gnutls:=
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )"
diff --git a/dev-libs/libprelude/libprelude-5.1.1.ebuild b/dev-libs/libprelude/libprelude-5.1.1.ebuild
index dbcd337b3b76..db91df92cb97 100644
--- a/dev-libs/libprelude/libprelude-5.1.1.ebuild
+++ b/dev-libs/libprelude/libprelude-5.1.1.ebuild
@@ -21,7 +21,7 @@ IUSE="lua perl python ruby"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="net-libs/gnutls:=
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )"
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}"
 BDEPEND=">=dev-lang/swig-3.0.11
 	dev-util/gtk-doc-am
 	sys-devel/flex
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )
diff --git a/dev-libs/libprelude/libprelude-5.2.0.ebuild b/dev-libs/libprelude/libprelude-5.2.0.ebuild
index b067890b2796..a7ab7b8c79c3 100644
--- a/dev-libs/libprelude/libprelude-5.2.0.ebuild
+++ b/dev-libs/libprelude/libprelude-5.2.0.ebuild
@@ -21,7 +21,7 @@ IUSE="lua perl python ruby"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="net-libs/gnutls:=
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )"
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}"
 BDEPEND=">=dev-lang/swig-4.0.0
 	dev-util/gtk-doc-am
 	sys-devel/flex
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index d405eba7bff8..61a8c2873377 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,3 +1,4 @@
-DIST libratbag-0.9.tar.gz 238225 BLAKE2B 74efbed2840103018195a73c11760a2022e42db5e81ba2e9d63a21bc5eb4c1dfed107382b657d2dc208101dfb53eb1926aaccc116ae66e3bf83e1218239dc1a2 SHA512 36215f534f9429c3b182f5502a2bbe16905492a634e327a845d65b638d7dd5ebb5c4eb1700a5196d6b5caac68e500603ced60c3c83f6d0c8e3c776e0161f657b
-EBUILD libratbag-0.9.ebuild 761 BLAKE2B fbcd3ec221b7c2cfbcd2dbf85dd3c2fa845bf1e7e90b8b1edf607c13418cdbb57f672ba73a4bb8f790725e6a05ce6fe8e4b95cfa29302bf56d395bc90afd3488 SHA512 b2ca3694cdfb145f29b6bb24b9eb14c77cc62250155b1bcac1a2393a7ad065956b1b7e4455744b3d0eecc1e29f4597d0ecec041855c637732e0fffe33ccaa2fe
-MISC metadata.xml 256 BLAKE2B 55800f1afe85cae6b43d53da79dea4169d8f2606b4b5152843c741e59b686be4c5c432d6160031d1337a153576d69f9c24b08d70a26b22289b63b560f3ba3afe SHA512 bb303019614fae3631db582d2515dc71f9e9953e97f2b46724667c760b180173544255700c4f5d24a9f0addf78e0ee6407272c1137e200d17ce7b7708c8bcb66
+AUX ratbagd.init 336 BLAKE2B c6f2ef095cd7d929c3097a18e912ae4b3615bd0ebbdfdaa9f4151b312614c016af2f3581c2fbb2853472cb70ce47d5f26f254772fb9f3dabba2ce93626b672b7 SHA512 3908b3481b49bcebc84e3023ff911dcbc1773e4322356def0067ed4aa426184cf43e12de702e98210157d17c2806d57c1cb4bc79ddb0b8660036a6fe3974607e
+DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa
+EBUILD libratbag-0.15.ebuild 1983 BLAKE2B aae71f42742972516cb9686ca639136f3487d2f549507111f7d5eff6655d80914326c2c860be2c1de7a63e53fdb6e9c1159f360c5053d2420477921c7f48fe12 SHA512 cca5ee5d04144b96d3299a08940cdbd889167c4b20b7aac141e7481d0d07013be7ea377903f756bec82df546ebb0f4f8fca2fc0392e6cc7aee51d745de505248
+MISC metadata.xml 634 BLAKE2B cc8a930132b186fe8acad18725ff2c621edd878cacf59a65491c3515061d5954bff2eb9be72ee0b3901aff82acb6aab0f88d814528a62358171a4288da2b38fb SHA512 6dabec3887b8958f6351c5fb7e33ee512bff8905d36d8002b088f02f0bf5474e97d33f017bb866b67cc6b6b82939fef25549625aefd87546dfa626bb596aa5d3
diff --git a/dev-libs/libratbag/files/ratbagd.init b/dev-libs/libratbag/files/ratbagd.init
new file mode 100644
index 000000000000..d3e7d08334ce
--- /dev/null
+++ b/dev-libs/libratbag/files/ratbagd.init
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="system daemon to introspect and modify configurable mice"
+pidfile="/run/${SVCNAME}.pid"
+command="/usr/bin/ratbagd"
+start_stop_daemon_args="--quiet"
+command_background="true"
+
+depend() {
+	need dbus
+}
diff --git a/dev-libs/libratbag/libratbag-0.15.ebuild b/dev-libs/libratbag/libratbag-0.15.ebuild
new file mode 100644
index 000000000000..ace62db4054b
--- /dev/null
+++ b/dev-libs/libratbag/libratbag-0.15.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson python-single-r1 systemd udev
+
+DESCRIPTION="Library to configure gaming mice"
+HOMEPAGE="https://github.com/libratbag/libratbag"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc elogind systemd test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	^^ ( elogind systemd )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/swig
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-libs/check
+		dev-libs/gobject-introspection
+		dev-util/valgrind
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	acct-group/plugdev
+	dev-libs/json-glib
+	dev-libs/libevdev
+	virtual/libudev
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+	')
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/gobject-introspection
+"
+
+src_prepare() {
+	default
+
+	if use elogind ; then
+		# Fix systemd includes for elogind
+		sed -i -e 's@include <systemd@include <elogind@' \
+			ratbagd/ratbag*.c || die
+	fi
+}
+
+src_configure() {
+	python_setup
+
+	local emesonargs=(
+		$(meson_use doc documentation)
+		$(meson_use systemd)
+		$(meson_use test tests)
+		-Ddbus-group="plugdev"
+		-Dlogind-provider=$(usex elogind elogind systemd)
+		-Dsystemd-unit-dir="$(systemd_get_systemunitdir)"
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	newinitd "${FILESDIR}"/ratbagd.init ratbagd
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog 'You need to be in "plugdev" group in order to access the'
+		elog 'ratbagd dbus interface'
+	fi
+}
diff --git a/dev-libs/libratbag/libratbag-0.9.ebuild b/dev-libs/libratbag/libratbag-0.9.ebuild
deleted file mode 100644
index f85cd3509b79..000000000000
--- a/dev-libs/libratbag/libratbag-0.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson udev
-
-DESCRIPTION="Library to configure gaming mice"
-HOMEPAGE="https://github.com/libratbag/libratbag"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	dev-libs/libevdev
-	virtual/libudev
-"
-
-src_prepare() {
-	default
-
-	sed '/default:/d' -i meson_options.txt || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable-documentation=$(usex doc true false)
-		-Denable-tests=$(usex test true false)
-		-Dudev-dir=$(get_udevdir)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libratbag/metadata.xml b/dev-libs/libratbag/metadata.xml
index 7899bfbe42b7..f0fab9cd91af 100644
--- a/dev-libs/libratbag/metadata.xml
+++ b/dev-libs/libratbag/metadata.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>alex@1stleg.com</email>
+    <name>Alex Barker</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+    <description>Proxy maintainer for Alex</description>
+  </maintainer>
   <upstream>
     <remote-id type="github">libratbag/libratbag</remote-id>
   </upstream>
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 42162ead2a77..71e77812e30f 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,7 +1,9 @@
 DIST librdkafka-1.4.4.tar.gz 2734332 BLAKE2B 47c22f00d88d58eb6366e17a8f0ddaee4984bc65f01a627c5d3b8eee019519a2de9a7ae6e2ab2053354a5d72337107b7f515ad65ff205b6838e154b95d9f2331 SHA512 478d17f56efd39b312ea774695bc31d22a83aae3a94913fb0dd07e7f04f3f2a6e3f3610dc7501864dbacbcf4a3207603c6e1d5eebac4e5246ee868cde398021d
 DIST librdkafka-1.5.0.tar.gz 2757553 BLAKE2B a9bbcdaa011944e43f9c70e2062199c5f12d1b92e40ba55707520002ed3a909ff13308336703924388625570d88a94d58b24cd19b5d6e9f79acd31dd92d0d7ed SHA512 ccd8dd3e90c9315833610745c28e0ffa60786324c938c7cbbb2ff847d7493d1b72d97adf5e5210bbc87970047cfd7e58a85141534d227187f2f17c492bef4262
 DIST librdkafka-1.5.2.tar.gz 2771823 BLAKE2B 61a56d36ba49539eb52f89a0d5b48e0245b1cedd09c40e65063d65208b50bb95aa5f00ce3c050d4203b4720b2ce63a9f1d6eee7100fdf85c50e7a15457a52010 SHA512 6a796c58aef9d91fe85f3815ee523a0dcafad59f33c83e5c20c62d4e4337c21c2d223dd0d6a88f37cf86d14a8e55facfa87c651990e08d9522f7cf78b0d17446
+DIST librdkafka-1.5.3.tar.gz 2773929 BLAKE2B f23ed9fe04af5d17ee2066366d32701a07f1360d665fd06126008f42e2512434848829eeb2578b35bd7f8fb26663d72c3d2ee22a5b3f33b7029df28f919b2b77 SHA512 24c93658462f933766a026fede5f09e1056ee9532f27b56da64bdde5626ac6f2460bc92b950337a7c3a99d75201a3c3bc5aaa78e888ffd9665e248d62f2c87d9
 EBUILD librdkafka-1.4.4.ebuild 1652 BLAKE2B d6b1f200c1beb20fafd794334ec4412dd962c818cc4d1ff340324ee804ab4edcf6654aecb95849555221d1795ac273ec90d3b10e9a48b37bda19f050a5f1c2f8 SHA512 5bdec28dbb294c2f5ea1f1b44de3ada493d3a1ef688362f9c0de377bfbae1db7b34e0357baf416f6585e2e50cd6c29b2efdaf39c3d400ec9d93cd5b9d5c38559
 EBUILD librdkafka-1.5.0.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
 EBUILD librdkafka-1.5.2.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
+EBUILD librdkafka-1.5.3.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.5.3.ebuild b/dev-libs/librdkafka/librdkafka-1.5.3.ebuild
new file mode 100644
index 000000000000..86b1ca559964
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.5.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	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 ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	zstd? ( app-arch/zstd:=[static-libs(+)] )
+	sys-libs/zlib:=[static-libs(+)]
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+	${RDEPEND}
+	static-libs? ( ${LIB_DEPEND} )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != "9999" ]]; then
+		sed -i \
+			-e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
+			tests/run-test.sh || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+		$(use_enable zstd)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/dev-libs/libtimezonemap/Manifest b/dev-libs/libtimezonemap/Manifest
index f84b95c2fd63..63eb4cbdfc00 100644
--- a/dev-libs/libtimezonemap/Manifest
+++ b/dev-libs/libtimezonemap/Manifest
@@ -1,3 +1,3 @@
 DIST libtimezonemap_0.4.6.tar.gz 2872895 BLAKE2B ec9da9efe4f58cd7c3cd6cb502ffc23d1331f8b8352021d30c4157d4a6fec983702c049725af672136f332e450191e03bb0c36c752cbd496c37a7e0bf64c4514 SHA512 3cbd4f577684254a91f1e745ecb49e58fe3c75e28c172a6115fbe68e7868c33ff4c68b80ef1d7f5c759f67d288e29a2a057e00e1788a57c4e55e0cbfef351761
-EBUILD libtimezonemap-0.4.6.ebuild 638 BLAKE2B 2e9ffc90fdc52982dea9cea9a7f31bdc5c9cfc12809b5da485245000913acfbef085ccf683e12b44e70e9ae202f53d6d5f798fd0c9dacf3f9d4cc9b7b18c8bb5 SHA512 ac3593e35c1eba84ccb946ad15f2e832281b32114e0127468248d6aa3ce6543abb35e067b5a570f409172acce8eec3524ff6e4a77678d98cd29b4f4186623be1
+EBUILD libtimezonemap-0.4.6.ebuild 645 BLAKE2B 4b832ceedbedd387acc7988ff02d9f039ccf437b17c5bfe4b184232e573932fb0d3c05d52befefcf3061fd41252586ded5dc946bfcfa4b53e0cd89f6fb7e44bc SHA512 3733132c9b5ef62cae0b0538be8f65fb385057994cb433602bea8d9d9787270546bcd3a94229558b435dcf7d90a386115919a087f9ad725ec6cacca72349f25a
 MISC metadata.xml 453 BLAKE2B 0ddfa1215414fea50844dcf5a72a5de4af39eca0b275fb95cccef077ba2c3717f0fa94e77ab8afa30196cd9f8c668b06ca9d09b5ba0974507d6dfb5a740544b3 SHA512 b0cf55d87a8efc69b49ea0f172016de1d6d9ed3fa9b86fc3d9713a42d2a36b4886bb5973a352fe0ab4ddeec8637dfa61f85c536a367de0a38a5e164f025bce1f
diff --git a/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild b/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
index a109233b6fef..6f50ee3b5599 100644
--- a/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
+++ b/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
@@ -12,7 +12,7 @@ RESTRICT="mirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="dev-libs/glib:2
 	dev-libs/gobject-introspection:0=
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index 4353b48aca94..162d61e5eca8 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,5 +1,5 @@
 DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
-EBUILD libucl-0.8.1-r1.ebuild 1242 BLAKE2B 16135c6e37661c78ccfd62218b3d1ac08f782d6c41e391838c859d563675931297eaedeeec83c1c0c1940dd45b6f2ee5e006c8c073238a3c732a4e1a5eea3d6c SHA512 5247ea70efaed51aa54b3724d92f5ab46a7093db85c1b064b7ef4319b94bbd9454422e777b029bfe75114080d2d5c48fc41b6f4cf773e883bdff9da397bc4164
+EBUILD libucl-0.8.1-r1.ebuild 1243 BLAKE2B 3a846ca9e36f8569185d9a92e2832b3569cc19f67aa5f4aeeed721c05e18c8a156759e778a81fe8d810364f1a1e77963d6896133d4a3c2cdf2e8f548d68267cd SHA512 a0b9f074d9539f5274ad98acff55ceb14ed823e6f6ae7fd2aa07e26855044857348e0e78f282b5de0e5c29b858d2db9a257101219e2a57f96f0e81d9d09bf5b6
 EBUILD libucl-0.8.1-r100.ebuild 1448 BLAKE2B 7da82d9389bd40244080445583f291882d1e722bb089c9f97642afa76821c046bad7da5f40199a8234bd700e2278d51c6971ed31e72a0fc56789059490bab625 SHA512 0a38bdc4e3118288411b06e63a5ed221581d3c40dfec5da03c402bcb82132470d28e0deff58621455a7787ece53e4ebb4944df4c7de0ad9bd02739969c1e4cf9
 EBUILD libucl-9999.ebuild 1448 BLAKE2B 7da82d9389bd40244080445583f291882d1e722bb089c9f97642afa76821c046bad7da5f40199a8234bd700e2278d51c6971ed31e72a0fc56789059490bab625 SHA512 0a38bdc4e3118288411b06e63a5ed221581d3c40dfec5da03c402bcb82132470d28e0deff58621455a7787ece53e4ebb4944df4c7de0ad9bd02739969c1e4cf9
 MISC metadata.xml 955 BLAKE2B 9bcc770371005f7b55c644a987e100572fc6c044ca38a862c817c1fd135864f1ffeb38b3a053a66bb1819ef0dd38f3a27432152779349f7b2af9528448ecfada SHA512 7742b29ef3cd909660e795a35859924f449dc18000ebdfc414e7620b9bf900112dde4ea053648b9490f45a56972a357c5a9645afcdc04211cfb4c3354fd1b8df
diff --git a/dev-libs/libucl/libucl-0.8.1-r1.ebuild b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
index c4c4911fe043..8c59554dfc50 100644
--- a/dev-libs/libucl/libucl-0.8.1-r1.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="lua +regex sign urls +utils static-libs"
 
 DEPEND="!!dev-libs/ucl
-	lua? ( >=dev-lang/lua-5.1:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
 	urls? ( net-misc/curl )
 	sign? ( dev-libs/openssl:0 )
 "
diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest
index c5728404a647..3805dd7691a0 100644
--- a/dev-libs/miniz/Manifest
+++ b/dev-libs/miniz/Manifest
@@ -1,3 +1,7 @@
+AUX Config.cmake.in 65 BLAKE2B 520fd3e379b53671d4bb9cb62567ec0f569c711d18019b428914967c57189b5e5f55aa589d0469f1c2891a68f285626e88395c2fef04f677bdf4a26633651526 SHA512 040e97901dea4890625a5bf80db145af432dcb0aa6159ac35e496b027ab3d35132392f45e734ab74002505148c7f879efc72595c6cce99469b8526786af3e7de
+AUX miniz-2.1.0-export-cmake-build-targets.patch 6592 BLAKE2B 96b279e4ae5888e8604a99d40ae0000927f5c654b9ef6d0ea95a57e97dc0a43d87004e5bb9750b92926445b75dfcb6313994eb6b3db1cbbcf2e78d891c5bf3df SHA512 61cccaac9734183416320de302c06987db186930e455ad1b78ba2a87c10f6b2965ea9e70d192bf22a26b487c4592b70da7a99ffaeec9e132f0e5adf0f66ece9d
+AUX miniz.pc.in 315 BLAKE2B d05cd14a7acb4039e5f0521a68e6e5eeed00849a5b5d639fbbd4de45c1e0eab8ed33a22cc608761ab1dd1e1142021b8e5bfbf8e9bab589bfb2545701828f5f7b SHA512 8c1828759a45c58a96bebaac9fa5196d95be85a76be8d4fdd30eb2b4db5dbe582a7e0156fc9a4249c84426bbe69b30d31b2faf162c8d619810012afe6e1ad0ed
 DIST miniz-2.1.0.tar.gz 104502 BLAKE2B 9a7b3818b454809cdfec523d98f13bef3a52e27b6d3857d289438978d12997e38c71aa97fffe060a6b765f8fbbdd8fe8cebced4a45d9f1f040dd3e39cf2a8055 SHA512 e0aba16afdf230d1e54d0a9cedd336b0b158b02744839f0547e14ee47a97fc1a6668f3a181bd46e969b01b158af18dc8ed3c0a4210b3b620242338a2788806b3
-EBUILD miniz-2.1.0.ebuild 636 BLAKE2B 517fbd2edb6ed5c3a7441f04e13a430f3099bd1bc5a494e1b20a96e17bebe37d58960da22412af2f642000f918b0101bbc7322f2f7d2097e0f2740dce03b6aaf SHA512 df07a3b77e72ec2f07178655e3cf4c3424440e14a081332e9437661316607ccc44a327e0acab7f4a3bdddb2518710c4e7c3104527a249ebf87d6ebe476a6d8a3
+EBUILD miniz-2.1.0-r1.ebuild 711 BLAKE2B 639316c2389f57bda50c675671aa829accfe17111a869c63d6defacc73f63562ead4f47f723e6dfec3216f2bd6e7e8a392bfb2d1bda3d20e320ed4f59d2b6f20 SHA512 756f4f758d18cb07dd5e3ebdb62722847360452b2526cddb7e015f3996b4049333342d26cd6d728d4c79b5e4792bc2052276e1fd8cbd0444d4f8eac49750edba
+EBUILD miniz-9999.ebuild 868 BLAKE2B 4c35c1ff7de11247e71860fbe61c973b77d456db29a87cf01b3e34a83df0d61b3a2b3d0f5a938081cf1f6f578a97a1489e292ee50b46d1e0ece1bc049b70b7b6 SHA512 9cfb04128eaa89af0a0d005ca8aa03a410addb3953d6522be5c480bbb93e765c1c2b6dbc145c91d57fc9931d7267bca47eb34e711561f4bc2ca7835cf98647bb
 MISC metadata.xml 1067 BLAKE2B 4360a8656cd006529dd8955d1905daa17e2a51c2ec5dabe6bc692ebdca70ca2a06d588d9e6dc6989c773922172e32ded9a7c1d65e41907468a2df5d1f18b1abc SHA512 8e36cbda8ad79dccaf7cd95eb9675e306c276d2173b0e1944d21b924f518ab0085fc4262eafa23aa3870633f198d8622b1d05866336b5551111b8750f16f220c
diff --git a/dev-libs/miniz/files/Config.cmake.in b/dev-libs/miniz/files/Config.cmake.in
new file mode 100644
index 000000000000..0865ae961005
--- /dev/null
+++ b/dev-libs/miniz/files/Config.cmake.in
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
diff --git a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
new file mode 100644
index 000000000000..6f8429222700
--- /dev/null
+++ b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
@@ -0,0 +1,179 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,15 @@
+-PROJECT(miniz C)
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.12)
++
++project(miniz)
++
++include(GNUInstallDirs)
++
++set(MINIZ_API_VERSION 2)
++set(MINIZ_MINOR_VERSION 1)
++set(MINIZ_PATCH_VERSION 0)
++set(MINIZ_VERSION
++    ${MINIZ_API_VERSION}.${MINIZ_MINOR_VERSION}.${MINIZ_PATCH_VERSION})
++
+ if(CMAKE_BUILD_TYPE STREQUAL "")
+   # CMake defaults to leaving CMAKE_BUILD_TYPE empty. This screws up
+   # differentiation between debug and release builds.
+@@ -8,45 +18,122 @@
+ CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ endif ()
+
+-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
++option(BUILD_EXAMPLES "Build examples" ON)
++option(BUILD_SHARED_LIBS "Build shared library instead of static" ON)
++
++set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+
++include(GenerateExportHeader)
++
++set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
++add_library(${PROJECT_NAME} ${miniz_SOURCE})
++generate_export_header(${PROJECT_NAME})
++
++if(NOT BUILD_SHARED_LIBS)
++string(TOUPPER ${PROJECT_NAME} PROJECT_UPPER)
++set_target_properties(${PROJECT_NAME}
++	PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${PROJECT_UPPER}_STATIC_DEFINE)
++else()
++set_property(TARGET ${PROJECT_NAME} PROPERTY C_VISIBILITY_PRESET hidden)
++endif()
++
++set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${MINIZ_VERSION})
++set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${MINIZ_API_VERSION})
++
++file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
++
++target_compile_definitions(${PROJECT_NAME}
++  PRIVATE $<$<C_COMPILER_ID:GNU>:_GNU_SOURCE>)
+
+-add_library(miniz ${miniz_SOURCE})
+-target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
++# pkg-config file
++configure_file(miniz.pc.in ${CMAKE_BINARY_DIR}/miniz.pc @ONLY)
+
+-set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
+-set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
+-set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
+-set(EXAMPLE4_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example4.c")
+-set(EXAMPLE5_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example5.c")
+-set(EXAMPLE6_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example6.c")
+-set(MINIZ_TESTER_SRC_LIST
+-    "${CMAKE_CURRENT_SOURCE_DIR}/tests/miniz_tester.cpp"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/tests/timer.cpp")
++install(FILES
++  ${CMAKE_BINARY_DIR}/miniz.pc
++  DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
++
++
++set_property(TARGET ${PROJECT_NAME} PROPERTY
++  INTERFACE_${PROJECT_NAME}_MAJOR_VERSION ${MINIZ_API_VERSION})
++set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY
++  COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION
++)
++
++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
++  RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}
++  ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  # users can use <miniz.h> or <miniz/miniz.h>
++  INCLUDES DESTINATION include ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
++)
++
++include(CMakePackageConfigHelpers)
++write_basic_package_version_file(
++  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
++  VERSION ${MINIZ_VERSION}
++  COMPATIBILITY AnyNewerVersion
++)
++
++export(EXPORT ${PROJECT_NAME}Targets
++  FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Targets.cmake"
++  NAMESPACE ${PROJECT_NAME}::
++)
++configure_file(Config.cmake.in
++  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
++  @ONLY
++)
++
++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
++install(EXPORT ${PROJECT_NAME}Targets
++  FILE
++    ${PROJECT_NAME}Targets.cmake
++  NAMESPACE
++    ${PROJECT_NAME}::
++  DESTINATION
++    ${ConfigPackageLocation}
++)
++install(
++  FILES
++    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
++    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
++  DESTINATION
++    ${ConfigPackageLocation}
++  COMPONENT
++    Devel
++)
++
++if(BUILD_EXAMPLES)
++  set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
++  set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
++  set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
++  set(EXAMPLE4_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example4.c")
++  set(EXAMPLE5_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example5.c")
++  set(EXAMPLE6_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example6.c")
++  set(MINIZ_TESTER_SRC_LIST
++      "${CMAKE_CURRENT_SOURCE_DIR}/tests/miniz_tester.cpp"
++      "${CMAKE_CURRENT_SOURCE_DIR}/tests/timer.cpp")
+
+-add_executable(example1 ${EXAMPLE1_SRC_LIST})
+-target_link_libraries(example1 miniz)
+-add_executable(example2 ${EXAMPLE2_SRC_LIST})
+-target_link_libraries(example2 miniz)
+-add_executable(example3 ${EXAMPLE3_SRC_LIST})
+-target_link_libraries(example3 miniz)
+-add_executable(example4 ${EXAMPLE4_SRC_LIST})
+-target_link_libraries(example4 miniz)
+-add_executable(example5 ${EXAMPLE5_SRC_LIST})
+-target_link_libraries(example5 miniz)
+-add_executable(example6 ${EXAMPLE6_SRC_LIST})
+-target_link_libraries(example6 miniz)
+-if(${UNIX})
+-    target_link_libraries(example6 m)
+-endif()
++  add_executable(example1 ${EXAMPLE1_SRC_LIST})
++  target_link_libraries(example1 miniz)
++  add_executable(example2 ${EXAMPLE2_SRC_LIST})
++  target_link_libraries(example2 miniz)
++  add_executable(example3 ${EXAMPLE3_SRC_LIST})
++  target_link_libraries(example3 miniz)
++  add_executable(example4 ${EXAMPLE4_SRC_LIST})
++  target_link_libraries(example4 miniz)
++  add_executable(example5 ${EXAMPLE5_SRC_LIST})
++  target_link_libraries(example5 miniz)
++  add_executable(example6 ${EXAMPLE6_SRC_LIST})
++  target_link_libraries(example6 miniz)
++  if(${UNIX})
++      target_link_libraries(example6 m)
++  endif()
+
+-# add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
+-# target_link_libraries(miniz_tester miniz)
++  # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
++  # target_link_libraries(miniz_tester miniz)
++endif(BUILD_EXAMPLES)
+
+-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
+-    ARCHIVE  DESTINATION lib
+-    LIBRARY DESTINATION lib
+-    )
+-file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+-install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
+\ No newline at end of file
++set(INCLUDE_INSTALL_DIR "include")
++
++install(FILES ${INSTALL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
diff --git a/dev-libs/miniz/files/miniz.pc.in b/dev-libs/miniz/files/miniz.pc.in
new file mode 100644
index 000000000000..51128735847c
--- /dev/null
+++ b/dev-libs/miniz/files/miniz.pc.in
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+Name: @PROJECT_NAME@
+Description: @PROJECT_DESCRIPTION@
+Version: @MINIZ_VERSION@
+URL: @PROJECT_HOMEPAGE_URL@
+
+Requires:
+Libs: -L${libdir} -lminiz
+Cflags: -I${includedir}
+\ No newline at end of file
diff --git a/dev-libs/miniz/miniz-2.1.0.ebuild b/dev-libs/miniz/miniz-2.1.0-r1.ebuild
index 1141b3f020ce..cc26fba366c0 100644
--- a/dev-libs/miniz/miniz-2.1.0.ebuild
+++ b/dev-libs/miniz/miniz-2.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake
 
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+DESCRIPTION="A lossless, high performance data compression library"
 HOMEPAGE="https://github.com/richgel999/miniz"
 SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -16,8 +16,13 @@ IUSE=""
 
 DOCS=( ChangeLog.md LICENSE readme.md )
 
+PATCHES=(
+	"${FILESDIR}/${P}-export-cmake-build-targets.patch"
+)
+
 src_prepare() {
-	sed -i -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt
+	cp "${FILESDIR}/Config.cmake.in" .
+	cp "${FILESDIR}/miniz.pc.in" .
 
 	cmake_src_prepare
 }
@@ -25,5 +30,9 @@ src_prepare() {
 src_configure() {
 	CMAKE_BUILD_TYPE=Release
 
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF
+	)
+
 	cmake_src_configure
 }
diff --git a/dev-libs/miniz/miniz-9999.ebuild b/dev-libs/miniz/miniz-9999.ebuild
new file mode 100644
index 000000000000..7bdf95f3cf88
--- /dev/null
+++ b/dev-libs/miniz/miniz-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A lossless, high performance data compression library"
+HOMEPAGE="https://github.com/richgel999/miniz"
+SRC_URI=""
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/richgel999/miniz.git"
+else
+	SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples static-libs"
+
+DOCS=( ChangeLog.md LICENSE readme.md )
+
+src_prepare() {
+	sed -i -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE=Release
+
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index c6fbfc651aa5..7da9fb13dc7b 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -7,8 +7,10 @@ AUX nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch 4053 BLAKE2B d4a
 DIST nss-3.56.tar.gz 81706176 BLAKE2B 84c3b9fd649ce38ad843725b180982692dcac34e851734813b959734054f2e9ebfad66496de320f46e861381f6d5f52db0cc4c0953f7504b79f6b529b871f173 SHA512 f2eed8252c13b38a4d80a11203136d22a521205f814b6d954cc119ccf8921fcb8f689d919944bea4739d1575e9bda7e13cf2ad054ac91d51e049abe246efc845
 DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
 DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
+DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD nss-3.56.ebuild 9192 BLAKE2B 159708f6fc8c0b2e55404b95bbe688798f3f691ecb6e62a87e9ae32b08c9e9ae6693bb959a7af3232694ee0c97e5b8bef1981156152c17d8ea4a7c121885bfc3 SHA512 56597eeacea300e066177e9fd83d646a0bc5f84e580ac4dfd952ffcfb67ab77f738126b21cae44966d12ec6bb6e9b50f44a8ac9cf2304bb2f95b41fbe144b78f
 EBUILD nss-3.58-r2.ebuild 9258 BLAKE2B dc108ae1b31d12f42c34b1938e99438d4f7c7c62cc681c880f458ee8c90ae7b5e0374fa80528c95b1372489c7537059af68570901a72094d240ddb3860297eca SHA512 34c05b3c3cf11ab13b32c68e859aa23f573f4875be76279c6b814e2f750c7bc5329cc6b180e83b4322debfac5f48e0296af3611a23b83682f4d5e472309c0ac8
 EBUILD nss-3.59-r1.ebuild 9272 BLAKE2B b7d26f3774c79e31054f4281eb33686801369f3ee134e27d7d09aad84dd9ce841f8629470ac2790728fb52aff903cb515bfa4c9426ba1eaf161209f5ab8ef97b SHA512 c780d53c01fbc80ea6e6429ebec1ea56e088887411b898a7b8dd2f79df4ba8d35ba38efb70dff32cacaec5da6e0deddce0b2c2d29c3baea55db7b8c7287d1e6b
+EBUILD nss-3.60.ebuild 9143 BLAKE2B 0e649ddeae47ea27728915631800040c4d75652a53e5c1a59c74c5aedd131f046d64f3dcc074457de85b3fc354fbc963b7ea4af8721ac18da602a9fa89405ba5 SHA512 15ce8381c217766f36938fa0fc2305aba7cb0b0f7b5a09a7fd93831b27cf8f2ff3a44f9e6997346ce67bafc5db4e2d918b16f9b842384682db3d19fa3ca7612b
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/nss-3.60.ebuild b/dev-libs/nss/nss-3.60.ebuild
new file mode 100644
index 000000000000..383f86723a30
--- /dev/null
+++ b/dev-libs/nss/nss-3.60.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.29"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert utils"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+	if use cacert ; then #521462
+		PATCHES+=(
+			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
+		)
+	fi
+
+	default
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		aarch64*)echo "aarch64";;
+		hppa*)   echo "parisc";;
+		i?86*)   echo "i686";;
+		x86_64*) echo "x86_64";;
+		*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 66ff3842754a..473b5ce896fd 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,8 +1,9 @@
-AUX gentoo.config-1.0.2 5207 BLAKE2B 08f8808a47ff9dd19388b9861d4def23fbe4bc63c4d544333a334bb559c363fbe2f17343e3265d17dea3ff46c9f637d266bb3d49b9e97bc9e627c450e154fc2f SHA512 3c36ef9e66aa0ff44593bee657d27fcbd1889c3ae8ac770ec0a2230fab4e362e51b8710f5a56f02de8dcf7531e7ce97dbccbb90a975d75715c441060e3555bd0
+AUX gentoo.config-1.0.2 5253 BLAKE2B 2a167c760399401cd595e6b85ee8c29f8e4d3e4a44e7b6b7e42320ec9f88b1a61bcd4387815bd6f73dea71c9b39603c1809e4f1537d5de553ec77996429c0516 SHA512 59479e5af84e1f991ba8abeac42276a08a5c9f61fa0c79af96cd7c94fddb72de82ba56f31babf9b3bef5de26431ebb2b98bc1c58715b20baea350e16360108a3
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
 AUX openssl-1.1.0k-fix-test_fuzz.patch 485 BLAKE2B 4dc2ef2b2c1935c8143c939ed6b7168fb070edced8ae47732f1ae9fdabe19887f846d75c15cea33680a54058c9a99f981a3c6a35fc84c3a6c360b4d2b920bc04 SHA512 68590479f096f3da920a5d293f27babd541ce1946944d5540f78d8341b59eeda92fe24743f7351b565e06421d7a2da77e331ebe1e5168023f6602aaa7376a038
 AUX openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch 1235 BLAKE2B 26997a474013c379a7d019d69203a5199ee17df07b28c86d06cebad3093ee62af9e4e568f3bc44ff4a5e8b555a5634d666446b35ce850c9c8668d920ef32bba6 SHA512 8ddfc077d3035b766175810b2554310935c8d1875044bf95abf8590ab5eeeb68357545566e7e8a50f95d9e62be68c72fdb58fef28497b154d44f08169645a08a
+AUX openssl-1.1.1i-riscv32.patch 2557 BLAKE2B 97e51303706ee96d3fae46959b91d1021dcbb3efa421866f6e09bbee6287aae95c6f5d9498bd9d8974b0de747ef696242691cfebec90b31dc9e2cc31b41b81ec SHA512 f75ae1034bb9dda7f4959e8a5d6d0dae21200723d82aebfbea58bd1d7775ef4042e49fdf49d5738771d79d764e44a1b6e0da341d210ea51d21516bb3874b626a
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
@@ -17,5 +18,5 @@ EBUILD openssl-1.0.2u.ebuild 9865 BLAKE2B f0b332d3fc6d45583b2cee5dbfc1c64f970878
 EBUILD openssl-1.1.0l.ebuild 9592 BLAKE2B 8778c7cff0b81a5bfc1b8161b45c7a5a4f89cc7bb07e9c8e213a034a651d80ac3acd0939fd9eb986f1965119e399868c3106a4ce3c58b637e2289582543d6105 SHA512 691be7e7221f7bfc7e95e1d118f8d32b40e45afe5b213c342a40f610088cb3e5a7acc1351f27330653775a5f773cbc16e5531302c343af768b2d385967983970
 EBUILD openssl-1.1.1g.ebuild 10192 BLAKE2B e52c4546f93268a03098ec24f91d29bfeae5c0705319379194973f91e50ca3b7977ab8c6942b9e7364b910d0709c16477740b046a236dd7d2859f3b038cb16ab SHA512 bc36994596f5e67bcd7e3fac1bb43ec628880497299cc4b5e0e596f08de24eca47abefb6958c73e297168830f67b3ede49ea8795a5de02305af2f5fa9ada4672
 EBUILD openssl-1.1.1h.ebuild 10201 BLAKE2B 8f7f18543c3ac4165a9bc93b7872228bd7bd48774d48c848557300cd52140b467488645ebd7d307e34b6e837342de8b406eb9c5a08ec6ca7912899192d5db12c SHA512 ce7a57a1eee4a045afdbc288a3087261901c3b9da9a404b1d3bd6d975e4b377106f05f471377a93e8f8c9c141f70f985981245a489d569e744977894c5bbe254
-EBUILD openssl-1.1.1i.ebuild 10220 BLAKE2B 28fb43c93cbcea3280c0b39efe01d7db00e7102fcbdb350226607787f9189a5bd5ac7600fd5393b267e4548e931e09d49651695a1a493866bcf02baec6e2f6f9 SHA512 e108329b7a88abc9cd09e414e2cc7a4bd96e8404bc162f3ae92f5a87b40e0ad1dc8ed5af4406badbeee59bd9177e01bb34e6c6d20c53b58e19fc49a7421d71aa
+EBUILD openssl-1.1.1i.ebuild 10262 BLAKE2B bf22af5fa5b25103bdefe046949fe26e6ca78dbf5f9965e2cafc4e08f927bbf8baa478296dfce2f182c13f1576e87ae3f257c18da16a1cc3cfb6c2f2862098ff SHA512 047c34d02e00529450d982dc891a9bc0319f8e7d1f3cdad70d8954f0c463b3c7621005382c091f282982337ea0f2d397038bfcdf2bfad99c16b51de466988ff5
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.2 b/dev-libs/openssl/files/gentoo.config-1.0.2
index 4e88dbabf135..68d7d0ac1fc1 100644
--- a/dev-libs/openssl/files/gentoo.config-1.0.2
+++ b/dev-libs/openssl/files/gentoo.config-1.0.2
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # Openssl doesn't play along nicely with cross-compiling
@@ -104,6 +104,7 @@ linux)
 		powerpc64*)   machine=ppc64;;
 		powerpc*le*)  machine="generic32 -DL_ENDIAN";;
 		powerpc*)     machine=ppc;;
+		riscv32*)     machine="generic32 -DL_ENDIAN";;
 		riscv64*)     machine="generic64 -DL_ENDIAN";;
 	#	sh64*)        machine=elf;;
 		sh*b*)        machine="generic32 -DB_ENDIAN";;
diff --git a/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch b/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch
new file mode 100644
index 000000000000..c94b0323eb43
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch
@@ -0,0 +1,61 @@
+From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Thu, 29 Aug 2019 13:56:21 -0700
+Subject: [PATCH] Add support for io_pgetevents_time64 syscall
+
+32-bit architectures that are y2038 safe don't include syscalls that use
+32-bit time_t. Instead these architectures have suffixed syscalls that
+always use a 64-bit time_t. In the case of the io_getevents syscall the
+syscall has been replaced with the io_pgetevents_time64 syscall instead.
+
+This patch changes the io_getevents() function to use the correct
+syscall based on the avaliable syscalls and the time_t size. We will
+only use the new 64-bit time_t syscall if the architecture is using a
+64-bit time_t. This is to avoid having to deal with 32/64-bit
+conversions and relying on a 64-bit timespec struct on 32-bit time_t
+platforms. As of Linux 5.3 there are no 32-bit time_t architectures
+without __NR_io_getevents. In the future if a 32-bit time_t architecture
+wants to use the 64-bit syscalls we can handle the conversion.
+
+This fixes build failures on 32-bit RISC-V.
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+(Merged from https://github.com/openssl/openssl/pull/9819)
+---
+ engines/e_afalg.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/engines/e_afalg.c b/engines/e_afalg.c
+index dacbe358cb..99516cb1bb 100644
+--- a/engines/e_afalg.c
++++ b/engines/e_afalg.c
+@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max,
+                                struct io_event *events,
+                                struct timespec *timeout)
+ {
++#if defined(__NR_io_getevents)
+     return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
++#elif defined(__NR_io_pgetevents_time64)
++    /* Let's only support the 64 suffix syscalls for 64-bit time_t.
++     * This simplifies the code for us as we don't need to use a 64-bit
++     * version of timespec with a 32-bit time_t and handle converting
++     * between 64-bit and 32-bit times and check for overflows.
++     */
++    if (sizeof(timeout->tv_sec) == 8)
++        return syscall(__NR_io_pgetevents_time64, ctx, min, max, events, timeout, NULL);
++    else {
++        errno = ENOSYS;
++        return -1;
++    }
++#else
++# error "We require either the io_getevents syscall or __NR_io_pgetevents_time64."
++#endif
+ }
+ 
+ static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key,
+-- 
+2.26.2
+
diff --git a/dev-libs/openssl/openssl-1.1.1i.ebuild b/dev-libs/openssl/openssl-1.1.1i.ebuild
index 7d5fc56e026b..6c86f655c996 100644
--- a/dev-libs/openssl/openssl-1.1.1i.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1i.ebuild
@@ -47,6 +47,7 @@ PDEPEND="app-misc/ca-certificates"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 1c2c32719d95..f85bfa57ae4d 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,6 +1,6 @@
 DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469
-DIST pugixml-1.11.1.tar.gz 386133 BLAKE2B d3a83a8be1b3e6605d7c9a6dcd48e4d467b44c2070238a01d1f0a511d2936a7a01efb26b080a4beceec7f02869e10392c3023c62d3e84eb94949ebefaceb73f9 SHA512 ab8da8744c4594a947d731a876717287892b64195d44d6e1c518bee5fb712a45b23ac763b12af0ad20c6f2cb74f6b1bae1a68fa90f786851aa6d3f139a32eda6
+DIST pugixml-1.11.2.tar.gz 386166 BLAKE2B 21dee2f04e8f9d962cd6f0ebf54d608fb0434ed815a13807f5939dea47e98128009b6b918a761b80566b959f1c0651c4b771028515fd9e8b8b51a0e4e592d3dd SHA512 403ef9f642fba6aff2d642399516886c0cda44ca19c58eeb05594aa7220562afbee939a5edab0c85263596834c5bdaea82a346dd8ee00a712e97b564f0d1e52d
 EBUILD pugixml-1.10.ebuild 571 BLAKE2B 882d1cf798f1b6f033d26204059fef59169588d7f939620f8a61dbbfe582d9c6888bc9918b657841cef5eba110dee6a977dab63a5a2c731ceb2d9a329635d447 SHA512 eefcb601ccfe5aa7c529ab220a1e21faaf3fdf4dfbac06f847e268ec6b784d7f6d3962d57d53b92c0645d735529d7f8ed56009ddbcecedc0f640b5f5f20420ef
-EBUILD pugixml-1.11.1.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
+EBUILD pugixml-1.11.2.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
 EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.11.1.ebuild b/dev-libs/pugixml/pugixml-1.11.2.ebuild
index 0750359ebd79..0750359ebd79 100644
--- a/dev-libs/pugixml/pugixml-1.11.1.ebuild
+++ b/dev-libs/pugixml/pugixml-1.11.2.ebuild
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index 39836e3ac670..e489cf3f6827 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -2,5 +2,5 @@ AUX redland-bindings-1.0.17.1-add-PHP7-support.patch 2359 BLAKE2B 04cc1122a8a226
 AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc88a275c2df804dbb9e09a411bada838afd7f30c592dc48f02995752822a5d738af35c208f124c9d9d008cbff3395bbcfd7b404 SHA512 158e06e58ad66ca88ac8eb4646df0628f423de8d22638e78a737be3ea12fd123fd3bcf63b75478ff7f82ec3b444773a2e8d467fd737b8de0ae9143ef79e60a65
 AUX redland-bindings-1.0.17.1-php-config-r1.patch 2249 BLAKE2B 83d9a65d6db9411531b827d25aaaec721b6756c4a5503179a477fa3d452fff4deaa1fdcaa78c66f5cef0b4cb0d36e06a89050e520a2e0fd36694121eb8a71669 SHA512 406e0d0d97c7c181a16c2a72ec291582ada1c1dbec1cdb53ca62ec73f954a1116462b97f3cf85ada4adfc4ebff35081ac4ce0ce9e2b7155e61402dbb64f57c20
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
-EBUILD redland-bindings-1.0.17.1-r1.ebuild 2952 BLAKE2B 872f56f376ee4918f8d597a12ec0c86b8e8e3e1e72c05a58561a767011a28cccec02bc7914258b13cb8c4d6140de3e776f7476cb42671fbd55985063f3e080df SHA512 4a42ffc9335285405618fcaa1132bb11788ea19dd3efa5f0bad79df89505b486c3a833a336d23574e88625a44a044c257d8cf909a7c46cca05f741621ca1118d
+EBUILD redland-bindings-1.0.17.1-r1.ebuild 2953 BLAKE2B ee6830dfa326cbba54cdf2e3d9e60a7d39b0f7151cc42a376d1c226ec97388f183b1244b7f5f353228ceab8f4a62d867fd44a5a7070f5466579e7e21e42a4b3d SHA512 9a03375698491ec2b90527c6043a2c6c13388b6b1eff59322b14c70db27b444c96005e19e2d070cce527cdda8e58d2dff127e16a631fc3b0b17024c557dcdf63
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
index bd6a298e59e7..538a1bbab649 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
@@ -29,7 +29,7 @@ BDEPEND="sys-apps/sed
 	virtual/pkgconfig"
 
 RDEPEND=">=dev-libs/redland-1.0.14
-	lua? ( >=dev-lang/lua-5.1:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( dev-lang/ruby:* dev-ruby/log4r )
diff --git a/dev-libs/s2n/Manifest b/dev-libs/s2n/Manifest
index 87e7f928838d..f68752235458 100644
--- a/dev-libs/s2n/Manifest
+++ b/dev-libs/s2n/Manifest
@@ -1,3 +1,4 @@
+AUX s2n-0.10.21-remove_Werror.patch 1292 BLAKE2B 208aab54784a956003c0f23564d07124476149f9a36fce40c6404ea79956479ba2a589bcb75808adae67c4f50ba78ac5fb72d21429248a515c9c84bf5faf5930 SHA512 4f8cbdfeeb7dfa514750083e1be4481f5ffe1e30ff88915b5c7eff2494ae534c454da51a0c56d720be66b5ce50900135a4e17f66a517ec437a027b01c9fc0fd0
 DIST s2n-0.10.21.tar.gz 6150129 BLAKE2B cf598ef02b4aa9a2a69f11a47b2a691055575b7398ba0a833081da704ebc7564d30abda5f2ad9ff9858ec2f553b1f332e913494b9e195e2a754f008bab5c11d2 SHA512 26957edf36af088af2cb355dad9281fefd9d54ce8c3c2c26f5682aee8d64338a3677aa81f3a07563b27a938cad2c57e0a86a478c9619cc93552674451d501909
-EBUILD s2n-0.10.21.ebuild 1038 BLAKE2B 586303dcaba45314151880fa4cadde26cfb7eb370230cd3bc75416d150d7233e02db1dc4beb693e3301c24f3bc7b0daff95815d2c364806fb80c1d7781512906 SHA512 cb5f76fa83b1056345af516b38a47ab0e15a3d71fed9ff3b0d0da1948a7678fa747a2e2af2c6a6bdef3e1f665b094435110412ff7bdba7f5044243a599a178ac
+EBUILD s2n-0.10.21-r1.ebuild 1479 BLAKE2B 0c2e33c6e9fc25cf67e3443dd9cc6a6cfd124326cfde164c945ac692fc2a4df1f2c336ea9df285c32c2a90848de0357fbd98ec9424fc48496576c142f943c391 SHA512 f8cdf7306ebfb68d73651b6617c49e011382540c1752b5ffc3449a9fc37b57ec8015a310ec155f8c23dab3430942b4696074a4419459c4f912d946c51684c5f1
 MISC metadata.xml 1538 BLAKE2B 93c2ed3dc762e8c7ab2eb1d422c3b86407c43e7bab88d9e3e9ff83eb236e7900336e5f6c73fcf05002e6a1e8c3e143c9ed7c0651f9744d72aec6ff6945af1841 SHA512 41d6a055ff20fac07585324d3f98a7fe1836502c27259337a33eec0435d72364cf49dc5cbb006e375e0481b3ae22d6ce014fe917eaaa3779df32494f54de733d
diff --git a/dev-libs/s2n/files/s2n-0.10.21-remove_Werror.patch b/dev-libs/s2n/files/s2n-0.10.21-remove_Werror.patch
new file mode 100644
index 000000000000..d0eadc7a8bd3
--- /dev/null
+++ b/dev-libs/s2n/files/s2n-0.10.21-remove_Werror.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt	2020-12-14 17:24:27.577239622 +0100
++++ b/CMakeLists.txt	2020-12-14 17:24:50.036240917 +0100
+@@ -193,7 +193,7 @@
+ 
+ set(CMAKE_C_FLAGS_DEBUGOPT "")
+ 
+-target_compile_options(${PROJECT_NAME} PRIVATE -pedantic -std=gnu99 -Wall -Werror -Wimplicit -Wunused -Wcomment -Wchar-subscripts
++target_compile_options(${PROJECT_NAME} PRIVATE -pedantic -std=gnu99 -Wall -Wimplicit -Wunused -Wcomment -Wchar-subscripts
+         -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -Wno-deprecated-declarations -Wno-unknown-pragmas -Wformat-security
+         -Wno-missing-braces -fvisibility=hidden -DS2N_EXPORTS)
+ 
+--- a/s2n.mk	2020-12-14 17:24:35.546240082 +0100
++++ b/s2n.mk	2020-12-14 17:25:05.604241814 +0100
+@@ -42,7 +42,7 @@
+ 	DEFAULT_CFLAGS = -std=c99 -Wcast-qual
+ endif
+ 
+-DEFAULT_CFLAGS += -pedantic -Wall -Werror -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \
++DEFAULT_CFLAGS += -pedantic -Wall -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \
+                  -Wshadow  -Wcast-align -Wwrite-strings -fPIC -Wno-missing-braces\
+                  -D_POSIX_C_SOURCE=200809L -O2 -I$(LIBCRYPTO_ROOT)/include/ \
+                  -I$(S2N_ROOT)/api/ -I$(S2N_ROOT) -Wno-deprecated-declarations -Wno-unknown-pragmas -Wformat-security \
diff --git a/dev-libs/s2n/s2n-0.10.21.ebuild b/dev-libs/s2n/s2n-0.10.21-r1.ebuild
index 225dc5144615..270991d36e4d 100644
--- a/dev-libs/s2n/s2n-0.10.21.ebuild
+++ b/dev-libs/s2n/s2n-0.10.21-r1.ebuild
@@ -22,8 +22,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-remove_Werror.patch
+)
+
 src_prepare() {
-	default
+	cmake_src_prepare
 
 	# Fix
 	# QA Notice: The following files contain writable and executable sections (...)
@@ -31,7 +35,14 @@ src_prepare() {
 		-e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
 		-i "${S}"/pq-crypto/sike_r2/fp_x64_asm.S || die "sed failed"
 
-	cmake_src_prepare
+	# Fix shared library building, needed for USE="test"
+	# See: https://github.com/awslabs/s2n/issues/2401
+	if use test; then
+		sed -i -e 's, -fvisibility=hidden,,' "${S}"/CMakeLists.txt || die "sed failed"
+		# Remove s2n_self_talk_nonblocking_test, it is broken.
+		# See: https://github.com/awslabs/s2n/issues/2051#issuecomment-744543724
+		rm "${S}"/tests/unit/s2n_self_talk_nonblocking_test.c
+	fi
 }
 
 src_configure() {
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 0aa530b04636..626a8736d4e7 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -2,8 +2,8 @@ AUX simdjson-0.7.0-dont-bundle-cssopts.patch 1318 BLAKE2B 29fef993c326fd918c279e
 DIST simdjson-0.4.7.tar.gz 4119328 BLAKE2B f19a603b83282081457f548bd9b609f4fc4b9b0e32c868c8d4ecc15fbc359e6463576c24f38b6623cd72cc4681a1db42ec45ee605df6096876982caa9f96be91 SHA512 023e8b75652cb29c41eb1e01ebc6c484b28ff5f6736c885fb5d8c639b1047660fd0eb24d131dabc035fc7fc824e15fe49b177bc3613e329f1d8cd956173a490f
 DIST simdjson-0.6.0-ppc64.patch.xz 23704 BLAKE2B ab26e93960d3e3cc2c7782516ef2e6e36fb259c1bd83b967f32b0ba899ca9f80468a47cc3344dd9dc392898626a88b4a1de42899502a989511945e573bf7f259 SHA512 c8e1233c7e6f92cf0c92206ae1023cd30067004e4e53fed86d11e105490f281bf1b8a0806880d02427485fbade24aeb7a7b027b17c9f05552089cf867f3029eb
 DIST simdjson-0.6.1.tar.gz 7889048 BLAKE2B 35b40e5e278e5093f5f07ad9e27ae23417f206bf2f4f624a6130931882db49632fc5141d027deca4977a3efa1fdfc7d8fc0bc2149d938a985a850eff4250f5bf SHA512 df5f6c717b3c4cfcde7757dff74d51c93f4682729fdbcdaae89d82db13bba006fe0378bc601d5bdf1d4cf2f0fafce56eb88aba8ca9648787a64cf160cab479e4
-DIST simdjson-0.7.0.tar.gz 7972237 BLAKE2B b769eec1b8401c5a3cf0f69e99848afb8c64c1361634ac3f08313030318e781ad8be0463649ab3eb0b2d41a731d8fd3118a23ac33e14948281b5a3f5522c413f SHA512 ad0bd723b28654e43b9717bcc831aeb38ad86289fd3e9e9cd7a20bfe367428334505c35f3cb5b261feda500ddb0cad4780a9fb2504a62cb97db9d5c4fa666d2a
+DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
 EBUILD simdjson-0.4.7.ebuild 622 BLAKE2B 591dc46e83afe30ff0aca4594a199302a237b078be207e3f7634bb76b1694319caf14ae83b3b7fff22c5bdd93cad5292c0e57ed5935c8c28c9931fae6bf75f80 SHA512 0bda85cfeb83a52657c9a127ae8711af162a92fe247f00e957896ba077509634654df11619c628cafc75fcd5efe528e57c69f69819582c91610e5e7b063d5cac
 EBUILD simdjson-0.6.1.ebuild 928 BLAKE2B c672740e77bc519b647d2f72efec2262b46629c3b9bdc429a647c0f08ecdb2fe3dd76ce81209d0359cdf9978086fe87e9428853369fd6f08de2698ccceb90364 SHA512 08daa7a4bae1325d3cd4dcc8bed8d44f86c2971404310dc013a0bc5ce4ccb9c61cead4dbc478cdc97f9bcb360289901ffa81abb7c29c592074f16de720f2da87
-EBUILD simdjson-0.7.0-r3.ebuild 1038 BLAKE2B 0aea6fa87992593836dd852a8982bb5fdaec652a629d4fd2e5783cd2a5823539a0b0227f77aa0ee6077d9f20f0fe44209d0564ed4c80c60e5ad05010a346d0df SHA512 ac317104a1255436a41cc860f854fc2e2054ac2adc0866cd5b86b289833f8823d7360b72433dfedd91208e828a45d7fccc135e24fefa0f4c4ef964832f0ded1b
+EBUILD simdjson-0.7.1.ebuild 1038 BLAKE2B 0aea6fa87992593836dd852a8982bb5fdaec652a629d4fd2e5783cd2a5823539a0b0227f77aa0ee6077d9f20f0fe44209d0564ed4c80c60e5ad05010a346d0df SHA512 ac317104a1255436a41cc860f854fc2e2054ac2adc0866cd5b86b289833f8823d7360b72433dfedd91208e828a45d7fccc135e24fefa0f4c4ef964832f0ded1b
 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32
diff --git a/dev-libs/simdjson/simdjson-0.7.0-r3.ebuild b/dev-libs/simdjson/simdjson-0.7.1.ebuild
index ed7b3f9d6f58..ed7b3f9d6f58 100644
--- a/dev-libs/simdjson/simdjson-0.7.0-r3.ebuild
+++ b/dev-libs/simdjson/simdjson-0.7.1.ebuild
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 3dc32668c7c1..8241cd0f98f4 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,6 +2,6 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
 DIST weston-8.0.0.tar.xz 1094904 BLAKE2B 858f892027f2f41687deb699770843bf962b8fab06bded4f9018ded01d87e2dc3388e371921229887d45f6c9c9e981ae5b28ad473660b9acce9107c7a63a14d5 SHA512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
 EBUILD weston-8.0.0.ebuild 3660 BLAKE2B 3a0d81693f81fc132b4ffde6d5b13f77c2e7c61b0d9518523fd2106559708dc23f5b4be8158fd1417e68d76837f21b835818b01bedf6ac757f5fb064339f0347 SHA512 c17c246ec8b0a1159bf45747b58d8e063c939223c37b23a92242ad6649f97b1e16f8c6ff3a15bb50ef7b5679a907daa266c7f794bf63c7ce2c2a0b60e816c3a0
-EBUILD weston-9.0.0.ebuild 3718 BLAKE2B b72e130caec955fca9a896b3c653df1f047d7a10b858f3759c34f9885f63d991c4c0889138c2fed1ceba575924273cdcca20f4df8c4f0fb955e956bd9ca6188d SHA512 144f62271d7c30ada9db349b2f7b467e7de9f64f9c38824dcdd859648b559c435a41fc8df2ca3058141763bb651206b44da607879cc4499e9f72bcb6a63d4749
+EBUILD weston-9.0.0.ebuild 3724 BLAKE2B fb4cc1b0ed4cc8ed15b0d400ba4626b6e94a05e1734b24738a0321915bef767773885873e6dd1ec720229a0dfd475d86066c83e22110155671719d2d9dd310c3 SHA512 a68943c5a130350f185d347e7dae37cb2ed6a8341d251df84ab28d20a86a4921b4ce5a7d904c683583b7e2becc6bda10e122ee41107c61c6663266112d13c39d
 EBUILD weston-9999.ebuild 3716 BLAKE2B 537fe56673b83e0c843be35ab95b1e154570a1bbb02a9cbede05e119de27e5e130fae91372c1c239ca5b77c762eb26db6e0c9e83523202d98e0aefe97f19ab45 SHA512 bd8b946e7dc6488b9f7586cdb263e64bf4bc87fc9936d635b79df9a27929fd621a26f1e2e918f2924bc3e11e7a0665934229cb5f5334503e1c02553fac273ab0
 MISC metadata.xml 1484 BLAKE2B 0cf0554d570059077eedaf579dc65651c715a80520d89633cf1979af25014fd7817d7e4ded1d7bdbbc77346e58d026e6371cfec91f710abfdcdc5d360eec60ef SHA512 63e012a64c88b3c2aca3a5f109d468e3dd5e856b1bd42ad2a803e2881b0962f499f8b201e99e940f04b09a3618e9f3594ea2e8565b204cab4093030913222900
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
index c01d4eda03b4..a65a36db98b6 100644
--- a/dev-libs/weston/weston-9.0.0.ebuild
+++ b/dev-libs/weston/weston-9.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/waylan
 
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="x86"
+	KEYWORDS="amd64 x86"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm x86"
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index c27d4b60f74b..2dddf4cedd32 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -2,8 +2,8 @@ DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad
 DIST xapian-bindings-1.4.15.tar.xz 1132248 BLAKE2B ba9f60263881ca558f9d3deab09bd07271e6f54e06a13d09bcb59bfaf9a637e959b3a62a9e9db0724ae2262e605fc3fd2160559d53702b2af5012f47177ea66a SHA512 dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9
 DIST xapian-bindings-1.4.16.tar.xz 1133900 BLAKE2B cea310cea777f665feac3b0cac7189da66e596d245af0a3a6cc40d01e6b9862bae2b61d5b21e7d742c1e0eb1424603a47c44a4fab9d17125820ab793360a85f9 SHA512 afdc4379c8dc8381813eefcaf761ea560a23ba6718a54c61874c0d29786b9f49dd548ed3854fee38689c273acebb4637833b8cf5c75d0c2ed05df83384e59113
 DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716798aa5b31e5bbc795d0f5c631022c69e96f472b3fd76609116a196431e5b069a710c3ebbfc989de8fb57d5e2d081008b89c SHA512 9cfd9809b8b13d47a7b50950c19b821d4ae902611eed3972d93cccda82d07d5858e37989bb9de31ede082c2574487e0bcd8c1e5f30f1479d47f4c28200ff76e7
-EBUILD xapian-bindings-1.4.14.ebuild 6446 BLAKE2B 2b98e0f1095d527c021792c20b7c5d6977025d16001ec1a82bbff83164adc9af27a8aa04f7b80ae7571bac2fe43bb248ad063e9ca4c28109408e5a562e35e3dd SHA512 ecf37332ea6f17c243447d81425389549a9549afc62e79602aaf9a51a96a2441d92848d85a7e63907af143b871b14f4f77470a7f0760f2a37a0752bdb10f07db
-EBUILD xapian-bindings-1.4.15.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
-EBUILD xapian-bindings-1.4.16.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
-EBUILD xapian-bindings-1.4.17.ebuild 6446 BLAKE2B e9ea51940945489174383fbdb5f328831eb2aca5425da9b0ac16fb64d5b8788f6dcc7a5f82f74d7ef79a55a54e232a96e4046af2059a9e10d5bb2212fde8712a SHA512 0a0684fc7836427cae1903b83bb21aa64a345aa31140ef774ba598254e5750c623518d0fe309f9483edde803efecaf6eaafafe1c30528389577057eadd43d08c
+EBUILD xapian-bindings-1.4.14.ebuild 6447 BLAKE2B 8c879c77362dd1a6de377899e37a7a45f3b10c84b3f8f30a85f37818b0fef560ba4ef76151ea231b9ef305025cddf8f18e6bd2dfa785b86d7a13fa5ed245b276 SHA512 acef1bef8b5c6d23899eca4960b1565ebe289b0b73dfaa551c27ebda73160e51eeddf53b9e2628f729b524a3e1e35646b41018f4e47f76bc834c49aa848faf0d
+EBUILD xapian-bindings-1.4.15.ebuild 6448 BLAKE2B 863f3a89cfc7656e07a25cb972456a45cd8d3da090ab4d0e5f830d39f4841ae04377dff6c93f798fd02ea01aefa5783cacd4a071b2eb95f6a215a8657540d6d5 SHA512 f59f5e58dabf13fe38e3d4dd35b1709feff7530fb3fb4fd29d48cd56d1148af6aa7fdacb0cfd8b7b1f59e6cd663eff2aa9ad82485b3ca3fd99ff6dedfbe5e360
+EBUILD xapian-bindings-1.4.16.ebuild 6448 BLAKE2B 863f3a89cfc7656e07a25cb972456a45cd8d3da090ab4d0e5f830d39f4841ae04377dff6c93f798fd02ea01aefa5783cacd4a071b2eb95f6a215a8657540d6d5 SHA512 f59f5e58dabf13fe38e3d4dd35b1709feff7530fb3fb4fd29d48cd56d1148af6aa7fdacb0cfd8b7b1f59e6cd663eff2aa9ad82485b3ca3fd99ff6dedfbe5e360
+EBUILD xapian-bindings-1.4.17.ebuild 6447 BLAKE2B 4c9f93b886563f6010bd2e60e7e429bc9ab7b914cb6c367a354e6c5dcf0e1bb1ce8f219a069b6ef9e40cad932b4e69bebd815b2878964bc333921485b21e65e7 SHA512 ebeebfb7223e7efa49b06ad076a82a99d03b836f18bd5dcb69ca512c4f5ac762443ea1e2ace41693e9bebe53e14810c5df4f1d7fa9b1c0c2c1d449e824ed4b4e
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
index 347f3ff01145..9afbf0ca6ebd 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	ruby? ( || ( $(ruby_get_use_targets) ) )"
 
 COMMONDEPEND=">=dev-libs/xapian-1.4.14
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0= )
 	perl? ( dev-lang/perl:= )
 	php? ( dev-lang/php:=[-threads] )
 	python? (
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
index f1522bf0ac05..d611b5377dca 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	ruby? ( || ( $(ruby_get_use_targets) ) )"
 
 COMMONDEPEND=">=dev-libs/xapian-1.4.15
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0= )
 	perl? ( dev-lang/perl:= )
 	php? ( dev-lang/php:=[-threads] )
 	python? (
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild
index f1522bf0ac05..d611b5377dca 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	ruby? ( || ( $(ruby_get_use_targets) ) )"
 
 COMMONDEPEND=">=dev-libs/xapian-1.4.15
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0= )
 	perl? ( dev-lang/perl:= )
 	php? ( dev-lang/php:=[-threads] )
 	python? (
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
index 7e936fad6ad1..6332e29debb9 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	ruby? ( || ( $(ruby_get_use_targets) ) )"
 
 COMMONDEPEND=">=dev-libs/xapian-1.4.15
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0= )
 	perl? ( dev-lang/perl:= )
 	php? ( dev-lang/php:=[-threads] )
 	python? (
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-18 11:06:49 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-18 11:06:49 +0000
commit	ab3da91fb6c91a9df52fff8f991570f456fd3c7a (patch)
tree	e8f3bfa2c6c3d20ec3b9c352c839e23949068b6b /dev-libs
parent	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (diff)