gentoo Easter resync : 12.04.2020

4 files changed, 9 insertions, 25 deletions

diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index dba2b84d503b..ad65a0f01d99 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,8 +1,6 @@
 AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e77b79aa5095a428c29a2420ca0308b88ede5070d827fcd5ac5815895f9dcfa846dfd2d983640134343e89b2079ef37 SHA512 6e32001e2f3fdc97da37f82dbe37ab293b1a7489d5c533f276583161028384da623bc3ea51e90e7440a866c28c6828eed272e27821a3f101d0e3e635f809efd0
-DIST isort-4.2.5.tar.gz 36361 BLAKE2B 7133ab999200412bc880a5413de81ff0b7718383eaf7f50dd1ca12da4d7ee24f8d47af60e7416ca6898a32074779c4f293d897a0f7d62c2539b10a686484c121 SHA512 ddc8e859bb421e4179315d74896958c8279394d42a75494db5dc22c58422994aa249b63c03645626a021ccf9142941bde51ad400256ab1c6be29da8110375f40
 DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
 DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
-EBUILD isort-4.2.5.ebuild 461 BLAKE2B fabee0ab83710838eab0ddc2bb3c960ddc04f0201e40de119a561522386e5d3243add10bc04d1aedf0ee294aab1c59876fcf2238afbbdc043013095ab572b781 SHA512 a53c7c31cbd0137ef75cba1a750879304d8f587fc4b171c8a840998e4d313ad9298d030103aa2cbf74d087df535f87fc59c850aa07ade3ce864a32dc868d71c7
-EBUILD isort-4.3.15.ebuild 462 BLAKE2B 63bac068380b5466dccdafcba4f0b1e39a83e6c290b6773c2d6d099db0a021a2fe312c03628df9177292a8581f5b82815c2b9fae0988616ca35833dc5f111701 SHA512 2144ca66ebd8f57a53e2f8bfdac65c0376580ecf2da35e03510025ea840c3a238ffd9b562a8039fd119e301353900056969223de135fb30bcffb0f5c2f258bf2
-EBUILD isort-4.3.21_p2.ebuild 826 BLAKE2B ef04ada9e6d6cf0ee294171fb523f420058276e0cfa124e22a396872ea2fb8f40efd27ea8d29dfb0945930cafc9d84e35af6283d8c0463faf0c016b6cb640de0 SHA512 27f57fa849b4bfa5c7102161b97b8aa763a9f74fd17773ef7178d69ca81868045f5dc90b420eec63f44f63f479e0e81ff981597f1fd352441b47e1f276cdd328
+EBUILD isort-4.3.15.ebuild 447 BLAKE2B 05640fd2f8789ab7457e0081519c72d6998623a61d6f5c8c6e2a7d2b7c7928949a578f283723d89c6a63f08e7d81670fba6f9be2905a033bab32a23dbcd35955 SHA512 b719b23a49a47897d115d38448ec3ca32a1f3e762113ac2f7b1e0493413afa2127599ff0282eec818ad914b15c9093055657870ac7e4d329a53428fe4087acce
+EBUILD isort-4.3.21_p2.ebuild 818 BLAKE2B b554c5bcbcc8cceeceac7f17aa9068d2de472192aa7ee48e90fc64d6bac65bf9ca146ad28934ea916ec5d56ed111b890d5f26d10933d16b89d61214afbfc9fca SHA512 d72459336b672d36b61be2523e97a4ea99fe3991688b2e80027c236661d16c4839b9973cc016ba0768c88d2e10e5d5495ca729eb94eb31766655e807514f06a7
 MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
diff --git a/dev-python/isort/isort-4.2.5.ebuild b/dev-python/isort/isort-4.2.5.ebuild
deleted file mode 100644
index 88be3a1b46ee..000000000000
--- a/dev-python/isort/isort-4.2.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
diff --git a/dev-python/isort/isort-4.3.15.ebuild b/dev-python/isort/isort-4.3.15.ebuild
index 0c4b6b3ae1ac..fb2cabcf1a32 100644
--- a/dev-python/isort/isort-4.3.15.ebuild
+++ b/dev-python/isort/isort-4.3.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A python utility/library to sort imports"
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
diff --git a/dev-python/isort/isort-4.3.21_p2.ebuild b/dev-python/isort/isort-4.3.21_p2.ebuild
index e25a7d403960..67a94215982b 100644
--- a/dev-python/isort/isort-4.3.21_p2.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -20,8 +20,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86"
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/pipfile[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep '
+		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+		dev-python/futures[${PYTHON_USEDEP}]
+	' -2)
 "
 BDEPEND="${RDEPEND}"