Sync with portage [Thu Nov 9 15:40:04 MSK 2023].

6 months ago · 8937bc6c1f
parent f4fb483781
commit 8937bc6c1f
1557 changed files with 17702 additions and 10621 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@ -4,3 +4,5 @@ DIST ansible-core-2.14.9.tar.gz 3137084 BLAKE2B b1bfd5e65a9a1de18a8e3c7bd9c5fe47
 DIST ansible-core-2.15.3.tar.gz 3144403 BLAKE2B 86b6528fe99a283c992134608857d0a244ba5b58753a4d623c7097b4db5bb38bea82391905ea9c2de9ca9ee62efc30480e0bd2989b95bc9e531cca87b9eb72e4 SHA512 ba91faef7ace83adf8c6f98ee8eb0186c1fef03657e595857f2255b697e91bfa2df716e9b733d23567f78228281a57940c9a0243d94b54bc7a1d2c0845f19d26
 DIST ansible-core-2.15.4.tar.gz 3148213 BLAKE2B f800278960982952bcda5054e48ce36d3170aa565d112633b2dde1ff0dde233876e284f55c2d89b1a19d28a48e6a05d1f12a1c0eaf4e85a525999c7fab9510cf SHA512 2db03dca53ff7ce99068afba97150f00e4b1c3a7b80e34b90f515baa3b745342d8e483849265e7fcf3dfee31de7a24352a1320c64ce719d31f43be96030b663c
 DIST ansible-core-2.15.5.tar.gz 3154868 BLAKE2B 4de5dfe792f8b33b0c64747142658215a235f0b6269b8e00742adc81f2d87db3e24fd9fc58bf58106591c8981dae356ebeb9a958ba55645eebf1815913a98120 SHA512 820c455d4e9703fc0edebdc917325b7dc5a47c29fbaaac701e3b4d975cd17ebcdffefeec178c57b15f11ccdc57cbd649cd070031fd927c1f35819d4955e19cc0
+DIST ansible-core-2.15.6.tar.gz 3154982 BLAKE2B 3c69671639d11e13aab266659fffeea2a213b8ed0e87d343926791428f4ad1c5a5e32e1d841eca2080d78af58c2a68b833cfa900b29403a6e86663fe8671154f SHA512 e1876b59c3393429d42e03bb74252e0f22f3d7cec8f80c74d2f024e1204c2bfa354c4240a283c16c63186cf8e7a705c2f99b08715ea2dcfe290884ce1f8b9114
+DIST ansible-core-2.16.0.tar.gz 3155083 BLAKE2B b488548d01bc5a1eb3826533241a35948b029cbc83c8b1d8e78d0f9e2d9c88ee16dbc6858b4e1e3c656fee760ff839d445c2ab6bfa2ae72686933f668113731a SHA512 1a94d958423f8a6b3f74f3c88157c21cced9c5332db2e3f601aa54360a0d9434082f61c2d5c3356beb19cd17b876f27d5c8f6b12e17360334a41ce25cf7fd5c0
--- a/app-admin/ansible-core/ansible-core-2.15.6.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.15.6.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYPI_NO_NORMALIZE=1
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+BDEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
--- a/app-admin/ansible-core/ansible-core-2.16.0.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.16.0.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYPI_NO_NORMALIZE=1
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+BDEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,3 +1,5 @@
 DIST ansible-7.7.0.tar.gz 40709642 BLAKE2B ee2f8d124f79ca3a3f131bfbc4f93e10d104a38262b7d60edd2a88284275fecdd3acf0e566a5cc81a1fb6a179a0b7c51215f2945d669be4c6af7aa2a4f31ade0 SHA512 7da6845c9a68f2b8c10cf3e4cc6ea347861d5b59daa6ac895731ac79b733c6724d234345054fe9e3bf4ea460345b9026492fda42dce22bfbc027c9b4de093fd9
 DIST ansible-8.3.0.tar.gz 40126372 BLAKE2B cf5b767e2d0c8fcaf86f64f9fdf5d2a303723023e946b28419f494d89406dfb572abc3ce8f0633d2f6b09600feccbd1550aae88d93b6bfd910a0c08fac8677c4 SHA512 8c051a33d4d95a002518556be84d7f50d825c8d80e291f812593171fc00dd6ad778dcb7261af06895add1978aadeb1ed920cbca08353dcb9b5075d3932222f08
 DIST ansible-8.4.0.tar.gz 40641778 BLAKE2B a99e7956a058a38ce6885019edfb91830fcfbbb161cc84b68edc876f13f0916b7a8eb4105ff6d0e61f11a5c483d0898d1a100028548609811c9d11ebeaf79c27 SHA512 f364685d734df04c51d48b81ae2e587bd02438817d7b7055cec2199a585564cdfad45f40dbfd8051d5b0855f303b8504463e3d1506ed9238e24f871f424587bc
+DIST ansible-8.5.0.tar.gz 40712390 BLAKE2B 1fc1fe7334f52a8b1e630aa31c0d01a2ac2c117f7e0dc432ad37a8a170b9d8ca9635ebd9a962ee0c04fb9282ddb5526b65268b6167a2caad804953c6952b12ae SHA512 4a61696f6cfe1859a1524bd6da45083b8bdec188d1c9fae382eb218776759d34237f7be9deaaf8734e1d6829a9c9fb75f843d8316df30d255314f10beb9ce6aa
+DIST ansible-8.6.0.tar.gz 41548019 BLAKE2B 01506ff418045b138fb7b8cb7c12b30e269c1001a66d2ba3c67fd50542f3823f83f1c85d934985bbeec18ec7275bffdecba47b1a3e6cbb0f350422751eccf319 SHA512 b316f1d6e8ffd4739f142d9add50f39802d8a57bac026f8ab833fd3d07c2ccd9df1d2ba5bcf68b3486db99e12943e8787203e22b16d1ecd1c4c1655a3573cf5d
--- a/app-admin/ansible/ansible-8.5.0.ebuild
+++ b/app-admin/ansible/ansible-8.5.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-core-2.15.0
+	<app-admin/ansible-core-2.16"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
--- a/app-admin/ansible/ansible-8.6.0.ebuild
+++ b/app-admin/ansible/ansible-8.6.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-core-2.15.0
+	<app-admin/ansible-core-2.16"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -3,3 +3,5 @@ DIST aws-cli-1.29.73.gh.tar.gz 2569425 BLAKE2B 14950fd5c67726779f621dd039bfb7d3c
 DIST aws-cli-1.29.77.gh.tar.gz 2572839 BLAKE2B c79219e4c8e711efdfeb8a2f49fe9bfe599581f769643ec7c85fa3ba81c58897bf0b88e02c46705ace0a7ef4e1a5704fe4b702426695675cb1b687c103d286af SHA512 5a88a90cc56f0324f794e8320316b415d21ce6ff12975979e94db632a92746f038387e139887e171102c8a18c4555dec339d2fd5d240b3b31f47fcff2c662f53
 DIST aws-cli-1.29.78.gh.tar.gz 2573503 BLAKE2B 6782a7774568adf5296461e19d71b9de992d9301e3d9c50b97c641448ea0fb9e161feb80cdbce50291fce7d37eaabbc92740ca6b26f432cc5b9105233c2949f8 SHA512 455e6cacb935c1075d9730dda3147dc17598ca01ff9224b9a5f0dffa003a10fb3f2f2e17db1aea9e44b353a5fdd1e3b692308b895ba79ef6433804156ba54b1d
 DIST aws-cli-1.29.79.gh.tar.gz 2574359 BLAKE2B fab1016d0b909c593d5fab7facf23e2cc744bc59c6c9ebbadd239b8920d255fe91e74080ba9a96f262b76b58325adb7a334914dd3a2c2e15842891e9630ec379 SHA512 d4f0fe2db2dcbae2664f7cd27259d83c85e92f126418c57fedf633f84ac783384592a229a9185ae75f804cdf93c3fed01c586a4243ff39ac22389ba847e1726d
+DIST aws-cli-1.29.80.gh.tar.gz 2574794 BLAKE2B 0f12c5463d54b11c5222f9ae1fa0d1327402cf4ba8241df720d6e34f4b6d7686627ab105e9d2642d9de115c47e0da6cbebe989d632607bb53528f27360d34d05 SHA512 e9d3676cb6d2e98f077f55faae9db2e67931849ca424828ef0ce36b9cfe9e0c0783100170e3104c0b9ff9336a49c4e1c45f1029059b2e7399a03de4a5630f3bb
+DIST aws-cli-1.29.82.gh.tar.gz 2575194 BLAKE2B 31961c3c6bd577871444396e36e50db5176666eefc77166f3b4cfab87386b6707f9c10553bb9fe328ce821b30268b34d3d2e5b4cbf00252390cca46c5e3029ec SHA512 e28945774e62d8df3204495c3a69ff68106d04fab2fe47bf10d0446ddbb310fa3baf079c9ab822ed49dae437429c31062976054336436a51ed3c9579d83480cf
--- a/app-admin/awscli/awscli-1.29.80.ebuild
+++ b/app-admin/awscli/awscli-1.29.80.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/awscli/awscli-1.29.82.ebuild
+++ b/app-admin/awscli/awscli-1.29.82.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@ -1,4 +1,6 @@
 DIST helm-3.11.2-deps.tar.xz 125570640 BLAKE2B 7dd267c0070add0bd9ce70bc115cf9d2b427e32c5040f900ff750218aafcee331712ddc8da8c9655f06522696c5f4923a73ba8b94a13f16d09b8973d447817ad SHA512 4223461fa3d0032826387a4170492df561f828546fd4f4307ec5f2006e2abb77275382ebab57baea81767de97bcaa3642d88a022b07448e452e151d83fc04652
 DIST helm-3.12.3-deps.tar.xz 156473664 BLAKE2B 88e2e99465f977b1bec52350a3c4988a595152bacf8db0208e81b38c050ccbadb48f97e3c239ddae5fa8d16d04be5bff6d76fa09ce8fdfc73487c2a44980a2ab SHA512 211775262e51d2ebabd4bf991ba7ecc8fc0fa6b9fa06e35cb6edf127bbc21143fd04a6441759dba423950def31951067407e253b3554b9efd56b4ed93444f7ea
+DIST helm-3.13.2-deps.tar.xz 148836588 BLAKE2B 517f09305f68ef0c5ee34aecf2c5cd846a455a2fde725b4ef7befbb04bb731f8ba4c675b95d8d00be591ab02a60c707345ac4517bf235025fc3a5383ecd390cc SHA512 6785d15244fd94f884177db702436255dcee91e8d866ba5258d25d5a3d21d91c3de7b1644bf43a139d353005708c0ff615da1b09b3a18b3547efc05441d27ae2
 DIST k8s-helm-3.11.2.tar.gz 733884 BLAKE2B 2077927a61b8dcbf5907f8b2760445c8f846c186d504fc9bc9037fdafa4ad15cd8ccaaed3033be7d96cc3e05c74c283bf84c69d666721fef43198c44529db681 SHA512 32b251abf520692490e5dc9affa33b73955540a90854c84cc645364be8a4ca7afa1a9bf356a19be1efba6d35d36ef69f7b420402f73b96790f04635e9e881756
 DIST k8s-helm-3.12.3.tar.gz 721672 BLAKE2B d426d77e8fc8bb4ccd149e05bb3ee6f2ac38260a609bd2a5301a6318b961fb2ac19cd30f0c1372eaad67c5b8d301e356f310653ed8a682eba77d980cb0bf35e7 SHA512 25015a8ce8f04887ebb3add1a151670ff500c24b5b8933cfe3a956db1478483902a9c9c5bf57887b9f4b891e8d479752d9422ee68b43b9140fa0edc37cf38753
+DIST k8s-helm-3.13.2.tar.gz 718707 BLAKE2B 10fa4c7212eeb9bfd3bbe1f3881c67ae0de83ec8931c20cb2fb5e35b5a10207fc9960d21e81c0796e6e37353fd4a2e5afe325bbaadd6d28afaff6d7b68b7f1ae SHA512 989bdc7f3a0ab5c460a8882c2bbd07c0736dee506e3247c0cc0bd9830a321d187f26ef51954c7b81307bd1064754f805be3e5980c5be7eefe4a954f254722902
--- a/app-admin/helm/helm-3.13.2.ebuild
+++ b/app-admin/helm/helm-3.13.2.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+GIT_COMMIT=2a2fb3b98829f1e0be6fb18af2f6599e0f4e8243
+GIT_SHA=2a2fb3b9
+MY_PV=${PV/_rc/-rc.}
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+
+RESTRICT=" test"
+
+src_compile() {
+	emake \
+		GOFLAGS="${GOFLAGS}" \
+		LDFLAGS="" \
+		GIT_COMMIT=${GIT_COMMIT} \
+		GIT_SHA=${GIT_SHA} \
+		GIT_TAG=v${MY_PV} \
+		GIT_DIRTY=clean \
+		build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
--- a/app-admin/longrun/Manifest
+++ b/app-admin/longrun/Manifest
@ -1,3 +0,0 @@
-DIST longrun-0.9.tar.bz2 11539 BLAKE2B a308dc7f350399da0bf593e2eee8109a90103b298d943976f0da143c52105362aa100763dcdd3cacd4c3244cdd5a7eb9a1b355aa803a69a2225ea18c6e5a60dd SHA512 6b38160f54d0cb9124c46c0e3ba22faf4ba4376ef58f7db40aabbab20836b1551dd839d28e5bf49540a5ce0e13312bd1d7332cc59ce45fa49f81d0b9746ef055
-DIST longrun_0.9-19.diff.gz 14697 BLAKE2B 98a7497679df5be0346a37b6119a9418c7fba80672eb2c345784628c3517c6f1fbc8d953abe2696a3b576310cd489e5c1d3595153bbfa9d82dfb44697c246116 SHA512 591519183017dd84d6f78554eea9f215be9346efc3f30889f5a25d01c6b68bd5a949507b9a0c871f9aca0b49e415c4fa261821d4158b24c93481394403b83e35
-DIST longrun_0.9-22.diff.gz 15714 BLAKE2B a132fcd5925b4868c767a43bc5e3428bc2731ffdc3678207442bd538db0bef79a1f50877679907dbd4a131aa807001d8bee602abc94ae086ec1ec458ec68a12d SHA512 6addb2a4070a4b105cbdd1ef96d3d99fbcbab5f6026fb2fcf8d6a702a60548e1ac9249c44e6359fcf46eab83da7529a6715a6ae77f8750f4be19d42ab83f51f8
--- a/app-admin/longrun/files/0.9-makefile_cflags.patch
+++ b/app-admin/longrun/files/0.9-makefile_cflags.patch
@ -1,13 +0,0 @@
--- a/Makefile
-+++ b/Makefile
-@@ -2,8 +2,8 @@
- 
- all: longrun README stamp-po
- 
-longrun: longrun.c
-	gcc -DLOCALEDIR=\"$(LOCALEDIR)\" -g -O2 -W -Wall -o longrun longrun.c
-+CFLAGS += -W -Wall
-+CPPFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
- 
- README: longrun.1
- 	groff -Tascii -man longrun.1 | col -bx > README
--- a/app-admin/longrun/files/0.9-replace-loff_t.patch
+++ b/app-admin/longrun/files/0.9-replace-loff_t.patch
@ -1,35 +0,0 @@
-Use off_t instead of loff_t.  Both pread() and pwrite() take
-off_t not loff_t types.  This breaks the build on musl.  See
-
-https://bugs.gentoo.org/show_bug.cgi?id=541694
-
-diff -Naur longrun.orig/longrun.c longrun/longrun.c
--- longrun.orig/longrun.c	2015-03-07 19:05:19.166652462 +0000
-+++ longrun/longrun.c	2015-03-07 19:06:05.419651899 +0000
-@@ -181,7 +181,7 @@
- }
- 
- /* note: if an output is NULL, then don't set it */
-void read_msr(loff_t address, int *lower, int *upper)
-+void read_msr(off_t address, int *lower, int *upper)
- {
- 	uint32_t data[2];
- 
-@@ -193,7 +193,7 @@
- 	if (upper) *upper = data[1];
- }
- 
-void write_msr(loff_t address, int lower, int upper)
-+void write_msr(off_t address, int lower, int upper)
- {
- 	uint32_t data[2];
- 
-@@ -206,7 +206,7 @@
- }
- 
- /* note: if an output is NULL, then don't set it */
-void read_cpuid(loff_t address, int *eax, int *ebx, int *ecx, int *edx)
-+void read_cpuid(off_t address, int *eax, int *ebx, int *ecx, int *edx)
- {
- 	uint32_t data[4];
- 
--- a/app-admin/longrun/longrun-0.9-r4.ebuild
+++ b/app-admin/longrun/longrun-0.9-r4.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="A utility to control Transmeta's Crusoe and Efficeon processors"
-HOMEPAGE="http://freshmeat.net/projects/longrun/"
-
-DEBIAN_PATCH_VERSION="19"
-DEBIAN_PATCH="${PN}_${PV}-${DEBIAN_PATCH_VERSION}.diff"
-SRC_URI="
-	https://www.kernel.org/pub/linux/utils/cpu/crusoe/${P}.tar.bz2
-	mirror://debian/pool/main/l/${PN}/${DEBIAN_PATCH}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-ppc x86"
-IUSE=""
-
-DEPEND="sys-apps/groff"
-
-S=${WORKDIR}/${PN}
-
-CONFIG_CHECK="~X86_MSR ~X86_CPUID"
-ERROR_X86_MSR="
-Longrun needs a MSR device to function. Please select
-MSR under Processor type and features. It can be build
-directly into the kernel or as a module."
-ERROR_X86_CPUID="
-Longrun needs a CPUID device to function. Please select
-CPUID under Processor type and features. It can be
-build directly into the kernel or as a module."
-
-PATCHES=(
-	"${WORKDIR}"/${DEBIAN_PATCH}
-	"${FILESDIR}"/${PV}-makefile_cflags.patch
-	"${FILESDIR}"/${PV}-replace-loff_t.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	default
-	dodoc MAKEDEV-cpuid-msr
-}
-
-pkg_postinst() {
-	if linux_config_exists; then
-		if linux_chkconfig_module X86_MSR; then
-			elog "You have compiled MSR as a module."
-			elog "You need to load it before using Longrun."
-			elog "The module is called msr."
-			elog
-		fi
-
-		if linux_chkconfig_module X86_CPUID; then
-			elog "You have compiled CPUID as a module."
-			elog "You need to load it before using Longrun."
-			elog "The module is called cpuid."
-		fi
-	else
-		elog "You have no kernel configuration available."
-		elog "Longrun needs both CPUID and MSR capabilites,"
-		elog "in the kernel you intend to run it under."
-	fi
-}
--- a/app-admin/longrun/longrun-0.9-r5.ebuild
+++ b/app-admin/longrun/longrun-0.9-r5.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="A utility to control Transmeta's Crusoe and Efficeon processors"
-HOMEPAGE="http://freshmeat.net/projects/longrun/"
-
-DEBIAN_PATCH_VERSION="22"
-DEBIAN_PATCH="${PN}_${PV}-${DEBIAN_PATCH_VERSION}.diff"
-SRC_URI="
-	https://www.kernel.org/pub/linux/utils/cpu/crusoe/${P}.tar.bz2
-	mirror://debian/pool/main/l/${PN}/${DEBIAN_PATCH}.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-ppc ~x86"
-
-BDEPEND="sys-apps/groff"
-
-DOCS=( MAKEDEV-cpuid-msr )
-
-CONFIG_CHECK="~X86_MSR ~X86_CPUID"
-ERROR_X86_MSR="
-Longrun needs a MSR device to function. Please select
-MSR under Processor type and features. It can be build
-directly into the kernel or as a module."
-ERROR_X86_CPUID="
-Longrun needs a CPUID device to function. Please select
-CPUID under Processor type and features. It can be
-build directly into the kernel or as a module."
-
-PATCHES=(
-	"${WORKDIR}"/${DEBIAN_PATCH}
-	"${FILESDIR}"/${PV}-makefile_cflags.patch
-	"${FILESDIR}"/${PV}-replace-loff_t.patch
-)
-
-src_configure() {
-	tc-export CC
-	default
-}
-
-pkg_postinst() {
-	if linux_config_exists; then
-		if linux_chkconfig_module X86_MSR; then
-			elog "You have compiled MSR as a module."
-			elog "You need to load it before using Longrun."
-			elog "The module is called msr."
-			elog
-		fi
-
-		if linux_chkconfig_module X86_CPUID; then
-			elog "You have compiled CPUID as a module."
-			elog "You need to load it before using Longrun."
-			elog "The module is called cpuid."
-		fi
-	else
-		elog "You have no kernel configuration available."
-		elog "Longrun needs both CPUID and MSR capabilites,"
-		elog "in the kernel you intend to run it under."
-	fi
-}
--- a/app-admin/longrun/metadata.xml
+++ b/app-admin/longrun/metadata.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		Longrun is a user space utility program for controlling the Longrun
-		thermal and power save functionalities found in the processors made
-		by Transmeta.
-	</longdescription>
-</pkgmetadata>
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -2,3 +2,5 @@ DIST puppet-agent_7.24.0-1focal_amd64.deb 31418478 BLAKE2B 201c0a5adbeca2b6f572d
 DIST puppet-agent_7.24.0-1focal_arm64.deb 31160744 BLAKE2B 22dfc3f0855c2e88c7202f2a9d98efd4ad9ef3a191ab9b5b8c37a6869306a47d1225d568fec9f0fc52cdf236f8258b5ca206a360049cc39e1825f1f8afc5d4af SHA512 db1b7cb25a04d6aeedd7f3bb125fe0fcac420c2881f9f3aba729143e253908376cd118073753de018d8fd1a6d7f38139766b4ec4bfb23f840ca7ee32143a8a48
 DIST puppet-agent_8.2.0-1focal_amd64.deb 35899030 BLAKE2B 67af546a361c5ff2284eacac49c395baf693fe16a185f63a1e656fc47a6420395f0d26ab27fa2c944e9cb3e520fae32168ba35ff46e8b8d4239bd8fe322154db SHA512 b5f869cfb39e23e401eb1d8ddde0e2d4c07660e4fd8753e53ccfa08c82c51d6d525637e7fbfdf01ee98d776781837fe7dc6e10d2d5a6dcc635479468194e2900
 DIST puppet-agent_8.2.0-1focal_arm64.deb 35390104 BLAKE2B a4dad98dfb0779ebece815f17174fe119c22ccd06d19a678b2cca2ecd46330b609eb6d6ce834c5cad57f1a81417914f9bd98a3bdd8697b1dc7eb6ef115834865 SHA512 24b458205f8420a2a4168c9eb397d2c8a871a2837b34d10ffc3d43e5e3bf6c94c87856c396ea86826b107daa6aafa4b37b1524bd32f98b11f17627a60a69068d
+DIST puppet-agent_8.3.1-1focal_amd64.deb 35930206 BLAKE2B 8a636bfd9a76a364f03022a587bbe9bd8a596515d515cc41c1eb4d96f930366191df54217444cb4a7a471e201f5ac9673e101b1a3697a55abfc7e2b19ac9a45c SHA512 b455e4dd539159e568aa68acbb993e3c94a3d2724e8bdc9056a28c79737d54981c891bfb0d0e7084dd6c16bb13580eb535aacfe6dff34f9bf3ea6da32cfbe08b
+DIST puppet-agent_8.3.1-1focal_arm64.deb 35420834 BLAKE2B b95702ba60df28ca511c7ea1efeacf7b537d666987e76f83048552667d0ee1ae41041166d07f41a6d1f0e1e6eceea9af427c8e4feef0efa1108b33edf2b64001 SHA512 89d0183dd8762ec9e96ca218d179a5c6278c6b106e4679370dac5b96beb5bb6ec5c18f52a6d076a7ae71f9bbcb9466351b65f096b5c961cb6d8f03a2c7fe171e
--- a/app-admin/puppet-agent/puppet-agent-8.3.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-8.3.1.ebuild
@ -0,0 +1,91 @@
+# Copyright 1999-2023 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/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb )
+arm64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${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,2 +1,3 @@
 DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B f4a3862153a01b1d5ce1cc9d72a2446d91346c5e8ed762f8aeae260a67bd583c277cd4ea0f207021057d40c69078add06af88978522706dea59796bdd6071070 SHA512 bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9
 DIST puppet-8.2.0.tar.gz 2882267 BLAKE2B b109e5cc9fddfa96ebc3be6b892d46a4616a5c1cec677937d02e16d0de6e39c147a9b117514e37ce29b39203f167a33dfe3a6c849fc7ebabecd48925b0d2595b SHA512 40e46350aadd19e187cc2a3c46cfa9f85bb2ffb944b0dcb18d084b10a8baca4c3c830e1361c840490c4f6257930a3ccb556d76b1a933e579ef37103556991b0e
+DIST puppet-8.3.1.tar.gz 2879699 BLAKE2B 6710d345714e6400ef04aeac8dedb933f39443688bda0b24316a3456a6c6bf2719286472a0ce764ddafd40754f8cd95767a4c311c5b5e2bd72b8bc92ec4d0e85 SHA512 0aff032caf7a3966f7e369d6f1785f0ada16e419f96f34dafee61457d2e97979b7934195eb356e44ef323401fa40be5eef608a175b3c2907f25ca92901ec81d2
--- a/app-admin/puppet/puppet-8.3.1.ebuild
+++ b/app-admin/puppet/puppet-8.3.1.ebuild
@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby31"
+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 ~riscv ~x86"
+IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+# <dev-ruby/concurrent-ruby-1.2 for bug #900206
+# - https://tickets.puppetlabs.com/browse/PUP-11722 (workaround, pinning)
+# - https://tickets.puppetlabs.com/browse/PUP-11723 (bug for fixing the pinning)
+ruby_add_rdepend "
+	hiera? ( dev-ruby/hiera )
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/deep_merge
+	<dev-ruby/concurrent-ruby-1.2
+	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-2" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init 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
+}
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@ -1,2 +1,3 @@
 DIST puppetdb-7.13.0.tar.gz 49917440 BLAKE2B 7cb01b2dbd6b6b22aad11a7fbcabff1c8452d51437bd0b3db3c8afe9d72bb853b66a9c8056c4c7c33f284efc4a90c788a05411fe6f80ae081ef817bb7f609bf3 SHA512 ba94031b3c15d38a2719390145e034be453a5f8368b5c53420bf3b371cc36a49f0b416447ec4d9de41ef0618b32ec806b9bae996ec3c4ca0ce05fb152940c2f2
 DIST puppetdb-8.1.0.tar.gz 56647151 BLAKE2B ba1fa54db6413ab45780546a33039799e2e1fbb16f99c5e3e54a382d2f6d1c2a2b8a65d0dbfe881284b9218f4b0f0b105e6c2d8ade12a7d2c25c3505bb9f4d07 SHA512 76ee2b616373c60496d4bc1f90a01b6d30fa6254ce8788a8438e28cabe55358a10653cfcb78ceda00c90c499c77cf2f77138a3f49daf9b4ebe77255fd134e017
+DIST puppetdb-8.2.0.tar.gz 59250096 BLAKE2B ed1009e87cad366a1d3399eb55b51d8aaad325f1b2da9c2fc5f77a1ad43581009ebc23f5e6756cd86430eb300d389a9022b14c29bdd4ea392cf956627df0f1fe SHA512 59d894710c2591566f9900a7fc1a396f971152e66ae423b54d73b0b9d474eaf4f58926fb6dc4815865dac8bd2dc458161685876ffdc9db5a3d049d0ffeb9b601
--- a/app-admin/puppetdb/puppetdb-8.2.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-8.2.0.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2023 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-11"
+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,2 +1,3 @@
 DIST puppetserver-7.11.0.tar.gz 59927771 BLAKE2B dcf2543ac6d5427f57bb451ff9cc6db6748522ffed6fd5a7e81bd63be899fbf722016975fdfca5154489bcaf93d973d11669dd455ad44c79b3be50ccc5e0f636 SHA512 4c9c8d05048ccc35fd729a9a37151451e97655eed131f7192be2dac7614c309ffa4cdb0dd77f1c9eb2666d7df630690faa52ad2b01266010533522b58fb06f79
 DIST puppetserver-8.1.0.tar.gz 61109210 BLAKE2B 562f765d0f36926d16575d6c6fe9e55ee1d732f9288ae3ab0cfa653868de87f4de6176d616e49568298de754a94951e37d61e129b6723ca1f1da6bb3bb191d54 SHA512 a6112d8c4eeaa58dfcb72e91f60104a0918a3c55f8fce4e555b40fa42d0027aaddf94e8751ecd854240f3dcf6034233dc52a750ee7791e35f0a6a7a9609a8c35
+DIST puppetserver-8.3.0.tar.gz 63318772 BLAKE2B 863337c364573b340b802b83f0593fdc510424bfbcf6c6b9f8a8e56729a4db689ce5d4c0d9e1a91399e123e05f42ed0547e6a2e86905d0166c189c79966cd9f3 SHA512 c9aa0f84f989dc544ee5d8d268f753b0961f6766531d832a2c99012701dd219d1c2abf4371835242b3445428a7518e86718552678b559b3bf9b027cbf72977fb
--- a/app-admin/puppetserver/puppetserver-8.3.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-8.3.0.ebuild
@ -0,0 +1,131 @@
+# Copyright 1999-2023 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-11
+		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/qpage/Manifest
+++ b/app-admin/qpage/Manifest
@ -1 +0,0 @@
-DIST qpage-3.3.tar.Z 225689 BLAKE2B 25ac50bbe1e5a623a95f0ca8ad53255693647ca49763d80bb571ce36cf941618b6cbecc1681035d5d56d559a30e2da2a8d3621588925b00b9cac7ad278ec4a44 SHA512 d6062fb9e9cd6cfd60cadb923d29d36fd649c27adff2a36fd4e768798b90780153b78e7d0d1a13dcad94971ac98b32c1c5a3b415d5a1b4aa1cfbac564514a3e9
--- a/app-admin/qpage/files/qpage
+++ b/app-admin/qpage/files/qpage
@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -e /etc/qpage/qpage.cf ] ; then
-		eerror "You need a /etc/qpage/qpage.cf file first."
-		eerror "There is a sample file in /etc/qpage/."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting qpage"
-	start-stop-daemon --start --quiet --exec /usr/bin/qpage -- -q 10
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping qpage"
-	start-stop-daemon --stop --quiet --exec /usr/bin/qpage
-	eend $?
-}
--- a/app-admin/qpage/files/qpage-3.3-fix-build-system.patch
+++ b/app-admin/qpage/files/qpage-3.3-fix-build-system.patch
@ -1,21 +0,0 @@
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -65,12 +65,12 @@
- 		@exit 1
- 
- install:	all
-		$(RM) $(bindir)/$(PROG)
-		$(MKDIR) -p $(bindir)
-		$(CP) $(PROG) $(bindir)
-		$(RM) $(mandir)/man1/$(PROG).1
-		$(MKDIR) -p $(mandir)/man1
-		$(CP) $(PROG).man $(mandir)/man1/$(PROG).1
-+		$(RM) $(DESTDIR)$(bindir)/$(PROG)
-+		$(MKDIR) -p $(DESTDIR)$(bindir)
-+		$(CP) $(PROG) $(DESTDIR)$(bindir)
-+		$(RM) $(DESTDIR)$(mandir)/man1/$(PROG).1
-+		$(MKDIR) -p $(DESTDIR)$(mandir)/man1
-+		$(CP) $(PROG).man $(DESTDIR)$(mandir)/man1/$(PROG).1
- 
- #		$(INSTALL) S99qpage /etc/rc3.d
- #		ln /etc/rc3.d/S99qpage /etc/init.d/qpage
--- a/app-admin/qpage/files/qpage-3.3-fix-warning.patch
+++ b/app-admin/qpage/files/qpage-3.3-fix-warning.patch
@ -1,12 +0,0 @@
-diff -urN qpage-3.3.orig/srvrsnpp.c qpage-3.3/srvrsnpp.c
--- qpage-3.3.orig/srvrsnpp.c	1998-10-25 14:55:05.000000000 -0500
-+++ qpage-3.3/srvrsnpp.c	2006-01-25 15:49:57.000000000 -0500
-@@ -1061,7 +1061,7 @@
- 		if (ptr && strcmp(ptr, STRING_UNKNOWN) != 0)
- 			p->ident = strdup(ptr);
- 
-		ptr = eval_hostinfo(&request.client);
-+		ptr = eval_hostinfo(&request.client[0]);
- 
- 		if (ptr && strcmp(ptr, STRING_UNKNOWN) != 0)
- 			p->hostname = strdup(ptr);
--- a/app-admin/qpage/files/qpage-3.3-gentoo.patch
+++ b/app-admin/qpage/files/qpage-3.3-gentoo.patch
@ -1,72 +0,0 @@
--- a/config.input
-+++ b/config.input
-@@ -20,7 +20,7 @@
- # See the QuickPage documentation for complete details about
- # the syntax of the configuration file.
- #
-QPAGE_CONFIG="/etc/qpage.cf"
-+QPAGE_CONFIG="/etc/qpage/qpage.cf"
- 
- 
- #
-@@ -41,7 +41,7 @@
- # copies of the configuration file.  Only one filename
- # may be specified.
- #
-SNPP_SERVER_FILE="/etc/qpage.servers"
-+SNPP_SERVER_FILE="/etc/qpage/qpage.servers"
- 
- 
- #
--- a/qpage.man
-+++ b/qpage.man
-@@ -867,7 +867,7 @@
- must be able to detect when it's safe to send dial commands to the modem.
- .LP
- .SH FILES
-/etc/qpage.cf
-+/etc/qpage/qpage.cf
- .SH SEE ALSO
- .B RFC-1861
- .SH KNOWN BUGS
--- a/example.cf
-+++ b/example.cf
-@@ -21,7 +21,7 @@
- #
- #	modem=<modem name>
- #		text=<optional text, no whitespace allowed>
-#		device=<modem device e.g. /dev/ttya>
-+#		device=<modem device e.g. /dev/tts/0>
- #		initcmd=<modem initialization command>
- #		dialcmd=<modem dial command not including phone number>
- #
-@@ -64,14 +64,15 @@
- 
- queuedir=/var/spool/qpage
- 
-+lockdir=/var/lock/subsys/qpage
-+
- identtimeout=5
- snpptimeout=60
- 
-modem=ttya device=/dev/cua/a
-modem=ttyb device=/dev/cua/b
-+modem=ttyS0 device=/dev/tts/0
- 
- service=default
-	device=ttya,ttyb
-+	device=ttyS0
- 	baudrate=1200
- 	parity=even
- 	allowpid=yes
--- a/ixo.c
-+++ b/ixo.c
-@@ -192,7 +192,7 @@
- 		if ((i = read_modem(fd, seconds)) < 0)
- 			return(NULL);
- 
-		if (i == '\r') {
-+		if (i == '\r' || i == '\n') {
- 			*ptr = '\0';
- 			got_full_packet++;
- 		}
--- a/app-admin/qpage/metadata.xml
+++ b/app-admin/qpage/metadata.xml
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
-	</maintainer>
-	<longdescription lang="en">
-		QuickPage is a client/server software package that enables you to send messages
-		to an alphanumeric pager. The client accepts a message from the user and
-		forwards it to a server using SNPP. The server uses a modem to transmit the
-		message to the recipient's paging service using the TAP protocol (also known as
-		the IXO protocol).
-	</longdescription>
-</pkgmetadata>
--- a/app-admin/qpage/qpage-3.3.ebuild
+++ b/app-admin/qpage/qpage-3.3.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Sends messages to an alphanumeric pager via TAP protocol"
-HOMEPAGE="http://www.qpage.org/"
-SRC_URI="http://www.qpage.org/download/${P}.tar.Z"
-
-LICENSE="qpage"
-SLOT="0"
-KEYWORDS="~alpha amd64 x86"
-IUSE="tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}
-	virtual/mta"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-fix-warning.patch
-	"${FILESDIR}"/${P}-fix-build-system.patch
-)
-
-src_configure() {
-	tc-export CC
-	default
-
-	# There doesn't seem to be a clean way to disable tcp wrappers in
-	# this package if you have it installed, but don't want to use it.
-	if ! use tcpd ; then
-		sed -i 's/-lwrap//g; s/-DTCP_WRAPPERS//g' Makefile || die
-		echo '#undef TCP_WRAPPERS' >> config.h || die
-	fi
-}
-
-src_install() {
-	default
-
-	dodir /var/spool/qpage
-	fowners daemon:daemon /var/spool/qpage
-	fperms 770 /var/spool/qpage
-
-	dodir /var/lock/subsys/qpage
-	fowners daemon:daemon /var/lock/subsys/qpage
-	fperms 770 /var/lock/subsys/qpage
-
-	insinto /etc/qpage
-	doins example.cf
-
-	doinitd "${FILESDIR}"/qpage
-}
-
-pkg_postinst() {
-	elog
-	elog "Post-installation tasks:"
-	elog
-	elog "1. Create /etc/qpage/qpage.cf (see example.cf in that dir)."
-	elog "2. Insure that the serial port selected in qpage.cf"
-	elog "   is writable by user or group daemon."
-	elog "3. Set automatic startup with rc-update add qpage default"
-	elog "4. Send mail to tomiii@qpage.org telling him how"
-	elog "   you like qpage! :-)"
-	elog
-}
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/flexbackup/Manifest
+++ b/app-backup/flexbackup/Manifest
@ -1 +0,0 @@
-DIST flexbackup-1.2.1.tar.gz 80158 BLAKE2B 0e54c275ddd218184195bb5bc873db10ab144409eed9d87410e5b7ba5ed09297fbdb58f3eb69b5d55c1ec727fe79f51b376914542ba5eae70ab4f87351b6dd4c SHA512 17630bc46657becdf5d5bde4852fd6cebe189fe54d381bda6471aa2e1db1ff082ba24461e2c22ba5805c2d93ac7f9805ffbdc4904da017f1b163cc21b5a3974b
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-afio-large-files.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-afio-large-files.patch
@ -1,13 +0,0 @@
-Index: flexbackup
-===================================================================
--- flexbackup	(revision 808)
-+++ flexbackup	(working copy)
-@@ -1155,7 +1155,7 @@
-     $cmd .= "$::path{afio} -o ";
-     $cmd .= "$no_compress ";
-     $cmd .= "-z ";
-    $cmd .= "-1 m ";
-+    $cmd .= "-1 mC ";
-     $cmd .= "$::afio_z_flag ";
-     $cmd .= "$::afio_verb_flag ";
-     $cmd .= "$::afio_sparse_flag ";
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-bash.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-bash.patch
@ -1,18 +0,0 @@
--- flexbackup	2005-06-16 20:28:04.577086588 -0700
-+++ flexbackup	2005-06-16 22:21:14.787322560 -0700
-@@ -5396,10 +5396,10 @@
- 	    my $shell = $1;
- 	    my $ver = $2;
- 	    if ($shell eq 'bash') {
-		if ($ver =~ m/^2/) {
-		    $::shelltype{$host} = 'bash2';
-		} else {
-+		if ($ver =~ m/^1/) {
- 		    $::shelltype{$host} = 'bash1';
-+		} else {
-+		    $::shelltype{$host} = 'bash2';
- 		}
- 	    } else {
- 		$::shelltype{$host} = $shell;
-
- 	  	 
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-lzma.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-lzma.patch
@ -1,114 +0,0 @@
--- flexbackup	2003-10-10 15:12:09.000000000 +0100
-+++ flexbackup	2007-01-15 01:08:18.000000000 +0000
-@@ -687,6 +687,8 @@
- 		$filename .= ".zip";
- 	    } elsif ($cfg::compress eq "compress") {
- 		$filename .= ".Z";
-+	    } elsif ($cfg::compress eq "lzma") {
-+		$filename .= ".lzma";
- 	    }
- 	} elsif ($cfg::type eq "afio") {
- 	    # tag these a little different, the archive file itself isn't a
-@@ -701,6 +703,8 @@
- 		$filename .= "-zip";
- 	    } elsif ($cfg::compress eq "compress") {
- 		$filename .= "-Z";
-+	    } elsif ($cfg::compress eq "lzma") {
-+		$filename .= "-lzma";
- 	    }
- 	}
- 
-@@ -2700,7 +2704,7 @@
-     # First check if things are defined in the config file
-     # Checks exist, true/false, or one of options
-     &checkvar(\$cfg::type,'type','dump afio cpio tar star pax zip ar shar lha copy rsync filelist','tar');
-    &checkvar(\$cfg::compress,'compress','gzip bzip2 lzop compress zip false hardware','gzip');
-+    &checkvar(\$cfg::compress,'compress','gzip bzip2 lzop compress zip false hardware lzma','gzip');
-     &checkvar(\$cfg::compr_level,'compr_level','exist','4');
-     &checkvar(\$cfg::verbose,'verbose','bool','true');
-     &checkvar(\$cfg::sparse,'sparse','bool','true');
-@@ -3001,6 +3005,16 @@
- 	    $::z = " | $::path{zip} -$cfg::compr_level - -";
- 	    $::unz = "$::path{funzip} | ";
- 	}
-+    } elsif ($cfg::compress eq "lzma") {
-+	$::path{'lzma'} = &checkinpath($cfg::compress);
-+	push(@::remoteprogs, $::path{$cfg::compress});
-+	if ($cfg::compr_level !~ m/^[123456789]$/) {
-+	    push(@::errors,"\$compr_level must be set to 1-9");
-+	} else {
-+	    $::z = " | $::path{$cfg::compress} -$cfg::compr_level ";
-+	}
-+	$::unz = "$::path{$cfg::compress} -d | ";
-+
-     } else {
- 	$::z = "";
- 	$::unz = "";
-@@ -3252,6 +3266,10 @@
- 		$::afio_z_flag = "-P $::path{$cfg::compress} -Q -c -Z";
- 		$::afio_unz_flag = "-P $::path{$cfg::compress} -Q -d -Q -c -Z";
- 
-+	    } elsif ($cfg::compress eq "lzma") {
-+		$::afio_z_flag = "-P $::path{$cfg::compress} -Q -$cfg::compr_level -Z";
-+		$::afio_unz_flag = "-P $::path{$cfg::compress} -Q -d -Z";
-+
- 	    }
- 	    $::unz = ""; # Reset & just use this for reading the archive file.
- 
-@@ -3415,7 +3433,7 @@
- 	$::path{'lha'} = &checkinpath('lha');
- 	push(@::remoteprogs, $::path{'lha'});
- 
-	if ($cfg::compress =~ /^(gzip|bzip2|lzop|compress|zip)$/) {
-+	if ($cfg::compress =~ /^(gzip|bzip2|lzop|compress|zip|lzma)$/) {
- 	    warn("Using type \"lha\" with compress=$cfg::compress makes no sense");
- 	    warn("Setting compression to false");
- 	    $::unz = "";
-@@ -3781,7 +3799,7 @@
- 
-     # Try and guess file types and commpression scheme
-     # might as well since we are reading from a file in this case
-    if ($file =~ m/\.(dump|cpio|tar|star|pax|a|shar|filelist)\.(gz|bz2|lzo|Z|zip)$/) {
-+    if ($file =~ m/\.(dump|cpio|tar|star|pax|a|shar|filelist)\.(gz|bz2|lzo|Z|zip|lzma)$/) {
- 	$cfg::type = $1;
- 	$cfg::compress = $2;
- 	$cfg::type =~ s/^a$/ar/;
-@@ -3789,16 +3807,18 @@
- 	$cfg::compress =~ s/bz2/bzip2/;
- 	$cfg::compress =~ s/lzo/lzop/;
- 	$cfg::compress =~ s/Z/compress/;
-+	$cfg::compress =~ s/lzma/lzma/;
- 	&log("| Auto-set to type=$cfg::type compress=$cfg::compress");
- 	&optioncheck();                  # redo to set a few variables over
- 
-    } elsif ($file =~ m/\.afio-(gz|bz2|lzo|Z|zip)$/) {
-+    } elsif ($file =~ m/\.afio-(gz|bz2|lzo|Z|zip|lzma)$/) {
- 	$cfg::type = "afio";
- 	$cfg::compress = $1;
- 	$cfg::compress =~ s/gz/gzip/;
- 	$cfg::compress =~ s/bz2/bzip2/;
- 	$cfg::compress =~ s/lzo/lzop/;
- 	$cfg::compress =~ s/Z/compress/;
-+	$cfg::compress =~ s/lzma/lzma/;
- 	&log("| Auto-set to type=$cfg::type compress=$cfg::compress");
- 	&optioncheck();                  # redo to set a few variables over
- 
-@@ -5686,3 +5706,5 @@
- 
-     return($spinner[$index]);
- }
-+
-+ 	  	 
--- flexbackup.conf	2007-01-15 01:11:36.000000000 +0000
-+++ flexbackup.conf.new	2007-01-15 01:21:46.000000000 +0000
-@@ -33,8 +33,8 @@
- $prune{'/'} = "tmp proc";
- 
- # Compression
-$compress = 'gzip'; # one of false/gzip/bzip2/lzop/zip/compress/hardware
-$compr_level = '4'; # compression level (1-9) (for gzip/bzip2/lzop/zip)
-+$compress = 'gzip'; # one of false/gzip/bzip2/lzop/zip/compress/hardware/lzma
-+$compr_level = '4'; # compression level (1-9) (for gzip/bzip2/lzop/zip/lzma)
- 
- # Buffering program - to help streaming
- $buffer = 'false';         # one of false/buffer/mbuffer
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-mbuffer-switch.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-mbuffer-switch.patch
@ -1,130 +0,0 @@
-Common subdirectories: flexbackup-1.2.1-r3/contrib and flexbackup-1.2.1-r4/contrib
-diff -ubB flexbackup-1.2.1-r3/flexbackup flexbackup-1.2.1-r4/flexbackup
--- flexbackup-1.2.1-r3/flexbackup	2007-04-14 17:03:34.000000000 -0400
-+++ flexbackup-1.2.1-r4/flexbackup	2007-04-14 17:09:48.000000000 -0400
-@@ -442,7 +442,7 @@
- 		# Get rid of trailing /
- 		$dir = &nuke_trailing_slash($dir);
- 
-		# If level is icremental for the set, each dir might
-+		# If level is incremental for the set, each dir might
- 		# have a different numeric level
- 		if (!defined($::set_incremental)) {
- 		    $level = $::level;
-@@ -3090,7 +3090,7 @@
- 	    push(@::remoteprogs, $::path{'mbuffer'});
- 
- 	    my $megs = $cfg::buffer_megs . "M";
-	    my $bufcmd = "$::path{mbuffer} -q -m $megs -p $cfg::buffer_fill_pct $mbuffer_blk_flag ";
-+		my $bufcmd  = "$::path{mbuffer} -q -m $megs -P $cfg::buffer_fill_pct $mbuffer_blk_flag ";
- 
- 	    $::buffer_cmd = " | $bufcmd";
- 	    $::write_cmd = "$bufcmd -f -o ";
-@@ -4884,18 +4884,24 @@
-     }
- 
-     if (defined(%{$::prune{$prunekey}})) {
-+		my $rex;
- 	# FreeBSD needs -E (above) and no backslashes around the (|) chars
- 	if ($::uname =~ /FreeBSD/) {
-	    $cmd .= '-regex "\./(';
-	    $cmd .= join('|', keys %{$::prune{$prunekey}});
-	    $cmd .= ')/.*" ';
-	} else {
-	    $cmd .= '-regex "\./\(';
-	    $cmd .= join('\|', keys %{$::prune{$prunekey}});
-	    $cmd .= '\)/.*" ';
-	}
-+			$rex  = '-regex "\./(';
-+			$rex .= join('|', keys %{$::prune{$prunekey}});
-+			$rex .= ')/.*" ';
-+		} else {
-+			$rex  = '-regex "\./\(';
-+			$rex .= join('\|', keys %{$::prune{$prunekey}});
-+			$rex .= '\)/.*" ';
-+		}
-+		# Show what the darn thing is constructing for prune expressions.
-+		&log("| \"find\" regex for pruning is: $rex");
-+		$cmd .= $rex;
- 	$cmd .= '-prune -o ';
-     } else {
-+		# Show what the darn thing is constructing for prune expressions.
-+		&log("| No pruning defined for this tree.");
- 	# Can't use find -depth with -prune (see single unix spec etc)
- 	# (not toally required anyway, only if you are archiving dirs you
- 	# don't have permissions on and are running as non-root)
-diff -ubB flexbackup-1.2.1-r3/flexbackup.conf flexbackup-1.2.1-r4/flexbackup.conf
--- flexbackup-1.2.1-r3/flexbackup.conf	2007-04-14 17:03:35.000000000 -0400
-+++ flexbackup-1.2.1-r4/flexbackup.conf	2007-04-14 17:09:48.000000000 -0400
-@@ -30,6 +30,45 @@
- # A space-separated list of directories to prune from each backup.
- # Key is a filesystem or host:dir spec as outlined above
- # regular expressions allowed (not shell-type wildcards!)
-+#
-+# Note:  These directories are actually regular expressions and must
-+# match "find" output relative to the path of the current backup set. This
-+# means that different exclusions are needed for different backup sets.
-+# This is a little tricky, so, read on.
-+#
-+# The regular expressions are processed by "find" but, before "find" is run,
-+# FlexBackup changes into the base directory of the backup set in progress.
-+# FlexBackup then runs "find" with a path of "." which means all output lines
-+# start with "./".  To be helpful, FlexBackup packages each space-separated
-+# prune directory as follows.  If you have a prune list like this
-+#
-+#     $prune{'/somedir'} = "one two three";
-+#
-+# then, the constructed -regex argument to "find" looks like this
-+#
-+#     -regex "\./\(one\|two\|three\)/.*"
-+#
-+# The last thing you need to know is that FlexBackup only uses the prune
-+# terms that match the current base directory in the set you're backing
-+# up.  For example, if your backup set definition looks like this
-+#
-+#     $set{'daily'} = "/home /root /var /usr";
-+#
-+# and you want to do some exclusions in "/home" and "/var" (but not the other
-+# directories), you must set up a prune list for those two directories 
-+# separately.  For example, to exclude bert's and ernie's home directories plus
-+# /var/tmp, you would need the following:
-+#
-+#     $prune{'/home'} = "bert ernie";
-+#     $prune{'/var'}  = "tmp";
-+#
-+# In particular, combining these *does not* work.  For example, this
-+#
-+#     $prune{'/'} = "home/bert home/ernie var/tmp";
-+#
-+# does not work, unless, of course, your backup set is backing up "/", 
-+# which our example is not.
-+#
- $prune{'/'} = "tmp proc";
- 
- # Compression
-@@ -84,7 +123,8 @@
- # True to try and preserve file access times during backup, if the selected
- # archive program can do so. Note that if this is true, -cnewer checks (file
- # permission/status changes only, not content) are turned off when deciding
-# which files to archive on the local system.
-+# which files to archive on the local system.  This is because preserving the
-+# access time changes the permission/status change time in the filesystem.
- $atime_preserve = 'false';
- 
- # Span across filesytems? ("dump" will ignore this option)
-@@ -97,8 +137,13 @@
- # leading directories (the filesystem specs above or the "-dir" flag).
- # Matches paths, not filenames, so put .* on the front/back as needed.
- # Comment these out to exclude nothing.
-$exclude_expr[0] = '.*/[Cc]ache/.*';
-$exclude_expr[1] = '.*~$';
-+# 
-+# Note:  The first example line breaks portage in a restored backup because
-+# "/usr/lib/portage/pym/cache" is not backed up.  Way too general!  The moral
-+# of this story is, be very careful with global excludes.  The second example 
-+# is probably okay.
-+# $exclude_expr[0] = '.*/[Cc]ache/.*';
-+# $exclude_expr[1] = '.*~$';
- 
- # If true (default), and using a tape device, level zero "set" backups
- # assume you want to erase and use a new tape for each set. If false, level
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.12-deprecation-warning.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.12-deprecation-warning.patch
@ -1,29 +0,0 @@
--- flexbackup.~1~	2010-10-09 13:19:27.633694860 +0200
-+++ flexbackup	2010-10-09 13:21:52.396818511 +0200
-@@ -133,6 +133,9 @@
- # tar has a limit of this many chars in its volume label
- $::tar_max_label = 99;
- 
-+# Define the prune hash to avoid warnings with perl 5.12
-+use vars qw( %prune );
-+
- # Get commandline flags
- %::opt = ();
- if (! &::GetOptions(\%::opt,
-@@ -1050,6 +1053,6 @@
-     } else {
- 	$prunekey = $dir;
-     }
-    if (defined(%{$::prune{$prunekey}})) {
-+    if (defined($prune{$prunekey})) {
- 	&log("| NOTE: \$prune is ignored for type=dump");
-     }
-@@ -4885,7 +4885,7 @@
- 	$prunekey = $dir;
-     }
- 
-    if (defined(%{$::prune{$prunekey}})) {
-+    if (defined($prune{$prunekey})) {
- 		my $rex;
- 	# FreeBSD needs -E (above) and no backslashes around the (|) chars
- 	if ($::uname =~ /FreeBSD/) {
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.16-deprecation-warning.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-perl-5.16-deprecation-warning.patch
@ -1,11 +0,0 @@
--- flexbackup	2010-12-30 08:09:10.000000000 +0100
-+++ flexbackup	2013-12-24 15:44:25.000000000 +0100
-@@ -2688,7 +2688,7 @@
-     }
- 
-     # Flag old config file
-    if (defined(@cfg::filesystems) or defined($cfg::mt_var_blksize)) {
-+    if (@cfg::filesystems or $cfg::mt_var_blksize) {
- 	# so strict shuts up
- 	my $junk = @cfg::filesystems;
- 	$junk = $cfg::mt_var_blksize;
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-prune.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-prune.patch
@ -1,136 +0,0 @@
-diff -ub flexbackup-old/flexbackup flexbackup-new/flexbackup
--- flexbackup-old/flexbackup	2007-05-11 20:14:13.000000000 -0400
-+++ flexbackup-new/flexbackup	2007-05-11 20:22:36.000000000 -0400
-@@ -3085,7 +3085,6 @@
- 	    $::read_cmd = "$bufcmd $read_flags";
- 
- 	} elsif ($cfg::buffer eq "mbuffer") {
-
- 	    $::path{'mbuffer'} = &checkinpath('mbuffer');
- 	    push(@::remoteprogs, $::path{'mbuffer'});
- 
-@@ -3101,7 +3100,6 @@
- 	    }
- 	}
-     } else {
-
- 	# If buffering disabled, use dd or cat depending on if blocking turned off on not
- 	if ($cfg::blksize eq '0') {
- 	    $::buffer_cmd = "";
-@@ -4887,18 +4885,19 @@
- 		my $rex;
- 	# FreeBSD needs -E (above) and no backslashes around the (|) chars
- 	if ($::uname =~ /FreeBSD/) {
-			$rex  = '-regex "\./(';
-+			$rex  = '"\./(';
- 			$rex .= join('|', keys %{$::prune{$prunekey}});
-			$rex .= ')/.*" ';
-+			$rex .= ')"';
- 		} else {
-			$rex  = '-regex "\./\(';
-+			$rex  = '"\./\(';
- 			$rex .= join('\|', keys %{$::prune{$prunekey}});
-			$rex .= '\)/.*" ';
-+			$rex .= '\)"';
- 		}
- 		# Show what the darn thing is constructing for prune expressions.
-		&log("| \"find\" regex for pruning is: $rex");
-		$cmd .= $rex;
-	$cmd .= '-prune -o ';
-+		&log("| \"find\" regex for pruning is:");
-+		&log("|     $rex");
-+		&line();
-+		$cmd .= '-regex ' . $rex . ' -prune -o ';
-     } else {
- 		# Show what the darn thing is constructing for prune expressions.
- 		&log("| No pruning defined for this tree.");
-diff -ub flexbackup-old/flexbackup.1 flexbackup-new/flexbackup.1
--- flexbackup-old/flexbackup.1	2007-05-11 20:14:13.000000000 -0400
-+++ flexbackup-new/flexbackup.1	2007-05-11 20:09:58.000000000 -0400
-@@ -48,7 +48,7 @@
- Extract (restore) the files listed in text file \(dqfilelist\(dq into your
- current working directory.
- .TP
-\fBflexbackup\fR \fI-extract\fR \fI-flist\fR <\fIfilename\fR>
-+\fBflexbackup\fR \fI-extract\fR \fI-onefile\fR <\fIfilename\fR>
- Extract (restore) the single file named \(dqfilename\(dq into your current
- working directory.
- .TP
-diff -ub flexbackup-old/flexbackup.conf flexbackup-new/flexbackup.conf
--- flexbackup-old/flexbackup.conf	2007-05-11 20:14:13.000000000 -0400
-+++ flexbackup-new/flexbackup.conf	2007-05-11 20:26:48.000000000 -0400
-@@ -28,10 +28,10 @@
- 
- # Subtree pruning
- # A space-separated list of directories to prune from each backup.
-# Key is a filesystem or host:dir spec as outlined above
-# regular expressions allowed (not shell-type wildcards!)
-+# Key is a filesystem or host:dir spec as outlined above.
-+# Regular expressions are allowed (not shell-type wildcards!)
- #
-# Note:  These directories are actually regular expressions and must
-+# Note:  These "directories" are actually regular expressions and must
- # match "find" output relative to the path of the current backup set. This
- # means that different exclusions are needed for different backup sets.
- # This is a little tricky, so, read on.
-@@ -46,9 +46,11 @@
- #
- # then, the constructed -regex argument to "find" looks like this
- #
-#     -regex "\./\(one\|two\|three\)/.*"
-+#     -regex "\./(one|two|three)"
- #
-# The last thing you need to know is that FlexBackup only uses the prune
-+# (with characters escaped as necessary depending on your environment).
-+#
-+# Another thing you need to know is that FlexBackup only uses the prune
- # terms that match the current base directory in the set you're backing
- # up.  For example, if your backup set definition looks like this
- #
-@@ -66,9 +68,16 @@
- #
- #     $prune{'/'} = "home/bert home/ernie var/tmp";
- #
-# does not work, unless, of course, your backup set is backing up "/", 
-+# doesn't work, unless, of course, your backup set is backing up "/", 
- # which our example is not.
- #
-+# Many other complex and abstruse variations are possible.  Here's one 
-+# interesting corner case.  If you want to preserve a directory but none of its
-+# contents, you can do it.  Picking on ernie from our previous example, preserve
-+# only his home directory:
-+#
-+#     $prune{'/home'} = "ernie/.*";
-+#
- $prune{'/'} = "tmp proc";
- 
- # Compression
-@@ -138,10 +147,10 @@
- # Matches paths, not filenames, so put .* on the front/back as needed.
- # Comment these out to exclude nothing.
- # 
-# Note:  The first example line breaks portage in a restored backup because
-# "/usr/lib/portage/pym/cache" is not backed up.  Way too general!  The moral
-# of this story is, be very careful with global excludes.  The second example 
-# is probably okay.
-+# Gentoo note:  The first example line breaks portage in a restored backup 
-+# because "/usr/lib/portage/pym/cache" is not backed up.  Way too general!
-+# The moral of this story is, be very careful with global excludes.  The 
-+# second example is probably okay.
- # $exclude_expr[0] = '.*/[Cc]ache/.*';
- # $exclude_expr[1] = '.*~$';
- 
-diff -ub flexbackup-old/flexbackup.conf.5 flexbackup-new/flexbackup.conf.5
--- flexbackup-old/flexbackup.conf.5	2007-05-11 20:14:13.000000000 -0400
-+++ flexbackup-new/flexbackup.conf.5	2007-05-11 20:09:58.000000000 -0400
-@@ -40,7 +40,9 @@
- \fB$prune{\fI'/'\fR}\fR = \fI'tmp proc'\fR;
- Configure subtree pruning. A space-separated list of directories to prune from
- each backup. Key is a filesystem/directory or \(dqhost:directory\(dq spec as
-outlined above regular expressions allowed (not shell-type wildcards!).
-+outlined above. Regular expressions allowed (not shell-type wildcards!). There
-+is additional explanation (and a lot of examples) in the provided configuration
-+file.
- .TP
- \fB$compress\fR = \fI'false|gzip|bzip2|lzop|zip|compress|hardware'\fR;
- .TQ
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-quieten.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-quieten.patch
@ -1,13 +0,0 @@
-Index: flexbackup
-===================================================================
--- flexbackup	(revision 814)
-+++ flexbackup	(revision 891)
-@@ -2419,7 +2419,7 @@
-     if (! -r "$configfile") {
- 	die("config file $configfile: $OS_ERROR");
-     }
-    system("perl -c \"$configfile\"");
-+    system("perl -c \"$configfile\" 2>&1");
-     if ($CHILD_ERROR) {
- 	die("syntax error in config file $configfile");
-     }
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-remote-bufftest.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-remote-bufftest.patch
@ -1,59 +0,0 @@
-Common subdirectories: flexbackup-1.2.1-r4/contrib and flexbackup-1.2.1-r5/contrib
-diff -ubB flexbackup-1.2.1-r4/flexbackup flexbackup-1.2.1-r5/flexbackup
--- flexbackup-1.2.1-r4/flexbackup	2007-04-14 17:09:48.000000000 -0400
-+++ flexbackup-1.2.1-r5/flexbackup	2007-04-14 17:23:20.000000000 -0400
-@@ -5276,6 +5276,7 @@
-     my $tmp_script = "$cfg::tmpdir/buftest.$host.$PROCESS_ID.sh";
-     my $retval = 0;
-     my $pipecmd;
-+	my $explicit_success;
- 
-     $buffer_cmd =~ s:^\s*\|\s*::;
-     $buffer_cmd =~ s:\s*\|\s*$::;
-@@ -5290,7 +5291,7 @@
-     print SCR "res=\$?\n";
-     print SCR "out=\`cat \$tmp_err\`\n";
-     print SCR "if [ \$res -eq 0 ]; then\n";
-    print SCR "   echo successful\n";
-+    print SCR "    echo \"successful\"\n";
-     print SCR "else\n";
-     print SCR "   echo \"unsuccessful: exit code \$res: \$out\" \n";
-     print SCR "fi\n";
-@@ -5302,13 +5303,19 @@
- 	$pipecmd = "sh $tmp_script ";
-     } else {
- 	print $::msg "| Checking '$cfg::buffer' on host $host... ";
-	$pipecmd =  "cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; sh $tmp_script; rm -f $tmp_script')";
-+	$pipecmd =  "$::remoteshell $host '$::path{mkdir} -p $cfg::tmpdir'; cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; sh $tmp_script; rm -rf $cfg::tmpdir')";
-     }
- 
-     if (!defined($::debug)) {
- 
- 	open(PIPE,"$pipecmd |") || die;
-+
-+	$explicit_success = 0;
- 	while (<PIPE>) {
-+		if (/^successful$/) {
-+			$explicit_success = 1;
-+			last;
-+		}
- 	    if (/^unsuccessful: exit code (\d+): (.*)/) {
- 		$retval = $1;
- 		my $out = $2;
-@@ -5337,11 +5344,15 @@
- 	print $::msg "\n(debug) $pipecmd\n";
-     }
- 
-    if ($retval == 0) {
-+	if ($explicit_success) {
- 	print $::msg "Ok\n";
-     }  else {
-+		if ($retval == 0) {
-+		    push(@::errors, "Unanticipated problems encountered testing '$cfg::buffer' on host '$host'.");
-+		}  else {
- 	print $::msg "Failed!\n";
-     }
-+	}
-     unlink("$tmp_script");
- 
-     return($retval);
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-secure-tempfile.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-secure-tempfile.patch
@ -1,72 +0,0 @@
--- a/flexbackup	2003-10-10 07:12:09.000000000 -0700
-+++ b/flexbackup	2006-05-14 13:14:54.000000000 -0700
-@@ -269,6 +269,7 @@
-     untie(%::index);
- }
- 
-+system ('rm', '-rf', $cfg::tmpdir);
- exit(0);
- 
- ######################################################################
-@@ -811,6 +812,11 @@
- 	($remove, @cmds) = &backup_filelist($label, $localdir, $title, $level, $remote);
-     }
- 
-+	if(defined($remote)) {
-+		# create our temporary directory as first remote command
-+		unshift(@cmds, &maybe_remote_cmd("$::path{mkdir} -p $cfg::tmpdir", $remote));
-+	}
-+
-     # Nuke any tmp files used in the above routines
-     if ($remove ne '') {
- 	push(@cmds, &maybe_remote_cmd("$::path{rm} -f $remove", $remote));
-@@ -827,6 +833,11 @@
- 	    push(@cmds, &maybe_remote_cmd("$::path{rm} -f $pkglist", $remote));
- 	}
-     }
-+	
-+	if(defined($remote)) {
-+		# remove temporary directory as our last remote command
-+		push(@cmds, &maybe_remote_cmd("$::path{rm} -rf $cfg::tmpdir", $remote));
-+	}
- 
-     # Strip multiple spaces
-     foreach my $cmd (@cmds) {
-@@ -2750,8 +2761,9 @@
-     $::path{'find'} = &checkinpath('find');
-     $::path{'dd'} = &checkinpath('dd');
-     $::path{'printf'} = &checkinpath('printf');
-+    $::path{'mkdir'} = &checkinpath('mkdir');
- 
-    push(@::remoteprogs,($::path{'touch'},$::path{'rm'},$::path{'find'},$::path{'printf'}));
-+    push(@::remoteprogs,($::path{'touch'},$::path{'rm'},$::path{'find'},$::path{'printf'},$::path{'mkdir'}));
- 
-     # Check device (or dir)
-     $::ftape = 0;
-@@ -3442,6 +3454,15 @@
- 	push(@::errors,"\$tmpdir $cfg::tmpdir is not writable");
-     }
- 
-+	$cfg::hostname = `hostname`;
-+	chomp($cfg::hostname);
-+
-+	# Use a subdirectory of the user-specified directory as our tmpdir
-+	# Also note that we make it closer to globally unique as we sometimes
-+	# use this variable for remote systems, so PID isn't enough
-+    $cfg::tmpdir = $cfg::tmpdir .'/flexbackup.'.$$.'.'.$cfg::hostname;
-+    mkdir ($cfg::tmpdir) || die "Can't create temporary directory, $!";
-+
-     # Levels
-     if (defined($::opt{'level'}) and
- 	(defined($::opt{'incremental'}) or
-@@ -5236,8 +5257,8 @@
-     # Create a script which tests the buffer program
-     open(SCR,"> $tmp_script") || die;
-     print SCR "#!/bin/sh\n";
-    print SCR "tmp_data=/tmp/bufftest\$\$.txt\n";
-    print SCR "tmp_err=/tmp/bufftest\$\$.err\n";
-+    print SCR "tmp_data=\`tempfile\`\n";
-+    print SCR "tmp_err=\`tempfile\`\n";
-     print SCR "echo testme > \$tmp_data\n";
-     print SCR "$buffer_cmd > /dev/null 2> \$tmp_err < \$tmp_data\n";
-     print SCR "res=\$?\n";
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-spaces-in-filenames.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-spaces-in-filenames.patch
@ -1,296 +0,0 @@
-Index: flexbackup
-===================================================================
--- flexbackup	(.../tags/flexbackup-1.2.1-r5)	(revision 784)
-+++ flexbackup	(.../trunk)	(revision 784)
-@@ -1301,8 +1301,8 @@
- 	$cmd .= "$::unz";
-     }
-     $cmd .= "(";
-    $cmd .= "mkdir -p $::device ; ";
-    $cmd .= "cd $::device ; ";
-+    $cmd .= "mkdir -p \"$::device\" ; ";
-+    $cmd .= "cd \"$::device\" ; ";
-     $cmd .= "$::path{cpio} -i ";
-     $cmd .= "-m ";
-     $cmd .= "-d ";
-@@ -1351,9 +1351,8 @@
- 
-     # Have to take leading './' off to make rsync's include/exclude work right
-     $cmd .= " | $::path{sed} -e \"s/\\.\\///g\" | ";
-
-     $cmd .= "$::path{rsync} ";
-    $cmd .= "--include-from=- --exclude=* ";
-+    $cmd .= "--files-from=- ";
-     $cmd .= "--archive ";
-     $cmd .= "$::rsync_verb_flag ";
-     $cmd .= "--delete --delete-excluded ";
-@@ -1368,7 +1367,7 @@
- 	    $cmd .= "$remote:";
- 	}
-     }
-    $cmd .= "$dir/ $::device";
-+    $cmd .= "\"$dir/\" \"$::device\"";
- 
-     push(@cmds, $cmd);
- 
-@@ -1658,7 +1657,9 @@
-     my $tmpfile = "$cfg::tmpdir/ar.$PROCESS_ID";
-     my $remove = '';
- 
-    &log("| NOTE: ar archives will not descend directories");
-+    &log("| NOTE: ar archives will not recurse into subdirectories,");
-+    &log("|       which makes them inappropriate for most backups.");
-+    &log("|       Be sure this is what you want.");
- 
-     if (defined($remote) and ($level != 0)) {
- 	my $time = &get_last_date($label, $level, 'numeric');
-@@ -1682,11 +1683,13 @@
-     $cmd = "cd \"$dir\" && ";
-     $cmd .= &file_list_cmd( $dir, $stamp, 'newline', $level, $remote, '-maxdepth 1 ! -type d');
-     $cmd .= "> $filelist; ";
-+    # Escape any spaces in filenames. 
-+    $cmd .= "$::path{sed} -i -e 's/ /\\\\ /g' $filelist; ";
- 
-     $cmd .= "$::path{ar} rc";
-     $cmd .= "$::ar_verb_flag ";
-     $cmd .= "$tmpfile ";
-    $cmd .= "`$::path{cat} $filelist`";
-+    $cmd .= "\@$filelist ";
-     $cmd .= "; $::path{cat} $tmpfile $::z";
- 
-     # Buffer both sides if remote
-@@ -1800,12 +1803,9 @@
- 
-     $cmd = "cd \"$dir\" && ";
-     $cmd .= &file_list_cmd( $dir, $stamp, 'newline', $level, $remote);
-    $cmd .= "> $filelist; ";
-
-    $cmd .= "$::path{lha} a";
-+    $cmd .= " | $::path{lha} a";
-     $cmd .= "$::lha_verb_flag ";
-     $cmd .= "$tmpfile ";
-    $cmd .= "`$::path{cat} $filelist`";
-     $cmd .= "; $::path{cat} $tmpfile $::z";
- 
-     # Buffer both sides if remote
-@@ -2766,6 +2766,7 @@
-     $::path{'dd'} = &checkinpath('dd');
-     $::path{'printf'} = &checkinpath('printf');
-     $::path{'mkdir'} = &checkinpath('mkdir');
-+	$::path{'sed'} = &checkinpath('sed');
- 
-     push(@::remoteprogs,($::path{'touch'},$::path{'rm'},$::path{'find'},$::path{'printf'},$::path{'mkdir'}));
- 
-@@ -4894,9 +4895,9 @@
- 			$rex .= '\)"';
- 		}
- 		# Show what the darn thing is constructing for prune expressions.
-		&log("| \"find\" regex for pruning is:");
-		&log("|     $rex");
-		&line();
-+        (my $temp = $rex) =~ s/\\([()|])/$1/g;
-+		&log("| \"find\" regex for pruning (shell escaping omitted for clarity) is:");
-+		&log("|     $temp");
- 		$cmd .= '-regex ' . $rex . ' -prune -o ';
-     } else {
- 		# Show what the darn thing is constructing for prune expressions.
-@@ -4906,6 +4907,7 @@
- 		# don't have permissions on and are running as non-root)
- 		$cmd .= "-depth ";
-     }
-+    &line();
- 
-     $cmd .= "$::mountpoint_flag ";
-     $cmd .= "! -type s ";
-@@ -5301,12 +5303,14 @@
- 	print $::msg "| Checking '$cfg::buffer' on this machine... ";
- 	$pipecmd = "sh $tmp_script ";
-     } else {
-+	$pipecmd = 
-+        "$::remoteshell $host '$::path{mkdir} -p $cfg::tmpdir'; " .
-+        "cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; " .
-+        "sh $tmp_script; rm -rf $cfg::tmpdir')";
- 	print $::msg "| Checking '$cfg::buffer' on host $host... ";
-	$pipecmd =  "$::remoteshell $host '$::path{mkdir} -p $cfg::tmpdir'; cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; sh $tmp_script; rm -rf $cfg::tmpdir')";
-     }
- 
-     if (!defined($::debug)) {
-
- 	open(PIPE,"$pipecmd |") || die;
- 
- 	$explicit_success = 0;
-Index: flexbackup.conf
-===================================================================
--- flexbackup.conf	(.../tags/flexbackup-1.2.1-r5)	(revision 784)
-+++ flexbackup.conf	(.../trunk)	(revision 784)
-@@ -12,19 +12,27 @@
- 
- # Configure backup "sets".
- # Not needed if you use "-dir <dir>" to backup one tree at a time.
-# Each set is a simple space-separated list of filesystems
-# Remote filesystems should denoted as 'host:dir'
-# You can use anything (other than 'all') as set names
-#
-# Example:
-#  $set{'set1'} = "/home /usr";
-#  $set{'set2'} = "/dir3 machine2:/dir4 machine3:/dir5";
-+# Each set is a simple space-separated list of filesystems.  Remote filesystems
-+# should denoted as 'host:dir'.  If the filesystem name (local or remote)
-+# contains spaces, then it should be enclosed in its entirety in double quotes.
-+# Multiple quoted filesystems included in a set should be space separated just
-+# like unquoted filesystem.  The Perl '.' string concatenation operator can be
-+# used to split excessively long lines.
-+#
-+# You can use anything (other than 'all') as set names.
-+#
-+# Examples:
-+#  $set{'set1'} = '/home /usr';
-+#  $set{'set2'} = '/dir3 machine2:/dir4 machine3:/dir5';
-+#  $set{'set3'} =
-+#      '"/mnt/winmachine1/Documents and Settings" ' .
-+#      '"/mnt/winmachine1/Program Files"';
- #
- # "-set all" will back up all defined sets. If you are doing a full backup
- # using tapes, each "set" will go onto a different tape and you will be
- # prompted for tape change in between.
- #
-$set{'backup'} = "/home";
-+$set{'backup'} = '/home';
- 
- # Subtree pruning
- # A space-separated list of directories to prune from each backup.
-@@ -42,7 +50,7 @@
- # start with "./".  To be helpful, FlexBackup packages each space-separated
- # prune directory as follows.  If you have a prune list like this
- #
-#     $prune{'/somedir'} = "one two three";
-+#     $prune{'/somedir'} = 'one two three';
- #
- # then, the constructed -regex argument to "find" looks like this
- #
-@@ -54,31 +62,38 @@
- # terms that match the current base directory in the set you're backing
- # up.  For example, if your backup set definition looks like this
- #
-#     $set{'daily'} = "/home /root /var /usr";
-+#     $set{'daily'} = '/home /root /var /usr';
- #
- # and you want to do some exclusions in "/home" and "/var" (but not the other
- # directories), you must set up a prune list for those two directories 
- # separately.  For example, to exclude bert's and ernie's home directories plus
- # /var/tmp, you would need the following:
- #
-#     $prune{'/home'} = "bert ernie";
-#     $prune{'/var'}  = "tmp";
-+#     $prune{'/home'} = 'bert ernie';
-+#     $prune{'/var'}  = 'tmp';
- #
- # In particular, combining these *does not* work.  For example, this
- #
-#     $prune{'/'} = "home/bert home/ernie var/tmp";
-+#     $prune{'/'} = 'home/bert home/ernie var/tmp';
- #
- # doesn't work, unless, of course, your backup set is backing up "/", 
- # which our example is not.
- #
-+# Like the $set configuration item, special handling is required for
-+# directories with spaces in them.  Double quotes should surround pruning
-+# targets but not the key.  Example:
-+#
-+#     $prune{'/mnt/winmachine1/Documents and Settings'} =
-+#         '"user1/Local Settings/Temp" user2';
-+#
- # Many other complex and abstruse variations are possible.  Here's one 
- # interesting corner case.  If you want to preserve a directory but none of its
- # contents, you can do it.  Picking on ernie from our previous example, preserve
- # only his home directory:
- #
-#     $prune{'/home'} = "ernie/.*";
-+#     $prune{'/home'} = 'ernie/.*';
- #
-$prune{'/'} = "tmp proc";
-+$prune{'/'} = 'tmp proc';
- 
- # Compression
- $compress = 'gzip'; # one of false/gzip/bzip2/lzop/zip/compress/hardware/lzma
-Index: flexbackup.conf.5
-===================================================================
--- flexbackup.conf.5	(.../tags/flexbackup-1.2.1-r5)	(revision 784)
-+++ flexbackup.conf.5	(.../trunk)	(revision 784)
-@@ -24,25 +24,51 @@
- .TP
- \fB$set{\fI'tag'\fR}\fR = \fI'/dir'\fR;
- Configure backup \(dqsets\(dq. Not needed if \(dq-dir <dir>\(dq is used to
-backup one tree at a time.  Each set is a simple space-separated list of
-filesystems/directories. Remote filesystems should be denoted as
-\(dqhost:directory\(dq.  You can use anything (other than \fI'all'\fR) as set
-names. Using \(dq-set all\(dq will back up all defined sets. If you are doing
-a full backup using tapes, each \(dqset\(dq will go onto a different tape and
-you will be prompted for tape change in between. Examples:
-+backup one tree at a time.
-+Each set is a simple space-separated list of filesystems/directories.
-+Remote filesystems should be denoted as \(dqhost:directory\(dq.
-+You can use anything (other than \fI'all'\fR) as set names.
-+Using \(dq-set all\(dq will back up all defined sets.
-+If you are doing a full backup using tapes, each \(dqset\(dq will go onto a
-+different tape and you will be prompted for tape change in between.
-+Examples:
- .RS
- .PP
- \fB$set{\fI'set1'\fI}\fR = \fI'/home /usr'\fR;
- .br
- \fB$set{\fI'set2'\fI}\fR = \fI'/dir3 machine2:/dir4 machine3:/dir5'\fR;
-+.br
-+.PP
-+Directories (local or remote) with spaces in their names should be enclosed in
-+their entirety in double quotes.
-+Multiple quoted directories included in a set should be space separated just
-+like unquoted directories.
-+The Perl '.' string concatenation operator can be used to split excessively
-+long sets.
-+Example:
-+.PP
-+\fB$set{\fI'set3'\fI}\fR = \fI
-+    '\(dq/mnt/winmachine1/Documents and Settings\(dq ' .
-+    '\(dq/mnt/winmachine1/Program Files\(dq';\fR
- .RE
- .TP
- \fB$prune{\fI'/'\fR}\fR = \fI'tmp proc'\fR;
- Configure subtree pruning. A space-separated list of directories to prune from
- each backup. Key is a filesystem/directory or \(dqhost:directory\(dq spec as
-outlined above. Regular expressions allowed (not shell-type wildcards!). There
-is additional explanation (and a lot of examples) in the provided configuration
-file.
-+outlined above. Regular expressions allowed (not shell-type wildcards!).
-+.RS
-+.PP
-+Like the \fB$set\fR configuration item, special handling is required for
-+directories with spaces in them.  Double quotes should surround pruning targets
-+but not the key.  Example:
-+.PP
-+\fB$prune{\fI'/mnt/winmachine1/Documents and Settings'\fI}\fR = 
-+    \fI'\(dquser1/Local Settings/Temp\(dq user2'\fR;
-+.br
-+.PP
-+There are lots of examples and additional explanation in the provided sample
-+configuration file.
-+.RE
- .TP
- \fB$compress\fR = \fI'false|gzip|bzip2|lzop|zip|compress|hardware'\fR;
- .TQ
-@@ -207,7 +233,7 @@
- .RS
- .TP
- If GNU \fBtar\fR is called \fB\(dqgtar\(dq\fR on your system:
-\fB$path{'tar'} = 'gtar';
-+\fB$path{'tar'} = 'gtar';\fR
- .TP
- Or it can be used to \fB\(dqsudo\(dq\fR certain commands:
- \fB$path{\fI'find'\fR}\fR = \fI'sudo find'\fR;
-@@ -304,3 +330,6 @@
- Written by Edwin Huffstutler (edwinh@computer.org)
- .SH "SEE ALSO"
- \fBflexbackup\fR(1)
-+.\" Local Variables:
-+.\" mode: nroff
-+.\" End:
--- a/app-backup/flexbackup/files/flexbackup-1.2.1-tar-1.29.patch
+++ b/app-backup/flexbackup/files/flexbackup-1.2.1-tar-1.29.patch
@ -1,15 +0,0 @@
-diff -ubBr old/flexbackup new/flexbackup
--- old/flexbackup	2016-12-01 10:52:59.088767278 -0500
-+++ new/flexbackup	2016-12-01 10:54:18.006882216 -0500
-@@ -1408,10 +1408,10 @@
- 
-     $cmd .= "$::path{tar} --create ";
-     $cmd .= "--null ";
-+    $cmd .= "--no-recursion ";
-     $cmd .= "--files-from=- ";
-     $cmd .= "--ignore-failed-read ";
-     $cmd .= "--same-permissions ";
-    $cmd .= "--no-recursion ";
-     $cmd .= "--totals ";
-     if ($cfg::label ne 'false') {
- 	if (length($title) > $::tar_max_label) {
--- a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
+++ b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="Flexible backup script using perl"
-HOMEPAGE="http://flexbackup.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE=""
-
-RDEPEND="app-arch/mt-st"
-DEPEND="${RDEPEND}"
-
-DOCS="CHANGES CREDITS README TODO"
-HTML_DOCS="faq.html"
-
-src_prepare() {
-	# Patch from upstream adds optional lzma compression mode.
-	eapply -p0 "${FILESDIR}"/${P}-lzma.patch
-
-	# Fix bug #116510: cannot back up remote machines after patch CAN-2005-2965
-	eapply "${FILESDIR}"/${P}-secure-tempfile.patch
-
-	# Fix bug #96334: incorrectly determines bash 3.x to be bash 1.x
-	eapply -p0 "${FILESDIR}"/${P}-bash.patch
-
-	# Fix bug #171205: specifies wrong command line option for mbuffer / other small enhancements
-	eapply "${FILESDIR}"/${P}-mbuffer-switch.patch
-
-	# Fix bug #173672: remote host buffer test is broken
-	eapply "${FILESDIR}"/${P}-remote-bufftest.patch
-
-	# Fix bug #178126: subtle subtree pruning issue / other small issues
-	eapply "${FILESDIR}"/${P}-prune.patch
-
-	# Fix bug #184560: fails to back up targets with spaces in their names in some modes
-	eapply -p0 "${FILESDIR}"/${P}-spaces-in-filenames.patch
-
-	# Fix bug #190357: fails on very large files with afio back end
-	eapply -p0 "${FILESDIR}"/${P}-afio-large-files.patch
-
-	# Fix bug #235416: prevent normal status message during conf file read from going to stderr
-	eapply -p0 "${FILESDIR}"/${P}-quieten.patch
-
-	# Fix bug #331673: perl 5.12 deprecation warnings.
-	eapply -p0 "${FILESDIR}"/${P}-perl-5.12-deprecation-warning.patch
-
-	# Fix bug #495232: perl 5.16 deprecation warnings.
-	eapply -p0 "${FILESDIR}"/${P}-perl-5.16-deprecation-warning.patch
-
-	# Fix bug #601368: app-backup/flexbackup breaks with >=app-arch/tar-1.29 when making tar-based backups
-	eapply "${FILESDIR}"/${P}-tar-1.29.patch
-
-	eapply_user
-
-	sed -i \
-		-e '/^\$type = /s:afio:tar:' \
-		-e "/^\$buffer = /s:'buffer':'false':" \
-		flexbackup.conf \
-		|| die "Failed to set modified configuration defaults."
-
-	MY_PV=$(replace_all_version_separators '_')
-	sed -i \
-		-e "/^[[:blank:]]*my \$ver = /s:${MY_PV}:&-${PR}:" \
-		flexbackup \
-		|| die "Failed to apply ebuild revision to internal version string."
-}
-
-src_install() {
-	dodir /etc /usr/bin /usr/share/man/man{1,5}
-	emake install \
-		PREFIX="${D}"/usr \
-		CONFFILE="${D}"/etc/flexbackup.conf
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "Please edit your /etc/flexbackup.conf file to suit your"
-	elog "needs.  If you are using devfs, the tape device should"
-	elog "be set to /dev/tapes/tape0/mtn.  If you need to use any"
-	elog "archiver other than tar, please emerge it separately."
-}
--- a/app-backup/flexbackup/metadata.xml
+++ b/app-backup/flexbackup/metadata.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">flexbackup</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/grype/Manifest
+++ b/app-containers/grype/Manifest
@ -4,3 +4,5 @@ DIST grype-0.61.0-deps.tar.xz 562038080 BLAKE2B cb780751f50f9c74ac9f9a7064e48921
 DIST grype-0.61.0.tar.gz 1021705 BLAKE2B 32ff98f3f240ee5d883edb568ff9caa7614053e76ea9bd8a774a5abb92091e4356e25c10b94d9aaf4a17a2f8c4c7d0f26e2ceec8a089ca079029893d255a7480 SHA512 ce4b1805f17bccd3281a218673156669ae632418bdfabf95c310b973bc224b89b7e0e3ca57a8c7e1df444074e034092d963df3b11cbf393e500fe1786f707ed5
 DIST grype-0.72.0-deps.tar.xz 599210536 BLAKE2B 4912cf4278488e78c7a174654da20f640c4975b5e98741e7caa94d9865ae51013a410863ee68c520805985afc19ca0b2b2175b8f2241724ceac86217719efd82 SHA512 1a91f1b46dc5a206025554c32f5420019ff0f8de564b67ad91070bdbe46abb71f08d409856799672cc31a7d753e151343d925147332caeb044f3cfd81318ff08
 DIST grype-0.72.0.tar.gz 1114440 BLAKE2B 931f4bdd883471e8b34b09dd1df53d4e67df96fc0d7be5224d1acfecc618cb068ee268f4b269e5a7f5e01a6605b9e01f8bb6a150819e8410a6b4f0daa12877ff SHA512 8335de5cba0b11500df1404afeee311be50c7e55d1a57c85cbebe830c9e8d9d21ff7b35ab6110200e57f464e999576f395814a56485115f8c7ed7b6e9f7dafb9
+DIST grype-0.73.0-deps.tar.xz 627765660 BLAKE2B 3d3949922a635d0654120aaf05edef38e7ae998c7beab89a7f13de994ab5f34bd6ade6a67145f5a366a2956ffb124a94a952b426a71cb50a7a30f65a7d721784 SHA512 f2e0ba2da0c196e705a23efc9e989ed3525d3465d661a2d5ce832c0663b0226a885541d91a773922f32de4d849030b73c307487eec00d0498368925213b9444d
+DIST grype-0.73.0.tar.gz 1124082 BLAKE2B 835b1833e6809510821f07906df06c55b418f7226dba190b4bf4f32ae603c006842496512d5e788eef8f2ce7e215a923bc338a1c55f089a3942476275663a6b2 SHA512 06be60104f23be38578660a79d3c593e988e2c5fce646b00dedec9af4d3442f204f81d063806944cfdaa04daffdff256ac71b52ed94d8ae07acde1e15c442f08
--- a/app-containers/grype/grype-0.73.0.ebuild
+++ b/app-containers/grype/grype-0.73.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=15432488224b3d7a557798fd258828f618dadc90
+SYFT_VERSION=0.95.0
+
+DESCRIPTION="A vulnerability scanner for container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/grype/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests require a running docker
+RESTRICT="test"
+
+src_compile() {
+	ego build -o bin/grype -ldflags "
+		-extldflags '-static'
+		-X github.com/anchore/grype/internal/version.version=${PV}
+		-X github.com/anchore/grype/internal/version.syftVersion=${SYFT_VERSION}
+		-X github.com/anchore/grype/internal/version.gitCommit=${GIT_COMMIT}
+		-X github.com/anchore/grype/internal/version.buildDate=${BUILD_DATE}
+		-X github.com/anchore/grype/internal/version.gitDescription=v${PV}
+		" ./cmd/grype
+}
+
+src_install() {
+	dobin bin/grype
+}
--- a/app-containers/syft/Manifest
+++ b/app-containers/syft/Manifest
@ -4,3 +4,5 @@ DIST syft-0.76.0-deps.tar.xz 457367140 BLAKE2B 8d05372361e6051b8102bec3b775eb00f
 DIST syft-0.76.0.tar.gz 5726316 BLAKE2B debf5c9764994c616fceb7b69c42e87d6399ceb4b2f878935901f626256723177cc3e23b38f6dbce40a59c6586cb5589e82ed3c2a9811117486d9a1ced2f2260 SHA512 86f82455ff0d78864f56f2575bb2acb311ab658c23161b44f342242e88470948581097c2d928fae96ed01ad52843cb26d4682e22e5f81818a83a35cca1eff69e
 DIST syft-0.94.0-deps.tar.xz 502576092 BLAKE2B 35c13d34a7a4b2afafb9b73502f4258b379db737d9482d3f2fc8c0748cda67733e198df25237b6622e7450055f6681de7e7031cf0d5c0f7d422b268e64608da2 SHA512 1018cbd7e22b44ca8626747ddce2a4672b7f6e0ff359d30e36877ac00e093cea8709d6880093850afe107aef7333b6f928ababc1dbb3cb5741c466b95ac69268
 DIST syft-0.94.0.tar.gz 5266343 BLAKE2B 892c7bf90a1d15fd926207acd1a28e8bd907ae5869be763e48ccd8d3279975c2ec84d9ec5842e3799460a823b5aa611a028982d8d40d90248c1cfad25415c672 SHA512 171b23271f03e1e824dcac41a563f7947d004797a21e762eea883ea680e0de65a532e03e4b245a4021288fec60142da8c1c16d6520eadece65728728b9d15f91
+DIST syft-0.95.0-deps.tar.xz 525784260 BLAKE2B 8aa9da529a605725ecbcc4ec98bef651218ee7b1ed08564fae0911fc83f78a13f7773c8c6e7c12f0ecb4b979477e1ea1a89354c11de932ef2e0a45b1fb80ec10 SHA512 0571b3586d27d1cf76a6bfd4c3fd5c06f796bd94feea63303c8464c602ce91f94e4bdc0002eb7241ff967e4146ec2a91cce428ad495d89dfda078a968e43d63f
+DIST syft-0.95.0.tar.gz 5328311 BLAKE2B 555844c771dc57dd396f4016095a8e462b5088abf7d7dc2f77b14dcd98bd77fb58598c1011145ce001117ea3059cf93f2b4a1d2a7c01914cd1e5b855e79394cc SHA512 6509d7a505ff1adc37386bccfefb8ce106ff8c1ffe267ee768f731ef865c731dec3603c055d094363aae8b0ad6dd09547cb4b7e5a8d6993d7f8e09ef47f195c3
--- a/app-containers/syft/syft-0.95.0.ebuild
+++ b/app-containers/syft/syft-0.95.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=9b98785aab9346999a0b5e9f5e4b4e63a1b1916c
+
+DESCRIPTION="Generate a Software Bill of Materials from container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/syft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# tests require a running docker daemon
+RESTRICT="test"
+
+src_compile() {
+	local BUILD_DATE
+	BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+	ego build -o bin/syft -ldflags "
+		-extldflags '-static'
+		-X github.com/anchore/syft/internal/version.version=${PV}
+		-X github.com/anchore/syft/internal/version.gitCommit=${GIT_COMMIT}
+			-X github.com/anchore/syft/internal/version.buildDate=${BUILD_DATE}
+			-X github.com/anchore/syft/internal/version.gitDescription=v${PV}
+		" ./cmd/syft
+}
+
+src_install() {
+	dobin bin/*
+}
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/prime-dict/Manifest
+++ b/app-dicts/prime-dict/Manifest
@ -1 +0,0 @@
-DIST prime-dict-1.0.0.tar.gz 6756593 BLAKE2B 7348e7a46dcf5a6d15ec2c5e09c4d89e724d912071a11b48b52f9e6cff62c0c52b7736da322a69ed6662e03c4b987702691174d48331e4ed692887d72b9169c0 SHA512 0cad16048baeeca982feaa3e95f7afaabaa94f511e1e80ad332cf106ea39e226f3119bcdc9636010cb5d5e0aef10dec0b8fc4d42b743e32c51971cb45e85dabf
--- a/app-dicts/prime-dict/metadata.xml
+++ b/app-dicts/prime-dict/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="osdn">prime</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
+++ b/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31"
-
-inherit ruby-ng
-
-DESCRIPTION="Dictionary files for PRIME input method"
-HOMEPAGE="http://taiyaki.org/prime/"
-SRC_URI="https://${PN}.osdn.jp/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-each_ruby_configure() {
-	econf --with-rubydir="$(ruby_rbconfig_value 'sitelibdir')"
-}
-
-each_ruby_compile() {
-	emake
-}
-
-each_ruby_install() {
-	emake DESTDIR="${D}" install
-}
-
-all_ruby_install() {
-	einstalldocs
-}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs/emacs-25.3-r19.ebuild
+++ b/app-editors/emacs/emacs-25.3-r19.ebuild
@ -48,7 +48,7 @@ RDEPEND="acct-group/mail
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:= )
 		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
 		xft? (
 			media-libs/fontconfig
 			media-libs/freetype
--- a/app-editors/emacs/emacs-26.3-r16.ebuild
+++ b/app-editors/emacs/emacs-26.3-r16.ebuild
@ -50,7 +50,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:= )
 		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
 		xft? (
 			media-libs/fontconfig
 			media-libs/freetype
--- a/app-editors/emacs/emacs-27.2-r14.ebuild
+++ b/app-editors/emacs/emacs-27.2-r14.ebuild
@ -83,7 +83,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:= )
 		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
 		xft? (
 			media-libs/fontconfig
 			media-libs/freetype
--- a/app-editors/emacs/emacs-28.2-r10.ebuild
+++ b/app-editors/emacs/emacs-28.2-r10.ebuild
@ -86,7 +86,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:= )
 		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
 		xft? (
 			media-libs/fontconfig
 			media-libs/freetype
--- a/app-editors/emacs/emacs-29.1-r4.ebuild
+++ b/app-editors/emacs/emacs-29.1-r4.ebuild
@ -1,577 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-29"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
-	PATCHES=("${WORKDIR}/patch")
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux small-ja-dic sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
-
-X_DEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-misc/xbitmaps
-	xpm? ( x11-libs/libXpm )
-	xft? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXrender
-		cairo? ( >=x11-libs/cairo-1.12.18[X] )
-		!cairo? ( x11-libs/libXft )
-		harfbuzz? ( media-libs/harfbuzz:0= )
-		m17n-lib? (
-			>=dev-libs/libotf-0.9.4
-			>=dev-libs/m17n-lib-1.5.1
-		)
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		xwidgets? (
-			net-libs/webkit-gtk:4.1=
-			x11-libs/libXcomposite
-		)
-	)
-	!gtk? (
-		motif? (
-			>=x11-libs/motif-2.3:0
-			x11-libs/libXpm
-			x11-libs/libXmu
-			x11-libs/libXt
-		)
-		!motif? (
-			Xaw3d? (
-				x11-libs/libXaw3d
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!Xaw3d? ( athena? (
-				x11-libs/libXaw
-				x11-libs/libXmu
-				x11-libs/libXt
-			) )
-		)
-	)"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	jit? (
-		sys-devel/gcc:=[jit(-)]
-		sys-libs/zlib
-	)
-	json? ( dev-libs/jansson:= )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	tree-sitter? ( dev-libs/tree-sitter )
-	valgrind? ( dev-util/valgrind )
-	zlib? ( sys-libs/zlib )
-	gui? (
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		webp? ( media-libs/libwebp:0= )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		!aqua? (
-			gsettings? (
-				app-emacs/emacs-common[gsettings(-)]
-				>=dev-libs/glib-2.28.6
-			)
-			gtk? ( !X? (
-				media-libs/fontconfig
-				media-libs/freetype
-				>=x11-libs/cairo-1.12.18
-				x11-libs/gtk+:3
-				harfbuzz? ( media-libs/harfbuzz:0= )
-				m17n-lib? (
-					>=dev-libs/libotf-0.9.4
-					>=dev-libs/m17n-lib-1.5.1
-				)
-				xwidgets? ( net-libs/webkit-gtk:4.1= )
-			) )
-			!gtk? ( ${X_DEPEND} )
-			X? ( ${X_DEPEND} )
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? (
-		!gtk? ( x11-base/xorg-proto )
-		X? ( x11-base/xorg-proto )
-	) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	default
-
-	if use jit; then
-		find lisp -type f -name "*.elc" -delete || die
-
-		# These files ignore LDFLAGS. We assign the variable here, because
-		# for live ebuilds FULL_VERSION doesn't exist in global scope
-		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
-
-		# gccjit doesn't play well with ccache or distcc #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
-			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-	fi
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	# libseccomp is detected by configure but doesn't appear to have any
-	# effect on the installed image. Suppress it by supplying pkg-config
-	# with a wrong library name.
-	sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Prevents e.g. tests interfering with running Emacs.
-	unset EMACS_SOCKET_NAME
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use jit; then
-		use zlib || ewarn \
-			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
-		myconf+=" --with-zlib"
-	else
-		myconf+=" $(use_with zlib)"
-	fi
-
-	# Emacs supports these window systems:
-	# X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa).
-	# General GUI support is enabled by the "gui" USE flag, then
-	# the window system is selected as follows:
-	#   "aqua" -> Nextstep
-	#   "gtk -X" -> pure GTK
-	#   otherwise -> X11
-	# For X11 there is the further choice of toolkits GTK, Motif,
-	# Athena (Lucid), or no toolkit. They are enabled (in order of
-	# preference) with the "gtk", "motif", "Xaw3d", and "athena" flags.
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-pgtk --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x --without-pgtk"
-	elif use gtk && ! use X; then
-		einfo "Configuring to build with pure GTK (without X11) support"
-		myconf+=" --with-pgtk --without-x --without-ns"
-		myconf+=" --with-toolkit-scroll-bars" #836392
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with harfbuzz)"
-		myconf+=" $(use_with m17n-lib libotf)"
-		myconf+=" $(use_with m17n-lib m17n-flt)"
-		myconf+=" $(use_with xwidgets)"
-	else
-		# X11
-		myconf+=" --with-x --without-pgtk --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with xpm)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	if use gui; then
-		# Common flags recognised for all GUIs
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with webp)"
-		myconf+=" $(use_with imagemagick)"
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=" --with-dumping=none"
-	elif use m68k; then
-		# Workaround for https://debbugs.gnu.org/44531
-		myconf+=" --with-dumping=unexec"
-	else
-		myconf+=" --with-dumping=pdumper"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		--with-pdumper \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with jit native-compilation aot) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with small-ja-dic) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with tree-sitter) \
-		$(use_with wide-int) \
-		${myconf}
-}
-
-src_compile() {
-	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
-	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
-
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_test() {
-	# List .el test files with a comment above listing the exact
-	# subtests which caused failure. Elements should begin with a %.
-	# e.g. %lisp/gnus/mml-sec-tests.el.
-	local exclude_tests=(
-		# Reason: not yet known
-		# mml-secure-en-decrypt-{1,2,3,4}
-		# mml-secure-find-usable-keys-{1,2}
-		# mml-secure-key-checks
-		# mml-secure-select-preferred-keys-4
-		# mml-secure-sign-verify-1
-		%lisp/gnus/mml-sec-tests.el
-
-		# Reason: permission denied on /nonexistent
-		# (vc-*-bzr only fails if breezy is installed, as they
-		# try to access cache dirs under /nonexistent)
-		#
-		# rmail-undigest-test-multipart-mixed-digest
-		# rmail-undigest-test-rfc1153-less-strict-digest
-		# rmail-undigest-test-rfc1153-sloppy-digest
-		# rmail-undigest-test-rfc934-digest
-		# vc-test-bzr02-state
-		# vc-test-bzr05-rename-file
-		# vc-test-bzr06-version-diff
-		# vc-bzr-test-bug9781
-		%lisp/mail/undigest-tests.el
-		%lisp/vc/vc-tests.el
-		%lisp/vc/vc-bzr-tests.el
-
-		# Reason: fails if bubblewrap (bwrap) is installed
-		# "bwrap: setting up uid map: Permission denied"
-		#
-		# bytecomp-tests--dest-mountpoint
-		%lisp/emacs-lisp/bytecomp-tests.el
-	)
-
-	# See test/README for possible options
-	emake \
-		EMACS_TEST_VERBOSE=1 \
-		EXCLUDE_TESTS="${exclude_tests[*]}" \
-		TEST_BACKTRACE_LINE_LENGTH=nil \
-		check
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
-
-	# dissuade Portage from removing our dir file #257260
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}"/usr/share/glib-2.0 || die #911117
-	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":"))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# verify that the PM hasn't removed our Info directory index #257260
-	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
-	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
--- a/app-editors/jove/Manifest
+++ b/app-editors/jove/Manifest
@ -1,2 +1,3 @@
 DIST jove-4.17.3.7.tar.gz 490070 BLAKE2B bfe95cc8f78993438839b93ebf37567940449e3914dd1963728ee82dc601c371318a34ea0d5d13d9d4dccaf9c4750874c5e0d3af22dcb2421595dca2da7cafdf SHA512 90bd597bb4be3a4589f77ee331cee4fa2784264221fe6247c2535ae34c5689c08f55c2b2919bff34af5631b73b12883dab54df9770b4157ae801079a23222d9a
+DIST jove-4.17.5.3.tar.gz 548835 BLAKE2B 12b1f16d82e84cc2d099e2f45f5a42e2d1e811e5a9685c7ee162280ef49ecef8f7955a98679b60c49bbeaa30e3a430b1d6fc969270bee02862ff284a932829d9 SHA512 f91bdf3145ad243cfe8a4d9aca497a3d2cc58711488fa6b845d0d5e70dece6939046743aae1f18fd2614d75420bb747b00e61bb60b13ff35b26409068df40127
 DIST jove4.16.0.73.tgz 465214 BLAKE2B cc1eeca2cdbd7ca98a5deaf27c37bfcdc529f2b388361e0cd5fd6278b72740a06283abd1f60212e6dc0d1e540e4dc4d99edb99b781645b13e1675644db0f38eb SHA512 2198504f9a23590710acba7f27661fa5649fdbed559a4c6bde9d2c1d673c22ce7d99a690be45a4602d37cf6e70399230c4ae3a251d8451af0c5252bdca61b09d
--- a/app-editors/jove/jove-4.17.5.3.ebuild
+++ b/app-editors/jove/jove-4.17.5.3.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Jonathan's Own Version of Emacs, a light emacs-like editor without LISP bindings"
+HOMEPAGE="https://github.com/jonmacs/jove"
+SRC_URI="https://github.com/jonmacs/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="JOVE"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	tc-export CC
+
+	myopts=(
+		JOVEHOME="${EPREFIX}/usr" \
+		JMANDIR="${EPREFIX}/usr/share/man/man1" \
+		JDOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		OPTFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" \
+		SYSDEFS="-DLinux" \
+		$(usev !doc FREFDOCS="")
+	)
+	emake "${myopts[@]}"
+}
+
+src_install() {
+	# The Makefile triggers a rebuild if any of the options have changed
+	# (see recipe for keys.c). So we must pass identical options even if
+	# they're not needed for installation.
+	emake "${myopts[@]}" DESTDIR="${D}" install
+
+	keepdir /var/lib/jove/preserve
+	dodoc README
+}
--- a/app-editors/jove/metadata.xml
+++ b/app-editors/jove/metadata.xml
@ -12,4 +12,7 @@
  language specific modes) while weighing in with CPU, memory, and disk
  requirements comparable to vi.
 </longdescription>
+<upstream>
+  <remote-id type="github">jonmacs/jove</remote-id>
+</upstream>
 </pkgmetadata>
--- a/app-editors/mg/mg-20230501.ebuild
+++ b/app-editors/mg/mg-20230501.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="livecd"

 RDEPEND="
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@ -4,3 +4,6 @@ DIST vscode-1.83.1-arm64.tar.gz 133032981 BLAKE2B c02f3147ccf8811730695aff4f6a61
 DIST vscode-1.84.0-amd64.tar.gz 135705913 BLAKE2B 3013fe6d6131237325dccf1de5ba53fe8de670098eb4d944e129faaa382f1e79d95480493f9cd55096ba5213685bf6d872bcf0cfe4d463abdb1872c33b8b3a8e SHA512 d86670e67b245c156b751a30253460c9b535de3a8387cf0e0f121861a05958974eaf20537c7c2beb36e2da048d0bef8e3163c541c30dc7eacfe5dcfceb59ac92
 DIST vscode-1.84.0-arm.tar.gz 122691456 BLAKE2B 9c89e96c50ffc317a56d066f0a81d5ff5b7e3e4ad53b2aef1bb2839d8d8ad861862bd81a131156843995fd97ada24c38100115f290881045fb7419801a44bc2e SHA512 8e64bf19e03fd6f62665037dba3164d5ac262a8f0cb18aca3372b4251f949f1a466e469e9d33a8df8771974564551ab86da3841f279c0a775c9630ab8e806a2f
 DIST vscode-1.84.0-arm64.tar.gz 132914793 BLAKE2B 6d8f1206f8feb8aff3dfb8e2e9f34deeb4814de854da5b77eddff1e0666ed5a26ede2ebff1990f4e5a02a030e7a7ad66f90b46eec8dafae8f162d9172fed036f SHA512 03fcf66e821227b52e0f0e3aedc364335b8bb86bdc1083ba00e1baf2a06021a8b4a37902ff9f7a783d8281c5c3dc9b060ce9308883191aba0d200b22c2996670
+DIST vscode-1.84.1-amd64.tar.gz 135727521 BLAKE2B a0b6ab48842ec3359f0dd29244346edba4b1468a97daffa7247655509a2bffe80a7fe642180ce13ced1b7dbbe64b3bb43fb386e6094d60ae84278743890602d1 SHA512 2768a706d6acbd9f723d9b3da7a15ddead82f4c01b6ae69762713b9ad0beaa9b74df66041263b8853b1e97ce4cd9178230df21e71639136f035177fc660e9a28
+DIST vscode-1.84.1-arm.tar.gz 122669562 BLAKE2B f0b6201ca18fc2ca8eb4ae20784d742ce841ee2672cbe39087350b031a16b9a0c6db0edb1e5cd54f969537c40d9b290a6da5d4dd9be268255b34cefef865c37b SHA512 2d5b0048c8865e536540e55d445676fa10ee391a6cf175173c40801c8ca6c5bd3b945aca2f8c89bd11b6284fcb2745a6bf7dae4008c41c09f9c760d9fbb28843
+DIST vscode-1.84.1-arm64.tar.gz 132919962 BLAKE2B 354c03703f9238f8141d1e710fc6d14554f73c3f5cf1b1847fc9ad8bd508beab75b2c8d227b0b05d8b54a22a0f0662f60aad6e5669af70c59d42485f2cb570a2 SHA512 709cc5f413e9250206d59fb6dd2a73d0444bc4338b75f8150f1dec30aa73b2f169422acb517485be37eaa9c82976ebfe7edd0011ab7341c625717d867eded62d
--- a/app-editors/vscode/vscode-1.84.1.ebuild
+++ b/app-editors/vscode/vscode-1.84.1.ebuild
@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm ~arm64"
+IUSE="kerberos"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libcanberra[gtk3]
+	media-libs/libglvnd
+	media-libs/mesa
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib
+	sys-process/lsof
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libnotify
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	x11-misc/xdg-utils
+	kerberos? ( app-crypt/mit-krb5 )
+"
+
+QA_PREBUILT="*"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/ThirdPartyNotices.txt || die
+
+	# Disable update server
+	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
+
+	if ! use kerberos; then
+		rm -r ./resources/app/node_modules.asar.unpacked/kerberos || die
+	fi
+
+	# Install
+	pax-mark m code
+	mkdir -p "${ED}/opt/${PN}" || die
+	cp -r . "${ED}/opt/${PN}" || die
+	fperms 4711 /opt/${PN}/chrome-sandbox
+
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
+	domenu "${FILESDIR}/vscode.desktop"
+	domenu "${FILESDIR}/vscode-url-handler.desktop"
+	domenu "${FILESDIR}/vscode-wayland.desktop"
+	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "keyring support inside vscode" "virtual/secret-service"
+}
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/ebib/Manifest
+++ b/app-emacs/ebib/Manifest
@ -1,3 +1,4 @@
 DIST ebib-2.38.1.tar.gz 1043749 BLAKE2B 937b3e00f4f52c5b63949ae993e40ff340477c374914ce308256018d0c86fafb52cbacde74dab552303b6635ff87d57c29661a62971b0649f58a67e3b916a9c8 SHA512 d822edb2584effc6f385e2e71bf57d72e5763129fe84fec60bf1a9841822e3d59cc53a05cab293014dee7c63d14cbae43734a2070746f5c512e417a4085f3ef6
 DIST ebib-2.38.tar.gz 1040337 BLAKE2B 97a61ecf5d4334dd39be287feaa44206d52d3d6687593b8eb2210427901890254b2cefa9cf37e9292f8ae2651c7c11ac0af2938f9a2854b98c3ee81ed6cfc7c4 SHA512 4a6b611759700e8181c09fa80cb631a024bf1d38d6950e040c3e476a194d02e893fe1fe9b749dd737a7eaf7fd9d4b8ecfe4d09be56e788b7692a4253dbbe838d
 DIST ebib-2.39.3.tar.gz 1044570 BLAKE2B e3608082e221fcf49f48286968fb48de2130d748897d45fccf31674ff4b6f48722fc9c5e667f7ed9a1ccb64a3c0109e72f1c13be1ae807551492e674e889cc1c SHA512 8bbf3a4cfe5c2b28013e25580f6cdcb5e5dcf3ef3154debbc3416f5023fa68d92d78e29b5e80ffdc82787b97787545caae6d75692fb7fdfe72d351c5eefe90b1
+DIST ebib-2.39.4.tar.gz 1048822 BLAKE2B 66fcfb8139cccee1e4ef5ec23fa8a79849a9b0ef9121a2e901b19b1d0cbdeea3404c9d78588636599ccb8f8af57aa2fe589e9b7b3b8f6ac155b1693c5cf454a4 SHA512 83e3291de1407163854316b5fe2e0bea3363578a8ee9bd75b3ec6e3dbf739b92c3966dca7151eaa40514cd18ddf582cd4bebe18a677432ef2b350458607bd77b
--- a/app-emacs/ebib/ebib-2.39.4.ebuild
+++ b/app-emacs/ebib/ebib-2.39.4.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="BibTeX database manager for Emacs"
+HOMEPAGE="https://joostkremers.github.io/ebib/
+	https://github.com/joostkremers/ebib/"
+SRC_URI="https://github.com/joostkremers/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-emacs/parsebib"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ert-runner
+		app-emacs/with-simulated-input
+	)
+"
+
+DOCS=( README.md docs )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ert-runner -L . -L test --reporter ert+duration --script test || die
+}
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}
--- a/app-emacs/ivy/files/ivy-0.13.4-ivy-test.el-skip.patch
+++ b/app-emacs/ivy/files/ivy-0.13.4-ivy-test.el-skip.patch
@ -1,39 +0,0 @@
-diff --git a/ivy-test.el b/ivy-test.el
-index 2062b81..8613337 100644
--- a/ivy-test.el
-+++ b/ivy-test.el
-@@ -2022,6 +1076,7 @@ Since `execute-kbd-macro' doesn't pick up a let-bound `default-directory'.")
-     (should (eq (ivy--sort-function 'c) fn1))))
- 
- (ert-deftest ivy-read-directory-name ()
-+  (skip-unless nil)
-   (ivy-mode 1)
-   (unless (file-exists-p ivy-empty)
-     (make-directory ivy-empty))
-@@ -1136,6 +1137,7 @@ Since `execute-kbd-macro' doesn't pick up a let-bound `default-directory'.")
-            :dir "/tmp/"))))
- 
- (ert-deftest ivy-partial-files ()
-+  (skip-unless nil)
-   (when (file-exists-p "/tmp/ivy-partial-test")
-     (delete-directory "/tmp/ivy-partial-test" t))
-   (mkdir "/tmp/ivy-partial-test/test1" t)
-@@ -1452,8 +1454,7 @@ a buffer visiting a file."
- 
- (ert-deftest ivy-swiper-wgrep ()
-   ;; `wgrep' requires Emacs 25 or later.
-  (skip-unless (and (>= emacs-major-version 25)
-                    (require 'wgrep nil t)))
-+  (skip-unless nil)
-   (dolist (search-cmd '(swiper swiper-isearch))
-     (should
-      (string=
-@@ -1585,7 +1586,7 @@ a buffer visiting a file."
-             '("one" "two"))))
- 
- (ert-deftest ivy-avy ()
-  (skip-unless (require 'avy nil t))
-+  (skip-unless nil)
-   (require 'ivy-avy)
-   (let ((enable-recursive-minibuffers t)
-         (read-numbers '(ivy-read "test: " (mapcar #'number-to-string
--- a/app-emacs/package-lint/Manifest
+++ b/app-emacs/package-lint/Manifest
@ -1,3 +1,4 @@
 DIST package-lint-0.17.tar.gz 284965 BLAKE2B 752adde42a820f54adef63cbe9f0cebef5af1d4d51dfefe9bf1c18929e739137081b722632f1fae8e171f4e25c0b9b15b47d9b3fb2c0f0542b214054c46ea190 SHA512 3f2240e03f67d6575b93643d26abd768bfe71fa1223c38b5b889c0f11784d22d3ad1849fa8f1424dccafc3befafdb49b1d796f175867490db96534c0e4b5f25e
 DIST package-lint-0.18.tar.gz 319579 BLAKE2B ba9ebc1bb3155b24ae6bfb7ce78f2360502ebac2aaa9f06bbe30c59b750cf3d4cafc318c2e0da9cd6414837d5bf2ad187cb6d4b3cf4edef4d10dffb453b1e06a SHA512 5f39e9de275b7d57e8a9cefa1edfd244e004ee5b436ac500739b5b615795cc894443f1596801a493cd60f9205c02203c12e9577893212b1f03e47eed66100471
 DIST package-lint-0.19.tar.gz 319593 BLAKE2B f17822bb2fd08c6e468457abfd283bfa8e3eab94bf7daf76701bcc603d4f73cd205348a19f403d78321402dce3b09f2f13a7ce27f34a96db19feff42fcb0389d SHA512 5024d45b5c3c6b6f958884b7bcf5ae9fb27afd61d66353c421de89b05abc87457fd6b301f0aa0254a9fdbea57e88a0ecbdc03eeb5a710c1a29a88af29626c850
+DIST package-lint-0.20.tar.gz 320154 BLAKE2B d1034df225179b4c5c9858212531991e8e4097504770e0067e48a42323f758a40359748cb4d86b633282b42d7c7f9e42104ec1baef4be2b98661bb99be45f405 SHA512 18935929a2d031194eba3045bcd56bb6911859bb9f221ee43c3735fa8a873d3e363950c7d3b2f056e24f62cace48202955ec98487460a64e28a5e31a6587b7b8
--- a/app-emacs/package-lint/package-lint-0.20.ebuild
+++ b/app-emacs/package-lint/package-lint-0.20.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Linting library for Emacs Lisp package metadata"
+HOMEPAGE="https://github.com/purcell/package-lint/"
+SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}"/${PN}-symbol-info-data-directory.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_install() {
+	elisp-install ${PN} ${PN}{,-flymake}.el{,c}
+	elisp-make-site-file "${SITEFILE}"
+
+	insinto ${SITEETC}/${PN}
+	doins -r data
+
+	einstalldocs
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/plus42/Manifest
+++ b/app-emulation/plus42/Manifest
@ -1,2 +1,3 @@
 DIST plus42-upstream-1.0.17.tgz 7592298 BLAKE2B 262b985bb9f42ff98a218676ce9d831494cd4cb72db8c6557e3ebb2b5e43f7545c1f7c20a3c7297921a3fc77dea366b1cf4c7745cc9d473e18c395fbe43c05ea SHA512 79e1310f2fb34b34b827c84ca6749b7af6a800a97fb9ada4bba19cc477f3ff7077fe51b82c3e8845049f65d9abd83dc4f8bac9ea522f8a8ca46bb5a43b786623
 DIST plus42-upstream-1.0.20.tgz 7595277 BLAKE2B 17ab2955a7408436756709362026590c4be40ad1049106c17a596c5e370343457e0f26d01099c89c40f1f57d2c90b066f4e6c4a4bd6e39263d6bd1301e39f814 SHA512 a91853b61cb72f61d2cc3cbf1e700c64d9ffabde87037017230513fc908bd35a2310e460e73e0d9d3eb459db41a082527ad32ff4714737376d735434bbb140bd
+DIST plus42-upstream-1.0.21.tgz 7596740 BLAKE2B 2710ec70682ea8a68ff07388c210bd253f5a91736caa017efed036b0cba41a9895721287246982477adaf4288d79d195cf6543b79d5e0905b62acc91becd4da8 SHA512 55b42e006ce003c9e619fa10ec7e28319f82444bce0f811f9ebdd16c0ceeded9e978a3f7c0b134bdc17c39a55f1071b8245d099d1c7d9a7b81bfe850d30bd962
--- a/app-emulation/plus42/plus42-1.0.21.ebuild
+++ b/app-emulation/plus42/plus42-1.0.21.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-upstream-${PV}"
+
+DESCRIPTION="An Enhanced HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/plus42/"
+SRC_URI="https://thomasokken.com/plus42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="app-accessibility/at-spi2-core
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-fix-makefile.patch"
+	"${FILESDIR}/${PN}-1.0.12-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/plus42bin gtk/plus42dec
+}
--- a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
@ -9,7 +9,7 @@ inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper

 WINE_GECKO=2.47.3
-WINE_MONO=8.0.1
+WINE_MONO=8.1.0
 WINE_PV=$(ver_rs 2 -)

 if [[ ${PV} == *9999 ]]; then
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/ceph_exporter/Manifest
+++ b/app-metrics/ceph_exporter/Manifest
@ -1,4 +1,2 @@
-DIST ceph_exporter-4.0.1-deps.tar.xz 7402752 BLAKE2B 4619eba4c1630cd683193fec8f449698587dc8d17c26992e033fa7495934de26bcca84fac4ac174e25e7f405c27033fc324703748cac59f90b6e58c2548f8cd2 SHA512 893a6d246c640647ac55f5f32d657cbd80bec3c9404e1484e6188e4e045a20d01d50559723105f179d438019f66d904938a24ce164f85a41631930067d92f7ba
-DIST ceph_exporter-4.0.1.tar.gz 143653 BLAKE2B 2a8c907fb5ff06bc629644aab94b450646f6b25ff057d2b01485f0131cef3e64e3b159f029f29cf78c8d6b450ff9b750858799fe079256509e31e5b8bcf3e012 SHA512 154e75cc397635450d2b99e5e56c829fd5816e9aad95707eff42500ce21fd92a6d12772a58530b580b8e14e5db7c32d2d24f395175f414df9d89fbcbb8239ece
 DIST ceph_exporter-4.1.1-deps.tar.xz 7386488 BLAKE2B d5ccacba93ae8ee0f03f349860e02e19bb52a5bd6af7ec1b2c6209d29834a74a6934f19a9435f5be1539e6f141ec41e1219b62660aff90a529513b91a3d0649e SHA512 a6f9a8053d3a8957bd03535089c3bb3c818f153f69c2488db08d0fc9a63f7d30ff3b490b0f0fd81399153a19c853239a9744564881c159bc88f5cf91807e10b0
 DIST ceph_exporter-4.1.1.tar.gz 146022 BLAKE2B d833b59418148efb1008d7d444f27a9310d1214197abfb022f74c8fd7af15eceb04c26bab8307eca80bbb4c60b54e7469da74562e38e06cbf7c3559f01d2e0d2 SHA512 1f840d02b50c6cd55c1fb78d44a9fb0beafd241168d3c1d4ad2a9ede67a4fd67b48311de8af0b637a07b04a562938afb72a3379a3c40d765f73923024a8ddd62
--- a/app-metrics/ceph_exporter/ceph_exporter-4.0.1.ebuild
+++ b/app-metrics/ceph_exporter/ceph_exporter-4.0.1.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Prometheus exporter that scrapes metrics from a ceph cluster"
-HOMEPAGE="https://github.com/digitalocean/ceph_exporter"
-SRC_URI="https://github.com/digitalocean/ceph_exporter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	acct-group/ceph
-	acct-user/ceph
-	=sys-cluster/ceph-16*
-"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-lang/go-1.18"
-
-src_compile() {
-	go build -o bin/ceph_exporter || die
-}
-
-src_install() {
-	dobin bin/ceph_exporter
-	dodoc {README,CONTRIBUTING}.md exporter.yml
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/lib/ceph_exporter /var/log/ceph_exporter
-	fowners ceph:ceph /var/lib/ceph_exporter /var/log/ceph_exporter
-}
--- a/app-metrics/ceph_exporter/ceph_exporter-4.1.1.ebuild
+++ b/app-metrics/ceph_exporter/ceph_exporter-4.1.1.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Prometheus exporter that scrapes metrics from a ceph cluster"
-HOMEPAGE="https://github.com/digitalocean/ceph_exporter"
-SRC_URI="https://github.com/digitalocean/ceph_exporter/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	acct-group/ceph
-	acct-user/ceph
-	=sys-cluster/ceph-16*
-"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-lang/go-1.18"
-
-src_compile() {
-	go build -o bin/ceph_exporter || die
-}
-
-src_install() {
-	dobin bin/ceph_exporter
-	dodoc {README,CONTRIBUTING}.md exporter.yml
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/lib/ceph_exporter /var/log/ceph_exporter
-	fowners ceph:ceph /var/lib/ceph_exporter /var/log/ceph_exporter
-}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/dvorakng/Manifest
+++ b/app-misc/dvorakng/Manifest
@ -1 +0,0 @@
-DIST dvorakng-0.6.0rc1.tar.bz2 28994 BLAKE2B 587222f6d3e65427ba3cb28c5ccce976363638dbe611382af9345e542387f42e855aa5a2b578abe451b719663780af214b02d087d1add3ec8574af8d8e207112 SHA512 87f0bb2199188093ea4223d7dc47232f53b266aa9498170b643c25e724f547fa1ce5d0e1d4e7f275c712f6ec4850d825827b66f84407f186eb80b73ac973ded7
--- a/app-misc/dvorakng/dvorakng-0.6.0-r1.ebuild
+++ b/app-misc/dvorakng/dvorakng-0.6.0-r1.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Dvorak typing tutor"
-HOMEPAGE="http://freshmeat.net/projects/dvorakng/?topic_id=71%2C861"
-SRC_URI="http://www.free.of.pl/n/nopik/${P}rc1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="
-	sys-libs/ncurses:=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README TODO
-}
--- a/app-misc/dvorakng/metadata.xml
+++ b/app-misc/dvorakng/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@ -1,2 +1,2 @@
 DIST fastfetch-1.12.2.tar.gz 538194 BLAKE2B bc6badbc7f690dacbe1408479286a0d42ec687526f776ff4d2ec7b0eb767032e5781cbbe37778f4dc03a5d386979a9ae2aab84c466be997b82d9a9a6c81ea78f SHA512 a82a7c7ae365335c20d659a82215cf320c4c6b07ff127c4dad322a0a01f7ec57e34d229f4953108daadcd0d243c84f8504a3b4367df5e255e5a06e685fd6739a
-DIST fastfetch-2.2.2.tar.gz 900528 BLAKE2B 435e42748d24c7dc20bc5081fb45b55d71391a60f830d3dd18b63c604f09c4e8c66ce4a58a1e80e9e78cf7886805fbddc3e9e46a85d6f93cf219b1cbf9789c11 SHA512 f4ba2b9ffd68fe76043089595445d3f2227152292dfeaf9ecaa45dd18def0c1dd3a9e113aea92bd2361699bdef7a44e1bdc45486b2f3f123428c500e747a0bb5
+DIST fastfetch-2.2.3.tar.gz 901203 BLAKE2B d6d097b72ce2f252e42b3e59cbd26b43a4f17ae974382f986270fbf91b457cf3c49e78a3c775e713d9302d536fb5a363e809005b9174d1a27622e6b6ed666709 SHA512 81e051b7555d56415c723606c0b6dfc3ad7ed91fb2c7b36c07465f4dfbdb91da5c8d216e46df36863888448de0a7bd63e28c6aa701995bf1165e0d7c33c4f724
--- a/app-misc/fastfetch/fastfetch-2.2.3.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.2.3.ebuild
--- a/app-misc/vit/Manifest
+++ b/app-misc/vit/Manifest
@ -1,2 +1 @@
-DIST vit-2.3.1.tar.gz 72143 BLAKE2B 288e21083fc39d47aa1df6d3adf5b5973a50ab0463ad53a40ad70c1dbc627821ed4e567cd269749cca470fb7705f0f1792dca9db58cd16b504d5e0a0c2471097 SHA512 930c02ab2f399a0338a1a7f328a99452c1448bd9352c1f0535c720b6d4437ff29345a23a73af107aeac1091ad33829a563ce69daae53a44b684cf71a54d70d4b
 DIST vit-2.3.2.tar.gz 72321 BLAKE2B 45fb6725547f2a6703dd0862df522781f5a5fa7d7264a1c1dd95d28fcca688661c971abec789e93fa40b4c40b2c1991ca5b951b4d0439baeeb7ef7f82aed6e7a SHA512 f24a3bd238b390acb437b1a7bdd888f468196ddbf179d1aee9578ce1c83e6f973703d779c231c07024f81600066431661e312419ad5a4c81bcb1125a9f714f42
--- a/app-misc/vit/vit-2.3.1.ebuild
+++ b/app-misc/vit/vit-2.3.1.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A lightweight, fast, curses-based front end to Taskwarrior"
-HOMEPAGE="
-	https://github.com/vit-project/vit
-	https://pypi.org/project/vit/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-misc/task
-	$(python_gen_cond_dep '
-		>=dev-python/tasklib-2.4.3[${PYTHON_USEDEP}]
-		>=dev-python/urwid-2.1.2[${PYTHON_USEDEP}]
-	')
-"
-
-distutils_enable_tests pytest
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@ -1,5 +1 @@
-DIST elogv-0.7.9.tar.gz 19556 BLAKE2B 5d5f1a4adab09cf8b56ca3433b2a1cd0d3572345ff92f34b6b3ad175178161c36531bf9211563f4ad18191c6ff99c2cdcf9c3d188eca293a1698157e0a9f04a2 SHA512 703d1e8f55f5ee17a393f3a331ee38ef1d4e4c918c316055d5e2297b96dbe7de0ca6df864f462520f2087ed1a7bb7f43db56bfd3864a865d349516694522a686
-DIST elogv-0.8.0.tar.gz 19563 BLAKE2B 1483f1973f0d18470484f8b4861f9301f5a2cc5e813709c3783127d0ed61db952c7edb1e5c12a3ba2066aa09bfd9c7547bc695ea9b46f106996b3036abc32d2d SHA512 75c1bce6dae36f5720e36a92d08c9469a54b31ff50321cc6fc250aa5a3039f2b4ce7ad518d261acb2d653e20783d375ec2c88bc2b86cc1400b6a49cfbb14647b
-DIST elogv-0.8.1.tar.gz 19289 BLAKE2B e88e7383661e0a6336ffbb9027ee9d5540f14db7dd00e385afeb732925487a5cf9e73aa56cead2e11c6ae893a92006b3c75231dfb8918d8102af5988c10a480a SHA512 36f4eb237a8811d3720862d0551a84a0abce36cf565c810d25457ec5b1b2735897be69856ab50be2ad08be77b3761435aae87ac377407374c7643d05fe592f27
-DIST elogv-0.8.2.tar.gz 19212 BLAKE2B d37daeccc4b1ed780d943649dd709815b8d2ab69665a9426700501b9266c3cd70ad0d29a828195fb16f9be71692ab1fdb80a503de94a759447dd5540b29e9dc9 SHA512 bc542c1ba941379290159796ede2aed8345c09e050bbbfa65ceb8f1d8c0fc6c33147d716bc685690e6b5d513d66d3aa04c96b28674ba4d83c29348740cb8feb1
 DIST elogv-0.8.3.tar.gz 27144 BLAKE2B 7c672365afb9a17e2acf76f04b4479a5a9d8a43fd1e739ac86fb00f2744ad2b2871f12e3b384d292c8f7d704af877372e201644a6354b49d38d6ec03c2437f4d SHA512 9825e530f3e2de9f84aa77afba813aaba8ce68e3fb52f7685e98099e9f5a3b828cad259d4eb273aafba9b7a14ea9e41e9c0ecf2f6efe1dfd3b81f9ea0786592b
--- a/app-portage/elogv/elogv-0.7.9-r3.ebuild
+++ b/app-portage/elogv/elogv-0.7.9-r3.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://gitweb.gentoo.org/proj/elogv.git/"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-PLOCALES=( "de" "es" "it" "pl" )
-IUSE="${PLOCALES[*]/#/l10n_}"
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	elog 'Deleting unwanted language files...'
-	for i in ${PLOCALES[@]}; do
-		if use "l10n_${i}"; then
-			# Keep and fix man page filename (bug #869905)
-			mv "${ED}"/usr/share/man/${i}/man1/${PN}.1{.${i},} || die
-		else
-			rm -r "${ED}"/usr/share/{locale,man}/"${i}" || die
-			elog "- Language \"${i}\" deleted"
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
--- a/app-portage/elogv/elogv-0.8.0.ebuild
+++ b/app-portage/elogv/elogv-0.8.0.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://gitweb.gentoo.org/proj/elogv.git/"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-PLOCALES=( "de" "es" "it" "pl" )
-IUSE="${PLOCALES[*]/#/l10n_}"
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	elog 'Deleting unwanted language files...'
-	for i in ${PLOCALES[@]}; do
-		if use "l10n_${i}"; then
-			# Keep and fix man page filename (bug #869905)
-			mv "${ED}"/usr/share/man/${i}/man1/${PN}.1{.${i},} || die
-		else
-			rm -r "${ED}"/usr/share/{locale,man}/"${i}" || die
-			elog "- Language \"${i}\" deleted"
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
--- a/app-portage/elogv/elogv-0.8.1.ebuild
+++ b/app-portage/elogv/elogv-0.8.1.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://gitweb.gentoo.org/proj/elogv.git/"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-PLOCALES=( "de" "es" "it" "pl" )
-IUSE="${PLOCALES[*]/#/l10n_}"
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	elog 'Deleting unwanted language files...'
-	for i in ${PLOCALES[@]}; do
-		if use "l10n_${i}"; then
-			# Keep and fix man page filename (bug #869905)
-			mv "${ED}"/usr/share/man/${i}/man1/${PN}.1{.${i},} || die
-		else
-			rm -r "${ED}"/usr/share/{locale,man}/"${i}" || die
-			elog "- Language \"${i}\" deleted"
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
--- a/app-portage/elogv/elogv-0.8.2.ebuild
+++ b/app-portage/elogv/elogv-0.8.2.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} pypy3 )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Curses based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="https://gitweb.gentoo.org/proj/elogv.git/"
-SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-PLOCALES=( "de" "es" "it" "pl" )
-IUSE="${PLOCALES[*]/#/l10n_}"
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( README )
-
-src_install() {
-	distutils-r1_src_install
-
-	elog 'Deleting unwanted language files...'
-	for i in ${PLOCALES[@]}; do
-		if use "l10n_${i}"; then
-			# Keep and fix man page filename (bug #869905)
-			mv "${ED}"/usr/share/man/${i}/man1/${PN}.1{.${i},} || die
-		else
-			rm -r "${ED}"/usr/share/{locale,man}/"${i}" || die
-			elog "- Language \"${i}\" deleted"
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
--- a/app-portage/elogv/elogv-0.8.3.ebuild
+++ b/app-portage/elogv/elogv-0.8.3.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 PLOCALES=( "de" "es" "it" "pl" )
 IUSE="${PLOCALES[*]/#/l10n_}"

--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST qpage-3.3.tar.Z 225689 BLAKE2B 25ac50bbe1e5a623a95f0ca8ad53255693647ca49763d80bb571ce36cf941618b6cbecc1681035d5d56d559a30e2da2a8d3621588925b00b9cac7ad278ec4a44 SHA512 d6062fb9e9cd6cfd60cadb923d29d36fd649c27adff2a36fd4e768798b90780153b78e7d0d1a13dcad94971ac98b32c1c5a3b415d5a1b4aa1cfbac564514a3e9`
				`@ -1 +0,0 @@`
				`DIST flexbackup-1.2.1.tar.gz 80158 BLAKE2B 0e54c275ddd218184195bb5bc873db10ab144409eed9d87410e5b7ba5ed09297fbdb58f3eb69b5d55c1ec727fe79f51b376914542ba5eae70ab4f87351b6dd4c SHA512 17630bc46657becdf5d5bde4852fd6cebe189fe54d381bda6471aa2e1db1ff082ba24461e2c22ba5805c2d93ac7f9805ffbdc4904da017f1b163cc21b5a3974b`
				`@ -1 +0,0 @@`
				`DIST prime-dict-1.0.0.tar.gz 6756593 BLAKE2B 7348e7a46dcf5a6d15ec2c5e09c4d89e724d912071a11b48b52f9e6cff62c0c52b7736da322a69ed6662e03c4b987702691174d48331e4ed692887d72b9169c0 SHA512 0cad16048baeeca982feaa3e95f7afaabaa94f511e1e80ad332cf106ea39e226f3119bcdc9636010cb5d5e0aef10dec0b8fc4d42b743e32c51971cb45e85dabf`
				`@ -1 +0,0 @@`
				`DIST dvorakng-0.6.0rc1.tar.bz2 28994 BLAKE2B 587222f6d3e65427ba3cb28c5ccce976363638dbe611382af9345e542387f42e855aa5a2b578abe451b719663780af214b02d087d1add3ec8574af8d8e207112 SHA512 87f0bb2199188093ea4223d7dc47232f53b266aa9498170b643c25e724f547fa1ce5d0e1d4e7f275c712f6ec4850d825827b66f84407f186eb80b73ac973ded7`