gentoo auto-resync : 29:05:2024 - 00:07:15

24 files changed, 42 insertions, 346 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 5816a4e14c1c..41a57059356c 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 5125fb928e76..9957af9b7955 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -2,9 +2,7 @@ AUX calamares-3.2.60-ldflags.patch 661 BLAKE2B ebeea9a8dbb067ebf3f862d425342338e
 AUX calamares-gentoo-branding.desc 10382 BLAKE2B 1a8f68c54d1e7d4392f4545b4d5cb3bebfb16c2d15320be3b0b63382ed255ebf79ac6286f6111b8b357603abde5b58f12da9ad2713bbfdf7445f7a135ba37637 SHA512 b2136662e2d580679dd13c4e642364329231c5636421911a0012f6763fe602959b54616323bb81f857b78fa12187f0331fb290611c720a45ec3c122b4e6e65f8
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f
-DIST calamares-3.3.5.tar.gz 4722988 BLAKE2B bc3270fbc2f804c46008f1f0a106719b779a07d7d5d3cc9f1ab17da7597ebb5dfebc8793036e19570b0048afb667df4b9fed55e813374d7465513ea048e00ffc SHA512 6846e13455e4fa38bd4d5061eece1baf5a972700f489dc1e35d988cfb5359650c63f79f9453431f1aff722af696260504c27f0c000490d781ab5fe03a5c46cf2
 DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6
 EBUILD calamares-3.2.60-r5.ebuild 2824 BLAKE2B a4931b7a2e77a3f9fb286374469f463d90a6687617836153a3a4150823528300c79ec90a26b794d1fbd45d5de9f880957da9d27c231d41b05ac9faed5c1fc223 SHA512 d2a5e6f0d8b2b4a97d1cc305db65b73dd1a1a527b6e17228386f27d41381f864b899af6e2a20a5444641031babb4d0b76342ceaac6923d46e304e77be118d2f4
-EBUILD calamares-3.3.5.ebuild 4419 BLAKE2B d2ce67ac7db2e1aa6766060015c63872245976cee3f5ab4e740f1aca1f918f1bf310cdbdf92937e2bc1ac6f9a2c62a8d0c6ca4613bba1775c7b2a531d6974c9d SHA512 c9ab1c71656dd0f22eeb879e4026107ffb78b74ed275c3da0f8479ed096be99edde48acc441183a3f6a4b736c36b7a4f8520fec463de8f2d8f1b7370c65d8a40
-EBUILD calamares-3.3.6.ebuild 4176 BLAKE2B fbfdb43f6405b3d146678b7a89d5215e02bb9fdc18f0177fa355304d280250caed28fffc7af4325d32c36f56e724e99c66ab30b67d2bc9d5e6fc2c099d1b44d3 SHA512 b41c675427d9254155090a8064dbe89dea088b167a5be4a9cc275bbc4b6241799920f1db092b80b04cd32e101042b3a1e7f38ed847b5984b4540e7da25c0e1bb
+EBUILD calamares-3.3.6-r1.ebuild 4107 BLAKE2B fec52736168a9530e1928d057fac111003f87ac4c985266c9d8ffda42e2480db91c9d98be72c08b30634dd3b67fdb75a9177a22a840eed93ec88c5b6b15a706e SHA512 dbfce01620be1c0b7a6bd4a6943cf69ad1f38b044bccad5c11897ef95c5a0fc8c7bc62b869670b718998ae659a804f2f95edb851919b58572ebb4e7410193678
 MISC metadata.xml 781 BLAKE2B 56d64535b539de398557b26f7705e6aa222d7073a0c31a38069d45deec697e488891c95850324a7610ee1faf8f4ce2e04d0d0a9fd29300afa5e5bf42804e6942 SHA512 156cd07700dfab61f78bbdd4c626a098ce111428cebbbc6ab541f60f12e347f62236ad21d2fd8031babfc0be87ad4b246ad2afb3e453005588f87bc500c78c72
diff --git a/app-admin/calamares/calamares-3.3.5.ebuild b/app-admin/calamares/calamares-3.3.5.ebuild
deleted file mode 100644
index 18227c7ccfcf..000000000000
--- a/app-admin/calamares/calamares-3.3.5.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+networkmanager qt6 +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-QT5_MIN="5.15.0"
-KF_QT5_MIN="5.78"
-QT6_MIN="6.5.0"
-KF_QT6_MIN="5.240"
-
-BDEPEND="
-	qt6? (
-		>=dev-qt/qttools-${QT6_MIN}:6[linguist]
-		>=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN}
-	)
-	!qt6? (
-		>=dev-qt/linguist-tools-${QT5_MIN}:5
-		>=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN}
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/yaml-cpp:=
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}]
-		dev-libs/libpwquality[${PYTHON_USEDEP}]
-	')
-	qt6? (
-		>=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml]
-		>=dev-qt/qtdeclarative-${QT6_MIN}:6
-		>=dev-qt/qtsvg-${QT6_MIN}:6
-		>=dev-qt/qtwebengine-${QT6_MIN}:6[widgets]
-		dev-qt/kdsingleapplication[qt6]
-		>=kde-frameworks/kconfig-${KF_QT6_MIN}:6
-		>=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6
-		>=kde-frameworks/kcrash-${KF_QT6_MIN}:6
-		>=kde-frameworks/ki18n-${KF_QT6_MIN}:6
-		>=kde-frameworks/kpackage-${KF_QT6_MIN}:6
-		>=kde-frameworks/kparts-${KF_QT6_MIN}:6
-		>=kde-frameworks/kservice-${KF_QT6_MIN}:6
-		>=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6
-		sys-auth/polkit-qt[qt6(-)]
-		>=sys-libs/kpmcore-24.01.75:6=
-	)
-	!qt6? (
-		>=dev-qt/qtconcurrent-${QT5_MIN}:5
-		>=dev-qt/qtdbus-${QT5_MIN}:5
-		>=dev-qt/qtdeclarative-${QT5_MIN}:5
-		>=dev-qt/qtgui-${QT5_MIN}:5
-		>=dev-qt/qtnetwork-${QT5_MIN}:5
-		>=dev-qt/qtsvg-${QT5_MIN}:5
-		>=dev-qt/qtwebengine-${QT5_MIN}:5[widgets]
-		>=dev-qt/qtwidgets-${QT5_MIN}:5
-		>=dev-qt/qtxml-${QT5_MIN}:5
-		dev-qt/kdsingleapplication[-qt6]
-		>=kde-frameworks/kconfig-${KF_QT5_MIN}:5
-		>=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5
-		>=kde-frameworks/kcrash-${KF_QT5_MIN}:5
-		>=kde-frameworks/ki18n-${KF_QT5_MIN}:5
-		>=kde-frameworks/kpackage-${KF_QT5_MIN}:5
-		>=kde-frameworks/kparts-${KF_QT5_MIN}:5
-		>=kde-frameworks/kservice-${KF_QT5_MIN}:5
-		>=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5
-		sys-auth/polkit-qt[qt5(+)]
-		>=sys-libs/kpmcore-20.04.0:5=
-	)
-	sys-apps/dbus
-	sys-apps/dmidecode
-	virtual/libcrypt:=
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		!qt6? ( dev-qt/qttest:5 )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	app-admin/sudo
-	dev-libs/libatasmart
-	net-misc/rsync
-	|| (
-		sys-boot/grub:2
-		sys-apps/systemd[boot(-)]
-		sys-apps/systemd-utils[boot]
-	)
-	sys-boot/os-prober
-	sys-fs/squashfs-tools
-	sys-libs/timezone-data
-	virtual/udev
-	networkmanager? ( net-misc/networkmanager )
-	upower? ( sys-power/upower )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-			PYTHON_LIBS="$(python_get_LIBS)"
-
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-		calamares.desktop || die
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-		calamares.desktop || die
-
-	cp "${FILESDIR}/calamares-gentoo-branding.desc" src/branding/default/branding.desc || die "Failed to overwrite branding file"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_CONFIG=ON
-		-DINSTALL_COMPLETION=ON
-		-DINSTALL_POLKIT=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-		-DWITH_PYTHON=ON
-		# Use system instead
-		-DWITH_PYBIND11=OFF
-		-DBUILD_APPDATA=ON
-		-DWITH_QT6="$(usex qt6)"
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Skipped tests:
-		# load-dracut: tries and fails to find Dracut config
-		# libcalamaresnetworktest: needs network
-		# libcalamaresutilstest: inspects /tmp (expects namespace?)
-		#
-		# Need investigation:
-		# test_libcalamaresuipaste
-		# validate-netinstall
-		# validate-services-systemd
-		# localetest
-		# machineidtest
-		# packagechoosertest
-		#
-		# Requires removed dev-python/toml
-		# lint-displaymanager
-		#
-		# E1101
-		# lint-dummypython
-		-E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest|lint-displaymanager|lint-dummypython)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	ecm_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/calamares/calamares-3.3.6.ebuild b/app-admin/calamares/calamares-3.3.6-r1.ebuild
index add03ed16ed6..2036bb2bfb26 100644
--- a/app-admin/calamares/calamares-3.3.6.ebuild
+++ b/app-admin/calamares/calamares-3.3.6-r1.ebuild
@@ -44,7 +44,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		>=dev-qt/qtdeclarative-${QT6_MIN}:6
 		>=dev-qt/qtsvg-${QT6_MIN}:6
 		>=dev-qt/qtwebengine-${QT6_MIN}:6[widgets]
-		dev-qt/kdsingleapplication[qt6]
 		>=kde-frameworks/kconfig-${KF_QT6_MIN}:6
 		>=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6
 		>=kde-frameworks/kcrash-${KF_QT6_MIN}:6
@@ -66,7 +65,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		>=dev-qt/qtwebengine-${QT5_MIN}:5[widgets]
 		>=dev-qt/qtwidgets-${QT5_MIN}:5
 		>=dev-qt/qtxml-${QT5_MIN}:5
-		dev-qt/kdsingleapplication[-qt6]
 		>=kde-frameworks/kconfig-${KF_QT5_MIN}:5
 		>=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5
 		>=kde-frameworks/kcrash-${KF_QT5_MIN}:5
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 7870980e6b5e..02af1535b98c 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,6 +1,3 @@
-AUX test.patch 1713 BLAKE2B 6b6322c9db1cfd1832a8752dda4bc91cc5d92a7cf4109eb8727dbbf484ccb1b6ef482dac4f9a656adcdd0872b262fca5dae183ba1e0b81befca5026a7facd5dc SHA512 c7dd54e67e8379f05746b0985708b69331623ebd6bfee393c48115cef5ca90423723f4c39b5e33f7fb30953da9629e4419f4343c573bcbd766d9f57dd911ab34
-DIST cdist-6.9.8.tar.gz 1385902 BLAKE2B 6190f09d527a562e490669335d604d3173209bb950448855588a78d48428b8522c8f39327d6455d30242d97bb48d810c319f650a1c0c2fba203a348637dc87c1 SHA512 3c78dd5332a5957750948c52c4b27269ada21b07a2fce0d84019b4fcd3b7ddc6221f0179690d1b3af7e685ffafd739e604f50195fbc36a5494a102b2fa1b732b
 DIST cdist-7.0.0.tar.gz 1395298 BLAKE2B 0dc11302b4a63e24f31d598df63dc5da784cb01d57ade9b67da277b7c27f66b4c31891ce710c3acdc100e92500b0e80e22cf01882b1669fa714d70c44879f7f0 SHA512 bd87b52603443bc9ffd81785a73bc07387e0555da34b04f97619beb39a1bfcf488b84a6a37fac4fe49b9b002080c5f20a50b3f08ac3665c6c2143a4aa4ee47b7
-EBUILD cdist-6.9.8.ebuild 761 BLAKE2B 7059616146fd1ba0fa8786ff490ed59656e0cbe7284a3e2fe20f27bad09a52097cf4d18543826de4c30026ed5900152a684cb0d5006b7deddec6873031d5c635 SHA512 6e75002987b83ff6be7b3dfc495f1469dffbed075562d151600ed917a5ad930281240ef669ed7d526405777203f0fb00f59457b86a216cddbeaad67d97087cc8
-EBUILD cdist-7.0.0.ebuild 730 BLAKE2B a309b47593bfcf2a79f7b5f51ccca8a41a98a6f636bc7997abf646cea64c5c0608085db1a8654fbe3e3fae303a4156082fdd1a811dfe2a70174e082b9f94620f SHA512 f139a134d4eb98449da8e2878699b2325104572501952ac60a0b1ab0d04f7bb8060665da62d01ba41c83da29922267ad110d76ed11ed45eb5d3ef4395b16e8e6
+EBUILD cdist-7.0.0.ebuild 731 BLAKE2B 82c9c631f156357b3761ca507e35871882a305be7d70d0953ee955f93e66247ab2a2f846bc4bd51efd8d6b60227ee3e64d1403a2921864f1ba8bacdf02315ea3 SHA512 9665b7a6e54eb55091cdad4c3a1500b687f7e1921ca628baaad9094025780dd1261f926add2274efa11edcd03d1f944da3d9cd3fd6c5b9635bd6055253324c30
 MISC metadata.xml 236 BLAKE2B 354b036d8fa34ea50195ab2125b113da315ba5254902cebee161e7b8710904dee7a9ae42bddd0b3b6cedb8021bbb60a35c705d993f2065ad9a8d662a0efb8c3a SHA512 dbdc16a1739daf1ed58da5e6ff4bac4a03d52b2ab62e47c6db96ff4d8bf4080b4c2f3a02e566152eacc0a54afa69b18e3d8fbfd0f47361774e78f4d41656462c
diff --git a/app-admin/cdist/cdist-6.9.8.ebuild b/app-admin/cdist/cdist-6.9.8.ebuild
deleted file mode 100644
index 4e75b661c296..000000000000
--- a/app-admin/cdist/cdist-6.9.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A usable configuration management system"
-HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist"
-SRC_URI="https://code.ungleich.ch/ungleich-public/cdist/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=( "${FILESDIR}"/test.patch )
-
-distutils_enable_sphinx docs/src dev-python/sphinx-rtd-theme
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	echo "VERSION='${PV}'" > cdist/version.py || die "Failed to set version"
-	distutils-r1_python_prepare_all
-}
diff --git a/app-admin/cdist/cdist-7.0.0.ebuild b/app-admin/cdist/cdist-7.0.0.ebuild
index 074a43f466ea..6a67147f107c 100644
--- a/app-admin/cdist/cdist-7.0.0.ebuild
+++ b/app-admin/cdist/cdist-7.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/app-admin/cdist/files/test.patch b/app-admin/cdist/files/test.patch
deleted file mode 100644
index ebc9d944ba57..000000000000
--- a/app-admin/cdist/files/test.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://code.ungleich.ch/ungleich-public/cdist/commit/3a321469a8ba5aea55220bd70bd4900de732e917
-https://bugs.gentoo.org/831362
-From 3a321469a8ba5aea55220bd70bd4900de732e917 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
-Date: Tue, 16 Nov 2021 11:11:45 +0100
-Subject: [PATCH] Python 3.10: collections.X -> collections.abc.X
-
----
- cdist/integration.py     | 2 +-
- cdist/util/fsproperty.py | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cdist/integration.py b/cdist/integration.py
-index 17b65f09..04470ea7 100644
---- a/cdist/integration.py
-+++ b/cdist/integration.py
-@@ -84,7 +84,7 @@ def _process_hosts_simple(action, host, manifest, verbose,
-     """
-     if isinstance(host, str):
-         hosts = [host, ]
--    elif isinstance(host, collections.Iterable):
-+    elif isinstance(host, collections.abc.Iterable):
-         hosts = host
-     else:
-         raise cdist.Error('Invalid host argument: {}'.format(host))
-diff --git a/cdist/util/fsproperty.py b/cdist/util/fsproperty.py
-index 09e9cc19..6bf935e8 100644
---- a/cdist/util/fsproperty.py
-+++ b/cdist/util/fsproperty.py
-@@ -33,7 +33,7 @@ class AbsolutePathRequiredError(cdist.Error):
-         return 'Absolute path required, got: {}'.format(self.path)
- 
- 
--class FileList(collections.MutableSequence):
-+class FileList(collections.abc.MutableSequence):
-     """A list that stores it's state in a file.
- 
-     """
-@@ -102,7 +102,7 @@ class FileList(collections.MutableSequence):
-         self.__write(lines)
- 
- 
--class DirectoryDict(collections.MutableMapping):
-+class DirectoryDict(collections.abc.MutableMapping):
-     """A dict that stores it's items as files in a directory.
- 
-     """
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 56228ad40320..b8ca273cfecf 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,6 +1,7 @@
 DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4
 DIST conky-1.20.2.tar.gz 1837320 BLAKE2B 41aaa384366ee9229ec4e7df97f37a8c62fff4dd864b3f8f8d3d40c57e87646ee8309c3d1fb68c7d7f8ed802c7ce49a57bbe0c01d32eaacfe84fddbd65b81007 SHA512 b516db38af5c20b101520356cd4f50d147869e7ed2bc84287e8a464e32bb306655edbac074da278d4732ee87f02c52d99cb4c117556e0d08f5be911a2a789618
+DIST conky-1.21.1.tar.gz 2146994 BLAKE2B 7c19813dad6a7a701cfedfba6d424d61bd5c960dc836c6aa6668031c7e096e214559177f0a8186fda1a770a956c301274d24d45a21c9d2d8faf62ce2f76610fd SHA512 4b7f243943a7d04942ee86dc6d5cdd75c6999a4ff0616efb5b00c47ad100a5b83dd4ca618764fc1ce97f0fc77118dabc87fa691fb1181fb54ab1b38d862f5229
 EBUILD conky-1.19.8.ebuild 5805 BLAKE2B c56ad10b94d3fee046a955a7a25d7d1ed71d089c2a935af6260d3c64e3181a8db74b5fbb0a27983a542896816a1150a33bb74797c3a87842efc829b26603ff1f SHA512 8f8cafd306f8ac7deb5d63c924f7eddcb2a76582ece7a7d83355422ecbaf09e57cc214241445fe79d84b4da96f04d9344f05cce192f451a9bb732e64c5575efa
 EBUILD conky-1.20.2-r1.ebuild 5995 BLAKE2B b82b95e5ec969b9ad844d3470b4bd8763e78c03c01d93ccc301a967897ec1cfa21732fa85b59f6803d5f948881c7260da192ac529688930a63c33f7515bf9fdc SHA512 c89bd339bbd166a04a29f16384a41fe0528cad7b27e82dde3250bcbb441061877ce98168ba22f7cc5c4cb1678bbe5a2f219ab6cccc9fd60b428aaaebf204edc7
-EBUILD conky-1.20.2.ebuild 5809 BLAKE2B 616f9cf91272e3a704f3ee9474cb148a2b3b1226ae1e837d16071112b199afe4fe3746c01310b18472be861c2e0c24f4db23d5de2d0b9c7d70fd46ac4bda9674 SHA512 a1b6b42f304a7787d0ae5c11134a792f3a7deb62efa222ba5c020d1e36172cc25b84579e19e4bc462d7c4ab13344f164b5c9bfe67036968329d699dfac7959ca
-MISC metadata.xml 2504 BLAKE2B 64776b9337c836b0a5463e7b0857a5f0bb81c742867ac34701cd49e9edeb08854c34e8dc50757de6df59ee7a5f85d8c80a158a6a8c8eec20a4e3d23f9f7d7a62 SHA512 499f432fd332b882f27da281f72b7e0f3fb166ba9a4b20f300e5f81769df95607fb018333bdd698a4fc96b17bc8cde501267c4abdcec45d50f40de513e72c0f1
+EBUILD conky-1.21.1.ebuild 6102 BLAKE2B 0b2d9da9ad05bb549be53427fdc68349040bcf3448ff33533991bc877b4bbd93d203f8bde9000a8ec3ea208a470a89d336086ef503996edb5a9d7402d48c0b37 SHA512 211177777e8479b128266886a6102e48429125dfccbfe2c04843bd721ba0c6778280ef4869512eb7dbee49cf698d21a86f8466bd87e763992f5d25ea73175eb1
+MISC metadata.xml 2574 BLAKE2B b3f3a78856ddd22337984d1b5800ba6c5e162897a5aadd919d7ca05e32d6b80cf89fb1a5e51544636167a37d4f06889cb7b867228f66b199bee83dd127416004 SHA512 90a9e83972438b43853794b23abbec4879465b8663ef2e39ec44c4df0a6605564c7ebe895bca221ca4b4dbbea3f7566166dafcb9131c3d424d142958195efb68
diff --git a/app-admin/conky/conky-1.20.2.ebuild b/app-admin/conky/conky-1.21.1.ebuild
index 1db4f0fdeff5..d76b4731f0d6 100644
--- a/app-admin/conky/conky-1.20.2.ebuild
+++ b/app-admin/conky/conky-1.21.1.ebuild
@@ -15,10 +15,11 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
-	intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
-	mysql ncurses nvidia +portmon pulseaudio rss systemd test thinkpad
-	truetype wayland webserver wifi X xinerama xmms2"
+IUSE="apcupsd bundled-toluapp cmus colour-name-map curl doc extras hddtemp ical
+	iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib
+	lua-imlib lua-rsvg math moc mpd mysql ncurses nvidia +portmon
+	pulseaudio rss systemd test thinkpad truetype wayland webserver wifi X
+	xinerama xmms2"
 RESTRICT="!test? ( test )"
 
 # Note: toluapp is bundled in conky since 1.11.2
@@ -32,7 +33,8 @@ COMMON_DEPEND="
 	iconv? ( virtual/libiconv )
 	imlib? ( >=media-libs/imlib2-1.11.0[X] )
 	irc? ( net-libs/libircclient )
-	lua-cairo? ( x11-libs/cairo[X] )
+	lua-cairo? ( x11-libs/cairo[X?] )
+	lua-cairo-xlib? ( x11-libs/cairo[X] )
 	lua-imlib? ( >=media-libs/imlib2-1.11.0[X] )
 	lua-rsvg? ( gnome-base/librsvg )
 	mysql? ( dev-db/mysql-connector-c )
@@ -41,7 +43,6 @@ COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse )
 	rss? (
 		dev-libs/libxml2
-		net-misc/curl
 		dev-libs/glib:2
 	)
 	systemd? ( sys-apps/systemd )
@@ -56,10 +57,11 @@ COMMON_DEPEND="
 	wifi? ( net-wireless/wireless-tools )
 	webserver? ( net-libs/libmicrohttpd:= )
 	X? (
-		x11-libs/libX11
 		x11-libs/libXdamage
 		x11-libs/libXfixes
 		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libX11
 	)
 	xinerama? ( x11-libs/libXinerama )
 	xmms2? ( media-sound/xmms2 )
@@ -82,6 +84,9 @@ DEPEND="
 	)
 "
 BDEPEND="
+	colour-name-map? (
+		dev-util/gperf
+	)
 	doc? (
 		virtual/pandoc
 		$(python_gen_any_dep '
@@ -107,10 +112,12 @@ python_check_deps() {
 REQUIRED_USE="
 	${LUA_REQUIRED_USE}
 	imlib? ( X )
-	lua-cairo? ( X  bundled-toluapp )
-	lua-imlib? ( X  bundled-toluapp )
-	lua-rsvg? ( X  bundled-toluapp )
+	lua-cairo? ( || ( X wayland ) bundled-toluapp )
+	lua-cairo-xlib? ( X  bundled-toluapp )
+	lua-imlib? ( X bundled-toluapp )
+	lua-rsvg? ( || ( X wayland ) bundled-toluapp )
 	nvidia? ( X )
+	rss? ( curl )
 	truetype? ( X )
 	xinerama? ( X )
 "
@@ -149,15 +156,15 @@ src_configure() {
 
 	if use X; then
 		mycmakeargs+=(
-			-DBUILD_ARGB=yes
-			-DBUILD_X11=yes
+			-DOWN_WINDOW=yes
 			-DBUILD_XDAMAGE=yes
-			-DBUILD_XDBE=yes
 			-DBUILD_XFIXES=yes
+			-DBUILD_ARGB=yes
+			-DBUILD_XDBE=yes
 			-DBUILD_XSHAPE=yes
 			-DBUILD_XINPUT=yes
 			-DBUILD_MOUSE_EVENTS=yes
-			-DOWN_WINDOW=yes
+			-DBUILD_X11=yes
 		)
 	else
 		mycmakeargs+=(
@@ -170,6 +177,7 @@ src_configure() {
 		-DBUILD_AUDACIOUS=no
 		-DBUILD_BUILTIN_CONFIG=yes
 		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_COLOUR_NAME_MAP=$(usex colour-name-map)
 		-DBUILD_CURL=$(usex curl)
 		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_EXTRAS=$(usex extras)
@@ -186,6 +194,7 @@ src_configure() {
 		-DBUILD_IRC=$(usex irc)
 		-DBUILD_JOURNAL=$(usex systemd)
 		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+		-DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib)
 		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
 		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
 		-DBUILD_MATH=$(usex math)
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 9f9d203f58f1..0a8b212cb2c9 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag>
 		<flag name="bundled-toluapp">Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags</flag>
 		<flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
+		<flag name="colour-name-map">Include mappings of colour name</flag>
 		<flag name="extras">Enable syntax highlighting for <pkg>app-editors/nano</pkg>and app-editors/vim</flag>
 		<flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
 		<flag name="intel-backlight">Enable support for Intel backlight</flag>
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index 41e92b772964..dcf913f9dca5 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,6 +1,4 @@
-DIST eclean_kernel-2.99.7.tar.gz 25393 BLAKE2B 74f803f1007a1c54d87f087287a34a8380b21b9c66ad75a0ae64463815d5df39de0387f5d0cfd366e33efdaf039fce5dad923f1e55f93a2836830e303c3ca2df SHA512 dd43f65c1beebef59ee7a2e41375797fa5ea77171d8e4cf465b2b6a46e8e4500fb1723f664f2ce59e5b6e79d2dedd4abbaaa303a77e8349b9ee90c56e00e799e
 DIST eclean_kernel-2.99.8.tar.gz 25134 BLAKE2B efd29370f0204c8df7a8e955a50ef8ad819fd29f8cbf1d179e61588130ac6d589366f1f76d499cae42c6e99c553d1b0cd68c4f0728315940b5997196bda6b57c SHA512 57956e1f93327db86942c5be815d3df61934f93a65349faca4d2605e7667b9dfe8e42bc6d4f5c5c27fbbdd536a25371b4c4b0b88dca92ba0f5f98058f1c1b679
-EBUILD eclean-kernel-2.99.7.ebuild 680 BLAKE2B fe2f07c50e4d0240d3b9269a0b3b73de9493f6bbb3d69a95caad28ee1d4dee4e849b82aca39a4b140095759463f7b32782fc14d3f618ec4763f6c6ec6c922ec0 SHA512 246033f645f600304914ff981ed5fa22f963cbd3e08684d7579d585bf8c7e98f3593ee6b382444fde74f99aff50d1d0cc381be8f741dc9d125de5b8482a67d54
-EBUILD eclean-kernel-2.99.8.ebuild 722 BLAKE2B d9b28b19c573c7153c5d92196516c4e058cc2d06c608737e773cd05d502ef830bfd125668e6dbad2323b62742861c88aa9a8939ba093396a659197c8e0b2982c SHA512 3e349c51b3c0752374116ec8e06d7bbe6f7928826f425f5f824008e2c983800e1a2628bb978aa21d0a6be5d5adb1812097b84d2f01188a48f6dd73ecea4c5558
+EBUILD eclean-kernel-2.99.8.ebuild 720 BLAKE2B 939d66eb93e21a538773333d19a4e12dfd4134db8fb273e4f6833a1e0917a29a064e42408f464a1ef8908216ac299abc213b2ee31249bc931b755fe5d18271c3 SHA512 b993b34b0be9b97669278cc7c8be4e8d176f6cd954043991e5e8f4daa79e249da4f58487446ee0c606c78e44dce00b1f5ce39730b46c026978c1aa4aeb9f2fa9
 EBUILD eclean-kernel-9999.ebuild 735 BLAKE2B afa45010d60b2f8206f06832b0db264efc8774e4b129d24a65f4d260d94dd90a4c3399cfd53b1203eaeb4d09f64d964306d360e2e8b3ce5f96b9e635bceb4b86 SHA512 2f2d1f0d0f00b5df4e8f7286ee8b35408fa92a8129be07e786afc3517dd098ac82374ca5c3eb889f2a6fb573233db591d60ccad14abdcfd55ffd9e000086d099
 MISC metadata.xml 671 BLAKE2B 326b6aed5217dab530d48eb8fd9fd9891ebdcc7dc523c44832c6319a54817f5c4ede703a648b3bef5643500b89d32fbafea2cd051aa6677ec824e287f76d1eb3 SHA512 6d60c4c9943a7545630577a1d48193024265d4117c89687d952aed5d4391558cc8d1c73183da9cf12963f051b9e0342e5a5710a9e947737f08c14a991efd0851
diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.7.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.7.ebuild
deleted file mode 100644
index 7829c8eaafb0..000000000000
--- a/app-admin/eclean-kernel/eclean-kernel-2.99.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="
-	https://github.com/projg2/eclean-kernel/
-	https://pypi.org/project/eclean-kernel/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~riscv x86"
-IUSE="lz4 lzo zstd"
-
-RDEPEND="
-	kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )
-	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
-	zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.8.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.8.ebuild
index 84d8c7e8070d..d5d222851c21 100644
--- a/app-admin/eclean-kernel/eclean-kernel-2.99.8.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-2.99.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~riscv x86"
 IUSE="lz4 lzo zstd"
 
 RDEPEND="
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 382f3fa04afe..cf4b6e120ebe 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,3 @@
-DIST hcloud-1.42.0.tar.xz 1876444 BLAKE2B e7ed2e01a7c6bb106a5c46e21e26d8b6bdd7636b64c7b354674364c3db8c1776f09f199ea022e2f311e873490b737490ea22045aa00147c6066ff0a7fb96d563 SHA512 dab916666ec17b9675ba0a559170859779289c36739ac4c3d72445c87fb440df475e55e52ed628fd8d1a52421c6df4d47b0b51713e476753a66da74b3a7bf11c
 DIST hcloud-1.43.1.tar.xz 1889004 BLAKE2B 563cde962cf1fd180bbef60127b714419c09da198afeb4923f8fc1cd48850131b3b91de243de43e269497f36d14757a1e71941d30dfbee98baebb533f20e6cdd SHA512 c8fa46e9d3e2c73cc2d86e597bebf6e1dbf28b7145dbc272c403607807251ac27eee14b9ad267fdf2aa730da16ce52be4d2b0d94653612b4f375f1779c95d90b
-EBUILD hcloud-1.42.0.ebuild 640 BLAKE2B df3d123728bc429f87a4165ffc0bf6cd204c8403337b3f88c4f2a2535b0bf7e5132a9c94087997f27a2be0da0be39b9604fd7952d530e2b76241f6de59043f7c SHA512 4dbaae7363e29d2ba2df336291701023824d7d9aebe7c2efbacb82ad28e461111851240adfd3d5a61346f8117e0add33f3fa2b08c248d18f171f63741b958fa3
-EBUILD hcloud-1.43.1.ebuild 645 BLAKE2B 479b4959afc11357387cc1cec715f31e8b63f2d66e9fade3e0916e9133c41e9726c345615828b4b547a2512892f3ec54c615e0ed1b64c69dee0f95b33fe680c2 SHA512 91df85323ebcef2444b5e983b584dfa5d039e3e87d7bafe90f40f1376918dfd780a6d8afe639ac517d8f149cc398abf7072dfd0f3436b72474949f9ccc4232bc
+EBUILD hcloud-1.43.1.ebuild 644 BLAKE2B 30273b4b3244eca66768acebc13756f702912728e8e42aaa66b17ae72956d79e99e80b3a2a0bf667589b931eaef0b53178ac1384499df33485ce2c039f6bb89d SHA512 f2b86d28d88c28ea3eda268c1ec8f6fb0ec356af0693278e8fdda80f5929b3f3fd745837d7b3f78853ba7e36644f7fb66cca60699ba3fabfdafe58560923b778
 MISC metadata.xml 338 BLAKE2B 6ba2cbe509581ac35dabd93abe166f960d69d1f14336779848483386d28e22dd06e5d196061312827b7a945369f05a466417a1636b607e138515957a75db6f84 SHA512 cc69ce0ab7ba3a9af94ef1918738074cdd725bef2ff70d6c19e46d07bb9514d05ef6415c7ba5b372e7a98902a8440cdb9f7b14a848c3ff2f054863356971ddde
diff --git a/app-admin/hcloud/hcloud-1.42.0.ebuild b/app-admin/hcloud/hcloud-1.42.0.ebuild
deleted file mode 100644
index c073e3b5e053..000000000000
--- a/app-admin/hcloud/hcloud-1.42.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-src_compile() {
-	ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN}
-}
-
-src_test() {
-	# For upstream a simple test is run 'hcloud version'
-	./hcloud version
-	if [[ $? -ne 0 ]]
-	then
-		die "Test failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.43.1.ebuild b/app-admin/hcloud/hcloud-1.43.1.ebuild
index c4449b25b091..1b73743024ed 100644
--- a/app-admin/hcloud/hcloud-1.43.1.ebuild
+++ b/app-admin/hcloud/hcloud-1.43.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_compile() {
 	ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.versionPrerelease=gentoo" ./cmd/${PN}
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index a198eb5fc724..b1915f9664ff 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,4 +1,4 @@
 DIST lib_users-0.15.tar.gz 25899 BLAKE2B e54dfe20cf5e3e3da3bddcf044cda36a5d51dec9baa808202d81ed0ef8a8b434b3c6f31a279b544308a32e6ebf91008ac2db49278da7624a6037ffdf1db309b6 SHA512 f9eab0d7c634602c496154dc20bd8374842df77c6abfaf69a0c34013f01c3a7541a006cb2b027539f6c088a55bea78682bf156723899d614f39ee48773fb9ea8
-EBUILD lib_users-0.15-r1.ebuild 1072 BLAKE2B 33e9ef6355c00024b82214c524746657c96dea056b07edf97012bbedcc4c9f76c4ed54d2a611c15e7048302ca0401d2c33b2cfd28d11b3448dec46cef0c21875 SHA512 9312ad13bf338f19e726e1c770363b60683517c5b17d5388d9409a0a0ad4e9d0d0555cfe6df19f15050453090d0bf726e227ce3f9c16d7ea03a93c5fed07c938
+EBUILD lib_users-0.15-r1.ebuild 1067 BLAKE2B e4a127dfe5d8849528fd4cd892ea3a28cf18c018f445572316800ee5f63a6a6e312466da0ba612e0a350e22c27e660715060df9e2ed5e3c41a3ea6ccf62c781e SHA512 b027e6280b5133ab422b124a63a9a75aeb52b4f6653ec0160fdfdff1a08a725c3d9b7bbcf19f0493799f8d3930a5b3f861edc38b7d64c729129bc11f538f3aaa
 EBUILD lib_users-0.15.ebuild 1066 BLAKE2B f458b98a2b2b8c3d96d7572ff9353118b0520cc2319a5172d43aca04b5308bdfcd71a0e93c15d74932b90805e27e1f02911fb134801654153c0fa84a61addcee SHA512 5172c79024c9cd0bb91d2707f93ce4e5c3f37b873146d8edfc6ea4998cb2ee19860d565a499a717d85089c8d6f74d9ca509556156d18838fe627fcf51489e2b0
 MISC metadata.xml 344 BLAKE2B b11cff8e0077d50cf43e98a4c0502afec9c3c966f83513f392b97c1009fdaecbd73cb58ee8851e993e8e751f75f10adad6db97bf305d4f47afc016bb4b30f8d9 SHA512 ed9a5449f5efc28cdc6a615c889e2a312841db90524d3e12899c10824896f82535cc5c302b26525ed523f7e90cdf133edda0e3ee77f32563f3bfaad7b997301a
diff --git a/app-admin/lib_users/lib_users-0.15-r1.ebuild b/app-admin/lib_users/lib_users-0.15-r1.ebuild
index 45ccbc10dde4..5faf526074f6 100644
--- a/app-admin/lib_users/lib_users-0.15-r1.ebuild
+++ b/app-admin/lib_users/lib_users-0.15-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index 0912f7538f13..f47689d71f3c 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,5 +1,5 @@
 DIST perl-cleaner-2.31.tar.bz2 6914 BLAKE2B 4b13ae42ab06ad75b6dbcb1306f3f4f476315db4504d0ffbc4c56d4d66a2da3a751d3682305daca6bcbae1861d182f16296c92f9a8d25687e35ab03a6f8734e3 SHA512 c4df0437604d41dbfdce0b72d72f975d464cf0c44f417c708917f01829e498ef8d6b47a78cee517836cac9344791ad49db98f29da5f78599e80b000e41b8127e
-EBUILD perl-cleaner-2.31-r1.ebuild 968 BLAKE2B 59c871e2d79ce6710bab27efa4e43b1152adeeb834dbe3e2d3bdc969c1efdae77ff6a10176040656d88d3dceb27a86ac47d0ed889c0cc9a6bcc477fd9d95a99b SHA512 01afd1fa686f8653d93e9229a48a1c4a3837474bb6f8b9bb7bf44e83c9180bd6704716089d14a2e5e372c7607306ef3c645bc2ecd26ca58089062e2976c56b54
+EBUILD perl-cleaner-2.31-r2.ebuild 959 BLAKE2B 40a0b8f9f315297f580a2aec4e6fab710e91aaddcc7894126c1516d51e94f80d04689b0f2a3ce4f7e3f7f36edd3a1c4db6b978914da278b5311cc0a16ed2f4b1 SHA512 981ab6a8e8cb552068b8de0b450076728d4c75ecfba1800df7b4e30da0fd93662696a694f0f7aae06ded89d9037b8d4d58e3bb530d9bb2634521ae1a4b16a16c
 EBUILD perl-cleaner-2.31.ebuild 951 BLAKE2B 235d22ddb436f0d079d4ceb40fcad0b326dfcd7c5030c81d819629bf2b95d34ba96a6ab9e5a0f6ae2fcf0471ab2c6fec7d7cfa2b261ac9809ada56d5a077a460 SHA512 1691c7ecf66ae9ab11f38b351c014e03d236734a8977a199277d2f5e7b4ba6645b55e065c4ccd143904ebc5b7ae177584a4c099b82c5be197b7dd0139a0a6802
-EBUILD perl-cleaner-9999.ebuild 983 BLAKE2B bd1a2053dea4ca15e0126f60c4f84d4d7cc3be947f3575db7cbf81744088754b5b9a0c43882fd82d3a9122c58eeabfca48750134c14e2796b9c7096abac3bf93 SHA512 e0166b41c6b84dea6751b8374f29851bb45647d21d44086af061c8057063c700235ad3047cdfead865d2120e8c8f9149f6fbdb7437af4ac4078ddde57c0909b6
+EBUILD perl-cleaner-9999.ebuild 959 BLAKE2B 40a0b8f9f315297f580a2aec4e6fab710e91aaddcc7894126c1516d51e94f80d04689b0f2a3ce4f7e3f7f36edd3a1c4db6b978914da278b5311cc0a16ed2f4b1 SHA512 981ab6a8e8cb552068b8de0b450076728d4c75ecfba1800df7b4e30da0fd93662696a694f0f7aae06ded89d9037b8d4d58e3bb530d9bb2634521ae1a4b16a16c
 MISC metadata.xml 509 BLAKE2B 4d80cf3b299ea530173c8295cdd5039e1663772f09ea1d718448843968029e58791565d7e2265e5f653b8260364a92921edab6293ed4b3c914c30aafc6ad8b41 SHA512 98eaef261e37fd9727a5a8ebba9418c2fa77e4f2deec9bee6a405a742ad32e68eb3d7d5e03c4e95a55d025eb72701f1257b539cc61069c410a48516e77e09dfd
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.31-r1.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild
index 4446279177ae..c8d659c9e0b4 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.31-r1.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild
@@ -24,13 +24,13 @@ IUSE="pkgcore"
 
 RDEPEND="
 	app-shells/bash
+	dev-lang/perl
 	pkgcore? ( sys-apps/pkgcore )
 	!pkgcore? (
 		app-portage/portage-utils
 		sys-apps/portage
 	)
 "
-PDEPEND="dev-lang/perl"
 
 src_prepare() {
 	default
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index 26e8acae9d9d..c8d659c9e0b4 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -31,7 +31,6 @@ RDEPEND="
 		sys-apps/portage
 	)
 "
-PDEPEND="dev-lang/perl"
 
 src_prepare() {
 	default
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 48f72600bf5a..47d49cc47434 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -3,6 +3,6 @@ AUX init.d-r2 553 BLAKE2B 270ff81ca5bac99f22b49bf47ec64d73b4328804ea264e99301de3
 AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288d9364f02331da5e693bce3862869248f7c0b81285576ca633e679a26acf75f03b2e620e16eea963909 SHA512 1ce55ef1f9a4cd7592645007af5e0f18147e8dca1c324ac2e48bf58aa2191ec657cfa68d7e6bdc9ba8e0747b32f4e6a44009e8c55a7bd77b265ac8593f51eeb7
 AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
 DIST supervisor-4.2.5.tar.gz 466073 BLAKE2B 54b45c824a1ad2960b04ca4ca9e54337f8c4da1a13008b559103f9efb9043588e72b3ee97c41218eb9252606d717575ad2615d12136047734f83d843d0a63bfa SHA512 ea80c8c91356646deccf20735e065fd9b341f3be6d56838d333989297a912b0a59142338925b2eb08690e038f0617814e03447673701a19093aa483432ce6d41
-EBUILD supervisor-4.2.5-r1.ebuild 1492 BLAKE2B 87ce2c3cef419460f593f467f6f45576449777c3f7308ddc1c1710a098a8921c0ac18e5daebfa725bd4fb3e18fa6ac60be15a55d789dea9893bc4f88980851a1 SHA512 c09acaafd2cc9305b97bf25e736ed51d808cc1e62763f9e150ca68e4df92e495cb1c93a5151afaa36a4a06e544f05ecd134ffa877a74011ab673e835644ac07c
+EBUILD supervisor-4.2.5-r1.ebuild 1490 BLAKE2B af01c4394f31e53dd4f420c6cdf2c936274bbfa97b2b32722a19cfcff2a93ce8ed557a1f0b72dbfaba018342ade93d2167668d694fee53ed17b8a8db338360e4 SHA512 4dbc478d630210a2c9f2b8bfa0b81eb4d6b126f87490808c1ae2536e800185976cc15595c2cd90c22c18734a4ebe47b1a746d74b63b425039f20ff4eaea49104
 EBUILD supervisor-4.2.5.ebuild 1381 BLAKE2B a5f68817963dfca8b1db5680c2067afd6ab9ed1df2d7ac4fbe28edc365576d1978be108f76710d44a891d0e5f783e6c88c61f40b6dd263b171298288970d4879 SHA512 df46678f2e38677111a0a407a2c7f95379487235f885b2692652aae7e8b4497d16eaf88d279cb6b6e3fc6f97c5d975a331b989dc07fb404799a92c5ace8c91a8
 MISC metadata.xml 624 BLAKE2B 6cb179a9284e7898dcfc4423e12e04d7bd4e805930f8f4e79e3528153180146aeb606040d087e3c5d127e6d7e3b42cbbd6f4b7c1bb2ad7fa414bf90a40a76502 SHA512 dfe5b6abb493cb69a2a2b2d93fbf9c66b4f21ca5d83d76a2da5066f3625a945c1834e876ce8b8b4368cec3e34a81003f7be47898b5e2bdbe796714ea8291f63a
diff --git a/app-admin/supervisor/supervisor-4.2.5-r1.ebuild b/app-admin/supervisor/supervisor-4.2.5-r1.ebuild
index 0ec69aee0dc9..065fd0635e6a 100644
--- a/app-admin/supervisor/supervisor-4.2.5-r1.ebuild
+++ b/app-admin/supervisor/supervisor-4.2.5-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
 
 LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 # setuptools is required because the package uses pkg_resources
 RDEPEND="