gentoo Easter resync : 12.04.2020

5 files changed, 2 insertions, 75 deletions

diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 357d53d4a002..808b3e3f1527 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,8 +1,3 @@
-AUX plumbum-1.6.4.patch 1521 BLAKE2B f65f963fbba8f8e585b8bcaa99f3cc377f485867994294d0116380d61d05fa0ff509f2df07e869fc12fb817d8c0ae3c97c9c71cc65b3e028eff708ac82565b09 SHA512 cd054cd97f055c571b627bdb54b4644dca4653f06efd9022a74cbd632486f1fe3cec65969168895aba85bed4bb0e060bbaf11009d31d21d9537dca5b4f29a539
-DIST plumbum-1.6.4.tar.gz 88041 BLAKE2B aadd929fc6878bd49ac3169b1b4235140d08ff452eb5eb61e43f9ad869ea867916d76ee7f2befb68e67cdd9d9b19c364d6e02810866f6ba5022cf7064d240786 SHA512 26110741251d75ae9b47f522aba38e8af7a658d22900b1487b3f6e4e6971e4682283003e674f40345e14dd4103f6d485fc569348cc1245ac0440cd04688abe99
-DIST plumbum-1.6.7.tar.gz 90911 BLAKE2B fbd7399962288826c9b1aa9eda60e93d2257b02c8d14adda02cd1c6a895941b0adda8cb844b2137e3235dbf5ca7ebfe7e272d3cfafe7e3df8ab3668be75a4fc3 SHA512 70a80a77eb64e483cf0444745a4c05c8599711ea578a61fe3969edceba4a9f68ca226c6d8cb65995ad36f3d6423326af887816c5ffd337f20279dfff47cb59b4
 DIST plumbum-1.6.8.tar.gz 309449 BLAKE2B 4112cb99852ebc7e4465ec54bf35a1352ff41a7ac084d3561d23f6da62fb1b25fa65a1f6f118564a677e6b6fde57b52f964a07fb71cae40b7d831ceb1505738e SHA512 2e834b6024ed1892eb91ede95f70641288a76911d58fcb24edaed59d3e54afa72e0533b4510896ecdd5077f70d4d60d9ceb06510c3e6d469afb1befae1961af1
-EBUILD plumbum-1.6.4.ebuild 481 BLAKE2B 89b712f2c90dde44674014302cd04a6a3e87c9b2d38a0d37639413b7acb3c56924edc0c4affc8697884c3c36b1cfbb4b5e6b66e1c0cce1204560843f84622f09 SHA512 413e6e804c0d43c96ce713a00369e5ab9cc08999fc55e3fa8a8b0b9e390d6ee4eb5f91843f78736147abf78a4e3faf5f558f3fa5f4974e8dbdc3ff320cf48f6b
-EBUILD plumbum-1.6.7.ebuild 448 BLAKE2B e44fd98485a3813072e441036cdd8bf7c813aeb8bffd65485910d6ea6769a09e6947d4eab74049a43abfa5c5687ee9ff57e7df1b149e3ea60c42b301d82b30c8 SHA512 768ceda2a1e184d0f5e24ee4e4400f4be22a212353132af06d3624174d5577557cc5218adfe21d99a1bcc3cd4731c98bf6b5a5934df5062267b764edda751126
-EBUILD plumbum-1.6.8.ebuild 523 BLAKE2B 7ea3db4596e93a8bd221425fe0587ecc518fa805729acd118ce05cd87b310ade9e86c71aabd7065df4fe2c42b9ee606c9dc19b9457592db7f0514f5fa56f7c11 SHA512 f02f6d9321594ec7efa31b8b75753110c24e3119cf4db7ea95b28d5b98b2a3ec6a4274237ad9b85cf73912a105c386cd2d5c8276466686a2e37f1836ef995dea
+EBUILD plumbum-1.6.8.ebuild 521 BLAKE2B ee9fe1cf0899628d5c9195355836682f6ade18f2f0230cc9db7ce892f3ac263d3402181437d16d6b979660ed55ddb13b1c5905885bba6cccbbdb5f0cbb6d313e SHA512 c4e477bc89cb1156dfe1e777e4a230cb143fec85a693ccb0163b7189ec870f70dfb3333b0f8f96411110e104c92bba05097aed2517f807bbb3d153d477e92810
 MISC metadata.xml 728 BLAKE2B c0f017b6d1dd00480dfbf37aca4f0326fab5f1bcb2c822709b1151521723450528c87873ca098af4f1e7909bb8434451da0d7cbd1ca1494aebffe932f3f8f498 SHA512 1dcf9374ca209dc5ae11fdcc58c9c7493b77be98d0d3d80953e2d0886cc1ba053fa5ebc05bcd4d5b14dc15a070b3df2bdb8c7056cd482bb21cb9901b372cd402
diff --git a/dev-python/plumbum/files/plumbum-1.6.4.patch b/dev-python/plumbum/files/plumbum-1.6.4.patch
deleted file mode 100644
index ce18d7afe09d..000000000000
--- a/dev-python/plumbum/files/plumbum-1.6.4.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -r -U2 plumbum-1.6.4.orig/plumbum/cli/image.py plumbum-1.6.4/plumbum/cli/image.py
---- plumbum-1.6.4.orig/plumbum/cli/image.py	2017-11-08 21:20:49.000000000 +0700
-+++ plumbum-1.6.4/plumbum/cli/image.py	2017-12-15 15:45:16.184943092 +0700
-@@ -3,5 +3,6 @@
- from plumbum import colors
- from .termsize import get_terminal_size
--import . as cli
-+from .application import Application
-+from .switches import switch, SwitchAttr, Flag, positional, Range, ExistingFile
- import sys
- 
-@@ -75,17 +76,17 @@
-         print(colors.reset)
- 
--class ShowImageApp(cli.Application):
-+class ShowImageApp(Application):
-     'Display an image on the terminal'
--    double = cli.Flag(['-d','--double'], help="Double resolution (only looks good with some fonts)")
-+    double = Flag(['-d','--double'], help="Double resolution (only looks good with some fonts)")
- 
--    @cli.switch(['-c','--colors'], cli.Range(1,4), help="Level of color, 1-4")
-+    @switch(['-c','--colors'], Range(1,4), help="Level of color, 1-4")
-     def colors_set(self, n):
-         colors.use_color = n
- 
--    size = cli.SwitchAttr(['-s','--size'], help="Size, should be in the form 100x150")
-+    size = SwitchAttr(['-s','--size'], help="Size, should be in the form 100x150")
- 
--    ratio = cli.SwitchAttr(['--ratio'], float, default=2.45, help="Aspect ratio of the font")
-+    ratio = SwitchAttr(['--ratio'], float, default=2.45, help="Aspect ratio of the font")
- 
--    @cli.positional(cli.ExistingFile)
-+    @positional(ExistingFile)
-     def main(self, filename):
- 
diff --git a/dev-python/plumbum/plumbum-1.6.4.ebuild b/dev-python/plumbum/plumbum-1.6.4.ebuild
deleted file mode 100644
index 5c555acbc6a2..000000000000
--- a/dev-python/plumbum/plumbum-1.6.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A library for shell script-like programs in python"
-HOMEPAGE="https://plumbum.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/plumbum/plumbum-1.6.7.ebuild b/dev-python/plumbum/plumbum-1.6.7.ebuild
deleted file mode 100644
index 365b8b150eee..000000000000
--- a/dev-python/plumbum/plumbum-1.6.7.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=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="A library for shell script-like programs in python"
-HOMEPAGE="https://plumbum.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-python/plumbum/plumbum-1.6.8.ebuild b/dev-python/plumbum/plumbum-1.6.8.ebuild
index 24627182d1dd..538c1c7c7928 100644
--- a/dev-python/plumbum/plumbum-1.6.8.ebuild
+++ b/dev-python/plumbum/plumbum-1.6.8.ebuild
@@ -12,5 +12,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""