Sync with portage [Sun Dec 18 00:47:33 MSK 2022].

1 year ago · 823caf54dd
parent 703cdc21ad
commit 823caf54dd
3302 changed files with 20957 additions and 29309 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.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 ~sparc64-solaris ~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 ~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"

--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,13 +1,4 @@
-DIST aws-cli-1.27.11.gh.tar.gz 2303984 BLAKE2B f773a631bd2f172697a013e11765307edfac0957f7bff7d05e74c326239491c03629859b5d7b4ec85a831e28acd47cbbf4a2393c8ae512fbf393142cfb7ca13d SHA512 ad9eee70eb95d2c9c71978425e96b80a42569efca6e20c5caeb6af7b27aa893b3bfe68fed8e13b18e20626c4cd9599e8efe93dacde5bcc5c347b815376819ea5
-DIST aws-cli-1.27.16.gh.tar.gz 2309698 BLAKE2B b81d5b1dcc8219a977bfc3cfa41053c12ff8cc363bcb8e3afd9b206d69240a7b4f5ef742d2e74cf21f46bc3a36271a516bf15e1ca34272ad64b4b1dc0c67e4e2 SHA512 1570b82cb2e6cbfb14754b539840b12a606c7a81490bb45239c851757b8e3ac694b41c5842a0b0df825d355d6d6182c6fd6b3c3f26e1c7070150814959c52260
-DIST aws-cli-1.27.18.gh.tar.gz 2313270 BLAKE2B 2f5dc87a2e306d024c03b6cc175736798a28fe5b125aba7e6af9fe1297e44e37fae6990df216cf58c6cdf47ac7b5fc583bed9d5125df063f328544286f4f0f82 SHA512 6f5b0b333af0f842d940cc80f0c18c55feb06c7a4cc609c2db8332126f7e868ccff6f84bfd031bf8d590ca38be9aa258527433e6fab9d63de6a96c64ae740ca2
 DIST aws-cli-1.27.20.gh.tar.gz 2315771 BLAKE2B 6729a6709e2ae3d493700b49dbcb7020391f7ce9e2d023e942271a27502309c8f699e90063aa6a13256981123d22772653888fcaae7bebe3cde471caa21bf4a1 SHA512 b520136e0c41e1b40ce48f90024461ace2d0967f3897dcdf68c90cc89ca637e3ba1dee117d5c1f7c6cd9d0d598e819c5faf5ebbf8a35818dc5e8c85933122af6
-DIST aws-cli-1.27.21.gh.tar.gz 2316385 BLAKE2B d85449a12fc93fb30fc905df7aa8e24ca8d2cfe5fea654ecbab2c2a1382c7e9e2acbbd3ac23ecfcb55fbec67af13fe3c497d484dd96ee972ece1f25063a405b7 SHA512 ad99186ae47d6687e5bc824c9c734255b9666948b4218a69f391462259cc9ba83592bfbe83fe5f7e18248d29afb6a928b211a25f6a78b2bc988e3ff93b96d31f
-DIST aws-cli-1.27.22.gh.tar.gz 2317454 BLAKE2B b926d1e62dbea9bb2790881838dfe6e6747f0072a7035f6c1ab317911c982a34f174ecff0238c17c7227fcc4d1ee5da6d4374f1b99a560eff48f59d87157b12a SHA512 dae02f109d028d0b1be6fc8fe1c2dc977d3d5fdd3cb252a4f267ab451567f39914c4bf6ba91598d21fc408eb1cdbe300a005d87ccc1026e7cd311fd5b88643df
-DIST aws-cli-1.27.23.gh.tar.gz 2318518 BLAKE2B eb04dd0f7b1ea803246c00c4dede6662af5c62918276f41b65a63ddeddf4509ffe198309f62748da7fd41fefc4a26861275e1a03d367486ee496ed84d5367ad4 SHA512 b78c75ffff12f730863290f2cf0c568a5e4ff27a4761339ca32321cbd1693984c6b80dccf0c12e4d6f103cb64caf2ea6ad3aa780b39b092d62225850a6273d7d
-DIST aws-cli-1.27.24.gh.tar.gz 2319169 BLAKE2B 6677fc6d09298fc37d5aae5e9b4addc87ec873f765b59b55759c0e1dd0c65ab49234c8a8f8f979be4f4cd1361033e8e142568136e5024408dc5c839f34480274 SHA512 29d8956b665531ee3d5451fbb063f7393978f223e379fed0a61304cb6798241325191bd5ea9f76531c7009b8b0e32c849a0c4a445508751518ce33631ce6a9cd
-DIST aws-cli-1.27.25.gh.tar.gz 2319262 BLAKE2B 1207b7879a82c538be9d1ee3dc8a69f20c6334afdd8d35c63ca3d44f264316680aa4d7d01b19a216ca2693748977b83851a2b75f1fd55b85989f2749ab05e827 SHA512 e46f684b219d0bce61ffae0737b2c485a4fb359b7e3ad3ef6180d5378daa49bb049033073594c63f44150266041b4a78634aced1a34fc98f08f0ca8e371558e2
-DIST aws-cli-1.27.26.gh.tar.gz 2319897 BLAKE2B 65307b3c63656b751ad3d96ca6ffdb2e9778cdb11cb35c730dc22dad83ee4b0e1cb37afc4d1de7b2c1cbbabd4622610fc2385e7dbc21cfa2c9833a36d693b1ff SHA512 508f8ae1abe037786c3ee35204f4c84fb06bb7bb8471d75217bf914cf7c9aea897cbecb364554f8b39c75001769c894ede7a1b06dd761187aff468f19001708f
-DIST aws-cli-1.27.27.gh.tar.gz 2320454 BLAKE2B 5ac7c2b872d23173dd3c1d0c586389b558c43de4bd0c1e0e5e45fee574d3d952aafb5591165fdd9eb2d14435df1342b27526dbd7ec1b7d63c1291e2d4d14bf80 SHA512 f5b9cf61b5045775142ae9868b3fd3193d82b09c4b0d52f05dadd173cc8dbc97699a2df458b17a97a5bc4743e14252fd9e7b6583fc9e49d8f26b96eb2c5d5d08
 DIST aws-cli-1.27.29.gh.tar.gz 2325759 BLAKE2B 693131da782ce248a00560617d3d1cd57e1dcac20ba8a6a560b5a1c06c7f6b18576efd4e0a2151d538e28b3f59593ded609e8fea3d29bce9f91bc270f888e23a SHA512 828a3fdda0b3156c1b09ed53b5c2c6486857bdd1e4e3d5cfd77e817bc6c1e53e1ff3f7ddf83c55e8ca93b2944f37333244adffa0f3b9416b1c4197db9b364dde
-DIST aws-cli-1.27.8.gh.tar.gz 2301766 BLAKE2B 1873d92b8d2f6d3f29a65b4177927a1a14034da71dbc95ff6abf3f49df6cf3ee192412eeea15be14c8cf9fca0a5603f2c76b80b280f4feb95e661055abcd8b60 SHA512 e53828cac1b3e10e2ddd45312d71cdb748216dbc37c3e9833e7a1320b236c3bef6a13204a38b946d9182430f169fca1ddc77d3d06c1c2c6e05978dc61f675168
+DIST aws-cli-1.27.31.gh.tar.gz 2327529 BLAKE2B 5c274358df6ed3081e945f21aac184fb774cc4b5d621954f4c4b88996252c3edb0b9c76d6aaab1f5273f0c2db1d19a7d5a46f3c1915190e7d5c141e9cfcf908d SHA512 37b295265d32e8ca73f3b16c4225027df8b735c39a930ad64db9590737da0e9407560fb82514417a0f7b42692fec27c8b949f91c973e719199c9767ff613559d
+DIST aws-cli-1.27.32.gh.tar.gz 2328348 BLAKE2B 0958525a47f6dac8422dd37c9e099c2bf48d4bb5a8897673d18bb5b747dc6a0806d71cdf92899daf768ffa7cf9b7d39fe559cadad46eabc7913130d98c578d75 SHA512 db034e58761368a72e5a233e49e6c904281635fb47384f984b2ead1bd285bdb0af1a7e7b76d77ddaa6d19496ee1add756e1dbc43044aab1ba2b1f09232a112c9
--- a/app-admin/awscli/awscli-1.27.18.ebuild
+++ b/app-admin/awscli/awscli-1.27.18.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm64 ~riscv ~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.6.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=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.27.20.ebuild
+++ b/app-admin/awscli/awscli-1.27.20.ebuild
@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~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.27.21.ebuild
+++ b/app-admin/awscli/awscli-1.27.21.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm64 ~riscv ~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.6.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=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.27.22.ebuild
+++ b/app-admin/awscli/awscli-1.27.22.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm64 ~riscv ~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.6.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=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.27.23.ebuild
+++ b/app-admin/awscli/awscli-1.27.23.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm64 ~riscv ~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.6.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=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.27.24.ebuild
+++ b/app-admin/awscli/awscli-1.27.24.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm64 ~riscv ~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.6.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=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.27.25.ebuild
+++ b/app-admin/awscli/awscli-1.27.25.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm64 ~riscv ~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.6.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=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.27.26.ebuild
+++ b/app-admin/awscli/awscli-1.27.26.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm64 ~riscv ~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.6.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=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.27.27.ebuild
+++ b/app-admin/awscli/awscli-1.27.27.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm64 ~riscv ~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.6.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=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.27.29.ebuild
+++ b/app-admin/awscli/awscli-1.27.29.ebuild
@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~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.27.31.ebuild
+++ b/app-admin/awscli/awscli-1.27.31.ebuild
@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~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.27.32.ebuild
+++ b/app-admin/awscli/awscli-1.27.32.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.27.8.ebuild
+++ b/app-admin/awscli/awscli-1.27.8.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm64 ~riscv 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.6.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=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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/consul/Manifest
+++ b/app-admin/consul/Manifest
@ -1 +1,2 @@
 DIST consul-1.14.2-vendor.tar.gz 40549325 BLAKE2B af0135de2b781d69707246a8f7f48fb677d3b9cfff59ee95ae6c37cdbe634bc04c2e853ce3dd2f70bd9a7a1d72438cdcd382939a5e361e152180c7ae1905bf85 SHA512 8e4d160993272a99901b83821b2e29686a53c2700a3e9e2355080eaa15d74f0a0d8f0d8ff86f08a131549cb3e70f77f59da302bb3f6f6b7a367c2ccd6f3ccfd2
+DIST consul-1.14.3-vendor.tar.gz 40650363 BLAKE2B 1c15333d1a1053da871ccf032c8b21f6b1265a5c222395f217444de3c4472c755d205bad82d83ecdb520081830d11e4c7f113207fe83a7dac4860497518d5be8 SHA512 b1764b845bea8681d72858de4558fdfce4de1faaaf1fb5221eab12d8c9f512efbf1b8a118ea68c829660e23410381a2b71d12fc6d995a64be041d74ad616a663
--- a/app-admin/consul/consul-1.14.3.ebuild
+++ b/app-admin/consul/consul-1.14.3.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+GIT_COMMIT="bd257019c580a7f06b3ef99168698929b74f4bfc"
+
+SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+S=${WORKDIR}/${P}-vendor
+
+src_prepare() {
+	default
+	sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-12-13T17:13:55Z|' -i GNUmakefile || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
--- a/app-admin/helm/helm-3.10.1.ebuild
+++ b/app-admin/helm/helm-3.10.1.ebuild
@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"

 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv"

 RESTRICT=" test"

--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@ -1,2 +1 @@
-DIST puppet-lint-2.5.1.gem 93184 BLAKE2B ce93397fcb05655043ed41693690d909505a74a7e8029f355d76cbcdc247cb03b87f9fc870d07e88ca378b0866b4490c853950a9dc7eff871006ff526d852c70 SHA512 5ffad674280b4b67669a59c9b17b36cef8338dc4de2c9a28b2cdfcff810f733eb4ae18824b6145b75db3816ed906c12e9d4b6404ac5294c4a9a0eb27c4272820
 DIST puppet-lint-2.5.2.gem 91136 BLAKE2B cae884b3994c7862f337a214903ecd4d7bb297e9e2bb7495fb94030304f53fa7ae98080b62944d5c96f2af0d208352d00030415a89259e8e188ec53da2a2b643 SHA512 996a5fda970c318a3f58a196c7b9aba7e712aae2b24d936b917f1dd9eb6bf5d706df28f70d88e1e174e175aabb13f1d22c8c90289314d5a1dd4ff9207ebbfe03
--- a/app-admin/puppet-lint/puppet-lint-2.5.1.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.5.1.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP="puppet-lint"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="http://puppet-lint.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~x86"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1
-	dev-ruby/rspec-json_expectations )"
--- a/app-admin/r10k/r10k-3.15.0.ebuild
+++ b/app-admin/r10k/r10k-3.15.0.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"

 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
--- a/app-alternatives/Manifest.gz
+++ b/app-alternatives/Manifest.gz
--- a/app-alternatives/awk/awk-4.ebuild
+++ b/app-alternatives/awk/awk-4.ebuild
@ -0,0 +1,95 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ALTERNATIVES=(
+	gawk:sys-apps/gawk
+	busybox:sys-apps/busybox
+	mawk:sys-apps/mawk
+	nawk:sys-apps/nawk
+)
+
+inherit app-alternatives
+
+DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="split-usr"
+
+RDEPEND="
+	!app-eselect/eselect-awk
+"
+
+src_install() {
+	local alt=$(get_alternative)
+	local root_prefix=
+	use split-usr && root_prefix=../../bin/
+
+	# We could consider setting AWK=... like we do for yacc & lex,
+	# but it would need some testing with a fair amount of packages first,
+	# as autoconf prefers gawk.
+	case ${alt} in
+		busybox)
+			dosym "${root_prefix}busybox" /usr/bin/awk
+			;;
+		*)
+			dosym "${alt}" /usr/bin/awk
+			;;
+	esac
+
+	newman - awk.1 <<<".so ${alt}.1"
+
+	if use split-usr; then
+		dosym ../usr/bin/awk /bin/awk
+	fi
+}
+
+pkg_preinst() {
+	HAD_MAWK=0
+
+	has_version "app-alternatives/awk[mawk]" && HAD_MAWK=1
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 4; then
+			SHOW_MAWK_WARNING=1
+		fi
+
+		# if we are upgrading from a new enough version, leftover manpage
+		# symlink cleanup was done already
+		if ver_test "${v}" -ge 3; then
+			return
+		fi
+	done
+
+	# otherwise, remove leftover files/symlinks created by eselect-awk (sic!)
+	shopt -s nullglob
+	local files=( "${EROOT}"/usr/share/man/man1/awk.1* )
+	shopt -u nullglob
+
+	if [[ ${files[@]} ]]; then
+		einfo "Cleaning up leftover manpage symlinks from eselect-awk ..."
+		rm -v "${files[@]}" || die
+	fi
+}
+
+pkg_postinst() {
+	# Show the warning on new installs if using mawk, or older installs
+	# if upgrading from < app-alternatives/awk-4[mawk].
+	if [[ -z ${REPLACING_VERSIONS} || ${SHOW_MAWK_WARNING} -eq 1 || ${HAD_MAWK} -eq 0 ]] && use mawk; then
+		ewarn "mawk (incompletely) implements  awk, as it was defined by the now-obsolete"
+		ewarn "POSIX 1003.2 (draft 11.3) specification. It does not fully implement the standard"
+		ewarn "extended regular expression syntax and there are other known issues pertaining to POSIX conformance."
+	fi
+}
+
+pkg_postrm() {
+	# make sure we don't leave the user without the symlinks, since
+	# they've not been owned by any other package
+	if [[ ! -h ${EROOT}/usr/bin/awk ]]; then
+		ln -s gawk "${EROOT}/usr/bin/awk" || die
+	fi
+	if [[ ! -h ${EROOT}/bin/awk ]]; then
+		ln -s ../usr/bin/awk "${EROOT}/bin/awk" || die
+	fi
+}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/engrampa/engrampa-1.26.0.ebuild
+++ b/app-arch/engrampa/engrampa-1.26.0.ebuild
@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/mate-desktop/${PN}/archive/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi

 inherit mate optfeature
--- a/app-arch/file-roller/file-roller-43.0.ebuild
+++ b/app-arch/file-roller/file-roller-43.0.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"

 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk-doc +introspection nautilus"
 REQUIRED_USE="gtk-doc? ( introspection )"

--- a/app-arch/lxqt-archiver/lxqt-archiver-0.7.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.7.0.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 ~loong ~riscv x86"
 fi

 LICENSE="GPL-2 GPL-2+"
--- a/app-arch/pdlzip/Manifest
+++ b/app-arch/pdlzip/Manifest
@ -1,3 +1,2 @@
-DIST pdlzip-1.11.tar.gz 73641 BLAKE2B 32b59f7ce1eb70916cba96444234fa95c4c798b00f32f54c0ec51e6c6558c7b01ee118f82c011a6d642a58b11b5f270bffe21df8d9b62478b809a84abe51164a SHA512 8fc3639ab1367026d9b5185d2f9db321b1eccfb2f2f3eebc22a41b10b2a824e598dd81d9d701923a7f55943501189b11f4ec00b0187dbadd56b06e329b750075
 DIST pdlzip-1.12.tar.gz 74125 BLAKE2B 41ae5878d75c0bcfad5b71194b58950d91281a5a20e67b9081b9ef6f852bf9467bd512c72a1af873b15bf84360273091d05ab6283ba0f3a725bd5fc17746f821 SHA512 0472c725db187c984f8874d039c53bd961a8d510ee03ea0b6b9e19ee2d8e7addadd06fc7715a58adfe8335c90ea697640c751cdfaf0007e40c94408a0bf8ed72
 DIST pdlzip-1.12.tar.gz.sig 72 BLAKE2B c7f95cc45493402e862068e78921729c39436729599fe41dabcedabbf7ebade0ac140b73e208cc3d4f776622668c339f23b06b8b55547c0b9c55ccaff154842d SHA512 45ebc9438705a242fb1948e74b5e27f1ef336b67549a8e279c015c1e01107fd565e68c11426467f60a17e0ee65362a59e765ec118a80b875865fd429bbd80b80
--- a/app-arch/pdlzip/pdlzip-1.11.ebuild
+++ b/app-arch/pdlzip/pdlzip-1.11.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Public-domain version of lzip compressor"
-HOMEPAGE="https://www.nongnu.org/lzip/pdlzip.html"
-SRC_URI="https://download.savannah.gnu.org/releases/lzip/pdlzip/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE=""
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}"/usr
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}"
-		CPPFLAGS="${CPPFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-	)
-
-	# not autotools-based
-	./configure "${myconf[@]}" || die
-}
--- a/app-arch/plzip/Manifest
+++ b/app-arch/plzip/Manifest
@ -1,3 +1,2 @@
 DIST plzip-1.10.tar.gz 94541 BLAKE2B deb49345ba3d6b120086aa8646f5684a32e6b64453f2ffc6321011dfd0741ddacca919bb11cba9435a26ea6aa63f453e7c5ff9a7dc7dc38c8ed0c6841237aeef SHA512 7fd7ec288800950deaec9337b3112db72cde059721a0143a091650fc20ba2a3d9d7eebbd7a312e5bbb1a61ca6c902d2450e6c3c7172dccf9c0c8b86db7c2a944
 DIST plzip-1.10.tar.gz.sig 72 BLAKE2B d3d40c1f3618750b375f862ece19badbbe762ea3b704ed346b8779d86b0fd1a881f48910222664a121360c2e7da42b31ab950ecfb01724ab91a60bac2694d705 SHA512 c4be15ee893cce47150f4da5bdb84d6e20ed9c84367508911de2673614e0df182a9e82d1e0be8967ec1e180f1e9be38be976b099fb5428c4df1567cb9bf54ecc
-DIST plzip-1.9.tar.gz 93312 BLAKE2B a5b9a81cfffa17eca9a4cf4d6b037ad943235022142bd053ec8bcfc4dd99b2b730d69332fa54187ba7704266666efde52d23e13f91c290b9cddb96a87023173e SHA512 3bca603ba6337462bde3967e7c7a7e66287f3a71adf8db987429fcdcb06ebbb90b52e666a7f98ac699bc158cbda21a9cce02490131d33fc44171b84ebb3a4a19
--- a/app-arch/plzip/plzip-1.9.ebuild
+++ b/app-arch/plzip/plzip-1.9.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Parallel lzip compressor"
-HOMEPAGE="https://www.nongnu.org/lzip/plzip.html"
-SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/lzlib:0="
-DEPEND=${RDEPEND}
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}"/usr
-		CXX="$(tc-getCXX)"
-		CPPFLAGS="${CPPFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-	)
-
-	# not autotools-based
-	./configure "${myconf[@]}" || die
-}
--- a/app-arch/pxz/Manifest
+++ b/app-arch/pxz/Manifest
@ -1,2 +1 @@
-DIST pxz-5.0_pre20151029.tar.gz 12271 BLAKE2B 6ba2cb7629b0475761b59620375a2d0de7c6a3a61f7af20140e214383f737e046c45f0c602830c0331794fe1d38332d8d309ed0b8451e3a780ef1a2835de85e6 SHA512 d26bfdf9b70baf91c575e21824920cb42d0a9bd171254b99147a6e5e322ed3d1f7351a570358213431bdacdcbe6e7b22646a2dd2d7a127e167c8237bc4f3038a
 DIST pxz-5.0_pre20220509.tar.gz 12375 BLAKE2B 5d954d4cd1b139dc94a9ecc5aa99c19a1484812eb62fce089b8f33bfc0ce3ed3ad8053cdc58843c429a365439cd13b3a4b14ebc34de7f2a99deae7cd995cd4e6 SHA512 b1de877d2b8ee9ea5190af4c1a0dc97f7777c35a084137db6d86e23de99b332ea361a82ed995ac2ea12b7bf0670ae92a822235be3b19a1145b6cf5604074f960
--- a/app-arch/pxz/pxz-5.0_pre20151029-r1.ebuild
+++ b/app-arch/pxz/pxz-5.0_pre20151029-r1.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Parallel implementation of the XZ compression utility"
-HOMEPAGE="http://jnovy.fedorapeople.org/pxz/"
-SRC_URI="https://github.com/jnovy/pxz/archive/fcfea93957d96b7661d1439cf4b767ecfd341eed.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux"
-
-# needs the library from xz-utils
-RDEPEND="app-arch/xz-utils"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	if use elibc_musl ; then
-		sed -i -e '/<error.h>/c\#define error(R,E,S,...) fprintf(stderr, S "\\n", ##__VA_ARGS__); exit(R)' pxz.c || die
-	fi
-}
-
-src_configure() {
-	tc-export CC
-	export BINDIR="${EPREFIX}"/usr/bin
-	export MANDIR="${EPREFIX}"/usr/share/man
-}
--- a/app-arch/pxz/pxz-9999.ebuild
+++ b/app-arch/pxz/pxz-9999.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/jnovy/pxz.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_}
-	case ${MY_PV} in
-	*beta?*) MY_PV="${MY_PV/beta/beta.}git" ;;
-	esac
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://jnovy.fedorapeople.org/pxz/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/${MY_P/beta*/beta}
-fi
-
-DESCRIPTION="parallel LZMA compressor (no parallel decompression!)"
-HOMEPAGE="https://jnovy.fedorapeople.org/pxz/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# needs the library from xz-utils
-DEPEND="app-arch/xz-utils"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	if use elibc_musl ; then
-		sed -i -e '/<error.h>/c\#define error(R,E,S,...) fprintf(stderr, S "\\n", ##__VA_ARGS__); exit(R)' pxz.c || die
-	fi
-}
-
-src_configure() {
-	tc-export CC
-	export BINDIR="${EPREFIX}"/usr/bin
-	export MANDIR="${EPREFIX}"/usr/share/man
-}
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@ -1,3 +1,4 @@
 DIST unrar-6.1.7.tar.gz 236798 BLAKE2B e33a7500b4a03a54f84b018ab90934366f52ef54c83257ed7fe4419ba993d2a8c21de26f445ae18d870aa5232cfbf1f5d8fbc0b3965803aeec6cac5e5a38e949 SHA512 b1a95358ff66b0e049597bbc4e1786d0bc909a8aff4aca94ee793d0d5a3c8b052eb347d88f44b6bc2e6231e777f1b711c198711118ae9ffbe8db2f72e7fbe846
 DIST unrar-6.2.1.tar.gz 242918 BLAKE2B 55cd5d11caae2e6cef2a36f5656b76d96946d6d7df3f34d7c65cc31b43b820d955da4751666797f8147c6a7b20c3429527b2b1629842334d3bec6de49e1d6a72 SHA512 920819b4b3e76004492813b4c22309443976fe5e7c873032bc084603b902c6873775cb90cb173d78de3624a3161a2238c9ece1e817f6b7d915937e2e18d8def9
 DIST unrar-6.2.2.tar.gz 243051 BLAKE2B 3f76476d8cfd2fb56c6d98c8a5698c7dbdba518566384051f5b645fc5e0661ec662aeee713641cf180819984c6e1d3a44f16d8afa0c99d95ae8007916feb82ea SHA512 8edc659599f9e7a325e7db0ffdf57775295880c4368c4b37881390e0633b1f41d66799263e7cb85cc658e395b6eb0ff9e495aa0fd870b971422c4369a2e6c1b5
+DIST unrar-6.2.3.tar.gz 245210 BLAKE2B 85dc22e52404a57286a19c901543aaeffd4526a2f7653f35b4d60c8c7c0965401f9b9658f79b1a06fc56365268a7c4895a560f04cff5d926fbc20ffa4f3d8f10 SHA512 070d027134210db930500f612bae41390af53d810160f8e5368640b6afee1a26650fc3473f8b563248b47ecc082dfd30b6fca318de6539c7795ac93af39f3357
--- a/app-arch/unrar/unrar-6.2.3.ebuild
+++ b/app-arch/unrar/unrar-6.2.3.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
+
+LICENSE="unRAR"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.3-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@ -1,8 +1,4 @@
 DIST xz-5.2.10.tar.gz 2123206 BLAKE2B fdd9e77e21ee65482401e0e43e0b291093a227d452991a9182562989b7a4388ceed30d5d54cd7f86320dcc073eb792032a49741880338a29043a8380507c4215 SHA512 c3814680fcad421efa71cf977217a62c34e3223900302a6fd7d505f310a7b338815feee2c8225b1232bd22b9e29c7dda3664e54dae2d80f816daec6adf560ca1
 DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733 SHA512 48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403
-DIST xz-5.2.8.tar.gz 2118089 BLAKE2B 28d4ede071ebd04fe6ce6b9ba88245aca432c7b3077a4857a14310001cbd1230026888d1813b5c163b86de3ec78c92418d9cb35f867f1a8ea65e5de593091676 SHA512 aaba9e4dfabc1ccb66b92f5930ca07219089c7c02396be80bd727073f90c824d2698f7aaaf156b881fdc6750da993e8a6289929d71225df8327bc3beed5cdee1
-DIST xz-5.2.8.tar.gz.sig 566 BLAKE2B c3f20d6fabd42839c0265b9c5a308b43392705f4923f83e9aba808d5d2b03814b1af566c1ff078dc0a69143420a47e5ee0a0f8dcc6773595d1ee2a8e3922a88a SHA512 253c0877357cd7305f4c852cc2b946b196a4007b48b58824446729f8f2390f6465d6d2bb9087d1147a40a707940142a5eb7ada91f0323b95482b92eff05904f2
-DIST xz-5.2.9.tar.gz 2122988 BLAKE2B 20e8552302ef73469edaf7dbdc8ca1df8df9ddd5e4b7399509f3f9204f7d19559db7b9a5da2185cb1b379b4d22a4773b68b81a0a2acc71230cf056a9b017ef92 SHA512 4e13c76d7d24deeb5def85f74f08f6ee7fea1873f61bfaa6b2e8771f5a1eb42587c9fca45b3a9cbbffe0d9550f6a7be4971fcb9096f03998f642daf14d33b0ec
-DIST xz-5.2.9.tar.gz.sig 566 BLAKE2B 0f5807e2c963aaba2a65495cbe49c80047f022c0ac0f2d1b001e1c4d434605499148e01855e586595d4b0db99cd9c81f72bef8dadf5c9a61ba4f6f5d7da85d9d SHA512 871f71cf4e3ed77249fb8279301a77bd2ca174647cc4d0fe034bda349d5c52438f1aafe04294a1c260ad93d9ecda16ee8aece1655de79a898536b2a6e2a65ba8
 DIST xz-5.4.0.tar.gz 2332619 BLAKE2B 7bcf2e48470b885ae48b1fd0d46ab504961e7c5b1358d8c57a6fe1ba32311f5ca837740cff7ba77767f0a25ef80ec68c3d43029f87af035131526cb71f961d0f SHA512 29b2cd25bb5b234b329ffe9547692d2c29be393db9d8d4ce70a66dfdaebd54433e79a89d80c57e58cd4559c3c68b9845507d5fedf3eec1c528a81e3d9ddbd811
 DIST xz-5.4.0.tar.gz.sig 566 BLAKE2B 6f8a6c81c0d91cea08b218e8f8ed74cea3b471a0adb0b5aac114f85d103977052b735ce5582e4fe5354dde17a7072d776f2fd64844531c3f67e60c770ccdc10e SHA512 9bebc2ad25ff63036e6cb07e9ea6767441138fd91ef59e6f068c370296a594135479477a18f086dbf06b7dda5188fa0da09c24a6b7b3e7222e4bca70104d20d2
--- a/app-arch/xz-utils/xz-utils-5.2.8.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.8.ebuild
@ -1,118 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI=7
-
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
-	inherit git-r3 autotools
-
-	# bug #272880 and bug #286068
-	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
-	inherit verify-sig
-
-	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="
-		mirror://sourceforge/lzmautils/${MY_P}.tar.gz
-		https://tukaani.org/xz/${MY_P}.tar.gz
-		verify-sig? (
-			https://tukaani.org/xz/${MY_P}.tar.gz.sig
-		)
-	"
-
-	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="+extra-filters nls static-libs"
-
-if [[ ${PV} != 9999 ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
-fi
-
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		# Allow building shared libs on Solaris/x64
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-threads
-		$(use_enable nls)
-		$(use_enable static-libs static)
-	)
-
-	if ! multilib_is_native_abi ; then
-		myconf+=(
-			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
-		)
-	fi
-
-	if ! use extra-filters ; then
-		myconf+=(
-			# LZMA1 + LZMA2 for standard .lzma & .xz files
-			--enable-encoders=lzma1,lzma2
-			--enable-decoders=lzma1,lzma2
-
-			# those are used by default, depending on preset
-			--enable-match-finders=hc3,hc4,bt4
-
-			# CRC64 is used by default, though some (old?) files use CRC32
-			--enable-checks=crc32,crc64
-		)
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
-
-		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
-		myconf+=( --disable-path-for-script )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
--- a/app-arch/xz-utils/xz-utils-5.2.9.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.9.ebuild
@ -1,118 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI=7
-
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
-	inherit git-r3 autotools
-
-	# bug #272880 and bug #286068
-	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
-	inherit verify-sig
-
-	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="
-		mirror://sourceforge/lzmautils/${MY_P}.tar.gz
-		https://tukaani.org/xz/${MY_P}.tar.gz
-		verify-sig? (
-			https://tukaani.org/xz/${MY_P}.tar.gz.sig
-		)
-	"
-
-	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	fi
-
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="+extra-filters nls static-libs"
-
-if [[ ${PV} != 9999 ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
-fi
-
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		# Allow building shared libs on Solaris/x64
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-threads
-		$(use_enable nls)
-		$(use_enable static-libs static)
-	)
-
-	if ! multilib_is_native_abi ; then
-		myconf+=(
-			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
-		)
-	fi
-
-	if ! use extra-filters ; then
-		myconf+=(
-			# LZMA1 + LZMA2 for standard .lzma & .xz files
-			--enable-encoders=lzma1,lzma2
-			--enable-decoders=lzma1,lzma2
-
-			# those are used by default, depending on preset
-			--enable-match-finders=hc3,hc4,bt4
-
-			# CRC64 is used by default, though some (old?) files use CRC32
-			--enable-checks=crc32,crc64
-		)
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
-
-		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
-		myconf+=( --disable-path-for-script )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/bareos/files/bareos-sd-21-r1.initd
+++ b/app-backup/bareos/files/bareos-sd-21-r1.initd
@ -13,4 +13,4 @@ start_pre() {
 command="/usr/sbin/bareos-sd"
 command_args="-f ${DIR_OPTIONS}"
 command_background="true"
-pidfile="/run/bareos/bareos-dir.9103.pid"
+pidfile="/run/bareos/bareos-sd.9103.pid"
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@ -1,3 +1,3 @@
-DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
+DIST docker-compose-1.29.2.gh.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
 DIST docker-compose-2.12.2-deps.tar.xz 139592724 BLAKE2B fd0e375e9cefe802d6d557763838959712f31391c2ac4e5e41d37ce2b6df209c35e86f255197ccb39ca04dc9ea9b04de29347570d0d1b0ed5a0b2d094c5e24a7 SHA512 af4e431dbb4735fa1a2aff2271e052479b4e4dac83f2d7a733aac9aab0ac33e00499d81b6c8a6a36aa330618a89c44993c5b27349752678ce1ac41921f12dfbe
 DIST docker-compose-2.12.2.tar.gz 305198 BLAKE2B a39a0c2266abc442f1c65ac00da9dd380df85d2aaa9429898461f12138fe64a7a6c74a45b3bb734419b7093ec69a44b49dfc57ff264a2d3cb576a78a0720db03 SHA512 dfb82ecc5a984d7193da164924c1e430d07b6378028dac7264b8084da2e315e5c5091803a5db79fe27ed06b002c62b295d873b9371bd19d4550a37a28f8ec952
--- a/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
@ -10,7 +10,7 @@ inherit bash-completion-r1 distutils-r1
 MY_PV=${PV/_/-}
 DESCRIPTION="Multi-container orchestration for Docker"
 HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
--- a/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild
@ -0,0 +1,72 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-5[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-5[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.29.0-setup-py.patch
+	"${FILESDIR}"/${P}-tests-unit-cli-test-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/unit/
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
--- a/app-containers/docker-compose/files/docker-compose-1.29.2-tests-unit-cli-test-py.patch
+++ b/app-containers/docker-compose/files/docker-compose-1.29.2-tests-unit-cli-test-py.patch
@ -0,0 +1,33 @@
+From 988f954a7e185c521e7c0f720684e8a53068b136 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 15 Dec 2022 18:11:03 +0100
+Subject: [PATCH] tests/unit/cli_test.py: Fix access to
+ py._path.local.LocalPath
+
+.. for test CLITestCase.test_default_project_name:
+
+> class CLITestCase(unittest.TestCase):
+>
+>     def test_default_project_name(self):
+>         test_dir = py._path.local.LocalPath('tests/fixtures/simple-composefile')
+>         [..]
+---
+ tests/unit/cli_test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
+index fa6e767..83ecef8 100644
+--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
+@@ -4,7 +4,7 @@ import tempfile
+ from io import StringIO
+ 
+ import docker
+-import py
+import py._path.local
+ import pytest
+ from docker.constants import DEFAULT_DOCKER_API_VERSION
+ 
+-- 
+2.39.0
+
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gcr/gcr-3.41.1-r1.ebuild
+++ b/app-crypt/gcr/gcr-3.41.1-r1.ebuild
@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"

-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"

 DEPEND="
 	>=dev-libs/glib-2.44.0:2
--- a/app-crypt/gcr/gcr-4.0.0.ebuild
+++ b/app-crypt/gcr/gcr-4.0.0.ebuild
@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"

-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"

 DEPEND="
 	>=dev-libs/glib-2.68.0:2
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@ -1,2 +1 @@
-DIST qca-2.3.4.tar.xz 737072 BLAKE2B 64e698135f02bf115269203d44a53d40449be1620487340551c1e45f66f042132beb2cfa2363d1249f92de3ffd670f1807219cb3ce3d6e7c05afd8c22242b703 SHA512 af27338b5c018d39c8c745b63691dec3914e29ff79347ab338f4391ee1dc9832d158b222bc9ef6c7681cf4b2893a38829a4daadf1d53622d6947de2efeb880a8
 DIST qca-2.3.5.tar.xz 741036 BLAKE2B 3948dc9b58a8ef03eec246cc14c7582d30e2513ea4b8f457a44d4a0c8f91fdb10af041f7cc342a0c8d9540a43cb47b4ca5b35641dfc3716c065fc3a1d6ff227a SHA512 656e44d4f30c3c0e1a8c04f2703484e3cff2d962b12c6ff9891b9f28127cd61ed30dcd248c059bf9066ac645bf53a9b7c14bdb413a7766c8b3f3d37426478d96
--- a/app-crypt/qca/qca-2.3.4.ebuild
+++ b/app-crypt/qca/qca-2.3.4.ebuild
@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake kde.org qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.14:5
-	botan? ( dev-libs/botan:= )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	gpg? ( app-crypt/gnupg )
-	nss? ( dev-libs/nss )
-	pkcs11? (
-		>=dev-libs/openssl-1.1
-		dev-libs/pkcs11-helper
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qtnetwork:5
-		dev-qt/qttest:5
-	)
-"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		virtual/latex-base
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
-
-qca_plugin_use() {
-	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
-		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
-		$(qca_plugin_use botan)
-		$(qca_plugin_use gcrypt)
-		$(qca_plugin_use gpg gnupg)
-		$(qca_plugin_use logger)
-		$(qca_plugin_use nss)
-		$(qca_plugin_use pkcs11)
-		$(qca_plugin_use sasl cyrus-sasl)
-		$(qca_plugin_use softstore)
-		$(qca_plugin_use ssl ossl)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		pushd "${BUILD_DIR}" >/dev/null || die
-		doxygen Doxyfile || die
-		dodoc -r apidocs/html
-		popd >/dev/null || die
-	fi
-
-	if use examples; then
-		dodoc -r "${S}"/examples
-	fi
-}
--- a/app-crypt/sbsigntools/files/sbsigntools-0.9.4-openssl3.patch
+++ b/app-crypt/sbsigntools/files/sbsigntools-0.9.4-openssl3.patch
@ -0,0 +1,35 @@
+Subject: [PATCH] Fix openssl-3.0 issue involving ASN1 xxx_it
+From: Jeremi Piotrowski <jeremi.piotrowski@microsoft.com>
+Origin: https://groups.io/g/sbsigntools/message/54
+
+Use ASN1_ITEM_rptr() instead of taking the address of IDC_PEID_it.
+
+openssl-3.0 changed the type of TYPE_it from `const ASN1_ITEM TYPE_it` to
+`const ASN1_ITEM *TYPE_it(void)`. This was previously hidden behind
+OPENSSL_EXPORT_VAR_AS_FUNCTION but in 3.0 only the function version is
+available. This change should have been transparent to the application, but
+only if the `ASN1_ITEM_rptr()` macro is used.
+
+This change passes `make check` with both openssl 1.1 and 3.0.
+
+Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
+---
+ src/idc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/idc.c b/src/idc.c
+index 6d87bd4..0a82218 100644
+--- a/src/idc.c
+++ b/src/idc.c
+@@ -189,7 +189,7 @@ int IDC_set(PKCS7 *p7, PKCS7_SIGNER_INFO *si, struct image *image)
+
+ 	idc->data->type = OBJ_nid2obj(peid_nid);
+ 	idc->data->value = ASN1_TYPE_new();
+-	type_set_sequence(image, idc->data->value, peid, &IDC_PEID_it);
+	type_set_sequence(image, idc->data->value, peid, ASN1_ITEM_rptr(IDC_PEID));
+
+         idc->digest->alg->parameter = ASN1_TYPE_new();
+         idc->digest->alg->algorithm = OBJ_nid2obj(NID_sha256);
+-- 
+2.25.1
+
--- a/app-crypt/sbsigntools/sbsigntools-0.9.4-r1.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.4-r1.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="${PN::-1}"
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot/${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${MY_PN}-0.8-ccan.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	sys-libs/binutils-libs
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.4-no-werror.patch
+	"${FILESDIR}"/${PN}-0.9.4-openssl3.patch
+)
+
+src_prepare() {
+	mv "${WORKDIR}"/lib/ccan "${S}"/lib || die "mv failed"
+	rmdir "${WORKDIR}"/lib || die "rmdir failed"
+
+	local iarch
+	case ${ARCH} in
+		amd64) iarch=x86_64 ;;
+		arm64) iarch=aarch64 ;;
+		ia64)  iarch=ia64 ;;
+		riscv) iarch=riscv64 ;;
+		x86)   iarch=ia32 ;;
+		*)     die "unsupported architecture: ${ARCH}" ;;
+	esac
+	sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure.ac || die
+	sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.am || die
+	sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
+
+	default
+	eautoreconf
+}
--- a/app-crypt/seahorse/seahorse-43.0.ebuild
+++ b/app-crypt/seahorse/seahorse-43.0.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"

 RDEPEND="
 	>=dev-libs/glib-2.66:2
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/aspell-da/Manifest
+++ b/app-dicts/aspell-da/Manifest
@ -1,2 +1 @@
-DIST aspell-da-4.1.tar.gz 4239148 BLAKE2B 21c30ec4576b73964d434217eb0212bc2e15774b42d7b4cbc9be37ae97eef42eb66821e22690b2b1d72c91d0240f2152acd1383038426ab65c030bc7f74379f1 SHA512 88a3a60db9be45f3235d75db0f946a5d7da0c2cfcf847ad2672c7b0e243454dce56f5f37d0652c6f2b9aeb08edbbefb80c4f45c909e5ba33aec2714f83fac7c3
 DIST aspell-da-4.2.tar.gz 4243070 BLAKE2B 171e28fb77712e7e3dc1d89a0fd5ce3ceb25a53755a0aa272082d1478a136680699278afa6107ecf161561a7332e93f5fb97c5fe6b44761ffcf699caf77268c4 SHA512 37c38b888e4cb50c1796f084ee1978a7f37b08ff1026c16f6ef5793298733f64863484ce98a5b550a7b7632e322be90f6eb4ac66f0bd1104485ebafe2a858221
--- a/app-dicts/aspell-da/aspell-da-4.1.ebuild
+++ b/app-dicts/aspell-da/aspell-da-4.1.ebuild
@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ASPELL_LANG="Danish"
-
-inherit aspell-dict-r1
-
-HOMEPAGE="https://github.com/mortenivar/aspell-da"
-SRC_URI="https://github.com/mortenivar/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
--- a/app-dicts/aspell-da/aspell-da-4.2.ebuild
+++ b/app-dicts/aspell-da/aspell-da-4.2.ebuild
@ -12,4 +12,4 @@ SRC_URI="https://github.com/mortenivar/${PN}/archive/refs/tags/${PV}.tar.gz -> $
 S="${WORKDIR}/${P}"

 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/cppman/Manifest
+++ b/app-doc/cppman/Manifest
@ -1 +1,2 @@
 DIST cppman-0.5.3.tar.gz 3614734 BLAKE2B 3b764be07c19ad026e20f6b0f1ac6709ef0fba6042225ce53d6aeb627bc80fba4c4775f9c4d9fa7e75f5d5fbc847dffab1eecbca9f55eab0c447b9d6b9f0f401 SHA512 4e89c8e4ec4b8fb7f577ae83ac77198fb2a56f85550b9efa2b534c1e3d25f45be7932e0cfe663d51b5ff2846668022386af0b018056bcc25c5a1b2e5d32eb111
+DIST cppman-0.5.4.tar.gz 3560915 BLAKE2B 37dae8d4f4884582fd4556bfb8778b62e332286b9438a4507dd1a401f40014964a2409a57f1b8d234bb6143555719a6b81ccdf939fcf95a46ddb0fdfd475ac32 SHA512 e401813772c393aaf0e403ee253510ad4aac9cd9733c015e195bb66dad70cb2db0ea3e3c9749d87aed04b49aee04639fa3f822dc8e69a5a8812c3992b3e5c86d
--- a/app-doc/cppman/cppman-0.5.4.ebuild
+++ b/app-doc/cppman/cppman-0.5.4.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="sqlite,threads(+)"
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="C++ man pages for Linux, with source from cplusplus.com and cppreference.com"
+HOMEPAGE="https://github.com/aitjcize/cppman"
+SRC_URI="https://github.com/aitjcize/cppman/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86 ~x64-macos"
+
+RDEPEND="
+	sys-apps/groff
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	')
+"
+
+src_prepare() {
+	default
+
+	# Don't allow setup.py to install documentation directly
+	sed -i '\:share/doc/cppman:d' setup.py || die "sed failed"
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs/emacs-18.59-r17.ebuild
+++ b/app-editors/emacs/emacs-18.59-r17.ebuild
--- a/app-editors/emacs/emacs-23.4-r23.ebuild
+++ b/app-editors/emacs/emacs-23.4-r23.ebuild
@ -35,7 +35,7 @@ RDEPEND="acct-group/mail
 		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
+		tiff? ( media-libs/tiff:= )
 		xpm? ( x11-libs/libXpm )
 		xft? (
 			media-libs/fontconfig
--- a/app-editors/emacs/emacs-24.5-r13.ebuild
+++ b/app-editors/emacs/emacs-24.5-r13.ebuild
@ -43,7 +43,7 @@ RDEPEND="acct-group/mail
 		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
+		tiff? ( media-libs/tiff:= )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
 		xft? (
--- a/app-editors/emacs/emacs-25.3-r15.ebuild
+++ b/app-editors/emacs/emacs-25.3-r15.ebuild
@ -45,7 +45,7 @@ RDEPEND="acct-group/mail
 		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
+		tiff? ( media-libs/tiff:= )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
 		xft? (
--- a/app-editors/emacs/emacs-26.3-r11.ebuild
+++ b/app-editors/emacs/emacs-26.3-r11.ebuild
@ -47,7 +47,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
+		tiff? ( media-libs/tiff:= )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
 		xft? (
--- a/app-editors/emacs/emacs-27.2-r9.ebuild
+++ b/app-editors/emacs/emacs-27.2-r9.ebuild
@ -80,7 +80,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
+		tiff? ( media-libs/tiff:= )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
 		xft? (
--- a/app-editors/emacs/emacs-28.2-r4.ebuild
+++ b/app-editors/emacs/emacs-28.2-r4.ebuild
@ -83,7 +83,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
+		tiff? ( media-libs/tiff:= )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
 		xft? (
--- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
@ -122,7 +122,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
+		tiff? ( media-libs/tiff:= )
 		webp? ( media-libs/libwebp:0= )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
 		!aqua? (
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@ -122,7 +122,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
+		tiff? ( media-libs/tiff:= )
 		webp? ( media-libs/libwebp:0= )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
 		!aqua? (
--- a/app-editors/gedit-plugins/gedit-plugins-43.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-43.1.ebuild
@ -11,7 +11,7 @@ DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ThirdPartyPlugins"

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

 IUSE="charmap git +python terminal vala"
--- a/app-editors/gedit/gedit-43.2.ebuild
+++ b/app-editors/gedit/gedit-43.2.ebuild
@ -15,7 +15,7 @@ SLOT="0"
 IUSE="+python gtk-doc"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"

 DEPEND="
 	>=dev-libs/glib-2.70:2
--- a/app-editors/gnome-latex/gnome-latex-3.42.0.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.42.0.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/swilmet/gnome-latex"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="+introspection +latexmk rubber"

 DEPEND="
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@ -1,2 +1 @@
-DIST kile-2.9.93.tar.bz2 8580239 BLAKE2B a43f160240dfdffc23c6898385994ee4e49e1f3d793915d1f392e41f606350269f2b9e80592c373680adb56454510abdd0b7e69131f20737fb5efa54d4eaa111 SHA512 d87277b8ef16c82cfd415dd191916641fa1a25e316e1eb2c463b275d3654dcfe180bea03027589ab30cd8b769d92d97005846a78aff8058bcfb20eed76287504
 DIST kile-2.9.93_p20221123-1ca67389.tar.gz 9507069 BLAKE2B 61770aeafe6604b8a45ae9e49fc79a375815fce5e11a189aef962172f60d0182984f6908a626cb95b493f1fe894958ec0816420096a12efbd03233114e0a5dcc SHA512 ed16cfb7cee3d08ad21fabecd5536981c68431261c02f66cc979f5f01229fa33c192c33f5d1ef78d61c37e643ab313eb432fd580aea61f5a918d3de76d2dcadc
--- a/app-editors/kile/files/kile-2.9.93-cmake.patch
+++ b/app-editors/kile/files/kile-2.9.93-cmake.patch
@ -1,20 +0,0 @@
-I know upstream wants to help us but it doesn't work...
-
--- a/CMakeLists.txt	2019-10-19 14:23:41.000000000 +0200
-+++ b/CMakeLists.txt	2019-10-20 15:50:52.606325681 +0200
-@@ -116,15 +116,6 @@
- 		kile2.0-5_upd.pl
- 	DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update)
- 
-install(FILES
-		AUTHORS
-		ChangeLog
-		README
-		README.cwl
-		kile-remote-control.txt
-		README.MacOSX
-	DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
-
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
- find_package(KF5I18n CONFIG REQUIRED)
- ki18n_install(po)
--- a/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch
+++ b/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch
@ -1,35 +0,0 @@
-From 483743aa9f194376a8b496ac4e58a946070a36af Mon Sep 17 00:00:00 2001
-From: Michel Ludwig <michel.ludwig@kdemail.net>
-Date: Sun, 1 Dec 2019 09:09:55 +0100
-Subject: [PATCH] Don't crash when deleting templates
-
-BUG: 413506
---
- src/dialogs/managetemplatesdialog.cpp | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/src/dialogs/managetemplatesdialog.cpp b/src/dialogs/managetemplatesdialog.cpp
-index fe6537ad..c5298b21 100644
--- a/src/dialogs/managetemplatesdialog.cpp
-+++ b/src/dialogs/managetemplatesdialog.cpp
-@@ -317,17 +317,6 @@ bool ManageTemplatesDialog::removeTemplate()
- 
-     KileTemplate::Info templateInfo = templateItem->getTemplateInfo();
- 
-    KIO::StatJob* statJob = KIO::stat(QUrl::fromUserInput(templateInfo.path), KIO::StatJob::DestinationSide, 0);
-    KIO::StatJob* statJob2 = KIO::stat(QUrl::fromUserInput(templateInfo.icon), KIO::StatJob::DestinationSide, 0);
-    KJobWidgets::setWindow(statJob, this);
-    KJobWidgets::setWindow(statJob2, this);
-    statJob->exec();
-    statJob2->exec();
-    if ((statJob->error() && statJob2->error()) || !QFileInfo(templateInfo.icon).exists()) {
-        KMessageBox::error(this, i18n("Sorry, but you do not have the necessary permissions to remove the selected template."));
-        return false;
-    }
-
-     if (KMessageBox::warningYesNo(this, i18n("You are about to remove the template \"%1\"; are you sure?", templateInfo.name)) == KMessageBox::No) {
-         return false;
-     }
-- 
-GitLab
-
--- a/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch
+++ b/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch
@ -1,25 +0,0 @@
-From 5c268679da2fb2cdc414890bdd79a5592e37cb22 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
-Date: Tue, 15 Sep 2020 15:33:51 +0100
-Subject: [PATCH] Fix KToolbar usage.
-
---
- src/widgets/scriptsmanagementwidget.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/widgets/scriptsmanagementwidget.cpp b/src/widgets/scriptsmanagementwidget.cpp
-index 79552da3..94f58f18 100644
--- a/src/widgets/scriptsmanagementwidget.cpp
-+++ b/src/widgets/scriptsmanagementwidget.cpp
-@@ -66,7 +66,7 @@ ScriptsManagement::ScriptsManagement(KileInfo *kileInfo, QWidget *parent, const
-     baseLayout->setContentsMargins(0, 0, 0, 0);
-     setLayout(baseLayout);
- 
-    m_toolBar = new KToolBar(this, "scriptControlToolBar");
-+    m_toolBar = new KToolBar("scriptControlToolBar", this);
-     m_toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
-     m_toolBar->setIconDimensions(KIconLoader::SizeSmall);
- 
-- 
-GitLab
-
--- a/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch
+++ b/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch
@ -1,164 +0,0 @@
-From 7a55cf2d93c9daa13f2fa2ec1ae25646507cfc0c Mon Sep 17 00:00:00 2001
-From: Michel Ludwig <michel.ludwig@kdemail.net>
-Date: Sun, 1 Dec 2019 15:56:05 +0100
-Subject: [PATCH] Fix overriding of existing templates
-
-Also, don't delete the original file after the template has been
-created from it.
-
-BUG: 413473
-
-* asturm 2020-10-17: backport to 2.9.93 (drop unnecessary string change)
-
---
- src/dialogs/managetemplatesdialog.cpp |  7 ++-
- src/templates.cpp                     | 78 ++-------------------------
- src/templates.h                       | 10 ++--
- 3 files changed, 12 insertions(+), 83 deletions(-)
-
-diff --git a/src/dialogs/managetemplatesdialog.cpp b/src/dialogs/managetemplatesdialog.cpp
-index c5298b21..77d5d6ff 100644
--- a/src/dialogs/managetemplatesdialog.cpp
-+++ b/src/dialogs/managetemplatesdialog.cpp
-@@ -292,11 +292,10 @@ void ManageTemplatesDialog::addTemplate()
-             reject();
-             return;
-         }
-        returnValue = m_templateManager->replace(templateInfo, m_sourceURL, templateName, iconURL);
-    }
-    else {
-        returnValue = m_templateManager->add(m_sourceURL, templateName, iconURL);
-     }
-+
-+    returnValue = m_templateManager->add(m_sourceURL, templateName, iconURL);
-+
-     if (!returnValue) {
-         KMessageBox::error(this, i18n("Failed to create the template."));
-         reject();
-diff --git a/src/templates.cpp b/src/templates.cpp
--- a/src/templates.cpp
-+++ b/src/templates.cpp
-@@ -82,7 +82,10 @@ bool Manager::copyAppData(const QUrl &src, const QString& subdir, const QString&
-             testDir.mkpath(dir);
-         }
-         // copy file
-        KIO::FileCopyJob* copyJob = KIO::file_copy(src, targetURL);
-+        if(src == targetURL) { // copying a file over itself
-+            return true;
-+        }
-+        KIO::FileCopyJob* copyJob = KIO::file_copy(src, targetURL, -1, KIO::Overwrite);
-         KJobWidgets::setWindow(copyJob, m_kileInfo->mainWindow());
-         return copyJob->exec();
-     }
-@@ -130,77 +133,6 @@ bool Manager::remove(Info ti) {
-     return removeAppData(ti.path) && removeAppData(ti.icon);
- }
- 
-bool Manager::replace(const KileTemplate::Info& toBeReplaced, const QUrl &newTemplateSourceURL, const QString& newName, const QUrl& newIcon) {
-    KileDocument::Type type = m_kileInfo->extensions()->determineDocumentType(newTemplateSourceURL);
-
-    //start by copying the files that belong to the new template to a safe place
-    QString templateTempFile, iconTempFile;
-
-    if( newTemplateSourceURL.isLocalFile() ) {
-        // file protocol. We do not need the network
-        templateTempFile = newTemplateSourceURL.toLocalFile();
-    }
-    else {
-        QTemporaryFile tmpFile;
-        tmpFile.setAutoRemove( false );
-        tmpFile.open();
-
-        templateTempFile = tmpFile.fileName();
-        m_TempFilePath = tmpFile.fileName();
-        KIO::FileCopyJob* fileCopyJob = KIO::file_copy( newTemplateSourceURL, QUrl::fromLocalFile(templateTempFile), -1, KIO::Overwrite );
-        KJobWidgets::setWindow( fileCopyJob, m_kileInfo->mainWindow() );
-
-        if( ! fileCopyJob->exec() ) {
-            return false;
-        }
-    }
-
-    if( newIcon.isLocalFile() ) {
-        // file protocol. We do not need the network
-        iconTempFile = newIcon.toLocalFile();
-    }
-    else {
-        QTemporaryFile tmpFile;
-        tmpFile.setAutoRemove( false );
-        tmpFile.open();
-
-        iconTempFile = tmpFile.fileName();
-        m_TempFilePath = tmpFile.fileName();
-        KIO::FileCopyJob* fileCopyJob = KIO::file_copy( newIcon, QUrl::fromLocalFile(iconTempFile), -1, KIO::Overwrite );
-        KJobWidgets::setWindow( fileCopyJob, m_kileInfo->mainWindow() );
-
-        if( ! fileCopyJob->exec() ) {
-            if( ! templateTempFile.isEmpty() )
-                QFile::remove( templateTempFile );
-            return false;
-        }
-    }
-
-    //now delete the template that should be replaced
-    if(!remove(toBeReplaced)) {
-        if( ! templateTempFile.isEmpty() )
-            QFile::remove( templateTempFile );
-        if( ! iconTempFile.isEmpty() )
-            QFile::remove( iconTempFile );
-    }
-
-    //finally, create the new template
-    if(!add(QUrl::fromUserInput(templateTempFile), type, newName, QUrl::fromUserInput(iconTempFile))) {
-        if( ! templateTempFile.isEmpty() )
-            QFile::remove( templateTempFile );
-        if( ! iconTempFile.isEmpty() )
-            QFile::remove( iconTempFile );
-        return false;
-    }
-
-    if( ! templateTempFile.isEmpty() )
-        QFile::remove( templateTempFile );
-    if( ! iconTempFile.isEmpty() )
-        QFile::remove( iconTempFile );
-
-    return true;
-}
-
- void Manager::scanForTemplates() {
-     KILE_DEBUG_MAIN << "===scanForTemplates()===================";
-     QStringList dirs = KileUtilities::locateAll(QStandardPaths::AppDataLocation, "templates", QStandardPaths::LocateDirectory);
-diff --git a/src/templates.h b/src/templates.h
--- a/src/templates.h
-+++ b/src/templates.h
-@@ -1,7 +1,7 @@
- /***************************************************************************************
-     begin                : Sat Apr 26 2003
-     copyright            : (C) 2003 by Jeroen Wijnhout (wijnhout@science.uva.nl)
-                               2007, 2008 by Michel Ludwig (michel.ludwig@kdemail.net)
-+                               2007-2019 by Michel Ludwig (michel.ludwig@kdemail.net)
-  ***************************************************************************************/
- 
- /***************************************************************************
-@@ -79,15 +79,13 @@ public:
-      **/
-     bool searchForTemplate(const QString& name, KileDocument::Type& type) const;
- 
-    // add a template in $HOME/kile/templates/
-+    // Add a template in .kde/share/kile/templates/
-+    // This function will override any existing template.
-     bool add(const QUrl &templateSourceURL, const QString &name, const QUrl &icon);
- 
-    // remove a template from $HOME/kile/templates/
-+    // Remove a template from .kde/share/kile/templates/
-     bool remove(KileTemplate::Info ti);
- 
-    // replaces a template
-    bool replace(const KileTemplate::Info& toBeReplaced, const QUrl &newTemplateSourceURL, const QString& newName, const QUrl& newIcon);
-
-     // these have to be methods as we cannot use i18n calls in global objects
-     static QString defaultEmptyTemplateCaption();
-     static QString defaultEmptyLaTeXTemplateCaption();
-- 
-GitLab
-
--- a/app-editors/kile/files/kile-2.9.93-no-khtml.patch
+++ b/app-editors/kile/files/kile-2.9.93-no-khtml.patch
@ -1,58 +0,0 @@
-From 7c050b5e306cab115573aea1bfc951aaaa1203e9 Mon Sep 17 00:00:00 2001
-From: Michel Ludwig <michel.ludwig@kdemail.net>
-Date: Fri, 22 Nov 2019 09:40:53 +0100
-Subject: [PATCH] Remove dependency on KHTML
-
---
- CMakeLists.txt       | 1 -
- src/CMakeLists.txt   | 2 --
- src/kilelauncher.cpp | 1 -
- 3 files changed, 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1bea621f..1b25e3a4 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,6 @@ find_package(KF5 5.31 REQUIRED COMPONENTS
- 	I18n
- 	IconThemes
- 	Init
-	KHtml
- 	KIO
- 	Parts
- 	TextEditor
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 77626894..e23480fd 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -55,7 +55,6 @@ set(kile_SRCS
- 	dialogs/usermenu/usermenuitem.cpp
- 	dialogs/usermenu/usermenutree.cpp
- 	dialogs/validatorinputdialog.cpp
-	docpart.cpp
- 	documentinfo.cpp
- 	editorcommands.cpp
- 	editorextension.cpp
-@@ -238,7 +237,6 @@ PUBLIC
-     KF5::Crash
-     KF5::DBusAddons
-     KF5::GuiAddons
-    KF5::KHtml
-     KF5::I18n
-     KF5::IconThemes
-     KF5::KIOCore
-diff --git a/src/kilelauncher.cpp b/src/kilelauncher.cpp
-index c0bcdf9d..24a1f5b4 100644
--- a/src/kilelauncher.cpp
-+++ b/src/kilelauncher.cpp
-@@ -16,7 +16,6 @@
- 
- #include <config.h>
- 
-#include "docpart.h"
- #include "kileconfig.h"
- #include "kileinfo.h"
- #include "kiletool.h"
-- 
-GitLab
-
--- a/app-editors/kile/kile-2.9.93-r1.ebuild
+++ b/app-editors/kile/kile-2.9.93-r1.ebuild
@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_CATEGORY="office"
-KFMIN=5.74.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kile/ https://kile.sourceforge.io/"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~riscv x86"
-fi
-
-LICENSE="FDL-1.2 GPL-2"
-SLOT="5"
-IUSE="+pdf +png"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	kde-apps/okular:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdoctools-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	pdf? ( app-text/poppler[qt5] )
-"
-RDEPEND="${DEPEND}
-	kde-apps/konsole:5
-	kde-apps/okular:5[pdf?]
-	virtual/latex-base
-	virtual/tex-base
-	pdf? (
-		app-text/ghostscript-gpl
-		app-text/texlive-core
-	)
-	png? (
-		app-text/dvipng
-		virtual/imagemagick-tools[png?]
-	)
-"
-
-DOCS=( AUTHORS ChangeLog kile-remote-control.txt README{,.cwl} )
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-no-khtml.patch"
-	"${FILESDIR}/${P}-fix-crash-when-deleting-templates.patch"
-	"${FILESDIR}/${P}-fix-overriding-existing-templates.patch"
-	"${FILESDIR}/${P}-fix-ktoolbar-usage.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package pdf Poppler)
-	)
-	ecm_src_configure
-}
--- a/app-editors/kile/kile-2.9.93_p20221123.ebuild
+++ b/app-editors/kile/kile-2.9.93_p20221123.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kile/ https://kile.sourceforge.io/"

 LICENSE="FDL-1.2 GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="+pdf +png"

 DEPEND="
--- a/app-editors/pluma-plugins/pluma-plugins-1.26.0.ebuild
+++ b/app-editors/pluma-plugins/pluma-plugins-1.26.0.ebuild
@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 inherit mate python-single-r1

 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64 x86"
 fi

 DESCRIPTION="A set of plugins for Pluma, the MATE text editor."
--- a/app-editors/pluma/pluma-1.26.0.ebuild
+++ b/app-editors/pluma/pluma-1.26.0.ebuild
@ -11,7 +11,7 @@ DESCRIPTION="Pluma text editor for the MATE desktop"

 LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 IUSE="+introspection spell test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@ -1,9 +1,6 @@
-DIST vscode-1.73.0-amd64.tar.gz 135608145 BLAKE2B a0d44d06f42071abc49ef4495c1e9fc4d3395c58e61211e1e2cd32ae2dfefe83880db1cb4c3ee5ead670936e73826cd588f10ff4076ce241afcfa4f929cf67a8 SHA512 116ba487b27fe6b9b3702deb9f6664139e10a2b7a53c372dc6849376e541eb3fb560e4f115e920862b1bff5cc7d7fc35d3353c843a6fdef549565dbc1c8ea552
-DIST vscode-1.73.0-arm.tar.gz 115197213 BLAKE2B 7f1bfc0c208be83525da810d8f198b8d14e969a9c68ace75a0304d49d3360dd0a65b27ead51487437764c9cf911d2196756df7f4793e02ccb630ee60f724d4ae SHA512 3b1e93b3c40a36b53c5a81cfffdf76238b8dfb2370589c0ffd38db8c3acbde0f69d0500af59f26de0b69b5e1c218fde9a25abc4a432b889d9f0097f2c1a31ab0
-DIST vscode-1.73.0-arm64.tar.gz 124908757 BLAKE2B 94006f56d5df515773d697c876479da7f97001b0b6dec0b8ea46efe0183898536edf0792ca41b74e6e4a09e44da2cae8c1960b0e69b8fd7f7c0d54ce59fc1af3 SHA512 9db4e79727eca2f7cc85d221a3ccb14866b90f7350b8bcdb558ec3bfe7b6fbfe91bf46dbd59b1c10e7af139c3bf07628dd42e51e7f47d49534b1b2ab46891a7d
-DIST vscode-1.73.1-amd64.tar.gz 135604445 BLAKE2B e08ea9dcc3f21aa5324fc97dafc969ba34d3b907b0e0f46a4ef7403801e4a47bd92c47de958603c588f9048f757abb8e09556820604d4432fe12cf3a78b60866 SHA512 f73e0466b953bc44975ca45666b106fd5ad099a8ed245094ff1be09140ed9b1b05909d71408932486da0cb61cc0dc3ce9bedf76c0619e3c1d368008d656ae234
-DIST vscode-1.73.1-arm.tar.gz 115191887 BLAKE2B a75ac8fec11a93a8aa010d76ea56fd1510d2c8c910718d6da9075222fe69aa5dbf9e726c4cd56bfb4722e5b6d82338c5c45cf803e22805a7a8f0b6939443fc36 SHA512 de22c1503134ea92face02218078d6d9404eb5e5eea789e9f61422d840b798d4da0ac5083d888d06e5eae313f2748da10d0b949eb0f06dedab8e7cabee2263e3
-DIST vscode-1.73.1-arm64.tar.gz 124921489 BLAKE2B dd244d2c1ebee9c8360284aa0a3afd3bc48f258a047c950fd6c4dab25980dcdc155f55cecac17eacdf462beeafe7400e98d618859f7736854595c9285cd8ea76 SHA512 735b8a1a715906152f2018457c0b4c279dad17edf3d962c895ab07734260b51b6da9ff31b07a3461c7d1fe8f97aad91e9da8cd25129290edcda724b5cba9590f
 DIST vscode-1.74.0-amd64.tar.gz 138266029 BLAKE2B ebc7c805d06c6e3685109d3432c0cde46ec40c009dfb4245c5446e9d234df470c10e256e5e4de919a98c20c66bb22b67ab59a8c1c80cfc5c05247c167c5b32f6 SHA512 0760d12364bf1440a42ffb96754a7bdee4a17a7f9e152d461ccdd6292417882fdfb5394d60ea1a774c1c446895c127cbe3de94972ee0dd83dba425163b9e6c22
 DIST vscode-1.74.0-arm.tar.gz 117871171 BLAKE2B 8b2b4180c06b57ab28df603b52a9596c38cebb33d73deff2fe2053579ad3b0d92b50b9c7ccc8e193adbf38e836a8d73065978b0709d990adb9264132a4e2a8e8 SHA512 cc1749f20753c2001f798cad5217540701458cf61a0286623999b315c764858f7b131bec772c737aaf7ec3a34aa894137aecb863dc5d90826d87da69c873b1d5
 DIST vscode-1.74.0-arm64.tar.gz 127510791 BLAKE2B 829539d4d4be86f59f0e8577b55fc656e6c78f4a172c6f1fa65147f4989893cc2c81d6aa30ca635078eba5cc9bcdf01465624abfa19f68cc7c5fe03514da57ec SHA512 68c1d67ece5493feab2259baee3dec3c5299baf10b07ab763c0a59bc909ee20731b4d589ae779c4e0115badc2c0da1dd12753f94591a11f45c2aed7156fe7092
+DIST vscode-1.74.1-amd64.tar.gz 138266991 BLAKE2B 283fedd15cf2eb75f339c741785cff35a0fca62b267cf71b26e2f0dce308f2f189c32bdfa0e4137109551b3bfb45c0e71fbb4d0940961d166955b053ae80e43d SHA512 73aabce1ce68c3b321490fe36083847d9d012c1a5fd6e095bf6a0160abad5e0935d4f1d8e0ad8e7e84bdc844bf8f2331baeb6ff58df2ffba080c97f46c096038
+DIST vscode-1.74.1-arm.tar.gz 117868697 BLAKE2B 331d1fa61d6a0ee4c588dc416fee3a62e33066c4d02a2a4a07002c89f5ec7a125269d05866817277f79649a3834221d209377d78622c4c8709cc6bffd9a9da71 SHA512 cb959dccdadbbcf4a592a92a543efa5bca193fcd9293dc61f42f4328676cfc1429099e4e10b8fef456b41e428f3eefecea462adde82a915ec3ab9c543184001b
+DIST vscode-1.74.1-arm64.tar.gz 127513900 BLAKE2B 1d34816d28f2a415d33ee8196a2c6843ba49f736abf8d862232a4905ddf73679ac2bf5145cb2673355c16bc62143b1428ed0d503153d7a84a30d17cc9602a881 SHA512 6a41cc164e1fc2ea2ce5d3f0f2c346aa78df7aec93457e6b4359fb588c40120917c810f96d6434c532c199444f233690de46ec9cd94494ee1b6e2baaf2eb542b
--- a/app-editors/vscode/vscode-1.73.1.ebuild
+++ b/app-editors/vscode/vscode-1.73.1.ebuild
@ -1,130 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-SRC_URI="
-	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
-	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
-"
-S="${WORKDIR}"
-
-RESTRICT="mirror strip bindist"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	Microsoft-vscode
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-
-RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	app-crypt/libsecret[crypt]
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/util-linux
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libxshmfence
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	/opt/vscode/bin/code-tunnel
-	/opt/vscode/chrome_crashpad_handler
-	/opt/vscode/chrome-sandbox
-	/opt/vscode/code
-	/opt/vscode/libEGL.so
-	/opt/vscode/libffmpeg.so
-	/opt/vscode/libGLESv2.so
-	/opt/vscode/libvk_swiftshader.so
-	/opt/vscode/libvulkan.so*
-	/opt/vscode/resources/app/extensions/*
-	/opt/vscode/resources/app/node_modules.asar.unpacked/*
-	/opt/vscode/swiftshader/libEGL.so
-	/opt/vscode/swiftshader/libGLESv2.so
-"
-
-src_install() {
-	if use amd64; then
-		cd "${WORKDIR}/VSCode-linux-x64" || die
-	elif use arm; then
-		cd "${WORKDIR}/VSCode-linux-armhf" || die
-	elif use arm64; then
-		cd "${WORKDIR}/VSCode-linux-arm64" || die
-	else
-		die "Visual Studio Code only supports amd64, arm and arm64"
-	fi
-
-	# Cleanup
-	rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
-
-	# Disable update server
-	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
-
-	# Install
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	fperms +x /opt/${PN}/{,bin/}code
-	fperms +x /opt/${PN}/chrome_crashpad_handler
-	fperms 4711 /opt/${PN}/chrome-sandbox
-	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh
-	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
-	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
-	dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
-	dosym "../../opt/${PN}/bin/code" "usr/bin/code"
-	domenu "${FILESDIR}/vscode.desktop"
-	domenu "${FILESDIR}/vscode-url-handler.desktop"
-	domenu "${FILESDIR}/vscode-wayland.desktop"
-	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscode.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "You may want to install some additional utils, check in:"
-	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
-	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
-}
--- a/app-editors/vscode/vscode-1.74.1.ebuild
+++ b/app-editors/vscode/vscode-1.74.1.ebuild
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@ -1,12 +1,6 @@
-DIST vscodium-1.72.2.22289-amd64.tar.gz 119678278 BLAKE2B cac30b199b729c7b1c5714671ebba8aa6ea18544bf8c7402cd78f7741be62ee09a2960eb2ef454058a1235e3a50b08471d98400eae3b2187672ea3cb771b3fe3 SHA512 999759e28ae8d388753f41b1025cdd5e0ee3fe0a58121529ea65aa8f07da9d6cd9f4a3a0fc5e577a296a97df087e321c47c3d4d87f78722deb68822388eb9554
-DIST vscodium-1.72.2.22289-arm.tar.gz 101721510 BLAKE2B db6aeb776caca658056ce14f8d63a185853f0836aa7922e7f73cd54fbce77e19b658acb866d524457127f9082fb1a792fa92d41233013941b00088a5e679a66f SHA512 d9f69d2e234126532f1c45d0c0ff0fb7ca8b5ea54db18373e063e098824a7519c6074a9862ae8a9a2beae4697129d816a7509273bbb18da5d8023adccfb6e279
-DIST vscodium-1.72.2.22289-arm64.tar.gz 112762927 BLAKE2B 0e1eee14f65eb438f0ecbc51684434512c812fb99b430bf84fd933986471afd80179bfed75db2297a0405d9a8be6d733a835befe328d48800db0e61d4600bb8f SHA512 a6d0c3ab25f94a6d84a1f0dc95d5dc8841d822940e2e7fea04ccfc87807f2d69fd44a74fee671715586b3c282f222d729e3134e482cd9b6c40943e6efbb0c251
-DIST vscodium-1.73.0.22306-amd64.tar.gz 119821329 BLAKE2B 89da99e0d2f7484d24a0606d80f3208b4ae44db726e094a4db25029e3dc2ad8ccb5c6bb12366ff6bd82b9621926ed8cf1b30d3177a677fa5981e47f8a4f73f45 SHA512 b2064d77055ea18b4cfe9cd445c6c4423b82e453b6e479ed6f3c00855c6690bb3b1796b046c7c59ea838c29e2141e3fcdbb83f3f7465342bce2bba84a9880247
-DIST vscodium-1.73.0.22306-arm.tar.gz 101863338 BLAKE2B a635be308af59f567a699a606511d75454605caa9e299b5d854998b8ae537669cdaf79888447484e223fb6d4e56a30ef8f0cddba605f96961eddde1383418fb2 SHA512 882c770fef8940f33de387ebb70de03ba2569e5d89f19ffca4bd079ca9a953bce957ec5650337b9c4b7f30b7fb656b41e69061a147f531244acfa5ba76e3197c
-DIST vscodium-1.73.0.22306-arm64.tar.gz 112892547 BLAKE2B 81cbaa37d557d2e67eab2857afb08ebdde3a8ffee6814000994fe4c7d9871fbff5d4c57e8f46d70b7b45c70d9910a49f9c45af157f499031a1f6fe0254fbc75c SHA512 b4467bb2d8254f8c7fa51c2ed299a2d38e5c1a92aa6d19a3d268e0ca0c029f48b982ff1aa652a5336e42ebbb6f88bc611bf69bb143112520b1846e6f9a2064ff
-DIST vscodium-1.73.1.22314-amd64.tar.gz 119819615 BLAKE2B 5937f0cdb22098eef709c84ca1f9efd9a7af094e8d1a236385d79ccba7499224b7097429b8ecdbb17ee7b879790557fd069bda1094c9dd3a5cd3ae34b92b6e73 SHA512 ab92cdceebbf6352b9c0f882f79d2c3d4c2d7ee301b7942dd703ad02406b9fcec9bdac3eb2c46cc921b21d5170780404f72b961a33a91fcbfa630daa29da7262
-DIST vscodium-1.73.1.22314-arm.tar.gz 101865243 BLAKE2B b414e5a07b8dd1b64e260227abc6771a864c7604161e7df6a7c4ed865fbda8f500f4d0734d0b87e13e6f0a9ea5a5a93ece551c0ce1cc7a320c71b9a12ebc7dfc SHA512 4f1c03941922b6e5e0c8c846a2f9a7435ed697b83006841492d9622901e83b5b39812a6c8c053fc856ec92060bbb0fab3509f34c5dc147cd4a35f651efa79fa0
-DIST vscodium-1.73.1.22314-arm64.tar.gz 112895655 BLAKE2B 78889f118f2c6eccd14a365c7224775ba1e078eb9c65feffc8919493d06e36f4abf007b5596b354eebd1c0ae94cdaa4e11acf0add494d38d82bf334adfc5ec36 SHA512 c7bd117dcbbe03117befe73e112fffd3c754ca921e3b37b3b4fd78b0e1689201c5e7cd39ad206a7dd157565664536d493701bc583d870b28d01d9abd18016e96
 DIST vscodium-1.74.0.22342-amd64.tar.gz 121392818 BLAKE2B d2fa5baa17ff3e1b77d7086cab0c38b3de7e35e0eac131408b8e2d34ae6578300622fac1d419024903c3e32367eb4fb872410e647b83c90cf76621898472d0e7 SHA512 8e254d411f91636b77086ee9f491e0179348fd26aaf149d3fa5af61770aabb7062bbb3574ae3dd27fd891e2877279719f0b37e6023151b7d4d8f6af9b5a5d774
 DIST vscodium-1.74.0.22342-arm.tar.gz 103442460 BLAKE2B 9deddff7c84a03b466de29caf8ca43c5b8ad4277ca4cee72171eed3acb37d1b49f27e6c6fe658d04b61840008c77ef581e2bba76c677482f851f6e1981991a59 SHA512 1396d573f2fa02406f8b62a94e0fab19a5989dc4baffa77c6c60f81fed6e6a723a0a786ac5fff833c1ee1ce9d38be20e4f7078a05a0d844703c9477c3051d168
 DIST vscodium-1.74.0.22342-arm64.tar.gz 114462026 BLAKE2B 56f965056b826868e3c89c54760a5dfe16842c93c09bd67b00a12a19645ee10722e34a5b7d32b029967f73cfbf8035f96a61d30823e9308993bd20442804c869 SHA512 c03c6b2a486b0ec1101f62b94322e027a9416cf4d93c286024ae31e83e81237a503e52f63ef0828d38eb4d97cd49a58288128f7472def01d2231d454751409c9
+DIST vscodium-1.74.1.22349-amd64.tar.gz 121393633 BLAKE2B e30b7edd966e56f79742bd045e75d02b76d886ea3cc450121e2ad625fc9a2296d78fb652e8a796fe04def3d5a7a56020e658d6f8401a9546366838af2ea26cb5 SHA512 0f05d3e17603cbdd072210f6d725fc3f9b5a03bcd01b0962f5ada48486e5d1caeb222b5c25ba9a5353f2455a282f61ed4af1660b23f7aec5f994c80187682145
+DIST vscodium-1.74.1.22349-arm.tar.gz 103433677 BLAKE2B 820b1363f5814549c13f2c15edbd14ac55be7a78f0357ffc3655f3e1b641977da344419865b116e72da1d26be0754e48ef1b8145d9e9c28ffc83f2ce7fef5326 SHA512 69ccef8a618aa9f56ba24720217e7b33fcf42aa8c6ce879c938b1e0a5b7887c9472083ff92b77eb95fad6c29ed5722d9113c55fde120a92d35c7d3fb51bdd11d
+DIST vscodium-1.74.1.22349-arm64.tar.gz 114469077 BLAKE2B 3751a2a25d32917fd71e782a168638ecd387ccd41ab62e79d3b5dfb49b5e169e1030df72ee2551c75fc8add434791497d13020b8bf96addb403f18ff0829b5ff SHA512 16f6c09762773ab4ac695c97f9458464ecdcb30f06023122e94278758424fd127d0921779e6f04e496cd004994b1996b276812eb11423d08fb4060fee60df4ed
--- a/app-editors/vscodium/vscodium-1.72.2.22289.ebuild
+++ b/app-editors/vscodium/vscodium-1.72.2.22289.ebuild
@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
-HOMEPAGE="https://vscodium.com/"
-SRC_URI="
-	amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
-	arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
-	arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
-"
-
-RESTRICT="strip bindist"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	app-crypt/libsecret[crypt]
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/util-linux
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libxshmfence
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	/opt/vscodium/chrome_crashpad_handler
-	/opt/vscodium/chrome-sandbox
-	/opt/vscodium/codium
-	/opt/vscodium/libEGL.so
-	/opt/vscodium/libffmpeg.so
-	/opt/vscodium/libGLESv2.so
-	/opt/vscodium/libvk_swiftshader.so
-	/opt/vscodium/libvulkan.so*
-	/opt/vscodium/resources/app/extensions/*
-	/opt/vscodium/resources/app/node_modules.asar.unpacked/*
-	/opt/vscodium/swiftshader/libEGL.so
-	/opt/vscodium/swiftshader/libGLESv2.so
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	# Cleanup
-	rm "${S}/resources/app/LICENSE.txt" || die
-
-	# Disable update server
-	sed -i "/updateUrl/d" "${S}"/resources/app/product.json || die
-
-	# Install
-	pax-mark m codium
-	insinto "/opt/${PN}"
-	doins -r *
-	fperms +x /opt/${PN}/{,bin/}codium
-	fperms +x /opt/${PN}/chrome_crashpad_handler
-	fperms 4711 /opt/${PN}/chrome-sandbox
-	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh
-	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
-	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
-	dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
-	dosym "../../opt/${PN}/bin/codium" "usr/bin/codium"
-	domenu "${FILESDIR}/vscodium.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler.desktop"
-	domenu "${FILESDIR}/vscodium-wayland.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscodium.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "When compared to the regular VSCode, VSCodium has a few quirks"
-	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
-	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
-}
--- a/app-editors/vscodium/vscodium-1.73.1.22314.ebuild
+++ b/app-editors/vscodium/vscodium-1.73.1.22314.ebuild
@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
-HOMEPAGE="https://vscodium.com/"
-SRC_URI="
-	amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
-	arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
-	arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
-"
-
-RESTRICT="strip bindist"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	app-crypt/libsecret[crypt]
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/util-linux
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libxshmfence
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	/opt/vscode/bin/code-tunnel
-	/opt/vscodium/chrome_crashpad_handler
-	/opt/vscodium/chrome-sandbox
-	/opt/vscodium/codium
-	/opt/vscodium/libEGL.so
-	/opt/vscodium/libffmpeg.so
-	/opt/vscodium/libGLESv2.so
-	/opt/vscodium/libvk_swiftshader.so
-	/opt/vscodium/libvulkan.so*
-	/opt/vscodium/resources/app/extensions/*
-	/opt/vscodium/resources/app/node_modules.asar.unpacked/*
-	/opt/vscodium/swiftshader/libEGL.so
-	/opt/vscodium/swiftshader/libGLESv2.so
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	# Cleanup
-	rm "${S}/resources/app/LICENSE.txt" || die
-
-	# Disable update server
-	sed -i "/updateUrl/d" "${S}"/resources/app/product.json || die
-
-	# Install
-	pax-mark m codium
-	insinto "/opt/${PN}"
-	doins -r *
-	fperms +x /opt/${PN}/{,bin/}codium
-	fperms +x /opt/${PN}/chrome_crashpad_handler
-	fperms 4711 /opt/${PN}/chrome-sandbox
-	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh
-	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
-	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
-	dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
-	dosym "../../opt/${PN}/bin/codium" "usr/bin/codium"
-	domenu "${FILESDIR}/vscodium.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler.desktop"
-	domenu "${FILESDIR}/vscodium-wayland.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscodium.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "When compared to the regular VSCode, VSCodium has a few quirks"
-	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
-	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
-}
--- a/app-editors/vscodium/vscodium-1.74.1.22349.ebuild
+++ b/app-editors/vscodium/vscodium-1.74.1.22349.ebuild
--- a/app-editors/xemacs/xemacs-21.4.24-r7.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r7.ebuild
@ -38,9 +38,9 @@ RDEPEND="
 	Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
 	neXt? ( x11-libs/neXtaw )
 	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
+	tiff? ( media-libs/tiff:= )
 	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	!amd64? ( freewnn? ( app-i18n/freewnn ) )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
--- a/app-editors/xemacs/xemacs-21.4.24-r9.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r9.ebuild
@ -38,9 +38,9 @@ RDEPEND="
 	Xaw3d? ( x11-libs/libXaw3d )
 	neXt? ( x11-libs/neXtaw )
 	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
+	tiff? ( media-libs/tiff:= )
 	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	!amd64? ( freewnn? ( app-i18n/freewnn ) )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
--- a/app-editors/xemacs/xemacs-21.5.34-r12.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r12.ebuild
@ -39,9 +39,9 @@ RDEPEND="
 	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
 	neXt? ( x11-libs/neXtaw )
 	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
+	tiff? ( media-libs/tiff:= )
 	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	freewnn? ( app-i18n/freewnn )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild
@ -40,9 +40,9 @@ RDEPEND="
 	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
 	neXt? ( x11-libs/neXtaw )
 	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
+	tiff? ( media-libs/tiff:= )
 	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	freewnn? ( app-i18n/freewnn )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/clojure-mode/Manifest
+++ b/app-emacs/clojure-mode/Manifest
@ -1,3 +1,3 @@
-DIST clojure-mode-5.14.0.tar.gz 23405449 BLAKE2B f30215834fd4f9599df93f13d94dc9ff7ee8ed55f4e1d3baca373f5665a9ef148af3e918b0db88e604e435b8f4cf4fc4447881ef2d51ee7de88e0a89c76609ae SHA512 4226d23ae2f1337edaef8203b7620f45ebb25f8e6921bd7076aee36916c1c4028add473aa5894d1d8db7a8dd03d5aa037bad05a8e90380d05583a137bef105d6
 DIST clojure-mode-5.15.0.tar.gz 23405863 BLAKE2B 33a1ca087525c47c59a49995ef11486816d9b2f9714f071aa43063167f09c9f9e8cf6b899ea5a13feeb36ee8a7da1f98bfe2c15dba6bc7a058308586e4dbe8c9 SHA512 a1e9902c62b36534c49fd4ea99d419a59a9f28f9d8074ed49b3baf7f4d304c25323a21cc5c2e6da5b25d984ff43b4c0b255522c606411929f7d6d5b2626f7278
 DIST clojure-mode-5.15.1.tar.gz 23406165 BLAKE2B bfc93f13dc1de227242e0d0cfdc08d6874f60e8c5eb13634766f73f488b9e8a1d5183338f3fa8623ef31a936cdb8baee88e1cd15d3fb639f2b82b36c966ef1ac SHA512 0a535cdc8aad72b55e592bc6dd42ade85f48608d50037ded76b9e7cf114cf8ecfd8886363d204fbeeae60537e57cce21dd87da6865cbdad719d7ba0e59ab7f04
+DIST clojure-mode-5.16.0.tar.gz 23407838 BLAKE2B 4df7d66f823be35ebe4e44701ef1fc373c40e6940a7f9502178f86d32e330ba3683ba862a3dfd2af54f131cef72eacce85c9a62842136588a9361f4777b4c822 SHA512 a73bf2b43ea7eab33cdea7c35e1e01e8416faa1878d92c6802ca85c68acb3a230d03963be27e3cc64ef30d3abb28c6f6f18b6ee5c5b423b01b625f8b52f4b354
--- a/app-emacs/clojure-mode/clojure-mode-5.16.0.ebuild
+++ b/app-emacs/clojure-mode/clojure-mode-5.16.0.ebuild
--- a/Show More
+++ b/Show More