From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-util/catalyst/Manifest | 12 ++---- dev-util/catalyst/catalyst-3.0.12.ebuild | 69 -------------------------------- dev-util/catalyst/catalyst-3.0.13.ebuild | 69 -------------------------------- dev-util/catalyst/catalyst-3.0.14.ebuild | 69 ++++++++++++++++++++++++++++++++ dev-util/catalyst/catalyst-3.0.9.ebuild | 69 -------------------------------- dev-util/catalyst/catalyst-9999.ebuild | 59 +++++++++++++++------------ dev-util/catalyst/metadata.xml | 4 -- 7 files changed, 107 insertions(+), 244 deletions(-) delete mode 100644 dev-util/catalyst/catalyst-3.0.12.ebuild delete mode 100644 dev-util/catalyst/catalyst-3.0.13.ebuild create mode 100644 dev-util/catalyst/catalyst-3.0.14.ebuild delete mode 100644 dev-util/catalyst/catalyst-3.0.9.ebuild (limited to 'dev-util/catalyst') diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index 67584c56d068..530b8d0e9312 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,8 +1,4 @@ -DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb SHA512 8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda -DIST catalyst-3.0.13.tar.bz2 621326 BLAKE2B f87a94b696d897fad8cab5e033a68a944dd5f73cbb110c3051432f9ae8baf8d341e456e1c9935345ac9102e99301c912abe706225023b3bdf28372095410cb26 SHA512 87f66b56056000ebee061003ae08d6e4e6b64aadbe89d71f6d50fe86e838e04d3f534dd3bc2f561fe42762de4108bf4d5536fab485fa260c251f90b45e97e8a9 -DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309 -EBUILD catalyst-3.0.12.ebuild 1912 BLAKE2B f136ef07278a13065b7df59cd1917d5b4075cb4dc4ea17d28ea8c402d25c4061feb334c59f99741ec9edf0370bfe4debd4fc6e57dc0287c2c19e65b0b4c2aea5 SHA512 298b705f37e8edd9bfd45e690793ee0c6b608ada57ca2d1510e61fe7882abe4f8ae380c6fdcff1b4c3fa9b687fa87b97722471145afbfbb8374dcca94e96c408 -EBUILD catalyst-3.0.13.ebuild 1921 BLAKE2B 4722d977737cd728eba8b6170c1a7a52a51b907db54dd2555332e2ebb0e0979d484a5292ad35f67110080570bfc09bf256e14c8c60ba1ab08bbd8bc838e51d55 SHA512 1c3a43f3df8d90fbf3572ef655a34b74563d2ead70b62b4cdf61be25deb58713037a813c622ee041d4071282901d6ee65b29e2fb1c6dcc15d43bc5d089c9d4d4 -EBUILD catalyst-3.0.9.ebuild 1912 BLAKE2B f136ef07278a13065b7df59cd1917d5b4075cb4dc4ea17d28ea8c402d25c4061feb334c59f99741ec9edf0370bfe4debd4fc6e57dc0287c2c19e65b0b4c2aea5 SHA512 298b705f37e8edd9bfd45e690793ee0c6b608ada57ca2d1510e61fe7882abe4f8ae380c6fdcff1b4c3fa9b687fa87b97722471145afbfbb8374dcca94e96c408 -EBUILD catalyst-9999.ebuild 2197 BLAKE2B 4744840b79871f9a804cb70d550d99f7e98d6c37b8c6117457d1aefd99f00948e5be6bcd50e3f12b304d766acc8399db9061b5fe726a4e048f6ef2f5385f68a7 SHA512 9591efe950983a2c876f725af2cde13447206ea178bf1a62e8aa3365feaff7ae73aabc7e5c702c821b0ec3419d1951ac7b1ca0fcbb9d623ba5f0c561388ad1c7 -MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25 +DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830 +EBUILD catalyst-3.0.14.ebuild 1913 BLAKE2B 76c621805e4cbb86e2bd52537091309fea71a6abef1190b274180210dbd6c363502d478d9c27f2981143e5068264e5b0b05633b857184e053669f11e44eba913 SHA512 be473d81fb31ae9aec8aa25608c426f98c877d4115a091c7fd7561e45e2dca3805c076b6eb088dee3988dc6925f186a67f3f951b5e75f2ea5d66014290d981f3 +EBUILD catalyst-9999.ebuild 2317 BLAKE2B 9e80914d109534080b36949a85afd9a4ca28d51e58b7c96bc5bbf359a3d18093ece3263650cf540584e4ad730f50ec7da2c1a8d8447950e46489be6a8d81e69d SHA512 45b47f8c3dfe12d15bad9b57e0fd4d885387e97bd44d8779dc9bcfe492d8240099185a434a25829eb6d43627e8a8ad3005403def3e3cd99fea2bbb1fc3173412 +MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd diff --git a/dev-util/catalyst/catalyst-3.0.12.ebuild b/dev-util/catalyst/catalyst-3.0.12.ebuild deleted file mode 100644 index 39bbd3250f4c..000000000000 --- a/dev-util/catalyst/catalyst-3.0.12.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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="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_{6,7,8} ) -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" -SLOT="0" -IUSE="ccache doc +iso kernel_linux system-bootloader" - -DEPEND=" - app-text/asciidoc - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] -" -RDEPEND=" - >=dev-python/snakeoil-0.6.5[${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] ) - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - iso? ( virtual/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 -} - -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.13.ebuild b/dev-util/catalyst/catalyst-3.0.13.ebuild deleted file mode 100644 index 644bdda69629..000000000000 --- a/dev-util/catalyst/catalyst-3.0.13.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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="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_{6,7,8} ) -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" -SLOT="0" -IUSE="ccache doc +iso kernel_linux system-bootloader" - -DEPEND=" - app-text/asciidoc - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] -" -RDEPEND=" - >=dev-python/snakeoil-0.6.5[${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] ) - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - iso? ( virtual/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 -} - -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.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild new file mode 100644 index 000000000000..09099da1323e --- /dev/null +++ b/dev-util/catalyst/catalyst-3.0.14.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2020 Gentoo Authors +# 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="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_{6,7,8} ) +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+" +SLOT="0" +IUSE="ccache doc +iso kernel_linux system-bootloader" + +DEPEND=" + app-text/asciidoc + >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] +" +RDEPEND=" + >=dev-python/snakeoil-0.6.5[${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] ) + amd64? ( >=sys-boot/syslinux-3.72 ) + x86? ( >=sys-boot/syslinux-3.72 ) + ccache? ( dev-util/ccache ) + iso? ( virtual/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 +} + +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.9.ebuild b/dev-util/catalyst/catalyst-3.0.9.ebuild deleted file mode 100644 index 39bbd3250f4c..000000000000 --- a/dev-util/catalyst/catalyst-3.0.9.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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="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_{6,7,8} ) -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" -SLOT="0" -IUSE="ccache doc +iso kernel_linux system-bootloader" - -DEPEND=" - app-text/asciidoc - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] -" -RDEPEND=" - >=dev-python/snakeoil-0.6.5[${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] ) - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - iso? ( virtual/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 -} - -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-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild index 2c7b1791e8cd..27ca55eff349 100644 --- a/dev-util/catalyst/catalyst-9999.ebuild +++ b/dev-util/catalyst/catalyst-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 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" @@ -12,39 +12,43 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_8 ) DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 ${SRC_ECLASS} +inherit distutils-r1 linux-info optfeature ${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/toml[${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 ) iso? ( virtual/cdrtools + amd64? ( + sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] + ) alpha? ( dev-libs/libisoburn ) @@ -65,22 +69,19 @@ RDEPEND=" dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) + x86? ( + sys-boot/grub[grub_platforms_efi-32] + ) ) - - 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] ) - ) -" +pkg_setup() { + CONFIG_CHECK=" + ~UTS_NS ~IPC_NS + ~SQUASHFS ~SQUASHFS_ZLIB + " + linux-info_pkg_setup +} python_prepare_all() { python_setup @@ -100,3 +101,11 @@ python_install_all() { dodoc files/HOWTO.html files/docbook-xsl.css fi } + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog + elog "You may consider installing the following optional packages:" + optfeature "ccache support" dev-util/ccache + fi +} diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml index f89291ab2936..70cd8c55a588 100644 --- a/dev-util/catalyst/metadata.xml +++ b/dev-util/catalyst/metadata.xml @@ -4,10 +4,6 @@ catalyst@gentoo.org - - livecd@gentoo.org - Gentoo LiveCD Project - Enables ccache support Pulls in the depends for building iso images -- cgit v1.2.3