gentoo auto-resync : 14:02:2023 - 07:56:50

14 files changed, 262 insertions, 8 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d1aa54f7a7f1..2921189cfcac 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index d0bf64fa0af8..edf2aebb8461 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -4,5 +4,5 @@ AUX apache-tools-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f4
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
 DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b SHA512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb
 EBUILD apache-tools-2.4.54-r3.ebuild 2677 BLAKE2B af27235ab1c8ae302c0684136208c3b598434f2fb27fe0bf908e04078052b61bbee6e1742f079ec4c226f2c66cf181a9c50f53db197f356204d8ceb8db44438c SHA512 bfd73d3bcaa27450b84bb950958c944bbaafde7e2b492147d41d5bfbd21560bef47183353a62c933012e7724afb687093e5b53e718352a6fbcc6b9b4482458a4
-EBUILD apache-tools-2.4.55.ebuild 2683 BLAKE2B f8c804da2c09da47c7211d486f191d0ffd48e5ec8f3a51705d6ba542b7ca10cc7a939a0c8036eb0dfafb46bc7fd2fe8dc5bda7d71bd28251ed6bbe5e36d20c09 SHA512 b5be41ea3e9d69df170f9fc7321dfe65c47500cf203ed22d54b4cabfb324f5b5527aec92b3e6677e290336ebb212b42f09c090720f7c5337dac2fc47f9206c62
+EBUILD apache-tools-2.4.55.ebuild 2682 BLAKE2B 6691767162e2527768c297272ccf26f07878c85e61758a4c83571af85b2e866f8e5357af5f0a88487c4b94518454af7e9702bd8f5fb6b18f7215be86ce109f40 SHA512 ecfcd918a572694999102ad0867544d7dcaee8aac7b454423ff750c04a0f55b67fa2c5944505cdb87a0bb0a2c0f56057e7f7b8350d61e70261e2a7fa818740c7
 MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819
diff --git a/app-admin/apache-tools/apache-tools-2.4.55.ebuild b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
index 5cfe66a9d4b8..28cc7a3c023a 100644
--- a/app-admin/apache-tools/apache-tools-2.4.55.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index 8037c86453ab..a69ae36db182 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -1,3 +1,4 @@
+AUX apachetop-0.19.7-c++17.patch 2309 BLAKE2B 3cc4cae51d25ed559d4c463dd296f319da835aad9de74a09baa0b0cbba8519671d56e134cab8ad922ba689bd6b21507cd72c77525eef0948da103f334f174888 SHA512 18a304e446a35177f21b1af108bcf3c9fda45f22851325c783f6fc8b43851b4e63db71fc537b0a7e2ab9cb908e15193b100708d503b9a928da5edadd3b412038
 DIST apachetop-0.19.7.tar.gz 132665 BLAKE2B 248247c361d1585de68a0a9adae22f98db72991babfb4a75f01fa67ef28443a3c04cf1da9c1ea34ed923599955b58959528cc9e0a881fbb7b463b1d64c0cb7bd SHA512 40d546facee23a9914483c06323940e219602518751d80f729d835c4dbf991c7d1dd9bcebcaa4ca6a2d64799d48c8a00d421bc324afc2959691c962113386969
-EBUILD apachetop-0.19.7.ebuild 668 BLAKE2B 0ae03e770fb0b827324687ad574b78d40f33b51f7a378504aaa9f535b214acc1d124d13da2d7b9055f9520d90197e4891acb590c1c3811118a6c0a65f0c6ab99 SHA512 57939a133aeb63182aba31998b982ebd9d86371f7e9d236251ce1bdc8074fe469190d62fdb9b93eaa87020274586c0f49b4ee9bd0ae2b048a124009ffed73634
+EBUILD apachetop-0.19.7.ebuild 721 BLAKE2B 56c4ad6a76a58eaf7e42c50795e66105ff1544acb087de4833129d1bac37b4059620fff711b7a236e3921ca0ab181adac7456cfe688f8fd936777d035b146eb7 SHA512 b0983f0849c934c45a22ccddce2785dd9064f12e4d3f457229c984925aa26669a863813b4de393078e22dec8e1f51c443b0dd880d8c9d167b62b40fbcc57d1f2
 MISC metadata.xml 249 BLAKE2B 141880499487b29052f0a977f506fd9967e84ee48965a1abd8ea7c12c56246dd1359723fed5680948bf643040e4c1c01822ee9f39408ff303d71ce2831582fe5 SHA512 dfa5bd639db93c8b76c0aa86bcaae906f3d5eb47f0da64ba522b189a7fd8b5f2c042af6c7c1c8864247f89d88a4e8401b2a5584c85ca2afb18f5c50650d504aa
diff --git a/app-admin/apachetop/apachetop-0.19.7.ebuild b/app-admin/apachetop/apachetop-0.19.7.ebuild
index 816b03798ef0..aaf86e4822f9 100644
--- a/app-admin/apachetop/apachetop-0.19.7.ebuild
+++ b/app-admin/apachetop/apachetop-0.19.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19.7-c++17.patch
+)
+
 src_configure() {
 	econf \
 		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
diff --git a/app-admin/apachetop/files/apachetop-0.19.7-c++17.patch b/app-admin/apachetop/files/apachetop-0.19.7-c++17.patch
new file mode 100644
index 000000000000..8ec6508b9e08
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.19.7-c++17.patch
@@ -0,0 +1,90 @@
+https://github.com/tessus/apachetop/pull/13
+
+From f89ae55bb09eb1a67fc73555d149fb85f82bfbd6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 14 Feb 2023 03:34:36 +0000
+Subject: [PATCH] Fix C++17 compatibility (drop register keyword)
+
+register doesn't do anything in any reasonable C++ compiler anyway, but
+it was deprecated in C++14 and removed in C++17. Without this, apachetop
+will fail to compile with Clang 16 which defaults to -std=c++17.
+
+Bug: https://bugs.gentoo.org/894186
+--- a/src/inlines.cc
++++ b/src/inlines.cc
+@@ -4,10 +4,10 @@
+ #define ONE_EIGHTH      4
+ #define HIGH_BITS       (~((unsigned int)(~0) >> ONE_EIGHTH))
+ 
+-inline unsigned int StringHash(register const char *str)
++inline unsigned int StringHash(const char *str)
+ {
+-	register unsigned int val;
+-	register unsigned int i;
++	unsigned int val;
++	unsigned int i;
+ 
+ 	for (val = 0; *str; str++)
+ 	{
+@@ -19,9 +19,9 @@ inline unsigned int StringHash(register const char *str)
+ 	return val;
+ }
+ 
+-inline unsigned int QuickHash(register const char *str)
++inline unsigned int QuickHash(const char *str)
+ {
+-	register unsigned int val, tmp;
++	unsigned int val, tmp;
+ 
+ 	for(val = 0 ; *str ; str++)
+ 	{
+@@ -32,7 +32,7 @@ inline unsigned int QuickHash(register const char *str)
+ 	return val;
+ }
+ 
+-inline unsigned long TTHash(register const char *str)
++inline unsigned long TTHash(const char *str)
+ {
+ 	unsigned long hash = 5381;
+ 	int c;
+--- a/src/ohtbl.cc
++++ b/src/ohtbl.cc
+@@ -13,7 +13,7 @@ static int primes[] = {101, 241, 499, 1009, 2003, 3001, 4001, 5003,
+ 
+ int OAHash::getNextPrime(int size)
+ {
+-	register int *prime;
++	int *prime;
+ 	for (prime = &primes[0] ; *prime ; prime++)
+ 		if (*prime > size)
+ 			return *prime;
+@@ -51,7 +51,7 @@ void OAHash::destroy(void)
+ 
+ void *OAHash::insert(char *key, void *data)
+ {
+-	register unsigned int p, i;
++	unsigned int p, i;
+ 	void *d;
+  
+ 	// Do not exceed the number of positions in the table.
+@@ -81,7 +81,7 @@ void *OAHash::insert(char *key, void *data)
+ 
+ int OAHash::remove(char *key)
+ {
+-	register unsigned int p, i;
++	unsigned int p, i;
+ 
+ 	for (i = 0; i < positions; ++i)
+ 	{
+@@ -108,7 +108,7 @@ int OAHash::remove(char *key)
+ 
+ void *OAHash::lookup(char *key)
+ {
+-	register unsigned int p, i;
++	unsigned int p, i;
+ 
+ 	for (i = 0; i < positions; ++i)
+ 	{
+-- 
+2.39.1
+
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index 9e546640c4f0..0de533a43693 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,3 +1,5 @@
+AUX augeas-1.14.0-musl-strerror_r.patch 709 BLAKE2B 74b81df529461bf7e3a7cd0bcdcb7427199f6da23dcd0e1ff3ee533dfea53e40a9cfc02daee4930a47fb24d7c16b1a836b609cfd13d99a12ecf17e68ec6f1e55 SHA512 e735e0de08d4839e4840d855784845fa49bfb72c13c8cb3566052368c23506939151105bfe48d53d5f1d290f6ae5787d5ee683323448362d8e9e0e71bab2ebc4
 DIST augeas-1.14.0.tar.gz 2651463 BLAKE2B 428e708cfdc485feeb7fe80b8642c5b63a8563f508350ae4751a718888d187bab5d8ca8e82b5e9106527b86bb53d3c5a5a2a6e9ef35d18dae308030286039b6a SHA512 06ef6f735686ae09ec8733a3daf36f6838fa56e761dc6d89e5c44420ea2403a4649bec162b8e49b2c3fe32f0eced8413eba1f2c551103a43860bba823315f1ef
 EBUILD augeas-1.14.0-r1.ebuild 955 BLAKE2B e1c6d5ff3ceba62fbd8f10457e796ae6864aff126d0c677b2e5aeb722361e536e905ae2eca726b99376b33adc7f2e5511626e28bff5fea0606f6cdeb44507bd9 SHA512 91ada7221da5ba659dcf8de3bde99aefb208212ae455c771cba7f39bf14399adcc3e1a634a2dce25358166e7125331eaa7fcdfd64b59fa656a54cca66eac2a74
+EBUILD augeas-1.14.0-r2.ebuild 1010 BLAKE2B 83b9098201828766e116357e0a491bd5d71033ebfe1184a667bde6ce88317ca9adb0220ff2b5aca30d879b4d407a6e51f112356d92660d7bcab8e3d52961d509 SHA512 8b66be8d2b979818ef53e4f8b973d7429a3cbd5d44a7b821cc2c6d1b148ace02a176fdca7704a7404831df9e6a521f07ca7673d416596064e227bc4b517bc3e5
 MISC metadata.xml 788 BLAKE2B d8484727eaeaecc48fde1039c9081d9e1c9572487f9a327a8464dbe448f407efc649499c06d7eca01fdd5eefc51cf7a33ef1bcfbf7df683276904a3f7367e4cf SHA512 1f9528e412f4621928b9da5970bfb244193b763bd27e235e40ae62efd7981be831ca2beebb060e335e432cad1f52ab2bbef2536eca19095e9115db0efa3c4ca2
diff --git a/app-admin/augeas/augeas-1.14.0-r2.ebuild b/app-admin/augeas/augeas-1.14.0-r2.ebuild
new file mode 100644
index 000000000000..a8fbc7adbc26
--- /dev/null
+++ b/app-admin/augeas/augeas-1.14.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="https://github.com/hercules-team/augeas/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libxml2
+	sys-libs/readline:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=app-doc/NaturalDocs-1.40
+	virtual/pkgconfig
+	test? ( dev-lang/ruby )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.0-musl-strerror_r.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# selinux needs to be implemented
+	econf --without-selinux
+}
+
+src_compile() {
+	addpredict /usr/share/NaturalDocs/Config/Languages.txt
+	addpredict /usr/share/NaturalDocs/Config/Topics.txt
+
+	default
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-admin/augeas/files/augeas-1.14.0-musl-strerror_r.patch b/app-admin/augeas/files/augeas-1.14.0-musl-strerror_r.patch
new file mode 100644
index 000000000000..07cda4c4ae02
--- /dev/null
+++ b/app-admin/augeas/files/augeas-1.14.0-musl-strerror_r.patch
@@ -0,0 +1,22 @@
+https://github.com/hercules-team/augeas/pull/791
+
+From 46ecd3542820604603ab4f046f9fb3e6195f60aa Mon Sep 17 00:00:00 2001
+From: Dimitry Andric <dimitry@andric.com>
+Date: Thu, 8 Dec 2022 13:08:53 +0100
+Subject: [PATCH] Only use GNU specific strerror_r() API when __GLIBC__ is
+ defined.
+
+--- a/src/internal.c
++++ b/src/internal.c
+@@ -431,8 +431,8 @@ char *cleanpath(char *path) {
+ 
+ const char *xstrerror(int errnum, char *buf, size_t len) {
+ #ifdef HAVE_STRERROR_R
+-# ifdef __USE_GNU
+-    /* Annoying linux specific API contract */
++# if defined(__USE_GNU) && defined(__GLIBC__)
++    /* Annoying GNU specific API contract */
+     return strerror_r(errnum, buf, len);
+ # else
+     strerror_r(errnum, buf, len);
+
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 4043b8fea965..c1af461856c2 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST aws-cli-1.27.59.gh.tar.gz 2360458 BLAKE2B e60117e41cf95d442db333cf49c146e4ed02247007b8f46228799c5dee8c486aec34b236c9a0a6d152d690ff86c34fd797a6f35227a6e443805cdfe1b1b30f00 SHA512 87b9aebe812415223285c09ab5a36de2b9c0da49775d1162a5b5d7489ad61c16ca5361b721bc9e4ec4ccc09306be24513f42d7263b315d6856be20fdf0779686
 DIST aws-cli-1.27.64.gh.tar.gz 2363382 BLAKE2B fd0879e793aa5ee449ee535425976d11edb6f844f0385a630df82b62aa6db593c76ccab2b59b960b951859b88e2fd1d2db98f5f9f423b1de4dfed65c22eb131b SHA512 8966543936133e98a7ed27897b3978dbc71fde0728dff18e778cb17cf18b834c6abdc4cae13375f72280b1c3f4b43b33c3a08d4f3b99a2cefb74f27d1dd480a3
 DIST aws-cli-1.27.69.gh.tar.gz 2366011 BLAKE2B e2ac484bb6ead107d0deca6bad5b9ca4a014f129d1253528869c303d72d58f1e9d5329b6c3180ec53190e43711d999b7026764c0cf65786903dade2a5c135f88 SHA512 85d6d820918ab42ce39e3a90751726a8dbf691083f5d71834b61b8456f6c91e3cac7ead86448187a3853a26f9e75e2e1d7f2acd3a8de59a69ebc028a4692b9ac
+DIST aws-cli-1.27.70.gh.tar.gz 2366135 BLAKE2B f8feedc28ff2b94326ea81ef1c38779c709ca88033c6f36a31dd28659f9f7cfe2fe520dcf39c46534e5d91e48877e0901e212fc3316effe3e0dc5b0c4855c47d SHA512 faae6ea80047736d99d16cc652b43c4b34fe70822c3aa5a59c8c505a79bbc8b573c4b875f8551c934f20119f0ac2a4ea86a0d91614d5a3871b32a2ea0cc9139c
 EBUILD awscli-1.27.59.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.64.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.69.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.70.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.70.ebuild b/app-admin/awscli/awscli-1.27.70.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.70.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.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() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# 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
+}
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 5fc5ef176c1c..7870980e6b5e 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,6 +1,6 @@
 AUX test.patch 1713 BLAKE2B 6b6322c9db1cfd1832a8752dda4bc91cc5d92a7cf4109eb8727dbbf484ccb1b6ef482dac4f9a656adcdd0872b262fca5dae183ba1e0b81befca5026a7facd5dc SHA512 c7dd54e67e8379f05746b0985708b69331623ebd6bfee393c48115cef5ca90423723f4c39b5e33f7fb30953da9629e4419f4343c573bcbd766d9f57dd911ab34
 DIST cdist-6.9.8.tar.gz 1385902 BLAKE2B 6190f09d527a562e490669335d604d3173209bb950448855588a78d48428b8522c8f39327d6455d30242d97bb48d810c319f650a1c0c2fba203a348637dc87c1 SHA512 3c78dd5332a5957750948c52c4b27269ada21b07a2fce0d84019b4fcd3b7ddc6221f0179690d1b3af7e685ffafd739e604f50195fbc36a5494a102b2fa1b732b
 DIST cdist-7.0.0.tar.gz 1395298 BLAKE2B 0dc11302b4a63e24f31d598df63dc5da784cb01d57ade9b67da277b7c27f66b4c31891ce710c3acdc100e92500b0e80e22cf01882b1669fa714d70c44879f7f0 SHA512 bd87b52603443bc9ffd81785a73bc07387e0555da34b04f97619beb39a1bfcf488b84a6a37fac4fe49b9b002080c5f20a50b3f08ac3665c6c2143a4aa4ee47b7
-EBUILD cdist-6.9.8.ebuild 761 BLAKE2B 47800708a731dfb1cfc24627639205421f084115211081c1ba66255e4665dfe2f160330db528dcbb519c3d4b7b33cbcfb279400c9fd44af31688ae8e1657c361 SHA512 a53a57387550276af481e4c7b78ce8e769400fead8ad67b74d680a83ed84d07bbb5dd8b60d1a7c93a703e05e8caa0a7b74da20a731f6ab1bcb150a985e7995ae
-EBUILD cdist-7.0.0.ebuild 730 BLAKE2B e3c8f394f813de6c25ba0d4f65496829ecac750e1c3a0db29b404893733fe52ee881cecd11fc6102707b97996b13ec17bc483d4990788e96a016a54abc3a430a SHA512 59f96ad2e8840278261ec2e036ce59b2228c0cdacf2ce2ba85b2613a8593c667c5667f15606a3ddd32e41f34d3e04e273240917497465e6fe15ff97b5d1d319e
+EBUILD cdist-6.9.8.ebuild 761 BLAKE2B 7059616146fd1ba0fa8786ff490ed59656e0cbe7284a3e2fe20f27bad09a52097cf4d18543826de4c30026ed5900152a684cb0d5006b7deddec6873031d5c635 SHA512 6e75002987b83ff6be7b3dfc495f1469dffbed075562d151600ed917a5ad930281240ef669ed7d526405777203f0fb00f59457b86a216cddbeaad67d97087cc8
+EBUILD cdist-7.0.0.ebuild 730 BLAKE2B a309b47593bfcf2a79f7b5f51ccca8a41a98a6f636bc7997abf646cea64c5c0608085db1a8654fbe3e3fae303a4156082fdd1a811dfe2a70174e082b9f94620f SHA512 f139a134d4eb98449da8e2878699b2325104572501952ac60a0b1ab0d04f7bb8060665da62d01ba41c83da29922267ad110d76ed11ed45eb5d3ef4395b16e8e6
 MISC metadata.xml 236 BLAKE2B 354b036d8fa34ea50195ab2125b113da315ba5254902cebee161e7b8710904dee7a9ae42bddd0b3b6cedb8021bbb60a35c705d993f2065ad9a8d662a0efb8c3a SHA512 dbdc16a1739daf1ed58da5e6ff4bac4a03d52b2ab62e47c6db96ff4d8bf4080b4c2f3a02e566152eacc0a54afa69b18e3d8fbfd0f47361774e78f4d41656462c
diff --git a/app-admin/cdist/cdist-6.9.8.ebuild b/app-admin/cdist/cdist-6.9.8.ebuild
index 53ba044243b5..4e75b661c296 100644
--- a/app-admin/cdist/cdist-6.9.8.ebuild
+++ b/app-admin/cdist/cdist-6.9.8.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/test.patch )
 
-distutils_enable_sphinx docs/src dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs/src dev-python/sphinx-rtd-theme
 distutils_enable_tests unittest
 
 python_prepare_all() {
diff --git a/app-admin/cdist/cdist-7.0.0.ebuild b/app-admin/cdist/cdist-7.0.0.ebuild
index 2b4a8bdff780..074a43f466ea 100644
--- a/app-admin/cdist/cdist-7.0.0.ebuild
+++ b/app-admin/cdist/cdist-7.0.0.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-distutils_enable_sphinx docs/src dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs/src dev-python/sphinx-rtd-theme
 distutils_enable_tests unittest
 
 python_prepare_all() {