gentoo resync : 22.05.2021

32 files changed, 142 insertions, 173 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7efe21e661d2..07d3f20ecf78 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ddcui/Manifest b/app-misc/ddcui/Manifest
new file mode 100644
index 000000000000..f945758bc6b3
--- /dev/null
+++ b/app-misc/ddcui/Manifest
@@ -0,0 +1,3 @@
+DIST ddcui-0.1.2.tar.gz 126766 BLAKE2B 85317b68bbd7e3e5b780ad2ba45888049f9ca70695ccfeb5d0acc2f2c8db11ee97438aa53240671f908caffd45b12a488593cd82b41c8e1acbad38f97d560ab4 SHA512 008033f23cf1dccb69b503b2f8950518e771bd4892b2df912186712859e6e66f724019beb5941d49452ae9a6080ce2730a1e11ec201931a31b3ab4735c03c724
+EBUILD ddcui-0.1.2.ebuild 853 BLAKE2B cb1bc97b03de0b47447d9e21c034f91d4ff7b7f4da9054e3b9bd37718ea40dbad70b1a105996a38ab020d24d7dea619f3fe51cdbe5b90fb526eb81f9598dd3ea SHA512 6e078a7c97b4723b22d2de3c11f2006a572b609295c5e04dd62e7c798fbd65fa8a4112b09854d7735668dd41c6c8dfc698964c11ab3ba3fd1045baf321b597d5
+MISC metadata.xml 506 BLAKE2B d9ba8243b0d919bf2e9c81e3ca6f0ac3af34b7be558837b839701f6743998f8bc9bc92b67358eae9e87c3752513d7eab5e68eec728cb6544aee0f19aadc0f766 SHA512 02009fcbe817a8bcf92067a461d57733937586c0111595e6f6a91709a93556f0d4485f841648519e5aca941bf7d904c12ec4c2a6f68b4187962cdf74fc6dc15c
diff --git a/app-misc/ddcui/ddcui-0.1.2.ebuild b/app-misc/ddcui/ddcui-0.1.2.ebuild
new file mode 100644
index 000000000000..4319b120f3d9
--- /dev/null
+++ b/app-misc/ddcui/ddcui-0.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+DESCRIPTION="Graphical user interface for ddcutil - control monitor settings"
+HOMEPAGE="https://www.ddcutil.com/ddcui_main/"
+SRC_URI="https://github.com/rockowitz/ddcui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND="
+	dev-libs/glib
+	>=app-misc/ddcutil-0.9.9
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	virtual/freedesktop-icon-theme
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# move docs to correct dir
+	sed -i -e "s%share/doc/ddcui%share/doc/${PF}%g" CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_install() {
+	cmake_src_install
+	make_desktop_entry ddcui "Monitor Settings" preferences-desktop-display Settings
+}
diff --git a/app-misc/ddcui/metadata.xml b/app-misc/ddcui/metadata.xml
new file mode 100644
index 000000000000..02bb3dbc970b
--- /dev/null
+++ b/app-misc/ddcui/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rockowitz/ddcui</remote-id>
+		<bugs-to>https://github.com/rockowitz/ddcui/issues</bugs-to>
+		<maintainer>
+			<email>rockowitz@minsoft.com</email>
+			<name>Sanford Rockowitz</name>
+		</maintainer>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 459e9c1aea05..8de63a17d6c9 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,4 +1,4 @@
 AUX golly-4.0-CFLAGS.patch 686 BLAKE2B 1d82b951bee9f336931ad2589bae03bd8e52ac2f982294f18abd5297bc0d5cbd877ece2716736ce8dfcf044c823cb707d6ce8923177b3ab2bbf09a3d0e247b92 SHA512 b883702ed44bd8469255bbc43191bbf91da64ff0048d4cc3c7cc0c5103e01fe49f9017ad1723d041ab080dfa46b68f4bab0b9abd850b74b1803d5bcebb04c36a
 DIST golly-4.0-src.tar.gz 5579026 BLAKE2B fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32 SHA512 3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
-EBUILD golly-4.0.ebuild 1381 BLAKE2B 182a9f197db7e0634c1baf06eb38b1bc923ab6bd39b90f529badfd3c3072b3f8597df57eb6ae5273545875b58f88fa2e6695f668cfcc869ca7e45341344cefb2 SHA512 394c3b8217a3fcc4be09391ffb504289fbbda991f9c7682defdacdc4a4570d6516d5c106690b9643912b5fcfce7f61725f5d963f3ac60e49fda86b480835082f
+EBUILD golly-4.0.ebuild 1384 BLAKE2B 2957836bae7ffc4c2a17e6f5183dae6b7cd2d3a898a0fa823ad32f22f79e143bf943da5548f0bae315ec1fdb52cf11d9a937db207329eff34149fa6f2d3a358f SHA512 36750dd133c0d2dfbd203b58cc9162e164f773c14af0bc3d0a679bfc13f358fee9f778191fdf8428aa35cb6481087266c1b640c610a5670ce1189c966e91dde8
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/golly-4.0.ebuild b/app-misc/golly/golly-4.0.ebuild
index e62cf1408e20..337a05a7ad44 100644
--- a/app-misc/golly/golly-4.0.ebuild
+++ b/app-misc/golly/golly-4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg-utils
 
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 23e5978a76f0..bf254aff5c86 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,3 +1,4 @@
+AUX gramps-5.1.3-test_locale.patch 1195 BLAKE2B 1b1aeb08b90bff9db9d028499428efa60a16b48597bcf466c07a77e3f658c8550eca84b899047d1bc6e20eb26e8dfab9637ae7aced1b99167466ea6c51707132 SHA512 70daee9afdce0f939ad3cec094fb4004f5c162e6b49849f83486db5baec074a8673d7a6096a367279019712a11f0b40e827f6cb3019e7dc3cc6bad327fee35ec
 DIST gramps-5.1.3.tar.gz 17352457 BLAKE2B 8356e29d4e9e2ee78f0f09e54db8f77b2db991652f2c6b2fdc742b8f2e160a2c9c2b7df1a43c34e5d05b12b540e88cd8572fe89cfbb3a1ecb6df650a39ac0651 SHA512 045d5dd6aac4745ce527624657bbee25b9130e63b1b66bdd6a8409cdc876f1f3a4a6c0435d433a62bfffb723f6ac66d93829b79fc12c8768694c266b7a3b82cc
-EBUILD gramps-5.1.3.ebuild 2744 BLAKE2B 83a2fa0bdd02c61f839c52e7706b236867998d395672c12a6ee66492c53f72f75cf8ee383d76f7efae3856f8325d35505b27d686ca3088ef18b8c0e0bdee9db2 SHA512 25796d3defb7c8c6a82ee283521acb8dc20a75cf5c161ba8748fb8b87ee24f9d97e30cc8665d63725ef5f3e8a593ba90c770ba01c69d1e42374317ac9d78cf53
-MISC metadata.xml 5598 BLAKE2B 4516bb11bb4fa57403d9b86409a073021dc9372b4d6d53af2c90cb31d5988b960ce4ab9f190b7e82948c1118f1fb0581bef1f8e1e4bbc9da8c294541eabbeda5 SHA512 74b37ffecc01f6c140f349d822ceedf20eb36af2c7a09faca53abaacede12d916cae4b514d066026600bd46d04943c4948dda7fe8c85e7e01714ebd24e428359
+EBUILD gramps-5.1.3.ebuild 3423 BLAKE2B 50c35c845943c62d32179ca86971636e459f2224ebb81f23d342242d682f8ac040fbd6d2b65bfecb2a280496161cd2c379c9cc11f9d64df11efc1f1769961e1f SHA512 4ae9b62f164d9ffc977751cefd8d96d4e1987c05bb384b9fd73bfb23a56f82ffae630468000881c24dfdf975165ad420bcb4c7d05ad189dad780be7437d66919
+MISC metadata.xml 5702 BLAKE2B 21c6b024222b3d4cc29ea388a8f16cbc158850ac5bb0ac32bd55205abfeb91d48d400be992f4f50c2af7e05b1c768e7916b7ff3db16eeea2b33dd294c27f7637 SHA512 e95b67c7b179bfd9bf280d9c8dfd69cc533562abf8b07a433a5c945cc76468f8f7d2097a218a406c71afe4a97ff8e8a790feec8b097c82ad24eed9b6ac8ec99e
diff --git a/app-misc/gramps/files/gramps-5.1.3-test_locale.patch b/app-misc/gramps/files/gramps-5.1.3-test_locale.patch
new file mode 100644
index 000000000000..40eba66dd216
--- /dev/null
+++ b/app-misc/gramps/files/gramps-5.1.3-test_locale.patch
@@ -0,0 +1,30 @@
+GEDCOM-import tests explicitly set the locale to en_US.UTF8 because they
+assume a US date and time format. That locale is not guaranteed to be
+present and checking that in ebuild is a hassle, therefore use C.UTF8
+instead - it's similar enough.
+
+--- a/data/tests/imp_sample.gramps
++++ b/data/tests/imp_sample.gramps
+@@ -1706,7 +1706,7 @@
+       </style>
+     </note>
+     <note handle="_000000f9000000f9" change="1591544255" id="N0036" type="General">
+-      <text>Objects referenced by this note were missing in a file imported on 12/25/1999 12:00:00 AM.</text>
++      <text>Objects referenced by this note were missing in a file imported on 12/25/99 00:00:00.</text>
+     </note>
+   </notes>
+ </database>
+--- a/gramps/plugins/test/imports_test.py
++++ b/gramps/plugins/test/imports_test.py
+@@ -51,10 +51,7 @@
+ # ------------------------------------------------------------------
+ 
+ # These tests assume a US date and time format.
+-try:
+-    locale.setlocale(locale.LC_ALL, 'en_US.utf8')
+-except locale.Error:     # seems to fail on Windows system for some reason
+-    locale.setlocale(locale.LC_ALL, 'English_United States')
++locale.setlocale(locale.LC_ALL, 'C.utf8')
+ 
+ 
+ def mock_time(*args):
diff --git a/app-misc/gramps/gramps-5.1.3.ebuild b/app-misc/gramps/gramps-5.1.3.ebuild
index 9908893b3c33..b02679ec1bcc 100644
--- a/app-misc/gramps/gramps-5.1.3.ebuild
+++ b/app-misc/gramps/gramps-5.1.3.ebuild
@@ -17,15 +17,15 @@ SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+rcs +reports exif geo postscript spell test"
+IUSE="berkdb exif geo postscript +rcs +reports spell test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_USEDEP}]
 		dev-python/pycairo[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
 		dev-python/pyicu[${PYTHON_USEDEP}]
+		berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
 		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
 	')
 	gnome-base/librsvg:2
@@ -44,6 +44,10 @@ BDEPEND="test? ( ${RDEPEND}
 	')
 )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.3-test_locale.patch
+)
+
 python_prepare_all() {
 	# Install documentation to the proper location. This can't be done
 	# easily with a patch because we substitute in the ${PF} variable,
@@ -67,10 +71,14 @@ python_test_all() {
 	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
 		die "Failed to symlink build directory to source directory"
 
-	# FIXME: some of the tests fail if the locale 'en_US.UTF-8' is absent,
-	# at least as of 5.1.2 this failure does not propagate back to this
-	# function but we should still handle this properly somehow.
-	esetup.py test
+	# Set a sane default locale for the tests which do not explicitly set one.
+	local -x LC_ALL=C.UTF-8
+
+	# Note that as of 5.1.3, test failures do not actually propagate back
+	# to this function. For now this is fortunate because the test suite
+	# does not handle the absence of bsddb3 well, in the long run however
+	# this should be fixed.
+	esetup.py test || die
 }
 
 # Ugly hack to work around Bug #717922
@@ -87,6 +95,13 @@ python_install() {
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
+
+	if use berkdb; then
+		ewarn "The BSDDB back-end in ${PN} has got known stability and data-corruption issues. It has been deprecated since version 5.1.0 and might be removed in 5.2.0."
+		ewarn "If you have any family trees in this format you are highly advised to convert them to SQLite, as described here:"
+		ewarn
+		ewarn "https://gramps-project.org/wiki/index.php/Gramps_5.1_Wiki_Manual_-_Manage_Family_Trees#Converting_a_BSDDB_Family_Tree_to_SQLite"
+	fi
 }
 
 pkg_postrm() {
diff --git a/app-misc/gramps/metadata.xml b/app-misc/gramps/metadata.xml
index 676ea64bf000..c6c84d61a5b2 100644
--- a/app-misc/gramps/metadata.xml
+++ b/app-misc/gramps/metadata.xml
@@ -88,6 +88,7 @@
 		zapolnjevanju vrzeli v rodoslovnih podatkih.
 	</longdescription>
 	<use>
+		<flag name="berkdb">Support BerkeleyDB-based family trees produced by older versions of Gramps</flag>
 		<flag name="geo">Enable rendering of geographical data using <pkg>sci-geosciences/osm-gps-map</pkg></flag>
 		<flag name="reports">All external software that is needed for graphical reports will be installed</flag>
 		<flag name="rcs">Adds support for family tree archives via <pkg>dev-vcs/rcs</pkg></flag>
diff --git a/app-misc/kryoflux-dtc/Manifest b/app-misc/kryoflux-dtc/Manifest
index e52a7ed40de0..e64ad8f2ffef 100644
--- a/app-misc/kryoflux-dtc/Manifest
+++ b/app-misc/kryoflux-dtc/Manifest
@@ -1,4 +1,4 @@
 DIST kryoflux_2.6_linux.tar.bz2 9177658 BLAKE2B 6eb0bc7a166950bfedb32da466c17125a8a7d64e4bc9aa6610c69dd0f98c2fb5187ad19dbaf191b33dcb5a786ec4a1fa9bce2464c3c04eb152e0b9ed7ae770f2 SHA512 9bf700e9c646bad135999eb1fed12c86ff6fbc11a0034b86af7541fb16a4905dd740c706ebb87bf5848f5d80f45699c350a56397df5b6850559c2576d18eef1b
-DIST kryoflux_3.00_windows.zip 18502294 BLAKE2B f8e60b0feb6e7d7b9a43480b0b4cf67b79c5431fa20ee9e771ee7adf214e1c992d080c2eb6a043f141936f2de873d63079e994b90e994051a29391c6a308f190 SHA512 12de0c7d28b0abca2eb35748770fe96906c12940b7148103f56713fe1144e09759d362a24c094a7088713557da467b90f4e3d0ace59252cb84e3349dc73ee5bd
+DIST kryoflux_3.00_windows.zip 18211783 BLAKE2B e50cfc196d37216a7c929c4aa915b5cfeb7f38805076aed4e1bbc9dbfcc946fce18db0a2e2020d77cf581e2df174f2e3b6eb2b3d9060795501b1769d258ad05d SHA512 afa42fd3460d796dd3694059a86484ea94ab3084c52dc18d6f14e5b790d66e0f13514fbe2efc5c32abd3e471cdb0ac10cc3f7bafcdfb41371a6caddda83e2a00
 EBUILD kryoflux-dtc-2.6-r1.ebuild 2453 BLAKE2B 1758326f8194bbc0259b115d71bf841eda55a20b48d3229ce30782675e2bd95f3dd7cf4a2051c7cf84a638f6b3bb3c1a8001b4e45d6ca90af2f52932a68669aa SHA512 78325bd05b5646374760ce57274663a1a7f091ccf95ba77fb65ddf74ecefb04f69bdce40165de94980a24cd4b26d640d2a5b07c883e033c30ec82f0e2237d5d8
 MISC metadata.xml 412 BLAKE2B 4a92b64039475119e84a4c9f11b1c6dac92d92139b195d37adcc710b274436a69b538d68b66393ef6f090338aa162d159929a498ba3b7d95dbcaad3b29d9204c SHA512 e8844f948a8f53b8b932311dd12c36b8148e985cb9f6927c384c131d914bd2dc42a240d45b98354a5cde3c6d6e4915c177ebed7c780c4f0b1f065571ac54ccda
diff --git a/app-misc/lfm/Manifest b/app-misc/lfm/Manifest
index e2d6dd6a4280..9449dc84ebea 100644
--- a/app-misc/lfm/Manifest
+++ b/app-misc/lfm/Manifest
@@ -1,3 +1,3 @@
 DIST lfm-3.1.tar.gz 88878 BLAKE2B 409b61d24de671db33c25ff78c039f690fb376fce7bf146c452a67e72d3b50d54b461994ae7a2fb9a17fb64fc94de83f58d5faa0bd960970a53ee5c42fc9c166 SHA512 9e6142c0d871fe19b4b82e5333e03de562ca87a7498bd7fb496cca27e0b42c56a33913f2a7eb46439447ab7adb4a87da44bfcc1548101e15703aaa21ec105af8
-EBUILD lfm-3.1.ebuild 450 BLAKE2B 1bf116bdb41eb147a95a276051213b5f82263032f782aec82d98b90ee9011c0a1da7801d74465122ac5d2a006fd17a1eb034c0f56e8deecfd2b5148c82895e8a SHA512 fa22afbf400d38c105cb1d3e035792cc015462e6c083b1f07f5192ded5f780a4bc586a9e71f6e0af29112dcaaa5f1e45850c719a71866e259f38711e5184181f
+EBUILD lfm-3.1.ebuild 451 BLAKE2B 38ced18dc08c22cc539da7d43f145b3953df98b79d0e0e9d2f99912c683871bcf50576a889225a090afa7f7e230196a1d98ee50ea3667998640e0a5f27292767 SHA512 a2836ecc6ed7287954df13e55b2dece99fc6a71052e72a594ce53bbb38adab13a4bd3eddda2c500f48edeb28757da21b63ae25201229a86e8bdcc1e8efb7b033
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-misc/lfm/lfm-3.1.ebuild b/app-misc/lfm/lfm-3.1.ebuild
index 575baaae927c..a9b266a3f8cb 100644
--- a/app-misc/lfm/lfm-3.1.ebuild
+++ b/app-misc/lfm/lfm-3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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="ncurses"
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index 2f52544a9534..4c0ed3b1df76 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,6 +1,4 @@
-DIST livecd-tools-2.8.tar.bz2 9991 BLAKE2B 4cee552aa384736a3c67b638d3a90efc64414c50112951a0021d84e811a836a803d2dd782f4e0af37e5ce02c7cefc0a06053d0debc3365ef7fe531f14903937e SHA512 66e74fccca4174352050a73b9b94f35084b76f6a768490d0d47ca2ffc590f32a53beb7f71d46bcacaf19a466cb5e3dc884cfd45de601c444326546b138d8300e
 DIST livecd-tools-2.9.tar.bz2 9987 BLAKE2B b24ee78aa0111950322b4424d630f640aa2d525c5c87b5ff3397628ed3e1c55eb2dbb71c32cbd5e57fa3a4310af1f541c1acd370b4f829dce49d2beb6f1be442 SHA512 89e892dfa8581e0f1f8208fecb7a686f19da100751e3430b014e90455c391efd2a3d25f3fff046576f8f739090715a2c14bc8c0b1fc9fe7db03455d84426a889
-EBUILD livecd-tools-2.8.ebuild 1018 BLAKE2B c9346c2fc8384c3e359cd3b852a3347d29cd2c2a6ccbba3c95275ab3579c2885b7c1fd67866fa5404496c3d573a3c9f41edc51f013370274cced77f0c36b0bb8 SHA512 196001176854559fef1ef16305d6474f0bb9435796583af18b25f468b8304950db470b477068db862cdffef0b781948ef9ee46b2807008876e6068e205544528
 EBUILD livecd-tools-2.9.ebuild 1018 BLAKE2B 8a9611ad733000da5e7d19ca276e9e727e3c711d2b76895d881740a44093f8eb2f4938b9c11aa6b217d1ba7ad67ff88afd31e2ed4c829c3879705a50a2414c85 SHA512 0578979c723a174cde9cf565ac18a9238e6da7b8b79944045057d8f19117cd81fefd14598316cd2a07b77ee29faadd6be1bbf2220b6b8f4c6fed379958651392
 EBUILD livecd-tools-9999.ebuild 1023 BLAKE2B fdf4ed97a881358baa903d620c9466d7b216e77af5f5da6713bfb7c1a526564381bb4d8424caa0118731cc3354a51d31a076b2132ce933b86b294e8d6d61fa4c SHA512 1bf0a83a0f52b0e1823a28cb3577771d8f0b8bb7235da01ce134eced8756e98c98d8f9e78316efb50871fe5bfdba0dab1adaf4de29e707af9479df5294a3134d
 MISC metadata.xml 256 BLAKE2B d02b5b33f7375594b6e77357966b74fd698579fcefce673bde9b7082e2a56a47b1b8824d5aa423ad7271113efc568997c476bc0106d147dbc1a198b201def869 SHA512 b301300f23bb631f440eef04dce17f16cfee618775d38013cfded6b0e8b806d772749578a39c43143104a1716d2cc6eefb3af7f6865d85da5b2cb6f1e78c7c68
diff --git a/app-misc/livecd-tools/livecd-tools-2.8.ebuild b/app-misc/livecd-tools/livecd-tools-2.8.ebuild
deleted file mode 100644
index 2105bbd658b3..000000000000
--- a/app-misc/livecd-tools/livecd-tools-2.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/livecd-tools.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
-HOMEPAGE="https://gitweb.gentoo.org/proj/livecd-tools.git/"
-
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="
-	dev-util/dialog
-	media-sound/alsa-utils
-	net-dialup/mingetty
-	sys-apps/openrc
-	sys-apps/pciutils
-"
-
-pkg_setup() {
-	ewarn "This package is designed for use on the LiveCD only and will do"
-	ewarn "unspeakably horrible and unexpected things on a normal system."
-	ewarn "YOU HAVE BEEN WARNED!!!"
-
-	CONFIG_CHECK="~SND_PROC_FS"
-	linux-info_pkg_setup
-}
-
-src_install() {
-	doconfd conf.d/*
-	doinitd init.d/*
-	dosbin net-setup
-	into /
-	dosbin livecd-functions.sh
-}
diff --git a/app-misc/mediacrush-cli/Manifest b/app-misc/mediacrush-cli/Manifest
deleted file mode 100644
index dda10331c43f..000000000000
--- a/app-misc/mediacrush-cli/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST mediacrush-cli-1.1.2.tar.gz 3299 BLAKE2B d3235ef82e7c6dc4ff0c19662514dc848b34904b19105c49343a91b401ea2611e4d090f586a06521f3e0d55e336027456507fbcbe2eed0ada9d0f0765556af12 SHA512 fa4c905e75ffe1d16a83a6c3cc29dd2e28eb9097d1bc95742ece2356ab6e219c15c75bab7a09443c98b18e438d1e6690968d24c35eb7a3dd0877dff36574761c
-EBUILD mediacrush-cli-1.1.2.ebuild 910 BLAKE2B 13e906fbdf80f720f34a47ffc262bb7fdcdcce9476e25956eda663d1e8e5ca5f95fe982e68689b3eb5e8da982c385a7391dc81a538538cf7b671a75f55edf1df SHA512 2d368c0f47a25ab7ed99127bc03eff718a5931ea35d696b14559e9cba9e8036f31435a08fb00b33d83d0ee742e9596a947cdeae942d12694e1ebb313ca226d93
-EBUILD mediacrush-cli-9999.ebuild 888 BLAKE2B 12d098ac31e66c99a8bf9691f5bbbc62a93012f8542de12af690e3a3da14fce319050fe6a1a52ae42d31e617728873bcfd02e31c820e3cebe8f8f292fd86493c SHA512 2da5feb0214fa4be4154beaf2215d602e3b47c54a5c353908c259c4d0892b1a0b6890f7dc4295fae98995361021f227e019c8384eef6574adcba2a2524feabae
-MISC metadata.xml 262 BLAKE2B 7b9a308d8a01487fb4f750860b742d96d6f05470a672b6e9759e23e958f5a0f2f314b819d96113049d0439e51993899e58a74193fedf77351844ed5c898876ab SHA512 0810bb0acec3604cbe7eb8677bfca60b172b54a9aaff2367ecbd892c0d64ba910cf482021a8b482180a811532f74fba9217c7e417b1140bc587d7b67346df3de
diff --git a/app-misc/mediacrush-cli/mediacrush-cli-1.1.2.ebuild b/app-misc/mediacrush-cli/mediacrush-cli-1.1.2.ebuild
deleted file mode 100644
index a8d2a2d39cb5..000000000000
--- a/app-misc/mediacrush-cli/mediacrush-cli-1.1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/MediaCrush/MediaCrush-cli.git"
-	SRC_URI=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/MediaCrush/MediaCrush-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/MediaCrush-cli-${PV}"
-fi
-
-DESCRIPTION="A bash script for working with MediaCrush from a shell"
-HOMEPAGE="https://github.com/MediaCrush/MediaCrush-cli"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-text/asciidoc
-"
-RDEPEND="
-	app-editors/vim-core
-	net-misc/curl
-	sys-apps/file
-	sys-apps/sed
-"
-
-src_compile() {
-	a2x --doctype manpage --format manpage mediacrush.1.txt
-}
-
-src_install() {
-	dobin mediacrush
-	doman mediacrush.1
-
-	if ! has_version x11-misc/xdg-utils; then
-		einfo "Install x11-misc/xdg-utils to enable '--open' argument"
-	fi
-}
diff --git a/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild b/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild
deleted file mode 100644
index 552c7ca56352..000000000000
--- a/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/MediaCrush/MediaCrush-cli.git"
-	SRC_URI=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/MediaCrush/MediaCrush-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/MediaCrush-cli-${PV}"
-fi
-
-DESCRIPTION="A bash script for working with MediaCrush from a shell"
-HOMEPAGE="https://github.com/MediaCrush/MediaCrush-cli"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-text/asciidoc
-"
-RDEPEND="
-	net-misc/curl
-	sys-apps/file
-	sys-apps/sed
-"
-
-src_compile() {
-	a2x --doctype manpage --format manpage mediacrush.1.txt
-}
-
-src_install() {
-	dobin mediacrush
-	doman mediacrush.1
-
-	if ! has_version x11-misc/xdg-utils; then
-		einfo "Install x11-misc/xdg-utils to enable '--open' argument"
-	fi
-}
diff --git a/app-misc/mediacrush-cli/metadata.xml b/app-misc/mediacrush-cli/metadata.xml
deleted file mode 100644
index 218155e9228b..000000000000
--- a/app-misc/mediacrush-cli/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">MediaCrush/MediaCrush-cli</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 3330767d1b16..b360a5079998 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,5 @@
 DIST pax-utils-1.2.9.tar.xz 705188 BLAKE2B 9eb9309f0317683dd06e491e6647ba20986f2cb248432fad0ed0eb277711e8d38c5b5148bc0b44e6dbc3d5d3d0093bccd4d10c057090801c49246a63f3bc0899 SHA512 47271cd75818728342e2a074fa05da24fce51ef0eeedb28237138525d7c86c207ca2b5d206fd02cb34529590340b726a14c54b205c65204539a51fb78ac55d41
 DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102
 EBUILD pax-utils-1.2.9.ebuild 1887 BLAKE2B ba4f47fff5eb0e56bcb845a04a7cfa61c655503878d66c6684b32a3fd15a19a2e30757c560a1ddecc1e49ace6540b420b2adc6d542c60e2285d63cfba0179d4b SHA512 dad5e4f7c102a6f4a490c5cdcb80759d0e71784081d8e363183d37970ddaa5bdf87a0bae66d010f88ce092cf74a328e719a5b0bacfa579654e8f7c06f99ed48c
-EBUILD pax-utils-1.3.1.ebuild 1880 BLAKE2B 35d4f74bf83d2bf0292a0d45e7b8e78b337b866237352973b85deb8690c53b4ce795da8d3ccbab7b971184ef219b51436c961010fd3029e6278e824b39425a7a SHA512 85ecc69ee4d80491ca654c89dc7918f22c92d72df89a03e5fc1f04435d121e0d25557ad8c2ff36a4d5e3c0af34bd5db6d745fd65527fb09d81875d4bdf77258a
+EBUILD pax-utils-1.3.1.ebuild 1875 BLAKE2B d09c134877a8ed1f9d3bcfc902c2f9ddfbfcb064a9ab0ce3b83d0b67629004d94f9d4cbf504c0872dfe2a0831ac6b54a68dd46cb346d98ab6308adde1c619948 SHA512 382380f70f4ad17cad97d423e7d4335c91563f62ca7651f33149d51ae9dc3329f55427e443846553224633c881c4742a079924791aed0923a8cf5d71b4091c25
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.3.1.ebuild b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
index 474efb8559ac..a1470ebee630 100644
--- a/app-misc/pax-utils/pax-utils-1.3.1.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${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 ~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 kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 2daae551cfeb..2589a3ef338a 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -124,5 +124,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD rpick-0.8.1.ebuild 2682 BLAKE2B d26c4f13683788bf7c2f5fed23c90dfc172c0754fe9e8906ea5825774b7c0e3ea94f5906859f203f2f09517ae5181d531256482dfab55ca6806ad3693e009559 SHA512 672ff9eedd557555ae5ab8e80c703e0442e2e7fc4197b45d8ce60bbc5166d73947ba9378c48cd58f07de7047d53e7a6019cc99d7724cfff0c59999e4fb5c868a
-EBUILD rpick-0.8.2.ebuild 2650 BLAKE2B 223f80211d3a4720ad371f4b1f62b8456fa3981b8c4401a0029c5ff7071e3f7fdfa3d292d3c163508db394701e7ad734b0117f92c1a5f8f1bcbd9d1c363c04bb SHA512 5931a3494184fc4ef963cf875bf4dbc542ada88ea11c3fb0306b0c47877a5e27f303b584c35f82269d8109b6273b297dfdf16cbad8e1a4939ebedc960073d2e9
+EBUILD rpick-0.8.2.ebuild 2647 BLAKE2B 68028dec9ac8da55d7d8e335ad188581b11c90fb463270ee9a522e1de821182f737df8f30f2a4ec0a42c26519e5daad24d2d373b18ec952a62b7360832b24fef SHA512 4ab8741291f5f1664e1f8bbc4c80ff2330fa7928b41d4d82536fae9d3d5312d941242d714984207ac83f1d7d2e832f929aaa2fe02ca1c8b66d6f1a8ac268c168
 MISC metadata.xml 982 BLAKE2B 81e304c7c73f959b09d1bb5f2d26d1495930f1b340552fbdb989c8741dba6f5ee7b8801e3eb1d7063947f8f424d0c32ccc66c29cf6508ce8c11305e45febf322 SHA512 bfa865140ae1320670b94f4f383931dfc9bbf1a0278597a283cd64d538362d95751e9b9b53a1a46aa96a835a69b9425518760bd286d0375c550d0e110d1f4f08
diff --git a/app-misc/rpick/rpick-0.8.2.ebuild b/app-misc/rpick/rpick-0.8.2.ebuild
index 9271423c73aa..030cd52c5bdb 100644
--- a/app-misc/rpick/rpick-0.8.2.ebuild
+++ b/app-misc/rpick/rpick-0.8.2.ebuild
@@ -127,7 +127,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # use cargo-license for a more accurate license picture
 LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
 QA_FLAGS_IGNORED="usr/bin/rpick"
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index d6df0d9233d9..e672ce29bdbd 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -4,5 +4,5 @@ DIST task-2.5.1.tar.gz 903428 BLAKE2B afa17364984237ea589921afb4379297b128ea1bb6
 DIST task-2.5.3.tar.gz 788760 BLAKE2B 3e8a4f2ebf6c39d3d51dc9b044cf1c8fbce23ab8178b6645405f26522bbb6f29e9f78247fe52601f6c8f87f966a3b7aad130417d0f416b9d969e9e396c10eafc SHA512 e906c8f42ad4b9a7e20a82defe31b89194d72957f18dd5129ecc41a2a60a9d8b0d01abb9b44ecce79b65cd9064af4a4a4c9dd695f98152e77908f130dc3f9677
 DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
 EBUILD task-2.5.1-r2.ebuild 1166 BLAKE2B 726572a3998040ea2b48f50aeabcfce2c7ce4538c99c9b1fe4d960fb1f0d76e6804a8625a618d54c9c1df643fcc878d56563202524cdda4c70c2de32c37a2840 SHA512 a7785cb3b81097e69ac3fafbd7586069f35c305b6ae6e29ac75b57d9e896d66e6c7099948df7985560bd0f509425351f6240862716f54413b4846057bc703015
-EBUILD task-2.5.3.ebuild 1371 BLAKE2B b22ef6dcef1c571d1d7f750cadf40a2ece291b5856540f57ca4e85b5ac99ca065638d01e4dcfa94c1d191404dc4c34b5001b884751a8e5805141909716df197d SHA512 803c3e8e17e4b82bb91adbabc2be903ab360799fc7aee563e56924a060000e8bba862cefc5aaa071cbdbde14f7bf6bf97706dd307edbb0460d3b389a851e61e4
+EBUILD task-2.5.3.ebuild 1369 BLAKE2B 9a9697292649fccd81b763cb645879c7cd8a46ec8b7cf222ad3be528e2f9244e529fbf14a7a3151b535cfb2674daaae42a851821250f132216d305300b2a09b5 SHA512 6306303a1e824e13d14588d56f79559da8ae54dd237b64fc249dde94da842daf7ece3ea8ed7a5127261ac8e4f245adfd9de514a2d41e73c6248933c73c20a31c
 MISC metadata.xml 465 BLAKE2B c3932c8c436b15c3222e07e7102364c30008fb2b36354f3da1d0ec5c8a9cb29a992a39ae9e329404166c1f7220ef29d5ffed1e10401a84782b79773072add441 SHA512 16416c5221952dbcc52b47312b9277d6e6230e1686816fb3c56db6dfd576459f39ded1e2eec7d43a14956373a090b7fcbb045fe285c49a65a0e0339ff6e789cc
diff --git a/app-misc/task/task-2.5.3.ebuild b/app-misc/task/task-2.5.3.ebuild
index 1116f0710464..47845fd51fdb 100644
--- a/app-misc/task/task-2.5.3.ebuild
+++ b/app-misc/task/task-2.5.3.ebuild
@@ -12,7 +12,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/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 0b0bfe9e0055..7edf5e4c9bbc 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,9 +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
 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
 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.ebuild 1171 BLAKE2B 9558d057e4e68784624911b5a1ba3aad6c9f4cb5d82aca3440037140aafb9b6cfcdf9c54699318a5d1798651471928d1a410f33b29beb7a5be358bcaf654d818 SHA512 7bcd104e73396f7ae72485c3c2edcf9f2371b9c1ee85eb9431cacf3b0e28763472d704bbbcc394d228e41d7a4efba5bd11e11678275ac5495d769a7426563c4b
+EBUILD tmuxp-1.7.2-r1.ebuild 1179 BLAKE2B 349c0a275a49e8f1959cf2cfd1604ec9b2d8c7ef926d0c7255c6e7e2c431ee5a17cd74d9f791c8d5e1e5bcbccef3b156fb48268aff2ff30191d3862925781b68 SHA512 e3c424f0ecf58ea802f052188fd0ae48e6c68f42205d216e7e4cf9a105aa975fd8e6c8c22167d28b75c7831be2004d45239377639fe602870774ba1dc1a0a12e
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/app-misc/tmuxp/files/tmuxp-1.7.2-relax-click-dep.patch b/app-misc/tmuxp/files/tmuxp-1.7.2-relax-click-dep.patch
new file mode 100644
index 000000000000..e3f5772e92b3
--- /dev/null
+++ b/app-misc/tmuxp/files/tmuxp-1.7.2-relax-click-dep.patch
@@ -0,0 +1,10 @@
+diff --git a/requirements/base.txt b/requirements/base.txt
+index fb2ab61..17e3516 100644
+--- a/requirements/base.txt
++++ b/requirements/base.txt
+@@ -1,4 +1,4 @@
+ kaptan>=0.5.10
+ libtmux>=0.8,<0.9
+-click>=7,<8
++click>=7
+ colorama>=0.3.9
diff --git a/app-misc/tmuxp/tmuxp-1.7.2.ebuild b/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
index 55ed4f164af4..25dcf9b50b9d 100644
--- a/app-misc/tmuxp/tmuxp-1.7.2.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 	>=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}
@@ -37,6 +36,7 @@ BDEPEND="${RDEPEND}
 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 --install pytest
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index 33dd58dcc27b..9ebbfe3d826b 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,5 +1,5 @@
 DIST trash-cli-0.20.11.23.tar.gz 69229 BLAKE2B f3650a037f00e6ce8cd7bd1ff5f3e11c794ceb09563193e2930eb9b81cd40120dd48f117e8c96d900a8221db9a68360ff633e591367bd544ad07045b1a505304 SHA512 d370687da706677de61c0d234d4cb4db4ff4d9da8cde60c361d11eaccf319e2e418969a7d49ec6edd456524b1275b63d1fcd49bc9a9012afabda1c7a8ad7de78
 DIST trash-cli-0.20.12.26.tar.gz 74542 BLAKE2B 558e3cc043cdaef44bf68317e666c6f757daf9feeb6b731a57aba91ec983e1adb1e404f7e8428a7bd1225d83df6e94e8b9b793942bbb233f09a44127af0a42fa SHA512 d0b0a97014c888ddda95759dc82837385a2809cae04bdf6a84dcf0233dc2cf9370253110bc5fdbc5c4452ebb65c5e7836fe1cfaa9aaabe38d34269724456cd1c
 EBUILD trash-cli-0.20.11.23-r1.ebuild 598 BLAKE2B 1fe9975c5b1f7a8646cea9f25c487ab4b84095c4a010d80ec8bc21dc77cf283ad726d09ee0c13227cbd145aeeae25d2444f6ec0e7510c3c8356992809eb6604c SHA512 8449369b777c9460106660ce57929a67eefb1a3f3e247f020070c5b863340c48c2b79f825eff77a783fb5a44a3a3f0a883c963af22de0319427d9c22ead88c3a
-EBUILD trash-cli-0.20.12.26-r1.ebuild 600 BLAKE2B 9fedf61aa8d64d4a08c80782e504ab367eda5744a532c4542430262ce7bc6bb8a71b087eb6e1013ff73c5d2d6285fa290fd31703dc8aec7fdc5a143d5aede533 SHA512 44810de0d465d94fdcc81106f8ad801148070acafc02fe9bf04da60cd187e45271b90e6faafe065dfad5aef4b7327f0e4d220bca1ed15913fa6e142f57c70c83
+EBUILD trash-cli-0.20.12.26-r1.ebuild 598 BLAKE2B 1fe9975c5b1f7a8646cea9f25c487ab4b84095c4a010d80ec8bc21dc77cf283ad726d09ee0c13227cbd145aeeae25d2444f6ec0e7510c3c8356992809eb6604c SHA512 8449369b777c9460106660ce57929a67eefb1a3f3e247f020070c5b863340c48c2b79f825eff77a783fb5a44a3a3f0a883c963af22de0319427d9c22ead88c3a
 MISC metadata.xml 1094 BLAKE2B 25187a31e5ffc666c680bc9970599affa08b76be31618489fb698e9a4581c75e75385c32c1ff65a10c6749222f813e4a783e657f9b142cfa2283ab863be3deec SHA512 81dda2f222de76ddf74f37e19afb498b0cfd37ed6583dcf92adb2a8ce64566c2b8360cca535bdbe9343c04563894257a74fdae3df2d9bac20e486f3aa7c86417
diff --git a/app-misc/trash-cli/trash-cli-0.20.12.26-r1.ebuild b/app-misc/trash-cli/trash-cli-0.20.12.26-r1.ebuild
index 55b4d0268f2e..c27b8153f31a 100644
--- a/app-misc/trash-cli/trash-cli-0.20.12.26-r1.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.20.12.26-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
index b7b2a40815ee..eee442d29794 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 896 BLAKE2B 453d5c8e202257a947529013345418198485e2bc389d41d6760b3e16f24c458f0f4c732e6bf31ed03c6190c9e0e3fb0b337fcfded8e3db804f9faa132c5343a5 SHA512 0b2ec22e4c21e605047506a41e33e4ce07b8e6d6cd1bf556cb43683c1626c5c1cdfd49dae489f8e2db4840d110f955e00c8abe8c30468fb1823d8941800104d7
+MISC metadata.xml 884 BLAKE2B eb463d729a8a67923198c7104a9a2e2da98fc1eaa1466849be6eab614a5a22c3c21cd57e22c53c1decb5bf74ef72ca59a1cfa144a13b6e20bd16c0224ebdec54 SHA512 ae7867fffcbfc58d3b1285798f60caf2aecd4c591ea672e05158da2685ff7713c3a0d217f77b400fc96d036127238b7126538a509cceb5e50fdb1175cd8e4b6e
diff --git a/app-misc/vcontrold/metadata.xml b/app-misc/vcontrold/metadata.xml
index 54ca11d7944d..b4396756d8e3 100644
--- a/app-misc/vcontrold/metadata.xml
+++ b/app-misc/vcontrold/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person" proxied="yes">
-	<email>tobias.leupold@gmx.de</email>
+	<email>tl@l3u.de</email>
 	<name>Tobias Leupold</name>
 </maintainer>
 <maintainer type="project" proxied="proxy">