[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

["Andreas K. Hüttel" <dilfridge@gentoo.org>]

commit:     2b32b247c3b59636c7d02c5bc24e4a18360ec9bb
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  8 20:30:48 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 00:37:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b32b247

dev-util/catalyst: drop 3.0.22-r3, 4.0_rc2

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/Manifest                  |   2 -
 dev-util/catalyst/catalyst-3.0.22-r3.ebuild |  82 ------------------
 dev-util/catalyst/catalyst-4.0_rc2.ebuild   | 126 ----------------------------
 dev-util/catalyst/metadata.xml              |   2 -
 4 files changed, 212 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index de8a439b0695..666e6e8b10ab 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1 @@
-DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2 SHA512 c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4
-DIST catalyst-4.0-rc2.tar.bz2 355924 BLAKE2B b14905e989674a9b547c6e7c83129e1bcc0b55cf64b86e0668532d067518d7a66dd0d494b9e1f84bf0ba9f6d57c79baeb39c35d7ffd9ef09602dd4c1be9a1bd9 SHA512 16ffdf74639bde74e043480d3c756121489033cf72850b38959701c53a689263b46bb10403496de222af00321b5d691aba7bcb41eafb8b5dcb1dd56dd658ace5
 DIST catalyst-4.0.0.tar.bz2 356445 BLAKE2B 1e3dc5fa5a3603b2c7e46277da00877ba34a4bd7a63a3e0f3728cdb9a76782e4dbb1b2f6f950e752e8814fa9da2db1e43280711bd7df44abe649c641760d9240 SHA512 332c9519fd59618c59367299ca1208280a973a0b99f03937831f9b39c643b090599733a0ad3735488de5b11d8581afd2b585a19bfb6a196c4eed899912388499

diff --git a/dev-util/catalyst/catalyst-3.0.22-r3.ebuild b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild
deleted file mode 100644
index 752cca6f7a24..000000000000
--- a/dev-util/catalyst/catalyst-3.0.22-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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 ~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
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5
-	insinto /etc/catalyst
-	doins etc/*
-}

diff --git a/dev-util/catalyst/catalyst-4.0_rc2.ebuild b/dev-util/catalyst/catalyst-4.0_rc2.ebuild
deleted file mode 100644
index 31c694a326bd..000000000000
--- a/dev-util/catalyst/catalyst-4.0_rc2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	S="${WORKDIR}/${MY_P/_/-}"
-fi
-
-PYTHON_COMPAT=( python3_{9..12} )
-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
-		)
-		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/metadata.xml b/dev-util/catalyst/metadata.xml
index d8a6b705dc27..2567283aae7e 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -5,9 +5,7 @@
     <email>catalyst@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="ccache">Enables ccache support</flag>
     <flag name="iso">Pulls in the depends for building iso images</flag>
-    <flag name="system-bootloader">Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar</flag>
   </use>
   <upstream>
     <remote-id type="gentoo">proj/catalyst</remote-id>