gentoo resync : 14.05.2020

4 files changed, 79 insertions, 2 deletions

diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 32be1f1128bd..f874e4ebcd93 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,5 +1,7 @@
+AUX argcomplete-1.11.1-fish-xpass.patch 1195 BLAKE2B 9ae2e5803359f2abca0b168e009afe8e98f8bc4529db2e4a5aafecce674f0cd4dd8e6e1354b19f00ed9f2afefc8038e938713872115613545c51933ffa6e4cf1 SHA512 0d187868ecf3428d0840fc97311c542c782a938cf039caa777e521a9073b525d3dd0a8e376ca9fe0dd4260313642854b21a0bd3d9c2f9a3fbbed8b4edd6ed3be
 DIST argcomplete-1.11.0.tar.gz 50555 BLAKE2B 7029b2bf442362f3dca804b75c32e000bf48e1ccee1e8e4e0e3c484d883a95f4c4774f7367b51f6310b653be457f3ad1ee5e4907cf9566c97a12ca85fbcb177d SHA512 30a594d7f3a9ad31b4a7c537bd81e6cc23bcb3861a9d2b9999c654c0f04b4f330bcb7dbab7fe7191d4b8bbbbecdb2ad3c1b8ab812c16bec880fe83733f75c5b6
 DIST argcomplete-1.11.1.tar.gz 50773 BLAKE2B 15c92929fc20a10a1f1e29cf8714b74dd9ab0ce11e7f77acd4b15a907ad885f944f8540a8b37fef13ea67ee8eb76107e1c72746434f2710ded7331830494ff50 SHA512 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce
 EBUILD argcomplete-1.11.0.ebuild 836 BLAKE2B 659835d8d5bd7656717849047d09a67b45b203159873a800ee38d0779d5852d965389a040f50d281559fcfeedf1a5fc554ea138bb61cc8586c34a77e68333a97 SHA512 f882eb57a2c9e4b7008f40ecf1cb0a354f36cbbd8f59a786036539dc75f288335ad83fd51011dc48daa134c7c3a18c4bfbd9b17bc1ad5309bcb480d79d1be8d8
-EBUILD argcomplete-1.11.1.ebuild 865 BLAKE2B 8a61895652ba0ac3f037c3767de2e53fd597a450ffeac0bc780812b5c0dd63638d84030921d9a2b66b861b983f4dc730e763c2fa2dc9b6932bee7d72abc3bd23 SHA512 c22e15d0b67eb0d9f207ce5b78d07c886880b7c30c239a967f01a35f08e32915ce4af9eb2d53cca17364bf801a0369ba18ce3d17ddaac580e52d0d167d57a359
+EBUILD argcomplete-1.11.1-r1.ebuild 921 BLAKE2B 9e7a8b52969cdcc6a7da8c78262357cc085aad08cc1aed34b24447d15a2a23762c9eb7005b3286ffc303807cf82bce9e7119798ffdfbfbc86513f1fc2beb8388 SHA512 34068f5291bbf61fa8b1c9901eb70dea93bd67811716ddf6af995279a4ab9924423bed9ac1f0b1de3b1d841300d981bc3da2f66296ca770834115d5db8946565
+EBUILD argcomplete-1.11.1.ebuild 877 BLAKE2B 1447f620cf4b54262454de2f128b3e74e82b41b805ae4f50656c314d02030b868c6b02d70facc2f7e0de5304a94e8cf892abfb4dd84621bc1bb443b0eaae94cc SHA512 bb33d42173aedcc74bdb8ee41c144b22e7214dc71e10c42a66ec6f23c4e5e176387c449cb1e3d3093e166f0766eca6c5836be6e609e6255a5212bbf7fa90b483
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
new file mode 100644
index 000000000000..a05a6d23449c
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
+	' -2 python3_{5,6,7} pypy3)"
+# pip is called as an external tool
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pip-19
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/argcomplete-1.11.1-fish-xpass.patch
+)
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/argcomplete/argcomplete-1.11.1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1.ebuild
index ec0a95fc0d3c..581d3ea7604f 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch b/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch
new file mode 100644
index 000000000000..575c8abbb744
--- /dev/null
+++ b/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch
@@ -0,0 +1,35 @@
+From 08bfc8a788e8081515d733e67be026d051c726f7 Mon Sep 17 00:00:00 2001
+From: Evan <evanunderscore@gmail.com>
+Date: Thu, 19 Mar 2020 14:55:07 +1100
+Subject: [PATCH] Remove expected test failure for new versions of fish (#292)
+
+---
+ test/test.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/test/test.py b/test/test.py
+index e91352b..2c34806 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -28,6 +28,8 @@
+ 
+ BASH_VERSION = subprocess.check_output(['bash', '-c', 'echo $BASH_VERSION']).decode()
+ BASH_MAJOR_VERSION = int(BASH_VERSION.split('.')[0])
++FISH_VERSION_STR = subprocess.check_output(['fish', '-c', 'echo -n $FISH_VERSION']).decode()
++FISH_VERSION_TUPLE = tuple(int(x) for x in FISH_VERSION_STR.split('.'))
+ 
+ 
+ class TempDir(object):
+@@ -1258,8 +1260,11 @@ class TestFish(_TestSh, unittest.TestCase):
+     expected_failures = [
+         'test_parse_special_characters',
+         'test_comp_point',
+-        'test_special_characters_double_quoted'
+     ]
++    if FISH_VERSION_TUPLE < (3, 1):
++        expected_failures.extend([
++            'test_special_characters_double_quoted'
++        ])
+ 
+     skipped = [
+         'test_single_quotes_in_single_quotes',