gentoo auto-resync : 16:07:2022 - 13:45:35

7 files changed, 78 insertions, 4 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 929d279bb9f4..f3d420ec760c 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index d1dd3564032c..f035f5e8fa70 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -5,6 +5,7 @@ DIST aws-cli-1.25.27.gh.tar.gz 2230639 BLAKE2B 80101fe2e2b58e7b626c546178ccab451
 DIST aws-cli-1.25.28.gh.tar.gz 2231756 BLAKE2B b10d54b79bf16d88c4bd0256a970a640e9d64f903cdd250899f86a73cf6bb4de43d6ad83bddb24fa87684cb50b6c8f286553a609a0a04e8f18dd3428efa1f577 SHA512 a6a1f0ccefc4d9a6dde9efe8908f74b0ba72edcaec1955ebef7d0f7ce8cf4f3cc71fc298ce5120e02173553a22383bcc68fe965c77b77299fbc6e8353ec7cdb6
 DIST aws-cli-1.25.29.gh.tar.gz 2231889 BLAKE2B d487859c3b8ec6cc75f5c8ee54f9b0adf0bf0fdec8f36262533b98454c580692566f49daea867453a7f2b240228149e8d031d903b56809adf4d8f60525e25a08 SHA512 913273355f1907d08bac0b1c3f74aeb13966c1bc44c6499a1655c74048e6e711fe9442f5592344478ee4cf292b9fbe573a91c74c4fcf7481f24249e1001d9247
 DIST aws-cli-1.25.30.gh.tar.gz 2233472 BLAKE2B b12753046748b11a6067ad4c6e33827631ff1992fc7ffcd603dc048f39ab176208aae9028b473a87981c655445dfddfe77f10e37aafa3878b925668e375aa674 SHA512 e00acbec500294e05d89ae71ecff7cd9dc324b3576423c77c8038767ab115f2244ee64c1c529adce105c3055782341f4fe2ad7fc692f49cc757a7594c4cdeb65
+DIST aws-cli-1.25.31.gh.tar.gz 2233721 BLAKE2B 791bd78851c5643ee72faddc8e4d4e39c94a91e4879d749bcf2cadbe4797cdd448a95dd2b3c626b76e648303ec93fc0338d08f79227f05ff467754810166731b SHA512 586f0fa0f81ec8acc0b79fba5372a37ebcf162981c8fbab31633f63736337cae0b4788bb7a4cdabf6e04800fb63ed6804a6a73a7d5552a9b4c85b4eb273ee6d8
 EBUILD awscli-1.25.17-r1.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.22.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.26.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
@@ -12,4 +13,5 @@ EBUILD awscli-1.25.27.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77
 EBUILD awscli-1.25.28.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.29.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.30.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.31.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.31.ebuild b/app-admin/awscli/awscli-1.25.31.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.31.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 11d576d16b38..2780bd6c40a5 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -6,5 +6,5 @@ DIST logrotate-3.19.0.tar.xz 166276 BLAKE2B bb19690ca092905e527f6a0a7915373a65b2
 DIST logrotate-3.20.1.tar.xz 166712 BLAKE2B 8481e0d746c6bcbe10f2686a921334c6f957c8d92520927de7bc8fb0b7631a444fedaa80f35bc2de7961b3d5833ce4ab885b1298b235b7f8b33cc3ae05438da6 SHA512 a9ed5796ab254f511d0029a8f29ef7557f62e12e3ea9af24e30b5b9f348b1c1a16df26d44314b78299916fb3b5000b9cd9eed7cee2cee8df11cfd8e40c79b092
 DIST logrotate-3.20.1.tar.xz.asc 833 BLAKE2B afc02177335bcd580e0617af8c50846b371c2d00ecd8fe329c2e298dc8c48823137625f455cea3d983a0d9971733297fa2c4d98ba3c6f72d2c07f8f21108cfe4 SHA512 2dd207feec431b223ff12f09f6cce14409d45e5bb3abaf2275dd773c7ee7c59ed7d32395e5869bfed70c970be4158fd299e6e269838378843dcb63ca5ebfa029
 EBUILD logrotate-3.19.0.ebuild 2257 BLAKE2B 0a66afed01ac2efcefccbb3abc5309ae27fcde5429368e13a17dc4672d06c6c67bd5546cf5e80da69eaa3f1cf36149409db004682e27d4e9995056deb0fe06df SHA512 f3d7b346b50e086bb50fa7d1b5d854d4c5fdf9a9700d9212eeb992da8a0dbf6c4a8b21ee0bf5a26d917ed2a581980952121d2c0c88f6fe1d3ca474db30a96d3f
-EBUILD logrotate-3.20.1-r1.ebuild 2515 BLAKE2B a2bdbba22ea746c23b95365ddcf71a72e03cf3d380f2ec549da3bb3890c015d6183095521ec793b74d90a393e92de0595d397c4858f92ca9c59954e0fb41ab7d SHA512 5a4f6c069c4170978ba19a6ad773523f63f25742477d63763974dcb87672d225d543db4675c653cc55a923aa93ade1f82e4b6c442f9d6dc67796219725a4ee94
+EBUILD logrotate-3.20.1-r1.ebuild 2514 BLAKE2B 9bde96f05bc35e00fe1e789a1911fd2c17b9384486fe7fe653c5d3f6ce03aa53eb2611f32a22c5cfed8ed3b7ca1ed5d94f966ebe07bb0c20b80c8f69bb66470c SHA512 ef471cb8eec135d25fcdb4edba0db12806eff8114ca39f11dbcf97871a43ec8f17361c621fb4427ecac49f4d0ed19c3242ca5706742792d8cedb11526607917e
 MISC metadata.xml 1207 BLAKE2B 0d2ebf29e5ab5a01b2a8ac76ce1699e175d8fdba393ad97abad9cd3fbf9162042f253ab3551cde9273053c35b703e098d0501b67203da519b12258437d898f50 SHA512 3ac710f21ade3bb31767ea3e26b120a19a8ebfbfbcf5c66d30c888093428b0df026417e69d3823a2feaa27408b6015231f624b354df87ff50313edea39a0287b
diff --git a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild b/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
index 1f950f5d6746..65640690466c 100644
--- a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl +cron selinux"
 
 DEPEND=">=dev-libs/popt-1.5
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index e34e2be7183e..845e547f4a9b 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -11,5 +11,5 @@ DIST syslog-ng-3.35.1.tar.gz 5901321 BLAKE2B 9ee93c22358703bc95c951f6fc9207da029
 DIST syslog-ng-3.36.1.tar.gz 5968598 BLAKE2B b74536e20ae2a2eac056fe278f2e7973b3c97657cd80962ee551812633045dbdeb65fe34b66448d565a6f1b9edb2f1066fc1934d3f7ffbd43b9527a73a181e58 SHA512 b74c10e708616f7f5f5d529de5c1a3ce8ac888c05aa4b0fcf390d70082e9bc3432f3752998a5a258663fd47b8e4d0c2735240a3e4eda28178579b18308ebb376
 EBUILD syslog-ng-3.34.1.ebuild 4875 BLAKE2B 67e9fec7003b0f0da9a90873a009f20ed3f4aa66fc33b3acb6bbfd0a317d380c1b2306b6043a135535cc44b7802568c611820eaf23fc4819dc7c8968286c8481 SHA512 1c5bd39853364a1e1dcc79e97ac88bc4bf38b4e94152eb7f4a8acafabca9da8e6a71a509b28658b92871672a1e518ca8ac2355515c3506a742e182c2eef04e72
 EBUILD syslog-ng-3.35.1.ebuild 4876 BLAKE2B 91ff5899b72a81743ab3dc7fb26076ce83788b2068e5ac7cc30ff5e375add7fb5f4957ed2e5e0320f80c47e4dc803778c3423079426649f6d47dc16bb7e7426b SHA512 24e3c0b98dd9b50e442d4be5fefa9fe12aba92847bc2f173ee59aaa27a75b9d1323566b3f2deea065ac7a3ef620dba11b1cf152206c77e650b1c55780be54eca
-EBUILD syslog-ng-3.36.1.ebuild 4888 BLAKE2B f91350d6b5d77304abef8330f30eaf4e72007c2d4b9793b18205c420b95da049d059611070fd7d9625a5dc2047a9fce57c38015605703d74985322e8f673eb1b SHA512 e527f88d21dad4eb9616b354a080790453466f4772248f450c55349911ba590cc52d55c3e659bfe27b5fd39282453ff79e256c9b6953999553873bb092dbe8e4
+EBUILD syslog-ng-3.36.1.ebuild 4885 BLAKE2B a6e10cd408691ee8aae45c2ffa874f870038673289b756fbce720db491bc87dcbdade0cfbde4e605fa1255664ab73282904d1522f744e2ba2cba65b990947c71 SHA512 1793e5bcb7ee2ad400c71a611578bac44f4c8a2cbf3bfcf2d8dce49ef44ffba198999a3b98895d1fd8d8a4ecba146a55441ec11527b7e52fdf38e0c1e54c942b
 MISC metadata.xml 1283 BLAKE2B 22643ccf254541685f0b58255d42ef6bdfc4af8800b871f96cc2e17e1f7aa05c3380672fe293260a7a395e0e7431c81abed871f248805a6dda991fcb877400b6 SHA512 37610fc48a1e169c478250a36634afae6de03c49b257e27d81cdef3243200c1fb3a00b84d4efc8e30020f9a6c1f6ed5828b2444e4b92fa5801e15c3bece8e25a
diff --git a/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
index d6d6d055fabb..18cd7826fd7b 100644
--- a/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( python )"