Sync with portage [Sun Apr 3 01:46:58 MSK 2022].

Manifest

@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29598 BLAKE2B c304b440ebfddefee894c370473a30f04ff5768e8e7ddbda199be7c84fcedd6ee71b60ac9529d875ec94fc4c6682da1871b89a6f5a71fa66501ba678d46ea948 SHA512 a4092eee256198f52faf3160fbb4bb81d9ae29c2e81271cad9e3ce91a1a3e60e5d592ce7ca5e47d7d297907a8e542fedfef135ddd261ec4e6dcb22364b21bfaf
-TIMESTAMP 2022-03-31T07:39:31Z
+MANIFEST Manifest.files.gz 29625 BLAKE2B 6c8e222f082e21880ab852ebbaa6f45c029e4ccbc699c2800690cae457de1d3602bcef011187033c959dba7cb68eca0b31c6a69df0c99e2f6f86f3a7ab7fb9ed SHA512 1e3c527f5fa40a93d64ff498123befae873257b81638e86b5c545fbefd3f942a10de5be2295f16fc8b8c378bb314565cc922ef9320636eb586a4e6efea237434
+TIMESTAMP 2022-04-02T22:09:11Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJFWrNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJIyYdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA5Bg//XQDSAm/RyiIPs0xTuqRdjK7qFZteJlCg4pDcI/sAYGn2c/MytpHdEC7Q
-eE7cOlmANCSerGQaAPbGovZ5BlaZ46GqG7sFPJBQhPQ665c+4KymacZ6PjTU4efD
-cgJoRhWQBv0LXt5f+wlFOkayLJi3eDM9dX1O4e6INPsOOAX/hKJckRQvUcQzbQ2s
-bIe9ttmM9UpSx1pdOe7HODmvTB03sdNZvwy4/Lk5otn/TWlKfeTfK/CVh5tW/057
-tz9+tM0a5qrnvNYUZ8iFs2CxQ1Dt9kNUZBy+qbnGVSZXYJ0consz4/fBd6njUdoh
-eHVNA1yVdzNKiZVESo3KoogIvodrKBfOrxfEDAgPjcC65i5EUierbP73wY8fVVvO
-GJAl9hYCgQfB+gP04zu9oZTH4IrN6P8gD3a4Sw5pIzeFd/WfbiQrOGoyARk74y81
-nGUOZ6Wd85p7U14OA9kH1ucXeVXU4z7XGcsuCRGOH89XfOHjU92a/hYzYQA//7q8
-ETqxLqYq+tBh1q6l8JW3Z3jlGT8hmuySeGrp/fLBJnAq3420yeu1FtW70RBt4xvd
-MC1eIA57QcJ7KtC7uGkP0ZR87XeWuwxQWWI/iqnwadO0ttXqsVxgRHOcbCrKrLei
-m20/j5/MWGpGdIP/oZkt1ykz22EHV3OpKH/1l8iouUiqPiuR+i4=
-=7r6B
+klAN6g//c+23/42Iepo8eojAJ8vXfj/rBS0SVCoQtkXY6UbJPXQRNtkYHeEAZx+y
+mcvrTF2CO/6hxyP2cBU/qyGV/TkU0fUrtsHU3BVSbN65QyKZ8UZViE/r0O3aIWm3
+fRtDUwNbPDhe77fIt4vTI3nk60bUQgt0hyBu7QYdP1t2Pc/Nokis5Wn2ccOMwq8o
+YDLY1ST81IPNe2TZfZ27U3Hmsp3Ki7l3Z4NwUnkHpePSUZcSlhgvY/KNgTrP7Kag
+uX1dc32PAFAZIHJJO9D3FockZISDaJGGWURdaRmDKVMoTZEYzGAA3tlSPUUzuBXd
+TP6Ag/GXh97Od4uroX/nB/BhRC4VmFAyUFGh3AWGOah8l1jVjgq84DK0Ryvazi6/
+ENjLAB39jjuRekgk10s5dhSN3E9LnmqUvqQnGJSKnlI72Qmg6FneAt7AmqoMdmLz
+fVwLuQuoOpu5rIEtQfFssQ14rN9Ef40igCuueJKeA2S1w0Yv8gUcLr/f5hOg5SAr
+sKWBHodQEWQSFIus2MNjU3rrw1kpqG2XA722Ds3/fKMKsYSZWxp/2SAoCcDyKqSi
+4GmU3QsoLi1wEBzhENZpyPAwYjSUDP3bBH5cEuXDJ+l1kDyDeAn3zVAxnMNrPjXM
+XWdZj8X0wopu9GfTkC1HezjtBB4v4qRXzy6Q3AdwaD1gks7dBCQ=
+=JTOY
 -----END PGP SIGNATURE-----

acct-group/partimag/Manifest

@@ -1,2 +1,2 @@
-EBUILD partimag-0.ebuild 199 BLAKE2B 29a40d7555b7d25aff006e1e295d01aa83a52750449e13885e1053411be6ddf3e770a9e4c39f1125b0caa26242cc954c948f1ee599023ac31481fac8f7a89715 SHA512 d676989dea98f7aae4b3adcb3998501b012ce068fe84867a5352d8a650f4e1497c3254a160fca1a1ee2dda63e64bd97ce6ba0f1cc497e120437d118fdf28e749
+EBUILD partimag-0-r1.ebuild 199 BLAKE2B d04bccd7067c82923be93bc23a2e6b634da06e5b4de0510af9d12d1aaa7d2ab244e5730de9529bb28fe4d124686ccf502d7221c5e29a3eee63807745aab7111d SHA512 9c703271edfffa572b50cba4582cd5642ab0efb2bc8bc09754cc21b02feaaca439e2f09269d971d3e152d0360031d2628e7ce3ee8cccdc66bb896218d7dae4d8
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e

acct-group/partimag/partimag-0-r1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit acct-group
 

acct-group/sddm/Manifest

@@ -0,0 +1,2 @@
+EBUILD sddm-0.ebuild 194 BLAKE2B 6e9bdb2df04e69485fc61627d2fae81e40a8e922ecc87636c751587916c19ad5a601c55aa5d2c752ba7e8531ea41cf3f41af54880ffe1b1d90a1aafbb1d3ab6c SHA512 89436a12a085784fd093cce68a519eab143e04c8296613ae693aec0e7420de040721c801187beea1cf0f5d7b9188873b6ea2c1990a272e40084701690a0627c7
+MISC metadata.xml 347 BLAKE2B d35c41092c587e21f53b8622fb40c8d2625f2ee7b71a645ec478f1e90eb2645eb87b6cb8f06b7e1a317fd9074594da44de68642de0ab45ee748aa93106dcdc89 SHA512 b9fd27f1b7465b3fdf254604066d230ce01eb1713354ed90f95f8963804d32c37e02ceeaadef01a4019abacbcabd044dab9ca0b55e9709505cbdb7d7415c2071

acct-group/sddm/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>

acct-group/sddm/sddm-0.ebuild

@@ -0,0 +1,10 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for x11-misc/sddm"
+
+ACCT_GROUP_ID="219"

acct-user/partimag/Manifest

@@ -0,0 +1,2 @@
+EBUILD partimag-0.ebuild 283 BLAKE2B cd3918d1a87ccb5e67f3505ed573a49a85b9dcfb8a8942146ccb0441d566926f1220aa24966530e1dd421b0561adcd8affa1d57865d13639df7d1aba459d167a SHA512 b901f7307ae3971b71e560dc8e1e7ac90f669e959e035e0a7ff88cde149012eafec840dcd3565125ad512845f103dbb90a2eb2488b400ffbad6336f404ac4d4c
+MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e

acct-user/partimag/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+</pkgmetadata>

acct-user/partimag/partimag-0.ebuild

@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-block/partimag"
+
+ACCT_USER_HOME="/var/lib/partimage"
+ACCT_USER_ID="91"
+ACCT_USER_GROUPS=( "partimag" )
+
+acct-user_add_deps

acct-user/sddm/Manifest

@@ -0,0 +1,2 @@
+EBUILD sddm-0.ebuild 278 BLAKE2B 9aef91f57e0b567a2c65aa86d3ce82aacee5337199d59b482a61133ac35e9460e58b8e0e4726d3e2a747bf88f8be2af783595110de314aa19e5099ffd3a8baa2 SHA512 29f17772e3ef81aef06810fdc8f8f3626deb5482c2b2038152757c183715a23ce3aed26eb7b92dd4a45d8addb326f44a80a1baf4e7e3514d2477742dbf547cab
+MISC metadata.xml 347 BLAKE2B d35c41092c587e21f53b8622fb40c8d2625f2ee7b71a645ec478f1e90eb2645eb87b6cb8f06b7e1a317fd9074594da44de68642de0ab45ee748aa93106dcdc89 SHA512 b9fd27f1b7465b3fdf254604066d230ce01eb1713354ed90f95f8963804d32c37e02ceeaadef01a4019abacbcabd044dab9ca0b55e9709505cbdb7d7415c2071

acct-user/sddm/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>

acct-user/sddm/sddm-0.ebuild

@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for x11-misc/sddm"
+
+ACCT_USER_GROUPS=( "sddm" "video" )
+ACCT_USER_HOME="/var/lib/sddm"
+ACCT_USER_ID="219"
+
+acct-user_add_deps

app-admin/ansible-lint/Manifest

@@ -1,3 +1,6 @@
+AUX ansible-lint-6.0.2_test-module-check.patch 689 BLAKE2B 69152c8799165f8efcf44640ad44133147e95945aeb4aee7a5a45aa0e74432fce599040f017ae92fb7264855f74c0bcd71a44e26abf0abebfcce2cbcaea39ada SHA512 01be971c7d33086aa799910ac744cfceb07b4d5041716043c49667075ab8c8579b57f0c14a8094248f96462c93fff3ac110776aa0aa1ea3adf11dc622028ca7e
 DIST ansible-lint-5.4.0.tar.gz 349353 BLAKE2B 9f41abdf1e9485afa4c8ed9498627b0dcbdcf57916f3b57c9886de8bd806e4e5b34e7e9c2e66b44ac8009a0afcea4d8566900ee8d391eaca61081fa23323c41c SHA512 f1bbbb49eb77991d60b6087646c695a938d328d719bba67707af4ed858de857d383b78490bcf0930cffebd13a0b0abde20269a47e47e4713a37da715a28c5da0
+DIST ansible-lint-6.0.2.tar.gz 195044 BLAKE2B 3334049dd1dc05444c6c362601da8d7e808c6b3473e87613b8892651cecb76058cb0aa370aa5d00cf6bc76ee3b096480fdce52facee4f043c01d6c76084860ba SHA512 a47e79c59dfcf3e36654247bd206581798f2559261142e3943b60e0688d75b5a6332832a9f9127f99b2faa6afff959a33c55fbc80aa5881f064725998420f679
 EBUILD ansible-lint-5.4.0.ebuild 1852 BLAKE2B 913794c189a58ed0fa3cd0febde7b0ac4788294bee7b1309eb1d70f5619289d4c80f57a8227a7a834ce299c6a24a7c59285425c737d7b0cbd1e53c47ac570650 SHA512 5ca55f7c4d72b01d95813ecef1f3e984ff92993fb0cbf7e5090d938349dba942b88e695e6e34e022385c5a4d6e1fb457766d19aee606ceddedc458fa84c91bb4
-MISC metadata.xml 581 BLAKE2B b2032b06ec9ebe63385918be612a0ee1c351943bfc05a544670a78d87bb2836eb2143bd80da6542c140ab16d33f4b79fa0f18cce3291833b34e43ffb6fd3e737 SHA512 912848e5c37863ed0b04062210da0e925a2d71f1766dd43bb746e7aa364a86ff501e4a6e9762c584ca6d37d4f38b7418a32f3a02b30a7ee4b3f7b828f84f6646
+EBUILD ansible-lint-6.0.2.ebuild 2259 BLAKE2B 5fecb95420b58fe2892e0f825e935494bc548d8e2b7a89a43b5706c224f13c463b4bb1f95299549dc5974976a3d20ab430c588016e0588065a967e0e40baedc1 SHA512 96383643638ab38ab80a77c1ff513086632e6ccc9e55b79d8e74df1986f8a1af261ca45a0113ab8e0be403bcb3bda6e2573c0e8728405afcacecc0e95f36e7e8
+MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36

app-admin/ansible-lint/ansible-lint-6.0.2.ebuild

@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
+HOMEPAGE="https://github.com/ansible/ansible-lint"
+# PyPI tarballs do not contain all the data files needed by the tests
+SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+# As of 6.0.2, access to Ansible Galaxy (i.e. the Internet) is required even to get
+# the test suite started (Bug #836582). TODO: Talk to upstream about how to bypass this.
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
+	>=dev-python/ansible-compat-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/rich-9.5.1[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.15.37[${PYTHON_USEDEP}]
+	>=dev-python/wcmatch-7.0[${PYTHON_USEDEP}]
+	>=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/flaky-3.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.2_test-module-check.patch
+)
+
+# Skip problematic tests:
+#  - test_call_from_outside_venv doesn't play nicely with the sandbox
+#  - all test_eco and some test_prerun tests require Internet access
+#  - as of 5.4.0, test_cli_auto_detect fails even when run manually with tox
+EPYTEST_DESELECT=(
+	test/test_eco.py
+	test/test_main.py::test_call_from_outside_venv
+	test/test_prerun.py::test_install_collection
+	test/test_prerun.py::test_prerun_reqs_v1
+	test/test_prerun.py::test_prerun_reqs_v2
+	test/test_prerun.py::test_require_collection_wrong_version
+	test/test_utils.py::test_cli_auto_detect
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	# As of 6.0.2, without this the test suite gets confused by the presence of ansible-lint modules
+	# in both ${ED} and ${S}.
+	cd "${S}" || die
+
+	epytest test
+}

app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch

@@ -0,0 +1,23 @@
+Let the package managers handle dependencies, m'kay?
+
+--- a/conftest.py
++++ b/conftest.py
+@@ -3,18 +3,6 @@
+ import os
+ import sys
+ 
+-# checking if user is running pytest without installing test dependencies:
+-missing = []
+-for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint", "pytest_cov"]:
+-    if not importlib.util.find_spec(module):
+-        missing.append(module)
+-if missing:
+-    print(
+-        f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
+-        file=sys.stderr,
+-    )
+-    sys.exit(1)
+-
+ 
+ os.environ["NO_COLOR"] = "1"
+ pytest_plugins = ["ansiblelint.testing.fixtures"]

app-admin/ansible-lint/metadata.xml

@@ -11,7 +11,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ansible-lint</remote-id>
-		<remote-id type="github">ansible-community/ansible-lint</remote-id>
-		<bugs-to>https://github.com/ansible-community/ansible-lint/issues</bugs-to>
+		<remote-id type="github">ansible/ansible-lint</remote-id>
+		<bugs-to>https://github.com/ansible/ansible-lint/issues</bugs-to>
 	</upstream>
 </pkgmetadata>

app-admin/awscli/Manifest

@@ -6,6 +6,9 @@ DIST awscli-1.22.81.tar.gz 2182494 BLAKE2B 57f62fc372f065f7b7c3a7b7b4fe32fed1bdb
 DIST awscli-1.22.82.tar.gz 2182473 BLAKE2B 0d73e62f7c394c1ac77f6b011e2303d9b48b8fd6d874360aef6b2fc4378feb8f9fa04b88e9c1ee8cf0cb5fb7d1884d4a08eee64093c151de274c1aa50777ebf3 SHA512 195061199fa3ed24b5be2a22a5d0ee2891bfb616239aaf54e5aa8715b3374e68edad613ea6e6b71a165e501b5a009856993259de3ac57f14ff3cd2a39453ec38
 DIST awscli-1.22.83.tar.gz 2182511 BLAKE2B 45e4868e83d130bee6c5a7cb59792d4d66e76d3c1ac14a5c99f49f3f93461970ba881a515b4816374baea81250733d061a8618ca8244b9fb4bbd289b67b0c7fd SHA512 dc24134650aceb45e035d6009cafd353aef9cf08a8db00d7bdfa4e7a0056bcf3ded50b94086fae8ca70ff349cf880ad75ef756748f8f70d84b2bb5397d6685bd
 DIST awscli-1.22.84.tar.gz 2182437 BLAKE2B 0b61b6d96da302c95c83bdeedfa14abbcacb1cb3f1a320faa8ca2ee275e43407c0c109c73b7e39879002a920a100a9808fd74582b0620b97534a8eb0deef54a2 SHA512 14054f90c0d4e000869bd6313f61241a736474faf79b8e5768f5e0aadf7230fc6c8441f5c332a1ee4dc22e0023416713d89cde96a4fff4d83ab6826748aaff53
+DIST awscli-1.22.85.tar.gz 2183008 BLAKE2B c1fe5dd82331a3b1618d34d739803058c7422087b64959bbccdc0408852ae2f0d5b9a423925176468131befeba25cb035b73e6264e3fb17e5237c407b7e7b342 SHA512 fe767ecddf2979af0d817bd4276737c5372293c27ccec1844e54c2a0f46fc061fceb6cccafc5ef47f17f65d5b77d9ac4189e17e077736c4ad5dd72ecef4b556c
+DIST awscli-1.22.86.tar.gz 2184477 BLAKE2B fee34978cef17a0b4f51a9a110836882e11641914f7b2569dc2ce35be705abab16eda68a5706fa8c2bf24ee1c018c97d785296cec31c52aeb5bdf40511475fb9 SHA512 640de79a71459f3532c1d03ce6708a279e3a56e6f13dc3f72d73ced6888d8e30abe02806f6bee1ed04d7d909a667805daeeffaea9829e97b0f1447330d2d0a56
+DIST awscli-1.22.87.tar.gz 2185493 BLAKE2B 5d274e0c9483b22e664ad6de8710c04cc99f854b7c1efdac6dd4164deab47dc55d35520b34b276f8b4de1ee8b1ed10205b1806a31fc776d17b289a5e29277016 SHA512 c117fb8f89680836206f678637fb480ffd06db2225533bff75686eb8c1bd6e450297adb11863247441eeed67744b13930c0f62afce1dd12527d06d4e2eb58a4b
 EBUILD awscli-1.22.63.ebuild 1839 BLAKE2B f7e466a4f36db6c84df8c93c9d8ad959a1eb4595325656607eccf73464c93bf49a7d2dae2568bcfe966444117fb9ae68239be0b76a2c83c004a063c483f02862 SHA512 c5c5d8b04c5097135c4ec0bacf1a7a0c9d801af900bd549d76e3da33ab7b8b65d470af5c7420c14e93f867398c7f3ae2ef4e9d8a55328573b2167ce255893697
 EBUILD awscli-1.22.70.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c274fcc7c28151bd069c19aa4f9263af9f8ceb834113b8263228a2a5addfa14c58e65bffe22a2d8743734fe0a50a8 SHA512 1c98e9021e1c4ab175e67c06cf13f83b267f29723d6b651c0277a28701c1ad53edb6aa2833d0cf65e88d30deb35becffe286b9dc1e0093fb298760f890cbc773
 EBUILD awscli-1.22.77.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
@@ -14,4 +17,7 @@ EBUILD awscli-1.22.81.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880c
 EBUILD awscli-1.22.82.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
 EBUILD awscli-1.22.83.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
 EBUILD awscli-1.22.84.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+EBUILD awscli-1.22.85.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+EBUILD awscli-1.22.86.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
+EBUILD awscli-1.22.87.ebuild 1842 BLAKE2B d90876cc17fe116c87f9ca9be895f65fbf880cd8d71d70f6c7a86e43b619956cad426c246bfef1a4b330df39dfd97e8a8cae89bb466091ad40e95abb783150d1 SHA512 bd59ac72eec643d30b79ba3735cf51a7d294ed7d62b36f00692235b701314562366d081a069a9342debbbb8994308ed30a66671951c7fe8f9d401a207669295b
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160

app-admin/awscli/awscli-1.22.85.ebuild

@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# awscli 1.22.55 → botocore 1.24.0
+# so botocore is x.(y+2).(z-55)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
+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.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+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
+}

app-admin/awscli/awscli-1.22.86.ebuild

@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# awscli 1.22.55 → botocore 1.24.0
+# so botocore is x.(y+2).(z-55)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
+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.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+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
+}

app-admin/awscli/awscli-1.22.87.ebuild

@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# awscli 1.22.55 → botocore 1.24.0
+# so botocore is x.(y+2).(z-55)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
+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.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+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
+}

app-admin/hcloud/Manifest

@@ -1,3 +1,5 @@
 DIST hcloud-1.29.0.tar.xz 1499276 BLAKE2B 3ec9973fc3ecaf5ec476b2d165fc1663f4d6cd2c00c4c87efc72f3946d1d6028f9a2d20f80020203b1f8f2aa94512a1d02e05b54e9422f5b84826eb8bb552490 SHA512 b5b1e20785fc8a06954a753dbd6c5d91b2b557d0e64cb044ab55cbfb11f0fd7d0a2eb625a51e1216af86cad6f772a206d3b0ef443f256649dba38d199614d41d
+DIST hcloud-1.29.4.tar.xz 1417068 BLAKE2B 88a26d771cd0b7b603bce7de8e8e299dceecf931b8fd7bfa1e734134200cb4f2c6d0598f8253024179ba3a4df87d182418f2ceb8b230af48f82cc6be9720ef6b SHA512 409de5fc334fa725c9b314cf9a327976da043af675b704c8ee4d1bb7e42d70607722891deb9ff2b5b1298b7a38d8ce4b0063a10d64c5d1fe2be03f4c8c794c25
 EBUILD hcloud-1.29.0.ebuild 712 BLAKE2B 720832d21c95224d42bc4511184428280c532f7edd91acfa6ead5b71fe0f3d0243285bf07b196b8cf86d1cbd9e5bbcc3d5bae99d71fa3ac739d5306584ae61b1 SHA512 879162a964a3bf1b13a74a5ef4e916153aed3ef7096d481e2c2428e27b812f6f1c4e181fa42c591140949a57b538150dedfac3e9452676c9446114c2cb861a27
+EBUILD hcloud-1.29.4.ebuild 726 BLAKE2B 7d96a9012f4b897b54576a5dbedb9419e0fcaa34476e68d252b907132efe6bc638ad9598a034160bcff3dca5b86dfe3a9cc9b4380b8606db71c889bcbafa2e2d SHA512 78a825e2b55f7ffbf6c5e7e8096f788b26d9fc4205edf5dc05286d8bf9da17d5f17d266f6c990bb07154edd7ba635a4c332241ac225e6b3ab02ab9a9f82f68d3
 MISC metadata.xml 338 BLAKE2B 6ba2cbe509581ac35dabd93abe166f960d69d1f14336779848483386d28e22dd06e5d196061312827b7a945369f05a466417a1636b607e138515957a75db6f84 SHA512 cc69ce0ab7ba3a9af94ef1918738074cdd725bef2ff70d6c19e46d07bb9514d05ef6415c7ba5b372e7a98902a8440cdb9f7b14a848c3ff2f054863356971ddde

app-admin/hcloud/hcloud-1.29.4.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A command-line interface for Hetzner Cloud"
+HOMEPAGE="https://github.com/hetznercloud/cli"
+SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+QA_FLAGS_IGNORED=".*"
+
+src_compile() {
+	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
+}
+
+src_test() {
+	# For upstream a simple test is run 'hcloud version'
+	./hcloud version
+	if [[ $? -ne 0 ]]
+	then
+		die "Test failed"
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+}

app-admin/helm/helm-3.8.1.ebuild

@@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT=" test"
 

app-admin/salt/Manifest

@@ -19,14 +19,18 @@ AUX salt-3002-dont-realpath-on-tmpdir.patch 1808 BLAKE2B 2ce464fef827cb98490b8a2
 AUX salt-3002-tests.patch 1125 BLAKE2B 345c094c38a1b62190587062a86da4e0a516988fb2bbf98c295da87f0abd456cfc8f25c11fe10a1c4571d4eb25390c6d89b0e300bd2ae6d82212d1685af8ed30 SHA512 7f9d6f8c4a5d34381c516c72d77de6613ed646fb88f89b7c4180afebb0bf0ee34a99ed02a7e8d7a6836a61c01653fe97a13c8caa18898a507a03091cff8e9d30
 AUX salt-3002.5-tests.patch 1437 BLAKE2B 7c0ddc9ab12c7ed3d07e18a22623f5f9e24f47bf7e871ad7b71f0d1c482790f1ac994b628bbaa0692344deacf57526496c79f1aa7fc1a68092dea67392c0ce45 SHA512 1551757f01348d64de94b8b5830ad45333a06e1cd54d457702a33031b1f741ce12c23c9452e25d3498a0fa6a8c80ec425b0618809af7c3860ce1064946491cbb
 AUX salt-3002.7-tests.patch 439 BLAKE2B 241d1efab22509c73e23d1e4e397fff5c6dadd7481cf8156df5d8c2b79e6b332c3e55e40e00582ed57c67da61dbad97a8be6df62209bd435db638e6e8a9d06c6 SHA512 c9145592a810a135111079d39d9a28cd0f4b7530e19864ee87b144b44c951b9a43e876f935f05a8ea8428da7fe3cfbcc49020baf46baf7b840816b15aff3f190
+AUX salt-3002.8-relax-pyzmq-dep.patch 293 BLAKE2B 7c56c7ea6124e18e6d71f1266cbdcca26537a2a5a72a996412a59eddeba5987748e9079a3ca601cde9365c65aca9e0aef3ed5f6fc47cd8dbfac3a43c59f0a4ca SHA512 3906630838b8d915e3bad3e1dd649d3ab6b42697aa4b26bedf3ab9dee406dd000440073fab026a967ee261cc1e64d7e14fbe1016f1d5b47576bbae496bee215f
+AUX salt-3002.8-tests.patch 1531 BLAKE2B 8a8b02a0ad6099aac7722d8f8edd178b27817483ef9216ca3f00078231c13d2f5e3a551539956186933200d04349e67640aa691cb7e5f35e3f6a4ce3dfb71368 SHA512 e146a04570aa9524341216547d8a55a434499eb67c4be1167a0fee778ce93c172555816a5422462648ce5431106c47840e7c0f270b6087cf84058082a1a7341a
 AUX salt-3003-gentoolkit-revdep.patch 514 BLAKE2B aff27558a2043970feeb3eda70cf8e9112b5545af40ba215c7859520ef95a9824001274e837929ef6c25f8e1c35a8ac73f1033e63336bcbaf48dbd4b54c2d42c SHA512 c8a4649ac241f219cf576b0896f48dffc0d5a273118713829c0ad34594f77cffceaa4f06a4d0f47a17b13d6e71b5787fc27f8ee97c774e53a6d15d1b282f99b3
 AUX salt-3003-skip-tests-that-oom-machine.patch 732 BLAKE2B b9e10cf8d9ce7f36371fd30fcf592dce4933a05ca2d85c41b2159233272f2e7c90315fbd998c4064f3733b5b1944f9f96816418ed7eb434f3b9df324de2e859b SHA512 e7bc9c63d95a9af4e85372ca973c5023660c332b67486382ce898e7d60c3f50e2aca59e2634a2e87ab7fa8b34e45bfd3a781e04b8003108efbfcc67cd921aff4
 AUX salt-3003-tests.patch 5792 BLAKE2B 6a383c400bfb1f261d284844dc12bfabe4fc1741c5bc840131440ea991d64e61432f4e9ac4059d5bc8680b7752c6ceed16c474d0908b53657f15560a7c6f0e8f SHA512 fdb3eef283b62da9955cbe88d7f99f889c23147d3b60af7d49e4a54f61d158903ea77ff321764e0f3aa62b38ac7045d46d9f17ccfb2870c56b8b32baa856b6a8
 AUX salt-3003.1-tests.patch 1151 BLAKE2B b2f0d99bf4bd90a7ea85ae5cc6abb91dd078ad8a95b062863a21573067f3df6045fe23ffd1b3f397e28b90b25126798253e8a9001509ad786cee3f318a900321 SHA512 9340a1dd343af45467be63b1f6991cd06fa57ffc187bcff4a96c75a9666a1429b98ce5b497354bc4cb975c0f6bcd9a64dbfb819b6bfdba02bb5917446d0a36fc
 AUX salt-3003.3-jinja.patch 5036 BLAKE2B 7b54f79a2c24daf706cade5e3fe9470a01ddb81e2c7ac1a74d9d3f3bcc6f365562435607d6829433bfc31a5cbb8fcff603fbc183ee07ef32582b4ca1fda9f7be SHA512 e3d5db2143b7cd80bc1c0eee297ef9cc05301be43a57cd9471e28e01e405749bad1823eb992cab9267a47a1dca690c15b782c2a9dd2ab54a2b4a0375e8f75663
 AUX salt-3003.3-tests.patch 9888 BLAKE2B b8785f6498246e3a61079721c060aebda15a595232600aad408e01cae052ccf15d0b482efd17c12de74bd227cabaf2e95812420f157bdc97edac60e9a25d1c44 SHA512 4709c63ffe1c8205672238855f07adcc28556d8d8fcb746402e07651552015ce8ae6754f2a6ec07545d58f4c018a27d14273e8cbba1ecfdc7a1527007ee7a928
+AUX salt-3003.4-relax-pyzmq-dep.patch 333 BLAKE2B 31596e398c420e04802f086e61ff59676a9687c199df0f7fcb9c7e6a804a3339e1c1960a0579cae0022f90c0e1a274aa90916b7a685239b54d47851246acbe1f SHA512 e9796a8cb0bcdc9d90f8a3d4e01d955a2ac1129edc3d572be7ddd472fd488bae933e80f6a107471c6660b61a16d9034cf4a80c7b8103a2c0b26b4392f5c70286
 AUX salt-3003.4-tests.patch 1982 BLAKE2B 920f9c7e587358cff0abf97f2dfe54ee523f82a35c238d193520e6bd30921cec993705dd93d0c8130d4794fe051e7236411afa552d311f2dcc30596c1bac2b51 SHA512 700cb7e9020383b0684898e4a6675174e552bed1ba7540cb773303ec151574707d142b888a99d5288e18236cf0d47169f1515041e4e6ca91204a0bc140f66898
 AUX salt-3004.1-jinja-3.patch 1638 BLAKE2B 3270b3547fe526dc178330e637aa16a363d483b4d17ac32f1d91bdfa47d917108d7dc032b0ad67d294868a131d2383ef660e7e04e961b4fd0c0d7229357809f3 SHA512 533c5b093e6ee7c6fe1808b9a7a914281cafe71cdd781e48dba38075ca079311c0916f6a8cc754ed90c3a21cc07d169523fe3ec86af759c03d874a9e21637a92
+AUX salt-3004.1-relax-pyzmq-dep.patch 348 BLAKE2B 75a5947cf6f92fd08da25d50b9064d82c13eaf9f2f2f4ed627f8690ba8893b58de7ef2f0a976879ce94f8f542b9198c637021ba08bc067f3eb56aa40e9598c75 SHA512 7c48d3f86cd81d11077c80ca9536a85c9825299dd9c2a81fd43fc2c2781211d9bb72e4dd79381343851c3292210eab41de049006e608ceb340af31a84cd244bb
 AUX salt-3004.1-tests.patch 12128 BLAKE2B dfdabd99aeae7d8d398c0232b638f048673daf7b222efbe948ed6411b16ef5910199c8ceaa647abf612f711d2b7e07ea5ab8cdcbe796c4fdfa8f20a80355265e SHA512 b7e922c1008118a93120d374f66ea711919e9853365ae66e5ab5b52044f0c0ecff48821342b012d68ca0e4bb28d11a8c0a438ba3ecb1cc7cde88f777a72b299c
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
@@ -39,6 +43,7 @@ DIST salt-3000.8.tar.gz 15249139 BLAKE2B df306669ba11dd650621222ff9c69f5a6e16b6f
 DIST salt-3000.9.tar.gz 15250432 BLAKE2B b76c166363b0b0fd3e3aa4b5306ba8280a2c99fbc7fd9866d957406bba8e6fcc03b769b53dbb80b115f9fa9f1fdc93e1eb257f4bf04283e414a309c16e4f078f SHA512 94214f20a8a080ebdcbb7e3351f60a466c3a92cc85d177c2ea677192a63e58b0f9cacfb1af04e14022a7ac570ebd0b931722d1d001a7655dcd7502813c29a092
 DIST salt-3001.8.tar.gz 15740488 BLAKE2B 77875a670b81438280becd1f29b64fbc766379192a9ca041568cd9360a3c4213bb3018063e88a297e9d1f637fb7ca3ef049a73a258022ec07e42f01a40bdf09a SHA512 8e90b2a1f82f951ab40a53a8af2ab421758ed8244f1881cc7aa71a8d9c2e2e6d892166ec8f8f6182966e56eb28c9aee6a060ee54b559b1d073fba97ad0afb013
 DIST salt-3002.7.tar.gz 15792124 BLAKE2B b4cb4a6d73c45f3c2183a7adfe8196bbc5788dce1995bd5c640cd9957bdfdba2e96deebaba927d6103fc50f4eaab86d51f4dd4594d25b7357db79ed67b39258e SHA512 c1e7bbcd39b5c2bef351bd74026346bf729839c4161f6eff8162620e9cb08a63073abeeb8af6bab635070386a883df494ef08cc07a84efa9aa7f2160b357a938
+DIST salt-3002.8.tar.gz 15798643 BLAKE2B 12280dfd29f46f9bb8b2df6fcef474c2c2237d6f9c71e1474caae58893605dd6f9fb4c4573f52765cb950cd15e31fc0fda2fa8dd1c87d48c1951d2812c1a3a81 SHA512 a88a6f77d2af2cff5d5244f38b16a1904da05bdfd45b2087691e41b07f21785b1838151314d7c80d3a33eebefe480c8f3678fa161e9ceaaa50c997022463c472
 DIST salt-3003.3.tar.gz 16017984 BLAKE2B 9cd1e33a7b6dff4d3c6c5a87e1204f7f113b6190da8301061e26fcec178aba597a9e17ab60a54a67b52a895a9a8aef58bec70e9fdd8d8edc5a42945f6de21a58 SHA512 4fe50922833fce48fcc679adb16a0e1fe893531b2feb08b235a1461c58b8d9a72af2acd89fc0f712207fb0cd215d6b446e31a40001b46c43d0cc4ac827ce29e3
 DIST salt-3003.4.tar.gz 16031515 BLAKE2B 34902aba7ab64f4ddbacbad1b776b9b2218caf22fb843879a80bd5c30b6c28f4c22a050bbaf0e9735507a78c887f52bcae7d1833ffeb51a543ec22fda79252e6 SHA512 35419fbb3f9a0f3e87579f740b717d6902cab0d85397b16d1e94d9516bf5f5d269b4f8bca370fd376abd9b7c8a6ad7ef4c8e8a8fdd31655fd17c810989e79693
 DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38
@@ -47,9 +52,10 @@ EBUILD salt-3000.8-r1.ebuild 6621 BLAKE2B 07886dd10693134d3e01db34e6847f96272d35
 EBUILD salt-3000.9-r1.ebuild 6663 BLAKE2B 257266c6734f4c859234e73e654bb2ce8c685c4509b1d49e4e60b4f6e0cc3b08be0aa9be70746f1f114d498e00d25111753e5297a63e71d3b39bfe7c7173f1b1 SHA512 b892b57e2aecbd6e521c3f6973c0e75e037b1a310ddfb1c1c107512adbdb108c4e9e47a1d8542734883fe74e6e951aed051abe35e7401d6ed70e6abd23f9f11f
 EBUILD salt-3001.8.ebuild 6233 BLAKE2B eda71511e995977e91fdd0a1b323a47fad5a6ab9b2969ca696f410066d859db205c12ca7ce00154a562b83e8542c5445cb27e8ac72f33bf4615b2fb234899496 SHA512 790c10e9770a8b859cb6e721e962d0e992f2bf3d0d11db2fbe2811b7f4c122218b317f64172d3a65175d62511db5906f1d3873a98336d726d089493796defef0
 EBUILD salt-3002.7.ebuild 6506 BLAKE2B 225e4b18c276e26f7d9dffb06920f6ad7990b9b7de7c3e838325c8582e6408ce483e284e03b549dd62b87beb778c2742c12e14e6f65e89c890cdab912e138525 SHA512 0b06ca50fe3f0b943a7270f617e61eb4d73fb0a3187068d37495987ee267f53e499abd638a88c098bbcf07ea51ff46f2ed9ba7c0717069239b81cfbfa82ac92e
+EBUILD salt-3002.8.ebuild 6672 BLAKE2B 81dd96a7806afdaa396d39658697573c1a902d27d4b6adc5dd1ff0a73b88b18ef61e2845b965128003cc2161c490748b0e37a5e0fad9479c2da69069043d3985 SHA512 c7300e77e23fb0c30780733b5c98ed7f239db2cdc2b757dc0980077407c21b6183f391ed5f7c4699aea0044757fb0b13adbb01ee9d9eba5f5467d20c96c29fe1
 EBUILD salt-3003-r1.ebuild 6580 BLAKE2B ba2d5c5a2461694213918dc4d7cb88600235b1b1428ffe77282e24aa21f69b95194085e785e59ad2d51f0319b1da29ea21181d55ff5be7ac9314cc8da5cd8196 SHA512 45f17a2d32ea81bbf01552d9efb2804093b5cd567cc17b23e591a89a692b2ed719676c7d5ecaeee6d723e0d1443f2873d02b4f35e945c5270c8709f0c106c4c2
 EBUILD salt-3003.3-r1.ebuild 6842 BLAKE2B d273b5b3a717022a75cc83563f9d0f8412c5250f062312be30c36560faf1250ca64382b4cc4f4e180196217b97158090dd7593a4f4e450904840f5a7d4c88104 SHA512 46aa981c49279c984d622bd38782099919845fa47597eb343a8a40bdcbf76ac29e1377c09ee4c33b6d6930e789c34bafeef308094adc873646be5805b7710f6f
 EBUILD salt-3003.3.ebuild 6801 BLAKE2B 5146a9a20ca1de9ef167f896df8cafea100a1b5245d747aea685a6811151c3909040c3cf53d80ed5eb7359e76914a5fdf94ad8af8d643995d46c727d9163cc66 SHA512 95a055ce3a69a358bfdd221f139b86964a7ce5ea18d3f12b9270bcb03f4873cdab55b738338165b785d039f869096928758a8ccb1c0c6a87c3e1897da0a89ae6
-EBUILD salt-3003.4.ebuild 6883 BLAKE2B 02a22c557148e2938522ddfeaf30ed71b3d8a31e5fc0dc3ce4602def91a98c8c8894291c01627d20424a06367712367bc7e0fab2312090c23e3724e34be63f6d SHA512 89773172b24287fb4cd68e2453d674e9bf64ba82481d7766fede6f6a6a8f2376b91b246d7e583772810c1e9a80dea2a1768f22d06d344ce353103ff1c993dcbf
-EBUILD salt-3004.1.ebuild 6913 BLAKE2B 71066c089ae51da08c7566d2405a4d73c17a23ba6b79e955bcd4638a70e715417c384fb1dd2eec0ff37983dd3adf6a8fcf1965278d1707e26665df8f48881611 SHA512 04051cf93463c0408c8b4d7bde5a5d484babc114c53ecc041f092de83826578d4ba35593a699f61ddc51f82a6b52ba8270d5067c2bb9e5251d0be797163d59fc
+EBUILD salt-3003.4-r1.ebuild 6933 BLAKE2B c99f429003c7992c9b9271413ce4929c2e4a3fb49d3dae818a37a7e9253165cce99625a4c298cd6065781564eb1b838edc5cfca437dbc7103878131bc5de1671 SHA512 52719d14b8bbdd55c4f4aff007733cf5a889339d6187caeb5c57a5a2bd53b999b910dda0213db50fc5224f0e01f9380ada63c1e8f344530ea60d6f6cbb9498d0
+EBUILD salt-3004.1-r2.ebuild 6974 BLAKE2B e8492cd3197672bb74750c6b6e3af207353d7d91edfa7cd338be35786a3bca10fef9d162ca39f4faf0a7a3bf958daefdfda9dc259bd3c1c6a533c6e3ed820e65 SHA512 306ea7f3774e54457b74dc30ccf7e10e86db549c1a8e2c7a5454851c3281d265a2ccba7ffb424ef0adc358275cf79fb07f50243140bc079b47a3819647850167
 MISC metadata.xml 2362 BLAKE2B 60fd7a02823e610b4d12b1d4c6a066cf16f8ef4094397553381d62bc027715164f02ccad4c86e431a30822d5c4c25e4eebd814f99e43b7a45bc08a3fd885cfee SHA512 4aa7549a76e69233949c68841bfcdba6630eeb78a507f20119469f7835a6532b737f41d117c09b1e4c7574f95dec759deacf5d5482be961755d63a19b9eee9a7

app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch

@@ -0,0 +1,11 @@
+diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
+index 77c9bd8be1..ffa1589043 100644
+--- a/requirements/zeromq.txt
++++ b/requirements/zeromq.txt
+@@ -1,5 +1,4 @@
+ -r base.txt
+ -r crypto.txt
+ 
+-pyzmq>=17.0.0 ; python_version < "3.9"
+-pyzmq>=19.0.2 ; python_version >= "3.9"
++pyzmq

app-admin/salt/files/salt-3002.8-tests.patch

@@ -0,0 +1,33 @@
+diff --git a/salt/transport/mixins/auth.py b/salt/transport/mixins/auth.py
+index de86773750..3ca09260a0 100644
+--- a/salt/transport/mixins/auth.py
++++ b/salt/transport/mixins/auth.py
+@@ -54,7 +54,7 @@ class AESPubClientMixin:
+     @salt.ext.tornado.gen.coroutine
+     def _decode_payload(self, payload):
+         # we need to decrypt it
+-        log.trace("Decoding payload: %s", payload)
++        log.debug("Decoding payload: %s", payload)
+         if payload["enc"] == "aes":
+             self._verify_master_signature(payload)
+             try:
+diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
+index 97bce1f10b..2ff5904b87 100644
+--- a/tests/unit/utils/test_schema.py
++++ b/tests/unit/utils/test_schema.py
+@@ -835,6 +835,7 @@ class ConfigTestCase(TestCase):
+         )
+ 
+     @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
++    @skipIf(True, "Broken with newer versions of jsonschema")
+     def test_hostname_config_validation(self):
+         class TestConf(schema.Schema):
+             item = schema.HostnameItem(title="Item", description="Item description")
+@@ -2060,6 +2061,7 @@ class ConfigTestCase(TestCase):
+         item = schema.NotItem(item=schema.BooleanItem())
+         self.assertEqual(item.serialize(), {"not": item.item.serialize()})
+ 
++    @skipIf(True, "Broken with newer versions of jsonschema")
+     @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
+     def test_not_config_validation(self):
+         class TestConf(schema.Schema):

app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch

@@ -0,0 +1,12 @@
+diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
+index 35d9014713..ffa1589043 100644
+--- a/requirements/zeromq.txt
++++ b/requirements/zeromq.txt
+@@ -1,6 +1,4 @@
+ -r base.txt
+ -r crypto.txt
+ 
+-pyzmq<=20.0.0 ; python_version < "3.6"
+-pyzmq>=17.0.0 ; python_version < "3.9"
+-pyzmq>=19.0.2 ; python_version >= "3.9"
++pyzmq

app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch

@@ -0,0 +1,12 @@
+diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
+index 62cb775d87..ffa1589043 100644
+--- a/requirements/zeromq.txt
++++ b/requirements/zeromq.txt
+@@ -1,6 +1,4 @@
+ -r base.txt
+ -r crypto.txt
+ 
+-pyzmq<=20.0.0 ; python_version < "3.6"
+-pyzmq>=17.0.0,<22.0.0 ; python_version < "3.9"
+-pyzmq>19.0.2,<22.0.0 ; python_version >= "3.9"
++pyzmq

app-admin/salt/salt-3002.8.ebuild

@@ -0,0 +1,200 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax"
+
+RDEPEND="
+	sys-apps/pciutils
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist(-)]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
+	)
+	neutron? (
+		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
+		net-dns/bind-tools
+		!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="
+	|| ( raet zeromq )
+	test? ( cheetah genshi )
+"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch"
+	"${FILESDIR}/salt-3002-tests.patch"
+	"${FILESDIR}/salt-3002.5-tests.patch"
+	"${FILESDIR}/salt-3002.7-tests.patch"
+	"${FILESDIR}/salt-3004.1-jinja-3.patch"
+	"${FILESDIR}/salt-3002.8-tests.patch"
+	"${FILESDIR}/salt-3002.8-relax-pyzmq-dep.patch"
+)
+
+python_prepare_all() {
+	# remove tests with external dependencies that may not be available, and
+	# tests that don't work in sandbox
+	rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die
+	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
+	rm salt/utils/virtualbox.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+
+	sed -i 's:log.trace(:log.debug(:' \
+		salt/fileserver/roots.py salt/grains/core.py salt/states/saltmod.py || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
+	# pycryptodome rather than pycryptodomex
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	einfo "Fixing collections.abc warnings for ${EPYTHON}"
+	local abc
+	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
+
+		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose \
+			|| die "testing failed with ${EPYTHON}"
+	)
+}
+
+pkg_postinst() {
+	if use python_targets_python3_8; then
+		if use nova; then
+			ewarn "Salt's nova functionality will not work with python3.8 since"
+			ewarn "dev-python/python-novaclient does not support it yet"
+		fi
+		if use neutron; then
+			ewarn "Salt's neutron functionality will not work with python3.8 since"
+			ewarn "dev-python/python-neutronclient does not support it yet"
+		fi
+		if use libvirt; then
+			ewarn "Salt's libvirt functionality will not work with python3.8 since"
+			ewarn "dev-python/libvirt-python does not support it yet"
+		fi
+	fi
+}

app-admin/salt/salt-3003.4-r1.ebuild

@@ -71,7 +71,7 @@ RDEPEND="
 	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
 	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
 	vim-syntax? ( app-vim/salt-vim )
-	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+	zeromq? ( >=dev-python/pyzmq-19.1.0[${PYTHON_USEDEP}] )
 "
 BDEPEND="
 	test? (
@@ -110,6 +110,7 @@ PATCHES=(
 	"${FILESDIR}/salt-3003.1-tests.patch"
 	"${FILESDIR}/salt-3004.1-jinja-3.patch"
 	"${FILESDIR}/salt-3003.4-tests.patch"
+	"${FILESDIR}/salt-3003.4-relax-pyzmq-dep.patch"
 )
 
 python_prepare_all() {

app-admin/salt/salt-3004.1-r2.ebuild

@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
 LICENSE="Apache-2.0"
@@ -32,6 +32,7 @@ RDEPEND="
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	dev-python/libnacl[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
@@ -71,7 +72,7 @@ RDEPEND="
 	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
 	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
 	vim-syntax? ( app-vim/salt-vim )
-	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
 "
 BDEPEND="
 	test? (
@@ -82,7 +83,6 @@ BDEPEND="
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		>=dev-python/pytest-salt-factories-1.0.0_rc13[${PYTHON_USEDEP}]
@@ -109,6 +109,7 @@ PATCHES=(
 	"${FILESDIR}/salt-3003.1-tests.patch"
 	"${FILESDIR}/salt-3004.1-jinja-3.patch"
 	"${FILESDIR}/salt-3004.1-tests.patch"
+	"${FILESDIR}/salt-3004.1-relax-pyzmq-dep.patch"
 )
 
 python_prepare_all() {

app-admin/terraform/Manifest

@@ -1456,6 +1456,8 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa2
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
 DIST terraform-0.14.10.tar.gz 2800197 BLAKE2B 46cf7abb960bb475d3042983d1e47d4f745e0444797034b82ee6416054baf5fe37eba8339325a014b3aae62028eb4f4c8203c6b9d0f1b45b02104763117fbf52 SHA512 639c6d4b517ac929204b4f74c5d649a141102117296a4ea81d250ea56bd47297ca3f00e8582dc7536bb324770f1d2c8d089bc10b4ff260fa69895e7c6205d80d
+DIST terraform-0.14.11-deps.tar.xz 232450812 BLAKE2B 7c1d16ab8ec4bb38cdc81676e59a9c151cb82828608c4baf53261d493e7287618afae849b956c996442d9b94fad77b81073539eb1f34fffff95bb1ad0ccfabc1 SHA512 11d31972a22055cd70fa2ed33803a747f3bc95a333b9e09b10755a5453503b8ef717dfe45073b0821cf9ae651def88ba917ff60e4cdb5d95abfa33978e15bbca
+DIST terraform-0.14.11.tar.gz 2807269 BLAKE2B 1031ec612ccadc11c7d2f5745ff23f8b157807e016922f9bb05867b73f45278a84b489f887d29b1dd1b88f3aa398d024bad8069180e03481db5106732a19ef28 SHA512 c21049518547f41c0ce858c746caeb36e1e83cba70e7c29963e6869e1c525cdf1e117c7c85b4327417a71c05ed28eaa5c5016df1692413738a86015649e23c19
 DIST terraform-0.15.5.tar.gz 2885932 BLAKE2B 997ae485ff395d2174ef2265559cff4321545e63b1b7f7eba55da6b1cacfa4c5922eaf75dea220688a126bb7f1b093f884cb67e60bea1de943a9d715b9a7daf2 SHA512 d8636e2adfca58be42f88469759aede0f2d71b824fea187d67ef198d21742bc0198ad721f636f166523e0b7a92f10fdea9b445ff142464a148888110bd10a8de
 DIST terraform-1.0.1.tar.gz 2881426 BLAKE2B 8602e053c5ca23fe9dacd3517cdad8aefe88abbe0780dc9a430307e05697395c8c34e845bedcccb5547d721791954585295a2af909892c34346be0f3a3cc20f9 SHA512 9909aa0802d2c4a77d138f4415e7d588a6bd450d0bba3adda695877f51bd41a7b9584c42291d41fbdc20fc1788c1f2bde54417c40e8c824ac4854b8670450c67
 DIST terraform-1.0.10.tar.gz 2895192 BLAKE2B 61acf1164adce38e2393b7e691c2fa6c5ef4df3787174da6608444379b5f0c27d5832b27e612f8de9fca0fda0b1424d15c695320b4069e91c201099e44ae9c52 SHA512 7a32ade193427959ae9a1c7a3a7bc8dcaf6ae3a8b91388e68ad9fbb151df7ee9e0278693cfb54ebf7f1aaeece46ff4094451f4aabb1912a09f2a9468565cb050
@@ -1468,7 +1470,10 @@ DIST terraform-1.0.8.tar.gz 2893091 BLAKE2B b6580190cc0b600c6d790dbb162b25b01ac2
 DIST terraform-1.0.9.tar.gz 2893713 BLAKE2B f380c1f6567caba1226eaf703d6ef017fbc387d9db8ada3be1ace23b82f6d1f3a426837bd6ea928ac0e7537f6fcc72bef30c8974ba264ee6235510cadfea6421 SHA512 b1d75b59f667bf4ff94429f10b5dcb8a83e242b3206d0aeff008094069540debc65789ddd8635bd156bf4147f4f0eb7a254af58f053ac4e220c7c8d4a89ac3ba
 DIST terraform-1.1.2.tar.gz 3175963 BLAKE2B fdaf424d6e833fb044fcc9fceea9c270b1900b89f988498f18e6cd56428ef150c6e6398610280d1e020a5c8a06ed5662f88513703eb6653112733571dd401755 SHA512 ca227367d6dd9bf74fa4fa4777461fbbe2a03d6e3254e536dd7096794e5146359cd7d2e53776306a65a26ee68846052541d44823507e23bad0bd33b5e0ac487d
 DIST terraform-1.1.5.tar.gz 3204617 BLAKE2B 94e6631bcc6ba18443571e5d4db753a1cdbc66ceda4cf37f712069c5b345d47132b27575854eba448e3f02bb5401339899830218772b6e4eeff27a4c88872f2c SHA512 bba587034db1bf62a275d8afd3977077864a1d0bf2a527dd67377b9c94a1179d62f8f11aa2ce87e96631f3b0b9238c39b1279d69785dd0229858c1f3838d65e6
+DIST terraform-1.1.7-deps.tar.xz 260019668 BLAKE2B e708a4ac0aaf97e0adcf2b461930f07d8159dc7bb0d091de20b113f54fad7cefc9dbee1fd64108ad8fdbcfc5a4e3cf04a79d60813e0496d9c6679a2f583bed9a SHA512 a3d4eb6f6ef70b1c77794a40dec594262f49bf16a69e5fa436c4173a0ec5b93793c348a96855f81895b4ae067d1e76db803c43593ee7e5d05ed8f46087032c70
+DIST terraform-1.1.7.tar.gz 3203860 BLAKE2B c5e8451d7413ac2bcf93cbd5c69a7b437e9aeea0f6c5e291c43f63e831bcf093a6edf8dd1ae712867174342cd03318dd320fc7da27eeb97bf4d3bb66372ace73 SHA512 80eaa090d63d2dc4f91c2602c0ac85aa0323875b1f136a237e0a763cf013b57ba0cae3eeb666c502b3628f76d92e69be8630124216abbddaa6b6added1ffad1a
 EBUILD terraform-0.14.10.ebuild 52142 BLAKE2B fa9347a9146993192c3e915de6f6dfd8759fe1108991d3b7f48699b13f4ccca8095789e84ce504f1a2fdd6a135090d67371a0dfe21d86f954bea7bcae51b02b7 SHA512 b9fd59984ec7195810eaa215a6fa8a8398752d36bafa6958b5cf8eff549b20950fe2d71d3c7e555168d9a80ca2aadfc9912c70636bb7440897870406140e94c0
+EBUILD terraform-0.14.11.ebuild 847 BLAKE2B 03b59d47026013fc3a1f106509a6ea761ece1d314217d142e222dba0786f4219b764d69f53459d7c879e4f739f3c3330dfc115ded6867dd8a627b7c7c0877326 SHA512 6866c26a7fa4609b981f22913aace8945959b783b7ec5f22e935c3e54a2dc93babc01db7ed96734eada0141464a12e5a2b47ecc723eba3fa1e075369b905d794
 EBUILD terraform-0.15.5.ebuild 58399 BLAKE2B a73f374b870f4e7026e46f411d7b071cf005df9755795dca847050b4d0c740c31839eccdb9bca11083d6a83519b53b8dee676d86d4768c71a05c6780fbc0128e SHA512 4c353bf162f5606d744d7cadaa85cf204e96154f382fb92c1ee69dee3d79a0cffb33c5bf1cbbd794de3d3168b7105fbee3ea924d4b63adad50ae70978117adbd
 EBUILD terraform-1.0.1.ebuild 58400 BLAKE2B 0faccb9bb1c97ecc6a581066a86e15df7f0222f8749d894325e7511d1603c05c802494814102ad60011263d71d92f9eb2fa418485a8e17d7db715e8a8d561c1f SHA512 6d4a3c2ff9e0699485f9f2f48a521b5e23ef24bd97b91b13d2d63df30339b48131d8fc2184e55c10046acd40b71379c708e9b30e9caa1528dabb3b60f1861eb7
 EBUILD terraform-1.0.10.ebuild 59518 BLAKE2B 1425a318a7457d9e227ef1b9bb91844fd0bd3d4c70c535b6b990259601ee1618fb69a01e4147fdda56b410746c2e51ecf60cbab51786311c8d65e86e280ee8a6 SHA512 4332929b9fa314232eb0acabdd611eeeb70e77e7800429f881814d43716ba939a70b93376f2bbbbd406328856d001955f53aa4291dac0043a15bbce2199bad09
@@ -1481,4 +1486,5 @@ EBUILD terraform-1.0.8.ebuild 59518 BLAKE2B 1425a318a7457d9e227ef1b9bb91844fd0bd
 EBUILD terraform-1.0.9.ebuild 59518 BLAKE2B 1425a318a7457d9e227ef1b9bb91844fd0bd3d4c70c535b6b990259601ee1618fb69a01e4147fdda56b410746c2e51ecf60cbab51786311c8d65e86e280ee8a6 SHA512 4332929b9fa314232eb0acabdd611eeeb70e77e7800429f881814d43716ba939a70b93376f2bbbbd406328856d001955f53aa4291dac0043a15bbce2199bad09
 EBUILD terraform-1.1.2.ebuild 65008 BLAKE2B 5255fc2aa6ad358dc78456df3d76c595d555de3d75f2520af6dc3148e00317740804f12339b893c6f1ff8b83fdfa80198888da335bd1197ffeaacb31056259a3 SHA512 ea492200db9b7fadda83947f6908b85017711706b4714ac2273f611ea6d2ebf47a5ba2fb5655ea47285d7c5c400acf6c5ce6522d99cab833048f1974908c8e47
 EBUILD terraform-1.1.5.ebuild 65008 BLAKE2B 7803a8b2d93a6027492e68fa0a91b6a87dc5e8037fee93eb2f5492f328106a126ee32fec1030acfd01422fe38b89de71b9bcd3295c58ec84ccb724c2effae3e4 SHA512 2bf75b2d33f06b1704cbb8e02828e6759efe91b0aa7230dec21fa7720bbb73ba298d2083633d975fc70b32b8996e177b20bfa8e4d6e6f65baca76d0d462a918e
+EBUILD terraform-1.1.7.ebuild 733 BLAKE2B 1784164c836bc1552283db669fd30324d824ed5a8dc2bbe8c5a0ebd2e67ace621d9d3680d17a8788d8a7cfe3db2a2bf8fc299bad633de7e5993a6979284829b9 SHA512 0b6a4dcf54d36969d246654948b417ea518d22cc5b4c3ee72890f115ece4183ff22b0a94dc44245310e9d75db275f3df373e5184dca5e2c1f14876be4aa0dac8
 MISC metadata.xml 1184 BLAKE2B 778da6678848ae048f8bf3d2e2ef2845269b82a14cc7d15044315c21d5e652774954028a81961eb04e32202cef5d67ab98f5c5ce423826477dd0cf049622de94 SHA512 09d06b2229442269fe078171e40d5bd0bd287e15999a0030be391d7ccabc906bb32af1a0e48addc50fc1230264018e3b06d656afc254b16621a6d851aba21b3a

app-admin/terraform/terraform-0.14.11.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	ego build -o bin/terraform
+}
+
+src_install() {
+	dobin bin/terraform
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}

app-admin/terraform/terraform-1.1.7.ebuild

@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	ego build
+}
+
+src_install() {
+	dobin terraform
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}

app-backup/restic/Manifest

@@ -292,6 +292,8 @@ DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
 DIST github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.3.mod 31 BLAKE2B 014f9a0fb3e3122acb3ab88f5ead6b4711706d1660941d0a2ef29b85e18cfb86bf3483d2628c6fefa8ea1be4505860d4ac0c6d65ae59a408ef642c70f386a907 SHA512 4baa6bd9b0f883c4f6736285d7a884567a0d8c71b60bcd0e34250502c4067f72905ea6da57ba57da705eac0509a8fa16a91c273686375102997e196775426e00
 DIST github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.3.zip 116220 BLAKE2B a01ccb210bf33122e613bec46758707effba0049f3ca589fe8d7cc923eccf6109b0734eaf36ed8fc39a77a99aa465bf0830c91119c18bd4e84b47fcea5f16bb9 SHA512 a64a7574c1197710eda20da590752120b9297136b5285beb7bf3de1f63858df31e2294769a1f26df68fd2c814df33e3da06c90709f11ffec300c841250c99d9d
+DIST github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.4-0.20211030221322-ba894c124ac6.mod 31 BLAKE2B 014f9a0fb3e3122acb3ab88f5ead6b4711706d1660941d0a2ef29b85e18cfb86bf3483d2628c6fefa8ea1be4505860d4ac0c6d65ae59a408ef642c70f386a907 SHA512 4baa6bd9b0f883c4f6736285d7a884567a0d8c71b60bcd0e34250502c4067f72905ea6da57ba57da705eac0509a8fa16a91c273686375102997e196775426e00
+DIST github.com%2Fkurin%2Fblazer%2F@v%2Fv0.5.4-0.20211030221322-ba894c124ac6.zip 119727 BLAKE2B 2f59cff742a679cfd93a95b7822ffab2a8d616cd6e01b947a5be45f34f906c6e883174f5767c7402d29b07cd9475f14c37ba11ed96761d64acdc1a6279033188 SHA512 6ade1cc2b3a0a1883b15c3de61661b507b4c085320db470a70be7af52730e7af68f280756d6381aab0db7f0a56d7f823f6044bf3b6f9ea5f6384a03245269448
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.5.mod 49 BLAKE2B 8b2bef1b80fd800e2e85a5d1e9ce4758dd3f23f58e1fe842bb31d6003794d571877f0f00f24eaf71e108ade573694b03456f06d326343816b2f12193d8c6c602 SHA512 c1b6e77c86f654480988e8a2c7f80b30739ce7d784a57e0d1b26b8fe41fce8c1d26dbeed5d23f3ad9a6aeb8953c07889ce3458ce837d92652aa5c825a318d4d4
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
@@ -301,6 +303,8 @@ DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod 90 BLAKE2B e375688bb7c11de4
 DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip 106445 BLAKE2B 5aa2489ac1b0c4dd5c1c633731c7db35a0e84afcfff3d4317025d16e6c7f62e9a06ee1c56072a26ad45716f90fece953dca9b0831bc004c4081eda012d32944f SHA512 431bfd66971e8936204d8bd9b02aafa25e4300b3a3d8d78f63dc8f6e5dd0b436e1987074b5bd52e856759477f6d154625b5f1c565146fad909ce510322721b79
 DIST github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.12.mod 996 BLAKE2B d3fbd2f0f2a920c86a4759c5a1779e77b8479abe7d0079f4858b701530aa00b616f97fc64090d1dd391a5c3df2978180fecad737d6c609e04ee10f7ef9a68a70 SHA512 dc3287045ea041de2cd023d555e59886ba76552474e5676bc62934edb9d2a765076d4e4f6d6c411f71c734e6271e21b294f62444c55319d58ac835a332475a0e
 DIST github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.12.zip 330306 BLAKE2B 5c32261a02717600839a0cb09425915c9b22fbbf0d328b6eba4b1dd6120f96185498a3069a01a8399d11acc282376ff283c63d4de1cf2f186e7f09adb5a1f0f3 SHA512 abca3449d45a18295c9d54ae8a7594d59fc2c3841b933f2209f9762c1b63bc40a21312ebf43cc1becf5e8b77f208018600c7d58409bced0778a3766b8e0f579f
+DIST github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.14.mod 996 BLAKE2B d3fbd2f0f2a920c86a4759c5a1779e77b8479abe7d0079f4858b701530aa00b616f97fc64090d1dd391a5c3df2978180fecad737d6c609e04ee10f7ef9a68a70 SHA512 dc3287045ea041de2cd023d555e59886ba76552474e5676bc62934edb9d2a765076d4e4f6d6c411f71c734e6271e21b294f62444c55319d58ac835a332475a0e
+DIST github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.14.zip 337726 BLAKE2B e7be6ef8bd0a8d1e33f15926d18119f5a046756b8b9c48ef21e5f1db7cf558083d59c6d9038bab0b056aa463013cf019b29a0a59dbbd229b58864a21704ce5e4 SHA512 3a6c0322816cc521e9bc67dad8fc47c7136d4d97ec88a7e8fa6c410907aafc7810692e4615fb3e904db62324f2dfd0786c4511c2a2eebd89875ac41a2d3f1321
 DIST github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.5.mod 951 BLAKE2B 9f5112b2b0bbd1a280651bda4d1dfd6b26033e7cbd6ce41c0b56f0a36626130c27cc08bb62c2baaf2e4c0012c29305bd4cdb8597c2e16da06a4ca863f71b2506 SHA512 8294b46e39f372d41fc486afcb1e6204416176255abfb979d155e720d91f08db7d6e6db20c6ef47214ebcb77905d63f232e3c7ed2e1fb43b6d69c662e5984106
 DIST github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.5.zip 407789 BLAKE2B 11eef3e924ab0ab03786f77635d87462c980cf691bf28a3a005c1562ce2db5aed19f6c37a8245b9d6f7eb25ce1d3b95ac76b2f89185dbc985e0f3c329ed74732 SHA512 5a72a834bc47e59007e0fe3d1d69eb3fbcf212ba5f54bd258d2284ff40473e4c8ca90e8a2de9bbc2134bbe10b6c1ee1afc7ec92ba79100d27db5f75d8b7a761e
 DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod 45 BLAKE2B 4868e4a4afda265cf4dd2e7c5a25657237687b3b1ba21d24f280174a05dece76ba902c1447586a7c632a961b8454a1d1c8a0e7d523fabcbf98dddee26d26e341 SHA512 2341ff459cb2432feff920048aac90868260d97c5ff68724b0b7e22c8e5c65da2b4055026d74578983020e24506d2f064e47e3fa247a4560a37951e205cd0a15
@@ -330,6 +334,8 @@ DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.mod 28 BLAKE2B 57fb6c274af3e1f296bb
 DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.zip 77749 BLAKE2B eaa632604b6808cdd0e6f7c864183f8d8cf0423a1e8ef7a9b6906cebcd55a4e6312a44d46b998a6f3ffdf4dfa7c84b13a50c2adddcbd6cb5205f7f3400dfbecc SHA512 b26f93046b971097b675fcc6ee4c8a53598e95625f7d71556787384bfb4b60706b88dfbb4071472611467e0a8b2cf09af490129be0c28d48f2bbf6042b7e1636
 DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.53.mod 28 BLAKE2B 57fb6c274af3e1f296bbb2c4b81cf52ecd31af71afac9be2f77ca58c67831ecac4eb2f4f8819c510f3e2982d9a5ffdfbb5f384db878b37b531e59e06e0093a31 SHA512 2f4794d0c8dfff16f1fa252eb5e3396e2cc5479c96b5e4af9ec01931387790e51273d4a308fb2813a699a54a3cbf6b3adb5e92d831d3032120cb5f19698bfd19
 DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.53.zip 77847 BLAKE2B d5864b60ada50a5096163ed3886efd6b081f320fce8f7c21b9b2654479077520538a8a3e3b7c2b22b53e0f9775d2b4071d34ad67ed8d60b38d279097d05827d0 SHA512 ff5edf9e78ad0fa498feda8d4fcbc45dafdd8adc76a67d00b3504afe8dcae682c19b86804ac3279f498ddc61ec662d13f27630269f68a1a707afc330625eea91
+DIST github.com%2Fncw%2Fswift%2Fv2%2F@v%2Fv2.0.0.mod 40 BLAKE2B 79eb94249355539af169c5a4c4fc7947104d715590ad68800539040dbf4e960f253a98f4ae8a420485e204e1b64e0fb4f14c345589af3b204448ce0357591abf SHA512 c900223a78f45d3b2034a3e1e9a6a1a8cdd62eaaffd255ae46e844cde4fe5ce8c01f35c184e0dba73715d1ae92864bd94567993d7fad333437c1c9de77f1bd32
+DIST github.com%2Fncw%2Fswift%2Fv2%2F@v%2Fv2.0.0.zip 79054 BLAKE2B 48b26e82b36238585b0cae08405fc1b19d99b908fa9de8a860dcc24cc1d68ac087e87fc6ca96c12780bcc9e645e8a87882706b103de11b4c152c4c03d115b2f6 SHA512 979a40a450aa8612835fcf0ea727eb0d05017b28fe6c2eb676026d95895f2bfb497347349125f9bbdc651b74c3b4d41b1c0fbbd1dfc8f03a44e1b8ba9ba4324b
 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
@@ -351,6 +357,8 @@ DIST github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.1.mod 89 BLAKE2B bc24827e1c30919d56b20
 DIST github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.1.zip 12246 BLAKE2B d16692824b5db5c6cec62e092d08609a96c05903e5286095124855cec2eb07e5cc7ad70973c76a246b1207dd420ec450e80e1bf6f9f7929f60c8faa258b70496 SHA512 15b8c5edf9db6c97b8e7ec7e0f42e764d784179c6ce9533e074abcc81784b8e27b53b48641dd2a6f45f5d423ba1239cc9a8977124dfbad708714cedc4159105f
 DIST github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.3.mod 98 BLAKE2B f389c41b6faeed9f7d510d88e256b40364fa834fef15ab95d00800a3106c6a690be97927929ac5b41aae37f6a86c941f81eddae50a107f815f22426d22822e3c SHA512 701501967684d9d1a751819e5e076f9f962026a79f7529c0b3b0a99dc015e731f7a90b1e005ed045a8ccde8e1f51410228604e589c8dfbf6f25b04c2daaf91c7
 DIST github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.3.zip 14664 BLAKE2B 5e0fe1a96057400630fbb6879a44879f3656ffb6152078c1ccf3f4dd3d064860cdffaa287ba8af03b20eb58eca6b8869282633fb63fd97ec1f69ff4806d1d456 SHA512 643dd982cee6ddf90457a1a4dffb36fb91f1e639ea21d2c6ab2d53659e84d784ea634eeaea5cafbf075609b7fc0a3705b500012d98725f5469ca7d5966f1857f
+DIST github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.5.mod 98 BLAKE2B f389c41b6faeed9f7d510d88e256b40364fa834fef15ab95d00800a3106c6a690be97927929ac5b41aae37f6a86c941f81eddae50a107f815f22426d22822e3c SHA512 701501967684d9d1a751819e5e076f9f962026a79f7529c0b3b0a99dc015e731f7a90b1e005ed045a8ccde8e1f51410228604e589c8dfbf6f25b04c2daaf91c7
+DIST github.com%2Fpkg%2Fxattr%2F@v%2Fv0.4.5.zip 14430 BLAKE2B 73678ae6df3addec052a84f9f6a093008bb2a55be0557fc3c516cd69d9154113af2de20899dab0981f3ef21177c3c0d7819127f5ec067e6e19e375cbc59f15de SHA512 1df519f4a98f7aee41cc04eb4e9fabfabae0f7a2212d14de0373f6641e5780e8331b97be5412c6c4e7002e4c2262f7f559db40d744506b6276372e100bda0314
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
@@ -881,9 +889,11 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST restic-0.11.0.tar.gz 23760619 BLAKE2B 85c247be9cddcb329ccfbfbbd2b6101c4b6bfd192105602168432688b33a53e2d77bc8e0a7ea89409329ea81aa1b84f6134ef6ef80e337fad76752d2ea45a8bb SHA512 332370fe4a47d2536c2d53c08105fcc4f590eb8a77b076817b4598ce55fe1e5c37463de3d855e2157ffdcdedff84edc8dfcfed33733256b649aba72da775907e
 DIST restic-0.12.1.tar.gz 23829887 BLAKE2B a9e94d0f4f8de9e6250dd40595e560393b1e04ff8ce6024bda2bbc06abd1a8fe95c064e2edc13ea16ecf88171218d97f943d7316b29a3b52c34d592cf55d77fe SHA512 a95ad2731889a54a26bd38d7c00285b5fee631d7b44bf553a37ef827747912ac03d5282b7fe5791705c98267cddb6282d82f13c1b6c489d1c09148da4fa526e7
+DIST restic-0.13.0.tar.gz 23855262 BLAKE2B fc4d0d91b21cb136311780ab6a3effb96f24a326c3f6e89d39148704c3f4991cb3a64c8193dd9cd83097ad95eda762de172a6a4b19bbeb093e5fd5f45ba1a49f SHA512 7f495cfaf40ef0d987e805c68dc328215477b6f662518292c73450fad012c82a07465efd5802bca11c852082c26f682390a781ac3030c79351c6057399657d54
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 EBUILD restic-0.11.0.ebuild 32428 BLAKE2B 9547c7ce3116e92e034880bae157c1f82430e8b0740d1a5dfcb43898c6b68b300a518b973f6fe70306cba0d64a143fbfed08c8223ad08a6e94f2c3fee8775324 SHA512 9b6170323810b0b94ce6c5664276e2fc5bb6d2517e0e73ef9b086eaf90337a533c775b943e603a91f54f4e2128991a8f1d99fdc3bad269a7d4e7ecea4a429d96
 EBUILD restic-0.12.1.ebuild 40712 BLAKE2B d20bd333a47022956e8f0690c00b44f0456571b255cf20f7d15c5df1901112f192cf7601cf16d7e4c1ce09a6d4e7e7f33d7031c238a2f2f39d52b5be6ddba4cf SHA512 994b1544d3bfa537d0d72f7d85b8f24ed37563eb1f0f6fc19c7a32adbf95b82d6e44daf94eff5bd98e76e9a8f628c14a37dadf55dbf120e73ac6a84488406625
+EBUILD restic-0.13.0.ebuild 40699 BLAKE2B 4188501643d8d8aa89838c8caad219a823a7faf6ba2aab06587579580eefed4cef2ea416b985fd5e75b71abb1168470181b2008465de4f22825184f999ab3c5f SHA512 9e5dac5a4373d6dbbe9ba2471a5e818854035a6fbb5924e39315c93c132c5b1904dc67562620aadeed4a58f84bf868e258856c7c3384fa444e8abc30c47efbae
 MISC metadata.xml 475 BLAKE2B 42559f3e005f8e05dbca2e857681072a08b3856e4f898d5dfd0fce2e1e628f97960c61e64491e7521889773be1b15baf565966adc35c38a52bf69cc70befc745 SHA512 97fa3fb430b022141730d1ac48fb87c5751c3ef5d6a5b35dc26b8fd893b3e30ccb8e5614de546e0de20348e125ab498b14edadb97aaae0aa30a2010f98c3fd70

app-backup/restic/restic-0.13.0.ebuild

@@ -0,0 +1,795 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="A backup program that is fast, efficient and secure"
+HOMEPAGE="https://restic.github.io/"
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512"
+	"bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go v0.72.0/go.mod"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go v0.78.0/go.mod"
+	"cloud.google.com/go v0.79.0/go.mod"
+	"cloud.google.com/go v0.81.0/go.mod"
+	"cloud.google.com/go v0.83.0/go.mod"
+	"cloud.google.com/go v0.84.0"
+	"cloud.google.com/go v0.84.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/firestore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"cloud.google.com/go/storage v1.16.0"
+	"cloud.google.com/go/storage v1.16.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-sdk-for-go v55.6.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v55.6.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.19"
+	"github.com/Azure/go-autorest/autorest v0.11.19/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.1"
+	"github.com/Azure/go-autorest/logger v0.2.1/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/antihax/optional v1.0.0/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.4/go.mod"
+	"github.com/cenkalti/backoff/v4 v4.1.1"
+	"github.com/cenkalti/backoff/v4 v4.1.1/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.3.2/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dnaeon/go-vcr v1.2.0"
+	"github.com/dnaeon/go-vcr v1.2.0/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elithrar/simple-scrypt v1.3.0"
+	"github.com/elithrar/simple-scrypt v1.3.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/go-ole/go-ole v1.2.5"
+	"github.com/go-ole/go-ole v1.2.5/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+	"github.com/gofrs/uuid v4.0.0+incompatible"
+	"github.com/gofrs/uuid v4.0.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v1.3.2/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/mock v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.1/go.mod"
+	"github.com/golang/protobuf v1.5.2"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/golang/snappy v0.0.3"
+	"github.com/golang/snappy v0.0.3/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-cmp v0.5.6"
+	"github.com/google/go-cmp v0.5.6/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0/go.mod"
+	"github.com/google/martian/v3 v3.2.1"
+	"github.com/google/martian/v3 v3.2.1/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+	"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+	"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+	"github.com/hashicorp/consul/api v1.1.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/json-iterator/go v1.1.11"
+	"github.com/json-iterator/go v1.1.11/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/juju/ratelimit v1.0.1"
+	"github.com/juju/ratelimit v1.0.1/go.mod"
+	"github.com/kisielk/errcheck v1.5.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/cpuid v1.2.3/go.mod"
+	"github.com/klauspost/cpuid v1.3.1"
+	"github.com/klauspost/cpuid v1.3.1/go.mod"
+	"github.com/klauspost/cpuid/v2 v2.0.4"
+	"github.com/klauspost/cpuid/v2 v2.0.4/go.mod"
+	"github.com/kr/fs v0.1.0"
+	"github.com/kr/fs v0.1.0/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kurin/blazer v0.5.4-0.20211030221322-ba894c124ac6"
+	"github.com/kurin/blazer v0.5.4-0.20211030221322-ba894c124ac6/go.mod"
+	"github.com/magiconair/properties v1.8.5/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/minio/md5-simd v1.1.0"
+	"github.com/minio/md5-simd v1.1.0/go.mod"
+	"github.com/minio/minio-go/v7 v7.0.14"
+	"github.com/minio/minio-go/v7 v7.0.14/go.mod"
+	"github.com/minio/sha256-simd v0.1.1/go.mod"
+	"github.com/minio/sha256-simd v1.0.0"
+	"github.com/minio/sha256-simd v1.0.0/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.1/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod"
+	"github.com/ncw/swift/v2 v2.0.0"
+	"github.com/ncw/swift/v2 v2.0.0/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pelletier/go-toml v1.9.3/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/profile v1.6.0"
+	"github.com/pkg/profile v1.6.0/go.mod"
+	"github.com/pkg/sftp v1.10.1/go.mod"
+	"github.com/pkg/sftp v1.13.2"
+	"github.com/pkg/sftp v1.13.2/go.mod"
+	"github.com/pkg/xattr v0.4.5"
+	"github.com/pkg/xattr v0.4.5/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/restic/chunker v0.4.0"
+	"github.com/restic/chunker v0.4.0/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rs/xid v1.2.1"
+	"github.com/rs/xid v1.2.1/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.8.1"
+	"github.com/sirupsen/logrus v1.8.1/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/spf13/afero v1.6.0/go.mod"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v1.2.1"
+	"github.com/spf13/cobra v1.2.1/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.8.1/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c"
+	"github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark v1.3.5/go.mod"
+	"go.etcd.io/etcd/api/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/v2 v2.305.0/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.opencensus.io v0.22.5/go.mod"
+	"go.opencensus.io v0.23.0"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.uber.org/atomic v1.7.0/go.mod"
+	"go.uber.org/multierr v1.6.0/go.mod"
+	"go.uber.org/zap v1.17.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+	"golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod"
+	"golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod"
+	"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e"
+	"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
+	"golang.org/x/lint v0.0.0-20210508222113-6edffad5e616"
+	"golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/mod v0.4.2"
+	"golang.org/x/mod v0.4.2/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+	"golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod"
+	"golang.org/x/net v0.0.0-20210614182718-04defd469f4e"
+	"golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210615190721-d04028783cf1/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914"
+	"golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
+	"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod"
+	"golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod"
+	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+	"golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod"
+	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c"
+	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/text v0.3.6"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+	"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+	"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+	"golang.org/x/tools v0.1.0/go.mod"
+	"golang.org/x/tools v0.1.1/go.mod"
+	"golang.org/x/tools v0.1.2/go.mod"
+	"golang.org/x/tools v0.1.3/go.mod"
+	"golang.org/x/tools v0.1.4"
+	"golang.org/x/tools v0.1.4/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/api v0.35.0/go.mod"
+	"google.golang.org/api v0.36.0/go.mod"
+	"google.golang.org/api v0.40.0/go.mod"
+	"google.golang.org/api v0.41.0/go.mod"
+	"google.golang.org/api v0.43.0/go.mod"
+	"google.golang.org/api v0.44.0/go.mod"
+	"google.golang.org/api v0.47.0/go.mod"
+	"google.golang.org/api v0.48.0/go.mod"
+	"google.golang.org/api v0.49.0/go.mod"
+	"google.golang.org/api v0.50.0"
+	"google.golang.org/api v0.50.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/appengine v1.6.7"
+	"google.golang.org/appengine v1.6.7/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
+	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+	"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
+	"google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod"
+	"google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod"
+	"google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced/go.mod"
+	"google.golang.org/genproto v0.0.0-20210624174822-c5cf32407d0a/go.mod"
+	"google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84"
+	"google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/grpc v1.31.1/go.mod"
+	"google.golang.org/grpc v1.33.1/go.mod"
+	"google.golang.org/grpc v1.33.2/go.mod"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/grpc v1.35.0/go.mod"
+	"google.golang.org/grpc v1.36.0/go.mod"
+	"google.golang.org/grpc v1.36.1/go.mod"
+	"google.golang.org/grpc v1.37.0/go.mod"
+	"google.golang.org/grpc v1.37.1/go.mod"
+	"google.golang.org/grpc v1.38.0"
+	"google.golang.org/grpc v1.38.0/go.mod"
+	"google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.57.0/go.mod"
+	"gopkg.in/ini.v1 v1.62.0"
+	"gopkg.in/ini.v1 v1.62.0/go.mod"
+	"gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637"
+	"gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+)
+go-module_set_globals
+
+SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	local mygoargs=(
+		-v
+		-work
+		-x
+		-tags release
+		-ldflags "-X main.version=${PV}"
+		-asmflags "-trimpath=${S}"
+		-gcflags "-trimpath=${S}"
+	)
+
+	go build "${mygoargs[@]}" -o restic ./cmd/restic || die
+}
+
+src_test() {
+	go test -timeout 30m -v -work -x ./cmd/... ./internal/... || die
+}
+
+src_install() {
+	dobin restic
+
+	newbashcomp doc/bash-completion.sh "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins doc/zsh-completion.zsh _restic
+
+	doman doc/man/*
+	dodoc doc/*.rst
+}

app-containers/buildah/Manifest

@@ -1,5 +1,7 @@
 DIST buildah-1.23.1.tar.gz 11872323 BLAKE2B 6e4cffd11177bca6c3e86cd3372fc7bf295b23559b7478a679ea2bea022c149b5ea058224f0a156df1b9511905795c44ed5e988ec68ca834dd80d0c198543d5f SHA512 2ceb6df5adb671483557bb03937df583857d99c116be5d44aae533c155f560d5d454bebf25908ac02bb85e4c2ba31533adb99f0946ecc4f4830977c14f324b6f
 DIST buildah-1.24.2.tar.gz 14184511 BLAKE2B ad9ee6f332a89038368d9a5d86198f1dfa9cf99a970e85ccf3b272294fc262c68c37004131971b0ec148e999e4d8f192f4955e71673f05188110407949eb3546 SHA512 dada2b65340386355aba3980c38d9be0f43d5c3f9316c6f8e713f299ee2b975e409c1b3a785daa52b59e688c3a9c9016c43d9b0a6443d4a9453aababc0a8afa0
+DIST buildah-1.24.3.tar.gz 14189867 BLAKE2B 18b6eaf0ba54c310c8b946e4763f3b930ff4e0bfd85333767b8baa3320df1f43937d4742404d11de51c6386a12521e3045770d1d19406c163accd9cccc500961 SHA512 74fa6073ddf6b641700f758435d4558fc2d61691172107572dfac3d723f986aa0faf7bb5b5d1e2bd6bed5d118cbed3c78b6faf96972770b304fa28fd363b4700
 EBUILD buildah-1.23.1-r1.ebuild 1196 BLAKE2B afd094d8fbefb9622704992892b8b0050fddae3d01e44275cd26f4d927f5c146cc577f8c374d7594083445ba581f7ef557660160725a977276e96ce5ed2f9006 SHA512 bdb5a798fc980be7e8d0c464784b48279af59b80a19a878f7134bb5344c8c807e5e16032f39a6d236ac653039cbf001fe40f64c9f4d2c26ea6ed7fed4805a588
 EBUILD buildah-1.24.2.ebuild 1198 BLAKE2B feaf84c0d34c256dc99cf2e836bde1c49ec4f719ada774763f529f0102ee77d8fe672375ea8d974788bd29ccb06925125aa5a7d818dad827e42c3e501e2f1f92 SHA512 891c06d40cacf7ba614b8de98cb887de6a10d7955b78569f5b96dbfae9de99b3c46221b47933f3364ae1a70f110e6a8aed4f08a8137856785233f55ce6e5cf8f
+EBUILD buildah-1.24.3.ebuild 1198 BLAKE2B 033bb57ef386ee7ca4cfc600eed3129edf00ede613da8bac92fcd428ebe02a36c286e83344e46f06352515ec591979015a605a06343521695d6f1089c6fec9d8 SHA512 63f6bf6c1a4da92404537bc6191deed663c29928105f39234f30d4f6816bbed355774c87fca055c03650c69ba38ba4a00702c1820552cf883b645b4af7d2ec15
 MISC metadata.xml 328 BLAKE2B 55d2d2b5cc972b7e6b6fb77d14e79e304adcbc7056ff351f5ee3cac6cf5f83b4ef2a10c70754d1d30a5ecd88e652abc07cddd8005c3767e7f709c0c5cb61d068 SHA512 7520f5745909da195d4bfdd750e4c716c461a3789adfde56dd9be46b91dfb789653d642c0958b5a2950eea220cc00143bfcd5db402fcc2578c8fe5f8ff69275f

app-containers/buildah/buildah-1.24.3.ebuild

@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=8a645e9a
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="selinux"
+
+RDEPEND="app-crypt/gpgme:=
+	app-containers/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin bin/{${PN},imgtype}
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}

app-containers/crun/Manifest

@@ -3,5 +3,5 @@ DIST crun-1.4.2.tar.gz 1956517 BLAKE2B c5db3396902c33568c3f9a490c57f8781703018f2
 DIST crun-1.4.4.tar.gz 1962130 BLAKE2B 59681ba7af5735b46d27b568b2f9c36b72dd20d33d1eda4c77284eaeb3a771746e5be26fac28284039f857a4853c3c8decbc9a83bb62004e4ae2da79f1470d31 SHA512 fe64f56bf0f1ed9fed4df4926dd57b0966863208726ad00d8b96dfb9440833f6f88c4223875a6b01fe350456bc2c1021d14efa32795762037e394737daa4bde7
 EBUILD crun-1.3.ebuild 1374 BLAKE2B d057cdec5aeb2c9cbb3ad91b1dae0568f4d2845b8deba6e10e93ee1c9268dca8fa03cb132d6365643523cc3517a09116218625467600c7cf88fb7e55734e0447 SHA512 210b4788c820a25e60dd1845cc81b99c15120fd29b596136f90e4ca3ded1a3d5dc780bb7cdedfde299efd7e37c99395d9d67479dee72fad2b5dfba2a5e6ac3f8
 EBUILD crun-1.4.2.ebuild 1513 BLAKE2B 9a6858626d135a21d3fd967027e5bf44a1de361c4be1d2ba5766bf35d24d6d1c7d64f1979614ea66ed30231d410f5705f02a81b4e3434650ebd1f8059c61f6ae SHA512 7d168190fd1a775b85f13d9c136d246325f6526b0b61b57cd594e80262b6f128ecafdbafdceb0c84fb3586da7ae75788f7448950927b9ea643dce96458c77734
-EBUILD crun-1.4.4.ebuild 1574 BLAKE2B 89f67706a5e0ca4d6073234a8980607b955372def24b626cd4b42a745ef04ebe31ca9486d9262db99a2d3bf31ac991cbf6daaae26d3bfaae4867d1d3d692d7ee SHA512 4ff4bbfe7a40aac081da8b67df6041f6e01a8158492945e475510aaecffaa5043f2464aef33c5901dbfebd72e0520a77c21682a3898ce694b27fee8d62ba59f6
+EBUILD crun-1.4.4.ebuild 1573 BLAKE2B d39c0f6333486269f4e36da3e5f4cd03cf1e12cd99d5ba027e95ef3cbb39e785982ae887c6f7c05bdc4ad31bacc859161f1779a82ce258f0f4f2cfc932350670 SHA512 261a713ca595fedf3cdcb9e4c1e862920a5ea60ae06b64158ea563ebada30aac8741501cf3a3ef89954b124dca02e1f5ff729fccbd3eec800149e53aa49eefff
 MISC metadata.xml 1300 BLAKE2B a0ae27420fca097e4e7b5e983de3b76fef43bf13887bd5fe903da14e20c2f0ebd2fc273dae74e32e28c2768b5f8d6e5e6c8b4c9f07ca6d47e41902621173a167 SHA512 1699a89a01de32b580bc74bc747430ef7b1a6284b2f459b4041b22de0efbebda45778803deb512a61806ed8e2998b141caefb7830acafc68d42ce4343b193dd6

app-containers/crun/crun-1.4.4.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv"
 IUSE="+bpf +caps criu +seccomp systemd static-libs"
 
 DEPEND="

app-containers/docker/Manifest

@@ -2,6 +2,6 @@ AUX etcd-F_OFD_GETLK-fix.patch 868 BLAKE2B 478be67388bc9001c90031c47e001c8bcc043
 AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79b7f47c6fd5a6b024529c49ef71817d4c379c7a95832a44b9c2f45c9f7707cb580b31be18dff4ee9a110e44 SHA512 bc87464d9f3351b2791e6f86bc7f2101e652c25b99cdcc02e46e4ff18f4bfb7ffc35d338370656bde6ad09ed98805e045065012dc6a264967d26272f7de099ff
 DIST docker-20.10.12.tar.gz 11091999 BLAKE2B e3b1c40d2dcd2df9b158942759e035d53481dbd63c0fda188ec8564b0249402f5eff5f25fcb1a53c5d9af5b4c49f0919fc07f1f52d0b7333044c0a9c12631c21 SHA512 f4122c8cbc67e6b7703856dc76d6f15d7fab1b2001d4916b89958d5319c16d8b8445881841ef4804e8d47d64694184aec1be93e22d7baceb021c4a99c2c03753
 DIST docker-20.10.9.tar.gz 11083239 BLAKE2B 16dbd22b67ecd626b638406fffaec3c62eeee7dc93e661f982e12436afa10f230da4257a22a38ab1df366026033207d00e6571f3b853477852f3e14f24d9f567 SHA512 e4ae9e37633c821892e929e7a5f9dab652fe17f348a24cd37778bc4bfc33d99cdb347e2f575966364a37664dcfa83d1500f2bff7d0b0398a890f2039155a0c0c
-EBUILD docker-20.10.12-r1.ebuild 7900 BLAKE2B cc3a18158b42e2f03369d6ed07fe69bc31b04aa15c0b054205fd89cf28f8bdda84b5d03e4d28e5eb6ff4ae91218a9822f9c9b9d5fe83ff719f21e50a79f195bd SHA512 32a4a799cd09138c2d1a51f24f7c0aa1b4f8299d2d556657fc1ee54a15cb85e29e380ca09f07f39419a09411d90441e2f5b02feecf95240361f8a5dc37045fbe
+EBUILD docker-20.10.12-r1.ebuild 7898 BLAKE2B f6edbcda89a4002d96fb9b94aee212556f38eeb275a7824347bf6fad71d218adf303221657569318451b29f8d23577f37dac82bd2b84a06b13f3b43f413cd1aa SHA512 329a8dfd8842c0bb931ab7adbf08580e1d4ed4eacdb30e3931cde7d83b0ad6ebe787a65a921593da188f4150d6b9f60b31b45decc302694d6c4fdcb9821c4f6f
 EBUILD docker-20.10.9.ebuild 7891 BLAKE2B 6a69bdad22882f72f1eb6c3054b6d21841a969d8dcd1ee384a91f40c70aad3d1cc17a62d1ff84f2cd6e54088c61981df2599543db46e4be31305176a4d7859ff SHA512 0ba0ccd5b6ede2126c81734dcc5078a2350163e47e1c325217242f88a3c264e18c2d382aff515b73863c9bbd6637f60400c63cffe6cddc57c17173555a7451b7
 MISC metadata.xml 1732 BLAKE2B d6c517445cd06bb18759cad0a8923bde800bd6f87ad532e632ad6a0a02eba10905f1022297115a92457d38f795fbcd50ec75d1a2f7dcb017dc15282bf55cc046 SHA512 93a93425296ec98ac52d5b8bbf5784747df9f25da586b6f016cbe946ad01089e75d0571ed8690a051e919571c4ca3be01fc0ba6ef8c5fc5b8a01f87a5ca5e21b

app-containers/docker/docker-20.10.12-r1.ebuild

@@ -29,7 +29,7 @@ DEPEND="
 # https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
 # https://github.com/moby/moby/tree/master//hack/dockerfile/install
 # make sure docker-proxy is pinned to exact version from ^,
-# for appropriate branchch/version of course
+# for appropriate branch/version of course
 RDEPEND="
 	${DEPEND}
 	>=net-firewall/iptables-1.4

app-containers/podman/Manifest

@@ -3,6 +3,8 @@ AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 DIST podman-3.4.4.tar.gz 10945990 BLAKE2B 3de69c9bc3bd1334837d21cb2817a9e9757fbb561a0b047658c7401608ecf1fbe09d5cd0c65497a82150a67a3775c77705d0dbd314a54f7b3a1953733cfb2906 SHA512 cfd295bf50ce86ea70741c3e663b409ed47b1e560c962bc579f319151a0fe2b24cdd3045667660083cce89449a9c5de1508c94a9a02375165a72ce7c16166666
 DIST podman-4.0.2.tar.gz 11377152 BLAKE2B ab022c3e7ef40685301f08b2d939e936b07e08231d5b86a84fefa6ea7a60c8f20a5e15b79788d862c263336204a9cd8d7206748b4530f2f42ccdd31df370747f SHA512 f3c42b3b3c75ca451b4c22c2d6f9f1b9ab9437b118b16e19f17f92f28b5849f8e3de4ebc97d8d249f565a61ba187214928c25a031204163a59174e94ce300a59
+DIST podman-4.0.3.tar.gz 11392523 BLAKE2B 2d69fa8f52b061a931cf3dbe767edcb9eb5baf4f45fa77bcd9dd6e5541c126830c059a2bb97906f4fe9a4fd3257f77c801add06e1da910542ebafeaa2d032768 SHA512 a7c6f9a0f33641520c4143e6a3568129021783557f8ea7c846e4bc3f7da9bf70cb30b19cc7c6527809df2c46e6ded1d162a929dc4f44a5daafcf9d211b43b44a
 EBUILD podman-3.4.4.ebuild 4769 BLAKE2B e7aafdf1f99f27730ab646f5d2c11bedc17e1b85b68124963ec885274663fe9ada2c0c6bfea394da3e318fc6cae3f9a86b1c9756e688b61ea7e7107cca8e193f SHA512 4ce9a78078814afba81c06066492ccb762438b36fd4bfa6448e86768b3491d0cb1b388cbbce848cf762ea2bc9b05ee7f5b23673088ba945064e446e75aacdb9a
 EBUILD podman-4.0.2.ebuild 4719 BLAKE2B 29e40f5e31bf621c3cb9e9a9a5992f951c76cbee2a5a7e9ea79902f9686c91a2a9034d2623af2d0041ad9711b2194787d1f7c01e82ce86dfcd8873b865ba5d91 SHA512 da46f1e9064898caf13a04884d5df76ebf9e130ca5a722a04882398258de58ec43016f0104bcdbc2ad78c83fc649f1c925c75a6ea52e3fc514f7711dcd72a8bc
+EBUILD podman-4.0.3.ebuild 4719 BLAKE2B 257bcbd6fcd2f80109f037c34861030cde4d20f9689d9f4823f5205a0d5113372dc7514afbc8b2802594cce5c115efc3e6aa2a6107219e649a4d29d7e8b4b5ba SHA512 634cdc23aef262008d22253e31d9a3fe314e0d2d5e5ce9a0ae1b0fe3e24aa5053e4be9735989c1b0046812fa803ea8efdf6c74fd604f068be06c9a7f6d7dd46c
 MISC metadata.xml 1372 BLAKE2B b8d6a880c8f915394b01e98644672f4ec91937606e912158b58740df31576010cef8accb053e217991b700020ffa03b4e6440d90de4698dfd1a6645599d5a0be SHA512 c8b3b35f30b48b156ad9cc0ae4189fb40838e954a925f14abc169f734472b98fe02f88bb95b1d2bc28ce74b4535dec28c662719189a26b06a138f57820cc0a64

app-containers/podman/podman-4.0.3.ebuild

@@ -0,0 +1,163 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGIT_COMMIT="62534053086fdeba7b93117e7c4dc6e797835a3e"
+
+inherit bash-completion-r1 flag-o-matic go-module tmpfiles
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/podman/"
+MY_PN=podman
+MY_P=${MY_PN}-${PV}
+SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-containers/conmon-2.0.0
+	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
+	!cgroup-hybrid? ( app-containers/crun )
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	>=net-misc/cni-plugins-0.8.6
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	init? ( app-containers/catatonit )
+	rootless? ( app-containers/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+	fuse? ( sys-fs/fuse-overlayfs )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	local makefile_sed_args=(
+		-e '/^GIT_.*/d'
+		-e 's/$(GO) build/$(GO) build -v -work -x/'
+		-e 's/^\(install:.*\) install\.python$/\1/'
+		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
+	)
+
+	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
+
+	sed "${makefile_sed_args[@]}" -i Makefile || die
+}
+
+src_compile() {
+	local git_commit=${EGIT_COMMIT}
+
+	# Filter unsupported linker flags
+	filter-flags '-Wl,*'
+
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	# Avoid this error when generating pkg/varlink/iopodman.go:
+	# cannot find package "github.com/varlink/go/varlink/idl"
+	mkdir -p _output || die
+	ln -snf ../vendor _output/src || die
+	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
+	rm _output/src || die
+
+	export -n GOCACHE GOPATH XDG_CACHE_HOME
+	GOBIN="${S}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${git_commit}" \
+			GIT_COMMIT="${git_commit}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	insinto /usr/share/containers
+	doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
+
+	newconfd "${FILESDIR}"/podman.confd podman
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	dobashcomp completions/bash/*
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/*
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/*
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	PODMAN_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process podman.conf
+
+	local want_newline=false
+	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+		elog "You need to create the following config files:"
+		elog "/etc/containers/registries.conf"
+		elog "/etc/containers/policy.json"
+		elog "To copy over default examples, use:"
+		elog "cp /etc/containers/registries.conf{.example,}"
+		elog "cp /etc/containers/policy.json{.example,}"
+		want_newline=true
+	fi
+	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}

app-crypt/signify/Manifest

@@ -2,6 +2,6 @@ AUX signify-30-man_compress.patch 576 BLAKE2B b6c82f0737dcfd569bc781d84eaecad2c0
 DIST signify-30.sha.sig 246 BLAKE2B b5c26ad1d90ce562a5e6e8cb0a26c031da6bcc9d04cdd668f7b81410ba38ef1777db8f1a4b38fc515c251c840baf38e3df6b3f730a59a0921180ccb88f457fe5 SHA512 b0aea8736b4508ce5a45a296e11150218d694351b15d87478cad235869a6b0150d1893247d1600ea1679d47e71e87e629f5cf4932ecafa2ad4f05aa962f1743d
 DIST signify-30.tar.gz 94593 BLAKE2B 2d432cef9990a8ce23d0f05449ef02dcf7a00f4328a25dcab98cd25c2c74875fd8ea7ed7a67b7e4ac6c9f432a91564edcc1fc9260627c37352c19cc17581aea3 SHA512 4a1ebcdbf7aa74865b97cadbf5380460702306b6d0a77306e6c943bb0c3419ca929ecd3455522da4448d780a56c8eddeb26fb4d7fb006fc3bf23f69693c39e87
 DIST signify-30.tar.xz 73824 BLAKE2B 27de72ac82d9b66346185292cad71e57af0767111123ba0c618a7d5d4add2e5502b546ffd53ffa2956c66b8f00d2b1a96d21958125d5649d6efb23254c0f56ac SHA512 e760fd89de8a3fea76bd0aa52c683e1d331968620190f4ac487bbca30da00f8d6e2636bbe3c59b0e6fa925b1bbcf81516f50c0bc37707ae7e7465b61fee5c372
-EBUILD signify-30-r2.ebuild 1144 BLAKE2B 1463b947fd34a8898efa28bfffea0a766129b4a09280467a50ee37e10600db8180357b4337c9f511917aa7e5519dcfe391e41cfa5a5262e312072969d543f0b9 SHA512 b3825f9fafa36d88f52c81774739acb37b45fb9812e23e87d0bd06274b0358ef18a89072c0a975858ff1070172daf46f0001a05fe6bd99316500b2e8aad28bad
+EBUILD signify-30-r2.ebuild 1163 BLAKE2B 480194840d37c4d8ad5cc374a7bc4c11bdb4b46413335969c1ad9334cadb0373fa569f8ad38e1efa4243ff9faf54a739054c226c130fdd9a45cb9e5bbaf03953 SHA512 b6b2cddda9127951439d2a297247d20e061ffa51180855468fc38d4884750dd89c806310950045ee14377c230506fe2d84ff8275392c00ba472c68a938dda472
 EBUILD signify-30.ebuild 616 BLAKE2B 970eeb3f56883853c77608f81af3f712d8057bb71cd5c99565a551a5e1a267358cf21e52c9e020461c8cfff09b18170cb3fb26645e8c811f9694e3169494de89 SHA512 3973c9115bf57c8582575a3791dae541bd3125241b0bfee2c046c795e627d818db8910fba83acb997fc8c27525df172908c136435006bc3fd4da571d5611f0b1
 MISC metadata.xml 437 BLAKE2B 75f7f8a4b2475b052a41134e41ab274386c5f59847bad67ad3d8bd447984a2b42a119bbc60b13df0ebed9988f98ea5382c4aff4fa093cf44c7c8d2907d0db26a SHA512 ce3b623779a2b51556bb440df1b08f386f9fcdca641d1c0b06b3c2f0d1e98649ca8b45d8b32406f7b2b53a6f781c58121da09802c1fedb76e0c604c0a3627f44

app-crypt/signify/signify-30-r2.ebuild

@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~sparc x86"
 
 RDEPEND="!net-mail/signify
 	>=dev-libs/libbsd-0.7"

app-editors/emacs/Manifest

@@ -11,17 +11,15 @@ DIST emacs-26.3-patches-2.tar.xz 1780 BLAKE2B f5dc9d041ea8a07549a817a2b18f84c8a7
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e SHA512 a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
-DIST emacs-28.0.91.tar.xz 47651228 BLAKE2B 94cfd907cb602ab698ffaa5c29aa1db2ff1b8538e1d6a0e20aa72ac1cb77e3c07759cf28cbe47027b155a08ce305c9c6ae01a6b82eb3468b2f4d4b49d51a3430 SHA512 bc325b685c3bb783cae03209107572980197a4278a45b1546e1528d593a476556f227c979d6d6a55ab44f2ca0535ed912a284b89258157bd6c995ab555445133
 DIST emacs-28.0.92.tar.xz 47692892 BLAKE2B 3a0a1e6cec79dd56c36d7f3227654f10e1d0d1a7b933a269e25bdd0da6bcec6653500ee0775b70bafdb09bb59d0976474535b82316eee592fafc8fa9e4d7c0e7 SHA512 5e6800baf2ee5a8127956517578cbddcc8fe71fdd9925a04e53ae645b455bc49300c72604d4401c837a733eaeb54fa4ab43ed3bc2bc68e31d4c33ced6e6c9a33
 EBUILD emacs-18.59-r14.ebuild 4351 BLAKE2B 43b9d632623afd061f1259166faebd1c5329a172c16c718623de60a3c7bf77762eb59e4e5e37f97ea84d3e9623277c83a9364d2af6bf5118b3143d3391da5fe7 SHA512 0527e11b681a053438c89d1576f3ea5967f7892fb79885d126aff1d38d4321d55c317a331cd48aee3464ce9f5a391439ff1dba8e47ac334ec2cc8645fb41b3f4
 EBUILD emacs-23.4-r21.ebuild 11065 BLAKE2B ec01f02640ccef8349bef30f81c23284652937e7635c853a34cf20116d2ebf651c629c7635a2b47072a025e645b344c0ad24f93b569341298856c42e8e096c07 SHA512 fdc01a8ca90039a86c06cac189b06d3370f218f5fe3cdc0cb614cde2fb9f4ec565264df1b96204613b7a767e5088550135899f1292737646152ab660c67d718c
-EBUILD emacs-24.5-r11.ebuild 10816 BLAKE2B 9968d323497774e9f864ff9f41e54b2cea4ed471836e9644ac675728cc83b955ddcf93d0a94af359beb722da5ec5d7c4e267a732fadc592fc00d740692ed65df SHA512 417cdbef740b8b6b122446547e87e527355208c3894fe88720114b9ec8ae22ce62cf44de5a571997601fa6cb17b208633c18a6017838386285302322ec3c8ea4
-EBUILD emacs-25.3-r11.ebuild 11126 BLAKE2B 094e3beb2f13d6f9b16b29b0758eac7aec05e5dd90d90b202fb36c0d8c247487d19cc8614c9c938b81598c0f97ef43f846dc14e3160b06f10d2608b5a517ba58 SHA512 2de603b0688d3648908b86ce0c7737e8f8e31500a07fe84c57a19d53e0b3d8039a949d88ea097d40074ab1eae0780cba164a3e8e03ae94a94e1d90298360cf6a
+EBUILD emacs-24.5-r11.ebuild 10769 BLAKE2B a0a3d436beb7bbd90fd21fcdfe80a85aa55974d45e67f10fc542e1b794cffecba000934efc36f19c0ed520d0778c5940db4b332a455c2128e3e61a55504192e2 SHA512 74559d08251892179749c3f6a183554fd9cb9e15a6b09da95980faa8a722d352260d4b6d449b10ee04466ebc8447859720d05d9201dfdc97d72443c2dbc5aa59
+EBUILD emacs-25.3-r11.ebuild 11079 BLAKE2B 4f96040e5e3db0522b413c152b4ad8b083317e85da312afbcc348ea1082c109befdcc2f6356df4ae57d286327c65d9819f23c8795ee748175e5bdc7023a7ad7a SHA512 1b591288b60f533de6c4c2d40aac5b7eca48f1657cdc50207623ed12a88fc75d903a2fa240e6b697442b9b7f0b762097dc544f97fa15772cf06611930e4f1904
 EBUILD emacs-26.3-r6.ebuild 11825 BLAKE2B 1df12880101fce336ded064f8e91840b9f1a66b213367f46503c0ec19fcd1db45f0fedfe0db895141d44a8d2bfcc506c8683dda949429b5910b8cad360d241c7 SHA512 0608d4f489447e4545c2510a446293cd34a4164e2f6348b143a158df78dc6e362d166cda25177d86daac52fb31c7a85d1519de9b8583b1a2b4fe8782bca4c785
-EBUILD emacs-26.3-r7.ebuild 11822 BLAKE2B 7097fe2ada9f2eb01369297c2e2559d58cb749793a3e797179ddfa552f735ec584c4dda46f4d07bae0f61b4c7e9433e238811ba0ff54f10a3af01e4a3d30931c SHA512 1ebad05f4c675a49b4d6da1a03183d4292b0e5637fca71c7b8c716afcee795ebd98e355efb39b8835d353351a13ff1d5ad81ecfd2900fee25d254662b7b30105
-EBUILD emacs-27.2-r5.ebuild 14528 BLAKE2B e38deb5d4f19d64279e151ed9a09e3b21010ca6347e9bc898297d048a84e5e2e00639094790e4383c16ab51af98b4e805f7018a3caa2cd6976fd5cfc44dc5cdc SHA512 5f61316ede791cdf52d6952c63da7a458311df49080f1502619477a0453112cbc08f8f2e8eebfa2586775655b50cb0cae1a951b2c47b038cbe54978fc99948e5
-EBUILD emacs-28.0.91.ebuild 14952 BLAKE2B 830648e4cd3d0ceeb6bdf7b7f8d9f9e5f41be5266d15bcf124ede1155a11221cf101bbcf8966f606fe50d77728f7e80693dfc7f2237b1570ce16afa30063d812 SHA512 d9c8fa7467e9bc850940b320c0e77dd7ec32a031786e9b3088816f238ac43ed6deb6da3dc43e9b48a9b8e003d44a70febbfee98d9096fd27767699c0d6b7f9fb
-EBUILD emacs-28.0.92.ebuild 14952 BLAKE2B 830648e4cd3d0ceeb6bdf7b7f8d9f9e5f41be5266d15bcf124ede1155a11221cf101bbcf8966f606fe50d77728f7e80693dfc7f2237b1570ce16afa30063d812 SHA512 d9c8fa7467e9bc850940b320c0e77dd7ec32a031786e9b3088816f238ac43ed6deb6da3dc43e9b48a9b8e003d44a70febbfee98d9096fd27767699c0d6b7f9fb
-EBUILD emacs-28.0.9999-r1.ebuild 14951 BLAKE2B e008a0398f8e8e83291f19cf67f018a7316edeb6cf9fd8b62ff0773c8b667989e189a984ff2b1a8a6ad3336af722e0ad65dfb55e2512fdea5481ea5559a268c0 SHA512 6063c3eaccdccb08512896c4eb76f61d2970613797641f4366fbe311be8ccc5f4a78eef0782664b50888cecc410627abea1651be593b24b486490514dc572608
-EBUILD emacs-29.0.9999.ebuild 16436 BLAKE2B 2a99071494b88fd7752656fa5d3df58523e2572b38b0c3e7d28f8f746d75981c7ef40e2d669160761a578a194a8c5b1100af9fff0c3b9d926c31afdeb21b4e0b SHA512 4d9a9fd96136246602870f445d197651b043baa01522aec731199281bc783c22c3b3635966c656bc3775b9245927b517be536027f80759ca051d75733146b8cf
+EBUILD emacs-26.3-r7.ebuild 11775 BLAKE2B 4b12ed82f48ca1397153daaa99014fcb55be56a3ae4606283d828a8ac28dc753eb69092b19d3b17a4fa87a0ac60b982fda2ceeba907cbd5f022ca2bb67254d50 SHA512 0c827b5b93c930ade6e903584be9ccde1a771678f5ca3be845cacfc6bdfd663312b0fd99d5b4b2aa5218a74c69ad3bfffa0bbecb014e218057d94b8d96d4cbdb
+EBUILD emacs-27.2-r5.ebuild 14454 BLAKE2B 0d90b85d520db45e5015962752a4a7c7323b562038514ce0f74845c3a5795e48fe76a70b3723c9c08fa476fe275f3ffa1cc6571ebeaa00407f93b7add3f52db2 SHA512 c1816726913c7337e8cc5977470b5bfad8d6a26661ed7b0c8f09087682c800501b47779bf8c8e7bbfedf9ea56d50d45afde2c60d2dd0d877a1fea4ecb99dfd73
+EBUILD emacs-28.0.92.ebuild 14905 BLAKE2B f97d2185c909099dfa5b9222a30590b5caa869147f7499488ab32e962fab8b5075536a3d567ca760db18f821dfd40eca306fcdf63a9b9f488c97b4b5a1ce55df SHA512 63f377bc329815291cae3eb26722af4b1a254abc0ecca06b6d83da2b86d022e3cdece4fea8afe7db1827a924ad617597515744fa1f68fd2fa934be00b03d4010
+EBUILD emacs-28.0.9999-r1.ebuild 14904 BLAKE2B 0d583b8f2b78dd37d874b6b0088aae92e45c834dfa48aad9f7e84023ca2844c797cc56533ea0119ffb6cca10368546e02c1cc6a565a8f82d5db9e5c14d547c7a SHA512 d5bb5ff837a850c5100e9075fff32cb4e63f5e8b676dc9d903a3860a7d02646f1e43f8ea6eef62ff454eca60f65031c26b73d1a1328ddbaa186288e421d6eec2
+EBUILD emacs-29.0.9999.ebuild 16386 BLAKE2B ebc681f5e7bc1c8245b23db7debe2ca3e5310ef1ccd6fc813ce18d97ee544d78d69084c4b48d989d4dfec17fb4b186c7b518db8c655ff25bfd7672b5f80107ae SHA512 d1f260804568574a0d4573fbbddca4befe0ae6aba46c82dd457d75d2b84dc96b7ce77551d0ebe5ab33882712b42258a844f00eb9287cc318ec04919abb161e05
 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee

app-editors/emacs/emacs-24.5-r11.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
+IUSE="acl alsa aqua athena dbus games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
 RDEPEND="acct-group/mail
 	app-emacs/emacs-common[games?,gui(-)?]
@@ -38,7 +38,6 @@ RDEPEND="acct-group/mail
 		x11-libs/libXinerama
 		x11-libs/libXrandr
 		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
@@ -143,7 +142,7 @@ src_configure() {
 		myconf+=" --without-x"
 	else
 		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
+		myconf+=" --without-gconf"
 		myconf+=" $(use_with gsettings)"
 		myconf+=" $(use_with toolkit-scroll-bars)"
 		myconf+=" $(use_with gif)"

app-editors/emacs/emacs-25.3-r11.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
 
 RDEPEND="acct-group/mail
 	app-emacs/emacs-common[games?,gui(-)?]
@@ -40,7 +40,6 @@ RDEPEND="acct-group/mail
 		x11-libs/libXrandr
 		x11-libs/libxcb
 		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
@@ -145,7 +144,7 @@ src_configure() {
 		myconf+=" --without-x"
 	else
 		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
+		myconf+=" --without-gconf"
 		myconf+=" $(use_with gsettings)"
 		myconf+=" $(use_with toolkit-scroll-bars)"
 		myconf+=" $(use_with gif)"

app-editors/emacs/emacs-26.3-r7.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	sys-libs/ncurses:0=
@@ -42,7 +42,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-libs/libXrandr
 		x11-libs/libxcb
 		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
@@ -148,7 +147,7 @@ src_configure() {
 		myconf+=" --without-x"
 	else
 		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
+		myconf+=" --without-gconf"
 		myconf+=" $(use_with gsettings)"
 		myconf+=" $(use_with toolkit-scroll-bars)"
 		myconf+=" $(use_with gif)"

app-editors/emacs/emacs-27.2-r5.ebuild

@@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 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 gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
@@ -75,7 +75,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-libs/libXrandr
 		x11-libs/libxcb
 		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
@@ -134,8 +133,7 @@ BDEPEND="sys-apps/texinfo
 
 IDEPEND="app-eselect/eselect-emacs"
 
-RDEPEND+=" ${IDEPEND}
-	!app-editors/emacs-vcs:27"
+RDEPEND+=" ${IDEPEND}"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
@@ -189,7 +187,7 @@ src_configure() {
 		myconf+=" --without-x"
 	else
 		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
+		myconf+=" --without-gconf"
 		myconf+=" $(use_with gsettings)"
 		myconf+=" $(use_with toolkit-scroll-bars)"
 		myconf+=" $(use_with gif)"

app-editors/emacs/emacs-28.0.91.ebuild

@@ -1,459 +0,0 @@
-# Copyright 1999-2022 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-28"
-	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
-	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 gconf 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 sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-RESTRICT="test"
-
-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(-)] )
-	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 )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			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=
-				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
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( 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([^,]*,[ \t]*\([^ \t,)]*\).*/\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
-
-	if use jit; then
-		# 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 #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} && tc-is-gcc \
-			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	#AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	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 gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --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"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		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 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) \
-		$(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 ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	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_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
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# 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/$(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	   (setq Info-directory-list (prune-directory-list (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() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-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
-}

app-editors/emacs/emacs-28.0.92.ebuild

@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 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 gconf 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 sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+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 sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
@@ -73,7 +73,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-libs/libXrandr
 		x11-libs/libxcb
 		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
@@ -198,7 +197,7 @@ src_configure() {
 		myconf+=" --without-x"
 	else
 		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
+		myconf+=" --without-gconf"
 		myconf+=" $(use_with gsettings)"
 		myconf+=" $(use_with toolkit-scroll-bars)"
 		myconf+=" $(use_with gif)"

app-editors/emacs/emacs-28.0.9999-r1.ebuild

@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 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 gconf 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 sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+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 sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
@@ -73,7 +73,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-libs/libXrandr
 		x11-libs/libxcb
 		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
 		jpeg? ( virtual/jpeg:0= )
@@ -198,7 +197,7 @@ src_configure() {
 		myconf+=" --without-x"
 	else
 		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
+		myconf+=" --without-gconf"
 		myconf+=" $(use_with gsettings)"
 		myconf+=" $(use_with toolkit-scroll-bars)"
 		myconf+=" $(use_with gif)"

app-editors/emacs/emacs-29.0.9999.ebuild

@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 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 gconf 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 sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
+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 sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
 X_DEPEND="x11-libs/libICE
@@ -123,7 +123,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		webp? ( media-libs/libwebp:0= )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
 		!aqua? (
-			gconf? ( >=gnome-base/gconf-2.26.2 )
 			gsettings? ( >=dev-libs/glib-2.28.6 )
 			gtk? ( !X? (
 				media-libs/fontconfig
@@ -233,7 +232,7 @@ src_configure() {
 		einfo "Configuring to build with pure GTK (without X11) support"
 		myconf+=" --with-pgtk --without-x --without-ns"
 		myconf+=" --with-toolkit-scroll-bars" #836392
-		myconf+=" $(use_with gconf)"
+		myconf+=" --without-gconf"
 		myconf+=" $(use_with gsettings)"
 		myconf+=" $(use_with harfbuzz)"
 		myconf+=" $(use_with m17n-lib libotf)"
@@ -242,7 +241,7 @@ src_configure() {
 	else
 		# X11
 		myconf+=" --with-x --without-pgtk --without-ns"
-		myconf+=" $(use_with gconf)"
+		myconf+=" --without-gconf"
 		myconf+=" $(use_with gsettings)"
 		myconf+=" $(use_with toolkit-scroll-bars)"
 		myconf+=" $(use_with xpm)"

app-editors/mousepad/Manifest

@@ -1,3 +1,5 @@
 DIST mousepad-0.5.8.tar.bz2 927756 BLAKE2B b0518cfbc72a4816765846dc55cedb13377047d39966ceb66d93943b6eed7191eb06c2d482f41e7356271a26f3e99a5a26d1f63b3e4ef490c777448f85dd7083 SHA512 6446927b564fe18c3127835e592d0248efa690c7b8fc2a7da92f237eb16184bd502c446a5b50aed8acd1d8233c22ee7e91c0b9ee512232f7d7a69c72f1dea9e9
+DIST mousepad-0.5.9.tar.bz2 953685 BLAKE2B f8db50048964c789600ce6d310f6b6a893d7d4406d55f0666b7e78bf3e54446d3ec56eb70a059da6fac367d7c3f3fc5861fb29dadf28aa9b0d5e2f62056f3dfb SHA512 915fa1c89d66f793c4dba7826b4934e286e940dbdd9c933bddeeaf76be79d2140cd0feb1dea2946989879ec354d57af36fd61517309ebd4915f18be4b9cf621f
 EBUILD mousepad-0.5.8.ebuild 870 BLAKE2B 6c7f7c5ee93f531233753a9076ac377e64cbfeaa00de2d2ff17e4660bc36013dd37657157c3920c1e945370be58db82ea342de007f6b96ade32959be39313fd6 SHA512 f17f2e243fffd6ea910f3449a9511aaebd4086a4cd118b0324a78e1bb47187e8a66f4833abc803c6a3db2084b10b7ffe1ecab9a1654f387bdeebbc1b792fb5ba
+EBUILD mousepad-0.5.9.ebuild 879 BLAKE2B 865c0a92bb70d41504dbdb96054fee945e363968ff42cca0c5ccbe0c8dce8d339d3bd7b348a8d66fdde8e5d266e8aafd145266c5a116812a04867a0a5939553b SHA512 caa46c5bd45c57b6e27bcc70cfca691c14d16eeb8e38d9531525a1a63bfe1b25d562c7daa02252e6faa32623f6d062c554b59acdaa8f09163674f798cddece2a
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3

app-editors/mousepad/mousepad-0.5.9.ebuild

@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
+HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.52
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/gtksourceview-4.0.0:4
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		--enable-gtksourceview4
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}

app-editors/neovim/Manifest

@@ -9,6 +9,6 @@ DIST neovim-0.6.1.tar.gz 10597584 BLAKE2B 3e2da61b768f5cae44e08f0ef7f386ce4b878b
 EBUILD neovim-0.4.4-r101.ebuild 2830 BLAKE2B a9aa517c7409e373bf510aa9d4adbaa627b561ee309c08d67941c3f497edc5471d50055406aaca2ca903952975813d74f5eb5f7caba09846522dbb25a8bb3cec SHA512 23db154a68cbeb0f15771a0d196a517cde5b7979440896c145c9cda4176e5ca2040b5222fdbee62fd6d97cf58e52ed143edaf9da25ac1a4a8a43acad8190edff
 EBUILD neovim-0.5.1.ebuild 2889 BLAKE2B fbf3f4d3ecb5effa3c0a22eaddefbd68adf1fcacb40306d8960871c78b3c05d374c429d87d2b3207f6e89efa7474b1a5efa6a69e9f81c61a775fbd2d6a046ea3 SHA512 12e9d1834653344fe598b1fe5acffd91f5bf32fefc06e4fd36c0d017c19ef374ae9d0d685043c516980116e185a9aa8ba1ee844f74840926adc798ae51977d44
 EBUILD neovim-0.6.0.ebuild 2928 BLAKE2B 32f7efda71fda938c0a278da9bfe7e54a870b536eb9a660b0f0f6ed72851b9b53147426a700948bfdebf8cc2a28b7343ad04014efb6c3d79000dd4ac3335dbeb SHA512 5eb55f224e87ea23461eaff00e93363a42e19b98e38f840e7d057c3eac36ba79c4717fcb543e623a85601bbe3de6e91a4761d04fa924fd1d585d9b896e01683b
-EBUILD neovim-0.6.1-r1.ebuild 3142 BLAKE2B 2c055a005eb094a25cf24fe56b53f63423896c42338a724acaf1b9c3940fcadda66bc3b85d6bf1658f9cc56a814ab7e5f4bd9705cad907ba3cd2a9c14a04f8af SHA512 87c65ca01d88b1a937031f080452d8e1c28a1f02645982a0dc9f5d9592ec91cd14c758bbb1fe78290d35ece2516bc122dde8702dccf3bf0fa9d7a9a220ef1d05
+EBUILD neovim-0.6.1-r1.ebuild 3140 BLAKE2B 50493746f95e943d73de95ec5d55b0cee88718657a26cb1c6d2ba5a22a87b88b786d0b59affb2b836e7df562393b97e0daa6a7ed3e56687a92d141f538026e88 SHA512 60929e073e8b4b21809b43dad27af9e215eb9284867bb73f4c77a2658e87cf4bcbaf0934508ffd92e6e974d898c14c1e079edc06f24e18d2db0fe4000f99352c
 EBUILD neovim-9999.ebuild 3142 BLAKE2B 6e913a187ac672eb84d3c7de98574962f71f82f7efbf8736302eb431ecf489f93c1b00cb223a4494e744aa5c242e71172e9a519326f13d691c7b405a0b769108 SHA512 7dac921fc021a8259ec12e8f80c18aeac1e195fe7b4cfc6f0cd394fdc24727f55e03d321c28a4841871bd411cd80016fae5720963e63f3f33d5be57ec38cf78c
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8

app-editors/neovim/neovim-0.6.1-r1.ebuild

@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"

app-editors/uemacs-pk/Manifest

@@ -1,6 +1,4 @@
 AUX uemacs-pk-4.0.15_p20110825-gentoo.patch 302 BLAKE2B b4e1e998b8befd15b0c6d9302a42f547848f346dab632a64688091b0e8180332935e3a72773247498314e82af31a904405c965dd7073bdb317f0d09944752f34 SHA512 6938e768e742ffcbd88469c58bba07325d0c2ae7d354bdba66fcc3f9d47d141a98923fce516a03a799032869461da301cbe8ce7f312196a51f69dddcbe5c069b
-DIST uemacs-4.0.15_p20180117.tar.xz 151600 BLAKE2B 76a6a3cd3d0abf720721c7c09687c1964958e6c1c05ad8db07e6e561d6714e436d31659d118af85d069ad77da2606b0ac86005824e2ac56db8040a0ea739aabf SHA512 aadf3f9e8ab3f2c9c7bccf305f7a37e75ac1c92c5c388ce35a10b24cedf886f7d9b0ce8b1196c2f96a0d874bd5af130edb3ecb1ccf571d8e8c00753564e38aa7
 DIST uemacs-4.0.15_p20180719.tar.xz 151748 BLAKE2B 66572d3b4eb54310b7468a43fa718faa78aae8070a8675018f8dccc38d2dcb8e93b41942f49ca28b7c8ee5d100b541ecebfa2adc9a84f121a178ade0903029b1 SHA512 0baa273d5f8df75976d01acbe69b2bca7ec803c8a40364ebded39d16874426874af7b7547774c211fbbb96c82fcb69aaf75f8fa5fd3e95422ee105e6be7f9564
-EBUILD uemacs-pk-4.0.15_p20180117.ebuild 924 BLAKE2B c131409e4d2ab8e6d794497aff01cf61cb792ffcbc9ecded591ed0ec9019fddb9de0726b3318b8f2007e8b627ae71709385bbc32583c835c8c481dbedd1f87c9 SHA512 7157079b00308cef925a95e91a835fc13b105a723bfb7404669b12dd5bbd6b85bcaa7f1de844e06b513baa25f32e601093e489eda4987907c83e27e6b719ef9f
-EBUILD uemacs-pk-4.0.15_p20180719.ebuild 940 BLAKE2B 4f9b4ce7e1c09a4fe1fe4044645c71916d20123ff4e0274ef82286169ab23d46c69853c425a9471775daca88ecc078d65014b5f6b9f4d74cae2d63049fa1ddfe SHA512 ca6aed04023b60f5b6283f47ff9e3b5a2956deb11c2eb6619ee369b6f2256af8a16617bc0bb2d0fe49b0d7bfdc9435e875f88f1c0956ad890f2a83d22864b688
+EBUILD uemacs-pk-4.0.15_p20180719.ebuild 880 BLAKE2B 0d6ccad13f54bc66fbe46ade7a5605fe3a6ada4721b1dc6519e705498149299403da9f71b6ce568fcda685628a57c63b75da2c97c8dc32a83decedad435d1d85 SHA512 1a92ee20d51c3284bd62b375a591c3aecabf31b7562315108b64c29859a18731868c5722ed7aa843dd69e99f2cf2f4462d0867c5dcf218a60d2a2770d07ddf7c
 MISC metadata.xml 1039 BLAKE2B b7661c49b2c3e2f3051f5f46e98e90ad9e2449e87882be00d735f45ed0568911c4bc04aa4b816389362b2db641c524a098476650eb663e07bd26e14137695826 SHA512 1287ac06c8db54c6a27c2981f14047bd95a82dbc45a80dac281a5d3aae3898809bc943d8a3c3d72d09b2a622f620c040e6d26028c078d921ef6b3fe572d9349c

app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild

@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="uEmacs/PK is an enhanced version of MicroEMACS"
-HOMEPAGE="https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary
-	ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK"
-# snapshot from git repo
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/uemacs"
-PATCHES=("${FILESDIR}"/${PN}-4.0.15_p20110825-gentoo.patch)
-
-src_compile() {
-	emake V=1 \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_install() {
-	dobin em
-	insinto /usr/share/${PN}
-	doins emacs.hlp
-	newins emacs.rc .emacsrc
-	dodoc README readme.39e emacs.ps UTF-8-demo.txt
-}

app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,10 +6,10 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="uEmacs/PK is an enhanced version of MicroEMACS"
-HOMEPAGE="https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary
-	ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK"
+HOMEPAGE="https://git.kernel.org/pub/scm/editors/uemacs/uemacs.git"
 # snapshot from git repo
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
+S="${WORKDIR}/uemacs"
 
 LICENSE="free-noncomm"
 SLOT="0"
@@ -19,7 +19,6 @@ RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/uemacs"
 PATCHES=("${FILESDIR}"/${PN}-4.0.15_p20110825-gentoo.patch)
 
 src_compile() {

app-editors/vscode/Manifest

@@ -2,16 +2,16 @@ AUX vscode-url-handler-wayland.desktop 351 BLAKE2B 8b1d295572865fb25beeb14d9762c
 AUX vscode-url-handler.desktop 291 BLAKE2B 364ce7de060a947d48486a639aed515f5b17e1720ac1eaee1aa4e13559047622e2897c0426aed792e3d8aed440771c6f5bb3e36873140401c951ec3b749cd661 SHA512 4607346645781f67daeb6cff2425924133537d620bf7dac9c2619cd5a1a29252e7ecf1a27f27e7bb917c413d462f129f9ae26f50ec8b531e5ac872bc8b96dd93
 AUX vscode-wayland.desktop 580 BLAKE2B fb70f6b28e975368550735f2dab8be6ccab9510481c794e6b44545a690224bc93b51cbc6beb809886eee1cde3648eb284374c87c0b74a1fcc3bdf0af0e700a9f SHA512 615cacda3121b4a839816722382c23bfa2cb162e2a772ba91bded9e161a92763bb536778ea8f716e4c6c46f4f6c289a9c922347523d278ba3714569eb64c0234
 AUX vscode.desktop 451 BLAKE2B 3c0cbe4a9bf71d47c3534bf6f7a265a04a0949b0bb86e060a0ecccb3b9f242ba9b46f1fc0dea37ff0d982ec88417da980b31b9658906a8f23c707e9b100183c6 SHA512 334b8c025c4a99e0f1390c56dd89e529c23b0ea3f6ec5a83105eb6acc4ff62b4d25419353d7bf4bb69dec611bd98778e7b8c728d2392827aa97690b5b91c7fb8
-DIST vscode-1.63.2-amd64.tar.gz 113730849 BLAKE2B 8be0b450356db61d072be9ee7c932b32b70493617f56ebc82948264f78a3a32363f6c183d26aa4f4d06b4475a6b95d69441a0fca64185fcfaa01d19c05b252bc SHA512 c7f2b80d2fd7a4b420d248d6b9e325f77b460dce3e1d1748b63c18dd6983243601d967f65ffc72c79c0d7615c9e228fcfffa86d456a4ee27d3d027dec644eceb
-DIST vscode-1.63.2-arm.tar.gz 94756805 BLAKE2B 75502ca42e3720f79fa8da3a33843655d8db6c9ef12403cd9be119e93e4ce07b8b70f9b7d5dfeea53eb3d7b3fecb3e1b4e282cfaad2e4830e3b1ea396a20b2dc SHA512 3fb9673a481642d5c2317bdaa7e45efb9d26152e52a4bedd26a7a17fcfbbe5c4f772d8a6680c2c39dafc6a15a1510910e846cc8f67ee0dff6d590fb7d58c77f7
-DIST vscode-1.63.2-arm64.tar.gz 108337529 BLAKE2B 8234fa92b1eac1b3a7c3297c50f730b73a2a4b0795868d91adc8898fff61e9f44780dbd94edf8c3ec6c9f3ec33b085e6855f6104ad9b927867d96412ec5bc038 SHA512 b474d54c75e62418e19f980e2a658ad82ffcba5927418f88123a7c12e6a19525c67260461764de56655fe1d964415b6de209628cdc264da41b2c2c9576815d03
 DIST vscode-1.64.2-amd64.tar.gz 112392185 BLAKE2B cc59dfc54167cc49b607d0131d81cdc922c120f06d40820cd13818bd280f40e55dc3ee5ec94284c48f91ac09904b1be1b3caa6c7380835745eafba3a860e36d8 SHA512 def09100c9b4a8ea772925fd89b9f26ea88835b27ddea203235bdfa13e28b1ed43ce0fccc8c799bd2b767998f7b9190856aae663c9a2e7e3226e43fb3b1bc8a7
 DIST vscode-1.64.2-arm.tar.gz 93473664 BLAKE2B c0f9df18d1750182385f7c2fa2fed2be93480406a5516597984d3f0ff488ad6cf98dcfab56f94b2a73badda2a5c1546a6ea7af6d245e15cc2e5ce3b522081866 SHA512 7f89a4f12951ced50d84a852aa8eecb52aba25d3aa549b656e35bec1a04f9f89eb5cdde1d5c04bfb072c469cfba8ea948a13470773b969d731d085d7812fdf91
 DIST vscode-1.64.2-arm64.tar.gz 107090187 BLAKE2B 15587ce30f15c393f78d5ea554da51557bb5d3392655c82476100451881d5dae3bb034e05d5e5e26aed2236b9199edd927a3af064a00d0ec82a7b24a6c501c6d SHA512 54f16d98c43f940d8cf989f2db90c161cdf84733788eca55fb0413279d291a4b2bb82a3f5fa7d0b01d5d265f32c3b5273fc131f4bd6a33b841f3bb1773d9f6c7
 DIST vscode-1.65.2-amd64.tar.gz 109564124 BLAKE2B 5b842253ed6438019de5f114f951651adc1773db93b408d3fec59b781ff32c0fb66f0e80ff0c02b6306ae46f541d55667f37d50ccf64709e810bf5e952af543e SHA512 1b5fd6c42966e66f963cb63a289414d3733cb64c051c36ad5a43481ccbd24996e99b58738b23be25a51890eb95593b7a2f224d61c3a21ea3195baed4f57cc761
 DIST vscode-1.65.2-arm.tar.gz 90793512 BLAKE2B 8e29cd51635408280a9f3e36cc7d8a0925feee6a2239352b9a44075454ae36d7b784be2ecf9eb310440e416511a0d38b801ae41bfae400edd06345f960d66b29 SHA512 9c10a9a6ed82d321228b41202ab1584d580596bea9aa9759db6500e41f1979d1e9e1fa3e3af4fd86bdbbd0844ec528a499dbeb2eee988bb87b549073f0d112de
 DIST vscode-1.65.2-arm64.tar.gz 104431396 BLAKE2B 17251a994ba15b9293b4bebbc8b34b8351bf5d15ea047d8789492839ab902d9802afcd94c6a805f26be505c9f05077c395c6a5c73a8f3614668c042400e3f4b0 SHA512 7365d8bec81bbd8bf72d6073cfd9034b8afca7309044863a921b190aadbb8fe16d5b58f98beab7d24d77c1077c60a1761a68a12e01ea974855608006973ec739
-EBUILD vscode-1.63.2.ebuild 3037 BLAKE2B 20cbcbd66b851538ded81989f63dc4e4a233d68dd2ad9381aedd92a13d894ebe90748952bc37867b8a60ff44c6a77ff1b3075140c823c6c6f47377e27b654579 SHA512 29e31a6f95beb7974b0751b74a6b06932283742ac771bcd36efa8da4bbf49167b7b6dffacac5b82bf3e3687ab34f0f59272c05a4d9343da6aa1ff2751892cdd6
+DIST vscode-1.66.0-amd64.tar.gz 115615178 BLAKE2B e6e13cb52f04cae605868b508f8e3323bfbcff4589a6bd9b29cf978d9fa8cfa3e05d1ec1ba01e6368c943254fe3af0895f7cd20df46ea22348427a3876749be5 SHA512 a2157b9b7b92d0ee194fea20432e839ef7cf42151baeb5ed378de3c0aa9dc9bffce6d45b72bde8b8bbbb5cf41a5508016a07a45ecd16b0f570aa30a0b81ccdfc
+DIST vscode-1.66.0-arm.tar.gz 96717878 BLAKE2B 0eec918894e03941835c11d662567e58a3a8dcdeb386a65aa516cb6fbd8f59c70d9b9adcb4fc4051fd2077e34e1488700e55cc24ba90763bb14696c22eff4a33 SHA512 f58139aa901cf4eba1410d792c4591b81dbd3241b25c1a31a27db1e469cf0e5274bf263ad661cb7d01212e2f1d67de6fcc9f617fb1aa9a227401efb95690694c
+DIST vscode-1.66.0-arm64.tar.gz 110612358 BLAKE2B a0a38121024c2f47fc178893cba0d327c5891bbd74ee2218aff2b9d701c062b427cbaaf2d5115f3c386eb5187db8817323b1d8d4d2d830bf435cb9817232777d SHA512 d91192310787f56f7455ead5ea13940f6051f9efa5a99178adf7b628d9bf7b168e5bbe98b90cd37d472928d25e8eb27659f82bf224bd0238e35d84980f1d1491
 EBUILD vscode-1.64.2.ebuild 3038 BLAKE2B fc4a05b861e3f704872c17a476c6d2d3012717a9b4e677c3dad731b360bebbfddb836a4ea4953e3bcd98bf8b58a3935c13aba38b395a4308f3597f211c30618a SHA512 04829aa5fa4dd456fcb5a69f71f7a214f6645d83cd04152b94a466eb8b3d0b5db45f8fbc2ed18c4abf43b3fe2405c7bd521d46c0a72a0e1d42ee70989176ac5d
 EBUILD vscode-1.65.2.ebuild 3371 BLAKE2B 965d066b8ca1ebfd4001edd4af59756db9c796a4cd9b16a40c8dc0793efa8caaf4c18e156c1d4123a1e2f2a2dfc2fea0fba8773e42bae09f480fbc8c33311128 SHA512 6eb57628ac4c04b0f4d7750817227e6d8105f19f3f0cb1c9c483534cf6a7bc24c97de529d32c9a528a91837eaa3a838b13aa75d03dfa09ca2d8f1e2b28dfa53b
+EBUILD vscode-1.66.0.ebuild 3371 BLAKE2B 965d066b8ca1ebfd4001edd4af59756db9c796a4cd9b16a40c8dc0793efa8caaf4c18e156c1d4123a1e2f2a2dfc2fea0fba8773e42bae09f480fbc8c33311128 SHA512 6eb57628ac4c04b0f4d7750817227e6d8105f19f3f0cb1c9c483534cf6a7bc24c97de529d32c9a528a91837eaa3a838b13aa75d03dfa09ca2d8f1e2b28dfa53b
 MISC metadata.xml 947 BLAKE2B d2c522407289299e1398799f6187e1c0d6621dfe29c1dd0e9d88281eafe44f4b4b3a0edad920268d220375f9330f0a62c015fb1e5085decf5ca5e485a92cc204 SHA512 6b27ac42f3d67203c46996388f6700c007a299557808505179cfa42deeb71098bf3a257f23c11835389fd7a59180f3536e420ed6cdb93b274d47e4c84a25f738

app-editors/vscode/vscode-1.66.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -104,7 +104,7 @@ src_install() {
 	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
 	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
 	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
-	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
 	dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
 	dosym "../../opt/${PN}/bin/code" "usr/bin/code"
 	domenu "${FILESDIR}/vscode.desktop"
@@ -118,4 +118,12 @@ pkg_postinst() {
 	xdg_pkg_postinst
 	elog "You may want to install some additional utils, check in:"
 	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+
+	if has_version -r ">=gui-libs/wlroots-0.15"; then
+		elog
+		elog "The wayland backend of vscode crashes with >=gui-libs/wlroots-0.15"
+		elog "This will be fixed upstream in a later release"
+		elog "Please run the xwayland version for now, on wlroots based DEs."
+		elog "For more information, see https://bugs.gentoo.org/834082"
+	fi
 }

app-editors/vscodium/Manifest

@@ -2,16 +2,16 @@ AUX vscodium-url-handler-wayland.desktop 383 BLAKE2B c3e281318290826ce9451fe517b
 AUX vscodium-url-handler.desktop 315 BLAKE2B b514551e6256cb444f13bfda86a9e164ed926d8aedbfcb7de3a6b1c3d3c2e465c0ee158c74626814908a153c5f801434952865a708c89ffdf64bce24a83fcc20 SHA512 afcf89af009361b409330a223696013e1ee8973bc3b3068e778fb05c3355fed66063bd537a66685d6ad3578c2808532d4b9c5273a291c7d2f3a9c0b2f997f152
 AUX vscodium-wayland.desktop 609 BLAKE2B 1b25dc9e98b5a12a10f85001b9c5acc9325368a2310a7d1e2aad20e22ae07fb000aa495b694612032e999f431c8f8e47f60eb162d0c7487fcfef6e37249622d4 SHA512 1d371978a5780c8d37e6e1359ca029659055a8d80de0d672d6eb3f21b890db2b92e368fd244be7cf83ec30935271cb269f1b9aef1c7deaaae36c3d739221d8f2
 AUX vscodium.desktop 481 BLAKE2B 89f335edd1f7d0256f95eb96d335c2359d8fd984a29bdc3190218ea63ba9a19e64435eb50c7be818cf28243c8cdf9b385f8987f6917e52df565a4ca555a2a13b SHA512 234f79a5ea9b901b62fe0c094554de3b339a67e8f47ec4b3daa5c0653778b9f51d1ccd91e773b4ca27f27e30a5847d5a3172d0ed322ada4d47624028bd5d8c1b
-DIST vscodium-1.63.2-amd64.tar.gz 114325091 BLAKE2B 2d05da02b67c52ec151611ef159f6c1f26f920c990e770630fbf59614f2f7982b3157855abc802b876ed49f513dc87ea387c39078c78375a59fdee0c276786be SHA512 13d309ac1427db6e924d667eb4f66c690f2bf26ae1dc307c22d76aceef5e1a997d57dd0f6458b40b7e0c88babe7bd3fe85b0efc2849aa672e8dc006cb09bc337
-DIST vscodium-1.63.2-arm.tar.gz 97849895 BLAKE2B eae617edfe6bddeb4b4795c668006ffa299dca2cb22d92d1611a51e599993ad0435dd975faa408e169bec4fe0fc87c19702850de6dee2bee9c5339211e2afa7a SHA512 8f24876638f6b784fe08e53682e076c3fdfeee73971ab2f9657de5827d8bff86bea83c48e5d5e571e1a08fd184bc8b4937e90b51eb9679799f5c76868d43704e
-DIST vscodium-1.63.2-arm64.tar.gz 112417892 BLAKE2B 08c44c7dfa75c11f548e1b29b621352a6054f8caed33d8456fcfe722b41283a4986167ff507055f284cb3202508754752412af005fcd8bd4fc405a7d124664f1 SHA512 cbf44d86ced1b48e1d5d17b8c77713e8c9a2bfc6cf8a4029b12ee382c42fc8ebd9cd2d79daf4042de23c96f47e08241c1b93e1f9eba0a0a962d8212c3b84ebe6
 DIST vscodium-1.64.2-amd64.tar.gz 113590369 BLAKE2B 0e222e126d099e4af446c1c229f1ef7967b6836b6f4e85a440adc768b3bd7662a710e23d4f3da61ed9a45adf328805876fe20012e94f97a9fd92cbc89704f425 SHA512 45c7a22c499abbdae8305e241533f99ecc48d504c73ba1a43a669ba8aafad8aac60e1383e45882ff4dff7a97b232c172e0b3d89def00e85fc1d37e209d80f162
 DIST vscodium-1.64.2-arm.tar.gz 96564908 BLAKE2B 5e8b974e179639231cfba996ff9a4d0203e597f1be0b58766f9f532516e4a8d0eca390a90f2366f5db66a8d12b64f72f301490f07d01ec6b5c66516ad26695f5 SHA512 b2e986ca7ebc021bd147a0c9fb3cd46833f5b65e01ec07bf26d577cca35a6998666409ab7c0bad5351de3c5d7e5e9c91d029d6b05e149261397d183ac06d57ea
 DIST vscodium-1.64.2-arm64.tar.gz 111168123 BLAKE2B 015163f9129e95cce5cb4df255cfa4bd69271362ba3782ed234e982ec849490cc4e15f8e8ed1dd1d942fb908026d93010f21a902b3c10b036e2a926d82893dc9 SHA512 7507080e2ac7bd4649fd87a52480900de229fe3c93df26d381ca34b472ddaa38852b5b8d14f06d4c9ee07d8f2fb3381b63c9c25b7e384d0da090e10a31f77df1
 DIST vscodium-1.65.2-amd64.tar.gz 110791055 BLAKE2B c6685f78c786dd36ddb79adce5485670016dc5bf8e72550a0d6f39425237dbdf75c36612e053f74db0c7e92cbc7f21dcd641a1573e03741eed8ae7573d7e6608 SHA512 5a79be254d8fd21e22ca1b557bf11138948793518e761f20cfcc9a8a142e5ae14845989e4a2341f4594a03df0ab9b03e4df971123136c636e1b56bb310397f2c
 DIST vscodium-1.65.2-arm.tar.gz 93766888 BLAKE2B 23f1b4a5839b4d8ce35779ae7cd033cfa5ced68272fcb9783307d000ee58dd145d68e8f84e963a1a0dc33ccca81b47119f95cbe49ee788eac5921c9b6ad9071e SHA512 bfc20b5d3de19afb02c11c6dce5b06dec9d843ed7989e400a2d0d2a7f98289db2ae5e7c6262fd31b353eee4efb4f6455aeedffa44e0e7162be03d688ef42c0cb
 DIST vscodium-1.65.2-arm64.tar.gz 108364942 BLAKE2B 05fe48a28f9d97487190725e52ef719db7487e27ec537be185bcb8e4ab56137047261b1221b3cf3909ab07fd95e50135a29a57c802e51c35511718c1822fd49a SHA512 42a2bde4685aecff7b15e8315ef5edf05150e9f1228cd55a62693dc5a03ed5154e01353367c29357d652c82c561477b9d6bad34c0aacf7638b3e4597c31312cc
-EBUILD vscodium-1.63.2.ebuild 2900 BLAKE2B 2674e6374578edec493eca8c5d3547ad89d54e0c1f42d6dfbedcb33b4875a69fd4d8e7929e9091d1208432fb119927f154cc6f769bd086b968d729f3a04dbed2 SHA512 742fa5b2d8d48af98435e30249d2368f344c754c1c5fbabc0ed41a7307df223f67e60fa62058d81593534bc52594ecf29b5bbf4ecc45a5cb93833d5e94db38e5
+DIST vscodium-1.66.0-amd64.tar.gz 115792381 BLAKE2B fca762114695e2cebc3658dee0f6e7d7b556d60278a4da512e51f6f3b5bb17b81f83f4a01c2b950c2439e21083023f6e985368419a55b83d0ebe8ab5e303c6cd SHA512 ec4c0bc9a9d928ea2991f5ec9cae247f692601d4e1e63c8b47dcc6d2f62c8e42ef0ebeb800b2cf3864ec66d486e4e17cbd7fb517c2f10727b4203bbb968da305
+DIST vscodium-1.66.0-arm.tar.gz 97612567 BLAKE2B c41b46469cc96f3609982fe1334f8c6e2801a8cac59cd9e30f0c523fdada42b7de711dfbc3ab77e08c136e13088f647010b44404d81152bc38bda130a8d41101 SHA512 dc2820c3fb59be9a5b2152fd45ec7c1617eb7cfc6272d7bed111b5c8d1aa6902e7f59a71df965bb0ff97e9f95d6e59e6ec3db5c55b7185424cffea1d8aa40e26
+DIST vscodium-1.66.0-arm64.tar.gz 113504867 BLAKE2B 2076d239950c745abc4ebf723f832a9934d31ae9582d7a9d1d51a378a79a05b83c0e5bd62a750e63174927d57097d113861633caea80fe2e70559fd8a5965a69 SHA512 46d789aa41991813a758dcf30764353292d6305431407c85249a039681264a7dbe9741569770aa14e2bd8cd9086e146cf128fca382abd383bcfd522f4c332537
 EBUILD vscodium-1.64.2.ebuild 2901 BLAKE2B 13b3ac36b9b9718201e74637cb1ff6be3cebdd358106e129e4cf2bfd97f59f3c5a88011305b3de65d4dd8a037dde51491bf4d128007cb2cf0b9625b47032e6c1 SHA512 ba4029c8d718905c2ec6ca88cf1e5e39ffc0292688775898fc736b6e84ca957d89895b6195bc1d89a63f40bbc3fd132a53c8ae880c044abc822e2cc80daf7324
 EBUILD vscodium-1.65.2.ebuild 3236 BLAKE2B 3cb64418ae40ca572e8d00b29a83d2c51754648de49f4fba7939994675776e6510f536829689447cfc5d06e85718bfe686e83e57b6caebde16d62d702cc15bcb SHA512 823c050bb727ab3451af94acb155e408242ef1d4535d66470fde7d4b80f184bc3403671f00df49899b666404ac5ce42c6c80f1b8910f1d7edf2601e3b82f20ab
+EBUILD vscodium-1.66.0.ebuild 3236 BLAKE2B 3cb64418ae40ca572e8d00b29a83d2c51754648de49f4fba7939994675776e6510f536829689447cfc5d06e85718bfe686e83e57b6caebde16d62d702cc15bcb SHA512 823c050bb727ab3451af94acb155e408242ef1d4535d66470fde7d4b80f184bc3403671f00df49899b666404ac5ce42c6c80f1b8910f1d7edf2601e3b82f20ab
 MISC metadata.xml 1191 BLAKE2B ac8f365247fc710ade8a690da2a409352c20a886ad96b529ab0fc3f200dda28c2c7ca62fa78a922689373fa483e0a789836b887c8fccf2729ca6aa4c0e06aefe SHA512 e5b56663a757cdfff13ddc25c5d4f118f22d194fb051ae0bbe3264a4721c196a8820db1bfbd5a992827d8c97a81edfc30a97ca9610961ee46684a253d186449c

app-editors/vscodium/vscodium-1.66.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -96,7 +96,7 @@ src_install() {
 	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
 	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
 	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
-	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
 	dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
 	dosym "../../opt/${PN}/bin/codium" "usr/bin/codium"
 	domenu "${FILESDIR}/vscodium.desktop"
@@ -110,4 +110,12 @@ pkg_postinst() {
 	xdg_pkg_postinst
 	elog "When compared to the regular VSCode, VSCodium has a few quirks"
 	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+
+	if has_version -r ">=gui-libs/wlroots-0.15"; then
+		elog
+		elog "The wayland backend of vscodium crashes with >=gui-libs/wlroots-0.15"
+		elog "This will be fixed upstream in a later release"
+		elog "Please run the xwayland version for now, on wlroots based DEs."
+		elog "For more information, see https://bugs.gentoo.org/834082"
+	fi
 }

app-editors/zile/Manifest

@@ -1,5 +1,5 @@
 DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766e3a1fbb59112fe375af6f6cc5e8c068dcb127b338091f3130d32190ad4bc3a79eac7f9a4f87b46723d5a4a82 SHA512 e2a04c280ae0c0038e6ef18abec0be55063a472f77a511bf31459712be24659edcaa2d1c861d7c00bdab87a1881af03d14eb561047c386cbff5f90b13b1a2575
 DIST zile-2.6.2.tar.gz 1152751 BLAKE2B db51b534c8d76e1def91bbfe49cab501ff1bccd6fbeddd5622d8fca3695305c53e480eed1978e880621e09955e2b98519cfa02cf259006a08d1a8722122148ea SHA512 16d5cece403fc215d53b35c31fe6f743d53d7a01cdc7d101cabe6760173539c9c31e092b29c374f28a723708027f6de626fcfee302962848091f85078fa81761
 EBUILD zile-2.4.15.ebuild 1093 BLAKE2B 5f94a7c04aeaa447571d806bcf4029d3c6cbdda2d31dcfdbcea2810800c1aa2a7e3b097df3edf923e6e30b223ce450154f2e4923ee501ee7e4b663099b5c072c SHA512 ea016a21bf45f2e2cbfcc09fb23ff25b39d63f8e96b01dcf45f3636c11f24be6cb3130d0b429a6bec4d956e893985228b3757440a1eed5bb5d9c3746962bfd3d
-EBUILD zile-2.6.2-r2.ebuild 1159 BLAKE2B b52aa66fb8e69795a960381bf2bb97434e338a1853965c5efcaa26380adf47cfb758b36616147b28a4dd51984acfdfa223a7bafaf7ed67a5035915f1e486dc0b SHA512 27eb2a5a2337417e40b002ee36ccfbe9414ce023f9cb723bfe20c4a7e1fa7ca078d208d243181bebbeb0f0aa68c13aa237416a627ea5061f9b46f122b9c68302
+EBUILD zile-2.6.2-r2.ebuild 1158 BLAKE2B 6ab126c09dee123eea182c159bed523caee0d4eb301ebcb0e7dd71b76f0736b957ddc13876dc5a1a24344d248359c2ccd6605ea3bf9d38fc79a8fadb2f96a2b4 SHA512 dc3d36ae8b7f74e36d69b9f9783320bc141bbb0ea6d4574c432e28f6dd0bf38f624e2b54741ceac8113eca3a7d51be08a6de06278edcaf92a7a7bcf27a72f61c
 MISC metadata.xml 537 BLAKE2B 3a084218fac3dad29b7a80d6f707e7e8c769eb0e755a1a482814d67b0064c274fc80a50dac09cc6d04e963271fd526f34805dc9c49ffb6d5681dc6178ff43032 SHA512 d1de1757bd448535892b60dd6cc739c9b8cb92affd0c7a1cfffcddbcc1d18a1f17d054e751aa4362e26111e6e59206d086e3afb1552a2061503db6459ec34424

app-editors/zile/zile-2.6.2-r2.ebuild

@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/libgee:0.8=

app-emacs/haskell-mode/Manifest

@@ -2,5 +2,5 @@ AUX 50haskell-mode-gentoo.el 44 BLAKE2B 1587be01b819c8d788bc8b9c3e9481885b2be3ce
 DIST haskell-mode-16.1.tar.gz 1192866 BLAKE2B 5a53075be5ea1246f2aa61d1004fb282d6c5e182497f7660336cf89634bde3b6455997286a4e7e599bf044a9d5c47384f44addb1ab6f53a257c749a93849992e SHA512 28654499ee521032be1ae6edfd338cab6022d7fdd4ff34e720ffe249801d4b442484cce4f5fc3461aa5145918f66f4b69df774b60cceb408220fc0533386cc56
 DIST haskell-mode-17.2.tar.gz 1144963 BLAKE2B 79005da9ac5a36f0dee0586aaee42d2db64711b56633d9e22b250044863383a332c6ce19c90d8c4d41dccc881eeeacc48cb75f705fd56d5af4ea678899f784d5 SHA512 3ef7052948d02d89150b3cd80e252b0dea2ebd9c485a6e7272c474906f282247b62f4ad4f639074326af908630cedbfa507f9b3b52f44a1579e7edce5e44e588
 EBUILD haskell-mode-16.1.ebuild 1044 BLAKE2B 89f1495645025522b77f7122e21277d4cfa825bca386a9839179874e4c0cc50bc3f621608e6b4cf46acac0101ff19dcdb11d182e3166051eb74143f3a5f886ae SHA512 60bf9041d3df6ed44b9006283b2516dc3a023bc795c3791065699686b39d77a7f68b5937ae817cb6f6be653b088f53e362aedb60b065b07e52a391521ac2413a
-EBUILD haskell-mode-17.2.ebuild 1061 BLAKE2B 1799e05deb3a8b3c9bcfcf306f880d24e50ba13b091ec20bd8b558d5f1bb2b76988faec4ff65ac84dce90832376d0d380bab42fc0749731a047abee40a128137 SHA512 4f53570749fa28d5a3bd0b1e694cc6d3aedbef602eb330e34a614cb340b507ccf8aadf28fb4bbeeb9d8dfbc2d63323ae6f62960f30748e9d22ddbf2d33ad1505
+EBUILD haskell-mode-17.2.ebuild 1058 BLAKE2B fd1caead652102463c6afe644b0d8bd0a31115526514572a9c6ac5d2f4b63cef71fa76ea201e086154477afbc18fd1d5f6eac00f7065ba5965d17cd770382202 SHA512 2616b1ca71bc7e678eb876e88b8dfdb3327bee41f5850947c331f37b0381e723487226ffe0601f7d4c39415954605091fd2940b190917c6133f76eff6123b742
 MISC metadata.xml 366 BLAKE2B cc208c49f0e807a36dc4bbf4b21b88bc5dfa1754e5885304880e931d126571047ff450c385b8b3fed092e077a4972e29fba5a02cccf40a6d842aed541c9a3b37 SHA512 1066f85973ea2837adc30049494b216804196c9b87e0d705c7aadeb9a98ce5650a4a29658b8255405f62c416162ae99847ad2a5baff80fe6e691156336ccc098

app-emacs/haskell-mode/haskell-mode-17.2.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/haskell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 BDEPEND="sys-apps/texinfo"
 

app-emulation/qemu/Manifest

@@ -13,5 +13,5 @@ DIST qemu-6.2.0.tar.xz 115667324 BLAKE2B 3f2f02e5c36113df6231a9474c6d5db774e5413
 EBUILD qemu-6.2.0-r3.ebuild 26085 BLAKE2B e08fd3d25ef6d00dd194c07af9bf6fcf8f76d18aa7727751275bae12debc17ce1bb95990f5dce731696996f4b4f45a0f2b59cc272a4ee73a7e6dd12d0bf28a45 SHA512 755f89d6f88c31cd259db2c2647c5e8db5d8f0d654d6546bbb12bc0d0dc8b3a153d94847d9c66e40b7580893af4ab7ae4ed3ee348694135d69c1959dde85bdca
 EBUILD qemu-6.2.0-r4.ebuild 26152 BLAKE2B a8c84fc856d6dda0d19666da6f164309cd140747f83e9a3776176d57e0031ec3a7e792eba7fabb31697835fcc649d0784f66e4f1a5690354b2e4945393b91c13 SHA512 2000feaf7dcf342edd132f435f24cbed73449bb651731066301c7a2b2086a3844d8cf96eae84aa2f541e22f5633181a89300348a1f92a622b2ffd2142010cfab
 EBUILD qemu-6.2.0.ebuild 25711 BLAKE2B d34b811efa9d11425e9eb39285c9f0b257faf5e8cce3ed769afe9b62718e6f769c7654ec389e153a58d09cd12cfc64d594a57d64b670f48fe72a6c8700266fb7 SHA512 39950dfc69cf04f5b663db7cfa029d5cd4ee0a1632366bbb406ba5eb7a7ac2b84ed4dbac96a5fd9101f956e6e5c0cb34d7a0b5878f03a0728bbdaacefcff816d
-EBUILD qemu-9999.ebuild 26024 BLAKE2B 066d8d27291482e2da5c81fbbde7302ec4a9bf2c04fa0a6841eb24e906481c1706ea49fa47735ebd1f9c58083d14f832c3b473b08a969de797902f240d304b44 SHA512 abeb0195f52051b1b0c7a670b822ef569a00369a906d094e631d32de5c1df4c4f83bf5764ba94d0ce69f5b2de4a4991286551b1b10ffefc120a85b103a1b2cdc
+EBUILD qemu-9999.ebuild 25766 BLAKE2B 5093413b58fc20c7722b7e1742c68817320ab6e21a10eebbba1349438f0bb4fdebc565040035b867e874455b96a8b48aeb43102210e82c7df530d3acfdb7d0f3 SHA512 4a24f73ad132040cfe0c85675e280701e7ccb40e186a05885c837ecae50d36f9d540e12e8c30727d8ef77536f10a8d159686329a62ebb5a53f827ffa92c6355e
 MISC metadata.xml 4590 BLAKE2B 420dff5c9595ed662f5c5963543d63e768b4db9b77518a1d84dca09daef2b6b2c5c089955804af9277cd26533eac8148b93c9d1c2c9cc4285d141a321af2b6e1 SHA512 9c85bf9834eaf1b450807931c05a32c843a247b614ecb26e82151828a5c4be2d95510119b7431c563d3ac5d48126ffc99e9cb654d94f361e4c2d2c7fc6347dcc

app-emulation/qemu/qemu-9999.ebuild

@@ -12,7 +12,7 @@ inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
 		pax-utils xdg-utils
 
 if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
+	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
 	EGIT_SUBMODULES=(
 		meson
 		tests/fp/berkeley-softfloat-3
@@ -41,7 +41,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc
 	+slirp
 	smartcard snappy spice ssh static static-user systemtap test udev usb
 	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-	xfs zstd"
+	zstd"
 
 COMMON_TARGETS="
 	aarch64
@@ -85,7 +85,6 @@ IUSE_USER_TARGETS="
 	hexagon
 	mipsn32
 	mipsn32el
-	ppc64abi32
 	ppc64le
 	sparc32plus
 "
@@ -136,7 +135,6 @@ ALL_DEPEND="
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
-	dev-libs/libxml2[static-libs(+)]
 	>=x11-libs/pixman-0.28.0[static-libs(+)]
 	accessibility? (
 		app-accessibility/brltty[api]
@@ -206,7 +204,6 @@ SOFTMMU_TOOLS_DEPEND="
 	virgl? ( media-libs/virglrenderer[static-libs(+)] )
 	virtfs? ( sys-libs/libcap )
 	xen? ( app-emulation/xen-tools:= )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
 	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
 "
 
@@ -308,7 +305,6 @@ QA_WX_LOAD="usr/bin/qemu-i386
 	usr/bin/qemu-or1k
 	usr/bin/qemu-ppc
 	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
 	usr/bin/qemu-sh4
 	usr/bin/qemu-sh4eb
 	usr/bin/qemu-sparc
@@ -566,18 +562,11 @@ qemu_src_configure() {
 		$(conf_notuser vte)
 		$(conf_notuser xen)
 		$(conf_notuser xen xen-pci-passthrough)
-		$(conf_notuser xfs xfsctl)
 		# use prebuilt keymaps, bug #759604
 		--disable-xkbcommon
 		$(conf_notuser zstd)
 	)
 
-	if [[ ${buildtype} == "user" ]] ; then
-		conf_opts+=( --disable-libxml2 )
-	else
-		conf_opts+=( --enable-libxml2 )
-	fi
-
 	if [[ ! ${buildtype} == "user" ]] ; then
 		# audio options
 		local audio_opts=(

app-eselect/eselect-fontconfig/Manifest

@@ -1,3 +1,4 @@
 DIST fontconfig.eselect-1.1.bz2 1713 BLAKE2B 30af0471a52d7e2785e6e0e5847f51f3a11d0fb53eb800a5314e18dbb61694f1542d71c3e0f4ceccf82a396432113529b0fdb1b5fc6eba37550b27410565c61e SHA512 3b5978e20009754f09cd39e39771e8151cbb7bda60378cda718182b2df2c267a64af5ead220a079fbeeffb30586bc432bbc83b94e4f910205c4a29040cd2ccbd
-EBUILD eselect-fontconfig-1.1-r1.ebuild 725 BLAKE2B a0a6a8505a08781d0abe211ce0bc0c9310bff037fffc2cab34a39f5a8ae242e7c1e58ec86ae656c0787451f6b438067e04bed176d772dbe112649cdb44fbeed4 SHA512 65a51242438af27bfa631481ba0880eaca8af518d9295c77ec554fe6e72ad5ee9447b291a816bc9ed1fa51cf8291bbca3ae8eb68b4e35f13676a1a768022cf52
+EBUILD eselect-fontconfig-1.1-r1.ebuild 778 BLAKE2B f8a1330410fd05e312869c5163c214f0560a2820367521d59c4a0eabdac6dcba12a23d862b4748ca4fc14d731810528ccdbb20a4bd7931343727265f738861ab SHA512 83447ac9ce53194ab50a29c516cf1a5f68b6704d4104d0f71c5d278e0526e4d66f02b9e604c444ed53e668b397abec1b739d7cafdf3e9a1822b7a1ae32f09b8c
+EBUILD eselect-fontconfig-1.1-r2.ebuild 740 BLAKE2B 42aab935c4e38565e78074dfcc980fee0a5b9b704d926371e34178ee6b06219cde3e5bec6b39c34def93894385af0acede296d2373bed31606b4c6f6f3a3a438 SHA512 b65047ef6192024d69592865ab1769b879dd42ff285cd0ed250df9400a5ca412a81d8daf521e77fb4c9e224b0b3b5469ebbfe3cd813447b79ad97d12ff4b16af
 MISC metadata.xml 263 BLAKE2B 0b50fbf82dc925c031f1c1fe78929960b5aa70f4ec80bdd34cec9017ac9f07f9a3960421fe5a6a7f9b728c89570aed37fc1460c3f300da751794f1e527079db3 SHA512 a1d548b6228cd790b0b5147752c5495017391cfec3065bd6ea8ee5f8e1f86905220f6b764e71531627323a29d1218b60d36b6b23e9ca585775df12c260a6b311

app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild

@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-fontconfig.git"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/fontconfig.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"

app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r2.ebuild

@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-fontconfig.git"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/fontconfig.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins fontconfig.eselect-${PV} fontconfig.eselect
+}

app-eselect/eselect-iptables/Manifest

@@ -1,5 +1,5 @@
 DIST eselect-iptables-20211203.tar.xz 2144 BLAKE2B 9a53784a0831e7d2c150a974faba6c9dc124b0eafdd22cd8a56d342f77d9d4741fb0ff289e429351b8cff2e7576d00ba7e66d36c73ebe7c43c9d42cf56c13292 SHA512 5a670d72f20722df12bae7baa9ad68175e9678610657e24c4182ef83f30cc356b7af2f3bd8ea22e16aa83ba34cf5c407761c6dc2b937a4488b2da47dcb9eca97
 DIST eselect-iptables-20220320.tar.xz 2152 BLAKE2B 82813bf7814b91f1cf6da35c5c893e8ca28a8f5b5885e234c12853b5dc3afd73b3e0512e9d3d379e81b466706eabef8774d1b5738dd12582bbf1e344294a80f8 SHA512 7783d94d3bc463e0e8e084368c3906358efd03c9e47898686943d4900babd84e038991338f78459fca410f618dd5a62020e3d2af5ae45554f323a70a9b284135
 EBUILD eselect-iptables-20211203.ebuild 642 BLAKE2B 57d17cfd068a6bed232490137f686b3e55d909b6b7bfb0461fed6ea1dfcbe6a0032fa57f424f2f2117c8ecf15539ab4d933618b3b4a3138d20a418a3dcce33bd SHA512 501464dfff410fd2fe6f5d8ad1903f4ccd76a0290abafef27d0b0144578f24b5f4453e34525780ebd338e5554a0c0e0fd8ab4a0d172e14cae183e26e9a628e93
-EBUILD eselect-iptables-20220320.ebuild 731 BLAKE2B 82f65d6d52506e38ef62110a497d241218f2e19b8e646c5d4d8e6654d45995b3f61d5ffa157116fe99b7014506ab150e51cda75dafa124931f687b90fece566a SHA512 fc0e5a7e67fcb606cb09839922f0a6f1156c910ef7e3963437c1a542e5459eb82626fafbe357e4ff6308ca258cadbe9a760d09005cb96a4246db2ed9a512e628
+EBUILD eselect-iptables-20220320.ebuild 726 BLAKE2B 2414a4cb4e3e99edcba18746c68fb660464dccb179ff680a1445e875f8f00e43df3af33d4965524cdbe79424f4f1702ada6c4be811aff7ea266df031426f379d SHA512 4fddcfb75eb70f7708b46d4355e332ee9fdea1f3de21e47b807bbf264c129a29cc7aac9173388da17f71033c5615627100d60056f829261f203950757ac5adce
 MISC metadata.xml 282 BLAKE2B 85c3312405ada57a85e03b06a59523c8d4069551f91e6b70f182d5af92ffc26b946c2987554001649eb41d605864a5cb3c172ebbb02f3c1a11ca1ed805889550 SHA512 5eac09aed8093684086d644c321b236d5da019a650ad322d33236b543bd5641edfc43cbdeee4654e093f9f6393eae034110ca51eb560b87a178fba74244d7fdb

app-eselect/eselect-iptables/eselect-iptables-20220320.ebuild

@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~chutzpah/dist/iptables/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="app-admin/eselect"
 

app-misc/neofetch/Manifest

@@ -1,5 +1,5 @@
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
-EBUILD neofetch-7.1.0-r1.ebuild 1157 BLAKE2B 51a9132dcdc1ec6d7b00723cc125cc30030fab0f4fa2307a4ef7d4c3bd22b720b7f0fd24e9e63f6076f2a1ab0b43992f76d1de8a8802e27b09d6c171ac173c34 SHA512 15ddd0ef83cdfb7df72677f66e4ec8b67955afd042ef4649bc40192aae8d404475c6612c97ccb4949c44cb1393c14dcaf277489c781d23cc3e87b336b6d2c540
+EBUILD neofetch-7.1.0-r1.ebuild 1162 BLAKE2B 29eacfd761d5cd3b774018c65c851263d26ce42413a732a0fd3ed2637684a64fb57c3d0032b36d1d047e1c09617e71987e524ffcabca1eaf228cd915edd36be1 SHA512 9dcadea05146ae430c70e515eb637c389d3be408c298979511850faeda2a873e6456fc564b88850b1c2565abd758223dd7ccad8fd9687fafeb0b4f896447640f
 EBUILD neofetch-7.1.0.ebuild 937 BLAKE2B 72424ef48458c2c4c0a70900f42f597ebaf0ec659b3fadc9e860262b336d066786b078412c363394c674250d52fcb2ab267c665d2778b98cea96a1baf759134c SHA512 568336106a81b75f35e657c7f494e6b1b7683dbba29085bc28c0e7b441d288c5a013ba3c6ebd1ad62b3862ec8ad835b6fcea07eb0dcd590b907c38f4427d79aa
 EBUILD neofetch-9999.ebuild 1147 BLAKE2B 12a4fe99b0c45f980d0452a4b96288a8543beb03f94eb81195dd11a1b87129506f7d9bf5a6a54380d4b6289988e7f2098680804924fb9cf32a7386fe1e6efaa7 SHA512 753c3e6ebae6688c78246d2276dfadd37baeb004763e5d9d26cd04dcafa1b77f48304456df92e3ca78eefb0d419bde969eb438d1bd2d80674ed5d8504bb3a7ed
 MISC metadata.xml 863 BLAKE2B 3a4dbfbeea790e95fafbe9b47169bd43c127be69f21ffb2c0752ad2003304ef7628f0c95388288cf00b5d567b83626ac15cb015a8fd9c4c6cacc1137410a7887 SHA512 593a76d4beb607cf64a5dfeec978d7c6be6ad2a1dc36aefa44c2e18724d09c76133d3bab0fc5692f2bd997c86156337142b5115e7d34d4da59f91e69f44d4f30

app-misc/neofetch/neofetch-7.1.0-r1.ebuild

@@ -7,7 +7,7 @@ inherit optfeature prefix
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"

app-misc/task/Manifest

@@ -1,10 +1,7 @@
-DIST task-2.5.3.tar.gz 788760 BLAKE2B 3e8a4f2ebf6c39d3d51dc9b044cf1c8fbce23ab8178b6645405f26522bbb6f29e9f78247fe52601f6c8f87f966a3b7aad130417d0f416b9d969e9e396c10eafc SHA512 e906c8f42ad4b9a7e20a82defe31b89194d72957f18dd5129ecc41a2a60a9d8b0d01abb9b44ecce79b65cd9064af4a4a4c9dd695f98152e77908f130dc3f9677
 DIST task-2.6.1.tar.gz 836830 BLAKE2B 18531a462e9466d2bfc21af70c05ec75f504c82e67ff4160378dd1dc2438955284eb430ec92969ffd212e9e92b14d6bea6013beda8eb353bfb7b8aac03bbbb2d SHA512 996690831967b5b248d336f0848aa243d5929a34238d05a78d49930f477a7927966d097119cf2dd935aa1c159e930f74bac07b05327504b15d235348927b657b
 DIST task-2.6.2.tar.gz 838933 BLAKE2B 47761b1d172f823b35cb5d44edda2ac8d37daf9c54c6e3af267b880bf7f6246c6fbfa436ff63179b415f22c4e6d4253768bb7e9321893ebeaf46089761f309ad SHA512 3c592552c1baada09ef4e06cf2266c9897ffae42a75998b70767f2cfbabd2e1de7d1a900f16f3b8eb164ce19637dabd21e246f84732a20a646f39716895cdf98
-DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
 DIST tests-2.6.1.tar.gz 221364 BLAKE2B 6aac691ba1828abb3469dfa2a9c093b92431591ac21113f71550676f7f9c40394770ddd2c649bf6cda5655d5f1c25aa6c7ef174e9da7ea0c647109d25771dc2d SHA512 df252b252ac7e319d46ef7e72c587c52a97bf7b496ad401342611114db15b7fdab501b4fffc60ea6a8dca7820abc267120375a1aafd1da0a0c41b925e9fd62da
 DIST tests-2.6.2.tar.gz 222713 BLAKE2B e65e2da08264a0dcceeb839efdfad4733312d645fa0dad9eb9fd7e1f260ed21db3009f1c2b3c939dc1a1bf8cf4389f228a0ba05844483fcb5e44de82c2d33fb5 SHA512 98946332f898c4cf621e1dfb2b48761ca9496a43935aca45bf5965029d74f87ff37154693348f13aeed0b61836fab7d2a3cec8161ddd2f65ed9402162fe21239
-EBUILD task-2.5.3.ebuild 1369 BLAKE2B 9a9697292649fccd81b763cb645879c7cd8a46ec8b7cf222ad3be528e2f9244e529fbf14a7a3151b535cfb2674daaae42a851821250f132216d305300b2a09b5 SHA512 6306303a1e824e13d14588d56f79559da8ae54dd237b64fc249dde94da842daf7ece3ea8ed7a5127261ac8e4f245adfd9de514a2d41e73c6248933c73c20a31c
 EBUILD task-2.6.1-r2.ebuild 1450 BLAKE2B 71be676510265b2b326275c15445deb2147fef1e674e1250dd0eaf5f8484151651b23f057480b6492c38274387cac89bacff048d9a81e2d41e49e27b29d039e2 SHA512 f50076068d96231d6d25d19a6c980bf701b35a14400f17e0166b2802c54681df81735a689a386e021337cc6c050fd34d99a9e68d40a1778c5b20f416cbebbe97
 EBUILD task-2.6.2.ebuild 1452 BLAKE2B 10da76901d78dc09c9b0672413e51cb5c7c93b44be28a1d85302b5d3a26a4bbecb01a37f88e00e81fd59aa5374b7f6ddb9d633215127740be4d7bfe0c5f426f9 SHA512 e5052aeec3bac269c135822ca9bb5c079f4715547265937cfe7823fd9b84789a01cc53182e36f0c8c4e33df595a3af1e9d5c7efad39ea6aa24d640a0039c6ab6
 MISC metadata.xml 466 BLAKE2B f2da2e60c939ef2864d1463434c7581457f8d05435cd428038f18fd00ce7cc24a92dc57430e35ff82927188f4a82f9e20f9f0da5272b7c63d0cf00901740747f SHA512 2211e19b9bec481fb3723596e8aba2c560071910c96f9225b4eb33da132a0563e36b2c6edb574c54061bcf480033cc5eecb3095b6ca1bd56fc7e8c3d38a08225

app-misc/task/task-2.5.3.ebuild

@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 cmake
-
-DESCRIPTION="Taskwarrior is a command-line todo list manager"
-HOMEPAGE="https://taskwarrior.org/"
-SRC_URI="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${PV}/${P}.tar.gz
-	https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${PV}/tests-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
-IUSE="+sync"
-
-DEPEND="
-	sync? ( net-libs/gnutls )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# move test directory into source directory
-	mv "${WORKDIR}"/test "${WORKDIR}"/${P} || die
-
-	cmake_src_prepare
-
-	# don't automatically install scripts
-	sed -i '/scripts/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_SYNC=$(usex sync)
-		-DTASK_DOCDIR=share/doc/${PF}
-		-DTASK_RCDIR=share/${PN}/rc
-		-DBUILD_SHARED_LIBS=off  # bug 764224
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${WORKDIR}"/"${P}"_build || die
-
-	eninja test
-}
-
-src_install() {
-	cmake_src_install
-
-	newbashcomp scripts/bash/task.sh task
-
-	# vim syntax
-	rm scripts/vim/README || die
-	insinto /usr/share/vim/vimfiles
-	doins -r scripts/vim/*
-
-	# zsh-completions
-	insinto /usr/share/zsh/site-functions
-	doins scripts/zsh/*
-
-	exeinto "/usr/share/${PN}/scripts"
-	doexe scripts/add-ons/*
-}

app-office/libreoffice-bin-debug/Manifest

@@ -1,11 +1,21 @@
 DIST amd64-debug-libreoffice-7.2.5.2.tar.xz 1468341700 BLAKE2B 6838ec1d4b2e43aaa171b800c72848d9ca8e2a57b4686269c1c6890f87febb2504e591f5eaa4c15a88be4f899eebf836f0146713fdb2e24598cd8ecbab7991ca SHA512 a70c6402b8a4743f0cd0bdd06d4b6974669a7b6853b0269e9872d5c82d767bc251602f963413f96efa6c353c3b6639b9e17da6513ef4d1f04c4f3e900c2cc430
+DIST amd64-debug-libreoffice-7.2.6.2.tar.xz 1468971352 BLAKE2B b94770acb7c96f59f047b9ee468b29a621da2a379dfad4f295ed77bc8ac4c910884df9a5eaf38da03c8f58d4f62d3767f4c6cb791f96695357107a29bf4c9a5c SHA512 fe9eb2f3dffbb8f003ff05b2c98f30dcd69cb388eb9e045501caf6145ecb623b648abb91b9cca2873d17e1065738a2e7df9ee47150ea00e9891b719b4267a416
 DIST amd64-debug-libreoffice-gnome-7.2.5.2.xd3 1374344 BLAKE2B 563d88c5eac92d0c0402a0f46e406cde412b32b790a40b8a8aefd73a31ad5f9a8fb5180e4a518b296dbacfa10e88dd998fa662965fa20ea26b4c1ead83b583d8 SHA512 5e33b1a35f40f62f43d4f10256d3c54ab7d917a08d7e6a18837c26355b3688aea9996b6eece6e7f82827efd99885b242c7749d762568e10fec56fe910d9b35b7
+DIST amd64-debug-libreoffice-gnome-7.2.6.2.xd3 1382303 BLAKE2B 71291a92cd245c2e9ed68fb01ff1543a26a81d345d13fe1e5c57527c6fb716e7bd6ee393bd500fcee526605784b20db9aa6e891897158e6767b3aecfee5e9ed4 SHA512 6a9b4df2bb53abe79cf4d268b2f4da5e2a1c93444b37dcc2cfd4e0fd37a53db59ab69b9ecd2152f5fbd48d073dd579fd1fa21080b84c6b61b59cbe05df556c73
 DIST amd64-debug-libreoffice-gnome-java-7.2.5.2.xd3 753187527 BLAKE2B ad0367bb2a4a0aba4d999724f6386cd469474f9a998748c0eda2f6e1109fa2fb06f7d71a0ea9b1bf3bcb383249b546197ca05bf0a2a63057d81f01ee35b682bd SHA512 7159ae06cb294f4323905f9aaf2c495e735e749acee8960eca9bcf72ca25718cf66c6de2811bfe538b0fa948b427873a42f0ea39af27d19bc306e68d4419ce27
+DIST amd64-debug-libreoffice-gnome-java-7.2.6.2.xd3 755642290 BLAKE2B b1a355f4fa92996990c481133bea367a3ed019796159be4c9f3e877dc50fb1d0e460aaba369f2b065073e6f2005e15030ef0812b6bea8a3ab4e069aefd7cd351 SHA512 5524b1215dbe0839d6a17d022a2c06f4df30dfe4cc623c61e0e122a4613eca459fa8d71e78b3868a587ea8bc23bbcfd72cecb6ede1c09f397efd98683efdc7bd
 DIST amd64-debug-libreoffice-java-7.2.5.2.xd3 751807644 BLAKE2B 103f01604bd2606566482b6be9b58acae1d82ecbfe035b73bbec87e7f7ddd9649007ea3911ce395987d34bdfb252397c98617ff3c6da4792ae7df9e726ed59d6 SHA512 47e9725f46465680535520383b27e64d29f84df1b6152a312f070f84157e88ca32767a2c2e352623df5c29ed978b624696b217fda943dea07879d2f05e1c5360
+DIST amd64-debug-libreoffice-java-7.2.6.2.xd3 754236655 BLAKE2B 324345c211da2b8773e81db97821324be77a9dfb712ae5c377e09d9d7fe9c0c2f9d352cc241a23ccbf091aba721c738fe56b65e7db500d7041fa1c893b0be73f SHA512 0249814b8b5d07a99bb35c154ddc31cb228c066a9af4d87730b81caac628f189ac0717d883a116f3c99d3a2cf058015036aadb47241122c34495d94a0e595ec4
 DIST amd64-debug-libreoffice-kde-7.2.5.2.xd3 460040481 BLAKE2B b2eabce2b53944997367c5158c8c1ca7bfb2e82e17b58e9142ca3bfa53fb3c848eb719f0e8b11cf3967ff034ead48548f5624a449bbb358eae247df5d1da9639 SHA512 734856278ef502f638e85a2da731e39e464ee7fce13f598f8e01fd8ff3ad7deb4266c1c9249c072bf5b28814ebf98dd57afc9c2f808471a77232769aa4649527
+DIST amd64-debug-libreoffice-kde-7.2.6.2.xd3 460398978 BLAKE2B 30d95ed2b40fae34259d7922ad963fc330c2f9311320af4796e09c96b713234037c1c4d0a7e38e870d2ebd87dd6a8d0da48ba1d0e42f1c46da1f1cc63a40d8fa SHA512 c66330553a0bf09a1027d45e229065c71d6585cc3c1f6598b4ef393ae0aed14c223cfb8fe6f711c74caa0c3bfedbf02d45fb07c8560af465edcb77b08fc2bc3f
 DIST amd64-debug-libreoffice-kde-java-7.2.5.2.xd3 756364946 BLAKE2B 62606d4852549494f1907490453c7c2d51b45f8c237a875aca0cbe68873bad5dee4a8660d7477477eb5695c3dfd9363d0c19ef4cffd238eb2e8b4725199b4783 SHA512 8cf360bf8614da8e88dcba711218b6352df6b90fafe6a3e0e4c5bdd8365fe484161391a6b73ecf8ca2b15694b483754d244972f7069a5fe18acfc58eccb28088
+DIST amd64-debug-libreoffice-kde-java-7.2.6.2.xd3 758655199 BLAKE2B 26382ff16e3155e5786ac7d7a1c0eabc815c8a45d8a129a5f07c39fa39fb678c212feb8699ebc9f120b223d0462af15c01bafb74c81f08d5213fa38e0b6d951c SHA512 7cc9292420941fecf9e9527a35b8a56238574793b64fc54b5fd8cb0754b62128c2193a9933664b46162f2aafe1afbb18a30b09f134ed39a81bbec3cf79f8f5d6
 DIST x86-debug-libreoffice-7.2.5.2.tar.xz 1437665708 BLAKE2B 693afa40cf054bd0a6b84e3f610dcc22147925cc635b671b79812a224384895d15acb8529c5f42ba5ce77891b4383d5f519e74584b0fbd5ee8253f4089a811e1 SHA512 f9e7fc0fc90193aa1d969943986c118af12eee284748dfec689833deaaceaa4c2d716ff54862a901c38a744ee4386ff09bcd78ef3453f40e9ddc609d61185d11
+DIST x86-debug-libreoffice-7.2.6.2.tar.xz 1437742176 BLAKE2B 762e7eb6c7566983306920978b5e689fc7a75016c6861c4fc878c17e19a1b948e14d7ec6749dcaabd9d918d2583db1c9cf51f5d9e111530ef7550f3bcd92b8b7 SHA512 446122ffa154111062b7178acfe116e53c6335fd29963838f7e215fd91ee09c4aa51cd5bd058652a42cabe61b93672b7437067846d6020fb5be2dc93933e2fed
 DIST x86-debug-libreoffice-gnome-7.2.5.2.xd3 1332559 BLAKE2B f87725b3bdae2a60f071d44479c1b9f8734661761a91dc328210855b583011a603b66c1eb9842bb3ea55a445028b328950d4de4d4cac91ca0c7cff787ce8ff26 SHA512 d1490cfc5a0d29165393ed36564b2228f84a37cb031410dc533f843743eafcce67b8fc6fc43bac12a010fe6a4afacf65fc2f9327057c30069169a16916fdc1bf
+DIST x86-debug-libreoffice-gnome-7.2.6.2.xd3 1340712 BLAKE2B 8004167ce6f32f97720399fa67de5a6f3c2b2df6ec815fa5c3764755aeefdddf5c67c34b8d2058dfcae420481b1cccf67d9cfbb2c416ba0d18bf24416bfe2bf1 SHA512 1ba6d86ab8396992a326144b3225af4f8d41a97bb97af2892ae9393d292c751598325f73ed5010f7de61099bb1861abe105a5fcb02579c63733957fac533aad2
 DIST x86-debug-libreoffice-kde-7.2.5.2.xd3 437928491 BLAKE2B fbf1ba96d82cdfb68670b2e1be55b4c9f26b4b0dad77e2b524433bdef06e8693761918db0547182e9bde59d2474511ebf0f5dda11c23e7cee03a98198d6aade5 SHA512 79c7c31c83b582f736ce2c520041354dc11bd7274701eb26fad93d76090d9d10b443183402b4253621fae35f87b33da3ccd645f5a5cfc27e9e7c001291d07668
+DIST x86-debug-libreoffice-kde-7.2.6.2.xd3 438069622 BLAKE2B e5602a31725801540300a78ec359d67c6df1c29c4663c61e5e72c7bc4bc119eda6cb005e4aae763c3c43df7fa6491419dfc8d7f7dfd3ccd61de2e53cf69c7fb2 SHA512 dd0cb3c92a415dae00f476c31d3185cb65acbc03edc1c303c8dd21ca282c783293aedfdc21412b6a5a73d92da99b6c32b478c269852152977e099297cbb7713a
 EBUILD libreoffice-bin-debug-7.2.5.2.ebuild 2451 BLAKE2B 5e3dfa9db695203636656a3cc16440f43d740adea37309f062f6290209885c71b5dfebe9e04edfbe2788b8972f37ccf2a550dd0e440dc16e20f7d5379f8a29cf SHA512 cbad6fb433a434742b2534798dcc9c6ade97f514defe1d58f6b7dd34a319f4dd19551825e31a92dca3c1b682e3de9cdf60881afff0f60b35626e042b8ce12ced
+EBUILD libreoffice-bin-debug-7.2.6.2.ebuild 2453 BLAKE2B 99c1c3f98aeffe7d8c1d4a61153d45c3ca0ed216d1f9033eee5acddd91fc997633847000b798ddc6147d9e4df37343fd5be50a53ef93d4ff27d75fb410509b9f SHA512 7e09f2f4ab869d58298724d2fe00d62863bca6175742766bc6cace310784647e9fec45305c7ef862546dcb72025633f4bfbaed54d4693a1649f6ab0678cb7297
 MISC metadata.xml 482 BLAKE2B 94bf0468867227f0b085d6ca86359e9ae852fb874ed95ffa6d9926cfcdc7173d5db4dfe1a0ed86daec746a4f867d42534465bb03402c5bd4d9ac6bb8101932d7 SHA512 d4f6a8f90659676fa509690059e462c1755e22792efeff0a571d8f04f9f167cbed22d5ce34928a4afbf2fc01bf7ea2b5e8f1a70d4a652a3df9153ed0ccbe1905

app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2.ebuild

@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		${BASE_X86_URI}libreoffice-kde-${PV}.xd3
+	)
+	gnome? (
+		${BASE_X86_URI}libreoffice-gnome-${PV}.xd3
+	)
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="~app-office/${PN/-debug}-${PV}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+	use x86 && use java && die "There is no build for x86 with Java support."
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}

app-office/libreoffice-bin/Manifest

@@ -1,12 +1,22 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
 DIST amd64-bin-libreoffice-7.2.5.2.tar.xz 141659504 BLAKE2B 3f8004e28c52ba2894d3ab4c643291b3ab307818599ad17af062a7cbd6d0ce096fae610aef955cda730344699ba6d025d532c95233b13c7d4083bfbbb227e517 SHA512 4083a0e6c0321478453eaa3a4fe5473325dc375900b3631876cb1695f4b6f6e81b2c79045eab92d76ddcea13ae7100f115a3f2b7da86afa20d4ff1ef67018dfd
+DIST amd64-bin-libreoffice-7.2.6.2.tar.xz 141647232 BLAKE2B f3de787c4021a241e905c4da1e1427ff9568277d6f350ec4b4d16916d08b11f0b28e16abec1015e25cc949fc769a86bd642804bd39507c4fc284e53e9496bf0a SHA512 9334caff01d675ec3ba442199ef6e2216a9226da64aebf3173c3a170abc8c8574c9416f3d76446f9cf18fb048e73b9e83558a8d9e1aeae6516489666d4a9a2ff
 DIST amd64-bin-libreoffice-gnome-7.2.5.2.xd3 1454525 BLAKE2B 2037e87a38b2cd8d30583b6145c99d884692e053f3e0d7002a2e8e461af288c0a122786ecfcd9e82a6c5c4f4bb98b2c59474874eed23272fce66cff9d282e68b SHA512 dbb2c1f5ede93d3ade9932ba1c0f4709e54280f171cf7a6efe1ec67a716ff6370f994ccc3ac62432d3503b9cd840027cf4b865ad31ad095ff2614f4ea93583a6
+DIST amd64-bin-libreoffice-gnome-7.2.6.2.xd3 1432488 BLAKE2B 171840cf4ceda8fb52ec29cca9e48cf5f0f8167f6ac37980481a145b4bc5aed016cab6a898feba4072288b0301f3b261e7ea162ff03a0b7bb9eba49883140bab SHA512 006eb6afeb476e1272c7654797ceb142e8d3840af84b9a94328896eb03ae52d8c00ec0c5b879ed149c3f4d0d35870039f9d96b1052c3eb6a16c2c1bdf2ec5803
 DIST amd64-bin-libreoffice-gnome-java-7.2.5.2.xd3 30819131 BLAKE2B a6cd99dbff624338c33cd00fdda1b010acbc2a5aa3d0025a8481bd047d8f74235e5026421885244fbd800fd8af4d4218d4dafc32afea10a48e3171e60109cdf5 SHA512 c9c0266ffd557c6551fd663d7bda186d9a434fea4c7e6fc26bf3d2afa3eac74191d3837dd49d4447209c53baf18c6fe3394c2362c5d3e011de70ba75332d8237
+DIST amd64-bin-libreoffice-gnome-java-7.2.6.2.xd3 30838103 BLAKE2B 025c3d554e73ea4811892641a917a84880c2a2cd24dbfc6e1b31ee30827acb8eab6b94f48ce07a7a002bf8ac0bae62c08442cfa274981439c946896c0ce99e32 SHA512 fe03906327ae39ca32184c66fea151348c03bdfe83608605a8761f4c2679c31623d628de4f24b605b4adc1d64cc82a7bc2a3b6106acd360592c43ec2a225d17b
 DIST amd64-bin-libreoffice-java-7.2.5.2.xd3 30704441 BLAKE2B 7ce0ad8b709f6331f94c56b29e45047c320502797fe23175f9c517cad8e1b192e5f8f2d92d4ddaa0a551accf33b587ed6493369366ae4496473e9e666d6df134 SHA512 6522aa848195b602681d972902e485bfcb018e578f8b0a693aea35a0afa772d054b62f3eefb3e53d54c9791fbfaf275104dd2d95e8c7f8b08c5f55a29247e410
+DIST amd64-bin-libreoffice-java-7.2.6.2.xd3 30714634 BLAKE2B 54ff35c9d5b239b8caeaf6fb6bd9269ae931230d5585afd73e7bd5b1bcd960add490614508e1d4bd09becfac5ffbb1683eeef959e1bad61e030a1f81ee19bcab SHA512 8d23e08879bf4057e539798568b5f8d50b1c4f5721c787430763cbfcebe5095185f389aa1bdf391d3ef7ace9ea6ffc43a8d5ec25a5dc3e6a1b3004a105d9b8f7
 DIST amd64-bin-libreoffice-kde-7.2.5.2.xd3 20966714 BLAKE2B 9a9503a191259ad054d72582b88e5923738bdd7bf3008493e6064b4fb84973c5763d8c29bf88db438b5772f11b63ad029ee7a32d791a99c640a56a1e1ae94195 SHA512 2ea0bb46e19548e9c24f0f9713d1c9368619d4d83fb8332ee85a3bc72497d70110a2954b93c51411c83b691195a17861b17657884d73e87f5699fb7d8c40072a
+DIST amd64-bin-libreoffice-kde-7.2.6.2.xd3 20970286 BLAKE2B e4d41de640bfe99d4d480c863726dad37c69d7e0ad1fd54765d2556fa07ba60cdb0f97032437aaf4e8252b3100ed05cc0be71fcbb2a2d3ebfbbf0e752e1aa604 SHA512 c7f718e1b5aecd4be5a92c3cf65ac63cc5a764a38c54b942cb4fcc30283e3d0f46a67cce79082d2012d6ebfcc5634ba1a2c4c69bf214e6e2012d750e87dafff1
 DIST amd64-bin-libreoffice-kde-java-7.2.5.2.xd3 30833000 BLAKE2B 20b8c90984db7f61f92d4e27503231efd88f04fee92743e1e80f5d5ba760b08ca77984dc63411d10219b88be50b5140ca0bdf161077aeee3e921dcb2e4f2cfaf SHA512 60d065c777cc922b6ce04c7f5a7d5eb7caeb76356cd4cbd574a4a1e70df8eee387898ab98f6c669dbc19d5b615ee31d0a13d50b02cdf9ea0b3ae8d209c0bf8f6
+DIST amd64-bin-libreoffice-kde-java-7.2.6.2.xd3 30861267 BLAKE2B fbb6c86449b8d109ecbaeff83229aae4b3acb6355c05c4cec6c6eef78287a00f12b6bd9b0cb064d1f6c2a4ec145bb299f62e923f95ad3e9bb1d12c66765f75e4 SHA512 84cb8f18cd69b9f9056b8959c8760fb331b30b612a1f6d4f9524b8782ea4d0c8d5a0b836a2e121a8ffe054dc47a9016e87665c9dbd573f80d19560ec8871eaf2
 DIST x86-bin-libreoffice-7.2.5.2.tar.xz 143261716 BLAKE2B e9b147d79265d5e73c4af998808b12c0c07efd23ccc234f49f26db1827b94ef6fade8e692955e36cda8e3a067ce4ac03eb400f92526ef33082c347c2540ccf90 SHA512 b436c2cf330c2770b2bf7e80d8645ad55204b5920d41ca0c8506d3b0277ed967ade55bec1affbc42cb2b28f7723e42ce5207c4d2bdf293e0777eef31d9675202
+DIST x86-bin-libreoffice-7.2.6.2.tar.xz 143296276 BLAKE2B 77d2674199b1ef1838f6274f3d75b4904ea5edbfb884bc8df1bb67609c1155b7cff93cd4141265fd609cb7aa7b7a00cf200096ba5b2ad27ec94ca84f414b4148 SHA512 00ad6fb88933a0a14b0633c716a94a3403f20860f8a017564e6c4a09981a65d877404b48a2543a3559d650bb30087ba9d538641fba7dbeb9f28d38eb3cf98808
 DIST x86-bin-libreoffice-gnome-7.2.5.2.xd3 1459128 BLAKE2B 041da1b99e451933ffcf2f9d8652b080c41b3fa0ac31d38c0cd7b23d25e3e519c190feb114c430453107ea402867128497b36bae2467e3473aad68e134b530a9 SHA512 8c1821b788655a337e1dd19d4fb020729befb47f36f76bad0521f65ff96863ff5920e70e0f59c7964adf609603d64f521a61862e9434c85a9f6520aeb173be3f
+DIST x86-bin-libreoffice-gnome-7.2.6.2.xd3 1455405 BLAKE2B 61d236edefec968cd735c5eb619def336e383297c7ed3ef0421dc9034e8fedbfccb5eeade2d397418fd12d154314a28514cf5c997d4dbbad3e7dfb5e7d0b4e43 SHA512 ec2e5f6a26a75f69c66d73e64d4897099b7c3bba435aab1a1f0fecf42bb92c65fe56cbf237b72d25f0382003574891be7722a38957becbde94405b8a473ec84e
 DIST x86-bin-libreoffice-kde-7.2.5.2.xd3 19655768 BLAKE2B 5dc888bc468bd4458752200ff437bca544e83b18c4f0de000228dbc1e8a738fb992ee97add1fd2f0f3bdb8896d72eee2d7d07aabec3c301c6e588f2e1a5ceed0 SHA512 544e3a3da7362621b4044a47180f1959080f42fd20c5b5361d09da239c3ec6f2cee2bacbf57dc1e4da6076fca58345a3a8ac1a9cf1f7001140b891242785822f
+DIST x86-bin-libreoffice-kde-7.2.6.2.xd3 18626678 BLAKE2B 3a70292566ff1b6ba97f99babed3c408200501235385cb21414c72a73dc9cb7e3441022e125b7aa8475791ab5e986d28871076a1c77e29abaab3f717bd59339d SHA512 165a223514c4cf16897fa9ed98ad43e3f9fb39e4a8cd3bc96b524c404ad1127e2bb7578189d058444342416091c27f6e3f4fc4207526556bf5aafdc554b3b154
 EBUILD libreoffice-bin-7.2.5.2.ebuild 6098 BLAKE2B ab2aa90a36ab1695e11b2fa0b1411bd998cea702e19f54f861c7c221773b9cd672cdbebe17aa5266720b0563e41254d06f7efac848ef94a579dce8abb0fc6520 SHA512 85b1669200f79c817a3bb94c31fcf06141ff90936422a11ba53f7cf1feba2904649317c22f9c74dbe427c4d88193c51ddbe602f495c5b9c85d016b5760a72e45
+EBUILD libreoffice-bin-7.2.6.2.ebuild 6100 BLAKE2B cc2269ebcd60df318fe6aca9af907d5b2c8d41ee40344eb6299338f9085892e4f34b7467bab1fc969ae4aca876e6c617dd8898206a2f36026d3a3e8b73919d4c SHA512 9c435672006ace52471ba142fb67a784616a0170174cf0a2def04ce0edf0c142f988fafbf729faed9d69439ae47158f015a888f6e116b41cd09a69b08f865d61
 MISC metadata.xml 511 BLAKE2B 3ebaebf19d7db6a7e64093e54ae4ce86f14f528dfbc0987c027bfd7dde5de6ce8e7bfdd815e437aff272b7201d298568fa032cfd3292523c00a1c2bef5bc984c SHA512 01ae7e196fa4b7fbca6190fda6ac2e2667b36a284e828f6b329593b517379f3f4575f96a2eecc4a1d74764fac19ba8d7a756a54c04190f2aa17c578705c9708d

app-office/libreoffice-bin/libreoffice-bin-7.2.6.2.ebuild

@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_9 )
+PYTHON_REQ_USE="xml"
+
+inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		${BASE_X86_URI}libreoffice-kde-${PV}.xd3
+	)
+	gnome? (
+		${BASE_X86_URI}libreoffice-gnome-${PV}.xd3
+	)
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.7
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-libs/boost:0/1.78.0
+	dev-libs/icu:0/70.1
+	dev-libs/liborcus:0/0.16
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/3.0.0[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-11.2.1
+	>=sys-libs/glibc-2.34
+	virtual/jpeg-compat:62
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+	${BIN_COMMON_DEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libnumbertext-1.0.6
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2
+	dev-db/unixODBC
+	>=games-engines/box2d-2.4.1:0
+	dev-lang/perl
+	>=dev-libs/boost-1.72.0:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	dev-libs/liborcus:0/0.16
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.28[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.11.0-r1:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	media-libs/zxing-cpp
+	>=net-libs/neon-0.31.1:=
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	net-print/cups
+	sys-apps/dbus[X]
+	gnome? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	!kde? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl(+)]
+		x11-libs/gtk+:3[X]
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	dev-db/mariadb-connector-c
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( virtual/jre:11 )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+	use x86 && use java && die "There is no build for x86 with Java support."
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}