gentoo resync : 27.03.2021

5 files changed, 0 insertions, 183 deletions

diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 9e450b635bf2..bb2715243a45 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,8 +1,3 @@
-AUX click-6.7-fix-tests.patch 1971 BLAKE2B 67c0b66f8668851eb48899aab98b4437846f65cec5389957645f5dd637b6e2a0fc2934856815a85b958c8326a8c33bb1c97bdf963d1774173051eb3ea05c7096 SHA512 fb864761ae8bea93096b9d090eef9cecef7707751d58fa40f846aeccaa8f59e8e01af38f8f79624b94c6ad081b9a388bef287b33b7659bdbbc292f1ae87abda6
-AUX click-6.7-support-sphinx-1.7.patch 1243 BLAKE2B d4939d49d43b50a3cddb77899ed2aae9ef6ede0941ca1e7e2d8d23d4f5afa0875df7d126adb498639839efb18790d021549018a355da3d4d71a77d4a6e80db79 SHA512 e497364ebf6243feb7281609d82ac73a73f1e399c1fcaf8a6c97a870c738d21605bcc98397adec7b4b0e1ebba209adf6eb1c6708c157e81e4baef1af1375e15d
-DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
-EBUILD click-6.7-r2.ebuild 838 BLAKE2B 608a2d022c059f918754df5755b29d848e8b30fb12122eecd5396e83775ddd2ea0ebae860ca2e2602d34c705de954a0c196b1770a29e38a6ec6ad37ba3d71265 SHA512 a1def50b7d240f7abfa5b1d42aa3b5126e35b6907ce03fe78b77610df8e1a7027833f82118310c9b5a3d2ca7942c87e3287b29cf1e42df447d4c48cb1deb6df0
-EBUILD click-6.7-r3.ebuild 975 BLAKE2B 435031938814afa6d19b056a1afbeec60d4e4bb230683ede187b49893bc0e42ab96f2afacff6c56dcae8ffed29a4549386bae975378f472914a2841d08c03cfb SHA512 7014fd220332c4280add5a57fbf09a8b79867ac254c7298ec681470653a305ff84b7016a889ca84f12e5e5ac1378f445c8bdb20f55ec85b6d5782d99f228776a
 EBUILD click-7.1.2-r1.ebuild 764 BLAKE2B 095cfcf03856893fbb93140a12ad1f52c6cd30f32367ff466ae798dc9fc6a1cee978eed1826685d698f8f4698fd3751d672083bbc8f067ce77de3304440b0759 SHA512 d606e2c5508c25eebe0cc72faccb248281651fb0d5574a5c5a6ef04af218c047a021f7ce1983fc42c4c89842626dceb6f366a421fdbc64023ada25e4d4d49f2a
 MISC metadata.xml 332 BLAKE2B a41bc7699360c666ce286a0d9a44779fab5afa6e6ce99efec2ee65a5d8d534bf3ccd65d4b23a2f5d40fc3b1c04c3c7e078a8889a3030909e7cc3992eabecfcb3 SHA512 de78734678a4bafe5175228f6df58210c65eaf016efec93e65441109b280725c4994406d0f21f2ee22ca0f9e1e27e27f76b3a1db724dbbd5b958fc8d8410126f
diff --git a/dev-python/click/click-6.7-r2.ebuild b/dev-python/click/click-6.7-r2.ebuild
deleted file mode 100644
index 4a02313d5fb2..000000000000
--- a/dev-python/click/click-6.7-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="examples"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# From upstream, can be removed in next release.
-	"${FILESDIR}"/${PN}-6.7-fix-tests.patch
-	# From upstream, can be removed in next release.
-	"${FILESDIR}"/${PN}-6.7-support-sphinx-1.7.patch
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-6.7-r3.ebuild b/dev-python/click/click-6.7-r3.ebuild
deleted file mode 100644
index 6a6ff97cc066..000000000000
--- a/dev-python/click/click-6.7-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	# From upstream, can be removed in next release.
-	"${FILESDIR}/${PN}-6.7-fix-tests.patch"
-	# From upstream, can be removed in next release.
-	"${FILESDIR}/${PN}-6.7-support-sphinx-1.7.patch"
-)
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/files/click-6.7-fix-tests.patch b/dev-python/click/files/click-6.7-fix-tests.patch
deleted file mode 100644
index 8a305e3665dd..000000000000
--- a/dev-python/click/files/click-6.7-fix-tests.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 20b4b1c0d1564ab4ef44b7d27d5b650735e28be3 Mon Sep 17 00:00:00 2001
-From: Armin Ronacher <armin.ronacher@active-4.com>
-Date: Sat, 23 Dec 2017 09:27:57 +0100
-Subject: [PATCH] Updated tests to work with newer pytest versions
-
----
- tests/test_basic.py   | 2 +-
- tests/test_compat.py  | 9 +++++----
- tests/test_options.py | 2 +-
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/tests/test_basic.py b/tests/test_basic.py
-index 045f608..960cd32 100644
---- a/tests/test_basic.py
-+++ b/tests/test_basic.py
-@@ -357,7 +357,7 @@ def test_required_option(runner):
- def test_evaluation_order(runner):
-     called = []
- 
--    def memo(ctx, value):
-+    def memo(ctx, param, value):
-         called.append(value)
-         return value
- 
-diff --git a/tests/test_compat.py b/tests/test_compat.py
-index e4ecdc8..9dacc21 100644
---- a/tests/test_compat.py
-+++ b/tests/test_compat.py
-@@ -1,4 +1,5 @@
- import click
-+import pytest
- 
- 
- if click.__version__ >= '3.0':
-@@ -11,10 +12,10 @@ if click.__version__ >= '3.0':
-         def cli(foo):
-             click.echo(foo)
- 
--        result = runner.invoke(cli, ['--foo', 'wat'])
--        assert result.exit_code == 0
--        assert 'WAT' in result.output
--        assert 'Invoked legacy parameter callback' in result.output
-+        with pytest.warns(Warning, match='Invoked legacy parameter callback'):
-+            result = runner.invoke(cli, ['--foo', 'wat'])
-+            assert result.exit_code == 0
-+            assert 'WAT' in result.output
- 
- 
- def test_bash_func_name():
-diff --git a/tests/test_options.py b/tests/test_options.py
-index 9dd8cdf..8bdda1f 100644
---- a/tests/test_options.py
-+++ b/tests/test_options.py
-@@ -199,7 +199,7 @@ def test_nargs_envvar(runner):
- 
- 
- def test_custom_validation(runner):
--    def validate_pos_int(ctx, value):
-+    def validate_pos_int(ctx, param, value):
-         if value < 0:
-             raise click.BadParameter('Value needs to be positive')
-         return value
--- 
-2.16.4
-
diff --git a/dev-python/click/files/click-6.7-support-sphinx-1.7.patch b/dev-python/click/files/click-6.7-support-sphinx-1.7.patch
deleted file mode 100644
index 1076c2decad1..000000000000
--- a/dev-python/click/files/click-6.7-support-sphinx-1.7.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2c7929511114494350e26d7b0c790fb8ca82f605 Mon Sep 17 00:00:00 2001
-From: Daw-Ran Liou <dawran6@gmail.com>
-Date: Mon, 14 May 2018 13:34:23 -0400
-Subject: [PATCH] Support Sphinx 1.7+
-
-Move: from sphinx.util.compat import Directive
-To: from docutils.parsers.rst import Directive
----
- docs/clickdoctools.py | 2 +-
- setup.py              | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/docs/clickdoctools.py b/docs/clickdoctools.py
-index c3db195..1dd47d3 100644
---- a/docs/clickdoctools.py
-+++ b/docs/clickdoctools.py
-@@ -15,7 +15,7 @@ from docutils import nodes
- from docutils.statemachine import ViewList
- 
- from sphinx.domains import Domain
--from sphinx.util.compat import Directive
-+from docutils.parsers.rst import Directive
- 
- PY2 = sys.version_info[0] == 2
- 
-diff --git a/setup.py b/setup.py
-index b78403e..f1bcdcf 100644
---- a/setup.py
-+++ b/setup.py
-@@ -24,6 +24,11 @@ setup(
-     maintainer_email='contact@palletsprojects.com',
-     long_description=readme,
-     packages=['click'],
-+    extras_require={
-+        'docs': [
-+            'sphinx',
-+        ],
-+    },
-     description='A simple wrapper around optparse for '
-                 'powerful command line utilities.',
-     license='BSD',
--- 
-2.16.4
-