diff options
Diffstat (limited to 'dev-util/catalyst')
15 files changed, 280 insertions, 644 deletions
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index 5c807b531981..6e330cfa382b 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,5 +1,3 @@ -DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a -DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8 -DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749af96a1de6401749131a40c2f1f70975d0c449e1a116623c1aec4d3302670ac058fffd80c4f546fae0609d0c3b7f SHA512 02092b39c70095ab49db28c3289a5d3eb4f73cb3aeda79b3e707cbe2710761cf0060493da7d8a5098e1453320b65654bbe34dd37d5f07623fa90d52579869070 -DIST catalyst-3.0.3.tar.bz2 878309 BLAKE2B 38cba740718a034c104d272aa24fa6964a8dd7fc77d5ccbb481308bb0a38c01d3f0d64e48c1708cab4a723b5a4e0f23727d1c2a0dd0ae4832810e09f76aa335c SHA512 26024dbea3afbc843563a0bf2cd68cc953818caccdf8a42c45ac1df25bd396064a604787807e2db847b4467e9a19df6b2f746eb178d99cbe79889070a2fc4b8a -DIST catalyst-3.0.4.tar.bz2 873281 BLAKE2B 8177cee09402ccd02343766facbac3011b45165211a207e8e2c07d53a40091202c84e8294a58ed02a193cab3b3d704fafb50322719257a62092fe39b895d7771 SHA512 5fc5ee9faba6874d1b57fed47a9f92fab9adc03544938d1b1f1d6d867215a36f1efd391849b21300034d27be3207bcc28b4792b8c9c4caec72040d4d30741c2a +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-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild deleted file mode 100644 index 9562f69636d7..000000000000 --- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-2" - EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git" - EGIT_MASTER="master" - S="${WORKDIR}/${PN}" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib python-single-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 kernel_linux" - -DEPEND=" - app-text/asciidoc - ${PYTHON_DEPS} -" -RDEPEND=" - app-arch/lbzip2 - app-crypt/shash - app-arch/tar[xattr] - sys-fs/dosfstools - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) - ${PYTHON_DEPS} -" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -PATCHES=( "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" ) - -pkg_setup() { - if use ccache ; then - einfo "Enabling ccache support for catalyst." - else - ewarn "By default, ccache support for catalyst is disabled." - ewarn "If this is not what you intended," - ewarn "then you should add ccache to your USE." - fi - - echo - einfo "The template spec files are now installed by default. You can find" - einfo "them under /usr/share/doc/${PF}/examples" - einfo "and they are considered to be the authorative source of information" - einfo "on catalyst." - echo - - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${PATCHES[@]}" -} - -src_install() { - insinto /usr/$(get_libdir)/${PN} - exeinto /usr/$(get_libdir)/${PN} - doexe catalyst || die "copying catalyst" - - if [[ ${PV} == 3.9999* ]]; then - doins -r modules files || die "copying files" - else - doins -r arch modules livecd || die "copying files" - fi - - for x in targets/*; do - exeinto /usr/$(get_libdir)/${PN}/$x - doexe $x/* || die "copying ${x}" - done - - # Here is where we actually enable ccache - use ccache && \ - sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \ - files/catalyst.conf - - sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ - files/catalyst.conf - - make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst - insinto /etc/catalyst - doins files/catalyst.conf files/catalystrc || die "copying configuration" - insinto /usr/share/doc/${PF}/examples - doins examples/* || die - dodoc README AUTHORS - doman files/catalyst.1 files/catalyst-spec.5 - - python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst" - python_optimize "${ED}" -} - -pkg_postinst() { - einfo "You can find more information about catalyst by checking out the" - einfo "catalyst project page at:" - einfo "https://wiki.gentoo.org/wiki/Catalyst" -} diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild deleted file mode 100644 index 98e502b926c4..000000000000 --- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-2" - EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git" - EGIT_MASTER="master" - S="${WORKDIR}/${PN}" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib python-single-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 kernel_linux" - -DEPEND=" - app-text/asciidoc - ${PYTHON_DEPS} -" -RDEPEND=" - app-arch/lbzip2 - app-crypt/shash - app-arch/tar[xattr] - sys-fs/dosfstools - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) - ${PYTHON_DEPS} -" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -PATCHES=( - "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" - "${FILESDIR}/catalyst-2.0.18-fix-quotes.patch" - "${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch" - "${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch" -) - -pkg_setup() { - if use ccache ; then - einfo "Enabling ccache support for catalyst." - else - ewarn "By default, ccache support for catalyst is disabled." - ewarn "If this is not what you intended," - ewarn "then you should add ccache to your USE." - fi - - echo - einfo "The template spec files are now installed by default. You can find" - einfo "them under /usr/share/doc/${PF}/examples" - einfo "and they are considered to be the authorative source of information" - einfo "on catalyst." - echo - - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${PATCHES[@]}" -} - -src_install() { - insinto /usr/$(get_libdir)/${PN} - exeinto /usr/$(get_libdir)/${PN} - doexe catalyst || die "copying catalyst" - - if [[ ${PV} == 3.9999* ]]; then - doins -r modules files || die "copying files" - else - doins -r arch modules livecd || die "copying files" - fi - - for x in targets/*; do - exeinto /usr/$(get_libdir)/${PN}/$x - doexe $x/* || die "copying ${x}" - done - - # Here is where we actually enable ccache - use ccache && \ - sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \ - files/catalyst.conf - - sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ - files/catalyst.conf - - make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst - insinto /etc/catalyst - doins files/catalyst.conf files/catalystrc || die "copying configuration" - insinto /usr/share/doc/${PF}/examples - doins examples/* || die - dodoc README AUTHORS - doman files/catalyst.1 files/catalyst-spec.5 - - python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst" - python_optimize "${ED}" -} - -pkg_postinst() { - einfo "You can find more information about catalyst by checking out the" - einfo "catalyst project page at:" - einfo "https://wiki.gentoo.org/wiki/Catalyst" -} diff --git a/dev-util/catalyst/catalyst-3.0.1.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild deleted file mode 100644 index 2e0198f3ece7..000000000000 --- a/dev-util/catalyst/catalyst-3.0.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-2" - EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git" - EGIT_BRANCH="master" - S="${WORKDIR}/${PN}" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -fi - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit distutils-r1 multilib ${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 kernel_linux" - -DEPEND=" - app-text/asciidoc - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] -" -RDEPEND=" - >=dev-python/pydecomp-0.2[${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] ) - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) -" - -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 -} - -python_compile_all() { - # 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-3.0.2.ebuild b/dev-util/catalyst/catalyst-3.0.2.ebuild deleted file mode 100644 index cc286d0a2429..000000000000 --- a/dev-util/catalyst/catalyst-3.0.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" -fi - -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) - -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 kernel_linux system-bootloader" - -DEPEND=" - app-text/asciidoc - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] -" -RDEPEND=" - >=dev-python/pydecomp-0.2[${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] ) - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - 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 -} - -python_compile_all() { - # 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-3.0.4.ebuild b/dev-util/catalyst/catalyst-3.0.21-r1.ebuild index e8b8bb017dfa..0017e34636a4 100644 --- a/dev-util/catalyst/catalyst-3.0.4.ebuild +++ b/dev-util/catalyst/catalyst-3.0.21-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 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,36 +9,41 @@ 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) +PYTHON_COMPAT=( python3_{9..10} ) +DISTUTILS_USE_SETUPTOOLS=no 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 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] ) - virtual/cdrtools + || ( + 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 diff --git a/dev-util/catalyst/catalyst-3.0.3.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild index 5e5de2a1b169..116f53d905a3 100644 --- a/dev-util/catalyst/catalyst-3.0.3.ebuild +++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild @@ -1,47 +1,49 @@ -# Copyright 1999-2018 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" EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git" EGIT_BRANCH="master" else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" + 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=( python{3_4,3_5,3_6} ) +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_SETUPTOOLS=no 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 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 - >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}] - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] sys-fs/dosfstools - !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) - kernel_FreeBSD? ( app-arch/libarchive[xattr] ) - virtual/cdrtools + || ( + 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 diff --git a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild index 5e5de2a1b169..49063325fdd8 100644 --- a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild +++ b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild @@ -1,47 +1,49 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2023 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" EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git" EGIT_BRANCH="master" else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" + 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=( python{3_4,3_5,3_6} ) +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" +LICENSE="GPL-2+" SLOT="0" -IUSE="ccache doc 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 - >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}] - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] sys-fs/dosfstools - !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) - kernel_FreeBSD? ( app-arch/libarchive[xattr] ) - virtual/cdrtools + || ( + 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 @@ -58,7 +60,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 } @@ -69,3 +72,11 @@ python_install_all() { 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..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 e8b8bb017dfa..c5bd9ff2d041 100644 --- a/dev-util/catalyst/catalyst-9999.ebuild +++ b/dev-util/catalyst/catalyst-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 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" @@ -9,44 +9,79 @@ 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) +PYTHON_COMPAT=( python3_{9..11} ) +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 kernel_linux system-bootloader" +IUSE="doc +iso" -DEPEND=" +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=" - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] + ${DEPEND} >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}] app-arch/lbzip2 - app-crypt/shash + app-arch/pixz + app-arch/tar[xattr] + dev-vcs/git sys-fs/dosfstools - !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) - kernel_FreeBSD? ( app-arch/libarchive[xattr] ) - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) + 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] + ) + ) " -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 )" + +pkg_setup() { + CONFIG_CHECK=" + ~UTS_NS ~IPC_NS + ~SQUASHFS ~SQUASHFS_ZLIB + " + linux-info_pkg_setup +} python_prepare_all() { python_setup @@ -55,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 } @@ -66,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/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch deleted file mode 100644 index f4cbcfbb7d38..000000000000 --- a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <blueness@gentoo.org> -Date: Sun, 18 Jan 2015 22:21:16 -0500 -Subject: [PATCH] Do not untar with --acls, fixes bug #536762 -To: gentoo-catalyst@lists.gentoo.org - ---- - modules/catalyst_support.py | 6 +++--- - modules/generic_stage_target.py | 18 +++++++++--------- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py -index 0e9faac..702887d 100644 ---- a/modules/catalyst_support.py -+++ b/modules/catalyst_support.py -@@ -108,9 +108,9 @@ contents_map={ - # 'find' is disabled because it requires the source path, which is not - # always available - #"find" :[calc_contents,"find %(path)s"], -- "tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"], -- "tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"], -- "tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"], -+ "tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"], -+ "tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"], -+ "tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"], - "isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"], - # isoinfo-f should be a last resort only - "isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"], -diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py -index c7db027..cc24c63 100644 ---- a/modules/generic_stage_target.py -+++ b/modules/generic_stage_target.py -@@ -660,10 +660,10 @@ class generic_stage_target(generic_target): - self.settings["chroot_path"]+\ - " (This may take some time) ...\n" - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - error_msg="Tarball extraction of "+\ - self.settings["source_path"]+" to "+\ -@@ -675,10 +675,10 @@ class generic_stage_target(generic_target): - self.settings["chroot_path"]+\ - " (This may take some time) ...\n" - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - error_msg="Tarball extraction of "+self.settings["source_path"]+\ - " to "+self.settings["chroot_path"]+" failed." -@@ -777,9 +777,9 @@ class generic_stage_target(generic_target): - "catalyst-hash") - destdir=self.settings["snapshot_cache_path"] - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir - unpack_errmsg="Error unpacking snapshot" - cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ - self.settings["snapshot_cache_path"]+\ -@@ -796,10 +796,10 @@ class generic_stage_target(generic_target): - cleanup_msg=\ - "Cleaning up existing portage tree (This can take a long time)..." - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ - self.settings["chroot_path"]+"/usr" - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ - self.settings["chroot_path"]+"/usr" - unpack_errmsg="Error unpacking snapshot" - -@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target): - - print "Creating stage tarball..." - -- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ -+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ - self.settings["stage_path"]+" .",\ - "Couldn't create stage tarball",env=self.env) - --- -2.2.2 - diff --git a/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch b/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch deleted file mode 100644 index ccaffbe6b034..000000000000 --- a/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1eabce3a9c15c5caf022e71c1959e8c8f4819fad Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <blueness@gentoo.org> -Date: Thu, 3 Mar 2016 20:48:43 -0500 -Subject: [PATCH] targets/support/chroot-functions.sh: correct quotes to allow - expansion of $1 - -This is a backport of commit b2473eff. The single quotes prevented the proper -expansion of $1 in setup_pkgmgr(). Since this is usually called as -`setup_pkgmgr "build"` during stage1 builds, it is surprising this was -not caught earlier. ---- - targets/support/chroot-functions.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh -index 3b7f77b..6c1a31c 100755 ---- a/targets/support/chroot-functions.sh -+++ b/targets/support/chroot-functions.sh -@@ -172,12 +172,12 @@ setup_pkgmgr(){ - # Use --update or portage might just waste time/cycles and reinstall the same version. - # Use --newuse to make sure it rebuilds with any changed use flags. - if [ -n "$1" ];then -- echo "Adding USE='${USE} $1' to make.conf for portage build" -- [ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf -+ echo "Adding USE=\"${USE} $1\" to make.conf for portage build" -+ [ -e /etc/portage/make.conf ] && echo "USE=\"\${USE} $1\"" >> /etc/portage/make.conf - run_merge --oneshot --update --newuse sys-apps/portage -- sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf -+ sed -i "/USE=\"\${USE} $1\"/d" /etc/portage/make.conf - else -- echo "Updating portage with USE='${USE}'" -+ echo "Updating portage with USE=\"${USE}\"" - run_merge --oneshot --update --newuse sys-apps/portage - fi - } --- -2.4.10 - diff --git a/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch b/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch deleted file mode 100644 index 1c641fd2b905..000000000000 --- a/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fbf94254a714c8d72840faee42cf348eb69b1a43 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <blueness@gentoo.org> -Date: Fri, 8 Apr 2016 17:58:15 -0400 -Subject: [PATCH] targets/support/chroot-functions.sh: remove machine-id for - systemd stages - ---- - targets/support/chroot-functions.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh -index 6c1a31c..67874a0 100755 ---- a/targets/support/chroot-functions.sh -+++ b/targets/support/chroot-functions.sh -@@ -223,6 +223,7 @@ cleanup_stages() { - stage1|stage2|stage3|system) - rm -f /var/lib/portage/world - touch /var/lib/portage/world -+ rm -f /etc/machine-id - ;; - *) - echo "Skipping removal of world file for ${clst_target}" --- -2.7.3 - diff --git a/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch b/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch deleted file mode 100644 index 67fc2c631b02..000000000000 --- a/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5fd2d5edd3c4c1e99687beb9acc130bab162866b Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <blueness@gentoo.org> -Date: Sat, 4 Jun 2016 12:43:44 -0400 -Subject: stage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for - setup_gcc() - -setup_gcc() calls gcc-config to select a particular gcc profile. At stage1 this -needs to be done in the /tmp/stage1root chroot. gcc-config looks for ROOT to -choose the root directory in which to make the selection. If we don't export -ROOT, then setup_gcc is ineffective. - -X-Gentoo-Bug: 584234 -X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=584234 - -Signed-off-by: Anthony G. Basile <blueness@gentoo.org> ---- - targets/stage1/stage1-preclean-chroot.sh | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh -index a80fc92..dc67521 100755 ---- a/targets/stage1/stage1-preclean-chroot.sh -+++ b/targets/stage1/stage1-preclean-chroot.sh -@@ -1,5 +1,6 @@ - #!/bin/bash - -+export ROOT=/tmp/stage1root - export RUN_DEFAULT_FUNCS="no" - - source /tmp/chroot-functions.sh -@@ -8,8 +9,6 @@ update_env_settings - show_debug - - # Now, some finishing touches to initialize gcc-config.... --unset ROOT -- - setup_gcc - setup_binutils - --- -cgit v0.12 - diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml index 988e80de6cc2..d8a6b705dc27 100644 --- a/dev-util/catalyst/metadata.xml +++ b/dev-util/catalyst/metadata.xml @@ -1,15 +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> |