gentoo resync : 08.07.2021

3 files changed, 3 insertions, 76 deletions

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 8ea663b3284d..d4e148c99c02 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,8 +1,6 @@
-DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39 SHA512 636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d
 DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
-DIST catalyst-3.0.19.tar.bz2 621000 BLAKE2B 162367363615fc83ce8847bd21f5f1b1e6e6e7ae90c65f6e58af6182a00f14d1bd26c7b994d984517447744b84bd7fbf9e865724a36316dff2cc294dab80685e SHA512 e375960f4b44d616112ec200278c20a9ee3597de04adc87e692b164dcaa3eb7cd4951b41a094c062a500d4920b375ad9750918b4985120ac71e97d118073020e
-EBUILD catalyst-3.0.17.ebuild 1998 BLAKE2B 19e8fc43f1322c3a24de6f07afd62693cda7680e5af7dbf443a893cce089a94c38b3dbe76530f801a67d5b33a5580edeb4681210f5d71e3a6ecbb7b273a1c70a SHA512 9414c001dcf2770efb5801909583dc0d044b6e376465509bb7ef7a3e633f2c9edff6e2c31aa4a8d3027530c9ac6ddf590153cbbc4504a1fbd90b23c0619f4109
+DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa SHA512 f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e
 EBUILD catalyst-3.0.18.ebuild 1998 BLAKE2B 19e8fc43f1322c3a24de6f07afd62693cda7680e5af7dbf443a893cce089a94c38b3dbe76530f801a67d5b33a5580edeb4681210f5d71e3a6ecbb7b273a1c70a SHA512 9414c001dcf2770efb5801909583dc0d044b6e376465509bb7ef7a3e633f2c9edff6e2c31aa4a8d3027530c9ac6ddf590153cbbc4504a1fbd90b23c0619f4109
-EBUILD catalyst-3.0.19.ebuild 1980 BLAKE2B 684d3ff85a3eb0b116f57c90a3d50612b60defe2666fde94b2aa23dd5e886daa497a11261ba1ee6c251a61c73a15eda5989dfe9f14d364597975e408e682f8b7 SHA512 6012d8c24a63ca062f7b4a8e48ce517be4df82d9a07629cbe0c52f2793201c9a022dac4b753421cb4402b17e8d76094c0f6f42dca41b94b276c11eec360482af
+EBUILD catalyst-3.0.20.ebuild 1986 BLAKE2B 0dace821cdc90ea2d09a61233beaace1fe057a3f90452d500c27c255ccde60f6e9ed69487bd1a8b1af61802422ca6cac1c2c19337f1f6140f44e84d114b4c5b9 SHA512 4386898cb4ea1a4df1fdf72bbbf9e15172df347b668f6ce02c82aeae7753cb42ef2a04477436279f7c07a17f01fabfa4d80c5b9eb92f0eaa7374f86bf0ce24cf
 EBUILD catalyst-9999.ebuild 2177 BLAKE2B 33a8c3f97e7cb4e7b8a56487eaf6a5d83cc2ba14e703a9bf43f3ca37e6dc035ad7d08406ad9112b5ebbe20361348bfd3e2e95d2857b22c6870b920ff8ab3baab SHA512 1dc17150656538bb6d6cfd1c058565ffe9f6d1ecd4da99542454e5c7f3f781f9dbdd59df36fe1ad587f46d0ab1b1da9b01559d11b2a4b600face3fd684df2404
 MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild b/dev-util/catalyst/catalyst-3.0.17.ebuild
deleted file mode 100644
index 5793fe90faef..000000000000
--- a/dev-util/catalyst/catalyst-3.0.17.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 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 kernel_linux 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
-	!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? ( 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/dev-util/catalyst/catalyst-3.0.19.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index a95863df1def..a674a9c53c82 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )