gentoo resync : 12.05.2022

4 files changed, 94 insertions, 0 deletions

diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 5d440a5576a5..fa209f0635d9 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,7 +1,11 @@
+AUX cookiecutter-2.0.2-fix-path-in-test.patch 581 BLAKE2B fbb1fb93f6735b23999191c4f7953c4609383994a6fde15b1597046925a6425594d38e29f4046fac10e882fa3f87fad5b1db48917d6d81299fc1e66b4de126dd SHA512 b4018c6402947f1d743b71ca01eba80fc6628a58e55eee67177b57ca025a8fb64c9ab8e6e0ca0d1e2b452d8ec623f3ea79ad7ed98a85e96c7229c678d86af4be
+AUX cookiecutter-2.0.2-relax-click-dependency.patch 626 BLAKE2B a016c0fd7e6126b79b017821cbb8fa2d57bb38fe7ec1fe2477c19fad14687d981735aad477cc89c486623f3f7d1e69c2807770dab7f820dd31be6aa23d858c98 SHA512 fe88d19feff05638019181c28da23f4eaa3a08d241312838bf951c8d6afa787d9f42a04f272cfc2328199d7a017e98846c17448688f5938d2c38f3335cd5fd40
 AUX test_cli-1.7.2.patch 579 BLAKE2B 8a77388ddac5bf4aaf1f2f3d950318a8f3af582df9bca9004a6701c7347ff81abea25b0c33586153198906358583a2acf8e17b20248ad98215c44411739df581 SHA512 d5906423db6cf8254c411a5f33f4f0c6b9b2760bace1db5e131ac8ec47b740d5b78feb7caa450efcec6cfb05997ff8038fb9e3fff81585d9b64b455b492e5a52
 DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1a5293330b8162da0f31895b0c3a58a4e0f36d66bee3da328a6b0a59fb5bd917a2f3f6fcf7772a4c63db5cd0030caae SHA512 15cc145f143b4cac6e78b12e1c29e191d0c1c96b0187db05a4c8aac18310a5cb31d912073674ef4c01727c9b5a3b67f8c508842cb625db338b4034faa52a4a4c
 DIST cookiecutter-1.7.3.tar.gz 253444 BLAKE2B 92ae74768c909ab8e2ae97ad87921ae0cbf24c417ab6985ac10eacd913981ee7756843e2588936174d3c04ecfa7a62077a6d4a323fdfa6d1872f3c84d943cbcb SHA512 a7dd7993ba40a084a719d553afbb8035f26976f38a3e8ee373c8074db64eac6bd7b711eca8cedbfd1050fc057a0b45409af4d59ff3bde57b344317dbee56f10b
+DIST cookiecutter-2.0.2.tar.gz 260840 BLAKE2B 008c4dceb1218ba7ead3846d24fc77253988a1fedfee929f30b4d2a63ee6ead9f2733e58e84f2d29840a5885b6655bb7d554664cec4175f49bd333b493c0f36d SHA512 0bd490e3f7067fbe87aeff35255ccac0d05d723c6505345856284612752a65e4e35a8e5fb4410f900d42e3998e68d7aa8bec402686404336dedbc456fd4cda49
 EBUILD cookiecutter-1.7.2-r1.ebuild 1301 BLAKE2B 49b746a2ea6120a7dd3cb451fefcc9db8a6240ad1604876c435a8bf9dbae4a72b12995584132b46465a25c01a7a2d8f7fde98e123f71e0971bb06754830aed59 SHA512 5716f7cf06d42e181695680e7a09779d9f1876f02f8fee0e0bb116f6d255bfde5c2bd7e1efd591d2ae8d27c579c2f875b32bb0fbf8599117925e8ff446aa2dee
 EBUILD cookiecutter-1.7.2.ebuild 1288 BLAKE2B 0b17d7cbc3ba94efed52318ffaf68e65f643e28bcbb232c963b9e7be48bfcde474f2c5c569d07964e374a56456376ff6435b6894aedb40f87d18d633d0ba8ba2 SHA512 1a331f871659bebfc8999556fb49d4098b1929404ed845fd4368db1f5b9c6652fe094071aca6dfcbe03fbf17f8ec318ba329ec3352788691b62134bcbf1086b1
 EBUILD cookiecutter-1.7.3.ebuild 1263 BLAKE2B a6ad9d143075c65cbde93a10882fbabd547e8c8e904161b5712d4c2fc76e3f1173ac1fdd629dcfe19b1e302684ca1e15efa0567bb8ba6f06798189514d463bd6 SHA512 850a02f099857f89ee7575e623deaceee1865dc902e2544a9b3a689691673717b488e840cc6c3c889a2c5d6c15a0e72a20b9e9ebb707d3730ffdeb30d26954be
+EBUILD cookiecutter-2.0.2-r1.ebuild 1501 BLAKE2B 14f9c25c1515f6ea0bc5582fa8ccab0a10c0871d2086b1946969035b8fa3c7dca2f157f8c5b21780bd902eee1db4b0d381a26d4a25b2a48244088ab2b334ba7e SHA512 0385c72cc3935f95b497f7da646fb89dac4c61708b643ad9b1d9e8c859c0fe29d96643062300b78d35f769029148f486d2487ecdb99d3edc5bb4ce66ad65153a
 MISC metadata.xml 449 BLAKE2B a0e82c0c0ef3700ca8deb860a6200ecb3c6e3cb48aa7e58851bb968919e7f29aead9ed05e5763f843b5add955219c5fbda69153aae58e179c0c4c051781cf486 SHA512 e533e02124fbaceb8ca527eba23cef06dfbdf7d055195bd9089c62bb0ccd0be5174511440f1b238b378680c5529b9fa3d604335514d461ec3199a25ee78f7f7c
diff --git a/dev-util/cookiecutter/cookiecutter-2.0.2-r1.ebuild b/dev-util/cookiecutter/cookiecutter-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..099096bf9ad7
--- /dev/null
+++ b/dev-util/cookiecutter/cookiecutter-2.0.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Command-line utility to create projects from cookiecutters (project templates)"
+HOMEPAGE="https://github.com/cookiecutter/cookiecutter"
+SRC_URI="https://github.com/cookiecutter/cookiecutter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	<dev-python/click-9.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	<dev-python/jinja-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-time-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+DOCS=( README.md HISTORY.md CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}/test_cli-1.7.2.patch"
+	# https://github.com/cookiecutter/cookiecutter/issues/1655
+	"${FILESDIR}/${P}-fix-path-in-test.patch"
+	# https://github.com/cookiecutter/cookiecutter/pull/1643
+	"${FILESDIR}/${P}-relax-click-dependency.patch"
+)
+
+distutils_enable_tests pytest
+# TODO: Package sphinx-click
+# distutils_enable_sphinx docs \
+# 	dev-python/sphinx_rtd_theme \
+# 	dev-python/recommonmark
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-util/cookiecutter/files/cookiecutter-2.0.2-fix-path-in-test.patch b/dev-util/cookiecutter/files/cookiecutter-2.0.2-fix-path-in-test.patch
new file mode 100644
index 000000000000..569ca97e5e42
--- /dev/null
+++ b/dev-util/cookiecutter/files/cookiecutter-2.0.2-fix-path-in-test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_generate_file.py b/tests/test_generate_file.py
+index 2ca30df..47e14ec 100644
+--- a/tests/test_generate_file.py
++++ b/tests/test_generate_file.py
+@@ -118,7 +118,7 @@ def expected_msg():
+     """Fixture. Used to ensure that exception generated text contain full data."""
+     msg = (
+         'Missing end of comment tag\n'
+-        '  File "./tests/files/syntax_error.txt", line 1\n'
++        '  File "tests/files/syntax_error.txt", line 1\n'
+         '    I eat {{ syntax_error }} {# this comment is not closed}'
+     )
+     return msg.replace("/", os.sep)
diff --git a/dev-util/cookiecutter/files/cookiecutter-2.0.2-relax-click-dependency.patch b/dev-util/cookiecutter/files/cookiecutter-2.0.2-relax-click-dependency.patch
new file mode 100644
index 000000000000..1ce7ea09f68b
--- /dev/null
+++ b/dev-util/cookiecutter/files/cookiecutter-2.0.2-relax-click-dependency.patch
@@ -0,0 +1,22 @@
+From 931dded761400c99ab70a1469e9c6e1c9abdcb8c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20La=C5=84ski?= <jakub.lanski@gmail.com>
+Date: Fri, 21 Jan 2022 07:11:57 +0100
+Subject: [PATCH] Restore accidentally deleted support for click 8.x
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 654010fa..d703c3c2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -10,7 +10,7 @@
+ requirements = [
+     'binaryornot>=0.4.4',
+     'Jinja2>=2.7,<4.0.0',
+-    'click>=7.0,<8.0.0',
++    'click>=7.0,<9.0.0',
+     'pyyaml>=5.3.1',
+     'jinja2-time>=0.2.0',
+     'python-slugify>=4.0.0',