gentoo auto-resync : 27:01:2024 - 18:57:08

3 files changed, 139 insertions, 2 deletions

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index bc11468fadb6..7069584ee0bc 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,7 +1,9 @@
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c
 DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2 SHA512 c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4
+DIST catalyst-4.0-rc1.tar.bz2 355575 BLAKE2B 373f3fa4a340e14461ab4881ae17cb8266e01a3d66fdffe37d648e5b816e95064e36360b3ced7dd4dc9f05c80eabdeb41dac506d4c156fa3072056b35a6e1074 SHA512 89660b603ecb6acf39b6bb7eb6e43f035c30b1610636586c84b9a75140963e2aefe4a9d97f465c15c293da9c4fc4146f0edce5685293a290d5d182e131dabb7b
 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-3.0.22-r3.ebuild 2133 BLAKE2B b4d2cc49991cdba68998064a94d9f165b424ab542dc0e2275db610b7289b53aaaa7f8bc8ac8d60383a68020afc3ad71904cd11934439d258d54f04a21a74b1b5 SHA512 11d1cda758912972796093397576d558848f185ac0629749e6b6733ffcbc4b2d5caaa808eec4e203cd62c98ff9519db9cafdd55a3d69d77430990b47c5e38d31
-EBUILD catalyst-9999.ebuild 2653 BLAKE2B 5e7b821756177ac7cb316aabf2fff87bf3481b9c05e1ac502ce397755fceb14a7c27d16c8a2ea5bfe9ac07243442313257014d1f2d87d2be00c49ecd01bb915c SHA512 34fb45502bec7583130d941d437cbfdb7feb470758d37892c26f4e8877ad51280ceebe6b33539b31ddc42fc14d91359b18221c6b5198fe7656239cc29eddc528
+EBUILD catalyst-4.0_rc1.ebuild 2790 BLAKE2B a36f28b51caad1706d6060444e3250450f22574476dcc62bab54c16b6a1136cf7345ecdb46795e2e8542ab0da20c1919949dd53b032a554eeccd8053913bb51e SHA512 4fa36ad7b5c1642649aa2cfcfc78e1d12dcfcd4b1d0414ecade8184d45768741820bd9d48938ca12397b98ad2197867d3e6c6eca8268baf9097cdb392019bfa9
+EBUILD catalyst-9999.ebuild 2744 BLAKE2B ff6931e1e5d2fdcb5a531de6ffee58bb461b3ee6701d46066acfc474c2d7b39d09e2b45688d92cea50db147ca898d6919a61bf7c1f07513dace494b43160bfcc SHA512 a614855b5c88193bcf196ed4ddd6174360ca9f92ca3b999fa84218c398c5d10b785a9963eb568e9bc5a605c3146280eedad39940abaea7a00f71371df0246133
 MISC metadata.xml 652 BLAKE2B 798bed21d492c2404691dab86198b443b72c43cb0a68f8476bb6d31167d19168930fd2969bdd384fcbae0efb0285b1a0e6927ce4eeeb3a995e617e598ff2cd6f SHA512 ae5920383badc6d4678d3efcffd55a20693c711fd12f358e12daae5f131b7daf4df5171ae73de93b908798772dac193b7564f8df352682f8e323aab1f1f66b13
diff --git a/dev-util/catalyst/catalyst-4.0_rc1.ebuild b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
new file mode 100644
index 000000000000..9bf921904e91
--- /dev/null
+++ b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${P/_/-}
+
+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/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P/_/-}"
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 linux-info optfeature tmpfiles ${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="doc +iso"
+
+BDEPEND="
+	app-text/asciidoc
+"
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	sys-apps/util-linux[python,${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-arch/pixz
+	app-arch/tar[xattr]
+	dev-vcs/git
+	sys-fs/dosfstools
+	sys-fs/squashfs-tools-ng[tools]
+
+	iso? (
+		app-cdr/cdrtools
+		dev-libs/libisoburn
+
+		amd64? (
+			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+			sys-fs/mtools
+		)
+		arm64?  (
+			sys-boot/grub[grub_platforms_efi-64]
+			sys-fs/mtools
+		)
+		ia64?  (
+			sys-boot/grub[grub_platforms_efi-64]
+			sys-fs/mtools
+		)
+		ppc?   (
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		ppc64? (
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		sparc? (
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		x86?   (
+			sys-boot/grub[grub_platforms_efi-32]
+		)
+	)
+"
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~UTS_NS ~IPC_NS
+		~SQUASHFS ~SQUASHFS_ZLIB
+	"
+	linux-info_pkg_setup
+}
+
+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
+}
+
+python_install() {
+	distutils-r1_python_install
+	rm -rv "${D}"$(python_get_sitedir)/usr
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	echo 'd /var/tmp/catalyst 0755 root root' > "${T}"/catalyst-tmpdir.conf
+	dotmpfiles "${T}"/catalyst-tmpdir.conf
+
+	doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5
+	insinto /etc/catalyst
+	doins etc/*
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		optfeature "ccache support" dev-util/ccache
+	fi
+	tmpfiles_process catalyst-tmpdir.conf
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index ab85324f0c98..c5bd9ff2d041 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -103,6 +103,11 @@ python_install_all() {
 	fi
 }
 
+python_install() {
+	distutils-r1_python_install
+	rm -rv "${D}"$(python_get_sitedir)/usr
+}
+
 src_install() {
 	distutils-r1_src_install