Sync with portage [Wed Oct 5 20:03:06 MSK 2022].

2 years ago · 3b8c9f36b8
parent 2671f1cc14
commit 3b8c9f36b8
9084 changed files with 33560 additions and 34304 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.46.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.46.0.ebuild
@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="metapackage"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DEPEND=""
+RDEPEND=">=app-accessibility/at-spi2-core-2.46.0[${MULTILIB_USEDEP}]"
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@ -1 +1,2 @@
 DIST at-spi2-core-2.44.1.tar.xz 209780 BLAKE2B e76f0b0c478564181db774633dfc9613bdfa6c74c5c52878d877723e37605b7b7169fee45a9025b331e84bf5af8132eed50b388db9ac1aee0fec7776a633628a SHA512 8d85df75f886c4a19d829d14e5a9412b607b9cbe2d1b7ecb95b4082602f0624e90747fe955f96d378c3a52bc0e732074b97008bb34e6acc2722c7056b2c0504e
+DIST at-spi2-core-2.46.0.tar.xz 540600 BLAKE2B e3ed9915c39a9f71b64a9753c7f91208d15289fe09a9505b4766df7fa04c3e6e5cdc7b3702315eabbdf70f9fc08b4cca4546353485328ab101e2950a672885d6 SHA512 633af2c02fab3b8cb02e37f929ce80dd5ce28ca5641046ef5e25cb29299530b90028e6c6f318a0c098a4270bed3eab48fb55d6967a76bfadd2520f49de47c770
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.46.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.46.0.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson-multilib systemd virtualx xdg
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="X gtk-doc +introspection"
+REQUIRED_USE="gtk-doc? ( X )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.67.4:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+	)
+
+	!<dev-libs/atk-2.46.0
+	!<app-accessibility/at-spi2-atk-2.46.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
+		$(meson_native_use_bool gtk-doc docs)
+		-Dintrospection=$(multilib_native_usex introspection)
+		-Dx11=$(usex X)
+		-Ddisable_p2p=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@ -1 +1,2 @@
 DIST orca-42.3.tar.xz 3707048 BLAKE2B b1a03cee97ba2ad17e32b863effba46974f86e5cbdcea72235085e369189e8e92cba8b83931fd83a7b859edfc8da9236f462e250c468ad1533768479eb25aad0 SHA512 59d9d61af2e385d8e356f825fc1733d73d136f89a3a06c352eaf1e7b05cd6ebf5bd13282afb478adb4ea7981398db0138324c3e275eb372b99ba648d9fafeab6
+DIST orca-43.0.tar.xz 3758480 BLAKE2B 05c31777c1c88452e165bd7fb6fe75fe727149f5337828b5f4e7679430ed5065a03de7074536c4433bedd81c3090c72e02a775db46f4673d6e3264a57732ad7a SHA512 20248e6065c1daa9c3d6ba37515bab60a3ceb14065b862d6d0610a7659bddc04f49a1cda7850646b45bb0afb5c2a89f1894de96f505831b11b77d332adb747d3
--- a/app-accessibility/orca/orca-43.0.ebuild
+++ b/app-accessibility/orca/orca-43.0.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="+braille"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-atk-2.34:2
+	>=app-accessibility/at-spi2-core-2.36:2[introspection]
+	>=dev-libs/atk-2.36
+	>=dev-libs/glib-2.28:2
+	media-libs/gstreamer:1.0[introspection]
+	>=x11-libs/gtk+-3.6.2:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
+	')
+	braille? (
+		$(python_gen_cond_dep '
+			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
+			dev-libs/liblouis[python,${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	dev-libs/atk[introspection]
+	$(python_gen_cond_dep '
+		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
+		>=dev-python/pyatspi-2.36[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+	')
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with braille liblouis)
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize
+}
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@ -1 +1,2 @@
 DIST augeas-1.12.0.tar.gz 2429279 BLAKE2B cd90203fec1a81b114d95bb50e168b852923136f34c83974d3427cbedd4eb0d335d3952057507b38ded5c7011be2b56725565ea106cb32a0ca43b7c81250b29e SHA512 4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40
+DIST augeas-1.13.0.tar.gz 2562588 BLAKE2B 0a8e62c999a425b89bfa2b1b2cdf7c7894ca39b59d577ca2f7ce9bf33e51f2fffe2510518a8666d59fcf7f8479cae3b2a41efe4478830f89fa20d1fbeb6c9716 SHA512 a6a9ee76f3e48780df1928f2fdfa5cc826695fe6233ff90d069d05806cb020aed3c6b2ce6b9047925a203973eefcd7c254fc3ddd1db7473821c8ade4fda58d5f
--- a/app-admin/augeas/augeas-1.13.0.ebuild
+++ b/app-admin/augeas/augeas-1.13.0.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="https://github.com/hercules-team/augeas/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libxml2
+	sys-libs/readline:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=app-doc/NaturalDocs-1.40
+	virtual/pkgconfig
+	test? ( dev-lang/ruby )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-selinux.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# selinux needs to be implemented
+	econf --without-selinux
+}
+
+src_compile() {
+	addpredict /usr/share/NaturalDocs/Config/Languages.txt
+	addpredict /usr/share/NaturalDocs/Config/Topics.txt
+
+	default
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/app-admin/augeas/files/augeas-1.13.0-selinux.patch
+++ b/app-admin/augeas/files/augeas-1.13.0-selinux.patch
@ -0,0 +1,19 @@
+https://github.com/hercules-team/augeas/commit/f38398a2d07028b892eac59449a35e1a3d645fac
+
+From f38398a2d07028b892eac59449a35e1a3d645fac Mon Sep 17 00:00:00 2001
+From: Leo-Schmit <63145459+Leo-Schmit@users.noreply.github.com>
+Date: Tue, 20 Sep 2022 13:41:31 +0200
+Subject: [PATCH] Replace deprecated 'security_context_t' with 'char *' (#747)
+
+--- a/src/transform.c
+++ b/src/transform.c
+@@ -918,7 +918,7 @@ static int transfer_file_attrs(FILE *from, FILE *to,
+     struct stat st;
+     int ret = 0;
+     int selinux_enabled = (is_selinux_enabled() > 0);
+-    security_context_t con = NULL;
+    char *con = NULL;
+ 
+     int from_fd;
+     int to_fd = fileno(to);
+
--- a/app-admin/augeas/metadata.xml
+++ b/app-admin/augeas/metadata.xml
@ -2,16 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-	<email>prometheanfire@gentoo.org</email>
+		<email>prometheanfire@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
-A library for programmatically editing configuration files. Augeas parses
-configuration files into a tree structure, which it exposes through its
-public API. Changes made through the API are written back to the initially
-read files.
+	A library for programmatically editing configuration files. Augeas parses
+	configuration files into a tree structure, which it exposes through its
+	public API. Changes made through the API are written back to the initially
+	read files.

-The transformation works very hard to preserve comments and formatting
-details. It is controlled by ``lens'' definitions that describe the file
-format and the transformation into a tree.
-</longdescription>
+	The transformation works very hard to preserve comments and formatting
+	details. It is controlled by ``lens'' definitions that describe the file
+	format and the transformation into a tree.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">hercules-team/augeas</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -3,3 +3,4 @@ DIST aws-cli-1.25.81.gh.tar.gz 2273195 BLAKE2B 3bf3ca742b08c0bf4367ae1bfabcf8c26
 DIST aws-cli-1.25.82.gh.tar.gz 2273453 BLAKE2B 11c307a78df654634a7ae75cc8a7ce7d37697aa9ce792a3ad2b1a250291f2ff3574bea13219c072f223e4f27b7e5df757b49971374a5962f19b57ae00f77cd44 SHA512 90737a8cc9aac60970e705c5637672b74e89278926196c1363252038401e12bcb31672c878d2a3b6f213f5a5aac308e5b170e90342f6d270793aead3c8485eaf
 DIST aws-cli-1.25.83.gh.tar.gz 2273842 BLAKE2B 3b3986f539302830d981478cf485c9a724a0c1bd216b6a3952781eeeb96e58d0f7cf575a899e79e55dc2252d90c15c1cf2cbde755fa4f89ac4fcabbab788896a SHA512 7194d281477bc8f94b91901fdea57a1da44e703a04d28df9bb63a7f17370ec31eb640128f07b902a46892ca77377e706a0d99f6d53699a572c9cb2ef7d0f6c04
 DIST aws-cli-1.25.85.gh.tar.gz 2274915 BLAKE2B 074651fd32ec378c8f574266ff2a2e43ddb3d16fc7cb73dda75895819d948216acefe6e5c0da1ef059e36c4b684a6b360f996e3ff905abfc71a4c68dc78ad64d SHA512 ca6b6012fbe69467adfeade7f4b7c4cf40c50f2c62aee71c1e459bfa6597d3510e8ba087752c23ca77306e49cffbb68dde95167eed0d9313ab1488855b2aa4dd
+DIST aws-cli-1.25.87.gh.tar.gz 2285796 BLAKE2B 47df516ee23e9955ce8798546a2fecdc4b43199aa3daa5195c4dda010c3e4c86d2a4b6aac1dfd1c057cfb2f5ed9ea9a718b34aad09d8ddbb176ab3bfb4a86d25 SHA512 8beb4d70773c890dec4b4914c77d6fd73e4b66a6ee11316d0a851f17d6abc20cc67bf33d7209e8a285f84195d68c9f497eb8471ecb59438bf3b03353d960a8f6
--- a/app-admin/awscli/awscli-1.25.87.ebuild
+++ b/app-admin/awscli/awscli-1.25.87.ebuild
@ -0,0 +1,72 @@
+# 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_{8..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-1)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+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() {
+	# 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/clustershell/Manifest
+++ b/app-admin/clustershell/Manifest
@ -1 +1 @@
-DIST clustershell-1.8.3.tar.gz 363975 BLAKE2B 3a7bb9103398e96f57f53d0d5d5edc6895ce02b6983e8fed34d65cad83a6d4e86f40b9576f41631e499a99adc8be5f4f422005b8ddc7ac8325fe11abd2c99477 SHA512 5108773e2958d1dae0aa6966d764e9af9d41024f65271005b202468f2bd1a3b63acc977729324fe1305d400dc8b06b0c4672e8d8ded207fa77cef69fb0005108
+DIST clustershell-1.8.4.gh.tar.gz 367622 BLAKE2B 1487697a49d37902f9763094da1a156f5e7cc2ab0487814207bb9da03b1109f1ce55034fc92e72262d4b9920d5c52b9f6de84ce1ff04b06d042b0a6d005f1049 SHA512 582393e56d94e62e126d91f8af074a7b57d0e781a5c929cfc374e61324c412c32fcf9a8e063a78cb805c2ff34641887a1adfc7ef9f377b881077f719dbc2adc3
--- a/app-admin/clustershell/clustershell-1.8.3-r1.ebuild
+++ b/app-admin/clustershell/clustershell-1.8.3-r1.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python framework for efficient cluster administration"
-HOMEPAGE="https://cea-hpc.github.com/clustershell/"
-SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-BDEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-libs/openssl:0="
-
-RESTRICT="test" # currently fail
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
-
-python_test() {
-	cd tests || die
-	nosetests -sv --all-modules || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Some default system-wide config files have been installed into"
-	einfo "/etc/${PN}"
-	einfo
-}
--- a/app-admin/clustershell/clustershell-1.8.4.ebuild
+++ b/app-admin/clustershell/clustershell-1.8.4.ebuild
@ -0,0 +1,67 @@
+# 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_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="https://github.com/cea-hpc/clustershell/"
+SRC_URI="
+	https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-shells/pdsh
+		net-misc/openssh
+		sys-devel/bc
+	)
+"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	# python3.10 related fixes taken from upstream
+	"${FILESDIR}/${P}-setrlimit-division.patch"
+	"${FILESDIR}/${P}-current-thread.patch"
+
+	"${FILESDIR}/${P}-skip-tests.patch"
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	default
+
+	# remove test sets that require working ssh connection
+	rm tests/{CLIClush,TaskDistant*,TreeWorker}Test.py || die
+}
+
+python_test() {
+	cd tests || die
+	# Automatic discovery does not work
+	"${EPYTHON}" -m unittest_or_fail -v *.py || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman doc/man/man*/*
+
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	einfo "Some default system-wide config files have been installed into"
+	einfo "/etc/${PN}"
+}
--- a/app-admin/clustershell/files/clustershell-1.8.4-current-thread.patch
+++ b/app-admin/clustershell/files/clustershell-1.8.4-current-thread.patch
@ -0,0 +1,95 @@
+Backported from upstream commit 314767d65c39 ("Fix for python-3.10") [1].
+
+[1] https://github.com/cea-hpc/clustershell/commit/314767d65c397fadc5ce0ae205a35d7bb47a68a8
+
+diff --git a/lib/ClusterShell/Task.py b/lib/ClusterShell/Task.py
+index b9142e6..8c9e1b9 100644
+--- a/lib/ClusterShell/Task.py
+++ b/lib/ClusterShell/Task.py
+@@ -254,7 +254,7 @@ class Task(object):
+             self._cond.acquire()
+             try:
+                 self.suspend_count = min(self.suspend_count, 0)
+-                self._cond.notifyAll()
+                self._cond.notify_all()
+             finally:
+                 self._cond.release()
+ 
+@@ -347,7 +347,7 @@ class Task(object):
+     def _is_task_self(self):
+         """Private method used by the library to check if the task is
+         task_self(), but do not create any task_self() instance."""
+-        return self.thread == threading.currentThread()
+        return self.thread == threading.current_thread()
+ 
+     def default_excepthook(self, exc_type, exc_value, tb):
+         """Default excepthook for a newly Task. When an exception is
+@@ -765,7 +765,7 @@ class Task(object):
+ 
+     def _resume(self):
+         """Resume task - called from self thread."""
+-        assert self.thread == threading.currentThread()
+        assert self.thread == threading.current_thread()
+         try:
+             try:
+                 self._reset()
+@@ -780,7 +780,7 @@ class Task(object):
+             # task becomes joinable
+             self._join_cond.acquire()
+             self._suspend_cond.atomic_inc()
+-            self._join_cond.notifyAll()
+            self._join_cond.notify_all()
+             self._join_cond.release()
+ 
+     def resume(self, timeout=None):
+@@ -954,14 +954,14 @@ class Task(object):
+         # termination (late join()s)
+         # must be called after _terminated is set to True
+         self._join_cond.acquire()
+-        self._join_cond.notifyAll()
+        self._join_cond.notify_all()
+         self._join_cond.release()
+ 
+         # destroy task if needed
+         if kill:
+             Task._task_lock.acquire()
+             try:
+-                del Task._tasks[threading.currentThread()]
+                del Task._tasks[threading.current_thread()]
+             finally:
+                 Task._task_lock.release()
+ 
+@@ -1376,7 +1376,7 @@ def task_self(defaults=None):
+     provided as a convenience is available in the top-level ClusterShell.Task
+     package namespace.
+     """
+-    return Task(thread=threading.currentThread(), defaults=defaults)
+    return Task(thread=threading.current_thread(), defaults=defaults)
+ 
+ def task_wait():
+     """
+@@ -1385,7 +1385,7 @@ def task_wait():
+     convenience and is available in the top-level ClusterShell.Task package
+     namespace.
+     """
+-    Task.wait(threading.currentThread())
+    Task.wait(threading.current_thread())
+ 
+ def task_terminate():
+     """
+diff --git a/tests/TaskPortTest.py b/tests/TaskPortTest.py
+index 697f144..4014a89 100644
+--- a/tests/TaskPortTest.py
+++ b/tests/TaskPortTest.py
+@@ -28,7 +28,7 @@ class TaskPortTest(unittest.TestCase):
+             def ev_msg(self, port, msg):
+                 # receive msg
+                 assert msg == "toto"
+-                assert port.task.thread == threading.currentThread()
+                assert port.task.thread == threading.current_thread()
+                 TaskPortTest.got_msg = True
+                 port.task.abort()
+ 
+-- 
+2.35.1
+
--- a/app-admin/clustershell/files/clustershell-1.8.4-setrlimit-division.patch
+++ b/app-admin/clustershell/files/clustershell-1.8.4-setrlimit-division.patch
@ -0,0 +1,21 @@
+Python3.10 related fix taken from upstream [1,2].
+
+[1] https://github.com/cea-hpc/clustershell/pull/487
+[2] https://github.com/cea-hpc/clustershell/commit/5ac85daf74056ec7e60778efec94c746a150142c
+
+diff --git a/tests/CLIConfigTest.py b/tests/CLIConfigTest.py
+index 2853398..db6cec5 100644
+--- a/tests/CLIConfigTest.py
+++ b/tests/CLIConfigTest.py
+@@ -229,7 +229,7 @@ class CLIClushConfigTest(unittest.TestCase):
+         display = Display(options, config)
+ 
+         # force a lower soft limit
+-        resource.setrlimit(resource.RLIMIT_NOFILE, (hard2/2, hard))
+        resource.setrlimit(resource.RLIMIT_NOFILE, (hard2//2, hard))
+         # max_fdlimit should increase soft limit again
+         set_fdlimit(config.fd_max, display)
+         # verify
+-- 
+2.35.1
+
--- a/app-admin/clustershell/files/clustershell-1.8.4-skip-tests.patch
+++ b/app-admin/clustershell/files/clustershell-1.8.4-skip-tests.patch
@ -0,0 +1,63 @@
+This is a Gentoo specific patch for skipping tests that do not work due
+to various reasons:
+1. hostname may be set to localhost
+2. test fails which are most probably caused by weird test interaction.
+   The issue is reported to upstream in [1].
+
+[1] https://github.com/cea-hpc/clustershell/issues/488
+
+diff --git a/tests/TaskEventTest.py b/tests/TaskEventTest.py
+index f8a4048..900008b 100644
+--- a/tests/TaskEventTest.py
+++ b/tests/TaskEventTest.py
+@@ -475,6 +475,7 @@ class TaskEventTest(unittest.TestCase):
+         self.assertEqual(eh.cnt_pickup, 3)
+         self.assertEqual(eh.cnt_hup, 3)
+ 
+    @unittest.skip("because of an issue https://github.com/cea-hpc/clustershell/issues/488")
+     def test_ev_pickup_fanout_legacy(self):
+         """test ev_pickup event with fanout (legacy)"""
+         task = task_self()
+@@ -498,6 +499,7 @@ class TaskEventTest(unittest.TestCase):
+         finally:
+             task.set_info("fanout", fanout)
+ 
+    @unittest.skip("because of an issue https://github.com/cea-hpc/clustershell/issues/488")
+     def test_ev_pickup_fanout(self):
+         """test ev_pickup event with fanout"""
+         task = task_self()
+diff --git a/tests/TreeWorkerTest.py b/tests/TreeWorkerTest.py
+index d5c221a..969d3c9 100644
+--- a/tests/TreeWorkerTest.py
+++ b/tests/TreeWorkerTest.py
+@@ -99,6 +99,7 @@ class TEventHandler(TEventHandlerBase):
+             self.ev_timedout_cnt += 1
+ 
+ 
+@unittest.skipIf(HOSTNAME == 'localhost', "does not work with hostname set to 'localhost'")
+ class TreeWorkerTest(unittest.TestCase):
+     """
+     TreeWorkerTest: test TreeWorker
+diff --git a/tests/WorkerExecTest.py b/tests/WorkerExecTest.py
+index 6f99f10..0894f99 100644
+--- a/tests/WorkerExecTest.py
+++ b/tests/WorkerExecTest.py
+@@ -45,6 +45,7 @@ class ExecTest(unittest.TestCase):
+         self.assertEqual(task_self().max_retcode(), 1)
+         self.assertEqual(task_self().node_buffer('localhost'), b'')
+ 
+    @unittest.skipIf(HOSTNAME == 'localhost', "does not work with hostname set to 'localhost'")
+     def test_timeout(self):
+         """test ExecWorker with a timeout"""
+         nodes = "localhost,%s" % HOSTNAME
+@@ -67,6 +68,7 @@ class ExecTest(unittest.TestCase):
+         self.assertRaises(WorkerError, self.execw,
+                           nodes="localhost", handler=None, command="echo %")
+ 
+    @unittest.skipIf(HOSTNAME == 'localhost', "does not work with hostname set to 'localhost'")
+     def test_rank_placeholder(self):
+         """test ExecWorker with several nodes and %n (rank)"""
+         nodes = "localhost,%s" % HOSTNAME
+-- 
+2.35.1
+
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -1,5 +1,3 @@
-DIST puppet-agent_7.17.0-1focal_amd64.deb 20397624 BLAKE2B 8304f937e6eb3f1a3c2a72ba34fce029ecec99decaf1a78b08b556c1ebe3073fa159e70e43baf468e833ede2e9a659f6384f52969e16932ac24a2a997da14eee SHA512 f493298af50e6eed61c7ffb0cf4234b1eb69594caedd24826bc9bcb5d85e736101bfa98b14dcfdceab5ee98e8bc228f25743fdcce440398ff9e0019c6861bde2
-DIST puppet-agent_7.17.0-1focal_arm64.deb 19595304 BLAKE2B 719473363cb24dcd58a864c9ce4d24cb8d8f328d6179ec666d3f3ba1dbf8df53746b9dba37a820c782b6b7b56639c068da1a7db4813e44c5520dfc74ff026008 SHA512 5d74f2fca8fe214c70931b099582d5861ae95a3f11be69e33ee4a10b5135cde43d57b117fa3492983b13e023f9138584d72df6ea788015e058124e4578ae1e39
 DIST puppet-agent_7.18.0-1focal_amd64.deb 33767214 BLAKE2B def38171c1e0cad50cdffc8aada569af0996b1b7e3f788ffa3c5e3b05d0456d2776f2d12a4cf2f8a9227ebf3c1c13b52fa28f210249b04a54de1fbbc19f26c30 SHA512 387d3e1ca3a05c107411dc7a126b2984e8dacf3580823022c0010f33b08305b6722d8a1babee7825b8f60769589b1f166991931f66a484d94a17ac7d437141e1
 DIST puppet-agent_7.18.0-1focal_arm64.deb 33559710 BLAKE2B af2a4657c95dc7208b5c2f7494b9cec03f1c9ed0e73c06c150f492fa474d5620f5a58b23b7d928d4117a9b2b8c6384514b7f7000e7a6639582ebe97ab82571a7 SHA512 fafabbd00c4ef03b3bd6d9680bc78ada42ffefa8bc8186f24203be277e01267363f0ff35f176f3f04057c46ff437bbb957d4416ce5b6ffc1b3e1f79492c2ce7b
 DIST puppet-agent_7.19.0-1focal_amd64.deb 33779898 BLAKE2B 40ced6309bc82a2a917572b35d2e6271f53c1b56721cf5d389b7a297774c08fb430915880279a11c1b4d803582793340127b21283202b527e2ecf826176c314d SHA512 2d8658a0f1b684ae07b2a8a87e130d210283bdc78b1a10750605e970cc9a2310967c85bc054c9e018d38fbc955708d6ebdb205b5562df6ea475386be9ea02581
--- a/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild
@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd unpacker tmpfiles
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb )
-arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-# virtual/libcrypt:= is in here despite being a pre-built package
-# to ensure that the has_version logic for the symlink doesn't become stale
-CDEPEND="!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	app-emulation/virt-what
-	acct-user/puppet
-	acct-group/puppet
-	virtual/libcrypt:="
-
-DEPEND="
-	${CDEPEND}
-	app-admin/augeas"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/libselinux
-	sys-libs/glibc
-	sys-libs/readline:0/8
-	sys-libs/libxcrypt[compat]
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	keepdir var/log/puppetlabs/puppet/
-	chmod 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd2" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-
-	# Handling of the path to the crypt library during the ongoing migration
-	# from glibc[crypt] to libxcrypt
-	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
-	if has_version "sys-libs/glibc[crypt]"; then
-		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
-	else
-		local crypt_target='../../../../usr/lib/libcrypt.so.1'
-	fi
-	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet-agent.conf
-}
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@ -1,4 +1,3 @@
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
-DIST puppet-7.17.0.tar.gz 2812615 BLAKE2B 80b5115b8825a87427a688ca7a9337334180fcb7722d437f44009b5cf74ede16dac52f1648a2e7595558abb5fa92322095e71dcf0d7d8d06a2275e13caf79163 SHA512 f691b6d3e931c5cc879c8e5129af2a935bedc891964ba5cbb873d6d69e0ec61bd82ca7d413a94389cda13cb6c8c536aae6f11dade4c6e2597abc7756a74f4df0
 DIST puppet-7.18.0.tar.gz 2816776 BLAKE2B 7c653744a9aa694c6e7558295d33fa8de1958f333cb274a51119ce543846ce649755d5c37ba677d1cdcf2417b237611073ef523aa7a109a3e3dc0e75bd986614 SHA512 428268c9d8333c0624023a3d4b55b5dddfaa890eb6d88a31486c8de5112db4d1dce7553050de81c4b5ffd0fec74c5d10f3c09c3fb1826ffc196808f2b45495d4
 DIST puppet-7.19.0.tar.gz 2817098 BLAKE2B d2d756aa236461963ac260167f9500693ea94f1b2ce7b6f881c55712f78668ce5935528a74d3a77e5b02123aeb4404c1bbfc91237622dcb68e686e920302acb9 SHA512 952ae1e77e9d9aaa0a0a731f408550fd3bf483dda9bbb12845e534e6208321db774325da8621f36535d7601bd7b8611098e486ef733428b7108f613f5dade4e0
--- a/app-admin/puppet/puppet-7.17.0.ebuild
+++ b/app-admin/puppet/puppet-7.17.0.ebuild
@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit ruby-fakegem systemd tmpfiles
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# fix systemd path
-	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"
-		dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet.conf
-
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@ -1,3 +1,2 @@
-DIST puppetdb-7.10.1.tar.gz 48769606 BLAKE2B 80686ab0ac16e71bd3758b55e10a4f59d29d1a954d62dc576af61777755384a24a3dde08fdb3f9159cf0d888377140cc13cee0c48904382ee2312300c6e8aa32 SHA512 cedebaa1f94e0f100dd9bac5f63a4bbaa19189a01abac011708de835e6a06d6222027f05a15ad2722261072154ebe9efd8f30de171b6f8640ee369dd51feb846
 DIST puppetdb-7.11.0.tar.gz 49070151 BLAKE2B ec59603b5fa2fe38a1d848e5e4e9926bb9e9c53bfda55c5093d6ede3ef0ee2cdd2cffe8f6fa8599d4b1a533b251c13871453cf7bc378edeecff69364579db650 SHA512 160123cea5af42c6196893a3993c4fdcf3c6690e43f56d2e01342b9fd5facd8777d3eee5c7ec658535f222cf1a6e52b3ec955e4b1ddff4c3346b363be36420a5
 DIST puppetdb-7.11.1.tar.gz 49075994 BLAKE2B deb1a031999f18988c44b1439670ebb370d654a7dd99f20f44cdce027fa48088eadc96adca4fc8efe298c4dcc9b62d0d607262d8a5de4d07de0f2405a0f05a36 SHA512 98238e61ae7798912e345d69ff321bd7236dea6d5230a1f9ae37c533993d29611890522dde085e18e83b87bccb5a53e49e4ad38b930bb09ce7e9f22d45776a60
--- a/app-admin/puppetdb/puppetdb-7.10.1.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.10.1.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="PuppetDB collects data generated by Puppet"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+="acct-user/puppetdb
-	acct-group/puppetdb"
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	doins ext/config/conf.d/auth.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	tmpfiles_process puppetdb.conf
-
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@ -1,3 +1,2 @@
-DIST puppetserver-7.8.0.tar.gz 64651673 BLAKE2B 7bd53e3a15128eb4405b47edc066e702a3ea702a22258d039a4be5a7fecb509c724dcf21d893e9d76a99e9c94ca8a514d48bcd7085bcf429dd318defdf9fbd8d SHA512 82503c79e3d24ae2700537c8acdd410ddd3b400993d51f392f30664f6d259c224ba782c8ebeaf21e49c4acfb503b2f1a8ac880359a67c8d008797abcaa3210ab
 DIST puppetserver-7.9.0.tar.gz 66386534 BLAKE2B 8aac7501c9923eb67bd06e965dd766ddce290b2eaaa8c752f6c7124a13d24364ede22847fdd1171d0e71b45bae191bc3c9b0c89cc5ebf9ed78d5230b8e28bfcf SHA512 6f0acabbf332072306386b4d942532270e202801bf98dcd436884c85b969437ca51adefb51a0f99556432c4c204e03ee8d3fecdecadf5e046b037ce06619a27c
 DIST puppetserver-7.9.1.tar.gz 66383400 BLAKE2B 1804191a5453ebe55c5744687cce2f6d062e397be7b29a44d2749d0880ea20995ddbd9efdc9ddcde17021c011ff5b665f3e215e49143424f7fe470d915c3b6d1 SHA512 2b8e43220480cad0d1140fdc08491bf7296b72c2eb228da56d5b569f6b39dad1c3968af1942d3a1d1b34a57d994aaa2b91edff20f1d54905477a77f3062b580c
--- a/app-admin/puppetserver/puppetserver-7.8.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.8.0.ebuild
@ -1,131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents"
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="amd64"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	keepdir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process puppetserver.conf
-
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
--- a/app-admin/tmpreaper/Manifest
+++ b/app-admin/tmpreaper/Manifest
@ -1,2 +1,2 @@
 DIST tmpreaper_1.6.14.tar.gz 158981 BLAKE2B 1c9ec124c6e57c0aab5d555594950dda37f06a6404a0d111da05be7a48bf6141e09e942c090d3f79ccf855f958a7b32f0d64c73da68b412da74465e39bdb72ae SHA512 e78fab0cd2cc8c851e2806be70c102697bff86230e181bfad1c76b15fe5455fb431bc0dd16bebf77a2e9bb64b5f5a1474d24254ff780d4d72d343ea0e6e30ccb
-DIST tmpreaper_1.6.16.tar.gz 158816 BLAKE2B cd0bbb3bc414800d73c49a5fd724af21e7f81d4ad07256f6a1f8f4943d53d74580dc11066938f417ea7a2c6105159f262363457c6ba082eeaa11817ef7128c96 SHA512 2f155a2c081f6af73e164dc1698b74430e4839864c6773b74d239ccc2f0aea5dbfbf5904c1738ef34a735a2451173b0000190ff8f3af291574b09b119410d412
+DIST tmpreaper_1.6.17.tar.gz 158894 BLAKE2B 537e8020a9db4adc9dee5b967e89242573d340c8b1d3540ab2de76d9a74bae391ff398d19b71c4017bde04716f01f8958bb73957215b1b44628e5ae7ad805f8b SHA512 8272cb0232f8188f8ad45be40442b686d18bbf508dcd440d3f901f4dbf7d17e05da91ee3bfa5d23d163041fdb08de81d525ac45945f10bc7ff886ac468fc4ce0
--- a/app-admin/tmpreaper/tmpreaper-1.6.17.ebuild
+++ b/app-admin/tmpreaper/tmpreaper-1.6.17.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 DESCRIPTION="A utility for removing files based on when they were last accessed"
 HOMEPAGE="https://packages.debian.org/sid/tmpreaper"
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/stormlib/Manifest
+++ b/app-arch/stormlib/Manifest
@ -1 +1,2 @@
 DIST StormLib-9.23.tar.gz 605295 BLAKE2B 2489e309f218f3e5c5069b56856415cc5985efb2352f36a33530442d539c786262b7c55d134dd67db3098981b1ad98ce8bfa77a16f86d28f326831b09752b705 SHA512 c851159596e252b42facdbac9c52f7477c61de35b44054ab608a22b42e7dc3b4179f50ba9d8cbd30448ed7787cc74e7efd2e08faafdd91289136cd91399d4f09
+DIST StormLib-9.24.tar.gz 625374 BLAKE2B 3647580b1b048e284ade2fb23aed53cac76a89a0180908f48fc99d571e702d876de37e42a47b3d351c72e6fa905fc02f4b8fa691a6840013637e1560e9acafcb SHA512 38694685edfc9c53ff1e303109831b6a791200b9db275043bca8b3bbe7cc928cf0ce9cf554c6758f693da453b85e6385d277ae9add7af867c13488d77432cde5
--- a/app-arch/stormlib/files/stormlib-9.24-gnuinstalldirs.patch
+++ b/app-arch/stormlib/files/stormlib-9.24-gnuinstalldirs.patch
@ -0,0 +1,55 @@
+From 8cb9b76a5e85ffab436f7b01ecfc0a0dea7547af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 3 Oct 2022 20:49:31 +0200
+Subject: [PATCH] cmake: Use GNUInstallDirs for configurable install
+ directories
+
+Use the standard GNUInstallDirs CMake module to provide configurable
+install directories rather than hardcoding 'bin', 'lib', etc.  Most
+importantly, this fixes install on modern amd64 systems that use 'lib64'
+rather than 'lib'.
+---
+ CMakeLists.txt | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9cf1050..b10c2c5 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -7,6 +7,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+ include(CMakeDependentOption)
+include(GNUInstallDirs)
+ 
+ option(BUILD_SHARED_LIBS "Compile shared libraries" OFF)
+ option(STORM_SKIP_INSTALL "Skip installing files" OFF)
+@@ -357,12 +358,12 @@ endif()
+ 
+ if (NOT STORM_SKIP_INSTALL)
+     install(TARGETS ${LIBRARY_NAME}
+-	    RUNTIME DESTINATION bin
+-	    LIBRARY DESTINATION lib
+-	    ARCHIVE DESTINATION lib
+	    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	    FRAMEWORK DESTINATION /Library/Frameworks
+-	    PUBLIC_HEADER DESTINATION include
+-	    INCLUDES DESTINATION include)
+	    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+	    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+         #CPack configurtion
+         SET(CPACK_GENERATOR "DEB" "RPM")
+@@ -395,6 +396,6 @@ endif()
+ if(STORM_BUILD_TESTS)
+     add_executable(StormLib_test ${TEST_SRC_FILES})
+     target_link_libraries(StormLib_test ${LIBRARY_NAME})
+-    install(TARGETS StormLib_test RUNTIME DESTINATION bin)
+    install(TARGETS StormLib_test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+-- 
+2.37.3
+
--- a/app-arch/stormlib/stormlib-9.24.ebuild
+++ b/app-arch/stormlib/stormlib-9.24.ebuild
@ -0,0 +1,44 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_P=StormLib-${PV}
+DESCRIPTION="Library to read and write MPQ archives (Diablo, StarCraft)"
+HOMEPAGE="
+	http://www.zezula.net/en/mpq/stormlib.html
+	https://github.com/ladislav-zezula/StormLib/
+"
+SRC_URI="
+	https://github.com/ladislav-zezula/StormLib/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libtomcrypt:=[libtommath]
+	sys-libs/zlib:=
+"
+DEPEND=${RDEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/stormlib-9.24-gnuinstalldirs.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		# interactive test app
+		-DSTORM_BUILD_TESTS=OFF
+		-DWITH_LIBTOMCRYPT=ON
+	)
+
+	cmake_src_configure
+}
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@ -1,3 +1,4 @@
 DIST duplicity-0.8.22.tar.gz 1408482 BLAKE2B 3a8b6eb79d5f67e8f274bdaaaf0bb5b6c9f0ebf91a3b6a849b876cdf2c9af0f5435946150b5db6ab5e524cedc5b98b40c456b1de0fe8c6e33c024fe3c7d881fa SHA512 474237e3ca9876fb124baf9871f781b8347c85e76b7b4191d6993a76fb4728500091c74ed0943c6c22d69651c08094b6d155eca742d1711bebe676734c84d12a
 DIST duplicity-0.8.23.tar.gz 1385252 BLAKE2B 63042486e6e17d2d93af72f617990c879763d5921e230302f406b4f9e7c57a67284130f9f57849b9ffc8638614b55f0f8abdf6bb20201155b33b72bef952ec9f SHA512 083cf0060a8c7a8472c6ee4ffbb87e85edf0fcdaba95862a9f272cc03d8ab3d18b584a8d256473e6cfab9eed6f993382b846b692a8c0dd46fd3a2d8215e54e45
 DIST duplicity-rel.1.0.0.tar.bz2 802941 BLAKE2B 7b5f33b2b8b0f938a86688ea68838fd45a1405e69cc59e9cc082035253d123258f6a30239ecc470e9210b5bafeda556909fe94887517be8c75a2c18641de66b0 SHA512 a3a0a8eee8f2555f275676c24c3e0933ef0ba267b64eccb7765dad751e58aae3ed0ffac4c4cee3acd3dd76c93bb799edb7fe1430ae159389174cc37ab646f339
+DIST duplicity-rel.1.0.1.tar.bz2 900987 BLAKE2B c298b436aff054d4c0eb389047257586fb0f4b0d9b08c47ddcedbfc539f99c27f1af1e434bd409f7a3a14c5ef24d293cc96fe174ba3338a9d54a5ec8337de231 SHA512 691e093025a8f9c3802588d8ecb9e946efe1637a117a46f3c51d8fa40848c2a7d8899574009a4b0486488719af5c8fd49cab180fac12e94657480a95e26af391
--- a/app-backup/duplicity/duplicity-1.0.1.ebuild
+++ b/app-backup/duplicity/duplicity-1.0.1.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_8 python3_9 python3_10 python3_11 )
+
+inherit distutils-r1
+
+DESCRIPTION="Secure backup system using gnupg to encrypt data"
+HOMEPAGE="https://duplicity.gitlab.io/"
+SRC_URI="https://gitlab.com/duplicity/duplicity/-/archive/rel.${PV}/duplicity-rel.${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="s3 test"
+
+CDEPEND="
+	net-libs/librsync
+	app-crypt/gnupg
+	dev-python/fasteners[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		app-arch/par2cmdline
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	s3? ( dev-python/boto3[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-docs-cmd.patch"
+)
+
+S="${WORKDIR}/duplicity-rel.${PV}"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
+}
--- a/app-backup/duplicity/files/duplicity-1.0.1-fix-docs-cmd.patch
+++ b/app-backup/duplicity/files/duplicity-1.0.1-fix-docs-cmd.patch
@ -0,0 +1,20 @@
+--- duplicity-rel.1.0.1/setup.py	2022-03-19 15:08:36.755624771 -0400
+++ duplicity-rel.1.0.1/setup.py	2022-03-19 15:09:38.332763172 -0400
+@@ -94,17 +94,6 @@
+                 u'bin/rdiffdir.1'
+                 ]
+             ),
+-            (u'share/doc/duplicity-%s' % Version,
+-                [
+-                u'CHANGELOG.md',
+-                u'CONTRIBUTING.md',
+-                u'COPYING',
+-                u'README.md',
+-                u'README-LOG.md',
+-                u'README-REPO.md',
+-                u'README-TESTING.md',
+-                ],
+-            ),
+         ]
+ 
+     if not os.environ.get(u'READTHEDOCS') == u'True':
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@ -1 +1,2 @@
 DIST apptainer-1.0.3.tar.gz 11972174 BLAKE2B 7fb0602184d9d78ef0de224ec888a01e046d3d44cd79a3233bbb8eab276d9ee360810356a25f4ef05612e337b5a905334f528d5aa5bfa489d9910538719afd2c SHA512 93ebe5abce32f35d56fe7d0f818703961cb7f7115965bad387fc895a275d45b569efeecf57ab5778457732233caa57651cd011a3bcac5ed5aaf2dd665082d959
+DIST apptainer-1.1.0.tar.gz 12761996 BLAKE2B 60b145c68a4c2f7587cbefb94e28337e3f3c9cee51b0f07a024a313605e5cc087bcc0d2775bf83691aa5f5c6d5b84870697acd2e5b09e685f9e44ec766afde2b SHA512 ea7db1d4b9bc5b87542a044abc82f04759b09a676fb429bfb3f33c9a4eb01808f1c2c81e450e99a273b5c61a7df723680352ebc6a1124a6efc060bb85defe20f
--- a/app-containers/apptainer/apptainer-1.1.0.ebuild
+++ b/app-containers/apptainer/apptainer-1.1.0.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="The container system for secure high-performance computing"
+HOMEPAGE="https://apptainer.org/"
+SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples +network suid systemd"
+
+# Do not complain about CFLAGS etc. since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+DEPEND="app-crypt/gpgme
+	>=dev-lang/go-1.17.6
+	dev-libs/openssl
+	sys-apps/util-linux
+	sys-fs/cryptsetup
+	sys-fs/squashfs-tools
+	sys-libs/libseccomp
+	!suid? (
+		sys-fs/e2fsprogs[fuse]
+		sys-fs/squashfuse
+	)"
+RDEPEND="${DEPEND}
+	!sys-cluster/singularity"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~SQUASHFS"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-trim_upstream_cflags.patch
+)
+
+DOCS=( README.md CONTRIBUTORS.md CONTRIBUTING.md )
+
+src_configure() {
+	local myconfargs=(
+		-c "$(tc-getBUILD_CC)" \
+		-x "$(tc-getBUILD_CXX)" \
+		-C "$(tc-getCC)" \
+		-X "$(tc-getCXX)" \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--runstatedir="${EPREFIX}"/run \
+		--localstatedir="${EPREFIX}"/var \
+		$(usex network "" "--without-network") \
+		$(use_with suid)
+	)
+	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
+}
+
+src_compile() {
+	emake -C builddir
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C builddir install
+	keepdir /var/${PN}/mnt/session
+
+	if use systemd; then
+		sed -i -e '/systemd cgroups/ s/no/yes/' "${ED}"/etc/${PN}/${PN}.conf || die "Failed to enable systemd use in configuration"
+	else
+		sed -i -e '/systemd cgroups/ s/yes/no/' "${ED}"/etc/${PN}/${PN}.conf || die "Failed to disable systemd use in configuration"
+	fi
+
+	einstalldocs
+	if use examples; then
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	if ! use suid; then
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 1.1.0; then
+				ewarn "Since version 1.1.0 ${PN} no longer installs setuid-root components by default, relying on unprivileged user namespaces instead. For details, see https://apptainer.org/docs/admin/main/user_namespace.html"
+				ewarn "Make sure user namespaces (possibly except network ones for improved security) are enabled on your system, or re-enable installation of setuid root components by passing USE=suid to ${CATEGORY}/${PN}"
+				break
+			fi
+		done
+	fi
+}
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@ -1 +1,2 @@
 DIST buildah-1.27.1.tar.gz 14825932 BLAKE2B bf290eeb4d96d255c7cdaa07af49eff44191664ac7dee255c7979656383daaa93c3673ba82ac1cbff033de769ffa08ad027f5d91c81b08a36222cb73e8a1e399 SHA512 a5e2ddf837e613554ffe8fe9c15ac9c8f9c2564c403e5544df7fb8802962581fb4e9dd4361c28c93443ede74c20c82f1631990e443c7895a3b4c3b8a659ee05a
+DIST buildah-1.28.0.tar.gz 14579386 BLAKE2B effc7d0a154e30790585c19e19655f98026c34687e79b91777700bc2f387b96896d88855cd5ec34573dd2678e4a30a832c39f789d53b61b45cb5f682dacd252e SHA512 f5e82a22648fa0d0ba7f5dcf3b97a2ec1182f31d3e03cd2624e01fe76fcdddf0a5605c59816eeef6401d151864b6b6be493c144b83f5667ab3947eea902f0086
--- a/app-containers/buildah/buildah-1.28.0.ebuild
+++ b/app-containers/buildah/buildah-1.28.0.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=79f41e32
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="selinux"
+
+RDEPEND="app-crypt/gpgme:=
+	app-containers/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin bin/{${PN},imgtype}
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
--- a/app-containers/docker-registry/Manifest
+++ b/app-containers/docker-registry/Manifest
@ -1,2 +1 @@
-DIST docker-registry-2.7.1.tar.gz 1996699 BLAKE2B 2e22db69f476be5a4688f5b3d6b41fbbf71460351543ae849f707dd5b3d56624f674815a25214002886b057f0859f75fd197bb275a7b3cc8a7787422f716ad0e SHA512 f6baf0e7aa96ebe828c628f7dfd84ee899331c3c1bdab86662aef595b092702b6d9b2c9be766a6de6d153ff4ca55d85c5fd8785a0968f285f56a32a50092c754
 DIST docker-registry-2.8.1.tar.gz 2007611 BLAKE2B abf3e630652f195cf3ad4d07e6d9845000e79d340b0bb8046528bb62592df754c125fd38a92d1af27d068fcd51910f80f356d6a894cb1b97f28d7042af24b898 SHA512 b9c8525051458ff4bf4592ca3ddba83c4325e88c6812ddb28c1567e331c1571f112e3b646ca970f0fe420f3b1d61d00f7151450d7b9948a08733606255731266
--- a/app-containers/docker-registry/docker-registry-2.7.1-r1.ebuild
+++ b/app-containers/docker-registry/docker-registry-2.7.1-r1.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-vcs-snapshot systemd
-
-EGIT_COMMIT="2461543d988979529609e8cb6fca9ca190dc48da"
-EGO_PN="github.com/docker/distribution"
-
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://github.com/docker/distribution"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-DEPEND="
-	acct-group/registry
-	acct-user/registry
-"
-RDEPEND="${DEPEND}"
-
-SVCNAME="registry"
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}"/${PN}-2.7.0-notification-metrics.patch
-	sed -e "s/git describe.*/echo ${PV})/" \
-		-e "s/git rev-parse.*/echo ${EGIT_COMMIT})/" \
-		-e "s/-s -w/-w/" \
-		-i Makefile || die
-	popd || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #681072
-	GOPATH="${S}" GO_BUILD_FLAGS="-v" emake -C src/${EGO_PN} binaries
-}
-
-src_install() {
-	exeinto /usr/libexec/${PN}
-	doexe src/${EGO_PN}/bin/*
-	insinto /etc/docker/registry
-	newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
-	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-	keepdir /var/log/${SVCNAME}
-	fowners ${SVCNAME}:${SVCNAME} /var/log/${SVCNAME}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}
--- a/app-containers/go-secbench/go-secbench-0.1.0.ebuild
+++ b/app-containers/go-secbench/go-secbench-0.1.0.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/qnib/go-secbench"
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="run and evaluate the docker security benchmark"
-HOMEPAGE="https://github.com/qnib/go-secbench"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-
-DEPEND="dev-lang/go"
-
-src_compile() {
-	GOPATH="${S}" go build -o bin/go-secbench src/${EGO_PN}/cmd/main.go || die
-}
-
-src_install() {
-	dobin bin/${PN}
-dodoc "src/${EGO_PN}/README.md"
-}
--- a/app-containers/lxc/files/lxc-5.0.1-glibc-2.36.patch
+++ b/app-containers/lxc/files/lxc-5.0.1-glibc-2.36.patch
@ -0,0 +1,383 @@
+From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001
+From: Christian Brauner <brauner@kernel.org>
+Date: Tue, 9 Aug 2022 16:14:25 +0200
+Subject: [PATCH 1/3] build: detect where struct mount_attr is declared
+
+Fixes: #4176
+Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
+---
+ meson.build                | 30 ++++++++++++++++++++++++++++--
+ src/lxc/conf.c             |  6 +++---
+ src/lxc/conf.h             |  2 +-
+ src/lxc/mount_utils.c      |  6 +++---
+ src/lxc/syscall_wrappers.h | 12 ++++++++++--
+ 5 files changed, 45 insertions(+), 11 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a145faf069..f679aabbc8 100644
+--- a/meson.build
+++ b/meson.build
+@@ -590,7 +590,6 @@ decl_headers = '''
+ foreach decl: [
+     '__aligned_u64',
+     'struct clone_args',
+-    'struct mount_attr',
+     'struct open_how',
+     'struct rtnl_link_stats64',
+ ]
+@@ -610,7 +609,6 @@ foreach tuple: [
+     ['struct seccomp_notif_sizes'],
+     ['struct clone_args'],
+     ['__aligned_u64'],
+-    ['struct mount_attr'],
+     ['struct open_how'],
+     ['struct rtnl_link_stats64'],
+ ]
+@@ -630,6 +628,34 @@ foreach tuple: [
+     endif
+ endforeach
+ 
+## Types.
+decl_headers = '''
+#include <sys/mount.h>
+'''
+
+# We get -1 if the size cannot be determined
+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0
+    srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true)
+    found_types += 'struct mount_attr (sys/mount.h)'
+else
+    srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false)
+    missing_types += 'struct mount_attr (sys/mount.h)'
+endif
+
+## Types.
+decl_headers = '''
+#include <linux/mount.h>
+'''
+
+# We get -1 if the size cannot be determined
+if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0
+    srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true)
+    found_types += 'struct mount_attr (linux/mount.h)'
+else
+    srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false)
+    missing_types += 'struct mount_attr (linux/mount.h)'
+endif
+
+ ## Headers.
+ foreach ident: [
+     ['bpf',               '''#include <sys/syscall.h>
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index ffbe74c2f6..4193cd07f5 100644
+--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
+@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f)
+ 		struct lxc_mount_options opts = {};
+ 		int dfd_from;
+ 		const char *source_relative, *target_relative;
+-		struct lxc_mount_attr attr = {};
+		struct mount_attr attr = {};
+ 
+ 		ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts);
+ 		if (ret < 0)
+@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f)
+ 
+ 		/* Set propagation mount options. */
+ 		if (opts.attr.propagation) {
+-			attr = (struct lxc_mount_attr) {
+			attr = (struct mount_attr) {
+ 				.propagation = opts.attr.propagation,
+ 			};
+ 
+@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lxc_handler *handler)
+ 
+ 	for (;;) {
+ 		__do_close int fd_from = -EBADF, fd_userns = -EBADF;
+-		struct lxc_mount_attr attr = {};
+		struct mount_attr attr = {};
+ 		struct lxc_mount_options opts = {};
+ 		ssize_t ret;
+ 
+diff --git a/src/lxc/conf.h b/src/lxc/conf.h
+index 7dc2f15b60..772479f9e1 100644
+--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
+@@ -223,7 +223,7 @@ struct lxc_mount_options {
+ 	unsigned long mnt_flags;
+ 	unsigned long prop_flags;
+ 	char *data;
+-	struct lxc_mount_attr attr;
+	struct mount_attr attr;
+ 	char *raw_options;
+ };
+ 
+diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c
+index bba75f933c..88dd73ee36 100644
+--- a/src/lxc/mount_utils.c
+++ b/src/lxc/mount_utils.c
+@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc);
+  * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the
+  * @attr_clr field.
+  */
+-static inline void set_atime(struct lxc_mount_attr *attr)
+static inline void set_atime(struct mount_attr *attr)
+ {
+ 	switch (attr->attr_set & MOUNT_ATTR__ATIME) {
+ 	case MOUNT_ATTR_RELATIME:
+@@ -272,7 +272,7 @@ int create_detached_idmapped_mount(const char *path, int userns_fd,
+ {
+ 	__do_close int fd_tree_from = -EBADF;
+ 	unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC;
+-	struct lxc_mount_attr attr = {
+	struct mount_attr attr = {
+ 		.attr_set	= MOUNT_ATTR_IDMAP | attr_set,
+ 		.attr_clr	= attr_clr,
+ 		.userns_fd	= userns_fd,
+@@ -335,7 +335,7 @@ int __fd_bind_mount(int dfd_from, const char *path_from, __u64 o_flags_from,
+ 		    __u64 attr_clr, __u64 propagation, int userns_fd,
+ 		    bool recursive)
+ {
+-	struct lxc_mount_attr attr = {
+	struct mount_attr attr = {
+ 		.attr_set	= attr_set,
+ 		.attr_clr	= attr_clr,
+ 		.propagation	= propagation,
+diff --git a/src/lxc/syscall_wrappers.h b/src/lxc/syscall_wrappers.h
+index a5e98b565c..c8a7d0c7b7 100644
+--- a/src/lxc/syscall_wrappers.h
+++ b/src/lxc/syscall_wrappers.h
+@@ -18,6 +18,12 @@
+ #include "macro.h"
+ #include "syscall_numbers.h"
+ 
+#if HAVE_STRUCT_MOUNT_ATTR
+#include <sys/mount.h>
+#elif HAVE_UAPI_STRUCT_MOUNT_ATTR
+#include <linux/mount.h>
+#endif
+
+ #ifdef HAVE_LINUX_MEMFD_H
+ #include <linux/memfd.h>
+ #endif
+@@ -210,16 +216,18 @@ extern int fsmount(int fs_fd, unsigned int flags, unsigned int attr_flags);
+ /*
+  * mount_setattr()
+  */
+-struct lxc_mount_attr {
+#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR
+struct mount_attr {
+ 	__u64 attr_set;
+ 	__u64 attr_clr;
+ 	__u64 propagation;
+ 	__u64 userns_fd;
+ };
+#endif
+ 
+ #if !HAVE_MOUNT_SETATTR
+ static inline int mount_setattr(int dfd, const char *path, unsigned int flags,
+-				struct lxc_mount_attr *attr, size_t size)
+				struct mount_attr *attr, size_t size)
+ {
+ 	return syscall(__NR_mount_setattr, dfd, path, flags, attr, size);
+ }
+
+From ef1e0607b82e27350c2d677d649c6a0a9693fd40 Mon Sep 17 00:00:00 2001
+From: Christian Brauner <brauner@kernel.org>
+Date: Tue, 9 Aug 2022 16:27:40 +0200
+Subject: [PATCH 2/3] build: detect sys/pidfd.h availability
+
+Fixes: #4176
+Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
+---
+ meson.build             | 1 +
+ src/lxc/process_utils.h | 6 ++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index f679aabbc8..e999542336 100644
+--- a/meson.build
+++ b/meson.build
+@@ -735,6 +735,7 @@ foreach tuple: [
+     ['sys/resource.h'],
+     ['sys/memfd.h'],
+     ['sys/personality.h'],
+    ['sys/pidfd.h'],
+     ['sys/signalfd.h'],
+     ['sys/timerfd.h'],
+     ['pty.h'],
+diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h
+index 9c15b15741..ed84741d0e 100644
+--- a/src/lxc/process_utils.h
+++ b/src/lxc/process_utils.h
+@@ -15,6 +15,10 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
+#if HAVE_SYS_PIDFD_H
+#include <sys/pidfd.h>
+#endif
+
+ #include "compiler.h"
+ #include "syscall_numbers.h"
+ 
+@@ -136,9 +140,11 @@
+ #endif
+ 
+ /* waitid */
+#if !HAVE_SYS_PIDFD_H
+ #ifndef P_PIDFD
+ #define P_PIDFD 3
+ #endif
+#endif
+ 
+ #ifndef CLONE_ARGS_SIZE_VER0
+ #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */
+
+From cbabe8abf11e7e7fb49c123bae31efdd9bc8f1e8 Mon Sep 17 00:00:00 2001
+From: Christian Brauner <brauner@kernel.org>
+Date: Tue, 9 Aug 2022 17:19:40 +0200
+Subject: [PATCH 3/3] build: check for FS_CONFIG_* header symbol in sys/mount.h
+
+Fixes: #4176
+Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
+---
+ meson.build           | 59 +++++++++++++++++++++++++++++++++++++++++--
+ src/lxc/mount_utils.h | 16 ++++++++++++
+ 2 files changed, 73 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e999542336..9f8a5de60c 100644
+--- a/meson.build
+++ b/meson.build
+@@ -639,8 +639,7 @@ if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') >
+     found_types += 'struct mount_attr (sys/mount.h)'
+ else
+     srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false)
+-    missing_types += 'struct mount_attr (sys/mount.h)'
+-endif
+    missing_types += 'struct mount_attr (sys/mount.h)' endif
+ 
+ ## Types.
+ decl_headers = '''
+@@ -656,6 +655,62 @@ else
+     missing_types += 'struct mount_attr (linux/mount.h)'
+ endif
+ 
+if cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG')
+    srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), true)
+    found_types += 'FSCONFIG_SET_FLAG'
+else
+    srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), false)
+    missing_types += 'FSCONFIG_SET_FLAG'
+endif
+
+if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_STRING')
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_STRING'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_STRING'
+endif
+
+if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_BINARY')
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_BINARY'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_BINARY'
+endif
+
+if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_EMPTY')
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_PATH_EMPTY'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_PATH_EMPTY'
+endif
+
+if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_FD')
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_PATH_FD'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_PATH_FD'
+endif
+
+if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_CREATE')
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_CMD_CREATE'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_CMD_CREATE'
+endif
+
+if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_RECONFIGURE')
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), true)
+    found_types += 'FS_CONFIG_SET_CMD_RECONFIGURE'
+else
+    srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), false)
+    missing_types += 'FS_CONFIG_SET_CMD_RECONFIGURE'
+endif
+
+ ## Headers.
+ foreach ident: [
+     ['bpf',               '''#include <sys/syscall.h>
+diff --git a/src/lxc/mount_utils.h b/src/lxc/mount_utils.h
+index ea392672d8..fd34739459 100644
+--- a/src/lxc/mount_utils.h
+++ b/src/lxc/mount_utils.h
+@@ -82,37 +82,53 @@ struct lxc_rootfs;
+ #endif
+ 
+ /* fsconfig() commands */
+#if !HAVE_FSCONFIG_SET_FLAG
+ #ifndef FSCONFIG_SET_FLAG
+ #define FSCONFIG_SET_FLAG 0 /* Set parameter, supplying no value */
+ #endif
+#endif
+ 
+#if !HAVE_FSCONFIG_SET_STRING
+ #ifndef FSCONFIG_SET_STRING
+ #define FSCONFIG_SET_STRING 1 /* Set parameter, supplying a string value */
+ #endif
+#endif
+ 
+#if !HAVE_FSCONFIG_SET_BINARY
+ #ifndef FSCONFIG_SET_BINARY
+ #define FSCONFIG_SET_BINARY 2 /* Set parameter, supplying a binary blob value */
+ #endif
+#endif
+ 
+#if !HAVE_FSCONFIG_SET_PATH
+ #ifndef FSCONFIG_SET_PATH
+ #define FSCONFIG_SET_PATH 3 /* Set parameter, supplying an object by path */
+ #endif
+#endif
+ 
+#if !HAVE_FSCONFIG_SET_PATH_EMPTY
+ #ifndef FSCONFIG_SET_PATH_EMPTY
+ #define FSCONFIG_SET_PATH_EMPTY 4 /* Set parameter, supplying an object by (empty) path */
+ #endif
+#endif
+ 
+#if !HAVE_FSCONFIG_SET_FD
+ #ifndef FSCONFIG_SET_FD
+ #define FSCONFIG_SET_FD 5 /* Set parameter, supplying an object by fd */
+ #endif
+#endif
+ 
+#if !HAVE_FSCONFIG_CMD_CREATE
+ #ifndef FSCONFIG_CMD_CREATE
+ #define FSCONFIG_CMD_CREATE 6 /* Invoke superblock creation */
+ #endif
+#endif
+ 
+#if !FSCONFIG_CMD_RECONFIGURE
+ #ifndef FSCONFIG_CMD_RECONFIGURE
+ #define	FSCONFIG_CMD_RECONFIGURE 7	/* Invoke superblock reconfiguration */
+ #endif
+#endif
+ 
+ /* fsmount() flags */
+ #ifndef FSMOUNT_CLOEXEC
--- a/app-containers/lxc/lxc-5.0.1-r1.ebuild
+++ b/app-containers/lxc/lxc-5.0.1-r1.ebuild
@ -67,6 +67,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc

 DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )

+PATCHES=( "${FILESDIR}"/lxc-5.0.1-glibc-2.36.patch )
+
 pkg_setup() {
 	linux-info_pkg_setup
 }
--- a/app-containers/umoci/Manifest
+++ b/app-containers/umoci/Manifest
@ -1,2 +1 @@
-DIST umoci-0.2.1.tar.gz 241472 BLAKE2B 2802fcb14e717a6460f9dc06226d3b430cce2181838a32064e86987131317947a4b117e91d11f981fa1df027804dbf2d92472b5c21749783b4f2ed371c699e7e SHA512 dfd7bbd1afd232400a9bffaf6c074d28ce4ce696c9f3c70bd436cc41b96928415d0793d57b1cf34dd70efd7d0e5eb567eaeea65d793c27ff9ea46fb190bd1807
 DIST umoci-0.4.6.tar.gz 2273608 BLAKE2B d5a36c78918697b9c8f54a5c4b914a9124b5e989dff3efc81a9f64f1bd276189d15a565a6ec2e8d4021925017e9a7a17f7cc5359a552f7c57dda414c25d2fb02 SHA512 0614dd583e00b6e2e69256f1ae1d3316e5bb5989a177d18c5ceacf3af18ab82ccf8edef879b6c813855d878d5af53c541ac433d81e6c20796885a26c57564118
--- a/app-containers/umoci/umoci-0.2.1.ebuild
+++ b/app-containers/umoci/umoci-0.2.1.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/openSUSE/umoci"
-COMMIT=0465f83826bc4f52e6e3c4dbb1022ec5792c421f
-inherit golang-vcs-snapshot
-
-DESCRIPTION="Manipulation tool for OCI images"
-HOMEPAGE="https://github.com/openSUSE/umoci"
-SRC_URI="https://github.com/openSUSE/umoci/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-go/go-md2man"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-RESTRICT="test"
-
-src_compile() {
-	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go build -v -work -x \
-	-ldflags "-w -X main.gitCommit=${COMMIT} -X main.version=${PV}" \
-		-o "bin/${PN}" ./cmd/${PN}
-	echo "$@"
-	"$@" || die
-	cd man
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
-}
-
-src_install() {
-dobin bin/${PN}
-doman man/*.1
-dodoc CHANGELOG.md
-einstalldocs
-}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/dehydrated/dehydrated-0.7.0-r1.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.7.0-r1.ebuild
@ -4,8 +4,8 @@
 EAPI="7"

 DESCRIPTION="A client for signing certificates with an ACME-server"
-HOMEPAGE="https://github.com/lukas2511/dehydrated"
-SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/dehydrated-io/dehydrated"
+SRC_URI="https://github.com/dehydrated-io/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A client for signing certificates with an ACME-server"
-HOMEPAGE="https://github.com/lukas2511/dehydrated"
-SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-IUSE="+cron"
-
-RDEPEND="acct-group/dehydrated
-	acct-user/dehydrated
-	app-shells/bash
-	net-misc/curl
-	cron? ( virtual/cron )"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-CN-extraction-for-older-openssl-versions.patch )
-
-src_configure() {
-	default
-	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /etc/${PN}
-	doins docs/examples/{config,domains.txt,hook.sh}
-	fperms u+x /etc/${PN}/hook.sh
-	dodoc docs/*.md
-
-	insinto /etc/${PN}/config.d
-	doins "${FILESDIR}"/00_gentoo.sh
-
-	if use cron ; then
-		insinto /etc/cron.d
-		newins "${FILESDIR}"/cron ${PN}
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		einfo "See /etc/dehydrated/config for configuration."
-
-		use cron && einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
-	fi
-}
--- a/app-crypt/dehydrated/files/cron
+++ b/app-crypt/dehydrated/files/cron
@ -1,2 +0,0 @@
-# dehydrated cron job
-#0 2 * * * dehydrated /usr/bin/dehydrated --cron
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
@ -22,7 +22,7 @@ else
 	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/john-${HASH_COMMIT}"

-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi

 LICENSE="GPL-2"
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@ -1,2 +1,2 @@
 DIST pinentry-1.2.1.tar.bz2 547698 BLAKE2B aa47612aa3a6f74c3676bf4018780356cb22ed4078792c1f466f9e0465199428c151c0e20dfbe6c784ef93c2b42b673daff0b6adc74c8c98fed9921e65ed42ea SHA512 a665315628f4dcf07e16a22db3f3be15d7e7e93b3deec0546c7275b71b0e3bd65535a08af5e12d6339fd6595132df86529401d9d12bd17c428a3466e8dfafab6
-DIST pinentry-1.2.1.tar.bz2.sig 119 BLAKE2B 6a9fc12a09b5122bf531e875977f63fa7caa75d39afcb4e9a9a957df87ba0a6f6156ad9799cdde8625debe0b7c3cb9482616b0ab57c133ffd2f9120ddf47815f SHA512 b14525f6ace3d1fc3dc9e1173de8821fa2a960b870876beb10b98f41222378c1e3f4f79481f3f3854c1753e8dc9a7eb92862ffa583c7be0788ec25045a4e1176
+DIST pinentry-1.2.1.tar.bz2.sig 238 BLAKE2B 01ba3dc296a8e76c546d21d0bb0cd13778476d5d5b3ef55a3401c6a0353a56d79250d11555afb31c77c5a77e63847ded0f8eaef395bb0dc2ee3ff1d6a4ed83bd SHA512 d0e8435dc169a58f111f057f1c9fbb6c70da32a850f1107d6abdf41357c1714832728109ae61507db313d7eaef9596e5faf92fd21bed78adcc46a8c8a590430b
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/eblook/Manifest
+++ b/app-dicts/eblook/Manifest
@ -1 +1,2 @@
 DIST eblook-1.6.1.tar.gz 440727 BLAKE2B 313dcc89fea9dbc8dac8c9fda618cf4e39d0cfef4f67ba7cf2ab29e3b1c8dc0559407c1f1c68c9994594b784acb445c6fe988456e14da324bd38c89de23f3ffe SHA512 36f4f383a53a0332a2dec0e40d2743c93d35c9f51a7de2d2706bbc18a4fde215d4e345feb175bebf428c1760cb32e73148fb9b336fcde8c0d8b924ee6ecfd6a4
+DIST eblook_1.6.1-16.debian.tar.xz 92044 BLAKE2B 9a6b19541c910694b0b079cfb4bcb9ae38f4505e25a08f4c17dd7af6cf04a1b5e9a33aadbda7a4c5a8509699b0a5efe4eb5962b6cdd6f63a82105bacad5231a7 SHA512 538956ac54cedae76563bcbc6c8ac7f97be4cdc2d9cc506fc14444dc3a7c9631040a1becf259c1f465b4e875333ffb43d6af5c8102b9fc8b862b7567cafc8d83
--- a/app-dicts/eblook/eblook-1.6.1_p16.ebuild
+++ b/app-dicts/eblook/eblook-1.6.1_p16.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Interactive search utility for electronic dictionaries"
+HOMEPAGE="http://openlab.ring.gr.jp/edict/eblook/"
+SRC_URI="http://openlab.ring.gr.jp/edict/eblook/dist/${PN}-$(ver_cut 1-3).tar.gz"
+SRC_URI+=" mirror://debian/pool/main/e/eblook/eblook_$(ver_cut 1-3)-$(ver_cut 5).debian.tar.xz"
+S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+DEPEND=">=dev-libs/eb-3.3.4"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-eb-conf="${EPREFIX}"/etc/eb.conf
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs/emacs-25.3-r12.ebuild
+++ b/app-editors/emacs/emacs-25.3-r12.ebuild
@ -53,7 +53,7 @@ RDEPEND="acct-group/mail
 			media-libs/freetype
 			x11-libs/libXft
 			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
+			cairo? ( >=x11-libs/cairo-1.12.18[X] )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
 				>=dev-libs/m17n-lib-1.5.1
--- a/app-editors/emacs/emacs-26.3-r8.ebuild
+++ b/app-editors/emacs/emacs-26.3-r8.ebuild
@ -55,7 +55,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 			media-libs/freetype
 			x11-libs/libXft
 			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
+			cairo? ( >=x11-libs/cairo-1.12.18[X] )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
 				>=dev-libs/m17n-lib-1.5.1
--- a/app-editors/emacs/emacs-27.2-r6.ebuild
+++ b/app-editors/emacs/emacs-27.2-r6.ebuild
@ -88,7 +88,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 			media-libs/freetype
 			x11-libs/libXft
 			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
+			cairo? ( >=x11-libs/cairo-1.12.18[X] )
 			harfbuzz? ( media-libs/harfbuzz:0= )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
--- a/app-editors/emacs/emacs-28.1-r2.ebuild
+++ b/app-editors/emacs/emacs-28.1-r2.ebuild
@ -89,7 +89,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 			media-libs/freetype
 			x11-libs/libXft
 			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
+			cairo? ( >=x11-libs/cairo-1.12.18[X] )
 			harfbuzz? ( media-libs/harfbuzz:0= )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
--- a/app-editors/emacs/emacs-28.1-r3.ebuild
+++ b/app-editors/emacs/emacs-28.1-r3.ebuild
@ -89,7 +89,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 			media-libs/freetype
 			x11-libs/libXft
 			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
+			cairo? ( >=x11-libs/cairo-1.12.18[X] )
 			harfbuzz? ( media-libs/harfbuzz:0= )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
--- a/app-editors/emacs/emacs-28.2-r1.ebuild
+++ b/app-editors/emacs/emacs-28.2-r1.ebuild
@ -91,7 +91,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 			media-libs/freetype
 			x11-libs/libXft
 			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
+			cairo? ( >=x11-libs/cairo-1.12.18[X] )
 			harfbuzz? ( media-libs/harfbuzz:0= )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
--- a/app-editors/emacs/emacs-28.2.9999.ebuild
+++ b/app-editors/emacs/emacs-28.2.9999.ebuild
@ -88,7 +88,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 			media-libs/freetype
 			x11-libs/libXft
 			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
+			cairo? ( >=x11-libs/cairo-1.12.18[X] )
 			harfbuzz? ( media-libs/harfbuzz:0= )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@ -57,7 +57,7 @@ X_DEPEND="x11-libs/libICE
 		media-libs/freetype
 		x11-libs/libXft
 		x11-libs/libXrender
-		cairo? ( >=x11-libs/cairo-1.12.18 )
+		cairo? ( >=x11-libs/cairo-1.12.18[X] )
 		harfbuzz? ( media-libs/harfbuzz:0= )
 		m17n-lib? (
 			>=dev-libs/libotf-0.9.4
@ -173,7 +173,6 @@ src_prepare() {
 	fi

 	if use jit; then
-		export NATIVE_FULL_AOT=1
 		find lisp -type f -name "*.elc" -delete || die

 		# These files ignore LDFLAGS. We assign the variable here, because
@ -352,7 +351,7 @@ src_configure() {
 		$(use_with games gameuser ":gamestat") \
 		$(use_with gmp libgmp) \
 		$(use_with gpm) \
-		$(use_with jit native-compilation) \
+		$(use_with jit native-compilation aot) \
 		$(use_with json) \
 		$(use_with kerberos) $(use_with kerberos kerberos5) \
 		$(use_with lcms lcms2) \
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@ -1,6 +1,4 @@
-DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
-DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
-DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
-DIST vim-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
 DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
+DIST vim-9.0.0399.tar.gz 16833387 BLAKE2B f9d6588920b49ef32b82d012e1c4f8a34dc505267b67027a3b4302dd99d7987645c29a91fdb234fffa873b342488b4d9c85d05d3fe7a332042781881a61bea5e SHA512 6b261bf3aaa355e7a42de1785b134bccc51086495578730b9bc3b8e048679caa3a901e576a360cba5f1aa4d164c7f162a3f916e945b3f5f71e893ea30e0ca826
+DIST vim-9.0.0655.tar.gz 16804127 BLAKE2B e021ff4dd370cdd9b39fb9df0a12309215abd780ec297760b92b6caf924882465b28f9ba65d94ad75a229eb01c8f393f24a29a11919a96d78bb6fb45ef2971e3 SHA512 aa267941e835eecbeeffa7989fb525bdf4269f84d9c88d135a26d74ab7d025487863405b6e0f1391023c30193a122ed3e85a7a71bd4dc48058f3fe3377798f38
 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
--- a/app-editors/gvim/gvim-8.2.4586.ebuild
+++ b/app-editors/gvim/gvim-8.2.4586.ebuild
@ -1,383 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim-core and app-editors/gvim
-
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-fi
-S="${WORKDIR}"/vim-${PV}
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-LICENSE="vim"
-SLOT="0"
-IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	crypt? ( dev-libs/libsodium:= )
-	cscope? ( dev-util/cscope )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_impl_dep 'deprecated' lua5-1)
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}"
-# configure runs the Lua interpreter
-BDEPEND="
-	sys-devel/autoconf
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	nls? ( sys-devel/gettext )
-"
-
-# various failures (bugs #630042 and #682320)
-RESTRICT="test"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--with-gnome=no
-		$(use_enable sound canberra)
-		$(use_enable acl)
-		$(use_enable crypt libsodium)
-		$(use_enable cscope)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python python3interp)
-		$(use_with python python3-command "${PYTHON}")
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	if use lua; then
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# update icon cache
-	xdg_icon_cache_update
-
-	# call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# update icon cache
-	xdg_icon_cache_update
-
-	# call eselect vi update
-	eselect_vi_update
-}
--- a/app-editors/gvim/gvim-9.0.0099.ebuild
+++ b/app-editors/gvim/gvim-9.0.0099.ebuild
@ -11,7 +11,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"

-inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
+inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 toolchain-funcs ruby-single

 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@ -209,6 +209,10 @@ src_configure() {
 	)

 	if use lua; then
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#874690)
+		use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
 		myconf+=(
 			--enable-luainterp
 			$(use_with lua_single_target_luajit luajit)
--- a/app-editors/gvim/gvim-9.0.0399.ebuild
+++ b/app-editors/gvim/gvim-9.0.0399.ebuild
@ -6,12 +6,12 @@ EAPI=8
 # Please bump with app-editors/vim-core and app-editors/vim

 VIM_VERSION="9.0"
-LUA_COMPAT=( lua5-1 luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"

-inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
+inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils

 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@ -29,10 +29,11 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"

 LICENSE="vim"
 SLOT="0"
-IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
+	aqua? ( !motif )
 "

 RDEPEND="
@ -45,23 +46,11 @@ RDEPEND="
 	x11-libs/libXt
 	acl? ( kernel_linux? ( sys-apps/acl ) )
 	!aqua? (
-		gtk? (
+		motif? ( >=x11-libs/motif-2.3:0 )
+		!motif? (
 			x11-libs/gtk+:3
 			x11-libs/libXft
 		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
 	)
 	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
@ -87,6 +76,7 @@ BDEPEND="
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"

 # various failures (bugs #630042 and #682320)
 RESTRICT="test"
@ -220,6 +210,10 @@ src_configure() {
 	)

 	if use lua; then
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#874690)
+		use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
 		myconf+=(
 			--enable-luainterp
 			$(use_with lua_single_target_luajit luajit)
@ -227,13 +221,7 @@ src_configure() {
 		)
 	fi

-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
+	# Default is gtk unless aqua or motif are enabled
 	echo ; echo
 	if use aqua; then
 		einfo "Building gvim with the Carbon GUI"
@ -241,23 +229,13 @@ src_configure() {
 			--enable-darwin
 			--enable-gui=carbon
 		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
 	elif use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
 	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
 	fi
 	echo ; echo

@ -274,6 +252,14 @@ src_configure() {
 		export ac_cv_func_sigaction=no
 	fi

+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		--with-vim-name=gvim \
--- a/app-editors/gvim/gvim-9.0.0655.ebuild
+++ b/app-editors/gvim/gvim-9.0.0655.ebuild
@ -3,15 +3,15 @@

 EAPI=8

-# Please bump with app-editors/vim-core and app-editors/gvim
+# Please bump with app-editors/vim-core and app-editors/vim

-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..10} )
+VIM_VERSION="9.0"
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"

-inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
+inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils

 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 S="${WORKDIR}"/vim-${PV}
@ -29,10 +29,11 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"

 LICENSE="vim"
 SLOT="0"
-IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
+	aqua? ( !motif )
 "

 RDEPEND="
@ -45,23 +46,11 @@ RDEPEND="
 	x11-libs/libXt
 	acl? ( kernel_linux? ( sys-apps/acl ) )
 	!aqua? (
-		gtk? (
+		motif? ( >=x11-libs/motif-2.3:0 )
+		!motif? (
 			x11-libs/gtk+:3
 			x11-libs/libXft
 		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
 	)
 	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
@ -87,6 +76,7 @@ BDEPEND="
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"

 # various failures (bugs #630042 and #682320)
 RESTRICT="test"
@ -96,20 +86,14 @@ pkg_setup() {
 	unset LANG LC_ALL
 	export LC_COLLATE="C"

-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
 	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }

 src_prepare() {
 	if [[ ${PV} != 9999* ]]; then
-		rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || di
-
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
+		eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches"
 	fi

 	# Fixup a script to use awk instead of nawk
@ -162,11 +146,26 @@ src_prepare() {
 		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
 		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'

+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
 	eapply_user
 }

 src_configure() {
-	local myconf=()

 	# Fix bug 37354: Disallow -funroll-all-loops on amd64
 	# Bug 57859 suggests that we want to do this for all archs
@ -177,14 +176,6 @@ src_configure() {
 	# multiple archs...
 	replace-flags -O3 -O2

-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
 	emake -j1 -C src autoconf

 	# This should fix a sandbox violation (see bug 24447). The hvc
@ -198,7 +189,7 @@ src_configure() {

 	use debug && append-flags "-DDEBUG"

-	myconf=(
+	local myconf=(
 		--with-features=huge
 		--disable-gpm
 		--with-gnome=no
@ -218,14 +209,11 @@ src_configure() {
 		$(use_enable tcl tclinterp)
 	)

-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
 	if use lua; then
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#874690)
+		use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
 		myconf+=(
 			--enable-luainterp
 			$(use_with lua_single_target_luajit luajit)
@ -233,13 +221,7 @@ src_configure() {
 		)
 	fi

-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
+	# Default is gtk unless aqua or motif are enabled
 	echo ; echo
 	if use aqua; then
 		einfo "Building gvim with the Carbon GUI"
@ -247,23 +229,13 @@ src_configure() {
 			--enable-darwin
 			--enable-gui=carbon
 		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
 	elif use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
 	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
 	fi
 	echo ; echo

@ -280,6 +252,14 @@ src_configure() {
 		export ac_cv_func_sigaction=no
 	fi

+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		--with-vim-name=gvim \
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@ -11,7 +11,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"

-inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
+inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils

 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@ -29,7 +29,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"

 LICENSE="vim"
 SLOT="0"
-IUSE="acl aqua crypt cscope debug lua motif netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@ -76,6 +76,7 @@ BDEPEND="
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"

 # various failures (bugs #630042 and #682320)
 RESTRICT="test"
@ -209,6 +210,10 @@ src_configure() {
 	)

 	if use lua; then
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#874690)
+		use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
 		myconf+=(
 			--enable-luainterp
 			$(use_with lua_single_target_luajit luajit)
@ -247,6 +252,14 @@ src_configure() {
 		export ac_cv_func_sigaction=no
 	fi

+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		--with-vim-name=gvim \
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@ -8,7 +8,6 @@
  <use>
    <flag name="crypt">Use <pkg>dev-libs/libsodium</pkg> for crypto support</flag>
    <flag name="cscope">Enable cscope interface</flag>
-    <flag name="gtk2">Enable GTK+2 interface</flag>
    <flag name="netbeans">Include netbeans external editor integration support</flag>
    <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
  </use>
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@ -1,7 +1,4 @@
-DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
-DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
-DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18
-DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
-DIST vim-core-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
 DIST vim-core-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
+DIST vim-core-9.0.0399.tar.gz 16833387 BLAKE2B f9d6588920b49ef32b82d012e1c4f8a34dc505267b67027a3b4302dd99d7987645c29a91fdb234fffa873b342488b4d9c85d05d3fe7a332042781881a61bea5e SHA512 6b261bf3aaa355e7a42de1785b134bccc51086495578730b9bc3b8e048679caa3a901e576a360cba5f1aa4d164c7f162a3f916e945b3f5f71e893ea30e0ca826
+DIST vim-core-9.0.0655.tar.gz 16804127 BLAKE2B e021ff4dd370cdd9b39fb9df0a12309215abd780ec297760b92b6caf924882465b28f9ba65d94ad75a229eb01c8f393f24a29a11919a96d78bb6fb45ef2971e3 SHA512 aa267941e835eecbeeffa7989fb525bdf4269f84d9c88d135a26d74ab7d025487863405b6e0f1391023c30193a122ed3e85a7a71bd4dc48058f3fe3377798f38
 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
--- a/app-editors/vim-core/vim-core-8.2.4586-r1.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.4586-r1.ebuild
@ -1,228 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim and app-editors/gvim
-
-VIM_VERSION="8.2"
-inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	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}"/vim-${PV}
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-LICENSE="vim"
-SLOT="0"
-IUSE="nls acl minimal"
-
-BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648
-	!<app-editors/vim-8.2.4328-r1"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug #82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i \
-		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "sed failed"
-
-	# See bug #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug #29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug #43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug #37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug #18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite ${file}
-		fi
-	done
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r6 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
-		rm -v "${ED}"/usr/bin/vimtutor || die
-
-		for f in "${ED}${vimfiles}"/colors/*.vim; do
-			if [[ ${f} != */@(default).vim ]] ; then
-				printf '%s\0' "${f}"
-			fi
-		done | xargs -0 rm -f || die
-
-		for f in "${ED}${vimfiles}"/syntax/*.vim; do
-			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
-				printf '%s\0' "${f}"
-			fi
-		done | xargs -0 rm -f || die
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-
-	# install gvim icon since both vim/gvim desktop files reference it
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	xdg_icon_cache_update
-}
--- a/app-editors/vim-core/vim-core-9.0.0049-r2.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0049-r2.ebuild
@ -6,7 +6,7 @@ EAPI=8
 # Please bump with app-editors/vim and app-editors/gvim

 VIM_VERSION="9.0"
-inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@ -29,9 +29,6 @@ IUSE="nls acl minimal"
 # ncurses is only needed by ./configure, so no subslot operator required
 DEPEND=">=sys-libs/ncurses-5.2-r2:0"
 BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!<app-editors/vim-8.2.4328-r1"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"

 pkg_setup() {
 	# people with broken alphabets run into trouble. bug #82186.
@ -42,7 +39,7 @@ pkg_setup() {
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches"
+		eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
 	fi

 	# Fixup a script to use awk instead of nawk
@ -147,6 +144,14 @@ src_configure() {
 	# Keep Gentoo Prefix env contained within the EPREFIX
 	use prefix && myconf+=( --without-local-dir )

+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
 	econf "${myconf[@]}"
 }

--- a/app-editors/vim-core/vim-core-8.2.5066-r3.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.5066-r3.ebuild
@ -5,19 +5,19 @@ EAPI=8

 # Please bump with app-editors/vim and app-editors/gvim

-VIM_VERSION="8.2"
-inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+VIM_VERSION="9.0"
+inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz"
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
 	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}"/vim-${PV}
+S="${WORKDIR}/vim-${PV}"

 DESCRIPTION="vim and gvim shared files"
 HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
@ -29,24 +29,17 @@ IUSE="nls acl minimal"
 # ncurses is only needed by ./configure, so no subslot operator required
 DEPEND=">=sys-libs/ncurses-5.2-r2:0"
 BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!<app-editors/vim-8.2.4328-r1"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"

 pkg_setup() {
 	# people with broken alphabets run into trouble. bug #82186.
 	unset LANG LC_ALL
 	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
 }

 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches
+		eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
 	fi

 	# Fixup a script to use awk instead of nawk
@ -58,8 +51,8 @@ src_prepare() {
 	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"

 	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die

 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
@ -98,16 +91,6 @@ src_prepare() {
 		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
 		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'

-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug #37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
 	# Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
 	# everyone since previous flag filtering bugs have turned out to affect
 	# multiple archs...
@ -123,6 +106,14 @@ src_configure() {
 	# Remove src/auto/configure file.
 	rm -v src/auto/configure || die "rm configure failed"

+	eapply_user
+}
+
+src_configure() {
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
 	emake -j1 -C src autoconf

 	# This should fix a sandbox violation (see bug 24447). The hvc
@ -136,22 +127,32 @@ src_configure() {
 	# Let Portage do the stripping. Some people like that.
 	export ac_cv_prog_STRIP="$(type -P true ) faking strip"

+	local myconf=(
+		--with-modified-by=Gentoo-${PVR}
+		--enable-gui=no
+		--without-x
+		--disable-darwin
+		--disable-perlinterp
+		--disable-pythoninterp
+		--disable-rubyinterp
+		--disable-gpm
+		--disable-selinux
+		$(use_enable nls)
+		$(use_enable acl)
+	)
+
 	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--enable-gui=no \
-		--without-x \
-		--disable-darwin \
-		--disable-perlinterp \
-		--disable-pythoninterp \
-		--disable-rubyinterp \
-		--disable-gpm \
-		--disable-selinux \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		${myconf}
+	use prefix && myconf+=( --without-local-dir )
+
+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
+	econf "${myconf[@]}"
 }

 src_compile() {
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@ -6,7 +6,7 @@ EAPI=8
 # Please bump with app-editors/vim and app-editors/gvim

 VIM_VERSION="9.0"
-inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@ -29,9 +29,6 @@ IUSE="nls acl minimal"
 # ncurses is only needed by ./configure, so no subslot operator required
 DEPEND=">=sys-libs/ncurses-5.2-r2:0"
 BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!<app-editors/vim-8.2.4328-r1"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"

 pkg_setup() {
 	# people with broken alphabets run into trouble. bug #82186.
@ -42,7 +39,7 @@ pkg_setup() {
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches"
+		eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
 	fi

 	# Fixup a script to use awk instead of nawk
@ -147,6 +144,14 @@ src_configure() {
 	# Keep Gentoo Prefix env contained within the EPREFIX
 	use prefix && myconf+=( --without-local-dir )

+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
 	econf "${myconf[@]}"
 }

--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@ -1,7 +1,4 @@
-DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
-DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
-DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18
-DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
-DIST vim-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
 DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
+DIST vim-9.0.0399.tar.gz 16833387 BLAKE2B f9d6588920b49ef32b82d012e1c4f8a34dc505267b67027a3b4302dd99d7987645c29a91fdb234fffa873b342488b4d9c85d05d3fe7a332042781881a61bea5e SHA512 6b261bf3aaa355e7a42de1785b134bccc51086495578730b9bc3b8e048679caa3a901e576a360cba5f1aa4d164c7f162a3f916e945b3f5f71e893ea30e0ca826
+DIST vim-9.0.0655.tar.gz 16804127 BLAKE2B e021ff4dd370cdd9b39fb9df0a12309215abd780ec297760b92b6caf924882465b28f9ba65d94ad75a229eb01c8f393f24a29a11919a96d78bb6fb45ef2971e3 SHA512 aa267941e835eecbeeffa7989fb525bdf4269f84d9c88d135a26d74ab7d025487863405b6e0f1391023c30193a122ed3e85a7a71bd4dc48058f3fe3377798f38
 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
--- a/app-editors/vim/vim-8.2.4586.ebuild
+++ b/app-editors/vim/vim-8.2.4586.ebuild
@ -1,350 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim-core and app-editors/gvim
-
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	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
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-LICENSE="vim"
-SLOT="0"
-IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	vim-pager? ( !minimal )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	crypt? ( dev-libs/libsodium:= )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? ( ${LUA_DEPS}
-		$(lua_gen_impl_dep 'deprecated' lua5-1)
-	)
-	~app-editors/vim-core-${PV}
-	!<app-editors/vim-core-8.2.4328-r1
-	vim-pager? ( app-editors/vim-core[-minimal] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}"
-# configure runs the Lua interpreter
-BDEPEND="
-	sys-devel/autoconf
-	lua? ( ${LUA_DEPS} )
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug #82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug #29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug #43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug #37354: Disallow -funroll-all-loops on amd64
-	# Bug #57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug #24447). The hvc
-	# things are for ppc64, see bug #86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite ${file}
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-canberra
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			$(use_enable sound canberra)
-			$(use_enable acl)
-			$(use_enable crypt libsodium)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python python3interp)
-			$(use_with python python3-command "${PYTHON}")
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		if use lua; then
-			myconf+=(
-				--enable-luainterp
-				$(use_with lua_single_target_luajit luajit)
-				--with-lua-prefix="${EPREFIX}/usr"
-			)
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
-	# for more information on test variables we can use.
-	# Note that certain variables need vim-compatible regex (not PCRE), see e.g.
-	# http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
-	#
-	# Skipped tests:
-	# - Test_expand_star_star
-	# Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
-	# - Test_exrc
-	# Looks in wrong location? (bug #742710)
-	# - Test_job_tty_in_out
-	# Fragile and depends on TERM(?)
-	# - Test_spelldump_bang
-	# Hangs.
-	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug #187449)
-eselect_vi_update() {
-	ebegin "Calling eselect vi update"
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	if ! use minimal ; then
-		dosym vim /usr/bin/vimdiff
-	fi
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	domenu runtime/vim.desktop
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
--- a/app-editors/vim/vim-9.0.0099-r1.ebuild
+++ b/app-editors/vim/vim-9.0.0099-r1.ebuild
@ -11,7 +11,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"

-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@ -225,6 +225,10 @@ src_configure() {
 		fi

 		if use lua; then
+			# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+			# deprecated (in 5.1) luaL_openlib API (#874690)
+			use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
 			myconf+=(
 				--enable-luainterp
 				$(use_with lua_single_target_luajit luajit)
--- a/app-editors/vim/vim-9.0.0399.ebuild
+++ b/app-editors/vim/vim-9.0.0399.ebuild
@ -6,12 +6,12 @@ EAPI=8
 # Please bump with app-editors/vim-core and app-editors/gvim

 VIM_VERSION="9.0"
-LUA_COMPAT=( lua5-1 luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"

-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@ -224,6 +224,10 @@ src_configure() {
 		fi

 		if use lua; then
+			# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+			# deprecated (in 5.1) luaL_openlib API (#874690)
+			use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
 			myconf+=(
 				--enable-luainterp
 				$(use_with lua_single_target_luajit luajit)
@ -246,6 +250,14 @@ src_configure() {
 	# keep prefix env contained within the EPREFIX
 	use prefix && myconf+=( --without-local-dir )

+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		"${myconf[@]}"
@ -293,7 +305,9 @@ src_test() {
 	# Too sensitive to leaked environment variables.
 	# - Test_term_mouse_multiple_clicks_to_select_mode
 	# Hangs.
-	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\)'
+	# - Test_spelldump
+	# Hangs.
+	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)'

 	emake -j1 -C src/testdir nongui
 }
--- a/app-editors/vim/vim-9.0.0655-r1.ebuild
+++ b/app-editors/vim/vim-9.0.0655-r1.ebuild
@ -5,20 +5,20 @@ EAPI=8

 # Please bump with app-editors/vim-core and app-editors/gvim

-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..10} )
+VIM_VERSION="9.0"
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"

-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz"
+		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
 	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

@ -64,24 +64,22 @@ BDEPEND="
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"

 pkg_setup() {
 	# people with broken alphabets run into trouble. bug #82186.
 	unset LANG LC_ALL
 	export LC_COLLATE="C"

-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
 	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }

 src_prepare() {
+
 	if [[ ${PV} != 9999* ]] ; then
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
+		eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
 	fi

 	# Fixup a script to use awk instead of nawk
@ -147,11 +145,18 @@ src_prepare() {
 		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
 		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'

+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+
 	eapply_user
 }

 src_configure() {
-	local myconf=()

 	# Fix bug #37354: Disallow -funroll-all-loops on amd64
 	# Bug #57859 suggests that we want to do this for all archs
@ -162,13 +167,6 @@ src_configure() {
 	# multiple archs...
 	replace-flags -O3 -O2

-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
 	emake -j1 -C src autoconf

 	# This should fix a sandbox violation (see bug #24447). The hvc
@ -179,6 +177,7 @@ src_configure() {
 		fi
 	done

+	local myconf=()
 	if use minimal; then
 		myconf=(
 			--with-features=tiny
@ -226,6 +225,10 @@ src_configure() {
 		fi

 		if use lua; then
+			# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+			# deprecated (in 5.1) luaL_openlib API (#874690)
+			use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
 			myconf+=(
 				--enable-luainterp
 				$(use_with lua_single_target_luajit luajit)
@ -248,6 +251,14 @@ src_configure() {
 	# keep prefix env contained within the EPREFIX
 	use prefix && myconf+=( --without-local-dir )

+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		"${myconf[@]}"
@ -295,7 +306,9 @@ src_test() {
 	# Too sensitive to leaked environment variables.
 	# - Test_term_mouse_multiple_clicks_to_select_mode
 	# Hangs.
-	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\)'
+	# - Test_spelldump
+	# Hangs.
+	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)'

 	emake -j1 -C src/testdir nongui
 }
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@ -11,7 +11,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"

-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@ -64,6 +64,7 @@ BDEPEND="
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"

 pkg_setup() {
 	# people with broken alphabets run into trouble. bug #82186.
@ -78,7 +79,7 @@ src_prepare() {

 	if [[ ${PV} != 9999* ]] ; then
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches"
+		eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
 	fi

 	# Fixup a script to use awk instead of nawk
@ -224,6 +225,10 @@ src_configure() {
 		fi

 		if use lua; then
+			# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+			# deprecated (in 5.1) luaL_openlib API (#874690)
+			use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
 			myconf+=(
 				--enable-luainterp
 				$(use_with lua_single_target_luajit luajit)
@ -246,6 +251,14 @@ src_configure() {
 	# keep prefix env contained within the EPREFIX
 	use prefix && myconf+=( --without-local-dir )

+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		"${myconf[@]}"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/async/Manifest
+++ b/app-emacs/async/Manifest
@ -1,2 +1,3 @@
 DIST emacs-async-1.9.3.tar.gz 14394 BLAKE2B dd6a98e61027dae2fa9ebb8e20f81a2d2debff1e990e57084a747ea815d1e615dc0e4b8fe5fcdc1f562c0f02780951121f4a67b26584f4519290413da05dc1e9 SHA512 ecbbb6614882df8a58a3440a78867e6cd19ae448e2e897b27d6aeaf5e5a648dcedbac64afbfd6240b7e68c533c685060f453051ef9a85d9d4cca6831fbf2c1dd
 DIST emacs-async-1.9.4.tar.gz 15375 BLAKE2B 763c716672722e8d8ba2b1d351513ab545826214a475b155ef79b741cfd69ef02e579ccd10a09acfee712713e4f60ae746a509fa487ed464c4706baa17011a8f SHA512 ca225588868320485f886b7fced526bce951dac19319bdfe9c17e74c68c2e5cb624e324842025fdc8d94affe9d10bf44c86132b5e762593a9204a804eac43d2b
+DIST emacs-async-1.9.7.tar.gz 28411 BLAKE2B a033b0d84a61f133c0a871b6355626a67250b61c6ae4640331c8d14b3abda0d9d7405bb9fb09128874053cc310b3532772f8a515afb63b6d740492e10c9af5a9 SHA512 ca2c118594cc1478b1f68b3fce7e2b9c10cc3a90146b33a2631286cdef60c39932aa0036837ea9546f963105de7fae8fbe3ab8b6f36daff95323ca89a0fea645
--- a/app-emacs/async/async-1.9.7.ebuild
+++ b/app-emacs/async/async-1.9.7.ebuild
@ -0,0 +1,24 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+MY_P="emacs-async-${PV}"
+DESCRIPTION="Simple library for asynchronous processing in Emacs"
+HOMEPAGE="https://github.com/jwiegley/emacs-async"
+SRC_URI="https://github.com/jwiegley/emacs-async/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+src_compile() {
+	elisp-compile *.el
+	elisp-make-autoload-file
+}
--- a/app-emacs/mpg123-el/files/mpg123-el-1.61-stdlib.patch
+++ b/app-emacs/mpg123-el/files/mpg123-el-1.61-stdlib.patch
@ -0,0 +1,10 @@
+https://bugs.gentoo.org/874954
+
+--- mpg123-el-1.61/id3put.c
+++ mpg123-el-1.61/id3put.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
+#include <stdlib.h>
+ #include <string.h>
+ 
+ #define INLEN 30
--- a/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
+++ b/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -16,6 +16,7 @@ KEYWORDS="amd64 ppc x86"
 RDEPEND="media-sound/mpg123
 	media-sound/alsa-utils"

+PATCHES=( "${FILESDIR}/${P}-stdlib.patch" )
 SITEFILE="50${PN}-gentoo.el"

 src_compile() {
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@ -1,5 +1,2 @@
-DIST diskimage-builder-3.22.0.tar.gz 507997 BLAKE2B 559203fb5e92ff6b32e3cda6e977c46ea247f47f0d41d72db5f4e6fa6957c599814fa65f24b3d0783fbf95fa72efb52db2bfa30f608b08955bc64bc8c4943d59 SHA512 1a2c4f6301eb90268cc4cc47e600e2de404336f871606beaebadb367ab8976cf6618da3a9ed594682f53b84e70c2b658d519732031c9b3423a906876ba3b03a4
-DIST diskimage-builder-3.23.0.tar.gz 509773 BLAKE2B 5896571442b5e359cbae10df3c504c2a3df48ace6ec52294afbad6c03baf300336d955b0180a174395cad118da42dbacfb395df9b32a85976982ff5194ec9e18 SHA512 080bca891890a02a7a0c6910668ccc966a8f2282f62a8b89cd01d5165b4cb52e4bd198b7a2ff431d86a75acae86e7490389f7053f197947c820925d540a3c934
-DIST diskimage-builder-3.23.1.tar.gz 509516 BLAKE2B 05d0484b33bf965f6f534445a13be3771a486b586d36f13905d351e434a6d04732195b484ec29f5c5792e8343bbd56dffb7393641d3d2902e5bfadb2759d3a4b SHA512 0f881dba486f057e18ce81eeb3eca91fa421e6ad6fe59d5e7c4eda11721fde243e0e233863545d16010386defc23aebf195364615324296393a77bab1ce60359
 DIST diskimage-builder-3.24.0.tar.gz 511917 BLAKE2B 4db5132d449c932202ede7a4d9e9f5711b667c39f3dad51dcd68ec81f49a71bafc4bfb09de363a5d16cac89942385a0b43b1adb31424581ccf0c903c0df5f80e SHA512 1e98e8c8886f2d046ccb2b02a647e294ba2d8bd691168678ef81ddab889f8945bae3c46e5e26ad03e0b2311c367bf3dd5d4bd2f07baab6e2002433ca1dfe0f74
 DIST diskimage-builder-3.25.0.tar.gz 512950 BLAKE2B 3a0c5658df5bc2498d4656b77c152dba9bedbbc342b53b20b88e89327cbb98e9c8e5dd8de97cc0b7b0bd31f01cd4d425e8e2f158bde24746b08a460db4ac79da SHA512 e602a9e8e3a8cef1c3cc62fcb3074183a4028c70f2b9e9c27416b6244773eb7cf2aa33a5bf38dca5f10dcfbee5d80eaffa9287e14beccb065cec3ddaf7a76ff7
--- a/app-emulation/diskimage-builder/diskimage-builder-3.22.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.22.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder"
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	sys-fs/dosfstools
-	sys-apps/gptfdisk
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"
--- a/app-emulation/diskimage-builder/diskimage-builder-3.23.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.23.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder"
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	sys-fs/dosfstools
-	sys-apps/gptfdisk
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"
--- a/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder"
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	sys-fs/dosfstools
-	sys-apps/gptfdisk
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"
--- a/app-emulation/libvirt/files/libvirt-7.10.0-fix_soname.patch
+++ b/app-emulation/libvirt/files/libvirt-7.10.0-fix_soname.patch
@ -1,13 +0,0 @@
-diff --git a/tools/nss/meson.build b/tools/nss/meson.build
-index 198936f3d42e1827d0f03ff3b27a198bdc4fa59c..f77309ebcab8063c515ae2bf95dbff542238a2ee 100644
--- a/tools/nss/meson.build
-+++ b/tools/nss/meson.build
-@@ -59,7 +59,7 @@ nss_libvirt_guest_syms = '@0@@1@'.format(
-   meson.current_source_dir() / nss_guest_sym_file,
- )
- 
-nss_libvirt_lib = shared_module(
-+nss_libvirt_lib = shared_library(
-   'nss_libvirt',
-   name_prefix: nss_prefix,
-   name_suffix: 'so.@0@'.format(nss_so_ver),
--- a/app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch
+++ b/app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch
@ -1,32 +0,0 @@
-From c80a05cd7d5f17ee16a2bc2546981863451fcab7 Mon Sep 17 00:00:00 2001
-From: "System user; portage" <portage@kestrel.43-1.org>
-Date: Wed, 8 Dec 2021 15:07:06 -0600
-Subject: [PATCH] Revert "lxc: controller: Fix container launch on cgroup v1"
-
-This reverts commit 1b9ce05ce241a581d4e80228c92ceb0266f21f94.
---
- src/lxc/lxc_controller.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
-index 444f728af4..8953e0c904 100644
--- a/src/lxc/lxc_controller.c
-+++ b/src/lxc/lxc_controller.c
-@@ -865,12 +865,12 @@ static int virLXCControllerSetupCgroupLimits(virLXCController *ctrl)
-     nodeset = virDomainNumatuneGetNodeset(ctrl->def->numa, auto_nodeset, -1);
- 
-     if (!(ctrl->cgroup = virLXCCgroupCreate(ctrl->def,
-                                            getpid(),
-+                                            ctrl->initpid,
-                                             ctrl->nnicindexes,
-                                             ctrl->nicindexes)))
-         goto cleanup;
- 
-    if (virCgroupAddMachineProcess(ctrl->cgroup, ctrl->initpid) < 0)
-+    if (virCgroupAddMachineProcess(ctrl->cgroup, getpid()) < 0)
-         goto cleanup;
- 
-     /* Add all qemu-nbd tasks to the cgroup */
-- 
-2.32.0
-
--- a/app-emulation/libvirt/files/libvirt-8.5.0-glibc-2.36.patch
+++ b/app-emulation/libvirt/files/libvirt-8.5.0-glibc-2.36.patch
@ -1,67 +0,0 @@
-https://bugs.gentoo.org/863446
-https://github.com/libvirt/libvirt/commit/9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90
-https://github.com/libvirt/libvirt/commit/c0d9adf220dc0d223330a7bac37b174132d330ba
-
-From 9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 1 Aug 2022 15:20:38 -0400
-Subject: [PATCH] lxc: containter: fix build with glibc 2.36
-
-With glibc 2.36, sys/mount.h and linux/mount.h conflict:
-https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-lxc_container.c imports sys/mount.h and linux/fs.h, which pulls in
-linux/mount.h.
-
-linux/fs.h isn't required here though. glibc sys/mount.h has had
-MS_MOVE since 2.12 in 2010
-
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
--- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -33,9 +33,6 @@
- /* Yes, we want linux private one, for _syscall2() macro */
- #include <linux/unistd.h>
- 
-/* For MS_MOVE */
-#include <linux/fs.h>
-
- #if WITH_CAPNG
- # include <cap-ng.h>
- #endif
-
-From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 1 Aug 2022 15:24:01 -0400
-Subject: [PATCH] virfile: Fix build with glibc 2.36
-
-With glibc 2.36, sys/mount.h and linux/mount.h conflict:
-https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-virfile.c imports sys/mount.h and linux/fs.h, which pulls in
-linux/mount.h.
-
-Manually define the constants we need from linux/fs.h, like was
-done in llvm:
-
-https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02
-
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
--- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -71,7 +71,11 @@
- # endif
- # include <sys/ioctl.h>
- # include <linux/cdrom.h>
-# include <linux/fs.h>
-+/* These come from linux/fs.h, but that header conflicts with
-+ * sys/mount.h on glibc 2.36+ */
-+# define FS_IOC_GETFLAGS _IOR('f', 1, long)
-+# define FS_IOC_SETFLAGS _IOW('f', 2, long)
-+# define FS_NOCOW_FL 0x00800000
- #endif
- 
- #if WITH_LIBATTR
-
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@ -1,3 +1,2 @@
 DIST protontricks-1.9.0.tar.gz 154202 BLAKE2B e998bd899ec953ed7ee0bb0f3944da0212b71f2d0eef6c6996040e4d9c607f7bc73b52df4cbc6a70480b308473fa8c0978415a6202f498247bf91662761adf5c SHA512 43ffd2a5cd4d58c44696a2a66da0223a93d553822fdc92a476c661d69f7522d2aef12787bfc33610751bc1171fb1a3da169e3d40a2b60863a9f37ed205771835
-DIST protontricks-1.9.1.tar.gz 158292 BLAKE2B 0825fb03bb05604482c893e7dc399bf0223d76a29eff86f0dd407d89cc8f5b39e8fcfec752a2979a3127921dbdb6dc3d186cc61b53f96c544e9b1526ec5e2246 SHA512 85ab3b1f3d5ff73eee7a8bae2021409443e2f82414f42cfa03646415e53a76e0b853ff1a99cb2d5eed512833ac7a60a2718095161aa56864ca83fe9901786881
 DIST protontricks-1.9.2.tar.gz 158505 BLAKE2B ea4bc39d835d28c3f1ba50fa64d9a646ec9ef535b7369517b77bccaceb62cb922bed8844a8a4ea1d4561e248e302628379326a4760b25ac24411e679d018cee0 SHA512 75158c5a8a86edaafcb5be1b01053db91e45754488db0febe026ef0cbfbbb67fa6f3f17d60fec997c6dd19a73245ee408bd2220e09a3983ccd253e6e4c10457d
--- a/Show More
+++ b/Show More