commit:     e25dc19957b596c0044aaaa3ef0c57dc55116c0a
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 14:59:59 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 18:41:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25dc199

dev-util/catalyst: use PEP517 build

Closes: https://bugs.gentoo.org/909976

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r2.ebuild | 74 +++++++++++++++++++++++++++++
 dev-util/catalyst/catalyst-9999.ebuild      |  6 ++-
 2 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r2.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r2.ebuild
new file mode 100644
index 000000000000..2cde6cf92ea9
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.22-r2.ebuild
@@ -0,0 +1,74 @@
+# 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
+}

diff --git a/dev-util/catalyst/catalyst-9999.ebuild 
b/dev-util/catalyst/catalyst-9999.ebuild
index 75ea55a47e53..06017c76d1fb 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,7 +13,7 @@ else
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}
 
@@ -90,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
 }
@@ -113,4 +114,5 @@ pkg_postinst() {
        if [[ -z ${REPLACING_VERSIONS} ]]; then
                optfeature "ccache support" dev-util/ccache
        fi
+       tmpfiles_process catalyst-tmpdir.conf
 }

Reply via email to