gentoo resync : 15.06.2021

17 files changed, 167 insertions, 102 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index aad198ef49ce..86b640a80c7f 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index eedda1ee7106..e65a838cf9c9 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -1,3 +1,4 @@
 DIST autojump-22.5.3.tar.gz 55429 BLAKE2B 3a2773669f81d1a54c01cce9fe75bc01609265998b035b4ba1aa064f1132acf852b59eb04ebfa744e628152f0ab478cbef24e5aff326bf84cec6e2c9348e8360 SHA512 d1dd3cbb67fda4e0a17ec5028b947faf46be8a95a6cd8418127b927f42bc95b71538a06658b38b479c77d147a6cd5e8cef77639ef538c7d449414c469c13f140
+EBUILD autojump-22.5.3-r1.ebuild 1973 BLAKE2B dc81d398100adbe54cd9bd7c838f1752ff7561eba3b63573a99918463a3bdd7ee30efad01316dd3bc0cfea243e93cc3dc4e01600b7feffd65de9754f54ffcdfb SHA512 cec85f2406aebbdf51ff51063493a9aa6caed244f011fdb51e3c8cfea8baacbbb139c48e58cfb68f8c13663f3fbea327de8d385eeddfcc65cf286f8d6eff969a
 EBUILD autojump-22.5.3.ebuild 1920 BLAKE2B 5ce4f10233f3c6e54124724ebc8ea3bb4ac41d377c870081ab68a614bdf10c7f81160e6eee1b62a0ec5198df4049f32112f31ed01fcd89c7637048829f1a1427 SHA512 beb84dfaa1c1dab86555fbb8421b0c12c38bb00124291dc4d10db14ade392440a65e5a45793ffb520d5ebca21d3dd58dc11a168a14c0cabfdcf849cddf77031b
 MISC metadata.xml 490 BLAKE2B 33ef64a70f2b0d3211861a9ae667a4ed930f850a0198661cd3371024ac6193c80d3121ca188f48cac4732741fdea08e918c8ef78161a921127ec82b1064dd1c1 SHA512 c7742421c4211de2b774bb6136261863bd69a93debe3f1ab4b921e9f19a7581ef2711fbe2090ada92b60f799cd6683368e48d974ab9698ae3c2b5f768cd34db9
diff --git a/app-shells/autojump/autojump-22.5.3-r1.ebuild b/app-shells/autojump/autojump-22.5.3-r1.ebuild
new file mode 100644
index 000000000000..a8d2faf130c3
--- /dev/null
+++ b/app-shells/autojump/autojump-22.5.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 bash-completion-r1 vcs-snapshot prefix
+
+DESCRIPTION="change directory command that learns"
+HOMEPAGE="https://github.com/wting/autojump"
+SRC_URI="https://github.com/wting/${PN}/archive/release-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x64-macos"
+IUSE="ipython test"
+REQUIRED_USE="ipython? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+RDEPEND="ipython? ( ${PYTHON_DEPS} )"
+DEPEND="${PYTHON_DEPS}
+	test? (
+		>=dev-vcs/pre-commit-0.7.0[${PYTHON_SINGLE_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	eapply_user
+	sed -e "s:/usr/local/share:/usr/share:" \
+		-i bin/autojump.sh || die
+
+	# autojump_argparse is only there for Python 2.6 compatibility
+	sed -e "s:autojump_argparse:argparse:" \
+		-i bin/autojump || die
+
+	hprefixify -q '"' -w '/usr\/share/' bin/autojump.sh
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin bin/"${PN}"
+	python_doscript "${ED}"/usr/bin/"${PN}"
+
+	insinto /etc/profile.d
+	doins bin/"${PN}".sh
+
+	insinto /usr/share/"${PN}"/
+	doins bin/"${PN}.bash"
+	doins bin/"${PN}.zsh"
+	doins bin/"${PN}.fish"
+	insinto /usr/share/zsh/site-functions
+	doins bin/_j
+
+	python_domodule bin/autojump_argparse.py bin/autojump_data.py \
+		bin/autojump_match.py bin/autojump_utils.py
+	if use ipython; then
+		python_domodule tools/autojump_ipython.py
+	fi
+
+	doman docs/"${PN}.1"
+	einstalldocs
+}
+
+pkg_postinst() {
+	if use ipython; then
+		elog 'This tool provides "j" for ipython, please add'
+		elog '"import autojump_ipython" to your ipy_user_conf.py.'
+		elog
+	fi
+
+	elog 'If you use app-shells/fish, add the following code to your'
+	elog 'config.fish to get autojump support:'
+	elog 'if test -f /usr/share/autojump/autojump.fish'
+	elog '    source /usr/share/autojump/autojump.fish'
+	elog 'end'
+}
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 42f303068015..2517982bb010 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,4 +1,6 @@
 AUX dash-0.5.11.3-check_nflag_in_evaltree.patch 1195 BLAKE2B 9624038cf627e68f65126cbac7499c34928827057656f35ac53132b697e886f4995b55361bad82fa76c9364a376f1c0056075da2eac8f82d2c77d544e5d103c2 SHA512 1b826edc306c109b3595ec38b07657df81bf6dc380e2390c482d668f97acbaeef670d22cbf04b88e005b49ebf1969169afbc6c1a51ae7d148ad2abc118158bc4
 DIST dash-0.5.11.3.tar.gz 244507 BLAKE2B 06d4bd9f4c93e76ddf895f5a0ebca0c18d9554f5d4fd30a948eafc862db0f4cd523f623dad75969ddb5f510ac85d174f3b3aac3726f9d3ca8fbdb4377715b244 SHA512 ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20
+DIST dash-0.5.11.4.tar.gz 240652 BLAKE2B 67c8c148448b8d95d09e5229953a88d52338d71c8e647977b92c12c56f19ffc62f24c775409231409bde9f7e5cf05f97f131a4967dd93fbdc16f539846467e61 SHA512 2344782b80f69b74d00eb153a918c2293eec2316825bf83c1eb4ff787eddf78f67ca3026cfce39b1db8d5ede69c7268951eec1e5711903f2306714b665f84160
 EBUILD dash-0.5.11.3-r1.ebuild 1802 BLAKE2B b4ed4b396ad07bc350e2eb78db47167051ac38a305b8c80fdfa3ba12677498c83840dd7d5b453e5c14a59f9666e463f3a2a89c716704ca684b3371e3fc09cbc1 SHA512 6062ceecdef0bd6b9042d36b2e77958477a499bf563eeb5e0cfdfc1dc0944d9f5e946bb2ff6d54c1a0d63a3f3081cdcfd4958dcbd8d129b858478d19af5f2847
+EBUILD dash-0.5.11.4.ebuild 1809 BLAKE2B 0d871ef3b3f8b2dcb92d046c88ae1fa7701b57be1ac572bb6d9a73ca47b35d1bd6dc761809cc4085b8fe714ae6b6bb44acdf09dc9f1c60e6dbaa28e3c78a47d5 SHA512 cb09c1f7a30caa3ac947c849e8edb33de5f05b190a72e3f9b776f5d82e4025562bcf1d5920be1f95771e8338577d905cf36c50bb863176e927fb7dc6151d05fc
 MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.11.4.ebuild b/app-shells/dash/dash-0.5.11.4.ebuild
new file mode 100644
index 000000000000..1c194ba16619
--- /dev/null
+++ b/app-shells/dash/dash-0.5.11.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Debian Almquist Shell"
+HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
+SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libedit static"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
+DEPEND="${RDEPEND}
+	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.11.3-check_nflag_in_evaltree.patch" #754267
+)
+
+src_prepare() {
+	default
+
+	# Fix the invalid sort
+	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
+
+	# Use pkg-config for libedit linkage
+	sed -i \
+		-e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
+		configure || die
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# don't redefine stat, open, dirent, etc. on Solaris
+		export ac_cv_func_stat64=yes
+		export ac_cv_func_open64=yes
+
+		# if your headers strictly adhere to POSIX, you'll need this too
+		[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
+	fi
+	if [[ ${CHOST} == powerpc-*-darwin* ]] ; then
+		sed -i -e 's/= stpncpy(s, \([^,]\+\), \([0-9]\+\))/+= snprintf(s, \2, "%s", \1)/' \
+			src/jobs.c || die
+	fi
+	append-cppflags -DJOBS=$(usex libedit 1 0)
+	use static && append-ldflags -static
+	# Do not pass --enable-glob due to #443552.
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		--bindir="${EPREFIX}"/bin
+		--enable-fnmatch
+		$(use_with libedit)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index 988403184451..eee7ae6f1661 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,6 +1,4 @@
 AUX hstr-2.0-fix-ncurses-configure.patch 2493 BLAKE2B 32e198aea7efd9416526feaf85e06029f05ec26aa982ceaacbb7f505ff8a4e7995a8222a3f033ca270b9f09ecf0465b56f9c3ec5b15dd202fa26e0f7e011062d SHA512 3c43179ce88a35599d44c60af5f4287383c0612eace067f2097e26bb2ab6d05573e8486ae83b9d1f6d222a65fb4466c64c4d0a34b15cce8bef4b75af0ec0b7ab
-DIST hstr-2.0.tar.gz 1242802 BLAKE2B 24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e SHA512 50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7
 DIST hstr-2.2.tar.gz 1246786 BLAKE2B f14091fea391dada79798c957b0b1094aff73b7ab4f8d9fd53c1070924556a7ff59f6f5a2e49b36dcd46ca6f93c5f8cd0fcfef07d5f7458d4bbe021546ccdc7a SHA512 c133edaa63a2be76356c08e52303d4133b11803e3ac6f915566a8d1b4651991b14d43974618061b2fc98c49e21b650ff6b9ac8168512e76566e327f90a550e4a
-EBUILD hstr-2.0.ebuild 686 BLAKE2B af341513a351df74714b6f3b49f47b2639f9bde238f59b4920ecd864d21712bb020f88a6068252a80f21c99cde5ce1e25b75c541a59e1daab0be6285178c7bc1 SHA512 d99bc7f83dd0229e5946cd284ceabb6efc20100692ca0664d8b728f1d2cebda5b23b432621f1d73a3da64ce2832be2c61fa2fdb2521802d4b7a3f46585160f4b
-EBUILD hstr-2.2.ebuild 703 BLAKE2B 1070254d71d89cb1d756b10821dc68be2f7ee5b1fdc2d7a4ca5da57f1f1359077b429460a04e1534877e2385e362c54cf3b67c6137f0b4006634f23822c0fdf8 SHA512 7d0d1e289ce09ebda054711598f38a04123a1dc50693272d7a617383e18033a5fea9dc74f657f15fdcbb1fb00a2a05c2850a2c7c618eec75ebc526d12a7b586d
+EBUILD hstr-2.2.ebuild 701 BLAKE2B c510eba37ab95bf6bfabe4cf2df2884c1438d5f904f97b6bc50d81dd5f2895bee647f877113ef175550e65de1dddf395eda72568f36a24e386aec1e385f960c9 SHA512 5269917863760e8c4524d3376a3ba6aaeadb2aabac6563b3188384456f38efdfa1c4d295615b2e72a0098522ca273763beb39245a307996de6fa01a94a40dcea
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/hstr-2.0.ebuild b/app-shells/hstr/hstr-2.0.ebuild
deleted file mode 100644
index 3c117b21f991..000000000000
--- a/app-shells/hstr/hstr-2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Shell history suggest box"
-HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
-SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CONFIGURATION.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-ncurses-configure.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:-O2::g' \
-		-i src/Makefile.am || die
-
-	tc-export PKG_CONFIG
-
-	eautoreconf
-}
diff --git a/app-shells/hstr/hstr-2.2.ebuild b/app-shells/hstr/hstr-2.2.ebuild
index 0033ce507cfd..2945e1ac8406 100644
--- a/app-shells/hstr/hstr-2.2.ebuild
+++ b/app-shells/hstr/hstr-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]"
diff --git a/app-shells/powerline/Manifest b/app-shells/powerline/Manifest
index c8f15b8424f5..70d5817d2fae 100644
--- a/app-shells/powerline/Manifest
+++ b/app-shells/powerline/Manifest
@@ -1,6 +1,5 @@
 AUX 2.7-ldflags.patch 837 BLAKE2B a1a873a898f3090dab586b968a755e1920ab20158237b9f375a9da2df18d87ba0b3cdf2f671a02ec3163f1ee95436a0c0537b2f7fccc0f8326f1fe25fdcc73c3 SHA512 85872900eeb44e46685b9a229bddd569d06d131ba4c187b44ee916a8ae1e705e10a47b87432c36d855021a0e0e3880c5fe80279a9694ac42f473a06ef3a33565
 DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517
-EBUILD powerline-2.7-r1.ebuild 739 BLAKE2B fb07fb71a4343006749ec1d9a258c9f04f9e95d91971cc4a80400b31c1f8f62fd49cf07c74f3d779528b16cf230b436ab63adf66ca05483985d1940f654868ef SHA512 9e68aff59eb030b811e6a2f7ab72fe8e311427b42081f8201af7e19030af4bf78416da2211d310ca166d898e5c380e78b6f5febe500f390453255725254aba3f
-EBUILD powerline-2.7-r2.ebuild 743 BLAKE2B 035e9e63160cfd5abb1baa833976aa0b6bf29da8086385da9b1ed23253d0e9d74b09c2860d070e0fbe1ba0015211489f840035787e9639ec358a91b4fde6d17f SHA512 e60febde502ed1cfb98cd63a74f85f9ae9f5797a87466b295894e4f95fcabb28be919418576867c8866b5e6006bb1943176745ea34df4f7ae3ebcd73a166476b
-EBUILD powerline-9999.ebuild 730 BLAKE2B 7739971c9d815976ff120b7bfc06764eda0c37be6f9f1023bf5d3d492acf01c603d8ffee35b7c27f437be94882f56865740a0949384ba17708ae28e7b8459af7 SHA512 9a40ded0f8583df00eed17296d38377989c34a9cfa1b98e9403ee230bf36438e21a57f2852fee709d17dfd847d6b13d99bea43449ee3bacf94f1173d9353fbc8
+EBUILD powerline-2.7-r2.ebuild 644 BLAKE2B 359c8d5f68663e467d7f3091f5fe263cefba225117002ebf4743fd306250a0d7e7d65718f2f3de9134fcaef7360630a187584161d56556ddc69e5a1245100e4c SHA512 d037ff4c841e000fe30e4b1c89cd5caaf1508fa443502959c9cc9b174b52f67bdd70b777940c563ffd6765c1794f510514ce3c3127b2ebb3f45b9cae89a8e046
+EBUILD powerline-9999.ebuild 631 BLAKE2B f33b2e051281b85477fcd023da008f83d3ce8be760bc3048d594ae6253faac4a11ee417ecfe7403700806b55b1194fb9662a4f386edb9253a77ab717b7fbdda0 SHA512 f7f7d54fa8b2a2ec46db898bfdd5bde71da7fc04ec283e278cc21193962da3cb298b59bb35e9eaabcf0fce9cc97875f10a44cde59b7d621b708bc4328d835506
 MISC metadata.xml 620 BLAKE2B 3c392d83a62425429cc89d0ac8dff925d98a392aa1d84bc0c7e84dd2871ded1566b0b66afe34b201672a51b23650cc2e18320c5e4e98b4b5042099340cae4b56 SHA512 10f3ce6affeed34d2b48a922a64eb2b1b1a628ed9d5e9a78f92eec3b264d633ce75b09e83e2cc3deae074ac27cd9f1bd2adcdb5f77e8deacdcd876d849977f60
diff --git a/app-shells/powerline/powerline-2.7-r1.ebuild b/app-shells/powerline/powerline-2.7-r1.ebuild
deleted file mode 100644
index ad7dbe200f01..000000000000
--- a/app-shells/powerline/powerline-2.7-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The ultimate statusline/prompt utility."
-HOMEPAGE="https://github.com/powerline/powerline"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/powerline/powerline"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}-status/${PN}-status-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-S="${WORKDIR}/${PN}-status-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/2.7-ldflags.patch
-)
diff --git a/app-shells/powerline/powerline-2.7-r2.ebuild b/app-shells/powerline/powerline-2.7-r2.ebuild
index 8ece4fd915b5..d6602b8ec24a 100644
--- a/app-shells/powerline/powerline-2.7-r2.ebuild
+++ b/app-shells/powerline/powerline-2.7-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
-DESCRIPTION="The ultimate statusline/prompt utility."
+DESCRIPTION="The ultimate statusline/prompt utility"
 HOMEPAGE="https://github.com/powerline/powerline"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -20,11 +20,6 @@ S="${WORKDIR}/${PN}-status-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/2.7-ldflags.patch
diff --git a/app-shells/powerline/powerline-9999.ebuild b/app-shells/powerline/powerline-9999.ebuild
index bee72318c1b8..5f68dc9da7f2 100644
--- a/app-shells/powerline/powerline-9999.ebuild
+++ b/app-shells/powerline/powerline-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
-DESCRIPTION="The ultimate statusline/prompt utility."
+DESCRIPTION="The ultimate statusline/prompt utility"
 HOMEPAGE="https://github.com/powerline/powerline"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -15,14 +15,9 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/powerline-${PV}"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}-status/${PN}-status-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${PN}-status-${PV}"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index e70353347168..de3d3360dc79 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,8 +1,8 @@
 DIST zsh-completions-0.31.0.tar.gz 247806 BLAKE2B 1923013feab9800f2dd0eef7b2263b0e252dd35b21d865e3f42f7946eeba2d1a882179e05fd16fdf473006646896ef87ca1da5cbc9bf69b52c66bcf99e82c010 SHA512 3f707e96c5d08103359304905cd36889d2b8dae82f0ea3781048a8fbd2f1db509abc1a181dc75215552214a59ee532d207897167fdb3850a5b1cc40e13b2b108
 DIST zsh-completions-0.32.0.tar.gz 273885 BLAKE2B 73400a13543f63c45fd32d78752f0294e3eaef9a63d41700aa004e445f123673c8bd8cba7aa3c0969fee0e188ea019b3f92cae2a6de341bf9b2f0f5842792785 SHA512 f1ef5dab3343675a9d82f6df0db4f541196d1904386becc94753b69a4515229ddcc133fe491c33e4a736ea0789c667f50306e60fbe5e61b97d0b3fd4946bf69a
 DIST zsh-completions-0.33.0.tar.gz 285049 BLAKE2B bcbbb2966a48f1b8c06e14f14432e147b4a4ca28c7d9769b4a108e3d4e005c37874c93c836c8636dabb860780077ccc5d9ebbd339f63c34fd16975ec5486a5c4 SHA512 8eaa7d9d2a58e8e2daa6ba7d9a8498e607b271bfd0484184482ec610e7f647ca72ba945f6897b2d619918304a18d048c4b079dae0993dc660cba61d4bce1e0a3
-EBUILD zsh-completions-0.31.0.ebuild 818 BLAKE2B fd9238a601a7fb790cb9736931ac8211ebd2b5cd8ec192286d3ab86917bc3c2d53dcc42f5b7d73b678c9912df61d4b69973236183cbc4d13ac971568714f372f SHA512 e02e1d59619fd1ddf24ba39f40dc92e4628438bfa7ecc45d3fd02af754c3376088160450bd6723809b1f20d291273f586d69a637436ee930cc3d0b25102c1c8c
-EBUILD zsh-completions-0.32.0.ebuild 817 BLAKE2B 0316487f3fcdff889bfec03a72c792468bce8cdc36dc1b0339f827045a4ec258d8bf4ad7f754244b5f8237465db9f606279405f218af6f0e78c8f5bffaddc379 SHA512 a71de29396fa8d94495d1ef00b53a844cbec0ae2dacaa851b73852987390f5b91970e8a1345a260e8ddff0a65b792369eb4723e49a86b0cd7e68c248193da215
-EBUILD zsh-completions-0.33.0.ebuild 824 BLAKE2B 0a600a312e772b208d2d5ed551a83a5932caa643cc9690f06d97c61566f4eb30099a8e895ac1e11c51034d1cd5359eb937a1b0689ec782d1e204c8ac859f3cab SHA512 05404cb95a57230944e4c83636634a7b1a34674dc2cad14243d86dde54453b9334461f9e348561a17d51113ea3c1da3960debb483a8427da6cedfce4449dbdf6
-EBUILD zsh-completions-9999.ebuild 824 BLAKE2B 0a600a312e772b208d2d5ed551a83a5932caa643cc9690f06d97c61566f4eb30099a8e895ac1e11c51034d1cd5359eb937a1b0689ec782d1e204c8ac859f3cab SHA512 05404cb95a57230944e4c83636634a7b1a34674dc2cad14243d86dde54453b9334461f9e348561a17d51113ea3c1da3960debb483a8427da6cedfce4449dbdf6
+EBUILD zsh-completions-0.31.0.ebuild 837 BLAKE2B d1a6f268a80437430bb72b9ab50f77b2b1cc9bd0195d27c6733d75bea171d216cce78a4046b3859a8b36d2bbd7a7d4eb55bfebe26c465aa04059907a16e5236d SHA512 612357ab603c4486f60fa50ce1bc0797a47ead14515d1c001fada2c5d1f90bcab29f309dba7d63a72ef9c9bf9e36ab13c379c0c1cb818ac5e113c5bed706e5f3
+EBUILD zsh-completions-0.32.0.ebuild 836 BLAKE2B 6172b3b5bc3cc5a48f95bcb5f4d40e7559f13b7b66560f1a5a631ce1abc26e9f3786ef4b93b26a9aab3895da634e87f33964478cb6943c0fad458c75a45e05a2 SHA512 3eb833a5ef15e00c67483162f327fb82722ef7c2f2bb2c8fa6d1f39ee41d05d80040701ad91daf703c03c5fe40cd84389be80815b1ef66a98ac319690d9fa155
+EBUILD zsh-completions-0.33.0.ebuild 843 BLAKE2B 5f4b722e370ba04fb38b570f9eaa4b313387310ebc0e7dd4fe608fe1edf4552fc92a1094a13852f412d59d84aec1d270b1f8d4ff9625c047c819e11c5d81aec0 SHA512 c73d14bf57cd00995305cde21ffdf69c6630321d9a4b8cd0cc2953543d4133681932147c203859dbcd4bf75aeb186ca6c574f065fe147c37409785b4d132198b
+EBUILD zsh-completions-9999.ebuild 843 BLAKE2B 5f4b722e370ba04fb38b570f9eaa4b313387310ebc0e7dd4fe608fe1edf4552fc92a1094a13852f412d59d84aec1d270b1f8d4ff9625c047c819e11c5d81aec0 SHA512 c73d14bf57cd00995305cde21ffdf69c6630321d9a4b8cd0cc2953543d4133681932147c203859dbcd4bf75aeb186ca6c574f065fe147c37409785b4d132198b
 MISC metadata.xml 287 BLAKE2B 4fc6f5facc5b1a0002e5910677c2a10bc05bad985b664bf1b0369c31803594b2360ee4b74c05ed08115b2c5c7f696fd5ef1fcca60df9744564b6051d59a2c142 SHA512 801d3f30ce96bb8acd812bb4e34f447717c886b05f6dc328dc375ed896f419a15f964f5a808682a9977cb0c12ead6a1cd78657f3f71e18d4a57c6616865558b1
diff --git a/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
index 888a5693eb24..e38191345983 100644
--- a/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.31.0.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="Additional completion definitions for Zsh"
 HOMEPAGE="https://github.com/zsh-users/zsh-completions"
 
-LICENSE="BSD"
+LICENSE="Apache-2.0 BSD MIT ZSH"
 SLOT="0"
 
 RDEPEND="app-shells/zsh"
diff --git a/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
index 04ae1f13c3f6..1c3212105a95 100644
--- a/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="Additional completion definitions for Zsh"
 HOMEPAGE="https://github.com/zsh-users/zsh-completions"
 
-LICENSE="BSD"
+LICENSE="Apache-2.0 BSD MIT ZSH"
 SLOT="0"
 
 RDEPEND="app-shells/zsh"
diff --git a/app-shells/zsh-completions/zsh-completions-0.33.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.33.0.ebuild
index 8ec707f726f3..ea096ae90a8d 100644
--- a/app-shells/zsh-completions/zsh-completions-0.33.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.33.0.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="Additional completion definitions for Zsh"
 HOMEPAGE="https://github.com/zsh-users/zsh-completions"
 
-LICENSE="BSD"
+LICENSE="Apache-2.0 BSD MIT ZSH"
 SLOT="0"
 
 RDEPEND="app-shells/zsh"
diff --git a/app-shells/zsh-completions/zsh-completions-9999.ebuild b/app-shells/zsh-completions/zsh-completions-9999.ebuild
index 8ec707f726f3..ea096ae90a8d 100644
--- a/app-shells/zsh-completions/zsh-completions-9999.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-9999.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="Additional completion definitions for Zsh"
 HOMEPAGE="https://github.com/zsh-users/zsh-completions"
 
-LICENSE="BSD"
+LICENSE="Apache-2.0 BSD MIT ZSH"
 SLOT="0"
 
 RDEPEND="app-shells/zsh"