gentoo resync : 15.12.2017

3 files changed, 55 insertions, 0 deletions

diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 5292be2e1a28..f591b80b9b57 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,5 +1,8 @@
+AUX plumbum-1.6.4.patch 1521 BLAKE2B f65f963fbba8f8e585b8bcaa99f3cc377f485867994294d0116380d61d05fa0ff509f2df07e869fc12fb817d8c0ae3c97c9c71cc65b3e028eff708ac82565b09 SHA512 cd054cd97f055c571b627bdb54b4644dca4653f06efd9022a74cbd632486f1fe3cec65969168895aba85bed4bb0e060bbaf11009d31d21d9537dca5b4f29a539
 DIST plumbum-1.6.0.tar.gz 77092 BLAKE2B 795101098614dfe547e884fb3c4f9e7947a65995a5223d89a83aedd91ed7d4eac25dd926d022e32384430620561128f9e957d05af68c463a65b58e8a86ce2717 SHA512 0be9461720cb03c56aff8f56705b1753013e02df4b4d3dbc7e8379930b9efb3822df587483ca708f3a16f08d625f03459f8fe377bc50e59439d05f73669003cc
 DIST plumbum-1.6.3.tar.gz 82109 BLAKE2B 363b0f779838fb341f67aaaf60f037cf978813ea10b5f3f4c0eb7cfe8360e64e75678740c8c0a669466f31075079de4d7e9b4e7dc90374faf52671689cc7bbbb SHA512 998148db310d3ede1a641bd0e8875a5b3853a08329d5bc68eea163f9eaa1e0e05548f544084d72ad2d233fd9b9bd1ed7518b0f8047e0e737a7a014fa0cd8fe1f
+DIST plumbum-1.6.4.tar.gz 88041 BLAKE2B aadd929fc6878bd49ac3169b1b4235140d08ff452eb5eb61e43f9ad869ea867916d76ee7f2befb68e67cdd9d9b19c364d6e02810866f6ba5022cf7064d240786 SHA512 26110741251d75ae9b47f522aba38e8af7a658d22900b1487b3f6e4e6971e4682283003e674f40345e14dd4103f6d485fc569348cc1245ac0440cd04688abe99
 EBUILD plumbum-1.6.0.ebuild 391 BLAKE2B d8680d4b61db0c7825bc00e3a576e10f68998a8a2b38f94ca603567383779333387228f6c0ac2924ecb10a250cb363ad5f4201451a786c004883d424702f8eef SHA512 07383a75c380b63f9917e8513ae670006cbf9f6e8d6ad8f49b4051f5ff2fca0f5ac2e641043e2314cc938f2eaedd42704282d5ec3fdade353abb542cb80c5c5a
 EBUILD plumbum-1.6.3.ebuild 395 BLAKE2B af89183d0fe0ebab91dda65264e409f3971c8dbdd1f956a9348b498e3d06df9586ad5a86dcccd184fa2c53f158af1c5ceb82646c4a011a4b0e3f4457e644b252 SHA512 7e66d384bae66ec29d77c7a396d71a56a2cc87342e925a5afda6958b770b8f06ef60b5edb0a7fdceeedc9bd9a2bcd84a3aab4c2658b2818a3dbad1dff02b43f9
+EBUILD plumbum-1.6.4.ebuild 490 BLAKE2B 6daa3c8117942111bffdcf4f82a2e792fce902a8b620413d9e760a1c1ac011769727be7ad4647ce33397709d24a111b59d3848efc0ffdea2b0fad21f3ce4b238 SHA512 988e9c173916192c23369da838f31064cb9908718e256f9bba83665f600b2216ff2ec5af4c0be0c1873c1e70a78dcc24e9d02b3f1c421c82ef2959dee4537730
 MISC metadata.xml 667 BLAKE2B 831314c0a117c620e7d17f7023d0bed99deba80cf0d84852bd972ca788aa8e4ed6d959938fe5c7592db95b13d600a86b7928aa46a58d65cf1b9e48a2209b5c61 SHA512 c44ac643857f1e096d33e7ac3ae9a5a7e135861b7f6e26a3b889d9cc4fd5d302ac9657520c73cdc618b95ee31f168cb2e5704c1bf1b7710b859e57a2abafa812
diff --git a/dev-python/plumbum/files/plumbum-1.6.4.patch b/dev-python/plumbum/files/plumbum-1.6.4.patch
new file mode 100644
index 000000000000..ce18d7afe09d
--- /dev/null
+++ b/dev-python/plumbum/files/plumbum-1.6.4.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 000000000000..8ad4fd785674
--- /dev/null
+++ b/dev-python/plumbum/plumbum-1.6.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="A library for shell script-like programs in python"
+HOMEPAGE="http://plumbum.readthedocs.org/"
+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 )