Sync with portage [Thu Sep 1 10:16:22 MSK 2022].

2 years ago · 818ed62c2c
parent 4005cac14e
commit 818ed62c2c
2973 changed files with 20573 additions and 28275 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29568 BLAKE2B 6d3e217552b67e268da823a69fb89c1d3a22d30a1f952be45de2f2f621f5fa6db49c9639d3e9949abf58fc0c126f8c7cd03d701f592f06fd3bf80d1121ee7c45 SHA512 1cefe091cf4e0c1ccfebe4c6719470289c744576d3cdd2b3d12eacf01374724ea1e794c286d887d2d5560c08be35d69f18c704e690820c3ff73850e873042481
-TIMESTAMP 2022-08-30T18:09:41Z
+MANIFEST Manifest.files.gz 29627 BLAKE2B 5d79ddd047f8be0fd017e7f943f67edaedeb90bfa7463c72f8f669224b59ce7e715d9fe12f6beb0dda462c51c06c3fc1b7bfd19be9f07cfec7b2cd9f3e741a98 SHA512 fdbf24b7275ecd6932eaf8c0746ec6ec2055167e79b9fc6c8d18807a2f2bd0d1e2814d9b27b4a0371b6e9aa891303dbbd11ebee53174a254749b2cd8d36f6bfc
+TIMESTAMP 2022-09-01T06:39:46Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMOUmVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMQU7JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDcOQ//YPdhjqRK+aJXg7vU//E3BMqQt1gJp2fwvftRn6B/y3aCtxK+MCKmfuQB
-JgXNpSHzX3QycnvvIP67kOB7+gYfRKECGvr8Yt+qLyEml6dGQTZsT2BZ1orNweDD
-p6eX9YjwGyE6u24CGabSCAUSLoS0I3V+Rndtv3BgzISWIFYoJusmM0+oPJZvPydi
-2erfoROZByT6FcNdiFdcJCZEz1YTyW289TZSFj3Jop8wxQKO/Y5/HbIP+bHzlZq9
-9SH74JA4AGB4EKGmoqqpOWudkbtox9KsQHrf+QjwnKAvhnEsWKBZMg5XVB/gaiwI
-300Xoni4okqLxF61diFpHAiXPs7p9ytm5E7b8WQPQjgC3lhGhWBb/FZMJ0CcLEW5
-TEXTEJtQN1s08fI4FiLhM12AqMxJKkqYL9FtTz0OIMwSd18BSS9lyah02yCdu77y
-QuvUe19hMrDkHRiBMQWYL7Wa88Cd7hAR/4TUD+JaJWeeUh9M8cpZh4XwVTXfeXdR
-BDATcrcXCQIloOMarViKiWt8W5TIhQ8FNCk2KGZNIwYPWo7koePSL/Bs2yGlDQ7K
-2ZusjcxMSuajmdMqf0rMssYrTtmVikb9VXobE6AraVcc7fmHp+AHLYRvRANznwDV
-fRqmvY7AIJ68+dGkjPIzI5hhxzz/u5yzPLk00b/NwSQsZdc65r0=
-=DPgt
+klBOjw//VKA8UMBAWNb0foVSN6IlC7aAW+0PPIr0YIQeN2H2CKASSmlvo78ykUIi
+r+6QoyFQmsZI5OeHAks8l6XoVMCwGGbPGGL6FISsBQ67Yb+M2FLMZtY64Skiqr8G
+0nSZ8cQCzfJewA3SpNHhH/uoYAWAkIzIesmK7KA0NnTxhjH4OhPx+UdyNe/xz32V
+uCMyNzhteM/4LQWEopfbUOHAo5pCdm7/aDVhagMIAjmcdAJDiKUuxOVKNF7jB7r+
+AttHXHFXY0zKhsbcljC+njkILKf+D5aOoJzOzj30lQXP8C37r1OPrrYdbtucQTvh
+0OYcczA1HVeoJgsH8jwbkIuXs08qfJIfio30dpYIA2J1rg1ddPJp94edXTC+R8bx
+ccEcYIu5T9uo4mLXmEnZFUH+VqomfMOvjJh9bdwMsDYC8FGVaWYcLs9lmg7usmaE
+jwg+MCK7O47I1UB46mMc/MaYSMCDR9QUnBlz76F2jOFpIs4nV9Dnq0dNaW5Te1g0
+mdOPeF9tSNW2UaxzwIpUfCa1OKg+uKCV6IjmdPUOakponZ2Y7Uutj9eLdwxdiqM3
+VETdFtayBJSLCjgu179VXT8lbu1QXNmFdlmiknBuWD1Ik8+SOXdyRXu590P2PeTB
+asOSuBTlLBHRxauD1wECsQRhZKznF+dVxXIk/2rCvP1cHicKzhY=
+=so9r
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@ -2,7 +2,9 @@ AUX speech-dispatcher-0.11.1-include-pthread_h.patch 367 BLAKE2B 54e4cb3556f066c
 AUX speech-dispatcher-0.11.1-remove-unused-variable-musl.patch 1106 BLAKE2B 0a21ef6692a938f3764cf2e5f4fa2ae204cc630bb46b754d81a7c79588be8e61687c311c8e9bc8f999c8affab3cc58a42121a93594ceba389ee9cf41e91b2f6e SHA512 1e4c80a431bd0d2a910dd4c251446dbb877859a4b131a7bd33018e2145d2b55da2021ba943a462458289bceebaa7dc0ae441a992e90be412c2d1aaaaa7ec7d83
 AUX speech-dispatcher-0.9.1-fno-common.patch 13112 BLAKE2B 6a4125117852cfe250bed1a9936af67a2a83303ecced615febd89b9b14918dda94a78862cdcceb95fcea3ea7ed30a12d799afbc21264ff386c94f9f867eb8136 SHA512 b957ebbfd8a6a9cfe2b85cba85b77dc813e76212721d63d42b3881ed17993d7b4a8c720d4c431c8e2eb3ea60996e411402732c735948f37fa84a9fdcfa2683fc
 DIST speech-dispatcher-0.11.1.tar.gz 6548489 BLAKE2B fd4e05c51b80991bdd5d27ecf967946cfde98f978462e909f193c14eab51f3cae047d281c3e2896b3ddeeb4e045ceb72f51e5dbfaf3f9ea8a818f8146cb5e625 SHA512 859911d7db5660423bc7911eacbe8e7a9c3104df97478cbbca48ca5fd6ec018113172d49bc66781680433c77b4d2af43578c9b0f11409e2ba7ac618deb31d7cf
+DIST speech-dispatcher-0.11.2.tar.gz 7147526 BLAKE2B 6b11949736275d900e5e1d3909fab51fc04fbb45baf470a4c98aed19f61b7adb8cedf6b11f1a1aa69d9625383627beab4122c74ec78d9c07a5d0ddf4646669d6 SHA512 038ecaa5b9d56e3f915ec49fe7768cb4eebe1c8be79b95635f09fb3f6067e4c0ade13d2dd355e0b326579dcdf509dd180889b27282410b6bb252a2f642f028d4
 DIST speech-dispatcher-0.9.1.tar.gz 1662222 BLAKE2B 03c3d79a9cbbe7e549f638992fb276ab2270a45a057708721666257699479b3feb81daddf26d8032ba3f7b9ab6b836c7f582ee22a532ff018c99820af3864d87 SHA512 35adb353d22b8dff8884cb20f3836f96f4f74b272bbd442d522a10a3d3b91a0da6705e6c216764f295208b5446c2077da620de2a81cafe5a0c4dd826e33753c2
 EBUILD speech-dispatcher-0.11.1.ebuild 2933 BLAKE2B d9235a55cbce83da1fc223646853d948c93de097ddfede44ffb62ffc4e43dc407459b4666c95b5937a920722e689fa61bb7902d6cc0ab46382d0e5a71be7953c SHA512 a245da1e1b7675926da1e26a43a9977e6bb76e58ae3f4a714621e04d02b8b419a8565b047557e9d18b49f7a5b2cdadde2583dd5006840645ec3ec02bc0b16059
+EBUILD speech-dispatcher-0.11.2.ebuild 2875 BLAKE2B d35c1758c898ae5f372e5df5980274da3a60563f52fba4a4f66edb2a117540079d67c3fca908472fb2704bc060211fcdb7cbca983c2fd2213138d108e50af2fd SHA512 60c71675b0db44bd1fe2f8c78c3192e4b78ec520a50c82782f8bb3bad887fc562d2e56f788460e595f060f6649bc8194317ecd7ec877c654586a98727abe7a65
 EBUILD speech-dispatcher-0.9.1.ebuild 2835 BLAKE2B f840d158b1303532c3fd0f41f9e40bac941d06071a125bcbef0341e75cc0197fe29a47d495b8248bc714cf2f8da3981660b95aa91d8b178fb72a7c4a23303b51 SHA512 2e0e8b16492ee0922199389e05e7d24103d4090b218378ce3f50111705084515c112d9e363f6dabc6d10dee75e4bdbb5f7c794f4b7b6562baa11798f3dff0dc9
 MISC metadata.xml 708 BLAKE2B fdccc4d8de7f22eb64469021786480527bd87f3718dd5746426874266b8a46dcb6cc2b7bb25a4561a523362b919e0ed77e3f829f3fe269d90060d17a69f1b2ed SHA512 770e54e5ddeacc46165b90d41dd3ea0d1060adfdfb95055a9dab778f757189b892250e66b515773ce7b4d8b1bbdd692386b4d8cb49d670af7af8dadfed5c8788
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.2.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.2.ebuild
@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 systemd
+
+DESCRIPTION="Speech synthesis interface"
+HOMEPAGE="https://freebsoft.org/speechd"
+SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="python? ( ${PYTHON_DEPS} )
+	>=dev-libs/dotconf-1.3
+	>=dev-libs/glib-2.36:2
+	>=media-libs/libsndfile-1.0.2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	espeak? ( app-accessibility/espeak )
+	espeak-ng? ( app-accessibility/espeak-ng )
+	flite? ( app-accessibility/flite )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )"
+RDEPEND="${DEPEND}
+	python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )"
+BDEPEND="
+	sys-apps/help2man
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.1-include-pthread_h.patch
+)
+
+src_configure() {
+	# bug 573732
+	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+
+	local myeconfargs=(
+		--disable-ltdl
+		--disable-python
+		--disable-static
+		--with-baratinoo=no
+		--with-ibmtts=no
+		--with-kali=no
+		--with-pico=no
+		--with-voxin=no
+		$(use_with alsa)
+		$(use_with ao libao)
+		$(use_with espeak)
+		$(use_with espeak-ng)
+		$(use_with flite)
+		$(use_with nas)
+		$(use_with pulseaudio pulse)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	use python && python_copy_sources
+
+	emake
+
+	if use python; then
+		building() {
+			cd src/api/python || die
+			emake \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_foreach_impl run_in_build_dir building
+	fi
+}
+
+src_install() {
+	default
+
+	if use python; then
+		installation() {
+			cd src/api/python || die
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl run_in_build_dir installation
+		python_replicate_script "${ED}"/usr/bin/spd-conf
+		python_foreach_impl python_optimize
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	local editconfig="n"
+	if ! use espeak-ng; then
+		ewarn "You have disabled espeak-ng, which is speech-dispatcher's"
+		ewarn "default speech synthesizer."
+		ewarn
+		editconfig="y"
+	fi
+	if ! use pulseaudio; then
+		ewarn "You have disabled pulseaudio support."
+		ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
+		ewarn
+		editconfig="y"
+	fi
+	if [[ "${editconfig}" == "y" ]]; then
+		ewarn "You must edit ${EROOT}/etc/speech-dispatcher/speechd.conf"
+		ewarn "and make sure the settings there match your system."
+		ewarn
+	fi
+}
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,35 +1,7 @@
-DIST aws-cli-1.25.36.gh.tar.gz 2237211 BLAKE2B fbab136a1c1211646c1213357cd80068da376e4aceb38007c14b2fb670a694b37aaa0157d58eb4edf10c3a9b5a700575a42b48c06db1c4034f39ccda584be19a SHA512 b66ba357085c82dcefc4ed9a6d0765d8768c8d216cd255056be055d3b5f604b62bace3eacccac83275d7c9487847f7de542efa804f8e0f454947cfe453d6e705
-DIST aws-cli-1.25.41.gh.tar.gz 2238897 BLAKE2B b0e4d1b96048971f41a0fce9c9149154778177ec8569f467cd210edaa063d629ea6998c1ebfa4506f8b2cca65caef7f73b307ef6aeec683801045c6121f85a8c SHA512 712c237181b166cdf1148ca4b3588a92939dbbfbaa5cdff9bffd8e2da35089539ef3b0b0ba271b234918796cd5fd83bf2a59e29c974f9e341d0e42e05bb8b69e
-DIST aws-cli-1.25.46.gh.tar.gz 2240196 BLAKE2B fde009f43c4a9c900b0ce66ad540252b87bd023e0070efd5403beae61fe72f4e5d42e0c0402eb36f0b45a08f8769f49ffeec404dbf9d4d58cb8ae2be72caf81e SHA512 387c428e1643c21b7598962b18d19929bc26747ed80a041bda31d2bb6239239f2693c272ba320616320be3ff1a536e6af859a289f4fb0813e0c9b89978da56f8
-DIST aws-cli-1.25.47.gh.tar.gz 2241028 BLAKE2B 6aea17029d28bf0875f58472ab27e244e2ace10d1d4d56e156c5fe97462d9ec2e10869609bbd19134edcdd3deba19235a39d409ce11617cf914d856cb325ef59 SHA512 1e76aa939f3098a19bb64cd79fd265d70bf3d96a0b92411c5d72d8e9b0635d0cfde70c6b4d3effce5ac8c82b0ddd84b761b2ce0b131ac1ed2fba9e0222057764
-DIST aws-cli-1.25.49.gh.tar.gz 2241270 BLAKE2B 6c5e3c20855df9da322f3e6085f4f6f5894f4bdb19b7a47011bd111fb5934ecbe921397e45e5539d4734520dfad144906337f488bfc4b2aaf479fe9a74a689aa SHA512 f8dbd6d0ce2e919e20e2c251d289be2720c46e9ca25595e249eb1934d6a0494347c8d13131c9839a7177f0aa89cf4a5ee0ed1a938c53febd70424349c8fcc661
-DIST aws-cli-1.25.50.gh.tar.gz 2241527 BLAKE2B 76a594e977bedaeb89bef7b3d61cbd08a157560b3610756719a04a8195b04c5e7480b94a5a6c69494cfe9fd7388550a6b26778e2ab0e1eeeec6e6eb91bfd36e0 SHA512 d112207b0fb654693503baa09ccaf3df3cf8766408a9c4a8533005e8be3cd724d28f197466af1580758ed689ebd3ad0afd895a5c4cfc06c3da15eadda0ca495e
-DIST aws-cli-1.25.51.gh.tar.gz 2241823 BLAKE2B 86e7463a8fb63311351d60ac3dcd01a2f87a774dd63430265dbb5546661d6533fa528c81cab72e08d805518c1896779451533a0e4af02ba2565115402a1aae76 SHA512 6ea6d6532dc6e5ad8e3a392cff6034ad3084b8dbdbdcb197ae737f7912088e415da992a56915cf355a7f39206ab28ec3865c10cb618271b2d1f8a71a89a809fd
-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
-DIST aws-cli-1.25.57.gh.tar.gz 2255779 BLAKE2B dddfd580d8af048111001151f3a28470d41026e21d4e9d3ec04972cc2d865c1670e306070114017911949ee8044a2a7840aa25374992721fc77fb045eb2cb9b0 SHA512 2b477f760ddba30a1d0f40dfc289ed84a96cf25a989cf5bc06a6e6432399f202f4418d8554f5892123e2b8a406f99ed2a5137204ba5f65d438a451badf0188be
-DIST aws-cli-1.25.58.gh.tar.gz 2256521 BLAKE2B 752581d8e6cf82fa5a77f8b530d1d267f55888f0843affb580420267393d81e259e945bd527441be0a5973abeee29dfdd544750c9571b3ea9cd1caa0e4cfe72b SHA512 28a041e2c703723de972763965c25ad639a03eaa72c3e487d75c9471386eb35baa16eea775f623adc74675784830f9d1acdb060800e4eafd1be0c317bcca99b5
-DIST aws-cli-1.25.59.gh.tar.gz 2256634 BLAKE2B 0fd3dbd2b3f59ee32d3e9d11c529184be54192057e273ed79a1d0e4871673f1318d3ef779d13067e162d334119f7c859c8b175a513095e7252bcf6bfb1a15675 SHA512 1f59362da22f542ec8af3e91343857f37922bca25f7e554bce66926e58a29fc63bfcd7308e8784e5bb69f8f8e032fe501502b6ab60798224b090f79d7170c17e
-DIST aws-cli-1.25.60.gh.tar.gz 2257567 BLAKE2B 368925e5dfd5b9fa3ab6c7a34c1f8e8312946df790534874a67aa248e81fc2defc5825e35a871d326e00acec31d5ec6a9c87fe1eff5925d489a8a87df7c059c5 SHA512 559c5cdb3cc1c0c94d77d97b7a7e4d2764a301c7ceaf0a557769629aed1ee9db0952669a265e0a54b828e5de39e320b9e4ad0b591868cfe17f8033a8eb8c4a9e
 DIST aws-cli-1.25.61.gh.tar.gz 2257977 BLAKE2B d1090ca3eb86284520e970a997932af31c250d2ca12ab7ddd2a64a55540e5b747bd30d21f4b0fdb8cd926692bde53a37b618f4cc2b9e92c7fcbca95419d7fb36 SHA512 cb869e08b9bec7c542d44401590f3ee5500564c23ff17d47e6a0265e1f98aea7429e55757e2184d7fbf23b3bb65366692040c059cdfffef39e1de2072345060c
-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
-EBUILD awscli-1.25.47.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.49.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.50.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.51.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-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 1843 BLAKE2B 66c1d54d4e61960ab8a897b3b33818dd6266aa1b0bdd52126942546e1eff2a234bbb2f884a21643fac176af1bd26bf068211f788079dcce78177a5dddc6d05f6 SHA512 fac1bd2328e655695a83ea34d19371c2f632386e4a1a12b0ccb05ab3521b932e28bf4deac0aec9c83bbbec17338d2077e841bd0f93315a0c97286ebe21b3d020
-EBUILD awscli-1.25.57.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.58.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.59.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
-EBUILD awscli-1.25.60.ebuild 1843 BLAKE2B 66c1d54d4e61960ab8a897b3b33818dd6266aa1b0bdd52126942546e1eff2a234bbb2f884a21643fac176af1bd26bf068211f788079dcce78177a5dddc6d05f6 SHA512 fac1bd2328e655695a83ea34d19371c2f632386e4a1a12b0ccb05ab3521b932e28bf4deac0aec9c83bbbec17338d2077e841bd0f93315a0c97286ebe21b3d020
+DIST aws-cli-1.25.64.gh.tar.gz 2263441 BLAKE2B d68ef0a3dabba879d9d650a911d5f286116a6d407d9d958088f7b7cd54c27db3be28165a1676e949785056519477f315ca4e08f6df9938da2516974d026fef81 SHA512 4db256228dde6aed2432133373c045bf2f2e69a7764629f3d13a94e086f99b43cc2a29862e6f973742a0de08032e6c26499b230db81575eabd288c8f2f63eb0a
+EBUILD awscli-1.25.56.ebuild 1841 BLAKE2B 8e87e521eb4464071ec89abd904be4b8056e6be8ed6a4b9aee005c952d5ef4da7e0468e0827e99cf1e460068fa9cff9b974cce96c0e0b87798e5a15f602ec600 SHA512 244149f5d56a3d1f5b4e8fdc3c2a15a4c6357998237cb5a8dc39e66af7aac968d61ba7a5873a10548af57bd08058b18ef3a97b335b42270fa896ecf7bc502f79
 EBUILD awscli-1.25.61.ebuild 1843 BLAKE2B 66c1d54d4e61960ab8a897b3b33818dd6266aa1b0bdd52126942546e1eff2a234bbb2f884a21643fac176af1bd26bf068211f788079dcce78177a5dddc6d05f6 SHA512 fac1bd2328e655695a83ea34d19371c2f632386e4a1a12b0ccb05ab3521b932e28bf4deac0aec9c83bbbec17338d2077e841bd0f93315a0c97286ebe21b3d020
+EBUILD awscli-1.25.64.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- a/app-admin/awscli/awscli-1.25.36.ebuild
+++ b/app-admin/awscli/awscli-1.25.36.ebuild
@ -1,72 +0,0 @@
-# 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.41.ebuild
+++ b/app-admin/awscli/awscli-1.25.41.ebuild
@ -1,72 +0,0 @@
-# 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.46.ebuild
+++ b/app-admin/awscli/awscli-1.25.46.ebuild
@ -1,72 +0,0 @@
-# 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.47.ebuild
+++ b/app-admin/awscli/awscli-1.25.47.ebuild
@ -1,72 +0,0 @@
-# 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.49.ebuild
+++ b/app-admin/awscli/awscli-1.25.49.ebuild
@ -1,72 +0,0 @@
-# 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.50.ebuild
+++ b/app-admin/awscli/awscli-1.25.50.ebuild
@ -1,72 +0,0 @@
-# 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.51.ebuild
+++ b/app-admin/awscli/awscli-1.25.51.ebuild
@ -1,72 +0,0 @@
-# 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.52.ebuild
+++ b/app-admin/awscli/awscli-1.25.52.ebuild
@ -1,72 +0,0 @@
-# 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.53.ebuild
+++ b/app-admin/awscli/awscli-1.25.53.ebuild
@ -1,72 +0,0 @@
-# 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.54.ebuild
+++ b/app-admin/awscli/awscli-1.25.54.ebuild
@ -1,72 +0,0 @@
-# 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.55.ebuild
+++ b/app-admin/awscli/awscli-1.25.55.ebuild
@ -1,72 +0,0 @@
-# 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
@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}

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

 # botocore is x.(y+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
--- a/app-admin/awscli/awscli-1.25.57.ebuild
+++ b/app-admin/awscli/awscli-1.25.57.ebuild
@ -1,72 +0,0 @@
-# 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.58.ebuild
+++ b/app-admin/awscli/awscli-1.25.58.ebuild
@ -1,72 +0,0 @@
-# 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.59.ebuild
+++ b/app-admin/awscli/awscli-1.25.59.ebuild
@ -1,72 +0,0 @@
-# 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.64.ebuild
+++ b/app-admin/awscli/awscli-1.25.64.ebuild
@ -24,8 +24,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"

-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+# botocore is x.(y+2).(z-1)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
 RDEPEND="
 	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
--- a/app-admin/doctl/Manifest
+++ b/app-admin/doctl/Manifest
@ -1,8 +1,6 @@
-DIST doctl-1.76.2.tar.gz 5648377 BLAKE2B 1ec89adb5ad187ccc6b66d077dda57ca4065bc1a5981a0f2549913532f6bcc6d1f48c3cc56c100c1b6c55f698ffcf3f2c639888ccaab30948384ce800181b332 SHA512 d7efc587843cd87f3ac17b974858ea688377ca6f0cd3d4b7430c47a1e8b825cc05f4d9107d7062f5e52fe3c267ec6bbd19a8b1d773a15f1d7ab653087ce13bba
-DIST doctl-1.77.0.tar.gz 5654010 BLAKE2B 809189c9fdfa1e81e75847e57fe5967f0d3ca476fdb7a2e72ffba1b4bb81ecdc2ce07b4b05f4f1f898104cd9e919d6bdba664d4ae0cc97adea6863379789aa08 SHA512 a53e8e3179ec467cd0617a25ab985fe36e41135a824688a947b15c0565fb2d8364c59a295573043039b79b701bb4d5a9ec5461450fa0e7c5a24f10ece53c6f71
 DIST doctl-1.78.0.tar.gz 5658172 BLAKE2B 3213219b1cfbc395c742a59a6bee1c6232f222455ac126de9ce51470a56ebaa9680de4d332cd31580a7ddb9f748b19a8abadef17ff6ea4265dffc2c42b1bb16d SHA512 193fe775885c78312eb6ba14bd34d109ee31acf41cfe68dbacbf6ab19864509b774c658aecf7a61d470598ca89829a6737ea6796eb970b3075d8f37aef747dbe
-EBUILD doctl-1.76.2.ebuild 1192 BLAKE2B 2b2e5e62493c6f2469deeb48a1c799e8ba4b9ee9b756b0ba44c1b9cd5af8162d7c8c56e65ae65e3311055ce00e5fd8094132a012d3bf3fd624c9a123f796bd1f SHA512 333c3fe715ae2b0c289401ca22f233722a7e4d3da4c1ec5e137c0ebf5c78717d44aef07067ec8ec05864dd4f6edf5d586842a58cbde7be4b4e30d62a5403107c
-EBUILD doctl-1.77.0.ebuild 1195 BLAKE2B afb48a2d4e77a6a7e49463733a60df12f35fb6cab9e905c8f55544cf639d2a40de9ef80c24e9d5e30108e04b54e93908177907c94d2e03471b90cc08b9d8cd48 SHA512 655a4325dfb26e85f99b5e4ded5f8f1143d46d9df0757c7f12991ac6843c924ae2ca7650269dfc4c310bc87292d08497df8cf1d163a79e30af8415f8235763d3
+DIST doctl-1.79.0.tar.gz 5661873 BLAKE2B 276cf8355f982070e2a44306f0d2bca5c269eccab3d67fe8b1b68171d393bacfb857e78fc66e036b0c039fa4bcf26505c029a1ba5ccebfeebf81d4dc3f51d82f SHA512 8257fc8d32ee097f78420138bd12572235dd7a6cead65fe1a666a9686d2f31add50a85a99fed45aae641b583b47b079a0ea3ce6e9e017c6ecfc7dfc14f7b5abd
 EBUILD doctl-1.78.0.ebuild 1195 BLAKE2B afb48a2d4e77a6a7e49463733a60df12f35fb6cab9e905c8f55544cf639d2a40de9ef80c24e9d5e30108e04b54e93908177907c94d2e03471b90cc08b9d8cd48 SHA512 655a4325dfb26e85f99b5e4ded5f8f1143d46d9df0757c7f12991ac6843c924ae2ca7650269dfc4c310bc87292d08497df8cf1d163a79e30af8415f8235763d3
+EBUILD doctl-1.79.0.ebuild 1195 BLAKE2B afb48a2d4e77a6a7e49463733a60df12f35fb6cab9e905c8f55544cf639d2a40de9ef80c24e9d5e30108e04b54e93908177907c94d2e03471b90cc08b9d8cd48 SHA512 655a4325dfb26e85f99b5e4ded5f8f1143d46d9df0757c7f12991ac6843c924ae2ca7650269dfc4c310bc87292d08497df8cf1d163a79e30af8415f8235763d3
 EBUILD doctl-9999.ebuild 1117 BLAKE2B db665b93fd6a9ff473a35f80b4d04e8474cea1c93d293f1731c87562fc65e03228569b2d0929b7fc6b1326ef4e2982d524a364276b4be537b87aee5cbcf8d3d0 SHA512 cd6a84398b1c031240b9faa0615388117215f42c740b520256a2e4b6748a59d2c7457e0389cf84fe945d483663b63ba335066cee57887783fde577e3bd196464
 MISC metadata.xml 670 BLAKE2B 5ee85d9c94a3bc5bf5a159089a11d22db8eb1923d0e713fd45ba4f76f154e17784fded0819aa2a359d2c582d96ca0db99ae80a01bb62843d136b45729b87407d SHA512 d48173ace378646dcad5eb5eb7025436432291ef03f89847e874c4cae7afebcd3c05549553543890581dccc8a7ab2808a6bab7fab6c1f315dcef7300897472d7
--- a/app-admin/doctl/doctl-1.76.2.ebuild
+++ b/app-admin/doctl/doctl-1.76.2.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo bash-completion-r1 go-module
-
-DESCRIPTION="A command line tool for DigitalOcean services"
-HOMEPAGE="https://github.com/digitalocean/doctl"
-SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_compile() {
-	LDFLAGS="-X github.com/digitalocean/doctl.Major=$(ver_cut 1)
-		-X github.com/digitalocean/doctl.Minor=$(ver_cut 2)
-		-X github.com/digitalocean/doctl.Patch=$(ver_cut 3-)
-		-X github.com/digitalocean/doctl.Label=release"
-	GOFLAGS="-v -x -mod=vendor" ego build -ldflags "${LDFLAGS}" ./cmd/...
-
-	local completion
-	for completion in bash zsh fish ; do
-		edo ./doctl completion ${completion} > doctl.${completion} || die "completion for ${completion} failed"
-	done
-}
-
-src_test() {
-	GOFLAGS="-v -x -mod=vendor" ego test -work ./do/... ./pkg/... .
-}
-
-src_install() {
-	einstalldocs
-	dobin doctl
-
-	newbashcomp doctl.bash doctl
-	insinto /usr/share/zsh/site-functions
-	newins doctl.zsh _doctl
-	insinto /usr/share/fish/completion
-	newins doctl.fish doctl
-}
--- a/app-admin/doctl/doctl-1.79.0.ebuild
+++ b/app-admin/doctl/doctl-1.79.0.ebuild
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@ -1,3 +1,3 @@
 DIST haskell-updater-1.3.2.tar.gz 26133 BLAKE2B ea72850e5ca35ec18fa00136c654435a852b072aea0402003c962abbb0e0f09e8a84568f78c9186324b0b0ee9658de1b413670e268cfe1c0056810b8c61b479c SHA512 a4d80ecb65efa9ae21008e04b1363ff2196df4ba431fc5ec899bb9904c598c7a109a38f7dd86dd2dc86faca8ed5083d036d700e7f7796840ee5470401c24f3d9
-EBUILD haskell-updater-1.3.2-r1.ebuild 1027 BLAKE2B a0f4d65a548a22ba15a7567ad6059069a12def78e1311d1c016d9353287285b2d21fba51489c3cabe8ae782d1493fa2c2af24d67a26cc9d4336214816c439872 SHA512 ddb8199f2e58969cc199de3ffe1b736c4ec86ff544baaa0a0d166fdb72cfa8e096cb13cc73e2c58a6a8051798f2febcba2c2813dd0d430f3668407568f62052f
+EBUILD haskell-updater-1.3.2-r1.ebuild 1034 BLAKE2B 0527bf9676c70315c0dfb4953896a0a0f22a3f89338ecd27f8d94c0f60740cf19088659262798a609b00ae2df7b2deb9d5ac5d439aaca855db580c953657b393 SHA512 2e66fd5193356ac24eab3eb5a646f18bd9058d290544c38d860f4b25acdf3c2fa97dc3e7984807f883eabf7ffc2353f1dc96e137f489e24ee25e6d77ee00d7dc
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
--- a/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"

 DEPEND=">=dev-lang/ghc-6.12.1:="

--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@ -24,6 +24,8 @@ AUX salt-3004.1-tests.patch 13025 BLAKE2B fd86808b3d43a25abb88f5d454dd2618d896aa
 AUX salt-3004.2-importlib.patch 584 BLAKE2B f9ccf7a6205228dc12847d9c86b7d9e539fdbccc1e27a77fccf05622b53f58504226f2eb4aecb2a5bf95789cf72c43e86ab22cb190d62aca903b0d14373a3df0 SHA512 61b966f010445c8a594a5c618441b33e9f7feb9481972aa4c7246d977003c5605c152459eeebc0922c2d9d7e28436243f891e738856a86a88a82a7489825f52a
 AUX salt-3004.2-jinja-3.patch 589 BLAKE2B 249e81ea2760cbe75ff66bfd86cbfaab58ea673fea240bb9e787896b89645ef523c0d98305214bcce545a7372e8bc545b6ae385ca3311d71cf7bd6fd66f52c7c SHA512 6615f5824c5b53a426395bf7def9c8f54f3c753f28f3e3b23119849900f10686968cec0787d4ffa16bbbd763a19072348617165e1af6a0f87bb81e9fd8be20e6
 AUX salt-3004.2-pyzmq-23.patch 1605 BLAKE2B b0c3e9722f0ff88b586f7e9f863d246a35bc10789568e1f4c3f9728022032dc8686ba0988a35225d2d01d00198c8a00253ec33331e24d6c3a7100d4a10c576ab SHA512 57a5c5a23ec1fd450e1f24740d6cd1d4b29947de5b5d984b7a55c89791e7b7f0eef44390cd9f959210b6c27fdb325650edeb2a53b3302f925ad182ee4ac8ac1c
+AUX salt-3005-relax-pyzmq-dep.patch 332 BLAKE2B d22d94b7680fb81e642b83cb7d823137e7e208b43a1720b131401fb957bcb3deb6a0fe5ca87da528cdf60ac219820d259d0b03a905e17142c9cd4d939b4bacf1 SHA512 7c5b963436c3066bf8e8f528acf04ea8ddfa2a5a19adb9486f9888346d55e56fdfcd97a4a04db18d85476cb8ecc8a350343855d765387744706e43e868464f5e
+AUX salt-3005-tests.patch 4101 BLAKE2B 6a7d7dee4e631a7619bf1b7fa6bd08b93c0bf31342ce72f734bb645206604ffed9ae2ddae9cebe01401cbe100c224e97f18a69ede5f40a041158d1cd8878dc0f SHA512 cbc3b3d625ab8e20aa7b166dd6ddca1728c4bf562cc14d28fa684573c6ee1d42a270b0f029e5d978803a30103e7ad281d516afff66d18bf31308528fae79c00c
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
@ -35,9 +37,11 @@ DIST salt-3003.4.tar.gz 16031515 BLAKE2B 34902aba7ab64f4ddbacbad1b776b9b2218caf2
 DIST salt-3003.5.tar.gz 16056545 BLAKE2B ede3f0c63175f093dca07bee1bfb659cc608336ae92f532fc45868bd7eca659498c42e5d44324492744b802ade088adac869277679989550e217c1a135d6566d SHA512 ebda2056b4d6d216a0689b919d00aa78f615c355d21703d1939dbb6b00e9ad9347be4ee5b861282521f2d337bf7bf2fdc85e6942016358088a094d854fb33be9
 DIST salt-3004.1.tar.gz 17685649 BLAKE2B 64950cdc8420228f935d4a21fc20872da9ecf7c51b866ec3c59b46486b84a739b002acc44fa909eed93ce3dc6bedc9804df05d3d9ee5a9a13cd9d041ba70f876 SHA512 9353a8dc2a1c6e272318c6f35059236c5d78b6c8930f715275b701c12fca3be1fe930eb533f3f0c22933ba60967b0980300b922fe486cee9a62e6cdb568bdf91
 DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef
+DIST salt-3005.tar.gz 17894520 BLAKE2B 67e755bdbe772991f620d09f61836f8ccfa2039722c3281ec4cfaa8ef76e34c57e4db861cc652545e37eb965ab765f6b6ba0250407d7d7448aa5d4685ad9492a SHA512 c2019a97a5a98b4810cdace826d5e0a6d2890a984da4b95109c1b9328a2fd11cafd2fb0ef9752adeea1d36f8b2a69b3a4a6a5a092b6a7f050c60ec52da314a18
 EBUILD salt-3002.9.ebuild 6672 BLAKE2B 01d02dd2411a676649d24af08a24d32426c98c1a6f8e3f0ebb96244bd55183e57f3a713fe9e65ea96093f0121374ba8dc933653b625be393c9a67620e06e2d55 SHA512 fbf0cfcde4fcb77614784a251d349a6d79e206fba8e673cc62419d23c8b2672d88a6b8adaa0b3840cb5771fbea3700b6f4bb57d8bbbb417d144f7fc5310f8554
 EBUILD salt-3003.4-r1.ebuild 6933 BLAKE2B c99f429003c7992c9b9271413ce4929c2e4a3fb49d3dae818a37a7e9253165cce99625a4c298cd6065781564eb1b838edc5cfca437dbc7103878131bc5de1671 SHA512 52719d14b8bbdd55c4f4aff007733cf5a889339d6187caeb5c57a5a2bd53b999b910dda0213db50fc5224f0e01f9380ada63c1e8f344530ea60d6f6cbb9498d0
 EBUILD salt-3003.5-r1.ebuild 7019 BLAKE2B 950714a06b7eb3f531c2a00cd8c58283db9750567b3f4f5434123b1bdbc57c19f97de507f8c307f200a92c6659167024aa2dae736ef4b061f7252337d3be54c5 SHA512 9ca17e369d90f7e52b9809debfdb36a6ad8d1049ba5ac585ead0d2281903d23d276af75356ffe3fb791e5c7c3a3f1aa6f26c1f6215274aa2c1136175d72725aa
 EBUILD salt-3004.1-r4.ebuild 7044 BLAKE2B fd253f8e588516e95519f0c503993887305952541dcbc3a62577a47909bd8160c6f2f46043843a3c473817f85bb8e2fd4eac6aea50e299a11a12f0ba7eb76084 SHA512 45d34cf7e65102f1f3c70a922b07cd419ad9fea8af9407cd6c2a84308cf9823bb31e7cb39ab0b4bb4b572025bd83a8e2a916353722e16b5bbacdb4d2d225d75a
 EBUILD salt-3004.2-r1.ebuild 7129 BLAKE2B f5c1603ac1f19c1c16ece90ad050cfedfeb5c1a881212dc6462923dca712cdb669c129bb98e184f7b7bd0efe032f15cf7aca5d39eb8d2b96dd4ea96a37743816 SHA512 40f618a45a71a64a2ed6688b5b5d6924343cba032cd0faf0485c0666bf28a911e983f8060e99ac7f454624038bc27eb97319c30abe10bae9c3a1bc7346732685
+EBUILD salt-3005.ebuild 6920 BLAKE2B 3e90dbf69321e73203d490b7fa84f615b943dd174715f2531759aaa98fff7cabc0c95672d802b3f9708e6c45df53bd9001c82fba10cd65e08f9c8daf60e94b10 SHA512 900644aaf7d41404a543da116bb3c986993d4871e95d0ac0cf50b84771f2558ed9722f356c94919197435b39f24c5d07413147b87659604c89368a9defd8ca27
 MISC metadata.xml 2384 BLAKE2B 8ccb0cbfc8d0944e684f979731884c354655d28fd9029f8d9abae1a313734102952fb817617d54032dd5cafa64925d73ee2a3e8a38ae16d2ff9c1af8c53d514c SHA512 6a4e1b8f2e041ad1a83bf2c85c35ac30ae7db3a20aa868204661c1dde9abdfab1dff1392e2dab8a844472434b325355fea71702229de99f7751e841d063fc0da
--- a/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch
+++ b/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch
@ -0,0 +1,12 @@
+diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
+index eb4d796418..ffa1589043 100644
+--- a/requirements/zeromq.txt
+++ b/requirements/zeromq.txt
+@@ -1,6 +1,4 @@
+ -r base.txt
+ -r crypto.txt
+ 
+-pyzmq<=20.0.0 ; python_version < "3.6"
+-pyzmq>=17.0.0 ; python_version < "3.9"
+-pyzmq>19.0.2 ; python_version >= "3.9"
+pyzmq
--- a/app-admin/salt/files/salt-3005-tests.patch
+++ b/app-admin/salt/files/salt-3005-tests.patch
@ -0,0 +1,94 @@
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 24ecf57e04..babc7ced90 100644
+--- a/tests/conftest.py
+++ b/tests/conftest.py
+@@ -684,8 +684,6 @@ def salt_factories_config():
+     """
+     return {
+         "code_dir": str(CODE_DIR),
+-        "inject_coverage": MAYBE_RUN_COVERAGE,
+-        "inject_sitecustomize": MAYBE_RUN_COVERAGE,
+         "start_timeout": 120
+         if (os.environ.get("JENKINS_URL") or os.environ.get("CI"))
+         else 60,
+diff --git a/tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py b/tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py
+index 230da8abc8..f6f1a70ce4 100644
+--- a/tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py
+++ b/tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py
+@@ -62,6 +62,7 @@ def _deferred_write_on_flush_proc_target():
+         assert stds.stderr == "Foo\nBar\n"
+ 
+ 
+@pytest.mark.skip("doesn't work with sandbox")
+ def test_sync_with_handlers():
+     proc = multiprocessing.Process(target=_sync_with_handlers_proc_target)
+     proc.start()
+@@ -69,6 +70,7 @@ def test_sync_with_handlers():
+     assert proc.exitcode == 0
+ 
+ 
+@pytest.mark.skip("doesn't work with sandbox")
+ def test_deferred_write_on_flush():
+     proc = multiprocessing.Process(target=_deferred_write_on_flush_proc_target)
+     proc.start()
+diff --git a/tests/pytests/unit/modules/test_portage_config.py b/tests/pytests/unit/modules/test_portage_config.py
+index 5cc6b90596..f344526909 100644
+--- a/tests/pytests/unit/modules/test_portage_config.py
+++ b/tests/pytests/unit/modules/test_portage_config.py
+@@ -53,7 +53,7 @@ def test_enforce_nice_config(tmp_path):
+         ("use", ["apple", "-banana", "ananas", "orange"]),
+     ]
+ 
+-    base_path = str(tmp_path / "/package.{0}")
+    base_path = str(f"{tmp_path}/package.{{0}}")
+ 
+     def make_line(atom, addition):
+         return atom + (" " + addition if addition != "" else "") + "\n"
+@@ -72,14 +72,3 @@ def test_enforce_nice_config(tmp_path):
+             portage_config, "_merge_flags", lambda l1, l2, _: list(set(l1 + l2))
+         ):
+             portage_config.enforce_nice_config()
+-
+-    for typ, additions in supported:
+-        for atom, file_name in atoms:
+-            with salt.utils.files.fopen(
+-                base_path.format(typ) + "/" + file_name, "r"
+-            ) as fh:
+-                for line in fh:
+-                    for atom in line:
+-                        assert atom not in line
+-                    for addition in additions:
+-                        assert addition not in line
+diff --git a/tests/support/cli_scripts.py b/tests/support/cli_scripts.py
+index 270af75d4b..50c08f4ed2 100644
+--- a/tests/support/cli_scripts.py
+++ b/tests/support/cli_scripts.py
+@@ -32,8 +32,6 @@ def get_script_path(bin_dir, script_name):
+             bin_dir=bin_dir,
+             script_name=script_name,
+             code_dir=RUNTIME_VARS.CODE_DIR,
+-            inject_coverage="COVERAGE_PROCESS_START" in os.environ,
+-            inject_sitecustomize="COVERAGE_PROCESS_START" in os.environ,
+         )
+     log.info("Returning script path %r", script_path)
+     return script_path
+diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
+index 8c648f5288..ce5715a562 100644
+--- a/tests/unit/utils/test_schema.py
+++ b/tests/unit/utils/test_schema.py
+@@ -873,6 +873,7 @@ class ConfigTestCase(TestCase):
+         )
+ 
+     @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
+    @skipIf(True, "Does not work with sandbox")
+     def test_hostname_config_validation(self):
+         class TestConf(schema.Schema):
+             item = schema.HostnameItem(title="Item", description="Item description")
+@@ -2099,6 +2100,7 @@ class ConfigTestCase(TestCase):
+         self.assertEqual(item.serialize(), {"not": item.item.serialize()})
+ 
+     @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
+    @skipIf(True, "Does not work with sandbox")
+     def test_not_config_validation(self):
+         class TestConf(schema.Schema):
+             item = schema.ArrayItem(
--- a/app-admin/salt/salt-3005.ebuild
+++ b/app-admin/salt/salt-3005.ebuild
@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="
+	cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax
+"
+
+RDEPEND="
+	sys-apps/pciutils
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiosignal[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}]
+	)
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist(-)]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
+	)
+	neutron? (
+		>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		dev-python/certifi[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
+		dev-python/passlib
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/pytest-7.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+		dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+		dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/libcloud[${PYTHON_USEDEP}]
+		net-dns/bind-tools
+		>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
+		dev-util/yamllint[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] )
+	)
+"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+	"${FILESDIR}/salt-3002-tests.patch"
+	"${FILESDIR}/salt-3003.1-tests.patch"
+	"${FILESDIR}/salt-3005-relax-pyzmq-dep.patch"
+	"${FILESDIR}/salt-3005-tests.patch"
+)
+
+python_prepare_all() {
+	# remove tests with external dependencies that may not be available, and
+	# tests that don't work in sandbox
+	rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
+	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
+	rm tests/pytests/functional/transport/server/test_req_channel.py || die
+	rm tests/pytests/functional/utils/test_async_event_publisher.py || die
+	rm tests/pytests/functional/runners/test_winrepo.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+	rm -r tests/integration/cloud || die
+	rm -r tests/kitchen/tests/wordpress/tests || die
+	rm tests/kitchen/test_kitchen.py || die
+	rm tests/unit/modules/test_network.py || die
+	rm tests/pytests/functional/modules/test_pip.py || die
+	rm tests/pytests/unit/client/ssh/test_ssh.py || die
+	rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
+
+	# tests require root access
+	rm tests/integration/pillar/test_git_pillar.py || die
+	rm tests/integration/states/test_supervisord.py || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
+	# pycryptodome rather than pycryptodomex
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	einfo "Fixing collections.abc warnings for ${EPYTHON}"
+	local abc
+	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
+
+	# removes contextvars, see bug: https://bugs.gentoo.org/799431
+	sed -i '/^contextvars/d' requirements/base.txt || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	# testsuite likes lots of files
+	ulimit -n 4096 || die
+
+	# ${T} is too long a path for the tests to work
+	local TMPDIR
+	TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)"
+	(
+		export TMPDIR
+		cleanup() { rm -rf "${TMPDIR}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${TMPDIR}"
+
+		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
+			"${EPYTHON}" -m pytest -vv \
+			|| die "testing failed with ${EPYTHON}"
+	)
+}
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@ -1,8 +1,4 @@
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
-DIST sysstat-12.5.4.tar.gz 1474379 BLAKE2B 73bd4ebc44cc57cd3dba4fecbcd45026929bdbeab6b99c5b13db7d37252dff8da987ee5ac00d545aebdc72f924d0100166e9e876f6684e064f7020f3fa7a7cb5 SHA512 c051f136d404684a21b11e968968e34f0f114b4568369c6449c64b7745269065a3dc492039ded7c415fe39970aca54cc81646589b0959ade43e9be6f6cd4c0dc
-DIST sysstat-12.5.5.tar.gz 1481620 BLAKE2B baf4d57eb369d75787e3fce48b29909f90ad5e981996930538ff0a60e668853457440bcea8323cfa10d86f7069b0f4e24e27d62aa09572bd1c9535c2bd730451 SHA512 66ccbf0fbaf783fac3cf2b52daf53a8d5bc6d182a66fa0b2965717cf5afc5e54590f08711948f18806b9b95c9f06a45376a1d18b5081d63a5214bc55f81f5696
 DIST sysstat-12.6.0.tar.gz 1454167 BLAKE2B 84213e1d63e6d44e889e9763c9f47c769805baf65715199b1ddb3472ce68c37b3b46229af43ecf0cd85d6c09be85273e90b96a975304cf2f6695298b3e552630 SHA512 f4d0e0dead0cce84782e985c8074871c45e77949c2bcfefd5642280e961f39e9eaa9f9fc93c013d79deba6e3703626894dd665ff64db72550d1c24f404780a5f
-EBUILD sysstat-12.5.4.ebuild 1881 BLAKE2B 1f285b96455f80ebfd841afec6ef75d483e26e1e91ef3987bd39bccf01cb26d4b28492c7aa368a7666dca3b80e7584f94c0749115a91b89e423a661c9568a1bb SHA512 5350bb48dd51622d5e6acb9b72b50531f34e046380af4547e4f232087a41a72aaeafdafad0a63a12c818363931293d2161db0fd085a672d66db760f6d9816367
-EBUILD sysstat-12.5.5.ebuild 1888 BLAKE2B 6ed7a47394309e13538fb0253b3adf0b4990d0257eb40df0cc565f295a8e9a6c3eb21c2260c99875fb2797385d58127bb29b3c8ef286ed5f73951a6d927aa699 SHA512 27d6fc1e19ebda59a8b580c567efa9f9552acc6ca93a29182cae934a34fb15d49bd29979389831a822ae04674da0e10c512eb35982516963b9c81e0a3ee45c85
-EBUILD sysstat-12.6.0.ebuild 1711 BLAKE2B 878f9173619a143a74c9203fdcb7053d16a0f242696eada1019237d50c41fdaa4d699a90313ac03f33f63cba1ee223d75c491a0317fe7d2916f0498cf297682c SHA512 f0f51353e3bde052a6bbf60ac371bef4b5b25ac0f267b41b20dc28b022e2efb5aef07aeb56ccefcad3ce26555c982e3ad4f7fdcc1e57af21a6a12ba275349050
+EBUILD sysstat-12.6.0.ebuild 1709 BLAKE2B 28cfcc23664f257132f8c45e9eaa5abdeda9f70b4421b11965aa0055508e552e3f9275451e424aaed593a67a3dfeb3665b03a10baa49d28185601508f6c777ac SHA512 bacd5e5c3f6886e7a215ac9e64db6bcc19b89b1e0abfc6e3e66df7dff403725e9855a0344680e3f9c79d190eb121ca33f41ff8ea4b983c1dbb5f2d14206bc5de
 MISC metadata.xml 537 BLAKE2B 96a62a60f2e483414fdbe7c2d2e11c25528e5c3301b50079a32fa91deaeae37f63f7e78c73a4b749c3cbca6d438aaf0387edc655fe0575fd15ee641619529d02 SHA512 57724ab12c814c17c3c44c234409fcca149058ae678d4dd26fac4fdc11eb4234885948862880db038e82190d665a664d6449a22da49f2fe08b42106aac2058e6
--- a/app-admin/sysstat/sysstat-12.5.4.ebuild
+++ b/app-admin/sysstat/sysstat-12.5.4.ebuild
@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="dcron debug nls lm-sensors selinux static systemd"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	!dcron? ( !sys-process/dcron )
-	selinux? ( sec-policy/selinux-sysstat )
-"
-
-REQUIRED_USE="dcron? ( !systemd )"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	use dcron && { sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die ; }
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/lib/sa \
-		conf_dir=/etc \
-		econf \
-			$(use_enable !systemd use-crond) \
-			$(use_enable lm-sensors sensors) \
-			$(use_enable nls) \
-			$(usex debug --enable-debuginfo '') \
-			--disable-compress-manpg \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	LFLAGS="${LDFLAGS}" default
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
--- a/app-admin/sysstat/sysstat-12.5.5.ebuild
+++ b/app-admin/sysstat/sysstat-12.5.5.ebuild
@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="dcron debug nls lm-sensors selinux static systemd"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	!dcron? ( !sys-process/dcron )
-	selinux? ( sec-policy/selinux-sysstat )
-"
-
-REQUIRED_USE="dcron? ( !systemd )"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	use dcron && { sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die ; }
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/lib/sa \
-		conf_dir=/etc \
-		econf \
-			$(use_enable !systemd use-crond) \
-			$(use_enable lm-sensors sensors) \
-			$(use_enable nls) \
-			$(usex debug --enable-debuginfo '') \
-			--disable-compress-manpg \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	LFLAGS="${LDFLAGS}" default
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
--- a/app-admin/sysstat/sysstat-12.6.0.ebuild
+++ b/app-admin/sysstat/sysstat-12.6.0.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="dcron debug nls lm-sensors lto selinux systemd"

 BDEPEND="
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@ -1,5 +1,7 @@
 DIST system-config-printer-1.5.16.tar.xz 1382124 BLAKE2B 37548bd470f8e80026e014d4077a79a38ad54258d620654536890b67b688fc790c9a9a269b321f2e12d63ec21f24858866e39b41089195c528ddbdf1351bba5f SHA512 ed20a409def66bdea7de4cd5b397891eca220c841e1b5c8cab98e45f87389ae8ba881d9e24072dd07203141fc34c49c4b67cf099791857c007971e3b7d2e2fc2
 DIST system-config-printer-1.5.17.tar.xz 1385792 BLAKE2B c17dce0ef2988028a95e4ad7b9ead18aa13ab07452f5df9a6fb07f4728ce2ed7aa51e8997e7086d517f6965ec1f306fbd6e7f68683e6da66d18bc75408af9220 SHA512 e56fb45e76a93de122bef99774574f77168014b855cd75e1939fb2d6e56ddb27496679a7932cd6255b950599541c3fb3b82386735bfb6dc13eed59f9a259668e
+DIST system-config-printer-1.5.18.tar.xz 1396808 BLAKE2B 910e853829ee876edc597a3103b5ab857b3b8c1cb87096f25213b1088e35d9f4d320dad61f55b530283a7650b07abe028a53b4e144b33b1b66c733cb2caa8011 SHA512 33dc9c52d92f4234e055fb10a99cadd58424dcdb62554797b44bdd5319f1c3662bd2fa33417ac3a3f5ec51216d64e81e1897f3e671eb49f6be34057d7c38f3f4
 EBUILD system-config-printer-1.5.16-r1.ebuild 2071 BLAKE2B c42ef6b6e64d7454a059333b5210c243ca949925af5df32c4394d9411c6bf32d36422e9f39ee4dcc78aad32d7e98076fa592b55c9d69dc55e6acbf54ecb4efeb SHA512 4cb21dc868a872b429ed5e096a9e0e8d9163286c8b91376152d3770c6305b53b661d171f4178a2bd6c391a197f30e94c9e4dd9e545e7e70e329fa2d95b3cca21
 EBUILD system-config-printer-1.5.17.ebuild 2076 BLAKE2B 9de2baba49780f8acb14375a8fc3b9e8dd8fbbb7ca7e7768e049e5271f1c56e0a5eb2012d2ecd38b7a8c40e88eec68349b06efdeb9f0dc65ff057e3de100830b SHA512 0d726e5190183e82d73a97894c9b286af2754a9696a38d726d969034f383afab4e893e5d7bc1ac8df5f067058782610787d15246f27b453903779387941ca667
+EBUILD system-config-printer-1.5.18.ebuild 2076 BLAKE2B 9de2baba49780f8acb14375a8fc3b9e8dd8fbbb7ca7e7768e049e5271f1c56e0a5eb2012d2ecd38b7a8c40e88eec68349b06efdeb9f0dc65ff057e3de100830b SHA512 0d726e5190183e82d73a97894c9b286af2754a9696a38d726d969034f383afab4e893e5d7bc1ac8df5f067058782610787d15246f27b453903779387941ca667
 MISC metadata.xml 464 BLAKE2B 6b9e1c83ddd541fa865336261d248c43e24354dbe1fdb585436bdaacd6cbbca9949b54961c0ad32220326b168650c377862640c50c2f40ad61106fbbb59fa3c4 SHA512 20f80adda8d894d92410585732a88565196b6cd10177bf5ed93966cf450d6dced89f46a840fd5c5ce26a9d7ac2fc42e59fbb8f789eb1f7f594e95da7a0cf60b8
--- a/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+inherit python-single-r1 systemd udev xdg
+
+DESCRIPTION="Graphical user interface for CUPS administration"
+HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
+SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gnome-keyring policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# Additional unhandled dependencies
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+# python samba client: smbc
+# selinux: needed for troubleshooting
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2
+	net-print/cups[dbus]
+	virtual/libusb:1
+	>=virtual/udev-172
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/xmlto-0.0.22
+	dev-perl/XML-Parser
+	dev-util/desktop-file-utils
+	>=sys-devel/gettext-0.20
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycups[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	')
+	gnome-keyring? ( app-crypt/libsecret[introspection] )
+	policykit? ( net-print/cups-pk-helper )
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-xmlto
+		--enable-nls
+		--with-desktop-vendor=Gentoo
+		--with-udev-rules
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	python_optimize cupshelpers
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED}"
+	python_optimize
+	python_domodule cupshelpers
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@ -2,6 +2,6 @@ AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649d
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
 DIST brotli-1.0.9.testdata.tar.xz 3771536 BLAKE2B e22a7e926a68b64cf3ddcf90d2381201d0bac6486f28c3a675c83a2a685108491011195faf48df9abd478a011e874df560ae81988348f7605197805cc3be20dd SHA512 d98c48dbc7772959a9cf276b638cf773a05a896c9daf4f6235f7d7fd625490b3f538e0690afcd6968ff81ad3745c7d78419850c2518048c44d73b470bcd08c97
 EBUILD brotli-1.0.9-r3.ebuild 1780 BLAKE2B 571c95c541b3def87351a232b69bd291dc0d50b9676a08a7a2a0a757d5fc993bad72efab1dc29c37302b2126370b5356d1571b232c9b520c43ea176247bbfc9b SHA512 e159729140a4e9046ec5a850dd7fb1d3f22c32adfc6b54748512abcf7aac0a266852a769814aea9a0219b2076c35cfa7b3b0dd33c6dfc1a0b05dbbb315f69ef9
-EBUILD brotli-1.0.9-r5.ebuild 1957 BLAKE2B 19739b25c1c80b731078ba6b7151b5222c678e346ff90b1207c322533142f820b27415e1c37a4715b47427fbe3bd744c2175db9629af284f92a1f6209c1ed62f SHA512 4d55c8cace3f8de9d87b045773aa6a58c8192fd81227c8479a8740c24f2c5285bcd572244a9f9edc4d6464a2feb4bbb11aba60875b12b65958c78b7658bad2f4
-EBUILD brotli-9999.ebuild 1957 BLAKE2B 19739b25c1c80b731078ba6b7151b5222c678e346ff90b1207c322533142f820b27415e1c37a4715b47427fbe3bd744c2175db9629af284f92a1f6209c1ed62f SHA512 4d55c8cace3f8de9d87b045773aa6a58c8192fd81227c8479a8740c24f2c5285bcd572244a9f9edc4d6464a2feb4bbb11aba60875b12b65958c78b7658bad2f4
+EBUILD brotli-1.0.9-r5.ebuild 2021 BLAKE2B 248575f27391f464db56caaadab701621da8f5d220f5338ff8b7aeb6688a66750d43d7242bb41021baac2b612dfb09bfaad311db2b503c39fc19641483ec87fa SHA512 f10930de2872be242b60bc21b7fc23201bf029dcc9bded25b4eee44ec3bb771ae67823ebd99d71126d4752cd8a4f00ac42c2f24386a95592ee5c545501c456ce
+EBUILD brotli-9999.ebuild 2021 BLAKE2B 248575f27391f464db56caaadab701621da8f5d220f5338ff8b7aeb6688a66750d43d7242bb41021baac2b612dfb09bfaad311db2b503c39fc19641483ec87fa SHA512 f10930de2872be242b60bc21b7fc23201bf029dcc9bded25b4eee44ec3bb771ae67823ebd99d71126d4752cd8a4f00ac42c2f24386a95592ee5c545501c456ce
 MISC metadata.xml 770 BLAKE2B 6e73f34b47e5edbb8007e253191dbc0dd399d1d3f9f1817df851fa6f56bb6e71c90ffed925e5251041a479d0ff6e8084734c45a0d8c56a914a890992c121fedc SHA512 5b43dbaadb8a7c53ec111335ffc57682ade5f30beba4e98cb53a64244fb835baaf3394ffa210763ed36b0abe6c444263117499d4046c4138d644e924683d931a
--- a/app-arch/brotli/brotli-1.0.9-r5.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r5.ebuild
@ -38,7 +38,12 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 "
-BDEPEND="python? ( ${DISTUTILS_DEPS} )"
+BDEPEND="
+	python? (
+		${DISTUTILS_DEPS}
+		test? ( dev-python/unittest-or-fail[${PYTHON_USEDEP}] )
+	)
+"

 DOCS=( README.md CONTRIBUTING.md )

--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@ -38,7 +38,12 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 "
-BDEPEND="python? ( ${DISTUTILS_DEPS} )"
+BDEPEND="
+	python? (
+		${DISTUTILS_DEPS}
+		test? ( dev-python/unittest-or-fail[${PYTHON_USEDEP}] )
+	)
+"

 DOCS=( README.md CONTRIBUTING.md )

--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@ -1,5 +1,4 @@
 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.17.tar.gz 11182479 BLAKE2B 515c048ab6f19e256040122323f394dfa2e8f7a4aefd89e5b374355bd7907f3ba5eaae37d7ce3aed0d1add8fa025b8e5ac3c46c4dc90adf757426fd40af39dbf SHA512 1def92a4f87695b1889e482947f2bc49342ad868ee15425900b0c6f8954ba77aa2a9a8bd4fc500ba124218603aa8c7127daf7192140cace6e652a311391397c4
 EBUILD docker-20.10.17.ebuild 8002 BLAKE2B a5967d16b5f5ad0cb674696e19451e0475ffb9edcfa9e49d9a236d68b3560fab38e2acc3952749023ff8bcdcede5babf464f21055c2c166e350ba9f9e9d748a8 SHA512 d9ad2d0cdc3aa182fbcbbfeaf596af1ffc369237a85440142c48be0f6d1a6c5b868e3a877e8d54222fa3ffe2ce9a435a5e4016398c62598fd931f4507a850206
--- a/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch
+++ b/app-containers/docker/files/etcd-F_OFD_GETLK-fix.patch
@ -1,28 +0,0 @@
-From ec81adb21605acd56b122bc35c53644b13d3ab7e Mon Sep 17 00:00:00 2001
-From: Moritz Both <mb@aldebaran.de>
-Date: Sun, 1 Nov 2020 23:20:12 +0100
-Subject: [PATCH] pkg/fileutil: fix constant for linux locking
-
-The constant F_OFD_GETLK is 36, not 37, according to
-/usr/include/bits/fcntl-linux.h
-Credits go to joakim-tjernlund who digged deep enough
-to find this.
-
-Fixes #31182
---
- pkg/fileutil/lock_linux.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pkg/fileutil/lock_linux.go b/pkg/fileutil/lock_linux.go
-index 939fea62381..004d35fa23b 100644
--- a/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go
-+++ b/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go
-@@ -29,7 +29,7 @@ import (
- //
- // constants from /usr/include/bits/fcntl-linux.h
- const (
-	F_OFD_GETLK  = 37
-+	F_OFD_GETLK  = 36
- 	F_OFD_SETLK  = 37
- 	F_OFD_SETLKW = 38
- )
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@ -10,5 +10,5 @@ DIST lxc-4.0.12.tar.gz.asc 833 BLAKE2B 2fca60b5ac267a893f70875ccdbe39db6b98b5fe5
 DIST lxc-5.0.1.tar.gz 973206 BLAKE2B 6d5cb1a03eb2612d0f8cb59783a64ec42bedd560cacfebf76383d9599dfc153e381f0e584a1c8c9a0b5b18a46bfb01863649dc5a019546e9ded6079b5ec69ddd SHA512 c87563b556aec83c93a7c62932217791e92da950cc76983f0d5e1d603fe1ae298a63fb5e88ec9ef5173846d579babb5acd0836679b915de00844bb9edf9c8d7e
 DIST lxc-5.0.1.tar.gz.asc 833 BLAKE2B f85df5fc5bd88a738042f622ee4191b99e0a8e07db7ceb5824d634bc451f4bf93c8b64d1c72d4899f639ad30bbc9ee82be292dbe310218fa20566ee00f9bb752 SHA512 09de4e74d174b54cf9240ca4ef4793b9f63355c65f610abffb40e6dc2dc9130380761a50725e4dcee39b421e4b51c874d141fe22d5ecfd7ad3af35f7ebec09a0
 EBUILD lxc-4.0.12.ebuild 5184 BLAKE2B 1c3a59f4bb1b43c66acae7de91014ea3aea152d3595e2e6431f30e56d99a2316b2c1d73bcb975371f84273b88282c22eda1691f798a4d3a373a3873596bfdb74 SHA512 a5435cfc04ead876fe7c3e7931307ebdd18057849e7cfd9e0b18073a5aff73e03e4f3b9f7cbf4efe608f4ba1502dde59195ebde8a6591c566cb2ac16ae1ba456
-EBUILD lxc-5.0.1.ebuild 4750 BLAKE2B 28f8e95a6e370153094013183dc8d8cdf13019db70ddffe577a506164168a9636026e2c7d32b86708d7fe8314110c31b0055c0a31b678909c9689b1ac5558bdd SHA512 20d7431a33f340c7144f11bad96583237a0588e14235b955edf0e7736f4b8970e74a6205b2fbecfa504e03da521ec9819d6fbd2a8e843ba754fa43aaf6762d65
+EBUILD lxc-5.0.1.ebuild 4748 BLAKE2B 1fa18490e2fc1284ce509a04f5ca8c81802db2a3b479decc626470e775530e8b37a743133c1a8b8f82a25ec7f18c2c313bad43bf6fe2e7732c5bd3f608c81f53 SHA512 4aeb0b7179039fcb20198086cfcbdfa07bd20b8776b373c4c50baf1039b70f2c2004b5ce1471189d19d286a823be140ef3941c4b33a55f3de40346ae16a21686
 MISC metadata.xml 713 BLAKE2B 982d13dbe2adffcdb473804981effa8eabc89ca95dc2f39ae6ebdbdce0f786311333c8f9cbfe2105faf55dcbaf7a63a09b46e6b7c7987ba629f5e87de24a348c SHA512 4c9d018afe1967708c18747f504b98487f110b6a021cd97c94693fa4b39d892b148ad19ae64399396b34502ed6f598d7515418b69d0b22031776366a9f172f3b
--- a/app-containers/lxc/lxc-5.0.1.ebuild
+++ b/app-containers/lxc/lxc-5.0.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz

 LICENSE="GPL-2 LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd test +tools"

 RDEPEND="acct-group/lxc
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gpa/Manifest
+++ b/app-crypt/gpa/Manifest
@ -1,3 +1,5 @@
+DIST gpa-0.10.0-autoconf.patch.xz 8500 BLAKE2B 0b1b99ef0096f4634b60cddf46d3eb6d70da17be1f506265f2642e742e8f7a016e2b340c6722d5976f185b20b1b2ad96661b375fcdd24595d225314bdfc97e56 SHA512 be59117bea8f254238306e6e8ef023f4485bc940387a7a3d4b47dab2962410d6bfb0a540476061beca531504ff5c56d7d8b2416d366810c73359807cdcc42207
 DIST gpa-0.10.0.tar.bz2 782455 BLAKE2B ef663432cbe20fb5c543696627f448b3970099b6a0f8f68b57e3d87af03550597adcfe4c27c2774d1f278cfc9d07a089652f42ef4f8c3cbc0192b645c465ac0e SHA512 87004fb0806e76012bc194f95afe9ef6044aec890b26e845f45c314e1bd8864f056ba5e32f9ef2e15b24b50840235e6e548a5e3006b255b4f1c20e0fd7710a3b
+EBUILD gpa-0.10.0-r1.ebuild 976 BLAKE2B c6b4680072a8660232d22d81d97b7b5b5c31793d9f586ad0006be2771334723275388b03738fa6212a2d35a101fb131c9d3a26b667b3d9326355698e470c10a9 SHA512 8212b01aa3cae16eda672ae848a0b64e45db01153e7e1bf7ab374b3675210dea2a566a9be016ea5e02d2202fa98c26b33c4ca8b8bf169bde097cb310b7a4b8af
 EBUILD gpa-0.10.0.ebuild 831 BLAKE2B eda7ac1940e4e5319baef416a93d088b20f84adea5e11432a5cdb3839159a056e37f3ce66c84e5c59e1055f606b6912702073cace915c3019ed6104aecfca1c8 SHA512 a2d244cf49742c1f8019fe89cdb3b4fc3fcdbf93db95275a1e436d890b6335a01ccc4e9c656334826f1cf042a8f6309b502b24827f6a6f3dda060e4d24cda43b
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
--- a/app-crypt/gpa/gpa-0.10.0-r1.ebuild
+++ b/app-crypt/gpa/gpa-0.10.0-r1.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
+HOMEPAGE="http://gpa.wald.intevation.org"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+# Backport of upstream changes to 0.10.0
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autoconf.patch.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="
+	>=app-crypt/gnupg-2:=
+	>=app-crypt/gpgme-1.11.1:=
+	>=dev-libs/libassuan-1.1.0:=
+	>=dev-libs/libgpg-error-1.4:=
+	>=x11-libs/gtk+-2.10.0:2=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-autoconf.patch
+)
+
+src_prepare() {
+	default
+	sed -i 's/Application;//' gpa.desktop
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
+}
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@ -4,5 +4,6 @@ DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb04
 DIST gpgme-1.18.0.tar.bz2 1762323 BLAKE2B a071b839eb75455378514f003920cd387320e9fae416e71151cf6ac1b4a058b58ed054450b79e3eeaf820ff5324ea14efa003612867477b7379a776942d62be6 SHA512 c0cb0b337d017793a15dd477a7f5eaef24587fcda3d67676bf746bb342398d04792c51abe3c26ae496e799c769ce667d4196d91d86e8a690d02c6718c8f6b4ac
 DIST gpgme-1.18.0.tar.bz2.sig 119 BLAKE2B 968f8b24ec71b4157214dd026aed83c96894ef353a9cb171f268d640a62fe464ba43540f318abf95dcfc19dffab177a0c3ad8a6e9937dc80e4ececbc8ceb3203 SHA512 02958d86cc037fffc787c6611ace8676d4e04cc1f65fd117eb911d3bfd665dddb7849bcd838af598465be78960f54883eac09c29c42f891f2e4b9713095aed7d
 EBUILD gpgme-1.17.1-r1.ebuild 3339 BLAKE2B b94b1c3ccbac471ad16c406823460d4ffca1c9428b1420f3b433f224faf2a4a760c23b2923bff5a007cf37c63497d9ed5737683ad9bb4cc97250443bb71e00b6 SHA512 f4479a00ae16770c7180c8465079a4cf0cb92811715f87439e92c591701d1ace2c6af35a2990120723ca4c4091fc673aa61fdbda67d6648891c24905279a0dd5
+EBUILD gpgme-1.18.0-r1.ebuild 3503 BLAKE2B 08e210140e79c270dcc4df020941d02a400c21541a84da283f51e3a2a9a5b490555cef626964561afa59cad55a9ca3a6af98bd5a6b76cec3a5b79b95b3ba6def SHA512 912acb47b31ea975d7821233a2d362aa15a32e44c56e84d584dafa6c1134d57dc3014bbd1cb0eebd94705dd6d3b6c1fe058ac48021f1f16f587b3f1a48e93bc0
 EBUILD gpgme-1.18.0.ebuild 3585 BLAKE2B dd453284e0e7d65680de0bcb51013bafc85453924ac322a2928931f1c3967875af8dccc3dd1027fc87f3c004b24ed8e6f3f81ae556419bb0ed267588695beae5 SHA512 aba9378584f4bab17fde88193fe5c9d428ae05d90be96bf46009fe2e857c43af28a0463e1b9c3edb77cf9ad8b739eaffce08925e1a846c304b7e368b75e241dc
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
--- a/app-crypt/gpgme/gpgme-1.18.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.18.0-r1.ebuild
@ -0,0 +1,130 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_OPTIONAL=1
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+
+inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
+	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2 LGPL-2.1"
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme.FUDGE>
+# Bump FUDGE if a release is made which breaks ABI without changing SONAME.
+# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
+SLOT="1/11.6.15.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs +cxx python qt5 test"
+RESTRICT="!test? ( test )"
+
+# Note: On each bump, update dep bounds on each version from configure.ac!
+RDEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.36:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${RDEPEND}
+	test? (
+		qt5? ( dev-qt/qttest:5 )
+	)"
+BDEPEND="python? ( dev-lang/swig )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
+)
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	elibtoolize
+
+	# bug #697456
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!"
+		die "Could not run tests as requested with too-long WORKDIR."
+	fi
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b" || die
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	# bug #847955
+	append-lfs-flags
+
+	econf \
+		$(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test") \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && emake -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	default
+
+	use python && distutils-r1_src_test
+}
+
+python_test() {
+	emake -C lang/python/tests check \
+		PYTHON=${EPYTHON} \
+		PYTHONS=${EPYTHON} \
+		TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+}
+
+src_install() {
+	default
+
+	do_python
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# Backward compatibility for gentoo
+	# (in the past, we had slots)
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
--- a/app-crypt/scute/Manifest
+++ b/app-crypt/scute/Manifest
@ -1,5 +1,6 @@
 AUX scute-1.7.0-fno-common.patch 1207 BLAKE2B 1dd361484b82786d00c2883913c0f1492df22c8d0d02cccaa1f4d4186d43a55058a9ebe2f0c61ec9cc02e22b0c43b26036147e385a28b25e5163b98031166174 SHA512 3e8074a9ba910069da5c4f84d4c779baf070a3ac656ddcccb8defacd0af9e1aaf522d1eb9745caa84483bc1f6da13fd177fa8c587865797b42868002196cec64
 DIST scute-1.7.0-manual-eps-images.tar.xz 236940 BLAKE2B 499207d9059bd4505f426b75f292e66755919d3e4e0d04d2f2420e2e0ceafa14ee47f0a3d7fd2846478dd0878eb01a776582a8299014728f4508a982fec36a28 SHA512 d227111456e664a295ee466dc990364423734170bc82d9a9d38ff72e79abca84775f164c2cf0dd893b9dfb63ff5035334f1740f80601a04dbc9fcb0877f50da7
 DIST scute-1.7.0.tar.bz2 851177 BLAKE2B 9a459fc07c53e44d6b194f0f7786644dae7c37402f69cc511ed7e6cc387236cfe01b13400779a90a123461a28e69629abc260f0fad9c302a9b630e23cb8b4293 SHA512 d58771a8e45632f468b60ec2255f84ef5f2f4cc5e11cf8b0fcd0cec60cc8fe0c49bdd523e855998d5aa6f126138981b2316ee825cf33ec14e723f158e36283d3
+EBUILD scute-1.7.0-r1.ebuild 1287 BLAKE2B 576cc29f62345e35f0286d690793558b314de63d7b192a535fea1cef266b23d246364c7c5116e13e574d7963de78a1c7dbebb28d5ecc443fabdd96c36da49aaf SHA512 82f8497fef7522f968a910dce6e99fb7462c41f15fc011e151a187139b2c16c0b6e223b2fa6c9ca9df0b3f30e869d7715573c7bf1986fef528d0d375b2b8ed63
 EBUILD scute-1.7.0.ebuild 1382 BLAKE2B 2e272267d6ab5332b16dd221be3df005b4850667e6578bc013a3eb67821a1d7effd42ea5ed022a7de2e87a9377518885058e72d615edc2e419aecf8a33b651d9 SHA512 44226957eac57f9b78a60b4eea29977d22dc0f7f1c4df37f4c35687256f33a59f0daabf0cbcf4d309a5dda76e6acfc6785a16ff0c85df43740956a7e03fa6848
 MISC metadata.xml 758 BLAKE2B f223ae2fd2a26cdf487e2a5942f1ef7c59381ef3059fc38798e7d9e8ac0a9c7abe11fa917f1b5ce97ed2686f862c57995ace036d28353f9f76d40181ec3fe539 SHA512 c3ff684ddbbdad228eb40ad0f27c8d504d7f876c3762b99946031050d6917a76fb1b82e97a326d9f655402432d1e3939d4becb6fbf70c261fa0b6a9439e903eb
--- a/app-crypt/scute/scute-1.7.0-r1.ebuild
+++ b/app-crypt/scute/scute-1.7.0-r1.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A PKCS #11 module for OpenPGP smartcards"
+HOMEPAGE="http://www.scute.org/"
+SRC_URI="
+	mirror://gnupg/scute/${P}.tar.bz2
+	https://dev.gentoo.org/~soap/distfiles/${P}-manual-eps-images.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# configure script try to check the version of gpgsm and gpg-agent when
+# non-crosscompiling so we need to have them as build-time dependency as
+# well as runtime.  Require a version of gnupg that is patched to have
+# gpgsm-gencert.sh working (as that's what the documentation describe).
+BDEPEND="
+	>=app-crypt/pinentry-0.7.0
+	>=app-crypt/gnupg-2.0.17-r1[smartcard]"
+DEPEND="
+	>=dev-libs/libgpg-error-1.4
+	>=dev-libs/libassuan-2.0.0"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}"
+BDEPEND+="
+	sys-apps/texinfo"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+src_unpack() {
+	default
+
+	# have to use pregenerated EPS files required for the texinfo documentation,
+	# due to bug 664236 preventing even converting *to* eps.
+	mv scute-eps/*.eps "${S}"/doc/ || die
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/pkcs11
+}
+
+src_install() {
+	default
+
+	# only building plugins
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@ -2,6 +2,6 @@ AUX tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch 1214 BLAKE2B 40f1
 AUX tpm2-tss-3.2.0-Dont-run-systemd-sysusers-in-Makefile.patch 2556 BLAKE2B ea8799561378e718019ed2e3885a91f5b5a270f65eb22f11f952e4346fe066f40fc8ae21230d77c53f4a2ebee3d508342777f34e7e7aa6aa81fcd48fb766984e SHA512 ba555d93affd142c213cc023ddccdfbdfabc9aa05528005cca5bd51751f729c6b44111054443f7ed69c1316cf2986b1f84d5c470e918a1ac34f9c4760eb2e596
 AUX tpm2-tss-3.2.0-slibtool.patch 3603 BLAKE2B f0a0047b316396dfa5800702b793bf5247d62be75704be42968b7719a87a25200b6870e14f87ccb45876b53600052b6716386493ddcbead87857093188608621 SHA512 8c20df4be8857dfcf030770e74f27dc14c31f4a5b6eb1a90c9dca6f0dd01987a7983478c0dfe9774669b9f8fc9ddace66d5d51f991582ba3689bcdcea64a1b86
 DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23
-EBUILD tpm2-tss-3.2.0-r3.ebuild 2534 BLAKE2B c5a3f76cad79f06b1c0d2d6388dc454bcb91725948c0642112a25316f13aa72a1c561504f9c87022ccee8a854f1bc706427f402d0372138a09c989b1a8ccd95a SHA512 8cb08dfad94ddba79dfcb833d9f6f7d3e78d7973e3917162baaf167203bd3d9b9a828e7f5b1f8ec1ba62f09599dd6830850005844920559caf17f611f78a20e4
-EBUILD tpm2-tss-3.2.0-r4.ebuild 2590 BLAKE2B 073da67e1fc42f40cb01e487fd21189ea9fcd644d3534a04e3dfa200bd5767263cf4584dab5c23a2e54c47c815fc81f5a2c4fe4515a7b3a04d51dd0e34bd6dea SHA512 e7b3399f1096956167080d981db81618d479be730ec6273da7c52417970ec7130865ba63e1323d96ff9ec05ed64bcb0c8ec7ac92f3c337f3338c2c4c7736ca2d
+EBUILD tpm2-tss-3.2.0-r3.ebuild 2550 BLAKE2B 2a1ebf581d6dae840e235afd19131164bcad8a6103a9ab8420fa67e69bab676c7b210b2966a8fda0458ed369ee99deb7da5d7871dc85057daa3e3a3d197f6370 SHA512 a1df8e66d2ba7de7ce000c17c8e59a2c9449fecce5d4feade69f0b3f7f9bee4bf68f518784b574cb636d386a2690698cfc8620410eab3916c8f17315fb315e1c
+EBUILD tpm2-tss-3.2.0-r4.ebuild 2606 BLAKE2B c95d09e279e467b40ce4df3fa024e3db1a5064132dad6930036a498ba3a25e84ee3e4070c39eb84cc15641137d66a64ad9d31e77bd836ea14063ec2e8ef63041 SHA512 14b29ef752b3e57652b7e61d58e0919709b46831590f9b5e196240eaa472a00e262fa54f9525700943c5beb569e1ea782036c5dac9ab716d3601321c2390084b
 MISC metadata.xml 747 BLAKE2B 0462c5942012c444e13bf094be03e0cc142b3b5e3e613570506f84be45bb3019876f3f44454b078668c7e3cbd4a60819cd2ea57c588cab34bfe82f76f222bcf8 SHA512 dab6f379190e40b0321597f0c5fa03ee5731eb77e91dc5d82d2f57c896cf40a074598ba1dedd1575e4e23e1fc5ed306f83cb50992fca6cc2bc1a1db822765a7a
--- a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild
@ -61,7 +61,7 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE=${S} econf \
 		--localstatedir=/var \
-		$(use_enable doc doxygen-doc) \
+		$(multilib_native_use_enable doc doxygen-doc) \
 		$(use_enable fapi) \
 		$(use_enable static-libs static) \
 		$(multilib_native_use_enable test unit) \
--- a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r4.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r4.ebuild
@ -62,7 +62,7 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE=${S} econf \
 		--localstatedir=/var \
-		$(use_enable doc doxygen-doc) \
+		$(multilib_native_use_enable doc doxygen-doc) \
 		$(use_enable fapi) \
 		$(use_enable static-libs static) \
 		$(multilib_native_use_enable test unit) \
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/cantera-docs/Manifest
+++ b/app-doc/cantera-docs/Manifest
@ -1,3 +1,5 @@
 DIST cantera-docs-2.5.1.tar.xz 4916296 BLAKE2B eb3da9f1258f6ee71d8a886c916b7c53c886078a0cf92bb407b6ddde28da659e9bb9195809a65ffdf20a49cee107e1a6503a381b52cc58a36fe750bd7edc6d72 SHA512 3e7cac6bc5ef8c8721f4fa4aa34ba9a3291a8bb9919801df22d080a4a45158e9388d2e4b19f0b133fbf9e9a1810d3ef53d12aae032caed5bfe593bc3054de939
+DIST cantera-docs-2.6.0.tar.xz 5561604 BLAKE2B 3fab71497584e7be6b025daaedb9cdf87c837a2476206882016894e9af9dc719dc99f5b428beb836df1b83c1db6c8bffad6abf480a4e71e3756985c70f4362d6 SHA512 d9273396cbc7638ed2ab9ce754fe75cd7993a00884c3c988fa007527842913696a97b796cc5dd57f5657813c339ad61ad1ffcdaf7384a667eee97d70cae441bc
 EBUILD cantera-docs-2.5.1.ebuild 806 BLAKE2B 36555597eddbb335055ee75ac229cb7ba7d049f49c4a4066ca0111feb60f8d99a5fcf0e14c1785481efa191e425cf0ae439939156252921c72737695ed42230e SHA512 146d42e250baf4621657d8173da6d7ae33e2507df67cc30e48b242b0ee58858a44495dbb96036d5435c58ef275e25787e7fcb2b6460fdac4bae93c06d9adfdf4
+EBUILD cantera-docs-2.6.0.ebuild 806 BLAKE2B a7918537891318127e5b5827fcc213d7900a99ce855869e4a86f67ee33d6187bd45793a9aa1e8d3c81f198d326955049fa31ff01290e0951be0ccfb062909063 SHA512 da774a2a38372a5bd3a2f9a5413b1dff8b932bf739dd0bae5ec6c1af7e851dbaf7205be74d7b6debad0f0d87e5c019c0fbdba089c84d13cd412c9ebef9bbf734
 MISC metadata.xml 614 BLAKE2B 4fb5b450306c2d966b1f801d52df495820a69c1457832323e63ae7b63ec2b5503aaa927bf47183e66d1b24f1deb7724962ad64bfc8e87643d6cc10d6a5f69193 SHA512 c61000800203ba306aec57220b8714a219f6f01c3d9947df8cd77349d58ed473e02c8f8467b44b83e75e57ff01d5114640ca89c2e7143d1b4d45caf335f821f6
--- a/app-doc/cantera-docs/cantera-docs-2.6.0.ebuild
+++ b/app-doc/cantera-docs/cantera-docs-2.6.0.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Documentation API reference for Cantera package libraries"
+HOMEPAGE="https://cantera.org"
+SRC_URI="https://github.com/band-a-prend/gentoo-overlay/releases/download/ct-docs-${PV}/${P}_modified_menu.tar.xz -> ${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+S="${WORKDIR}/"
+
+src_install() {
+	insinto /usr/share/cantera/doc/
+	doins -r "${S}/."
+
+	make_desktop_entry "/usr/bin/xdg-open /usr/share/cantera/doc/doxygen/html/index.html" "Cantera Doxygen Documentation" "text-html" "Development"
+	make_desktop_entry "/usr/bin/xdg-open /usr/share/cantera/doc/sphinx/html/index.html" "Cantera Sphinx Documentation" "text-html" "Development"
+}
--- a/app-doc/casting-spels-emacs/Manifest
+++ b/app-doc/casting-spels-emacs/Manifest
@ -1,4 +1,4 @@
 AUX casting-spels-emacs-19-require-cl.patch 392 BLAKE2B 030efca6d6dbd245abe77fa060c165e2d0f40909123e005af4afd79a97fe113654a077c1be5d28ccd2be1a7c5eb824a2afe73f5854258ecd55d06c13c75a0454 SHA512 8170ff7e8ec91a12bcb292aa75a03901f020b6d13fa5e14d20648e2e324c833d23622b098651573181a5161ebc424dbc74ca5a3191811332d758721b4e3159f6
 DIST casting-spels-emacs-v19.zip 1883707 BLAKE2B 3cacf4d9f2afbc4d421aac86d8826fc72b762b8db48f8c7efc9df6b38139f8384704f5edb802d74ec102248ff99f7b177d32290eb006f7b2e69eeb52509e39ff SHA512 349d326a4787b1f1f7dd0630012f938fc67f354f3cb8f18a8b501dff3c1f0e7f07decea528a55f38e1f83d222c917455102103732560a426f37fb183e27d24ab
-EBUILD casting-spels-emacs-19-r2.ebuild 1017 BLAKE2B ec49af5f3702eecb3995cae7bd2e43e09949da7b2320763c11ca9ec5eced246c487586acee7fef6feb38df6e693a600da49f2f3a0e418d9fcd3d19a8e7919ace SHA512 4c5d1021e39b9e504a81f708c1167927fd77f192bdb80e2156df8e8cf400ae1fd161a5ef408b22c50bced7021e9fcd40cbd32c6f168b7d36c6f61c00c0d04594
+EBUILD casting-spels-emacs-19-r3.ebuild 1017 BLAKE2B ed12778d4a30eca397ab4557122a942e08d8fea8ad8ee8f2c00017bc8a2e4dde5cb006f11e1cc7c8f049ad9773fff4cefecc02e4368086d18f0ad7051607377b SHA512 f976f0f46f746f2d70a7e6e945dc3046af808f042bbb805248770f2df6ba607683049dd9a2831327b792af8e1c726dd42bda6331b0dc5679d96b4398bf70f405
 MISC metadata.xml 888 BLAKE2B 2b4f9364572e63ecf109c69fec3e12a14d80c44d51df808917b375527cc0a0a03a47c41ba25417b60e608c26a79288084c67e87b360c0f4b42cc44de1d391ebd SHA512 93e266aff3897cdec74da0cbc5c2f89a84961d701a54dc95ed1fd00501db40bd5b0e38072f77bee2f649546cdd5831a711bf52caf8bfa2932e801d863907869b
--- a/app-doc/casting-spels-emacs/casting-spels-emacs-19-r3.ebuild
+++ b/app-doc/casting-spels-emacs/casting-spels-emacs-19-r3.ebuild
@ -1,14 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 inherit elisp-common

 DESCRIPTION="Casting SPELs in Lisp - A Comic Book (Emacs Lisp Edition)"
-HOMEPAGE="http://www.lisperati.com/casting-spels-emacs/html/casting-spels-emacs-1.html
+HOMEPAGE="https://www.lisperati.com/casting-spels-emacs/html/casting-spels-emacs-1.html
 	https://www.gnu.org/software/emacs/casting-spels-emacs/"
 SRC_URI="https://casting-spels-emacs.googlecode.com/files/${PN}-v${PV}.zip"
+S="${WORKDIR}/${PN}"

 LICENSE="GPL-2+ FDL-1.2"
 SLOT="0"
@ -17,8 +18,6 @@ KEYWORDS="amd64 ~riscv x86"
 RDEPEND=">=app-editors/emacs-23.1:*"
 DEPEND="app-arch/unzip"

-S="${WORKDIR}/${PN}"
-
 src_prepare() {
 	sed -i 's/\r$//' *.txt html/*.html {lisp,test}/*.el || die
 	# needs cl extensions
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/hyx/Manifest
+++ b/app-editors/hyx/Manifest
@ -0,0 +1,4 @@
+AUX hyx-ldflags.patch 1013 BLAKE2B 829d0597ea4bddcbd0ed289aef1e92f667ffaf88bb57a82491c2ca0baae200cba1dd3d0c244d2e9e74bf82d4bb08e0db3252d9e3c7259e487d3e89c82ef00e62 SHA512 7ad16481d50940755422b473d8e52c03f44a14c4c369fe9c36c46a17180cfc3f4c567392d6f5328ba6491c86dff529b7d5db40ffb1100e84c0738c1e9b694faf
+DIST hyx-2021.06.09.tar.xz 13864 BLAKE2B 2c97364e1ae185e7dd63fdfb452637cb68b8ab0d76d0009ce515d6f0fe709d38b910f86dfa465ac6843c88feb997dfdc3c736e21bb0b4265a39440c054f75251 SHA512 43f990e29ce097f8e2378a4511a3097e2576fd72e16f3b5c81688702487c8715e7189cb4a368e344c5440a90a1c759d2f76e7831ab401fa814f7e5ff7e145bd8
+EBUILD hyx-2021.06.09.ebuild 520 BLAKE2B 6be22257eb4711d4e94c5693130686975f488d911fe5a2886b8c1e8305292a0b0797ee8c726875ed61e72f1e9e20bd7a4ff99f296d8af959b9ff71282faee2e0 SHA512 8a73e784b412d79a9d1d236fbec1c577da376676002592c3d560c98e06c3f0d7450aa469ff51213e8c4e071e28c229ad8cdca9513c2dd7264f6b6f7b33ee309e
+MISC metadata.xml 411 BLAKE2B 065732e0003a64a4d9357f4e4a1165fe2fe8816fef95b006aab0409614e4e2c52e0aec9a2b7df22f22b828d5d0cf583a201f39b2197cb7104afcad49c68b6e64 SHA512 1c8ae48ab439e36b4c5e1bbbb1fec9f8113eafb0fde2a994ee64e9272b2209ec073a86ee15083d640d8cc8aafa4b1d9d289719fe77e0a87424314f02f74f7034
--- a/app-editors/hyx/files/hyx-ldflags.patch
+++ b/app-editors/hyx/files/hyx-ldflags.patch
@ -0,0 +1,27 @@
+diff -Naur hyx-2021.06.09.org/Makefile hyx-2021.06.09/Makefile
+--- hyx-2021.06.09.org/Makefile	2021-06-09 18:09:18.000000000 +0200
+++ hyx-2021.06.09/Makefile	2022-08-31 08:20:27.711819466 +0200
+@@ -1,18 +1,19 @@
+ 
+ all: CFLAGS ?= -O2 -Wl,-s \
+-               -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all
+-all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG
+               -std=c99 -pedantic -Wall -Wextra -DNDEBUG
+all: LDFLAGS ?= -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all
+ all: hyx
+ 
+ debug: CFLAGS ?= -O0 -g \
+                  -fsanitize=undefined \
+-                 -Wl,-z,relro,-z,now -fpic -pie -fstack-protector-all
+-debug: CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror
+                 -std=c99 -pedantic -Wall -Wextra -Werror
+debug: LDFLAGS ?= -Wl,-z,relro,-z,now -fpic -pie -fstack-protector-all
+ debug: hyx
+ 
+ hyx: *.h *.c
+ 	$(CC) \
+ 		$(CFLAGS) \
+		$(LDFLAGS) \
+ 		hyx.c common.c blob.c history.c view.c input.c \
+ 		-o hyx
+ 
--- a/app-editors/hyx/hyx-2021.06.09.ebuild
+++ b/app-editors/hyx/hyx-2021.06.09.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A minimalistic console hex editor with vim-like controls"
+HOMEPAGE="https://yx7.cc/code/"
+SRC_URI="https://yx7.cc/code/hyx/${P}.tar.xz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	# Avoid complaining about not respecting LDFLAGS
+	"${FILESDIR}/${PN}-ldflags.patch"
+)
+
+src_compile() {
+	CC=$(tc-getCC) emake
+}
+
+src_install() {
+	dobin hyx
+}
--- a/app-editors/hyx/metadata.xml
+++ b/app-editors/hyx/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>mario.haustein@hrz.tu-chemnitz.de</email>
+		<name>Mario Haustein</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@ -8,6 +8,6 @@ DIST vscodium-1.70.1.22229-arm64.tar.gz 117342125 BLAKE2B c924b7b9af67613d61ae7a
 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
+EBUILD vscodium-1.70.1.22229.ebuild 3017 BLAKE2B c0703683185759b5999ee651fb00e93ee6f180a66294a2ce413d2adb118c4a494627dc6b49b0dfbf9c10f7f8bbb853e43d0be2fe3328b8654c83665b91573f54 SHA512 7679546c57f2a6c300b0df096d7a7345ff8b201b65f8eeae192dca1a7882f758d4d9aa613b0750958ffa3d445036000a434345df52fe4bfe565582ab2d51189a
+EBUILD vscodium-1.70.2.22230.ebuild 3017 BLAKE2B c0703683185759b5999ee651fb00e93ee6f180a66294a2ce413d2adb118c4a494627dc6b49b0dfbf9c10f7f8bbb853e43d0be2fe3328b8654c83665b91573f54 SHA512 7679546c57f2a6c300b0df096d7a7345ff8b201b65f8eeae192dca1a7882f758d4d9aa613b0750958ffa3d445036000a434345df52fe4bfe565582ab2d51189a
 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
@ -89,7 +89,7 @@ src_install() {
 	rm "${S}/resources/app/LICENSE.txt" || die

 	# Disable update server
-	sed -i "/updateUrl/d" ${S}/resources/app/product.json || die
+	sed -i "/updateUrl/d" "${S}"/resources/app/product.json || die

 	# Install
 	pax-mark m codium
--- a/app-editors/vscodium/vscodium-1.70.2.22230.ebuild
+++ b/app-editors/vscodium/vscodium-1.70.2.22230.ebuild
@ -89,7 +89,7 @@ src_install() {
 	rm "${S}/resources/app/LICENSE.txt" || die

 	# Disable update server
-	sed -i "/updateUrl/d" ${S}/resources/app/product.json || die
+	sed -i "/updateUrl/d" "${S}"/resources/app/product.json || die

 	# Install
 	pax-mark m codium
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@ -22,6 +22,5 @@ DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31
 EBUILD xemacs-21.4.24-r5.ebuild 7114 BLAKE2B 051a221c2973c4d54741e89ecd3152cc95b65ac63318099c98c73c16ce5ba43dc940331371ee88c79af6023c7c9ac8a4720d99483e5ce91688d0858a302a5fa7 SHA512 fefe0fb6d1c3f9ff66a50acdbe0e2c9769df01b5447a8e25fd9243733da728d16c9ac5d54539d40c0a0dc83cdc5c3e949d661c7c9b6c9aabe63cbbf78ff8f287
 EBUILD xemacs-21.4.24-r7.ebuild 7142 BLAKE2B 3a8a98f947d1a177f631521ad394e0d5efcb5c53108a4c912a599aa72a5684261ba45472460c6e5cfc4bc10f4c041409bbefc840cdef3630082a3e344daabe5d SHA512 d7154cbf4cb769d3eca13a76bc423225fb2a383c59c172e72ea9b032db68a09d9bef9f5780dbcacacaa191ec2c6da017679a6e4d7daf4883bd4722d6cdfc1296
 EBUILD xemacs-21.5.34-r10.ebuild 7399 BLAKE2B a8afa73fc7ad48aa5140daf1af6e66502928771e8a4d1c5f989823b3d4614dc3e28c8b6ef57424d40822b6ddf6fa8032fd934cfef1595080d48cd43dfebd0320 SHA512 faea36d2b00eb13b075c49f390061209858a95a4343a135c0afff2a29eb87d162130bfbfb734ec8d35da9a18277f81433d0fd829880455c05b521548f2f64a89
-EBUILD xemacs-21.5.34-r8.ebuild 7339 BLAKE2B be0b1d94b9ab0e113c14d9563b82a4feb2c9fd7601597269efa608df7eba950b03dc6f5502c5b439962eac2fedd953285f4a45d7f212e5e34147a7530b66e4a8 SHA512 e44fcec4cf5eee02f3800c153f35295454f0d8c3f10cda3d30245518e7199f997908333a1d7f9f37ca79dd2264bd397b06cfac89e6be7f6ab0113beff7ae824f
 EBUILD xemacs-21.5.9999.ebuild 7227 BLAKE2B 7f5a194f23a7cd06029ad061d493e829fed6ef4f088a5711125b14fc5d103d909bd2681c88ebb5b73773ef68e6e1675e00dd2b943df8f11cfc0c2ea70726a964 SHA512 ca7b3ff6b186fdbae86ee7011d4918590daaf5ff29a8d6e492a241fece2342f3c3dee18e1d1a52c8913fe885ded056b3060bacc20f753f01d230c59c58848e3c
 MISC metadata.xml 683 BLAKE2B 060e4f7830a96404813a550debecf83c2de3993183d41638362ed01a3a6240bdd33a83c0db5e31a2f2e821046fb1c15199688271c27611689aac1bdf02bcde14 SHA512 176625d3c972766aaecd10125e69b4cdcbedff958b842b2ac2b6a39d728ec868b3311ef13f6854122063810c5125f48d73cd1e68083de5ddf3ef85f7f2b09cdc
--- a/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
@ -1,260 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=7
-
-inherit autotools flag-o-matic xdg-utils desktop
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="https://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0=
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap:= )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0[xft=] )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	freewnn? ( app-i18n/freewnn )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-	default_src_unpack
-
-	use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
-	eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
-	eapply "${FILESDIR}/${P}-gcc5.patch"
-	eapply "${FILESDIR}/${P}-glibc-macro.patch"
-	eapply "${FILESDIR}/${P}-as-needed.patch"
-	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
-	eapply "${FILESDIR}/${P}-ar.patch"
-	eapply "${FILESDIR}/${P}-strsignal.patch"
-	eapply "${FILESDIR}/${P}-process-test-qa.patch"
-
-	eapply_user
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# bug #639642
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena or use Xaw3d ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff )"
-		myconf="${myconf} $(use_with png )"
-		myconf="${myconf} $(use_with jpeg )"
-		myconf="${myconf} $(use_with xface )"
-
-		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
-			myconf="${myconf} --with-xft=no"
-
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-xft=no
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} $(use_with freewnn wnn )"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-	use alsa && soundconf="${soundconf},alsa"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm   && mydb="gdbm"
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	use debug && myconf="${myconf} --with-debug" ||
-		myconf="${myconf} --with-optimization"
-
-	econf ${myconf} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--prefix=/usr \
-		--without-canna \
-		--with-ncurses \
-		--with-msw=no \
-		--with-mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		--with-newgc \
-		--with-system-malloc \
-		--enable-option-checking=no \
-		--with-last-packages=/usr/lib/xemacs
-}
-
-src_compile() {
-	emake EMACSLOADPATH="${S}"/lisp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr \
-		mandir="${ED}"/usr/share/man/man1 \
-		infodir="${ED}"/usr/share/info \
-		libdir="${ED}"/usr/$(get_libdir) \
-		datadir="${ED}"/usr/share \
-		install
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags gnuclient gnudoit gnuattach; do
-		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${ED}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-
-	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
-	einfo "incompatibilities:"
-	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
-	einfo "- The X resource class has changed from Emacs to XEmacs,"
-	einfo "  settings in your .Xdefaults file should be updated accordingly."
-
-	if use xft;
-	then
-	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
-	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
-	fi
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/atomic-chrome/Manifest
+++ b/app-emacs/atomic-chrome/Manifest
@ -1,4 +1,4 @@
 AUX 50atomic-chrome-gentoo.el 242 BLAKE2B 9a9bbcb4c774ec38f8cbdf322e398ea7b95af3bd31e3e05bac3c928f6714bf995cb86f762831c080cffc28c6e9cbb6dbc1c59d366e700451f2190ef5bc65b0e2 SHA512 67c0f0159e9ab77adde7961cbcf2f87ab5297af472865dc0ea7a6cab5e5c9c1a4af10e40dada3fe2535b5e79248414423724dd3db13cbf7fae5b0ddc6f2a339d
 DIST atomic-chrome-2.0.0.tar.gz 218286 BLAKE2B db75055df1d337d6f5adfb1dcbef0f9976da38d50bcff96dd5e94993cca84c837d05432c27cab7b3b7bfc14c8a960d667e7c852eda4732f9209f8b72c9a3a191 SHA512 702c8e80246f47dd46f4c864412e47c7cb74a13737754ccf81053a5054b97c4f48c4ca7613d1734dbf7251fbcd1d15269e2a605c36b3e7b631613506bb3a49bc
-EBUILD atomic-chrome-2.0.0.ebuild 498 BLAKE2B 264aa0c308137b5fb93c80ff7cce87f27e58c4a41f5076a36a7cf85266070bd672f76290ae2d198147cefa045a7280550a4d43457fdd0499304ccfc01fc2f3fe SHA512 735fe443394c4a391f59cb9e0243a482d21cc394d5409ede37d466dece2d1b5ecd901836e7cb947c6eb9e2063d8dac0ef20f8b11d38ac7b7710c2f842579027a
+EBUILD atomic-chrome-2.0.0-r1.ebuild 495 BLAKE2B 55027a2d745970211f3e2a11c2d78b6806b302dc53ed19f35f6e37dcdbcc506658ac7d569b510026f112ad8f46788e675febe6b0fe2469a4b35ac473c5ff5d9c SHA512 bcf893fce6452552ee7fc2b8b04a1e05a584460171c1658a8dfdb2dd3e92602d51a0b90235850a90c2b6f836e1c8be88d5bc098781a02de947de609ddf04b6c5
 MISC metadata.xml 772 BLAKE2B 64622335c8a84319fbdfc1d70c0f77793bdd7cb4b9d302418cc8dbd54e0875371e3e740c47199d9ef42df4a41080ffe2fc455d89c0ce8c1f78f455f94b691fa2 SHA512 5046b6fe50a22bc460867248b0daadb0e245440e463bdf84f62834a3b2baceb3a2d2cf8937453563e5fa40fdf8d3d12411b2ec4116dfbf5ce992acb4966410ad
--- a/app-emacs/atomic-chrome/atomic-chrome-2.0.0-r1.ebuild
+++ b/app-emacs/atomic-chrome/atomic-chrome-2.0.0-r1.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8
 NEED_EMACS=25

 inherit elisp
--- a/app-emacs/buffer-extension/Manifest
+++ b/app-emacs/buffer-extension/Manifest
@ -1,4 +1,4 @@
 AUX 50buffer-extension-gentoo.el 80 BLAKE2B 8329957627093470a42d5839e03cceafbd1e9639af9c6f2b3f08cb0c53705a23926cb9e7d0c22aee7a7e7f0280fd76e80162f4037d74f30442e991f2fbd82d70 SHA512 e3f1534344a9c1cca133f93fd03024a5dd9867823358bf83beb81cadece5488054bac378fbe947c9a1f71b085381254dacc6b7e7c3a18e8ad72cebdfd41fc2d9
 DIST buffer-extension-0.1.el.xz 2472 BLAKE2B 10e6cbbe3075871c79a90dd17cd20fad15c9a12f5778758f94e6c509fdf5bb96a17ca0069c1420f53a320041ec5634034ea199e7515c8aef2c0f4808c376b259 SHA512 fef6380a7455fab534563da44868cbab2a54a793e7c86142171940b6133c4e8a9d7008c7f1297568135071eb4f1936f67ec6eea4d2f0a450be5337d97cd0139c
-EBUILD buffer-extension-0.1.ebuild 591 BLAKE2B 15a769194a415b359a1952be4d1527d4c602b897b046376563d55edf37473345bcf5e350fb0ac8311d8751589d797ed075025414510c9a8c9d52ccc5fac413d3 SHA512 03d7f95407af09cbae633a2575fe3b191c41bdbdd0f830a4e3b871d56b037436a4e6bdb8f9a062a0f85c368c46ecd8d9b430df91d00fb182218c79736b78a4f9
+EBUILD buffer-extension-0.1-r1.ebuild 591 BLAKE2B 046db79df5be99dc9323aae36a20c9a7b4ea4f069345c3adf152bc9bbb1fd987c7d2458f031f7dc452500698c43048f56cac5425e157d24f6b30d73e83467481 SHA512 1b807b522160232bf886a59308049589259fc1fecc1e248d505dc5be9ab99c1fbc2c8de7f2026a48af5857816e312d3bc89cf24c8f980b9bf42c401af27c44c5
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
--- a/app-emacs/buffer-extension/buffer-extension-0.1-r1.ebuild
+++ b/app-emacs/buffer-extension/buffer-extension-0.1-r1.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 inherit elisp

--- a/app-emacs/company-coq/Manifest
+++ b/app-emacs/company-coq/Manifest
@ -1,5 +1,7 @@
 AUX 50company-coq-gentoo.el 180 BLAKE2B df1fe948ed5daae78cbe5eee1f41dea6fee8bf09c309e1090b2af28252a3558796db3d84afaed41327b05a3410bb4097f5ba7cec717662cf6badf231423368cd SHA512 3d47c7646665dc1b25c4e84b249dec9b60c3e18f824bdbcdea4d086d4c6a9e8b250db2a769b08cb4eb71fa44ab05008066cd25ac91b1f7e6006f875fa441e33b
 AUX company-coq-refman-path.patch 490 BLAKE2B b4fb42289d969b324ebb946c79fb78989e4553910a330007195691b1e1a9add38dac10e12aee8f06b01d4e1575be9dd0f24904ec9376833a5028795a49d5f74e SHA512 097ab6ab479c2f0478877d077cfd6d9792c4b9807a4554e029ce6d76a1a45f728662fb245a94e0e9b9068a33c07a4edcb582f215548eccdb66d5a3bf1cd427f4
 DIST company-coq-1.0.1_p20210708.tar.gz 3803957 BLAKE2B d2bb3022228cc7a103d4343e914ec20cf539405062e475c7be6cd0db776490a7af35f10fc9e712733bd8f7c6667a05f8d3d6c4321820a61da0847b8bc718c182 SHA512 92a7d0bf8326460519e5f47fe1e9779a4cc2d2bf069898e1797fabf483535eca8244c1ea36bc525aac418e2c26036a8580076435ccbfaa5bdc2e6ee6f133b655
+DIST company-coq-1.0.1_p20220314.tar.gz 3804039 BLAKE2B 93458da7615f7c6f4a6c96c56aa14b95abd0a738a6653c5a3564829f3182ce890fdf52d4aa02e7b5079b7dd17db46e2eb9a7dbe271c579755e12606ba001487e SHA512 07b3c7f639e663ac9c114300fc53a729e2877563d9e2c4434010e12fa7ab435465a7daf6f47fc11076506f18d056c9672be4c6f4246a1b559284a0bf739dc696
 EBUILD company-coq-1.0.1_p20210708-r1.ebuild 871 BLAKE2B d727e070d8888e8663e7b062a4a83eec1a7aa4911444b1da494c0865bda242bf36045136fd4eb2e81c2edc7043f2764d9415b5545e67776dfa58995007849c66 SHA512 96a495a1528d2f8b1ae827718d457b3af20cf59cc4fbe0dfef0e703671cdbaaae02e64a218c0e4c1ad16867290d06494c375041f277f39bf68fabd0041c45bf6
+EBUILD company-coq-1.0.1_p20220314.ebuild 871 BLAKE2B 817f2e9d91097a216bfad878f6d69c3e69323fa735e813e4312d9eea7fe2db64e60ed7ab9b4e1a31a68492e85b5cdb05e8ec64a7cd9bdfa1e8e26c903ae1e42b SHA512 3e1a48faacf1cf88e4399bda8083f46d33ad8ae4e681ed73b5a5657ddcfa3b128e397f0241d60449416a3b6fffff2047c3c86a2491127ef209a04217d99fc9f0
 MISC metadata.xml 905 BLAKE2B 85dc026f6b0fe495795fc3d3f8e41c4fc5470c95ab7d006ba181ab2cdbac1fc664ab69ded1a7a8588b30a4e5b58798f4f3c9e10564111c3abaf8d126524a87c8 SHA512 268fe6e3ad1e37417f9912d7af2ac9732d187a5830af63f9c4b8bc06ffbad1841c5bbaa934aa5d339313356c7bebbd4352ee1cab659a6ad89ec0ed9b0f503dd3
--- a/app-emacs/company-coq/company-coq-1.0.1_p20220314.ebuild
+++ b/app-emacs/company-coq/company-coq-1.0.1_p20220314.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=a6e349e0131f676a885bd14c908fd26054b2df42
+
+inherit elisp
+
+DESCRIPTION="Collection of extensions for Proof General's Coq mode"
+HOMEPAGE="https://github.com/cpitclaudel/company-coq/"
+SRC_URI="https://github.com/cpitclaudel/${PN}/archive/${H}.tar.gz
+		-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	app-emacs/company-math
+	app-emacs/company-mode
+	app-emacs/dash
+	app-emacs/yasnippet
+"
+RDEPEND="
+	${BDEPEND}
+	app-emacs/proofgeneral
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-refman-path.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare(){
+	default
+
+	sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}|" ./company-coq.el || die
+}
+
+src_install() {
+	elisp_src_install
+	einstalldocs
+
+	insinto "${SITEETC}"
+	doins -r ./refman
+}
--- a/app-emacs/company-ebuild/Manifest
+++ b/app-emacs/company-ebuild/Manifest
@ -1,7 +1,9 @@
 AUX 50company-ebuild-gentoo.el 210 BLAKE2B 669e2366c1c28ad32136578f1f996bfbcd94f654e9b683958f7efb0f542b07f5f580b293b706ab996df07a7e5d86fce2ea0ec4b69b734ac1065508c21d44fd6d SHA512 73814267000a349bbad229d1b172ba61a07733473fd53f0b5a88b6488edf85e95ecad7fb5e145ed423c9c55fa0ed65abec16d99dd5d8cd140407aeb2874508b9
 DIST company-ebuild-0.1.0.tar.gz 10938 BLAKE2B e89e389b49b32057a6acd72cf7a0eb68b10d005824287c112528e3136e7d969e3b678450fc997800d83b3c8f226030b0e2724c63b3ae82d78ad16af49bc10984 SHA512 bc7fec05fbc3600ce6b5111b4e1817bfe04f7185a6a33bf5b83291feb795f47b91f827960b29f844f2627e885a05cc156b755a468e5eb0c314345c869678ea17
 DIST company-ebuild-0.1.1.tar.gz 11059 BLAKE2B 5eba661f1956a019a133d3e61f997dcf2d9340c4a5f6d05920cba07e06e493e4358fabab6e16a48d1c081fc2c71f548e06511adf46b55a2fb30cef4ba2df71f5 SHA512 09bed101dcef18b07c2b51aa916b358f6e2ea526bd80dc997b280516ee074a62e006f3a0d748d77848f5e43412d4971841771cf40abe5b80a95477a21ad9d847
+DIST company-ebuild-0.1.2.tar.gz 11697 BLAKE2B e376626d13aa32a4df09ecdae2245b9c961a6e2cd615febfaaa626ac48ccd420b462a6195d9f769d64c37629c34929ba87e3ea6543e2344b62b217a51695870a SHA512 2a67c6ea6e53f78a6c41b2251b928cf7e97bb3f71c7c03057c540c699bd275898bdf8840d723cf5d8846dbbe82cc531f1cc2707181825fe05c4433ea80039011
 EBUILD company-ebuild-0.1.0.ebuild 611 BLAKE2B fb1fddcb8d3f45bb23339104a23f11544aa461c85f369d36bd273fb2b1e2f16f85d8d214cf04a78d8549bb81add36970ec6f4d14200fad2c5515bb9a4a7db148 SHA512 7a44d9c2d0e1701958e61de247d0c832c5b949273656ebfa454d9e00d4266fa00c41095797a6d1720bc0335c55b3ce5cbdc9750f4f6018a2203675ddb38c515e
 EBUILD company-ebuild-0.1.1.ebuild 611 BLAKE2B fb1fddcb8d3f45bb23339104a23f11544aa461c85f369d36bd273fb2b1e2f16f85d8d214cf04a78d8549bb81add36970ec6f4d14200fad2c5515bb9a4a7db148 SHA512 7a44d9c2d0e1701958e61de247d0c832c5b949273656ebfa454d9e00d4266fa00c41095797a6d1720bc0335c55b3ce5cbdc9750f4f6018a2203675ddb38c515e
-EBUILD company-ebuild-9999.ebuild 611 BLAKE2B fb1fddcb8d3f45bb23339104a23f11544aa461c85f369d36bd273fb2b1e2f16f85d8d214cf04a78d8549bb81add36970ec6f4d14200fad2c5515bb9a4a7db148 SHA512 7a44d9c2d0e1701958e61de247d0c832c5b949273656ebfa454d9e00d4266fa00c41095797a6d1720bc0335c55b3ce5cbdc9750f4f6018a2203675ddb38c515e
+EBUILD company-ebuild-0.1.2.ebuild 622 BLAKE2B 57f0ca4543f5e68c41ac86413a0bc68a81afc251235faf727407129535a615b28133b213a40037ec30967192001b8367a658175aebe66f8cb9e2727697ff354a SHA512 95154f84abe16382fe014ae6146125de349f822b4081edcb6ec95350481501bafa58c7f36bbfc36c4664a21161bf59168861d4e42cc30323d72e5334efda347e
+EBUILD company-ebuild-9999.ebuild 622 BLAKE2B 57f0ca4543f5e68c41ac86413a0bc68a81afc251235faf727407129535a615b28133b213a40037ec30967192001b8367a658175aebe66f8cb9e2727697ff354a SHA512 95154f84abe16382fe014ae6146125de349f822b4081edcb6ec95350481501bafa58c7f36bbfc36c4664a21161bf59168861d4e42cc30323d72e5334efda347e
 MISC metadata.xml 451 BLAKE2B 85cf2b33444f33f2dee8a0ccdfff3f83de7ab15d3233e0264dbceddb68382cdd551a6dcc691d71f52fbf8a3e7d1a1d041bab9b3dae0c91e81f7d7c3de8f3e2bc SHA512 4886219382c419a94a07041a0e4d0ed6622c45a0371cd0c70a912d391ee29db1a6e730c1134b8493e5edb299646f35df8eb799cfa311f3927256dba2cb345b55
--- a/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild
+++ b/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.2
+
+inherit elisp
+
+DESCRIPTION="Company backend for editing Ebuild files"
+HOMEPAGE="https://gitweb.gentoo.org/proj/company-ebuild.git"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+	app-emacs/company-mode
+	app-emacs/ebuild-mode
+"
+BDEPEND="${RDEPEND}"
--- a/app-emacs/company-ebuild/company-ebuild-9999.ebuild
+++ b/app-emacs/company-ebuild/company-ebuild-9999.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-NEED_EMACS=25.1
+NEED_EMACS=26.2

 inherit elisp

@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
 fi

 LICENSE="GPL-2+"
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@ -5,5 +5,5 @@ DIST company-mode-0.9.13.tar.gz 88074 BLAKE2B 8704d45d0dec15d7fbe39edcdaa3e34826
 DIST company-mode-0.9.13_p20220720.tar.gz 2198598 BLAKE2B 0dad09689e11b613397149fd0f6c16aa0e01a8d79bd7fc79b66b2ad32a48544ba1a1a6488c316477c793218432383b6ba784c171ada15ac6fe90cce07920ba9d SHA512 fea6d572fee0ecbd91fb41427d7e1eec462fd92da426af1011d1f5c590c2b6c793064c5d25aad49728a9fbbd25a010ee2e17a495115e7bd3587092f3cb4b9f8a
 EBUILD company-mode-0.9.10.ebuild 509 BLAKE2B 989fda1916d89b73575df28f7faaf3e9fc6c01e9b599bfa6c40f4624f8baab949dea1bca2bc2a4968307fc444eb972b079449bd4e560fb29cc92877ed6e35476 SHA512 4f7ad07ac7dc54c5b58ab2bbcefddcecd36199ebbe80602ef1ec3f01f061bef874c244db115fe00d2b90bb2947966ce8d715f80f5ef17c63d12c657660ef5535
 EBUILD company-mode-0.9.13.ebuild 509 BLAKE2B 989fda1916d89b73575df28f7faaf3e9fc6c01e9b599bfa6c40f4624f8baab949dea1bca2bc2a4968307fc444eb972b079449bd4e560fb29cc92877ed6e35476 SHA512 4f7ad07ac7dc54c5b58ab2bbcefddcecd36199ebbe80602ef1ec3f01f061bef874c244db115fe00d2b90bb2947966ce8d715f80f5ef17c63d12c657660ef5535
-EBUILD company-mode-0.9.13_p20220720.ebuild 863 BLAKE2B 268738237cb9a911d1da874b4bdd82effadafca35dd7c25d148f33fce7f656350a492eddd23bc5286f9a6d97094d9298806300f5fbe8efa953f5496a2740e354 SHA512 cba4e55e3444abccf14654555663862f16aba88188585497099dedd7864abdfd5f84bd0df80e3c0263cf7085650feadbb92cf39731f835047ee374ece6871011
+EBUILD company-mode-0.9.13_p20220720.ebuild 874 BLAKE2B 34a087cb6b9bf927175e0037cf276632bf5a7324e6c5fdc68c018539b3e6db638f33dd65f952c9a2ecf8b01b4b9c056d15fb55c54d9e39d642874fa1b2eb83df SHA512 5f5e50351ac5d836ff5d314a762171a243b0c7858d350074694e35088ddf63970e65bd73b78eae7a90f5a697c907fbdbe5aaf28ade0377993b316c7c3531d9d4
 MISC metadata.xml 371 BLAKE2B 802336a86d961a5eaa5079ff9a556a7bb435d9e52e9a8a901bfb6e49739b5e27ebe73f00016fe20fdc023f2dd1af4b2b082926011ae8ce2a9fa220e36475a2aa SHA512 93d3bf18ee05d67814ce1965b23a1b5274d37322eca0f02144eab1af23c13d5e811f026c6378e9f9b53d2e67a15e8b75730efbca16d07cc9afa684c1cbb10e1c
--- a/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
+++ b/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-${H}

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

 PATCHES=( "${FILESDIR}"/${PN}-company-icons-root.patch )

--- a/app-emacs/corfu/Manifest
+++ b/app-emacs/corfu/Manifest
@ -1,6 +1,8 @@
 AUX 50corfu-gentoo.el 80 BLAKE2B 030035947690cded0580337466f06e7561c996ef27d6dce32cacf28249e71f3a99083e1dcd68e8fb1e2d0bcff75a70881ca88c7f41128123876e6f34230235fa SHA512 cde0d90e0b8bafffafd8d79c6fb4bc7957d1c7e5a6eb86b2c2cdeb73910bfddb6b8b2985bd46af406e5d3f3d1e1205b37ac2bf8cb26aa3d052b06054ae7ba00e
 DIST corfu-0.25.tar.gz 38366 BLAKE2B 297c8c556d32ee9f0a42265bbcd9b7cdd19881b8d85a9c92b6be84cb52e5558996cb16da596d13349fd1c9c72c7b6247e003ab48fcc41fd4acbe2d151b8e2e90 SHA512 602a9072cfa6a75672e1879e8da95b59355cc720482c8946311446c5722d13d0db6171eab8d899b689a689fe306d11f9b063e6bdc07dc710d9ee8f6f15b5aeee
 DIST corfu-0.26.tar.gz 38840 BLAKE2B 47dfcd2430cfd37c912cc2101760692bb1e4ef788bafec64760c81b02412119156b99d57a129e31d7109a62a073dfeb836453076f8bc59ece835015b4ec19ac0 SHA512 3996528e5ee9992462bc2cb241c36b7a05aeca460de0a04db542e6cd9eb7352067283ea4d8c668053003a7afc2dacc97e3b634842b847c05450fd8472ae8249a
+DIST corfu-0.27.tar.gz 39034 BLAKE2B efc1d2477bfaa891d32516d69aeb5179bfcb9332b579609319f832a7ff03416ef5836cf5124bf9ad9c8f75ad4a6c4183a17257037f6271801515636dc5bfd132 SHA512 fd143b4fe63080e6280be98b93ef84f4b12c5c1211cb1a9294ea4fddde61466f29f68e9aa24dce74c5316d7938c91fdd0b28775c688b451386daf041ac745b82
 EBUILD corfu-0.25.ebuild 521 BLAKE2B a4caf9986c9ee8edf59147fd748765f18c3dce07b6b573c6c8f9b79147449216aeba2ea33578789a10cdb491bd3714cdcd5ed6e0bfa82a2e956952ee821d113b SHA512 4efb8703c33148f8b9c508f5787594c6519e8dbed90cc4e3389d12d7ce3ad4fdae4687f19eead535183a791605fb2b55ef4202a82ac7e73cea34daa94a902d5f
 EBUILD corfu-0.26.ebuild 521 BLAKE2B a4caf9986c9ee8edf59147fd748765f18c3dce07b6b573c6c8f9b79147449216aeba2ea33578789a10cdb491bd3714cdcd5ed6e0bfa82a2e956952ee821d113b SHA512 4efb8703c33148f8b9c508f5787594c6519e8dbed90cc4e3389d12d7ce3ad4fdae4687f19eead535183a791605fb2b55ef4202a82ac7e73cea34daa94a902d5f
+EBUILD corfu-0.27.ebuild 544 BLAKE2B 8e7b2e689f65d4dcca4934c53564bb8435dae6f06c364d445fce382229231e5e8553d13e25c4451359b00ed453e140a4d1286c8f5584e683474bdc0e12efaf64 SHA512 2f80fc7697c70ab5be781034220f24067b7cc9b648de2520ff159de3c87c6abca72fd7c86739767c58d5ed165525f6b2dc48c3652a60b01f01962e917621ac10
 MISC metadata.xml 357 BLAKE2B 4a324f2913cf600a98085a72ffc69263205068f54b191101ed2825d3e3c84f951e58af8ebcab481bd50908685dc3603cdba3156772f153bf5a565ab43831b201 SHA512 038f5605bc71c57700f5d34539c8474c667f4434261cdb7dacb28c1dd80a64e656c395dfc2c84329d36e6cee28aaa9986d3cceb25f46d887bf8fdc1cbb348b8c
--- a/app-emacs/corfu/corfu-0.27.ebuild
+++ b/app-emacs/corfu/corfu-0.27.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Completion Overlay Region FUnction"
+HOMEPAGE="https://github.com/minad/corfu"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	mv extensions/*.el . || die
+}
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
--- a/app-emacs/cycle-buffer/Manifest
+++ b/app-emacs/cycle-buffer/Manifest
@ -1,4 +1,4 @@
 AUX 50cycle-buffer-gentoo.el 76 BLAKE2B 72fac6d037804f88aee631205aa0ee192c48cfe64a8efe5a90496b24b03429503d0010b9ee082181540d374c2ff9066425e35a3ef5fd6af9759264873a129527 SHA512 e19c819b054a961e3265c6bfc96f20bfc90ee9cfbdf78f30d86e211b168e4e4ccf94ed6ef8d52c08a37dee3202773eb1164f7d758572c943e3bb2de52fea3fbd
 DIST cycle-buffer-2.16.el.xz 5392 BLAKE2B 7d4b765da320109274605731bfc6910bf75ab4a0610f75d4dd4a4b45e03c7103a76bf0dedffbdb67831d0c8cb04f147f8c77757cb40b714c80a7bc69c9105b79 SHA512 344c07af9e2c9ff06dfa81ff44d02c1e8a9434381486c227a7af06c989e7c623b0f9bf547500b320e2ede7d181f0212725c03a84f53a43683ab3b8229b99a6c6
-EBUILD cycle-buffer-2.16.ebuild 522 BLAKE2B e4b25216a87a770dbca5919d3f875c08ff5084676d971ee18789f3a5d7e0591e12af740a38a4c899d7e4f1455382c43f79f350882899d30118aa08cb1446e6f9 SHA512 276359ef16628f506cbb20b8f71629a42bce70afaee10ed86bc0dd8e8c364ecf2675292e57959ec0df6c7864dd81e7bf4a919607c726cf9a8031aabcd44e8221
+EBUILD cycle-buffer-2.16-r1.ebuild 522 BLAKE2B 86d34697232290edafe4920bbfcec3a6fc30cd010f4b72abbfa64b0897837aa6a47f8fc8b119875a0ecdb71c40000298cab33e605e2b2da14e4a188b5c84a1e4 SHA512 7bef4e7b22ecbcfdf3edc3035a64929fc2279ba75c93d317a7cccb9aa99b39b4697b2fd792298219eb369f576e656d341ac85f447d27f2bd6ddbedcfa5bd0a13
 MISC metadata.xml 293 BLAKE2B 07085bc46a57a9592b46c4442f0ca6995a5d1857ce51bb85384d389114b3385b71f3977cfed5d7180fd574cc4211824a327c98f5f690a9d959320f9d960af88a SHA512 c3af1c6afe14f621f3d1689ea4fda1b7215c3dd9e3c578e45edda24cc4eae1ec11dc29d42d87c762f3c6decf9f9bdf356b109736d47951c9eaefcca8d9111d56
--- a/app-emacs/cycle-buffer/cycle-buffer-2.16-r1.ebuild
+++ b/app-emacs/cycle-buffer/cycle-buffer-2.16-r1.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 inherit elisp

--- a/app-emacs/diff-hl/Manifest
+++ b/app-emacs/diff-hl/Manifest
@ -1,4 +1,6 @@
 AUX 50diff-hl-gentoo.el 1736 BLAKE2B c743490ef717dcc1ec72fc44a2c2a05792ff60cee702ac06b105a39d5fb088ee2816d23cf9a54d8686d3db5af6649f5793738273bd054e2f486da949eb3cf9c7 SHA512 ac3c8d3f1566515fe8be749619764febe3fdf24820d5e7a95f1eb9eff8329cb5e4fa7da848e867ece8772b5d7a1e75e159091da5194ec16bd2724febeacb6f8b
 DIST diff-hl-1.8.8_p20220405.tar.gz 241924 BLAKE2B 316326eaca5e37155665436e923b9c8fa2a05cee6cf37bdb4c8538dc2ca8575fa7eff736e125b063c92abc0365c42743907f01edcfb7df2837f58bb2cad2a62e SHA512 4055699146f4244863c2be05a2196db7c51de16c9403ddad926b93b6be87b704efba1b578c2570d25a6e4da2d73863f8298691e26d270513558200169da02e04
+DIST diff-hl-1.9.0.tar.gz 242125 BLAKE2B 1dff9d601ba0dd8e117dc22de95dbdfa05ab14c0efecdcb7168061f760fa00b61c936fd1b3f0208d325336e3f7eb4f4c081e8b3b6db84799b45a56a73f3e8542 SHA512 fd82e22e685d2c51048acd3e339f0d7da9a1dc7ba49f64437b66dccaaf5b7bd93b9832eb37c56c0e9cbbe6dc058968e9a53c6e5dec398471fc79615ccce828fb
 EBUILD diff-hl-1.8.8_p20220405.ebuild 997 BLAKE2B 9ed0d40bb0754f35ff4fac74de99f7284801c61602786c562f5e85fc5180d3f155709efc2ef70916191d2a04163503fe037df25bc2487cffbd29d01bdaadcf89 SHA512 549923a536ea2cfed026b8f9b3e93ba0a44215f00289eeb9676dc83fbc87233f9f32b01f8fe2719bb381e089b90f84401d3eb2cb658e14fe412a15c1650dc395
+EBUILD diff-hl-1.9.0.ebuild 939 BLAKE2B d194bb3aefcd797c824f22a042875e95cd73dd958a73932bd55d04d6e12c74c33c2d81ea6b514859d86a21b1c61c21a622d5e23347d631af6b90880855909c70 SHA512 e3253b294f9941bcd54c2c4fe9c9824cd8b8509d5843061219452a9f83f059523711ba40fae3020d638ea3919c82bb922d3b36c07f465d566a73c6a8a77e5557
 MISC metadata.xml 417 BLAKE2B 8008d30c29065e61bd3fe0188f6c882993cfcb3021ed3dc650f9a12e7ef625e1f743ab6e405ce63d7d29a49f54f2987b7dee73025cc936e5356b09a5e0fb7038 SHA512 eaccfd63d897f54a6d2426028eaa1eb47f80fd63136446b5344dcdb599727680a81a13faa917a07d4899ed92f233dd247a161bf8610a701e29270955d3975209
--- a/app-emacs/diff-hl/diff-hl-1.9.0.ebuild
+++ b/app-emacs/diff-hl/diff-hl-1.9.0.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=37b00f3bad841e131d69442a89cbebc3041d996b
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Highlight uncommitted changes, jump between and revert them selectively"
+HOMEPAGE="https://github.com/dgutov/diff-hl/"
+SRC_URI="https://github.com/dgutov/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-vcs/git )"
+
+DOCS=( README.md screenshot{,-dired,-margin}.png )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ebegin "Creating a git repository for tests"
+	git init "${S}" --initial-branch="master" &&
+		git add "${S}" &&
+		git config --local user.email "test@test" &&
+		git config --local user.name "test" &&
+		git commit --message "test" --quiet
+	eend $? || die
+	emake EMACS="${EMACS} ${EMACSFLAGS}" test
+}
--- a/app-emacs/elpy/Manifest
+++ b/app-emacs/elpy/Manifest
@ -2,5 +2,7 @@ AUX 50elpy-gentoo.el 220 BLAKE2B e2a2f6e0db08776665bd7e71ceebac1abee5a2d8e399fa3
 AUX elpy-elpy-rpc.el-elpy-rpc-pythonpath.patch 453 BLAKE2B 80a2421d3c25209ed4c6cd2d87021ef994ff1745e9b5a447ea86b7d8c8e22b7511e7f11462a424c0d7fb5ad9c8d60b9f6f34f9cd6e9fc18e17a5af59c707bb86 SHA512 4a354bfc4e16188b91ecb4a33ad9cf7802693b641a3f5753632cee23f8a4beeb716654b872aba6db00d11c45b1ed2e0ef8247649e8fc115f3b0d5cf971205269
 AUX elpy-elpy.el-yas-snippet-dirs.patch 495 BLAKE2B 62aa75ae47c98a20501210d5b53a468298ba7fe7b15cf05785565fa0d706a0bbcdeaf90c49d03a35138fa7752a7d476b323affb864dcf47f63c3299e3148523c SHA512 bda0ded2f6097f5f058c34eb2c0c978318118e9c22260a7efc54c1d92d2cfa10aeaa497a77f2be040c41f47a69e41755ae076a4ba5c1c26544ab86759791d9ae
 DIST elpy-1.35.0_p20220321.tar.gz 177145 BLAKE2B 6362a68efc5997c3d0e26e22c6fe563e1fdba5e6f3a9e1e3c1b53bef8320cc4ac0f929edd177b492a5f2e622c265aeb23d34df8db8ae67bd9a2e48e00adc7c25 SHA512 e8cf579effa0a0bc8f3c05001341b96fd134f8f08c16d95d83200ad94a942e3f60ef4ee4186758a2810de2ca58ee41e7119bc84a7535f28665ec7dad29b07db0
+DIST elpy-1.35.0_p20220627.tar.gz 177246 BLAKE2B ded88f89949683000c9be606f3b5d2fc65a943c97e0369505713ecbd4f595a43a7ce560b699ebbdfd4a756703c5fa8fb21af5b4e8a1aa6dbb8a55fe4b7dcc468 SHA512 b9a4588eb83edef69661568b936e278621abad316ae160a00737c546b5eb26abd8ac089b369be212abbe16b66b590d9df73986995d36201c1010da7dc9706f79
 EBUILD elpy-1.35.0_p20220321.ebuild 1728 BLAKE2B 9c451b481fd4619e2bc7f5d2413a0fdd370b5877054092a10447c3750fad90c4b1a0d4d93dd1bd0196e9015a4fc95f83754f1cc613d22bda636e4acda4793fd5 SHA512 d96530b7f6a31434c9fc3c468c54cf7ec1f201d847c1e1d1530b5a824ee9ab55cb0f26fade671026ea82987733cdfb4ec0e29d2811143105b8dc4ec53d17b169
+EBUILD elpy-1.35.0_p20220627.ebuild 1728 BLAKE2B e0b96e52833dce861ed46dff94ba404ab88ce8295ba5a8a9d308eb23066aee610e9c012bf74e4dac5e459d90b575bc7189243284b8bb56c7c18240eb50f3b1c7 SHA512 c0ec0eb176f739cece0ccd2b8e7dee9a99c8c883a7462025a7a1893589612205275d9be1ac17d9efd7450c68a9695fb4e73e0879140271548be324e1e29afc5d
 MISC metadata.xml 427 BLAKE2B 8711ffb7b4aadb742844dd478544e141159550c8ac041dea7702be583d8ab2ac48793762d70c6a7da0523052585bad40a31438d48d84dc735f827b36b3b42c60 SHA512 8fd5918a278dde43c85186cc67f6634d71cfe7e92d91c2a5adc3dfa86fd77d0d483f72e4c95dacea819da4c946beda835f828bb5e9067a79e7cc6434812d6293
--- a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
+++ b/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=de31d30003c515c25ff7bfd3a361c70c298f78bb
+
+DISTUTILS_SINGLE_IMPL=ON
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+NEED_EMACS=24.4
+
+inherit distutils-r1 elisp
+
+DESCRIPTION="Emacs Python Development Environment"
+HOMEPAGE="https://github.com/jorgenschaefer/elpy/"
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/company-mode
+	app-emacs/highlight-indentation
+	app-emacs/pyvenv
+	app-emacs/s
+	app-emacs/yasnippet
+	$(python_gen_cond_dep 'dev-python/flake8[${PYTHON_USEDEP}]')
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/autopep8[${PYTHON_USEDEP}]
+			dev-python/jedi[${PYTHON_USEDEP}]
+			dev-python/yapf[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+DOCS=( CONTRIBUTING.rst README.rst )
+PATCHES=(
+	"${FILESDIR}"/${PN}-elpy.el-yas-snippet-dirs.patch
+	"${FILESDIR}"/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch
+)
+SITEFILE="50${PN}-gentoo.el"
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests unittest
+
+pkg_setup() {
+	elisp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	rm elpy/tests/test_black.py || die
+
+	sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" ${PN}.el || die
+	sed -i "s|@PYTHONLIB@|${EPREFIX}/usr/lib/${EPYTHON}|" ${PN}-rpc.el || die
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	elisp_src_compile
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	elisp_src_install
+	insinto ${SITEETC}/${PN}
+	doins -r snippets
+}
--- a/app-emacs/emhacks/Manifest
+++ b/app-emacs/emhacks/Manifest
@ -1,4 +1,4 @@
 AUX 50emhacks-gentoo.el 785 BLAKE2B 90811c7d1acdc25a1a2a430af1ce8a8bfe9845042f22b6043208dda87a1ffad5946f2ccf04036bb9b1aa433de6f03d09de911b5ce5e1b29d2ec773bc76b96825 SHA512 80961af6c9ba24ab964214e68d464ac88b2c88894b069b90f7041dbbade02c96b3cb2c60876f90134882a4984386a73ff23ebc785c19cd18a11e6b424c2a62ff
 DIST emhacks-20070920.tar.bz2 71232 BLAKE2B 82c80bc41daa37868fe6376461df9cc96ee6d5db1b5e4a2e6414b9cd114fe57f3f5a226e82d2b9e5ac7e42a84faea585fa18621da5c7db4181334fb8db73cc9e SHA512 097a4602d82587a20feeb14c4717c69536336319f43f7b5e8b4ba0c7f878218138eddbe1edb6293222b7c5798b94dd2c8393231a7b8fb8f32fe5349f2b054bb1
-EBUILD emhacks-20070920-r1.ebuild 636 BLAKE2B fe44df7b58e6bd82f832cd4764cb0853b73c2cd81c9d17b659535e1d6c7c77f0e3d81e4decacbe0409b5ca23c52ab9a662efa9b5265a9cffbe1da0bb9c6acf70 SHA512 ac9d715f9671d97799d7baebd5553d4014cdeebb46039eae19263a13c8786ec763b6348a8d79f88b5db0dbbc79316dc539c4ce15e30b073ac656da6e4b7682da
+EBUILD emhacks-20070920-r2.ebuild 629 BLAKE2B 24bfbb3480197cb7bdbf3609aeda4af3134414c5434114a54746627d04db7d6ab1afb6953e779ecb47d510d85e4402ba460c2e17f714f3811d683690cea753df SHA512 a7f0110102b91e3db7de5094c826895bb56e7d72a6e863ea93f29e2c666a59923501073f496dbc25bb37c7008e33ffa6a4e1e49108824df90ce78427d9d63160
 MISC metadata.xml 761 BLAKE2B b71eb820d17348229ce4a9ed3dddd3c18cefed790a81071588081f3d234b29448ba34f173666aa0dddb68581599b06ba9123aa7fe0c3ab7f48f8c5e8d2830a31 SHA512 30fe0dd5a704bfab0ad99b0aca90c6992bceb4b1e94633315d63a4c39495d6ce7ba732ec2941b0da535507a26baa010d4c4ac4b9559ef8a57ad920abff379630
--- a/app-emacs/emhacks/emhacks-20070920-r2.ebuild
+++ b/app-emacs/emhacks/emhacks-20070920-r2.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 inherit elisp

@ -21,5 +21,5 @@ src_prepare() {
 	# remove files included in Emacs>=22 or not useful on GNU/Linux
 	# remove jsee #642588
 	rm -r findstr* jsee* overlay-fix* recentf* ruler-mode* tree-widget* || die
-	eapply_user
+	default
 }
--- a/app-emacs/flycheck-guile/Manifest
+++ b/app-emacs/flycheck-guile/Manifest
@ -1,4 +1,6 @@
 AUX 50flycheck-guile-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST flycheck-guile-0.2.tar.gz 15138 BLAKE2B db557f69c3069ff378724438954e65f35dddba15a80211c33f06a12a1f8e72881f2b9e717bbf83d52e6b80f877ac8229ed8431669a1780c8aeaf458a577afa79 SHA512 7689ba434bbb53724bed6c60a36e48578f8f00a4d8bf2a82e2e6e6a08a3180b2b83de2f0659202d500fd04469b1528f5867c4f6a12a3579f143d1b4749149ae2
+DIST flycheck-guile-0.4.tar.gz 15866 BLAKE2B 2aee8e29a5702c809835ceebda3e4f2efa76712f9dbde943ef09bbd7462461093b63710b816fbfeb13a7f1e6a0bf07c32fe274c3b6d2f4f47ab0845dfa981035 SHA512 46b68533d3510a06ceaa211730318e4894db8bb3b5fd6a03028377134af0e7b48c2c77102492a656c92c0850aa5a6037879dab601930776c00210825db2e68aa
 EBUILD flycheck-guile-0.2-r1.ebuild 591 BLAKE2B 845e2a984792bb5a5aa1c5dacaf2d0bf68c7410640769c9c19bdd3f6c203c729fea671712602c8e9bd744f5b8675c91c2bce735d92c21913a62ee2d68009473a SHA512 6031fc82937c71484fc6dc0b14a35cedc4624583777dcbdfd8c7c8af4209a26767c1c09a4fe12020dd15f62d230d83cd9860cf8ab1450b21c473ecb1fcf8e161
+EBUILD flycheck-guile-0.4.ebuild 561 BLAKE2B 143b267eea35d2b89676811a284b08c5e18d3ffa4eaf2e650329e52853db605312c72404848b5ca6d73b1cfbbaaaa9fe1d141e46416bb3ea9928d09df59d6ed7 SHA512 8abbd275e890c5c31ef32a026522b7cc02fc09d5cf0a8c9bd03a0b5789354b222de7fb0a132bb674fa5508ab0209c550fdef7ed2fad9f5f97ea515c921800c55
 MISC metadata.xml 563 BLAKE2B 30d09ba125549e1a8dc7b873aba8bcbf21dee273f1c31c7a40ec2409cc81f0566f365ac1ef4eb8c6f5b565a4006a5233349b402197fae147a0096a06e0c4778f SHA512 5df30cd0d0b49a9c718d8eeaca573aa85e916f53c81d90cb1794329376f2a737d165983e053676669af3743a4c9c1bbf80a5f15915d7652151b22de4eb0d742a
--- a/app-emacs/flycheck-guile/flycheck-guile-0.4.ebuild
+++ b/app-emacs/flycheck-guile/flycheck-guile-0.4.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Flycheck checker for the GNU Guile Scheme implementation"
+HOMEPAGE="https://github.com/flatwhatson/flycheck-guile/"
+SRC_URI="https://github.com/flatwhatson/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	app-emacs/flycheck
+	app-emacs/geiser-guile
+"
+RDEPEND="
+	${BDEPEND}
+	>=dev-scheme/guile-2.0.0
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/geiser-mit/Manifest
+++ b/app-emacs/geiser-mit/Manifest
@ -0,0 +1,5 @@
+AUX 50geiser-mit-gentoo.el 222 BLAKE2B 5748fd1b3dae50af185b667e463fe7db7f4c34ba6225e7c0f4687936cb2b33ca20a9e8de2981bd72ae41b376dd600ee2214d9d21ef3e8b3f8df0fbe65bc68d8c SHA512 b06f705d8fd0b89fd981a22c60a25202592b9c8ada5982648020a3cd302b361ae003c98594e4848c1a3bae3e4c4636d22dc541d3344d4352d4fe3603a9f2373c
+AUX geiser-mit-src-dir.patch 396 BLAKE2B 4cefad3baff7d5cc14491b1499bc98c911c09a1d88665de84db5b456b03f0018642472373902bab5114dfeaa4b02d18db59c751d9a3973fa7eb4c7c491fd5d62 SHA512 71dd0dfa58822f56eb8613a81c248a429689c6da918cb5673af2e4806dcd2bc165995ae0742506853f2e2518d4a07d25c28d237c4e084b345e5a6b308e21a6cb
+DIST geiser-mit-0.15.tar.gz 6216 BLAKE2B d14f412730e86ef580bb13426e3af558403acc00cd1c742507f66f80369a644581c98310803430439ff09b1c13eefe550f6dbc3289897ae86e6471b7197d73cc SHA512 e2d7a81a66293e5232f510eb4cf1707c3ab64ac77a36c29b55d17275a2d0141302e28d29e4280e388f3107db3a961e757e9127219e36b76b1680fa54fee48593
+EBUILD geiser-mit-0.15.ebuild 1133 BLAKE2B 43408ed30f04027e62051393f5ebd1696c53e20d2b9f327089a1afef9348747e242a1b395ae1ed6ba41139beac4968cd3b532381735dbb73e84d278b2cec3c87 SHA512 6fccd7778c96e6c9443a3519867635f7b3698a93c4505fa47d76b8a76d10fd387ce7cb1a65a651bba9de0c132789403712adf63424b7e7209f181d597fbea25f
+MISC metadata.xml 545 BLAKE2B 22f524510834b30e9d531053910ebc9082679678b2ce74e08f69c869ce5d0d832cba6144989f329ddf704b1931441802e96633103607d95bc1d032d422f0b11b SHA512 9d4b141a749b89f71f25f0998ab5e469fdec73e2cb7f0f014e849dada07912600a500de1335cee95904b3b68edaf258dd7ceca6d056d921c3d8e433c94deaa56
--- a/app-emacs/geiser-mit/files/50geiser-mit-gentoo.el
+++ b/app-emacs/geiser-mit/files/50geiser-mit-gentoo.el
@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'run-mit "geiser-mit"
+  "Start a Geiser MIT/GNU Scheme REPL." t)
+(autoload 'switch-to-mit "geiser-mit"
+  "Start a Geiser MIT/GNU Scheme REPL, or switch to a running one." t)
--- a/app-emacs/geiser-mit/files/geiser-mit-src-dir.patch
+++ b/app-emacs/geiser-mit/files/geiser-mit-src-dir.patch
@ -0,0 +1,13 @@
+diff --git a/geiser-mit.el b/geiser-mit.el
+index 53edf0e..2dfe9fa 100644
+--- a/geiser-mit.el
+++ b/geiser-mit.el
+@@ -61,7 +61,7 @@
+     geiser-mit-binary))
+ 
+ (defvar geiser-mit-scheme-dir
+-  (expand-file-name "src" (file-name-directory load-file-name))
+  (expand-file-name "src" "@SITEETC@")
+   "Directory where the MIT scheme geiser package is installed.")
+ 
+ (defun geiser-mit--parameters ()
--- a/app-emacs/geiser-mit/geiser-mit-0.15.ebuild
+++ b/app-emacs/geiser-mit/geiser-mit-0.15.ebuild
@ -0,0 +1,54 @@
+# 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="MIT/GNU Scheme's implementation of the Geiser protocols"
+HOMEPAGE="https://gitlab.com/emacs-geiser/mit/"
+SRC_URI="https://gitlab.com/emacs-geiser/mit/-/archive/${PV}/mit-${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/mit-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-emacs/geiser
+	dev-scheme/mit-scheme
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( readme.org )
+PATCHES=( "${FILESDIR}"/${PN}-src-dir.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_compile() {
+	elisp_src_compile
+
+	local scms=$(find "${S}" -type f -name "*.scm")
+	local opts=(
+		--interactive
+		--eval "(for-each (lambda (s) (load (symbol->string s))) '(${scms}))"
+		--eval "(for-each (lambda (s) (cf (symbol->string s))) '(${scms}))"
+		--eval "(exit)"
+	)
+	mit-scheme "${opts[@]}" || die "failed to compile scheme source files"
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto ${SITEETC}/${PN}
+	doins -r src
+}
--- a/Show More
+++ b/Show More