gentoo resync : 07.01.2022

14 files changed, 84 insertions, 32 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 71fc2d15d1c4..6bfeddad92d3 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 3d1a84203935..0509451f7d75 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,11 +3,13 @@ DIST awscli-1.22.23.tar.gz 2128226 BLAKE2B b572d21d2ba226871fd84eb33d44e65c3f5c0
 DIST awscli-1.22.24.tar.gz 2128390 BLAKE2B 6b23a629a66e6f962b953fdc89ab1e81530806ba6120ae92022c8227e61f31aba53cea880d94b26d81ee4a7b62c57b39e45fdbd3e5ce1b9a929111ecc4b759b6 SHA512 846b5c0aa4121cd5975cadfa6a3800118b2fa3616d80dde7676043aa57142ae092debb1eb35f159db580104a03b20e2e02f57d73d7bad9f17f9931dab5b51435
 DIST awscli-1.22.25.tar.gz 2130417 BLAKE2B 1c150feb135d662cbae1e51cd0cd41744472d8a33ff84948ef1a1d6e49ea36ec5e9d85a6f8176d928dc3d1a74961bf6116e4bb01e4256c7cf01059bfb7e3db66 SHA512 0055805213057247fad6a13cb9cd9a90796723411999a55aa7bcd9f7b014709127654313877833a1257a14a2a61770232d142943c5dfae91ee1d9de91efd81d5
 DIST awscli-1.22.26.tar.gz 2131318 BLAKE2B 87651dc3a75bf0ca57142fb394b90ff3f60fbde724b7f6586c213fbf03169d5f4638133362b925a32235e518d7c8b56dea54a0bd224d4562a482e6303c7f81fb SHA512 276a137a3826922dc56316c59f46b1a741f57b5037a0a6345ece3732d31715e3fbf36faaa09b8969b161be2d54ef106c0cfd7bd6c3a3a31a540b8b42f9cf364c
+DIST awscli-1.22.29.tar.gz 2132978 BLAKE2B 67dd83bfd9799c3a49bc2439b29b581e21cd57c6d4c93f8b3073bfd83b0d6ebbc95abc074b6257407f03b2f98253ef099dd1a2a853c093338b2435a17bf9d02e SHA512 61b2117125031e945a2aaa4d20325d8cee0a56d7b5cdb9726f0d951b1bd0eedefc6264be8a1a890c9dfa4869500222a15a9b62f2935cf59f168bdd3d0022fba0
 DIST awscli-1.22.5.tar.gz 2111679 BLAKE2B 970e472e8de43664d060023fdab9f54ce848c5655d8aa417efeae1b1efb52989fd021817521db9dc9cd64580cabbf0c30f3d0178034bdb1edf41feebbc690f46 SHA512 9177fe9da0fb8e9e28777bbf8f2c3fe089a08851b57a49fecefab43417fff187584638d17394289bf6df3d18d9052fd958bd3fbc8064327120af04a0cbe30494
 EBUILD awscli-1.22.14.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
 EBUILD awscli-1.22.23.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.24.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.25.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.26.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
+EBUILD awscli-1.22.29.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
 EBUILD awscli-1.22.5.ebuild 1546 BLAKE2B 7d465d3ae8da32c1d1ba98b059be12fb7b3401a2d843043ad23823ab80a56bdde0575dcfe48efcf91112c4a8d8f12d19f800ae4f6cc4efa841466994b3835b5f SHA512 61e24518229ae0d07f46c3b06efa3116b8fbec78efdc489d4e74d89a29b3e307ea89799490d4149b718066e93e55b7801c49c3da8bc2d954fe4f0deaa898056d
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.22.29.ebuild b/app-admin/awscli/awscli-1.22.29.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.29.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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
+
+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() {
+	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/gam-server/Manifest b/app-admin/gam-server/Manifest
index 26a54c50587d..9fd79970d3f7 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -6,6 +6,6 @@ AUX gam-server-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75
 DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST pkg-config-0.26.tar.gz 396399 BLAKE2B 5a88cf825d6ad99d198418798b28c779cfd4c0bcfaa023e915a818c141a504c49a6281ea0b2d04a7a9ec89f9924c87f8b1ddaa5a088952715397081383b3528a SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
-EBUILD gam-server-0.1.10-r2.ebuild 2617 BLAKE2B 0a69d182922d3a95995eef47ac4587336258dfc983e13017e842928b16ebd6e747744acccaf922b58897b9bdcf6bf9821d5c21d84e85dd874f978c10d1833e8e SHA512 8ada6086382ff417ebe800b5de7ff0423ce920cc79ce45ec40b3d029355857d96616bccc9a8bd4aded70227c3d0fae117d27b5878ae3fdce30ad44e1dbc585dc
-EBUILD gam-server-0.1.10-r3.ebuild 2542 BLAKE2B ce994fa29c780f862e3df385726fa2d7aba22a07f49b26a6dfbb96ca43118aa9e7bbf24398a1e6c7e798564b2f6172f2d2f1cb637bf2f5f5ae844dbe2f670116 SHA512 cab5ef14a8e33d9533031f94bdc34118cee24ed315bd7dc5e9cd47812850c134499e656530243580554836438d764813d385bd8767b090bde5571f9a073a6497
+EBUILD gam-server-0.1.10-r2.ebuild 2604 BLAKE2B 3dbc1b236ca91e2e1c12980075127a4731bdbfb359e294ed30241188ab8724d265ab79b610b70f56d758942cde43995dbdd5a102535bbc2e7a6a5ab72f152966 SHA512 bdcf52435ec8b098f1437c236d14b06c2f485d753f492e9751de72bfbb3ba2d32dd45d618dea22492c65e07fee3f815907770b97f4228aafb32b1336a8033073
+EBUILD gam-server-0.1.10-r3.ebuild 2529 BLAKE2B 9099936eaebe61572df09fbea115a86bd9dff84227d23f1b10d95877a0c13e1802f4fe1eb6095cfdf2ddf56d63d9dd986571826f18304aae5f987b7440e41cd1 SHA512 a20989d3b4418f06e5c1eaad390587814a657fa54d9f3157e96aa7f17d7102323c2424d13a47f8d6da6e4285ae8f97a9cc5620fa846f41167fd09ad95229c693
 MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index 18a07d6a7eb0..66a45bfa5661 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-solaris"
-IUSE="debug kernel_linux"
+IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2:2
 	>=dev-libs/libgamin-0.1.10
diff --git a/app-admin/gam-server/gam-server-0.1.10-r3.ebuild b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild
index 7a6e86629521..99d0e57d1baa 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r3.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-solaris"
-IUSE="debug kernel_linux"
+IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2:2
 	>=dev-libs/libgamin-0.1.10
diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest
index 547f83c43b2b..a65c9bf0b204 100644
--- a/app-admin/gentoo-perl-helpers/Manifest
+++ b/app-admin/gentoo-perl-helpers/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-perl-helpers-0.3.1.tar.xz 9420 BLAKE2B dea001473832f4412ae090afbc458720ec1d40d19ac3db3a6a57b26115603f224f2f1c4155ecd3190866dfa0ab648fdd3a98a90e9ed576e7bd3ad8bdaf9a73c6 SHA512 dce6addfebbdfd16da3b580776c34346eb60b2eaef9cc7bed03d5ae0bf028de7a0175fbf7f68113d44b645c3d5ca7f5175389478655b08c115a5342ff930e096
 DIST gentoo-perl-helpers-0.4.0.tar.xz 9580 BLAKE2B daea9e3f43bcd24ea34c9448294fb730595e8a021dffcbbf7f123ff5439455aa362c623affee29341266a0494f4744df0bf195d2db422d6276eb54fdca07149c SHA512 fbbd33122028ad12cbec7adbc97faaa32aa485ef21ca38dc2e1906610fdea7709e5da7e8164f5f86afa3607928837f3b35468274b6c626e3bd843432d780701b
-EBUILD gentoo-perl-helpers-0.3.1-r1.ebuild 1252 BLAKE2B 9798d956cd7993cbbc6dc7ae7d545cfcf76dd38e6982841220963b6378a60c5d45018a953ad863b68b61d6e7e101396239019a9f6b7fda226d4a7ca1794cf302 SHA512 9d721901468f8b4b8f885609ec3aebecab3cb2ad83cc3ba049d4d7bf367b4cadf4566e6e013102bd8c96cfdfa023f4e21c0666c99d196aee48e64991c21406ac
-EBUILD gentoo-perl-helpers-0.4.0.ebuild 1281 BLAKE2B 431c26224e45a47e6d66d61740a25d9ab0bc766d59104f967629fc597e88b56d49429d877e692d50962e41cf1ed3b69bf6eae11c90b7b2561da35408569ca77b SHA512 6ac9e6aea376c5d848282e67a55f0eb67deb9fda41da79e9565784dc338e6a51cdd3c3966a9e17f7c408cb117ab73a3c701bfc706b4bc585e4c668f424033f82
+EBUILD gentoo-perl-helpers-0.3.1-r1.ebuild 1231 BLAKE2B 0f5f7527aebbf41f89147111b5de259352d8eb1ffcabcdd772d342a0bd905ef677d98ffd26146ece768235182cb0d46dc27a42a62caff9c215008c5bb5fce8a8 SHA512 ebb846f68cf2e0f7e03aa83aa1b6ec597d415ed110e92516f099f3b61dba9d7188d3e85a293143625c829a02a5ce2ca8ae6af4dc8324318b28419e75e8c074ca
+EBUILD gentoo-perl-helpers-0.4.0.ebuild 1260 BLAKE2B ac9a293178fb1e6b714849c724fc6c01e724240c467a9704f3dd18fb97aad5b9f6531b20bfba337df1c12b6b5ce18ab48a21e243ca7fd9b1c18cdd58f9c648ed SHA512 b0f05ad1fac374fc1698d577c091b9e667b61bda2f65b445254939bf8cd18eda9289d735bc15456ba21388bb157e9c254b7625537f9120d74becfcc08fda4ecf
 MISC metadata.xml 348 BLAKE2B ebb76313771776b978708505761f5a42b3b1d65e5f307d754c26308626c04c414171f39d5c033a00cf990a734e8ca41732ec0ed6f8158157e1f0dbd39a28d56b SHA512 4e12044c5a14c90aecae073df7ef04fb2aee07cbf81965f603c1d7fc45818e78488d7f3d98b86aa7eb2577de90ac3ffff147bc28b0b6f3d2c74bb23b1e1b565d
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild
index c243ef939290..75bf546bafd3 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,6 @@ IUSE=""
 # Assumed System:
 # sys-apps/coreutils
 # sys-apps/grep
-# sys-apps/findutils
 # sys-apps/sed
 # app-shells/bash
 # sys-apps/gawk
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
index 230e202e58f7..92f935790b7d 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,6 @@ IUSE=""
 # Assumed System:
 # sys-apps/coreutils
 # sys-apps/grep
-# sys-apps/findutils
 # sys-apps/sed
 # app-shells/bash
 # sys-apps/gawk
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 27559cecd4b9..97dd5d8dac02 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -5,6 +5,6 @@ AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43
 AUX gkrellmd.initd 338 BLAKE2B 6ff2ab29e354578efc477af50af6a7e517bb7ec9267575d75fb5d5a12c9894a60996ffa37672760657eeee0680b9b7573d3d03d7d5efbe20122d330e5a55ebd8 SHA512 403431a0bfe8264ccdaf3c7e361e363a18a5e2deda8b2287919030c746c7caf80571b1a2dda407c113a9f878253078e67202017a026d83dec43bc5ca0389cc06
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.11-r1.ebuild 3279 BLAKE2B 646ef88000510ca895cc234d1e13127822317295697584ae3370aee14156396584e7005405d0b4ccf47b1e27af5babecbe9472249ae5a41541a68ada0b51b2a9 SHA512 9795b6971c04a5408ceb53ae4c364d66238fa672a0c3fbcde228e667e7b9a2f7bb118ab3edf907813e947faaeb57ede6fa2de9e0277f618add9e91e432e2b790
-EBUILD gkrellm-9999.ebuild 3297 BLAKE2B 5f6fdd84066441184f2c6a1a813fe33f9c7ef7d723fb719208d71231db632e8e8e3a189e36cd705e52633d2aa96506d3a143ba400fe1d1037b191dc17e715c97 SHA512 19a26ce053caaaa2385b7c669e00a3862323806e0c0e90d91713c156cda06823a11c973e410c5b8037342d6e77265aa9491844e81c70fac25a57a397d05b9d7b
+EBUILD gkrellm-2.3.11-r1.ebuild 3208 BLAKE2B c3d4d3f16cc5ab6ff2a3a19eb1d2ff712d755bd5df64ab86f847268a91ae77c11ebaf5e6c8defe504747f3a081976cc651a8094cfa01695da6a613678fc4d5dc SHA512 5cddfb833dce63799b00eacd0e641920f0585dc8f7d19cd0110f75995e19a64c81e102a8f213b7c8aa615cb6f5740e6d046267c07be5bd1838522b0dc40044c5
+EBUILD gkrellm-9999.ebuild 3226 BLAKE2B e166906224496bac76cda607f23201a42fa71e38134b2a89c3bddf5fae9bb783d477b433d2050dcd0d4a0bf90d56678d5808c49ae2cb639afb929d3a2b6f54c7 SHA512 0c2e473570685871f00acef32335bccf28639a0035a91a9994a5c07b66755c4b9e10745d42d7a9b3f445ddc65da6a5dc91887e2bb4a412522f0c87b144eba994
 MISC metadata.xml 918 BLAKE2B 23439cf9f8e9cab924cedc5682753acf5897964679bcfd0b606ca980f658196877c559685a36986c65d763ecc615083447789e5bc80c4e36215ca7ad1e41ddeb SHA512 94c9d89b06ab4768da82f3b8cf3a47377f446b6c9a9d80173d0edf3838cf0323c29080448f3ca416f65fe7cce737b3b527952b5a576c005f9ee107b5b2896527
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
index 39dfbab8031b..50c444a0e35b 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="gnutls hddtemp lm-sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X"
 
 RDEPEND="
 	acct-group/gkrellmd
@@ -66,11 +66,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
 src_prepare() {
 	sed -e 's:-O2 ::' \
 		-e 's:override CC:CFLAGS:' \
@@ -85,6 +80,8 @@ src_prepare() {
 }
 
 src_compile() {
+	TARGET=
+
 	if use X ; then
 		emake \
 			${TARGET} \
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index c88185125116..8b29bcf41db9 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="gnutls hddtemp lm-sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X"
 
 RDEPEND="
 	acct-group/gkrellmd
@@ -66,11 +66,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
 src_prepare() {
 	sed -e 's:-O2 ::' \
 		-e 's:override CC:CFLAGS:' \
@@ -85,6 +80,8 @@ src_prepare() {
 }
 
 src_compile() {
+	TARGET=
+
 	if use X ; then
 		emake \
 			${TARGET} \
diff --git a/app-admin/mongosh-bin/Manifest b/app-admin/mongosh-bin/Manifest
index 7f2090a61320..eb2d8061c198 100644
--- a/app-admin/mongosh-bin/Manifest
+++ b/app-admin/mongosh-bin/Manifest
@@ -1,7 +1,7 @@
-DIST mongosh-1.0.4_arm64.tgz 58296826 BLAKE2B 87304d259e731ac63b52f63e8277746042df90eeaa67771265d45fd9450950d878a20996a34285db4f8dbac9c4877c37391b54b6b9e57ff0409e0d72bec1c5a1 SHA512 ad9e9cf733915cfd6e9e2140b90cfbbc77f63160331683dee740e906c69b5993ac9704ac0bfbe8b5227eb474a0db75cddd8df310150f737de28fef00184d1280
-DIST mongosh-1.0.4_x64.tgz 62341440 BLAKE2B af4394c1312825ca0718f1ec836cde64c212533ae2210dcb64363042d066304e558c5822e46362323aeedb5cbc402fae1999689b338102d8ba8de5c74379cf21 SHA512 07091f85b14b80fcfe334ced3a1773d206e9dd09faa3ac0ec6045503f222ccba0735a861bb4088d4c7687783de37e2134c8beeaa160cd838f197233e68aae796
 DIST mongosh-1.0.7_arm64.tgz 59235420 BLAKE2B c1993ca1b697eac8c5ed8d2b9ec7af0b28a46021c368d14585736f5fa0a8874db8c6bfb1d362eb62b97c3331c6902c925687f4d8548f6a209dabd698a378151a SHA512 885f86fa15c2ffb596d36bbdee5d3526e7ff0ea53d0530e8066bcfbd430dac678047914de9239a49d6cb6fb1e1d21b336de2a8dae3929af8f0504bebad9265f2
 DIST mongosh-1.0.7_x64.tgz 63269269 BLAKE2B 0403db9fd437a832bc37790ac38ae43b1aa0add711283d0f40631f9c7f8ba7f590d083a53e5ac5403b90d22b34e2a461304593702f876e75a6867e543ce0f152 SHA512 fd232c46dbde02bda22a36300c49748860902d51bd2b01f24464168d0e2b76083369f201900783b4a8c698a77f2a344b903f6c05f0914f9cd94be3fa01270b2f
-EBUILD mongosh-bin-1.0.4.ebuild 864 BLAKE2B 4aad7079d89ee34b2f60687710e7a7934a6f2e53985139ab6b3bf9a50c7574bf1f7918eb509e79c3ea497a2bd6e588716bfa461c3e636fafd89dfdb333f13954 SHA512 76268daa6d7fa44bfbe56266ce862ab50875e7a1b2c5654515f9435c5ba45f16afeddd59eb8962c486caeff4c08ac90dbb4af3928b995bc185d8f578553183d2
+DIST mongosh-1.1.7_arm64.tgz 60598298 BLAKE2B 77817d970ddde690c49337d3e39d3f88fe50c442b698ea8d4aca3f7b9626d3f6f96e1094d08011e1c64caf616b9478ea7d275fc5e778b1afe1dfe762e71eff75 SHA512 b842fdc10f53eca4c310fc077340f87f22d2bff9550f8e865846fa6e503d8a8807d1b5e2cf113a636026c2fa233acf313a63bca0853fad91643cb9ce4df515c4
+DIST mongosh-1.1.7_x64.tgz 61852105 BLAKE2B c929806debbf73ba603e716c78a187626c963b6880fff1b8a853092a682c49dee9e07d51705ee365ac57f6e93bac59975d2268761ea473265460437d37dabff0 SHA512 9f89a0f50eae7a33e96d82017ae69c19ab67ff443c156ff3c809564e1a9bf41209c49bb2b04395aeba5c4604b8eb92b870bd6dc76eba0208e03ad0f30fe0a7c5
 EBUILD mongosh-bin-1.0.7.ebuild 864 BLAKE2B 9c1d6c5f0f38587bcf753059e94650906a81481d15db576731457569c7c97b86d9dcd3b7b22b66336a3c1cadffe834470edb07e9ffdd196c361607cd791b43b3 SHA512 76a64f68eec55d27bfb1a4b18ea9274c034b03ece390615a28eb8c0ee7f08de125cf395bb88dde272a162901066b30eeaf4ff5d75072e7e8533685be86f277ba
+EBUILD mongosh-bin-1.1.7.ebuild 864 BLAKE2B 9c1d6c5f0f38587bcf753059e94650906a81481d15db576731457569c7c97b86d9dcd3b7b22b66336a3c1cadffe834470edb07e9ffdd196c361607cd791b43b3 SHA512 76a64f68eec55d27bfb1a4b18ea9274c034b03ece390615a28eb8c0ee7f08de125cf395bb88dde272a162901066b30eeaf4ff5d75072e7e8533685be86f277ba
 MISC metadata.xml 589 BLAKE2B b1893b4e14b43ba803ce4a673a2550821cc2acacd0fd4e203bfc71522db394778de744ab28de46ae9e3dca3ec346baf751056d18dc43c978aafc860768057133 SHA512 3b74d3554cb6d32ed12b5bed010473b29fa6f2b39d68461b6bcfdac317be8569998e5d7abeaf1c20a34c30dd360da261690164bb22920666758d00494f0aa280
diff --git a/app-admin/mongosh-bin/mongosh-bin-1.0.4.ebuild b/app-admin/mongosh-bin/mongosh-bin-1.1.7.ebuild
index efad4f587482..99b15a3d48a8 100644
--- a/app-admin/mongosh-bin/mongosh-bin-1.0.4.ebuild
+++ b/app-admin/mongosh-bin/mongosh-bin-1.1.7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="${PN%-bin}"
 MY_P=${MY_PN}-${PV}