gentoo xmass resync : 25.12.2021

31 files changed, 373 insertions, 112 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 069edf6618b0..44fb981792ce 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index 7f416852b816..4d05b42947f9 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -1,4 +1,3 @@
 DIST cereal-1.3.0.tar.gz 374585 BLAKE2B 67bcdf8715585d8913c6ae4ff1a20d77df0eb95816b37a77620a3f08000b6e911afbd295236a6cd0394d3242ae0a3b2619f6e168503724517c9c66bc20f1d07c SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
 EBUILD cereal-1.3.0-r1.ebuild 815 BLAKE2B 8ca410517b7d8f92e4d0fc8c534fbc1bf6d20790c3842b1323d11df7afa657c3c89e891efd51bf20a2af3b7278fc97493285f87490e9b8598e745cee4e351d77 SHA512 e44bb348fbded83fe7a5277570a0bc4ccc7558d11fdca65df216140fb51b548e0a814e77dfecd8b5e00dcb1df237bc06449d2b08059207fcecad5efebfd6ff04
-EBUILD cereal-1.3.0.ebuild 553 BLAKE2B ae9b5d7897c871ef8f67495e0162f1fd5c88abb03eb146c17321d49b53454d5369725a80bf421a75a60b977aaa5eb98007f4fce258a83f1b45e7f3c0099abf52 SHA512 9d6f822c803d6da65184219b0644b1f6941824ecc67de12c6325be3e6391bdce32826f993de434ac7ab690579956bb6c2f6688c54b5db4511856c1686f96e618
 MISC metadata.xml 395 BLAKE2B 6a5de4941e400c48ca8148af6748f2054614eb28337e6f8ea6f282c4fa961c8f60a57fe2e98f87cefd32cd72de32c4cbe2d13f8f7bfc91d6ba1cbdc42adcf200 SHA512 344f769d49106b234ccaa39934eb2531f2161a018c302efd27bad57f072e7ee41501f8b3c189694a9059a6ef24053ea80219307a910f64838e9c0ff51588c850
diff --git a/dev-libs/cereal/cereal-1.3.0.ebuild b/dev-libs/cereal/cereal-1.3.0.ebuild
deleted file mode 100644
index 463e000b4b75..000000000000
--- a/dev-libs/cereal/cereal-1.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Header-only C++11 serialization library"
-HOMEPAGE="https://uscilab.github.io/cereal/"
-SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DJUST_INSTALL_CEREAL=$(usex !test)
-		-DWITH_WERROR=OFF
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 1e3466daa904..88de56969544 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -5,6 +5,6 @@ AUX dmalloc-5.5.2-string-macros.patch 367 BLAKE2B 7fd3e6ae9b4564ec519da953c5116b
 AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6fb9570e1140ec64e87e4bddd6b84227d072454bd64c4e0f261e81da0dd27a6ebf310b60e8a74539a21f83370e291f SHA512 b561c715c19604128c046b36bfe09794922176ce1cd12947da277631a410bbc19c5a1f7e998f0b61d7564e3b7516bee0fb4deddb13e036bb9e667f3502e56d0e
 AUX dmalloc-999999-texi2html.patch 355 BLAKE2B 3b599bdfa45f6c781b446d72cab79acb6f6b59e0c648989c1012b625f4e07ed5b0934cd4c21865af154a1745e1ce2b72bf90f738efa40d7c2654e5e2723b389c SHA512 e29aba00d3e5edf0639685858215736f3aed4baa9f7b79577a69bf5e2e51a0072e92befe7ad0e24a68ea35e184271c15312b5acea145ff1a186eb0d35a985c72
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
-EBUILD dmalloc-5.5.2-r7.ebuild 1821 BLAKE2B d054daf5d6cd9c454c6e559dc79eb29dd53e097d52a0a51eef27fd81747b671f16c1b526f314e1355fef2096d3da14c1ccca4ee9a3487909d2850572669b4306 SHA512 58b422a27913326552300e39c55e84083d0d0ec14970cbdf3480762b3df54b726bd3787a17932136aaf348c0e5bfbb63f4187e1f3f3ede41657a9be3a7bccb4c
+EBUILD dmalloc-5.5.2-r7.ebuild 1828 BLAKE2B 920eee5e279c94245c135806010dfe50c75167f0b2943d2c9e78527977c1daa26516c0f9fff56cf61038700256ab2bbb63c75511bb3a5d54e34482ec0fb6ec64 SHA512 7f191948682117b5bb09cfa3de947c6adf4413f0b9871af48b8b1d46f7a51b3a4f79581e395ed21cf623a4bec3cf9ee9595bd2efa6daed6bdb18aac2f901d070
 EBUILD dmalloc-999999.ebuild 1655 BLAKE2B 9f6453eb6ea54a84f0edc491e66944a15034298b9f945d27c311825dbc6256642a030e36cc9b1125a7fa4637ec1e99e69125320107d8a3f7751214e3b073e955 SHA512 b1abc70b2221c1d1c69030b1046ab5e3447594217e4fc3f637aa4548dab5bf8018211bb600aa6cc31b9f7ee77c4832792817e7f81a8a668e3a99e3d93ae24ee1
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
index 60e05ee68fbf..63f70913d550 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="threads"
 
 BDEPEND="sys-apps/texinfo"
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 3d1b999126de..9dece6cf1510 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -3,6 +3,6 @@ DIST ell-0.45.tar.xz 531140 BLAKE2B 62a54c18dbb7858ec0e56aae081fd8edf14c1aa82a9a
 DIST ell-0.46.tar.xz 531420 BLAKE2B aea36c7faf75bdc282805e4c003877cfe3fc8ff31fcb1ec85a666481b5d574091876b5021259797411d102d7ae6057a79a600e89fa34da038d44863a840db78a SHA512 20a25dbcb7c93a7c29a87cd07ab6124d0915d382f588e2a808e3f7e330d00a6769f40d91264d505408eeae3c6d07ce3917e04d843b4d04c73cc7c9f01395ecc4
 EBUILD ell-0.44.ebuild 1169 BLAKE2B ed818bc1b592a9d5768ee4875205a63bedc7c32cad81e5be707e5b345aa78de37e1c337a33fdbae36a934bb2c01e288f5ab27a8af6a3fcfd795912414dd4437c SHA512 b4aab5df0c8036b434c05e46f00277f5b9a111567b3fd1b7ecff52cbb0c6e3678fa8cd9afcba57c43bc316b7416a28582484791d66b1ffb9357e366e3821241b
 EBUILD ell-0.45.ebuild 1175 BLAKE2B 38153be8a98441d30ba0299302e0913631abee145ad6c2c212ef6d4c9ef7ba97f4408aa79119f2ee6e2ada5731d8811288fcd9d98385f1660efa89d58dc2c149 SHA512 9572ec6ecf0e0bb036934ca776675d1d14694df5a0efda4bc2045e45c2478b2c8c9c1488b9daa123754f3eed2c14a883dc3d1d64bfbf4085961e3720fac7e46c
-EBUILD ell-0.46.ebuild 1175 BLAKE2B 38153be8a98441d30ba0299302e0913631abee145ad6c2c212ef6d4c9ef7ba97f4408aa79119f2ee6e2ada5731d8811288fcd9d98385f1660efa89d58dc2c149 SHA512 9572ec6ecf0e0bb036934ca776675d1d14694df5a0efda4bc2045e45c2478b2c8c9c1488b9daa123754f3eed2c14a883dc3d1d64bfbf4085961e3720fac7e46c
+EBUILD ell-0.46.ebuild 1169 BLAKE2B ed818bc1b592a9d5768ee4875205a63bedc7c32cad81e5be707e5b345aa78de37e1c337a33fdbae36a934bb2c01e288f5ab27a8af6a3fcfd795912414dd4437c SHA512 b4aab5df0c8036b434c05e46f00277f5b9a111567b3fd1b7ecff52cbb0c6e3678fa8cd9afcba57c43bc316b7416a28582484791d66b1ffb9357e366e3821241b
 EBUILD ell-9999.ebuild 1168 BLAKE2B 229eaef8e41979c42c2a5b5a233cda5701be588f5dc093eb8b288ef3ad05c9216b065cb8e29bf4adc4d8f702331032f9904f443f139ac72936fe776434f32b59 SHA512 e9719214985628d7e6f752df9a69f4576efb2c0e418f9bf44968c0c23ed81ede0483fe9f5f79bf9ef32a18fbaded57fc3c38c582f02bd2e5cd0dacfda5532028
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.46.ebuild b/dev-libs/ell/ell-0.46.ebuild
index e2a5fd2979c4..21c528b64073 100644
--- a/dev-libs/ell/ell-0.46.ebuild
+++ b/dev-libs/ell/ell-0.46.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 506c39d31aee..518753e99677 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -3,5 +3,5 @@ DIST jsoncpp-1.9.4.tar.gz 214057 BLAKE2B 9a8c52e5d0b78f1593c93bc40f48d3789b031ba
 DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
 EBUILD jsoncpp-1.9.3.ebuild 1027 BLAKE2B bf5471834eff9feaeea9c821007dfbb7683d046e2aa48a29cc484a3fdcc275bdf144c2f212eae9e5457a36d344be8ca20a74574247bad35a6f55c1056a2297a0 SHA512 6a6c382bba7abc7e79dea025430078185f6d4f6e841966d75c0a70d65a8065f54b604f2d376c2dbd2362a84ea979d10d68f6271dca17c93c167fe234d456c845
 EBUILD jsoncpp-1.9.4.ebuild 1217 BLAKE2B 7fca9799cff917932d3809519f78ef90762ccc649a24b5ced6eb6a953483a8617a0e9bd1bb8ea1575df384a580aeeca88b908ea8ed598b227e30eed87117e34b SHA512 c95cfcfb3a867d69cdf29511d64ce6694803acccbe1ad2bc26353abc34ef9f5e4fb8fac1a5456bc33a4fe471f69d2ef12d8ab51d1a2327e141a7504fe6504972
-EBUILD jsoncpp-1.9.5.ebuild 1219 BLAKE2B b5ed44d9826022423936a6f505671ff0520796a17b3e8178815076c0aaafbe02e0ac6bd0ea6d737c6cbcc47ec2c4dc7c2532bd1d1ae24322b74a6df7c98fbdbb SHA512 58b32c252bbb2de51c7a59124e703abaa8137ff1c988291001aede7b89c83c1548cc8a6ab09f6e5b5ed9b4c30c77c912dacf8dd4f643e61e93832d11e8490e30
+EBUILD jsoncpp-1.9.5.ebuild 1218 BLAKE2B 4458b0ae19a52aebb0b143ad402e80e15fa282b79c1502216c9d4fdc1b504bcf33e3ebb5f3e34cfccdd18114da3aea1d7370eb3dd42c180cfc7569e4b0b35af3 SHA512 e4a88c502a466c464828b4408bf9484af1a7e8ad6e5de4f78bbda7de355a10dd53160a52ab667b6aa56ae5fed3689b099c6ec792096d3e95376b1363da1c21b2
 MISC metadata.xml 404 BLAKE2B b1439e7ff1121eaaac0eabccea420806b8c059b6cfc43fec2ec47ff5e3a937ace7a1afa4c3a5f18385de22b3979e8648f048cc7a8717b0ea5e282e08a3914bb8 SHA512 700ebcb293411f62c10a69640c5e7d9240f90f513435b54b77e0fa30f1bb732affa0055dcd7c84c858a50d56f0b3a138dfe6410f8a45fd91d1af62ea827c9e8d
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
index f00d5b8f1921..cc1a92f51299 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/25"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 9f339a52c73d..5d0ebe9807da 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,6 +1,7 @@
 AUX libbytesize-2.4-no_Werror.patch 827 BLAKE2B a9192908e7ec0bad0cd4d1f853fd6f48a17977380d6f2e6a0c8255058d1e3ebecbfdaff68311f70f8d26291ed0c917dafb8f7d85fd5ad8f097ea929f4a200677 SHA512 6972e86cdc8de7f27b850742c4e0d8c492e354c1a526e103f4f4ec080cc6543db7ad4abd54a9674807521d083eb19fa811e351942330a73591e0a9700e876bd7
+AUX libbytesize-2.6-configure-bashism.patch 1239 BLAKE2B c579abd45db89e2c252be853edc2306b7c29ea4d74d9c1aeb5f6d937456fb1386f19f7dc114d49959a89ecff641eb63473447478851f60d4a3dd169274af5577 SHA512 50e3f5adde12a809d7356429b39e8746045a88587e21111dfc988e723ee59207d1c786d2405c1a8309b9a92b47512845d11767ed84fd849b2c2b4fe169e7a79e
 DIST libbytesize-2.5.tar.gz 439194 BLAKE2B 8d2cd82cea1e95f3368eed5855abfbc89b410fe1d627f7cbe69974f0d1fc89b600c93ad242816a37c3585b8318fcce77ef0fe6ab349d10f34a8be4c69303e343 SHA512 730d9c84bfc7199424fa34de5037dd9187d60c1f32d82cedc3e395167bf39a98a3b7f20b15f154206e797144c11de05ae0f606e0af6a2157ed946f138a346ad6
 DIST libbytesize-2.6.tar.gz 444795 BLAKE2B 5f89b2c614ebdd8efd3ac0841ad99c32309bdb33236373a0c9b007415a2f40ff30a0edcecb56947f2f41403cabb6a6bff68c2e4ce52e322df15d6daa3e10d2af SHA512 f6e72b763216c54c08318d090d604791c61cd5a3e683ffbe6e9d01de850661bd4e8a3adeb85c6fd0fb60244e2e128292cbae06c0aa2d1fe9f34104e64af8210e
-EBUILD libbytesize-2.5.ebuild 1575 BLAKE2B ac0a761addd9cedaf39a8500a64ad66480a2febafc6ddb6e5cba6654303031339559cf20e6e9823da2530d70724419d663d81f786920ae38a26cf0f1964b33c1 SHA512 b56aca7cf6910ab870dd46d5e528146f7abbbee710980484a2bfbc447b3366e010a673af529e8ddedeec5d54b3181e9b562f317b07bfd6933f4e01cf52a7d689
-EBUILD libbytesize-2.6.ebuild 1582 BLAKE2B 8b30c4ed1009812f07725033170a350f3162d18ed6beb4cf995ccd85ef338a1d7f428dbf7bc5bdad86253574a55dcd0988dc5c7c61daec1d71b5ea077846ac45 SHA512 067a06bee9569fe831df2282aefb089ca882ef4a10d89a9fe936c12ecb292fe2007b5cab47158097333e0f2bdea51f169dc8e0364b1e3aba8846f1a45cc083df
+EBUILD libbytesize-2.5.ebuild 1609 BLAKE2B 6508a1777cf4e28205e371a9bce0e669cb4a5db58af622f9ed1814e3036924ce60ae75aac6ad3ea16fb3bb3604e5f31180797947995e880d2c9a86791e36f794 SHA512 febcd1883b9cee736fb08632c77b10bdacb443e0c2177ecfcd305dbfd4437bcf3fba431081e822f2a33b7212faa3c63d31200f26ae7e074ea8e8e27ecb67e625
+EBUILD libbytesize-2.6.ebuild 1632 BLAKE2B d76ce8a93b59f15d0e26fd02de51ce5936b42e9f1c670a62404b760758f7cb2b1706daaaa5ae86f31f6448ee103716be9a0ab55d66a8abacc33b9fee61bce08b SHA512 f4db7184424318c99f6f9fd51cb5a794b6347eadfa412c24b548916fc4b7e3a268fc781c6b04a126309a0a1c0899a0b031e0bdf8d53bd92f3a183db5b60faa0d
 MISC metadata.xml 426 BLAKE2B 9476445b939bba3c8cc648a30455b653fb77660e010bb8238af7f7773617d28304986dccdb856bff949ca30c8296bda26ecd0cc2d085609b4bcd891c0ed4f110 SHA512 bdb43b7259039d6170cdae6af640bd8eb5e84277db1fb28f51f3eace267ad81ae0546c805ad929b78bab4c5b8603cea2dc9b5a610787a0b7413f32bcf30ab97a
diff --git a/dev-libs/libbytesize/files/libbytesize-2.6-configure-bashism.patch b/dev-libs/libbytesize/files/libbytesize-2.6-configure-bashism.patch
new file mode 100644
index 000000000000..5fe0f095eaca
--- /dev/null
+++ b/dev-libs/libbytesize/files/libbytesize-2.6-configure-bashism.patch
@@ -0,0 +1,31 @@
+https://github.com/storaged-project/libbytesize/pull/102
+
+From: Sam James <sam@gentoo.org>
+Date: Fri, 24 Dec 2021 07:58:47 +0000
+Subject: [PATCH] build: avoid bashisms in configure
+
+configure needs to be executable by a POSIX-compliant shell (/bin/sh)
+and while this is often Bash, which tolerates non-POSIX statements, it
+might sometimes be e.g. dash which doesn't.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,7 +59,7 @@ AC_ARG_WITH([python3],
+ AC_SUBST(WITH_PYTHON3, 0)
+ if test "x$with_python3" != "xno"; then
+     AC_PATH_PROG([python3], [python3], [no])
+-    AS_IF([test "x$python3" == "xno"],
++    AS_IF([test "x$python3" = "xno"],
+     [if test "x$with_python3" = "xyes"; then
+       LIBBYTESIZE_SOFT_FAILURE([Python3 support requested, but python3 is not available])
+       fi],
+@@ -77,7 +77,7 @@ AC_ARG_WITH([gtk-doc],
+ AC_SUBST(WITH_GTK_DOC, 0)
+ if test "x$with_gtk_doc" != "xno"; then
+     AC_PATH_PROG([gtkdoc_scan], [gtkdoc-scan], [no])
+-    AS_IF([test "x$gtkdoc_scan" == "xno"],
++    AS_IF([test "x$gtkdoc_scan" = "xno"],
+     [if test "x$with_gtk_doc" = "xyes"; then
+       LIBBYTESIZE_SOFT_FAILURE([Building documentation with gtk-doc requested, but not available])
+       fi],
diff --git a/dev-libs/libbytesize/libbytesize-2.5.ebuild b/dev-libs/libbytesize/libbytesize-2.5.ebuild
index a819367ec1e7..9afd519fb6c1 100644
--- a/dev-libs/libbytesize/libbytesize-2.5.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools python-r1
 
@@ -66,7 +66,7 @@ src_configure() {
 		$(use_with tools)
 	)
 	local ECONF_SOURCE="${S}"
-	python_do econf "${myeconfargs[@]}"
+	CONFIG_SHELL="${BROOT}/bin/bash" python_do econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/dev-libs/libbytesize/libbytesize-2.6.ebuild b/dev-libs/libbytesize/libbytesize-2.6.ebuild
index f261594c01a2..84be8f1ddd9e 100644
--- a/dev-libs/libbytesize/libbytesize-2.6.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools python-r1
 
@@ -44,6 +44,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4-no_Werror.patch"
+	"${FILESDIR}/${PN}-2.6-configure-bashism.patch"
 )
 
 python_do() {
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index a1ab59629da0..4538249839d1 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,4 +1,6 @@
 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
+DIST libgit2-glib-1.0.0.1.tar.xz 141664 BLAKE2B a99ad6db55d0d4bee4d7d96b92e92d12712843e41e25e5ab57f5722926fe3e95109a33654d0ab94b7f919bd5d51a0b159dcae720eee763200c964d0327b8a37d SHA512 8e156791783f79d585fa83267a5e14a4a93324fcca75e836478ddd5b5c53d9e827b07a3738c67116478435613639aab0992f32413b9a4de5fc4ff641dd042e80
 EBUILD libgit2-glib-0.99.0.1-r2.ebuild 1303 BLAKE2B a78542a2d8b2f822d1624c5ba098ea681ccad65feeef0db9f34648925e1d41cbad9e7d4f799a957e650fae3b5789f67e3c9afee6284d1dad66237f0d5a0dc2e8 SHA512 1c177814b210279e7d82e34f452d24dee5a959d3a05c84f10ab5aad2cc36c37ada017974b494332dda1c20fb75fbab52a01422818e7af9e0ab54ddf3a94e8dd0
+EBUILD libgit2-glib-1.0.0.1.ebuild 1241 BLAKE2B 44002385061b7d53958ca25c1a2747a205f52bf34dc4d1ec05e4ddaa9b6d46859d81e1fe0378703483721089bed80768c18be5759bc2ce5913336b0f7ab21ecd SHA512 96f719212d76eb80bc83dfa39e1041fb52ce814b74c8164c250e086f89222c9b06566abf4d45b1dc275df31e27c3cc9de58d153a2bf3ed50c0b6076ca9fb4c52
 MISC metadata.xml 432 BLAKE2B 69d6aa326333089515925cd4c8cc5c2d86318cbe148349f2e2f1554afd8c659a5ce3aed28ad02562d8552317bb010f866e10e3793e47f5a7a5c82d11d8702e51 SHA512 bf228fa30f58c6d860b7648eb40e841c72398390539980fd48e35860f6874e141c3b81c373ee3ca1cb8bbbde5dec36a94c5381b102e1ec33e91962455d9fa8ee
diff --git a/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild
new file mode 100644
index 000000000000..ed7a89a597ee
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson python-r1 vala xdg
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="gtk-doc python +ssh +vala"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libgit2-0.26.0:0=[ssh?]
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		-Dintrospection=true
+		-Dpython=false # we install python scripts manually
+		$(meson_use ssh)
+		$(meson_use vala vapi)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule libgit2-glib/Ggit.py
+	fi
+}
diff --git a/dev-libs/libgrapheme/Manifest b/dev-libs/libgrapheme/Manifest
new file mode 100644
index 000000000000..8f3f1cc54396
--- /dev/null
+++ b/dev-libs/libgrapheme/Manifest
@@ -0,0 +1,4 @@
+AUX libgrapheme-1-make.patch 752 BLAKE2B 82e35485f3f0f0b2f0cc766ec83b82ef528b43a7dc56ec8ff5c8caade9859eb64cbe550c2e3c4be545cb79b4144de84cd1363a1a763dcbb9d3b03d9fc7c56b77 SHA512 89f0584efeb492b45d33750efef0f33abaa26923da3f6b5e96e6174dce0156dbacfc54a996a99db7a2b7af9c9db7dc2e76e325638e8a69a769ed1fa9023eb1e8
+DIST libgrapheme-1.tar.gz 67912 BLAKE2B 62e82018b2a45f7259811fbfbae45741252ffedafa095d8e373d62220fc50141afe359d171b723e007120ac307db540c03cfe6e60ecedf1eea0be5518caa9bcb SHA512 c0f3300d30707266e44ee01f359204720ae1770788cec509b03be914f8581caae144fb72952d111f108ebef21fd96b5ca2cf69463ee569bce4bba8645942ee05
+EBUILD libgrapheme-1.ebuild 733 BLAKE2B e37db1f94ac597ca876c190ab56876668fb0653355fea0ecb02701108d48e20a62a331e840330792c508ba22367ab08241da643c1938da21fecd09366e81fefe SHA512 191b3f8b1828953b16409ceea2f4834366115e8072150d4eb90b7621e85cbceca9d8e49551b295777bccb7f9a51d585491c79ec94a3f1ea5413653cbdf5124f6
+MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/dev-libs/libgrapheme/files/libgrapheme-1-make.patch b/dev-libs/libgrapheme/files/libgrapheme-1-make.patch
new file mode 100644
index 000000000000..363df6cfb51e
--- /dev/null
+++ b/dev-libs/libgrapheme/files/libgrapheme-1-make.patch
@@ -0,0 +1,32 @@
+Adjust config.mk variables, fix cross-compilation, and don't run ldconfig.
+--- a/Makefile
++++ b/Makefile
+@@ -68,3 +68,6 @@
+ $(GEN):
+-	$(CC) -o $@ $(LDFLAGS) $@.o gen/util.o
++	$(BUILD_CC) -o $@ $(BUILD_LDFLAGS) $@.o gen/util.o
++
++gen/%.o:
++	$(BUILD_CC) -c -o $@ $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $<
+ 
+@@ -84,3 +87,3 @@
+ libgrapheme.so: $(SRC:=.o)
+-	$(CC) -o $@ -shared $?
++	$(CC) -o $@ -shared $(LDFLAGS) $?
+ 
+@@ -99,3 +102,2 @@
+ 	cp -f grapheme.h "$(DESTDIR)$(INCPREFIX)"
+-	ldconfig || true
+ 
+--- a/config.mk
++++ b/config.mk
+@@ -13,8 +13,4 @@
+ CPPFLAGS = -D_DEFAULT_SOURCE
+-CFLAGS   = -std=c99 -Os -fPIC -Wall -Wextra -Wpedantic
+-LDFLAGS  = -s
++CFLAGS  := -std=c99 -fPIC -Wall -Wextra -Wpedantic $(CFLAGS)
+ 
+ # tools
+-CC = cc
+-AR = ar
+-RANLIB = ranlib
diff --git a/dev-libs/libgrapheme/libgrapheme-1.ebuild b/dev-libs/libgrapheme/libgrapheme-1.ebuild
new file mode 100644
index 000000000000..3217f024438d
--- /dev/null
+++ b/dev-libs/libgrapheme/libgrapheme-1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Unicode string library"
+HOMEPAGE="https://libs.suckless.org/libgrapheme/"
+SRC_URI="https://dl.suckless.org/libgrapheme/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-make.patch
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+	tc-export_build_env BUILD_CC # see make.patch
+
+	append-ldflags -Wl,--soname=${PN}.so
+}
+
+src_install() {
+	local emakeargs=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		LIBPREFIX="${EPREFIX}"/usr/$(get_libdir)
+	)
+	emake "${emakeargs[@]}" install
+	einstalldocs
+
+	rm "${ED}"/usr/$(get_libdir)/${PN}.a || die
+}
diff --git a/dev-libs/libgrapheme/metadata.xml b/dev-libs/libgrapheme/metadata.xml
new file mode 100644
index 000000000000..06d84e396dc3
--- /dev/null
+++ b/dev-libs/libgrapheme/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 6759733cbb31..cbc28362a4c7 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,6 +1,5 @@
 DIST libgusb-0.3.7.tar.xz 41844 BLAKE2B e0829430a7c4c9372ebc061ca8245ecd6b30f0922e4e37ae41f7f65055e7339b5a3a882c5526ea5e5663be3b7c1ad71fee7da5cffb501d63bd1cda2b618fd40d SHA512 65a35be62bff689621f418abf045f62f946c67488dd021d363ab252b9b3a2380898ec763b374f7da50901945eda666fdcae7cbfda7e143544175d7ade3ebc20d
 DIST libgusb-0.3.9.tar.xz 42708 BLAKE2B 6d73f3dba891dc7594c2df02198bb1632c8e7ccea2b60f5071c87ae1111b6e2cfed4f9b912f58f788f199c5ee075db156a4d7326aa9b5e6448581c2acd1af469 SHA512 4a4545d9e8ccadf2c66ef891936a30b2b73b7b471a9b0e945da21fd2b55efc3a8d12cfd5127dfcbca0ba24f565b25f8edd7a276b70a6615eb4b2201791745c6c
 EBUILD libgusb-0.3.7-r1.ebuild 1513 BLAKE2B 6a36977eae498f15a9292723c26624d8bbc12ad07907cf98b7a3c95ea6348e68bdbbeb81ec2744c678e9f1ffee81443805af39367526a7dd4d660da913cab730 SHA512 361111fe47bc09d5a715a98561e70e5f9e99adc617753142282236920d0a9e5805b2e5d2a647c3c5f6ab4b340be75102c0cb5310cdd38f14951e5ad2c0fadcde
-EBUILD libgusb-0.3.7.ebuild 1510 BLAKE2B 1e8783e5c44fd4387692888a39574c8215c4cde0ac99585ea95e6570fd9c7554a8026a8a5572fea0d7b6c273559762cf029e59fb7a136b65b2f4737f68e6610e SHA512 757153b0b1f7356a602b3b5cd47000e620e82c802b95aeec879f6e3470b40957134fe962d8940891a382c69b2ad82d473e9fd5b390bb9436b1afbe7220e29d77
 EBUILD libgusb-0.3.9.ebuild 1519 BLAKE2B 17d730f541318e98fd2cec90d47b7bc876a8fc7f5ca36440039e57832ee65731315011bc1a92e06b5d7c83e57b83e9d689adc8de688ea445e5240016e1f661d8 SHA512 2e3b4978f64e4b4573646273d985bc231b61bcc11b28bdaab2fd0e45132f5c5a3d5912408ced16865d918443e03e3b89327b43d03667bcda19af5d8a556d0e08
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.3.7.ebuild b/dev-libs/libgusb/libgusb-0.3.7.ebuild
deleted file mode 100644
index 6c27baebffaa..000000000000
--- a/dev-libs/libgusb/libgusb-0.3.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson-multilib python-any-r1 vala
-
-DESCRIPTION="GObject wrapper for libusb"
-HOMEPAGE="https://github.com/hughsie/libgusb"
-SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="gtk-doc +introspection static-libs test +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
-	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	sys-apps/hwids
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4
-		dev-util/gtk-doc
-	)
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_use test tests)
-		$(meson_native_use_bool vala vapi)
-		-Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids
-		$(meson_native_use_bool gtk-doc docs)
-		$(meson_native_use_bool introspection)
-
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index b7a4ea5b81e5..7f4c4bdcae40 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,5 +1,5 @@
 AUX libnl-99999999-2to3.patch 1082 BLAKE2B d3749aa9cf5fd7a2e255ebf6e7ab6c59c81da86fe419ef36b58a9fb14173a9944e7252e64c1a72ccbf9ca9a42f558642548e5247f900344df1bf2f2d54ebac86 SHA512 75796506b16e0953d7fb22d600b747eb48c900badacda665740302002ce112e1cbebd44061158e0557e829c3c16a06917d2acfdb2f450211834de14643112a66
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
-EBUILD libnl-3.5.0.ebuild 2382 BLAKE2B 74f7547affccd9b5d598633dab8f2a9d7392a3a2a47fea889fa151e7fa615d283965b6175bda715034d14f6fdf4cb54e39c02f13d94d38aa082a4f285f654725 SHA512 280eb0e550967896df738c8bb3ab678ce9a8f16b9d6a5f096da63e49b381c81620db8fcce095082f44fc8650f216121275f9b97a7df66fd2aee6be3562118e2c
-EBUILD libnl-99999999.ebuild 2402 BLAKE2B ff14de3e36dd90e8a85134ece01681216c5baf0212a19a4c8ebfa5b9a5e6a06259ae84e4c763c260f602e7c49e80007266cff556c562dd56d0b5b652d2839d48 SHA512 937454d469f5c5ec6d928659e78b2efc68ef0d6207f7bdb9a3ef3c4595b72c96962b07ce72d8f9319c810b64fc0fb1ec806b5d0393346fdf2ef7515b95f38883
+EBUILD libnl-3.5.0.ebuild 2382 BLAKE2B 165ccb15849aba20eb8f59b12b0a8a3a001c6382c84392c656d830d67b4113d33d6d99648c7c6d337735c23b5faa8961b6b23d323cbc0e4ef571c68d7353a868 SHA512 09dfd882de44a5c099fc656c99062ff4683ad985f7e1518dc2e5755d98ccd7913f282ae44edf05199186e62eb4d09ca85002cba8befcd507f522fa5411a23c1b
+EBUILD libnl-99999999.ebuild 2402 BLAKE2B 686bd0c10f0e881efe5587d244311f06efd6eb6ecc7a307f1be85c08b6b1173468b0e42576d7376ef08cafa3fda00956c63a07eeb29f036bdcbcd04299ecd623 SHA512 8f83dc6706a7ba4aa42b5411a36ed8d9d18b3db2de0b34405ae2d925bb5944550726ed2a35c32f1d4353628341c13065cbe3ddb69bc611e456e8ba6111706bf5
 MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index 16c5e65ab3f0..1164928a297f 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
 inherit distutils-r1 libtool multilib-minimal
 
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index 5179de7255b9..0afdbd9d360f 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1 git-r3 multilib-minimal
 
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 4f6677ae3d75..3e2dc6a1b065 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.30.tar.gz 633287 BLAKE2B 7ca2fa4eb4e887e77658dc66b455ab830da31634a121d2fc58ec4e038a62d09d2c392ca70dbe7df3740592d82e9861086f398d82fba1af8e4d6066c395dca3fd SHA512 ba04206427c6bfd63c4799e2728fd5487a75757a42281daf87c8aee87d3c685e5fa60a0c77409fa774e4fddaaa3336f96bce002e88e6ad54f9af2c2cc939b9fa
 DIST libzia-4.32.tar.gz 633444 BLAKE2B 60fbc85297b06e109f6c989798b6c5629d6f2d861b52388b134f896ee5232f75dc362fd847fd557d4aacced1c2264554c2861c9af7acfbb1e6837d9348aac30e SHA512 e426626d54c97dbce88e11eaefcee84a4e0a23e17a196f46ed4319a22d0f55bf9524c542bd4d41c376b26b51553d4cf7e0d994125cb2321549620f4b4aea5912
+DIST libzia-4.34.tar.gz 636031 BLAKE2B f33c13f4159fd6e6e83e3aada2560ed6f2160811eb1d94078c8792c5dfb07cc6c69f2a41f9b82ddf73b28b2cd57480590393b3c6b5ac24eece1ef40e55a52014 SHA512 a93ecea84d506767d20f03fa8b56408c6e8a0aaa4b8dad26b21e133c83a4726ebf3ca88425bc63249cb98fbd95dd3bb4d9afb8529bdd5e70fc5dbffbc6bf5533
 EBUILD libzia-4.30.ebuild 972 BLAKE2B 9f4836d3afecae91e382f7a5bca85ff975027da86e4d9c1dcd100ffe283772bc526bb0086051b5d4459c4f562d25f0be303579b7f8f1facccca6fbb3353754c5 SHA512 5f024cd389418478031574adbc2f08a1550283fa3e1d3e37add45a232d9e2e4ec7e71d9cb1b48f5c24fc68f8374ff567b8765f7e58db11d8b0ba2cdab571b3f8
 EBUILD libzia-4.32.ebuild 973 BLAKE2B 3a9e0fdb102777c7bbb7fef3058ee287df919633769b6dfe816378d4eb4c3c450cbfbd77e7f515112230c4c9e97bcead764f29fbdbaf7e3f7103ea09b3790dcc SHA512 49d3361f42075c32c328865a1ab678dbfc8ed05c913f49871511984b833ea861d0ce0aa1dc5ddfe0c5e669195cdb23ae32929d324a7eae00ed0fdc656c70cd62
+EBUILD libzia-4.34.ebuild 974 BLAKE2B b74446348dfd0d0f0c1470349aaa04ae1d59d034c1ecf96d5da37a9507e7200d6e487c427e4312464e90561668cd06274140e74e2a00c46aba0c2ee0d51ed4c4 SHA512 6555ced9e553fc7546163ee0e77f0c87f8421d038bccdca61e290414d3fa30ac3dfadc4d86154933c1926018fcd6b365a29246abf41f66db59432ecc4a2a4e59
 MISC metadata.xml 326 BLAKE2B 1b8ed6c9d40252f3371cf9a1ec295f593c8898dd8e45173ca05cededf987c7e44e2fafca613f8ad3022e9fbb6886d6aec2d183fd47c3064f35038784f361ebc4 SHA512 0c8a48b1101aa184dc596581feaf47463688801cb0f342177ecfb6fade1d63520ca1b9dcb278279470c181b560f555de332e4d2583e8856eec9057cde34df48f
diff --git a/dev-libs/libzia/libzia-4.34.ebuild b/dev-libs/libzia/libzia-4.34.ebuild
new file mode 100644
index 000000000000..0e9b995dd476
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.34.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest
index 22750cfb8014..240b2f36a76d 100644
--- a/dev-libs/miniz/Manifest
+++ b/dev-libs/miniz/Manifest
@@ -4,4 +4,4 @@ AUX miniz.pc.in 315 BLAKE2B d05cd14a7acb4039e5f0521a68e6e5eeed00849a5b5d639fbbd4
 DIST miniz-2.1.0.tar.gz 104502 BLAKE2B 9a7b3818b454809cdfec523d98f13bef3a52e27b6d3857d289438978d12997e38c71aa97fffe060a6b765f8fbbdd8fe8cebced4a45d9f1f040dd3e39cf2a8055 SHA512 e0aba16afdf230d1e54d0a9cedd336b0b158b02744839f0547e14ee47a97fc1a6668f3a181bd46e969b01b158af18dc8ed3c0a4210b3b620242338a2788806b3
 EBUILD miniz-2.1.0-r2.ebuild 711 BLAKE2B 639316c2389f57bda50c675671aa829accfe17111a869c63d6defacc73f63562ead4f47f723e6dfec3216f2bd6e7e8a392bfb2d1bda3d20e320ed4f59d2b6f20 SHA512 756f4f758d18cb07dd5e3ebdb62722847360452b2526cddb7e015f3996b4049333342d26cd6d728d4c79b5e4792bc2052276e1fd8cbd0444d4f8eac49750edba
 EBUILD miniz-9999.ebuild 868 BLAKE2B 4c35c1ff7de11247e71860fbe61c973b77d456db29a87cf01b3e34a83df0d61b3a2b3d0f5a938081cf1f6f578a97a1489e292ee50b46d1e0ece1bc049b70b7b6 SHA512 9cfb04128eaa89af0a0d005ca8aa03a410addb3953d6522be5c480bbb93e765c1c2b6dbc145c91d57fc9931d7267bca47eb34e711561f4bc2ca7835cf98647bb
-MISC metadata.xml 1132 BLAKE2B f34126664a5b04a2179f55ba57e7b675265dea89fc268d818109fd433ccdcf7449473174f06ca57472ba7b32587ca570f8d1798fb405fc11a5cb4ac92712df3a SHA512 bed1ab29b2b66008c3e96d6303aeddc1f23f90ebdc95e2b0432f3b02c40695e26a1588b8f719a9943fdebe3a8cdb11224814144ea1b320b7a2cae0591e61f819
+MISC metadata.xml 1039 BLAKE2B abcf47a1154eada5c2f5fbe0629f1f065db0f81db5202e58aac598b8b88237bf953eb4aa5c973e70e8371fc7ef4a033a4a7f8c1da83507c477509440f737ad2c SHA512 48f92a799a49ae6dd6ed589a50f746cccd9ab87e2e5370dc63c98c6ac663037a0d1d57f04a8170bd319bb5d17bfa16b4451b71a0df38233fc5a47c902927c690
diff --git a/dev-libs/miniz/metadata.xml b/dev-libs/miniz/metadata.xml
index d62552766b83..9ae3e1edddab 100644
--- a/dev-libs/miniz/metadata.xml
+++ b/dev-libs/miniz/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Gentoo 3D Printer Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Miniz is a lossless, high performance data compression library in a single source file that implements the zlib
 		(RFC 1950) and Deflate (RFC 1951) compressed data format specification standards. It supports the most commonly
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 651863f83ce1..3e965bda5b1d 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,4 +1,7 @@
 AUX quazip-1.1-cmake.patch 3279 BLAKE2B 5b596da742e87c00c742881a8585d4f48955d99dfd868451ad2eacde64b7f035dfcf38efeb21335ee8c2e68a6aa0606a7d18e2a23198efc5e1d3f3068a93261d SHA512 5c28adf3e6ae96c3be89dab18092be2089e2b622a9c88e9423abdd505db306680c97abc861d4b90829efeca6b3a85907ad927512e95da575eaec39bd231a8b5a
+AUX quazip-1.2-cmake.patch 2978 BLAKE2B 3125b2b84e9316f3db9afbbfc91b379933dec602e288cbfffbc58cd422ea3f26653075d9bce731671e375127c937c6fcc2ff9cf217884be67057c9ecdd43115d SHA512 033c63a46ec0b1ea82f713dc807faf30c266e4bf385b4e9c0b1e6320c12f7c2093d1388a06e65ea32cfe27374324f00eb08baca9a2648bac8d0801a783b19fa7
 DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
+DIST quazip-1.2.tar.gz 155878 BLAKE2B cfd5505509863dfdfcc88cf9f50aeff0ee0c1391412dc8aeb34ab020debd8a29279563323a0ca13a8d3b8b026518f5d079b8fa989aca20a9bec083c6dd4e3695 SHA512 3f4b1a4194ca286163b1c17880ea471a341dcc05d758ee8f3d1e540d0f6aed7ac18200450187034c46b4fab1da39111dca534d75859701259406a6dd50205386
 EBUILD quazip-1.1-r1.ebuild 941 BLAKE2B 19855983f1cfcfd549bfbd4e183c570d663492e507ff1daed5821d76c75dc9bf18b55697cb4e555091e8f2e538111d400979d4cc175556269dbd6ff46d1b0ae8 SHA512 d8545a52bd5ec70501514f3fe45808190c393c892b8a8e3abe0810bbd1d091378ef4d397a8239413f075d4f0453a9ef2a9ef57379180ec13808a3172f6f16eb1
+EBUILD quazip-1.2.ebuild 945 BLAKE2B 8a864f56c7b722b9b196b470df69cfcb14eba0dec5f7e8d1713750835442e5767956f0669d182dbe34831120b7c4f0144f78e73a98ceec422511c05d71156419 SHA512 f670036990d26bab46c4440e972a331b6f0b0274d058fd2d4d23a8555e01aa83ce5b4e38ed86f23ff53e37d42a4c812ff26f7a922a29b665f21063ccfc8c639e
 MISC metadata.xml 348 BLAKE2B 756252686a3a4888fa4466e59594dc39bd40675d1a9b4b98124ec014d6fdaa14ad5dfd0659712fe5c2e7d338753d7b101fa3183831964764f68e67bb7b950ac7 SHA512 e10894c3e476992491b0692fcce8091450deee9782c7b580e2b956276b000a851844f9a0c408708c9508be607e3744be4f6849162ee362ac818a2e6ad05eb9a7
diff --git a/dev-libs/quazip/files/quazip-1.2-cmake.patch b/dev-libs/quazip/files/quazip-1.2-cmake.patch
new file mode 100644
index 000000000000..e8bfdf7807cc
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-1.2-cmake.patch
@@ -0,0 +1,79 @@
+From d141ac016ad587b052886b17b42c8c4dc77aba98 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 20 Feb 2021 22:53:46 +0100
+Subject: [PATCH] Use CTest module provided BUILD_TESTING (default: ON)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 32 +++++++++++++++++++-------------
+ 1 file changed, 19 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c42816..5d52baf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,9 +11,10 @@ set(QUAZIP_LIB_SOVERSION 1.0.0)
+ option(BUILD_SHARED_LIBS "" ON)
+ option(QUAZIP_INSTALL "" ON)
+ option(QUAZIP_USE_QT_ZLIB "" OFF)
+-option(QUAZIP_ENABLE_TESTS "Build QuaZip tests" OFF)
+ set(QUAZIP_QT_MAJOR_VERSION 5 CACHE STRING "Qt version to use (4 or 5), defaults to 5")
+ 
++include(CTest)
++
+ if(NOT CMAKE_BUILD_TYPE)
+ 	set(CMAKE_BUILD_TYPE RELEASE)
+ endif()
+@@ -30,23 +31,29 @@ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
+ set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
+ 
+ if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
+-	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
+-                         OPTIONAL_COMPONENTS Network Test)
++	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat)
+ 	set(QUAZIP_LIB_LIBRARIES Qt6::Core Qt6::Core5Compat)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core)
++	if (BUILD_TESTING)
++		find_package(Qt6 REQUIRED COMPONENTS Network Test)
++		set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
++	endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
+-	find_package(Qt5 REQUIRED COMPONENTS Core
+-                         OPTIONAL_COMPONENTS Network Test)
++	find_package(Qt5 REQUIRED COMPONENTS Core)
+ 	set(QUAZIP_LIB_LIBRARIES Qt5::Core)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
+-	set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core)
++	set(QUAZIP_PKGCONFIG_REQUIRES "zlib, Qt5Core")
++	if (BUILD_TESTING)
++		find_package(Qt5 REQUIRED COMPONENTS Network Test)
++		set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
++	endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
+-	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
+-                           OPTIONAL_COMPONENTS QtNetwork QtTest)
++	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore)
+ 	set(QUAZIP_LIB_LIBRARIES Qt4::QtCore)
+-	set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES QtCore)
++	if (BUILD_TESTING)
++		find_package(Qt4 REQUIRED COMPONENTS Network Test)
++		set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
++	endif()
+ else()
+ 	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
+ endif()
+@@ -67,8 +74,7 @@ endif()
+ 
+ add_subdirectory(quazip)
+ 
+-if(QUAZIP_ENABLE_TESTS)
++if(BUILD_TESTING)
+     message(STATUS "Building QuaZip tests")
+-    enable_testing()
+     add_subdirectory(qztest)
+ endif()
+-- 
+2.34.1
+
diff --git a/dev-libs/quazip/quazip-1.2.ebuild b/dev-libs/quazip/quazip-1.2.ebuild
new file mode 100644
index 000000000000..b118be537348
--- /dev/null
+++ b/dev-libs/quazip/quazip-1.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
+HOMEPAGE="https://stachenov.github.io/quazip/"
+SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	sys-libs/zlib[minizip]
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!=dev-libs/quazip-1.1-r0:1
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DQUAZIP_QT_MAJOR_VERSION=5
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use test && cmake_build qztest
+}