gentoo resync : 20.06.2021

22 files changed, 79 insertions, 334 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c3ad9e337db9..1ff81be8b087 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 7f50f7a750d4..5c29e42db936 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -18,6 +18,7 @@ DIST awscli-1.19.93.tar.gz 2018769 BLAKE2B 95aadfbf6b54e679aee97a1f9194aa8d1667d
 DIST awscli-1.19.94.tar.gz 2019028 BLAKE2B 5885322bc03f18829217ab8fca683fbd4c19b7e7761be33ac4d568d6085844d81677b0b01e93a4cb88e23a47a16afdd49ed1c1c2eaafcbf1bee0d22c6f7c2600 SHA512 226f8eb41f3aedf52b71cfaf3f4f92286fd9d4a89015f3ba50bceb733ab316f6ed2ee787da6cfea84f5a13c26ded8123a2f32603259c67442a7d741b86fe83c8
 DIST awscli-1.19.95.tar.gz 2019311 BLAKE2B 4ab4901cbc701e5697f5a98e61df401cdcde0b364674c8939788b0177199ee174f6f8ca22c87c11fe8b468bdc3002fc2e521869a5982c4f1bd3b307a986a3351 SHA512 7134cad65f2bfb9068cec5d9939e37fd0e340a82a54d2f100847f5afc50e6d77fae79511f7d0c8eb928c0110f9d05c84917e3605f3dc1807bba939c98734781c
 DIST awscli-1.19.96.tar.gz 2019687 BLAKE2B 77ea6eba698a0ea95261741b68416091fe33a1268c5c3d8d52d286e652929e597767ce5a6d5f8012ad0911a8fd7f86b33dadfc4ab1a5087a5a36c8e7e1f41217 SHA512 ba22fd866dc4ce7fe927e2a63fea784514057cc5b3e5259c5d6b73c42d10f68bba9732c4373e6eb4145aedfe6c373e6c5764a2c5ca31ba935cdaba6b31eeeb00
+DIST awscli-1.19.97.tar.gz 2020143 BLAKE2B 2dac6f59a04a958b09e0f8b7d056583015762df78ed1349b55c6301d3189e1100bd8ab98445ded3ccc0ddbf1148ddf0475086704f123b0db1ccfd1cacb6b4680 SHA512 4e4e0f34ba02819232427f7571a4b10d22b167788d758c9ac43749607ea7a4c498259fcc5c69fb32d66faffc535a5b3045006168b64506f2b0f9fbbaa804e387
 EBUILD awscli-1.19.47-r1.ebuild 1367 BLAKE2B bb8b7d8cd38bf771578ad146817be2570d4e17ad86073691c8233c4d5bdfb4804f51dda002eb4662e70ab226615876c829798fbffaeaf609b953d70dbac0c8d5 SHA512 9439c9fe91e9e965f9d43a5a6ea238884cf8f74fa8055ff5d15bad8be2798ba98dac5ba14cef9f32bd911d9dbbcaa90d2fcb2b99d6b4c53edb63efa4f36ef877
 EBUILD awscli-1.19.78.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
 EBUILD awscli-1.19.79.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
@@ -37,4 +38,5 @@ EBUILD awscli-1.19.93.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b940
 EBUILD awscli-1.19.94.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.19.95.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.19.96.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.19.97.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.19.97.ebuild b/app-admin/awscli/awscli-1.19.97.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.19.97.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(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.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+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/drush/Manifest b/app-admin/drush/Manifest
index ff06ebe45903..f07aba23b857 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -1,4 +1,4 @@
 AUX update-bash-completion-script-for-2.1.patch 1332 BLAKE2B a54fa2cab268542a37f1020012cf7744106966419d2ba8415a2e2ead882feb3f3dc9bd9b1ab17f8592e5d021855f5361b05304efcc810362224935069ef1b897 SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0
 DIST drush-6.7.0.tar.gz 511581 BLAKE2B d3a589e3de35afe120d790f96ffa7e88b530da1e1d04815b1dea2f05cd081ad7dc6f4b39fa6f19b5620b9913b952ab289ec538f1b7c0c0f298d3cd0129eb7026 SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5
-EBUILD drush-6.7.0-r1.ebuild 1711 BLAKE2B 8ad6c7143bec3f610501d56a72c589e72177ef2efa8c079afda7789e44ae424463ee372cca082467a5da12889e35468ec8805bffbeca71a70ee34b9843bd0910 SHA512 b300dcccbdccf48c1f6b03c15def89d116fdf06b4704851b5e5723c1535e4db3508717c9bb61b11ca37406e8a430aa8d34718b3e64ef05a99d046f9a9340d3c3
+EBUILD drush-6.7.0-r2.ebuild 1714 BLAKE2B a21340f3c6092b81d2b779bf629b7f337d62a689cd81d5c46044ab332078ba35b9c8f7e848d0acd2aeec584800b10c9855d6f3bd2f6eaa44d4a1e9648a5c587f SHA512 b3a493fa5b1e8b6f235626fdcdd84ff1fcd113ca4ee22a874b7138229317ac272b91a5e05ed74959e37f8e5c6375b903e316bc101f34e82ad779012b66e4ea4f
 MISC metadata.xml 531 BLAKE2B f28505f228108046c5a667d98863fe5b77e3ff8a994d3613a34bcc6666d041451c419a0f43b6792c376e2a0749dcf5dfd42e83781ad2db6b1ba6f084bee00b1a SHA512 27cfde1e0c618050f645abf589511ccf87675ac00da8eb147b6a38d1e48d0d688fef2310ec015d394a202b56b3f09aca32b6d6c9bedaab98e469139349472aa4
diff --git a/app-admin/drush/drush-6.7.0-r1.ebuild b/app-admin/drush/drush-6.7.0-r2.ebuild
index dfe5917b1f25..ba9c4f699942 100644
--- a/app-admin/drush/drush-6.7.0-r1.ebuild
+++ b/app-admin/drush/drush-6.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="dev-lang/php[cli,ctype,json,simplexml]
+RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml]
 	dev-php/PEAR-Console_Table"
 
 # Fixes the bash completion script, check the patch for Gentoo/upstream
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index b3ad0c4b92fe..8fe0ddf99544 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.31.0.tar.gz 5411379 BLAKE2B cc97c8f7aff6dd563aaec9701c19cfeed408f42b20ebb34ab90f15ec694e927c64f50dc3b5eda91af2a292609bf8b43ee005c6b5f1a152a0eb491d0f354618f2 SHA512 6f3a92210fb03cc0aa255bd91ffe884fb99d29f82e81919a1e9e82cfdfbfb09ee739e906032338494019656fc398cc49f2dfb48dbb01d68573fb6dab79afeb5c
-EBUILD exo-1.31.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.32.1.tar.gz 5228508 BLAKE2B fcf48f851cd0467b765a4835099cea6757b747e724ff43774fdf90905193b217402d4cbed2991b61aec1892d75e996c9e68b1abf847a242b9fa2277ac1f2e5a3 SHA512 9cd205f273d25bdb6f133bf9617c24d9bb0f0d1bd8e9db2645bba9f920913a1f367b75f13731b94c5d8a69f611f9122e0fc48392ddd098794717025c901fa210
+EBUILD exo-1.32.1.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.31.0.ebuild b/app-admin/exo/exo-1.32.1.ebuild
index 49b1772f318b..49b1772f318b 100644
--- a/app-admin/exo/exo-1.31.0.ebuild
+++ b/app-admin/exo/exo-1.32.1.ebuild
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
deleted file mode 100644
index c2b56a666228..000000000000
--- a/app-admin/glance/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
-DIST glance-21.0.0.tar.gz 2032938 BLAKE2B 9da6353d95768c8f241e8ea42def5a7a457d88ddf92c4f881649f196a57ef232ddabcf4f6816256fbd1fcb21b6e7b46811c3bf7c9b9c587fc902d008cbaf525d SHA512 83d49f96a82de0093fe3991f5138febc403964f5af1012de6e63395b82a368e08b2b7d142a889244c4261d1d019336e69050e9149d40b88e1c175f7a561e4f5d
-EBUILD glance-2020.2.9999.ebuild 4980 BLAKE2B ab065aba9f5bd64913a68ca382533f2224416fc60aaa8469299c502a8fbe0b762168a9a1d17d068c6138ec088c596e2a706b2bea77cc12f4a7167aab029c1f4b SHA512 8f0515e8fb4ec8991e3503ad599f6e4a8065f33c29e0e87c7f96ce793757f7290c021b1f2d4c421958eb416042bbd00acc85dfd3dec8561d9edfe4f2390c4632
-EBUILD glance-21.0.0.ebuild 4978 BLAKE2B bba0baf883fda2a3a8da27ff05d4d8c97a03f6c923f5b7fd7a40baea1bc7029eb3f74e581d8df454c0a370d41428f1bf530b8f4b481a4f788f99e29eded331d2 SHA512 d2e448aa9fec6cb2ce657e5465225b4162adff2556ba17f945e849b658b0c0d0280be63d973f83657ad5a77c4aab0676e8ec7a7a6351b9dc73c46a058a1953fb
-MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd
deleted file mode 100644
index 57274ac2dfee..000000000000
--- a/app-admin/glance/files/glance.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts ${SVCNAME} service for OpenStack"
-
-command=/usr/bin/${RC_SVCNAME}
-command_user="${GLANCE_USER:-glance}"
-command_background=yes
-pidfile=/run/${RC_SVCNAME}.pid
-required_files=/etc/glance/${RC_SVCNAME}.conf
-
-depend() {
-	need net
-}
diff --git a/app-admin/glance/glance-2020.2.9999.ebuild b/app-admin/glance/glance-2020.2.9999.ebuild
deleted file mode 100644
index dd4a939849af..000000000000
--- a/app-admin/glance/glance-2020.2.9999.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/glance.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="mysql postgres +sqlite +swift"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/eventlet-0.25.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	!~dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-2.4.1[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
-	acct-user/glance
-	acct-group/glance
-"
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}/glance.initd" glance-api
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
-
-	distutils-r1_python_install_all
-	rm -r "${ED}"/usr/etc
-}
diff --git a/app-admin/glance/glance-21.0.0.ebuild b/app-admin/glance/glance-21.0.0.ebuild
deleted file mode 100644
index dc947889962d..000000000000
--- a/app-admin/glance/glance-21.0.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/glance.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="mysql postgres +sqlite +swift"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/eventlet-0.25.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	!~dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-2.4.1[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
-	acct-user/glance
-	acct-group/glance
-"
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}/glance.initd" glance-api
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
-
-	distutils-r1_python_install_all
-	rm -r "${ED}"/usr/etc
-}
diff --git a/app-admin/glance/metadata.xml b/app-admin/glance/metadata.xml
deleted file mode 100644
index 080766e81a18..000000000000
--- a/app-admin/glance/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <longdescription lang="en">
-    Provides services for discovering, registering, and retrieving virtual 
-    machine images. Glance has a RESTful API that allows querying of VM image 
-    metadata as well as retrieval of the actual image.
-  </longdescription>
-  <use>
-    <flag name="swift">Adds swift storage support</flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">glance</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 90c5770f5cc3..b48866f6038c 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,5 @@
 DIST hcloud-1.22.1.tar.xz 910672 BLAKE2B 51e18c530964677bd0cef8232c68031f3186b83fe0da91e8c6572b95130df32e5b00de6e734fb6cce56a51b6fca6136bb306d33ad4a6c728aac3d0afe634c738 SHA512 365823e779f526ae9cbbb50ecaed557c5a838b6614208e4d03e7eadb9569a2e2156e05e019aea2623a811defda707b8822d0eb09a4bfd7006262bd6a19e09aae
-DIST hcloud-1.23.0.tar.xz 1129416 BLAKE2B b91e0a5f24020cd250a0e50c4c2b049397575e884968652f6795e89340a90f43141deee7179944e2027992f6f722a75704c3cb8fb0b0e0653036e9b5c34258d4 SHA512 d16d5eb28873045ba1ed0b09a6a76b26c3e39fffd404fca233d79640c06cb75fe2a13db22d9c343890bfb5ebac0535c7e7fae8e37e96229ddd5d324b2a9d4c79
+DIST hcloud-1.24.0.tar.xz 1153220 BLAKE2B 0fefb2059a8ffe35a66a16386cc64bbe51941a312ab15f3971e02e47e547587a1dd63f0472a32da9cd874056a1d395a89bfd5c98d3bee70d936c0476c9c3a563 SHA512 192418d51558e7da47ff7f875c3f1ec4adf1449a75f2156c673a8a1308e891a94da3aadf57d8c35bbf7ee933b0e334fdf30ae044d1fbc0672e682d3840496c91
 EBUILD hcloud-1.22.1.ebuild 712 BLAKE2B 720832d21c95224d42bc4511184428280c532f7edd91acfa6ead5b71fe0f3d0243285bf07b196b8cf86d1cbd9e5bbcc3d5bae99d71fa3ac739d5306584ae61b1 SHA512 879162a964a3bf1b13a74a5ef4e916153aed3ef7096d481e2c2428e27b812f6f1c4e181fa42c591140949a57b538150dedfac3e9452676c9446114c2cb861a27
-EBUILD hcloud-1.23.0.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
+EBUILD hcloud-1.24.0.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
 MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.23.0.ebuild b/app-admin/hcloud/hcloud-1.24.0.ebuild
index 77d54006fe99..77d54006fe99 100644
--- a/app-admin/hcloud/hcloud-1.23.0.ebuild
+++ b/app-admin/hcloud/hcloud-1.24.0.ebuild
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 6b046959660a..2ac13497ecff 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -33,9 +33,9 @@ DIST salt-3000.9.tar.gz 15250432 BLAKE2B b76c166363b0b0fd3e3aa4b5306ba8280a2c99f
 DIST salt-3001.6.tar.gz 15736056 BLAKE2B 00e7674452e9d61c3cd487d27a3a1f3435c6b12dcc89008aa63c96814957b6ce8654f4d4d51dbce7b14027f0cee66fd2ea9602f6be18bf2f4beac11ae164f89f SHA512 e45c9cfddb64ab1c9d66b6b6b3e5ff8d9010c01307161e5013140b4362ee630cf912ab153d1afa72f56d18fc5353293b2f4b449caf8ee384d1e93204d490bf4c
 DIST salt-3002.5.tar.gz 15784880 BLAKE2B baa90bb0caea572dfbe12d92fb488ee0c4adef9a07221f394009cd43a62ffef18c57f2e7cdcfcd923807c7a3d02ce6833480f74d70250c29d311420f30514300 SHA512 dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1
 DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38
-EBUILD salt-3000.8.ebuild 6604 BLAKE2B 61ff93d5f584bf6d217d281bf8b4e95cb6905052a2af1b6c8099d4b29cfde895c264c1e0130e14c5e090a948e5215acab86b40e9a0bc68fdbc3053c4136f193a SHA512 739e23a73501a48429e16815a139557addb229cb650c1430794a6e2307787a56d5add0f4a8d751449d6f21e9298994cee734ba291b726ecf09563dadaa581d12
-EBUILD salt-3000.9.ebuild 6646 BLAKE2B c25321fcbd779237d86b2039b6a2b89f2a038786066fcd35399ffe6a506c4d74c5e19c6f5717118ab1553a85bd1028f74b66186509b342546cf903406be3d17b SHA512 ecc53c8ac47fdc7ab05610ebc8a420bf5e9424c7fea00aa45f5e7f9d4e104273598cb537842e94ef54e507d707375f7ae28914f37209adb3bab26503f2a90fca
-EBUILD salt-3001.6.ebuild 6227 BLAKE2B ab716696dc9068dc3202f5d7aedb31581403af50136497980ad1e60c15ef42271f783920da45b6bf01e344398b402da8ed6736caef7a0d30fe00820a2cf9e39f SHA512 035c715d820753cc08df36cece810900cd28b80ce887070b0445d505432368ea819fffc7c68bf7486caf9974213a24b321906b100e21e98025327340d77e609d
-EBUILD salt-3002.5.ebuild 6263 BLAKE2B d1e0b9ab2825e349bc024cec68814b8d638a4a79a5a6906b564eac458080cac672d395ae2f0c3633a9d06b391e71e03b45af0cbbb03704422548d5a27c3eb107 SHA512 354ad8f0587d25aa232f2ae92268e69f7a8112be3983350c0b99ed2c8b82019f01e40058259f08405341a7df3815545f248c68484687d37688d88e547db8c1f6
-EBUILD salt-3003.ebuild 6547 BLAKE2B 31904f2742edc03b52fa9b06e6a7cd4942761b50a41f11f8a1883dba9fe4869ab8b501bd037626587aabc133bed9ea4c51dbcb66bc124c0bb54ba456979c22a8 SHA512 9730f66591a5429cf1383904ed3c455484fed10ebc95bfa223a262143073600cf19103dbd470d6b8381486f302490dfcad76fa467a3f198fec49b111e8d2bed8
+EBUILD salt-3000.8-r1.ebuild 6607 BLAKE2B 836d773a15e113447bddc988f783ad1ebdcbf1c434e5c16d490c3a65bb60b70d76d4ed550408fa34bde0d38d992ff8b1173e1c61b03e508886689c1ec2c0812c SHA512 f4a0c7a3a951a8d98f3240800cbdb61d2c19ce6229641b36dfdd9b81808918bdbe3265c9db6c8d6f70eef023000358d73a72507ac9314c87e300414821bbbe8d
+EBUILD salt-3000.9-r1.ebuild 6649 BLAKE2B 66677b3408322036e59bd64f3f0c64bffa916079e40c08273ad326191fe57962846b862933b1319cdbba81077a26c3e7569796205d7ac7ce89068feb32b283b0 SHA512 8f2095fc664c4d92c0a1ef2d250e70e25ab1468185466644c51d15ecfdd6f393919b6f9a18a1b1d46701ab839ebcb851360477e19f942223245bbf98bafbba94
+EBUILD salt-3001.6-r1.ebuild 6230 BLAKE2B 2d426df7b28e4f24bd7bcf79bc6a641816e04c58189e69a9b90e367d859d8238eab992a5c2366bf0b91f2e6880b0c67b586fd3df9ddd49cbce06d54bddefeb83 SHA512 db15971b900f13c27f9e61d954562e67de3d9bdc14420cf22460a41ab528f96ea5cbb1703828b73478998f62015be56ae08b69b30d5ebe511fa533f1b01c0584
+EBUILD salt-3002.5-r1.ebuild 6266 BLAKE2B 48c7fb0bd4b5dad34c7c998a4083bf9a34d1413bd1e62c9018906c6fde58bfe97da696b235534bf96ef9a6e1e9c4c2f89262ed6859a88d21b73f50a370f5ecc1 SHA512 8e06b18090a9fa3624e5d9677efbf42d5286f3118d39f22cee8c99ae093f09fc5bb2faa4bab4bf51bdb12b1403632ccf22da49146aac2203d57d754def6ad5db
+EBUILD salt-3003-r1.ebuild 6550 BLAKE2B 68fbc98b0101f15fa0d69ee0e9a7d6f1066a64cc53d5045e207798b7822c27c0964b65748917febd1f0fb87b048966d277fba7f5d0ddcef161a6a25e55659b63 SHA512 66e14cb783a970b61df81652883f69cb95407c094e9aaa70091619ba4c425bfc80845a31fd778c928ffab93954df2a8e152c00932e8c8b020a01f199fe7721cb
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/salt-3000.8.ebuild b/app-admin/salt/salt-3000.8-r1.ebuild
index dfb990d2ed38..986ee5e8b93e 100644
--- a/app-admin/salt/salt-3000.8.ebuild
+++ b/app-admin/salt/salt-3000.8-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
 	)
 	openssl? (
-		dev-libs/openssl:0=[-bindist]
+		dev-libs/openssl:0=[-bindist(-)]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 	)
 	raet? (
diff --git a/app-admin/salt/salt-3000.9.ebuild b/app-admin/salt/salt-3000.9-r1.ebuild
index 9818e6b40a97..876a4b185475 100644
--- a/app-admin/salt/salt-3000.9.ebuild
+++ b/app-admin/salt/salt-3000.9-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
 	)
 	openssl? (
-		dev-libs/openssl:0=[-bindist]
+		dev-libs/openssl:0=[-bindist(-)]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 	)
 	raet? (
diff --git a/app-admin/salt/salt-3001.6.ebuild b/app-admin/salt/salt-3001.6-r1.ebuild
index 63b9a4a334d5..69dcc1cddbd0 100644
--- a/app-admin/salt/salt-3001.6.ebuild
+++ b/app-admin/salt/salt-3001.6-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
 	)
 	openssl? (
-		dev-libs/openssl:0=[-bindist]
+		dev-libs/openssl:0=[-bindist(-)]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 	)
 	raet? (
diff --git a/app-admin/salt/salt-3002.5.ebuild b/app-admin/salt/salt-3002.5-r1.ebuild
index 7d8022aa9205..91a7919ea18b 100644
--- a/app-admin/salt/salt-3002.5.ebuild
+++ b/app-admin/salt/salt-3002.5-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
 	)
 	openssl? (
-		dev-libs/openssl:0=[-bindist]
+		dev-libs/openssl:0=[-bindist(-)]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 	)
 	raet? (
diff --git a/app-admin/salt/salt-3003.ebuild b/app-admin/salt/salt-3003-r1.ebuild
index 1175e01d12ff..0c3832ff8ad9 100644
--- a/app-admin/salt/salt-3003.ebuild
+++ b/app-admin/salt/salt-3003-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
 	)
 	openssl? (
-		dev-libs/openssl:0=[-bindist]
+		dev-libs/openssl:0=[-bindist(-)]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 	)
 	raet? (
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 7d65c439676c..5422f9128ff2 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -10,7 +10,7 @@ AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a0
 DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd SHA512 ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52
 DIST syslog-ng-3.31.2.tar.gz 5727835 BLAKE2B a71190fe1580702a4d904c8a4d31a123d2aa0d01bb5a6e21f32f8502ec99f6109b45537c1a5022b0baeae89456b4b919bb8c88077d00aa9724398b7588254d89 SHA512 22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385
 DIST syslog-ng-3.32.1.tar.gz 5782744 BLAKE2B 43600ac7bf3bcd090353aa5a3d3b3c7701b8794328a111a0ef306dffbf5462880ef3e86f4f8b63580402848b7a4e333112ae1c5514c5e8d41103db4a0d4de159 SHA512 c5a72e4815c2791cb609cbb93993cbb2c52f3ac869e062984b6a359f11232f523c5db3555857f0fef0071764a677f1efdb2aa1f24b4abe7cea13590973d09280
-EBUILD syslog-ng-3.30.1-r1.ebuild 4914 BLAKE2B a3d036b879ab3e3a8c6354318da4e7f6c16121e58f3de6f34c074c5540d11f2123a2833f16530c215ce9ef625d5857b71d19f223bf95831e24ac6887ebd27210 SHA512 777e922d766b42e848ba1459a63869f68cfbbd7b874da8b6cfec86d00d8bb3fab25e944bbeb8cc7c8442817bf6e672cdd3d944b60eab5aa5008c9b19a9a63d89
+EBUILD syslog-ng-3.30.1-r1.ebuild 4910 BLAKE2B 3a745d7c4b815da818cbd50635cab0170aa3891b7ca44b5e58ea1b022c2811dee86cacc991071d53090818db6b0a84a06f931d2b9f723e094e7369ad1b4b5b20 SHA512 b9da09ba79a4e1216865d9c2971b4e98ee13650398d0fa5cb0b587648951fc15dddf3a0675c30b88fd724cf6bb1e3464a6410d0ec3a460a3d062689578f359f8
 EBUILD syslog-ng-3.30.1.ebuild 4837 BLAKE2B d58b8f79ac4f99867cc6b1bd4774a95f4dc1c9d91c68b87bec0719dc55d9741e2475f7deca471f908627c5bc914ad30c006c31d3e8ff87ecaf43bd1a66ce536a SHA512 eff8014d2f648e799ee0b090cd24d82ad610b022d1eb023de5d4f19b0f8138ee7b2993a2d067486ab7a532fed474288da1c413562ced38c32f3981886813cad2
 EBUILD syslog-ng-3.31.2.ebuild 4933 BLAKE2B d1493e6465cf83b3f08da8b57e8c8622d31ea7f56f550e789f9575287654e511a80a37e7f19bacedbfcea3b1b271ccff5c974c4e16d09323254b26ffa398b05e SHA512 5bb0cf89069dc0da0772cc0545dcf5eb4a8cca650e0b1e762f1199ef0cdcdac43680eda2e37f0d9c47faa7c8b0aa813d149df40840ee3aa5a63aa1fd7a21e8ee
 EBUILD syslog-ng-3.32.1.ebuild 4934 BLAKE2B 91e7b7124580298ef3247316ca1c8b665e4260baac5deb277b9da67463ceac5df19de83275c0d46ef4474ea4d63d728e6d23efe4d1ba013937b0cd0999ce4fa8 SHA512 bbb1be3acb51d64acd12246e8f16a7d38f42c42feb13d770bed6e1e01dfdf87f406fdf35a2a09e9d767629ae3b7a85b60c980abb3a19a1676e85631b510e28a2
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
index 38194a59211c..efaf5d70e266 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1-r1.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} )"
 RESTRICT="!test? ( test )"