gentoo resync : 15.12.2019

5 files changed, 112 insertions, 40 deletions

diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 00c7655791c4..1d64231be136 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,7 +1,10 @@
+AUX argcomplete-1.10.2-test-pythonpath.patch 1563 BLAKE2B 0442a02ac2cfe15c6c7c78816c5281935c65ecec7a4c4c65ee7388b681de8102e8271a8bc6a8295c4a04ac24610d5e34ba20318e2003e281949d2f954184c68c SHA512 8b9efa077c2543f45425604a738924f0dcace1ba3924ea03d5e3b41a1e2a0271c8311a3e28206095c7cdea9ee5f65a6f213b44608b51951219eab12f16b752fc
 DIST argcomplete-1.10.0.tar.gz 47271 BLAKE2B 78a67b56d4871120d7384459c8ee591f42dee195143712c5c70d144d4116041d36ba687d4425beba6258b58d5a0a3ef847d10d6267f372282f37e953c6f92d80 SHA512 59e9cb721ddffd85d9f6461a70d50f9ba0795e36044cd46fa5fe707fb1be28c12f4ef531d2844020efc156300861b2ca8b73f56a116dd54bda0e52cf68c0a411
-DIST argcomplete-1.4.1.tar.gz 37219 BLAKE2B eff9c8b8a2996d2d57ca99516071a1c831f9e64be4efd72bf930dfe7fb2404db2aa03546e761ae73b5d22f8ebe683728c433ab837eee5c073616e7d32fa32010 SHA512 3e9fa64fca93baf14fddd653947ff0269004e8783de0567931dafb9e4d0dfff2e2450ef6df331a4d648f5ce1d817a422f52d8d30b94315cd54fd82102467ded5
+DIST argcomplete-1.10.2.tar.gz 50128 BLAKE2B 95a7f5a10b5d86e2b065b0d0563ff6281a5d6a0c9ea83b432492a00f67a1321c52cb9d5907868f36351f3057b21d215ab5a897a2ea7530d27925914a9e04eba8 SHA512 5e425f7ed042c429d8c01bdf11b6e721343229ec9fe0e3f9d4a6e49c40473a40286175a82f62530b822294e1fd8539e941c17673f2a0dd05216a243f1c2f4fce
+DIST argcomplete-1.10.3.tar.gz 50173 BLAKE2B 371baf55b65d49885398d3b2cbc2fa8abda30345643fd3f5700f92b76d4426a5f790835a83c158e47f9ee0f5fb6de8f8696528dc0701a1c8431f205bf2033703 SHA512 ea0fa18c161b395448fc09f5fad1190040ac05bb8c763c1ab775a95a10fcc88342f1b8594edcb07d56728014487f6ac54899b7e4cd16788cdc40cf14a4d60731
 DIST argcomplete-1.9.4.tar.gz 47471 BLAKE2B ba64acc1fb2ae336166504db3dd991227c4e2a04abc6909ecf6723c1d2ce82ea65453ca2dde97316da9eaaa5b60026a6c8e4f3d658f1ed8122ca4fd00723fca1 SHA512 831958dffc75c65e2a63918d1e6f5e1fa47ec753b913c978e8d1d30d430ab8fedf66c99d8df23b2abc547b42c27335ccf47811224322994316ca2225c85ce346
 EBUILD argcomplete-1.10.0.ebuild 676 BLAKE2B 6275bf40b609222d486d1573d7c3fb24e4c4d857af66c29819d8382f1a5c36ab8d298297de1ebcbbf679de3e2d02a152957dd74741cd161148e2d3dee931f279 SHA512 9d031bf58b76a54c4ada8fc1e6189c5eaf6ef0c53d23d129320bb955c0850bacfdac6dff4656fccdcaaec454cea80d466ec56f413aa4a91e0f7c92dfe82812e8
-EBUILD argcomplete-1.4.1.ebuild 959 BLAKE2B 7028b6136fee5572def13a0bbef23a4e9acf805a2088c2c11289b2a94cd7ec48ade2fd521c2db5b4bef6cc6ba9e4ee2d53bd7b8ea7614bd2e974554533645375 SHA512 8a114e18f7d238bf0e8a078977f066f6fefb50ee3e63f995bff9f2afd61dfec9caa70e05373c55be7ca11f54c558f9584064927a1951d548173802f8b2cb5ef7
+EBUILD argcomplete-1.10.2.ebuild 799 BLAKE2B 40f2681cf2e0bbe307b545064b32a70a0af59551d4581d2da0c7b5925f7e0bc2350334369897f97401276ece6d9bbd32fc69c571e24a1146164014dcee51439e SHA512 f884433cdcf1418215b34b90500422bda124bc2d2d9f0c3b8baab0eaeee9a5f178c2396ef659e46381753b9bfb3c2ab4ccb9606e5a8d3d0d9fc12ff08e2f1651
+EBUILD argcomplete-1.10.3.ebuild 728 BLAKE2B b1ef6de9b760408d52a4f3542294396fd4d3e96a7a368cc7662470699ddf16c57c49d2d2b72f9ef95d846622489fd209215aa6cf2d9a1b9f68bf24ddca5afd19 SHA512 c08c4825da6e908d58684419ee11f6175f98d931c3afc54833f86713a7859a6d245ae26fa80eab17e1c9d1ff01f5ec50cc9e70b48241a96732c17123607de373
 EBUILD argcomplete-1.9.4.ebuild 804 BLAKE2B bcc010bf6173d0a81750dbcac4ba0ca8a69432609dcb997ffdb1df226500a7e0b22f9c7f03f6ba4f3a7ee1c01edadf40f457f01c0f0c2cf1c7f20db46752d767 SHA512 056cbead37a9f84a86c0ccfd66a7c34cd72a382cd7abbf3e93cf31efe186399c90280f056a5c84e64113aa099cc4fa3b5b240da0b6fc31c0f5b935d1c48ef8df
 MISC metadata.xml 385 BLAKE2B d552f29df1805f58bef2bbaf91166ef43daebf78d36a079c9b93bee54a8165d33576e1f9c238e7070f64253e0ff71c9b6a18c63b3321b5a400f8d287b10e4a82 SHA512 125cccb9f83bacb68944c893b76905ca6db26c41f0e843bc3b2ed4fd8b18df4247696c0fb34acff77c41bd57fce517669878e071db6dcdcedde42f85cc012e5d
diff --git a/dev-python/argcomplete/argcomplete-1.10.2.ebuild b/dev-python/argcomplete/argcomplete-1.10.2.ebuild
new file mode 100644
index 000000000000..b4d81cae4366
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.10.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy 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="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# 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
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/argcomplete-1.10.2-test-pythonpath.patch
+)
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/argcomplete/argcomplete-1.10.3.ebuild b/dev-python/argcomplete/argcomplete-1.10.3.ebuild
new file mode 100644
index 000000000000..0e5076f4659a
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.10.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy 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="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# 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
+	)"
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/argcomplete/argcomplete-1.4.1.ebuild b/dev-python/argcomplete/argcomplete-1.4.1.ebuild
deleted file mode 100644
index db7e3c03234d..000000000000
--- a/dev-python/argcomplete/argcomplete-1.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1 bash-completion-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# purge test folder to avoid file collisions
-	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} test/test.py || die
-}
-
-python_install_all() {
-	sed \
-		-e "/complete /d" \
-		-i argcomplete/bash_completion.d/python-argcomplete.sh || die
-
-	distutils-r1_python_install_all
-	newbashcomp "${S}"/${PN}/bash_completion.d/python-argcomplete.sh python-${PN}
-}
diff --git a/dev-python/argcomplete/files/argcomplete-1.10.2-test-pythonpath.patch b/dev-python/argcomplete/files/argcomplete-1.10.2-test-pythonpath.patch
new file mode 100644
index 000000000000..18bd22cf1893
--- /dev/null
+++ b/dev-python/argcomplete/files/argcomplete-1.10.2-test-pythonpath.patch
@@ -0,0 +1,39 @@
+From 003cc45b1fa45c766e38c3230423a5662a00d371 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 21 Nov 2019 11:29:41 +0100
+Subject: [PATCH] Prepend to PYTHONPATH in test_console_script* instead of
+ replacing
+
+Modify _test_console_script() to prepend to PYTHONPATH instead of
+overwriting its value.  This is necessary so that it is able to find
+just-built version of argcomplete that is provided via PYTHONPATH
+(vs requiring it to be installed in system-wide directory prior).
+
+Otherwise, the tests are failing:
+
+  Traceback (most recent call last):
+    File "./bin/test-package", line 5, in <module>
+      from test_package import main
+    File "/tmp/argcomplete/test_dir_pychyg9vqx/test_package/__init__.py", line 4, in <module>
+      import argcomplete
+  ModuleNotFoundError: No module named 'argcomplete'
+---
+ test/test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test.py b/test/test.py
+index 98da760..ddf5a03 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -1185,7 +1185,7 @@ class TestBashGlobal(TestBash):
+         with TempDir(prefix='test_dir_py', dir='.'):
+             self.sh.run_command('cd ' + os.getcwd())
+             self.sh.run_command('export PATH=$PATH:./bin')
+-            self.sh.run_command('export PYTHONPATH=.')
++            self.sh.run_command('export PYTHONPATH=.:$PYTHONPATH')
+             test_package = os.path.join(TEST_DIR, 'test_package')
+             command = 'pip install {} --target .'.format(test_package)
+             if not wheel:
+-- 
+2.24.0
+