gentoo auto-resync : 15:07:2022 - 13:42:19

10 files changed, 82 insertions, 84 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 54923cc644c5..c7eea5cce8fe 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index f411ca3699f0..d1dd3564032c 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92
 DIST aws-cli-1.25.27.gh.tar.gz 2230639 BLAKE2B 80101fe2e2b58e7b626c546178ccab45108985d827db2b162d86e4271d5cb105dad2dfe36b807e88372af9cf14b706fda8928c0ccbbd97a49f2f1cf73bbff74f SHA512 2e88950c40dcf64b6911ca02ede7d9790a0ff3f3beb4c4fe3d4087b82100d49df00a90e254c9ff58e09132e4ab79ac3861480eeb1a3603c95aba0093fdb90554
 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
 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
 EBUILD awscli-1.25.27.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 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
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.30.ebuild b/app-admin/awscli/awscli-1.25.30.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.30.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 dce189f18b15..cf59bbc941e1 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 2521 BLAKE2B 814c1d7aeb75675dba26a3f3db7d64d0f9221ed8efc6085f19b4b6fb720528a26ba7236b108d48854606879d1b9f3e48c6f74423d1905512da241848c97bb7e9 SHA512 8101cf963a0a526b868516cb2846512ec1ac46e01005a2f80f278a97b4fbf5edc3d3023f5e495338de849c059370de5a1381b9d454e6688a705d2b9c2e3bc002
+EBUILD logrotate-3.20.1-r1.ebuild 2516 BLAKE2B 27f7fd48f37526fbe59f2e1913bbaecab61498a2d1e2f4993e3dc7d550d1a44f1f331aa410907511c94f17c4425c961ef2bea8cf9570c59dc8e527df43d070f4 SHA512 888f03b11ec607860aebc75de5155701efefdf91bdd95f07e2e2af88fa501c43d1bf85c30be8835f391c6aac64a04a7e6e3ab9ba97514a3c2a4cb5eb46606bcf
 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 9023bd91b43b..f2b18ca713b5 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/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 02df24197ce3..5d20e45d2472 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -3,10 +3,7 @@ AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3
 AUX logstash.confd-r2 767 BLAKE2B fa251570a13b2bc2d0779e0f00549f40bc957f211be0f4164829f7bf731221e5adabdb27341c703f1ea67b19455e8832f5d822fd41ffc64994007201690feff6 SHA512 83eecf30baa160041f33fd3dafce317c1692efaf676d0fdc9bee04965eafb15f1e01d07a09607d345665f6bebc4db90d17a0abd1c7fd4962d6926ac069f16768
 AUX logstash.initd-r2 1997 BLAKE2B 4a2e36bcd171950ddea636f9269708416536b4f54c620b36eca91839b894f0b4242775ec85aadbe93714b8aa7cd535774cd0558f4bc90096638d0640e4f3961f SHA512 23203f99610d1666247ee8584b1d1452216f65c6c06345007768eac494c9de755a79bd74b3fd241e62f2239d52394626a61e06100486f89b7f3a2b8282389d56
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
-DIST logstash-6.8.23.tar.gz 178007697 BLAKE2B d7ba85a141586b8ee6cf524b9ab39b6b9a0777df5357fb22f15770126023599d7b62eeafc55dc87e0ff401b5df8dab9084a9ea4ba98c850e2ee98d4988bf4ad2 SHA512 3ee0de55cca50c1ea5b8afbc618783c7e301ebdc570c34d590160468b0b7708afe83589669c08106ac006e64436903ccbb3b3322e2801332b921ea802a788d86
-DIST logstash-7.17.3-linux-x86_64.tar.gz 363469045 BLAKE2B 9817a18b0112f6abe4b4da47908db0543feb981e963d5283e0b0133f9f722f155b84592b7529c74b03ec48307e6797732abb3204e2206c26751414597a676c60 SHA512 bea8a6e4a3f5974739061d3f15ac76b705a5326b43bfb4b488edfefb6bb25b5f36e8734713d536386b03b6d45acbf739a3c9381e61cda344557a2acb4bbb65c4
-DIST logstash-oss-6.8.23.tar.gz 177876480 BLAKE2B d961c9073c1108b3a0e74ba763e0ce45b35a5767cd732e7ec756697c5f1526e01b23c0919acefa173b5410e9a4908920a24c1ce351dd7c09d998cb025ba05aef SHA512 87488767c6239878c1383c1f28ca17e8f330c10298542627c0c44a0620976737a1acbca55b8db6b6917d8b8bcb988ec4d84b2a840a4ef6362909b7e230a0e0b6
-DIST logstash-oss-7.17.3-linux-x86_64.tar.gz 363264492 BLAKE2B 11d8fde29d087fc6956731904bd113fab3d163e29bb302c29aa11ca1b77393e896332da3f6f939008d83b6035672b9e49ea609c734ae6fa7806eabfc968f7648 SHA512 5bc60cdb79b80a5c239c5cef375fb1336d1fa1595fa3556720cb86ee495cc48f9c57d19003de2b9c7717116069d487857c71bff1cc7a4c029841f702c831dc34
-EBUILD logstash-bin-6.8.23.ebuild 2099 BLAKE2B 5af2697d30b52e26c11bb5ec7f3fe11b30be7ac3e0b4c946cb024f46e19b92e99c078086cd64bbbdaddf0ac06b2291813a9b89a474978b9a0d5d5ee6c0d678dd SHA512 bba4fa4720b257d4a58198e0c145e5f88553c783bdd5e2214a9b685d922845803ff4b12e793f9732c29dd19daaa8bf35506a9f5809da0d7f03b1da93daa21b58
-EBUILD logstash-bin-7.17.3.ebuild 2532 BLAKE2B 926b1ee9b2a9699ed0de55bda4e608c0fd9b6eafa6b11b5c1e3fb5388e2e3997f89d367bbb7b95a4bd2dc6c30fe4a6d7719dbf0d3256b0ae09eaa0b78cf7ce66 SHA512 4afc83cfd148c5f24fe8301c5d7691b5f7e046b126afd766e20cec0d49521e4a137f7c3a503a8cd69e92b72d9ef82fdd54d45b3374e9f00ba42ddce0868e1177
+DIST logstash-7.17.5-linux-x86_64.tar.gz 363609474 BLAKE2B b6f6065a997a7401ad6e14d5f1fd6b2a924cf734cab0b7e07444cb800420f3c7b2634cd0be693ce0cddce909f49675b00764fa05ca4f3c3ab75a72387fffd629 SHA512 6508b9ba1a6672fd560773d2282501f9d022bf67a75f2b046ec31219cc78cbf8d35040827838948c69458089a9b30fdf21cbb5c2cc3f67c0812662265e9518dc
+DIST logstash-oss-7.17.5-linux-x86_64.tar.gz 363419923 BLAKE2B 7423ca08f5821439059be89be46df2a3927722ee48a7fcb95b1015f0539526c6ad99a4e11e85e5d6ff2aa340ad5421d1ce9ac26043dd70b1b4ebeeba8c4eaab3 SHA512 d86cc76f52975128c6e9ccec6217a1f289b88048b19cc6c19f8247c614c056532b960f7e4a9f3c7b7a4ea81596e9ca3b7df19249811445273668403f18af5c74
+EBUILD logstash-bin-7.17.5.ebuild 2532 BLAKE2B dfd8efa6e7fdc93820836f68a21bf02e4c0c1eb1c907c4d6a1005d6f253eb83012334d2a9ecd75ac569309d2579331b1e44c8738474f5fd9e071ae9ac81b79cc SHA512 4872a97be23d3276f5722d00e120d336136cd235cd4f10a5b2823baebb00f28e1a5775f0a9476723e8ff41feefde1d53c96fcf1fbdab6d6c1832428985bf73e3
 MISC metadata.xml 571 BLAKE2B 8fb52685ec095fe2a192d477c7e5737be2ab526fe5ee9c77f62c8aa1799dea7c471eb3ea073352b2d09e3f1ba82b0dea05dd03648eb810e32504a2707342832e SHA512 36de48dec06abe08515d48f2e2fb86e5125ab6e9331f989dea8fff9d2511b337afffc75a842bf85b051fbe968b220676a4610c0a4d1a6b2c3b83759f9c2ca199
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild
deleted file mode 100644
index 8388a11e7f88..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.17.3.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.5.ebuild
index ddceca40f83c..bcfbba4ea846 100644
--- a/app-admin/logstash-bin/logstash-bin-7.17.3.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.17.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit java-pkg-2
 
diff --git a/app-admin/needrestart/Manifest b/app-admin/needrestart/Manifest
index 5767fb0abe2a..490009a75e7b 100644
--- a/app-admin/needrestart/Manifest
+++ b/app-admin/needrestart/Manifest
@@ -1,6 +1,6 @@
 DIST needrestart-3.5.tar.gz 67824 BLAKE2B 73af940efa578b145d89cb0724f7103edd0fe869bfb211596109b67fd16a8ddce83060942687c3ca0e861d9d545022845b64d90bc44e39997e8943b1575dd5f1 SHA512 e082ab92497cce7b65da9c625ba0bc2332cc7863c5b7d99a04593c646256da0302519fb7c9fc9823ce0058affdf7eb6a4587a1874881eda8aa4d07032093eb0b
 DIST needrestart-3.6.tar.gz 71159 BLAKE2B 76994ef0e77a4db0532dca2e17990097b2314f912fc3c32e67643eca7c44fff9611a42b49abd55f959a0e959d6ea69cfef36ad9008c86debfd125b64bdc673b5 SHA512 5c0f2f427c93e6f621fc1727f6abf42651e184e168b3f720708ac73b425bc7dfb94622c6cc2afad1161e3ffbfd36500eb99c375f2f5a525c9cd10d7142f1e365
 EBUILD needrestart-3.5.ebuild 913 BLAKE2B b7526899199daa72bb6d0c5d323dffc48bae329d6469f64c20e2a427b54508c03eed410d366aa0b78e666ff8a39095d48869e59a9e573927d564c5eb20c42f1b SHA512 6cd43d37250a15db77e143ee371f69a23b0aac8f2c8828f27cbb3b270cff20717262dd3cd0fc84f32c1d09d076efd6635b1a4e2e13f9ce23753575db821cfdd6
-EBUILD needrestart-3.6.ebuild 915 BLAKE2B 82577740e01939ca0e0104f3c2be796ae6bdc1e74e0d197057f6672ba9242785e4145ea578c6f236b00f7ab59e61364cbb874837eaa2c99c5c72fbc7752afb7a SHA512 983cfb758f1994a85a68c8a5a45b32218862ede337e7e3443c19133645efa0b691a078a54cc65787acc0608be2a99adfef745aa5f68d6d87f43ffd26a3545d79
+EBUILD needrestart-3.6.ebuild 914 BLAKE2B 1c7b7d839c4ea6a0f23288e97f8c9509a3acf81822e11755c26e23738d469d8b565040ddebbe7ff90fdf464e57eefc9f22362ae333bcff99634959121d571bd6 SHA512 0e172c1f2230d9244f15b07b97326ff85e4d926db18dcf46f21c4890f8543d15fe57166487920e439fc03902064fd1e4f7620e82bc9eaca46edd8a0e2021aedd
 EBUILD needrestart-9999.ebuild 915 BLAKE2B 82577740e01939ca0e0104f3c2be796ae6bdc1e74e0d197057f6672ba9242785e4145ea578c6f236b00f7ab59e61364cbb874837eaa2c99c5c72fbc7752afb7a SHA512 983cfb758f1994a85a68c8a5a45b32218862ede337e7e3443c19133645efa0b691a078a54cc65787acc0608be2a99adfef745aa5f68d6d87f43ffd26a3545d79
 MISC metadata.xml 361 BLAKE2B 32f60b794e1017b1b358c91737d3117fcca6e90b52b6b0dc611488262db98966ac2856341b7ba726dd167ca6f63bbb5b6165ac4d066ea49066c1b771447266d5 SHA512 4f21f03e0462da778f7b85ada6f1e8c4fb4f5d2e7ca8d227b0baebbb5922f06a6e3baae21e8bfc33d20bd33ddcbd9fec4cc2eb1711b3f8d8d8bd52b104cd5353
diff --git a/app-admin/needrestart/needrestart-3.6.ebuild b/app-admin/needrestart/needrestart-3.6.ebuild
index c773506fddc2..2c212a6353fb 100644
--- a/app-admin/needrestart/needrestart-3.6.ebuild
+++ b/app-admin/needrestart/needrestart-3.6.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Restart daemons after library updates"