gentoo auto-resync : 07:07:2023 - 16:17:07

4 files changed, 8 insertions, 63 deletions

diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 4f06a05fda3c..724ab1ac6f66 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,10 +1,8 @@
 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.3.tar.gz 253444 BLAKE2B 92ae74768c909ab8e2ae97ad87921ae0cbf24c417ab6985ac10eacd913981ee7756843e2588936174d3c04ecfa7a62077a6d4a323fdfa6d1872f3c84d943cbcb SHA512 a7dd7993ba40a084a719d553afbb8035f26976f38a3e8ee373c8074db64eac6bd7b711eca8cedbfd1050fc057a0b45409af4d59ff3bde57b344317dbee56f10b
-DIST cookiecutter-2.0.2.tar.gz 260840 BLAKE2B 008c4dceb1218ba7ead3846d24fc77253988a1fedfee929f30b4d2a63ee6ead9f2733e58e84f2d29840a5885b6655bb7d554664cec4175f49bd333b493c0f36d SHA512 0bd490e3f7067fbe87aeff35255ccac0d05d723c6505345856284612752a65e4e35a8e5fb4410f900d42e3998e68d7aa8bec402686404336dedbc456fd4cda49
 DIST cookiecutter-2.1.1.tar.gz 263100 BLAKE2B 6f054cc5e03328db3198443fe1f99bbef285fe03a1f9bf588b4b80d2314da10f6c998221cf6c41bff9c7fdc3c92680290468dfb070ade4a868ab80f941c1f6a4 SHA512 7833bfc0e6d2d32060e099a97a4477114c2e6f9b09f951c4a5519153fd7c1f9659c22596e443392272f4a6f80eabb2a346417bac56ea7ea4108fc6b36fc0072c
-EBUILD cookiecutter-1.7.3.ebuild 1263 BLAKE2B 09277b6ed31b2471acc2507d388015d2bc21cb9477aa339a1a8ba8ca7ef04b86b0ad94bedf1044e490f4061d926784bb644d76170dd1a72f33598af42de4dc3c SHA512 476d8c2b3f5bce592e1c308478e76c4cf6f9faf40f6082d801031c9f7526ec2255d6d19eaeef7c63ff4de39740f497da52f3324ad5e5f068053c7f1b0530fa6f
-EBUILD cookiecutter-2.0.2-r1.ebuild 1499 BLAKE2B c43387d97db5b9c9d9ef0fb9224228d0740fb9e2d9e40e81f1f590f4c45bbb550bd4cfed408cec778211f846563b2382c23e638993e6e105dcb2c15d2f72a09d SHA512 c817aa7fc755b84bc07d281ea329aa775000a9a2ab37bd8a0f5d486311e788227fa18776b8b13787a62aff341645119afb2277395a3075709b1a3d12a2a249c3
+DIST cookiecutter-2.2.0.tar.gz 270467 BLAKE2B 4bb308448e4e400902ac7b0af7a496065e5cb9a27959616bcb100451decc111d526b35158d96139e65ba6a8f1f71fc0bde2653cbfad1779c43ab9e703acb7253 SHA512 bd09e01e761dbbfd9f8c6f271aedda504edae1bc1e118906ea05984a38d262c7c7680210c6310c94bcdd19da4c68d74ce48849a01b88b5904dd6565309459cce
 EBUILD cookiecutter-2.1.1.ebuild 1341 BLAKE2B f5e1c613379acbe76d7e95051dc07792a9fe93d6bef4f82a9e6e0d800b4274c653634daa4b8baf1c1bb43f5f12f2d1f3ef94b19e4ae0aebd1a81ceab0bebf669 SHA512 6b9e6c4cb4dbd6563b521f1ef9919dd6cc79b2de2e9ca04d7dd25b170908616f8ca3becfaf5136f92a682d5438ea5801840a6316987ede58d7b8a555abb99be2
-MISC metadata.xml 473 BLAKE2B 39058a17087b932747cc9b86662db3834dac391d53cec1e83fd00e654f26290c21d0290d21272e1680244ca4d157e61c4009062d0e3a161c1bc5c86873d15688 SHA512 59db6f3a98c67aa143f101501ffeefbf8d297b17332e7af10d1f64ca9de3f658cd59d1179f5ea9de48cba2075f05c9f88bd14f9122beb9b1945e2c26439dd241
+EBUILD cookiecutter-2.2.0.ebuild 1329 BLAKE2B 56ffefa5667296297af2b1d5d164462f08bce6913e7e5e904694bda2464f8f2369a03d1d8a7a4ac7d0e7e951aca43f7f2f6453f116aef3278257bff12ec87c0a SHA512 5d64d7b8b1c9d9f9aeb9c04833b86d67545f1bd15762294ac1e3d0aead57884506d8c63f6b2d7b34d59393c3a30f64b16676c95d3a5b35cbea583ebd30a77c1c
+MISC metadata.xml 478 BLAKE2B 26a0ef11397a266f9b64252c88ffa45466adae6959d3f95d3d7c815a4820430dbd5de1b66c3dae57d4a6b947d69efe57e9eea5c448d288e7ceca3ef8b507356d SHA512 22ac873e11794cd7b00ee09d8ce643e018214f36b5bbc5eb3b53ef65cfadc2a9d7c1ca1515ea22657c9f0aa4afe041e45262280f53927f29a317ce4d2fbbc83b
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
deleted file mode 100644
index 4226acde3723..000000000000
--- a/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-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/jinja-2.7[${PYTHON_USEDEP}]
-	<dev-python/jinja-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-time-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/poyo-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-slugify-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${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"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme \
-	dev-python/recommonmark
-
-python_test() {
-	epytest -o addopts=
-}
diff --git a/dev-util/cookiecutter/cookiecutter-2.0.2-r1.ebuild b/dev-util/cookiecutter/cookiecutter-2.2.0.ebuild
index 4ad9ba45ea65..f4dd1e02e7f0 100644
--- a/dev-util/cookiecutter/cookiecutter-2.0.2-r1.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
@@ -13,15 +13,16 @@ SRC_URI="https://github.com/cookiecutter/cookiecutter/archive/${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
+	dev-python/arrow[${PYTHON_USEDEP}]
 	>=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/pyyaml-5.3.1[${PYTHON_USEDEP}]
 	>=dev-python/python-slugify-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
 "
@@ -38,10 +39,6 @@ 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
diff --git a/dev-util/cookiecutter/metadata.xml b/dev-util/cookiecutter/metadata.xml
index 61e2dc802064..ddb58f880b7b 100644
--- a/dev-util/cookiecutter/metadata.xml
+++ b/dev-util/cookiecutter/metadata.xml
@@ -11,6 +11,6 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">audreyr/cookiecutter</remote-id>
+		<remote-id type="github">cookiecutter/cookiecutter</remote-id>
 	</upstream>
 </pkgmetadata>