gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /app-misc
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
106 files changed, 1155 insertions, 1771 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 69594c644d16..168fb11d4460 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index 54e943b11544..7a72eccbdc99 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,6 +1,4 @@
 AUX asciinema-2.1.0-setuptools.patch 518 BLAKE2B 5d25d52cc9877744fd58be2d5f5b4ce0667652e4911d63ed64cd80911b9f84cf99e2b5c30f097ee18ac4adf8c36e69cbc9438ecdfa5588356636ed8de703a1e9 SHA512 e52d3c21318624a2a5abed08cdd485a6006e3e1278e59e757261b4f6f72224b51e8e171fa4fa5b010d1f7f354856848cef3f0fd1c14dca134cdc6b875d62c560
-DIST asciinema-2.0.2.tar.gz 50058 BLAKE2B db04e21f41b76a7b2be1ca119b2c0a2ff29c9e525c35180d2506722b12c7d139087d0a102bd984cecd7d69e2da0ce8ac0f4bc83c631bc1373fecc8de2d29f107 SHA512 27ae831494c2532270940c3e0fedc87ebbdc1e9d8d24c37d1b63d3f74d9722d38e867fa1b46656249e5b0a84ed7ed32bb21da65f06e9c6a8b787aebdce2068f3
 DIST asciinema-2.1.0.tar.gz 82022 BLAKE2B 2f7c68caef228a6cb98f3503212edc393bd8f7a3653a369b0509d45a6e19b8373630fac88498a771c0eaa2a322a95ab816b268660b8b2384d1ec25c617b06a5a SHA512 df77ccea13e06e9c5feda22be2366aa702acf510fdc6cbc9a09b20d67ae43a47214891fbb5ef080ff9af9c3ee2f450694c306ee1dbdbdef3f9862dc6dee60750
-EBUILD asciinema-2.0.2-r1.ebuild 599 BLAKE2B 7896149f4bdf6dc6b336f63741dab4714be462a6820550dea895ecc630ab5101c4c62859dbf5f213bf3b246fa7f5dffc3519edcbe5cbbacea3eb723c03a582bb SHA512 eb00b68e0021cc53a529c6e621a6c5d92efddf53148dadb60e6294c1552991108ec179761cf56aaceb42cda3a41e9810e633122fdced2f8faeed4a56d73a0031
 EBUILD asciinema-2.1.0.ebuild 648 BLAKE2B 3997c1daf213881550480de8df2e9d65ab8a1113e5514ef59cb0ec47669f66a7152789cc83ec680c0adb22ac6bcf27115cfcd824dba1dd7ff707c6792d5e290a SHA512 772f27cbb9808f638293dbaa79040aeab0a6c70521727930cd286c7a23253177381a9bbd11e4cf19816b0b70f9fb7227e9ae0fce1ef05115e129f5936e429ec3
 MISC metadata.xml 385 BLAKE2B f2b8a62b093eecc73e9fcaffad696b04b8d99d7123999afb566b55505a035765c11b8f8b7ad4a91fb346e474741d94a96e9cc9936a5040c15bf2582ed0fbeba9 SHA512 13c0a69cf14f3bcf6adc6ba333231f5e73df0674845280ed701f472e9aebbdb1181353aff7da6f95476e6c64eb5ec40d9b2ecc2e195be9476d021b55e205076f
diff --git a/app-misc/asciinema/asciinema-2.0.2-r1.ebuild b/app-misc/asciinema/asciinema-2.0.2-r1.ebuild
deleted file mode 100644
index cf6a18f64899..000000000000
--- a/app-misc/asciinema/asciinema-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i -e "s|data_files=\[('share/doc/asciinema|&-${PVR}|" setup.py || die
-}
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index 2be1f05b0fb4..b8ca3d4e20ac 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -1,7 +1,5 @@
 AUX conf-1.9 385 BLAKE2B 5a2ccebed6b8ab81fea623f66e1175506fe9bb8045bd516ccbb78c40d4b84d554c11ffb9d3c628b0142f5ce33d6f5e1ff8b140d8cd7d05642648c2e4f8bc700d SHA512 981dc0dca903f8ebdd3cc80368650d42f02bf194ccd12e64d2d4cc273ae13ec42da69341529750bca7232d7bcb3df67a02aa3db6179c4835682e86fabef689f0
 AUX init-1.9 511 BLAKE2B 8651a6f023f99f183bb7092a79f5a7d5d7d56f3321c18ceb0fcf8199f3217505a1e1238fa584d0ab9c7276d04abd9c5527ed2f732a44f39a6044310a20399b58 SHA512 7e16023709e72724f411953b2d042c6bb369be7c0a9c891d3e03ea12d4c175ce82e57466c8b2c2bf8611cb1f5aee9c76ae5adad0ad38e99c93525d732715546a
-DIST beanstalkd-1.10.tar.gz 66243 BLAKE2B ff9c37b82073435523e0bc98169026ba9c1f8e8963100f35f63c4bdcb35e9dc512f726e06b91931ac44e20f7d3c8a0b80e8be3675f924ff4339a5495b10f7c91 SHA512 db85e4a32c686330e50d64d497a39bb9806de42a2c2d2c84eb260ae8cfad91b4c99eef6a8f0ab3e62d0ca71a31837778ec68a4299899ac5a9d94a5a4403d673b
 DIST beanstalkd-1.12.tar.gz 79592 BLAKE2B d0abe510bada93014c9c748e116a7a34e947be50269eba3b64ed97739800f3464b7c2574c9d7e87786855f6f50701e60464d280c95db4f75f402f547700ef19e SHA512 347f8cf29501d4bf1a01a472f8f6265d1211eadfaa4e5626c8fcab5b1f8116e1e0ddee2a0c82ac116ee60655a2e3b514d254f98c2154be76109a24d77f7d8210
-EBUILD beanstalkd-1.10-r1.ebuild 911 BLAKE2B d912810d75d0e822a44481bbc1a3548fb6f9cc6ae0863f1ddfa6126d4627d51970f67a85e0ff82aefd51be95ff6bd816858b66c15df37f063d09410c7c81106e SHA512 925aab027bb55d6c856b7e55c724eb4028a828501ad35b00959a19cd08563a372e00d8c9bf6a5109ebe57684e9ee7236463a8be3f442698b4c200d86ed398163
 EBUILD beanstalkd-1.12.ebuild 852 BLAKE2B cb59c31bbc42bec08a1ce9f1019b97466ea364128910faf728a421e33cf41785e1d7d557cd50b2f17df779770c1348769fbdaa7eeb4717b47ba17f84fd26c887 SHA512 0e0f46d7b01b20e8063ccb2ce68cd4563dd907a46f4593548a97837494fc84448aa86922817119899e115f7507a6170a32a03d3d06d15404b85e7eb0d328d308
 MISC metadata.xml 251 BLAKE2B b73e2b21c0304e0fc001b7480a96e6432dd4e8846bbc9302b88778b08262b0677dd496ac2eab68403d7114ce10b823888826c6b1b2b1b63570de2019e27ec48b SHA512 827b351d2f43a349136e14e2dcc714739524568aef590a8c24536c968819dec6789cc2e38051a969cbdfbe89262d589395dc3d61f3ee3d03115672dbddd0832e
diff --git a/app-misc/beanstalkd/beanstalkd-1.10-r1.ebuild b/app-misc/beanstalkd/beanstalkd-1.10-r1.ebuild
deleted file mode 100644
index 489bb2fc14e4..000000000000
--- a/app-misc/beanstalkd/beanstalkd-1.10-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="A simple, fast work queue"
-HOMEPAGE="https://kr.github.io/beanstalkd/"
-SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos"
-
-RDEPEND="
-	acct-group/beanstalk
-	acct-user/beanstalk
-"
-
-DOCS=( README News docs/protocol.txt )
-
-src_prepare() {
-	sed -e "s/CFLAGS=/CFLAGS?=/" \
-		-e "s/LDLIBS/LDFLAGS/" \
-		-e "s/LDFLAGS=/LDFLAGS?=/"
-		-i Makefile || die
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	dobin beanstalkd
-
-	doman doc/"${PN}".1
-
-	newconfd "${FILESDIR}/conf-1.9" beanstalkd
-	newinitd "${FILESDIR}/init-1.9" beanstalkd
-
-	systemd_dounit "${S}/adm/systemd/${PN}".{service,socket}
-}
diff --git a/app-misc/bgrep/Manifest b/app-misc/bgrep/Manifest
index 85985c7d33c7..172184bc3d0c 100644
--- a/app-misc/bgrep/Manifest
+++ b/app-misc/bgrep/Manifest
@@ -1,5 +1,3 @@
 DIST bgrep-0.2_p20210221.tar.gz 4854 BLAKE2B 85c9171572e440f1e5def3a902a4adb1a3339706847013c6ff139745a819d9eab48a9449bf89b631cfcfe0081365240eefcae46a68064f710178db6d2db50037 SHA512 a9488ee9fd68a1b0e9924cbdf1e36fb3517cdceee4b57a27ef148ccd2c3f51942f8a57b41d47a2cb5b65b376b0b87c92ca4ee5d7053714a725c57ffbabbf12b6
-DIST tmbinc-bgrep-49b098b.tar.gz 3386 BLAKE2B 3c98e849689cf5b9131a52578bef8735f7ff8d0a8a8b7c1c3e048487d3e40c9c34e902e737e3fa0d40e0e640ffc1a7cedb49b1b45d04263c7c987625cd02726f SHA512 18a0161fe23a04d36bbfe67712a90b3d30c4cca95fed023773b0a1eda5fc1c284996d9669eec256a9aacc7019297f96c3d4fe69c240595bcdcc3a8b7c1bea990
 EBUILD bgrep-0.2_p20210221.ebuild 751 BLAKE2B 776c93fdcd639867a50cfbcb84abede39c6c0fe1524f69c9f848bb3d5798bf5fbc75edf116413cdb7f7f1f286d5894f7356b2867da0155cf8369d8873d1b0ea3 SHA512 1a06e055664c0617e086e7a2683c379075d9832fd5084f930bb879a706bde59d70d1864d837618eee4e15094ed9478be8cbf9db442d8d50387c8c9f1e7c5a1d9
-EBUILD bgrep-0_p20110121-r1.ebuild 835 BLAKE2B be476291900a3b914cfb7615c4f49819aacae13adc798568b0683018ad80928c204264cd55e0cdc3ac2cc32cc5b0b080d46e29f59763531586b77f272d8b72ce SHA512 0eb81251c1f16f93fb9cddc2a5249fe897cca706fd30021140251e260d48fe23c72a87de4af71c0d57eb28350706139ae0c7522e8ae19c63b8a7e41e2ad0a3b8
 MISC metadata.xml 245 BLAKE2B bd29244a57f054f042f71968b5f20b23e0074ce9b590ff8dfc8076025510e068bc20d7539899dec7872b76ca0a3130d7a3673f59c34c3c33395738e8c22323cc SHA512 a5d2111b57d5da663b929ed77d5bdbfe9f2934d6bf4ff619d0ca0e58cf8af4dc32e7f76305a70de37f68caa24aca0df64297912fbe18c07cfd7634ca9c7286ef
diff --git a/app-misc/bgrep/bgrep-0_p20110121-r1.ebuild b/app-misc/bgrep/bgrep-0_p20110121-r1.ebuild
deleted file mode 100644
index 6f15514382ce..000000000000
--- a/app-misc/bgrep/bgrep-0_p20110121-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GITHUB_USER="tmbinc"
-GITHUB_HASH="49b098be9548d174023ad05c10f6af9d02b8e18e"
-MY_P="${GITHUB_USER}-${PN}-${GITHUB_HASH:0:7}"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Grep-like tool to search for binary strings"
-HOMEPAGE="https://github.com/tmbinc/bgrep/"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/tarball/${GITHUB_HASH} -> ${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( dev-lang/perl )"
-
-src_prepare() {
-	default
-	sed -i -e "s|/tmp/|${T}/|g" \
-		test/bgrep-test.sh || die
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_test() {
-	cd test || die
-	./bgrep-test.sh || die
-}
-
-src_install() {
-	dobin bgrep
-	dodoc README
-}
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index c7309e5e8d06..d65f215ce7eb 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -27,6 +27,7 @@ DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST broot-1.10.0.tar.gz 9419669 BLAKE2B 6b8bf45b13d3f95488677f6c5322bb74f0c60d51b6686760a6d8aa0c53e9705c7e2c6120868433be38324f4ec38c2506bfb32f67a645fc9dfd23f49b46807e9b SHA512 24a098eb1f2ff428030e84ca8a875169291b830bf6b64ca4f2442aede80ffbcee9297ca1dd17183b03621a9d6352d9c1fec85db8a3afe7f4cbe630a70a521caf
 DIST broot-1.11.1.tar.gz 10039048 BLAKE2B 5d52bf08658a117d6240f9f0502f6b366fab8516c3e7638611b5397ea1981405c77d788539c6d4c957c64298014980461b97156350c982dc9c0c5097ef7f3981 SHA512 dd8478a904df85999221a8e6466d3025de0d80ad9f7f1d1d0627a103893a6de3f379c1434ac59afe534bb28bda9a3ea0c269efe7d3266bdf87cbc5efcf07421f
+DIST broot-1.12.0.tar.gz 10041150 BLAKE2B f6c47b137844d2615389552a9e245003ab2c5c1bb7b266e8d89e729ea1218c01f8924b378f892386ca5154085f5f1ba5052a2e7ba5e477a1c5053970d1688a40 SHA512 47d4940c077d782b79e1fde6a74eac42ac60444a078a2d96d8fbb9cf9ded2f3753ff6cc4f0983df849234535e750f881d0bebae3fe625a121d2b23652c7ef6b9
 DIST broot-1.8.1.tar.gz 9417690 BLAKE2B 499cd7fc32c7a7151a2ea0599e4c9332162a235a83a22e953b0f4dad098c95320986352f0129eacc4b4feb8d68c81276274bd9d8072ade8158fb89bb5a0c6048 SHA512 ddd84d7dad2416c63bcab2e8e72375aa14b4748a5a29708c47b7df5f4a203691ad8d0587dde1ba961658195fe6ecfea154729bcfd7e757777a53a16cde9f2a09
 DIST broot-1.9.2.tar.gz 9421208 BLAKE2B 15f0df8f69d0a3a70a025cebe2e930381a7b198d2e70f7effb81bc4bec4b5b1f8095167512ae592ae0682abf1cf6853d33415be05bdd7e1e54b24ae573248d3a SHA512 3bd69d58913866a7bad11d97dc50a9eb22b0ceb4536a0a78b1b76bb2b83fbedc6feaf8d0f0500db30191f93e6d7cb369ea440e9857cdfb85f967b29a65053605
 DIST broot-1.9.3.tar.gz 9418812 BLAKE2B 02e007f8ab1faa3d7297b7106166311f7eaa4aa37e13fb82a9200ab84c9cce6bab4c2ae892a75290f2982391a4e55a3ab07cdb0cbc9878c6367ae35b464bb143 SHA512 dec999d5b00dfad7ff7104244774f124b7d4d4e7b9cedbc7c0bbda2df7be01622c65e3fa88abc6483621b697b18868bca481c82a2d4407cac1138a3f7fc5f28c
@@ -286,6 +287,7 @@ DIST xterm-query-0.1.0.crate 5662 BLAKE2B fe75d2e7d4e493a3dfc0105dd61e923910f890
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD broot-1.10.0.ebuild 4724 BLAKE2B e13e4163a0ad1571f2c784d99387a6a5d36c99cab790be2bae88aa2e54eec90a3f13e0e15fee550399f4a6c128a6011ce96743b9e463a0ce13a76e4087211b91 SHA512 33977c27bcca26ef89dfd0132690200a6742bf1926b87f4c43009655b8432525f9a651adb4604706566faef4910234b4384fbf75ca3af51043603340cf46e99a
 EBUILD broot-1.11.1.ebuild 4726 BLAKE2B 02aaf695de78329cbc952f2454dbfc8f742c37a590a5bc2ba5fc41392787d132e03fd21ffd24ce6839af228ac417c483ebdc2ec010894e70f928e3cb38ebee36 SHA512 038175ee519bcf5d628fa3340809ad775ec692308e89849df54d6d36d1ab39e1cb798c7f88913f097f14dfa644f0008bc0ec2294bc14a2ccf8caecb143f1dd5e
+EBUILD broot-1.12.0.ebuild 4780 BLAKE2B 421e432bd1b1253dfbc3242288e7629370cb11f09ad92b0ad78e8f0189f8d0681a5633c5036876644ca8ebb08b432b8c4220ba94acd97f9b522aa9515c61c0f7 SHA512 a2a02e67253c4f38c88934caaffc30bfee478c458c3e7fc28797c441d58e6fa01e01db85646ffd5d7f56967b73d33388ee6b56a237861e8582108c333b29809e
 EBUILD broot-1.8.1.ebuild 4564 BLAKE2B 5e3958df321e20a68b6a3982eaa07d5eff329525189bd94b677c321fe394a90ba772d302b133e26b161678b4fc52ce9014d3e9737046fe43c8ea384383342171 SHA512 6cec0e09e46150e09047f7d5fbbc4ba269a542306cd3fd3821449d77129fea969534bd492fa9f69291d188cb5573418fea19a4cb00782cf87f642e5f9233f933
 EBUILD broot-1.9.2.ebuild 4593 BLAKE2B 13ad217d95abc40ecfd15aa09e436fa2f4311ebc1dd1a529d265bc32b8d4382c24fb74c0eb59b851466cf3a0512411d1b90fd2c3109eac2af17a0a1a24fcec03 SHA512 4e4196bd17309b2e318518c45f7461ef45748bca00b5b77c884274d62d1c177ba722a1247004a34d218b18b798a50d3a9cf0eec102766e483abdc663b8615253
 EBUILD broot-1.9.3.ebuild 4672 BLAKE2B 63c7668419110b6ec68937f87c6990bf58acbceaedb51bbda744254d5b65492798158aaee8c2780387a7513f2ee0330c5814abddb6172a265e01277b42ca9849 SHA512 e1f9b9ccfc645e822a400c540a504bbd7a456493dd0b5cfb1671add7898baf5a4fac7370ef8b33ed42ed21130112ef4c3084eb7b1a5b0058c56745636072ac8c
diff --git a/app-misc/broot/broot-1.12.0.ebuild b/app-misc/broot/broot-1.12.0.ebuild
new file mode 100644
index 000000000000..4ec52da34716
--- /dev/null
+++ b/app-misc/broot/broot-1.12.0.ebuild
@@ -0,0 +1,273 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+adler32-1.2.0
+ahash-0.4.7
+ahash-0.7.6
+aho-corasick-0.7.18
+ansi_colours-1.1.1
+ansi_term-0.12.1
+anyhow-1.0.56
+argh-0.1.7
+argh_derive-0.1.7
+argh_shared-0.1.7
+atty-0.2.14
+autocfg-1.1.0
+base64-0.13.0
+bet-1.0.1
+bincode-1.3.3
+bitflags-1.3.2
+bstr-0.2.17
+bytemuck-1.8.0
+byteorder-1.4.3
+cc-1.0.73
+cfg-if-1.0.0
+char_reader-0.1.1
+chrono-0.4.19
+clap-2.34.0
+cli-log-0.1.0
+cli-log-2.0.0
+clipboard-win-4.4.1
+color_quant-1.1.0
+coolor-0.3.1
+crc32fast-1.3.2
+crokey-0.4.0
+crokey-proc_macros-0.4.0
+crossbeam-0.8.1
+crossbeam-channel-0.5.2
+crossbeam-deque-0.8.1
+crossbeam-epoch-0.9.7
+crossbeam-queue-0.3.4
+crossbeam-utils-0.8.7
+crossterm-0.19.0
+crossterm-0.22.1
+crossterm_winapi-0.7.0
+crossterm_winapi-0.9.0
+csv-1.1.6
+csv-core-0.1.10
+csv2svg-0.1.6
+custom_error-1.9.2
+deflate-0.8.6
+deser-hjson-1.0.2
+directories-3.0.2
+directories-next-2.0.0
+dirs-sys-0.3.6
+dirs-sys-next-0.1.2
+doc-comment-0.3.3
+either-1.6.1
+error-code-2.3.1
+fallible-iterator-0.2.0
+fallible-streaming-iterator-0.1.9
+fastrand-1.7.0
+file-size-1.0.3
+flate2-1.0.22
+fnv-1.0.7
+form_urlencoded-1.0.1
+getrandom-0.2.5
+gif-0.11.3
+git2-0.13.25
+glassbench-0.3.1
+glob-0.3.0
+hashbrown-0.9.1
+hashbrown-0.11.2
+hashlink-0.6.0
+heck-0.3.3
+hermit-abi-0.1.19
+id-arena-2.2.1
+idna-0.2.3
+image-0.23.14
+indexmap-1.8.0
+instant-0.1.12
+is_executable-1.0.1
+itoa-0.4.8
+itoa-1.0.1
+jobserver-0.1.24
+jpeg-decoder-0.1.22
+lazy-regex-2.3.0
+lazy-regex-proc_macros-2.3.0
+lazy_static-1.4.0
+lfs-core-0.11.0
+libc-0.2.119
+libgit2-sys-0.12.26+1.3.0
+libsqlite3-sys-0.20.1
+libz-sys-1.1.5
+line-wrap-0.1.1
+linked-hash-map-0.5.4
+lock_api-0.4.6
+log-0.4.14
+matches-0.1.9
+memchr-2.4.1
+memmap-0.7.0
+memoffset-0.6.5
+minimad-0.7.1
+minimad-0.9.0
+miniz_oxide-0.3.7
+miniz_oxide-0.4.4
+mio-0.7.14
+miow-0.3.7
+nix-0.22.3
+ntapi-0.3.7
+num-integer-0.1.44
+num-iter-0.1.42
+num-rational-0.3.2
+num-traits-0.2.14
+num_cpus-1.13.1
+num_threads-0.1.4
+once_cell-1.10.0
+onig-6.3.1
+onig_sys-69.7.1
+open-1.7.1
+opener-0.5.0
+parking_lot-0.11.2
+parking_lot_core-0.8.5
+pathdiff-0.2.1
+percent-encoding-2.1.0
+phf-0.9.0
+phf_generator-0.9.1
+phf_macros-0.9.0
+phf_shared-0.9.0
+pkg-config-0.3.24
+plist-1.3.1
+png-0.16.8
+ppv-lite86-0.2.16
+proc-macro-hack-0.5.19
+proc-macro2-1.0.36
+proc-status-0.1.1
+quick-xml-0.22.0
+quote-1.0.15
+rand-0.8.5
+rand_chacha-0.3.1
+rand_core-0.6.3
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.11
+redox_users-0.4.0
+regex-1.5.5
+regex-automata-0.1.10
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+rgb-0.8.32
+rusqlite-0.24.2
+ryu-1.0.9
+safemem-0.3.3
+same-file-1.0.6
+scoped_threadpool-0.1.9
+scopeguard-1.1.0
+secular-1.0.1
+serde-1.0.136
+serde_derive-1.0.136
+serde_json-1.0.79
+signal-hook-0.1.17
+signal-hook-0.3.13
+signal-hook-mio-0.2.1
+signal-hook-registry-1.4.0
+siphasher-0.3.10
+smallvec-1.8.0
+snafu-0.7.0
+snafu-derive-0.7.0
+splitty-0.1.0
+str-buf-1.0.5
+strict-0.1.4
+strsim-0.8.0
+svg-0.8.2
+syn-1.0.86
+syntect-no-panic-4.6.1
+tempfile-3.3.0
+termimad-0.10.3
+termimad-0.20.0
+terminal-clipboard-0.3.1
+termux-clipboard-0.1.0
+textwrap-0.11.0
+thiserror-1.0.30
+thiserror-impl-1.0.30
+tiff-0.6.1
+time-0.1.43
+time-0.3.7
+tinyvec-1.5.1
+tinyvec_macros-0.1.0
+toml-0.5.8
+umask-1.0.1
+unicode-bidi-0.3.7
+unicode-normalization-0.1.19
+unicode-segmentation-1.9.0
+unicode-width-0.1.9
+unicode-xid-0.2.2
+url-2.2.2
+users-0.11.0
+vcpkg-0.2.15
+vec_map-0.8.2
+version_check-0.9.4
+walkdir-2.3.2
+wasi-0.10.2+wasi-snapshot-preview1
+weezl-0.1.5
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+x11-clipboard-0.5.3
+xcb-0.10.1
+xml-rs-0.8.4
+xterm-query-0.1.0
+yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libgit2:=
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/rust-1.58"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_configure() {
+	export RUSTFLAGS="-Cstrip=none ${RUSTFLAGS}" #835400
+	local myfeatures=( $(usev X clipboard) )
+
+	cargo_src_configure --no-default-features
+}
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+
+	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
+	cd ${build_dir[0]} || die
+
+	newbashcomp ${PN}.bash ${PN}
+	newbashcomp br.bash br
+
+	insinto /usr/share/zsh/site-functions
+	doins _${PN}
+	doins _br
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+	doins br.fish
+}
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index cc6545d35b57..c879fa0a9792 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1,3 +1,3 @@
 DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
-EBUILD c_rehash-1.7-r1.ebuild 921 BLAKE2B d0cbefa0e9d5c8056932b82e514c04f4cf522f526116bdeed8aee947d5decb82aedf06e24c2a72b0b265befdcf8a6da897fd5aa06e61f1949b99daf516107299 SHA512 7216bc8fc3562f7839dfed1fe66b7d8143b7b0eaa1820a9ba8ceccdfc721a378935f38715445bc5a78940696ba49d3408c857fa927fd20269ed97598f030ab4b
+EBUILD c_rehash-1.7-r1.ebuild 928 BLAKE2B cd0401cf38611c7025b5fe8391391cc75eb8ff796d15a89bdaed4e19ed647fda92abca451014cf3a1ce05f1c7cf2a1dda74aec68a4dab1adfc3d9c072025b6f0 SHA512 2b8461bf9063e520fe87c157ffa313697d630ece4d8787fb3d1fc0fb8b79cefa1d1ec9560e4f72d5aad3a7ce4de84e483a70b0b91f3cdf0458b142c3c13cd2be
 MISC metadata.xml 340 BLAKE2B 18c63b1a5966e9cb39197495d6ad59c7e2999a96f1fba3aff63f203a0b08f6f50433679f89a81cbc6923893cda303466aaf7c0582dd4467ee61c5c004c20735f SHA512 59121a842240d53abc14bfac1293b79e86cb362fccb244cd6d950c51603bb99721be3c5046dd2a88707b56484afb2d9c1d6db3afb59eda5672e4b6cec5be3bfc
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index 1aecc57e1922..a1e262077a58 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
 DEPEND="${RDEPEND}"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 4a3c5a1cd907..c1c58eb1357f 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -3,14 +3,8 @@ AUX ca-certificates-20211016.3.72-no-cryptography.patch 824 BLAKE2B fb71347a7763
 DIST ca-certificates_20210119.tar.xz 232964 BLAKE2B 593352912d2b490e3f46ea032ac1ddf1c87a7ac93859d475461cbba490918cdec853b0bb30bb253a634d8d597ca6f0304bc81122b4b31b5b31fd6a80e1faaf33 SHA512 a824209fa0ff0865872a07d8e6b901d8407f599243810fd5c820e1f69226e05b0b4f1e25e5ff3d8d398ff952529084442f026e32220961f359f6323f6bf03373
 DIST ca-certificates_20211016.tar.xz 239608 BLAKE2B 9b4730b54fd9f472fe4e5427bf912d9a61d10d2c289d1e443b54cca469fa87f9e02b8f67e7e087aceceffc7dd2b4043cdb5380e2652bc619d51f3a224c64f717 SHA512 bedf072c8aa1b05b249ea272f5cecfe16bdcd762c02c712323f12ac7a278e8814453f5f3caad86a2581e451788b292ed3a76a6a81620926459bb890133cffde1
 DIST nss-3.66.tar.gz 82401896 BLAKE2B ae369899af681e1c6ea8046098c83da08c2112b16d85a0eaee46e9d4f97dfb3f7c3e97eb681ec947b5648446c6db51e8f1396ec9bb6c731c9678ecf925e7f743 SHA512 327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467
-DIST nss-3.71.tar.gz 83927933 BLAKE2B a8d683b9f9bff5390e0378ab0d55156f7cc69a52b0667658738e67e920548965e7a276dc4104547b2e6a1a6d18325c3f85b955b9c12d7f071d10930b5264207e SHA512 a4a724dc4e8677965b6245ea2309790d31ec7719658e2b349eb67c9008082132c76277340d15e4fdd8d2fe1f560ae6803fb038d023c3dfd2e3772fa3b77720e2
-DIST nss-3.72.tar.gz 83928300 BLAKE2B d92889e27e99095a18090eff0c08b8653ef1f53f4954f5bd018df2f2903647bc71f217159bb4b11f0d6b4fb289fda20bffa2d1d207d1836dcfc33dbd4bedf511 SHA512 1d818d2ef85735837275059fecf68d57e48152f0348ea54887c29171cf029b6944e94d99a8cd96e580a81edb678b79c55515ac0516e27daf6b290c34baed9ebb
-DIST nss-3.76.1.tar.gz 84626067 BLAKE2B 5112b208f3b9528a34b1d8e3e669db067ecb79719ad16793b8cd556a02910cc29f899f2a57e959c50048c5d2b94eb3b9855208dd3c20646a719c971561f6ea4c SHA512 80d32a97501cbc05312caa5cec54fe6dd8708f01e6d15693e36a40d70433be7a35565fcc5fadfc324c998ee9093b10b2f7a89643882f06a850eda4ffd3b19c54
 DIST nss-3.77.tar.gz 84592839 BLAKE2B a63770f550b062549901afdcc5dc2a11c4648cef6875b023895da01ef53d6afc8c618291de96ac0af3a2c2cd7aa7986f93b4f10102a3c5aca1aa1447c148c393 SHA512 bd62eeb8f90ecd2d3999fd78fea6652736c02a6530f29e98d0cad0707f3b901b30409132eb6a6d53b9f5c05c6b464615a946a2a3e255553c793e44d0ed93179e
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
-EBUILD ca-certificates-20210119.3.66.ebuild 5729 BLAKE2B 621fa9f502341120c79456c777adc53bc5f745e30c5f0262f9939115d0aa689e050c1fa0804c60f576e6a6e4d551eed66ae1688fb1221f3df0457a5d1fc12c66 SHA512 ebc95de3a0c5d64927d6aea7399ed7d7d314ff275de0e8ffe3c62a26b86518104cdba475ca99b01de0967a0dcc807bd8e1b5fc7528f77d890a7f7d46b30f2855
-EBUILD ca-certificates-20210119.3.71.ebuild 5737 BLAKE2B 58d29e546924fffc92dbcea7b2758b5486c1338852d3d6794df12cd07770552ad961fcdf961bb2c486dfb0a15b12d234cd4e4ac4c127f1ac2fedf4b829daf0ea SHA512 5750aa5e1c62ad82dadac6a67fb847d4f6c18f30c2fd4eca0da9c798ef285a49784633f399f1df0cd4a3a480fa936f471c06e90a693b46ab7d943574dec9c7a6
-EBUILD ca-certificates-20211016.3.72.ebuild 5906 BLAKE2B f93d6e3a59c78016256a839849c2e1869225429276c30add1ce26399979cc57f4f45c1121560836d7b85f0d899e75d522d5d06e419cd17e15738775d431cef6c SHA512 d190a2b873aaa825a98b79adb6e80de12f1b7fb1eb3231c20bab79e1936f037ad8c29ecd0bbcc65a8c1f8b5cc989ee27e560ed5950cb4f201397ba9446749da3
-EBUILD ca-certificates-20211016.3.76.1.ebuild 5921 BLAKE2B 8b46948c07cddd68dd350021d2b6ebfeef40e502922157253eb6aa27105e2395c0eacd9f7c62e4335db465f89823ab4bd9d805271b27f94795f936842d14728f SHA512 e270f8f25c896b0208c0899e21cdec71dbea6f71fc4eadcf84255f7ae2ce30350594ef2239c2ae1cbdce98daff31782e146faa0359d4c191c725cc6456d045cd
-EBUILD ca-certificates-20211016.3.77.ebuild 5921 BLAKE2B 8b46948c07cddd68dd350021d2b6ebfeef40e502922157253eb6aa27105e2395c0eacd9f7c62e4335db465f89823ab4bd9d805271b27f94795f936842d14728f SHA512 e270f8f25c896b0208c0899e21cdec71dbea6f71fc4eadcf84255f7ae2ce30350594ef2239c2ae1cbdce98daff31782e146faa0359d4c191c725cc6456d045cd
+EBUILD ca-certificates-20210119.3.66.ebuild 5729 BLAKE2B a7d54e1ca93169be4a31763b784319b55a10dec2c3280c1095d8765f954a6525aa275e8fa8752ca1557a62aaedd9d6bfd87873dab9e99567a2d0e945a216e86c SHA512 39389a5aa5393372df2e00418f4e81c11cf178caa5b6e97558aa80b8d885c038b34e7df24cd1d39d30c1c2c9dd7fd6de1ddd191b30b061fbd08adfc7aa2ecdbe
+EBUILD ca-certificates-20211016.3.77.ebuild 5928 BLAKE2B 245cf66585bb22c90e2ddae3e90c29050acde45a67315b2f04661eb5b1151c2203de611d696d2c7aa26c39e007620e14ec6fe239b7b8cb1190abc37853842a05 SHA512 ecd03ada9a3f6f905d2d7ee2ed1d67d976467a381d2dfb84fdc581c0ef1f180d7cd9d04a84b835bb91612cfee1a8790261260f51da78a6498f17d274fdc5c750
 MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954
diff --git a/app-misc/ca-certificates/ca-certificates-20210119.3.66.ebuild b/app-misc/ca-certificates/ca-certificates-20210119.3.66.ebuild
index 08fedcfa8fe7..2e7b4998455b 100644
--- a/app-misc/ca-certificates/ca-certificates-20210119.3.66.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20210119.3.66.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # The Debian ca-certificates package merely takes the CA database as it exists
@@ -18,7 +18,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1
 
diff --git a/app-misc/ca-certificates/ca-certificates-20210119.3.71.ebuild b/app-misc/ca-certificates/ca-certificates-20210119.3.71.ebuild
deleted file mode 100644
index 589797be2800..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20210119.3.71.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging user reports, refer to our wiki for tips:
-# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-
-	DEB_VER=$(ver_cut 1)
-	NSS_VER=$(ver_cut 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" cacert"
-
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-CDEPEND="app-misc/c_rehash
-	sys-apps/debianutils"
-
-BDEPEND="${CDEPEND}"
-if ! ${PRECOMPILED} ; then
-	BDEPEND+=" ${PYTHON_DEPS}"
-fi
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-
-RDEPEND="${CDEPEND}
-	${DEPEND}"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	if ! ${PRECOMPILED} ; then
-		default
-		# Initial 20200601 deb release had bad naming inside the debian source tarball.
-		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
-		DEB_BAD_S="${WORKDIR}/work"
-		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
-			mv "${DEB_BAD_S}" "${DEB_S}"
-		fi
-	fi
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}" || die
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin || die
-		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
-			usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
-			eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
-			popd >/dev/null || die
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		-e 's/openssl rehash/c_rehash/' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs \
-			etc/ca-certificates/update.d \
-			"${c}"/mozilla \
-			|| die
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org || die
-			mv "${d}"/CA_Cert_Signing_Authority.crt \
-				"${c}"/cacert.org/cacert.org_class1.crt || die
-			mv "${d}"/CAcert_Class_3_Root.crt \
-				"${c}"/cacert.org/cacert.org_class3.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	(
-		echo "# Automatically generated by ${CATEGORY}/${PF}"
-		echo "# $(date -u)"
-		echo "# Do not edit."
-		cd "${c}" || die
-		find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ${PN}-${DEB_VER} || die
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild
deleted file mode 100644
index 30183fb5044d..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging user reports, refer to our wiki for tips:
-# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-
-	DEB_VER=$(ver_cut 1)
-	NSS_VER=$(ver_cut 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" cacert"
-
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-CDEPEND="app-misc/c_rehash
-	sys-apps/debianutils"
-
-BDEPEND="${CDEPEND}"
-if ! ${PRECOMPILED} ; then
-	BDEPEND+=" ${PYTHON_DEPS}"
-fi
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-
-RDEPEND="${CDEPEND}
-	${DEPEND}"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-
-	if ! ${PRECOMPILED} ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if ! ${PRECOMPILED} ; then
-		default
-		# Initial 20200601 deb release had bad naming inside the debian source tarball.
-		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
-		DEB_BAD_S="${WORKDIR}/work"
-		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
-			mv "${DEB_BAD_S}" "${DEB_S}"
-		fi
-	fi
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}" || die
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin || die
-		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
-			usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
-			eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
-			popd >/dev/null || die
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-
-	pushd "${S}/${PN}-${DEB_VER}" >/dev/null || die
-	eapply "${FILESDIR}"/${P}-no-cryptography.patch
-	popd >/dev/null || die
-
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		-e 's/openssl rehash/c_rehash/' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
-
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs \
-			etc/ca-certificates/update.d \
-			"${c}"/mozilla \
-			|| die
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org || die
-			mv "${d}"/CA_Cert_Signing_Authority.crt \
-				"${c}"/cacert.org/cacert.org_class1.crt || die
-			mv "${d}"/CAcert_Class_3_Root.crt \
-				"${c}"/cacert.org/cacert.org_class3.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	(
-		echo "# Automatically generated by ${CATEGORY}/${PF}"
-		echo "# $(date -u)"
-		echo "# Do not edit."
-		cd "${c}" || die
-		find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ${PN}-${DEB_VER} || die
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.76.1.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.76.1.ebuild
deleted file mode 100644
index 864b59789c1f..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20211016.3.76.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging user reports, refer to our wiki for tips:
-# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-
-	DEB_VER=$(ver_cut 1)
-	NSS_VER=$(ver_cut 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" cacert"
-
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-CDEPEND="app-misc/c_rehash
-	sys-apps/debianutils"
-
-BDEPEND="${CDEPEND}"
-if ! ${PRECOMPILED} ; then
-	BDEPEND+=" ${PYTHON_DEPS}"
-fi
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-
-RDEPEND="${CDEPEND}
-	${DEPEND}"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-
-	if ! ${PRECOMPILED} ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if ! ${PRECOMPILED} ; then
-		default
-		# Initial 20200601 deb release had bad naming inside the debian source tarball.
-		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
-		DEB_BAD_S="${WORKDIR}/work"
-		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
-			mv "${DEB_BAD_S}" "${DEB_S}"
-		fi
-	fi
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}" || die
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin || die
-		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
-			usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
-			eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
-			popd >/dev/null || die
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-
-	pushd "${S}/${PN}-${DEB_VER}" >/dev/null || die
-	eapply "${FILESDIR}"/${PN}-20211016.3.72-no-cryptography.patch
-	popd >/dev/null || die
-
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		-e 's/openssl rehash/c_rehash/' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
-
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs \
-			etc/ca-certificates/update.d \
-			"${c}"/mozilla \
-			|| die
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org || die
-			mv "${d}"/CA_Cert_Signing_Authority.crt \
-				"${c}"/cacert.org/cacert.org_class1.crt || die
-			mv "${d}"/CAcert_Class_3_Root.crt \
-				"${c}"/cacert.org/cacert.org_class3.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	(
-		echo "# Automatically generated by ${CATEGORY}/${PF}"
-		echo "# $(date -u)"
-		echo "# Do not edit."
-		cd "${c}" || die
-		find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ${PN}-${DEB_VER} || die
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.77.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.77.ebuild
index 864b59789c1f..4660acc41ba3 100644
--- a/app-misc/ca-certificates/ca-certificates-20211016.3.77.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20211016.3.77.ebuild
@@ -18,7 +18,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1
 
@@ -50,7 +50,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/cadubi/Manifest b/app-misc/cadubi/Manifest
index 2734a6c4ab6b..72cfed59ccce 100644
--- a/app-misc/cadubi/Manifest
+++ b/app-misc/cadubi/Manifest
@@ -1,4 +1,6 @@
 AUX cadubi-1.3-helpfile.patch 351 BLAKE2B 1dae10ad3b58bfc21b0c1ffcccbaec6c41de3433fad5657ed02273fb0f91e3e0ad3c15292c8bc5cca5850cbd0ad41d3fed8705f50f22431908565f5f66e27da6 SHA512 36c2af2d77a58d5091b7171495a8d788e219e65a664fe0bfd55800a2aacaac04db5e2d249c6bc8737336c43e2852687f7fee7da4510597d64b40abe4843cdac3
+DIST cadubi-1.3.4.tar.gz 65661 BLAKE2B 239cedfe50fba79bcfe250a2b646f851ef06bdae18260aeab2d10b8889dcc0d9d086f3edc8b594b3199aaa23f85ab3bd3393d63428ea545893f41a723063c9a0 SHA512 02a8e6d49f4892294d0c8fdffa7b6032ed7529bf0869681e9b760ed5c227905cca829d1f4e049400789d69c1251f4df714bf36d5c42dc778ac37e89cf753b45a
 DIST cadubi-1.3.tar.gz 12559 BLAKE2B d1a32d602c00d76717e8e6cdf8d376dca12f9f55f9375bb0b8ea781cf923cfb90789cc011a3ab33960339ced3c05c668f6c6ec6e5b33ca89f7eda27c47789639 SHA512 e3b5190850bd4d579934bd5825db2b8bde5a46158862ec66b8604999344138477c0fb3fad34dc186ed9dd67dfbdcacf12763f76adbdfbd0cc4dbf6b51ad53bc7
+EBUILD cadubi-1.3.4.ebuild 646 BLAKE2B c3510e82c16cace0c0c6405e815567065f7e7b064a953de0afe1b6656b15deb4d39b2130bb95581f5bb5ebac3f5c88763839fd2c0a8f13660f95d75ca874d871 SHA512 e88557bced88d4dab9b25f83e17390c7c31ded7eeb3c962745bd7c4974a3303f372c5f183f88745d2cabd7352ab20748f864656890e0c46f05ea09dbfb3b9ecc
 EBUILD cadubi-1.3.ebuild 574 BLAKE2B 690a332da44371b7fab741801b9cc0465962db1d5a6b2e51e53688a06f3a3c4ebfd70a4282921aa174839de0de3c05cbc81864b91d6f59fbd6d82dbb3a4342ba SHA512 804928407e3d0e042b1b1395720f373992a21c2037066771d1480b3cc3079c38e22ecad4101b55124f2c2a277e16e9f24bf741bb0df32f146d509b78bb303be0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/cadubi/cadubi-1.3.4.ebuild b/app-misc/cadubi/cadubi-1.3.4.ebuild
new file mode 100644
index 000000000000..2cf1358ee321
--- /dev/null
+++ b/app-misc/cadubi/cadubi-1.3.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="An application that allows you to draw ASCII-Art images"
+HOMEPAGE="https://github.com/statico/cadubi"
+SRC_URI="https://github.com/statico/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-lang/perl
+	>=dev-perl/TermReadKey-2.21"
+
+src_prepare() {
+	default
+	sed -i "s|$Bin/help.txt|$Bin/../$(get_libdir)/${PN}/help.txt|g" ${PN} || die
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	insinto /usr/$(get_libdir)/${PN}
+	doins help.txt
+	dodoc README.md
+}
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
index 9e4b36733177..ba8e5117cad6 100644
--- a/app-misc/ddccontrol-db/Manifest
+++ b/app-misc/ddccontrol-db/Manifest
@@ -1,5 +1,3 @@
-DIST ddccontrol-db-20190826_p20200613.tar.gz 85044 BLAKE2B 6f80a7a53843dc29ff6158614dd36eba3d7f8172e21592776426464729b4bdcfd3bea51b8412919aa5231015f75766da51eb71f4d808b4c280c045209a4edf1a SHA512 9171193fd31c877699df9e8740cbed0a8de68acc41b614ded36022a25be27f01cf34129033ae3c219211bff54ea82882a955f587dfa87fa7571d3992ac3fa4de
 DIST ddccontrol-db-20210812.tar.gz 100719 BLAKE2B aecc9e9bf432905652e69b17b274daa07222d8f766048f29493eb0e50e07331fb5434258faad277ce21dec6475b192b4575eb1ebbd117edd25d333091ba33c8c SHA512 5bf64d69e1dd4324ce498909313b5c32a4af18d101e1536c40845f9a440f353e0ecb36d26441733c68de05be7e52dcea983325d70f4d542df85b5462ad193cb7
-EBUILD ddccontrol-db-20190826_p20200613.ebuild 820 BLAKE2B c976f2ec2a274ddb6340e71e8b1ce7c173c1519ffabde33419039369df59ab711e8c08c6da3ced31865902c2a3dcd26e3cb71e2b8be7dd96370fb9dbd9a4aabe SHA512 596d054cdb7d711c5bd0f5738e50d18aae8f03e47159b6079fa50d27076f357b350dee04d191c1e60bcda7a17ace753d7e28da9b0248cf53d18e9f344f9ad178
 EBUILD ddccontrol-db-20210812.ebuild 600 BLAKE2B c56facd5748032e4e1bdc1d53668b3cec6df1cdd8f08c9add9b1ef27441d1a03fa1ef3d7727e092ea40119317a89845747a904394c54c8960785428b6dff65a0 SHA512 b95245cd6f64a5df64c6599b14ed4b530729a77925740037607118b0a8377f9f1df7586cd6e77cebfd83a6c3526b49f53b911a86c0dd003612dd5486009cf257
 MISC metadata.xml 319 BLAKE2B a9f063aefd3004d8157559423ac0ff4b74a155e97d7663db1e9b4599cb9f98c41c185fa2e48e7342b7e2b8e90fcf9c3077e0fa201a95961a5e5975cead80938c SHA512 9f4fe27a2cdf12ce882449c566ab4ce4a5bd22afbd9794ef8aa6e01d0b15082b54783b31e1ebf92f59fad550b3d59ba6fb1d2263ec22b901a526bf80fec8cc95
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild
deleted file mode 100644
index f230ee9f2591..000000000000
--- a/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="DDCControl monitor database"
-HOMEPAGE="http://ddccontrol.sourceforge.net/"
-COMMIT_ID="e75714979448b2f513d5ce65929899fa32a59044"
-MY_PV=${COMMIT_ID:-${PV}}
-SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
-		dev-util/intltool
-		dev-perl/XML-Parser"
-
-src_prepare() {
-	touch db/options.xml.h ABOUT-NLS config.rpath || die
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README.md
-}
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index 487b9e632353..ba1974939dbc 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1,5 +1,3 @@
-DIST ddccontrol-0.4.4_p20200630.tar.gz 173792 BLAKE2B 7a7ef330eb471f1cbddbfd90745e212a8a66f4be6cc6a4ccb8014c41498a86a09e4bc0226a300201102c202da37c0f4b8020aa88f08b5e2acaa92ac0dc2971b6 SHA512 7aaadf98eaf24d4b040073dce6f469e6e4aaae1efde0e8f988fb9c5fb99b776b1836573c069b9d8f12eaa724d3b39df5d4f247aa47ca2b7911dc9a9df727a50a
 DIST ddccontrol-0.6.0.tar.gz 180376 BLAKE2B d844f03ae4843a710a3a7143b1270656202c261b5e412822c49c2096c150052ddb6747b62f7c1d2404cffeb13af5ed604be915061b3fd339c8dcf66473bbd791 SHA512 49e857e8ef8f2ba87dc51056b9511ce55f3e6471222cd9171a324e2ee179b8c96a8f4d90c63bb379260ccc8e1d9653964f90748d6589d298ff2bbe6982efd3e2
-EBUILD ddccontrol-0.4.4_p20200630.ebuild 1967 BLAKE2B 81f65ef049bc913f50764801f7ce5bed9cee26e20662d221fb9e061abf5c2e92ccd551b79544e6f23a807b22a6e9eac0951e6346a74471369bc868b5d188b894 SHA512 844751b33f72dabf73ad999cadd9ee40c727c0e17fa0b35a0dddc2a93a9a5ed97c50e3ca3f0f98b889276481cc5cd73c4f257544b9c1c9e7a2d159131127af58
 EBUILD ddccontrol-0.6.0.ebuild 1894 BLAKE2B 2e54c658446e131fd40ea3c9b8ddc7202bfb56ada50bf090e894fd057f93142ec8ae4bcea05ff94e576f1fab869c4f759984caeb41bbdd433c215895a611d795 SHA512 e9c9ca3ee4a37b6608ec1046f54b7f2e25c1284f3bbf6ab02829a45bb3c16d4230c510536215eb77742e510e23d6462d12688e4c0c98edf9fb77053301f03b09
 MISC metadata.xml 418 BLAKE2B 0c4f8c520b2ba661bfa763de83a97fe7c1dba5826633e42f03efebdbf9c96b5989ff59068111c9d278017b3942abbff0577217d7c2180c005fc0bc725c50d8b4 SHA512 54b3ebae0357cf2f3e2d81bb493dac58b7c23fe2b0be237128d94a9dcc2ec36c7d782b2cf0979cf15a3c9fee22cf9a4ccd5c30a4798a5c55826d9b2813abc67f
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
deleted file mode 100644
index ca00b21efde5..000000000000
--- a/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="control monitor parameters, like brightness, contrast, RGB color levels via DDC"
-HOMEPAGE="http://ddccontrol.sourceforge.net/"
-COMMIT_ID="f3d003f63aaa0407d3147b04848e0722f78695d5"
-MY_PV=${COMMIT_ID:-${PV}}
-SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gtk nls +pci static-libs"
-S="${WORKDIR}/${PN}-${COMMIT_ID}"
-
-RDEPEND="app-misc/ddccontrol-db
-	dev-libs/libxml2:2
-	app-arch/xz-utils
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( sys-devel/gettext )
-	pci? ( sys-apps/pciutils )"
-DEPEND="${RDEPEND}
-	dev-perl/XML-Parser
-	dev-util/intltool
-	sys-kernel/linux-headers
-	doc? (
-		>=app-text/docbook-xsl-stylesheets-1.65.1
-		>=dev-libs/libxslt-1.1.6
-		app-text/htmltidy
-	)"
-
-src_prepare() {
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
-	sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
-
-	# ppc/ppc64 do not have inb/outb/ioperm
-	# they also do not have (sys|asm)/io.h
-	if ! use amd64 && ! use x86 ; then
-		local card
-		for card in sis intel810 ; do
-			sed -r -i \
-				-e "/${card}.Po/d" \
-				-e "s~${card}[^[:space:]]*~ ~g" \
-				src/ddcpci/Makefile.{am,ini} || die
-		done
-		sed -i \
-			-e '/sis_/d' \
-			-e '/i810_/d' \
-			src/ddcpci/main.c || die
-	fi
-
-	eapply_user
-
-	## Save for a rainy day or future patching
-	touch config.rpath ABOUT-NLS
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
-
-src_configure() {
-	# amdadl broken, bug #527268
-	econf \
-		--htmldir='$(datarootdir)'/doc/${PF}/html \
-		--disable-gnome-applet \
-		--disable-amdadl \
-		$(use_enable doc) \
-		$(use_enable gtk gnome) \
-		$(use_enable nls) \
-		$(use_enable pci ddcpci) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/app-misc/detachtty/Manifest b/app-misc/detachtty/Manifest
index 949bcb704302..db7bc0638eef 100644
--- a/app-misc/detachtty/Manifest
+++ b/app-misc/detachtty/Manifest
@@ -1,5 +1,6 @@
+AUX detachtty-11.0.0-sparc.patch 2669 BLAKE2B c1912520e5e7388bd905059a0d3f0d28726533884c4eafa89b1f6800feb2e05740dd96ee0b501f76d4f2329cf0e49b7b349d6990e12c359be13615f84e77670b SHA512 b62b7f809d79ba8f391f4f3b0c84eb969884b9de1f8ef27a50e1af84f6fe6f699c17321a6f4b225ae8c64d463c090a1bb5d105bf450a01aec4ccf8bb189449f5
 DIST detachtty-11.0.0.tar.gz 23189 BLAKE2B 734489fe35acb5bfb381b8fee1b91d60f15ec795f2ba58f5855544d913957f7da4174c15583dc4090e397c5f562e78a23c1534a741a9812980f4a9cd2d2e291e SHA512 608d68ebe9b8fae55b4295b9c50d8e9065226dbb78818535af79bd2e70cc4a831820b6c673414289548b1063843b5dc80c8b7d2371dd716a16eceb20cd064a10
 DIST detachtty_9.tar.gz 13081 BLAKE2B 28bb6a946d04717bc60ac7f65b791a8bb59a5ce1a2f7d7fabb63776538ade3fe046e874007effe7dd6ba7ebac8d739e16b0b0e2372ce4154385164d7939b498c SHA512 8ae7edc1a1c7727eb4d32a1a4327932e374ac838b441f34aee99cfe83e922f1d70383ab0aab2299808f28fea6229f5c122a7624b7ff992ab92b9c3f53483d035
-EBUILD detachtty-11.0.0.ebuild 589 BLAKE2B d4762a79e440d4eb3df0c0b1aafcbdc2e943b3f0239e087d8b90d7a07199c8a301b889d8f829cad666ac515d8292415589f10f189bc8453d00f414ee96884816 SHA512 cb394dd6de35e718c86ada3fa5da7aabfa6a9dd14953f7006b7e1cb3ffd16522f97c98be69e92503967121ca2ecd86c27154c3ce6ff81575886c3f9b5b847f77
+EBUILD detachtty-11.0.0.ebuild 632 BLAKE2B 0a118db31a6f4dc05bb848f53d1949728deaa4956458bd9ca0848f16e49516605bc0a7e2ed494d090a16c3b6f6d6a6096ff0533059cb69df6fb4b9d83108a1c8 SHA512 6cdbf7fcfb37ec030344cf6ac68b544bbe8f68bad4fefde6f565c85a7ccc9cea6c825a09c0cd96bf7c6539c4019c665548d4a9971a81e2a00ea504417ca55b2f
 EBUILD detachtty-9-r1.ebuild 600 BLAKE2B 26747aa2903250488781353bcf93ecb0f66b086e63a691cd84725f3e9b7e7717927509aada2d64b017ca4a12c6cafb0c566ea7cf354b076c8a88032d8b6f0315 SHA512 4902bab8a023b424d9d6f1d583ab431b50375e878d0ed5e7e08840a762e4176dd56c681e632b01fb8a0bd20220c254af0b945561cbf272f5bdeae1f6a0759cda
 MISC metadata.xml 704 BLAKE2B 605242d690a156e4b0bccb2114e76b8c9d6578e6c12a5bdfe87479df2703001d9d20d8996548505f60382086d4f8dfbe78b66f54f654e196f50af46c8ee1b774 SHA512 c38ba5cde4e76e557ff6d63746b1488a1669910865b629fa222bc63cb9974e68dfc2b7467f421beac7dd893bd0f8230dcb74f5bf22162c73ac4251c8d8999de6
diff --git a/app-misc/detachtty/detachtty-11.0.0.ebuild b/app-misc/detachtty/detachtty-11.0.0.ebuild
index 2a826d210e63..66c9920eb6a9 100644
--- a/app-misc/detachtty/detachtty-11.0.0.ebuild
+++ b/app-misc/detachtty/detachtty-11.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,9 @@ SRC_URI="https://github.com/cosmos72/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
+
+PATCHES=( "${FILESDIR}/${P}-sparc.patch" )
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
diff --git a/app-misc/detachtty/files/detachtty-11.0.0-sparc.patch b/app-misc/detachtty/files/detachtty-11.0.0-sparc.patch
new file mode 100644
index 000000000000..a65907abf92b
--- /dev/null
+++ b/app-misc/detachtty/files/detachtty-11.0.0-sparc.patch
@@ -0,0 +1,121 @@
+Fix compilation on sparc.
+Patch from upstream, backported to the 11.0.0 release.
+
+commit db785c7975e364acbf76a4db90296820d36b0740
+Author: matoro <matoro@users.noreply.github.com>
+Date:   Wed May 4 08:28:11 2022 -0400
+
+    check for signal existence before registering in handler (#5)
+
+    Some signals are only defined on certain platforms.  For example,
+    SIGSTKFLT does not exist on sparc.  Use preprocessor macros to check for
+    signal's existence before registering signal handler for it.
+
+    Note that this is the same technique cpython uses:
+    https://github.com/python/cpython/blob/3.10/Modules/signalmodule.c#L1427
+
+    See: https://bugs.gentoo.org/807184
+
+--- detachtty-11.0.0/attachtty.c
++++ detachtty-11.0.0/attachtty.c
+@@ -94,8 +94,45 @@
+ static void init_signal_handlers(void) {
+     struct sigaction act;
+     int i, fatal_sig[] = {
+-        SIGHUP, SIGQUIT, SIGILL, SIGABRT, SIGBUS, SIGFPE, SIGSEGV, SIGPIPE,
+-        SIGTERM, SIGSTKFLT, SIGCHLD, SIGXCPU, SIGXFSZ,
++#ifdef SIGHUP
++        SIGHUP,
++#endif
++#ifdef SIGQUIT
++        SIGQUIT,
++#endif
++#ifdef SIGILL
++        SIGILL,
++#endif
++#ifdef SIGABRT
++        SIGABRT,
++#endif
++#ifdef SIGBUS
++        SIGBUS,
++#endif
++#ifdef SIGFPE
++        SIGFPE,
++#endif
++#ifdef SIGSEGV
++        SIGSEGV,
++#endif
++#ifdef SIGPIPE
++        SIGPIPE,
++#endif
++#ifdef SIGTERM
++        SIGTERM,
++#endif
++#ifdef SIGSTKFLT
++        SIGSTKFLT,
++#endif
++#ifdef SIGCHLD
++        SIGCHLD,
++#endif
++#ifdef SIGXCPU
++        SIGXCPU,
++#endif
++#ifdef SIGXFSZ
++        SIGXFSZ,
++#endif
+     };
+     
+     /* catch SIGINT and send character \003 over the link */
+--- detachtty-11.0.0/detachtty.c
++++ detachtty-11.0.0/detachtty.c
+@@ -392,9 +392,47 @@
+ 
+ static void init_signal_handlers(void) {
+     struct  sigaction act;
+-    int i, fatal_sig[] = { SIGHUP, SIGQUIT, SIGILL, SIGABRT, SIGBUS, SIGFPE,
+-                           SIGSEGV, /*SIGPIPE,*/ SIGTERM, SIGSTKFLT, SIGCHLD,
+-                           SIGXCPU, SIGXFSZ, };
++    int i, fatal_sig[] = {
++#ifdef SIGHUP
++        SIGHUP,
++#endif
++#ifdef SIGQUIT
++        SIGQUIT,
++#endif
++#ifdef SIGILL
++        SIGILL,
++#endif
++#ifdef SIGABRT
++        SIGABRT,
++#endif
++#ifdef SIGBUS
++        SIGBUS,
++#endif
++#ifdef SIGFPE
++        SIGFPE,
++#endif
++#ifdef SIGSEGV
++        SIGSEGV,
++#endif
++#ifdef SIGPIPE
++        /*SIGPIPE,*/
++#endif
++#ifdef SIGTERM
++        SIGTERM,
++#endif
++#ifdef SIGSTKFLT
++        SIGSTKFLT,
++#endif
++#ifdef SIGCHLD
++        SIGCHLD,
++#endif
++#ifdef SIGXCPU
++        SIGXCPU,
++#endif
++#ifdef SIGXFSZ
++        SIGXFSZ,
++#endif
++    };
+ 
+     /* catch SIGCHLD, SIGQUIT, SIGTERM, SIGILL, SIGFPE... and exit */
+     act.sa_handler = fatal_signal_handler;
diff --git a/app-misc/digitemp/Manifest b/app-misc/digitemp/Manifest
index 9022e4c6d73a..52505f1d367d 100644
--- a/app-misc/digitemp/Manifest
+++ b/app-misc/digitemp/Manifest
@@ -1,5 +1,3 @@
-DIST digitemp-3.7.1.tar.gz 144870 BLAKE2B 5d00197ba0122772d96c3185f430119961d214f50dc07dcd5881e1aa1135283680ff38b4d92736827f5c7644b11930b9418b8467f276e832e40f4228d08d1774 SHA512 e5eaf576b544c61049a358dece7dc96d9793b751ef08645060f3b2c1a2006e2906c3aa3f97de3dab46818290d664d2e784a948b2495b538a200b6d71b03173d2
 DIST digitemp-3.7.2.tar.gz 146166 BLAKE2B 9718e5d8a135e99cfd8893f5f4d2cc40a0bcdffa4e01c4ef460d654b38d9808c75ea1efced6211672033a67be8ba7f30f34320ef8e64d47d8a88be8bbac8c997 SHA512 807934ecc743df5ee69e9a8a0f5e90e469f03e577cc80b4510e6ac4ecc61ff9c79e05642602a4f50b4acda7e1f53e33016e6c201898ab0b44c76f3f7ac028820
-EBUILD digitemp-3.7.1.ebuild 1787 BLAKE2B eab478eaee2516bee1c1282816cb4fec4042ad39b2e6ae866aa198527ddf0e1e8011078435dcd353022b4d3070da6873f0d62534e471276a7457dc42cc39f283 SHA512 8e15e866c2cb62f9021042ef4cf3e3a7e97f9da38681f8210ddd6d3e4df05f85bae4285dd02302fadce9973aafa8c49e7c7d9c4231eb2b2fff7d17e2e9222e67
 EBUILD digitemp-3.7.2.ebuild 1787 BLAKE2B 4cd84f2d3b02bfd644c630cbf7fc675626a36d6721ff1c0eab0289e2f7633d5fa9577ae56c71bfe4c6c6ec28f078840bcfc592dbb2a2bb3bc6e21901a51223f3 SHA512 c6ccdb78afeb3dbb1d06eab3d5504e74780e7db11d885c46899d70c612a6725114c8116bfb6a3699aa78dccdaa91e00892119b9d2e72e2ae78178bb59cdb007e
 MISC metadata.xml 982 BLAKE2B c76e77aba3cbd377a3459302669c327abda9b437c659149c768d0d7d8a791210302115b403df09c3802a5af0bee3370e8ee6cd18306d8d29e80d56eafc391cbc SHA512 abb3db43dce3e259defefccdb71fffa2cdbb8fc21149cc1167b04c71b854e0dbbf1996f32293d4369aa9af0131e01a12fc57a4156514e956272f1ee8f9cf0606
diff --git a/app-misc/digitemp/digitemp-3.7.1.ebuild b/app-misc/digitemp/digitemp-3.7.1.ebuild
deleted file mode 100644
index 65431c4aae4f..000000000000
--- a/app-misc/digitemp/digitemp-3.7.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol"
-HOMEPAGE="https://www.digitemp.com/ https://www.ibutton.com/"
-SRC_URI="https://github.com/bcl/digitemp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="ds9097 ds9097u ds2490"
-
-DEPEND="ds2490? ( virtual/libusb:0 )"
-
-targets() {
-	# default is to compile to the ds9097u.
-	if ! ( use ds9097 || use ds9097u || use ds2490 ); then
-		echo ds9097u
-	fi
-
-	for target in ds9097 ds9097u ds2490; do
-		if use ${target}; then
-			echo ${target}
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
-		-e "/^LIBS/s:=:= ${LDFLAGS}:" \
-		Makefile || die
-
-	# default is to compile to the ds9097u.
-	if ! ( use ds9097 || use ds9097u || use ds2490 ); then
-		ewarn "If you don't choose a component to install, we default to ds9097u"
-	fi
-}
-
-src_compile() {
-	local targets=$(targets)
-
-	for target in ${targets}; do
-		emake clean
-		emake CC="$(tc-getCC)" LOCK="no" ${target}
-	done
-}
-
-src_install() {
-	for target in $(echo $(targets) | tr '[:lower:]' '[:upper:]'); do
-		dobin digitemp_${target} && \
-		dosym digitemp_${target} /usr/bin/digitemp
-	done
-
-	if [[ $(targets|wc -l) -ge 1 ]]; then
-		ewarn "/usr/bin/digitemp has been symlinked to /usr/bin/digitemp_${target}"
-		ewarn "If you want to access the others, they are available at /usr/bin/digitemp_*"
-	fi
-
-	dodoc README FAQ TODO
-
-	for example in perl python rrdb; do
-		docinto ${example}_examples
-		dodoc -r ${example}/*
-	done
-}
-
-pkg_postinst() {
-	elog "Examples of using digitemp with python, perl, and rrdtool are"
-	elog "located in /usr/share/doc/${PF}/"
-}
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index 382105d8c03b..5880ed9f30ed 100644
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX editor-wrapper-4.sh 402 BLAKE2B 1cbdc02b300968ad6d8e6b68dbc27507d92820373efd3101f85c170c2a1e7a9e3114558fb04dcf0ce91a5ea094781f1c50c2c92ead0421f9ac8e2dc24aaf09e0 SHA512 502f8018d3c135ac05081cb896cad0296cc94f636a2410562afd915d9e44be3c2d71db319a803f5453396ebc2509cce0d5b4c5affdca875a27de2b0da1101052
-EBUILD editor-wrapper-4-r1.ebuild 903 BLAKE2B 532a7715cee52af25f22da601305ac1f21ade71110621c3338c792f434a39078eec358b49fe08512895afc54d1039c4ba846e9cb568e5053afac28f9494e4757 SHA512 10956be2ff026654b3c1c454ce33ee785dcc36703972fe50ab6d0118276da9f08a174ed67f19100a338600729cae61f362959eb19829357d8a84fb897010b2d5
+EBUILD editor-wrapper-4-r1.ebuild 910 BLAKE2B e88d955ff7844380c0fcaa1a92884cd52c1a7f1717cf9598cca3c61ab04bca360f36eafd59d8768d336592a0392cfcc9da8ac5f3056a2d88d88ff5918a53c676 SHA512 10ebf635fdaf875eb952057b538d8243a69161172f5749349c8d397f1d37343191e35715dca799214e5d19a775cab54f80b63b65086ed75cb8d97f06a426a518
 MISC metadata.xml 368 BLAKE2B 0735037743f0e78203e78394c9145ae9ed510ed3420d8798104a477071a97eaa4a4995dc7b72f05893b6d788e8d9f5092b506ad5708fe51029a7613024b09d49 SHA512 b7a083d59d58736c4b38fb57622cc423b1a63f9f08fcd7757c15e005d880696ac8776929bcfb0dad2d1895cda8faab8e3ee00ae211d422501c8f2d4125b56f81
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index 39f32a983569..cd0f2892095d 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index d7d6b0da2486..f87956a8c844 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -8,10 +8,8 @@ AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed27
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-6.8.23.tar.gz 149672445 BLAKE2B dd7b080f1496f3a20755c183befae74194eab05b04c6f77679e9dad6067eef5222a4c7ce43d6267f1233a7bf864c6f8b23d5caf52278e1fe5f48f465e6603113 SHA512 73258b400cd194768058105a74ca0e811962ccf81bed8c4d3a824d4e5b97a8178a31150e60602fa1e04c6764b139980eb45ae6f246864702120653b45120b597
-DIST elasticsearch-7.16.3-no-jdk-linux-x86_64.tar.gz 167284956 BLAKE2B 9dfa13d6f08bf5bbd5752870839c344635e3cc6b9f34e92948f09afdfb3929c0942d89bd02d5844f40a80d18c2cac51c8bb207c0c830ad2853acf662f5e79845 SHA512 ec9747694ba9f8b76b1620e42addd106afa3d3c207dd3836afe2482556f8a982fa03f3536ebb762f12a6093c9a5eac63cdbf2f1941dde9e3ce69c41652749d4f
-DIST elasticsearch-7.17.1-no-jdk-linux-x86_64.tar.gz 167347718 BLAKE2B 8fd17260d0bc37a8f4a95371ed47bf2797df4eaaa226179270aced4c9fbff9bfe484ca66605a31773921d18cb2a3c91d25435555f31688ed426c4ccce8ac62e1 SHA512 3f572eed0d0a9140f843dcc07911c32a10bb76c4e2c2a4c904ba3279e0401c58fe0f7c7776a7347fec3acd5dbebf3c9f1888f59e782c3a46c76f038e82d53f7c
+DIST elasticsearch-7.17.3-no-jdk-linux-x86_64.tar.gz 167378547 BLAKE2B 4bacb075e94587351bb4638da15644ed372ec1ad2b72e1c9b84c511e84666f6b79ccc8519ce5fede119e6c134ac500a1209578f18a26fd8566646e870a17f9ba SHA512 f2d5953710adfe31f1e30a0fdf4c091c0493f613a83927ddec4bbc74d2eccb839e1ffa6d44636ad0ad9c07613915847cc7a68fc87e465a8a851c96e023917bf1
 DIST elasticsearch-oss-6.8.23.tar.gz 68573265 BLAKE2B 80366fdc4eaaf45161a36da112397938a82d08d842d82dd5a9311abf63ca20afb93ecc06387c6852bbb1a861306382d6e7c2314e67635b6f2e75cdc183057ad8 SHA512 14dbb2809b06499373c3ec5035d829d62255c2c93103618fbfe3d7d03cecf8847f654e83c78f765f23224126ff18ed713b959857e8ecf435c475b11bcd143d3f
 EBUILD elasticsearch-6.8.23.ebuild 2597 BLAKE2B 8ee44e77ee5a1e4fbf5a2b2811c1a0ef57e2b1ac9e6125ae8ee2faf9ee47f86061340af6df3497e36dd012310bf55a3bc2eab315a628c75292749bc6e4fe471d SHA512 f22f587ffb0b3eb01ceb3ee3cc072b433aaeaa6d5462bbee2d7f318bf59109357c2755bd7813ebf2729e5df97c74bc5f65848449bfe8afe75f304d41485cd4c3
-EBUILD elasticsearch-7.16.3.ebuild 2404 BLAKE2B 53442d4b047689457b04aa62696256a4748db73f07791a94a7324eb947e9a14d5d00122b0bacdfd02a38006b19b994a97f391d921b68a19817891d26c233adbe SHA512 f4a9631133a62e6528053a74b0ba5d8199a588e73b69bfc9a5c541c53e326cede24a1ffe44b3a9d8af0056e014c09965b7ecf983b944907de40f9244959ea9fb
-EBUILD elasticsearch-7.17.1.ebuild 2404 BLAKE2B 53442d4b047689457b04aa62696256a4748db73f07791a94a7324eb947e9a14d5d00122b0bacdfd02a38006b19b994a97f391d921b68a19817891d26c233adbe SHA512 f4a9631133a62e6528053a74b0ba5d8199a588e73b69bfc9a5c541c53e326cede24a1ffe44b3a9d8af0056e014c09965b7ecf983b944907de40f9244959ea9fb
+EBUILD elasticsearch-7.17.3.ebuild 2404 BLAKE2B 53442d4b047689457b04aa62696256a4748db73f07791a94a7324eb947e9a14d5d00122b0bacdfd02a38006b19b994a97f391d921b68a19817891d26c233adbe SHA512 f4a9631133a62e6528053a74b0ba5d8199a588e73b69bfc9a5c541c53e326cede24a1ffe44b3a9d8af0056e014c09965b7ecf983b944907de40f9244959ea9fb
 MISC metadata.xml 490 BLAKE2B 48bca2017c5b522ba95203316efcb1fa711a0a1689fe75bc3b645f3f305d0671e69747d657e0b561237b472a721edf7cbe51a32919a71b57dc30e86bd4c05655 SHA512 37e637e54f452cd1fcc23a5e1537d53af6a17f3e7d805bb6d091d85e564f9132931ebf9c020580bf9fe81721293d972b03fa47985c04a722570630248ca416c4
diff --git a/app-misc/elasticsearch/elasticsearch-7.17.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.17.1.ebuild
deleted file mode 100644
index be38b6a483a2..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.17.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Free and Open, Distributed, RESTful Search Engine"
-HOMEPAGE="https://www.elastic.co/elasticsearch/"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz"
-LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="acct-group/elasticsearch
-	acct-user/elasticsearch
-	sys-libs/zlib
-	virtual/jre"
-
-QA_PREBUILT="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-src_prepare() {
-	default
-
-	rm LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	fperms -R +x /usr/share/${PN}/bin
-	fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.4" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.8" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
-
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/elasticsearch/elasticsearch-7.16.3.ebuild b/app-misc/elasticsearch/elasticsearch-7.17.3.ebuild
index be38b6a483a2..be38b6a483a2 100644
--- a/app-misc/elasticsearch/elasticsearch-7.16.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.17.3.ebuild
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 5dbd55aad074..8d64240fda80 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,4 +1,6 @@
 AUX 2.5.3-optional-vapi.patch 2135 BLAKE2B 0e2d2620fb1fbe287eef4f9d749d77c75452bf0d12fdcfd4f5cebe9d35118cb22ff6366562a0a1a9b07bfd452ac35580d563c498d4d77474dcf6613b24da5d80 SHA512 254fcffb4500031100c802e751cf84d2ca85b8a890cee7aa3b538dd9d5374cda560eaad262c5efd4ba7c2503d4130a958adeb77eba66162627708d2448096338
 DIST geoclue-2.5.7.tar.bz2 85764 BLAKE2B bf0a6e312b7a303ed2cfc33f02cfad0e68e44f60899a327c9eba12f4967d2a3a5922a475f8fefb6f47da328c92dc75706504b41bc2dcd21db3fc5da7c2a50180 SHA512 16ec15afa41910b7d993a9918dd3c068dea3f6c5be922b7ac772493cd6aabb0cad3fe2206b82c1a008781c3f1ddd8f4afd8f70b5d497920bea8ed5e473f0fd1f
-EBUILD geoclue-2.5.7.ebuild 1763 BLAKE2B 9feac54965408b9df68943bfa6ef003088d199ca9f64a1a57b35a02d9e0c269d70f48b8f09afad6dbc3465edd53ec40acfda4241aaa8a4ff59309e0991824ddd SHA512 0018a41975f19ca23ebb0fae024f60578277d11e9bab12decc3f0ac0b8666817da7517101c645beb38c6f7b54323b6463b8699c43193be776d90cd63be2351e3
+DIST geoclue-2.6.0.tar.bz2 94890 BLAKE2B d579752482e77e6ec6df3cb34f6b1c7ca61ea425f1c29195f1bcd031afe22644aed2f5b3f75e82c20e0e3cf0d415ca858b30351b2ee3835fff0ca25e63fc6395 SHA512 13205ab88cbd9748c155081318ae1909fddedce4250e3ece39a9f379b8cfea91dfe571961e278406ba54f8efd3a1070967479feb8256f50170112b28246b3103
+EBUILD geoclue-2.5.7.ebuild 1764 BLAKE2B 9bd08a6d0823b978f256c66bfcc073b586cbcae665882f60e7a3c76be146ade4834f94b32bc1c9d5a38321b2851506484b3f1e9069c62652f93240ac74c04fcb SHA512 2999116ab064f7b50a14e1e1c460ce895f292fc34a2c28014ab33e91558322ea46a1301160294113eb50e2d88a7fe20a6dd59d5387de7f3c0a0415f0a16f3ccc
+EBUILD geoclue-2.6.0.ebuild 2330 BLAKE2B f25e38f1200e011b9d0b1e2402d0c6dd31b5532fbb84565e3f409fced902279c9f15d47a366751ad95f2e57e98cc08a9fe722ee2d36870a884572f80aefa1fc0 SHA512 d9fc71abdb965b907a2f32af9531560e907f70d2c77f01ee471417de873b4d94bf985326d7c2267ef918ed7a4ff165c95a0d0d384b2d1e70fd4f42e2501f5a91
 MISC metadata.xml 523 BLAKE2B 42629fc7fb9ed88748d53c9f521666436eb8b65d33d004410c577c32235dacc8618def18da640986b8e64ecfb8b0b9c4085797a40b9aebc3d8f9471ca4e163b2 SHA512 33aa5cf04b48ab8c9b805aff3ee9d33193314bff55e4ec47ee2cadd0f5b7cb2c9d6ee86a27a4a2bb9286ee4637c9d04b5eedea41467b6a8da605f8b0eaf71a5c
diff --git a/app-misc/geoclue/geoclue-2.5.7.ebuild b/app-misc/geoclue/geoclue-2.5.7.ebuild
index 4ebabf0ba6f2..fb5eef3a6052 100644
--- a/app-misc/geoclue/geoclue-2.5.7.ebuild
+++ b/app-misc/geoclue/geoclue-2.5.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="xml(+)"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/app-misc/geoclue/geoclue-2.6.0.ebuild b/app-misc/geoclue/geoclue-2.6.0.ebuild
new file mode 100644
index 000000000000..d792a58f3b94
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.6.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson python-any-r1 systemd vala xdg
+
+DESCRIPTION="A location information D-Bus service"
+HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
+SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+introspection gtk-doc modemmanager vala zeroconf"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-0.14.0
+	>=net-libs/libsoup-2.42.0:2.4
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	modemmanager? ( >=net-misc/modemmanager-1.6 )
+	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
+	x11-libs/libnotify
+"
+RDEPEND="${DEPEND}
+	acct-user/geoclue
+	sys-apps/dbus
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlibgeoclue=true
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc)
+		$(meson_use modemmanager 3g-source)
+		$(meson_use modemmanager cdma-source)
+		$(meson_use modemmanager modem-gps-source)
+		$(meson_use zeroconf nmea-source)
+		-Dcompass=true
+		-Denable-backend=true
+		-Ddemo-agent=true
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Ddbus-srv-user=geoclue
+
+		-Dmozilla-api-key=f57afde7-113f-4e8f-96d1-62be64a0273c
+	)
+
+	DISTRO="$(awk -F= '/^NAME/ {print $2}' /etc/os-release | tr -d \" )"
+	if [[ $DISTRO != Gentoo ]]; then
+		eerror "The following API key has been allocated for Gentoo only."
+		eerror "If you are a derivative, please request your own key as discussed here:"
+		eerror "https://gitlab.freedesktop.org/geoclue/geoclue/-/issues/136"
+		eerror "See also: https://location.services.mozilla.com/api and"
+		eerror "https://blog.mozilla.org/services/2019/09/03/a-new-policy-for-mozilla-location-service/"
+		die "Please request an API key for your distribution."
+	fi
+
+	meson_src_configure
+}
diff --git a/app-misc/glastree/Manifest b/app-misc/glastree/Manifest
index 5ecebb6312b8..e960c0d83ca7 100644
--- a/app-misc/glastree/Manifest
+++ b/app-misc/glastree/Manifest
@@ -1,6 +1,4 @@
 AUX glastree-posix-make.patch 535 BLAKE2B 3a8e4918c2a5206978cd0b748331e444e59643b2262b494aa11a9e8147afbffacc455afa89e7931a3013309241e9aa6a40ad9e5ecc11c8025afdc07926cab498 SHA512 a9a79aac878dddb49022f7fa1abf302147e540316e0fc472286dec839125003e9d09ff30807469a6a6ee179dabfb3b128ac111f94a295fcb10f63307a170a736
-DIST glastree-1.04.tar.gz 5846 BLAKE2B b380b577a712f08b0a3ec89627d9f8bd20c76244ab19c8e76d27ac2fa08b0242381c280430fafe8a43bef78de8954d4660051d7648550c4ecd789a8941b55a4d SHA512 81b819bc91780f42f945db13efc97faadd661c3272007dc0b90ed998776d3fc0fbe406249f069f0065271208c9f6ccd0488021d384e05d5b9da39311bec8f94d
 DIST glastree-1.04_p20150525.tar.gz 5716 BLAKE2B e248d607ce87f4e78d880c67415c8eb15325a15dca222d14bc9fbafbcfd30c356f71a73fcfc4c8df80c645741e8b0edeca71cfdd0d66b284facad23b5322d64b SHA512 cff2fc671265f7be62b098f9c0a6f8c7711f86c014b64bd0bc1dde4c1570e7707de735d2a421e78d15ff126bcd6cbf18c90ba96bf7a5b30c5f6135c2e4a03179
-EBUILD glastree-1.04.ebuild 600 BLAKE2B 72197ccedcefbde343a53d862704746deefbe01e305aa61a44c1316d986ad30da425762d9b7d1e828d78f767614f5db8028d76b077003833fa8e45d6d7167384 SHA512 0f1c89747e3d1b6f5c46961804ce71daa6165c5bdfd2b306303db98a9d345cf1c2aa2aaf1c203a1b100a9960c877bec1b62df50e4f9a0d5b204c73e4f2f133ec
 EBUILD glastree-1.04_p20150525.ebuild 790 BLAKE2B 01da7f59e487d8d583b4fc74a309b4e637988b9ea0467ae6f5cc875182be6e2efb6c3cf1a8c30eba3682cfadcf60a00ea566813440b331e63a2ea735d3c2e1e4 SHA512 e5249c5a23485dfaca4a2e95f34fc0395c6dec56e446d6019aecd8acd3a3b2ff87f27268aca923ce80db6709b760537250edc74deff67c1e2df730a9e2956338
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/glastree/glastree-1.04.ebuild b/app-misc/glastree/glastree-1.04.ebuild
deleted file mode 100644
index 6ba6ab08de11..000000000000
--- a/app-misc/glastree/glastree-1.04.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="glastree is a poor mans snapshot utility using hardlinks written in perl"
-HOMEPAGE="https://old.igmus.org/code/"
-SRC_URI="https://old.igmus.org/files/${P}.tar.gz"
-
-DEPEND="dev-lang/perl
-	dev-perl/Date-Calc"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-LICENSE="public-domain"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-posix-make.patch
-)
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/man/man1
-	emake INSTROOT="${ED}"/usr INSTMAN=share/man install
-	dodoc README CHANGES THANKS TODO
-}
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index ea11132dbb4c..e9b71650536e 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,3 +1,3 @@
 DIST graphlcd-base-2.0.3.tar.bz2 523229 BLAKE2B cfdca5a6a73e8a3858d694aa997037b56471feb20541a328210a106d22c97f57e20f0798411e5a92ca616e5991ec167a8986730b985d0aefcbbb6c6454ab78c2 SHA512 dd0d6a1f1d43405d6ff2e531010f97d47081e3e8e9ccd238adc1084912c99838e80e85b8bd6b37d6462859c3c96229fd83e5ac93fb4068ffe5c30cff3787d138
-EBUILD graphlcd-base-2.0.3.ebuild 2212 BLAKE2B 05f93ffe573522c9596ecf8af4cb2f95f15f28ad6bb360445ccab7e2af2f1d3822e5b9babf717e2f751ac6455bd1456c9eaaffe71f5af607a14181124a4bf1e6 SHA512 e946a5db1ef0b9a972666db65732d725bdc603beb09400a658737ed4ed4398ae61194b3757ef5b4ed5e9a5ad79dc259fff3cfb525d1cc513ee5b1686475143ed
+EBUILD graphlcd-base-2.0.3.ebuild 2217 BLAKE2B ab6c9689d21b9b12458be430b6a168d104246b2988c83c237ddd2cbc7a16f0b09befef77310633f73e519263d9b9b1beee601786aadfca080d2585ef29ab3aa9 SHA512 06b450ff8ae6e44fcbb46570fcf1f559247b721abe9afc3345a2eb1d0137739b11ca7c060100f4769ffd9b5711022daef3a4c5e926d9610bda6d39339c9b2cb0
 MISC metadata.xml 1010 BLAKE2B edb76fc1024e7dc42a14155d892a126d611cf3157604b1a12590c97e4c3270dfb66f49962b08780c6bc53874f94acb1188cc275221e27b2e83ed3b02c343dbad SHA512 d623de28fc64e351373fbb6005393e6bded18f163ec771d1f6854b87fe022250fb88447c919c6a88379fb23d4fc057a2a752365a7759ce621c5ab8059d471aab
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.3.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.3.ebuild
index acea49078a67..428b379d979a 100644
--- a/app-misc/graphlcd-base/graphlcd-base-2.0.3.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.3.ebuild
@@ -73,7 +73,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" UDEVRULESDIR="/lib/udev/rules.d" install
+	emake DESTDIR="${D}" UDEVRULESDIR="$(get_udevdir)/rules.d" install
 
 	einstalldocs
 }
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index 6846193d7048..befff04e62c6 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -4,4 +4,5 @@ AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d
 AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
 EBUILD inputlircd-0.0.1_pre15-r2.ebuild 918 BLAKE2B 8a577f53bf67e0f1ff5a8087ed7fb63d49b6743809d40e5be4ce905f528f964642020c298e5540d834f725928315eec3ee8e9022f20823795f20d656ebdc3084 SHA512 7de73915bc37f7b17b598193d101b1524624668d818e970a6f7af7b0f5d9e5da2c85ec832ce67b065cb9f56d3af8724acf9bd34ab471c6e9404dba94775c2d24
+EBUILD inputlircd-0.0.1_pre15-r3.ebuild 892 BLAKE2B b98e4f68eafbab5ceb224ab965aa8c14ba8682944cd9611ebafd888b133c7001f4ab43d8b5ed452780446dd90f2c975b72c4c887c33b2e32a37d2c2631cf4269 SHA512 201fb5f314dde08d2009107c86584e58f2c8d2b53d02138d2e26a4ce4ed500712f9b45f219de0fafbc414cd5b53fff2639541c792f1b3f83ead7bd59141db50e
 MISC metadata.xml 259 BLAKE2B c37e63028ff67345f2840423e9d03b3e011b4132f4c80ce8a4b6c94e9ad069be10dbf4e6f9a96a848619b673dd0670ae41fad3e51ce382bee44e097d2245bc4b SHA512 33692b38a520781ebab5dcf3c02f4b5a082a3e4d001527e7c7f6e283eae28aff68ce0fecfce53809b9705d84cb110ff8c9bed38f40cfc918d4760984a94f9a96
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild
new file mode 100644
index 000000000000..b262f5a39eba
--- /dev/null
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Inputlirc daemon to utilize /dev/input/event*"
+HOMEPAGE="https://github.com/gsliepen/inputlirc"
+SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+
+src_prepare() {
+	local ver="$(best_version sys-kernel/linux-headers)"
+	ver=${ver#sys-kernel/linux-headers-}
+	if ver_test 4.4 -ge ${ver}; then
+		eapply "${FILESDIR}/inputlircd-linux-4.4-fix.patch"
+	fi
+
+	sed -e 's|$(CFLAGS)|$(CFLAGS) $(LDFLAGS)|' -i Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	newinitd "${FILESDIR}"/inputlircd.init.2 inputlircd
+	newconfd "${FILESDIR}"/inputlircd.conf inputlircd
+}
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 0e36629eccb6..e278da2ceb58 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,4 +1,4 @@
 AUX khal-0.10.4-add-etag.patch 417 BLAKE2B 2eadf7cb5ba1a4bd179a4f8b37278407819de7f798ce9f23723a11694fe9954bb67a267932d85416644a7dcf09544d13ca0107c02c832e63d36122cdab1e00f9 SHA512 ff5cd23b3351e474f8d9327bee52733587f8e5f8ab8973beff3736bd59af017865512c53b0c42b81f1b4fbb8212099b2d0d3751aa67e190f0e57349ffedd87b2
 DIST khal-0.10.4.tar.gz 185736 BLAKE2B 0cb9deb793f577bbcedcbba4788988973ee9d0ab71fdd30a01142a54434767d74b1d10e5bfa5f6a2feb9f18a8a9fe22717d4a38a07ab5e30b331c87b79a79f39 SHA512 b32f1bfe5d3a3976278726a6570eb345a5ad44f63a52b75f045fd0509d145edd5b76e11a10acffd9c3982edc124f93daec34a37c39299c2311796c0314016eb6
-EBUILD khal-0.10.4.ebuild 1309 BLAKE2B 6e434cf11da9566a73c8332178c191d412bc630b3eadb74817e6c0db2053e1077379f3c3ac21880fb43628073ef872eeab1ff79de851cf730c1c34326f3b7924 SHA512 2812692b896baa76082173b808995ee8b0ec54fa2a88101b27de63198bbe86bc3141e002754f1f0bd130d8b94ff7db8b0541f995ce87558a5d8e77fe3cc56873
+EBUILD khal-0.10.4-r1.ebuild 1306 BLAKE2B b010ade57359c1172980e17569f8a1a2841251f4ec3a758a5db7537309490098df177981a3f9dd2e879732b242bd48cff94257ae28a45a04a1d57cfb8ab07776 SHA512 fb7d04a0db84c42b1795de6e497ac9fac45a4c0ad021b64ba13fa2063e494fee3b224c37b6083720cadf2aa42397c19a1a90e6fad7a5f79c9b375c7265113c8a
 MISC metadata.xml 285 BLAKE2B 5e4543b327c8dc84cecfda51b540cccf8722c584a44ce5146beb390ccb3105af8789c8dfefe614e92723eb12a3c167baab09d6e83bd1d7ad2feb3f5ae31f7c81 SHA512 6309634c2ea8e5cbe7ce1627098b90fc90ae12829000332f83e967dd3ef1677dc807b78332cc9c790155323086d901b9db1c5acb23252c1f5e5d241d8b0b73d9
diff --git a/app-misc/khal/khal-0.10.4.ebuild b/app-misc/khal/khal-0.10.4-r1.ebuild
index 3fb13770ef22..3179def35992 100644
--- a/app-misc/khal/khal-0.10.4.ebuild
+++ b/app-misc/khal/khal-0.10.4-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	<dev-python/tzlocal-3[${PYTHON_USEDEP}]
+	dev-python/tzlocal[${PYTHON_USEDEP}]
 	dev-python/setproctitle[${PYTHON_USEDEP}]"
 BDEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
 	dev-python/vdirsyncer[${PYTHON_USEDEP}]
diff --git a/app-misc/kryoflux-dtc/Manifest b/app-misc/kryoflux-dtc/Manifest
index f33336f99402..2dd692315837 100644
--- a/app-misc/kryoflux-dtc/Manifest
+++ b/app-misc/kryoflux-dtc/Manifest
@@ -1,4 +1,6 @@
 DIST kryoflux_2.6_linux.tar.bz2 9177658 BLAKE2B 6eb0bc7a166950bfedb32da466c17125a8a7d64e4bc9aa6610c69dd0f98c2fb5187ad19dbaf191b33dcb5a786ec4a1fa9bce2464c3c04eb152e0b9ed7ae770f2 SHA512 9bf700e9c646bad135999eb1fed12c86ff6fbc11a0034b86af7541fb16a4905dd740c706ebb87bf5848f5d80f45699c350a56397df5b6850559c2576d18eef1b
+DIST kryoflux_3.00_linux.tgz 13921877 BLAKE2B aceb934ec7b0b9d5d1d96555dceeeaa5eb11af67b1aae91888376a2c7615d4ed135167d4c3ea0ae3851a378e5fd5934aacd557a57e28e824c9131efcb87bc59e SHA512 0f4e805373c769bc81659ff93d6f8001103a6a192ca30c73b84cde231d52aa51950860fb9e11c156800d40ebbcd7cc33253f0fcbd436e8668731836f9689c013
 DIST kryoflux_3.00_windows.zip 18211783 BLAKE2B e50cfc196d37216a7c929c4aa915b5cfeb7f38805076aed4e1bbc9dbfcc946fce18db0a2e2020d77cf581e2df174f2e3b6eb2b3d9060795501b1769d258ad05d SHA512 afa42fd3460d796dd3694059a86484ea94ab3084c52dc18d6f14e5b790d66e0f13514fbe2efc5c32abd3e471cdb0ac10cc3f7bafcdfb41371a6caddda83e2a00
 EBUILD kryoflux-dtc-2.6-r3.ebuild 2453 BLAKE2B 2aa1623720263e4e94bdb2b68323ca767149a4e3c28fd64a3ad0c1efe29937d1783d4e24c70ad9403952eb0104d8751fa4115386b1e4d6e4ed2e79decb4346d0 SHA512 492abb2fe4d34620bd2e4052ff739df6a8f34a5ffcbb42e71ff3c660092ef35a4dbdd249035c5f87ce775dc1554cad8696e11a41349ed67101a4756434d3422d
+EBUILD kryoflux-dtc-3.00.ebuild 2512 BLAKE2B 863e26621cba57bd23996d57d2567252f4946985b677e6878382a83e1cb5d1ec775434fdfb6fbd109c036a331147b1503c33bfdc5dbbfe5c8c365592f6d67ffb SHA512 7aeb848cf376a77547f5e40c25bd4bfcd4683c6ad0ba7bb00f2316c37d5343632ae6d184eff0ec00c45379582b2a2289ce36d34498da076c81229cc8dbf5c382
 MISC metadata.xml 413 BLAKE2B 1cb4e2bd2cc707542fde7a9c04ec455a349eb521f26bc2704a873578ff574dfaf8f74721c86ad9cfdd174b218ef31836098f889c0f8fc5c43ba9be75279740ee SHA512 f16d5eb1ae4f08cbf0876dd461bdbe8bae6d804790589b293f5998cfc7dd630e7e9e8b17183cdd658b47ae8fd8a37a76b750f868245007817209cb3a7590e2e2
diff --git a/app-misc/kryoflux-dtc/kryoflux-dtc-3.00.ebuild b/app-misc/kryoflux-dtc/kryoflux-dtc-3.00.ebuild
new file mode 100644
index 000000000000..fa32d86a4167
--- /dev/null
+++ b/app-misc/kryoflux-dtc/kryoflux-dtc-3.00.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="kryoflux_${PV}_linux"
+MY_PV_DTC="3.0.0"
+MY_P_DTC="dtc-${MY_PV_DTC}-Linux"
+MY_P_WINDOWS="${MY_P/linux/windows}"
+
+inherit desktop udev wrapper xdg-utils
+
+DESCRIPTION="KryoFlux Host Software"
+HOMEPAGE="https://www.kryoflux.com"
+SRC_URI="https://www.kryoflux.com/download/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="-* ~amd64 ~arm64"
+LICENSE="SPS"
+SLOT="0"
+IUSE="demos doc gui"
+
+RDEPEND="
+	dev-libs/spsdeclib
+	virtual/libusb:1
+	gui? ( virtual/jre )
+"
+
+BDEPEND="
+	app-arch/unzip
+	dev-util/patchelf
+"
+
+DOCS=( "DONATIONS.txt" "RELEASE.txt" )
+RESTRICT="bindist mirror"
+QA_PREBUILT="/usr/bin/kryoflux-dtc"
+
+src_unpack() {
+	unpack ${A}
+	unpack ${MY_P}/dtc/$(usex amd64 x86_64 aarch64)/${MY_P_DTC}.tar.gz
+	use gui && unpack ${MY_P}/dtc/kryoflux-ui.jar
+}
+
+src_prepare() {
+	default
+
+	# Upstream uses 'libCAPSImage.so.5.1' (uppercase),
+	# but their source installs 'libcapsimage.so.5' (lowercase)
+	patchelf --replace-needed libCAPSImage.so.5.1 libcapsimage.so.5 ../${MY_P_DTC}/bin/dtc
+}
+
+src_install() {
+	newbin ../${MY_P_DTC}/bin/dtc kryoflux-dtc
+
+	insinto /lib/firmware
+	doins ../${MY_P_DTC}/share/dtc/firmware_kf_usb_rosalie.bin
+
+	cat <<-EOF > "${T}"/80-kryoflux.rules || die
+	ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="6124", GROUP="floppy", MODE="0660"
+	EOF
+	udev_dorules "${T}"/80-kryoflux.rules
+
+	if use gui; then
+		insinto /usr/share/kryoflux-ui
+		doins dtc/kryoflux-ui.jar
+
+		dosym ../../bin/kryoflux-dtc /usr/share/kryoflux-ui/dtc
+		make_wrapper kryoflux-ui "java -jar kryoflux-ui.jar" /usr/share/kryoflux-ui
+
+		newicon ../images/disk.png kryoflux-ui.png
+		make_desktop_entry "kryoflux-ui" "KryoFlux UI" kryoflux-ui Development
+		dodoc dtc/kryoflux-ui_README.txt
+	fi
+
+	if use demos; then
+		dodoc -r g64_demo ipf_demo
+		docompress -x /usr/share/doc/${PF}/g64_demo/BBSB/*.g64
+		docompress -x /usr/share/doc/${PF}/g64_demo/DOTC/*.g64
+		docompress -x /usr/share/doc/${PF}/ipf_demo/*.ipf
+	fi
+
+	if use doc; then
+		dodoc -r docs schematics
+		docompress -x /usr/share/doc/${PF}/{docs,schematics}/*.pdf
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you want to access your Kryoflux without root access,"
+	elog "please add yourself to the floppy group."
+
+	udev_reload
+
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+
+	if use gui; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index e6d189dac86c..68acb33b6f57 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -2,11 +2,8 @@ AUX LCDd.initd 310 BLAKE2B 415321c1b8c80016f21e283339e21c6adbbb92dbf99649846044f
 AUX LCDd.service 166 BLAKE2B ef3d9a7af9e8e8d8bb54e11110dbcb44c968cbc8fec63529f86dbb0a027154997d12e927405ca228a5740fcadc7518448c640ddbe5f38eabee1b7698b17b3035 SHA512 d09829efb26c9b8ca01f6cd07f704d55d05b3328866c169251683b1343ec37e569f95ad14b3b51e2d832ea7b0d3eba5579cec02decb86504016e535a61d7ea46
 AUX lcdexec.initd 325 BLAKE2B 7a7b48e2e24c763533934bca78debd36a1fb6146f6e72204777f50d7dc962a519ab06ef0bc9b1c91b36cd726b67679e7a94d2edbd28bd524ecccf6d20f6a53de SHA512 f8bf380b2e452e830cc3805f297d06c4cdf623db91eff310da2b20cd87cd87ef850c1c7e5b843044333167fa8724acb8de8d65752328ec4144b486d0bed6bfce
 AUX lcdexec.service 171 BLAKE2B cad9c32ce67365158a210fbc65c794881cf84ddcba870019e2772eb6b0913fcbcba99f82f803621930b867d72c63f16bc61710174c35da0ba923e9f68dc119dd SHA512 5372cf10ee750122d2312ecb595a827aa3c5f14bf34049f90950b36b7a77a7c36bcf2d72a30dc6ebf8830251c901c9703c05a6c92fdc580940b6ffe1e421cb2f
-AUX lcdproc-0.5.9-use-freetype2-pkg-config.patch 552 BLAKE2B afa135d8abb2bb47f75f5306ed26a5447289618575c26873bf5335c94286c36dc0444b2ef8b74dd7087b0a3d2529602c25de680ff534df303e094a90f258f8bd SHA512 d5922c61274b420dc3138c5345868924ab7562f7aaa267068c925b4c36b74309ce8132103e265cdfc5b84cb6f3d6f5bea7036c617e14e7a22aa32c360202014e
 AUX lcdproc.initd 325 BLAKE2B 405944d2808e308c27732ef9e75d65e388616596ede330848a66d9135c6dfd48101534159c344a3b4afc1fbba9694f412e5a82ed8cc3a9a2cff0a74754348192 SHA512 057c0f6aef2d6e09c3707382f281888738d7e30f25f151f0588c5a678e34f5bc2e2f11a44fe1c4e30ba13c18504e8578f45b92c3ce5822259f9e9a9cba8a6ae9
 AUX lcdproc.service 171 BLAKE2B aca4177b065f31aab4c940629850f7045ff7a9420975f8555f1dad9071cb58a17be8123c4a72f26e6a366ca0edd5581724b16bb3fbc4e0457c9016af802a18f2 SHA512 c71684ad0ff7b81466922676fd8612f6f8ec6641c4504089efb1a335d5f7eccbcce010de1e0c7a33dc07d9cd8abf80a3f5d0118fc7c711fe592ef9f98643a629
-DIST lcdproc-0.5.9_p20200721.tar.gz 936215 BLAKE2B d861346c9b0bd66a181cd80d98624b453f84944842a80fed8afab436539a617ed195481f0fb244839c8978b2c3eb587f521b5f185c324151273ec739753f6c45 SHA512 11895caedc66e337a3f6c9a57ef50e6f690982078f682ad3d4d0fadec771c6073727238e7347e7461dca32e735110162d44d0d25c76026775159e4a65cd758cd
 DIST lcdproc-0.5.9_p20211220.tar.gz 941272 BLAKE2B 910504e86a8c3b2c764b20b175b76287166c6fa1d93fec74e7ea91adc7027530a40f415c26c2820f300d2bf5222e9bebec082aedf76b53d0a70a386c91b8d540 SHA512 6901a92cb8d7102f5fb429d59d416fcd98b57e1cae41bddbfe592befaa97738acff3d46be250cbb5b1ad012322f88ac549d220e96aa399bb4cd8c19ee28407c8
-EBUILD lcdproc-0.5.9_p20200721-r2.ebuild 6273 BLAKE2B f71841b9fcff2c2399411523a051dfcc39cc212570b13186f63dd2f10a1d8d81e554f20f806d4c4e93751bc7069b62bd10e310072a4ae122139bc1f36e232d39 SHA512 4cbbaf98aa4c07a5fbc41b4fc2860a307d8cfdb36910eab66482d727094323ffa5b0b6a9227bdca8f2cf4ee87155da05c103e3da9197f5543f82c28c7f24cecd
 EBUILD lcdproc-0.5.9_p20211220.ebuild 6203 BLAKE2B 1887cc69812a6804ed5348d364cf228b6f473a821c1e16bc0970a9f5e2912a50b445049237c08d03177a43ce6474014fe9df34a3c91b4a30b7c368739f08cafa SHA512 9877cbf6cc21655f8d7dfd084edc83842bdb729a001e39a277b0cfc16221c9d9c1d9d4c9ee42aa73aa86ccbf478f8fc0d68c280ff8996ae3337ecb160581560e
 MISC metadata.xml 1539 BLAKE2B d2f01507bd93dbaf286576e2f66e5c617f8b0fbfbbe94565f5de2eee406fdd7a66d77467db5af7c521ff3838b718a4872fac74332f587ff602c20681b968a09d SHA512 d5a36d6c40c5c49245f62dee9063fad6eb8f1391ac694bd7a2a9cc1cdc0cc1d74659a3e2baefd9750f3267aee8ae53dfc1b3527c32e3e4811b268d45ac5f83c1
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch
deleted file mode 100644
index 9149bf784276..000000000000
--- a/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.ac	2017-06-18 22:33:56.000000000 +0200
-+++ b/configure.ac	2018-10-04 22:30:22.668770478 +0200
-@@ -389,11 +389,7 @@
- AC_MSG_RESULT($enable_freetype)
- 
- if test "$enable_freetype" = "yes"; then
--	ifdef([AC_CHECK_FT2],
--		[AC_CHECK_FT2([],
--			[AC_DEFINE(HAVE_FT2, [1], [Define to 1 if you have freetype])],
--			[enable_freetype=no])],
--		[AC_MSG_WARN([freetype does not seem to be installed])])
-+	PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1, [enable_freetype="yes"],[enable_freetype="no"])
- fi
- AC_SUBST([FT2_CFLAGS])
- AC_SUBST([FT2_LIBS])
diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild
deleted file mode 100644
index 32ab3bf75e73..000000000000
--- a/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT="9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1"
-
-inherit autotools systemd
-
-DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD"
-HOMEPAGE="http://www.lcdproc.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc ethlcd extra-charmaps menu nfs png samba test-menu truetype"
-REQUIRED_USE="
-	ethlcd? ( lcd_devices_hd44780 )
-	png? ( lcd_devices_glcd )
-	truetype? ( lcd_devices_glcd )
-"
-
-# Define the list of valid lcd devices.
-# Some drivers were removed from this list:
-# - svga: It needs media-libs/svgalib, which is masked and obsolete.
-IUSE_LCD_DEVICES=(
-	bayrad CFontz CFontzPacket curses CwLnx ea65
-	EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd
-	icp_a106 imon imonlcd IOWarrior irman irtrans
-	joy jw002 lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a
-	ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD
-	Olimex_MOD_LCD1x9 picolcd pyramid rawserial
-	sdeclcd sed1330 sed1520 serialPOS serialVFD
-	shuttleVFD sli stv5730 SureElec t6963 text
-	tyan ula200 vlsys_m428 xosd yard2LCD
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-REQUIRED_USE+=" || ( "
-for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
-	LCD_DEVICE="${LCD_DEVICE,,}"
-	IUSE+=" lcd_devices_${LCD_DEVICE} "
-	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
-done
-IUSE="${IUSE/lcd_devices_glcd/+lcd_devices_glcd}"
-REQUIRED_USE+=" ) "
-unset LCD_DEVICE
-
-# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
-DEPEND_LCD_DEVICES="
-	lcd_devices_cfontz? ( dev-libs/libhid:= )
-	lcd_devices_cfontzpacket? ( dev-libs/libhid:= )
-	lcd_devices_cwlnx? ( dev-libs/libhid:= )
-	lcd_devices_futaba? ( virtual/libusb:1= )
-	lcd_devices_g15? (
-		app-misc/g15daemon
-		dev-libs/libg15render:=
-		virtual/libusb:0=
-	)
-	lcd_devices_glcd? (
-		app-misc/glcdprocdriver:=
-		dev-embedded/libftdi:1=
-		dev-libs/libhid:=
-		dev-libs/serdisplib:=
-		virtual/libusb:0=
-		x11-libs/libX11:=
-	)
-	lcd_devices_hd44780? (
-		dev-embedded/libftdi:1=
-		dev-libs/libugpio:=
-		virtual/libusb:0=
-	)
-	lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= )
-	lcd_devices_irman? ( media-libs/libirman:= )
-	lcd_devices_iowarrior? ( virtual/libusb:0= )
-	lcd_devices_lirc? ( app-misc/lirc )
-	lcd_devices_lis? ( dev-embedded/libftdi:1= )
-	lcd_devices_lb216? ( dev-libs/libhid:= )
-	lcd_devices_mdm166a? ( dev-libs/libhid:= )
-	lcd_devices_mtc_s16209x? ( dev-libs/libhid:= )
-	lcd_devices_mx5000? ( app-misc/mx5000tools )
-	lcd_devices_noritakevfd? ( dev-libs/libhid:= )
-	lcd_devices_picolcd? ( virtual/libusb:1= )
-	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
-	lcd_devices_ula200? ( dev-embedded/libftdi:1= )
-	lcd_devices_xosd? (
-		x11-libs/libX11:=
-		x11-libs/xosd:=
-	)
-"
-
-RDEPEND="${DEPEND_LCD_DEVICES}"
-
-DEPEND="
-	${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		app-text/xmlto
-	)
-	nfs? ( net-fs/nfs-utils )
-	png? ( media-libs/libpng:0= )
-	samba? ( net-fs/samba )
-	truetype? ( media-libs/freetype:2= )
-"
-
-DOCS=( "CREDITS.md" "TODO" )
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.9-use-freetype2-pkg-config.patch" )
-
-src_prepare() {
-	default
-
-	# Fix path for modules
-	sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Enable all users enabled lcd devices
-	local myeconfargs_lcd_devices
-	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
-		if use "lcd_devices_${lcd_device,,}"; then
-			myeconfargs_lcd_devices+=",${lcd_device}"
-		fi
-	done
-
-	local enable_ftdi="--disable-libftdi"
-	if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then
-		enable_ftdi="--enable-libftdi"
-	fi
-
-	local enable_hid="--disable-libhid"
-	if use lcd_devices_cfontz || use lcd_devices_cfontzpacket || use lcd_devices_cwlnx || use lcd_devices_glcd || use lcd_devices_lb216 || use lcd_devices_mdm166a || use lcd_devices_mtc_s16209x || use lcd_devices_noritakevfd; then
-		enable_hid="--enable-libhid"
-	fi
-
-	local enable_png="--disable-libpng"
-	use lcd_devices_glcd && enable_png=""
-
-	local enable_usb0="--disable-libusb"
-	if use lcd_devices_futaba || use lcd_devices_g15 || use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_iowarrior || use lcd_devices_picolcd || use lcd_devices_shuttlevfd; then
-		enable_usb0="--enable-libusb"
-	fi
-
-	local enable_usb1="--disable-libusb-1-0"
-	if use lcd_devices_futaba || use lcd_devices_picolcd; then
-		enable_usb1="--enable-libusb-1-0"
-	fi
-
-	local enable_x11="--disable-libX11"
-	use lcd_devices_glcd && enable_x11="--enable-libX11"
-
-	local myeconfargs=(
-		--enable-drivers="${myeconfargs_lcd_devices#,}"
-		$(use_enable debug)
-		$(use_enable doc doxygen)
-		$(use_enable doc dot)
-		$(use_enable doc html-dox)
-		$(use_enable doc latex-dox)
-		$(use_enable ethlcd)
-		$(use_enable extra-charmaps)
-		$(use_enable menu lcdproc-menus)
-		$(use_enable nfs stat-nfs)
-		$(use_enable samba stat-smbfs)
-		$(use_enable test-menu testmenus)
-		$(use_enable truetype freetype)
-		${enable_ftdi}
-		${enable_hid}
-		${enable_png}
-		${enable_usb0}
-		${enable_usb1}
-		${enable_x11}
-		--with-lcdport="13666"
-		--with-pidfile-dir="/run"
-		--without-included-getopt
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake dox
-
-		local docbook
-		for docbook in lcdproc-user lcdproc-dev; do
-			cd "${S}"/docs/"${docbook}" || die
-			xmlto html "${docbook}".docbook || die
-		done
-	fi
-}
-
-src_install() {
-	default
-
-	# Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients'
-	rm -f "${ED}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die
-	insinto /usr/share/lcdproc/clients
-	doins clients/examples/*.pl clients/metar/*.pl
-
-	newinitd "${FILESDIR}"/LCDd.initd LCDd
-	newinitd "${FILESDIR}"/lcdexec.initd lcdexec
-	newinitd "${FILESDIR}"/lcdproc.initd lcdproc
-
-	systemd_dounit "${FILESDIR}"/LCDd.service
-	systemd_dounit "${FILESDIR}"/lcdexec.service
-	systemd_dounit "${FILESDIR}"/lcdproc.service
-
-	if use doc; then
-		dodoc -r docs/html
-
-		local docbook
-		for docbook in lcdproc-user lcdproc-dev; do
-			docinto "${docbook}"
-			dodoc docs/"${docbook}"/*.html
-		done
-	fi
-}
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index 3b36aea79f20..81cc8db61322 100644
--- a/app-misc/mime-types/Manifest
+++ b/app-misc/mime-types/Manifest
@@ -1,3 +1,3 @@
 DIST mailcap-r2-1-53.tar.gz 27238 BLAKE2B ffc9067287d951775c417d7a583a9f64fc09f98990f3f760643e76e3b91d2205040828cd452aa1004f0bc76c3e913f5da93887b385cc3cd9464327ba1ffde57a SHA512 3f952a031f9e86321a4583dba42fa7778a2821c55fc42b6096cc56c531bc957e50c545ab0d470ab72782eb3815e8278df122e20c1ae532b7bbb55db12e00cb77
-EBUILD mime-types-2.1.53.ebuild 702 BLAKE2B 673f7925e3e002f35a4871693173f311192b44e84d4bc2c87d409d31676f01957824e52f1a099d4ac4c8be91248ebbd45905aff6df8cc39fc94113bdb61a7f59 SHA512 fdee37ecfdffaf7b788c915d6535fa4944a485481f179dcfde10eade8b6833716d3d1abe6495ab92657ce7dd994b670d8f20b0d2320f5c45d959e339f082feea
+EBUILD mime-types-2.1.53.ebuild 709 BLAKE2B 1845fb6c8020cb0dabf1c53c7ab13b7e3f5c2b15f8d89d3ddb5b60e908ffc623c4488220f4d0f1165eae7fafa3acedc683f435f7c878caac46eebbbc14e9eb44 SHA512 8d12337d78678ca9367095c0828e97c280c16c2013947903cd293d6a3eba70e2a22ec90c6f06666fb78ce62e56c374c6a1695f9452ad054bd61eb4a492f8aeec
 MISC metadata.xml 352 BLAKE2B 462a2f661aa883b7674f2f1cf0cba158434fcfdff203f3a725b4b0ff394e8825babe1d25b37e2c4b13e822dd448a863262530e29610d97ba858d3a697b9c19cd SHA512 32a3007fb66e92f7dbc4fece550e44d7beb1f59f4142cfabbfff1448cb4b9f1ecbb2a69554b6dc649d505f1eeb6e2bcf7f9c49abeb90968fcfc9fac5aad067f1
diff --git a/app-misc/mime-types/mime-types-2.1.53.ebuild b/app-misc/mime-types/mime-types-2.1.53.ebuild
index 940f2070384d..a478928ff94c 100644
--- a/app-misc/mime-types/mime-types-2.1.53.ebuild
+++ b/app-misc/mime-types/mime-types-2.1.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://pagure.io/mailcap/archive/r${MY_PV}/mailcap-r${MY_PV}.tar.gz"
 
 LICENSE="public-domain MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nginx"
 
 S="${WORKDIR}/mailcap-r${MY_PV}"
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 906974e7274c..a5c5c931584d 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,5 +1,5 @@
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
-EBUILD neofetch-7.1.0-r1.ebuild 1160 BLAKE2B e038b9c2c7b54514b1e45361fe32681b82e9fccc9d336c9d4edab4f8508b7dd5ed65d4e24b75f07c98dcd807f1297beb8facbe5f23b4a6995586c982e3c20afc SHA512 28a6e3c6983cfa39e6ea4239b1a2ca52b7d714775652d903ca5437a729c502664f75e9b5424cea6cae9e582547e499aa3ad0bbadf1c1924a5c37c9510b2740df
+EBUILD neofetch-7.1.0-r1.ebuild 1167 BLAKE2B 4ecde775c461661091d8a0f0729f217dfe9a9c392c7f5c58ac3b5452616d70a11a7d030b6e9891c50beaba4590383067d93a8e1c65b60ffadd1ccdfd08dfef17 SHA512 0e5214adff0f1e65f298bddebabf3a350769d4a47a42bdb2de483dd4e501de10c34ec004795b9f0c42763a14ee4c864123fdb9a81c3089b0f63fac27d541f077
 EBUILD neofetch-7.1.0.ebuild 937 BLAKE2B 72424ef48458c2c4c0a70900f42f597ebaf0ec659b3fadc9e860262b336d066786b078412c363394c674250d52fcb2ab267c665d2778b98cea96a1baf759134c SHA512 568336106a81b75f35e657c7f494e6b1b7683dbba29085bc28c0e7b441d288c5a013ba3c6ebd1ad62b3862ec8ad835b6fcea07eb0dcd590b907c38f4427d79aa
-EBUILD neofetch-9999.ebuild 1147 BLAKE2B 12a4fe99b0c45f980d0452a4b96288a8543beb03f94eb81195dd11a1b87129506f7d9bf5a6a54380d4b6289988e7f2098680804924fb9cf32a7386fe1e6efaa7 SHA512 753c3e6ebae6688c78246d2276dfadd37baeb004763e5d9d26cd04dcafa1b77f48304456df92e3ca78eefb0d419bde969eb438d1bd2d80674ed5d8504bb3a7ed
+EBUILD neofetch-9999.ebuild 1154 BLAKE2B 9e196f593153560b9f638c0eea977e090228e2e35120305c186c49c75623d8f714abf52df9b28945a56cd826f663f7e252d68e01de126b5e837c366fc3fef587 SHA512 17af5087b2e32db0b93a4e015764c11e35397f3658104aee0a04a0c71446a558775a13efe85facc55a30f030915c538185661befb23322e1a244cfca0d1c016b
 MISC metadata.xml 863 BLAKE2B 3a4dbfbeea790e95fafbe9b47169bd43c127be69f21ffb2c0752ad2003304ef7628f0c95388288cf00b5d567b83626ac15cb015a8fd9c4c6cacc1137410a7887 SHA512 593a76d4beb607cf64a5dfeec978d7c6be6ad2a1dc36aefa44c2e18724d09c76133d3bab0fc5692f2bd997c86156337142b5115e7d34d4da59f91e69f44d4f30
diff --git a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
index 972756a092a1..f1cb69cc0c0b 100644
--- a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit optfeature prefix
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index b0c0a070de9b..a5b12b52fdd7 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit optfeature prefix
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~mips ~ppc64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 24579b083442..fa15b7b2ddff 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -18,6 +18,7 @@ DIST nnn-3.5.tar.gz 205980 BLAKE2B 4c49fb0feb4f04075fd64d0b42643256cceec84185df2
 DIST nnn-3.6.tar.gz 204688 BLAKE2B 475bd783333bbb55f0c64a3028712792f9376f6a604ba18a7aef3735f1afc5aa91f419f3f41b2c14d525d02fb30db6ca7078fe56f4c7cce2f97c32079be129ea SHA512 e997e2279c495c7235fdfd51ffcc36949686889424686f050329c7f127c62f3ddc807a758ee1b18b00a1884eeaf9f94195d02b2d0e2d76ae1523b8bf2cef1232
 DIST nnn-4.0.tar.gz 214555 BLAKE2B b0490662bad07213ff79b8865b8d9672d1ff98d93e3705e0aa45d103c151274934dc0cff66731f7b157007a81b9dbb5d9f3edb6a17daddcfb265f73b6faa400e SHA512 fde552a31674c9bf50a2e98de4456621bdc97aee36cd5efd7ad0cc33959965d01469fb20b12868ebffd4c8da79990b502e26895cb5b047ac8821e2ca09b0a234
 DIST nnn-4.3.tar.gz 236606 BLAKE2B cec0a73a40fae76e478c3299e2ae8a613c2e1b16e009d4f69cc3c9c9f6ea5df4048fc7f941ae6369293cf56df9b91a496531f4b34bf05f1dbbf8fab9120ffe78 SHA512 588af174d86db14acf5d1e2ac42f88ca5c6f0e105996a58771e7e0f989f224616e7a12d74fecc96540a9782db0cf8857c21bf0f50df4ee3b4b5c641291c64575
+DIST nnn-4.5.tar.gz 242191 BLAKE2B 2a1564520222bc51df64c495ffa7a22fc3200f4572281e4b4e998e999b41c171f4b832502a054741040fa9d87d0da0d0d23949c0d867fc4c2830722045654c3d SHA512 ab64f0e6211b14e90a4632bb0da9a1214635c9a06718c7c434d344d69d1087b4d5d978d44f38c1b03bb555e3055ca5033bcbca40927135757a468e6f1b99046e
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
@@ -38,4 +39,5 @@ EBUILD nnn-3.5.ebuild 857 BLAKE2B 5d83ed554d1f63667bca5f3bb3d39b06594693bb3a2a59
 EBUILD nnn-3.6.ebuild 1050 BLAKE2B ab4ac86b9c72e0bbb44b3e08ad26b6953bdef7272387cd58019806c4e722a210c19c8afa504b7753fa4905dba70b4bdcf59bb92746a73d515e63de1f76d8c5ba SHA512 8200e20e253a0970859fa53451f7e811fe7dbe8e7d2bf2631e81e58aff97271c325ce36bf1acc62542d96e2baf3fe26a628702516140dce94935e7303ff9e4c6
 EBUILD nnn-4.0.ebuild 1050 BLAKE2B ab4ac86b9c72e0bbb44b3e08ad26b6953bdef7272387cd58019806c4e722a210c19c8afa504b7753fa4905dba70b4bdcf59bb92746a73d515e63de1f76d8c5ba SHA512 8200e20e253a0970859fa53451f7e811fe7dbe8e7d2bf2631e81e58aff97271c325ce36bf1acc62542d96e2baf3fe26a628702516140dce94935e7303ff9e4c6
 EBUILD nnn-4.3.ebuild 1050 BLAKE2B f4c3accb8482ebec73a9af0768c20208866f527d4262e8a9127d03b1be42175dfb542ffdb1fc7e67908a57c700912532912029f332562cdc676bb1554d401a4d SHA512 db2c9a11d2a7e6d1fcdbf30e1aa948f180ab48b61d68cfc76f2ae6841b5c44953083fed8dfed7f53fb5c1a709e7f28ec732f7ce4e2b228480c16151c7ca8ac1b
+EBUILD nnn-4.5.ebuild 1050 BLAKE2B fa98a38f462e4f72947e174cafa7aaada7377e9a54d862f76f66bef59aee3f8c6ae5f3057e8aec217f2319e8f665e1b9b8ce0d18f6614cc8dca3ff80612649a3 SHA512 c896f5c94b18cd19d998fe804365ca3391ccbd3ebff1be73c1feac1b5bdc2a47011814f233fdffa89af740580f1eb7254968bbe8bab28afbab68e2c697eb64dc
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/app-misc/nnn/nnn-4.5.ebuild b/app-misc/nnn/nnn-4.5.ebuild
new file mode 100644
index 000000000000..57340dc98f35
--- /dev/null
+++ b/app-misc/nnn/nnn-4.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/install: all/install:/' Makefile || die "sed failed"
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install-desktop
+
+	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-misc/notary/Manifest b/app-misc/notary/Manifest
index c020080a9ab8..94c204ee095d 100644
--- a/app-misc/notary/Manifest
+++ b/app-misc/notary/Manifest
@@ -3,5 +3,5 @@ AUX notary-server.initd 568 BLAKE2B a38ceeadc4d3bd663dced340da3040b352081dce6d27
 AUX notary-signer.confd 103 BLAKE2B 461b38b6c8d97e7c8cedb88e48eca0342174434a819d99883496a9622fd04c19d097a498195c9e37246420f4f01fef07219bd4c9e76dc26cf8b70d9ce43ab1c7 SHA512 088bbd2eabf1e9be673b35a4a481c270ba2ccea479ef1164804ecead730a61465862888e7cbff53976056826d4ff066e1e2ab253cd6e3287109d03873c11777b
 AUX notary-signer.initd 568 BLAKE2B a0041a57049a1709ffb0906e4cef2e6cad32172c52bddc77917e7f6293a4deba79ae0d965db53fb537d66d91dc6b06230f91d14971c408f60182b350b6a672af SHA512 325614982f75f33a9fd59a6183255fa61158c4b2288f2d06e4d88c8f1f43dc5df83c85e8ecdf40cf19f9a00b51ba641fc024d863f220b6aac8e530e17e7eb3a2
 DIST notary-0.7.0.tar.gz 7146025 BLAKE2B 2aafa82e27eb498d21d09781b54f9a40df57ba23fd4386b5d8fdc0eb09a74b761a1bc3c618ad2403b21e049c4dfb9e75281e949cc8f29474da6903d5fc06ede3 SHA512 8996f4d64fda5db54d460ae8168360fdde86986752b30255ab9cf9cf12d475f88d7ac4f2b0e15d6cb9ee8eff2709306fd0b3d38708ee41caa94862d795ca6a75
-EBUILD notary-0.7.0.ebuild 1023 BLAKE2B ddbce4a49463d9509242f2d439d3b04fc59054c22aca4b8e67d4a13593847bd1d6fb9892cc62604ebff3f6d0746b394623766aaa46e54be6a0875a01eb12e89c SHA512 53de0418d81c8a47d6a3085664b63ea6ab83d575963f7bee8b4db92e4f89b5003269895210bdd268a35543398a879008dcb9092b0eea06268731dfa1865c27a6
+EBUILD notary-0.7.0.ebuild 1013 BLAKE2B bb91619e8e00a2c54352f87fe640712c36b75850f4be90bb93343c52d69ebdc350cd26ccecf1637d7c0a7daf33eb14a9436b8347313ddc92dcd3ba3220f73328 SHA512 0c089eea4b811e6cfafc2cfb893ab5d60f02ed3687872c428643ff2c987c53cb41912b39d2058348cb46c4195e0a6ac7a9f6585e9033db3d9cfd3592568795e2
 MISC metadata.xml 263 BLAKE2B 70180cf01a9a8de9dc53e35528c571ae95b0316c794b482a33f9db1575119c0bfeb3645e4e31681192e64a958fd51c24fb0dac048bce6e2850ce9eee40a42308 SHA512 d918f5f60be280f32f0a07a3c6de16fea69a8d0e0495a15e97362c97074a21d7c1ef69bd292b86eaf61e68fae593ec3d167abc29d6d3536d2d1ad57535f2b3bf
diff --git a/app-misc/notary/notary-0.7.0.ebuild b/app-misc/notary/notary-0.7.0.ebuild
index 141759da1bd1..4ca8fbf90066 100644
--- a/app-misc/notary/notary-0.7.0.ebuild
+++ b/app-misc/notary/notary-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,8 +6,8 @@ inherit go-module
 GIT_COMMIT=b0b6bfdd
 
 DESCRIPTION="A project that allows anyone to have trust over arbitrary collections of data"
-HOMEPAGE="https://github.com/theupdateframework/notary"
-SRC_URI="https://github.com/theupdateframework/notary/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/notaryproject/notary"
+SRC_URI="https://github.com/notaryproject/notary/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 4fb1860d2aff..34775c7629d1 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,7 +1,5 @@
-DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102
-DIST pax-utils-1.3.2.tar.xz 725916 BLAKE2B ff792288b22c185501123d3e152ebae891585d5fbbbb1957f62c68fca3b342b8ca986d53611677aff4566ad4483afb3c69f40738be4cf5d653ca469e72b5661a SHA512 50330a34d9b7b33c67be079eb871e6dafe29c72f2fc42fec0e51aa9a2e0c1eb95e6d27a4dc1affe6647cdf4c9357545336d48c9e27a7e0106d57532a0f53cdcc
 DIST pax-utils-1.3.3.tar.xz 725900 BLAKE2B 17004a4fe57f05e80e0c51a156931975cbaf73e20d96fa50dedf6bd1538ff3f8383591f4b5fd0df926a6a6b75cb083724aaf92b1a4d4ebc67290500520919c29 SHA512 bb0d03371cf8f0cc26a83cbee888a6d91e70416dedc740476cd5549ddaef67048c6802e30e469ab1aced0fd7f63f84e9644744602b2d483ef7af37191505f72e
-EBUILD pax-utils-1.3.1.ebuild 1706 BLAKE2B 7ae3c220eeb4628635eb153defcc191ed539920fd85e6bcce381ed1e11db9aaa4ba58e09e56942401a04a4b51d32568a4689284ba0511ba11368a2addbbb4b4d SHA512 6bff379bed3e0b9f9a81af330e731abbc0c4c8f4e7cdd39bbfea7471970f90866f3aa955be8c354f7f96a32c294375a5cc4617a6bd0bd9d0216a231fe1807df0
-EBUILD pax-utils-1.3.2.ebuild 1666 BLAKE2B 91f44eeb63c978c4c16d2b0e5038a71b7bc8832f0da82de5dd009ca4f92faf556f5482545e58c34380788789d33f2134da2f85459cfe831e9080f5721fa4d884 SHA512 4c0a6eacb346a634c441befcca7f2c037301d99bee7e202b4d3340afda5e243122b0689abce3fc90bfa05b5ce522e7e444d7df30e17cb432e582e4fe7787f711
+DIST pax-utils-1.3.4.tar.xz 753448 BLAKE2B c105ff568a8e4378cfef5f8b9acb415a850b1e209ea8413cdf518de82e5e925fdba60288557f042bf02d2e075ed5e538175b2078e4dafbe5c54117ed580fd87e SHA512 44a475860823e8b70b1d09d69e5fba3ed8298511d07e1e7b09ce62237cb8b1ecee8fc2fc550d6853d0b9f8db3c350bf78ced49d5f210997b294dc10e36627fcd
 EBUILD pax-utils-1.3.3.ebuild 1824 BLAKE2B 4d5e2039ad372c70caf76594938228223c1169e984b3e7cce0dd8f892ad137b910d65a985bf3ba7ab60a1b9a89c7fe04eb7e3c2f0b0436c1371a3717f5fa24a1 SHA512 f9ada3fea1b51dabdb6b12348ba6a245cf31462c3f8d7ad71b3352ad481edd730c697c76a80608abc7379fc66aef5d57ed7068ccf2d94fcdeb5e0ac3c0d8fe4d
+EBUILD pax-utils-1.3.4.ebuild 1792 BLAKE2B 5e55bd21f86066aac6047f736735d99eda8050736f5ead32901a95c4af794563838f4751c4ca9b804323e0209109e8c3c485acb123a827229a873c61ff65333e SHA512 9272f84b6ecdfc589082289e2325b1ffe3bf2a6d099b04803fc6f2a70663a6b799b215b8387f6255042584c453e0ba7f4918cc74185132a0c1773ed61e296c62
 MISC metadata.xml 678 BLAKE2B 347b6f8175b20bfa4f592b41b15f5fa8228fb3e657ab86b4692aef468130e7625e41ec1266a89ed1fb2a81d608eecd957e773863b440afd7bf83873a357ec7ce SHA512 e6739b52ccaf7f8e4d0c3b173c85b368c974fd62b231ce83513c342b9e3148b5b29aa7f985af929d3d07e9d5808ff6aca575b88dd23f0b25bb89d952fa45dc70
diff --git a/app-misc/pax-utils/pax-utils-1.3.1.ebuild b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
deleted file mode 100644
index 792772f354ac..000000000000
--- a/app-misc/pax-utils/pax-utils-1.3.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="ELF utils that can check files for security relevant properties"
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps debug python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pyelftools[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	caps? ( virtual/pkgconfig )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux ||
-		has_version '<sys-libs/glibc-2.10'
-	then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-
-	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
-}
diff --git a/app-misc/pax-utils/pax-utils-1.3.2.ebuild b/app-misc/pax-utils/pax-utils-1.3.4.ebuild
index 155a5737d3f9..293e00e107be 100644
--- a/app-misc/pax-utils/pax-utils-1.3.2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.4.ebuild
@@ -3,6 +3,9 @@
 
 EAPI="7"
 
+# Note: if bumping pax-utils because of syscall changes in glibc, please
+# revbump glibc and update the dependency in its ebuild for the affected
+# versions.
 PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-single-r1 toolchain-funcs
@@ -10,12 +13,11 @@ inherit python-single-r1 toolchain-funcs
 DESCRIPTION="ELF utils that can check files for security relevant properties"
 HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
 SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+	https://dev.gentoo.org/~xen0n/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/rdfind/Manifest b/app-misc/rdfind/Manifest
index 65bdfcef0660..d7ee2464c61f 100644
--- a/app-misc/rdfind/Manifest
+++ b/app-misc/rdfind/Manifest
@@ -1,6 +1,4 @@
 AUX rdfind-1.5.0_include-limits-header.patch 509 BLAKE2B 452f26f332850bcad3dbc6aa61cfcbc0c0fbde595330e12160572dd00b9bd4be3bf7f80bcf5b6eaef58adf211b1e5ad2e44c8ed46451a7d684e6b4dcce519150 SHA512 cfae0145b4b657060d465dbd841f3b5e3260cb4a63bfe4706038810b64020f4b8067fc3d5607a9c1480527378d45f4b7aa56a67178d720af318b584968ca17e6
-DIST rdfind-1.4.1.tar.gz 53708 BLAKE2B 18778fa65f9c5fda18a59e4021b6346bc5722c19a3796f2b4a85e5c8d919c5f8beeeb8fed572fcce0016e2939568f5e3dc3d3e567178a54ad9ac4e89a1ea77ff SHA512 00d34f46e8534074577a0cd32f71dd8da0b9a7c9a175a612a4a858693ca679de3b77fca1796b543ead796c806a693e97611c0a9fdc743229d317136b32ce89dc
 DIST rdfind-1.5.0.tar.gz 55200 BLAKE2B ad031acba85b6dead8ec3cfb2dfeb13bce424ee3b70dabc2b1ecaf0bcab8ae64c33ce1df22a54b430876d95ff59a58a2c3dc86d93f551ca8dc069488d3319e6d SHA512 007e54c90a74a20913ce8af6e6ecc90414c503260d88afa5a98525d43a7b6445762210c6a957beacdc99ff3dab95adb4100a2553454d177c0cfa3cbbc937f495
-EBUILD rdfind-1.4.1.ebuild 534 BLAKE2B c960258c2a59410b3d106cd24d699976615d2263d1177400bcee8ff9eceb44da319b8ffa11dc9002aa8bddcfc1ce50be46830fefe37fc5ad5e3b9dbacccb45a5 SHA512 8dfc23566939b930ea55daaf71f05f653167d5e4f7dd9ae9e543e77e6327545ddab10b304db267375112b800f35f3e2d8aa1ff4be05ad0433914009c54b78489
-EBUILD rdfind-1.5.0.ebuild 602 BLAKE2B 536cc019811464a630b47279efdc7cb7364429e17f9d55ba50cd3523d71f65cdb7d5c448269407d7145b10615eff7125e873789118b967eff8c9a1d5f1189444 SHA512 d34d8c2c6722b0c10601e7fc9db24d51ba26e50e60814d16fe8d620c535577390d518875fabff54f5967492e8ba273b53aea692fe372b2efdab34d173b68462b
+EBUILD rdfind-1.5.0.ebuild 702 BLAKE2B a49a5d26b9ecd34a66e7fb7dd50e7999c13a684310553042755fc8c42661bd92ff0a44c075f20505ce1308e31f323cefa51b0e5d85343cd0346bbebd9de7b4e5 SHA512 51de6b38a3b72aff83b3424f59bbcbf41939847409429b6e01a7742cba765b3cc015587108ac8f8b6a40d04373711dd50996a1e15ee2b4d6aab0b9794d56aecc
 MISC metadata.xml 841 BLAKE2B 32b8bde4c5907e3c1cf8cbecf78f1c10c9fe49efc9ce5748af35815c7d5a5ab958a440c6da5d7680f52d72ab200230813f33a54503edc274cd6d588716ee153b SHA512 bd25cb0e6341ef0202ed7c9b23db2de735818c3eb31b557145a12dca62cbe7298db4e7ad13b7f3c899055b51db13264a77a9eaf378e89e5f62886237e93bd142
diff --git a/app-misc/rdfind/rdfind-1.4.1.ebuild b/app-misc/rdfind/rdfind-1.4.1.ebuild
deleted file mode 100644
index 3d1a5b6fa188..000000000000
--- a/app-misc/rdfind/rdfind-1.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Find duplicate files based on their content"
-HOMEPAGE="https://github.com/pauldreik/rdfind"
-SRC_URI="https://github.com/pauldreik/rdfind/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-releases-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/nettle"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/autoconf-archive"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-misc/rdfind/rdfind-1.5.0.ebuild b/app-misc/rdfind/rdfind-1.5.0.ebuild
index 6425d24842bd..e376f74993f8 100644
--- a/app-misc/rdfind/rdfind-1.5.0.ebuild
+++ b/app-misc/rdfind/rdfind-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,3 +24,10 @@ src_prepare() {
 	default
 	eautoreconf
 }
+
+src_test() {
+	# Bug 840544
+	local -x SANDBOX_PREDICT="${SANDBOX_PREDICT}"
+	addpredict /
+	default
+}
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 7eecfc6ee6d2..8ac8352d6588 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -4,10 +4,12 @@ DIST recoll-1.29.2.tar.gz 3871580 BLAKE2B ae6ef5628dfac67a192a3d133d5b5d8ddec079
 DIST recoll-1.31.0.tar.gz 3679099 BLAKE2B 6d02c0e0487ff02957ffc3c824152a14307e5a9ebfd472ffb84d047ce37f170ff7738b0d15ccfd6582840d22d19aa6e509ca50b98fd88d1a3730e58304cdb4b1 SHA512 1a740cdabab158737461ab8f097ece79844e1f0b64285871217049c0619df400d99db18eac8942e1986def555c5ab8364f3320eb403d150b061126cbc3be2116
 DIST recoll-1.31.2.tar.gz 3689921 BLAKE2B 01eb0ef96362e214022a96876c10246c0d183a861c1e3d791717c3d77d4244ed90bbb9041bf23a613e59b5c099092c262d1bee1760ea527fe60f01383bec8a5f SHA512 365cc152715cb89c88b4271fdda4ccf963b1c6e3088f69684cba2a494bf9b0192e4553b1412607f3acd61ec85eb2fe92c46cd258b3fc2977f9528bb0a667e6cb
 DIST recoll-1.31.5.tar.gz 3696832 BLAKE2B d2bb3199e70aa53679662aff8650a08b6d99182ee7ba11011726f704401c03899bc4d7e24c5c5cf88b2b3a99257e2f11403e29d69da87e00386f57c43db3bd2c SHA512 3a48cfb825e70ec7de6cc789f9d03f6ee6f38cb54ac8419b9038c1f35ed8954249c1ed558bd9aa781c741a0241b633c02b2aa31d6d12b30937a32b9e1da8d44f
+DIST recoll-1.32.0.tar.gz 3622960 BLAKE2B 74adc5861d7eeaa3240471444622a4cf638a111bc79aa7ea372c49e63732b06c011f2ae627130da84aaa9a3df42d8c64d4a65d2d83db2ebb20c21bf7820b06f6 SHA512 4a2edf3b9ef7048352bb7c8547138b8e21597f362f8ca058218c99400c841a5a80f948ab5ff51209ae66010c8d35d5b136e8b7e09284d1c70665b4641cc4c9da
 EBUILD recoll-1.27.12.ebuild 3477 BLAKE2B 95fa8b50e3e2036c4fb6ef72a69f394f04d5aacb9919d41c33782ae8e9688de7b993f9386b0a96e8b8b1a6ff5a0be8d49f21900b69a939e200131fdf7b439198 SHA512 e33fd31fc1e9ba7bb0eca7fe82237d94a8db3049fbf442de72f49f23bf2f7370d5b5e933a5d23a85bf93628247ee7180e3830da2c98b9b83143af09102cd01fb
 EBUILD recoll-1.28.5.ebuild 3483 BLAKE2B a38aad710cb61005bc5aef38dfafcac4a83e9c7e2016dc98fe41d695891300858cb86ea3e9d601f684a556345bbd4be1a12e42512228f0711d4a493909212440 SHA512 fb3884952862d76eb8406c42ed881bbd4230e8fbce3a79324621807852ab86b32db7eb850b4b431d60e43520548b967ec3c846b851eb8ef42c4345213c614837
 EBUILD recoll-1.29.2.ebuild 3483 BLAKE2B a38aad710cb61005bc5aef38dfafcac4a83e9c7e2016dc98fe41d695891300858cb86ea3e9d601f684a556345bbd4be1a12e42512228f0711d4a493909212440 SHA512 fb3884952862d76eb8406c42ed881bbd4230e8fbce3a79324621807852ab86b32db7eb850b4b431d60e43520548b967ec3c846b851eb8ef42c4345213c614837
 EBUILD recoll-1.31.0.ebuild 3321 BLAKE2B 17a189a77c300a00b09c77971978051ecd3eebed8a56b11b1bc795cf48ec394845cb2f270f2c7e0adc4d1da0d0aba7e03373ffe278ee3a66281ed92bd3d3f118 SHA512 c5a84fb5d0cc339c0630f8f3698597f0e4216046e324196b8118ee4bbdab061ac3cae27b310d0752cf3cbb9f92ea232e8767c56a514e6c01b36c50a27965aa1a
 EBUILD recoll-1.31.2.ebuild 3500 BLAKE2B 771d1de875c488266efb8681a362393bc2c749888f1a4e8097af6252b48fe6361a71a20087195531e244ff5316bb75b126d48e373ee1385ab49f66991a338fc6 SHA512 82d2178bff571909b5f3e711e2a27c602d5e0b87b4c657d719a33afe50c2fd448543caadd26eb6fb8172b3b5eac7af35519a29cf533b734e66c73e847205c175
 EBUILD recoll-1.31.5.ebuild 3521 BLAKE2B 9c7b418d56208a4d5787792e8a86e556308c7a3ea66296da23355c96f9d2b9eb4928d5521e6a38fe7b8c25f76209f29f454c968ca614355baa4e04110df12454 SHA512 7c3f136b3cbf2bda807a5dac5b5f95636dad6a5a598c793650d86c40e9b806aee55887434d8dc2b67ece4e52ac7155956347d1b0671b750c707f29d542484a85
+EBUILD recoll-1.32.0.ebuild 3118 BLAKE2B daa8a2345637926e053f1eb56cba6bfc0099cc2f453957789c459832e1168be467e434f2bb61aa147965975e9b7850ba37d317dea2ca4df89833078b45c25bbc SHA512 267ebf6358a7a18827d816373b56a0788d78ff9a33084e791cd1c1ad05f0a86bd9ef62c6a6cbfec2e9013b2a8b4995d20ed8ab6d6dd9c0ff121a43c20df914e2
 MISC metadata.xml 1413 BLAKE2B ffeeae4a0a0d5553e7ee8bffc85262eff920ca0d2ee2c8db767662f6f37c4b9702123fdf1cc1f804e9d646819d8523a360018813233ec6277d9d4d819397a67e SHA512 855cbf30c1d6216d52c1655ed20caf622ce835a6c9c0798b871206c29e946bdde2759e25f2d3003c0c8478d8cda78b28f1c3c0435db26001b0ea323858355a69
diff --git a/app-misc/recoll/recoll-1.32.0.ebuild b/app-misc/recoll/recoll-1.32.0.ebuild
new file mode 100644
index 000000000000..59a495aceb67
--- /dev/null
+++ b/app-misc/recoll/recoll-1.32.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit linux-info optfeature python-single-r1 qmake-utils systemd
+
+DESCRIPTION="Personal full text search package"
+HOMEPAGE="https://www.lesbonscomptes.com/recoll/"
+SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="camelcase chm +inotify qt5 session +spell systemd webengine"
+REQUIRED_USE="
+	session? ( inotify )
+	webengine? ( qt5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/xapian:=
+	sys-libs/zlib
+	virtual/libiconv
+	chm? (
+		dev-libs/chmlib
+		dev-python/pychm
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		webengine? ( dev-qt/qtwebengine:5[widgets] )
+	)
+	session? (
+		inotify? (
+			x11-libs/libSM
+			x11-libs/libICE
+			x11-libs/libX11
+		)
+	)
+	spell? ( app-text/aspell )
+	systemd? ( sys-apps/systemd )
+	${PYTHON_DEPS}
+"
+
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+RDEPEND="
+	${DEPEND}
+	app-arch/unzip
+"
+
+pkg_setup() {
+	if use inotify; then
+		local CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang filters
+}
+
+src_configure() {
+	use qt5 && export QMAKE="$(qt5_get_bindir)/qmake"
+
+	local myeconfargs=(
+		$(use_enable camelcase)
+		$(use_enable chm python-chm)
+		$(use_enable session x11mon)
+		$(use_enable qt5 qtgui)
+		$(use_enable webengine)
+		$(use_with inotify)
+		$(use_with spell aspell)
+		$(use_with systemd)
+		--with-system-unit-dir="$(systemd_get_systemunitdir)"
+		--with-user-unit-dir="$(systemd_get_userunitdir)"
+		--disable-webkit
+		--without-fam
+		--enable-recollq
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake STRIP="$(type -P true || die)" DESTDIR="${D}" install
+	python_optimize
+
+	# html docs should be placed in /usr/share/doc/${PN}/html
+	dodoc -r "${ED}"/usr/share/recoll/doc/.
+	rm -r "${ED}/usr/share/recoll/doc" || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	optfeature "XML based documents support" "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+	optfeature "PDF files support" app-text/poppler
+	optfeature "PDF files with OCR support" app-text/tesseract
+	optfeature "MS Word files support" app-text/antiword
+	optfeature "Wordperfect files support" "app-text/libwpd[tools]"
+	optfeature "Lyx files support" app-office/lyx
+	optfeature "GNU Info files support" sys-apps/texinfo
+	optfeature "RAR archives support" dev-python/rarfile
+	optfeature "7zip archives support" dev-python/pylzma
+	optfeature "iCalendar files support" dev-python/icalendar
+	optfeature "Postscript files support" app-text/pstotext
+	optfeature "RTF files support" app-text/unrtf
+	optfeature "TeX files support" dev-text/detex
+	optfeature "DVI files support" virtual/tex-base
+	optfeature "DJVU files support" app-text/djvu
+	optfeature "tags in audio files support" media-libs/mutagen
+	optfeature "tags in image files support" media-libs/exiftool
+	optfeature "Midi karaoke files support" dev-python/chardet
+}
diff --git a/app-misc/reptyr/Manifest b/app-misc/reptyr/Manifest
index 9e12ef8d90bd..c80f35154297 100644
--- a/app-misc/reptyr/Manifest
+++ b/app-misc/reptyr/Manifest
@@ -1,3 +1,4 @@
+AUX reptyr-0.8.0-riscv64-support.patch 4120 BLAKE2B d7bd33368e97083e2c213be23440bff3f5823a6bc9176c45047ef9db6754c94167e00669837c6060e8a4ee2a5e741b37e70fcf58481aa31f8abbe37d42fe2cb7 SHA512 c281d654bebb3d1c1450ffcca2992c0aceff04daf6d06a1c91ccb886aadb6c0091e0156b04c20139492b2a9c077e194b0f4091f685641b1c6089c2dbc2f82c11
 DIST reptyr-0.8.0.tar.gz 32239 BLAKE2B eb3d966c06df710ea27a421bceaca0c91e342cb981567eedc9125e5dd2dc937be294dc212ed9b3021d5e5d75e1011fa4a39eaf93c152c24ef7c5098f8edd9018 SHA512 880d899a2b6df3c33909dc70ce0a58f413b2e2eec2e212abc709348345d48294cf2e39f5891ab4b1fa24e69b54effe99c1b8ab03b448bfd7097e20498e7e85dc
-EBUILD reptyr-0.8.0.ebuild 778 BLAKE2B f2200a6dbc2608d9c13d0fa2cfbb895bac5a10a8ef88c2473759428d4eb01e9e80cb7913647165824a078f7a248091df6cea09f0d9f54311698481ca88a87c3a SHA512 f67f248928679d40f713af7889ba3588951cbac47e47693920eeedd6e933ab9fc67a9840d7aab798e226d6d1bc41e0d3899fa0b9c206bacfd277c26909d95866
+EBUILD reptyr-0.8.0.ebuild 876 BLAKE2B 67dbdb76e704f87adef46cb7d7bc5e111e34194965473e4a5bc98b463284ce28187e5fa95c8e7142e6f7958cf007476294e686091eec2d4ee10128f3387eda95 SHA512 307eafc1b4372138576c1595c3a6da6cfe618a9f522b59faa6cee482bd21b3ec02683c4227de2b50e00130adc16bcdc467b39260ca4f4c537bf05d7216336720
 MISC metadata.xml 473 BLAKE2B 2022d918552715fde48dc339d09a5e31480b9df7a9724d2275c6a26bb3414eff4a69d199fb04b2df61922d00587ff61028fcb67bde72748600afac8318814f75 SHA512 d8538e25ff5ff782d4d19cbed3417db3aa9ea1589d487025277476832dbae48026e0d36e790d5702dd657a9e0c6fd2173248765c9994f8a27ffdddc5a0291da9
diff --git a/app-misc/reptyr/files/reptyr-0.8.0-riscv64-support.patch b/app-misc/reptyr/files/reptyr-0.8.0-riscv64-support.patch
new file mode 100644
index 000000000000..6cedd3a55c5d
--- /dev/null
+++ b/app-misc/reptyr/files/reptyr-0.8.0-riscv64-support.patch
@@ -0,0 +1,115 @@
+Taken from https://github.com/nelhage/reptyr/commit/e26724cc1ae5fe7af0c9fb6369f6cf09d1d12900
+
+From ae0b4ec014c1a01b1c3409e5404cf0fa0102c349 Mon Sep 17 00:00:00 2001
+From: Ast-x64 <Ast-x64@protonmail.com>
+Date: Wed, 10 Nov 2021 09:39:45 +0800
+Subject: [PATCH] Support riscv64 on Linux.
+
+---
+ platform/linux/arch/riscv64.h | 68 +++++++++++++++++++++++++++++++++++
+ platform/linux/linux_ptrace.c |  2 ++
+ ptrace.h                      |  3 ++
+ 3 files changed, 73 insertions(+)
+ create mode 100644 platform/linux/arch/riscv64.h
+
+diff --git a/platform/linux/arch/riscv64.h b/platform/linux/arch/riscv64.h
+new file mode 100644
+index 0000000..96221c3
+--- /dev/null
++++ b/platform/linux/arch/riscv64.h
+@@ -0,0 +1,68 @@
++/*
++ * Copyright (C) 2021 by Ast-x64
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ */
++static struct ptrace_personality arch_personality[1] = {
++    {
++        offsetof(struct user_regs_struct, a0),
++        offsetof(struct user_regs_struct, a0),
++        offsetof(struct user_regs_struct, a1),
++        offsetof(struct user_regs_struct, a2),
++        offsetof(struct user_regs_struct, a3),
++        offsetof(struct user_regs_struct, a4),
++        offsetof(struct user_regs_struct, a5),
++        offsetof(struct user_regs_struct, pc),
++    }
++};
++
++static inline void arch_fixup_regs(struct ptrace_child *child) {
++    child->regs.pc -= 4;
++}
++
++static inline int arch_set_syscall(struct ptrace_child *child,
++                                   unsigned long sysno) {
++    unsigned long x_reg[18];
++    struct iovec reg_iovec = {
++        .iov_base = x_reg,
++        .iov_len = sizeof(x_reg)
++    };
++    if (ptrace_command(child, PTRACE_GETREGSET, NT_PRSTATUS, &reg_iovec) < 0)
++        return -1;
++
++    x_reg[17] = sysno;
++    return ptrace_command(child, PTRACE_SETREGSET, NT_PRSTATUS, &reg_iovec);
++}
++
++static inline int arch_save_syscall(struct ptrace_child *child) {
++    unsigned long x_reg[18];
++    struct iovec reg_iovec = {
++        .iov_base = x_reg,
++        .iov_len = sizeof(x_reg)
++    };
++    if (ptrace_command(child, PTRACE_GETREGSET, NT_PRSTATUS, &reg_iovec) < 0)
++        return -1;
++
++    child->saved_syscall = x_reg[17];
++    return 0;
++}
++
++static inline int arch_restore_syscall(struct ptrace_child *child) {
++    return arch_set_syscall(child, child->saved_syscall);
++}
+diff --git a/platform/linux/linux_ptrace.c b/platform/linux/linux_ptrace.c
+index d065199..bcbe600 100644
+--- a/platform/linux/linux_ptrace.c
++++ b/platform/linux/linux_ptrace.c
+@@ -84,6 +84,8 @@ static struct ptrace_personality *personality(struct ptrace_child *child);
+ #include "arch/aarch64.h"
+ #elif defined(__powerpc__)
+ #include "arch/powerpc.h"
++#elif defined(__riscv) && __riscv_xlen == 64
++#include "arch/riscv64.h"
+ #else
+ #error Unsupported architecture.
+ #endif
+diff --git a/ptrace.h b/ptrace.h
+index ee05bd7..8e3a7f4 100644
+--- a/ptrace.h
++++ b/ptrace.h
+@@ -25,6 +25,9 @@
+ #ifdef __powerpc__
+ #include <asm/ptrace.h>
+ #endif
++#ifdef __riscv
++#include <asm/ptrace.h>
++#endif
+ #include <sys/ptrace.h>
+ #include <sys/types.h>
+ #include <sys/user.h>
diff --git a/app-misc/reptyr/reptyr-0.8.0.ebuild b/app-misc/reptyr/reptyr-0.8.0.ebuild
index 960ac099ad2a..6bfa5e3f6049 100644
--- a/app-misc/reptyr/reptyr-0.8.0.ebuild
+++ b/app-misc/reptyr/reptyr-0.8.0.ebuild
@@ -11,10 +11,15 @@ SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="test"
 
+PATCHES=(
+	# drop on next version bump
+	"${FILESDIR}"/${PN}-0.8.0-riscv64-support.patch
+)
+
 src_prepare() {
 	default
 	# respect CFLAGS
diff --git a/app-misc/rmlint/Manifest b/app-misc/rmlint/Manifest
index 9c7f3b24f261..e2a9be665fff 100644
--- a/app-misc/rmlint/Manifest
+++ b/app-misc/rmlint/Manifest
@@ -5,5 +5,5 @@ AUX rmlint-2.10.1-scons.patch 3626 BLAKE2B cc9187d2b8926eb36071462d02a60f3a4b06d
 AUX rmlint-2.10.1-skip-tests.patch 1216 BLAKE2B 8fa9727f5146a26fbd91e8e6c4f8b903e432c386ca8f97b4591bd9244940bf94aa476dfb0390c332fe8fa7e777e31890046423cd88e47181f3a8f30e3fead4be SHA512 c66812da8860a714d1ae368039f95dd86d59b3ba6164fc9141f0c1c0ab6ab7c7245dcef9785a179dc437615cd5d9e8af1a1ee60354e99c02fd3c345fd2e91608
 AUX rmlint-2.10.1-x86-fix-size.patch 1092 BLAKE2B 2cd3e7e68d5252c89b84d1d78a17520e6c5f7b61f5d9bfc05bd25ea96b9057bb195c7afc6e61a8bac121ae749b5f84d28dc032be2d92bd6f5a2ab04f5b3cae9d SHA512 78a41f52aa1af9f9d63227b9a2100cf87806a442f07d153e83ccedf7110a14e4c7fec8c9a4fdf21284301927895a62eedaf666cbfe90092eb4ac41e68bf34c6e
 DIST rmlint-2.10.1.tar.gz 2494474 BLAKE2B 40219ff64d54f0e2fc66a958c6ca51520152f77f9038e9756ab601da5180502528be7b2d750c85b5991c31db96c3eb7415841084b6c90db103dc212947864034 SHA512 a1281359798816dadaf3a1e706e671dc63edf8f7d176c114a924a1e03fc9ad6fa54d10de701b09b5e364a9a815e0d11bdbef3d16fb7fec74eb85af20a106db1a
-EBUILD rmlint-2.10.1.ebuild 2964 BLAKE2B 5555bd12e25f09cc06b5b4d8346b2d9a0b21d223028f3027a98ffcd48ca687ae16c847f8773e0883179d2a0f6cadd7236f983aba9520ddbd3398386459de905c SHA512 658254c6fba265c889e941b5148e6d73b0c123c4f4e180f086aea886c26bdb0b4f90b2382b9307a734ab3129f8565d7b764632268e8dbdf7998f16c27ca4bba9
+EBUILD rmlint-2.10.1.ebuild 2965 BLAKE2B 4134e854c7a6278137aa33eeee6ab265657a8c767b25a6ad84d3572b459feb3fe47df695a178b2efd2342b293a565fd0689359039ecda055e53838b850a2c53a SHA512 a9bb4e8891f0ae0ccef6b97faa7015c9a8808f694c7b74a0df927ed15146e6805e1e7e3051018982f0d9002d04a9408fdb82eeceb3d6c84da55606e39b03658b
 MISC metadata.xml 383 BLAKE2B 5ac0b3d0708812cfcd5f432f43556ea55a2e7686447e06d876ae686befb854831415f1e5713cab07f3ba9f87c7cd982e17342423630eae4ea9656cbce29ed957 SHA512 d42c9219374f548e8105f7463156895e584c0b5863788fb9214633c9dc5c46dc8f2f4c53a00c411dd32aa1f3b83d9b9e9bd24508a2f18f69e7032aaf4c1de218
diff --git a/app-misc/rmlint/rmlint-2.10.1.ebuild b/app-misc/rmlint/rmlint-2.10.1.ebuild
index 4ef7a1287b4f..fa6e30240832 100644
--- a/app-misc/rmlint/rmlint-2.10.1.ebuild
+++ b/app-misc/rmlint/rmlint-2.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome2-utils python-single-r1 scons-utils toolchain-funcs xdg-utils
 
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 3b9909d49a34..9564f01ad330 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -6,6 +6,6 @@ AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
 DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84
 EBUILD screen-4.8.0-r3.ebuild 3848 BLAKE2B e861b10538b50fa4d53a9b42fc3e69409c2a9d6e24d4f757b9905fc2f48b2ebcc94066f7c7b25f5dfc0c6661b696ca878b9a4a8fce694ed847e6e0eab2095112 SHA512 5c51dde15eeab2e1f0dbf3120ee20cdc1ec22666ad62bf4b86a9db85793d1293673071d2a5cb620726abbba6b2318f172248d381383338b23ba89f1e03cbef3b
-EBUILD screen-4.9.0.ebuild 3777 BLAKE2B ea63c9443397727218142acd84e409ac9cd69f5a8d92c583a0e5824b8f94af0394323151bb24c6f45c0c5df522b4b10bd8fa6f3dd5c3f4075c71b6340cdb5185 SHA512 9cf35db49d764588d27033ec3db1096a0cdba85b894051d3762dbb1d821029a37c43b5ee96f26dc612572f05afa425d0159487a28f05a9b01d49ccbaf60ccf39
+EBUILD screen-4.9.0.ebuild 3769 BLAKE2B 67f057ee845f24d0181279a8aeea0c6c6305cb01eda0c61f55d15a25bb8b15f439c54cd23f9836ff1d061780ca594c7847e0d94c7fae0030ac5623281bfaa22b SHA512 7df1d8a5e319eaa5c0bffaf71f46afc368ba5ab69a8ee5999155633a22186bc6465879456201790132f25596e15978db359ef6a651838fffb33253f9bec4a04a
 EBUILD screen-9999.ebuild 3781 BLAKE2B c70c76d9f0d0f1ea8f7af9d182e22dcb381d9e0ef0f134b27e72e07a3be90e387efe0856dff3459ce04e125dd0e555e83df1e5e32c93bce84ccb7a6b1ee7f6cd SHA512 b503a8ebfdef364fed0acbac79f0960969c668b68243c337ed12a814e7b796cec4235a4faa2c6bae84cb20d6d866547aa3e2b1d4dd242be328cbda43a9c7f188
 MISC metadata.xml 1783 BLAKE2B 6b1b392339f6786f95c151a7f311c24adf76c32d23e0f5bf50ff97571ab7e0a7b878d1ccac6938a01c2783c4f54eb0644dfd1f35b9bc602590fce96eed4a4e99 SHA512 fc4a716f118ab74b7757035ffadaaeebd47ba512a8ff123a7f5df4fa8fd2b384a66d4da88f8b78e7c16314b710e2346cfa6fc644c22f059d065cc1778565d060
diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild
index 18779966236e..a06b97c1aed1 100644
--- a/app-misc/screen/screen-4.9.0.ebuild
+++ b/app-misc/screen/screen-4.9.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 83c3ff712e6b..9320e47eb111 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,5 +1,5 @@
 DIST screenfetch-3.9.1.tar.gz 77350 BLAKE2B 10852e63c9ad615cea9a5e53374f16e2f3ac40074bc247c144c91b5e96e0040c6b6623d2a79300e859cef0d8eeb2e935aad585c73d668676dda388d5af6693b3 SHA512 e186901480dcad57b765052b1b156b7706a196ce0e08b6b88264912a5d2a1250e5014923312353a82ccabd8129d4d2421891f13fd34f0ed76c50ce9633207df0
-EBUILD screenfetch-3.9.1-r1.ebuild 790 BLAKE2B f086e0cc30cf4589c9fd4164a206b0ba7964e41eb59f1265abd037536bb8b8a0f2986be12fc21c550271cea13d9b691c8de22164f1406d153ed42033cc190cd5 SHA512 920613f4f1cf034d4ded464d1da4d28cdce797dafc9b56df684e58d1b5fe1a2a9782857b3ea48f3abc5d00af5cbb8b27a126ba6e85b15f09f0aa7d2c9b1bcf58
+EBUILD screenfetch-3.9.1-r1.ebuild 797 BLAKE2B f493500222965d18b3cbc340e9429bef5c08ce210c40369c00f265a4458409d7cfa7493f2193cfbfd1ff48f720d5bc318724b2ff7ee6bbf33b8d902a76ac798e SHA512 b9c977a999e75769871a1f9b21930eaa0eda74370aa1c00e9a20333c3676b3b1d68f2f4154cd36181251037462cbe5eda8cd24c72b974ed042ef0b17f8da5b1b
 EBUILD screenfetch-3.9.1.ebuild 699 BLAKE2B f70b0de1eb3d79064a25e74315b1e9bea733c310d6c236c26b345f5ca460cfedef4cf85a854247e1fdb47918be5ed1fbdec82f6a0468d926dd516dd78fafdfad SHA512 4e1729290cc836d02578db0b6b2065cbdae13f2a55f14febf512aa12a064f6818c63cc8b25b91d9b0b4f24e2c431b16947ba229cafeb74d5865259402e8f5980
-EBUILD screenfetch-9999.ebuild 783 BLAKE2B 6cc07a31e3a1f6f2bde2cf8fed3f3d487d6d8775b51dec38f1b29dbb3aaa6b5fe3fc5708acaf382739d252da5f05f6ee7ecbc6abf5b5b25a2b38a210838673c1 SHA512 073eac6b7f4108e02408eb91c97ca3ce2e1fe9b50dc8960eabc93117cb3a87b5bc4f0925145f62a7ef6dd47add325b3bb4e4a78b6c821ae0183d85dab46b68c1
+EBUILD screenfetch-9999.ebuild 790 BLAKE2B 4ead16cac14ab1c3998bcc556dac3861cf047220a33891b8db30f3e3ed5345cbc597a562955b667543a108725569fa9511ebacb0eba8f67353f734cc7c4b3d0f SHA512 11d8dccf923b1259576bfccfc9b725272710e20f990a7e7b9999f8fd127db27010a81978e495e63b31b892be99fb0f8d5fe23ec1baa3a0bcf0f134f18d662738
 MISC metadata.xml 440 BLAKE2B 5e088a9a7872f816c9f4da9443593a10296a21960aed04341053e6c0cf4ae55510f553280c6c349cdb9d21c96eb70d1f2bf97882fcac0f0fa32243b1b61f340d SHA512 bcd65a8f941a6a8d0c28c3975084f5f00f32452f2ee58ed54ac7e153f3b704bf1cc033fb0ad63c4917643490c36a71a38d830a494aef265e031fdcb5f38e5ed0
diff --git a/app-misc/screenfetch/screenfetch-3.9.1-r1.ebuild b/app-misc/screenfetch/screenfetch-3.9.1-r1.ebuild
index 86503e6eadf2..e575ef6a0395 100644
--- a/app-misc/screenfetch/screenfetch-3.9.1-r1.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~loong ~riscv ~x86 ~x64-macos"
 	SRC_URI="https://github.com/KittyKatt/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index 8bb13a276cb6..4312905647d7 100644
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~loong ~x86 ~x64-macos"
 	SRC_URI="https://github.com/KittyKatt/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
index 109b1d70c90c..e1bf364184b2 100644
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@@ -1,3 +1,3 @@
 DIST scrub-2.6.1.tar.gz 362536 BLAKE2B 5342f0b6ffc361e7f581f80f5fd721cd7ed0ccab4591a0c1442476847a51182d869794e5543b06af9f834ebf87ab963c7ce771a6aceef6983c91e814ab86b4fd SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640
-EBUILD scrub-2.6.1.ebuild 385 BLAKE2B de195e8eb3506443452b45fd633d4867904907e48367475f13da219cf086bcb7211f3b4b3f358c015a5f9bdde0a8a928a6cfd9635e3dfdc3d84a3e76bf4a6ed0 SHA512 fe52caf332a971802e3515e1ca896e6cd9da50e1ae61e04c3ce7e5d7f8a989f41ff27d2db65296cc28febaa09c957dde10eb4d0fd080a53ecc592e7068ace14b
+EBUILD scrub-2.6.1.ebuild 392 BLAKE2B 8040da0ad38e3da3985eaa7c9641b35596b19303859ba9795a41c34322a5d8026dccac3ffd92b0c76e565d3607a0bcd8479c15785fe8aab4ac60498ce9172dc9 SHA512 79d0feb3eee6d81daa07f2c4a2c3eaff9a1f17c43edfd46a950c9132daa0c3b59c217a4f193f89b3580324bda8eade97c2349fd08dd0ff374e494b9cbd201156
 MISC metadata.xml 428 BLAKE2B 3b0dafd4c5c4c5f8b1f630ae20e6a33f1858e1465e20c920487fb1ade63de415787ac2e405cc1652c21508bb012a0333e810cb58d7610f02a684fcf1794e9915 SHA512 5868d55250b339a6cf8835f95efc6dbbcad2ee323415a910d78f261964ab3968708841f5ee9a649493c7e8446560037d0516e0c109a86b89ad943c404eaf3b62
diff --git a/app-misc/scrub/scrub-2.6.1.ebuild b/app-misc/scrub/scrub-2.6.1.ebuild
index 8ad2d007c75b..32311ea10b7d 100644
--- a/app-misc/scrub/scrub-2.6.1.ebuild
+++ b/app-misc/scrub/scrub-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 35fabd56af9a..37e369e68731 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -3,5 +3,5 @@ DIST task-2.6.2.tar.gz 838933 BLAKE2B 47761b1d172f823b35cb5d44edda2ac8d37daf9c54
 DIST tests-2.6.1.tar.gz 221364 BLAKE2B 6aac691ba1828abb3469dfa2a9c093b92431591ac21113f71550676f7f9c40394770ddd2c649bf6cda5655d5f1c25aa6c7ef174e9da7ea0c647109d25771dc2d SHA512 df252b252ac7e319d46ef7e72c587c52a97bf7b496ad401342611114db15b7fdab501b4fffc60ea6a8dca7820abc267120375a1aafd1da0a0c41b925e9fd62da
 DIST tests-2.6.2.tar.gz 222713 BLAKE2B e65e2da08264a0dcceeb839efdfad4733312d645fa0dad9eb9fd7e1f260ed21db3009f1c2b3c939dc1a1bf8cf4389f228a0ba05844483fcb5e44de82c2d33fb5 SHA512 98946332f898c4cf621e1dfb2b48761ca9496a43935aca45bf5965029d74f87ff37154693348f13aeed0b61836fab7d2a3cec8161ddd2f65ed9402162fe21239
 EBUILD task-2.6.1-r2.ebuild 1450 BLAKE2B 71be676510265b2b326275c15445deb2147fef1e674e1250dd0eaf5f8484151651b23f057480b6492c38274387cac89bacff048d9a81e2d41e49e27b29d039e2 SHA512 f50076068d96231d6d25d19a6c980bf701b35a14400f17e0166b2802c54681df81735a689a386e021337cc6c050fd34d99a9e68d40a1778c5b20f416cbebbe97
-EBUILD task-2.6.2.ebuild 1452 BLAKE2B 10da76901d78dc09c9b0672413e51cb5c7c93b44be28a1d85302b5d3a26a4bbecb01a37f88e00e81fd59aa5374b7f6ddb9d633215127740be4d7bfe0c5f426f9 SHA512 e5052aeec3bac269c135822ca9bb5c079f4715547265937cfe7823fd9b84789a01cc53182e36f0c8c4e33df595a3af1e9d5c7efad39ea6aa24d640a0039c6ab6
+EBUILD task-2.6.2.ebuild 1450 BLAKE2B 71be676510265b2b326275c15445deb2147fef1e674e1250dd0eaf5f8484151651b23f057480b6492c38274387cac89bacff048d9a81e2d41e49e27b29d039e2 SHA512 f50076068d96231d6d25d19a6c980bf701b35a14400f17e0166b2802c54681df81735a689a386e021337cc6c050fd34d99a9e68d40a1778c5b20f416cbebbe97
 MISC metadata.xml 466 BLAKE2B f2da2e60c939ef2864d1463434c7581457f8d05435cd428038f18fd00ce7cc24a92dc57430e35ff82927188f4a82f9e20f9f0da5272b7c63d0cf00901740747f SHA512 2211e19b9bec481fb3723596e8aba2c560071910c96f9225b4eb33da132a0563e36b2c6edb574c54061bcf480033cc5eecb3095b6ca1bd56fc7e8c3d38a08225
diff --git a/app-misc/task/task-2.6.2.ebuild b/app-misc/task/task-2.6.2.ebuild
index db350fe67469..acaa34e50b1c 100644
--- a/app-misc/task/task-2.6.2.ebuild
+++ b/app-misc/task/task-2.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
 IUSE="+sync"
 
 DEPEND="
diff --git a/app-misc/terminal-colors/Manifest b/app-misc/terminal-colors/Manifest
index 55fde9cf98b0..f74c4126addc 100644
--- a/app-misc/terminal-colors/Manifest
+++ b/app-misc/terminal-colors/Manifest
@@ -1,3 +1,6 @@
 DIST terminal-colors-2.3.gz 5424 BLAKE2B e08635c0e989a430805159829b133f18b7c30959c945e4373a77442ac15628bb8bf3a5a2d14cd4f5705a5dd332297fa3d41611b52f56baaf9b1a882c26626714 SHA512 64fbfe766563c4c25bec23d1657187414f97b6f92e8a4a35337563210ef9873db495376676ef0a2f4e440ad77a6c1b43ee9c27fe04b34c2839eb4fffd5289a00
+DIST terminal-colors-3.0.2.tar.gz 152226 BLAKE2B 95179e27f4e1af1008dd0da01917aad1c7e4d192f9cfe30a18c1f24b7a038b4cd88349f8c7f2f84bfd8bc1ef53f558579275e9c31a6d76414d241a3f3186bafd SHA512 517506b7508251eeb151032b8071e4225efb19207b4b50aee2ad5b9a58063ce78c39f7193135ca66669d88bc1d6cc54b614d1584d877d1891f35541c7b3bb4a1
 EBUILD terminal-colors-2.3.ebuild 601 BLAKE2B 847d66db2b9b05b27b5bf56d270b744773bdfbedd4329998caf097541d2f165111d36a78deeccabb925e6f989010282e1241c3dc1f9f5116ccc3be355952c844 SHA512 684d8baa8a58db93d030570873602b17991adaada9a86a4e80566e3d6893a88f8521a29fbd32737a1bd38895c878ac0cdbdbb5f4f4c24ff98c245e1d6b535f37
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD terminal-colors-3.0.2.ebuild 796 BLAKE2B d1a0dad17c6c9442d929a91520651a83c53fd71bc9cb568e1158d01fa7652503993d96f9e7be163fd8af62d4793271ade00d76eb165d0be024eb389142c072cd SHA512 3072517b391ffc4756f344866c69872c7904d1e63bbf3f95f319d892b144801dba88606d2a7bc5ca4d9ec44c533cb8ecd62d8fc1167ef5ef357f60386385b036
+EBUILD terminal-colors-9999.ebuild 796 BLAKE2B d1a0dad17c6c9442d929a91520651a83c53fd71bc9cb568e1158d01fa7652503993d96f9e7be163fd8af62d4793271ade00d76eb165d0be024eb389142c072cd SHA512 3072517b391ffc4756f344866c69872c7904d1e63bbf3f95f319d892b144801dba88606d2a7bc5ca4d9ec44c533cb8ecd62d8fc1167ef5ef357f60386385b036
+MISC metadata.xml 502 BLAKE2B 2f8f7523fec6894264624fa4b0fd0c5d2ca507996c83bc7ef3d8f786ebc02eb520089f903abde3755001e13fc6fa44d46fda4f9a944b7cd2684946bfb5333d1f SHA512 ad1b783b110b453b20749f9ddfc1ef6b464e75e014a95c65dd8721841174f84ba3ececf7fd6a24ac483924414df1933eacfa124dfb364401afa7a771e67c4fa9
diff --git a/app-misc/terminal-colors/metadata.xml b/app-misc/terminal-colors/metadata.xml
index 85e4ed814fa2..57ed3913755b 100644
--- a/app-misc/terminal-colors/metadata.xml
+++ b/app-misc/terminal-colors/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <maintainer type="person" proxied="yes">
+    <name>Thamognya Kodi</name>
+    <email>contact@thamognya.com</email>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">eikenb/terminal-colors</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/terminal-colors/terminal-colors-3.0.2.ebuild b/app-misc/terminal-colors/terminal-colors-3.0.2.ebuild
new file mode 100644
index 000000000000..867968e5c559
--- /dev/null
+++ b/app-misc/terminal-colors/terminal-colors-3.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ncurses"
+
+inherit python-r1
+
+DESCRIPTION="A tool to display color charts for 8, 16, 88, and 256 color terminals"
+HOMEPAGE="http://zhar.net/projects/shell/terminal-colors"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/eikenb/terminal-colors.git"
+else
+	SRC_URI="https://github.com/eikenb/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND="${PYTHON_DEPS}"
+
+src_compile() { :; }
+
+src_install() {
+	python_foreach_impl python_newscript ${PN} ${PN}
+	einstalldocs
+}
diff --git a/app-misc/terminal-colors/terminal-colors-9999.ebuild b/app-misc/terminal-colors/terminal-colors-9999.ebuild
new file mode 100644
index 000000000000..867968e5c559
--- /dev/null
+++ b/app-misc/terminal-colors/terminal-colors-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ncurses"
+
+inherit python-r1
+
+DESCRIPTION="A tool to display color charts for 8, 16, 88, and 256 color terminals"
+HOMEPAGE="http://zhar.net/projects/shell/terminal-colors"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/eikenb/terminal-colors.git"
+else
+	SRC_URI="https://github.com/eikenb/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND="${PYTHON_DEPS}"
+
+src_compile() { :; }
+
+src_install() {
+	python_foreach_impl python_newscript ${PN} ${PN}
+	einstalldocs
+}
diff --git a/app-misc/tmux-mem-cpu-load/Manifest b/app-misc/tmux-mem-cpu-load/Manifest
index bc1a78b520dc..ffa5cd4d3f4a 100644
--- a/app-misc/tmux-mem-cpu-load/Manifest
+++ b/app-misc/tmux-mem-cpu-load/Manifest
@@ -1,4 +1,4 @@
 DIST tmux-mem-cpu-load-3.5.1.tar.gz 23020 BLAKE2B 2bbe2441c0fd687fee4ed2f27b8cea0fdbb0596c36fe8c791be110b880abe5d8c28a14960a9836552cf49b4f92d32a127be9271954853c5310f1628791138f7a SHA512 e08a3ad088021d4f4a3fb671a15cc8468a833501202391a63f57d3b53ea65934dc32869c3b7bbe47bce7d8ff2c9d1d35a5823a70c80d1218392aac82ed96e68f
-EBUILD tmux-mem-cpu-load-3.5.1.ebuild 543 BLAKE2B 76164c9a863654c25ad08875777ac2404eeec72596d85485e5b101b8e79375ff05ed2edfa6aca6aa0ec0fe56201d051973fa08ed446862698be7360ff6987946 SHA512 11ea3b55417f9aeffc3adf5c8b3b3a26bfd210f8166e303cd8eb32505c874024d5bc657a9971d3f3d2d0a1a46bad6719c5a09eeec19a12ec5b845233d3c65508
+EBUILD tmux-mem-cpu-load-3.5.1.ebuild 550 BLAKE2B 12f5c6415bf0208c1b7081f411439b2554c66896c07e8d59e95802dbdfcc949e2d1962f2c6caec01be0bf6fad3d5024dec8894629bd9120a34835780fe6502ea SHA512 be076f28175cbe0f12a86cb35c59aff93fe53e64fa61f9a4ab67fd668e0a5c625eb95712246b15ca8ea53425f94e4d7de42e6b41c29985b5378712ab9b285d48
 EBUILD tmux-mem-cpu-load-9999.ebuild 545 BLAKE2B 316949a74bb2db6c7d9c485a10795369b31aa3387258365d2f2f8be9657a601bfd6986b0a34f87a49741e54e0fb1705f6025254a773a3837f6ed75abc4857beb SHA512 a86af4da3c65fca2c4333e4169442d6b8f639266533d1300f0851761c5dc443cf16963d1802f19ffbb307c803a17f84af0748ec0699e4cfde621be84fef3d0c9
 MISC metadata.xml 261 BLAKE2B c72b9ffeda4ffe9423279540d7ea84bb499eec367dfa01288393aada1561ccdf01f08f89d5574d4beb7cd197cb3b123d2602ccce6288bbafe4e6c25a1ffe6e67 SHA512 99c6f01dba5cb14a98d96480e02dc49a3399ba679dc83a11f39d9847e472ff830470b0881f7944aba24c6fd7827a5c19bf8c1001f53627fc3eaf3f8d92840cd8
diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.5.1.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.5.1.ebuild
index 6c44434f54fb..1d2b0b9c12d5 100644
--- a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.5.1.ebuild
+++ b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-3.5.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-		KEYWORDS="amd64 ~arm64 x86"
+		KEYWORDS="amd64 ~arm64 ~riscv x86"
 fi
 
 DESCRIPTION="CPU, RAM memory, and load monitor for use with tmux"
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 876b8914069f..a08b6a240bd9 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -4,6 +4,6 @@ DIST tmux-3.1c.tar.gz 561323 BLAKE2B c6f688a854e128acffa140321a5dd00e4ca090ff79c
 DIST tmux-3.2a.tar.gz 648394 BLAKE2B 94527d4d1016caddab170b5bbfd181514768474898314241fb65a53a1f5ae94863bacedf90a7543690c115d15295960dfab4d5ba2ce31cd105585a73fb9b82d1 SHA512 6e52c7f5d03b2c8b8c4c8caac092a166956ba97334b426f2823d74dc5849a1d31a80145924f641f69dd2c244809e9350d9bd7070897fa2e3e1f9f086f9b2f365
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 EBUILD tmux-3.1c.ebuild 1638 BLAKE2B 0ab8033ed5e3093c794c163f0434e02b15fb8a03e0eec333048bc1a1ea845065cb93de1edbc40f05b3d2c39e842ca5e0037d992846021a0d5e8f82f241dbb48c SHA512 c0bb3466cf8087fdd1bc2bafa298f21fdc44792a1d2c60ec0075fe51a86eaa15913b685d5be26aca949c993023a66d2d1fca9d06c25ee3a9fbab8e7612da464a
-EBUILD tmux-3.2a.ebuild 1706 BLAKE2B 903cf84a06aa341fbe0a9fbb4e8a7ce5e09fe74d7a299eab7aaaa24a2adf593849cd4f55d11a6c7f806f403646652a6db951d87f7b244d1e04c368b90c58bb2b SHA512 fbf9224fd63c012f36c621926f874f13a8abf9ac682124bd80626217ac244154e8b498bd42b06118065bcdb681d08af6d6102217e263f8f538a2ca9b7bf33a28
-EBUILD tmux-9999.ebuild 1647 BLAKE2B 1e438f3e076ecc281fa1fd71185dda46a094152191c45ce7343d1a888ac5d8fab3d3e7e84b4916ce3153ef57d431ab2065247bc57d57765aaed4641d8006733e SHA512 c1bb99f996aeb30f1faa040ab5b006aedbf7c2dfba381c62d9c95385770b5740b42681436e4c467bc58ddf6f63895f2805f3503fdff8ee571de8ad1f8403c8ca
+EBUILD tmux-3.2a.ebuild 1713 BLAKE2B eaf841e39eddde547d854a7cf96f7637417ec4084a225cff2769598b75c405a101e4005696dc0278d6c84558096b3d3a00ec9e8cb917a9ad862f4a978115f1f1 SHA512 ea9760475aaba6362b185736af49810d421dc18eeba7a1ef9b0afed706a7d78ac6465165e5e0e11586bdd7dc739d03faf8059e1991e065164648cb35f26b06ac
+EBUILD tmux-9999.ebuild 1654 BLAKE2B 655c261edaccdb712a1019c3632049c4b18bcc6697be65ea1028cf63c467628a408e4dbc10c25e50af0579b5534ff627ab3d000d6fcff2ca023910acbec6969c SHA512 17a3d4753440d247de0a5b8740588451ee253f765484d7459b9dea9eecc5908256b433d5afd806f1d5fb7ff3e986c10beca784cb991f4d9e52f039313102d4e3
 MISC metadata.xml 817 BLAKE2B 82a6ef0299449e66a441f24d6ababd640926b51a2196573d1d21076e83709db1c4e3ca9a466d8220ac4bc5fb4ae8aee02b49c8573011524e2d9509802553c092 SHA512 5cdbfe700d3c1f37fb1d958ada1078ab22d1236248872f1aad6e311ec0aad1fb32b8988acf2e1ade98ba1a6644ffc39b9a29d553271fa12d73afc27b78c8b141
diff --git a/app-misc/tmux/tmux-3.2a.ebuild b/app-misc/tmux/tmux-3.2a.ebuild
index dc9fe95fd7e4..06f3fa9699bd 100644
--- a/app-misc/tmux/tmux-3.2a.ebuild
+++ b/app-misc/tmux/tmux-3.2a.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 19d2a1bee137..9e9fa7c5e753 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index a716e862f7b6..2cda4a7171bd 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,19 +1,10 @@
 AUX tmuxp-1.6.4-tests.patch 689 BLAKE2B b3c52055186d41be30378d9960099a705c0f7f4606c16a5aaa62f3e2df55b5ceec7feb77329715d13b7aa9fadad9424ed55dfaccb7c24bd6550be40ea6faa425 SHA512 d5ab3b391fe9c4b0646cbecbe3c3f4633829d6f1544503e96ad7d9b2265736c3082c959988344146a6623f125eac339f2f6875ec7b121e5c7db256089324cef8
 AUX tmuxp-1.7.2-relax-click-dep.patch 236 BLAKE2B 034c3f1b09e96de2dd6e534a6607ad8b3c3d46a4a9fa6dfcd196733237176e7b400f99f8289a0ad7bdda56faa5352778e05997fd4d53e3c7686cdb1c2af221b1 SHA512 b21d87efe015efc93b973d20b43805bb5c514e4f5ef4b3ee5a0961bdd7edb249d9804a9e6d573a22a1b607fbca4f4a2b219d0cb47d2d26c0a577c3cc7c0786fb
 AUX tmuxp-1.7.2-tests.patch 475 BLAKE2B 07d6def54c025b6b1d538813258ba06cf9b030ac8e40160492490f31d37c07e5158a95b5b1a28a3350aab1b1bb188b29a2c12b8521ac3a12f937ceb623e04707 SHA512 1842005a34e7b4a495e9e735243d1681158cb8e24b37006edcd7c1929df1eefc2a2f174f6eefd08866f1b830951610d881c654063ce20217fb8e457a84baa7fb
-AUX tmuxp-1.9.2-relax-click-dep.patch 242 BLAKE2B 549f6cafda02226dedee9101bb65d70cce452890c93a004f3ad121764fce57b370d3364b5fd5a5b6341db93d09a46ebeedd080da3b96fa7e3dc926c7abce3edb SHA512 337a1fe1373f61041fd2ed268371385f19284376fa05594cd8a2d465147b41c1bc1cb1a82a1ba690866bced822ec95dfe4a32d060a29feec1d829a4da6ee8bca
 AUX tmuxp-1.9.2-tests.patch 564 BLAKE2B f164bcd3bd5344e39fe050bc3c716dc3678584071990ed19c6cdcc0ab816852d0b18f89d358ba0607260dec0eb87596e245dc386a7afb0884461d44e22dec35f SHA512 f15745bfeb8c72dc0d4a1e1cac489acaa31a18282aa8d39e5b142d207f92cbbf110e1752449f14eb2b4fabcaf9022d7f3256956e26328a2f607edfd87ac05c47
 AUX tmuxp-1.9.4-relax-click-dep.patch 305 BLAKE2B f15674bb3b007321dda444b747cfca5f5da13b4d3e5ff741aa7559271c804cf5939d511792259dd0cdd62864e08d12ebc6acc0ba2836f9d8ecc50e93f3546db4 SHA512 cb476d64cb95f94b41536ec6fb5c1954cb6e168836c1d6b40cba407d4cb0753174d6e437e71d1aba51d084004377e048e129f84caa03df671022995c4a1349ec
-DIST tmuxp-1.5.4.tar.gz 843048 BLAKE2B 863b428198e8bb2895802ba7365ac2ec43fc75c708b41929934b6803c79b8f6436b5233ad567f1ab010e6ae372d89261a7ee19953fa01ab9defd1e290b6da621 SHA512 f6fdecff23de883076461fcef3fb1555242d8a96f1c05c88fd0fb3216bbb99fb321680f484972b10f54ff87eb032d8627397f76960262612954eaab6bbf7c7a9
-DIST tmuxp-1.6.5.tar.gz 1017117 BLAKE2B 4cc8955f9dcfffd237ffde3e7487496aaf85dd886fd124ad76d61e10fa64f90bac79cc4df9aac63122446b7a4727b01ceaea502d7bbe5f5ba7f68e89bbb86feb SHA512 9095c196f20b537662ffa9d819c675e325fda7f49fb3fd9811f00fc1e1c763b7ea29cdd500bb7d775d1673ab2fc1386f662a2ff6744ffcd2b7aaab13a014cce3
 DIST tmuxp-1.7.2.tar.gz 1027293 BLAKE2B 2564d196c9c327584d24f57ce72165a7cdff2209fe6869a4d3519eb0246329cd8159ecaa20c2a39e153bde224201b1f846f4244c4df72ac540cf0d71f9fba75a SHA512 2ccf63c9f5b7049438ca6079894aac92a0f7496a56c68d88e5a9d5c2a42188a4e40d559792857881f492b28392a329697d4d43781f38ee7c49ed592aac8a69f8
-DIST tmuxp-1.8.2.tar.gz 1019801 BLAKE2B 1e02139df6cc5ee0aec31e3a39413297195b6951a9acaa487a8f705f7f28b79ece0e5388284d017dbf45744540eecb0809e4a7e668f91b824aa0e4adcd64bcf8 SHA512 b6993be72bdab1ef469dbf43d056fbd812612437716af8a4c2e803a55f7ad803246789ccb0b3cafa5ad9047ae86426b4aede27480f20f6d3593d9bf737b74323
-DIST tmuxp-1.9.2.tar.gz 816621 BLAKE2B f471ba2b7a6f97b123661ca2473c63273dc79b08cbe25f4ea756d174ab58e5070d0fc2dfbe8ec254785946e2fa139121d2e9fa5d7d5c127c18580e514064523d SHA512 e4af94fde475c999cee5aa6ad4b60a05c3a9f6f338290406043544250c4dcf688bc39e501631f442b59009156e04eb383098ea717fe7be8e9811b44886515935
 DIST tmuxp-1.9.4.tar.gz 821650 BLAKE2B 34454919e811bc4901dcb570046b45d481934ab36f9b8f50753972fe6545ca9e487b2f04ee818c4b54eea01181c62efb1f5262ab033f2fc92c3cee3828d16bf4 SHA512 ecf113011231a03998b3be2d146f7e6c6cc2ccfc36af59b88d51e09726259c92dc4360bde569fba13ca8d81eb9639f85b45cd5f4b50d70d347e3237e396ea446
-EBUILD tmuxp-1.5.4.ebuild 964 BLAKE2B 643aaf5a7db258f05164547d93e0dc4a63af82a79048a247f08bb8e8cbd5ad5bd71d27e1c708f4f63573424ed70804dd66a6e25b62460e641339bc4426384444 SHA512 f9ed588279ec0739ffe842847a271144c8418d1dcb1aa8190816320eb621a1900b77a1a5bdb5dc037a0b12cd266b10334c72562e8b0444acd5cbdabf3e74a061
-EBUILD tmuxp-1.6.5.ebuild 1122 BLAKE2B 005720290707591c2291ce5f5431fc10484945080fe3d62b437966acab6fb6395f031f24793cd6a9b2321597e7f0dbc8341d541ebf9ccff2870f8397f7485b3e SHA512 f4bf6bfaab0999505f3822139d9ce10128e57f56a74d42ece314c900d128e9a9f8042e40f722e4776ab35cd990041193cc476b1512649a284f34cce88a357864
 EBUILD tmuxp-1.7.2-r1.ebuild 1027 BLAKE2B 4c01323c11b87b7c9cdd0363619482b0d223c5f1ee2d9a00939632d0f78cb40df42c5395e4d345421475deef63639db695e450a04fc01ff301bee07a1e98ef1d SHA512 ea39bf844846f078e9fefeba04e74c215cb8d511e4fd1820ee14d58ef43e0bcdcb85d8a5370159d6b3b23431f8214724bb457fd821d2674c0b2b2d6bad17b846
-EBUILD tmuxp-1.8.2.ebuild 1029 BLAKE2B 473845e85cd9d4a5637efec7c4f693c6d51cd2498739b181c981eba65c82b5d447d335cd2d45db8b6bbb4f9b090bdadfe5e0628f26a1b94b0b244836c8fa9f0c SHA512 75510a50fa787d40051b7531440654aa770d6b090c95d5ff1518df589a2e4968e83a2a1f765d5df8f65bb9a941082a9eb862643ffa29f5c5527f058388eee283
-EBUILD tmuxp-1.9.2.ebuild 1035 BLAKE2B 8d1c7d60b3ed255893682dedf9b7ef24a4104da64767feb6ef063a78bb9f0aaf3eb3bb7b401ebb30c6619b671c60a0cdd7332d82a9bae357d8e3a0909981b211 SHA512 1d5ca877103ab636935924918fa44f7b095dadd6814e89c2394e66e1c5fe59dcc1dfc853394559f8f080581a317ee64239b2066ed9779f5322e7b29a2bfc37cc
 EBUILD tmuxp-1.9.4.ebuild 1030 BLAKE2B 02f8a99f7e22e6f0000d39571235d75ecdfdddc4f2cc6dd910d069108f7c41c588dfd4390bc0efb3a8eb3bde684b9e68040156d1728b19bb6a20821c26e58f29 SHA512 720ca6cbba04172903298730b505c37902e686451ac94827970f8f89e01351410bc845f63d4b91be220005e7c90d586a25b5e6ec70f03c1303c5c01e273c7d6b
 MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
diff --git a/app-misc/tmuxp/files/tmuxp-1.9.2-relax-click-dep.patch b/app-misc/tmuxp/files/tmuxp-1.9.2-relax-click-dep.patch
deleted file mode 100644
index f4c2be80d2dc..000000000000
--- a/app-misc/tmuxp/files/tmuxp-1.9.2-relax-click-dep.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/requirements/base.txt b/requirements/base.txt
-index 4b713f1..3ca88e5 100644
---- a/requirements/base.txt
-+++ b/requirements/base.txt
-@@ -1,4 +1,4 @@
- kaptan>=0.5.10
- libtmux>=0.10.1,<0.11
--click>=7,<8.1
-+click>=7
- colorama>=0.3.9
diff --git a/app-misc/tmuxp/tmuxp-1.5.4.ebuild b/app-misc/tmuxp/tmuxp-1.5.4.ebuild
deleted file mode 100644
index 55ec6ede123b..000000000000
--- a/app-misc/tmuxp/tmuxp-1.5.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/kaptan[${PYTHON_USEDEP}]
-	>=dev-python/libtmux-0.8[${PYTHON_USEDEP}]
-	<dev-python/libtmux-0.9[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	<dev-python/click-8.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-4.1.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	SHELL="/bin/bash" pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/app-misc/tmuxp/tmuxp-1.6.5.ebuild b/app-misc/tmuxp/tmuxp-1.6.5.ebuild
deleted file mode 100644
index eb22d7e67537..000000000000
--- a/app-misc/tmuxp/tmuxp-1.6.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
-	>=dev-python/libtmux-0.8.5[${PYTHON_USEDEP}]
-	<dev-python/libtmux-0.9[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	<dev-python/click-8.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-4.1.1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
-		!dev-python/flaky
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/tmuxp-1.6.4-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	SHELL="/bin/bash" pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/app-misc/tmuxp/tmuxp-1.8.2.ebuild b/app-misc/tmuxp/tmuxp-1.8.2.ebuild
deleted file mode 100644
index 3db97f10a3f4..000000000000
--- a/app-misc/tmuxp/tmuxp-1.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
-	>=dev-python/libtmux-0.9[${PYTHON_USEDEP}]
-	<dev-python/libtmux-0.10[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
-		!dev-python/flaky
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/tmuxp-1.6.4-tests.patch"
-	"${FILESDIR}/tmuxp-1.7.2-tests.patch"
-	"${FILESDIR}/tmuxp-1.7.2-relax-click-dep.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	SHELL="/bin/bash" epytest
-}
diff --git a/app-misc/tmuxp/tmuxp-1.9.2.ebuild b/app-misc/tmuxp/tmuxp-1.9.2.ebuild
deleted file mode 100644
index 75e9bbb0189c..000000000000
--- a/app-misc/tmuxp/tmuxp-1.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=app-misc/tmux-3.0a
-	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
-	>=dev-python/libtmux-0.10.1[${PYTHON_USEDEP}]
-	<dev-python/libtmux-0.11[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
-		!dev-python/flaky
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/tmuxp-1.6.4-tests.patch"
-	"${FILESDIR}/tmuxp-1.7.2-tests.patch"
-	"${FILESDIR}/tmuxp-1.9.2-relax-click-dep.patch"
-	"${FILESDIR}/tmuxp-1.9.2-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	SHELL="/bin/bash" epytest
-}
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index 51e3dc9b0bf1..665d29bcfbf8 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -3,5 +3,7 @@ AUX trash-cli-0.21.10.24-fix-lint-in-trash-cli.patch 864 BLAKE2B 4acf3d0cbf03d46
 AUX trash-cli-0.21.10.24-fix-unit-test-test_trash_empty_will_skip_unreadable.patch 2305 BLAKE2B 435aa364c75bb1173408b830a74fdb9f0b8115e89623e5c223df07574c1279c31e4307a68da5932bd5dc7bd31b34a33bb1ae86aeb25340670f4f13a35fb18163 SHA512 9d782064d0ccd35ece3b4eec9101654befd6f870f9668ca8e80c6b0dec3c78adeec1866dad2832d0d25870466affe02fdd8eac53cc518f7bec596a10a976654f
 AUX trash-cli-0.21.10.24-fix-unit-tests-not-deleting-temp-directories.patch 4668 BLAKE2B 8f742be79360b6a01637d15bc8fe4e7f5d447e52279f16fa59d06435fd7c332e4ff4c7ac1ae35ff993cfc19f677adc256f11bcf488a11b7e5d8a469a3b1f6daf SHA512 6e02b79f67a2c76e6feebc8632dfb59e110561b777a687d0e1cda66ba60653717485f09800cd894e76c79fa1b8fb89a786bfdb7d4c77ec4552401bf23a1cf4da
 DIST trash-cli-0.21.10.24.tar.gz 78085 BLAKE2B 6d8f82695a94e45efd4316eb9f1a8c8f5d348774fc10cd4e5323d8dad15897f827acf343e2c1a15e1cef4eecb2ed76ab456345e359319c82bfde9b95f68f7b77 SHA512 1bf258cea7658a3968beec939d09ae088eac8898a9812e8a3aca587df7f2ad20c66f766995f8c893e4d84d0ea7db94ebb4ca7eb24982af81fa4179cc9e239fd1
+DIST trash-cli-0.22.4.16.tar.gz 78221 BLAKE2B 9eabecf5b4e787e1a413f4b05fb6c5592b4a5ec55e4a399c02c738e2ad62acaabc234217954262a79c85ad855535a2ca0d6f981b0ac86139f6c631519aeea936 SHA512 961e87ec361c405a45d02e6a4b7bf43493bca86cf3540a7235df459abd450762bcea4760acdfed0e5f276933ff0eb5b9f426ae0eecfde3e5830a8699fa99a19f
 EBUILD trash-cli-0.21.10.24.ebuild 889 BLAKE2B 03f2203d4ff8654b792ff0a14007d365234f0611b18d716e510286884645e6b036cd04b8fa18f9a38ef471490594090cbb36c0fe5b2e778a5b4a64366cdc6844 SHA512 a41901b018a00c9fe4495c72ac919519848b9abb3e0357b2cc3331f670f4339d63e5a34132dd8b0eb096b9a5b710303337fb5a22ddc41a247cb756b0829b2cda
+EBUILD trash-cli-0.22.4.16.ebuild 635 BLAKE2B 7252a7f6df6ec05192bfef1cf9348afb29e6211bdc970279b2c888347f31fd2eb7734af9fdef32de977da344fbee0f37f253bff0de23543dd17c346b237270a0 SHA512 548d891b56c90031e333d07284e4f0e09d0174cffea560d4b0dccbe7e16446287d711a0b8d00c985f7040b88360aee3fea5d11da4921b58982c0f2a1203ba16d
 MISC metadata.xml 1095 BLAKE2B 47ecff4dfa92c0750b4743988d715e828ce8a8d07140df5eec50ad41f0f1aae22efcdf7c7f743c5f6a58c572da9faa8fae4017fde65909e1f8e2ea3b4750b40e SHA512 b935e7c812982d7aabc6cbbcf39ae62404f04f2c8e6055adfdb710bf9502da907b61806425d270b87c14206e7e4caf3e3baea6ab8f86f0b16b9cf3171954b652
diff --git a/app-misc/trash-cli/trash-cli-0.22.4.16.ebuild b/app-misc/trash-cli/trash-cli-0.22.4.16.ebuild
new file mode 100644
index 000000000000..641302d9ab3e
--- /dev/null
+++ b/app-misc/trash-cli/trash-cli-0.22.4.16.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python scripts to manipulate trash cans via the command line"
+HOMEPAGE="https://github.com/andreafrancia/trash-cli"
+SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	local -x COLUMNS=80
+	distutils-r1_src_test
+}
diff --git a/app-misc/ttysnoop/Manifest b/app-misc/ttysnoop/Manifest
deleted file mode 100644
index 1ba78d57ab54..000000000000
--- a/app-misc/ttysnoop/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pinkbyte_masking.patch 960 BLAKE2B b42c754ea33c41bfa1c6ca5c529af30c1fe05473accbb4be195e1d5d30944e4a38e4175226b16cd9d3560707135b9cc8056374b3e87a4a937515fd8cae8e8764 SHA512 20e6d3d8d909bdd9795e52c5e46ed6ca60a6a8448027cf011d8f77a2201fb44d49ba5b73d8a9e3c682c187fd88efb30ded531a2efb8183ae764cf6d2a5bfa38c
-AUX ttysnoop-makefile.patch 1085 BLAKE2B 6578ff063cc6b4e3d48085761deffdb8de1b98324f6c8ae08fbd46bb9b45cf968bbf5e9d14930ae23666c08656f10d695ef5022f384875122917b8c4c63373a5 SHA512 eab5831d6d744e5fb9f5a3105c773872f0c6995a917169c162bccf829ce9dbd63dcd28360ee99faf08cf7aaec034df02d73c21d7dae0f004779ac66519aab419
-DIST ttysnoop-0.12d.k26.tar.gz 9376 BLAKE2B 114c260de72c4909b97fb47d3ec8b22cf2406df433f708299098df7a7b1315ada8babd81c62ae3a12775fb2393c6548d24457df85523663223960390bb2891c1 SHA512 9ac90ce08e170442718ca4871b7cb569acd8a594e63a56a6889ff0852be93a6ae8e7a212ba1064e74286043dad5a27af5d8588cb3b1ea297db4bf7fa10c66665
-EBUILD ttysnoop-0.12d-r1.ebuild 814 BLAKE2B d58940e47748747cfb7e36949745d665159befc5193ca8b92c283a0aad66d827d2f5bcb799f04449798374cc3d77421cdfc04548edeae847e7e16c6cea0ebe61 SHA512 19b7c35233b2c4b43681fce4db2553f67fdb9f2b70cf235b4bc3fe11703c9b5dd77fd7e7d23d851273f3cb8b0ac61d87cf2c1d525fb42b793ff05e6851f128e6
-MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
diff --git a/app-misc/ttysnoop/files/pinkbyte_masking.patch b/app-misc/ttysnoop/files/pinkbyte_masking.patch
deleted file mode 100644
index 8d944b21e3af..000000000000
--- a/app-misc/ttysnoop/files/pinkbyte_masking.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/ttysnoops.c
-+++ b/ttysnoops.c
-@@ -18,6 +18,7 @@
- 	v0.12d  8-4-98 Carl Declerck	- updated #includes a bit
- 	   k26 28-5-00 Vinicius Anselmo - added sound alert (demoniac) created by Stas
- 	   k26 31-5-04 Vinicius Anselmo - updated for unix98 pty support
-+	   k26 13-8-09 Pinkbyte		- deleted fucking sound alert and "bye bye" message ;)
- */
- 
- #include <sys/types.h>
-@@ -502,22 +503,6 @@
- 	struct utmp utmp;
- 	int ptyfd, servfd, len, n, sel, susp = 0;
- 
--	/* demoniac begin */
--	
--	StopHandle();
--	
--	if (InitSound()) /* play if we can */
--	{
--		DoSound(466, SLEN);	// A#4
--		DoSound(622, SLEN);	// D#5
--		DoSound(784, SLEN);	// G5
--		DoSound(932, SLEN*2);	// A#5
--		DoSound(784, SLEN);	// G5
--		DoSound(932, SLEN*3);	// A#5
--	}
--	
--	/* demoniac end */
--	
- 	if (!isatty(STDIN_FILENO))
- 		errorf ("stdin is not a tty\n");
- 
-@@ -660,7 +645,6 @@
- 		{
- 			if ((n = read(ptyfd, buff, BUFF_SIZE)) < 1)
- 			{
--				errorf ("bye bye\n");
- 				exit (0);
- 			}
- 				
diff --git a/app-misc/ttysnoop/files/ttysnoop-makefile.patch b/app-misc/ttysnoop/files/ttysnoop-makefile.patch
deleted file mode 100644
index ba8d702e9e6e..000000000000
--- a/app-misc/ttysnoop/files/ttysnoop-makefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -2,8 +2,6 @@
- # Makefile for the ttysnoop programs
- #
- 
--CC	= gcc
--
- # Without shadow support
- 
- #CCOPTS	= -O2
-@@ -11,7 +9,7 @@
- 
- # For shadow support
- 
--CCOPTS	= -O2 -DSHADOW_PWD
-+CCOPTS	= -DSHADOW_PWD
- LIBS	= -lcrypt
- #LIBS	= -lshadow
- 
-@@ -24,19 +22,19 @@
- all:		ttysnoops ttysnoop
- 
- ttysnoops:	$(SERVEROBJS)
--		$(CC) $(SERVEROBJS) -o ttysnoops $(LIBS)
-+		$(CC) $(LDFLAGS) $(SERVEROBJS) -o ttysnoops $(LIBS)
- 
- ttysnoop:	$(CLIENTOBJS)
--		$(CC) $(CLIENTOBJS) -o ttysnoop $(LIBS)
-+		$(CC) $(LDFLAGS) $(CLIENTOBJS) -o ttysnoop $(LIBS)
- 
- ttysnoops.o:	$(SERVERSRCS) $(INCLUDES)
--		$(CC) $(CCOPTS) -c -o ttysnoops.o $(SERVERSRCS)
-+		$(CC) $(CCOPTS) $(CPPFLAGS) $(CFLAGS) -c -o ttysnoops.o $(SERVERSRCS)
- 
- ttysnoop.o:	$(CLIENTSRCS) $(INCLUDES)
--		$(CC) $(CCOPTS) -c -o ttysnoop.o $(CLIENTSRCS)
-+		$(CC) $(CCOPTS) $(CPPFLAGS) $(CFLAGS) -c -o ttysnoop.o $(CLIENTSRCS)
- 
- common.o:	common.c common.h
--		$(CC) $(CCOPTS) -c -o common.o common.c
-+		$(CC) $(CCOPTS) $(CPPFLAGS) $(CFLAGS) -c -o common.o common.c
- 
- clean:
- 		rm -f *.o core ttysnoop ttysnoops
diff --git a/app-misc/ttysnoop/metadata.xml b/app-misc/ttysnoop/metadata.xml
deleted file mode 100644
index a3862b8ec2fc..000000000000
--- a/app-misc/ttysnoop/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-misc/ttysnoop/ttysnoop-0.12d-r1.ebuild b/app-misc/ttysnoop/ttysnoop-0.12d-r1.ebuild
deleted file mode 100644
index d58b8e138ac6..000000000000
--- a/app-misc/ttysnoop/ttysnoop-0.12d-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P}.k26"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tool to snoop on login tty's through another tty-device or pseudo-tty"
-HOMEPAGE="http://sysd.org/stas/node/35"
-SRC_URI="http://sysd.org/stas/files/active/0/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/libcrypt:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/pinkbyte_masking.patch
-	"${FILESDIR}"/"${PN}"-makefile.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dodir /var/spool/ttysnoop
-	keepdir /var/spool/ttysnoop
-
-	fperms o= /var/spool/ttysnoop
-
-	dosbin ttysnoop ttysnoops
-
-	dodoc README snooptab.dist
-
-	doman ttysnoop.8
-	insinto /etc
-	newins snooptab.dist snooptab
-}
diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
index 1a90bfb658ef..ee508a075ad7 100644
--- a/app-misc/vcontrold/Manifest
+++ b/app-misc/vcontrold/Manifest
@@ -1,4 +1,4 @@
 AUX vcontrold 157 BLAKE2B c8d08ae44343850d95e9b99626690a2f79403bb9bafef9ea6125376623c617c4fc1523beb4be4d3cfa50d67c3a7ef84e4b3042afcaf8211ea0276d4e519cd713 SHA512 10583cff05a3099d06ec13cd35711c93dece72de1ba05a2026d85b31cb6279136cbbffa00bcc162cba841232d2f8fe2babda463bdadb6b4f3e1f39ce95562401
 DIST vcontrold-0.98.10.tar.gz 87721 BLAKE2B 06111f534d137d08f0a66b00f1238dd04856c3a7dbe630baeed89667de2840cfa6d9227a899b3ce4819accccd8d2228ef7e31e9562e1bb21027a3ddd2fe2b148 SHA512 4e65c23edd2542323a2815154544c2a4376c35a49a52168d6a3a08dba68f462dbd9c0c43020f86a4cb6c4eb7736b5d9460c2e4e2a67c015e2e51841338547c55
 EBUILD vcontrold-0.98.10.ebuild 882 BLAKE2B febf481c4f796ed0058fd4cee3f938d2633f5ae86dc47b1fc2dd603c40d13fde1107abd0cff0e865b5702a01a2df2b1f1f5435c2242bd9cb8ad3219d5f32cf68 SHA512 b958adf4ca63c46fa77fd1dbf700a25b569bb3eb9b90b888780af43adf4382b959deecdb3ab8f08b0a8d3831ab139ca63d6c43080942e3e821806fba4f80a4a5
-MISC metadata.xml 885 BLAKE2B 17676d1b2de65b63083ec40cf1cc9f6db2e4de7ea11c5c8b6caffb987e65a8203123a971de6dc4d9008bca78814285da9cd0957fe2a9af1e06640125f8cd9725 SHA512 2b46a7837e30663b9124d51641070616321edafb8c991d319175aca810e1afbb1e2aa15d67d9d1edac7274f523db1d1b407a97f2e2cc4a5789c2028fad8fe8a0
+MISC metadata.xml 889 BLAKE2B f047017277fc9cca0029102cb10b7f94858095dcbae3337edeca05b96fb64cbe7c7514f8d815f28088db893b94527b300caabfef57f78f367d2a4daa573f5364 SHA512 c32ea8ca79d0fee0419e91be44c0624658e2648bb611835b00e963e83cac7ad464f61d53a295c916aeaf9882aa09d6842d08b0e726d5073dced323e22c17eaf4
diff --git a/app-misc/vcontrold/metadata.xml b/app-misc/vcontrold/metadata.xml
index 8c0ccecc06fd..a31c0aaf3771 100644
--- a/app-misc/vcontrold/metadata.xml
+++ b/app-misc/vcontrold/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person" proxied="yes">
-	<email>tl@l3u.de</email>
+	<email>tl@stonemx.de</email>
 	<name>Tobias Leupold</name>
 </maintainer>
 <maintainer type="project" proxied="proxy">
diff --git a/app-misc/vittk/Manifest b/app-misc/vittk/Manifest
index 9828ee921ac9..2e7fe5bdd45a 100644
--- a/app-misc/vittk/Manifest
+++ b/app-misc/vittk/Manifest
@@ -2,5 +2,5 @@ AUX vittk-1.1.1-dirs.patch 2490 BLAKE2B 7eccfb13df6ca64a2244d45e60d193e1c828ae31
 AUX vittk-1.3-configure.patch 810 BLAKE2B 40e4cc3efc99cf976aaeccc7d075f9a77e2396cfad67aefd2298ff8d9d3d0091ddcd96631f5f05e89340d872861c75c0ba3ea7b2027e31013731fa0b43500452 SHA512 0ac4b5c6a1df2405be3ddf9e87d2a6978db157e1646824ce9baf8f80865e5a59e7185eca6a799cfdc47a6fbe521dec9c27db66fcd6128d0bd224f517b937c4e1
 AUX vittk-1.3-makefile.patch 3729 BLAKE2B 2ba2d2096dd522331e1b7dd719c7d98db80f4b4b25385499a02b87c9b79d7313240a889951cc6612341884a2f180324c640cb592b75b3e6317e4ab9b7d25af7f SHA512 9f284630c003bcdb911f34e2a49a1d8ad3119fa781a9eadd0dda7116220ce2481dd64104258fd90fcef4fad1b49dd2f9be54b1769bef2ec293e487a02890c200
 DIST vittk-1.3.tar.gz 71921 BLAKE2B eae3aeee88f1986fd654307b0bae4fd7bc9c3f86312f82bb3776ee5f8d36b45489aee386762a9c8a1ef67766d75aa01086ab50a4743bffe14910411ccb19dd88 SHA512 feda4eda7780a5a2a51acbc4c4d47ba5b88c3c01c82ae8715e7822700843e0d7de365b786554db59f7e40dbdff6f6bb0083a2126b1b082586504d8d16112af6d
-EBUILD vittk-1.3.ebuild 621 BLAKE2B 339c485bbb9e403e7a86d25ee9f9afb5a0a042eb3b7e831100001619480be40d1dd34657d722ad5b904bafa35df4c61c64b249503076788f47d817ddb406c5f4 SHA512 7f21ec4b34af48bdac13d61df6d6f1bc7fe55d03dd9a02f0e2be8a775953544e0c94cf8f7fc9002462233d4fcbd318d2336c722d41eadc68cda44578dc5eb429
+EBUILD vittk-1.3-r1.ebuild 621 BLAKE2B 23b3ea5799c748094990b5b7b7e904b36667ab6d8e661b2ad16578ad1cba254495a722e263b5192564520bb689708eca1d25cc8ff4f769ea2fd6939d04bddbe4 SHA512 0fb2bfa316744e8530503807067128e242fe9a4408156d6daa91333e2d83a69c153cf3abb21a35f3f230366d258f5eb62578abe7db0be97da34c4cfc29229590
 MISC metadata.xml 391 BLAKE2B 5c7cd4e57a3b86e93b827f2969e7661efafbda6c93709c0271931352aefc1fb70d8ed9f39e360a6c92748151203150814b709ed06f77b57e9c26aa4063c3e90a SHA512 c0d9ce3812ade59831c724d835f92e89b4ff7f82399c373e8015c20a8efc8669858395e803f25fbdd1c551b6aa6bb8fe5fc2cead1bf59d32478929dfda415857
diff --git a/app-misc/vittk/vittk-1.3.ebuild b/app-misc/vittk/vittk-1.3-r1.ebuild
index bc1c47519edb..4cf322908e9a 100644
--- a/app-misc/vittk/vittk-1.3.ebuild
+++ b/app-misc/vittk/vittk-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,11 +13,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-lang/tcl:0"
+DEPEND="dev-lang/tcl:="
 RDEPEND="
 	${DEPEND}
 	app-misc/task
-	dev-lang/tk:0
+	dev-lang/tk:=
 "
 
 PATCHES=(
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /app-misc
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)