gentoo resync : 30.10.2021

33 files changed, 100 insertions, 314 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 55fff4e1c35c..e1ceafe60d0f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index cf3c40036dd6..9843d22188c7 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -3,10 +3,11 @@ DIST ansible-core-2.11.3.tar.gz 6841255 BLAKE2B fde1143515d04121de79ddb2c14bf326
 DIST ansible-core-2.11.4.tar.gz 6843603 BLAKE2B fa8e72a9e77633b1b43a9a290d92db009e95ed87357f666059ed7898031f584c993ebeb6acec8cad29376666f3a714a742f4e52ac8f2baaf5d01c02796b64acd SHA512 9385a3877e6e9a25d244c855cf50c0c6b62a91cc9cebc5e7b5b5ec23424b3e3dcddd71e7367482a03996fcd5d591ad29771edd19d62758ae61473f97a5c9351d
 DIST ansible-core-2.11.5.tar.gz 6847600 BLAKE2B 83a80dcfda427b5d41eb3288d6b60cf710124a82edce2817a6bd5bbed0dc0157fed444b45db6428640dd25164306c987af9aba6f87ef52c63229ae113754b7c3 SHA512 73cfdb65e984856b84a0f7d0e1164a97ddbcdc38e00479f15c4a335297ba3a8f43dc503dc5b4a3f1fea06f91a3c4590b66dd680adb95b765c034207a8de5d589
 DIST ansible-core-2.11.6.tar.gz 6999232 BLAKE2B 5105928881297226e982e42c8027a370ad31869d92ca87d338cdb6e72504a22cf3fe7843921905599c7126c840197fb7799a72c261a007437a437b85c4a65c68 SHA512 d14686afb7b2802be3bca3baf6f3840d33f7994b7c48fcb4d42f871e13e4eb54ffef413e124dbe614a55041c23b509f5e887b687dbb6c4868425957cac45910a
-EBUILD ansible-base-2.10.10.ebuild 1633 BLAKE2B 425db4ea1e64c960b86d56cccddeb59edd838f389bb685c145babd0e885677de76b364383b801f7ffbdc61fd6a46f8baa24c26e45f00e984aa162bbcac4ae24b SHA512 2b67326ac2653e03b37829db0952232183b2f79d7e66c3d5a78847f17b2f5f93f27bccf39e164af56f80c1ee8acb69c3379bb6107c0e987aeeabb6caf3547c52
+EBUILD ansible-base-2.10.10-r1.ebuild 1671 BLAKE2B 27f94ea8935864a2775ac26f81d3fa5e82599184e975b773be4538932bb43c30d973c153c1559d0d00af25ee5f0c3f9365ddd98d33d12d4f377909ee4f04d41a SHA512 81c5a197bf8ed24288fa0763a7d082f893960a3651d30568e1dcb06f665b966899faf9e674ba7197724eafdb2efd73f66a0da80fe898a6db09d4d61f5dd72274
+EBUILD ansible-base-2.11.3-r1.ebuild 1644 BLAKE2B a1b2e6134be668e2fa9254e84b9869773cd667a7b74d55c62d77acec4113c3047e4e92ebc50fc2d6d47863243e3f2c6e6ff209706e018bbeaf208d698a045522 SHA512 11b8d029e8c909c46c6c9d1e71f355c48730ef66713eb1a3d9f849654cddd08b018e3472b37a5fd5101701bd0847d86e1ee1d3b3d62561687b81a471d005ae48
 EBUILD ansible-base-2.11.3.ebuild 1603 BLAKE2B 8ca4f3d4c4a1e494e0efe5bba55de5e71ca5e229c86c5046181d8d89e890115b823ad99d133c3ec22b06dd653cd23b65b159bc83cdbe990c2c527c0bb8bca9f5 SHA512 2513a5654edbce7a6161044f6983f3b8f041f1b158598c64d14e242afc642309be559b89899472ceec5b253a1792909ccc1bd20d3bf82175eeac360ef6568d4a
-EBUILD ansible-base-2.11.4.ebuild 1613 BLAKE2B edd0951d0e8546271896856de2c23f6873d2ac2a0c0f68a82de24b1bc180e10dbe183f07611e5c872785a77048e5b642476d7b516367ef84d1622f3e5ca8098d SHA512 cf34c497fc24225adf242a7871bb078d90e337684e649b7643da11afc0892b3ddefacb4c55484007a1ceab9e7306ec7551d190154cdeae3a0d0461a9a9cdcdf6
-EBUILD ansible-base-2.11.5.ebuild 1613 BLAKE2B edd0951d0e8546271896856de2c23f6873d2ac2a0c0f68a82de24b1bc180e10dbe183f07611e5c872785a77048e5b642476d7b516367ef84d1622f3e5ca8098d SHA512 cf34c497fc24225adf242a7871bb078d90e337684e649b7643da11afc0892b3ddefacb4c55484007a1ceab9e7306ec7551d190154cdeae3a0d0461a9a9cdcdf6
-EBUILD ansible-base-2.11.6.ebuild 1613 BLAKE2B edd0951d0e8546271896856de2c23f6873d2ac2a0c0f68a82de24b1bc180e10dbe183f07611e5c872785a77048e5b642476d7b516367ef84d1622f3e5ca8098d SHA512 cf34c497fc24225adf242a7871bb078d90e337684e649b7643da11afc0892b3ddefacb4c55484007a1ceab9e7306ec7551d190154cdeae3a0d0461a9a9cdcdf6
-EBUILD ansible-base-9999.ebuild 1613 BLAKE2B edd0951d0e8546271896856de2c23f6873d2ac2a0c0f68a82de24b1bc180e10dbe183f07611e5c872785a77048e5b642476d7b516367ef84d1622f3e5ca8098d SHA512 cf34c497fc24225adf242a7871bb078d90e337684e649b7643da11afc0892b3ddefacb4c55484007a1ceab9e7306ec7551d190154cdeae3a0d0461a9a9cdcdf6
+EBUILD ansible-base-2.11.4-r1.ebuild 1651 BLAKE2B 3b48db9d9823c32e0777712584d05b14dd8bd976eada756c4462b8eb586db223a76091439610d126c7056c7a1b7c3b0bf41a77bd6ece3ad1c1083b3bed252941 SHA512 8ee851c50c57b306877ce98bc4e7b6bd6372fb5e5ee3f1ec9ac7ccba6e46317fafa0559ee165e638a4fcadbe8df55dd59a258e8dca2a7857bbd93ae5da0b780f
+EBUILD ansible-base-2.11.5-r1.ebuild 1651 BLAKE2B 3b48db9d9823c32e0777712584d05b14dd8bd976eada756c4462b8eb586db223a76091439610d126c7056c7a1b7c3b0bf41a77bd6ece3ad1c1083b3bed252941 SHA512 8ee851c50c57b306877ce98bc4e7b6bd6372fb5e5ee3f1ec9ac7ccba6e46317fafa0559ee165e638a4fcadbe8df55dd59a258e8dca2a7857bbd93ae5da0b780f
+EBUILD ansible-base-2.11.6-r1.ebuild 1651 BLAKE2B 3b48db9d9823c32e0777712584d05b14dd8bd976eada756c4462b8eb586db223a76091439610d126c7056c7a1b7c3b0bf41a77bd6ece3ad1c1083b3bed252941 SHA512 8ee851c50c57b306877ce98bc4e7b6bd6372fb5e5ee3f1ec9ac7ccba6e46317fafa0559ee165e638a4fcadbe8df55dd59a258e8dca2a7857bbd93ae5da0b780f
+EBUILD ansible-base-9999.ebuild 1651 BLAKE2B 3b48db9d9823c32e0777712584d05b14dd8bd976eada756c4462b8eb586db223a76091439610d126c7056c7a1b7c3b0bf41a77bd6ece3ad1c1083b3bed252941 SHA512 8ee851c50c57b306877ce98bc4e7b6bd6372fb5e5ee3f1ec9ac7ccba6e46317fafa0559ee165e638a4fcadbe8df55dd59a258e8dca2a7857bbd93ae5da0b780f
 MISC metadata.xml 1040 BLAKE2B c516a3b141924ad21424220f2a9df134d428156283f00f01a6c953ef837bef941fff9f345b48aae23a4af29c938d5053f6147d2e7c43b24af16c1c68b79b9d5b SHA512 6e99c597f3d16d8a5173da3334639e0beed6c95235082b152a3ca256de4a10907c083a646d69152fad23816ac2fb81d0f8d3188fe1713f4030a638cd225e3f61
diff --git a/app-admin/ansible-base/ansible-base-2.10.10.ebuild b/app-admin/ansible-base/ansible-base-2.10.10-r1.ebuild
index 5ac07b2ea362..27ef8040ba27 100644
--- a/app-admin/ansible-base/ansible-base-2.10.10.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.10-r1.ebuild
@@ -39,6 +39,7 @@ DEPEND="
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
+		dev-python/bcrypt[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible-base/ansible-base-2.11.3-r1.ebuild b/app-admin/ansible-base/ansible-base-2.11.3-r1.ebuild
new file mode 100644
index 000000000000..9aa31d07d02f
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.11.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	MY_PN="${PN/-base/-core}"
+	MY_P="${MY_PN}-${PV}"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
diff --git a/app-admin/ansible-base/ansible-base-2.11.4.ebuild b/app-admin/ansible-base/ansible-base-2.11.4-r1.ebuild
index 18cd0f14676d..957f728b3909 100644
--- a/app-admin/ansible-base/ansible-base-2.11.4.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.11.4-r1.ebuild
@@ -46,6 +46,7 @@ DEPEND="
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
+		dev-python/bcrypt[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible-base/ansible-base-2.11.5.ebuild b/app-admin/ansible-base/ansible-base-2.11.5-r1.ebuild
index 18cd0f14676d..957f728b3909 100644
--- a/app-admin/ansible-base/ansible-base-2.11.5.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.11.5-r1.ebuild
@@ -46,6 +46,7 @@ DEPEND="
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
+		dev-python/bcrypt[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible-base/ansible-base-2.11.6.ebuild b/app-admin/ansible-base/ansible-base-2.11.6-r1.ebuild
index 18cd0f14676d..957f728b3909 100644
--- a/app-admin/ansible-base/ansible-base-2.11.6.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.11.6-r1.ebuild
@@ -46,6 +46,7 @@ DEPEND="
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
+		dev-python/bcrypt[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible-base/ansible-base-9999.ebuild b/app-admin/ansible-base/ansible-base-9999.ebuild
index 18cd0f14676d..957f728b3909 100644
--- a/app-admin/ansible-base/ansible-base-9999.ebuild
+++ b/app-admin/ansible-base/ansible-base-9999.ebuild
@@ -46,6 +46,7 @@ DEPEND="
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
+		dev-python/bcrypt[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 6f5b01729079..106bed99ded7 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,25 +1,13 @@
 DIST awscli-1.20.53.tar.gz 2081402 BLAKE2B 88d56df063ae6473122913e4713e17bfd8c32961477b8e723ed3c0c0b7dc72ccc4dfd8d897699e2060a2b65a198b96eccf77accdac9a21510aa56dba5423b76e SHA512 48576b535bdf6b9e6397eadd589c41eeec480d2eaf3035ca6e64bd86984aba9170a83b71c0f7f3f64cfaebaf5104fe3adcdaebace5166343fb3b772f5ad8ccfd
 DIST awscli-1.20.60.tar.gz 2090278 BLAKE2B 107d4d34730769fe18729cc2a42a574c8b66d0715eabc67c1a236d828ee7623387ece4dd8b3a80818b68be7439ffb74ba2c48bac74323b2a9e960f53c0508bf3 SHA512 7c4a1d79434ca2497d814dace68b537e5bc120f03d4f63cf74280d8c83d4c68273d9c0b16e90b477c91e49498468e1717ba6ba1b057590fd89c0c2cc82b90383
-DIST awscli-1.20.61.tar.gz 2090747 BLAKE2B ddd0ca28f0f36a69e0d03a15bab142df35f4695a1e3f2c71f3507325050aceb088a53cb18dc17c80b7c90e8bba7aee377ab4bf336188ae19adb095df4cfd5bd2 SHA512 c0ed1fdd11022c897e31f83be97bddc2dbc8d53e6571ffb5c5592f406f88c30eeb36f7530b541a7102a4426b1bf14114db08667e3c03e3583f3130e3e50767e4
-DIST awscli-1.20.62.tar.gz 2091052 BLAKE2B 95043ddac83c71a6153eb84b9e2e48ea5659d300fdec3bf4c7d0356d214da7a5ec15a0777c1eb41f275a2ee6fdf7996d28082fe604825234226a415e9c12181c SHA512 6f33f1a02703b81813c56872f4a90e712ef60775854d88f256c1c6fa487678f6bc8f5d8a4345b2a064ff18afaf9f5e336f4af0257fc746d83a703fcc4a655bc4
-DIST awscli-1.20.63.tar.gz 2091148 BLAKE2B 12e6aebf29b5d91b191f87568fb605513c86d30c2a4d6b553ab2a0fb90b6aa0bd4b7024981671566f0646811f39a88bc16ac888f511c29b0e459f86440300304 SHA512 adb57d355a7ba70cf166ea1544df4274caaedbea1a2c4ba7895be600a76d8ef0129ca20c6d03d702c073d21dfa4f70fa3f5488266dc0cc5ef7f5d952b6d6ee6f
-DIST awscli-1.20.64.tar.gz 2091360 BLAKE2B 24a0838f1348a05392736f580816b968cd28a252ade31559241fadc5cb2a36dcb6f31c8743c484879fc523b0282381625cbabd58656a00cce0dcb81a6b0319d4 SHA512 a3c0b393e9a5e7aee0e4e4bab14f2cb2c0877b22ead0547d99b430e24bd927391536bbae8b612612b9437dc0dba2cd804a858bddc980d29a74afac434ddc3ab3
 DIST awscli-1.20.65.tar.gz 2091702 BLAKE2B e8295cf4e859c1e642077f4014fdea333292e98e22bbcb58a87da174687af8ebdf693a94f04949119d544daaf6fb9bfe4388444d9ec8a24c0e8b67d202e75753 SHA512 dd943682d10212179ebba959b8919a07ba0b548c5f24f735c69c05f9e1c27efa3f74c45d9702b96c4e556a6b436947d34da88291fc5718386891a3425a738c84
-DIST awscli-1.21.0.tar.gz 2092490 BLAKE2B 98684a1ba8f3efead1e4df7c266ae4b9dcabedfc56a64fea67a9f8ca1403e90d4c5cdd8bdbbfbc8917c830d23030e1e19fc8fde1d25156dc601249de5f77dfee SHA512 2fc8d26ddf23d06b65224523177fd9a4023941ff9e204c2d18bf3647206f86aef0fcb9eaa177219e0eb0a5b1c79655497d0346c1851cd74f4d8506ffef885275
-DIST awscli-1.21.1.tar.gz 2092333 BLAKE2B c222760f8491426cc141a67bbbb6a5c31691a3918e1e3b35256588666a796fd00990b2cdfdfdabee5eb64610c910e89cb55c972d7792f75c42489f58163b94b4 SHA512 daf130f6a24ed850e4e13851c8a1de5a139fb6b65f03b9471db33b1fe087e5fd2f087e7bc0c705204c0d62682a21142b708f0acc0e1ca3133173fbdf6a94f05e
-DIST awscli-1.21.2.tar.gz 2093332 BLAKE2B 65115d78b004f08f422fe62f851eaccd479e32b75fda821281a320102891f4b3741a69ca387a5d9817c873533d6dc47ff7b394dbee8a2bfb1ed963a042542c61 SHA512 874a4bf3a0adcbea928c9a0f0c978e375a95350631aeec15f1115aca2f1bfc91b5f918c4414860bb9685d090dc5a947959dde648f66147941cab1587a18d1e0d
-DIST awscli-1.21.3.tar.gz 2093712 BLAKE2B 5b3564f6109fb4b61af0d57445b6fceb2526e9052fec6ee33649b81da15617a09fb99176ed8735edb441a9cd5420b44b0afd044a8ad54c4941f40cafc78cdbf9 SHA512 98c923d5fdd15fe21601d4738abb1dde11bbde7397ecd14a3230ad1e2aa4bd7b72094e9d1f5ce8a0030f25fe189868b39bb54dca9fe959133715e5fed7de4a3d
-DIST awscli-1.21.4.tar.gz 2094591 BLAKE2B 5fe04384e33db4d047ffc8a1d19ec73faa4749ce1e5d0fbeba5a98e52123a47c6a648f6618bbf7a713f168f4a11c0d735a079186278cf2e8bb2e068f98e7db50 SHA512 2c2fba0753687d95a0b2c66f3b74ec5dae3ef4711e1f19f30e36020e1f5a4a71a3f10c5c579f401dd4853a9f8df9bd646b7e68f252544f1d9d9d5c92699abd1d
+DIST awscli-1.21.5.tar.gz 2095418 BLAKE2B 152d0ac70e9e0120fb9b10451904af52035bce84168c055695e7dc93e56648bd7689f20ac0ecdbdfc54ccb846d51b33027d2e9ee09c5e5d1e915c0ec05b0fbfe SHA512 e3063252a50fc6033669a0ff80f82d73764a6728d623d75a27f0652e779cbeb452454d887bf5bd70199a7394df40f9758b14619778c6428a164d590e6c8aaa89
+DIST awscli-1.21.6.tar.gz 2095961 BLAKE2B 7c765168604cf98f2c1be1aebf1cacb425124dff51a0a1ba1792634187feab6361d740aa743eda7d41a671300d4196e852640e04f56aa399752ce3305ac1ce86 SHA512 912d81f96cef3ae1c2a0969050e1bce304d1019a98d6bf16e45de50c66f85f6f69a10ceffeae773aafa002227e657861a9f41d123368c1b4a93b5d49747137d3
+DIST awscli-1.21.7.tar.gz 2095914 BLAKE2B 6cb53fab223941a41eceeb8430d7158bc14da670a42609707ee5aea02a7e9d43f32fd7118ef7ab4ede54dd5312a4907eac7aa0e040d775ca7f606049dfc1a090 SHA512 8bf7dd4aaab890e4269a02fdd8735dd918a31783128dab46bc5077310ca385717fe4da913c2fb3c36e1132eaaea40cb7c4f434d6060fe27cd4bfc704581cd1e0
 EBUILD awscli-1.20.53.ebuild 1306 BLAKE2B 1b1be64ca6072a28230aa36c66bea67684784f2d44e040ecdb6694ce5f023168e170a36d3a3e133a9a8559d15dd0aced5e7a78af349f3691a883bc19f7f60318 SHA512 6b9579b86a827d2a4d46568d17899f3a45b047621abec213da57f70603021ab2ac57dbe1e127ee12aa41edc93aafd503db911e13ab744fcaf5ea6d8b5d60ad6c
 EBUILD awscli-1.20.60.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.61.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.62.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.63.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.64.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.20.65.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.21.0.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.21.1.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.21.2.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.21.3.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.21.4.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.21.5.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.21.6.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.21.7.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.20.64.ebuild b/app-admin/awscli/awscli-1.20.64.ebuild
deleted file mode 100644
index 81d5997098c2..000000000000
--- a/app-admin/awscli/awscli-1.20.64.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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}]
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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/awscli/awscli-1.21.0.ebuild b/app-admin/awscli/awscli-1.21.0.ebuild
deleted file mode 100644
index 81d5997098c2..000000000000
--- a/app-admin/awscli/awscli-1.21.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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}]
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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/awscli/awscli-1.21.1.ebuild b/app-admin/awscli/awscli-1.21.1.ebuild
deleted file mode 100644
index 81d5997098c2..000000000000
--- a/app-admin/awscli/awscli-1.21.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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}]
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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/awscli/awscli-1.21.2.ebuild b/app-admin/awscli/awscli-1.21.2.ebuild
deleted file mode 100644
index 81d5997098c2..000000000000
--- a/app-admin/awscli/awscli-1.21.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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}]
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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/awscli/awscli-1.21.3.ebuild b/app-admin/awscli/awscli-1.21.3.ebuild
deleted file mode 100644
index 81d5997098c2..000000000000
--- a/app-admin/awscli/awscli-1.21.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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}]
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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/awscli/awscli-1.21.4.ebuild b/app-admin/awscli/awscli-1.21.4.ebuild
deleted file mode 100644
index 81d5997098c2..000000000000
--- a/app-admin/awscli/awscli-1.21.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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}]
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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/awscli/awscli-1.20.61.ebuild b/app-admin/awscli/awscli-1.21.5.ebuild
index 81d5997098c2..81d5997098c2 100644
--- a/app-admin/awscli/awscli-1.20.61.ebuild
+++ b/app-admin/awscli/awscli-1.21.5.ebuild
diff --git a/app-admin/awscli/awscli-1.20.62.ebuild b/app-admin/awscli/awscli-1.21.6.ebuild
index 81d5997098c2..81d5997098c2 100644
--- a/app-admin/awscli/awscli-1.20.62.ebuild
+++ b/app-admin/awscli/awscli-1.21.6.ebuild
diff --git a/app-admin/awscli/awscli-1.20.63.ebuild b/app-admin/awscli/awscli-1.21.7.ebuild
index 81d5997098c2..81d5997098c2 100644
--- a/app-admin/awscli/awscli-1.20.63.ebuild
+++ b/app-admin/awscli/awscli-1.21.7.ebuild
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index b88f27d593c7..95608e8a57d3 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.45.1.tar.gz 5559372 BLAKE2B a5b43f5fcc363041db882de88c52a33e16fb7e85bff414d8560455223e2e76d94b66dbf0a1b71368e8d12c591030475fff47cc1004ab34296cdd7541f1b72e43 SHA512 4a5dfbd81226a0150feef3ad40711555e0b316ba05c6f07987f6c04b261c662aa2942930ae6e4566d87a05d61c19924a20add3225ff2f862c71595cf9f802281
-EBUILD exo-1.45.1.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.45.2.tar.gz 5559557 BLAKE2B f4a4d4f0c82cde28590ef2238338f80ee5de085b4eb4d434a662dddc1031c32f181f9104de9df52da0a39932301ec0cf64cae8f54e41c979931626ee2043575e SHA512 641d17c98878f089ff9e744c0488c424d3f1661a2dfbc3bdf65cb42e0f4a9922206575854ff996a0752f1e6972c0143d20ea7ed5539127e0ca17676a6896439a
+EBUILD exo-1.45.2.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 334 BLAKE2B 230d1a47a3e39f796c16a9e9a622fbc27560c951da0c49adf7aca135970c0c944f42da7eb624c7193d44830c72cf95da9d69d977562853de6a00fd8fb6408977 SHA512 cd1366d99abc260c6f2899000e2a517be9a4c43e921078764fdc996871df34c1827e512087c3eb6f95bf3b685c2f34cbc1f1462eaa303a948640a362b4501b01
diff --git a/app-admin/exo/exo-1.45.1.ebuild b/app-admin/exo/exo-1.45.2.ebuild
index 49b1772f318b..49b1772f318b 100644
--- a/app-admin/exo/exo-1.45.1.ebuild
+++ b/app-admin/exo/exo-1.45.2.ebuild
diff --git a/app-admin/fam/files/famd b/app-admin/fam/files/famd
index da3d745b244a..da3d745b244a 100755..100644
--- a/app-admin/fam/files/famd
+++ b/app-admin/fam/files/famd
diff --git a/app-admin/gentoo-rsync-mirror/files/rsynclogparse-extended.pl b/app-admin/gentoo-rsync-mirror/files/rsynclogparse-extended.pl
index b0befc31c7ab..b0befc31c7ab 100755..100644
--- a/app-admin/gentoo-rsync-mirror/files/rsynclogparse-extended.pl
+++ b/app-admin/gentoo-rsync-mirror/files/rsynclogparse-extended.pl
diff --git a/app-admin/hddtemp/files/update-hddtemp.db b/app-admin/hddtemp/files/update-hddtemp.db
index bc29b3ec0caa..bc29b3ec0caa 100755..100644
--- a/app-admin/hddtemp/files/update-hddtemp.db
+++ b/app-admin/hddtemp/files/update-hddtemp.db
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 8aed42c953c5..db7e0c6f5b4c 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -5,5 +5,5 @@ DIST KeePass-2.48.1-Source.zip 5123663 BLAKE2B 919a109d114a8bc404a02f063a8101358
 DIST KeePass-2.49-Source.zip 5135190 BLAKE2B bf5a9aab0065a97545bd1b81a74b5ab113e4c4802873445719ce2a571745b04c69ab5d8be9a67dc59a713947f0955cbcccc782b6628f722a0d564283b943eee6 SHA512 7a25de6acb2637bd8820fb70866ab4ced4ece4b3e64172f616c2fb59d2a4e7a2f340435db10731ed3d7e66db7761487925cf1c7941b0bac12e72c5fcd9e8b7d3
 EBUILD keepass-2.46.ebuild 3134 BLAKE2B e98f684a58e0ab1b9f663ab0dc2805514898f012d4fe7fb0a35e107cbbcd2e065beddcc673ad07f54da8628a08bde9de2b9e56e642ccd747d46318c752ce768c SHA512 cc24dcee297f3732ea2ac9dfd815f5770b4d2f750c7c6b03dbf76086c470e17e01968620183ca98b28fe77e2a9b22617b2611c9340eaae449b8f0749ae401451
 EBUILD keepass-2.48.1.ebuild 3175 BLAKE2B 878525ed7dde9c0125aa301568436e1825902d6d95091ad89a701db68e769d5f7736f0d98bde52e31beb389b9b1f4e9752931fc24e96afedc041c94115cfebed SHA512 1cbd71474e625077503bcc40ad3492de050be0a64022a39ca61db2e4119aebc5d66002fd618508ec414ae84f5ae620196435b34e34dc27a0557aa661818fa6d8
-EBUILD keepass-2.49.ebuild 3175 BLAKE2B b2a8196b616faba52d80d2a393360cd7701d4f35089d824e5e696bec370253df29c5ddf2dd6709b914c9ec50d6730f7ac1eab27f2996f1ef3b1df2b98b690874 SHA512 cc536ea3c4b6b7a5d081cd8e2d2742e9434b26c2cd10fabe40cdc4540a3ba8ee7990fb0c4af7b1ba35ae938bd92852cd3ca72bb02a61c2c4a574de9ab9f6b4ad
+EBUILD keepass-2.49.ebuild 3174 BLAKE2B b78bfdf4bbc6e16f49ef1d9674b7d5003ed1ee7ae4348edd1047cb56670206eaf2475ab5e67fb0257400511bf379b2e4f859341d5546d5e5d1e3f82924f19d9c SHA512 56bdddad13858da2b040f877407f330389dd641fa3b75b78c6de7a2f136df4bdab0d98a5f38d6edf836bf830031abd2e172dec4f3daf996fbe096610b770d3eb
 MISC metadata.xml 682 BLAKE2B 5499e44d9e2d6740c1cf229d9ab1b7cea2f71fb81dc569b3c9ff5c246ea41e273eba955e4a6863d48df364328e92567d027d9eb569b460138b967a70e225b56f SHA512 4c3f93962d1773c61ea8648ef658ff590ba4eaa7259803a17c54a33c7065b6ea0fe724da69e601df725cd5d6a7d4d2dd03c184c975f27d86c670427cc03b9d35
diff --git a/app-admin/keepass/keepass-2.49.ebuild b/app-admin/keepass/keepass-2.49.ebuild
index f603d70fa8c1..82cb8e525c40 100644
--- a/app-admin/keepass/keepass-2.49.ebuild
+++ b/app-admin/keepass/keepass-2.49.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="aot"
 
 BDEPEND="app-arch/unzip"
diff --git a/app-admin/prelude-manager/files/prelude-manager.initd b/app-admin/prelude-manager/files/prelude-manager.initd
index 14a39ba415e8..14a39ba415e8 100755..100644
--- a/app-admin/prelude-manager/files/prelude-manager.initd
+++ b/app-admin/prelude-manager/files/prelude-manager.initd
diff --git a/app-admin/sud/files/sud.rc6 b/app-admin/sud/files/sud.rc6
index 068acf776173..068acf776173 100755..100644
--- a/app-admin/sud/files/sud.rc6
+++ b/app-admin/sud/files/sud.rc6
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 68700c3d1bb6..a0734f687e34 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,6 +1,6 @@
 DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745
 DIST sudo-1.9.8p2.tar.gz 4302256 BLAKE2B ba40df539b3466bebe0d876ef4f1809867125e83983609eae0447f933fbd499b2eda88d2f6c475779654e68af9580a2998eca3c3f7953129ff73c923e1c88ad9 SHA512 899b252e8c219226f658dff3dd34c97b07d42004998b45175b4c0c4de42a6bf9f909598e99b4056fa1171e63378e203854b0f8608b0f5c1b00e9d3677818f6d3
 EBUILD sudo-1.9.6_p1-r2.ebuild 6725 BLAKE2B 620c20c144bb7fd723e3e46022dd3e6152084978091e2e3af0a95a961dc027defeb5d20dcee4b0e36959e04124586a2c53d65c8137af9d1f52a6044392c08aea SHA512 fc61898d795187d7ab0876001c725bdb2c5f0c98ab38adc8427f69abc1da8b33be6ef8ebe1353ead193f10f48ed042fe12a13f90c181bc3a0d3cceed352bc262
-EBUILD sudo-1.9.8_p2.ebuild 6669 BLAKE2B 908e75ad8b33fc74a3491c77aa184e6f1de8629b13fb6bc704f7b9980b43fb313591667b58c9583f50392d44e852dcd7f3e65c5265b3eb5d32c8e970370b9d9e SHA512 f415714f5b28550b5f7b3b3f79b28a95db5738f3b2c65720d911c8fcabc4b8099f58e510c17af6194ba76cac53157fbbcb7688d35ae99b2633973bcf50799089
-EBUILD sudo-9999.ebuild 6669 BLAKE2B 908e75ad8b33fc74a3491c77aa184e6f1de8629b13fb6bc704f7b9980b43fb313591667b58c9583f50392d44e852dcd7f3e65c5265b3eb5d32c8e970370b9d9e SHA512 f415714f5b28550b5f7b3b3f79b28a95db5738f3b2c65720d911c8fcabc4b8099f58e510c17af6194ba76cac53157fbbcb7688d35ae99b2633973bcf50799089
+EBUILD sudo-1.9.8_p2.ebuild 6733 BLAKE2B 368f23a2b355e4603ebe96ffca348fdc8c7cfe88daf60c5ea14f84dbfae13fd6f95c5189ed697e4bcb3044d1678c51493ff3d39417d4128ca8e5222b898d645c SHA512 98627c6bbc5e9752b9ea143ff8fbb9056f9b2b3684583d2cfeb54b32b9d5be0d04e115e65824e2e6320fa40ef3534a70078f50d8ea9d0c45c0c6dbfcf85f21ef
+EBUILD sudo-9999.ebuild 6738 BLAKE2B c01463d07ac685ef4b37f375793999fa88a8fd75a89ad98d01aa86f87d7c766f6d6298e369e7f1e212304ca1a8c8a1dec5c4d308577531d88cc6f8c634093876 SHA512 3f1124da310c815250ac216dc8f9999c23235faa76704793edced96a3825a91ed4ed3e6481fa10fd8c6695fcefdbd8e53cfa472bed7e5463a470ab9945df1b26
 MISC metadata.xml 1050 BLAKE2B 4027c8a5941e8e12bb6c9cd9950187965b01e236ddfc073ba0dd98be8e3e98225ffbca1c05b3153d72e5507484f966e01c7b44e9416bbedecd88ae8f4d52e359 SHA512 8033bd4649190c3c6bf0d07dab2dc99a708b81a74b0d154b1f4d56bdfbc115d4889b3a78e6b2f3eebaa91bf0252e8fd043bf2bc850b8f6b4199b38ea751b7174
diff --git a/app-admin/sudo/sudo-1.9.8_p2.ebuild b/app-admin/sudo/sudo-1.9.8_p2.ebuild
index de7fec385553..6e918224c11b 100644
--- a/app-admin/sudo/sudo-1.9.8_p2.ebuild
+++ b/app-admin/sudo/sudo-1.9.8_p2.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
+		KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris"
 	fi
 fi
 
@@ -159,6 +159,11 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_test() {
+	# See bug #667600 for TZ workaround
+	TZ=UTC default
+}
+
 src_install() {
 	default
 
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index de7fec385553..a35ba589af05 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -159,6 +159,11 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_test() {
+	# See bug #667600 for TZ workaround
+	TZ=UTC default
+}
+
 src_install() {
 	default
 
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index c56d65ca02e8..9448aa39c57c 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -16,6 +16,6 @@ EBUILD syslog-ng-3.30.1-r2.ebuild 4889 BLAKE2B a84207505959119191dd2097e7e0c6dce
 EBUILD syslog-ng-3.30.1.ebuild 4839 BLAKE2B 92c837ecd1d724d06457e586dfc35e483ab233b7cd0ed9fbb461174c2659d9aba967aff62a33cec504f13b85656b8b736f61b0cb57bc70fcee96cda795bd7d91 SHA512 b02e32aa65e0df8ca222d219bf70ccbb0260b40e3db98db7a9ac37998e8059992f35a2bb9d03a5adb2d60756bf065e9a4aa1ddd94dacf40505a701bcf6c373ad
 EBUILD syslog-ng-3.31.2-r1.ebuild 4940 BLAKE2B d7d0f6fec4570cbe20336b8332d17930ee310d904540fce3cb83434b98227e8fb40e7b7cde5eccaa16fc2142660d626361fca11d42ba386cd9196e7b1faef72c SHA512 af3b35519d289d06b74eaa2be42190c862743b18c85cdf75ab67193d6bff386fef5df546ea9e04290fec8cef41aa909a2d716869ac9cdeec0aa2d4cc7fc184db
 EBUILD syslog-ng-3.32.1-r1.ebuild 4941 BLAKE2B d06d4fd5bc2104c335d46d626657e800712382b0e8db648d737efe2a7be53e4766fc2795179aa08ae749edb7b152d9d1e3292c248b51dcd3d69216b07743abce SHA512 f1d1449199a773fc8474690ac5d074eec485d4f7f142825d7982c8279c781e0f8427d4be6c256be1a8569560d75e98ea74ae742e3f5cfcd3511da2d73d15c83b
-EBUILD syslog-ng-3.33.2.ebuild 4885 BLAKE2B 875a91e1a21a4b2026d20064526a97bbaac5f4632a3d66b5b56d031b6359a4a0e130e474ed91b4224471610e323b7cd6227b5f511b09ba08a2be52fbeb8a24f3 SHA512 11129fa4fcb04e69adc844d5939eadf594d6d878270596b5cf154227082e40c0764bde7639802c6843aad5be17491e40e901865e2616bb41564f2bd52575d9ec
+EBUILD syslog-ng-3.33.2.ebuild 4883 BLAKE2B f75b23bb978fdc424c714091c3e54a724ad32c40d8a8b4318a790874fc8c582f325cdab6be464a5efc360d19d8a7fc452b833167a018e78437bfd6f41e9c8d94 SHA512 a19bd9f1141d6a7402d78fe9d1791f9177e754f6714a78ed5b98768dc2921dea0df337a03a30385dcdffe9cf99e18fce06a3f16ad509891505ce6de6992a547b
 EBUILD syslog-ng-3.34.1.ebuild 4883 BLAKE2B b4b36e9aa1a62149ae9187196b810d4d74cd7b7bf02d222fefffd3c8603bcb35aa47dbc4703c1cfbe1cc811463db0cdb112d279b98a4035aeb843635ebf98134 SHA512 95fcc558278b04d0fe7de1f41f7585f192de4da8071bbdc4f6cb6818c9bafdd9a20e05587e730567fa660a58e1cc5cb58e4025bcffcc1e4f22ce03e78ef2dcf3
 MISC metadata.xml 1283 BLAKE2B 22643ccf254541685f0b58255d42ef6bdfc4af8800b871f96cc2e17e1f7aa05c3380672fe293260a7a395e0e7431c81abed871f248805a6dda991fcb877400b6 SHA512 37610fc48a1e169c478250a36634afae6de03c49b257e27d81cdef3243200c1fb3a00b84d4efc8e30020f9a6c1f6ed5828b2444e4b92fa5801e15c3bece8e25a
diff --git a/app-admin/syslog-ng/syslog-ng-3.33.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.33.2.ebuild
index d34e04e0c520..9b367ba1236e 100644
--- a/app-admin/syslog-ng/syslog-ng-3.33.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.33.2.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 )"
diff --git a/app-admin/sysrqd/files/sysrqd.init b/app-admin/sysrqd/files/sysrqd.init
index f88fc8ce43ef..f88fc8ce43ef 100755..100644
--- a/app-admin/sysrqd/files/sysrqd.init
+++ b/app-admin/sysrqd/files/sysrqd.init