diff options
Diffstat (limited to 'dev-util/catalyst')
-rw-r--r-- | dev-util/catalyst/Manifest | 5 | ||||
-rw-r--r-- | dev-util/catalyst/catalyst-3.0.21-r1.ebuild (renamed from dev-util/catalyst/catalyst-3.0.12.ebuild) | 22 | ||||
-rw-r--r-- | dev-util/catalyst/catalyst-3.0.22-r1.ebuild (renamed from dev-util/catalyst/catalyst-3.0.9.ebuild) | 22 | ||||
-rw-r--r-- | dev-util/catalyst/catalyst-3.0.22-r3.ebuild | 82 | ||||
-rw-r--r-- | dev-util/catalyst/catalyst-4.0_rc1.ebuild | 130 | ||||
-rw-r--r-- | dev-util/catalyst/catalyst-9999.ebuild | 99 | ||||
-rw-r--r-- | dev-util/catalyst/metadata.xml | 10 |
7 files changed, 308 insertions, 62 deletions
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index a550f90a9b7f..6e330cfa382b 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,2 +1,3 @@ -DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb SHA512 8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda -DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309 +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 diff --git a/dev-util/catalyst/catalyst-3.0.12.ebuild b/dev-util/catalyst/catalyst-3.0.21-r1.ebuild index 39bbd3250f4c..0017e34636a4 100644 --- a/dev-util/catalyst/catalyst-3.0.12.ebuild +++ b/dev-util/catalyst/catalyst-3.0.21-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} == *9999* ]]; then SRC_ECLASS="git-r3" @@ -9,10 +9,10 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{9..10} ) DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 ${SRC_ECLASS} @@ -20,26 +20,30 @@ 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" +LICENSE="GPL-2+" SLOT="0" -IUSE="ccache doc +iso kernel_linux system-bootloader" +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 - !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) - kernel_FreeBSD? ( app-arch/libarchive[xattr] ) + || ( + 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? ( virtual/cdrtools ) + 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 diff --git a/dev-util/catalyst/catalyst-3.0.9.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild index 39bbd3250f4c..116f53d905a3 100644 --- a/dev-util/catalyst/catalyst-3.0.9.ebuild +++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} == *9999* ]]; then SRC_ECLASS="git-r3" @@ -9,10 +9,10 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 ${SRC_ECLASS} @@ -20,26 +20,30 @@ 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" +LICENSE="GPL-2+" SLOT="0" -IUSE="ccache doc +iso kernel_linux system-bootloader" +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 - !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) - kernel_FreeBSD? ( app-arch/libarchive[xattr] ) + || ( + 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? ( virtual/cdrtools ) + 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 diff --git a/dev-util/catalyst/catalyst-3.0.22-r3.ebuild b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild new file mode 100644 index 000000000000..49063325fdd8 --- /dev/null +++ b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild @@ -0,0 +1,82 @@ +# 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 +} + +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_rc1.ebuild b/dev-util/catalyst/catalyst-4.0_rc1.ebuild new file mode 100644 index 000000000000..7bc3d781337b --- /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..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 + ) + 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 2c7b1791e8cd..541b54e2bacc 100644 --- a/dev-util/catalyst/catalyst-9999.ebuild +++ b/dev-util/catalyst/catalyst-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 if [[ ${PV} == *9999* ]]; then SRC_ECLASS="git-r3" @@ -12,76 +12,77 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 ${SRC_ECLASS} +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" +LICENSE="GPL-2+" SLOT="0" -IUSE="ccache doc +iso kernel_linux system-bootloader" +IUSE="doc +iso" -COMMON_DEPEND=" - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}] +BDEPEND=" + app-text/asciidoc " DEPEND=" - ${COMMON_DEPEND} - app-text/asciidoc + 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=" - ${COMMON_DEPEND} + ${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 - ccache? ( dev-util/ccache ) + sys-fs/squashfs-tools-ng[tools] iso? ( - virtual/cdrtools + app-cdr/cdrtools + dev-libs/libisoburn - alpha? ( - 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? ( - dev-libs/libisoburn sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( - dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( - dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( - dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) - ) - - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) -" -PDEPEND=" - system-bootloader? ( - >=sys-apps/memtest86+-5.01-r4 - sys-boot/grub:2 - sys-boot/shim - sys-boot/syslinux - - amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) - x86? ( sys-boot/grub[grub_platforms_efi-32] ) + 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 @@ -89,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 } @@ -100,3 +102,26 @@ python_install_all() { 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 f89291ab2936..d8a6b705dc27 100644 --- a/dev-util/catalyst/metadata.xml +++ b/dev-util/catalyst/metadata.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>catalyst@gentoo.org</email> </maintainer> - <maintainer type="project"> - <email>livecd@gentoo.org</email> - <name>Gentoo LiveCD Project</name> - </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> + <remote-id type="github">gentoo/catalyst</remote-id> + </upstream> </pkgmetadata> |