Sync with portage [Wed Nov 15 22:06:55 MSK 2023].

5 months ago · c5cd4e9ab9
parent f917504f3d
commit c5cd4e9ab9
26991 changed files with 63891 additions and 75755 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/systemd-hostname/Manifest
+++ b/acct-group/systemd-hostname/Manifest
--- a/acct-group/systemd-hostname/metadata.xml
+++ b/acct-group/systemd-hostname/metadata.xml
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>systemd@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
--- a/acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild
+++ b/acct-group/systemd-hostname/systemd-hostname-0-r2.ebuild
@ -1,8 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=505
--- a/acct-group/tpm/Manifest
+++ b/acct-group/tpm/Manifest
--- a/acct-group/tpm/metadata.xml
+++ b/acct-group/tpm/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
--- a/acct-group/tpm/tpm-0-r1.ebuild
+++ b/acct-group/tpm/tpm-0-r1.ebuild
@ -1,8 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-ACCT_GROUP_ID=347
--- a/acct-group/ultimaker/Manifest
+++ b/acct-group/ultimaker/Manifest
--- a/acct-group/ultimaker/metadata.xml
+++ b/acct-group/ultimaker/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Gentoo 3D Printer Project</name>
-	</maintainer>
-</pkgmetadata>
--- a/acct-group/ultimaker/ultimaker-0-r2.ebuild
+++ b/acct-group/ultimaker/ultimaker-0-r2.ebuild
@ -1,9 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for ultimaker"
-ACCT_GROUP_ID=369
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/tpm/Manifest
+++ b/acct-user/tpm/Manifest
--- a/acct-user/tpm/metadata.xml
+++ b/acct-user/tpm/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
--- a/acct-user/tpm/tpm-0-r1.ebuild
+++ b/acct-user/tpm/tpm-0-r1.ebuild
@ -1,12 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=347
-ACCT_USER_GROUPS=( "${PN}" )
-ACCT_USER_HOME=/var/lib/${PN}
-
-acct-user_add_deps
--- a/acct-user/ultimaker/Manifest
+++ b/acct-user/ultimaker/Manifest
--- a/acct-user/ultimaker/metadata.xml
+++ b/acct-user/ultimaker/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Gentoo 3D Printer Project</name>
-	</maintainer>
-</pkgmetadata>
--- a/acct-user/ultimaker/ultimaker-0-r2.ebuild
+++ b/acct-user/ultimaker/ultimaker-0-r2.ebuild
@ -1,12 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for ultimaker"
-ACCT_USER_ID=369
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@ -1,6 +1,4 @@
-DIST ansible-core-2.14.10.tar.gz 3141532 BLAKE2B e96e2dd82aacb7752afb51704f3316deb3006f6da328e67a4c0789681b351d70e0a1f84325df89342c4cf8fccb07c5a28967506fcbb167319a6b65944eaa0008 SHA512 f455d35a348dcd770bcb65fac12727e8f76c373b9ef7bcf1f9802a50f7fd8e5ed67ba696d9f481458715efe9b7164d57b480be84e8463c20d155b67fe477b4be
 DIST ansible-core-2.14.11.tar.gz 3144040 BLAKE2B b9ae1b284219650a764af6b2a341172730cbfe3481b9ff3d1e33549ddd9b687071455a6349124019f0dd8448d5c61ada9e0011375f2ffc74ca4ae44cd1ce285b SHA512 778d7b2646d59ac45994a0d33e59d0f85ca2cbf58605d94185fc86d9bc782d642d155c056213703c95e5b144939e287176096d833b9487971efa5cc22624bd27
-DIST ansible-core-2.15.4.tar.gz 3148213 BLAKE2B f800278960982952bcda5054e48ce36d3170aa565d112633b2dde1ff0dde233876e284f55c2d89b1a19d28a48e6a05d1f12a1c0eaf4e85a525999c7fab9510cf SHA512 2db03dca53ff7ce99068afba97150f00e4b1c3a7b80e34b90f515baa3b745342d8e483849265e7fcf3dfee31de7a24352a1320c64ce719d31f43be96030b663c
 DIST ansible-core-2.15.5.tar.gz 3154868 BLAKE2B 4de5dfe792f8b33b0c64747142658215a235f0b6269b8e00742adc81f2d87db3e24fd9fc58bf58106591c8981dae356ebeb9a958ba55645eebf1815913a98120 SHA512 820c455d4e9703fc0edebdc917325b7dc5a47c29fbaaac701e3b4d975cd17ebcdffefeec178c57b15f11ccdc57cbd649cd070031fd927c1f35819d4955e19cc0
 DIST ansible-core-2.15.6.tar.gz 3154982 BLAKE2B 3c69671639d11e13aab266659fffeea2a213b8ed0e87d343926791428f4ad1c5a5e32e1d841eca2080d78af58c2a68b833cfa900b29403a6e86663fe8671154f SHA512 e1876b59c3393429d42e03bb74252e0f22f3d7cec8f80c74d2f024e1204c2bfa354c4240a283c16c63186cf8e7a705c2f99b08715ea2dcfe290884ce1f8b9114
 DIST ansible-core-2.16.0.tar.gz 3155083 BLAKE2B b488548d01bc5a1eb3826533241a35948b029cbc83c8b1d8e78d0f9e2d9c88ee16dbc6858b4e1e3c656fee760ff839d445c2ab6bfa2ae72686933f668113731a SHA512 1a94d958423f8a6b3f74f3c88157c21cced9c5332db2e3f601aa54360a0d9434082f61c2d5c3356beb19cd17b876f27d5c8f6b12e17360334a41ce25cf7fd5c0
--- a/app-admin/ansible-core/ansible-core-2.14.10.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.14.10.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	inherit pypi
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/resolvelib.patch"
-)
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-BDEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/botocore[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
--- a/app-admin/ansible-core/ansible-core-2.15.4.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.15.4.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	inherit pypi
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-BDEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/botocore[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,4 +1,3 @@
 DIST ansible-7.7.0.tar.gz 40709642 BLAKE2B ee2f8d124f79ca3a3f131bfbc4f93e10d104a38262b7d60edd2a88284275fecdd3acf0e566a5cc81a1fb6a179a0b7c51215f2945d669be4c6af7aa2a4f31ade0 SHA512 7da6845c9a68f2b8c10cf3e4cc6ea347861d5b59daa6ac895731ac79b733c6724d234345054fe9e3bf4ea460345b9026492fda42dce22bfbc027c9b4de093fd9
-DIST ansible-8.4.0.tar.gz 40641778 BLAKE2B a99e7956a058a38ce6885019edfb91830fcfbbb161cc84b68edc876f13f0916b7a8eb4105ff6d0e61f11a5c483d0898d1a100028548609811c9d11ebeaf79c27 SHA512 f364685d734df04c51d48b81ae2e587bd02438817d7b7055cec2199a585564cdfad45f40dbfd8051d5b0855f303b8504463e3d1506ed9238e24f871f424587bc
 DIST ansible-8.5.0.tar.gz 40712390 BLAKE2B 1fc1fe7334f52a8b1e630aa31c0d01a2ac2c117f7e0dc432ad37a8a170b9d8ca9635ebd9a962ee0c04fb9282ddb5526b65268b6167a2caad804953c6952b12ae SHA512 4a61696f6cfe1859a1524bd6da45083b8bdec188d1c9fae382eb218776759d34237f7be9deaaf8734e1d6829a9c9fb75f843d8316df30d255314f10beb9ce6aa
 DIST ansible-8.6.0.tar.gz 41548019 BLAKE2B 01506ff418045b138fb7b8cb7c12b30e269c1001a66d2ba3c67fd50542f3823f83f1c85d934985bbeec18ec7275bffdecba47b1a3e6cbb0f350422751eccf319 SHA512 b316f1d6e8ffd4739f142d9add50f39802d8a57bac026f8ab833fd3d07c2ccd9df1d2ba5bcf68b3486db99e12943e8787203e22b16d1ecd1c4c1655a3573cf5d
--- a/app-admin/ansible/ansible-8.4.0.ebuild
+++ b/app-admin/ansible/ansible-8.4.0.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-core-2.15.0
-	<app-admin/ansible-core-2.16"
-
-python_compile() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-python_install() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_install
-}
--- a/app-admin/apache-tools/apache-tools-2.4.58.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,9 +1,4 @@
-DIST aws-cli-1.29.68.gh.tar.gz 2565226 BLAKE2B b1f2209738c3a54beac322b14ceb54d31a4288b85038c2778d56d8dcafbabe7a307aa228c96e73faabc0ad2495edb65f701a35eddc506c70f0873f9084177c36 SHA512 d8cafa7560ab0f824b190301d9889d0cfe5d746a9a7edd3b19ad003ee70c5f6cc9a26403ec961826462f5e5509a2e12f8a6a99d851fc97b1e46f44e59294aca2
-DIST aws-cli-1.29.73.gh.tar.gz 2569425 BLAKE2B 14950fd5c67726779f621dd039bfb7d3c24ab083530b3923aec52f1433a9110455e7ef5aa529ddad3b576e30d6cdd3d40fc94a14f06638756c7347475d8b8e7e SHA512 2a85489d8052b968a083dbff7f9e31d9ffbfce60617ffdacaa65d5d7a9d4c05e70785f230e2e8b2f92c47be9a0b86147ea76a9ffa588b768818e5e64ef4aa280
-DIST aws-cli-1.29.77.gh.tar.gz 2572839 BLAKE2B c79219e4c8e711efdfeb8a2f49fe9bfe599581f769643ec7c85fa3ba81c58897bf0b88e02c46705ace0a7ef4e1a5704fe4b702426695675cb1b687c103d286af SHA512 5a88a90cc56f0324f794e8320316b415d21ce6ff12975979e94db632a92746f038387e139887e171102c8a18c4555dec339d2fd5d240b3b31f47fcff2c662f53
 DIST aws-cli-1.29.78.gh.tar.gz 2573503 BLAKE2B 6782a7774568adf5296461e19d71b9de992d9301e3d9c50b97c641448ea0fb9e161feb80cdbce50291fce7d37eaabbc92740ca6b26f432cc5b9105233c2949f8 SHA512 455e6cacb935c1075d9730dda3147dc17598ca01ff9224b9a5f0dffa003a10fb3f2f2e17db1aea9e44b353a5fdd1e3b692308b895ba79ef6433804156ba54b1d
-DIST aws-cli-1.29.79.gh.tar.gz 2574359 BLAKE2B fab1016d0b909c593d5fab7facf23e2cc744bc59c6c9ebbadd239b8920d255fe91e74080ba9a96f262b76b58325adb7a334914dd3a2c2e15842891e9630ec379 SHA512 d4f0fe2db2dcbae2664f7cd27259d83c85e92f126418c57fedf633f84ac783384592a229a9185ae75f804cdf93c3fed01c586a4243ff39ac22389ba847e1726d
-DIST aws-cli-1.29.80.gh.tar.gz 2574794 BLAKE2B 0f12c5463d54b11c5222f9ae1fa0d1327402cf4ba8241df720d6e34f4b6d7686627ab105e9d2642d9de115c47e0da6cbebe989d632607bb53528f27360d34d05 SHA512 e9d3676cb6d2e98f077f55faae9db2e67931849ca424828ef0ce36b9cfe9e0c0783100170e3104c0b9ff9336a49c4e1c45f1029059b2e7399a03de4a5630f3bb
-DIST aws-cli-1.29.82.gh.tar.gz 2575194 BLAKE2B 31961c3c6bd577871444396e36e50db5176666eefc77166f3b4cfab87386b6707f9c10553bb9fe328ce821b30268b34d3d2e5b4cbf00252390cca46c5e3029ec SHA512 e28945774e62d8df3204495c3a69ff68106d04fab2fe47bf10d0446ddbb310fa3baf079c9ab822ed49dae437429c31062976054336436a51ed3c9579d83480cf
-DIST aws-cli-1.29.83.gh.tar.gz 2575803 BLAKE2B 6f3de0dadca3fe412f792f3974429bf84e05e11cdc598b71b16381dee91401d110701a88c70d47c4333a3e07d8d2c88522000da2277743f3453edfc3cf70be04 SHA512 83a3ae460919a6b50dc7b477a1bda69cf8739975bf4772d0db80c9be3ca8a96605cc0a04290a14651adb3adf00e5befb7ad98827b98c82133bf55a5a90217c74
 DIST aws-cli-1.29.84.gh.tar.gz 2576584 BLAKE2B c442a433b0deaacb8b0a94ecb4ce296b60eb6f364bf5626d4ccf606d35b8ad22a2859c29486c9eaa8091edc9f796d271b5b7308638d10f72f128b4548f5250bf SHA512 6f46bde5016df5d227861ed80e847a893144f290dba11c57966f6ccf043690fad42dcc11d18e1b2d27225c8b070063a2c20b8a622628bde37887e44d0e0e7fb5
+DIST aws-cli-1.29.85.gh.tar.gz 2577082 BLAKE2B 8d16b3a989b6a12a154baa8b5d25be6c35c6201f6041cc9f100274815f746c55b1107274575dee928250743b72f02d3db17c8198a9fd3bff7c3bcd827def5cdb SHA512 88164eeddc9d99811d20aa7cd607720fafaa8324738db3eb0aaa76cdb2e8710b828f64c0da3fb14409130fb41880c724918617742a1a3e8d92200f9707865db8
+DIST aws-cli-1.30.0.gh.tar.gz 2584557 BLAKE2B d88e0987b019ca6a86ffb599ee894b8270dda4c4cae2a4bf0a74438d821533d5875d379132f76c70e93bc8b3136f3a8374b60d797f064921597b259589bd5bfe SHA512 5fd1ee8e4f978cfc4964799b3556eae8c0a7cec367dd4f0c096971a948d1ce7b8bc008b05e84c67723f0d603470777d075cc12a014cb2466789033de62e9078e
--- a/app-admin/awscli/awscli-1.29.68.ebuild
+++ b/app-admin/awscli/awscli-1.29.68.ebuild
@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignore
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.73.ebuild
+++ b/app-admin/awscli/awscli-1.29.73.ebuild
@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignore
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.77.ebuild
+++ b/app-admin/awscli/awscli-1.29.77.ebuild
@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.78.ebuild
+++ b/app-admin/awscli/awscli-1.29.78.ebuild
@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"

 # botocore is x.(y+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
--- a/app-admin/awscli/awscli-1.29.82.ebuild
+++ b/app-admin/awscli/awscli-1.29.82.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.83.ebuild
+++ b/app-admin/awscli/awscli-1.29.83.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.85.ebuild
+++ b/app-admin/awscli/awscli-1.29.85.ebuild
--- a/app-admin/awscli/awscli-1.29.80.ebuild
+++ b/app-admin/awscli/awscli-1.29.80.ebuild
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@ -1,3 +1,2 @@
 DIST conky-1.19.2.tar.gz 1715080 BLAKE2B 1e7ee050ab6525a1cc0dd513e25ea2e98a21fa6a70a3f3feb95cda9dc4b3bfa4625889c91093f7643746325f897e7165b199da38308699c9dadeb87cdebfc896 SHA512 a9b565ab2e6b92efe8a10db69e88fb720ba00f09e63b21a5741f95c8a05c78dd58aa23fdbf34f8f0c9137e04ce76b1fe197594ebc1b2ad99d7fd9bf8e6127ad3
-DIST conky-1.19.4.tar.gz 1724291 BLAKE2B 478c9f1c3c9ced8d1f9384a5d1d9b918245049ee9282304828c5c5e4ccbb96cd0404d6095f5d03b6d8efd06b7f6b2f34f070734877c1496efff7cd49cb06faee SHA512 3856a059d2c21da3df9cad42a4bd36cccc5ba87b2b581985c1b7d9b04b3465e99f230b5b973ab4f5b986058abf02afcc9779e1ab05696791c7952372c2e29615
 DIST conky-1.19.6.tar.gz 1727487 BLAKE2B 2ef2b0acd354559679b9d7d442de7a709e932418e27459b02bdf2f8b6dbdcf7911964932ab9851bab213e7f68d9a82034acab96892752544ab1a26d68c174c09 SHA512 9f1900f495125c668835334239b69fc098c30fe450a384786d873eb3d3e955ff0f06ca70c3a94f47a4b38a42d4510be77efd13873411f11ff84d8bfdc2869fde
--- a/app-admin/conky/conky-1.19.6-r1.ebuild
+++ b/app-admin/conky/conky-1.19.6-r1.ebuild
--- a/app-admin/conky/conky-1.19.6.ebuild
+++ b/app-admin/conky/conky-1.19.6.ebuild
@ -1,234 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-PYTHON_COMPAT=( python{3_9,3_10,3_11} )
-
-inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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 thinkpad truetype
-	wayland webserver wifi X xinerama xmms2"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	ical? ( dev-libs/libical:= )
-	iconv? ( virtual/libiconv )
-	imlib? ( media-libs/imlib2[X] )
-	irc? ( net-libs/libircclient )
-	lua-cairo? ( x11-libs/cairo[X] )
-	lua-imlib? ( media-libs/imlib2[X] )
-	lua-rsvg? ( gnome-base/librsvg )
-	mysql? ( dev-db/mysql-connector-c )
-	ncurses? ( sys-libs/ncurses:= )
-	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	pulseaudio? ( media-libs/libpulse )
-	rss? (
-		dev-libs/libxml2
-		net-misc/curl
-		dev-libs/glib:2
-	)
-	systemd? ( sys-apps/systemd )
-	truetype? (
-		x11-libs/libXft
-		>=media-libs/freetype-2
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/pango
-	)
-	wifi? ( net-wireless/wireless-tools )
-	webserver? ( net-libs/libmicrohttpd:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-		x11-libs/libXext
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xmms2? ( media-sound/xmms2 )
-	${LUA_DEPS}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	apcupsd? ( sys-power/apcupsd )
-	cmus? ( media-sound/cmus )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-	extras? (
-		app-editors/nano
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	wayland? (
-		dev-libs/wayland-protocols
-	)
-"
-BDEPEND="
-	doc? (
-		virtual/pandoc
-		$(python_gen_any_dep '
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-		')
-	)
-	extras? (
-		$(python_gen_any_dep '
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-		')
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-python_check_deps() {
-	use doc || use extras || return 0
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-REQUIRED_USE="
-	imlib? ( X )
-	lua-cairo? ( X  bundled-toluapp )
-	lua-imlib? ( X  bundled-toluapp )
-	lua-rsvg? ( X  bundled-toluapp )
-	nvidia? ( X )
-	truetype? ( X )
-	xinerama? ( X )
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md AUTHORS )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
-
-There are pretty html docs available at https://conky.cc/.
-
-Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	lua-single_pkg_setup
-	if use doc || use extras; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# pin lua 5.4
-	sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \
-		cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
-
-	cmake_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	if use X; then
-		mycmakeargs+=(
-			-DBUILD_ARGB=yes
-			-DBUILD_X11=yes
-			-DBUILD_XDAMAGE=yes
-			-DBUILD_XDBE=yes
-			-DBUILD_XSHAPE=yes
-			-DBUILD_MOUSE_EVENTS=yes
-			-DOWN_WINDOW=yes
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_X11=no
-		)
-	fi
-
-	mycmakeargs+=(
-		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_AUDACIOUS=no
-		-DBUILD_BUILTIN_CONFIG=yes
-		-DBUILD_CMUS=$(usex cmus)
-		-DBUILD_CURL=$(usex curl)
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_EXTRAS=$(usex extras)
-		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_I18N=yes
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_ICAL=$(usex ical)
-		-DBUILD_ICONV=$(usex iconv)
-		-DBUILD_IMLIB2=$(usex imlib)
-		-DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
-		-DBUILD_IOSTATS=$(usex iostats)
-		-DBUILD_IPV6=yes
-		-DBUILD_IRC=$(usex irc)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-		-DBUILD_MATH=$(usex math)
-		-DBUILD_MOC=$(usex moc)
-		-DBUILD_MPD=$(usex mpd)
-		-DBUILD_MYSQL=$(usex mysql)
-		-DBUILD_NCURSES=$(usex ncurses)
-		-DBUILD_NVIDIA=$(usex nvidia)
-		-DBUILD_OLD_CONFIG=yes
-		-DBUILD_PORT_MONITORS=$(usex portmon)
-		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_RSS=$(usex rss)
-		-DBUILD_WAYLAND=$(usex wayland)
-		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_XFT=$(usex truetype)
-		-DBUILD_XINERAMA=$(usex xinerama)
-		-DBUILD_XMMS2=$(usex xmms2)
-		-DDOC_PATH=/usr/share/doc/${PF}
-		-DMAINTAINER_MODE=no
-		-DRELEASE=yes
-	)
-
-	if use doc || use extras; then
-		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use extras; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
-
-		insinto /usr/share/nano/
-		doins "${BUILD_DIR}"/extras/nano/conky.nanorc
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	xdg_pkg_postinst
-}
--- a/app-admin/diradm/diradm-2.9.7.1.ebuild
+++ b/app-admin/diradm/diradm-2.9.7.1.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP"
-#HOMEPAGE="http://research.iat.sfu.ca/custom-software/diradm/"
-#SRC_URI="http://research.iat.sfu.ca/custom-software/diradm/${P}.tar.bz2"
-HOMEPAGE="http://orbis-terrarum.net/~robbat2/"
-SRC_URI="http://orbis-terrarum.net/~robbat2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE="automount irixpasswd samba test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( automount irixpasswd samba )"
-
-RDEPEND=">=net-nds/openldap-2.3
-	sys-apps/gawk
-	sys-apps/coreutils
-	sys-apps/grep
-	dev-lang/perl
-	app-shells/bash:*
-	sys-apps/sed
-	virtual/perl-MIME-Base64
-	samba? (
-		dev-perl/Crypt-SmbHash
-		>=net-fs/samba-3.0.6
-	)"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-perl/Crypt-SmbHash
-		>=net-fs/samba-3.0.6
-		dev-util/dejagnu
-		net-nds/openldap[-minimal]
-	)"
-
-src_configure() {
-	econf \
-		$(use_enable automount) \
-		$(use_enable irixpasswd) \
-		$(use_enable samba)
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-	dodoc CHANGES.prefork KNOWN-BUGS
-
-	if use irixpasswd; then
-		insinto /etc/openldap/schema
-		doins irixpassword.schema
-	fi
-}
-
-pkg_postinst() {
-	elog "The new diradm pulls many settings from your LDAP configuration."
-	elog "But don't forget to customize /etc/diradm.conf for other settings."
-	elog "Please see the README to instructions if you problems."
-	elog "This package is primarily intended for use with nss_ldap & pam_ldap"
-	elog "and populates many default settings from the /etc/ldap.conf used by"
-	elog "those packages, with a further fallback to /etc/openldap/ldap.conf"
-	elog "for server connection settings only."
-}
--- a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild
+++ b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild
@ -8,8 +8,8 @@ DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1

 DESCRIPTION="Make tinydns and dnscache logs human-readable"
-HOMEPAGE="http://michael.orlitzky.com/code/djbdns-logparse.xhtml"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
+HOMEPAGE="https://michael.orlitzky.com/code/djbdns-logparse.xhtml"
+SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz"
 LICENSE="AGPL-3+"
 SLOT="0"
 KEYWORDS="amd64"
--- a/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild
@ -16,7 +16,7 @@ fi

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="selinux"

 DEPEND="
--- a/app-admin/restart-services/restart-services-0.17.0.ebuild
+++ b/app-admin/restart-services/restart-services-0.17.0.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tool to manage OpenRC and systemd services that need to be restarted"
-HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
-SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-admin/lib_users
-	|| ( sys-apps/openrc sys-apps/systemd )
-	app-portage/portage-utils
-"
-
-src_install() {
-	dosbin restart-services
-	doman restart-services.1
-	keepdir /etc/restart-services.d
-	insinto /etc
-	doins restart-services.conf
-	dodoc README CHANGES
-
-	sed -i 's/^#include/include/' "${D}"/etc/restart-services.conf
-	cat>"${D}"/etc/restart-services.d/00-local.conf<<-EOF
-	# You may put your local changes here or in any other *.conf file
-	# in this directory so you can leave /etc/restart-services.conf as is.
-	# Example:
-	# *extend* SV_ALWAYS to match 'myservice'
-	# SV_ALWAYS+=( myservice )
-	EOF
-}
-
-pkg_postinst() {
-	local MAJOR MINOR
-	# migrate config data for versions < 0.13.2
-	if [[ $REPLACING_VERSIONS ]]; then
-		MAJOR=${REPLACING_VERSIONS%%.*}
-		MINOR=${REPLACING_VERSIONS%.*}
-		MINOR=${MINOR#*.}
-
-		if [[ $MAJOR -eq 0 && $MINOR -lt 14 ]]; then
-			einfo "Checking for old config"
-			if [[ -f /etc/restart_services.conf ]]; then
-				ewarn "Old config file found: /etc/restart_services.conf"
-				ewarn "It will be ignored so please migrate settings to a file in"
-				ewarn "/etc/restart-services.d/ and/or remove /etc/restart_services.conf"
-			fi
-			if [[ -d /etc/restart_services.d ]]; then
-				ewarn "Old config directory found: /etc/restart_services.d"
-				ewarn "It will be ignored so please migrate files to /etc/restart-services.d"
-				ewarn "and/or remove /etc/restart_services.d"
-			fi
-			einfo "done"
-		fi
-	fi
-}
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -4,3 +4,5 @@ DIST sudo-1.9.14p2.tar.gz 5229966 BLAKE2B a350136731c1c6eca1317a852ce243b270df61
 DIST sudo-1.9.14p2.tar.gz.sig 566 BLAKE2B f72469340cfbb5005540a7080410dcf72694966c6293274cc28a1167824ddafed8ab441478985564f674f8f0c48a7b738a36ea572e36ec7fafee91486d08b646 SHA512 5a3cd7fe28762ee435f52a03fda504ab820805e5cdc7462343291a579daad7d779f5dc3897d7dceb9bfce6468a08ee60fe1c517a7d18ba917291339031609383
 DIST sudo-1.9.14p3.tar.gz 5232320 BLAKE2B 702d0c5489658dfd35c5a57977431343d29e6c2d7bb44bb7a8fd9f7fc7b7094b3f3fe2348d1ab6b9aa037e2b5fd1019f127f45e99190bdfff077e94747dc17e1 SHA512 d4af836e3316c35d8b81a2c869ca199e8f2d5cb26dbd98b8ad031f29be62b154452afdf5a506ddabad21b80e5988a49f1f7c8f1ec44718ffcbd7e89ccbdef612
 DIST sudo-1.9.14p3.tar.gz.sig 566 BLAKE2B 61ea3ca0e6032ddabbfd7e5b56881f0e800b49eed0404738c1a28687160917a8ddde91378b915cb81c9576732629d398790eac31d300e536e117fa9bbf5b1f4a SHA512 e1723f589eb3b758bd7e7e0da158d21e9315976320f8d39159a97e801c9745768b42b7b16c697cdbb3917a3f3def0125acf868dc343b062834f9f0818d741608
+DIST sudo-1.9.15p2.tar.gz 5303642 BLAKE2B 002f820d6d82b3384a9206545a999765c2924b2650fd7f6331c191e3f631507064d71a042c606b4fcea0d518d38b5a24d3f44964bb09cb5774e50501abc3f524 SHA512 219fc138fb4850fff30c44a6dab767402172d545a83d31dba4a2a9ce27f8a9fe14f1f24f4e328517f2dd26e84906db5d2be388a9c82e89f5ca59740bb782a608
+DIST sudo-1.9.15p2.tar.gz.sig 566 BLAKE2B e526f608c11abdf2e762dd273106e5934273a42596f00afaa64826f6f56714ff8186f7e1d9233b56cae8d2aed657565f87c976437727880f674e2ef42f93560a SHA512 1b0692a19966e3a2db82d064a17312bfcab454bc9eba0e9fe7ce3dcee0507704767655c30443cb87e0b7d2015317fd38d990ccf66cd18bb47fdf6e43494d6d8e
--- a/app-admin/sudo/sudo-1.9.15_p2.ebuild
+++ b/app-admin/sudo/sudo-1.9.15_p2.ebuild
@ -0,0 +1,286 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pam libtool tmpfiles toolchain-funcs
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc
+	inherit verify-sig
+
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
+	SRC_URI="
+		https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
+		verify-sig? (
+			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
+			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
+		)
+	"
+
+	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+	sys-libs/zlib:=
+	virtual/libcrypt:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1:=
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap:=[sasl]
+		)
+	)
+	pam? ( sys-libs/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( sys-libs/libselinux )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ssl? ( dev-libs/openssl:= )
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${DEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+BDEPEND+="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	?? ( pam skey )
+	?? ( gcrypt ssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+set_secure_path() {
+	# First extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+
+	case "${SECURE_PATH}" in
+		*/usr/sbin*)
+			;;
+		*)
+			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+			;;
+	esac
+
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# Then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:${thisp}
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# Finally, strip gcc paths, bug #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do
+				[[ ${thisp} == ${e} ]] && continue 2 ;
+			done
+			newpath+=:${thisp}
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+}
+
+src_configure() {
+	local SECURE_PATH
+
+	set_secure_path
+
+	# bug #767712
+	tc-export PKG_CONFIG
+
+	# - audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# - plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	local myeconfargs=(
+		# We set all of the relevant options by ourselves (patched
+		# into the toolchain) and setting these in the build system
+		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
+		# (it'll downgrade to =2). So, this has no functional effect on
+		# the hardening for users. It's safe.
+		--disable-hardening
+
+		# requires some python eclass
+		--disable-python
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable sasl)
+		$(use_enable ssl openssl)
+		$(use_with ldap)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with pam)
+		$(use_with pam pam-login)
+		$(use_with secure-path secure-path "${SECURE_PATH}")
+		$(use_with selinux)
+		$(use_with sendmail)
+		$(use_with skey)
+		$(use_with sssd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP.md
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP.md for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins docs/schema.OpenLDAP sudo.schema
+	fi
+
+	if use pam ; then
+		pamd_mimic system-auth sudo auth account session
+		pamd_mimic system-auth sudo-i auth account session
+	fi
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	# bug #652958
+	fperms 0711 /var/db/sudo
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/run || die
+
+	# bug #697812
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	# bug #652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
--- a/app-admin/sysklogd/sysklogd-2.5.1.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.5.1.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
 else
 	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 fi

 LICENSE="BSD"
--- a/app-admin/xkcdpass/Manifest
+++ b/app-admin/xkcdpass/Manifest
@ -1 +1,2 @@
 DIST xkcdpass-1.19.4.tar.gz 2572291 BLAKE2B f36299ab66bc02f95a7811ebdf40fa62f441a0ef1eac27af8d380fca9643eb9c2444c988392900e5add8a2a22f4ef33766bc5904fb350520b0b7572e95898ecd SHA512 2a83473f6e2426f34ee89297056ca7d3949044f7e818f6d6501fd7852ac1ba9f860f8287ad6d366f13f46f580b0f3f7e9a3dfa160b262b4d00b00ed1c9f5da59
+DIST xkcdpass-1.19.5.tar.gz 2572430 BLAKE2B e955780492d2771558bc1f0716913f4e84a408d98049b2f5f23d53a56e6d660bc1afb2539b3f422bdc98df05ae065c51f0303ddaf2e268994420a22580aba2a2 SHA512 8a560247cb860377ef723b26610a6f784a891b4c8dfb2c5b55187df70e326d6ff2f1d31128dfc4e7136cbc15108c470658d896056177900e0eb419d14458348f
--- a/app-admin/xkcdpass/xkcdpass-1.19.5.ebuild
+++ b/app-admin/xkcdpass/xkcdpass-1.19.5.ebuild
@ -0,0 +1,42 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Password generator inspired by XKCD 936"
+HOMEPAGE="https://github.com/redacted/XKCD-password-generator"
+
+LICENSE="BSD CC-BY-3.0
+	l10n_de? ( GPL-3 )
+	l10n_it? ( CC-BY-SA-3.0 )
+	l10n_no? ( CC-BY-4.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
+
+distutils_enable_tests pytest
+REQUIRED_USE="test? ( l10n_en )"
+
+PATCHES=( "${FILESDIR}"/xkcdpass-1.19.4-no-examples-in-site-packages.patch )
+
+src_prepare() {
+	default
+
+	use l10n_de || rm ${PN}/static/{ger-anlx,eff_large_de_sample.wordlist}
+	use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy}
+	use l10n_es || rm ${PN}/static/spa-mich
+	use l10n_fi || rm ${PN}/static/fin-kotus
+	use l10n_fr || rm ${PN}/static/fr-*
+	use l10n_it || rm ${PN}/static/ita-wiki
+	use l10n_no || rm ${PN}/static/nor-nb
+	use l10n_pt || rm ${PN}/static/pt-*
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman ${PN}.1
+}
--- a/app-alternatives/Manifest.gz
+++ b/app-alternatives/Manifest.gz
--- a/app-alternatives/gzip/gzip-1.ebuild
+++ b/app-alternatives/gzip/gzip-1.ebuild
@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives

 DESCRIPTION="gzip symlinks"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"

 RDEPEND="
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@ -1,2 +1 @@
-DIST advancecomp-2.5.tar.gz 1315529 BLAKE2B 6d5844e64595f611ecf5a1ae69fa0208d324745fde91e63e2d934ca7c7ea6ce67da88063563ccfb67d8762eccff0723bc8f0e47b9322691a67bc7cc80a2039b0 SHA512 3beb26e9afdafb62ab13c3c56902b71b5dabccfa458c9930bdfd0a835149c46bed22bfac7b529c341f241bb8f7670c4cda4c50fd34df31b9a3902f8b8b655049
 DIST advancecomp-2.6.tar.gz 1343700 BLAKE2B 8666565721090217c396cb992b62c3f7c4c06932705db1f71acaa8283fd2795206808811ecd293344293e01a15da58675e8f397f1114c5ad5cc3186627286979 SHA512 10cc2a72b0cf486868b52cdb78a8dc2c965bfa9f43f712fdf97af58e4b0eac62460a635fe58435e2efbc605ed281b8bf0dc560b08bbbe66ee5a8673ec40ea0a6
--- a/app-arch/advancecomp/advancecomp-2.5.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.5.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
-HOMEPAGE="
-	https://www.advancemame.it/comp-readme.html
-	https://github.com/amadvance/advancecomp/
-"
-SRC_URI="
-	https://github.com/amadvance/advancecomp/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	app-arch/bzip2:=
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-"
-
-# Tests seem to rely on exact output:
-# https://sourceforge.net/p/advancemame/bugs/270/
-RESTRICT="test"
-
-src_configure() {
-	local myconf=(
-		--enable-bzip2
-		# (--disable-* arguments are mishandled)
-		# --disable-debug
-		# --disable-valgrind
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dodoc HISTORY
-}
--- a/app-arch/advancecomp/advancecomp-2.6.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.6.ebuild
@ -14,7 +14,7 @@ SRC_URI="

 LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 # Tests seem to rely on exact output:
 # https://sourceforge.net/p/advancemame/bugs/270/
 RESTRICT="test"
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@ -1,3 +1,3 @@
-DIST patool-1.12.tar.gz 69146 BLAKE2B e97f64b4ba41860c1f7e506f63f249adeb02974b71bf83eb1673ae1fd93b8f9b698818cb57f961b3d3a5d4e445c5e7a3a349db54e1eb11a8fc165ad07722ace9 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc
 DIST patool-1.12_p20230424.gh.tar.gz 1990425 BLAKE2B dd0ae58fd26ef1849c26cb681839536b0499d666faf48cb7028adc12840055d72e70a85db99c615c79b076671f16e1371ee5ddbb24228248cd3c1b0daf2dc496 SHA512 c2974bad22ab57aca3aab32e51aeac0c2a2aa3ffee41241d3220151206b8a5d709ec72ea1b4a73a218c03b9fad64297ecd2ab44cc20da5f4d0e4a3ecd5589d43
 DIST patool-1.14.1.tar.gz 1992559 BLAKE2B 3468c6b7779806ecb906830043964f2fa88384569af4cad857d8519568a7670a403ce17ca5b495fae6ad129f109bfac38693bfe651bad54dc5e6a46b5b58ea4f SHA512 df5ce0f5275fcc0b653775b9fbc36e11dfff1fcf30e5caf78bbebbf2c169125c7d27e71481c7ba108d39fb12cebdf3d84ab8c40f1a5f061dea5e5304e2306481
+DIST patool-1.15.0.tar.gz 1993753 BLAKE2B 18dbbb6d73862778af9774b64f192e20d48f1454c078a2ab0bf9ccf12f3de988b7799c5e6116b1f49fe48b2512968789d363e37aa504d622a72c22a620398f5f SHA512 c7cbcd829a803025a99df67c8d4aca1d803d3bd8e06f2897c65bc0e2475fbd42e273654f978090fe4c2bbcac02e5d1f8e322cb90220e746ac9ef9d0755e0c717
--- a/app-arch/patool/patool-1.12.ebuild
+++ b/app-arch/patool/patool-1.12.ebuild
@ -1,15 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Portable archive file manager"
-HOMEPAGE="http://wummel.github.io/patool/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
--- a/app-arch/patool/patool-1.12_p20230424.ebuild
+++ b/app-arch/patool/patool-1.12_p20230424.ebuild
@ -119,6 +119,8 @@ python_test() {
 	if use x86; then
 		EPYTEST_IGNORE+=(
 			"tests/archives/test_clzip.py"
+			# bug #916317
+			"tests/archives/test_lrzip.py"
 		)
 	fi

--- a/app-arch/patool/patool-1.14.1.ebuild
+++ b/app-arch/patool/patool-1.14.1.ebuild
@ -112,6 +112,8 @@ python_test() {
 	if use x86; then
 		EPYTEST_IGNORE+=(
 			"tests/archives/test_clzip.py"
+			# bug #916317
+			"tests/archives/test_lrzip.py"
 		)
 	fi

--- a/app-arch/patool/patool-1.15.0.ebuild
+++ b/app-arch/patool/patool-1.15.0.ebuild
@ -0,0 +1,129 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Portable archive file manager"
+HOMEPAGE="https://wummel.github.io/patool/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-arch/arj
+		app-arch/bzip2
+		app-arch/bzip3
+		app-arch/cabextract
+		app-arch/cpio
+		app-arch/dpkg
+		app-arch/gzip
+		app-arch/lbzip2
+		app-arch/lcab
+		app-arch/lha
+		app-arch/libarchive
+		app-arch/lz4
+		app-arch/lzip
+		app-arch/lzop
+		app-arch/ncompress
+		app-arch/p7zip[rar]
+		app-arch/pbzip2
+		app-arch/pdlzip
+		app-arch/pigz
+		app-arch/plzip
+		app-arch/rpm
+		app-arch/rzip
+		app-arch/sharutils
+		app-arch/tar
+		app-arch/unace
+		app-arch/unadf
+		app-arch/unzip
+		app-arch/xdms
+		app-arch/xz-utils
+		app-arch/zip
+		app-arch/zpaq
+		app-arch/zstd
+		app-cdr/cdrtools
+		dev-libs/chmlib
+		media-libs/flac
+		media-sound/shorten
+		sys-apps/diffutils
+		sys-apps/file
+		sys-apps/grep
+		!elibc_musl? ( app-arch/rar )
+		!x86? (
+			app-arch/clzip
+			app-arch/lrzip
+			app-arch/unar
+		)
+	)
+"
+# Test dependencies which are packaged but can't be tested for various reasons.
+# app-arch/arc
+# app-arch/zoo
+# app-arch/zopfli
+# media-sound/mac
+
+# app-arch/rar is masked on musl
+# app-arch/clzip is unkeyworded on x86
+# app-arch/lrzip bug #916317 on x86
+# app-arch/unar is unkeyworded on x86
+
+# Unpackaged testable dependencies
+# archmage
+# genisoimage
+# lhasa
+# nomarch
+# pdzip2
+# py_{bz2,echo,gzip,tarfile,zipfile}
+# rpm2cpio
+# rzip
+# star
+# unalz
+# uncompress.real
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	newdoc doc/README.txt README.md
+	doman doc/patool.1
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# zoo emits a non-zero exit status on a possibly false consistency check
+		# Zoo:  WARNING:  Archive header failed consistency check.
+		"tests/archives/test_zoo.py"
+		# Doesn't accept long arguments, such as those that files in ${S} would have.
+		# Too long argument: /var/tmp/portage/app-arch/patool-1.12_p20230424/work/patool-ab64562c8cdac34dfd69fcb6e30c8c0014282d11/tests/data/p.arc.foo
+		"tests/archives/test_arc.py"
+		# Error: 1002 (invalid input file)
+		"tests/archives/test_mac.py"
+		# AttributeError: module 'patoolib.programs.zopfli' has no attribute 'extract_gzip'
+		"tests/archives/test_zopfli.py"
+	)
+
+	if use elibc_musl; then
+		EPYTEST_IGNORE+=(
+			"tests/archives/test_rar.py"
+		)
+	fi
+
+	if use x86; then
+		EPYTEST_IGNORE+=(
+			"tests/archives/test_clzip.py"
+			# bug #916317
+			"tests/archives/test_lrzip.py::TestLrzip::test_lrzip"
+		)
+	fi
+
+	epytest
+}
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@ -1,6 +1,3 @@
-DIST rarlinux-x32-623.tar.gz 627653 BLAKE2B fc7475374adaf4e53367c70f4b95aaa4e05e6b78aeece97f79f266bc73ed7fc00ad05eb0b4d91bc62b8b5373ff6c17a91536f5b6a670942e4a514e5a483e1ded SHA512 95d7319be5cbe8544a93cabfa457ac723b204c3a0799a2fa6408a21bdd75ad3b49e2c030242b6c0473c05c4079eba113158b525400e3612bda56d8fbc4af6c3a
 DIST rarlinux-x32-624.tar.gz 627966 BLAKE2B 8069b5a33bbc229c1f64564bc483e98da8996388890defe03cd430571a269ec9a0d935bdb9ca24d97a5ca2d2eff078c50f2ed158a5d48a263312063ff56b073d SHA512 967ca151e2927f427738c49eedd0bd4a0c1e56bd43d417bfbfb1e940d553c30a4860b279b90a47151838312f8e788f0fee13c424ee3b31ab2574a077de957234
-DIST rarlinux-x64-623.tar.gz 614350 BLAKE2B a9ce80c6ab920e1c74d9b5fa4af2a2e0e46b638a4aced4cb6e88068518c1c3d702f20b44d9ce7c7c5601096254f01d6992c2d4a97a16554f8cfc67ca3600ce2f SHA512 0aa3e9c6b08e12343b1637929a3ce807196205ecfc5f6c98c464f8d8f40c544ec594a3be514a02d0e3a86c0a5d5e68208c993ab9d94d847249547fbb713fcfe2
 DIST rarlinux-x64-624.tar.gz 614146 BLAKE2B 4cad338a68234a8223b63427fbb2d735b65012d79466c0ef799b5764e2df8e575c3e42dcaa37c8a3e5e51474633452dc4e832b05a7c13164e1778d4f741edc49 SHA512 04b935d918d7636bf7cececee2c306f6c586ac363932a30529dcf0e5e199823ca976269acf26456f9a91830dfe909d67ff0a13e55a68096e59875e46e0e0b0de
-DIST winrar-x64-623.exe 3595296 BLAKE2B 8ff54390827070ecd1f42f53d5010e150bd4ccf38dd9bb85a9ee0e3fffa3c489e72e79be0bdecb90d995f19f924bee643f3c1c433d4d932a9c90589f29491887 SHA512 5ba4cb71d9579b01e54835f9559ab39fddbff5f3bc262e0c9f67ea450d490122326d46ae8f8a55b503f96ba1e5963f31ca3ff477ff485bab0fc3e5eac793d8dd
 DIST winrar-x64-624.exe 3589048 BLAKE2B 5afb3069bea3e73f6f8aca103a99fb83d09fc0bf692757e5213515423918a7219a86dc0a5936131a180a0e324b04c9685cb47a493cb69f61f7673d4f45bcac26 SHA512 f5f61a3cf4440d9fa59e7093341a293c0b42081b547992284e54cef61eee1f817fdbbbcc2cb921b077f8bce5b9280072c0f3b5a1bff266ef23c3d9a792d24b9f
--- a/app-arch/rar/rar-6.23.ebuild
+++ b/app-arch/rar/rar-6.23.ebuild
@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV/./}"
-URI_AMD64="https://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
-URI_X86="https://www.rarlab.com/rar/rarlinux-x32-${MY_PV}.tar.gz"
-URI_WIN64="https://www.rarlab.com/rar/winrar-x64-${MY_PV}.exe"
-
-inherit unpacker
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://www.rarlab.com/"
-SRC_URI="
-	all-sfx? (
-		${URI_AMD64}
-		${URI_X86}
-		${URI_WIN64}
-	)
-	amd64? ( ${URI_AMD64} )
-	x86? ( ${URI_X86} )
-"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD BSD-2 RAR"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="all-sfx"
-RESTRICT="bindist mirror"
-
-RDEPEND="sys-libs/glibc"
-BDEPEND="all-sfx? ( app-arch/unrar )"
-
-DOCS=( "acknow.txt" "rar.txt" "readme.txt" "whatsnew.txt" )
-
-QA_PREBUILT="
-	opt/rar/default.sfx
-	opt/rar/default-elf32.sfx
-	opt/rar/default-elf64.sfx
-	opt/rar/default-win32.sfx
-	opt/rar/default-win64.sfx
-	opt/rar/unrar
-	opt/rar/rar
-	opt/rar/WinCon.SFX
-	opt/rar/WinCon64.SFX
-	opt/rar/Zip.SFX
-	opt/rar/Zip64.SFX
-"
-
-src_unpack() {
-	local _file
-
-	for _file in ${A}; do
-		if [[ "${_file}" == rarli* ]]; then
-			if [[ "${_file}" =~ x64 ]]; then
-				if ! use amd64; then
-					continue
-				fi
-
-				unpack "${_file}"
-			elif [[ ! "${_file}" =~ x64 ]]; then
-				if ! use x86; then
-					continue
-				fi
-
-				unpack "${_file}"
-			else
-				die "Unknown SRC file '${_file}'!"
-			fi
-		fi
-	done
-
-	if use all-sfx ; then
-		mkdir sfx
-		cd sfx
-		for _file in ${A}; do
-			if [[ "${_file}" == rarli* ]]; then
-				unpack "${_file}"
-				if [[ "${_file}" =~ x64 ]]; then
-					mv rar/default.sfx default-elf64.sfx || die
-				else
-					mv rar/default.sfx default-elf32.sfx || die
-				fi
-			elif [[ "${_file}" == winrar* ]]; then
-				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				unpack_rar ./w64.rar
-				mv Default.SFX default-win32.sfx || die
-				mv Default64.SFX default-win64.sfx || die
-			else
-				die "Unknown SFX file '${_file}'!"
-			fi
-		done
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar
-
-	insinto /opt/rar
-	doins rarfiles.lst
-
-	if use all-sfx; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
-	else
-		doins default.sfx
-	fi
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar
-	dosym ../rar/unrar /opt/bin/unrar
-
-	docinto html
-	dodoc order.htm
-
-	einstalldocs
-}
--- a/app-arch/rar/rar-6.24.ebuild
+++ b/app-arch/rar/rar-6.24.ebuild
@ -25,7 +25,7 @@ S="${WORKDIR}/${PN}"

 LICENSE="BSD BSD-2 RAR"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="all-sfx"
 RESTRICT="bindist mirror"

--- a/app-arch/xz-utils/xz-utils-5.4.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
@ -35,7 +35,7 @@ else
 	"

 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi

 	S="${WORKDIR}/${MY_P}"
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/bacula/bacula-11.0.6-r6.ebuild
+++ b/app-backup/bacula/bacula-11.0.6-r6.ebuild
@ -0,0 +1,431 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads(+)] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			dev-libs/openssl:0=[static-libs]
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-util/patchelf
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
+	eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# same for tray-monitor (bug #915605)
+	sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \
+		src/qt-console/tray-monitor/tray-monitor.pro.in || die
+	mkdir src/qt-console/tray-monitor/.libs || die
+	touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
+	chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
+
+	eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die
+
+	# Don't let program install man pages directly
+	sed -i -e 's/ manpages//' Makefile.in || die
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# remove not needed .la files #840957
+	find "${ED}" -name '*.la' -delete || die
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[18]
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+		rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	fi
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependency for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+
+	einfo
+	einfo "If you adapt the port numbers for baculas components in the config files"
+	einfo "make sure to adapt the file names for the pidfile accordingly"
+	einfo "(see init.d scripts)."
+}
--- a/app-backup/bacula/bacula-13.0.3-r2.ebuild
+++ b/app-backup/bacula/bacula-13.0.3-r2.ebuild
@ -0,0 +1,444 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline selinux +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads(+)] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			dev-libs/openssl:0=[static-libs]
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-util/patchelf
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	selinux? ( sec-policy/selinux-bacula )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+# suppress warning wrt 'implicit function declaration' in config logs
+# bug 900663
+QA_CONFIG_IMPL_DECL_SKIP=(
+	makedev		# designed to check availability in
+				# used header file
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
+	eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
+
+	# correct library search path for slibtool usage (bug #914389)
+	eapply -p0 "${FILESDIR}/fix_slibtool.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# same for tray-monitor (bug #915605)
+	sed -i -e 's#bins.files = bac#bins.files = .libs/bac#g' \
+		src/qt-console/tray-monitor/tray-monitor.pro.in || die
+	mkdir src/qt-console/tray-monitor/.libs || die
+	touch src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
+	chmod 755 src/qt-console/tray-monitor/.libs/bacula-tray-monitor || die
+
+	eapply -p0 "${FILESDIR}/fix_tray_monitor.patch" || die
+
+	# Don't let program install man pages directly
+	sed -i -e 's/ manpages//' Makefile.in || die
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile ||die
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/docker/Makefile ||die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+	keepdir /var/lib/bacula/tmp
+
+	# remove not needed .la files #840957
+	find "${ED}" -name '*.la' -delete || die
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[18]
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+		rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	fi
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependency for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+
+	einfo
+	einfo "If you adapt the port numbers for baculas components in the config files"
+	einfo "make sure to adapt the file names for the pidfile accordingly"
+	einfo "(see init.d scripts)."
+}
--- a/app-backup/bacula/files/fix_slibtool.patch
+++ b/app-backup/bacula/files/fix_slibtool.patch
@ -0,0 +1,67 @@
+# slibtool creates library in .libs directory but need -L. to find them
+# Bug #914389
+--- src/stored/Makefile.in.orig	2023-11-15 14:20:23.135630968 +0100
+++ src/stored/Makefile.in	2023-11-15 14:22:35.771246680 +0100
+@@ -267,7 +267,7 @@
+ 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ 
+ btape: Makefile  $(TAPEOBJS) libbacsd.la drivers ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(TAPEOBJS) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(TAPEOBJS) \
+ 	  $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ 
+@@ -277,7 +277,7 @@
+            -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ 
+ cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  $(BLSOBJS)  libbacsd.la drivers
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
+            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bcloud.o: bcloud.c
+@@ -286,7 +286,7 @@
+            -I$(basedir) $(DINCLUDE) $(S3_INC) $(CFLAGS) $<
+ 
+ bcloud: Makefile bcloud.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  $(BLSOBJS)  libbacsd.la drivers
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
+            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(S3_LIBS)
+ 
+ bls.o:	bls.c
+@@ -296,7 +296,7 @@
+ 
+ bls:	Makefile $(BLSOBJS) libbacsd.la drivers  ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	@echo "Compiling $<"
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
+ 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bextract.o: bextract.c
+@@ -306,7 +306,7 @@
+ 
+ bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	@echo "Compiling $<"
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
+ 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bscan.o: bscan.c
+@@ -316,7 +316,7 @@
+ 
+ bscan:	Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
+ 	../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
+ 	   $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bcopy.o: bcopy.c
+@@ -325,7 +325,7 @@
+ 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ 
+ bcopy:	Makefile $(COPYOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(COPYOBJS) \
+ 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ cloud_parts_test: Makefile cloud_parts.c
--- a/app-backup/bacula/files/fix_tray_monitor.patch
+++ b/app-backup/bacula/files/fix_tray_monitor.patch
@ -0,0 +1,15 @@
+# original code calls 'qmake' and 'make clean' for tray-monitor configuration twice
+# resuting in a Makefile without install rule for binary
+# 
+# see bug #915605
+--- configure.orig	2023-11-14 12:01:38.738557240 +0000
+++ configure	2023-11-14 12:02:13.845743964 +0000
+@@ -35067,8 +35067,6 @@
+    rm -rf moc32 obj32 moc64 obj64 ui32 ui64
+    $QMAKE
+    ${MAKE:-make} clean
+-   $QMAKE
+-   ${MAKE:-make} clean
+    cd ${BUILD_DIR}
+ fi
+ 
--- a/app-backup/rdup/rdup-1.1.15.ebuild
+++ b/app-backup/rdup/rdup-1.1.15.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Generate a file list suitable for full or incremental backups"
-HOMEPAGE="https://github.com/miekg/rdup/releases"
-SRC_URI="https://github.com/miekg/rdup/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/libarchive
-	dev-libs/glib:2
-	dev-libs/libpcre
-	dev-libs/nettle"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-
-src_prepare() {
-	default_src_prepare
-	sed -i -e 's/ -Werror//' GNUmakefile.in || die "Failed to fix Makefile"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_test() {
-	if use debug; then
-		ewarn "Test phase skipped, as it is known to fail with USE=\"debug\"."
-	else
-		default_src_test
-	fi
-}
--- a/app-backup/sarab/sarab-1.0.0-r1.ebuild
+++ b/app-backup/sarab/sarab-1.0.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sarab/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 RDEPEND="
 	app-backup/dar
--- a/app-backup/simplebackup/simplebackup-1.8.1-r1.ebuild
+++ b/app-backup/simplebackup/simplebackup-1.8.1-r1.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Cross-platform backup program"
-HOMEPAGE="https://migas-sbackup.sourceforge.net/"
-SRC_URI="mirror://sourceforge/migas-sbackup/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sasl"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	sasl? ( dev-perl/Authen-SASL )"
-
-S="${WORKDIR}/${P}/unix"
-
-src_compile() {
-	return;
-}
-
-src_install() {
-	newbin simplebackup.pl simplebackup
-	dodoc ../unix_readme.txt
-}
--- a/app-backup/spideroak-bin/spideroak-bin-7.5.0-r2.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-7.5.0-r2.ebuild
@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit desktop unpacker
-
-DESCRIPTION="Secure free online backup, storage, and sharing system"
-HOMEPAGE="https://spideroak.com"
-
-SRC_URI_BASE="https://spideroak.com/release/spideroak"
-SRC_URI="x86? ( ${SRC_URI_BASE}/deb_x86 -> ${P}_x86.deb )
-	amd64? ( ${SRC_URI_BASE}/deb_x64 -> ${P}_amd64.deb )"
-
-RESTRICT="mirror strip"
-
-LICENSE="spideroak"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus X"
-
-DEPEND="dev-util/patchelf"
-RDEPEND="
-	app-crypt/mit-krb5[keyutils]
-	media-libs/libpng-compat:1.2
-	dbus? ( sys-apps/dbus )
-	X? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		dev-libs/glib:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	# Set RPATH for preserve-libs handling (bug #400979).
-	cd "${S}/opt/SpiderOakONE/lib" || die
-	local x
-	for x in $(find) ; do
-		# Use \x7fELF header to separate ELF executables and libraries
-		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
-		patchelf --set-rpath '$ORIGIN' "${x}" || \
-			die "patchelf failed on ${x}"
-	done
-
-	# Remove the libraries that break compatibility in modern systems
-	# SpiderOak will use the system libs instead
-	rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6" || die
-	rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1" || die
-	rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0" || die
-	rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1" || die
-
-	eapply_user
-}
-
-src_install() {
-	# Install the wrapper script
-	exeinto /usr/bin
-	doexe usr/bin/SpiderOakONE
-
-	# inotify_dir_watcher needs to be marked executable, bug #453266
-	#chmod a+rx opt/SpiderOakONE/lib/inotify_dir_watcher
-
-	# Install the executable
-	exeinto /opt/SpiderOakONE/lib
-	doexe opt/SpiderOakONE/lib/SpiderOakONE
-	doexe opt/SpiderOakONE/lib/inotify_dir_watcher
-	rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher} || die
-
-	# Install the prebundled libraries
-	insinto /opt/SpiderOakONE
-	doins -r opt/SpiderOakONE/lib
-
-	# Install the config files
-	if ! use dbus; then
-		rm -rf etc/dbus-1 || die
-	fi
-
-	insinto /
-	doins -r etc
-
-	# Install the manpage
-	gzip -d usr/share/man/man1/SpiderOakONE.1.gz || die
-	doman usr/share/man/man1/SpiderOakONE.1
-
-	if use X; then
-		domenu usr/share/applications/SpiderOakONE.desktop
-		doicon usr/share/pixmaps/SpiderOakONE.png
-	fi
-}
-
-pkg_postinst() {
-	if ! use X; then
-		einfo "For instructions on running SpiderOakONE without a GUI, please read the FAQ:"
-		einfo "  https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
-		einfo "  https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
-	fi
-}
--- a/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild
+++ b/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild
@ -9,8 +9,8 @@ DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1

 DESCRIPTION="Back up Untangle configurations via the web admin UI"
-HOMEPAGE="http://michael.orlitzky.com/code/untangle-https-backup.xhtml"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
+HOMEPAGE="https://michael.orlitzky.com/code/untangle-https-backup.xhtml"
+SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz"

 LICENSE="AGPL-3"
 SLOT="0"
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/filebench/filebench-1.4.9.1-r1.ebuild
+++ b/app-benchmarks/filebench/filebench-1.4.9.1-r1.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Filebench - A Model Based File System Workload Generator"
-HOMEPAGE="https://sourceforge.net/projects/filebench/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="auto-completion"
-
-RDEPEND="
-	auto-completion? ( dev-libs/libtecla )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-fix-automagic-libtecla-dependency.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with auto-completion libtecla)
-}
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@ -4,7 +4,5 @@ DIST Geekbench-3.4.4-Linux.tar.gz 9998564 BLAKE2B feb3b2c9b2c57c1a71bb5148110752
 DIST Geekbench-4.4.4-Linux.tar.gz 71089467 BLAKE2B 257f79644e20189950fb7c9121e32337526e0c9bf5b0f0f66568c107e2a15c65459eecd332bea4fcbc2d9bb1287bab0e4f37b2100f419ffa52c5396828d86c38 SHA512 c43e1d658d361347efb012824ff0b81975ace35c866a1c2a227adeb86167292b639f19e8fe190d2f0de395f19280a99cb20342325177222f634c9e71c9226e78
 DIST Geekbench-5.5.1-Linux.tar.gz 93199992 BLAKE2B e2ff24da19134778dd1b3036ac3fb8b2d99746dbe41b1959cb74522613a7b9a8a0e3796d22351af877a9ea7a734c6b101a0ffadfd3bbc2e29fb9b12e59106848 SHA512 0fd90d55eaaf178e4c981ef6ef54808d1ff86edc92c907a5d8e2a3a379c2289e614d917db330a3d748c818bcedb2dc69cad250b1b98ba80287c6d9a66382bcc4
 DIST Geekbench-5.5.1-LinuxARMPreview.tar.gz 111581640 BLAKE2B be413e306a77c0612be380d0ec0d589067365ac1c4091b55a08b722d469180c9cf9126cc0597e3f3c8a75acf77d2a0423bc43b753f30a219924b1a7df640243d SHA512 1d76b9a7928f89f1fdfa0e3cc9859c305e109cbbe72b013b4c249b03722273c985ad1e5d818341a6e399e9e7b3c61136856df87c9f5e61bcc9e7e0455f80e61b
-DIST Geekbench-6.1.0-Linux.tar.gz 227951888 BLAKE2B f741eac75043bbe9468597bd791d9a5b69fbab7c085a037b846bbaf985a30066748439fd6dbab11e86a01eab1dfe587767bfd211ea3f8a7d1b70de24d4a45656 SHA512 0d98ced1d7ad259cdd957231a6690d5eaedd345ed5550573d9503c56caef5a6724c3290207305e79dafc6660b209a4748801b52a9baf5fdeda0b81fdec80bcf6
-DIST Geekbench-6.1.0-LinuxARMPreview.tar.gz 191699484 BLAKE2B 0702d7e52a06b1e01d87aac1fba1739be0584ca7afb59f17b5eafdcc290a20ed631a15e28c027b1f5df57ce7882dea4c4cc18b02b7a0a133b00cf403bcbea18a SHA512 82047365bfce6dd45d926628435f1a8b85297aac05a358f35254a2d827981f080f1582a4e4ca6b943ac4c527164fa9b50c8f612907de66e5d5751994ee5e5ee0
 DIST Geekbench-6.2.1-Linux.tar.gz 227986935 BLAKE2B 1a7e17b91cfab4f6e6ded5d82189f135b410719fb65a64b179a5648a662401c6a81ce0f4f57eeeeb4ce86e78255da5fee556b3c7a0bc491e8415e26ad8b3c0d3 SHA512 37aa1ed8e626eacb962e748059e6c61dc0eff8c78fc4cd7c307b992ec5699814ddfab329296f1874a551d09ad0911939cf3c7b801b3de8eb0a4d598fc28e3fc7
 DIST Geekbench-6.2.1-LinuxARMPreview.tar.gz 191740987 BLAKE2B cde50e718f50974b8ed3840b57e4891132ded77b88afddc2d9199f043e5f86a380314f93ba75a7f813c654d9c010567c51aa1c43341fd9386b895c291f8ed731 SHA512 387b1207cb06bbb305fcd7e1c6bb03ed0ec0bd707284f9b71fb570e12ffe6014dd3f9afa9019046301423a022c4803ec159c8bfbe9342e1171e11b18ff33a175
--- a/app-benchmarks/geekbench/geekbench-6.1.0.ebuild
+++ b/app-benchmarks/geekbench/geekbench-6.1.0.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
-HOMEPAGE="https://www.geekbench.com/"
-SRC_URI="
-	amd64? ( https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz )
-	arm64? ( https://cdn.geekbench.com/Geekbench-${PV}-LinuxARMPreview.tar.gz )
-"
-S="${WORKDIR}"
-
-KEYWORDS="-* amd64 ~arm64"
-LICENSE="geekbench"
-SLOT="6"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="
-	opt/geekbench6/geekbench_aarch64
-	opt/geekbench6/geekbench_avx2
-	opt/geekbench6/geekbench_x86_64
-	opt/geekbench6/geekbench6
-"
-
-pkg_nofetch() {
-	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
-	local MY_S="Geekbench-${PV}-Linux$(usex arm64 'ARMPreview' '')"
-
-	exeinto /opt/geekbench6
-	use amd64 && doexe "${MY_S}"/geekbench_avx2 "${MY_S}"/geekbench_x86_64
-	use arm64 && doexe "${MY_S}"/geekbench_aarch64
-	doexe "${MY_S}"/geekbench6
-
-	insinto /opt/geekbench6
-	doins "${MY_S}"/geekbench.plar "${MY_S}"/geekbench-workload.plar
-
-	dodir /opt/bin
-	dosym ../geekbench6/geekbench6 /opt/bin/geekbench6
-}
-
-pkg_postinst() {
-	elog "If you have purchased a commercial license, you can enter"
-	elog "your email address and your license key with the following command:"
-	elog "geekbench6 -r <email address> <license key>"
-}
--- a/app-benchmarks/geekbench/geekbench-6.2.1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-6.2.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="
 "
 S="${WORKDIR}"

-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 ~arm64"
 LICENSE="geekbench"
 SLOT="6"

--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@ -1 +1 @@
-DIST stress-ng-0.17.00.tar.gz 6147684 BLAKE2B 438b282043ca43104f598b80803ebbc3ab5d7d9e230ab874e1f9360bc8bc5122f351dd3ce322b797e47b87471ad57cd13e826a24f17d42b050e3de173bb5eb10 SHA512 37669d4a00f1a02bb6cfcac6bf4dd32db74734433189ef686af9fbf861ee75dc63b94409981101c162f3b2b03802f96e4085f863a67cb62027b1eff8657aa03b
+DIST stress-ng-0.17.01.tar.gz 6168897 BLAKE2B 37fbee68094dc4d840a804bd9256bc51341c4daa199b99cd008cb0675edadb2ac2e69efb6dedb7b089af115d5299d373df8b9977361eaa547132f9192954bfb6 SHA512 1fc4ec634c000b6fa314d6b48f66ff0f26ffb2bd47894c7a88eaf51f292e8ae5534f766c307588d14dcee9fd926955b30071eebb41610c47c9a23c7e01ff6c50
--- a/app-benchmarks/stress-ng/stress-ng-0.17.01.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.17.01.ebuild
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/podman-tui/Manifest
+++ b/app-containers/podman-tui/Manifest
@ -1 +1,2 @@
 DIST podman-tui-0.11.0.tar.gz 13317542 BLAKE2B 0492799b7e61eaa75344392d824be6f41bac0b61510587cca936ec2e5f516e2513e709d739e66cd86a658fa916f61a02dbf0802a3761bab2ccb11705c3d514f3 SHA512 1b5ce216829a0f2ef345920ea908a5f721ee704bf3c7efe121e42c413edb84fb247eb32964fcd7928c734df93efd85a3c1fb5a92b0e6f3c1de3b4906fbc77fe2
+DIST podman-tui-0.12.0.tar.gz 15740756 BLAKE2B 2d38997e6ffc67d8d4f2e8c68856b4da4eb3b658ab5998da752b5d01a7d7591d3f196efba11f9d6d67bf438335729ea7bcab920eb1e2e847f6a024c3f4b3ebed SHA512 753932fef58746c80752c142aae17ef61b4632af51f8d9bd5aee29246ffc8179f98f4e38c7607a82efd25d0b809e9065a5b537b1a3a823eabae23a87b5b6dd74
--- a/app-containers/podman-tui/podman-tui-0.12.0.ebuild
+++ b/app-containers/podman-tui/podman-tui-0.12.0.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+DESCRIPTION="Terminal UI frontend for Podman"
+HOMEPAGE="https://github.com/containers/podman-tui"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/podman-tui.git"
+else
+	SRC_URI="https://github.com/containers/podman-tui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD-2 BSD MIT MPL-2.0"
+SLOT="0"
+RESTRICT="test"
+RDEPEND="
+	>=app-containers/podman-4.0.2
+"
+
+src_compile() {
+	# parse tags from Makefile & make them comma-seperated as space-seperated list is deprecated
+	local BUILDTAGS=$(grep 'BUILDTAGS :=' Makefile | awk -F\" '{ print $2; }' | sed -e 's| |,|g;')
+	ego build -tags "${BUILDTAGS}"
+}
+
+src_install() {
+	dobin "${PN}"
+	einstalldocs
+}
--- a/app-containers/podman-tui/podman-tui-9999.ebuild
+++ b/app-containers/podman-tui/podman-tui-9999.ebuild
@ -7,7 +7,7 @@ inherit go-module
 DESCRIPTION="Terminal UI frontend for Podman"
 HOMEPAGE="https://github.com/containers/podman-tui"

-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/containers/podman-tui.git"
 else
@ -15,7 +15,10 @@ else
 	KEYWORDS="~amd64"
 fi

-LICENSE="Apache-2.0 BSD-2 BSD MIT MPL-2.0"
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD-2 BSD MIT MPL-2.0"
 SLOT="0"
 RESTRICT="test"
 RDEPEND="
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@ -1,5 +1,4 @@
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-DIST certbot-2.7.0.gh.tar.gz 1336481 BLAKE2B 224f26819ee55b99a26540e7f56a8466c806d08149cce511d28d77ce9f5fb8073ec65e6cfa3e0c168ca84ddcbf85478ff335b84feaadee66db6c5a811be202be SHA512 1e1defcd143f804a36b50e3104d239bf20873545474ceb654269a5879e15cfbb76a18bd569f5e6e12de1036779e72c74d9896707daabc314fc5d67acc1c5180d
 DIST certbot-2.7.1.gh.tar.gz 1336424 BLAKE2B 46351af6c6ec918cdfdcfd44009bc878ea4599f0bafc5c61b6385bdba8ba4f47bc7ef20d11bbfb1fc5fef435336e7c7a3de1c7f302047744fb283779d0366033 SHA512 01b4ca4455408bffddb6d8c49fc97a72692995a9c7e887ef3b4b259e1ebb11f5e3651ebb9a53b0a30c81457b3c49c28b5250493070c2c3cb3caa5ed4f707d149
 DIST certbot-2.7.2.gh.tar.gz 1343827 BLAKE2B 83fade55e9ea348b5a0fb10ab425f1d23ef6f4e8d43e7c762e363230548ede061ace66cbc49212cca1262809bcf046703859b80a93d698b7ffc545ff16f56bf5 SHA512 bb82a6f6f8d4042e598f9b4b583fd3ea3128026f41acbacb9ee932b195522e565eaddf7ae8d6a661cab5e2f15a436e234f36e0388c730844bff40a3f982a45ee
 DIST certbot-2.7.3.gh.tar.gz 1344285 BLAKE2B b32a57c5a13cb1dac474f291eba17c51abe11455455d9831d88c77e0559e9c76b78da2e4dc14165dc892c61b901713687e72657504947ca810c9c139038fe4f0 SHA512 6251f7c3062fcac5b13df94d70c5bcf72e541da4f1dd73a3cc3198fbab050cc3e584fc8ccae9819435896c1d2d2df372ce7465ef571592896afcfee473148f0c
--- a/app-crypt/acme/acme-2.7.0.ebuild
+++ b/app-crypt/acme/acme-2.7.0.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-PARENT_PN="certbot"
-PARENT_P="${PARENT_PN}-${PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${PARENT_P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}/${PARENT_P}/${PN}"
-
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-# The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
-# to avoid broken 23.1.0.
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-23.1.1[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
--- a/app-crypt/acme/acme-2.7.1.ebuild
+++ b/app-crypt/acme/acme-2.7.1.ebuild
@ -22,7 +22,7 @@ else
 		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
 			-> ${PARENT_P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi

 DESCRIPTION="An implementation of the ACME protocol"
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@ -1,5 +1,4 @@
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-DIST certbot-2.7.0.gh.tar.gz 1336481 BLAKE2B 224f26819ee55b99a26540e7f56a8466c806d08149cce511d28d77ce9f5fb8073ec65e6cfa3e0c168ca84ddcbf85478ff335b84feaadee66db6c5a811be202be SHA512 1e1defcd143f804a36b50e3104d239bf20873545474ceb654269a5879e15cfbb76a18bd569f5e6e12de1036779e72c74d9896707daabc314fc5d67acc1c5180d
 DIST certbot-2.7.1.gh.tar.gz 1336424 BLAKE2B 46351af6c6ec918cdfdcfd44009bc878ea4599f0bafc5c61b6385bdba8ba4f47bc7ef20d11bbfb1fc5fef435336e7c7a3de1c7f302047744fb283779d0366033 SHA512 01b4ca4455408bffddb6d8c49fc97a72692995a9c7e887ef3b4b259e1ebb11f5e3651ebb9a53b0a30c81457b3c49c28b5250493070c2c3cb3caa5ed4f707d149
 DIST certbot-2.7.2.gh.tar.gz 1343827 BLAKE2B 83fade55e9ea348b5a0fb10ab425f1d23ef6f4e8d43e7c762e363230548ede061ace66cbc49212cca1262809bcf046703859b80a93d698b7ffc545ff16f56bf5 SHA512 bb82a6f6f8d4042e598f9b4b583fd3ea3128026f41acbacb9ee932b195522e565eaddf7ae8d6a661cab5e2f15a436e234f36e0388c730844bff40a3f982a45ee
 DIST certbot-2.7.3.gh.tar.gz 1344285 BLAKE2B b32a57c5a13cb1dac474f291eba17c51abe11455455d9831d88c77e0559e9c76b78da2e4dc14165dc892c61b901713687e72657504947ca810c9c139038fe4f0 SHA512 6251f7c3062fcac5b13df94d70c5bcf72e541da4f1dd73a3cc3198fbab050cc3e584fc8ccae9819435896c1d2d2df372ce7465ef571592896afcfee473148f0c
--- a/app-crypt/certbot-apache/certbot-apache-2.7.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-2.7.0.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-PARENT_PN="${PN%-apache}"
-PARENT_P="${PARENT_PN}-${PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${PARENT_P}.gh.tar.gz
-	"
-	# Only for amd64, arm64 and x86 because of dev-python/python-augeas
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}/${PARENT_P}/${PN}"
-
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
--- a/app-crypt/certbot-apache/certbot-apache-2.7.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-2.7.1.ebuild
@ -23,7 +23,7 @@ else
 			-> ${PARENT_P}.gh.tar.gz
 	"
 	# Only for amd64, arm64 and x86 because of dev-python/python-augeas
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi

 DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)"
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@ -1,5 +1,4 @@
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-DIST certbot-2.7.0.gh.tar.gz 1336481 BLAKE2B 224f26819ee55b99a26540e7f56a8466c806d08149cce511d28d77ce9f5fb8073ec65e6cfa3e0c168ca84ddcbf85478ff335b84feaadee66db6c5a811be202be SHA512 1e1defcd143f804a36b50e3104d239bf20873545474ceb654269a5879e15cfbb76a18bd569f5e6e12de1036779e72c74d9896707daabc314fc5d67acc1c5180d
 DIST certbot-2.7.1.gh.tar.gz 1336424 BLAKE2B 46351af6c6ec918cdfdcfd44009bc878ea4599f0bafc5c61b6385bdba8ba4f47bc7ef20d11bbfb1fc5fef435336e7c7a3de1c7f302047744fb283779d0366033 SHA512 01b4ca4455408bffddb6d8c49fc97a72692995a9c7e887ef3b4b259e1ebb11f5e3651ebb9a53b0a30c81457b3c49c28b5250493070c2c3cb3caa5ed4f707d149
 DIST certbot-2.7.2.gh.tar.gz 1343827 BLAKE2B 83fade55e9ea348b5a0fb10ab425f1d23ef6f4e8d43e7c762e363230548ede061ace66cbc49212cca1262809bcf046703859b80a93d698b7ffc545ff16f56bf5 SHA512 bb82a6f6f8d4042e598f9b4b583fd3ea3128026f41acbacb9ee932b195522e565eaddf7ae8d6a661cab5e2f15a436e234f36e0388c730844bff40a3f982a45ee
 DIST certbot-2.7.3.gh.tar.gz 1344285 BLAKE2B b32a57c5a13cb1dac474f291eba17c51abe11455455d9831d88c77e0559e9c76b78da2e4dc14165dc892c61b901713687e72657504947ca810c9c139038fe4f0 SHA512 6251f7c3062fcac5b13df94d70c5bcf72e541da4f1dd73a3cc3198fbab050cc3e584fc8ccae9819435896c1d2d2df372ce7465ef571592896afcfee473148f0c
--- a/app-crypt/certbot-nginx/certbot-nginx-2.7.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-2.7.0.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-PARENT_PN="${PN%-nginx}"
-PARENT_P="${PARENT_PN}-${PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${PARENT_P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Nginx plugin for Certbot (Let’s Encrypt client)"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S="${WORKDIR}/${PARENT_P}/${PN}"
-
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-# The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
-# to avoid broken 23.1.0.
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-23.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
--- a/app-crypt/certbot-nginx/certbot-nginx-2.7.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-2.7.1.ebuild
@ -22,7 +22,7 @@ else
 		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
 			-> ${PARENT_P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi

 DESCRIPTION="Nginx plugin for Certbot (Let’s Encrypt client)"
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@ -1,5 +1,4 @@
 DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-DIST certbot-2.7.0.gh.tar.gz 1336481 BLAKE2B 224f26819ee55b99a26540e7f56a8466c806d08149cce511d28d77ce9f5fb8073ec65e6cfa3e0c168ca84ddcbf85478ff335b84feaadee66db6c5a811be202be SHA512 1e1defcd143f804a36b50e3104d239bf20873545474ceb654269a5879e15cfbb76a18bd569f5e6e12de1036779e72c74d9896707daabc314fc5d67acc1c5180d
 DIST certbot-2.7.1.gh.tar.gz 1336424 BLAKE2B 46351af6c6ec918cdfdcfd44009bc878ea4599f0bafc5c61b6385bdba8ba4f47bc7ef20d11bbfb1fc5fef435336e7c7a3de1c7f302047744fb283779d0366033 SHA512 01b4ca4455408bffddb6d8c49fc97a72692995a9c7e887ef3b4b259e1ebb11f5e3651ebb9a53b0a30c81457b3c49c28b5250493070c2c3cb3caa5ed4f707d149
 DIST certbot-2.7.2.gh.tar.gz 1343827 BLAKE2B 83fade55e9ea348b5a0fb10ab425f1d23ef6f4e8d43e7c762e363230548ede061ace66cbc49212cca1262809bcf046703859b80a93d698b7ffc545ff16f56bf5 SHA512 bb82a6f6f8d4042e598f9b4b583fd3ea3128026f41acbacb9ee932b195522e565eaddf7ae8d6a661cab5e2f15a436e234f36e0388c730844bff40a3f982a45ee
 DIST certbot-2.7.3.gh.tar.gz 1344285 BLAKE2B b32a57c5a13cb1dac474f291eba17c51abe11455455d9831d88c77e0559e9c76b78da2e4dc14165dc892c61b901713687e72657504947ca810c9c139038fe4f0 SHA512 6251f7c3062fcac5b13df94d70c5bcf72e541da4f1dd73a3cc3198fbab050cc3e584fc8ccae9819435896c1d2d2df372ce7465ef571592896afcfee473148f0c
--- a/app-crypt/certbot/certbot-2.7.0.ebuild
+++ b/app-crypt/certbot/certbot-2.7.0.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
-else
-	SRC_URI="
-		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="
-	https://github.com/certbot/certbot
-	https://letsencrypt.org/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="selinux"
-
-S="${WORKDIR}/${P}/${PN}"
-
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-# See certbot/setup.py for acme >= dep
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/ConfigArgParse-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	selinux? ( sec-policy/selinux-certbot )
-"
-
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
--- a/app-crypt/certbot/certbot-2.7.1.ebuild
+++ b/app-crypt/certbot/certbot-2.7.1.ebuild
@ -19,7 +19,7 @@ else
 		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi

 DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
--- a/app-crypt/gpgme/gpgme-1.23.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.23.1.ebuild
@ -54,6 +54,9 @@ DEPEND="
 "
 #doc? ( app-doc/doxygen[dot] )
 BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	' python3_12)
 	python? ( dev-lang/swig )
 	verify-sig? ( sec-keys/openpgp-keys-gnupg )
 "
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@ -1,2 +1,3 @@
 DIST p11-kit-0.25.0.tar.xz 958940 BLAKE2B 6ffce977f86c516a327afe50f4cc5a36e86ba7f43c6cb555db419d9e4ba7543a9f1847ba83da348cd6d7bbebe55dfa26cfe3a3aaa3e1d5420a4b8dc6cbbff088 SHA512 e6df3cb224f6ff5671bd3c0557503b5f20bbfded1b6ec340b1dafcbd1b1725ea2d41d0e920756716e0fe9cb28270d115fe77b23ec876a15007b22e3f30d015fe
 DIST p11-kit-0.25.1.tar.xz 990460 BLAKE2B 6704ef2ada20765bfbbbfc6f92ec2e934be34b482e1b6a94a7a15ab4718efcaecf943ce06b6c352b8c638fe2b1f0bc7c953c6b0dcf0590e5695c1d6724272ebb SHA512 e12e32148e0924ac7dca4c6a4399cff0934df4f002a31e7ffc5c3cfd14a4c0a47225eb84abd73b7f36c8dfcc32f92756e90699335b830414e8f5eddeaa42c532
+DIST p11-kit-0.25.3.tar.xz 991528 BLAKE2B 5c695c1ef95edf4bbbab001aa634076c433df0bc89cb8104deaec2ce00c6908640e467755b49c6900e5d7d5d81e1a3871f4978a212c6f6ae088386ac0b95289a SHA512 ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c
--- a/app-crypt/p11-kit/p11-kit-0.25.3.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.25.3.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 meson-multilib python-any-r1
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
+SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~m68k ~mips ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+libffi gtk-doc nls systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/ca-certificates
+	>=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}]
+	libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+
+	# Relies on dlopen which won't work for multilib tests (bug #913971)
+	cat <<-EOF > "${S}"/p11-kit/test-server.sh || die
+	#!/bin/sh
+	exit 77
+	EOF
+}
+
+multilib_src_configure() {
+	# Disable unsafe tests, bug#502088
+	export FAKED_MODE=1
+
+	local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
+
+	# p11-kit doesn't need this to build and castxml needs Clang. To get
+	# a deterministic non-automagic build, always disable the search for
+	# castxml.
+	cat >> ${native_file} <<-EOF || die
+	[binaries]
+	castxml='castxml-falseified'
+	EOF
+
+	local emesonargs=(
+		--native-file "${native_file}"
+		-Dbashcompdir="$(get_bashcompdir)"
+		-Dtrust_module=enabled
+		-Dtrust_paths="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+		$(meson_feature libffi)
+		$(meson_use nls)
+		$(meson_use test)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_true man)
+		$(meson_native_use_feature systemd)
+	)
+
+	meson_src_configure
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/ghostwriter/files/ghostwriter-23.0.4-stdint.patch
+++ b/app-editors/ghostwriter/files/ghostwriter-23.0.4-stdint.patch
@ -0,0 +1,27 @@
+https://github.com/KDE/ghostwriter/commit/b76b14a00069a2d544b615ad6dc8f9cbdc678982
+
+From b76b14a00069a2d544b615ad6dc8f9cbdc678982 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Wed, 26 Jul 2023 04:19:19 +0200
+Subject: [PATCH] Include <cstdint> where needed
+
+Include it where std::uint32_t is explicitly used.
+
+(cherry picked from commit 9e1a2ba2e01c7172a04e41b5d487461aa73c87d6)
+---
+ src/markdownnode.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/markdownnode.cpp b/src/markdownnode.cpp
+index dce179d4a..f7a4eab49 100644
+--- a/src/markdownnode.cpp
+++ b/src/markdownnode.cpp
+@@ -4,6 +4,8 @@
+  * SPDX-License-Identifier: GPL-3.0-or-later
+  */
+ 
+#include <cstdint>
+
+ #include "../3rdparty/cmark-gfm/src/cmark-gfm.h"
+ #include "../3rdparty/cmark-gfm/extensions/cmark-gfm-core-extensions.h"
+ 
--- a/Show More
+++ b/Show More