gentoo auto-resync : 08:07:2023 - 22:23:22

7 files changed, 80 insertions, 40 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a10f0b3d2f6b..2dcac64bd5be 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 51fa4a79c0b7..4c1f3e18e9bc 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -2,5 +2,6 @@ DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f1
 DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2 SHA512 c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4
 EBUILD catalyst-3.0.21-r1.ebuild 1918 BLAKE2B e3a4746c61239f51104456b6bca825a7d53deb3d696e7ef3d366958d5db527b929171cdb51d93817cc97146dd7728fa81df71e157f06f136dd6dda81e34c7418 SHA512 589a9d89eabde0d71f2a23e1e0a424a3b6aa0f05c41ed7949afd42425316166c1b9369cfa04af1308a48e53ee31ca69d3e352139a79073eeb860c640b8f3808f
 EBUILD catalyst-3.0.22-r1.ebuild 1918 BLAKE2B 3f76b8f2578f78564fcf3797391aa9b8670cbf0d0f12a8f8013f8f81d4aba8176276734608e50185782393b8f5698851b8c11368130230576aa3b1c24903a0b9 SHA512 e1676547fd7053be871b2ceef7ff91c2bbdb0c3174a0277eb9032a8e0b7e7920877c28052f169cede7a3f9f03cd94c75cacf337372df69f5d94ce83929c6f7e6
-EBUILD catalyst-9999.ebuild 2444 BLAKE2B 1b1f38237731b8cfb71aa67be75ad21dfc1988d586bc8c7a775bd726dc58abdeb67088a781ffdea09a3ab2fd216f1571b351227cbe6b4112b1bf32e213cf7b4b SHA512 43824eb4e51573983051b7d4069add45dfbabebbb6ac5d2a7513b497f89bd3eae295b77883e04a15cd4c5b3c2d40a48ceafafa46d444fb150f37e9987375d32f
+EBUILD catalyst-3.0.22-r2.ebuild 1981 BLAKE2B 0d6fed0410c6189cdbf28149b05ce1a70998c475dd6675ffec61df1afc7a591b55df23b359c9e608c4e2bbe79d7305c6103d6686eb398f4aff1845baa4023701 SHA512 3e30a645370960278e2e8638fc0f3ed17b03dd6996decc3b95d9e733be484c44535c5ebe02abfa027bc7ce875fe0a08b6ebbd84220fb8696ddee9881edaad553
+EBUILD catalyst-9999.ebuild 2546 BLAKE2B 23d8661fa775b980a5c8c3b59cbce6d0f9319d4034a8cd2a918900d8220b6edee40145f6738738029ae515fff88f469632c10085e82664f61b917b94a234036a SHA512 b8edee291c3a70d9d33f01694738b96fd200ff3c6f82bc51c6f610d5363ab1a4b9371f53158ac8ba82014843038e68482389553489f89b7e624e58a6a9282fdd
 MISC metadata.xml 652 BLAKE2B 798bed21d492c2404691dab86198b443b72c43cb0a68f8476bb6d31167d19168930fd2969bdd384fcbae0efb0285b1a0e6927ce4eeeb3a995e617e598ff2cd6f SHA512 ae5920383badc6d4678d3efcffd55a20693c711fd12f358e12daae5f131b7daf4df5171ae73de93b908798772dac193b7564f8df352682f8e323aab1f1f66b13
diff --git a/dev-util/catalyst/catalyst-3.0.22-r2.ebuild b/dev-util/catalyst/catalyst-3.0.22-r2.ebuild
new file mode 100644
index 000000000000..2cde6cf92ea9
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.22-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="ccache doc +iso system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	|| (
+		app-arch/tar[xattr]
+		app-arch/libarchive[xattr]
+	)
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	iso? ( app-cdr/cdrtools )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+# Build man pages here so as to not clobber default src_compile
+src_configure() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 75ea55a47e53..06017c76d1fb 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,7 +13,7 @@ else
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}
 
@@ -90,7 +90,8 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
+# Build man pages here so as to not clobber default src_compile
+src_configure() {
 	# build the man pages and docs
 	emake
 }
@@ -113,4 +114,5 @@ pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		optfeature "ccache support" dev-util/ccache
 	fi
+	tmpfiles_process catalyst-tmpdir.conf
 }
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 724ab1ac6f66..4265d063c09a 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,5 +1,3 @@
-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-2.1.1.tar.gz 263100 BLAKE2B 6f054cc5e03328db3198443fe1f99bbef285fe03a1f9bf588b4b80d2314da10f6c998221cf6c41bff9c7fdc3c92680290468dfb070ade4a868ab80f941c1f6a4 SHA512 7833bfc0e6d2d32060e099a97a4477114c2e6f9b09f951c4a5519153fd7c1f9659c22596e443392272f4a6f80eabb2a346417bac56ea7ea4108fc6b36fc0072c
 DIST cookiecutter-2.2.0.tar.gz 270467 BLAKE2B 4bb308448e4e400902ac7b0af7a496065e5cb9a27959616bcb100451decc111d526b35158d96139e65ba6a8f1f71fc0bde2653cbfad1779c43ab9e703acb7253 SHA512 bd09e01e761dbbfd9f8c6f271aedda504edae1bc1e118906ea05984a38d262c7c7680210c6310c94bcdd19da4c68d74ce48849a01b88b5904dd6565309459cce
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
deleted file mode 100644
index 569ca97e5e42..000000000000
--- a/dev-util/cookiecutter/files/cookiecutter-2.0.2-fix-path-in-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 1ce7ea09f68b..000000000000
--- a/dev-util/cookiecutter/files/cookiecutter-2.0.2-relax-click-dependency.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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',