Sync with portage [Fri Feb 18 08:25:04 MSK 2022].

Manifest

@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29592 BLAKE2B f08faabd66eaf1ebc67f2f875a67e8d849712eaa9f436e8e17eb749f20478e6c2240401e0b0e2cb0b6a24a7f7d5e8d3b14f59548b5921b0c12c40668089cce29 SHA512 f3ad7fe99201e9e0593a9a95f06f43fd1c92c061f66249354d17c71ec34ae76fd5bccfb2638ace8779cbd0cb54618098a46f40becd8da302adfb7b0c4ac985bd
-TIMESTAMP 2022-02-16T13:39:18Z
+MANIFEST Manifest.files.gz 29587 BLAKE2B 555349989ea1e83f39edbc19a45e8b131b9329272a61bdaff6b8ca661d9a6b121574167fe3d87c64de39da442b18897853a9e50203f7a8d7fc47c2339c9cc6f9 SHA512 8cc997863d934c6d3426cdd736117946c0a825878b183c388cc1c770e91a46ef111a1b59c2cae35af36d6aa139e1bda9402966da23dbf71bc4a101e7367faeab
+TIMESTAMP 2022-02-18T04:39:20Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmIM/oZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmIPIvhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCG6g//Rd1pw44sQQ7dHloGIAYBb2hgNNI2B6L03dtNGO80yx33keeB5BQ66SIh
-8EF5jJIcLvgRn4d6vpU6vUn8fJxEXipXyHdu9+E7PQ3/6O/CJnrtCs+5HRzi5FBb
-GKJixtP6cvwJnJ06rZiyhzFc0esLXLilFOoK7IidiMgyr+jQIfwPCm+RRqu0CFlV
-mCFjYkQW5Gyv8l0YS+7fNvqTzS9k27g6iD/g8N4V5zD5T1mM2FGYPsC9CJkAhecP
-QmdxwBsI4dxZgH6drI1ebt3O0DqsDXokcvnrFFVdqFTekj1o2+g6o19Ni49WmN4+
-0VgeBb691HyWcNjZh5kswkSCvYgnj0R94Gdox5+lsbztw6fovKWaPwtjk061Ff5p
-7kYsAo9lsu+MHDjcwSClim0XWLEB2uiUrjaGonChByBC7XnaJRq4bTBWQsz7A0vm
-d0QkBeI52plHjltEzXmPrrEd9dIihowM0tkd6wSTO/Lkrx/QS2iejdXZCPqZGMll
-EEg5y0VufI+tJcTt6wi48xa4/Uqah0V0HKzU+pUNVLeKHNFYPFPrTMh9MBMNmPis
-pEpHsfmiwVUzPOEypo2TSbpLK3qONI3d0NIYsPUow5ENUD4lS8eu4askXVdq+jQn
-SGAd8b1LqwFzdCsCBqnyxFhPF42ZRrGunH7IrbNJr5ya74k4mTc=
-=h3nJ
+klA3TQ/+L1jAYxoBfonjkDJdxiYWBn7MaBztmaGlrKWpMy904U90t2p10JqqIGyz
+ODEW7KRhLMR9J6UrjmgLpiNtljpcwzpuYHqjUPMQT1u1RITH2/id7mkFxrbkhpB0
+r2bbPkdl002EnvE9jqrGHF1e1uL4QSaOZxVLkPu2kUtddGJ4DX12+JWzCkOAEZfZ
+rl4q1nrlCgiMza3HD1lqkbCJBYZdabqXBv5pFnkbvQCXQfgaHCUgWW9V/60n5tW7
+ON+waZdxfWoYZNbIitngezgH0NJxYOsxxjR/w0daol8Q3ynhqbQ9jKvk34QbLLvQ
+WgG35PKmzgkQCX0KHlToZuoctdQWZDpAGHVCaWUdeSv28J5TGup+h0PsGolf97W0
+gxZQ7Med3Skgwedr0XjEAXBo/2Rqbf16pUSYsO2N8eumJnYigPKBR7HV4IzCbbJU
+s9Ta0xrC7OmIds5DqmHMKJGcz270OpIBGovRSxhCXr82wujHrUCtDHuMl/PYKA2A
+G6Ma2g0nKr9blfqPkjqoVzySloq93hoxXIPZ2xu4gN2/Jcj1AgQgin0hY7iqQ8YT
+DP7LJ94SKkqq/by1vp1Mnzl26f2skhpxG0i1fSlBfh6mrD8UPkaweBWlUxYonWv/
+lepL3S+HKkTKDxaVtf5bvUklOJ8EDY27X36BPFHC5V8H2uw3wMg=
+=O/vy
 -----END PGP SIGNATURE-----

app-admin/ansible-lint/Manifest

@@ -1,7 +1,5 @@
-DIST ansible-lint-5.2.1.tar.gz 356071 BLAKE2B 70c54114a667ba63c1d285ec8a73a7c3332f89cbdf1b8d4866de86aa2c358e41759ac69188806c715cbd3893a2d0b1123e6b679ed208ce4c40141a40b9f54681 SHA512 9ae1aa775572485aaa68ef127cb2ea2d66cd1057878ac396b1644244a070f05b7920eceec3cdb16523f9fadcbcb5df971f3513d7e4d9cbd6ace1ec4f4d861451
-DIST ansible-lint-5.3.1.tar.gz 356514 BLAKE2B 3ae30c357ed03c544773671af94763bf76d3544f30b1c7b7081db9a67feaeaecfb678d4b194c05b45fc8c7e75cc1c057ad9612ad4aaf364cfd4904200ac128f5 SHA512 2d46b1cf2605c68765c67e7d7e90a049e9253b058ac01c833ed0afc67ba553a8855f3d9315eec440bfc08c0d9e7b0b0f5e0151021708ad1e05fd895c7f679c43
 DIST ansible-lint-5.3.2.tar.gz 356870 BLAKE2B 4af11f760e30945e066a9d160438bbedd5a4d39799009bc6d30614baab0b88a21cad088c0b758529aaa5fbb54a9f2a1f636ab6d642a37297a27c8ba5240f53ef SHA512 4ff2d36de20b2e6982d0cd1bca6a3f886307701dfa0bf880d2d417387191d90adc9361afb57f8ed26239cbc110e5f05f52a186950d7d3b4b0a8e4406e4695acd
-EBUILD ansible-lint-5.2.1.ebuild 1516 BLAKE2B 2506a58802c30dff8193c489b893954e99c4d2328a886e7fe7933dbec463ddaa43982acaff09a1e022da975804af4f73b7f8235dced49a1e63940cf5b439476b SHA512 b6029f18d328dfe5caf4e68a2b2c3d869181643f5cfe15b3a478098d618b48393b92c3ee73bf8b02a54185483963f92fd3f6b60f3008c1275d87316352d87217
-EBUILD ansible-lint-5.3.1.ebuild 1556 BLAKE2B a6e8a4ea6e984535de2e47490e409001cc4fe020a286fd86e555aca7fdf9f955b6146a2d69c4c3af9446105036f714b0bda7dc85f2f6c6c1052f743112fa0790 SHA512 2578255ba9909d6befdd254eba015798ad516c31d99017f06c0402333358d77e6d293d466a654106bd03f3fe16cec1dc8cf1db2cdd9392902f4eb37ea400f1e6
+DIST ansible-lint-5.4.0.tar.gz 349353 BLAKE2B 9f41abdf1e9485afa4c8ed9498627b0dcbdcf57916f3b57c9886de8bd806e4e5b34e7e9c2e66b44ac8009a0afcea4d8566900ee8d391eaca61081fa23323c41c SHA512 f1bbbb49eb77991d60b6087646c695a938d328d719bba67707af4ed858de857d383b78490bcf0930cffebd13a0b0abde20269a47e47e4713a37da715a28c5da0
 EBUILD ansible-lint-5.3.2.ebuild 1557 BLAKE2B 462cf7e23e4ec5ebf70c6c2826dbaa90a3318d7cebe08b869497ef4f2cb384fbea799d25d6582ff85089066f6535d7ee16c8c138de1abd7438736a61cffd267f SHA512 bd1f3bfb1f4bf64185bba03eae0faf352db85bae2b13c52c5849fd682b9888d7aa7b53176bae5cdd72b4f3417276bef7b944c4de266edfc11b91d542f8e0a019
+EBUILD ansible-lint-5.4.0.ebuild 1852 BLAKE2B 913794c189a58ed0fa3cd0febde7b0ac4788294bee7b1309eb1d70f5619289d4c80f57a8227a7a834ce299c6a24a7c59285425c737d7b0cbd1e53c47ac570650 SHA512 5ca55f7c4d72b01d95813ecef1f3e984ff92993fb0cbf7e5090d938349dba942b88e695e6e34e022385c5a4d6e1fb457766d19aee606ceddedc458fa84c91bb4
 MISC metadata.xml 581 BLAKE2B b2032b06ec9ebe63385918be612a0ee1c351943bfc05a544670a78d87bb2836eb2143bd80da6542c140ab16d33f4b79fa0f18cce3291833b34e43ffb6fd3e737 SHA512 912848e5c37863ed0b04062210da0e925a2d71f1766dd43bb746e7aa364a86ff501e4a6e9762c584ca6d37d4f38b7418a32f3a02b30a7ee4b3f7b828f84f6646

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

@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
-HOMEPAGE="https://github.com/ansible-community/ansible-lint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-# 14 tests fail due to usersandbox denying the executable 'ansible'
-# access to $HOME/.ansible. More importantly, some tests (6 as of 5.2.1)
-# fail even when run manually with tox.
-RESTRICT="test"
-
-RDEPEND="
-	>=app-admin/ansible-2.10[${PYTHON_USEDEP}]
-	>=app-admin/ansible-base-2.11.4[${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/tenacity[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-7.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.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.1.0[${PYTHON_USEDEP}]
-		>=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-pkg_postinst() {
-	optfeature_header "Consider installing the following optional packages:"
-	optfeature "letting ${PN} run YAML checks" dev-util/yamllint
-}

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

@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
-HOMEPAGE="https://github.com/ansible-community/ansible-lint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-# 14 tests fail due to usersandbox denying the executable 'ansible'
-# access to $HOME/.ansible. More importantly, some tests (6 as of 5.2.1)
-# fail even when run manually with tox.
-RESTRICT="test"
-
-RDEPEND="
-	>=app-admin/ansible-2.10[${PYTHON_USEDEP}]
-	>=app-admin/ansible-base-2.11.4[${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/tenacity[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-7.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.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.1.0[${PYTHON_USEDEP}]
-		>=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-pkg_postinst() {
-	optfeature_header "Consider installing the following optional packages:"
-	optfeature "letting ${PN} run YAML checks" dev-util/yamllint
-}

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

@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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-community/ansible-lint"
+# PyPI tarballs do not contain all the data files needed by the tests
+SRC_URI="https://github.com/ansible-community/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=app-admin/ansible-2.10[${PYTHON_USEDEP}]
+	>=app-admin/ansible-base-2.11.4[${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/tenacity[${PYTHON_USEDEP}]
+	>=dev-python/wcmatch-7.0[${PYTHON_USEDEP}]
+	>=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.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.1.0[${PYTHON_USEDEP}]
+	)"
+
+# 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/TestUtils.py::test_cli_auto_detect
+	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
+)
+
+distutils_enable_tests pytest

app-admin/awscli/Manifest

@@ -4,10 +4,12 @@ DIST awscli-1.22.46.tar.gz 2160630 BLAKE2B 628f60975b66fb60b4a91edb98856d9cc8cf7
 DIST awscli-1.22.49.tar.gz 2161874 BLAKE2B de97f0f9aeb075049e69c5bbd4bc67d59ba964f6508c92f8c2d1574f77dd4f2d602cd16b07270242c516e68d4119f8df95834935bfbcb16eccc3c1bc0a6cb08a SHA512 d55cf65bb8f70e4f98bd1eb0a79385d0959985b1b969e6f0269e7185c4af2cf3b40e0cd6d736431a489e21e4ec5b055ac0727dd1b2226b6d4dc6b19c4609ff11
 DIST awscli-1.22.54.tar.gz 2164355 BLAKE2B 86f103c0ab646f78b77ca35740af816d1e36b2a4055f5f3283a7ce70eea2e3f4c481f2fa0b82f964ad1e725705c3c1adde7f365b2e21b3a435b5766da3d4b645 SHA512 63e95c767cd38fd7b68a4a74acac72abeb02c220ef16941b6d9069c74f9eca1ad29c6f63a89da2873b65b45999017dfe667dab4864cf7877405ac6328865c811
 DIST awscli-1.22.55.tar.gz 2164540 BLAKE2B 7e69d2810ba3a829522e4ada836f70d229ac62d1dae6f9fb087f932ab356b9be98cfd85ab8fe80d7ea2cf1e886def41b11b4d30031784b1ff68bd00ba05798b2 SHA512 1f08c624739e59d416a0a1642e38da3230f6df2d4b2b497b704949965a17d955c0c7c65fde29b037a3176487ba6c5d86e6017aaadf980253fff19d44f410ea5b
+DIST awscli-1.22.56.tar.gz 2164531 BLAKE2B 86ed7632aded1a5c3b18d2eabfbf5fd9954ef2d8f61ebf5c23e596452381a3915909d6fc93c92eaa5d58f02a27df994476fbc847b40984c141946e6f08933dd8 SHA512 fb4ad95f2990397fb1d83559e71dbebf1b4f2f52b46912da02bded1d486a61141c94dabc0f59ba2ffd724ef7e379f66113a71f2ea466e7a28cf6ac9582579004
 EBUILD awscli-1.22.31.ebuild 1653 BLAKE2B 35b3764561e364a6cf1d0f5156102732e442915c3502ae4c10f9e9c11459d855bc96c4a0c484c57ae10f7e709d9e3b9d2639128cbdec2205fc522ddf724d61f7 SHA512 896ef21b47189c5dc605fd2a87728f62387766d081f07bfef380295a2b1d4a73b039ddc88c064377953c0fe7f580ec19acfc1b8bb5fbe145f1557081d492c799
 EBUILD awscli-1.22.37.ebuild 1653 BLAKE2B 35b3764561e364a6cf1d0f5156102732e442915c3502ae4c10f9e9c11459d855bc96c4a0c484c57ae10f7e709d9e3b9d2639128cbdec2205fc522ddf724d61f7 SHA512 896ef21b47189c5dc605fd2a87728f62387766d081f07bfef380295a2b1d4a73b039ddc88c064377953c0fe7f580ec19acfc1b8bb5fbe145f1557081d492c799
 EBUILD awscli-1.22.46.ebuild 1646 BLAKE2B 08f020b021c432e5082460aa2ad3cc88986dbae494994c83a78ca3a8fa131ed1067f4d03762c52fc4f40a0dcd63c84b65e9b744b33a271ff6a7254938b71069c SHA512 e2fd156b4a7230bf87c25af17674b7309672d433b57ae7161c8fdff5366f9e30df23f3e381e48e9650107abadb639b2782635f84ca18a52c32e85f464c5976d1
 EBUILD awscli-1.22.49.ebuild 1646 BLAKE2B 08f020b021c432e5082460aa2ad3cc88986dbae494994c83a78ca3a8fa131ed1067f4d03762c52fc4f40a0dcd63c84b65e9b744b33a271ff6a7254938b71069c SHA512 e2fd156b4a7230bf87c25af17674b7309672d433b57ae7161c8fdff5366f9e30df23f3e381e48e9650107abadb639b2782635f84ca18a52c32e85f464c5976d1
 EBUILD awscli-1.22.54.ebuild 1646 BLAKE2B 08f020b021c432e5082460aa2ad3cc88986dbae494994c83a78ca3a8fa131ed1067f4d03762c52fc4f40a0dcd63c84b65e9b744b33a271ff6a7254938b71069c SHA512 e2fd156b4a7230bf87c25af17674b7309672d433b57ae7161c8fdff5366f9e30df23f3e381e48e9650107abadb639b2782635f84ca18a52c32e85f464c5976d1
 EBUILD awscli-1.22.55.ebuild 1646 BLAKE2B 08f020b021c432e5082460aa2ad3cc88986dbae494994c83a78ca3a8fa131ed1067f4d03762c52fc4f40a0dcd63c84b65e9b744b33a271ff6a7254938b71069c SHA512 e2fd156b4a7230bf87c25af17674b7309672d433b57ae7161c8fdff5366f9e30df23f3e381e48e9650107abadb639b2782635f84ca18a52c32e85f464c5976d1
+EBUILD awscli-1.22.56.ebuild 1702 BLAKE2B 57475e38d69402acbfa5c2a72c2e6fb03accda8177cc9729ef12cc15b0e69d567ff5d72d4a0ee70c5a8ecdb91467a9c8b69107d76a0b53e7cdae2f2381f1040a SHA512 da8fb0125aeb816df91880eadf2196fdcc8f23daebd9a9afd2c9c282e56236106397588d5e873ed7431bdbf79b6a06f803603043acf54af5857f7b2729847004
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160

app-admin/awscli/awscli-1.22.56.ebuild

@@ -0,0 +1,59 @@
+# 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
+
+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}]
+"
+
+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}
+}
+
+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/eselect/Manifest

@@ -1,8 +1,6 @@
-DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
 DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
 DIST eselect-1.4.20.tar.xz 180272 BLAKE2B 424653d00eda45335c3aaae50f6fbf2e89486da4529f657596516352f3b7fcb9859ceb2dc5b9762a34c44fb64e645fa27c46b86453bf50be6e8ae820664a4289 SHA512 9589ed89c4d5d31f71d535886eb50da67b84dec8a13a5df081e7569efee861dede4eaa43a0bfb9930c5b95d4f334e19245cb8820a73f7361527da262da1d1fb2
-EBUILD eselect-1.4.16.ebuild 1549 BLAKE2B ffd77bec2d576b75a788537ebfc5741ba0da79a7244a4b45382189f13b6c2509852e6a624c255b8cc55acaad23192d54706e987ee25fbec7d74fb576cd24d9f1 SHA512 bba3c48b699820ab4334e91d13da83122d2d8ac792b532c4e0dc3c81a8a83b18e212b1f3f9fc38a169ecf68e34808def0dedf1b64dfb33f9d480b0cc552d4eab
 EBUILD eselect-1.4.17.ebuild 1535 BLAKE2B 279bff17e818888cf1111fd94d4d79deb6a39d2cbc5a9f5456c5ed0df964b95985191431a0949db376345b3f5528860fb0c3328ca48d0db173f19a8ba6b09f5b SHA512 050011d552f1a2b50d78e0568f047f13f27e46408d87cb51d1447117a5f1cedb57ff3672d21903b558c690be2fcfdf5104a8c63e61bc55bed24e86da3f2fc9e3
-EBUILD eselect-1.4.20.ebuild 1537 BLAKE2B e747314e4564a89dfc40e7008bcdfabbb8a87b31cf43aa9981a74926e0a349e11bfe378e8c3300547baecdb1bebe9b7023c107ee63138c23b791807249dd3a0c SHA512 a29ee378dd48b221e18814f49a285ebb1302266474591d902f04e4f97614a21d7ee53c5ace143aac6e6a0978081b3ded68aaff88d9c946ea3b2fb2a0001949ca
+EBUILD eselect-1.4.20.ebuild 1536 BLAKE2B 955daec78f287c9b5fd9eb069f000d41afefef9b198da9b565583c105c279a5cf092b53aeb23bece09faf656a53f2cc023358860eb851d09dba4ef8166792e5f SHA512 3465bb3fdea00cf76f11d2eba9ba7a9668a90f318d5816f82871f75bd5f957557d9dde62b37f698d030fc39592dd44bb2431664e41becaf48cdabecb1b8aa547
 EBUILD eselect-9999.ebuild 1394 BLAKE2B fb62991371b697680959344974f4d7d4cdedba39337b12d004588d118632be5cd26c2026024fd6a2cc1e448f196c3367b82ba3fe347617149602c4730f8083d1 SHA512 78c75a30e9a8bfb370620b25cd200be9c6a8724858548cd1ab76926194f9d96a25c7441463d1dcb7a2aa3a6c947b1a656d6a0b455eb95e9ad9a1535f8cb349ce
 MISC metadata.xml 273 BLAKE2B 9264ca72e36905ad1d6a5ebee0b72f8f11019ac4f957bbc58189fee60aea1aa1a8a2ad33bfafa67f1451bf37318cb5771f32465958bcd9152895ee5adca714aa SHA512 63e78fe95dfc95415c72fdff09a46ff58c4944b4d945e89b8c70834ec46a6e3e57ccbfa2766f1dff2c4abcf299e34652115ae062b63a695dabecf29481f49ab6

app-admin/eselect/eselect-1.4.16.ebuild

@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
-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"
-IUSE="doc emacs vim-syntax"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses:0"
-
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	if use doc; then
-		docinto html
-		dodoc *.html doc/*.html doc/*.css
-	fi
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}

app-admin/eselect/eselect-1.4.20.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 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"
+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"
 IUSE="doc emacs vim-syntax"
 
 DEPEND="sys-apps/sed

app-admin/vault/files/vault-1.8.2-go-limiter.patch

@@ -1,264 +0,0 @@
-This is a combination of upstream commits:
-b368a675955707db4e940da29a1043871a3781b6
-21ea03e0f874991086d2f1bcdc285216878bd566
-
-Fixes https://bugs.gentoo.org/808791
-Fixes https://bugs.gentoo.org/810317
-
-diff --git a/go.mod b/go.mod
-index 548c0590f..22a8833e2 100644
---- a/go.mod
-+++ b/go.mod
-@@ -150,7 +150,7 @@ require (
- 	github.com/ryanuber/go-glob v1.0.0
- 	github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da
- 	github.com/sasha-s/go-deadlock v0.2.0
--	github.com/sethvargo/go-limiter v0.3.0
-+	github.com/sethvargo/go-limiter v0.7.1
- 	github.com/shirou/gopsutil v3.21.5+incompatible
- 	github.com/stretchr/testify v1.7.0
- 	github.com/tidwall/pretty v1.0.1 // indirect
-diff --git a/go.sum b/go.sum
-index c5b3b410d..98a5dd0a8 100644
---- a/go.sum
-+++ b/go.sum
-@@ -1120,8 +1120,8 @@ github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod h1:7zjs06q
- github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod h1:BeybITEsBEg6qbIiqJ6/Bqeq25bCLbL7YFmpaFfJDuM=
- github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
- github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
--github.com/sethvargo/go-limiter v0.3.0 h1:yRMc+Qs2yqw6YJp6UxrO2iUs6DOSq4zcnljbB7/rMns=
--github.com/sethvargo/go-limiter v0.3.0/go.mod h1:C0kbSFbiriE5k2FFOe18M1YZbAR2Fiwf72uGu0CXCcU=
-+github.com/sethvargo/go-limiter v0.7.1 h1:wWNhTj0pxjyJ7wuJHpRJpYwJn+bUnjYfw2a85eu5w9U=
-+github.com/sethvargo/go-limiter v0.7.1/go.mod h1:C0kbSFbiriE5k2FFOe18M1YZbAR2Fiwf72uGu0CXCcU=
- github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc=
- github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
- github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=
-diff --git a/http/util.go b/http/util.go
-index 0550a93c7..cbb364843 100644
---- a/http/util.go
-+++ b/http/util.go
-@@ -48,7 +48,7 @@ func rateLimitQuotaWrapping(handler http.Handler, core *vault.Core) http.Handler
- 			return
- 		}
- 
--		quotaResp, err := core.ApplyRateLimitQuota(&quotas.Request{
-+		quotaResp, err := core.ApplyRateLimitQuota(r.Context(), &quotas.Request{
- 			Type:          quotas.TypeRateLimit,
- 			Path:          path,
- 			MountPath:     strings.TrimPrefix(core.MatchingMount(r.Context(), path), ns.Path),
-diff --git a/vault/core.go b/vault/core.go
-index 3b6e461fd..27741e8c6 100644
---- a/vault/core.go
-+++ b/vault/core.go
-@@ -2744,7 +2744,7 @@ func (c *Core) setupQuotas(ctx context.Context, isPerfStandby bool) error {
- 
- // ApplyRateLimitQuota checks the request against all the applicable quota rules.
- // If the given request's path is exempt, no rate limiting will be applied.
--func (c *Core) ApplyRateLimitQuota(req *quotas.Request) (quotas.Response, error) {
-+func (c *Core) ApplyRateLimitQuota(ctx context.Context, req *quotas.Request) (quotas.Response, error) {
- 	req.Type = quotas.TypeRateLimit
- 
- 	resp := quotas.Response{
-@@ -2758,7 +2758,7 @@ func (c *Core) ApplyRateLimitQuota(req *quotas.Request) (quotas.Response, error)
- 			return resp, nil
- 		}
- 
--		return c.quotaManager.ApplyQuota(req)
-+		return c.quotaManager.ApplyQuota(ctx, req)
- 	}
- 
- 	return resp, nil
-diff --git a/vault/quotas/quotas.go b/vault/quotas/quotas.go
-index 68cc72f9f..80ee59521 100644
---- a/vault/quotas/quotas.go
-+++ b/vault/quotas/quotas.go
-@@ -168,7 +168,7 @@ type Manager struct {
- // Quota represents the common properties of every quota type
- type Quota interface {
- 	// allow checks the if the request is allowed by the quota type implementation.
--	allow(*Request) (Response, error)
-+	allow(context.Context, *Request) (Response, error)
- 
- 	// quotaID is the identifier of the quota rule
- 	quotaID() string
-@@ -181,7 +181,7 @@ type Quota interface {
- 
- 	// close defines any cleanup behavior that needs to be executed when a quota
- 	// rule is deleted.
--	close() error
-+	close(context.Context) error
- 
- 	// handleRemount takes in the new mount path in the quota
- 	handleRemount(string)
-@@ -287,7 +287,7 @@ func (m *Manager) setQuotaLocked(ctx context.Context, qType string, quota Quota,
- 	// If there already exists an entry in the db, remove that first.
- 	if raw != nil {
- 		quota := raw.(Quota)
--		if err := quota.close(); err != nil {
-+		if err := quota.close(ctx); err != nil {
- 			return err
- 		}
- 		err = txn.Delete(qType, raw)
-@@ -518,7 +518,7 @@ func (m *Manager) DeleteQuota(ctx context.Context, qType string, name string) er
- 	}
- 
- 	quota := raw.(Quota)
--	if err := quota.close(); err != nil {
-+	if err := quota.close(ctx); err != nil {
- 		return err
- 	}
- 
-@@ -541,7 +541,7 @@ func (m *Manager) DeleteQuota(ctx context.Context, qType string, name string) er
- // ApplyQuota runs the request against any quota rule that is applicable to it. If
- // there are multiple quota rule that matches the request parameters, rule that
- // takes precedence will be used to allow/reject the request.
--func (m *Manager) ApplyQuota(req *Request) (Response, error) {
-+func (m *Manager) ApplyQuota(ctx context.Context, req *Request) (Response, error) {
- 	var resp Response
- 
- 	quota, err := m.QueryQuota(req)
-@@ -562,7 +562,7 @@ func (m *Manager) ApplyQuota(req *Request) (Response, error) {
- 		return resp, nil
- 	}
- 
--	return quota.allow(req)
-+	return quota.allow(ctx, req)
- }
- 
- // SetEnableRateLimitAuditLogging updates the operator preference regarding the
-diff --git a/vault/quotas/quotas_rate_limit.go b/vault/quotas/quotas_rate_limit.go
-index 64117b002..ad58b2af3 100644
---- a/vault/quotas/quotas_rate_limit.go
-+++ b/vault/quotas/quotas_rate_limit.go
-@@ -1,6 +1,7 @@
- package quotas
- 
- import (
-+	"context"
- 	"encoding/hex"
- 	"fmt"
- 	"math"
-@@ -264,7 +265,7 @@ func (rlq *RateLimitQuota) QuotaName() string {
- // returned if the request ID or address is empty. If the path is exempt, the
- // quota will not be evaluated. Otherwise, the client rate limiter is retrieved
- // by address and the rate limit quota is checked against that limiter.
--func (rlq *RateLimitQuota) allow(req *Request) (Response, error) {
-+func (rlq *RateLimitQuota) allow(ctx context.Context, req *Request) (Response, error) {
- 	resp := Response{
- 		Headers: make(map[string]string),
- 	}
-@@ -300,7 +301,11 @@ func (rlq *RateLimitQuota) allow(req *Request) (Response, error) {
- 		}
- 	}
- 
--	limit, remaining, reset, allow := rlq.store.Take(req.ClientAddress)
-+	limit, remaining, reset, allow, err := rlq.store.Take(ctx, req.ClientAddress)
-+	if err != nil {
-+		return resp, err
-+	}
-+
- 	resp.Allowed = allow
- 	resp.Headers[httplimit.HeaderRateLimitLimit] = strconv.FormatUint(limit, 10)
- 	resp.Headers[httplimit.HeaderRateLimitRemaining] = strconv.FormatUint(remaining, 10)
-@@ -320,13 +325,13 @@ func (rlq *RateLimitQuota) allow(req *Request) (Response, error) {
- 
- // close stops the current running client purge loop.
- // It should be called with the write lock held.
--func (rlq *RateLimitQuota) close() error {
-+func (rlq *RateLimitQuota) close(ctx context.Context) error {
- 	if rlq.purgeBlocked {
- 		close(rlq.closePurgeBlockedCh)
- 	}
- 
- 	if rlq.store != nil {
--		return rlq.store.Close()
-+		return rlq.store.Close(ctx)
- 	}
- 
- 	return nil
-diff --git a/vault/quotas/quotas_rate_limit_test.go b/vault/quotas/quotas_rate_limit_test.go
-index 27225e338..21f35dac3 100644
---- a/vault/quotas/quotas_rate_limit_test.go
-+++ b/vault/quotas/quotas_rate_limit_test.go
-@@ -37,7 +37,7 @@ func TestNewRateLimitQuota(t *testing.T) {
- 			err := tc.rlq.initialize(logging.NewVaultLogger(log.Trace), metricsutil.BlackholeSink())
- 			require.Equal(t, tc.expectErr, err != nil, err)
- 			if err == nil {
--				require.Nil(t, tc.rlq.close())
-+				require.Nil(t, tc.rlq.close(context.Background()))
- 			}
- 		})
- 	}
-@@ -46,7 +46,7 @@ func TestNewRateLimitQuota(t *testing.T) {
- func TestRateLimitQuota_Close(t *testing.T) {
- 	rlq := NewRateLimitQuota("test-rate-limiter", "qa", "/foo/bar", 16.7, time.Second, time.Minute)
- 	require.NoError(t, rlq.initialize(logging.NewVaultLogger(log.Trace), metricsutil.BlackholeSink()))
--	require.NoError(t, rlq.close())
-+	require.NoError(t, rlq.close(context.Background()))
- 
- 	time.Sleep(time.Second) // allow enough time for purgeClientsLoop to receive on closeCh
- 	require.False(t, rlq.getPurgeBlocked(), "expected blocked client purging to be disabled after explicit close")
-@@ -66,14 +66,14 @@ func TestRateLimitQuota_Allow(t *testing.T) {
- 	}
- 
- 	require.NoError(t, rlq.initialize(logging.NewVaultLogger(log.Trace), metricsutil.BlackholeSink()))
--	defer rlq.close()
-+	defer rlq.close(context.Background())
- 
- 	var wg sync.WaitGroup
- 
- 	reqFunc := func(addr string, atomicNumAllow, atomicNumFail *atomic.Int32) {
- 		defer wg.Done()
- 
--		resp, err := rlq.allow(&Request{ClientAddress: addr})
-+		resp, err := rlq.allow(context.Background(), &Request{ClientAddress: addr})
- 		if err != nil {
- 			return
- 		}
-@@ -141,7 +141,7 @@ func TestRateLimitQuota_Allow_WithBlock(t *testing.T) {
- 	}
- 
- 	require.NoError(t, rlq.initialize(logging.NewVaultLogger(log.Trace), metricsutil.BlackholeSink()))
--	defer rlq.close()
-+	defer rlq.close(context.Background())
- 	require.True(t, rlq.getPurgeBlocked())
- 
- 	var wg sync.WaitGroup
-@@ -149,7 +149,7 @@ func TestRateLimitQuota_Allow_WithBlock(t *testing.T) {
- 	reqFunc := func(addr string, atomicNumAllow, atomicNumFail *atomic.Int32) {
- 		defer wg.Done()
- 
--		resp, err := rlq.allow(&Request{ClientAddress: addr})
-+		resp, err := rlq.allow(context.Background(), &Request{ClientAddress: addr})
- 		if err != nil {
- 			return
- 		}
-@@ -221,5 +221,5 @@ func TestRateLimitQuota_Update(t *testing.T) {
- 	require.NoError(t, qm.SetQuota(context.Background(), TypeRateLimit.String(), quota, true))
- 	require.NoError(t, qm.SetQuota(context.Background(), TypeRateLimit.String(), quota, true))
- 
--	require.Nil(t, quota.close())
-+	require.Nil(t, quota.close(context.Background()))
- }
-diff --git a/vault/quotas/quotas_util.go b/vault/quotas/quotas_util.go
-index dc2fcdfac..7c0732f67 100644
---- a/vault/quotas/quotas_util.go
-+++ b/vault/quotas/quotas_util.go
-@@ -40,7 +40,7 @@ func (*entManager) Reset() error {
- 
- type LeaseCountQuota struct{}
- 
--func (l LeaseCountQuota) allow(request *Request) (Response, error) {
-+func (l LeaseCountQuota) allow(_ context.Context, _ *Request) (Response, error) {
- 	panic("implement me")
- }
- 
-@@ -56,7 +56,7 @@ func (l LeaseCountQuota) initialize(logger log.Logger, sink *metricsutil.Cluster
- 	panic("implement me")
- }
- 
--func (l LeaseCountQuota) close() error {
-+func (l LeaseCountQuota) close(_ context.Context) error {
- 	panic("implement me")
- }
- 

app-admin/vault/vault-1.9.1.ebuild

@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-BDEPEND="
-	app-arch/zip
-	dev-go/gox
-	>=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-S=${WORKDIR}/${P}-vendor
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-e "s/gofumpt/gofmt/g" \
-		-i Makefile || die
-	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
-		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
-			die "mv failed"
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake bin
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}

app-admin/vault/vault-1.9.2.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
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+webui"
 
 BDEPEND="

app-backup/borgmatic/Manifest

@@ -2,6 +2,8 @@ AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
 DIST borgmatic-1.5.21.tar.gz 278933 BLAKE2B b098334fa476304a8e63ceed37b3c2b9c67d0549bea6d06d8f0fd0f41f9812e79cea52f88fc15d2be29e491355f9544b6ccbe7c31936dfbd78eefd42e9ff2832 SHA512 e183269a0ac3ae049031832414d597ced8f75dd1f82d16379faec6d53566a1c19f51d613745e61077621381ee819d2f5dfc5cabaf9928a629f5cf3e13398503c
 DIST borgmatic-1.5.22.tar.gz 286392 BLAKE2B 99105661935b58a6e772d694214590ad13c3ff284eeccdb075b36f6a4c55abeaf02c46a49d01ab3ca165b47320280ef0bb2b2c978f039e7a695b50a6cafb8d1d SHA512 a9006685ca707ceca199cfae9d52414b0edd295afcff7478bfac16fc05c12d31ee6578b58970ead8f702a7b9928d33db8a32617bfb8f6e9e8d5fa06bddd6a02c
+DIST borgmatic-1.5.23.tar.gz 290506 BLAKE2B 9924d9df1cae7e4f97ff70eb16f84a2ee8a0fe0cd3a08add7a7ec59d269fb693f74350cdb45633fc4d76816614216a69a205504cac9c7608a635fc364253add6 SHA512 1b811fec2e814854459d10e4c90e552d90e0450d908931dbca5a838dc091c40dc6075c6fa09653a5aac69073e5b7600aed4beda4bc765daf0c6d8d2a00983ad7
 EBUILD borgmatic-1.5.21.ebuild 1865 BLAKE2B 641b95b1f94585bba6822f4cfad1ec487d5030ae795aff13d776ded939dc98ae1b7cfb4a8ecd59c81a8ed675c4af73cdbccee6a3b8fabc89099a7132144b4833 SHA512 48c64a3fbab381ded06c5b56e971d0895eaee5ede8b77d6bd25c2176e1f45673651531bf9fb901e7003ee51f1c554012f876a0562c9be5110668ccc1eaad90b2
 EBUILD borgmatic-1.5.22.ebuild 1866 BLAKE2B 748de8d2b7c0df946da8468425c93c9ba1a3382d299ff0cf2dbf5ff6f37be71a0d37136facdf431463c7aeeaf0494d7a7badaeaea16dd1f41edd2c2525938874 SHA512 396f4b93494e217cd794563dfec4c967985e05fb39375ba10b9c30704447619d89de895aff1aa03638e61a204a6a266c4d3c626a9fa055185267b8f26a6c8ce1
+EBUILD borgmatic-1.5.23.ebuild 1905 BLAKE2B 394591623f5c59b1b839dbcc06590585d5217505f3b9db9a4035b6b3a92a3ea2b2d8571e826fcad6a80369aac73b2ba0af26520f0c2e3fd05971e2e96b55191b SHA512 7bd673ad1b1f7ae9ea9f9a90c2f89305176c39a660bb2651840951c059b6e99d5682270cdfe5df4c401dd2b7c6c657b3d4a59dfcd8671616c6245f1a1417e595
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f

app-backup/borgmatic/borgmatic-1.5.23.ebuild

@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+	$(python_gen_cond_dep '
+		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
+)
+
+# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
+# executable so making it work would require passing --install
+# to distutils_enable_tests. Given that this is the only test requiring
+# this and that all it does is make sure the NEWS file has been updated
+# for the current version, just skip it.
+EPYTEST_DESELECT=(
+	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit sample/systemd/borgmatic.{service,timer}
+	keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To generate a sample configuration file, run:"
+		elog "    generate-borgmatic-config"
+	fi
+	elog
+	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}

app-backup/burp/Manifest

@@ -8,5 +8,5 @@ DIST burp-2.3.36.tar.gz 619564 BLAKE2B 8f30fb8808c8a3167467ef0bcdc84cd7c2e885ee6
 DIST burp-2.4.0.tar.gz 624032 BLAKE2B 4a1ff48236dc631dd6d545480a33af3cdf8020c3088f1ca09ab66ac5cec8128d262b9b991bf9e3229c80f75a4746d338073a0a43fdb67a2fe21a0fd4f243469d SHA512 ea81a12e54c6d88b702dd09dc4fa5a724d1e322bdfba2643c9312a9077c9edc63f6ca0f6cb3a6ebecb6ad9feb1cc26c114277b2308d9903f4abb0442a9be7c19
 EBUILD burp-2.2.18-r2.ebuild 2802 BLAKE2B 5836cb858ddefee698aa1781b30c0e2102cdff4acb1d8f1d53cec0afb4183085c4435ce0b0a4fe74cbeb348d9c8430580207b479da6a7bd3bb67ef4a91ac5499 SHA512 b7015a72e38382af5308eb5b3e666b52c5c34a9965178dc728e7163a1e77bdbcc7a00dd0801c14b2a48087b72fff3f770149801b8ae8ae9fadbe8eb3ce17ca71
 EBUILD burp-2.3.36-r1.ebuild 3173 BLAKE2B 769e558604b2d4de172b2d640222577e813a17ce5a805fd5fa16ea455527e66ec14655dae72b64f24ca1e4abfbb1f2ba39d26ee6353571c318fb4bb7055f2773 SHA512 42aa51c9e035e88f2eec4d9cfe9fef4ae70c4afb17f3502a42c0160dc7143e677dbc1eb537b310154a9a20b3dc5daa93a086d30c4186651ad110f7929933cb9a
-EBUILD burp-2.4.0.ebuild 2926 BLAKE2B eb2406bd0b45cdc0d4d9fc4a697f1aed432e45a66ba44712d917e0690105e9695deeb9b1d543724b7397372e06cb7f36cfe480c937e0afa56659fa07f5a6c6aa SHA512 66963b2dfb784dc664097d7f5581860fa1da1ddbe8c2a26162b8123926ae3e977e4ff794feb939885ef7aef18073deff0e69b226988dce9e3dd7e3a5e6093705
+EBUILD burp-2.4.0.ebuild 2969 BLAKE2B 4271114fa6845a377d910bc0a34bd4bb9e27aec4048822928b32b00ede5c64cc20f59216f530ed72d8231be46906ffe3bd66dbbfffbaccd9703393704be309f0 SHA512 96b0dfdcf82f220fd57771abf9b5f6b4787b5a506c698c2cf9a9c9afb36945d0acc1e0c1269d084d93df23139331b2f31392400eadfcd042f95ff2a44342ed83
 MISC metadata.xml 824 BLAKE2B 144475d686773901cee9f3926e843a2d9b3cab8a9db0c2b6d590b389dde0dda059bb06abb74e015d19a1f1ed60c4a2c7a11c06bf35e93bf1be8cb2a702447558 SHA512 1cc41b5f4c4d31355824a595f778702b79bec6a45b398e503834d55408bdbbf708bafc7c364f5fc038e31eef26baf4adcd8cd922ac18f6a41b5be446eb9ebf0c

app-backup/burp/burp-2.4.0.ebuild

@@ -28,6 +28,7 @@ COMMON_DEPEND="acct-group/burp
 	acl? ( sys-apps/acl )
 	xattr? ( sys-apps/attr )"
 DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
 	test? ( dev-libs/check )"
 BDEPEND=">=sys-devel/autoconf-2.71
 	virtual/pkgconfig"

app-backup/dar/Manifest

@@ -1,5 +1,5 @@
 DIST dar-2.7.2.tar.gz 2294187 BLAKE2B 6422f40aea9fe07195359d9e8d5a947fe20d1ec4d6bd866eb8e9240c153d069b5df75018c25b9e8ce6b7acbf4ce4259b50b0768cd391d8b9b1c7be72f03a56b6 SHA512 7e41adc0102806c07d644da41960b1e5bcb6b7872e6a5789506c1f2a001ffb4e3607cae6f76ccc2339d90cf4387b7645e9de6dbc4eed1306827a46e4b7c9d09d
 DIST dar-2.7.3.tar.gz 2398624 BLAKE2B 9d34d233968efcd390db6a1afa1bb93477b6dcbb4bb8c6beb315e927f7ae624bdf23b77f32233a63e3ddd437701fbbd1ee19e5c7ab4f0366ef7e646bacdab46c SHA512 a8a930cd39cae66199e402e61fc48609fe22b821c12407ab7922b8bc8f43f9b11b2f0732baf8198b41d193442a1f82d18536a0d6a7fd7282aaed3600342c7d48
-EBUILD dar-2.7.2.ebuild 2227 BLAKE2B 3b2c94f212a3b83753ff1187098d820f776745b7ed20f78fd0f1d5a20682faff9d193b0d5966e7c032626b60906f0ff94fe0b1b908dc936c7c15537b1587ea5e SHA512 b5621fa636ee83fdaf47b86ffb123157a43b73f983857b7d165077a19a22726b9ddebc1b8b123f19d126528b38f34b17b2de50e7303ac464d07f81923592d47a
-EBUILD dar-2.7.3.ebuild 2227 BLAKE2B 6bb7d94f33bda0f7dfc0aabfc1b9b81b268104067891ff42433e1d9c57503ded1c660173a344684160a86cb63ba5351c782b1678f839f94e59e1aa93c235f3eb SHA512 c317bd8937c55c34ab74eb9618bed093ad3cc5067dd07a431e3c9b3ece3199fabf83a835b08d19f1a99beb73268916582bc5fbf49d0fc7558c8dc9638c30b1fe
+EBUILD dar-2.7.2.ebuild 2226 BLAKE2B 305c99ac9f516c706032ec066f7e22d6c85690bc6e7c29cfe8eecd54fbb0a4ca2e2db17fd58edbd0d6de98c3f89af13500e48369a62036f6816880b6f116b3fb SHA512 c43754f566d0ff4772ba9bc8062ac2c121c2d9f9bf7bd85bf1153301b5c06b8e75200e1cbb75708abc19c283c07b40917de85658a42c46bbcedff96155b27092
+EBUILD dar-2.7.3.ebuild 2226 BLAKE2B 305c99ac9f516c706032ec066f7e22d6c85690bc6e7c29cfe8eecd54fbb0a4ca2e2db17fd58edbd0d6de98c3f89af13500e48369a62036f6816880b6f116b3fb SHA512 c43754f566d0ff4772ba9bc8062ac2c121c2d9f9bf7bd85bf1153301b5c06b8e75200e1cbb75708abc19c283c07b40917de85658a42c46bbcedff96155b27092
 MISC metadata.xml 1284 BLAKE2B b70f06ea13076c3de9470fa1b65d9a17de048db8f52ade94246c62241828be74f308dcc39067b27ed99ff963c3554e371611aba0bb04ed6d57d14d4f7fd7f9dc SHA512 5cbbbff7e0652a85f717f2eb6a574d6fe52d478e049fa81e1c25b1bbe034086d433558952be1bc56ea4492c9c43f6da1e0968cc9132d18e7342890434c0a19d6

app-backup/dar/dar-2.7.2.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
@@ -31,7 +31,7 @@ RDEPEND="
 		dev-libs/libgcrypt:0=
 		dev-libs/libgpg-error
 	)
-	gpg? ( app-crypt/gpgme:1= )
+	gpg? ( app-crypt/gpgme:= )
 	lz4? ( app-arch/lz4:= )
 	lzo? ( dev-libs/lzo:2 )
 	nls? ( virtual/libintl )

app-backup/dar/dar-2.7.3.ebuild

@@ -31,7 +31,7 @@ RDEPEND="
 		dev-libs/libgcrypt:0=
 		dev-libs/libgpg-error
 	)
-	gpg? ( app-crypt/gpgme:1= )
+	gpg? ( app-crypt/gpgme:= )
 	lz4? ( app-arch/lz4:= )
 	lzo? ( dev-libs/lzo:2 )
 	nls? ( virtual/libintl )

app-cdr/isoimagewriter/Manifest

@@ -1,3 +1,3 @@
 DIST isoimagewriter-0.8.tar.xz 430368 BLAKE2B d540ca0ee874b633618480ff5cc30ceea5f0aef84e3e4b0236fc6474ce590661ca8728a3719cc733cc791d14cfdcaad609ffa32d79b99df141381aa3f35edec8 SHA512 1d5031695647be54e5de10f6243b68bf8d2dc29a7894c8ac69954df353d5baa740290b572c89cd37650718749117f5e3b25dd99b8b374d8ba0376288878f9199
-EBUILD isoimagewriter-0.8.ebuild 668 BLAKE2B e8764f7dc2751b3250f147493d826cf68a4718e726a23c689558fba78765399dd69b5a0e180b225fb205e7c9b6177395e8683eed5bd08a0211b826c83e30de83 SHA512 d313ab98ebc8ad9797b601fd14e7fca971af38e251a09e0585ccf92042294aedadb80f9c734c3ce87252147a132f865822909a7001990d2be4f7fe2de11aebc7
+EBUILD isoimagewriter-0.8-r1.ebuild 673 BLAKE2B 75f9407b7663d19f1141fc1cfe9bdb09dee09ba929557feda4e8c4004d78ba5725dd3ad9eeff430553e1d0758430bb4756eb3065bbbc09b7285e6662252e57d1 SHA512 91f707eabc5ea818de44d658fe2b469503c177703ee7c565f1f2a37ea78a999d19f8fa91d4ea9fcd1dbc322915273187dd6cc6534782f58eaf30f3a9c4a30004
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6

app-cdr/isoimagewriter/isoimagewriter-0.8-r1.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.60.0
 QTMIN=5.12.3
@@ -20,7 +20,7 @@ SLOT="5"
 IUSE=""
 
 DEPEND="
-	app-crypt/gpgme[cxx,qt5]
+	app-crypt/gpgme:=[cxx(+),qt5]
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kauth-${KFMIN}:5

app-containers/crun/Manifest

@@ -1,8 +1,7 @@
-AUX libcrun-linkage.patch 1155 BLAKE2B b815ada4c90e61ac36e878ba0072f2dc3944e8f82d827e47cc8907fce0931e2134af690261cf75e193fbcb47b4822955d26f3e9950b674c5fafde85f25700032 SHA512 2a1936f3ac3a45cc2fcef61d097c86c78e94ee71ff15dc68d6037bf6be174a6bff725c04ccefff805c9059db3e4db1285c785658b7f6cf4b610739f11e82cfed
-DIST crun-0.19.1.tar.gz 1870594 BLAKE2B 1780a2936ff39ec80836c4c9ae072e2fc30703a31a79786337290c62dd433b5a35dcfa953be370703d1baab3de93fdb376c99ab76dff1470883c61726c313144 SHA512 f93f79d1d63d6749bcf92d48542d9555f3ad47657c959c7c06701861d7a5a4171969f00f6dff3878286970a48aba3314c25e35c005463e606533b0ff7843d994
 DIST crun-1.2.tar.gz 1879836 BLAKE2B 45370e3206a13c963d694f338dc0a00de24253025d31ec893353905235b239b8e7f626ddd4ee0cc32da2b3f5676b42f59f3214a1eb9c3af4612483cd6fd14693 SHA512 5cadaf0eb0e9bcf53726e7f6ffb664c8327f0f4e7cdbf75ae8a0cd4759f7c8a8a2611df65ca1436a50d7af5d37505aac861d7db4d46a93c3832362228cb37cbc
 DIST crun-1.3.tar.gz 1889283 BLAKE2B d7e7f676ca5db8322b9da2110c9a9e8eb11b13b5e9f1432ccc6ef12bf6ae7db3a28e3227fac86091589a215394ec577e91ccbffec532dabf44be746cb8a5d404 SHA512 9600bdacf5fd2defa542230b6e134920eb80e9d4c49598167b9d58887719765c174f1ac8559c0092dc1b5435274124e0b29c3d0830df86d1cfd690d67c746016
-EBUILD crun-0.19.1-r1.ebuild 1511 BLAKE2B 56dc3607cfccf765c0be5357df9d51f43ad397359f82ce600eeefd39ee03cae12f96a44bcaf22c5f41a538991e577e2f1ff8cc44adf5e711ae869f5cd47e8fc5 SHA512 314589e661a047094b5eac396ec5c982d6b9f2bc25d63fb43e53a6420a4ccc2568fffc476d1a8777dca6bbf2511de16e37e52c28d29b67e9171381db74710857
+DIST crun-1.4.2.tar.gz 1956517 BLAKE2B c5db3396902c33568c3f9a490c57f8781703018f228f07bb17b1ccaa5c2ab903eda76e50d46fa3be10e440e6a0c3f791744f05d7677c71e2510673077d0acbef SHA512 cc7b57ed945cb36a36cf2ceab57349f836a07164ef31e0cec8bbddc4451a5757e2a0b92bc553b8994a236d7869cfdf229a5dd5e5a0d7f139f8c2a8df5c151d3a
 EBUILD crun-1.2.ebuild 1371 BLAKE2B 4bd901a57f19df424118c9243327b5e19c7d1d9b88d32501a60f35cf2e641320b9759ebd77e4bd701f3c211f4931a7cdd01cbb3241aeb680cfe180189eb7269f SHA512 b6eb3ed73f098cd1d7bcbe370af90e76c610763caaddf27b70bac1dbf4dd9b02c3f0529685ba992ee3011b5d5c5288cc1fe69706b80808c38df781be8ae43771
 EBUILD crun-1.3.ebuild 1377 BLAKE2B 5475c023a96897a4bb929240ddaee95ea62d3cbd5f31c54a3879a96e2512b8255e86b340ef837323fe3176391b76d78f34e4adb50e80ef3b85f19108965416d3 SHA512 c7478145a0ecd544d640ee2008fcae23f1c4a27099040c00f415af26815c6f070dc1c764b674fe93e89a0e7dd3716a8ecd74e1b0cb3e7787fff43bd146317ca4
+EBUILD crun-1.4.2.ebuild 1377 BLAKE2B 5475c023a96897a4bb929240ddaee95ea62d3cbd5f31c54a3879a96e2512b8255e86b340ef837323fe3176391b76d78f34e4adb50e80ef3b85f19108965416d3 SHA512 c7478145a0ecd544d640ee2008fcae23f1c4a27099040c00f415af26815c6f070dc1c764b674fe93e89a0e7dd3716a8ecd74e1b0cb3e7787fff43bd146317ca4
 MISC metadata.xml 1300 BLAKE2B a0ae27420fca097e4e7b5e983de3b76fef43bf13887bd5fe903da14e20c2f0ebd2fc273dae74e32e28c2768b5f8d6e5e6c8b4c9f07ca6d47e41902621173a167 SHA512 1699a89a01de32b580bc74bc747430ef7b1a6284b2f459b4041b22de0efbebda45778803deb512a61806ed8e2998b141caefb7830acafc68d42ce4343b193dd6

app-containers/crun/crun-1.4.2.ebuild

@@ -1,11 +1,11 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools python-any-r1
+inherit python-any-r1
 
 DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
 HOMEPAGE="https://github.com/containers/crun"
@@ -13,12 +13,12 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 IUSE="+bpf +caps criu +seccomp systemd static-libs"
 
 DEPEND="
+	dev-libs/yajl:=
 	sys-kernel/linux-headers
-	>=dev-libs/yajl-2.0.0
 	caps? ( sys-libs/libcap )
 	criu? ( >=sys-process/criu-3.15 )
 	seccomp? ( sys-libs/libseccomp )
@@ -27,6 +27,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
+	virtual/pkgconfig
 "
 
 # the crun test suite is comprehensive to the extent that tests will fail
@@ -34,17 +35,6 @@ BDEPEND="
 # required to create linux "containers".
 RESTRICT="test"
 
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/libcrun-linkage.patch" )
-
-src_prepare() {
-	default
-
-	# for libcrun-linkage.patch
-	eautoreconf
-}
-
 src_configure() {
 	local myeconfargs=(
 		$(use_enable bpf)

app-containers/crun/files/libcrun-linkage.patch

@@ -1,29 +0,0 @@
-From 7cfdf094071fcff038bab573c1eeee599fa17b16 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Mon, 2 Aug 2021 03:53:25 -0700
-Subject: [PATCH] Makefile.am: link libcrun to $(FOUND_LIBS)
-
-otherwise libcrun consumers fail at runtime with
-symbol lookup errors
-
-Closes: https://github.com/containers/crun/issues/711
-Issue: https://github.com/containers/crun/issues/340
-Downstream-bug: https://bugs.gentoo.org/717750
-Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 150e933a..7e5a4406 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -46,7 +46,7 @@ libocispec/libocispec.la:
- 
- libcrun_la_SOURCES = $(libcrun_SOURCES)
- libcrun_la_CFLAGS = -I $(abs_top_builddir)/libocispec/src -I $(abs_top_srcdir)/libocispec/src -fvisibility=hidden
--libcrun_la_LIBADD = libocispec/libocispec.la $(maybe_libyajl.la)
-+libcrun_la_LIBADD = libocispec/libocispec.la $(FOUND_LIBS) $(maybe_libyajl.la)
- libcrun_la_LDFLAGS = -Wl,--version-script=$(abs_top_srcdir)/libcrun.lds
- 
- # build a version with all the symbols visible for testing

app-containers/lxd/Manifest

@@ -11,6 +11,6 @@ DIST lxd-4.0.8.tar.gz 8898153 BLAKE2B c02bea1019079f59fff5fbb2c3d3ebf13e01751fd1
 DIST lxd-4.0.8.tar.gz.asc 833 BLAKE2B 2073b113f34b2ab052e6e4f406016ac04631ec63269b79dd1e85ca5191aa73ed1f47f0e87f5155b6e5c6659138a182c4c403a66e20925cdb347f49e542e8139b SHA512 9b5f00f9d4a601e718ca91f623dd31e864963b7b8a9e9be6af8da2288b775c4fc8c60b0d6fcefa2a347d733d1e002a3714ac3dbfadf9a1188f9747e9682fe8b9
 DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2 SHA512 657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
-EBUILD lxd-4.0.8-r2.ebuild 5010 BLAKE2B f26824c565e1c57305d9b0487b27a27fec08de895400b1f5a0aa18b504dc331d8a563ad1168f455a48bab9cdc39511e9363e821fc6dfb3d8d5fed65c6dd5bc10 SHA512 25c1f9408781386b7af95f63406137cf38b41280290e2effe2933b52e61fe87daab96f82fa7ee80b125fdf3ee2456c80572f5aab00a6b55d28810d56e4a0a779
-EBUILD lxd-4.0.9.ebuild 4542 BLAKE2B 054da08a937700ebe84dfbc03885e2c67d337ec3dd1e5300ce68a5fd277cf62ac3010a891f2d94653a61462f59db7bd878909f81dd64ef6528af5652f694c015 SHA512 453aa3dd9a9a8a27e8893414929e07a99358270d478666671b6659059f404e8bf8436c9aced2b5720a0430e99cc6390df84c847df7c9f71ec9cc50894378045a
+EBUILD lxd-4.0.8-r3.ebuild 5019 BLAKE2B d320ef4a693b34132b69bf530f4397e585510fc934fef816c66bfb5de08f81404e16abe1fb3e57c64856bcba75a02cac4d4e4cb95700ee1d5360e7c1ddcd655e SHA512 77c77eb5fa83156cd27aeb462ad3f5c4514f1f0deaffddaa96b957cdf6f1027314094310c108b13f4ed1364c029aa78b69c055911e597a29dbdc41cf0e1c38f4
+EBUILD lxd-4.0.9-r1.ebuild 4551 BLAKE2B b0d43f9fbe9538f69135d0aa38c412e1aea03d75c56825be1522b5810035f9c7d1029a183e2ba797d0f311e6eef7b800102a0332592a06039b4f418fe62365b2 SHA512 1dd1e3424ae2a2690f5e3ca114cb909581cc3db9cc67f140be2256da3c79596c773015bb2d9e70eece05d2bafd8e805f02b2c58807e7b740f3cb27b38f253f7d
 MISC metadata.xml 777 BLAKE2B e25ff2ac780143763e40917f2570bbe8244c2a2a9eac1a9761199e7ea19df9863ade968ca8218f62da9fe41f3b9e7110ef86abff764c2a3d85f02ae102951a16 SHA512 e39a06e8b838990a9b0019f52e1d0c7dd83527c6a15bc8a14f0aa9fec2ee86c914de52f1ba48e7a586c3866d9da46dc32c2d6e1ea3e2c42ca985fdfe0783b40c

app-containers/lxd/lxd-4.0.8-r3.ebuild

@@ -23,13 +23,13 @@ DEPEND="acct-group/lxd
 	dev-libs/lzo
 	dev-libs/raft[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp,ipv6?]
+	net-dns/dnsmasq[dhcp,ipv6(+)?]
 	sys-libs/libcap
 	virtual/udev"
 RDEPEND="${DEPEND}
 	net-firewall/ebtables
-	net-firewall/iptables[ipv6?]
-	sys-apps/iproute2[ipv6?]
+	net-firewall/iptables[ipv6(+)?]
+	sys-apps/iproute2[ipv6(+)?]
 	sys-fs/fuse:*
 	sys-fs/lxcfs
 	sys-fs/squashfs-tools[lzma]

app-containers/lxd/lxd-4.0.9-r1.ebuild

@@ -23,13 +23,13 @@ DEPEND="acct-group/lxd
 	dev-libs/lzo
 	dev-libs/raft[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp,ipv6?]
+	net-dns/dnsmasq[dhcp,ipv6(+)?]
 	sys-libs/libcap
 	virtual/udev"
 RDEPEND="${DEPEND}
 	net-firewall/ebtables
-	net-firewall/iptables[ipv6?]
-	sys-apps/iproute2[ipv6?]
+	net-firewall/iptables[ipv6(+)?]
+	sys-apps/iproute2[ipv6(+)?]
 	sys-fs/fuse:*
 	sys-fs/lxcfs
 	sys-fs/squashfs-tools[lzma]

app-crypt/acme-tiny/Manifest

@@ -1,4 +1,6 @@
 DIST acme-tiny-4.1.0.tar.gz 12776 BLAKE2B 7efd9d1399ec3bbd98180511c9f36fbf6f9a96a0d4e0e72b9d4c85d16246118eaaad25bc26ba42f746fd4b60b498ceca5307e279d788157237ac6ad153848501 SHA512 31d69a5031c019acbc23b3f06041eae8e261766396d4a7420fd70a71cfa16de953bea4c0c2ad0c6a6e793ed61ab5331f40145352ffce69f4f062f35dd0db7519
+DIST acme-tiny-5.0.1.tar.gz 21036 BLAKE2B a09c16ca19570b48d34c919e2a361e3be5d66ed8fc0ccff7af74e4018d294f2940a552906dee45bac27a16e7b039a3567dc35e201b058015c5123baa2cbb01c1 SHA512 6e0619917b31a5795c2c7d8aa811b46231b81fc6b57227f611f7f4b9f73eb3de669676482563c33d935a4a0812498677bcbe974663a561af61abb441a880947e
 EBUILD acme-tiny-4.1.0.ebuild 1108 BLAKE2B fe306b726c732ca03b672bc2cb7668b1125868daf5758b69312ca27e4ea71a3374b9d3ac00cebfe4459c566b68ee5fd807bf3cac1a44f64dd70afb2789a7c783 SHA512 bda714125cad2d2442539691630caf3de45498e0ac6a6e95211ec0e2e3a4fefc4a3d7b2c221359a7ac0b86a7d0126e361604dfb3c8a677b2c026b3fac61016fc
-EBUILD acme-tiny-9999.ebuild 1110 BLAKE2B 15dd4d5adf387cb805ca3b35bc31cb4ea3bb36a7835ddaa090126e3fbe229e0db9cb6ea251bb0fd00b7ddce9413809d4fe080b97bded7350b81988f1433c2cf2 SHA512 71e613afa351a85093024e09ef945b118479f0c1b74516642f7d866f454eecd24a2dde87afd36de6894fb66b1f4f339514acbe3439e8cad819abd3d87da57043
+EBUILD acme-tiny-5.0.1.ebuild 1115 BLAKE2B ad6d68f9de100b37eadad44105a8d541373663f97f233a1620cebf2055e97f1be701220a772e8fb92a24e69355f8c7f7fb97213c374abecf7869b9ce6b00dcfa SHA512 23a05a75412e621c550cea4ace83c98b5e4b41c76b988cc3c93899ead5de63fdd7e4b57749d0ffd8fe1e692d7985c70284718c64b44283349c7858cdaabca74a
+EBUILD acme-tiny-9999.ebuild 1115 BLAKE2B ad6d68f9de100b37eadad44105a8d541373663f97f233a1620cebf2055e97f1be701220a772e8fb92a24e69355f8c7f7fb97213c374abecf7869b9ce6b00dcfa SHA512 23a05a75412e621c550cea4ace83c98b5e4b41c76b988cc3c93899ead5de63fdd7e4b57749d0ffd8fe1e692d7985c70284718c64b44283349c7858cdaabca74a
 MISC metadata.xml 332 BLAKE2B e5e439ca9e8a4809dc6d76d879d1d0708475d59c39c47724e2fd1375bb0026fc6d470c893abc02a5d0d2f06e0538ae024265cbd76c056d87375db02867512684 SHA512 36f47d97f15ef341b5ae81d23e85d94cf02ce71d6a20b7bdcdc16ef0c36a091c99e09ebe86f05aac789a36f1dcd71819832b53a4d835a1a12cd468e1b3f132e5

app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild

@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
+else
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
+HOMEPAGE="https://github.com/diafygi/acme-tiny"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/openssl:0"
+
+pkg_setup() {
+	if [[ ${PV} != 9999 ]]; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	fi
+}
+
+src_prepare() {
+	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
+			einfo "The --account-email flag has been changed to --contact and"
+			einfo "has different syntax."
+			einfo "Please update your scripts accordingly"
+		fi
+	done
+}

app-crypt/acme-tiny/acme-tiny-9999.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then

app-crypt/gnupg/Manifest

@@ -9,4 +9,4 @@ EBUILD gnupg-2.2.32-r1.ebuild 4786 BLAKE2B 6e81532e958f0454d6ef5f56f381c794ba753
 EBUILD gnupg-2.2.33-r1.ebuild 4794 BLAKE2B 67398864ea884a87548d1bb5fb69899567a831f3ad0db749a7815bac2a34e6573da0eb60b755a25beac86e00639f0ce26de032e88b84e0e1f567aa562fb64027 SHA512 e3929982e9ae323839cb11d5acfe170f9f4b99fc28cc56f5aaac1825536de84f22e6638b0e6b05e3a749386f849c22caaac1cd9cd34396a2e177c36a167daad9
 EBUILD gnupg-2.2.34.ebuild 4987 BLAKE2B 292f10178a8964c6c4f6d4328e310a6413e831e736b49bfb11cae376d223f44a68f415475ae7a78b80fc5f805478216cdfc3dd2d7135e87556680d16956af084 SHA512 be3f95ba14586ba1d762c6ef4c41606817ff90ad4aa9caa24f0767fc67d4730fb2a736539a0d75d0ce946dbae521eb4c259259850df313d24757a6dd014b8c5b
 EBUILD gnupg-2.3.4-r1.ebuild 5178 BLAKE2B b615134041bde1f91e504fdd6d348192770d81148dd5c2a7c222a49bd1d24960dc6aab93f3000bfc45c256a9fc56c6e4c72ede67884affb0918471ad63b75d0f SHA512 22ed8562991971fc276893d2d44f517e411864e2f448c782903d6d8684edd89c913cc5ffdede420f9ef8c0bf79f18077ef382411c67bbf1bf441b4f1d2a756de
-MISC metadata.xml 1409 BLAKE2B 6b6dd19b047530aaa08ccecc59875b12f994e721095d9f83c3134fc04436494d6df79f2f15c8d6ac22ececfe9d8d358dd9a9575b635a3bae93080e3168486489 SHA512 7d2e07bb899d40a5b9a3c2186ce73b3cde9a103ce579aa795e42630bd42509d1e8ca3b3e5b5e934b8b0e2a1ba476c07d05187a6fa5c0b7da296c97961e3e248b
+MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de

app-crypt/gnupg/metadata.xml

@@ -5,10 +5,6 @@
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>

app-crypt/gpgme/Manifest

@@ -4,5 +4,5 @@ DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d
 DIST gpgme-1.17.0.tar.bz2 1748416 BLAKE2B 32df1e3e579275d39507cb013ab7eded12149735f27a5eb1f4c3142df6b97864947a64c7fa58736e6cdea4ae623fb42eeb007596ec08ac5fdfb2af7826447550 SHA512 7ab379c6be2031ff24334a636e596f01c9d491627b695cc6cce7a361e78c6054b7891c521f07becea3c5da10c58043c1acffbba6058bbbfaa515241d75dd6c46
 EBUILD gpgme-1.15.1.ebuild 2746 BLAKE2B 9d801a0d79d2acdf81027e4ac511c7f60df3a2db47b6a28e61f9bd881478b07237d5d87bb1ac54cbdb306708e55b51456b3b3b1283bb5f164d49776a052f9a56 SHA512 dc74be1ae8fb89b9cd449ab86ec95b5fd6b766be4c813083ce08a94297ab3700fb1ab16d3bc73baa11c0aa6951fc5e8f6e4718ebf36b9ec33de40886e1b00620
 EBUILD gpgme-1.16.0.ebuild 2804 BLAKE2B a9d58a8b7eea2fa3b24a5edbb9cc2de81a1c65f8a638a04d80896848c07250f9503695fe353d0cdb9230bc193717656f38c00a2f441e8609fc2f3ca3fbd995a9 SHA512 9e6ae0ea746252c46b4357c6d6a4f148a7302d4bb7a9522ce33549115dee0d119ee8d6b6d501a934a27f3eda548f6f2b3ece6754e27917ded113cffe737c3aaa
-EBUILD gpgme-1.17.0.ebuild 2777 BLAKE2B f7cab18f0f52bec481a12275539d2eed630c473584ea9098d48c024fa17f86cc03b3a558b3b8fcc40ba194ed0f2633737ecb7ee2b170a188724709a690841540 SHA512 751d4ac8f073f96cf79e02048f30fcee64c9be6614ca1b206a55d636ce4a1b6e2ef744d517de0f249ad4abc262f2a72cc9de6fac38363a91278352b76f88cc7c
-MISC metadata.xml 327 BLAKE2B b81e8fb75326ade6f0c2fff8e2b542631ec799d7881e0b1d5c11749ed2dd0cbc0c157d137782c05d26b18adb1a3c7d598dabee1a7464685cf1b0be94a1c86d2b SHA512 84ee5946f52200c1484bbe23ba5f3d1e423b2d6f85b68522906948baf44bd6904453c5a6d4024e8425f3d874c29d2710dfb9a48cc3598932dbfcb54cdcfe0703
+EBUILD gpgme-1.17.0-r1.ebuild 2965 BLAKE2B 0d1849d52b3ad94a76f5f9b521a46307a6c9405ba2e60b75351dfae4f9a370db54bacc9ae310f8eca3ba73b5af498c9eceb9c3287928ae40e00934b591404e37 SHA512 6d41e730fdea10fe399b3b4654a7be41e6cfa9f4df3b52beb2a7db14963621620027ce907c0de468a97fbc49770d340fa68d6a2a4ad6414391fbd7b11106be65
+MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f

app-crypt/gpgme/gpgme-1.17.0-r1.ebuild

@@ -13,7 +13,10 @@ HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
 SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme>
+SLOT="1/11.6.7"
 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"
 IUSE="common-lisp static-libs +cxx python qt5"
 

app-crypt/gpgme/metadata.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>Lars Wendler</name>
-		<email>polynomial-c@gentoo.org</email>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
 		<flag name="common-lisp">Install common-lisp files</flag>

app-crypt/gpgstats/Manifest

@@ -1,4 +1,4 @@
 AUX gpgstats-0.5-flags.patch 668 BLAKE2B 5436cbb050c6f52edf74182127f2fc5e50c22808f3f8b80600c362ba652fd3b0ce927d9ead7f4ca28425046021b3e477e56a719bc63ab4a45b6e0025b259a00a SHA512 8f54993f957d8d93da495530dea25734f9e5fedc1d5dc17aa4b517daabc88f8162ab2565159a51daa203ef2b039e80122e009bd23dab862be87ad5a75e072546
 DIST gpgstats-0.5.tgz 6691 BLAKE2B 681a4bb06b4ab7156c35d81510238420121d1854d3f8f678fce6017331e2f9c6db9ea413f45dcce1570f917fd636a586ee816f998dbd17347473e1da964bd617 SHA512 273f08af37089eb43cee65fa06ff8023e1951fa4649bf208e01d6bc453e4131c11128b511c6cbd8396a7bd93722904e8930168656994e3d4d055024c3d5fb649
-EBUILD gpgstats-0.5-r1.ebuild 573 BLAKE2B 01cb2a505f6baec4ac7e40b42bb4b98f4bdd45cca677764f5a68c2e8fb880615c41cbe66bc1bd47ddfd850227beb6e9f08b970b82480d9ab8cdc4ff3f7a9b213 SHA512 843c09ba4fa5ee2943fae404384141bb13608a77d7a8105416b40da5b3f362e7ff6ef9d8c1f6166e51e754e70c217efca2f8d3337202b62ca8915c4a7571315c
+EBUILD gpgstats-0.5-r2.ebuild 573 BLAKE2B 9220faf47449ef822c4ade0eb9a94846353cac8b562b4f115c4b18fe281a3afaa07841087f828fd949364cb6f3d02c9c5b255f7799601ee62978d1888e916b14 SHA512 609d011108d5282f31a6d381ee5e1d3ea6549decc6b6a6c94777ad3aaeeb37524cc385f6d03b8db1560254f578ee5076cdae32a93197641a2deae117fa1a7609
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2

app-crypt/gpgstats/gpgstats-0.5-r2.ebuild

@@ -1,28 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="GPGstats calculates statistics on the keys in your key-ring"
 HOMEPAGE="http://www.vanheusden.com/gpgstats/"
 SRC_URI="http://www.vanheusden.com/gpgstats/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RDEPEND="app-crypt/gpgme"
+
+RDEPEND="app-crypt/gpgme:="
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-flags.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" DEBUG=
 }
 
 src_install() {
-	einstalldocs
 	dobin gpgstats
+	einstalldocs
 }

app-crypt/nasty/Manifest

@@ -1,4 +1,4 @@
 AUX nasty-0.6-flags.patch 468 BLAKE2B acc1ac4bbe024136a176f04a3f6ba85190ffa34b4655d4e284ed980774169ab790f5582d8ce8d86cb59ceecaeefb579f975dacc5144b6bf8fc5da741819a8f27 SHA512 56d808209a9ba1fd1fa3b77ed90398cded9adb08c271ed74c80c5dff793413f1e7270ab057bd253c8c1e951dec7e7b8ad6c92976abb7c267109f517ccb81d4a1
 DIST nasty-0.6.tgz 3811 BLAKE2B d6e5973c4f1335fe936b9a7c976d5a0f994cf618ed83c8ae7629256c2dbab17b631a095a14da366d7011add5df5263d63de66db4b3e69712aae0be092fa50064 SHA512 6803c1ccb843934ab6d2bd173c4cf154124926ee493a79072b351167f7fbbc08f90226ba63d2c591f2ae122d33d7cf1dc6b60e8684dc7ec650c8bcf3f04b3e07
-EBUILD nasty-0.6-r1.ebuild 553 BLAKE2B af753a0eda3a8756af06d098574d4ba0d0256673da30b02da0895ccfa4a3f7c2e187f114c333231ce9176f5a43085fbb0ddb83b056264c5bb23b147cd1dac8dc SHA512 d10d1c5da5a420d5d28daf30c04166bba01e9246ce10eed933da80db4503b0d8315d197037ca4864f348557632561a20866560f68b96c34acdca86fa2e848400
+EBUILD nasty-0.6-r2.ebuild 535 BLAKE2B 6ce17fe20c35b6eedb3afc75cfd06e5d59df52699607bf226d15f1b659cae421b092464756485a46ede5ef954b1ec11ff153580cf725739eda90918ccc3f47fd SHA512 ae2004b87f9dd89772dd30bc0d5897b826f684b6ac46ef4876cd034477f47a562f589d23e3e6ba167e71f51db288a92083db56066459b4535ac49bc8c0072f56
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3

app-crypt/nasty/nasty-0.6-r2.ebuild

@@ -1,32 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Proof-of-concept GPG passphrase recovery tool"
 HOMEPAGE="http://www.vanheusden.com/nasty/"
 SRC_URI="http://www.vanheusden.com/nasty/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RDEPEND="app-crypt/gpgme"
-DEPEND="${RDEPEND}"
 
-DOCS=(
-	readme.txt
-)
+RDEPEND="app-crypt/gpgme:="
+DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-flags.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" DEBUG=
 }
 
 src_install() {
-	einstalldocs
 	dobin nasty
+	dodoc readme.txt
 }

app-crypt/seahorse/Manifest

@@ -1,6 +1,6 @@
 AUX seahorse-40.0-fix-segfault-with-ldap-disabled.patch 1056 BLAKE2B bde592e3c78f28503d0e113da676639c76d9ab8c17226bd94e82b2e3cd1612088147b62d064cc0d7268d8cd75912c8239e52ec7c7c96f4f8aeff5120a955b367 SHA512 9c69c11540ea9dab84bafac8ee12302eea47e67276a6023a91768a612d42325a9496ec7472ba988dab7ad79cc7b6f5c012e5c0cb94b90f9509f0c71e72cc3c97
 DIST seahorse-40.0.tar.xz 1309064 BLAKE2B dd179ef13c79454b30571959b33c02a523591fa9d59957e0c30ec5d75a52bd8e9a5b420214f85d5feac0849d69a51ddcee808ab47e4bf97d7ac99094f853bc9a SHA512 c389420fb1b3d54c1b9a1004f2c8b9e50118a1ffcba02aa8cfdd2223d1bc117368c9a1ad875c59abd319d95eb93ec3de2e9cedadbfc1d6a0997d613c8256c60b
 DIST seahorse-41.0.tar.xz 1371984 BLAKE2B fdfc7c6d5ba41ab83c639d93c92fe6e1c36d42a02c7a384c2055bfe594e2a16415115bfb07597de93a886e492974e38c812fbbd59c7112c0360adeed96cb437d SHA512 cc51e27a55ed646ee376aa1b1bffe28369d80e4b8c484c9711de6bdf190694714ef208579d0399b5c199b5619491d72dede1b1f6c03b89cf3a53e8519a4d4fcf
-EBUILD seahorse-40.0-r1.ebuild 1688 BLAKE2B 1467777527251f2dfb6501ec2ea5054428cdbc52d0cbd08bb9f4cda244de7bee02a64c666274e724e07d8a8a1750c47cbed1886a3741c7201743d5a2d458ccb3 SHA512 a23db51158cd52eeb5db93b1479f726be7d00a4f69766fcd8d48a0304b1420420a5b3f635c44f4a9b0f7c1bc4848edf79e7db23e1d7ed8aeab01fcd994ac8ac5
-EBUILD seahorse-41.0.ebuild 1627 BLAKE2B dd1b330b4a018eae7117d6fde17c4b766f47e16d9b809d5d555ebe34321cb7489d7af8de5fb5919a17493f4539ab200d57f3dc0ae2178d44ad2d6e87b6d6c323 SHA512 1ae55ceb406da14884c069eca6eae08a4ae09549a7e60ccb3463657061762dd161e6772372a6fb4aee9adc1668792f5228cda4d3d11049026479b69fc8dcea80
+EBUILD seahorse-40.0-r2.ebuild 1690 BLAKE2B 428a72e77c7a9752552eb2867a2e4b3b3c816d401d20f7e43303f5179ae093fcb08ac95028a81fbfb88bfaa02d346229493973ba2ca80097e55d8c4619850035 SHA512 64dd3fb6879c5b5de7fcff0d248b44bff08dfdb22eb93d22e8d80b34556c536a29771c2efa6ec6a32d72d4b44fb3a6537db3c3c4d119642fd4739e653622347c
+EBUILD seahorse-41.0-r1.ebuild 1629 BLAKE2B 329aea64725cf2c1162cb7d641a6edc62a5b796ab2474f3d8f78c5a40d7e5f32206b32bbdbe91bc6297acffa508d67290e9462447b7130c4fa713d93c3467aa3 SHA512 d4a73b529fa4bd83ac88fdda87d1472d05d1578047b2ceb8f3cb4139adbd35f2e3aadecacba22c56149bcb831f457ae372171eeb551c701c5e319b4e4c048529
 MISC metadata.xml 743 BLAKE2B 90fed564b56f7e7a781f197eb09ebbca90ac0bd3c93ee1b65eec7e35420fcdd8bf0c0bf67cbf2109a55de590f32b48d3837a70844bb7e6e50819a8b67c868369 SHA512 99872b87aa52c0fe0584d11186fed74d0ade69e083395b030af3a22ba031a91467247c9c72e8cfa45b114192ebc13ed593a2634aec7db5a2b8efa1e2af6a0791

app-crypt/seahorse/seahorse-40.0-r2.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
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 RDEPEND="
 	>=dev-libs/glib-2.58:2
 	>=app-crypt/gcr-3.38:=
-	>=app-crypt/gpgme-1.14.0
+	>=app-crypt/gpgme-1.14.0:=
 	>=x11-libs/gtk+-3.24.0:3
 	>=app-crypt/gnupg-2.2
 	>=gui-libs/libhandy-1.1:1=

app-crypt/seahorse/seahorse-41.0-r1.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
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 RDEPEND="
 	>=dev-libs/glib-2.66:2
 	>=app-crypt/gcr-3.38:=
-	>=app-crypt/gpgme-1.14.0
+	>=app-crypt/gpgme-1.14.0:=
 	>=x11-libs/gtk+-3.24.0:3
 	>=app-crypt/gnupg-2.2
 	>=gui-libs/libhandy-1.1:1=

app-doc/kicad-doc/Manifest

@@ -1,5 +1,5 @@
 DIST kicad-doc-5.1.12.tar.bz2 74217615 BLAKE2B f0906fdb0cf697348e06b63ef0003630a9035d47732c9a22ed3c4fee2f21c02f85fda51eee5149291b72326adc4899b31198178ee6e6ac0d494361cec6c06208 SHA512 db678d91ea5f564ca3f266829c297362cfd6cf35a5dced2ede5e7c9c38a37ca1037b264ee9314fa5c4a9d8197fcd92484ad4cae3668ea9741947d38c7ac7f910
-DIST kicad-doc-6.0.1.tar.gz 78035248 BLAKE2B 25ff6eb1318d2c55ace2df3b1d553ce9220b035f8de034e583a98eb601c1032856b0efc8b81e0a142483722015878d64e25b05df5a53e5d53df56967dfc23021 SHA512 1027a4f46a855ab34c9e4fb53df1a495d8cb1d27f98263fb574ef25135b0d20ba3a875e2711fcb73836c27f5c0e193aea2dec3e9fa313434785eb0553ca214b8
+DIST kicad-doc-6.0.2.tar.gz 78035381 BLAKE2B f78ce40c35ca39ee10ebd1322ed299d02a7a688f3d47d875420aea3270ba26d644521659ff5c34b395736454e03fc5c64bd345ea30e9b88b63472f21731a2c28 SHA512 f219d5f13a873fa90c105f376c456ac68b5a36eef3eb65fc08e1bc26d6be70b31fa43e4c6cee0371a6a64469c54d4e0721d9e15f19d1e952da3cefd6bbd3e09c
 EBUILD kicad-doc-5.1.12.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
-EBUILD kicad-doc-6.0.1.ebuild 2043 BLAKE2B fc47f0fc22887cb620cd03115539548676d60378720e79515e0ee3c851f163c0ac957a3bda5c9ab8ce71d97ccefd07f0693503bea96f05ff88e1a2b2b974635b SHA512 cacf92232283d333502373004e9023da5a9e4a6e6978934de8a82c8066e07fc36dcbba7ee63513dd58e24ed68bae2bab3f5526d78249bb5d81120ac4948ed8d4
+EBUILD kicad-doc-6.0.2.ebuild 1945 BLAKE2B ee70c28a33e87a44857df212667d33440bf152afcd7161ba1eaa98eabdb6de37d57761a3be9325e6cc5af5e57fedaee4eac7452068bf1ca013f1ba405ab350b2 SHA512 2c5a406837c5fef2b9b10c4ef996c804c69d246e6edb18a10236784cfa338029c2055d1527d7b47d5b7635b92f904ef2035758d84c662d799401c3b09222a75f
 MISC metadata.xml 852 BLAKE2B 9b21d1f5ae47786e87fdf3703b2e65645cbc4746b861f023f8ca94a9d32dd8c50594eec0e316538943abe7f93a261b3fb2e96f1ac56bccbc316e2f9ef06cfb77 SHA512 aed642bd4c57be8cdae2dc31c81db0915b30032b72dbce3ea157163e2713bd3fe6812aa96c3ee3894f84cfa9126577fb69c2da35525eee2124728c004b436fad

app-doc/kicad-doc/kicad-doc-6.0.2.ebuild

@@ -14,10 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	# x11-misc-util/macros only required on live ebuilds
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 

app-editors/hexedit/Manifest

@@ -1,6 +1,3 @@
-AUX hexedit-1.2.13-tinfo.patch 329 BLAKE2B b82e7b0495a8ccac367501f530d52f8b2988a242206efd25e14c433a25e1742c2bc3d0c7b1d1613ec8beec530264ce7fb177f2d3d9338c90eaf921a366726a66 SHA512 21306eddc00720a22365b84181581bc89db2a1d422cf769c2b29585144ab87064a19696ba946e16cc56e2d2d45aa12ebb88b3054ea0167124d960afdaa5a7d8a
-DIST hexedit-1.2.13.src.tgz 68778 BLAKE2B 377c4f0008f6e3b54e4cf2e0249fa344b684b11a6acea9daf7d8e6585524f9d11a4eb199d5289a57a72be5efbdf3060cc47269aad1d218784e7679a469ca4f50 SHA512 df9afb0b9b965e20ea8c427c1986b0200216601b157862199c35bae9e201ccc478ab0bfecd39d0dfaa85bf582f1cf372b0134fadcfeacf4734805a6e6dcaa2bb
 DIST hexedit-1.5.tar.gz 30544 BLAKE2B d7292a70819826fddd63f99ee9d05073b8a59f51477390af91151146ee1f5a75333560829f0351fa9e158ef932c07a3582a3e822f42e645917a7fa321055d14e SHA512 9d8e5c8c0cda0af17ffeaf528e3dacd7fc2878dfc0755cb055dae5c56f05c961353c1d1723b05897314b49a44a6eb96de5d3a599c6b29967425507eea7cc7ca5
-EBUILD hexedit-1.2.13.ebuild 702 BLAKE2B b2baa82ded8ca1e5d01f83aa763a4df04f527b653ac3bc8d7063974f684082dfc0a2276a505d28dbeb5a5085ab8feb1281c4dab40aa9e39290600ab47146e1a7 SHA512 1e8acb13a25382648b5593e75a347f954e3f229f3cd44d85d9b877a2bc140df3aae80defa708778db9e2d32879859efb41a33f1f2bbaff5abf71a5562c5f9834
-EBUILD hexedit-1.5.ebuild 737 BLAKE2B d2aea9e728d537c62c02513946d60ec990bac58ad06f70f523ab1465c0b92d2c7371732e0d71253cda502b044123ba64c1121ba74b1f7f414a30a52f28b8e805 SHA512 51835f2e70f31a63c940e5620b3f2569e03609f545f8cc6fbfa56fcfe5d8023970877c06d4586b5b028ca0544d6ca545b1891e131c1255c6b661406712246063
+EBUILD hexedit-1.5.ebuild 735 BLAKE2B ce7ae724f31b951a7a9e695274dbb82e3db4a517da61a35c69fe2dc20df6b8ba2f0f1658bf9a4d957bd309de42eaa9ee6312e2dbadc78ee59eccfd3951c1622a SHA512 34cc7032c292ed1aa1474afae9c524df3f532335f42c64d94e21ffc191c0d127b356b51b6940c7849b1e8b41d27c281d6474aa546607b0482a7b3657764744af
 MISC metadata.xml 351 BLAKE2B 0c74729ae34fd37946be2b370ec986ea6f894cc13c642865030ad8857b65bb5900cf3b822e2c9b16bfc33df955e3d747622dddf6b5344a5edd867a236988135a SHA512 1878b5fb1fe6d7e0c6af3a433d9dfd8e9f365a4bf52d15ff5aa01e4f8153924b6379edee442d98f2c0282fd19f7141ffc77d0ce53e8dd1428e5ac90643f84c9e

app-editors/hexedit/files/hexedit-1.2.13-tinfo.patch

@@ -1,10 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -37,6 +37,7 @@
- AC_CHECK_LIB(curses, initscr, LIBS="$LIBS -lcurses",
-   AC_CHECK_LIB(ncurses, initscr, LIBS="$LIBS -lncurses")
- )
-+AC_SEARCH_LIBS(nodelay, tinfo)
- AC_CHECK_FUNC(use_default_colors, 
-   AC_DEFINE(HAVE_COLORS, , "Define if you want colored (fruit salad) display option")
- )

app-editors/hexedit/hexedit-1.2.13.ebuild

@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="View and edit files in hex or ASCII"
-HOMEPAGE="http://rigaux.org/hexedit.html"
-SRC_URI="http://rigaux.org/${P}.src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-DEPEND="sys-libs/ncurses:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.13-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	dobin hexedit
-	doman hexedit.1
-	dodoc Changes
-}

app-editors/hexedit/hexedit-1.5.ebuild

@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 EGIT_REPO_URI="https://github.com/pixel/hexedit.git"
 else
 SRC_URI="https://github.com/pixel/hexedit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

app-editors/vim-core/Manifest

@@ -11,14 +11,14 @@ DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df03
 DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be
 DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec
 DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
-EBUILD vim-core-8.2.0814.ebuild 7164 BLAKE2B f244a235e78abd3dd0880b3c13be3780186634adc7588fabc86de6b7e33823a1b6dfecdd36dcc9e81c3e13e01594b3bd555f988d5f42636d666e5abfa10922bc SHA512 0bdae6503815e79347fcd7cc010813047a7333388e19b765a43aaab7b87f08dcefa46e3daea24fb82c0774732c39429bad53fc80d34ab0a9234ec8031b5a2ee2
-EBUILD vim-core-8.2.3428.ebuild 7230 BLAKE2B 03d7b91e062a4b33dbfd7226f90fc60f4f30b5c48014435e30172b0fb5adca2d40e3afdb3223e1025c0099357341e611605e6159807e9ec0ced8fbd540af9525 SHA512 99da825ebd14a43c36eb5329cdfe51fe22aa2414f9ef7cae2c02831bff24deff169b8919edf47327a1286140d4898842b0283ba4f446741950f09fb0ae206e35
-EBUILD vim-core-8.2.3567.ebuild 7245 BLAKE2B f2e57ff7b63e54789c2bfbb4cf4929e301f363424cd06bea9c8b7f4b519630e324961b078672123ef8499fa5418386c7c1e15e0b588f35e98190c979ebe59378 SHA512 669e5a657f4abbdf3261a068501c4bfe5492fd81fdc021cd409249a47c46babd327b0c122b19747f08161c028b45671967896f8b26ad1f94ebb6f866eeb5e8b6
-EBUILD vim-core-8.2.3582.ebuild 7237 BLAKE2B 57401e1c87a3382822347e140eae2411526842a5b16689c862f13d34ddef830b234d3acccf6e6850a13b20a3c3e30c323e4c2b787a353ff4fd91521ee4259a3c SHA512 1d8fc9df2432fea0c46acdf38e12653326a88a505f870f34e4e3d3bbc5f82ec4063a5721e048e9ab523f097dc3c826347ff988e965951cce670f9b0efbc7bea2
-EBUILD vim-core-8.2.3669.ebuild 7245 BLAKE2B f2e57ff7b63e54789c2bfbb4cf4929e301f363424cd06bea9c8b7f4b519630e324961b078672123ef8499fa5418386c7c1e15e0b588f35e98190c979ebe59378 SHA512 669e5a657f4abbdf3261a068501c4bfe5492fd81fdc021cd409249a47c46babd327b0c122b19747f08161c028b45671967896f8b26ad1f94ebb6f866eeb5e8b6
-EBUILD vim-core-8.2.3741.ebuild 7237 BLAKE2B 6330fc6e445586cba797557d304ffdbebf6c2e9040aa690fcb04d26409ae68861da8b34cea36a9cfb8d503dfdef8b90a0fc1c01954c22958f3464b922703e4fc SHA512 2737d15d22ef255abde5f2359bf0485ce8e9897d1d71ea4d227c49f3d359ff8b194bde8e0c1584079638a9c6f03ecf3e9899fcf1330af5f50099e877493b9359
-EBUILD vim-core-8.2.3950.ebuild 7245 BLAKE2B 5c9b4902c4fa4d74ca6d19cbfef053ef7c5a49b140acaef23426671c0e13f038bf718b1384192bba4f5f5d433cb05cd99b4de6c93e7b15687abc5f8a01332d30 SHA512 6ad5383121999226973559257d2013a5dd13df34ff1166d9bec6b4faaafd259504d2fe5f1928a6cdb65a12eb8e2875f5a9acfc3b706686781ae0e0d5a40905a2
+EBUILD vim-core-8.2.0814.ebuild 7300 BLAKE2B 452feeb918fd09c92f7d444e5eeaf6f040ad407e4dc7757bd036cc7b549da45255a402c53c139e5372f3b37d23a2a05e13a49eba2b96a4b9a7622849dd1a634a SHA512 99c6c7f97d93c0ff4a397e93e9ccd440ad234a2d31e0f064d63b173cb0ecb75079cc13c56325c69fb1ac731cd121a13511d29d72ce1eac18146e1f332799620b
+EBUILD vim-core-8.2.3428.ebuild 7366 BLAKE2B de425d60e2bdf82d046eb6ed6db3826c15c6c83467e8eb07d176a0fec4bb15c75efdd9849ba41e804de4dd5ca4f620fcb1e8b206a2cf964bf0f2de5e41b7b4c4 SHA512 104f83f30e1682e4d97239f2d5349d57523db62950decab5c168417a83f9ceaa42fb95778b3fd84fb5b24cd863fbd9a41a287422888aa7dc671c24a491814263
+EBUILD vim-core-8.2.3567.ebuild 7381 BLAKE2B 4cb5e5901673b65fde1d14e4d840e366890f01690f6f970079481d791a16b221e9c8edb14bcc867f33cc13968f336cf54440b6f0d79e145de3bbb7373691184f SHA512 5b29470cb25ba812d29b2af639bf485d25add93dbf52eeeafee2cf584ff7ba5b22472aa930fd43183b6814a729153cd0854a63e113f5c8eefb2da9c975b045af
+EBUILD vim-core-8.2.3582.ebuild 7373 BLAKE2B e74e51f668bed259f7f3534f4a19f87589ba19bc33595adda00c3b4b2e9d44a62dd1ab4310db68d4ef2a007cb3adee329d235bdc0497cde4e7000fd7eb2bc45e SHA512 02504a1e6dc36526e06448901f59408b32e2828f66bfa1fc408b1e0ef4107dd2d4c73a761aee681610c4600158c4b988d291bd76945d42d70f30c1f6103c6440
+EBUILD vim-core-8.2.3669.ebuild 7381 BLAKE2B 4cb5e5901673b65fde1d14e4d840e366890f01690f6f970079481d791a16b221e9c8edb14bcc867f33cc13968f336cf54440b6f0d79e145de3bbb7373691184f SHA512 5b29470cb25ba812d29b2af639bf485d25add93dbf52eeeafee2cf584ff7ba5b22472aa930fd43183b6814a729153cd0854a63e113f5c8eefb2da9c975b045af
+EBUILD vim-core-8.2.3741.ebuild 7373 BLAKE2B 6c783035fe60f08462e8047f0ef6373a532c1c9725857710a3ef1dd94cfc3b6c7da04f50e6b8c2a5ccc52e23a6c8723201a76ec6dfe72b8752e2dd8b1f647122 SHA512 0bc0a3a25c9dc412d28235ce1eb6472a8261e3803a2bf38d30d4d118d46b2943b1088a76c5fde23ce933ced9458d61c39e5cdbc59b67d1baa14c3e48727edef7
+EBUILD vim-core-8.2.3950.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb
 EBUILD vim-core-8.2.4285.ebuild 7245 BLAKE2B 5c9b4902c4fa4d74ca6d19cbfef053ef7c5a49b140acaef23426671c0e13f038bf718b1384192bba4f5f5d433cb05cd99b4de6c93e7b15687abc5f8a01332d30 SHA512 6ad5383121999226973559257d2013a5dd13df34ff1166d9bec6b4faaafd259504d2fe5f1928a6cdb65a12eb8e2875f5a9acfc3b706686781ae0e0d5a40905a2
 EBUILD vim-core-8.2.4328.ebuild 7245 BLAKE2B 5c9b4902c4fa4d74ca6d19cbfef053ef7c5a49b140acaef23426671c0e13f038bf718b1384192bba4f5f5d433cb05cd99b4de6c93e7b15687abc5f8a01332d30 SHA512 6ad5383121999226973559257d2013a5dd13df34ff1166d9bec6b4faaafd259504d2fe5f1928a6cdb65a12eb8e2875f5a9acfc3b706686781ae0e0d5a40905a2
-EBUILD vim-core-9999.ebuild 7245 BLAKE2B f2e57ff7b63e54789c2bfbb4cf4929e301f363424cd06bea9c8b7f4b519630e324961b078672123ef8499fa5418386c7c1e15e0b588f35e98190c979ebe59378 SHA512 669e5a657f4abbdf3261a068501c4bfe5492fd81fdc021cd409249a47c46babd327b0c122b19747f08161c028b45671967896f8b26ad1f94ebb6f866eeb5e8b6
+EBUILD vim-core-9999.ebuild 7381 BLAKE2B 4cb5e5901673b65fde1d14e4d840e366890f01690f6f970079481d791a16b221e9c8edb14bcc867f33cc13968f336cf54440b6f0d79e145de3bbb7373691184f SHA512 5b29470cb25ba812d29b2af639bf485d25add93dbf52eeeafee2cf584ff7ba5b22472aa930fd43183b6814a729153cd0854a63e113f5c8eefb2da9c975b045af
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7

app-editors/vim-core/vim-core-8.2.0814.ebuild

@@ -191,9 +191,6 @@ src_install() {
 		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
 		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
-		# Delete defaults.vim to avoid conflicts with one from vim[minimal]
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 
@@ -208,6 +205,13 @@ src_install() {
 		eshopts_pop
 	fi
 
+	# Delete defaults.vim to avoid conflicts with one from vim.
+	# If defaults.vim already exists in files installed from vim,
+	# do not install defaults.vim.
+	if [[ -f "${vimfiles}/defaults.vim" ]]; then
+		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+	fi
+
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 
 	# install gvim icon since both vim/gvim desktop files reference it

app-editors/vim-core/vim-core-8.2.3428.ebuild

@@ -193,9 +193,6 @@ src_install() {
 		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
 		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
-		# Delete defaults.vim to avoid conflicts with one from vim[minimal]
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 
@@ -210,6 +207,13 @@ src_install() {
 		eshopts_pop
 	fi
 
+	# Delete defaults.vim to avoid conflicts with one from vim.
+	# If defaults.vim already exists in files installed from vim,
+	# do not install defaults.vim.
+	if [[ -f "${vimfiles}/defaults.vim" ]]; then
+		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+	fi
+
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 
 	# install gvim icon since both vim/gvim desktop files reference it

app-editors/vim-core/vim-core-8.2.3567.ebuild

@@ -193,9 +193,6 @@ src_install() {
 		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
 		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
-		# Delete defaults.vim to avoid conflicts with one from vim[minimal]
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 
@@ -210,6 +207,13 @@ src_install() {
 		eshopts_pop
 	fi
 
+	# Delete defaults.vim to avoid conflicts with one from vim.
+	# If defaults.vim already exists in files installed from vim,
+	# do not install defaults.vim.
+	if [[ -f "${vimfiles}/defaults.vim" ]]; then
+		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+	fi
+
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 
 	# install gvim icon since both vim/gvim desktop files reference it

app-editors/vim-core/vim-core-8.2.3582.ebuild

@@ -193,9 +193,6 @@ src_install() {
 		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
 		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
-		# Delete defaults.vim to avoid conflicts with one from vim[minimal]
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 
@@ -210,6 +207,13 @@ src_install() {
 		eshopts_pop
 	fi
 
+	# Delete defaults.vim to avoid conflicts with one from vim.
+	# If defaults.vim already exists in files installed from vim,
+	# do not install defaults.vim.
+	if [[ -f "${vimfiles}/defaults.vim" ]]; then
+		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+	fi
+
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 
 	# install gvim icon since both vim/gvim desktop files reference it

app-editors/vim-core/vim-core-8.2.3669.ebuild

@@ -193,9 +193,6 @@ src_install() {
 		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
 		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
-		# Delete defaults.vim to avoid conflicts with one from vim[minimal]
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 
@@ -210,6 +207,13 @@ src_install() {
 		eshopts_pop
 	fi
 
+	# Delete defaults.vim to avoid conflicts with one from vim.
+	# If defaults.vim already exists in files installed from vim,
+	# do not install defaults.vim.
+	if [[ -f "${vimfiles}/defaults.vim" ]]; then
+		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+	fi
+
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 
 	# install gvim icon since both vim/gvim desktop files reference it

app-editors/vim-core/vim-core-8.2.3741.ebuild

@@ -193,9 +193,6 @@ src_install() {
 		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
 		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
-		# Delete defaults.vim to avoid conflicts with one from vim[minimal]
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 
@@ -210,6 +207,13 @@ src_install() {
 		eshopts_pop
 	fi
 
+	# Delete defaults.vim to avoid conflicts with one from vim.
+	# If defaults.vim already exists in files installed from vim,
+	# do not install defaults.vim.
+	if [[ -f "${vimfiles}/defaults.vim" ]]; then
+		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+	fi
+
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 
 	# install gvim icon since both vim/gvim desktop files reference it

app-editors/vim-core/vim-core-8.2.3950.ebuild

@@ -193,9 +193,6 @@ src_install() {
 		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
 		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
-		# Delete defaults.vim to avoid conflicts with one from vim[minimal]
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 
@@ -210,6 +207,13 @@ src_install() {
 		eshopts_pop
 	fi
 
+	# Delete defaults.vim to avoid conflicts with one from vim.
+	# If defaults.vim already exists in files installed from vim,
+	# do not install defaults.vim.
+	if [[ -f "${vimfiles}/defaults.vim" ]]; then
+		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+	fi
+
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 
 	# install gvim icon since both vim/gvim desktop files reference it

app-editors/vim-core/vim-core-9999.ebuild

@@ -193,9 +193,6 @@ src_install() {
 		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
 		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
-		# Delete defaults.vim to avoid conflicts with one from vim[minimal]
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 
@@ -210,6 +207,13 @@ src_install() {
 		eshopts_pop
 	fi
 
+	# Delete defaults.vim to avoid conflicts with one from vim.
+	# If defaults.vim already exists in files installed from vim,
+	# do not install defaults.vim.
+	if [[ -f "${vimfiles}/defaults.vim" ]]; then
+		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+	fi
+
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 
 	# install gvim icon since both vim/gvim desktop files reference it

app-editors/vim/Manifest

@@ -9,14 +9,14 @@ DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df03
 DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be
 DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec
 DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
-EBUILD vim-8.2.0814-r100.ebuild 9440 BLAKE2B dca3174687b35b94074b4dd1c6c33b663b1163204a349c64a19ba25e9a4227c9e5135dbd7491308a30dcd669339598fe86a6b779c2ba03378c049766a9e11f2b SHA512 af81e0e1e8eb32bbed0551440181d73b29308b3540d9b5b649ca4b29713b5e92572fd750262f3832589216590163a2067d8deb4fe99598e4165c4174049db7b3
-EBUILD vim-8.2.3428-r1.ebuild 10129 BLAKE2B 90c5110d69abc6e14bed2dab61fc8c944c47b6cc9931b16eaeb615e81945f65977c2fa89bf065ec5bda38ca99e0764ced63c0502824ab675df0c2bc9bf03b026 SHA512 e159ccca71dc187bb53d6d97db2f8401eba0b9ea0be129d7299019d3ee6566d416a29630f907a4a0c7dd196758eceb62cadf87ebc912f4ebb71b7283394e8525
-EBUILD vim-8.2.3567.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96
-EBUILD vim-8.2.3582.ebuild 10201 BLAKE2B 19b74948c229fed51d4a5d668f97b2f3320c274aaec01658e5b3fdab11d244bdcca10df3cd14760e01f380c4058ebf53937fb0da84cd739d4c6f6f9cbcdefb02 SHA512 833011e1b757031021804b6c36911358f508b9318c82030c260be99efc631dabb6c6cd5c71695d9c448c44475354d3106a50825dca98e41bdb58045048690f18
-EBUILD vim-8.2.3669.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96
-EBUILD vim-8.2.3741.ebuild 10201 BLAKE2B bb7832ea899f26ea0c1de4d86142a17a18097092bb1128f144a5fdb1f747891e25f62f20ece63c67adcc7e5e7f8382b2b9c6a96388e0a4bfddd52aec127af4ed SHA512 1d320804780c62cf5a1cdc0dd65ebb4e5f6b0a0746c4ea0d339983aaae33da1d87df82be949839a85b15906b59dbbad5e529dcc5e02763c668a4940be7c11117
-EBUILD vim-8.2.3950.ebuild 10209 BLAKE2B ec10b49d5a770f3334739e38447652bbd06c6266c481d3696327f8ef9cb32c42916c98755a74ba9edbf0a609004d43ebcdd9f1d4b3714670017aa9e76603c2c1 SHA512 f6c90b20a2042b6a6d79fa57e9eb03f226db02393a3c6cf07c333b2fc1d11ddaddc3b2f9c55d0fc1237a4b32001c944bafb3daae45771b990109a8776e98b49c
+EBUILD vim-8.2.0814-r100.ebuild 9496 BLAKE2B 2835639bb27399e87b7dd4f3c5848ec41a151934571496af5abb9670302165e70a958410fa3dc08e843d6f603531c83e4247bc1a987cacaa5b486386e5a2c353 SHA512 16b1df6fe249f05d3bb2a706e5f9e16a4704be9c64230edc95eb60284ae428d24dafdd720aaca81d09c015a5fb5d4000f9620f8095ba819d750d11deb382ef1b
+EBUILD vim-8.2.3428-r1.ebuild 10185 BLAKE2B 27f995ad412bcc80695778d8a925be2bc2f372557c1624a14bf95524b8ff2af13dfe352160b7bca1ca6dea0ad0c8e9a1e84fc15c99421ccfdaf2978f4b3c0b46 SHA512 ce735ecf3c457a068dea374966a2d9d96bb15a09e960b468fe9f0cd437b897c984ac95a49dbe5504de7480125a91529ff4a61974ae74e16db4e8fd92a0f6d79d
+EBUILD vim-8.2.3567.ebuild 10265 BLAKE2B 56f0b023cc56c3d6cfb72ce048c7804af36f5002a3946c3df110b19fdfb871d95c46225233bc94b10adbaaa6ca8e8c84d556595d495393c9d966a2ba0d430690 SHA512 32a5e9523ea1fac68ba00f0bac4448bd23a15fc1083236f5e89c27452b3570e20fff979f7260f73800a990c661ee55550b88145d509fffbe6f4de75cda8bbfbd
+EBUILD vim-8.2.3582.ebuild 10257 BLAKE2B 4bf57b80eeda4d294ff27cc34a17c52454fc62e724fa51a46323ab686f0797ced1cfcfdd0c774bd8d40ee51ea141aa0d61811fc688f95c408188131f3741e8b6 SHA512 5fd816585bc0bd1d012a7b49f69ceae9174e5995a8a3417233f672d3146edfb18b5f269cc0d7d371346c1acdae34e7ba9664a19e023f5d98c5f842a1e0e7c293
+EBUILD vim-8.2.3669.ebuild 10265 BLAKE2B 56f0b023cc56c3d6cfb72ce048c7804af36f5002a3946c3df110b19fdfb871d95c46225233bc94b10adbaaa6ca8e8c84d556595d495393c9d966a2ba0d430690 SHA512 32a5e9523ea1fac68ba00f0bac4448bd23a15fc1083236f5e89c27452b3570e20fff979f7260f73800a990c661ee55550b88145d509fffbe6f4de75cda8bbfbd
+EBUILD vim-8.2.3741.ebuild 10257 BLAKE2B d33c9e872586b4e9ad4cdae08ef20a2dc5aefbfbad33b6ac262daac88c0ca522d9ec35da43143dc5208915a1e95caff5ffeb750c5349c52440c32145b51c7a84 SHA512 2531fa382b1ea8632767cfb4aad8cecbe6137763eb89189ed58ebdc6958fa28a41a188e2be2ed7b8b18214ed1602930075dcc09b79fda082511641a153cb8d38
+EBUILD vim-8.2.3950.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70
 EBUILD vim-8.2.4285.ebuild 10209 BLAKE2B ec10b49d5a770f3334739e38447652bbd06c6266c481d3696327f8ef9cb32c42916c98755a74ba9edbf0a609004d43ebcdd9f1d4b3714670017aa9e76603c2c1 SHA512 f6c90b20a2042b6a6d79fa57e9eb03f226db02393a3c6cf07c333b2fc1d11ddaddc3b2f9c55d0fc1237a4b32001c944bafb3daae45771b990109a8776e98b49c
 EBUILD vim-8.2.4328.ebuild 10209 BLAKE2B ec10b49d5a770f3334739e38447652bbd06c6266c481d3696327f8ef9cb32c42916c98755a74ba9edbf0a609004d43ebcdd9f1d4b3714670017aa9e76603c2c1 SHA512 f6c90b20a2042b6a6d79fa57e9eb03f226db02393a3c6cf07c333b2fc1d11ddaddc3b2f9c55d0fc1237a4b32001c944bafb3daae45771b990109a8776e98b49c
-EBUILD vim-9999.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96
+EBUILD vim-9999.ebuild 10265 BLAKE2B 56f0b023cc56c3d6cfb72ce048c7804af36f5002a3946c3df110b19fdfb871d95c46225233bc94b10adbaaa6ca8e8c84d556595d495393c9d966a2ba0d430690 SHA512 32a5e9523ea1fac68ba00f0bac4448bd23a15fc1083236f5e89c27452b3570e20fff979f7260f73800a990c661ee55550b88145d509fffbe6f4de75cda8bbfbd
 MISC metadata.xml 951 BLAKE2B 10b867295bee9174e71d1df8a2a8a251c669fb2415893f2e90e361622520fa6b357a2098cb0184637a6f3078ed1873ed1d38f64be205d941de13040fb9f197e2 SHA512 683a03f6198c53c16874cfd8b50a265460a507afcb1bff104ce8932a9957cd4a3cc0cd6d0e494ea0757645162994c55a792d282fd6ad1278dd10659804d2f54c

app-editors/vim/vim-8.2.0814-r100.ebuild

@@ -306,8 +306,10 @@ src_install() {
 
 	# Fix an issue of missing defaults.vim when USE=minimal.
 	if use minimal ; then
-		insinto ${vimfiles}
-		doins runtime/defaults.vim
+		if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+			insinto ${vimfiles}
+			doins runtime/defaults.vim
+		fi
 	fi
 
 	domenu runtime/vim.desktop

app-editors/vim/vim-8.2.3428-r1.ebuild

@@ -318,8 +318,10 @@ src_install() {
 
 	# Fix an issue of missing defaults.vim when USE=minimal.
 	if use minimal ; then
-		insinto ${vimfiles}
-		doins runtime/defaults.vim
+		if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+			insinto ${vimfiles}
+			doins runtime/defaults.vim
+		fi
 	fi
 
 	domenu runtime/vim.desktop

app-editors/vim/vim-8.2.3567.ebuild

@@ -320,8 +320,10 @@ src_install() {
 
 	# Fix an issue of missing defaults.vim when USE=minimal.
 	if use minimal ; then
-		insinto ${vimfiles}
-		doins runtime/defaults.vim
+		if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+			insinto ${vimfiles}
+			doins runtime/defaults.vim
+		fi
 	fi
 
 	domenu runtime/vim.desktop

app-editors/vim/vim-8.2.3582.ebuild

@@ -320,8 +320,10 @@ src_install() {
 
 	# Fix an issue of missing defaults.vim when USE=minimal.
 	if use minimal ; then
-		insinto ${vimfiles}
-		doins runtime/defaults.vim
+		if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+			insinto ${vimfiles}
+			doins runtime/defaults.vim
+		fi
 	fi
 
 	domenu runtime/vim.desktop

app-editors/vim/vim-8.2.3669.ebuild

@@ -320,8 +320,10 @@ src_install() {
 
 	# Fix an issue of missing defaults.vim when USE=minimal.
 	if use minimal ; then
-		insinto ${vimfiles}
-		doins runtime/defaults.vim
+		if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+			insinto ${vimfiles}
+			doins runtime/defaults.vim
+		fi
 	fi
 
 	domenu runtime/vim.desktop

app-editors/vim/vim-8.2.3741.ebuild

@@ -320,8 +320,10 @@ src_install() {
 
 	# Fix an issue of missing defaults.vim when USE=minimal.
 	if use minimal ; then
-		insinto ${vimfiles}
-		doins runtime/defaults.vim
+		if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+			insinto ${vimfiles}
+			doins runtime/defaults.vim
+		fi
 	fi
 
 	domenu runtime/vim.desktop

app-editors/vim/vim-8.2.3950.ebuild

@@ -320,8 +320,10 @@ src_install() {
 
 	# Fix an issue of missing defaults.vim when USE=minimal.
 	if use minimal ; then
-		insinto ${vimfiles}
-		doins runtime/defaults.vim
+		if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+			insinto ${vimfiles}
+			doins runtime/defaults.vim
+		fi
 	fi
 
 	domenu runtime/vim.desktop

app-editors/vim/vim-9999.ebuild

@@ -320,8 +320,10 @@ src_install() {
 
 	# Fix an issue of missing defaults.vim when USE=minimal.
 	if use minimal ; then
-		insinto ${vimfiles}
-		doins runtime/defaults.vim
+		if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+			insinto ${vimfiles}
+			doins runtime/defaults.vim
+		fi
 	fi
 
 	domenu runtime/vim.desktop

app-emacs/avy/Manifest

@@ -0,0 +1,4 @@
+AUX 50avy-gentoo.el 1476 BLAKE2B b081bb631b724c62cc18bd64c5f27e0f4179d311ddb97cfd7635e68bece246cb4c9d9f84f96d60e43a9cf918c6460870ab4d1c63b6bcc9de94ee27c8027aaaf4 SHA512 d3ad03714f69c1acc3fc5266dab43b5bc14a76b9b4c0ea6b2be163a8beb1be3a85cdc10fa5df5ecc781bdecfc4754aff8283829b39d37d7e690d657270f62c2f
+DIST avy-0.5.0.tar.gz 27569 BLAKE2B 616040ea72ebda2eda89736c940462eb0af5ec78e9233e1ebc3555d1f09cef9e2be5fad2524f4652fc2666b35a37c7d48a5564883708eb672e4a306849cd52e7 SHA512 34dcaff06d68d53a276cf69293c1a97a8a6722e18933722638400e84dd809c23925aef4c6b23074a5657f23196ae4899a0b79921732b5e35abb01ede128adeba
+EBUILD avy-0.5.0.ebuild 608 BLAKE2B e4244a469120c5a8af5bd8e7084386491baa72b24ef4875ca10398d3d35fa8d66eacb992b6b1aa054c264efde4b76c6ee65c470a77418ae9e0d4c962d6882b2d SHA512 a47fa02625fcb00840b9834b8e7ca0be7ed3f3da89a017bcd9e5e4cff7532e0f7b8171a28337eb345c0909c47a56363a268b764deae0c33d68fe8868aadbd2cd
+MISC metadata.xml 357 BLAKE2B d5e3af31ea61b59f5c419fbe45566b4f5ff305f326a38ed2ebf0eb3a09165225fc6012c26b0580ca172deb733bb59382480a1ad80f3503178e22cc1e107a7cfa SHA512 4e3f21d6a7518f2520fed09c3909ea4933b4299017e190e28fcbea9e10d814085e17cbcdfa7e58e4f480ac6f0fa2f4bddfae644dbde5bdbc1da3ec278523df8f

app-emacs/avy/avy-0.5.0.ebuild

@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Jump to arbitrary positions in visible text and quickly select"
+HOMEPAGE="https://github.com/abo-abo/avy"
+SRC_URI="https://github.com/abo-abo/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -l avy.el -l avy-test.el \
+			 -f ert-run-tests-batch-and-exit || die "tests failed"
+}
+
+src_install() {
+	elisp-install ${PN} avy.{el,elc}
+}

app-emacs/avy/files/50avy-gentoo.el

@@ -0,0 +1,34 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'avy-process "avy" nil t)
+(autoload 'avy-goto-char "avy" nil t)
+(autoload 'avy-goto-char-in-line "avy" nil t)
+(autoload 'avy-goto-char-2 "avy" nil t)
+(autoload 'avy-goto-char-2-above "avy" nil t)
+(autoload 'avy-goto-char-2-below "avy" nil t)
+(autoload 'avy-isearch "avy" nil t)
+(autoload 'avy-goto-word-0 "avy" nil t)
+(autoload 'avy-goto-whitespace-end "avy" nil t)
+(autoload 'avy-goto-word-1 "avy" nil t)
+(autoload 'avy-goto-word-1-above "avy" nil t)
+(autoload 'avy-goto-word-1-below "avy" nil t)
+(autoload 'avy-goto-symbol-1 "avy" nil t)
+(autoload 'avy-goto-symbol-1-above "avy" nil t)
+(autoload 'avy-goto-symbol-1-below "avy" nil t)
+(autoload 'avy-goto-subword-0 "avy" nil t)
+(autoload 'avy-goto-subword-1 "avy" nil t)
+(autoload 'avy-goto-word-or-subword-1 "avy" nil t)
+(autoload 'avy-goto-line "avy" nil t)
+(autoload 'avy-goto-line-above "avy" nil t)
+(autoload 'avy-goto-line-below "avy" nil t)
+(autoload 'avy-goto-end-of-line "avy" nil t)
+(autoload 'avy-copy-line "avy" nil t)
+(autoload 'avy-move-line "avy" nil t)
+(autoload 'avy-copy-region "avy" nil t)
+(autoload 'avy-move-region "avy" nil t)
+(autoload 'avy-kill-region "avy" nil t)
+(autoload 'avy-kill-ring-save-region "avy" nil t)
+(autoload 'avy-kill-whole-line "avy" nil t)
+(autoload 'avy-kill-ring-save-whole-line "avy" nil t)
+(autoload 'avy-setup-default "avy" nil t)
+(autoload 'avy-goto-char-timer "avy" nil t)
+(autoload 'avy-transpose-lines-in-region "avy" nil t)

app-emacs/avy/metadata.xml

@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="github">abo-abo/avy</remote-id>
+</upstream>
 </pkgmetadata>

app-emacs/consult-flycheck/Manifest

@@ -0,0 +1,4 @@
+AUX 50consult-flycheck-gentoo.el 92 BLAKE2B 5532c765040436488578ff7601bba176f89f35090b090c7320226dc63f75182dd5dcb0fa7f99d66feba21fecec1711278b67b62f2e6a0fcbfece329af35ce95e SHA512 3ebed324f0c5a63c9bf6b52e4d297a1d6ee4e461939bd1307ad3189b2830c897a6107f7cc93077ececf8fc4ccd8724b546229ead17ec399133c5ddf999bae69e
+DIST consult-flycheck-0.8.tar.gz 2146 BLAKE2B 9b27456095012818b73484303c9d798595fb7997658952d8878b8ff63cbec860cb562e871e009ab4535f8ae12d67c1283b2ca80ce0927a471a846137a6eec8f4 SHA512 304cb58b164155f95e6c8088949fc3946145a50461388a2c8a085c940c20ada0e8834c861ee1f8900a02f308ed09c0a04d10917e94da8be0500539ddf87fe217
+EBUILD consult-flycheck-0.8.ebuild 472 BLAKE2B dbf051cbcadf6eaa2b5c2f8edc83f067f707940038aa7523c09ea02fa63d2686a5022a963a11c1f7cc6de7585a21da1b7e02f3d1576b14bca9482e39b6d1a416 SHA512 a900c3bba996a512188c392b81538c10c722c1e6f3bf708f3c26d6a927b1f76d3ae4d82bba512ff42170bd380c10e39f36aeaf4ec9152a29cec494d2990f15dd
+MISC metadata.xml 368 BLAKE2B 691c3ebb7200bbbf6b0b96d1b58ce74fb291bfebd29443b292cd0333687fb99cb79e1455110932bad9c77ac48dcf34ac2f5ae74844636d26542fdbcf571c613f SHA512 3672cd5201ebdcbe22a9412f21c788cb0b07d98bd2f282f530c29597d5d92a811231457e6e8e78bfdf898746b19771c6b345d19fbe8671cb578262cb0684edbd

app-emacs/consult-flycheck/consult-flycheck-0.8.ebuild

@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=26
+
+inherit elisp
+
+DESCRIPTION="Consult integration for Flycheck"
+HOMEPAGE="https://github.com/minad/consult-flycheck"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+SITEFILE="50${PN}-gentoo.el"
+
+DEPEND="app-emacs/consult
+	app-emacs/flycheck"
+RDEPEND="${DEPEND}"

app-emacs/consult-flycheck/files/50consult-flycheck-gentoo.el

@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'consult-flycheck "consult-flycheck" nil t)

app-emacs/consult-flycheck/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>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="github">minad/consult-flycheck</remote-id>
+</upstream>
+</pkgmetadata>

app-emacs/consult/Manifest

@@ -0,0 +1,4 @@
+AUX 50consult-gentoo.el 82 BLAKE2B 3443827f490db8caacfe842cc7f1d1315f3889dec007210f451909576a76139f70ac5795346a7a1b11befccd3152874fd3c86ad7a20c0fbf84f793f8deb595cd SHA512 dd2ba1149c847d95d6c54265bc03de36e198dfecedc10336f6879fb3a1fc9d92e2c6de190d4f9aaab6c3d15f268fb80e082b49b6e96165697ff786333a50a601
+DIST consult-0.15.tar.gz 90201 BLAKE2B 1652d5a2c1f559c67f6899fe26b221bfdf0599a20af7309e2dc57a4701a795c8decd2f878056297204611d045829ee1aa24ccb665e36c15f6a2a3a14eb81f382 SHA512 2b8926638c13633e2ccf48d63a3a76245d075694f046e20575e8c9bcce983a3610ef648374b01dbff4dbf97d116830040c8e76d9d75d05ca23278253e68138e5
+EBUILD consult-0.15.ebuild 456 BLAKE2B cc4edada3d2a580436f812bcee60e56015f354d10442fc63a9e48d4c57c77cae8f5bea75828478009b28049d715ba46e5042d37e8633f53fdadf70b98b4994d4 SHA512 9ec27b2cbc037a83b5ef583ca0d997863f1c993a6f200feadd9c0f914cd875b29d0194fdc118988e9345c233d0aba3cb869324cbe69016b3dd3bea3eb736e6cd
+MISC metadata.xml 359 BLAKE2B 569bd0c5fe81610f0b67c94e8c431edddb5060800a6e22d0833a4d5f120df34545dc49c879c12a6522ccbe791472df47be42af97fbb228498e79d9e0893697f3 SHA512 8e01b569f019ea43209f43c783fd41b9661a7235d300363a9441179058b10921629cf8b891874c706d2c1ec106248f6c1e0a3501df7bfcdd02000d08f7997c29

app-emacs/consult/consult-0.15.ebuild

@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="Consulting complete-read"
+HOMEPAGE="https://github.com/minad/consult"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}

app-emacs/consult/files/50consult-gentoo.el

@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/consult-autoloads" nil t)

app-emacs/consult/metadata.xml

@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="github">minad/consult</remote-id>
+</upstream>
 </pkgmetadata>

app-emacs/hl-todo/Manifest

@@ -0,0 +1,4 @@
+AUX 50hl-todo-gentoo.el 180 BLAKE2B 967e85d2d5738a45f21cc1bb038ac64366a0774d88fda4b542521f76ee204f88b950769eb120d2f537b0a48fdd239d17453263c19aefcbd1f2bf14d886cfcf88 SHA512 9b9b437d6ea14762afac357012a307599677f115bc1659d0c07cfd7db4eefa95b5a7104d03db101cdfefed05a9e510324a11066772e5642891c054675424e533
+DIST hl-todo-3.1.2.tar.gz 5506 BLAKE2B b44b1b21e1d40bf8ddff9cfc1e30d66fde4e4ee4779029820b4d5b94f040b02ebc562f2c571d1113ac0501f107035e9d1d4e9e31052d3a2aa56fd7988d3c14c4 SHA512 c1ee4d50be93348ae9c4f754291b157592701bf362d83d1cc98406965d313539f362338d214b8574a83ebd06433ddb3e07fa33b6657f075b744eecf1e38b6114
+EBUILD hl-todo-3.1.2.ebuild 432 BLAKE2B 190669f576b8b59cd8e7b152f1600dd5144b05e7e2adb5761e995e5f4a9590aee0884619def229892f5dc254f9a504c21e704c2f124d926cdb171014b76b612b SHA512 823dde84abee951529c0560b140463339f63f70645ffabbf66ea635f8c1c4a7b0b503127ac7b146352660c6b64f3d2bec31d47037e303c55008d4eac7d4f8baa
+MISC metadata.xml 361 BLAKE2B d64dcf7b0a3a4d6fce92bc067d14e85ef5f4124414269aced39eacbce3fe1f2e96a5342886dbc8bcca39a0dfd6b2c2919ef404b106b408e3894f0c6e595971cb SHA512 3b795dfdb6a9c151218874c8a753474ba352e4d8d701de6f08340e9e11456752fcbeefcb715da11a1930ede0a6cb079bbe99c0d77e772413b5db86749d9a5581

app-emacs/hl-todo/files/50hl-todo-gentoo.el

@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'hl-todo-mode "hl-todo" "Highlight TODO keywords" t)
+(autoload 'global-hl-todo-mode "hl-todo" "Highlight TODO keywords globally" t)

app-emacs/hl-todo/hl-todo-3.1.2.ebuild

@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="Highlight TODO and similar keywords in comments and strings"
+HOMEPAGE="https://github.com/tarsius/hl-todo"
+SRC_URI="https://github.com/tarsius/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"

app-emacs/hl-todo/metadata.xml

@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="github">tarsius/hl-todo</remote-id>
+</upstream>
 </pkgmetadata>

app-emacs/ledger-mode/Manifest

@@ -1,4 +1,6 @@
 AUX 50ledger-mode-gentoo.el 364 BLAKE2B 5972883970743cfc2d2732b0a50ba96bfa7e82000f26e6b3bfcdc81cf7e999ac8d2687cc2e1cb416e1863d91be1fab0bb2446ed851d9c26773908858f795d6a3 SHA512 45b4e233dd4f821828c56daf3c5e7d044a0850825e9a4f32ce639de274e1e5cf23407cec337a607b1e373347de77444b851cdc17983d779fb113419c05446ce2
 DIST ledger-mode-3.1.1.tar.gz 55876 BLAKE2B 49dce2a58c278d3bca6ceba353766296609595609ce0976c8efdc6f17836ace4a0cc8676ab2de9522cafc036e97b2eaafe6fede1dd4d795201a676a2a519c761 SHA512 0d79e15f5a91eb361662761a3cc0a2d556584f3310e270b8a4db5648fea06022f74970faa5716e3726da902922eceabf4c8c5d281d02be66e8d785a4d7044d71
+DIST ledger-mode-4.0.0.tar.gz 96248 BLAKE2B 776b63768a3251f5ee18b49ab90fd1fed8a33b7ef9169c1882f0b757889d6da81ae75936c417eb99efedb2bb90b85c8e4ef609970ca968f64775055b41a13875 SHA512 0ddc3c8652997a3ca0609f2e3ce53488e6317364e918ca29b8b42bfcf2992c4090d6fd894b3c361dc1032ea28cfa4ca8f522d1001ed95778bd1bba41dce0a0d1
 EBUILD ledger-mode-3.1.1.ebuild 545 BLAKE2B fde286fefdc51565f44c3d65d4ec5b4518e2b6225274f4b1adf1e03de148b5d91a000bca49da8684c3102ac2215071aa74ba565b6d69fc8775f65ff470c8f1cd SHA512 daaa28419116512582c5e5e4422990d32feac83117f098c27cdf740e296b2136935b6a556547484d1b0c7aea5d868ed7ba4b92d5afd8eb5f89b1a88d12b4d72c
+EBUILD ledger-mode-4.0.0.ebuild 547 BLAKE2B 6e63e9bd27d67113518c26f99fc86c30edac46914555896f83a980a05a8f9e56db627c83f2f75e17a0d79548c785901fd74a8f0692cc4f0076bea0d7fe354fda SHA512 cde373e51e613b44e59da2a4631912a98b1f2b091e071ff032bfd2f6f6ab6695a6214654d899accd9229b7b132b050cf61d1446be74fee0587431e651bc3d974
 MISC metadata.xml 364 BLAKE2B b9e75591e73a975d447581be9b6f2effdb4f1da4d97046e7797199f77af0536c670191a4df1e4e0ed6319ec17791ea92c1f280058ede1782d99701563cf6b880 SHA512 9e210dc3bb733064fd3b79f1530dff710ef419bcdac01cce2c6cb3511f946736675a110d947b7d2de18cf7e54161054e9d0108945c73877ee3361a372af10790

app-emacs/ledger-mode/ledger-mode-4.0.0.ebuild

@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing ledger files"
+HOMEPAGE="https://github.com/ledger/ledger-mode"
+SRC_URI="https://github.com/ledger/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="doc/ledger-mode.texi"
+BYTECOMPFLAGS+=" -l ledger-regex.el"
+
+RDEPEND="!<app-office/ledger-3.1.2[emacs(-)]"
+BDEPEND="sys-apps/texinfo"

app-emacs/lua-mode/Manifest

@@ -1,6 +1,6 @@
 AUX 50lua-mode-gentoo.el 206 BLAKE2B 07efd36ded1a442c754102c22bea97ee4bffc2c89e40fbef2d8e644051766da13da6b0d2034f3a4e27fa1522949ff351a1105651d79d9005bf38dddd4bea6577 SHA512 b062343ab77dcaa50355498a63681c8e5bc6f209b1aa5ef82d65be8c19aa52d58c2efcd481f091804726b095a02b97de5b6cbce232ee5d9f328c5e3d888b496b
-DIST lua-mode-20151025.tar.gz 35319 BLAKE2B d84c79622793c51caf7262749d4648baa106f7a2d639706b495097d89fbe8f3ce09482ca12a0473e4a4eaf04cab83ee8b65d62e505b32b12302571efdd1881d4 SHA512 1b2877ba9ba24694b2a820a4e1408d0f475f04bdee424d346fc2248980863aaaf230f757365095304cda763addb32de7e6a2585218770f66d519455d1a32762d
 DIST lua-mode-20201010.tar.gz 42458 BLAKE2B 7bdfd35a8cb2bd1abea477fc408ee1d36c482310764d95acc0e0032a316bba005c15be9b5b862f249d72a7f6bdb30e71d951182023686f5914f4ec5272eb03f1 SHA512 7df283c4a6445979b4ceb1e398d1b48e8967d2f631f33be3f58171758ceb613ea8a4c7a466975bbe77d2a361b70dc9f30b7a244be34a87de0e6434b61088a6a4
-EBUILD lua-mode-20151025.ebuild 646 BLAKE2B 16181ba7dbdb6029fc5f472f121c90bd258e5bfca7a3d66c43382387be74baf72c6029fca6a764ee008832450777886c4a40db60c089e6acace1a1e451e3e68e SHA512 349032a3721c29854d70016433b30d5922b7d33f667f08bfee48076300369b9275361991c46a75089f3f563e1f40f566987da2853d6999eb17ec6f6092e6ea26
+DIST lua-mode-20210802.tar.gz 53708 BLAKE2B 59532423c87dc0a50401352151756f66cb757e3ffdd7bae066bfbe4e4d90a6ea52b90b106e998c5e2abe05bdd0be9a653b1d226127380b88c5c13def5292a622 SHA512 04a85b6911c295ac02534b812bcd90c8f0224634c77b1fdcff86a24315749af07d86a8b4f8c65caf853849d4a9af9e85af9506606d0e5193e37644130981ccc5
 EBUILD lua-mode-20201010.ebuild 628 BLAKE2B f376b55e3861d32b7cf18628372016e33c8984179639b4358712f8967824ab6f1cdea7cf1aaccd091e707133b69be43f738497e5dd2811f11413732935e09782 SHA512 c6f1a10810ecb55bac8a434b7607a198e8fa573d560c99977b2f2ffc3a07b490a8b147a04269611c05635407550228b75e6e1a25a231638e040d57fe1f188fc6
+EBUILD lua-mode-20210802.ebuild 635 BLAKE2B e0cbeb48af6129dbcfb35ad1978fda9c2633aa9e5bf154ceaf1e344ab45001604b5373c5ffc721ab64831afbb036a90fa31c04b3045a01e82017b1fa9f52bad0 SHA512 d7c721bccc41702b77672b187340a07e9489ef5d19bbcdc172674fb747465b13e5602459b6df36864fb801fafc02350165a0c0912f7a2cb1ebbb42055ee753a9
 MISC metadata.xml 362 BLAKE2B 34214f3a2a012b497368307bf473bcd67fffa8870407fe6f140c4db0fa66152c6eff1f14cb775e286ce732b9df6df395a43561fcd3304ddbde30702c9cf50843 SHA512 341faebc485a16a7c1e07e20aaef61c12d21e9f462ffb6cb5599c91f08517f1cbfec94752038dafa2a1fe95ad3748a404debec8fe3bac5c0249ce651b1fefbb0

app-emacs/lua-mode/lua-mode-20210802.ebuild

@@ -1,20 +1,20 @@
-# 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
+NEED_EMACS=24.3
 
 inherit elisp
 
 DESCRIPTION="An Emacs major mode for editing Lua scripts"
 HOMEPAGE="http://lua-users.org/wiki/LuaEditorSupport
 	http://immerrr.github.io/lua-mode/"
-SRC_URI="https://github.com/immerrr/${PN}/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/immerrr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 RESTRICT="test"		# tests require cask which isn't packaged yet
 
-S="${WORKDIR}/${PN}-rel-${PV}"
 SITEFILE="50${PN}-gentoo.el"
 DOCS="NEWS README README.md TODO"