From 9b7c1fbd58003c124c759de7da018c5ef5d7d1f6 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Fri, 12 Aug 2022 14:41:43 +0200
Subject: [PATCH] dev-util/catalyst: Sync with Gentoo

It's from Gentoo commit b69d9ce8ab378268442900dc477e516e870576be.
---
 .../portage-stable/dev-util/catalyst/Manifest |  1 -
 .../dev-util/catalyst/catalyst-3.0.18.ebuild  | 73 -------------------
 .../dev-util/catalyst/catalyst-3.0.21.ebuild  |  2 +-
 3 files changed, 1 insertion(+), 75 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.18.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest
index b5babf4abe..02379c1ffa 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest
@@ -1,2 +1 @@
-DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.18.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.18.ebuild
deleted file mode 100644
index 3a8a525c1c..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.18.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 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 ~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{8,9} )
-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 system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	<dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	<dev-python/snakeoil-0.9.6[${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
-}
-
-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/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.21.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.21.ebuild
index 282eccf985..a2a90b5763 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.21.ebuild
@@ -9,7 +9,7 @@ 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_{8..10} )