Sync with portage [Sun Aug 21 21:04:35 MSK 2022].

2 years ago · 441039e608
parent 0ccce33ab9
commit 441039e608
1066 changed files with 12592 additions and 11300 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29629 BLAKE2B 3425e2123115cf415160f9c67aa149fbd71cdfb66e182e784d90e00ea5d5653ed9d94f77929f4576084c4d1643fd9cbff54146b680d2c179fd2df2fbdb438379 SHA512 81234bd20f53fb0da090959259f17c41206213f89db5ea2c06cec47a4abcc982d541bb25ced90c10db809cc5a6542898b20c08c4ebe246ab5722202bf7729c6e
-TIMESTAMP 2022-08-19T09:09:59Z
+MANIFEST Manifest.files.gz 29631 BLAKE2B 5795c993060d4fadcf45edd86ed02a02a695b7dd2a3ee04a99c578e2bfd95b839e53d9632987001053ffffd6a40abbd1da4d74633b413e75a12993858c29fe5c SHA512 ca3c49e4c3367b82c74595c8c00b7a0cb860c2d1c125a53a400e0b89f7fc40a637a3770708f1500268165a05300f865a0365491e386ca9a1035d668f2c0a4404
+TIMESTAMP 2022-08-21T17:39:50Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL/U2dfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMCbeZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBHRg//Tm7aP99k6NtbbYQSi5JpTiG1Nyhj8oB+FSXLn9YWMoGlY8YjOyMGdlTo
-rnKR1cLFIC2TgBws3xZfvLoFcDyMsD7iihU9btbPfK6cNbBajF9l5k+dh9xnMxyv
-TXlf0whlGe03pC2Q8pY2s4sLxzIUQ7Qbp0HKjr47RjD3QmnH3rHKwVOwYCHovGZV
-dU0+ktjEaKng0WBmhCUbflYMxVwZkbx4vBNXHgUDFEXF45VcFM6bls2ZWT8dM+MV
-HveWLjsOQW9mdFkd9sr7kNAXRIJ+u8WsUK/DO3jbmJVHWAuTxy9H5rZ2GMFLS9It
-3X9YsvfQh2hxywEmFIqCQYMNBNoItLAyd2sKpzrP5TXlVPgv1ZQh6o9fzcJBM7KZ
-/zydRayWWy+2lOKTDSfC/1XwprGFfOru7pKTTIvflYTAXFCmxCoDvE7BEkmE8m7j
-MOaJKF8glN2+b4Hu9TJobsCamRCtWnUlDM5AJzIJhdQh8TjGyjm4Hs6HGNTlP97V
-S2huAom8YA4ZUjzoYwoet8FhXsd/a0NMtlhmI5R+wk+KLlJsuwvMGYBRArfwzSwR
-aOv4Ul5wGhLICTz8Y9xKuiMKaGhqe0R6WRHp2jJmLE2cUUsS3NjWG/DhkTIdKch3
-lFhfa4UbRKH6ZG1DGxCJuFKxcVpUhGuMP80VYRrxQQfIjdoBA/o=
-=KWPu
+klDq6xAAtw+rwXhBfCVTq6zJrN7ioU16yWYQEFNSJZCBfJefy7UT+18Ylvq7ybrN
+8T2KHCLsAbICUYx0AgLUZh+dcAsujUEl5aeEJdHVDRte7huRm/fTCaHsxBBMWYnC
+/nnRH8OkFOD4gqVV5LQS6uywEQRe+B5xO7qtdyBb24fCa/lAt6FEFmO5Scz8zTEL
+fUqPoZi4pEw/uwCXbSdvsOc0+Ij6pZN2DNoKDq6TU/FpD9Os7Z0HuHHRODiNQyD7
+GWZ0e9gi+xrDW8mqncuoqx99uljXuVen56in3+mXcYhYDpm/JC+DjB96Ril+SfG
+zQkNB7KGEJPfnF68p9EtGEb2CLVy0arD+YT/LZoveT8bJh0uz/sZx27ni+5+6aQj
+40zxo9iQr0BogxnbXeaw/NQk6DTEa0N9qfJsCujGKAwXnj5XH44q7dA26wWSPqiq
+6TE9a3216XkFWj02XTLP86YNYsXfxJnnRjrQ0MJC385tgIHymztscikp8SW0czOd
+NBcFK8CSJj+2R73oi5lU2F9iL6PGuwe7xvWMhJn6h/eJJdlSk+GKeEYlRjtxxD4e
+upB4MW/bFopekXacy9sydNbBUHtl82WDjKD7V3991hmDeR+GWWH8Fmsvye082uN
+6YQPgZjNa3/E+PLAdIlxBaL+HKCyxuK0jmEqnguS0/Y4Qr9IuMk=
+=ccZD
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/speechd-el/Manifest
+++ b/app-accessibility/speechd-el/Manifest
@ -1,6 +1,6 @@
 AUX 50speechd-el-gentoo.el 207 BLAKE2B e12cf59adb3c4867bdf0f7926b5de6d63ff46991140343c4961fd5b11a4befa9fbba877a74e4c7b0591221e2f8deccc37a28fb37414a03c80f95a8e9015cd99e SHA512 f5a891ca804aa7cd60f0ea7095903f15d9dfd6ae0bfd149fa897423f31db52a1e7786134e009c706207825d0bfe6e258288f8c6425cf26e7ad9da26fb1e9dee5
 DIST speechd-el-2.11.tar.gz 144000 BLAKE2B ab87885b9b0873a4f00f8a960d9a4c10321a88e1edd402bc92a45dd2fc631be2a17398d0995c4c9e8c88221727739c27b506cab9cafb3a9635193bd5b9b83a3a SHA512 fc6be9f9c6dbf34be559be3ceb38ecca0e94ed7230a8e738f3bdad4153e7443cdf72f34a229c6cb119cab627bc4cfcee0542817715d980e01ed2c776c23b1b6e
 DIST speechd-el-2.8.tar.gz 474614 BLAKE2B 36ac862c2f14b3f9b5be25bf666c466093f8e5bf3d456058d73a4eef0cc766d9b36ce990d8a3ee8161edb4190637a199853ac77eaedc28afd101ebd95842c47f SHA512 1a34e433d5ae61c83dfb7d3a9f26e25210613355f3a71e7601f15865cd9693db81dd9f559aef41bd3142d25702db88006bb9fd2053b597799f1b68c48911a3d2
-EBUILD speechd-el-2.11.ebuild 934 BLAKE2B 302e895d8326ec3eead108c930cba556486d9e8fb6f621cac1951e6c1ed4861f466313cc7c886da3b9719c544d3c281c7c1ef0bb132039b05f299dd5e47d17d7 SHA512 33f2d48d062b803c50617b2f58f8c827057897b88de702176ea6da1713161790646950b41d515ed5c934f5135c7b2f39924c3f386814dfe543fe391eadc1ff3d
+EBUILD speechd-el-2.11.ebuild 931 BLAKE2B e389dac5a4f54a96a1eddb1b1f201c59d91bc712bed1d912828624001e0453ac2455be345844cf8417d90f901f93f9f14574c57dc2ce137570819e65f62bf1f3 SHA512 0d911f5fb1d668924005ecd228b39185a25b6425133038a2662ec29406a10afe7aecfaa2c0c79ec299fe0df46d0f047bfab61511fc9d57cfa867246a694c4640
 EBUILD speechd-el-2.8.ebuild 994 BLAKE2B e912bf5b2d44d7f9db9de06607627c0a8f3a404923de6eccc58807d23c20b0ea0950684a8a09c8bd951b0e02719d1b3fb68c40f4618fb3b6adc5fd055430e061 SHA512 94d620eeb4ccfa108ef31a36480a360f84e0fff64e37bc1fb8290ce2d46a769b795a1b9f3b9417fcb5875186e3fc93768d45ef7dce92ceb78ac3f30d3d01f27a
 MISC metadata.xml 464 BLAKE2B f2eaa295dcc054afa26f0aff0b2cc4a8a653d73a1ff955577843b7db02887b9d1391e1281b6e2b3ddf2e7c38f7f3ff411d4cb4db12cb91aaa6a9b22233b87414 SHA512 786e80f36a29dbe3e16a9701ed6b5a30051ac28e551842693c456d8936621eb6a956d8e7f650308ae52baa4af8e6fc35fb6de2ec6002a291f49f2430127269c9
--- a/app-accessibility/speechd-el/speechd-el-2.11.ebuild
+++ b/app-accessibility/speechd-el/speechd-el-2.11.ebuild
@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-${P}

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"

 RDEPEND=">=app-accessibility/speech-dispatcher-0.7"

--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@ -1,16 +1,12 @@
 DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
 DIST ansible-core-2.12.7.tar.gz 7756456 BLAKE2B e9c5b446fbd80524572646667875afa26a28cd6f8a0c138383ef2af7fe2e51ba5dcbb19bdbb00e7e367ba78f9667be0b03320f887367dc5cc3d18cfc33ebf89b SHA512 15b29bc52cbcd690d442e4923bad23c2b4db34b1d9af9a7e3a73fbad6b4d775795a44df80c739ad409206767f6bc9efc3d5abdab593fb2abd6ba991ca8cbee67
 DIST ansible-core-2.12.8.tar.gz 7760983 BLAKE2B 9050033ca76f7f3bb6d5043d58e7a4b2473ee1eb21b5665654e5a571e8ebe408897661ad0f13c4f4b0d1569c1df904434cc4911e1b561b229d8ab16109127930 SHA512 1bb30dba44f11b0655000350b54cae30b85258dccc130d5cd2b1a5c70e0ebe93abd8fe41d5830da34b6fe622276f69f18a0f47bf9d0b0269338a7efbd5820e44
-DIST ansible-core-2.13.0.tar.gz 7383065 BLAKE2B 14c9c30a1d04c4235877da9a2d866bae229fa0bb28815dccc2cbc37ca7a767a6a15b2ae1824849cb2c7031b3c3bdcac433b04bf353265228ab2beec7650aa7b9 SHA512 37e17d73477ba88c62af94a6912f9b4b91ebf2ac967c2845875e293fe2ed09307e414644899714e604883973e241eed571d61b7a093a6c212446a1f5b702af6f
-DIST ansible-core-2.13.1.tar.gz 7407801 BLAKE2B 230dd2f1030c6da89d5e2be6ea7d83b78c05b4216bad6d99b51807cdd3114d13cfbc8cc3b5c3583249937f774ce5b15ba1d524f8d68c201d3042ff1350981921 SHA512 f40ec5c8fdcc1e3f2ed78f398561aca5bfd4793a5f4d9240930f7aaf96233f05c7177304c30c06115943b5b9e9944286f01545cedd378e9c3e7f93c3ebce7c78
 DIST ansible-core-2.13.2.tar.gz 13332205 BLAKE2B 446421a6ab86e1edd1087506c48b8d7eceaaa594a0c866fc3639c4b5a3809b4e5a7d39feb94a56be112dda585994291e07194f7e3392d0dbe6e088cf7327b9be SHA512 a57cf0388c0866b30513a84733208b85b5d352755e884021ec5120f32b5b76d751f9f03320336744d925f69f6b35064eb58081029f49f7987b9a877913c3c29b
 DIST ansible-core-2.13.3.tar.gz 13924100 BLAKE2B aabb87a327f2cd4b3a8f8a30d00b09d50ddf05bbd8720e446275004ba98e87bc1de513dfaedf9ee617c77235c92f171b590295ca8a92d03f47829eacf39e7cb8 SHA512 9be80d0dcd10d012c871b5c95b2357430dfa6809bff794158a4ae06a40761c01db60a966115d7a9141028c96d79a1d99d6bfb191788dc1c467dd0107dba7058c
 EBUILD ansible-base-2.11.7.ebuild 1648 BLAKE2B cfa73eefc856be5b4a7a71b37fd62b3142f09a9d2a89bb94f20d8c362bce8606e00a0efe2db3824e7e15008f346c1dddb217bacd559a410a031a76e5487b95b1 SHA512 0f71b29df5a4acf4d11eb088c567b0d00d8a1f5880e86053281165cdd36a6630339a90d5a122746e4d057b754cb19754a6d790aadc687bd8602697d91decf6f5
 EBUILD ansible-base-2.12.7.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
 EBUILD ansible-base-2.12.8.ebuild 1652 BLAKE2B 86acd8409ebeb175027e795e2008bbbc16ef67f7a18d2d523dc30325148c45f320aecb96aa0f3cc9df01095289f78089837aa540005dde997279db03b8909507 SHA512 b469bb030a5a101ee3e521caaaf69cd79859874fefd164de22af3bf926e61210fc81b4a4b74006eb3871051257f5a34351271e52945c6835ef5a3c20e6e4f7c7
-EBUILD ansible-base-2.13.0.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
-EBUILD ansible-base-2.13.1.ebuild 1649 BLAKE2B 1da2acd0074a8055f58bbc07ef6db49b8901f9261fb6466a6c37c229111a74513bbe1f21c2d22ecc4d2c0a7554fec997845df268b3eb8572830a25775ba493cf SHA512 ff174eea7a471f473a8c8d6ff7ace6bfcc877e0b1903628657909ebbd16477f410bb2a386e30ab1aa3897ebcdf76be1a4ab7f38314ff8c54450cf777ff537786
-EBUILD ansible-base-2.13.2.ebuild 1652 BLAKE2B 4d62ebd585cd7226ce888c7042bb256b3bde16d22af4b61a25004c0a68fb21fea5f1d781e1e779de93a767263b01e33d78d1c73c57c1c85517f46dce4a5c5e57 SHA512 1654e03cade0cdf01b8294590e4bcb589a019d031b3f5278f05945e87a0b2dcca5c5000873de5ddba870230380085d95fe1a017be8649b725ffb0ce5e2db9975
+EBUILD ansible-base-2.13.2.ebuild 1649 BLAKE2B 1da2acd0074a8055f58bbc07ef6db49b8901f9261fb6466a6c37c229111a74513bbe1f21c2d22ecc4d2c0a7554fec997845df268b3eb8572830a25775ba493cf SHA512 ff174eea7a471f473a8c8d6ff7ace6bfcc877e0b1903628657909ebbd16477f410bb2a386e30ab1aa3897ebcdf76be1a4ab7f38314ff8c54450cf777ff537786
 EBUILD ansible-base-2.13.3.ebuild 1652 BLAKE2B 4d62ebd585cd7226ce888c7042bb256b3bde16d22af4b61a25004c0a68fb21fea5f1d781e1e779de93a767263b01e33d78d1c73c57c1c85517f46dce4a5c5e57 SHA512 1654e03cade0cdf01b8294590e4bcb589a019d031b3f5278f05945e87a0b2dcca5c5000873de5ddba870230380085d95fe1a017be8649b725ffb0ce5e2db9975
 EBUILD ansible-base-9999.ebuild 1652 BLAKE2B 790486ad0a49351a7c12ad6ed3661bf16503423edaa8fb7e128dd8cdb06c1dc4c19aa3e538faf16e51c244e83ab000d33f2892dd97b6f53a8d49d4a0a1a15dc7 SHA512 d4fde99d65fc48702f6def192b0c8bd042fe19659e98a0cca4c3f4567b5f8f86cdd12d81ec62dfd9f828c03ac71bdc6e42adec695fe0175b37f420a47c35abab
 MISC metadata.xml 1040 BLAKE2B c516a3b141924ad21424220f2a9df134d428156283f00f01a6c953ef837bef941fff9f345b48aae23a4af29c938d5053f6147d2e7c43b24af16c1c68b79b9d5b SHA512 6e99c597f3d16d8a5173da3334639e0beed6c95235082b152a3ca256de4a10907c083a646d69152fad23816ac2fb81d0f8d3188fe1713f4030a638cd225e3f61
--- a/app-admin/ansible-base/ansible-base-2.13.0.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.13.0.ebuild
@ -1,64 +0,0 @@
-# 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_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
--- a/app-admin/ansible-base/ansible-base-2.13.1.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.13.1.ebuild
@ -1,64 +0,0 @@
-# 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_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
--- a/app-admin/ansible-base/ansible-base-2.13.2.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.13.2.ebuild
@ -19,7 +19,7 @@ else
 	MY_PN="${PN/-base/-core}"
 	MY_P="${MY_PN}-${PV}"
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 	S="${WORKDIR}"/${MY_P}
 fi

--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,15 +1,11 @@
 DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702
 DIST ansible-5.10.0.tar.gz 36898833 BLAKE2B 5705325c150909e4911cbc6fafb9b6194bcd15cf7a97978835b29cb8b87b671fa888163e28e825d1fc98006c57313677afed63236f4a55af415a70daf5fe305f SHA512 d81b34642533dfaf0c3dba5ecc8ba483efb3d82bd40afa469de2778666e932bec3c20e61ae579184fcbd7f1ec7c8d694617f334ebb3e910db3c9f6709d3b9385
-DIST ansible-5.7.1.tar.gz 35657258 BLAKE2B e13d294327ff6e6ca42a5fe95d5795c984319bace80da1d9e62b0eca861ac60cc9e6551c3bef6eddd8629670bb85b1f9ebc48fd093880248988831de2056908d SHA512 cba20da1a87e96600214b89539b5dd9ea0439edb6ccd757717c4041506b7ccb8ca046cd11840b2418bf0f6e725b21e56c8ac057f13604baba610d3716deee268
 DIST ansible-5.9.0.tar.gz 36756162 BLAKE2B 4c713f0a45536aadbd20451c5b5ac37b474cb1d1f9fbfa6031b228a549bfd65e1ae0ee76d6fcd08a0de43d7d07eaebf90d08d00764acad438bcffcdb09c5d58b SHA512 88b26b1ba59a39370ee4a27eedda441d6e6ce8ba8eb857353572c692e49b189e95ed80e5063917c52799fb15bc3608d4c1ada013a7d650909714ca8ea5dd3bbb
-DIST ansible-6.0.0.tar.gz 35015538 BLAKE2B 30736f5742c6b8a50f1cc763cec8ef7a7ca8d034a6365bb5aaedab7e768e35fa0ffdb999b53e59389da42e5ff305912e1716ce3b2847cfb44888fd22793d8abd SHA512 490bdc574ad6a444f8007138a12be5e5fcd8eb7abdd5466ff1924ac7c34e0a71be1c2495666ceefa1c88da48900fa2bca2c1e8d5775f3f559b1fa285bbcdcae9
 DIST ansible-6.1.0.tar.gz 35074113 BLAKE2B 4468b7f2ecb93229c92f2d32ce2821c836164ae5281f69c2fef01026a3424ba13e1a0bcefb7c658857546e7bb96f58377b613c4b4eee1828e005bb7328bdf796 SHA512 795d3534d6993bfbf5d4cabed758f9370760e14e851123b4578c3aaf34f104a52f6d57d641ccbe6f18ba036bd9245b0898e76a21671ce95ddceda9fa5305e2dc
 DIST ansible-6.2.0.tar.gz 35390078 BLAKE2B 1e7a5f69e837fe3ec383ee3f1d631ad7ecbd502e582752edef85b3e2841b38ba78af1e7f080b4da007283291d487e481141bc4261b351f48be45874a3399789f SHA512 7e0751fdedef6bd92a01c06e23dd482bb4b4795ef5a17754eea8f8297cebddb84b4d20041affec6589297214cd820cddaea4618d2f3a158daebb556c4a87bdb0
 EBUILD ansible-4.6.0.ebuild 701 BLAKE2B 23fb332fd50a5de4e58bdf7479eb072284e8bafac36a6340da061e8a0bda644a4dfb5e4aec4be0bd182a43d20a7157f8656016965a62ab5eca17dc9f72879686 SHA512 1887aefe7d3ceb06703cce26f2442fec8de7ccdd740b5cb24cf67945ee5efdbe7adbe3cbec64dbcd2ea6b16db573f80cd4fa22896187d976a5a2fb29cb885548
 EBUILD ansible-5.10.0.ebuild 705 BLAKE2B 3aff5e97267d1d1bfeb1c51ea3c1bf6602434de0695fb7da8c995146e626fb4c817c6a86bedd5328ac25665ed511668408af652d54c25b50e4b9f55090960ae8 SHA512 3adcec18ad42c9d3edbad2ef586ea45eb15216072eb6ad9a90ec0aeed6c5001e73f43a73b0cb74138e0eb2481485a01440ceae22ec666f4cd97d5bcd067e3ca4
-EBUILD ansible-5.7.1.ebuild 702 BLAKE2B 7ed0f66425218b72a4b90d310ebe3c305296db12e3940efcb7f54bd8068c81671ec8bbcee375aae774dd9eab1d20e92f63e926562c5485750e5da5a3fa3957f2 SHA512 9edbbcbe86922ce40e0d7dc415153d6fba463027ca3ff15fb7cf943a15aca076c5ae8d5cc6fd5b3f6e62cf7c9d10e217626b7213f82cdabad1ed91a97baedf39
 EBUILD ansible-5.9.0.ebuild 702 BLAKE2B 7ed0f66425218b72a4b90d310ebe3c305296db12e3940efcb7f54bd8068c81671ec8bbcee375aae774dd9eab1d20e92f63e926562c5485750e5da5a3fa3957f2 SHA512 9edbbcbe86922ce40e0d7dc415153d6fba463027ca3ff15fb7cf943a15aca076c5ae8d5cc6fd5b3f6e62cf7c9d10e217626b7213f82cdabad1ed91a97baedf39
-EBUILD ansible-6.0.0.ebuild 702 BLAKE2B a584b2c5b9bd2e2d724e3d712f057b1f2412ae946e13be2b2a31d5e84936ba7cdf606978f776e916fbac0bad0f7f83d3dc0b105707238d9baa03747d32df663f SHA512 b33993cfc1acea190319e1f37136dfaf11f29c8625b90f3710062c3df4c3d3fbe1dba91a946511ceab755e709d697649c14a34522956457cd6c142a2ae9356e4
-EBUILD ansible-6.1.0.ebuild 705 BLAKE2B 09a68de4d26fef9b7bae56b435b64aed0c28ba9ee5c45aa56e2a9b314124b9fb14af0b6d3c9acb6a986c07902aed68a7ea93e092f1b862e61d00cec1ce13c1fb SHA512 23566e58957aaf63da622a5cf7b92c4f289910710c0d2a326993e90011e31245665a4d26787fea38a5f298c0ec4064f4d4594e0986ea404e765b95b267ff1279
+EBUILD ansible-6.1.0.ebuild 702 BLAKE2B a584b2c5b9bd2e2d724e3d712f057b1f2412ae946e13be2b2a31d5e84936ba7cdf606978f776e916fbac0bad0f7f83d3dc0b105707238d9baa03747d32df663f SHA512 b33993cfc1acea190319e1f37136dfaf11f29c8625b90f3710062c3df4c3d3fbe1dba91a946511ceab755e709d697649c14a34522956457cd6c142a2ae9356e4
 EBUILD ansible-6.2.0.ebuild 705 BLAKE2B 09a68de4d26fef9b7bae56b435b64aed0c28ba9ee5c45aa56e2a9b314124b9fb14af0b6d3c9acb6a986c07902aed68a7ea93e092f1b862e61d00cec1ce13c1fb SHA512 23566e58957aaf63da622a5cf7b92c4f289910710c0d2a326993e90011e31245665a4d26787fea38a5f298c0ec4064f4d4594e0986ea404e765b95b267ff1279
 MISC metadata.xml 726 BLAKE2B 92c09d65c38a346db34eddf78f75aba7d914df678e37dcd54b1a47cf3d7f043604fad89b435fa08877bb0c7254fb1a99db32bdd298f2b12af6f8089828f1e67e SHA512 40b712fc2055cfc60fdcb33705757509adc97feb893c46dab1e6e7d8b88ab2026b3b0ada66d7504f86b25072a4d3bffee023a5aa0e8b5286bcf58a8cb18c5ac3
--- a/app-admin/ansible/ansible-5.7.1.ebuild
+++ b/app-admin/ansible/ansible-5.7.1.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-base-2.12.0
-	<app-admin/ansible-base-2.13"
-
-python_compile() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-python_install() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_install
-}
--- a/app-admin/ansible/ansible-6.0.0.ebuild
+++ b/app-admin/ansible/ansible-6.0.0.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-base-2.13.0
-	<app-admin/ansible-base-2.14"
-
-python_compile() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-python_install() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_install
-}
--- a/app-admin/ansible/ansible-6.1.0.ebuild
+++ b/app-admin/ansible/ansible-6.1.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"

 RDEPEND=">=app-admin/ansible-base-2.13.0
--- a/app-admin/awscli-bin/Manifest
+++ b/app-admin/awscli-bin/Manifest
@ -1,10 +1,13 @@
 DIST awscli-exe-linux-aarch64-2.7.11.zip 46384612 BLAKE2B 1728dac769441954b86f1436708c7b84aa4d1f7affc634de9e6a7bea66a10e5143a6d1da3fd24e8e721cdaabff0bb4b363bef78e29aecc976e9cd5b961284a2b SHA512 3f3e2670614bdcf6751d556a8a150d573712b036ad904a7cbfbb85600241d04f7f257df2d1159e2fb6f5b0d02b7f65df1bfb00764218ef60782a04a7fdebdc2a
 DIST awscli-exe-linux-aarch64-2.7.16.zip 46227549 BLAKE2B 28c72891454779337e7da8cb554310d54af0d3e3aab45a9aea76350eb0db5cba592c67f55f8feb0b4f57044a7b2292d6ac79809ceafd1a8d62639c67f6018e7c SHA512 e577e3507310dc48d323635592df5c7c12ac5ba90578d5e9e0a74264007b3c4bcaa0bf43d95f37d4974e7a83e57fdd3ec3a36e43ccd8ad359d5a56b7cda7402c
 DIST awscli-exe-linux-aarch64-2.7.20.zip 46289081 BLAKE2B 1750e609bef53775e4bf66f1be78e2b05f763bde7677be99867ae89e252f1deb81dddf6011718ceafe1f97b53ac4871657f2644c478887eb4d021e14be400121 SHA512 f519aaaf2ebc3e163ae55abdb85b08dd49e148f902a06e671f582879790bdfa07e32f8d8e773ddeb95494aee3a38dc3fbdf91a93b14215f63e13ae87cdf3de4a
+DIST awscli-exe-linux-aarch64-2.7.24.zip 46460084 BLAKE2B c24cf41c888b1469a793354c9a97cec4273f6a762ec74b4079ab8626d0eddeb95dec5ef66270764a1c8d3b1525a5460e63009441ac83ef966b43f68efe41b00a SHA512 ee4201a193e393cf7fd1e9c473eaf41a1d7934e342035b931c3d69e985bc9e74434d31d0b46bf176c27c41d1b1000bbd487a514d62c8ccdf8d7c7e82c621d1f4
 DIST awscli-exe-linux-x86_64-2.7.11.zip 47188206 BLAKE2B 9530ad2cf832dab1d5fb38a4942d338629c24bdadebe6abd0ba3a1759688e2ea9666cd97d8643d6ba7469bc446f09bd4c63a43f36deba1afb133ef00da49ce6d SHA512 6a15745502e273ddfad1d9ac118aea1684cf62f533a0fa3ac7661c31e49984ce1d0b608c61f5ed182692686ab7fd992f9a8da6a066bc4da6fe5e3d386548ab8f
 DIST awscli-exe-linux-x86_64-2.7.16.zip 47030919 BLAKE2B 1ac5789003753b015278eda42109c9ca5ee4710d32b07940c3abac0100844065fa6bffdc854446a7b4493727d3648f0514fe10e09b50c77d79f42139e2c64fcc SHA512 ae76d7425974154f481546b804cc6f359702f9357e670dfaaa7f943aa2ca27124c66388032ad9b4fbd05d82f73b7401fa7d07d7d4742c8f37c49eca17e6e6564
 DIST awscli-exe-linux-x86_64-2.7.20.zip 47092365 BLAKE2B 26320deb54f66043693aa40cd2fee2e110f2dbf1710278ce431781d49096860dacd906bd91a01160c69c484020cc1ca497954283213e85d42206ab2dba3f1c92 SHA512 6f5ab60fe3b59a7c8ad73e81b3d3003660736fe9da35e5e44b8d222a94cf195676a4802e8ea391bbefb9cbece77860148be1f616f32281d18726af126c7daa4b
+DIST awscli-exe-linux-x86_64-2.7.24.zip 47216162 BLAKE2B f99393a089bc495fc82d4f208f555bce144adf817b15c2995ad97493c16e18e38ee6cb77fb29c9225ff144193f878a7334ef90c318a5770d5c58b1f7e2209632 SHA512 2c25637fa421117aa3629ddfe8f9ead7ad3d7f04ead819b958e2b274621c858ea9e1ba2d9c111e63511ab75a1a7f0db275f653da2fef58dd5ee03274b1e7e8b7
 EBUILD awscli-bin-2.7.11-r1.ebuild 2289 BLAKE2B a10366396fb39fc81382351de2b57dd95afac77cb9eddac2c11245460fb16614d8d50be696dd88ca978f13096070bc0de3909f9433784c2b3ae3ef7d1237d3a0 SHA512 19eba643095a14c9e3a4723f704b4a6d34a8fe6e60b75d6baa56030b55f7870af23cbfa8ddab7307929d611843d43ad1ebf0dbc65eeb2abcd2a198e42afff871
 EBUILD awscli-bin-2.7.16.ebuild 2289 BLAKE2B a10366396fb39fc81382351de2b57dd95afac77cb9eddac2c11245460fb16614d8d50be696dd88ca978f13096070bc0de3909f9433784c2b3ae3ef7d1237d3a0 SHA512 19eba643095a14c9e3a4723f704b4a6d34a8fe6e60b75d6baa56030b55f7870af23cbfa8ddab7307929d611843d43ad1ebf0dbc65eeb2abcd2a198e42afff871
 EBUILD awscli-bin-2.7.20.ebuild 2305 BLAKE2B 49bd417c8c54ac715176c3043dff2c99ff48f2eb62c80e26f4464c9b9bba989de0eed39f7e12a435098a02b50790cf0b6c3f2ea073f4af3669981728d3124cd8 SHA512 2977797f3c8e9a1a16e5cbad3de6c765234d2d093cca1f166929465f75d116e92fc7be4bc6f1bafe63f1a82d303bbc9cf10b3cff88fb89f79aca5df7c10a88e3
+EBUILD awscli-bin-2.7.24.ebuild 2305 BLAKE2B 49bd417c8c54ac715176c3043dff2c99ff48f2eb62c80e26f4464c9b9bba989de0eed39f7e12a435098a02b50790cf0b6c3f2ea073f4af3669981728d3124cd8 SHA512 2977797f3c8e9a1a16e5cbad3de6c765234d2d093cca1f166929465f75d116e92fc7be4bc6f1bafe63f1a82d303bbc9cf10b3cff88fb89f79aca5df7c10a88e3
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
--- a/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild
+++ b/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild
@ -0,0 +1,90 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="command line interface for Amazon Web Services"
+HOMEPAGE="
+	https://aws.amazon.com/cli/
+	https://github.com/aws/aws-cli/
+	"
+SRC_URI="
+	amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
+	arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
+	"
+
+LICENSE="
+	Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
+	openssl PSF-2 BSD-2 GPL-3+ public-domain
+	"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+RDEPEND="!app-admin/awscli
+	sys-libs/glibc"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="*"
+RESTRICT="strip"
+S="${WORKDIR}"
+
+# This code is based on the install script in the upstream archive.
+
+set_global_vars() {
+	ROOT_INSTALL_DIR=/opt/aws-cli
+	BIN_DIR=/usr/bin
+
+	EXE_NAME="aws"
+	COMPLETER_EXE_NAME="aws_completer"
+	INSTALLER_DIR="aws"
+	INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
+	INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
+	AWS_EXE_VERSION=${PV}
+
+	INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
+	# INSTALL_DIR="${INSTALL_DIR}"
+	INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
+	INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
+	INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
+	INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
+
+	CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
+	CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
+	CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
+
+	BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
+	BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
+}
+
+create_install_dir() {
+	dodir "${INSTALL_DIR}"
+	setup_install_dist
+	setup_install_bin
+	create_current_symlink
+}
+
+setup_install_dist() {
+	cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
+}
+
+setup_install_bin() {
+	dodir "${INSTALL_BIN_DIR}"
+	dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
+	dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
+}
+
+create_current_symlink() {
+	dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
+}
+
+create_bin_symlinks() {
+	dodir "${BIN_DIR}"
+	dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
+	dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
+}
+
+src_install() {
+	set_global_vars
+	create_install_dir
+	create_bin_symlinks
+}
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -8,6 +8,8 @@ DIST aws-cli-1.25.51.gh.tar.gz 2241823 BLAKE2B 86e7463a8fb63311351d60ac3dcd01a2f
 DIST aws-cli-1.25.52.gh.tar.gz 2241932 BLAKE2B e11ce7250040886ae9a00413c8ce67c929e90b5697a83d36184750d69d947c389afc4fc97d590c64874c2c259ba4a10b97b5d20f6148aee167d9cf6b9af6ff9d SHA512 5c5e06c9e2b0529508edc829c1baa7359238a1e72712e45e269030fd58644fde2f7b94767d1e33b1ff35859a25985f2b00b7d13c96e37dc5999bc7e24cc4f5da
 DIST aws-cli-1.25.53.gh.tar.gz 2242474 BLAKE2B 000bb154882210f52f8fe5c40e56d43526b28665a9e5666d7d8b61f95302d411a8f0d0c6eeaef3bd5aff46cfa6ae1133263dc38cb6a7274b4d7058c26005c369 SHA512 82790f15c9fdd736f2bdda976aa5990849521f7af05c95ee9c2c55cf232e140d875b396714be8be1ffba382ebf8f26f8b0a03bc064699de0316ca41156b993b8
 DIST aws-cli-1.25.54.gh.tar.gz 2252442 BLAKE2B 7f3f55af39f52be60daa039c42cd494a806998bbf0e27d5218949f0b6b8de29d85fc515697b76fa163e93e051405ac69a4df82322ac573fd124117d548040cc8 SHA512 bae88f022cfc8d596569412dfacddeed626ac88019632fc846a8351447ff02ae07dd481962e9a1495897896bb2f8b96186f8e3572bcb4fbd37d82b016afb8e33
+DIST aws-cli-1.25.55.gh.tar.gz 2250376 BLAKE2B 21a61086d4eb737229990fbcacdde652e8bd94e146a027dbdcc8fcc8ab005f6dcd4525625276df196408da3d11e0c215c602df4cf298fea3f12f6bd923f7f191 SHA512 e53997ae7475fb125e08bab90ac63b49723abd7ff66312d15145ca452c806986237f8e20fc6cb467d4654087a288b0835fcec48f7be6ec8795e90345a0983ef5
+DIST aws-cli-1.25.56.gh.tar.gz 2252989 BLAKE2B a082d42bd9ebaa858a3464bf885ba86a6f0f1b75d6ec89f9d6f1ab04dc753cf13cc6f7ced64cca35f8ddc460d589b44caa483c9d94bccb5b028c921fe7b970c0 SHA512 3a0fcd505b8a0c4fb322d2d39cc0ec3add977eb7ede14d7ff9fa3dd25b92e0e0d97128b73b6c32588d7e48344283c8c3eac293ea6cd470ea4feda1d1bf124e1b
 EBUILD awscli-1.25.36.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.41.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.46.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
@ -18,4 +20,6 @@ EBUILD awscli-1.25.51.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77
 EBUILD awscli-1.25.52.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.53.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.54.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.55.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.56.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- a/app-admin/awscli/awscli-1.25.55.ebuild
+++ b/app-admin/awscli/awscli-1.25.55.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/awscli/awscli-1.25.56.ebuild
+++ b/app-admin/awscli/awscli-1.25.56.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@ -1,13 +1,5 @@
 AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
-DIST containerd-1.5.11.tar.gz 7494477 BLAKE2B 2415e85694e5f4410c8cee7be08d1d304adfcdb95c4078f7a92c710a5a11a29ae011daa70fcfa72c2fabf5b48b7cac962b39121f18bb027931ef77214e86b1aa SHA512 6348f4ae7f9b473aac7d5e7325ca4539345d09f01b95383cec28f09d5e5b0b831e25fe305c3a15050f1e1959948ee8dcad788a1d6dd4780cf3077132d5617ef8
-DIST containerd-1.6.2-deps.tar.xz 99095488 BLAKE2B a8ab5b2a506cb90cbadba9461d2737b1ac0bea672681e3f940d1dc76fdd2885d1ab287129a2aaa2fab64d19ba049eb7ecdffbafa6b08772430b94428a775a042 SHA512 2a96405c28a6ebaeae523ef36b4721f493332953880bfb7cecc4571b325557f2566141a62c0eb5c981045d498dd18ad18f8e7adfd9d5f17218a5d5d65760b855
-DIST containerd-1.6.2.tar.gz 8617797 BLAKE2B aaf16dbbd071f4eab45bc94cc50643b33665b5c4a4155ef007b7a974e04660235b69e12d99e78c24b27c09d45c0eb6e9be3d688b41592a54497a0a4e5f577c86 SHA512 3ff280ae0cf5a45b0c21a42290c94bad30d46bf8a5bbcef1024e3c67fde3345a31b23a88cdbb6025d526c93e2a0899e9b341c9b8ccbba381983de3d8a39b1046
-DIST containerd-1.6.4-deps.tar.xz 96520056 BLAKE2B 695e26ffc26c0d85350c91412b746f59d7edd556aef2fea71a8947b79e0cdba573503a19b45ddc4a733b721be6cef581ab22e7522d00ab9221a1322d5b9670a4 SHA512 439bad6067939ab97115c0cf85d8eafd1214435f78bc57ee6a3d60e606da1260153d871e50de7b31fb57dc293e2f1ffa083cf89d08a394ee99450effda309678
-DIST containerd-1.6.4.tar.gz 8625617 BLAKE2B b3766eec306a4e4b27849aa3131c0adf84e040c9b6b843bc2b231a13f5f1b6222035e4a7d2315170b0a001be60874544bbe2920bf4cda951aac48217efb3de28 SHA512 a913dbfdcf29faebd5617f64e7c5e62b366cb9c80d0dbf55337121601f3c5b7d19c1670f71e9454513b681a1568c7cd1fc28c5daf3ea1c820279f2a2356ff8c6
 DIST containerd-1.6.8-deps.tar.xz 96625924 BLAKE2B 773b7c660826648b4077d320cbb3b265129fdd81233ac4aeb833586c9f25707c62e338492fb9905010b160e3fa635069ca4220136bca344ce54d154ee074bdeb SHA512 d805fefc0500fe2156bd8c6a752f9d13cafe85b528454ddc6efc95b09e05548df666cf9136aa3169794a0f7cc8135b943da1b106eec7e3dbbc83938892d80ead
 DIST containerd-1.6.8.tar.gz 8663866 BLAKE2B 4b1473febb738ce46d435a687971058f4bf586a2877b2899446a323e2e7ccf8a0ec9015277693f9b1bac6f663721117704e97031ce923ae62d27a8d7b882bdfd SHA512 c204c028cdfd76537d1da01c66526fc85b29b02d2412569bb9b265375603614b037356c61846025a72281398f0f46df326a5ea3df97f57901cce85f2f728f0ba
-EBUILD containerd-1.5.11.ebuild 1905 BLAKE2B 660c443a3de0f9c280ebc8bda5b049dc9803a35ea0d1fd6826338705f7d94b6d7f7bcaf987be92c458fa624a3b4aab6b19479aab90798f504ca7445f2c848821 SHA512 5c1f0c09f89743438924f2c012b9bce173844e4e5d3cfd9312eee576ee087ff01c532daabbe63502b9a39fd423825f198cf4f66c3c18a9786aadbb58d8ab45b7
-EBUILD containerd-1.6.2.ebuild 1975 BLAKE2B 3ebbd30a63d3e4fc89491332ac27e0441a611d275746b5fe9dd0ba627ac57af9bf6d71d6ed2b1fbc7bbfa1bedc16fc329cbd9264eee14bd8803c313185b4930c SHA512 49e8aff2be3f9196047f7e502033048de00ea1a4dc8e53b033e0014d22a57755b0156ea21df7efdf307a26344ded7cd2bd1a6f439abce9dbf47b35eb9cb6d80e
-EBUILD containerd-1.6.4.ebuild 1975 BLAKE2B ee2badba1a884e9fc2eb03ee26fcb7f27335910e6ac1cdf127d2ca1bde4017420e9ff5e064183a1fbb31f287d746b9bad31bd2b67d8d3c0f987ae8dc7ae682be SHA512 89eea35b99149e4aad2cdb9025006d9a774bdb676ef00133d532f4834a18560313b5d05478355d10d3d9b9e5de48d0ba80df4d22874142c0396d09e0cefb95e4
-EBUILD containerd-1.6.8.ebuild 1973 BLAKE2B 09aa4bcda7026235380bc185a78f1aeab4e6d079548e8ad4fed352e9182bcc65ddfce7908e8607610a679c739ed14af9dd789474e9dbd4db2eac49c57677e8e9 SHA512 1440591ed1bc4dffde63fed58303a846e41686a4469c88942fed9a469acb8c2c9f7e7b61d240a5d04d556b6490077806f2b06a4aaadef034e0b29037251c9043
+EBUILD containerd-1.6.8.ebuild 1972 BLAKE2B 61b059f9f5aa48eeb1e94480141e5c827bb1d1fc3d418d2f7e51fb020e3af108c0162d58fd28842ad7be5ced62221a708f0eb37eff3ad0152d9ba8671c737015 SHA512 2149d274746c929e34bfbcf480cdaf6b4677349091cea64b0d00f87f6c41f662e28075922a91ba4a48e4848c7c10995c060043e9eb097740de2702c724c6a86d
 MISC metadata.xml 1144 BLAKE2B 960f8dd81a1e56c0d381355da41a845c2e9c12db0c8c546da1593a0499e4929b37610dff83943c388f8edc5878b9824e47ddac02ba129176a916054400e10e90 SHA512 904a5a11d7729ea6021aaf1b1d91ae3f7609c08b8c191d9f4c35c62914b0acf1ee45f3f7e0416711225809f129da4b4c76c934e6207026b69b0096f431820982
--- a/app-containers/containerd/containerd-1.5.11.ebuild
+++ b/app-containers/containerd/containerd-1.5.11.ebuild
@ -1,84 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GIT_REVISION=3df54a852345ae127d1fa3092b95168e4a88e2f8
-inherit go-module systemd
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-containers/runc-1.0.3
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-# upstream does not recommend stripping binary
-RESTRICT+=" strip test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
--- a/app-containers/containerd/containerd-1.6.2.ebuild
+++ b/app-containers/containerd/containerd-1.6.2.ebuild
@ -1,85 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GIT_REVISION=de8046a5501db9e0e478e1c10cbcfb21af4c6b2d
-inherit go-module systemd
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-containers/runc-1.1.0
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-# upstream does not recommend stripping binary
-RESTRICT+=" strip test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
--- a/app-containers/containerd/containerd-1.6.4.ebuild
+++ b/app-containers/containerd/containerd-1.6.4.ebuild
@ -1,85 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GIT_REVISION=212e8b6fa2f44b9c21b2798135fc6fb7c53efc16
-inherit go-module systemd
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-containers/runc-1.1.2
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-# upstream does not recommend stripping binary
-RESTRICT+=" strip test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
--- a/app-containers/containerd/containerd-1.6.8.ebuild
+++ b/app-containers/containerd/containerd-1.6.8.ebuild
@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"

 DEPEND="
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@ -1,9 +1,3 @@
-DIST docker-cli-20.10.12.tar.gz 7527161 BLAKE2B 34a90f6df9f43507461307817e72cfb9e37f88d00e6fc50b8b16f3db9c573e54edc2eb2641ff4e091a2a73e936f8844011520efe5aaec37a9eb9880f5f81c51a SHA512 ac7c997f5751f2e34b9bcb9f026d3d0c2cd58c32a13e9255536b0eb0d7eabd81c42f2d608c0fe7725322b619f2360818b08379e847d598dd0bec570602ad224f
-DIST docker-cli-20.10.14.tar.gz 7508390 BLAKE2B b268a329450540c2e94eced7e7b7bb9387cd208c68bde82607fc56e1f0529d8ca35bb8c16839154443d950c21b0625a13aa8547d9f3053ed19645da683f14419 SHA512 f8b7f1040eccd404e39ec33bcef8bb8423636b0695af65f84c0612e77223844892d219f82cfbb99ccd5326e228f8af27be1870d90ebace77810ea5fce9f86e4a
-DIST docker-cli-20.10.16.tar.gz 7635926 BLAKE2B eb7ecde2770bb4e937f40b885604f5daa996f5644f78881d9814ae3cdfc7a0eec107519ef24bbabe0c726c8c83eaa475667fa251c3e9346fec597069ec36ba2e SHA512 90451f71f16f3bd1410b13c5df256ef1f422dd5b9b75d63cf318ee91a07bcb3ddb2876d2fee81e835d8daaee48c4e010c2daf4373de1095e2075fed8ee5fe75e
 DIST docker-cli-20.10.17.tar.gz 7636087 BLAKE2B 2777ca5c310ffeca75a07f2667703a3f1d24b4d1c1691ffb58df3144b7bfe54bb2b9cb9896a253718b7f47ab4c246064c5944a1ca05328fe7924f9bb79e10ff3 SHA512 9c2cff7e248272e234eac9febdfd7c5c844fc65ee4b08fd4ce0f526e4fed33f2d12682d0991ef28b42977b9de2c84d7ef9c6ddd6f31c4e8c34a3985c1cea3316
-EBUILD docker-cli-20.10.12.ebuild 1844 BLAKE2B 315897c0bb0930e2b3ac72ff73581700c66ed8130a26f5ac573e9820c56947e80f44b5478fdb8dab4013407acbc1c7706fc7fdef876d511dc3433cbaf6b96f9d SHA512 1e576548e6697d51cf7a681a97910dcd01d04073f18222e0d467d7c4f8100479bcb998d547da16cb574fb92db36d86c2e58ea512003015ce805b64cfc1a9373a
-EBUILD docker-cli-20.10.14.ebuild 1895 BLAKE2B ca302b1f195f6cb90bf16e3eb636110052d191e3d8833949dcca8af421cd87853d8d946340a88e5ed5b9aff2d6b5251b6ac372286ba58d08154fcc70306a6f2b SHA512 fc4a83b6a8531cb6272be1726b2ae139e045251848aa7237b81f27e3e343b6c0cc901541889c79248cd6f534acd66e07aa81d59952aa6c720870a9fb0ba43d32
-EBUILD docker-cli-20.10.16.ebuild 1895 BLAKE2B c5dabb17515c9b9e76fa173b6db5f7e2466a35eb3633003563d742108c9760dac6f88650fe512690eb6bbfe96c3f1e9c9d61b7cf9327c3446bbf33bc4087a06b SHA512 939fec07f7bcd4f583b8f1ecd135f360ac9b4b7757f59e014504189c2310c8f003a5f83fe8ce468dc9be254f3e92472efe85fcccc89ecc83ee545844cfc5b566
-EBUILD docker-cli-20.10.17.ebuild 1893 BLAKE2B 316e4b3137cf3a91a6d1fd47ccff03d29c6d56847cfc9882cbf98ce9031c0e1a95b3d49a87b7d98334f37bd4227d7f0c10f0924910b2f5d86d2ee9325eb291af SHA512 fc4850101106e9ef373f636d5f6953608f8e5b080cba073a3ba11ea5e6e969c458ade7608c25a80c74592239266c294da2a192c63de00f4c6eeb53ae9bdd52ca
+EBUILD docker-cli-20.10.17.ebuild 1892 BLAKE2B c1b88b4bdc27f9f499dadbe56da3bdd5d7805bddb96eaffeaa256813542b3324bf96dcbd437f4d09b96e72c665e3ba1303b53252c3b11f12db828b5d9870f582 SHA512 652c8b7540ccaef968e74e0423891105741b410c04db9fedd82009e58e0131cce82f929f1956bf1853fc44fb034736a6fa8fe86ccc379cae5b8653001e3fec81
 MISC metadata.xml 689 BLAKE2B 45f4a07f9d949ad4e0175908af936140573bd257f7b11f9b9cc25cdd52bb821a294036635fd81662bcd348aa21e69b5582ab2dc8efaf94dbbdc9608b131414f4 SHA512 efe37f3ae8bc6b26433b7bacfda203ea3b480f419b343921214f19a4ad4e25b2cca5f0426a27348902f51ef15f558e81599ccdadcab6504f9d22314bb472d80c
--- a/app-containers/docker-cli/docker-cli-20.10.12.ebuild
+++ b/app-containers/docker-cli/docker-cli-20.10.12.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=e91ed5707e
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="hardened"
-
-RDEPEND="!<app-containers/docker-20.10.1"
-BDEPEND="
-	>=dev-lang/go-1.16.6
-	dev-go/go-md2man"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-
-	# build man pages
-	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-	mkdir -p ./man/man1 || die "mkdir failed"
-	go build -o "${T}"/gen-manpages ./man ||
-		die 'build gen-manpages failed'
-	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
-		die 'gen-manpages failed'
-	./man/md2man-all.sh -q ||
-		die 'md2man-all.sh failed'
-}
-
-src_install() {
-	dobin build/docker
-	doman man/man*/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
--- a/app-containers/docker-cli/docker-cli-20.10.14.ebuild
+++ b/app-containers/docker-cli/docker-cli-20.10.14.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=a224086349
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="hardened selinux"
-
-RDEPEND="!<app-containers/docker-20.10.1
-	selinux? ( sec-policy/selinux-docker )"
-BDEPEND="
-	>=dev-lang/go-1.16.6
-	dev-go/go-md2man"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-
-	# build man pages
-	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-	mkdir -p ./man/man1 || die "mkdir failed"
-	go build -o "${T}"/gen-manpages ./man ||
-		die 'build gen-manpages failed'
-	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
-		die 'gen-manpages failed'
-	./man/md2man-all.sh -q ||
-		die 'md2man-all.sh failed'
-}
-
-src_install() {
-	dobin build/docker
-	doman man/man*/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
--- a/app-containers/docker-cli/docker-cli-20.10.16.ebuild
+++ b/app-containers/docker-cli/docker-cli-20.10.16.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=aa7e414fdc
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="hardened selinux"
-
-RDEPEND="!<app-containers/docker-20.10.1
-	selinux? ( sec-policy/selinux-docker )"
-BDEPEND="
-	>=dev-lang/go-1.16.6
-	dev-go/go-md2man"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-
-	# build man pages
-	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-	mkdir -p ./man/man1 || die "mkdir failed"
-	go build -o "${T}"/gen-manpages ./man ||
-		die 'build gen-manpages failed'
-	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
-		die 'gen-manpages failed'
-	./man/md2man-all.sh -q ||
-		die 'md2man-all.sh failed'
-}
-
-src_install() {
-	dobin build/docker
-	doman man/man*/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
--- a/app-containers/docker-cli/docker-cli-20.10.17.ebuild
+++ b/app-containers/docker-cli/docker-cli-20.10.17.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="hardened selinux"

 RDEPEND="!<app-containers/docker-20.10.1
--- a/app-containers/docker-proxy/Manifest
+++ b/app-containers/docker-proxy/Manifest
@ -1,7 +1,3 @@
-DIST docker-proxy-0.8.0_p20210525.tar.gz 3154432 BLAKE2B 3f273cd4c2dd3c797117bebfe06eb3ae8ce3b3f70d495cb0c77a372d64e23f1d9ad31e8efef64df494cc462e9f4fda9311c99ae7e7218f0fc41b6bf44cf8c08d SHA512 6a94fe23ce1bab0a428ee4bbe20089f5a4470e72c5da156b2b1a89de01cca803374fd9cdcd4c5b25b86af1c4e956c75a1a5ad7fb6639def7bcec69859a77c047
-DIST docker-proxy-0.8.0_p20220315.tar.gz 3154501 BLAKE2B 1078db00c0206542740736f0ffed3261dd6688a273699d47328edc6d803d267c026343f7377ef748e0359c025dbeb6cfc9015bf9ca6ed664e0220f15229fb032 SHA512 d6c09ba5fd2b0d87e97627ad55fca4bed1a0ea4f17c747550054d0e059ec056588995877a3e59a40e664ec1e3c92cde8572addc0e2bba8b588a100c6032c0d20
 DIST docker-proxy-0.8.0_p20220601.tar.gz 3154283 BLAKE2B 7651e1862acf60988f6a8bdf3c0befc9b01a388aebda2b86610109bb6affe0d9c64d2750a911f0d1856be0dba970e9e92de2a0d393cc5c3a581d4253c574a623 SHA512 d3d9888f39a9247b6e773b0bfe63e6d248c5c155e7032cdbdd5cfacf995cb6b4cf2f0fb51e09c4554a4b994e3c3d7fc9cd2fde6cf8dda34fba6aa07218ac959c
-EBUILD docker-proxy-0.8.0_p20210525.ebuild 813 BLAKE2B 376f4657a6a0b0a16a0f11243727d6df09b77a92b2f17f1841f58b36f2b2def2caf1e5033418d2627ef4c02dceb18514cf60ddba78b81fdb2d51b141e68a1f41 SHA512 142541cfc5e44ba8fc580777e5aaaccb91d5585b6364d1114f10e0c00b1449caba29c5a104e978277f1c0024b0c331bcc3645a468f5a5be8e056b0f9f96e1b5b
-EBUILD docker-proxy-0.8.0_p20220315.ebuild 748 BLAKE2B ac008769d81682299258cb3530ed2be91f384f3da051666e4d6966e8b7a5e60115c36b950ded5b4138d6cef0c8e76943a7598170dcc72eeeedceb9ad10c5b820 SHA512 c9ac1375edd16d05929a0ad44d266484dbdb39449ec1de36b2c5dec99685b54b4582dd17af6518457de4d80fcfc5c1e767a6538ce2ed3aa6202937737ec59d1a
-EBUILD docker-proxy-0.8.0_p20220601.ebuild 746 BLAKE2B 98094a84864d081f0fa9bd45dc26148db5873b777447245d8aade163d831de0f0311c506f50197cbe121dedb7798acbfb0b2050f451bce49b70baf2fcb0fea8a SHA512 27882601288e726ed200865f8083c67ee75b4d04c10644d45f9049f2541180068527bd20ab0a163c37b2d836036262f230c4545317fbd1565c3eb48eedd2453c
+EBUILD docker-proxy-0.8.0_p20220601.ebuild 745 BLAKE2B 2a3a2e7ab9e70bba5aac7fdbcf324d554e5d4cf7cf7741e925e2eea1fb2ac1a5cd41981c193deafb9323d11d97d964689988e0d12f5c9c600da7ac6e976f9e51 SHA512 caf39d6e1b17f9e76cc5d45e2a99e007aae853a436933db5ccbed8f465348972f6933cb31655333dde46c5e8201775cc111b6c35882b7cc3c571a152d1d1b90b
 MISC metadata.xml 443 BLAKE2B b641498e7f0a6670f6c902d1432dd7ae97dcce870b2d43d5ed7b1a96b483f2f1b70a1b625d27cd786c25cf4b86c80200f3668d94b5852985d366194fc1dbc77f SHA512 bb2ffc7c2d8ea17a8dcb28554fb505885596589b9bc886dfd30ec889d8b46926a9141aea354b929793b55cfbe0f28cc31a6d656943d865e1552187f4fa9f9f5b
--- a/app-containers/docker-proxy/docker-proxy-0.8.0_p20210525.ebuild
+++ b/app-containers/docker-proxy/docker-proxy-0.8.0_p20210525.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN="github.com/docker/libnetwork"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	EGIT_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8
-	SRC_URI="https://github.com/moby/libnetwork/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="Docker container networking"
-HOMEPAGE="https://github.com/docker/libnetwork"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-# needs dockerd
-RESTRICT="strip test"
-
-src_compile() {
-	GO111MODULE=auto GOPATH="${WORKDIR}/${P}" \
-		go build -o "bin/docker-proxy" ./cmd/proxy || die
-}
-
-src_install() {
-	dodoc README.md CHANGELOG.md
-	dobin bin/docker-proxy
-}
--- a/app-containers/docker-proxy/docker-proxy-0.8.0_p20220315.ebuild
+++ b/app-containers/docker-proxy/docker-proxy-0.8.0_p20220315.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/moby/libnetwork
-GIT_COMMIT=339b972b464ee3d401b5788b2af9e31d09d6b7da
-inherit golang-vcs-snapshot
-
-DESCRIPTION="Docker container networking"
-HOMEPAGE="https://github.com/docker/libnetwork" 
-SRC_URI="https://github.com/moby/libnetwork/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-# needs dockerd
-RESTRICT="strip test"
-
-src_compile() {
-	GO111MODULE=auto GOPATH="${WORKDIR}/${P}" \
-		go build -o "bin/docker-proxy" ./cmd/proxy || die
-}
-
-src_install() {
-	dobin bin/docker-proxy
-	dodoc README.md CHANGELOG.md
-}
--- a/app-containers/docker-proxy/docker-proxy-0.8.0_p20220601.ebuild
+++ b/app-containers/docker-proxy/docker-proxy-0.8.0_p20220601.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/moby/libnetwork/archive/${GIT_COMMIT}.tar.gz -> ${P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"

 S=${WORKDIR}/${P}/src/${EGO_PN}

--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@ -1,12 +1,6 @@
 AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee88751e8e0471cd33429b8141cbea07a3a56c61eccd63c796c9135edafaf5977571a4413e5d71931aac44b5313110af94c3206e286b15394f637 SHA512 bc709b6f0dd8685fbf2404be589743f32a5f4deb24dec8ed6aeec18f0fcd1db4c5d59587209c28f62d964d78ec9ab3a3fdbb795dc4b7e3fabd00a06a002af34e
 AUX etcd-F_OFD_GETLK-fix.patch 868 BLAKE2B 478be67388bc9001c90031c47e001c8bcc0435433df44b42ea4c15cdb595d2169c0b2d05a4e774d20f7f971e64c08e132b736e8847cf0966c65bf1816f6a958c SHA512 4caf8a8a1f4363545d02695fed4a06ce96fdad181d5773188ae8c2ef95e4f4fbfee6d7906ece6bf0d85dd57e159f2a3774aa228f0e6e1da0cdfef63ced62a434
 AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79b7f47c6fd5a6b024529c49ef71817d4c379c7a95832a44b9c2f45c9f7707cb580b31be18dff4ee9a110e44 SHA512 bc87464d9f3351b2791e6f86bc7f2101e652c25b99cdcc02e46e4ff18f4bfb7ffc35d338370656bde6ad09ed98805e045065012dc6a264967d26272f7de099ff
-DIST docker-20.10.12.tar.gz 11091999 BLAKE2B e3b1c40d2dcd2df9b158942759e035d53481dbd63c0fda188ec8564b0249402f5eff5f25fcb1a53c5d9af5b4c49f0919fc07f1f52d0b7333044c0a9c12631c21 SHA512 f4122c8cbc67e6b7703856dc76d6f15d7fab1b2001d4916b89958d5319c16d8b8445881841ef4804e8d47d64694184aec1be93e22d7baceb021c4a99c2c03753
-DIST docker-20.10.14.tar.gz 10989937 BLAKE2B 4b510408c8cf2aef3a9777996aadd024e61df519c6c83d8c59e066058fb082f72ee14405b011731cb3663abdf0759d8f005b3336f6e9b6430270a2e1ba337436 SHA512 94ee555337aaf96bb95ce8cbe8fe1d9c8b87fcd4f256d2af5082fc47915f7576882929c1211ef7fba0c754097bdef5e6df59abbdf77456d3babe139f4353ed21
-DIST docker-20.10.16.tar.gz 11182324 BLAKE2B 8d6676a24b3b53f9155a53eb55a1b5074c5724788102356cae8ead55dbf2f2c2875ea4a0a9eaee4a7720d8f11671b2f748eb8c61b67b81992342d1171feaaaa7 SHA512 5fdf87f98a951af87a334a5a403e36b975ff6c4647d0656dde2bd763d27562c620346f3746adafa1439c205869c721a3bef750f8302734499423ca789218f85d
 DIST docker-20.10.17.tar.gz 11182479 BLAKE2B 515c048ab6f19e256040122323f394dfa2e8f7a4aefd89e5b374355bd7907f3ba5eaae37d7ce3aed0d1add8fa025b8e5ac3c46c4dc90adf757426fd40af39dbf SHA512 1def92a4f87695b1889e482947f2bc49342ad868ee15425900b0c6f8954ba77aa2a9a8bd4fc500ba124218603aa8c7127daf7192140cace6e652a311391397c4
-EBUILD docker-20.10.12-r1.ebuild 7898 BLAKE2B f6edbcda89a4002d96fb9b94aee212556f38eeb275a7824347bf6fad71d218adf303221657569318451b29f8d23577f37dac82bd2b84a06b13f3b43f413cd1aa SHA512 329a8dfd8842c0bb931ab7adbf08580e1d4ed4eacdb30e3931cde7d83b0ad6ebe787a65a921593da188f4150d6b9f60b31b45decc302694d6c4fdcb9821c4f6f
-EBUILD docker-20.10.14.ebuild 7909 BLAKE2B 49bd4f27f8e6717db6f615d1b96ac66ae1687651e3161e2f7e45968af7ae726e68d18ca886d8899e0c897bb8048af79a5821b8d739ad3f32a9a39909a9904b64 SHA512 86085b41ac3207691c8d00cb62e7a8bbe939b7eab1b3e348344e46253c7eb8a00a952594733e07724c298ebd96172233aa461d0f11ccdc8b742be56de36f5568
-EBUILD docker-20.10.16.ebuild 7908 BLAKE2B 56a9459e3caed8a7a570c3dbc9f7c83039fc032596e8b6e306183fc3f84d4c472d6b0dddec0c40a2a992d309d2320b5e6975864a1c17e46b885ef6a598462d15 SHA512 8dcfcc7daf73ea0cc79d6e2cc62963d63f763934c688bc28bc7b07a704b765aa0c8c05098e9f972f5bd053e144d67e442353f5318b0a73e7e336a95608d90efd
-EBUILD docker-20.10.17.ebuild 8003 BLAKE2B c045aaebcc4ce7ee9b6116bf90cea652e64e82c70e2670857a6b8e90f96fd01826d35866b2c7223e7ac2f3e8ac972b8c2b6352ea44cc08b93fcccc68c4262f6d SHA512 4bf9635015c494e4e244fd5e789c69e91551ba1f4eca7faf859c215c2e0f7f645275daae367aa475eca462ab2407ccb46260902872253d518b65707c6b6906f0
+EBUILD docker-20.10.17.ebuild 8002 BLAKE2B a5967d16b5f5ad0cb674696e19451e0475ffb9edcfa9e49d9a236d68b3560fab38e2acc3952749023ff8bcdcede5babf464f21055c2c166e350ba9f9e9d748a8 SHA512 d9ad2d0cdc3aa182fbcbbfeaf596af1ffc369237a85440142c48be0f6d1a6c5b868e3a877e8d54222fa3ffe2ce9a435a5e4016398c62598fd931f4507a850206
 MISC metadata.xml 1732 BLAKE2B d6c517445cd06bb18759cad0a8923bde800bd6f87ad532e632ad6a0a02eba10905f1022297115a92457d38f795fbcd50ec75d1a2f7dcb017dc15282bf55cc046 SHA512 93a93425296ec98ac52d5b8bbf5784747df9f25da586b6f016cbe946ad01089e75d0571ed8690a051e919571c4ca3be01fc0ba6ef8c5fc5b8a01f87a5ca5e21b
--- a/app-containers/docker/docker-20.10.12-r1.ebuild
+++ b/app-containers/docker/docker-20.10.12-r1.ebuild
@ -1,279 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-GIT_COMMIT=459d0dfbbb
-inherit linux-info systemd udev golang-vcs-snapshot
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-# https://github.com/moby/moby/tree/master//hack/dockerfile/install
-# make sure docker-proxy is pinned to exact version from ^,
-# for appropriate branch/version of course
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	>=app-containers/containerd-1.4.12[apparmor?,btrfs?,device-mapper?,seccomp?]
-	~app-containers/docker-proxy-0.8.0_p20210525
-	cli? ( ~app-containers/docker-cli-${PV} )
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-PATCHES=(
-	"${FILESDIR}/etcd-F_OFD_GETLK-fix.patch"
-	"${FILESDIR}/ppc64-buildmode.patch"
-)
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~CGROUP_NET_PRIO
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK
-	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-
-	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
-	~EXT4_FS_SECURITY
-	~EXT4_FS_POSIX_ACL
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is lt 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-			~IOSCHED_CFQ
-			~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	if kernel_is lt 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is lt 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	newbin bundles/dynbinary-daemon/dockerd dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use device-mapper; then
-		elog " Devicemapper storage driver has been deprecated"
-		elog " It will be removed in a future release"
-		elog
-	fi
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-
-	if use cli; then
-		ewarn "Starting with docker 20.10.2, docker has been split into"
-		ewarn "two packages upstream, so Gentoo has followed suit."
-		ewarn
-		ewarn "app-containers/docker contains the daemon and"
-		ewarn "app-containers/docker-cli contains the docker command."
-		ewarn
-		ewarn "docker currently installs docker-cli using the cli use flag."
-		ewarn
-		ewarn "This use flag is temporary, so you need to take the"
-		ewarn "following actions:"
-		ewarn
-		ewarn "First, disable the cli use flag for app-containers/docker"
-		ewarn
-		ewarn "Then, if you need docker-cli and docker on the same machine,"
-		ewarn "run the following command:"
-		ewarn
-		ewarn "# emerge --noreplace docker-cli"
-		ewarn
-	fi
-}
--- a/app-containers/docker/docker-20.10.14.ebuild
+++ b/app-containers/docker/docker-20.10.14.ebuild
@ -1,280 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-GIT_COMMIT=87a90dc786
-inherit linux-info systemd udev golang-vcs-snapshot
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened
-overlay seccomp selinux"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-# https://github.com/moby/moby/tree/master//hack/dockerfile/install
-# make sure docker-proxy is pinned to exact version from ^,
-# for appropriate branchch/version of course
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	>=app-containers/containerd-1.4.12[apparmor?,btrfs?,device-mapper?,seccomp?]
-	~app-containers/docker-proxy-0.8.0_p20210525
-	cli? ( ~app-containers/docker-cli-${PV} )
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-PATCHES=(
-	"${FILESDIR}/ppc64-buildmode.patch"
-)
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~CGROUP_NET_PRIO
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK
-	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-
-	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
-	~EXT4_FS_SECURITY
-	~EXT4_FS_POSIX_ACL
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is lt 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-			~IOSCHED_CFQ
-			~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	if kernel_is lt 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is lt 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	newbin bundles/dynbinary-daemon/dockerd dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use device-mapper; then
-		elog " Devicemapper storage driver has been deprecated"
-		elog " It will be removed in a future release"
-		elog
-	fi
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-
-	if use cli; then
-		ewarn "Starting with docker 20.10.2, docker has been split into"
-		ewarn "two packages upstream, so Gentoo has followed suit."
-		ewarn
-		ewarn "app-containers/docker contains the daemon and"
-		ewarn "app-containers/docker-cli contains the docker command."
-		ewarn
-		ewarn "docker currently installs docker-cli using the cli use flag."
-		ewarn
-		ewarn "This use flag is temporary, so you need to take the"
-		ewarn "following actions:"
-		ewarn
-		ewarn "First, disable the cli use flag for app-containers/docker"
-		ewarn
-		ewarn "Then, if you need docker-cli and docker on the same machine,"
-		ewarn "run the following command:"
-		ewarn
-		ewarn "# emerge --noreplace docker-cli"
-		ewarn
-	fi
-}
--- a/app-containers/docker/docker-20.10.16.ebuild
+++ b/app-containers/docker/docker-20.10.16.ebuild
@ -1,280 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-GIT_COMMIT=f756502055
-inherit linux-info systemd udev golang-vcs-snapshot
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened
-overlay seccomp selinux"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-# https://github.com/moby/moby/tree/master//hack/dockerfile/install
-# make sure docker-proxy is pinned to exact version from ^,
-# for appropriate branchch/version of course
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	>=app-containers/containerd-1.6.4[apparmor?,btrfs?,device-mapper?,seccomp?]
-	~app-containers/docker-proxy-0.8.0_p20220315
-	cli? ( ~app-containers/docker-cli-${PV} )
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-PATCHES=(
-	"${FILESDIR}/ppc64-buildmode.patch"
-)
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~CGROUP_NET_PRIO
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK
-	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-
-	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
-	~EXT4_FS_SECURITY
-	~EXT4_FS_POSIX_ACL
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is lt 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-			~IOSCHED_CFQ
-			~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	if kernel_is lt 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is lt 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	newbin bundles/dynbinary-daemon/dockerd dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use device-mapper; then
-		elog " Devicemapper storage driver has been deprecated"
-		elog " It will be removed in a future release"
-		elog
-	fi
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-
-	if use cli; then
-		ewarn "Starting with docker 20.10.2, docker has been split into"
-		ewarn "two packages upstream, so Gentoo has followed suit."
-		ewarn
-		ewarn "app-containers/docker contains the daemon and"
-		ewarn "app-containers/docker-cli contains the docker command."
-		ewarn
-		ewarn "docker currently installs docker-cli using the cli use flag."
-		ewarn
-		ewarn "This use flag is temporary, so you need to take the"
-		ewarn "following actions:"
-		ewarn
-		ewarn "First, disable the cli use flag for app-containers/docker"
-		ewarn
-		ewarn "Then, if you need docker-cli and docker on the same machine,"
-		ewarn "run the following command:"
-		ewarn
-		ewarn "# emerge --noreplace docker-cli"
-		ewarn
-	fi
-}
--- a/app-containers/docker/docker-20.10.17.ebuild
+++ b/app-containers/docker/docker-20.10.17.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened
 overlay seccomp selinux"

--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@ -1,11 +1,3 @@
-DIST runc-1.0.3.tar.gz 2375241 BLAKE2B 0fb9368ab5442462001c15a67a71821133ad90d16cac5aac760e52b2477db69c0a5dd59df42601119b19ede508889796c994a24624f88ec6a1a29dad19e0bf33 SHA512 64a1894c2b4ed5a68b185e88548fc9fbbd01d8a9495feed59fb196aa06763d64cfb71ca6cbc09d1defa26a0d94ad58626296585741f23df2e290147ba6c4c26e
-DIST runc-1.1.0.tar.gz 2332427 BLAKE2B 3a194221d0bab813249e23c5f725255e453ce6843c2cb7e1a40a3c6fdd90a1a805c18ebadf56ee5d535f253025716aae6ab3f437140a3cc69e854e750e205e0c SHA512 542ea87c488fd120f2b77e53e2c197f09cd504fbe55dbe47008aaa5b0565aa300fc49f8cadc24ead796e45a4e95a30dfb08bfeefa58dc370145a218fd2869e41
-DIST runc-1.1.1.tar.gz 2332722 BLAKE2B d0abe624ddd17885bd25a5923e35ed760a7acaeb2ae7eefa18cdd28a2ecfc79a958d550eafac421b58865376620d7475338752df823e0f1b4a69be201fe4ea90 SHA512 baf622e7edae9b68d2fa255f02359d770489c7578be3c6379a5d939b4f1dfa697ec9eb4ef7dce252e64ee5225f76c06e45182a9b92b68a952e21e3f5f91450d0
-DIST runc-1.1.2.tar.gz 2332953 BLAKE2B e6047baa799e97d201630f5ff438ca8742ef4c9f465c3728fe2e4bd7f18a571172cb8f994c0e9ffba4f7ae75088626583602f49e0e9f4764c96157820c332b5b SHA512 61d8cc82f49e3bc1cf4cc4ae18a9d9c8f4ae93e8380ce6fa9034b154bd1b915339ee65babdf7518021d015a3c31545fcbad5bbf0c4579c7eb50988877121f049
 DIST runc-1.1.3.tar.gz 2333384 BLAKE2B 7530faa80a6d51c840a1ea702ec59580a3e42514f5932a7dd4df9f80ff93245bde05accd572a942190b6be76316f38a408566b003ad380611376e73abe3cb5c0 SHA512 27fce2569d0dc710a0f90095957be30c29da24ce1d2b8e115b9dc11d36f5226d98c4b2d8b92ecfa7581eade90bc51c5d9bccaf15fcb2542dafebe4fabc6e1cd9
-EBUILD runc-1.0.3.ebuild 1793 BLAKE2B f92e4d3fe0fb2125fdf5a2d3ef4cc9418c6cfb1cf864c2dc6a757d48f44b8771e52da88685e8fb661ed56cb9be2d949263c84379015a41a4c10d6beca2ddabf1 SHA512 015b6982421ddc244c9d841eb7919d9e6f83d604286b1cfe6991b97f56faafd7731e363ea55b1e46cb62c99bfb90e8fa6ea89b40c45a31c8b7cf80d9c5b3371a
-EBUILD runc-1.1.0.ebuild 1795 BLAKE2B 0df960fc7c3bf58ac6d271d61838416e229a200d2a948aaf392d65fec701c4e5718dd924ade42ef85620e95c3fa291b54f8de3cfefe75ec52fdcf0a27d829570 SHA512 9fdfb92e462491d95e208eeef50c3bc09c8d560c86d5f254574b7facf5d59028ac9b1e780de6c2dab6f96ba99e804dcd9b3a3bcd95d0a49b98320d9615187db2
-EBUILD runc-1.1.1.ebuild 1846 BLAKE2B 3e7caa50bcd158e59043db753ec64aea99dfa26f6ecb693cda011606dc9649248e76e154efe13852b10c0f256accd78674f3eac12f4e259897820e567d35bcf8 SHA512 250d42b4f01bd6e610b7247a7b88d934f8b3765eec7e882cab9d3e0a7bb7eb6006a4ef018c8e3c15b462b1c5b58f767a7ab1dac57b510f23066d611aad93bd32
-EBUILD runc-1.1.2.ebuild 1846 BLAKE2B 759f30c6f805ebeb5efdfd925158ce86a06f5fdd9dd0c2f36e96af0ee31c897abbeadbc0a21b2021d942f3a233ace86db1513abaa1ec31c35e90687f62be7d26 SHA512 543e51005552723ae7f4b0b65cf7946d57bf0460889fe27f53c26786052faed9fff2b82169cd5d2a957dcc6c9d93898e61ebe90f6e91020efa4949e9f46c3fd0
-EBUILD runc-1.1.3.ebuild 1844 BLAKE2B ed03bfb9f1e81c38280ea3011f1fc62499f556b2d7f0958a52856d81637e205aa0209971cbe79aac5d3a303e3debf7f9414a6959f319789c6b513284561ba8bc SHA512 9709b5b91e2a69f08f2b0f1fecb4fc2e051206b06310f91d24e438ee50a1959ab63b083971a8397891d1a3d60df4ae0745aff9f466a95488b4fcc35ce4a21564
+EBUILD runc-1.1.3.ebuild 1843 BLAKE2B a5cd10807918d4128b60944385f1315ecebfb0fb0421750477d360d5295b97555c59c6afc75e939e5d3af2696b43ed4a959f65123503ddc93d70e52123b2b71a SHA512 ebed92d9aa4b179622249695c38e0d5730b68c1e0b4ec9f859b4c6a1ad35cb0c29111b3e66e54f6a014e3c7f753b8f93f623bf01aab857991c77ba3fa0050def
 MISC metadata.xml 822 BLAKE2B 2029743d60c9a6197e3db4ca27c3ee48bc86f624a50d7caa9bfb7f958383a1736d8817f2f977ac0e673229bd61f341a00f266dbce35dcd9633ecc27b182478d5 SHA512 f80b366f7fc8f4ff5bd46245aa80871748800a557440af3aa45bd1a508732cf634b6f21a3445135450eefbac91ab16f7b344c3f557af8ef69fdd8120ca6cf4e5
--- a/app-containers/runc/runc-1.0.3.ebuild
+++ b/app-containers/runc/runc-1.0.3.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module linux-info
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
-RUNC_COMMIT=f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
--- a/app-containers/runc/runc-1.1.0.ebuild
+++ b/app-containers/runc/runc-1.1.0.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
-RUNC_COMMIT=067aaf8548d78269dcb2c13b856775e27c410f9c
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
--- a/app-containers/runc/runc-1.1.1.ebuild
+++ b/app-containers/runc/runc-1.1.1.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
-RUNC_COMMIT=52de29d7e0f8c0899bd7efb8810dd07f0073fa87
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-	selinux? ( sec-policy/selinux-container )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
--- a/app-containers/runc/runc-1.1.2.ebuild
+++ b/app-containers/runc/runc-1.1.2.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
-RUNC_COMMIT=a916309fff0f838eb94e928713dbc3c0d0ac7aa4
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-	selinux? ( sec-policy/selinux-container )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
--- a/app-containers/runc/runc-1.1.3.ebuild
+++ b/app-containers/runc/runc-1.1.3.ebuild
@ -16,7 +16,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P

 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor hardened +kmem +seccomp selinux test"

 DEPEND="seccomp? ( sys-libs/libseccomp )"
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/envchain/Manifest
+++ b/app-crypt/envchain/Manifest
@ -1,5 +1,3 @@
-DIST envchain-1.0.0.tar.gz 8252 BLAKE2B 5b4e07421d47eede180ddbd1968090050ec4b25e887d235f2714604ed0d4439f1a36b72f0d277c53e3b9f010ee9c6bb61f598daec330641384c21b00802feadd SHA512 0c7e129509fa60adbbedd995c30a11e981171b85dfce60385a0fd4a3d8264f1a2d65300f882e45075556490dfff0255eb6a6688066455809653b81e83d29c514
 DIST envchain-1.0.1.tar.gz 8604 BLAKE2B 6273eac40cf2a9eaf0704ee81d23b6e72cd296232f378bf5e5b15cdfb29a91bd394201724491e3a7104017b2416084d16e07b3634e5abe382e05eec52e388410 SHA512 ac2bca6e53f46c10978d55b2924595988ed6d76a9969691f01c1a57d17e5e8e2abd21653cba996aad31408bb029e8ba00818100c60f5b089b84c70eaf20a2c75
-EBUILD envchain-1.0.0.ebuild 476 BLAKE2B c424c556f180f755c75db9bb650be9e375f94950bac6f83c114d3f14667f5c0818bf35c98c4c94c3fce098f51c65f1a42791605109ddf279a519a6446994fe7f SHA512 09f8a61e03ad2115a5db8005f4fbd90bb7599c51e6d8bcbda7baffe399116e36a89b07ee7176a13039ff67548a9ae5f51a19967701ef37dc0c7220e5d0f30e2a
 EBUILD envchain-1.0.1.ebuild 478 BLAKE2B 4a7f5f450de103e61a9797d215dc3b55fd1181573914bab3228c47d6fb4daa6fce28b8261e9b7e35ad46e3b0a3b9a2bdb296dadb71618fc1ceddba98b8f9efd1 SHA512 454c17e0950d1afad8dfe04310469c6989f730aad483d6f387031be50c8dbb76c0b0f41b4f6f4168360e9a3adb3ad7084e7b291e49bdc08517c167783b10e09e
 MISC metadata.xml 777 BLAKE2B 5a10456c60818c32d6e8d1c44fec93fcce8f7193a4b4756255c453e256242ad83e5c07946021cdee8424bb62b16665541edbe2fe9c7883ec1527c8760dbe093a SHA512 a6acebf3c38e0e62f07c37d842a4c56db9c36d595080324fdc26d55912fe41feaa96bc9ddc3db2ae3c091fec69660fd8e9fbae45e014d4f2c2252d100f248a8d
--- a/app-crypt/envchain/envchain-1.0.0.ebuild
+++ b/app-crypt/envchain/envchain-1.0.0.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Save environment variables in a secret vault"
-HOMEPAGE="https://github.com/sorah/envchain"
-SRC_URI="https://github.com/sorah/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	sys-libs/readline:0=
-	app-crypt/libsecret"
-
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}/usr" install
-}
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@ -14,6 +14,6 @@ DIST doxygen-1.9.4.src.tar.gz 5196383 BLAKE2B 8fe27a8821e3309aa0314586b569a7e295
 EBUILD doxygen-1.9.1.ebuild 3069 BLAKE2B 04a668ae2be27712efc937e69f67c6d2f33041a91ffcf3d6f64255fc67c477619e56cf1caecaa02030422af8cba57b0e828afd6858fae5e4c5dde7ee44596c43 SHA512 adbefc8067347781614369199c02d7071e0fd19b047b1315300310fdffbb84781252e860382b22aec58aa881bc0a5f0f2599ee342dbdaa3d674697689cd6ae11
 EBUILD doxygen-1.9.2.ebuild 3044 BLAKE2B 418674cda835cb849d96c670af9846778f8ac40727af6ccc6a1c3880504be23dcf41007f18900cf7e4ab4ed1aef4057718aed61c83ffd43571f99fc7a844457e SHA512 af9d3a74eab861a0423ebf852b94312597624ab156e849d30cfeecd4cc20c8a5eacb6daf8da48dc21f7579b3c4c86754fcf28ba5856882616b7330386e69a729
 EBUILD doxygen-1.9.3.ebuild 2905 BLAKE2B 6c177c1de038266e02c18912f63d087c292447346b7e850d4b17f30a7eaf6f3f66703502afd8afc4eb587d2c99374e343e64c3ad587bc6faceaab29c92275352 SHA512 1d25fb469253a97006fe043ceb225704d1d9413277ac644e7c9bdecd8309f1564b2b6ffd6c5a999e3529ef4bbc5bf5da9f08dede72643112ebb984b42f94a90f
-EBUILD doxygen-1.9.4-r1.ebuild 3059 BLAKE2B 38922da14a47dd699d4984a2562ffee34af85cb0ccf725b95a52793be7c4b28bf70374b41bf0a01f42bbd0b79005722b271b883885f8b890b21c85fe46ea2fcd SHA512 624730a54fbb578f6d349bd3c7aa71312b0407f4aed5938ff7476c5b271f2863a4fb07adcf4e4b0708800c06db5af812b330c72879f67ed70773caf73a13e9d5
-EBUILD doxygen-9999.ebuild 3027 BLAKE2B f5d5345fa9834ab02ae15c21df0add03c092e04f9d164e8127fe2e2e8cee8d14a9b24ef2277aee44b0b334db9f5be43ba0d2c3bab4d392a6a5774746512e188a SHA512 40660ad851ae2ab51b5f124f35cdd8a748c82f11b9afb9fa022e1ccc823b1bf7a8985eb1903d15cf03ff019ef0447348a7e50968e3c4e21b0a1a4baafc4c2ae5
+EBUILD doxygen-1.9.4-r2.ebuild 3075 BLAKE2B ecccc1d1842628bcfc1ec0f707be52e51bbe9bc0e5a3e67f9796a54aa5ec70719dac4e352a1fde3209133652d2f7c60cbc02ad42ee94837a715b0395b5e239ca SHA512 3d03c5c7e00627eb8ab0dd4afd37bbd801612864446d413ce345876ec28bd4ad3d1f253e9f47703955df922a596364055b0fb18e890f2a7e112896ea1ed435f2
+EBUILD doxygen-9999.ebuild 3043 BLAKE2B e4e1737c488f2a6e1def2710fb7131bea5b849f7e8f3e56541c24f127a1677f7235822e8e8ca870207efdab4b5d64d4f1228c3e09b6511eeb8133dd627b2fa10 SHA512 3dae56efad5d963fd2ad7a990cfda536e755e6b5b1bf7ffaaa4edcfe7ef78c52ffe01b0b0aec35eedb962ebdabf96b62faebaf1321af176005b01dffa078c17e
 MISC metadata.xml 972 BLAKE2B 21df73118710e6eb9b1b495aef2b87b5c1457d55efb50bd3051d72505a12ee9855407f9222094fae21501f51d8ca97b70a211cd0953a68d172fc030b64144def SHA512 0d4855b1b4233da690add845a04c089c8a71634b25bc1dea8f995997b8e329e0e882eaaea15cc30994f9c063df48ff49a865c372162c4eb3dbc08bd6a44a3b67
--- a/app-doc/doxygen/doxygen-1.9.4-r2.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.4-r2.ebuild
@ -131,4 +131,6 @@ src_compile() {

 src_install() {
 	cmake_src_install
+
+	doman doc/*.1
 }
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@ -130,4 +130,6 @@ src_compile() {

 src_install() {
 	cmake_src_install
+
+	doman doc/*.1
 }
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@ -20,10 +20,10 @@ EBUILD emacs-24.5-r11.ebuild 10781 BLAKE2B 436f02959a1aa71165682f8e133dc0d7964cf
 EBUILD emacs-25.3-r11.ebuild 11091 BLAKE2B 02e66e0142e1fe4a5bd262548ee01bc399328d3b3cfeaf81bf67ad76dd10405bac1013de66d648f0e3cf5aa09b46ec69989130b514ad9989c5962a06d465bc68 SHA512 1ec9fdc1c130274277da7dd689640c48b9f3e439bf948dada9d4b79d6f2dee74e22d53e2854c1a2bd223da4b81916f2217efb9dd788e344004d50a28ba9f2b7d
 EBUILD emacs-26.3-r7.ebuild 11779 BLAKE2B 69ef04e1707478913d6d574cc9569e1b7eece4152f68c70112e9caf1e192b6b2d5f74fff7e0e89f4d730429861c1b4e1d70a0c1e6b9cb42565fefe740085f8d3 SHA512 6757269a4fdd86292b107d138d8ac39f44f055858d017e988ce005dcb4985ed3b49ce58b61335aa61fb031865f8a15bd1cbb46c402ae5466529adcee6280b552
 EBUILD emacs-27.2-r5.ebuild 14310 BLAKE2B 8875ffdd3002c88240d58891d67c840ea67bba108009e7fbf5963050a36b9e4f1cc4903e38c37a7456c3becf9a5c42c29bb910e8797940b9389b3fad8747948d SHA512 e47f5035c3d687b7a58ef3a05952ec301a00d17ae7633a9d5055c15f8fe9631d7d60927966eaf0b3e9fb1a3f0d892e3830269dc995efc2ff3400aad23815df1c
-EBUILD emacs-28.1-r2.ebuild 14934 BLAKE2B 0d81ef8eddbc2aeeace9071b7ce9214f539dd7bb3657ce0b066ea85bb0b38e4ec09d921ee01ed0dc6d4cfc6ab5fc2d25109105e318339b0e4ced569ff1c3c17b SHA512 d0692d7227f44052d2996468d59b4a16dafc55ebd73d84b53c15728701af81b281d126bc50fe1c7994151ec8e5c3a98b505be7e7f8146fd2e18e1edcfb101a60
+EBUILD emacs-28.1-r2.ebuild 14926 BLAKE2B 75ad1e8fc9566d3f0b76878306640c26ff8d58ca0ac8cb45472a1fbc4e4edd5415b8e01b9a07b9770b303b2288fdc6169e4e0df40d50fba81860393363eeec44 SHA512 cf259ec995064385d9e4f3e02eb2f9d86e8550ef1842f64a81ea6902e61a0d58cdcc49b800e9f7e8ad412c752ddaf6e341dfaa02a820325e6bcf9fad40e509ec
+EBUILD emacs-28.1-r3.ebuild 15011 BLAKE2B dd646d6c697403a00294aabd72d55841a4d886c034ae1d47ce118de4f0ad2b301fd27c91ab7fdc56a3825f97793044da624ab95bf576df8a26d22785731c39e6 SHA512 b09a22af3bf5f4e9a2632168cde59071285ce5748237dd8e40fd2437831a69bb0b35c9c55a647c0bb0a44e9d40639da06a92e020926d70ebd43b680a673a8eb4
 EBUILD emacs-28.1.90-r2.ebuild 14940 BLAKE2B b6bb7cf14803f2649554168191d2533a2912212d399a31c1095c1b463356a7284ce135d648b1378042f20ae780cadac6b848efacecc1cda5c190fa2f925fb7aa SHA512 b7d7852e3f7367f18500132317ab0c95a076ace63080cfa805ed638266cbd7171ddd6814911bed3532f0c5740300689f2773790744e9cccbc426ac7d1867c2af
-EBUILD emacs-28.1.91.ebuild 14940 BLAKE2B b6bb7cf14803f2649554168191d2533a2912212d399a31c1095c1b463356a7284ce135d648b1378042f20ae780cadac6b848efacecc1cda5c190fa2f925fb7aa SHA512 b7d7852e3f7367f18500132317ab0c95a076ace63080cfa805ed638266cbd7171ddd6814911bed3532f0c5740300689f2773790744e9cccbc426ac7d1867c2af
-EBUILD emacs-28.1.9999.ebuild 15037 BLAKE2B 61cbff92ed83808be6868a4451f6e7f4064474da368f7e93295a3b23ff8a9f3a6ceb6c78ebc3955a3aa506ccf01e096b6a906b0ae4225c532b649b7492c865dd SHA512 37e7756db860b4564557b7f93c6a46e3b390dd899568802296ea2416cf9b23c408843192e5f9793a2968eff9bf622138c09858210efb85f16da0f006a912693d
-EBUILD emacs-28.1.ebuild 14789 BLAKE2B a34823f4e5f862663981f580fff6b3a66e8b0b6c605cb584fb5bed3c5f2aeca0ae266668c31c0d302855fcfdffb1790c7193bf7a5d77596438bf7c0530d300af SHA512 b752b2befed614b341ea8688f6e66ef752dc026015906b77a32ef1828fb7f115de4a7c45e21be09081f72b631a5ea2bf6cddb98a0b0a84a681ffdebf2cea4dcf
-EBUILD emacs-29.0.9999.ebuild 16519 BLAKE2B ad8023a343f5b3809ac1a1b361c6213921931c2afa9eeca1d57d77b925f56c319ca10880ab7d70a33488e44c35969475b14442989c50147b7722e3d9cf44ee03 SHA512 50c3e8308f7627dd0da511104fcf3dc93e6095ad8334fa425de17b597e44e6feba58e0851cf15a8e1deb280b4957fce2ae173688f519b5e27bd4be25c42ffcb7
+EBUILD emacs-28.1.91-r1.ebuild 15017 BLAKE2B ffff9bb339105d79ba5acbdb98f923b28efe05d1f8156b9a5327facd85aaf989ba69de8c788c7904de164662d9dddf4523330d701c1002798b6e2dd736da3923 SHA512 c5c75748123da1ce2b32f11e0026f9ec9250a3a46534b0611c3fef699946e8fdba0118ba25e8951f3cb047d13da7397749eba32e0272650d128aac5bcde75413
+EBUILD emacs-28.1.9999.ebuild 15114 BLAKE2B 4b42d6c38221d17a3119523dc7248fc44cc8e75fa49c20f8bf4513ffd00860bebc88dbbfc25cdc9d1b1a10cadc3666a30afae95caed7eb7ea4163400afb69888 SHA512 00e7401f911a2e23f6530555fa352af7f024acce2b7f13d3b0427cbe8ee7ac91356d4340abfb5f636be8689dc1e5d405649b701a3c769670c65d579d8f04a751
+EBUILD emacs-29.0.9999.ebuild 16596 BLAKE2B ca64fcc0271d921d216171411d5849fc7d8a3ec04b348b41516e2f677b6e710c917609be44345d6fd72b8fe580a5f37d5651b96d369c294465e5270388139cc3 SHA512 eec5cb8e3b7b25760c6df63410e844433103b84f695c12d5bc29ae910b89b5809426823974704259f7476e33cd48392a892d52982f89b059b33deae633ad9177
 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
--- a/app-editors/emacs/emacs-28.1-r2.ebuild
+++ b/app-editors/emacs/emacs-28.1-r2.ebuild
@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi

 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
--- a/app-editors/emacs/emacs-28.1-r3.ebuild
+++ b/app-editors/emacs/emacs-28.1-r3.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs

 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@ -31,9 +31,12 @@ else
 	elif [[ ${PV//[0-9]} != "." ]]; then
 		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi

 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
@ -149,6 +152,9 @@ src_prepare() {
 	fi

 	if use jit; then
+		export NATIVE_FULL_AOT=1
+		find lisp -type f -name "*.elc" -delete || die
+
 		# These files ignore LDFLAGS. We assign the variable here, because
 		# for live ebuilds FULL_VERSION doesn't exist in global scope
 		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
@ -165,7 +171,7 @@ src_prepare() {
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die

-	#AT_M4DIR=m4 eautoreconf
+	AT_M4DIR=m4 eautoreconf
 }

 src_configure() {
--- a/app-editors/emacs/emacs-28.1.91-r1.ebuild
+++ b/app-editors/emacs/emacs-28.1.91-r1.ebuild
@ -152,6 +152,9 @@ src_prepare() {
 	fi

 	if use jit; then
+		export NATIVE_FULL_AOT=1
+		find lisp -type f -name "*.elc" -delete || die
+
 		# These files ignore LDFLAGS. We assign the variable here, because
 		# for live ebuilds FULL_VERSION doesn't exist in global scope
 		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
--- a/app-editors/emacs/emacs-28.1.9999.ebuild
+++ b/app-editors/emacs/emacs-28.1.9999.ebuild
@ -149,6 +149,9 @@ src_prepare() {
 	fi

 	if use jit; then
+		export NATIVE_FULL_AOT=1
+		find lisp -type f -name "*.elc" -delete || die
+
 		# These files ignore LDFLAGS. We assign the variable here, because
 		# for live ebuilds FULL_VERSION doesn't exist in global scope
 		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@ -171,6 +171,9 @@ src_prepare() {
 	fi

 	if use jit; then
+		export NATIVE_FULL_AOT=1
+		find lisp -type f -name "*.elc" -delete || die
+
 		# These files ignore LDFLAGS. We assign the variable here, because
 		# for live ebuilds FULL_VERSION doesn't exist in global scope
 		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@ -1,6 +1,6 @@
 DIST ReText-7.2.2.tar.gz 522652 BLAKE2B f9b19f985c1381eade324758c4dc6bf2e5f74bc3f5bfc27afa10462b7387f64a3e72edd5875aabf1831f1f0a942f395e43b124c172cac8cec4b9f19334661484 SHA512 68345b57b2c5446158ed3a6f97b5ead103ef1c99a3aea9cbc69ef7d0807fb64546f38ebde2969b94429eeed6450abb345fecc566dcf6e0767fe84c4e27348e53
 DIST ReText-7.2.3.tar.gz 527428 BLAKE2B 3c710769a881275d74018ba319b174020dda0b65da22ae926231af56901b56c31b3cff69119a9bb378cd218d7b793f002bb08bf1483cc1e55c95a4963cbe1598 SHA512 eb337866f5dfacad2f23435f09b550f4378df5bb261d6f79b1708fed9e7bd93e96e8f06f940cb7109fe02aa6df0592b151f11dfe13853799f0b1ac2c1065a0da
 EBUILD retext-7.2.2.ebuild 1976 BLAKE2B e50052619b4664d384b13993041fa78b0eeca5f2fc084662c42f3912249863c5e079a8d4041f4f44e4913d1b9c2f06653d589600837cb934c116529fa562c58c SHA512 df0c32f8d6afcef5207ce9edba6ad2008078f1556f370d7708e41980f00dddd148aa867747b632bf96cb9494521474a6639d708570c269faa0379423e6846dc4
-EBUILD retext-7.2.3.ebuild 2022 BLAKE2B 47b58eb7b230911f3daa28ad9240a750aef63710560eaf6ef4dd9c3f3f0cea01d9a5f62ae745cd4d36564e3ef0ddd3d9ebe071ada2ef52f5759cb424b5fe9c97 SHA512 e1043f16a139a9eaf93b32fcf08538a2280a7091b91dabbe76b944382bf5006f09befdf8655f7d58871073ddb28b763ac789319b42e7d4f18ed4469be222718a
+EBUILD retext-7.2.3.ebuild 2021 BLAKE2B 353e22f58be9fa226ddf1d4c3e37698e08b21fecfb49c56ed21c44100a898a7d055400d7d4bd514756b5a25ddee9ec860a88bcf887759c28d270f08170d9cd2f SHA512 cbfe7cc9d5f167677155db5e4366ebe0b5763e4dcc0826fbc158bbb5a108a9d73285fb19bcf847677eaff076195939d7ba1ccbbdc1e40f3955e9158ef6a51e38
 EBUILD retext-9999.ebuild 2022 BLAKE2B 47b58eb7b230911f3daa28ad9240a750aef63710560eaf6ef4dd9c3f3f0cea01d9a5f62ae745cd4d36564e3ef0ddd3d9ebe071ada2ef52f5759cb424b5fe9c97 SHA512 e1043f16a139a9eaf93b32fcf08538a2280a7091b91dabbe76b944382bf5006f09befdf8655f7d58871073ddb28b763ac789319b42e7d4f18ed4469be222718a
 MISC metadata.xml 298 BLAKE2B 82f3b1a76b71a731c76a61612a0e3a31634b08ab73d1ff9d57c9c68fdd68b0acf9387a5024772c9fe80d4f54d2134c591b17bc4c519d06b50491671042f4c635 SHA512 5e439ee1dae76ef108f8a5f28a5e4305181eacab14c9b239d5f3d4a6b25a25a59617eaa5d2df13b5fba8362d6b8f3af43af8fa9df22715867e170d29cf649c5c
--- a/app-editors/retext/retext-7.2.3.ebuild
+++ b/app-editors/retext/retext-7.2.3.ebuild
@ -23,7 +23,7 @@ else
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"

-	KEYWORDS="~amd64 ~riscv ~x86"
+	KEYWORDS="amd64 ~riscv ~x86"
 fi

 LICENSE="GPL-2+"
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@ -1,8 +1,5 @@
-DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780
 DIST vis-0.7.tar.gz 403918 BLAKE2B 5e4930fdb14ed42a2daf6682a99107ee6eb59e99e348abab5262bdbc53956dd9ccd094695d7f53c6770d10e46b2812b0e07ff90184ff920790f5b95f4091a610 SHA512 ccc6a054fea6917e7751882468a74c30c712f7ec400a913c95c0084691f706e2bee54efb86b75be8b121c9a209c7e587e72e5474c55271d9943e91fc8aaf9bac
-DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
 DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfcbfbd4f42f7992815cf33a604340b59171dcd880f7180ae56e3f73f46684b7aacd96438480db6c4592851f2c SHA512 c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1
-EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
 EBUILD vis-0.7.ebuild 2089 BLAKE2B 6f162ce08ee3df3ccc361c72e95dfd0736629a8970cccef34f389896cd40cf3a34c13f05704603609f53d062c9ec26a25323fa467dce631cdee4475a8bcee76c SHA512 4b7810d5ec4780f639fc52372a2d031ab791abcc06f88887fd69eb883f0a5d82b394501625f0393b06a5235ebeca4346b4795798ea2d733a15426f7506ec8a83
 EBUILD vis-9999.ebuild 1510 BLAKE2B 261b5b6a5f68755c365c6d5ba76950069d7d7cd86f0cf459e2a08d5351195bd62fee18a8808d6834709b6753055581f0e2af8bc92b3bf3880ce324d9a2eeec3b SHA512 248809889b2e225a29e5511f5f337e9b002a32230859526bd90e026127f59970a4368c7afce0fda76359960ccb9bc1189709a3278d225f2717b454840e54552f
 MISC metadata.xml 624 BLAKE2B 5a95ae9ee2534eaccfccfc71f92ba0b978fe6794a42eeb6015812443c0b9ad30bfc604e183c8707e0b6594ef14df6ab499553e0495503768c5807327aa1f09ea SHA512 e052254e86f089107f9bc0b0cc6fa326aa10209d02a7ac1eeeeab040a0d197da3429a6a289ec8c92de64fdd4452f3752d73905c409b1970767ec4ca00c132a69
--- a/app-editors/vis/vis-0.5.ebuild
+++ b/app-editors/vis/vis-0.5.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PTV=0.3
-
-DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
-HOMEPAGE="https://github.com/martanne/vis"
-SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/vis-v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz -> vis-test-${MY_PTV}.tar.gz )"
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="+ncurses selinux test tre"
-RESTRICT="!test? ( test )"
-
-#Note: vis is reported to also work with NetBSD curses
-#TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings)
-DEPEND="dev-libs/libtermkey
-	ncurses? ( sys-libs/ncurses:0= )
-	tre? ( dev-libs/tre:= )"
-RDEPEND="${DEPEND}
-	app-eselect/eselect-vi"
-
-S="${WORKDIR}/vis-v${PV}"
-
-src_prepare() {
-	if use test; then
-		rm -r test || die
-		mv "${WORKDIR}/vis-test-${MY_PTV}" test || die
-		if ! type -P vim &>/dev/null; then
-			sed -i 's/.*vim.*//' test/Makefile || die
-		fi
-
-		# https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22
-		sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die
-	fi
-
-	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
-	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
-	sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
-
-	default
-}
-
-src_configure() {
-	export CFLAGS="$CFLAGS -fcommon" # https://github.com/martanne/vis-test/issues/21
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable ncurses curses) \
-		$(use_enable selinux) \
-		$(use_enable tre) || die
-}
-
-update_symlinks() {
-	einfo "Calling eselect vi update --if-unset"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	update_symlinks
-}
-
-pkg_postinst() {
-	update_symlinks
-}
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@ -2,12 +2,12 @@ AUX vscode-url-handler-wayland.desktop 351 BLAKE2B 8b1d295572865fb25beeb14d9762c
 AUX vscode-url-handler.desktop 291 BLAKE2B 364ce7de060a947d48486a639aed515f5b17e1720ac1eaee1aa4e13559047622e2897c0426aed792e3d8aed440771c6f5bb3e36873140401c951ec3b749cd661 SHA512 4607346645781f67daeb6cff2425924133537d620bf7dac9c2619cd5a1a29252e7ecf1a27f27e7bb917c413d462f129f9ae26f50ec8b531e5ac872bc8b96dd93
 AUX vscode-wayland.desktop 580 BLAKE2B fb70f6b28e975368550735f2dab8be6ccab9510481c794e6b44545a690224bc93b51cbc6beb809886eee1cde3648eb284374c87c0b74a1fcc3bdf0af0e700a9f SHA512 615cacda3121b4a839816722382c23bfa2cb162e2a772ba91bded9e161a92763bb536778ea8f716e4c6c46f4f6c289a9c922347523d278ba3714569eb64c0234
 AUX vscode.desktop 451 BLAKE2B 3c0cbe4a9bf71d47c3534bf6f7a265a04a0949b0bb86e060a0ecccb3b9f242ba9b46f1fc0dea37ff0d982ec88417da980b31b9658906a8f23c707e9b100183c6 SHA512 334b8c025c4a99e0f1390c56dd89e529c23b0ea3f6ec5a83105eb6acc4ff62b4d25419353d7bf4bb69dec611bd98778e7b8c728d2392827aa97690b5b91c7fb8
-DIST vscode-1.70.0-amd64.tar.gz 119734068 BLAKE2B ed24b84903cc8c9a427315ac4f229de337f1d550cfd573815a32984a2fc731e905b94562da6a163af85e56367b9d307691a48d7c4e2f6bc5adf83fe6f9167fcd SHA512 db4eec2303ed2ca778b6f745dd1569f5e17543b672ec077ffaca5887c03977dbe12284d04e67713758f22556669a13380e4a5f515e98c1c63a5fb91568888881
-DIST vscode-1.70.0-arm.tar.gz 100801066 BLAKE2B 829965520d93d1d165cfc6624922eee0b48a5ed16c40275d63192d025d2f810ed1d85710e19e138178c5bff79d3f5b47f1634bbc6434aecc24e533ed2ffd6357 SHA512 8f7db99d16170e3a4823e2efaa03adba3fa89f2323be628969240db5453aefc922c3cb11575e94e3d89cd8691f7991a6a01c1510cdd66278e95788d578ba4486
-DIST vscode-1.70.0-arm64.tar.gz 114890103 BLAKE2B 17ad2db3748e5650e2e0ae85b9d857f6c981109a32c838442d672e8c0af4d6940e410d90e94580cc64bb2b57469768eff0bbac5844bf8a8b6ec8e26cb84e21bd SHA512 a74e0dffdea57f884bad06986cd31f1cbeafbb67b7ed59e5e96dec633144c8208df5b952e89186145ba2b37990d21e15fdf13109d34057652dd0357645c5adfe
 DIST vscode-1.70.1-amd64.tar.gz 119738468 BLAKE2B 7944f5fbaec4d935b71626c3c9fc8abe504510748309024d373913cde7887652e5e2c6176201d18c14e131664031feae6af4b2b75f79a11bf0625869143f6b8a SHA512 6f44acd886ded96d92627587c3c5b23fd629f8e151690e7e205eb4cb594cb1e73c582b15f847afe4c72b80e8fdb08dca165bd8840bbb770647e075b3ca9626e9
 DIST vscode-1.70.1-arm.tar.gz 100809684 BLAKE2B d45cb42134cac7156af0c5108ec70dda7e50d529daf37e352288ec299f6fa53617c260f80bb03a921da837ec706dd2078a2a17dac60255b61dffad5c253e93f5 SHA512 184728e2969d9d00d94eaaa344164ddc536c0fde6267a142ea35157ecc6befa6f1532f35e879345f27a853d05248bb678f2b666c1e07db9651d90e019ecfeb9a
 DIST vscode-1.70.1-arm64.tar.gz 114897540 BLAKE2B 9728a77a9b012352f5f85a236f3cde60ff11ba52a03836feff4ed35f8dcd0101a8924ecae0dfc0ebbf27aa396be649d2c2f013a15341829f2b0e70f491d2eec2 SHA512 0840d16599d6f83922ec8adce84e59b62fbcf61b704d2898215c0a67e4b87461c5a31288a57559cf9ec382882fe5f14512927670082b044a7d1152c80a78a642
-EBUILD vscode-1.70.0-r1.ebuild 3157 BLAKE2B 597031b0395dba268fcad3e45b8ce3cd2ae3323d2fda455c23f054e7cc0dc50bd3777f533a914caea027ef3003406ff4d950f77343b05ed1d43e879c973510a9 SHA512 3f9c8d7f709835d02bfa50699e0714d91601f28bea7c31f85cc1987f3fccacac838338f3616d8385c3396e1a0977b87a077a44b18cab97d67a04e61f0c7e7aa8
+DIST vscode-1.70.2-amd64.tar.gz 119730258 BLAKE2B 3d9098ea2bfea299eca56eac56c4b503b3cb504350009891d508da99cd1644e4290fabeb7fe9a1128f9606fea7c227d0de2b125af0e63086c62005895bdfc5f5 SHA512 aeaeab1c6a67f211e1e7b4132c10e12577663914b519b68d1971d81d8c20cbf80e02921d4b3ac2e6bda97c76984a76961a9a96cfe8480026d731498377dfc4bf
+DIST vscode-1.70.2-arm.tar.gz 100796924 BLAKE2B b59d96166dcfca06666f8efe84f0e8c81d9c94ed5d9cbe2e4e1ddef0590ff67dd4d31cdb9a15950026519d98b6d542c9f9993398b473c6bace5371cb7898bde3 SHA512 4e60480dabdf8100be9e6db269ba2603e3c730b94437bbd1f8e8535bbfad2694c3c717ad97776181bd10a95c40840c25a8af928e5ce3952b0b6761437e9c1055
+DIST vscode-1.70.2-arm64.tar.gz 114896722 BLAKE2B df09413b7a56274e0c9408a774d43cb15fd01b94447044558f9e51d0d03a7d99941efd78e85c5a602659f27cc013e32327f52f31d1ebfe338f6be26d2e6d60ab SHA512 bf0ceb5a8bbfb20c8a7c08d2a4179d78bba161bbf54582ad4d3821387ee1b090d191dac791cb446fa7439e185708aad2c6fa2f5997f4e92df99a692a7b8f5b38
 EBUILD vscode-1.70.1-r1.ebuild 3157 BLAKE2B 597031b0395dba268fcad3e45b8ce3cd2ae3323d2fda455c23f054e7cc0dc50bd3777f533a914caea027ef3003406ff4d950f77343b05ed1d43e879c973510a9 SHA512 3f9c8d7f709835d02bfa50699e0714d91601f28bea7c31f85cc1987f3fccacac838338f3616d8385c3396e1a0977b87a077a44b18cab97d67a04e61f0c7e7aa8
+EBUILD vscode-1.70.2.ebuild 3157 BLAKE2B 597031b0395dba268fcad3e45b8ce3cd2ae3323d2fda455c23f054e7cc0dc50bd3777f533a914caea027ef3003406ff4d950f77343b05ed1d43e879c973510a9 SHA512 3f9c8d7f709835d02bfa50699e0714d91601f28bea7c31f85cc1987f3fccacac838338f3616d8385c3396e1a0977b87a077a44b18cab97d67a04e61f0c7e7aa8
 MISC metadata.xml 1058 BLAKE2B cf7606233d99e4429debe5ef824f235f1ff3083ab5553030453e982bfb5860dd5ccecca3792319665835d604b6ff2cb53ebd885bb959236784c62885087750b2 SHA512 961552953336ad9606c9fc004fc3e0fb8d7481a017b6ba5da683db5ba989f58d474ccb4ea3a001851b2cfe705e7fe3f70ba01a14dd1f048523e73af522d50410
--- a/app-editors/vscode/vscode-1.70.0-r1.ebuild
+++ b/app-editors/vscode/vscode-1.70.0-r1.ebuild
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@ -2,12 +2,12 @@ AUX vscodium-url-handler-wayland.desktop 383 BLAKE2B c3e281318290826ce9451fe517b
 AUX vscodium-url-handler.desktop 315 BLAKE2B b514551e6256cb444f13bfda86a9e164ed926d8aedbfcb7de3a6b1c3d3c2e465c0ee158c74626814908a153c5f801434952865a708c89ffdf64bce24a83fcc20 SHA512 afcf89af009361b409330a223696013e1ee8973bc3b3068e778fb05c3355fed66063bd537a66685d6ad3578c2808532d4b9c5273a291c7d2f3a9c0b2f997f152
 AUX vscodium-wayland.desktop 609 BLAKE2B 1b25dc9e98b5a12a10f85001b9c5acc9325368a2310a7d1e2aad20e22ae07fb000aa495b694612032e999f431c8f8e47f60eb162d0c7487fcfef6e37249622d4 SHA512 1d371978a5780c8d37e6e1359ca029659055a8d80de0d672d6eb3f21b890db2b92e368fd244be7cf83ec30935271cb269f1b9aef1c7deaaae36c3d739221d8f2
 AUX vscodium.desktop 481 BLAKE2B 89f335edd1f7d0256f95eb96d335c2359d8fd984a29bdc3190218ea63ba9a19e64435eb50c7be818cf28243c8cdf9b385f8987f6917e52df565a4ca555a2a13b SHA512 234f79a5ea9b901b62fe0c094554de3b339a67e8f47ec4b3daa5c0653778b9f51d1ccd91e773b4ca27f27e30a5847d5a3172d0ed322ada4d47624028bd5d8c1b
-DIST vscodium-1.70.0-amd64.tar.gz 119473836 BLAKE2B 278b071006de89408f5124a38b0dbccaffa10a574397473ba84da41d0f14ec1b472ffbaef6580cc5a033187aecb9d8de39893d0060e3d16e38741840b57a209f SHA512 d0284e25144c01aeebda8e460d5f83aa62a529bc9c97949f037de9515ad387c3b99ff306eafdeb1a2d69a18a90ba284d7acbbfcb469438ba38a9094b9c55bda2
-DIST vscodium-1.70.0-arm.tar.gz 101286329 BLAKE2B aa1862aac41bfcc1836a91933185097abf24664b1a85008603bd0d41154cdcfdf94ae6e9c5885d2762a7b00bbddae5af91f78233f5775c213925992db9969882 SHA512 9565c6c08c6c1dfb8bc1622514eb54220b2453cf697a3f30b85fe67fca9f7a295a525590c5e1b6fa23e9c84f139e54d2425e13c68d872a5a7eb001b945ae5a63
-DIST vscodium-1.70.0-arm64.tar.gz 117321647 BLAKE2B 9a49aa9d77dd2aec1561ff8332953062341fc5c6d37e2130c509941d673c2ff32b490ca6755602b46e635425cc801492ed30a058ef8b5f93b58a9c7619695512 SHA512 da82950cf243bbafebb415bf72127edc63dfa805cb37045c5ffff67f24d28fb811c44aa0d2c3b14098238dbd55c29e384872594ef6d8464af95dea6379cdd071
-DIST vscodium-1.70.1-amd64.tar.gz 119463559 BLAKE2B 735786acd7796445f66dea016d3024286c5043f5eda635963eb9dcf4fcb0ff27265aacce18d9e2be00f2f7e6ff580d0c6dc83ac91dbdb7ffd934b721c221793a SHA512 115b3f520b53becbd164c868406805e6012b51414d803283d80eb4cf992c2e0fea53af3e1939dcd9cfb1264b13b4a3eb422a89f763f8eb7fbd28ce462f3a6fd6
-DIST vscodium-1.70.1-arm.tar.gz 101292517 BLAKE2B a2a0abd470988f649d657498ebdb49c1b10ecae4a8797d78da341c526604596680af301a7bb940bcc627e6aaa6fe971a50e4311baf2364fce4eb65779ef835e3 SHA512 33dd3eda80b9a6353e72ed92ee5f2adc3bdc48c49de0fa0829195e695fdfab0cd2fcba9fa1d6a0d6e3eccc3cd4b5c87a86af5e29161105a070f4743a413d7a2a
-DIST vscodium-1.70.1-arm64.tar.gz 117318425 BLAKE2B 16af0105d270aa706d762f94190838f7a0f5fb9ffe3c1b0eccbdf120d8ff1c21473d871170b252e1a805ed9ce81d35f1bcfbc33cd085b363497f40770fb32457 SHA512 9cb90d5a43aa124bc77cdf2868b45da59fa2c8573333373a6e351f2ed00fbccf7069655e30ce39e7322d8c18bb7edb20818b781bc1d60c3f524f8b37b85a6645
-EBUILD vscodium-1.70.0-r1.ebuild 3015 BLAKE2B 3ed691411f9b21af21d22e20d6ee2c666cf27e2645b0424331d8c85181166acc6e937cbbc0dc3fe6f894d017f1399786f5f49a387fd45ecf6d38b61b62f5f488 SHA512 dfb471155ea94bd9fc842df3ef3a8bd60216d361ad6a5a1ff49b47850696966304b5c93ba48ea1c3a9d2474a91cb2f0c901e439da5a1d8f547aec690084ac1f6
-EBUILD vscodium-1.70.1-r1.ebuild 3015 BLAKE2B 3ed691411f9b21af21d22e20d6ee2c666cf27e2645b0424331d8c85181166acc6e937cbbc0dc3fe6f894d017f1399786f5f49a387fd45ecf6d38b61b62f5f488 SHA512 dfb471155ea94bd9fc842df3ef3a8bd60216d361ad6a5a1ff49b47850696966304b5c93ba48ea1c3a9d2474a91cb2f0c901e439da5a1d8f547aec690084ac1f6
+DIST vscodium-1.70.1.22229-amd64.tar.gz 119469285 BLAKE2B 0f21c7576a144f20b9744d7192d2186dd49679a8dbe110c904b839a16f486edcda0c6fd6c2bc63abd995e14c56239bc84f95b89ef3a8232a8b429578c9216550 SHA512 4a74ecf5b60b59630814f7e908867d9fbe10622c1bb5b5054fe96c47dab7c5e12044de82c353a679d7779c65f36fff92a10453e39742f9a5ab727baa8821c224
+DIST vscodium-1.70.1.22229-arm.tar.gz 101292874 BLAKE2B d2cfcdf00a9eb1c65b7426a4e479ba15baeffb39d79622e37655d7814b1c62c072906e96bcf28d306331540fa39140a0f3594a267cc66176e2d7f7b1e81ac543 SHA512 9e607c576f79a59a23ff641742ccd6559318a5a37e047780762c78a0f4c7f632fc477aa733e4805022a77e615e17bfacd2cd99cbf00aa1959211705389126300
+DIST vscodium-1.70.1.22229-arm64.tar.gz 117342125 BLAKE2B c924b7b9af67613d61ae7a334d422627de7cface80e27da06f5a7be905e1b28d360225f7790917951e350fff315ab2315b5235f6d1f99b8ba54afa584f80e1a8 SHA512 ceff9924e1dc8af7efb77979c67108aa9bf7d48c984da514ab8ef238d1a5690ab6946bc2fa71c8e2d1f4daf8ac7aca78fd7cf210591bace31cbf3ff487b72339
+DIST vscodium-1.70.2.22230-amd64.tar.gz 119462089 BLAKE2B 85bbf6638cea72e66b795e4fe33b8fa2815bc05d1feb98d549e6999b09fe4b0f4b1718423b35714e35724c4645a4136df529d7e43a8be83c810ac156b63a52fb SHA512 0830645e671bb9ebdef7c7abba5c3cdf934468621bfe2537ccd10fba64c1278fde381373fe0fc99484dfd9c382b72298695d5d89702414705c29ed270a41a3f4
+DIST vscodium-1.70.2.22230-arm.tar.gz 101302938 BLAKE2B c062a33ed58b3d322266ae0ce9825c3aa126f5f8feff4e9c53dc5fc5fcb94b43ec61c0b9cd814f222c74426740734b7570e88c7d54bc11e9bcfd12b0cc761186 SHA512 dea101d8ef45912ee5fd39cb57e90dba9079bc466ddcd8828fcf91ac1d2f792e158d72592a3a657a328e2f4130bfd80e5b084c5457ba32221adee1045f07fdc9
+DIST vscodium-1.70.2.22230-arm64.tar.gz 117323455 BLAKE2B 9e2706c5e99f2ed0343ac8b036d519f8adef56c5cd9f8bd219a80cd6d20c49b6d62a4e31d283329daa6147462d6ef526a9f86faaaf017f6a903e7a7a9b392256 SHA512 ed766d2e15e70ae639bb9f42d4877a6f2c0f4984f1a8693c895452b4043dd00a617f5b3739941bd3142332a677cb569383156c7a20d35a072e3177eb5a3457a0
+EBUILD vscodium-1.70.1.22229.ebuild 3015 BLAKE2B 3ed691411f9b21af21d22e20d6ee2c666cf27e2645b0424331d8c85181166acc6e937cbbc0dc3fe6f894d017f1399786f5f49a387fd45ecf6d38b61b62f5f488 SHA512 dfb471155ea94bd9fc842df3ef3a8bd60216d361ad6a5a1ff49b47850696966304b5c93ba48ea1c3a9d2474a91cb2f0c901e439da5a1d8f547aec690084ac1f6
+EBUILD vscodium-1.70.2.22230.ebuild 3015 BLAKE2B 3ed691411f9b21af21d22e20d6ee2c666cf27e2645b0424331d8c85181166acc6e937cbbc0dc3fe6f894d017f1399786f5f49a387fd45ecf6d38b61b62f5f488 SHA512 dfb471155ea94bd9fc842df3ef3a8bd60216d361ad6a5a1ff49b47850696966304b5c93ba48ea1c3a9d2474a91cb2f0c901e439da5a1d8f547aec690084ac1f6
 MISC metadata.xml 1302 BLAKE2B ff0c1f72c2394f21e13b89831493df562ca15114fa5006262f794d3f2580deaad01d7e01f87481dcc75cc5044c8b4950955dcc3dbecbc8cfc7a6ceafaf078fb6 SHA512 8ec965d8544c2ab31e3c2f2f3c879b084126880603681fef5e5158af1bc1f2f79351b68284f6a101d486893f968594e1537df1eedeacdebffdf51de7a38ccb25
--- a/app-editors/vscodium/vscodium-1.70.1.22229.ebuild
+++ b/app-editors/vscodium/vscodium-1.70.1.22229.ebuild
--- a/app-editors/vscodium/vscodium-1.70.2.22230.ebuild
+++ b/app-editors/vscodium/vscodium-1.70.2.22230.ebuild
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/eldev/Manifest
+++ b/app-emacs/eldev/Manifest
@ -2,7 +2,9 @@ AUX 50eldev-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b569
 DIST eldev-1.1.1.tar.gz 214901 BLAKE2B 42ca0089519fc97cb3cd89718eee2eef5c14d1b4cfd0864524a8a5cd22855e1fbd399233229951f3356b7f9ff6d69bbe5ed8abd8c6ae6129fae67279f900ce53 SHA512 4665bde0337a224e34fb3ec81fc6013a38800770e81e2b0911c7e05cb958fb18846995cba1494f84ae1299e1e4374645de3173ad12b01b379b61759b3c893032
 DIST eldev-1.1.2.tar.gz 215487 BLAKE2B f34af28c43b9799935a73892561fbe0a28feeb864c05bef9d3fd234cff905096bf84cd12570ac3da00b89b99edc891f13e39ed6c6574e07a67d45db0e25d604c SHA512 59742d1b50be10759dd90aa81e5a80c0c52e3f32b45d458a9774f98f37459682cb5de03c248e4c8dd664f53a8f6253db1dc93a3958a4e74306c50e20e578ef56
 DIST eldev-1.1.3.tar.gz 215481 BLAKE2B 9eed051f29be1eda9e7bbb2f55fec69d217d52fda592b206afe39c7f64584140a8e3df75f0963f1f6ba95b555961218663bede39b32f86508f0ade95e627515b SHA512 5d91d3067d82287543d4ec55440874900c3cd52359415da961641af96984f7cee978ded1dc77752d6df55440d48c951c010070657177180aee623647c9dd76b4
+DIST eldev-1.2.tar.gz 237458 BLAKE2B 8b91de9fe66c3746519591f44fc7560971d7aff72c81b320991a8bb2dd2ac5a102ccbee2edb4b1488ed8492b42071c79be0c8ec1fa7fbccc4307132cfbf52706 SHA512 ca1fbf6af218ad4632f9b8d199bf6a25a75a915263dc92b3b5bc4681c62aa5523b4e6391a110fa961bc578ce01aa4c4ec62a543418febcb1e74e4e8706801884
 EBUILD eldev-1.1.1.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
 EBUILD eldev-1.1.2.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
 EBUILD eldev-1.1.3.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
+EBUILD eldev-1.2.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
 MISC metadata.xml 982 BLAKE2B db2324ced8f4bc4ba579130677175a9de7a8dc7b8d937cd902edd69a20bc897bf4ee034acb6a9400b88de82c58c2b144e62ec4ac7b75d8dc63cdf56670cacc9e SHA512 3e4d2d7ea4fbada45b4d933d7711266bcd9ffd217ee3c3e3351e9f66145785dc11449b4f09f5ffa4853d2b475db45e501848d259f80fb5aa26429acadcb6da7d
--- a/app-emacs/eldev/eldev-1.2.ebuild
+++ b/app-emacs/eldev/eldev-1.2.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Emacs Lisp Development Tool"
+HOMEPAGE="https://github.com/doublep/eldev/"
+SRC_URI="https://github.com/doublep/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.adoc )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ELDEV_LOCAL="${S}" ./bin/${PN} test
+}
+
+src_install() {
+	elisp_src_install
+	dobin bin/${PN}
+
+	# NOTICE: If ELDEV_LOCAL is defined Eldev will use it
+	# to load up it's components,
+	# if it is not it will bootstrap itself from network
+	# always check if it uses installed Emacs Lisp files.
+	# Also, do not forget to run `env-update` & reopen your shell.
+	# https://github.com/doublep/eldev#influential-environment-variables
+	echo "ELDEV_LOCAL=${SITELISP}/${PN}" >> "${T}"/99${PN} || die
+	doenvd "${T}"/99${PN}
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+
+	ewarn "Remember to run \`env-update && source /etc/profile\` if you plan"
+	ewarn "to use Eldev in a shell before logging out (or restarting"
+	ewarn "your login manager)."
+}
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@ -1,4 +1,4 @@
 AUX 50pymacs-gentoo.el 183 BLAKE2B f1a4b874bb339b653c4fb6fb186bd7e531151c34d1df58be6963288d4443438fcae0f82c92a1667b4e7cb739bc2f7c6fd8d8d5f6d4e91413ee5bec47a609cc2e SHA512 f59fed86f859b796c901088b38fb570a5e5527d774a15456105ce75598c31fd20d0afaa62ad9cbf12063810fa592dbbd7c33aaece5871b36b488e5af6de0fac2
 DIST pymacs-0.26.tar.gz 123373 BLAKE2B 0c467435d18ebcbe7b263e90096363e201dd84ba770fa702beefac4318a713954c316f335ee005ea88370be29c3710a7df04fb05b6efd3816beedbb88e38126d SHA512 ae245de130f435d947788c5ac11d8ce6534df80f70a4e35fff903f22d2b79b0f66925059ebaf53bde45cd6660ac0a8a224490f4f9e256a84e3a08f6468c14dd2
-EBUILD pymacs-0.26-r3.ebuild 1104 BLAKE2B 2c8f36295ae9c18fa3d34ef05c1feed08dca1ee6998b3f30740e0538eb8e43dfa528878cfee5b385b242cfdac7d74544be6d119e5c7d21c3a3fb40c056b1087a SHA512 43308fb357ba0c483affb6c9f42a4b48e8184a192fa8c728388803f9e4d3c197ec04283ef8f0e6a038315b8347d62390f0fbab09020c75a0d730ca6960ada527
+EBUILD pymacs-0.26-r3.ebuild 1103 BLAKE2B 3da6ca03e7004bb0ccccfcdd796dcfa7244bb7c7db04db91e665ca7c2d805159624088c48a1d44702c6853b5408f389cba675b32ebc0740b395a9e75d97cb1db SHA512 c7963abade8ff4d427991e9a13102ba3ecf39bc2af47e2123f0f1d5a48c512ffdd3d2c0513e5fe3d7158627bd67bd27c30c5d10913528fbd4ad93aab9e9b0fff
 MISC metadata.xml 436 BLAKE2B 4239aac38b2303531a3792704946f0039b484aaa1561a336ffb4955aecd3a6881051a8de0a8d9c2b2c628e2ef45a448519fa70efd2698a64a4f07d38adb04b07 SHA512 4be8dd1573dee1c631449a512d6da4ff02f9917c4132477ad5383432521087a3f5468698d1a0b9906fc76367b75bca9d25e6da3ce0142be5fb4e4b7e225651d9
--- a/app-emacs/pymacs/pymacs-0.26-r3.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26-r3.ebuild
@ -8,7 +8,7 @@ DISTUTILS_IN_SOURCE_BUILD=1

 inherit elisp distutils-r1

-DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp"
+DESCRIPTION="A tool that allows both-side communication between Python and Emacs Lisp"
 HOMEPAGE="https://www.emacswiki.org/emacs/PyMacs"
 SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

--- a/app-emacs/spacemacs-theme/Manifest
+++ b/app-emacs/spacemacs-theme/Manifest
@ -1,4 +1,6 @@
 AUX 50spacemacs-theme-gentoo.el 114 BLAKE2B d8dae7a2e3ed0d55f87f3294acd13cbcde06565c35d19ec8a52451f3c47f341420aa6e9aa036d0a6177e08432edf7b67ad58ca2bdad5bfff3269dadb3935b862 SHA512 f776939f1471433fb063509f4e0733db81a46c1182a2ba0d15ccb4270ae6890e5d8b61272b9ac88483a12789335aff5af07478c28e396c352435c97aab252345
 DIST spacemacs-theme-0.2.tar.gz 688604 BLAKE2B 1806fbe9b2b1b9a625778415aa6df74e4acc62279d811ff782620a7bb18e6a1327b16dacc174267c61fd959191f2ccaecaaf08f30ae5bb2844652bf92919cda2 SHA512 250f15e11c38e16930107bc2bf0c265876ba74383743714c0aa6bdb270f55cb14ee41c1f2c4d1008a6d90d3c361f44f363d36af0fb0e92087df8d320e0a888a0
+DIST spacemacs-theme-0.3.tar.gz 688782 BLAKE2B 5df23e5c98396d824e0b6d6a2f29f83966dfa935371266449cfa6e4b8522ffcd4e0719617a0e13722ed7cb5f8df5329e0603b2c21ab30b0b21a8a4bfff1ccf7c SHA512 ea11248299fbf3be85fd96b2be28d1ec2b770e53d138d36a0ece9e519d8c186dfe6e454d69bc9e5d5d5a3a5d8d03452fff3d452927fe6655356db856657c212d
 EBUILD spacemacs-theme-0.2.ebuild 490 BLAKE2B dd14d856a750926c23a8fde8cec2634e80d9f4a3ec5656d14197a532a81c61314c5e6d5a6f90dc86ae781fbc44d62ac5e9877ad710dd90c09d4bda88406a06a7 SHA512 42bc6f8a0585def2dbca037d5e305da394756ee2f94f4f56ed9711ca191dc11ef29c51494b77401ed4183614001d5296580845c3368d21a8e74a9baf9b96fc4b
+EBUILD spacemacs-theme-0.3.ebuild 490 BLAKE2B dd14d856a750926c23a8fde8cec2634e80d9f4a3ec5656d14197a532a81c61314c5e6d5a6f90dc86ae781fbc44d62ac5e9877ad710dd90c09d4bda88406a06a7 SHA512 42bc6f8a0585def2dbca037d5e305da394756ee2f94f4f56ed9711ca191dc11ef29c51494b77401ed4183614001d5296580845c3368d21a8e74a9baf9b96fc4b
 MISC metadata.xml 437 BLAKE2B 36e22919e1f78b39be205814074e044256b7c2ffce32427b508f4e58cb713006a3a89ef0ad4dfe79c76a459d6eeb6c353f0553d9ae4ff9e759f395be0864d938 SHA512 78251c276dd66a11ef5d467136b9b29fdaa6afe8ec2e4c6d68ab2301c4ad93b6c4e65619409e98eb28b6508d15c5ce71f10ec1fe7d1441cc1f35168e2dda0f9a
--- a/app-emacs/spacemacs-theme/spacemacs-theme-0.3.ebuild
+++ b/app-emacs/spacemacs-theme/spacemacs-theme-0.3.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Emacs color theme that started as a theme for Spacemacs"
+HOMEPAGE="https://github.com/nashamri/spacemacs-theme/"
+SRC_URI="https://github.com/nashamri/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md img )
+ELISP_REMOVE="spacemacs-theme-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@ -13,4 +13,4 @@ AUX ski-1.3.2-syscall-linux-includes.patch 397 BLAKE2B dfb72fef3be8110ab5acacb8f
 AUX ski-1.3.2-uselib.patch 582 BLAKE2B b0d91fed1a01c6d4c2db464a1dbe6c4855a0302eacb21367865a3510b081a95756f1b09f79a015a1e20b3cb87d31e08785a5abed4a661203aec82a4a311538bf SHA512 f119e1a18ef08f40758fa1ddde61a88533b432c75111bba38ffc134edfee66f28ee01336509ed106461bddfc438d1eac48213ab4940e82f5128b924e584b974e
 DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
 EBUILD ski-1.3.2-r4.ebuild 1506 BLAKE2B 90836a677e69fb8ebf30da8e387f48b440999de416f2924e4e11d0db2a3b36f55b1050a67bf04b3ab86319664cfe8b0493328907debf72c45254ed990d959b53 SHA512 e9c9f64fb7230421a12a910ee4d46e9defe4ee6a9ef85fa8fe47bc9f7a6afa91bc2eb387736639682848b1e01be433f079a08c822c687a30ccd5a5fa66468892
-MISC metadata.xml 362 BLAKE2B d68617202b219ea432d578e887768aa651afe38327a5bdc2d2d7231df18464bf3d113425b9e6027ef740a9403f958b88febb498a58e52c53e58e5d545738ec47 SHA512 42917d55e9ff3ce4a73e175f6f9a3c3faff4edae272139ce891a8cab89a6d97ee2b4d9292ad9fa92b864a771e6f0bc28e47c2a385c7212a0332d7fdcf64673d6
+MISC metadata.xml 411 BLAKE2B d9b6023db6462b087fa1acb3767fd0b29ab4f02014a7a3aff864ee518d689bbb95980fdd6d7d561c424b1cda2dac45fc12e8c885af877877206deda14f7f4b2f SHA512 3dbce520f1b8ce4beea04f912341167e8283cf6e6be3a9db796d393219cafff6408f93b1af60f39b3e521f96dd1c5f7a4b214002aad29bf64249a4fa30dfc00f
--- a/app-emulation/ski/metadata.xml
+++ b/app-emulation/ski/metadata.xml
@ -7,5 +7,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">ski</remote-id>
+		<remote-id type="github">trofi/ski</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@ -1,7 +1,9 @@
 AUX virt-manager-4.0.0-setuptools-61-fix.patch 993 BLAKE2B e129b16cdfb1fb819f4cc8e99b67c28a259de92e62254ddd6d2fd4920ab1713cfb3329d219d692a37b963eff6dedfef36e5e5763ec25d7ce736767d17c52966e SHA512 eb0ec5d9cd73ce35b0c0cc75413e607bb57854a0430ef509acbc438d829ba84dc06441f8b333133c2de7cd423b3110faa0b5012eeff72e594905376b716265fa
 DIST virt-manager-3.2.0.tar.gz 2858909 BLAKE2B 83bd8589fb7d9c855300e06689fdeeeee575e354f9349b5bc63ff1da1a8b578a842f6f60d95a8b8fa53ed007c090d37f706f50fb8dcbcee83c08e27853a150cc SHA512 90cd98fe6b269007cd30f628490c65df440abe39b4925c65dc80667e7d80d059752695353ccf6ac3e2436206da311bc402eda50df31874d82ef8fe115966e1ec
 DIST virt-manager-4.0.0.tar.gz 3096236 BLAKE2B cf6ae282c6a351aab832a06387bf9daf9093c8cce3688cf0597f33d037db875638429a5320ffe28d8d860c83484ba5d6a02a8dc758c98914fa2af483552dede8 SHA512 115dc3feb499bb2f1f6df537bffe150d23b9b568fe8047d43577a138ff9b9180b10259dde3476136cdc85750576da1104e81a8c2f5761b4f2a89852467761f81
+DIST virt-manager-4.1.0.tar.gz 3151412 BLAKE2B 1b4203be81bd7b82251225d691a4d9068f268e610f049bcadb96de5b539e964ca0b001f22f06ddd8266b58b079f60046f6d11942a1e4eadbc43f0607c46bbddd SHA512 725cb5bcbaebaafae417f95deffb4243ccdad769668cba6e1235f4607e2b29dbd099d2a9a3885981158f53ea854dd71cc29ed9d7557b2791161c13d34f2ef883
 EBUILD virt-manager-3.2.0-r1.ebuild 2566 BLAKE2B 9fdea4cfaa4d6cbe5f9b9000695ebd02c8e2c4d9d4ed0222a90690f977f72de63f997187295b13c110242b016003bf693ac032e2edc59eea2b3ea6fd81436336 SHA512 72f75dd06013f473c8620e726a49dde64b20137d1020f7bab0933c3b79ec515eeeae50b592661eba25a0ad57995b06c780dde7b49fe0407141e8cc8a1c0f25e7
 EBUILD virt-manager-4.0.0.ebuild 2607 BLAKE2B 52cebf620855872635d2b0dbbe971093ccb6faa575c42c005dc272f1755c060ff92eea9b120dcc89a603314f8c31be43b544e1456590c6a98371c11e2063eee6 SHA512 531e2c6014f6267b300c47c44aac89c8dcab39eb6244d1e86fa7ca47d37a3a8e869badc481a407e0662a129b96e3b12cce6624e5b510e9271d3f31e1c42cbc44
-EBUILD virt-manager-9999.ebuild 2524 BLAKE2B 2ec7855cb1f40cbcfe9fc44268a67f232b363afb02beae4450360863721cb08cbc326df90464bc1541585d536dc4b8f699044788c84101cd8249b7ed956bfccf SHA512 8f07683cb85c6ccf57c76ab1451e5beee44dbb8bae4f4a7416e73359d544f5a191e0fcc45da7ba567db87a18c7b3d322a537cc5fd0f4f0ed5d7ffd79db873849
+EBUILD virt-manager-4.1.0.ebuild 2642 BLAKE2B 7db78a0d314e205b6460383643e4997ae0de26a998b5d41dc7346dd35490622669afc5cb3c2ef86ca7cb27c7ea4707dc071213ffb5777e68ae7df77b18fb6759 SHA512 3b7427b36cbf9c7b6237734fbac63852cbe85afb0e6c738db48aa25fe7b1854065979c88e991f15b66b0b13cb7a0b25ab59a39c4a9bb9dfcdff5246d6f09fc40
+EBUILD virt-manager-9999.ebuild 2642 BLAKE2B 7db78a0d314e205b6460383643e4997ae0de26a998b5d41dc7346dd35490622669afc5cb3c2ef86ca7cb27c7ea4707dc071213ffb5777e68ae7df77b18fb6759 SHA512 3b7427b36cbf9c7b6237734fbac63852cbe85afb0e6c738db48aa25fe7b1854065979c88e991f15b66b0b13cb7a0b25ab59a39c4a9bb9dfcdff5246d6f09fc40
 MISC metadata.xml 717 BLAKE2B 931cc0f16850272e3d61e4c3421768bd01fd98891d1049d540c36dfcc1cd3872c158796edf33479005fdf07fe449d251ef55562a832db8827e757202ed1b046e SHA512 e40d93e6febcbb48ea6178986736721a5c45bc92073a9108179fd437bb303ba1b6bf0adb6053e36f877b660c413404ef877aefe4d3ef2ec124d6b6cc808a411d
--- a/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+inherit gnome2 distutils-r1 optfeature
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+	EGIT_BRANCH="main"
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gui policykit sasl"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-cdr/cdrtools
+	>=app-emulation/libvirt-glib-1.0.0[introspection]
+	>=sys-libs/libosinfo-0.2.10[introspection]
+		$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_USEDEP}]
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	gui? (
+		gnome-base/dconf
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
+		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
+		sys-apps/dbus[X]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/gtksourceview:4[introspection]
+		x11-libs/vte:2.91[introspection]
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/docutils"
+
+DOCS=( README.md NEWS.md )
+
+DISTUTILS_ARGS=(
+	--no-update-icon-cache
+	--no-compile-schemas
+)
+
+EPYTEST_IGNORE=(
+	# Wants to use /tmp osinfo config?
+	tests/test_cli.py
+
+	# These seem to be essentially coverage tests
+	tests/test_checkprops.py
+)
+
+distutils_enable_tests pytest
+
+python_configure() {
+	esetup.py configure --default-graphics=spice
+}
+
+python_test() {
+	export VIRTINST_TEST_SUITE_FORCE_LIBOSINFO=0
+
+	epytest
+}
+
+python_install() {
+	esetup.py install
+}
+
+pkg_preinst() {
+	if use gui ; then
+		gnome2_pkg_preinst
+
+		cd "${ED}" || die
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null || die)
+	else
+		rm -r "${ED}/usr/share/virt-manager/ui/" || die
+		rm -r "${ED}/usr/share/virt-manager/icons/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm -r "${ED}/usr/share/applications/virt-manager.desktop" || die
+		rm -r "${ED}/usr/bin/virt-manager" || die
+	fi
+}
+
+pkg_postinst() {
+	use gui && gnome2_pkg_postinst
+
+	optfeature "SSH_ASKPASS program implementation" lxqt-base/lxqt-openssh-askpass net-misc/ssh-askpass-fullscreen net-misc/x11-ssh-askpass
+	optfeature "QEMU host support" app-emulation/qemu[usbredir,spice]
+}
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@ -1,91 +1,105 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_SINGLE_IMPL=1
-
 DISTUTILS_USE_SETUPTOOLS=no
 inherit gnome2 distutils-r1 optfeature

 DESCRIPTION="A graphical tool for administering virtual machines"
 HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"

-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
 	EGIT_BRANCH="main"
+	SRC_URI=""
+	inherit git-r3
 else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+	SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi

 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gtk policykit sasl"
+IUSE="gui policykit sasl"

-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	$(python_gen_cond_dep '
+	>=sys-libs/libosinfo-0.2.10[introspection]
+		$(python_gen_cond_dep '
 		dev-libs/libxml2[python,${PYTHON_USEDEP}]
 		dev-python/argcomplete[${PYTHON_USEDEP}]
 		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
 	')
-	>=sys-libs/libosinfo-0.2.10[introspection]
-	gtk? (
+	gui? (
 		gnome-base/dconf
 		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
+		sys-apps/dbus[X]
 		x11-libs/gtk+:3[introspection]
 		x11-libs/gtksourceview:4[introspection]
 		x11-libs/vte:2.91[introspection]
 		policykit? ( sys-auth/polkit[introspection] )
-	)"
+	)
+"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-python/docutils"

 DOCS=( README.md NEWS.md )

+DISTUTILS_ARGS=(
+	--no-update-icon-cache
+	--no-compile-schemas
+)
+
+EPYTEST_IGNORE=(
+	# Wants to use /tmp osinfo config?
+	tests/test_cli.py
+
+	# These seem to be essentially coverage tests
+	tests/test_checkprops.py
+)
+
 distutils_enable_tests pytest

 python_configure() {
 	esetup.py configure --default-graphics=spice
 }

-python_install() {
-	esetup.py install
+python_test() {
+	export VIRTINST_TEST_SUITE_FORCE_LIBOSINFO=0
+
+	epytest
 }

-src_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-	distutils-r1_src_install
+python_install() {
+	esetup.py install
 }

 pkg_preinst() {
-	if use gtk; then
+	if use gui ; then
 		gnome2_pkg_preinst

-		cd "${ED}"
-		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+		cd "${ED}" || die
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null || die)
 	else
-		rm -rf "${ED}/usr/share/virt-manager/virtManager"
-		rm -f "${ED}/usr/share/virt-manager/virt-manager"
-		rm -rf "${ED}/usr/share/virt-manager/ui/"
-		rm -rf "${ED}/usr/share/virt-manager/icons/"
-		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
-		rm -rf "${ED}/usr/share/icons/"
-		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
-		rm -rf "${ED}/usr/bin/virt-manager"
+		rm -r "${ED}/usr/share/virt-manager/ui/" || die
+		rm -r "${ED}/usr/share/virt-manager/icons/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm -r "${ED}/usr/share/applications/virt-manager.desktop" || die
+		rm -r "${ED}/usr/bin/virt-manager" || die
 	fi
 }

 pkg_postinst() {
-	use gtk && gnome2_pkg_postinst
+	use gui && gnome2_pkg_postinst
+
 	optfeature "SSH_ASKPASS program implementation" lxqt-base/lxqt-openssh-askpass net-misc/ssh-askpass-fullscreen net-misc/x11-ssh-askpass
+	optfeature "QEMU host support" app-emulation/qemu[usbredir,spice]
 }
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@ -2,5 +2,5 @@ AUX virt-viewer-10.0_p20210730-meson-0.61.patch 1022 BLAKE2B b4ff7ec6d33da1e73b7
 DIST virt-viewer-10.0_p20210730.tar.bz2 271223 BLAKE2B d66e915eccdea6eadc7d93309c66d648828da65e76e4884bd2a98a645db328296d0013955fe94df45bac5d21079230218de7e09909d29f63568d2fc32b4fe762 SHA512 58d49eb67e1bbeb73fd7672871348911ef8eaab95b0f90dd3ae2564cc2321d620eec703fe8520748a96c80429ecbdcd13ba4a7c31b249fd347a935c9b9c02531
 DIST virt-viewer-11.0.tar.xz 259772 BLAKE2B 41914a60361f0a47a0b0b54962d228ffaec67c6b69c664bb6fe683b7074dd5e2136d2bf3528b6e1b6b785cc4e337125fe16fdd94dd603dd42e8fde543931241a SHA512 738034e15e40a7aaadd2646bf289c12409cbf2d06925d43baa50fa7bc8438188480d6b97687e9816427ac0a9dae84d205351715cb2f38afdbefa2dd1d134904a
 EBUILD virt-viewer-10.0_p20210730.ebuild 1437 BLAKE2B 0e6f3b91d512a7603f009944524a9529b16cc37d7dad95bc1e45b200ff1de3c0acbdb39ada98b00a33724a4f409473a72d53280432c7c75a1c02e3161e0d7606 SHA512 554a8c23d2c4b2efe99fb7f0a3efb7cf13bd5ac0add3c845ca2b6543bf67abb03dd508912a044cf35dded8695b5cbb3117af1c3f20aa353be3e8a00a02b299b0
-EBUILD virt-viewer-11.0.ebuild 1613 BLAKE2B 37fda2240e6032f5f96d8f281676eca4075e866fa8444430834b5844c4d0a858e26e3bcbbfdd68eefc90d0093c91e56926456ebac77012c85f95917b65ab80ab SHA512 1eb62eed4a9023ee529bd5bda72fae61fdf4ec50271644294212439eb3e1079b7af11fb605385159d70cf3b80a974ab08f059c84ed4bb2da463659facdc2f5b4
+EBUILD virt-viewer-11.0.ebuild 1612 BLAKE2B 5ad745fb468134ea788b64e7f898d783a4c9e96764709d12d02ab12ab93bf1f5da85bf1d3b704fc5e7a52ab82363e423911b2dca1dec006f6d87eed2b232af81 SHA512 97d9aeb05053439b88e579049ec5d334105530520fd06b6520899693b10563fd60871fb1b8a95fcaa9f1eabd948590bbf10020c5215bc0e68f599bacd569f5d5
 MISC metadata.xml 734 BLAKE2B f25e87b2bb317cda7595ebefa8854e36f479c2a4bb4531289bcc3ae6ce53d1c9aaf36832272707d9a30735cfd519dfb56b7b04a1121c33afb767c3c5514336d5 SHA512 935b4a7d1af8199cfbd90db7c0e8e3ae52fe939739724f36fe12ecbf222220483af94a7746fb54a585c971fb0dc28c629a2e7fb34690743ea0d08a965b30db0f
--- a/app-emulation/virt-viewer/virt-viewer-11.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-11.0.ebuild
@ -19,7 +19,7 @@ fi

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+libvirt sasl +spice +vnc vte"

 RDEPEND="dev-libs/glib:2
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/scalpel/Manifest
+++ b/app-forensics/scalpel/Manifest
@ -1,7 +1,5 @@
 AUX gcc-11-fix-literal-suffix.patch 10217 BLAKE2B 25e2767b566c506a57a455118f0bfdac75dde80ea64ccc66c5da597c7d0fc270d2e34d5a3e26e1c77cf1a1904b80b1a9cdfbcab1ed1de9804075fe312d669952 SHA512 c189ad720eced09010e64a19e0d87f7531b67ff5aa3d96bb5318b3937740de8e163bf1eb55a2fc76ed41eb432bd05861849dbfcd1d6b9b67c7bec4f564df810e
 AUX musl-error_h.patch 1913 BLAKE2B 94f4f1bc8466180c1095ad52728736f760a678b59e6a10a9085b11612dfabf4bafd035ea4debbbb71e54d38a0154c2442744b00a37c811f468cee459f5cba93a SHA512 209a6278b046d75b2efe4a3a28e62263918a34abdbab9e6300a03f6d3b6b1902dc47fa4f8ff2dcd60c008ae49a953d4fb9be75fe00665be5f77f5c84f0c19332
-DIST scalpel-2.0.tar.gz 1436379 BLAKE2B 7a645c1d6ea32fbd1b0bcfcbfa0f704b6eb58ebe091b8a7ef89f59756c18ce9937849f9754f6ab8548c805e3503f9eb3cc58a2f835956a1315668db5ce19c41f SHA512 7bf8e36f2fd22eb34e0f454c44a3ec3bc4e61dfd44ecda6ae93f0cc41cc3ad2b9fd9604637329bb96274a606812a578c968dd435d9d4a3ac5533613c849d321a
 DIST scalpel-2.1_pre20210326.tar.gz 1445147 BLAKE2B f70e16d6854c6f781c2ec389b4595e25055bedc5c69b4c0713ae263d138f0bd9824641099e224cd1969688f6b0acb07c707072afe43955c8752391132eb9b84e SHA512 76811437f01125dcdb27e185ad4f82ba589461eb47638a32af4291b0b81803180e095ccf89440d6c50e35e641e9c3eed63d6ffb33715b5ebe0a3a73389c25e5f
-EBUILD scalpel-2.0.ebuild 610 BLAKE2B cf16769dbdbbb7e12a5e2605ff92d9816dbfe992c7d7c451fdf8b5e360b726a5024aee52d8d72192c1336eedbe4e1613ff67d56b76efba532ddb9990379b0f48 SHA512 d077b16affa31d02982f565810cd51cb7fc52300529bb2accf069aae3097df61b8000b5040f9289058647c4855a2d83fe3a0befd3b987326606a0eb2891731cd
 EBUILD scalpel-2.1_pre20210326.ebuild 1085 BLAKE2B e20be72042129649fb3884ec69bcfa3c9b23454f07425629e008675b80d71bbf6509ae0cad60ab28504664c6a9d4ca096032034194fdf6c58dcb8f3d6c2d5028 SHA512 714d2fe1b92bf5d8b1e43e82993d60bffa9a19a7ab5010b9f7738f9f1d24f0c43bc008acd87fc0799732b19e9d1cfbe756b51a5cb3af7a079c26966ecf5c3dba
 MISC metadata.xml 895 BLAKE2B dba0bae8f7c087e2c13d0f2f3f3985f965f6d74c9e0232048150a913b86fdb6f7605b261eef799e9dbbffb099216c4565e2ec1898bf0fa93476b93f22bd8e4e1 SHA512 b38df0fc4fd94fcfee6fd0b96b24045bd3e29e47b7be62fead1ad67ee0d38194a46b49aa1fad0e40aa75e8b9e8c01669284aa4a58199c344d1167178ba2912b1
--- a/app-forensics/scalpel/scalpel-2.0.ebuild
+++ b/app-forensics/scalpel/scalpel-2.0.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A high performance file carver"
-HOMEPAGE="https://github.com/sleuthkit/scalpel"
-SRC_URI="http://www.digitalforensicssolutions.com/Scalpel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/tre"
-DEPEND="${RDEPEND}"
-
-DOCS=( Changelog README )
-
-src_prepare() {
-	# Set the default config file location
-	sed -i -e "s:scalpel.conf:/etc/\0:" src/scalpel.h || die "sed failed"
-	default
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins scalpel.conf
-}
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@ -2049,5 +2049,5 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea29
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 EBUILD prometheus-2.31.1.ebuild 114477 BLAKE2B 81f7f10435f634f85a3c8338b8fa85bbb5829091a2328edc85dc66d307005f82ee569b8c604674c701f8b031b93c298bac2e32aae63592b477317ce19c0e0ce4 SHA512 25f4b8c49fd093c5111cf099fd27d2e3dd5c93e7df1556ce49b904138a8b13ca9f7d6592a31119151e67218c8a9846c3f6a850037cd8ae4b967b60c350216827
-EBUILD prometheus-2.36.2.ebuild 2149 BLAKE2B d193350d631f99863bd0b5c00c73aa8c851e970ae8d4b61d5378789f8ffcaf587d748b882a7dd541047a3d106de8c5343bb1f082f6fa2c9ad6677aa7c1fb4545 SHA512 479c3b8d3158a593f33fa105e2785c422630d58a40bdedb2d94a24ecc9a9421a553fcab605bdc63e7703f998d124246f9d13834bd2bc6751595a2b318b7a4f73
+EBUILD prometheus-2.36.2.ebuild 2156 BLAKE2B 6f4e87dcb953ffec084444e4aa0bdf0bde17296a8e8ead7a10937131309027bbc055a651ad7baa68b0208eb4ec46ad1e406f3e4a39faf4caad4057fdad2cb32a SHA512 497f4ea54c11cbb92f5711b58cbf62648dd942015db08aae1b62e204c39a7f47ab5a58b54b2bb57ee5a54a1d92971919f851876d6feab702e9ef29958195bee8
 MISC metadata.xml 443 BLAKE2B e6f1b0fa6c89174aebf787bdfe37000233cb29f68aecea6b2586af76216c04fa094e6dc08793092c36e51b2f34887a968174960e55c45fcd3d2c91f93f3b1ee1 SHA512 13cdf9d1e49aeb1470223c4cfa830c3063e5816141afddfffe6eb6078b9118cab262bc520b873254e65b81663042f317b5797e35b74e25df21cf28b46fe1477d
--- a/app-metrics/prometheus/prometheus-2.36.2.ebuild
+++ b/app-metrics/prometheus/prometheus-2.36.2.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P

 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm"
+KEYWORDS="amd64 ~arm ~riscv"

 COMMON_DEPEND="acct-group/prometheus
 	acct-user/prometheus"
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@ -1,4 +1,6 @@
 DIST iwdevtools-0.11.6.tar.gz 85945 BLAKE2B 61c18ae0ed1c0f7e90d41af485f18f891cdd9ffbaff5437cb9f9ca88622efa0f5acd89ac8596e7d41c25a083a970143f3b226284f4566b0b8ee3718071cd6cbb SHA512 21ffda72945947658bf6867bf83d9b9ad4f6b930d4c2cee3dea551581030668ab286a4c4a07edeae937fd91f4aba08fe8e7c6506459808c4ada38502226b5b26
+DIST iwdevtools-0.11.7.tar.gz 86578 BLAKE2B 1945f99ab5d516bdef7081e13ecb0921728497f84e5e5248b2ddea78b306f185a0952a664165b4bae6c2089ddd1a4423d26524f42631a53b75fd2749a6994721 SHA512 fe18a88d166f239581bdddb0c719bf1d7789f671df151d87844b1836d134754d731114250ae2a9ef5b1a37a403615c15bbd6174eeeec3fe275e93c32ce6fae5c
 EBUILD iwdevtools-0.11.6.ebuild 1901 BLAKE2B eba3b07b717b1d05d61fed1eb064816d83dc981953428eb099afedfa74cd2ec3318c8de57f3d2706d391809f182c5276e0baa12d6701e3b49edef8cbd7714a65 SHA512 081af3ffdc6f2b083d30c33b5635aa9dae2f327a0adf590e5362c1278d5e9e85dedbb3b2d3e630c22187238dfc883c941266057a70159923a799e138fa7c0580
+EBUILD iwdevtools-0.11.7.ebuild 1901 BLAKE2B eba3b07b717b1d05d61fed1eb064816d83dc981953428eb099afedfa74cd2ec3318c8de57f3d2706d391809f182c5276e0baa12d6701e3b49edef8cbd7714a65 SHA512 081af3ffdc6f2b083d30c33b5635aa9dae2f327a0adf590e5362c1278d5e9e85dedbb3b2d3e630c22187238dfc883c941266057a70159923a799e138fa7c0580
 EBUILD iwdevtools-9999.ebuild 1806 BLAKE2B 90e7cd55d1f57c126a6c59489b4bfacf39266a48875370659693efcdd90fef644bbc21e67ecb21c665000139b28008c3d0979796b7f2f2312ca2deebb3860250 SHA512 56e8546414c77b124a5da1b334833384bf2e78adfc385918f6a05a336d1a22cae705d3e526846b8e7a483f929fb9327288d9527c9c157a607a69c362743d9d11
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
--- a/app-portage/iwdevtools/iwdevtools-0.11.7.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.11.7.ebuild
@ -0,0 +1,64 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	>=app-shells/bash-5.1
+	dev-libs/libxml2:2
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	|| ( sys-apps/util-linux app-misc/getopt )"
+BDEPEND="
+	sys-apps/help2man
+	|| ( sys-apps/util-linux app-misc/getopt )
+	test? ( ${RDEPEND} )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
+		$(meson_use test)
+	)
+
+	has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
+		elog
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@ -2,6 +2,9 @@ DIST pandoc-2.18-linux-amd64.tar.gz 16713899 BLAKE2B 89f2166fb93793c07af9d3ddff5
 DIST pandoc-2.18-linux-arm64.tar.gz 18522530 BLAKE2B 84e2479a77c12ace90a93ed9b66be2abdec357e0b4338143db8a9318cd48e76852d9fc12ceb8bd795860412a2e98d11a4d1e54bf74bdf68494c699fd5878c818 SHA512 e2be1473edeba12996a9eb7af3fe7dfd860adb1054446d2b93db6d712708282424628b14fea8809dba903e93daa1626a0dc3e1304af33b77e9da298c8fd7885b
 DIST pandoc-2.19-linux-amd64.tar.gz 16807538 BLAKE2B f92ca873d3f048768ecf39533c60157db59ed3c0b1849b7bfe8093f1590a076bd36f3fda81800527d1ec03b2387564e4bd37e35fd991a356d3caa33afb3de30a SHA512 8ad0b0a790681d2665866d8ecd6b04a5b0944e88ff6c202e4b44c0dc0ad27f45ab24136641dbcb03e10953fcaa833020125b0e08f12e3a18e014dab32934f67e
 DIST pandoc-2.19-linux-arm64.tar.gz 18631015 BLAKE2B 5e4ca9f33a10dd98c3e95798f073d2527d6aebe8a12af2d24fb93346a5ef5c6e567d3fb1b26a222a4f252efc77d874233ad4eb0c26a2b7185b4593541235d583 SHA512 f16c8114e2551203e603285f4ab27a1343516acaad622b672d617ce15b3fb108fe4e9a5926ba1d70545bdba8822291a94f4b65ff228a89bf7262286c80eb887c
+DIST pandoc-2.19.1-linux-amd64.tar.gz 17167943 BLAKE2B 7799baa54cf340581113eac5e783c8eaff52f93cd0992a706f6c1cfd176d37466acadd46be9ef624de3633c5f32bd9f62b61d886af64f00a7c993829fe57aac8 SHA512 504ee74f8fa67789472d69f7545588cbc990a4a637f38281ee7e71ce9022153994f291a1470fadbbe457d032543524e2c62ea98889c1f75ba86788dcc605c652
+DIST pandoc-2.19.1-linux-arm64.tar.gz 19030188 BLAKE2B de56902e276e9df89e88c92cb470e177d23a957542bfb11ff8449fec3c5af4a461b36b3093c5523e273d68a28784de9b88af862aa5d1be6f493c3a7485c001ca SHA512 8e74784690bb14d2239f83a52992548f7e27ad5ff93cf844cdb93f6e74d904592cd64cd98b6e93daa66b5cf83ce6c3e5968ab4ae86f23d69557b863ffea60ce4
 EBUILD pandoc-bin-2.18.ebuild 990 BLAKE2B d155ff808a25b86ab0e86a6e57f1b4ab6f3a4a819a3a8149f0b832520811d7f2b3fe82d69b28ce38b1b583b89b886b1092a823944f92c1536131b1027300e9da SHA512 2bd39771dcfe4ef3ac5c882b8d38a04570d5cf7eca730e3d683dca56ed4b4abf5e8a6cbe4130135cac60ac4d3e56326e8ea3c95fba3d3c7b728aebf9024d2a6d
+EBUILD pandoc-bin-2.19.1.ebuild 1008 BLAKE2B 3dc7415786f348a5f91dfa14c0da4297cc5180c4ea234b5415c1e73706caa4b21cb6c63e1ae460c60257f495cb4b01116eb27bc52c28b8350d9f51dd4395f5a9 SHA512 4d86d329d78f57d1989ffe9d9a2a26c078f34118dda500c82a448b1eab9654af99a5b02166b106975203c142808a12c6bdbce32c66f7f18021d6edef104d306f
 EBUILD pandoc-bin-2.19.ebuild 990 BLAKE2B d155ff808a25b86ab0e86a6e57f1b4ab6f3a4a819a3a8149f0b832520811d7f2b3fe82d69b28ce38b1b583b89b886b1092a823944f92c1536131b1027300e9da SHA512 2bd39771dcfe4ef3ac5c882b8d38a04570d5cf7eca730e3d683dca56ed4b4abf5e8a6cbe4130135cac60ac4d3e56326e8ea3c95fba3d3c7b728aebf9024d2a6d
 MISC metadata.xml 986 BLAKE2B 10ab442c2f7892545054ba2747c0cde115d9d875673c077d2cefcd035e2ecd6d04f2aef05ef9ca58a2150a983079ad8fbdc6910ca93fc14977409041e5f20201 SHA512 c8e241d4d7bba0a6f36320517d18fbb99922e32970d7771d5bbc80a8ecf5086f8f7d1eadd0188d457412a66db898d044074b4d4f0301aab1e19cd1213e562375
--- a/app-text/pandoc-bin/pandoc-bin-2.19.1.ebuild
+++ b/app-text/pandoc-bin/pandoc-bin-2.19.1.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN//-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Conversion between markup formats (binary package)"
+HOMEPAGE="https://pandoc.org/"
+
+BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
+SRC_URI="
+	amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
+	arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"  # Upstream provides only AMD and ARM 64-bit binaries
+IUSE="+pandoc-symlink"
+
+RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+	default
+
+	# Manpages are gzipped
+	unpack "${S}"/share/man/man1/${MY_PN}.1.gz
+}
+
+src_install() {
+	exeinto /usr/bin
+	newexe bin/${MY_PN} ${PN}
+	newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+	if use pandoc-symlink ; then
+		dosym ${PN} /usr/bin/${MY_PN}
+		dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+	fi
+}
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
--- a/app-xemacs/debug/Manifest
+++ b/app-xemacs/debug/Manifest
@ -1,5 +1,3 @@
-DIST debug-1.20-pkg.tar.gz 107953 BLAKE2B 90af70a49f6d62224248a73907dec986ba9671a99782aa84cdf9024426f192fca74781ced10f539da9c3115586cc1fe6ecfbe91fef536228d259280c251fb6f3 SHA512 3985447986f5129a8789d1f9058a662cef5dbbe0e9d565f00973e79a6d32139581fef777f0e6d683ad5338896cc679bea3ffaf18d51976a5a2e27ba5484cd9c9
 DIST debug-1.21-pkg.tar.gz 108036 BLAKE2B a713832c1ccb5c17d61b8ddd054db638537bbb8f9d82e59a7caaa623c2fdb1cacd7d6c585fc2ccb25948ed73a578720eae9508fc81b710e0949654891f0919f0 SHA512 91d2597c85ee207b1c28c433aacd856bbdb136d69c1979a6d84a567dcb1b1ac2b09fcc788a784252d4319d52d45788f3570c59fb248c99983144114b31fd7f17
-EBUILD debug-1.20.ebuild 310 BLAKE2B fee374e5762c46f193929372779e3fcfbd983e1f15d76e5c9f95fd8ee21a7feaed083bb59a591292b2375ee1c340eb8fbd9727e3dbb205ad5aa89073a31b54f7 SHA512 eea988f19ce44f282a2af6433587139459bc8fd52938e5c81f59b61e2c402fe8ec26ffc12c1429ae195f785c8f4bbb8877ddc80645e3b69eceef74d73a6ba71f
 EBUILD debug-1.21.ebuild 345 BLAKE2B 78878686e257e8add7e477d12847e912306124b6937940d23c438ecc06e60efc461fa49adc903af18a2ab7d584ee76653712f1dfb978feb5c5379debe11f1524 SHA512 f0c66b5649ca83ef5ce66606309b919bec6b20787e49840706be4949c92cd5c2ebf12334d647db05b3f56ce0e49e62ea10da0cf8719307f4c04b0b43b2311def
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
--- a/app-xemacs/debug/debug-1.20.ebuild
+++ b/app-xemacs/debug/debug-1.20.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="GUD, gdb, dbx debugging support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/ecb/Manifest
+++ b/app-xemacs/ecb/Manifest
@ -1,5 +1,3 @@
-DIST ecb-1.25-pkg.tar.gz 872399 BLAKE2B 513181b108efa75b0d54ed2f568d586db6bd944a453ac2334a6b43ce83d8331b53dd34a68029869a1b7cc1e4f0218277c5966e8d49a4bd87a065719bc3dac58c SHA512 bfcb9e9d7fc55b9eb281f991ee57ef7059b7ecc6cf9b7a3c9693d40afbec36fc90789cfe2c3b007aab737db341154ac5cee73ea5056fc435ff6b0d86941ca8ba
 DIST ecb-1.26-pkg.tar.gz 872978 BLAKE2B 5b969a574ae209a0942782b82b9f62b0a01e333d485da616fc65fcce3e5256d06d40ae816d2596276675bbe213dec48822e67859ca6225699ca73d5fc2ee5a2e SHA512 b6baca962bc41abeb67b58eb266d12196a60bf1cb8d3359a0c30e65ed068a89a4e03b35893eef8caa8ccb524d81332aec8ffa3e56adc93aae5fedae0046df1ab
-EBUILD ecb-1.25.ebuild 552 BLAKE2B f209c60f7c98e1094f6e6f2d4aa1574c2d2222a23e768f82cde51dc8dc7b6644f95caad079a19f4c1b804793ff2aa29985468b090d58b3d80874445cf3185d71 SHA512 48d78d6f1264e03d3a5add882c66650873878c7954f6c1c495c9d52d6c9209d2196a64f94f2f49aba668f62321623de36a1616cb4c9d419e532b7a0b6e0ec5d3
 EBUILD ecb-1.26.ebuild 587 BLAKE2B 1c6b5c3a14d55d1c8315f0272ea17af0dbacf93ca0dd52f908e14999627c2af514a755f8a5e34a7e0a0f05591b5474d9dd879d0b92e302679246a2088d34706d SHA512 d7f7281561d019324bcd123a993feb0c5540db33604f5f7d47caba2a0b6e76d8cbb42edb5fc14bfcfac5c284a6c8bd73da3181f249437593f25e85e8c5fafe1c
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
--- a/app-xemacs/ecb/ecb-1.25.ebuild
+++ b/app-xemacs/ecb/ecb-1.25.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Emacs source code browser"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/semantic
-app-xemacs/cedet-common
-app-xemacs/eieio
-app-xemacs/fsf-compat
-app-xemacs/edit-utils
-app-xemacs/jde
-app-xemacs/mail-lib
-app-xemacs/eshell
-app-xemacs/ediff
-app-xemacs/xemacs-devel
-app-xemacs/speedbar
-app-xemacs/c-support
-app-xemacs/os-utils
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/Show More
+++ b/Show More