gentoo resync : 15.06.2021

4 files changed, 9 insertions, 51 deletions

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=""