gentoo resync : 25.04.2020

4 files changed, 53 insertions, 88 deletions

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index ce50ae3364b9..05d071efec57 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,4 @@
-DIST catalyst-3.0.8.tar.bz2 873610 BLAKE2B af6fca5dd8dea377795d1b50b942773b0cb8383e1727ba547f1511f126ad4f1494d64ca3d4b3e479664de366e8ed2f8ad8c09c206bbd213d6f95aa51ae56ea8c SHA512 b00a31d9af9b3c1d220080eb6068c924f6ca9f4d574f4805f2b833e61e0fdb79290ec6f5b190c0c7501e015068eb756ede6aea7a959d2e22cef8a055968b7203
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309
-EBUILD catalyst-3.0.8.ebuild 1884 BLAKE2B 9178f000151591fd90e3af46781eb5542c38bb3808c2b260bba48c0ff0877cc90a977d1e125ea3641ef9f590d8e1e0dae235a81f9229d9c409cc1619949ba89b SHA512 2252f340e107687adc3b6ec10535aecad5886d9fc21fbb619d6ca1a4be9e237076bf4c2f8847b23357ae37909f4f4518e66379c1861c1f22397b51e3d4a9bfb9
-EBUILD catalyst-3.0.9.ebuild 1893 BLAKE2B 12181979e89486f1f8e88756a1a9274ea55dc6a157591d85784a8483578f6c7d677e1c46846bd850c4a7a370e8d62f6cbe85c4e4e64c9cdc01d779e0c3c97a65 SHA512 fc73d9c32144ac93c2db9c981ec53b7cfe99edbdcf4c59c5d7088c94c842244fa1c6f4850e88a8e44ae56b2d543a3496dcbeffb34b52ea1009c446d76bbd2251
-EBUILD catalyst-9999.ebuild 1893 BLAKE2B 12181979e89486f1f8e88756a1a9274ea55dc6a157591d85784a8483578f6c7d677e1c46846bd850c4a7a370e8d62f6cbe85c4e4e64c9cdc01d779e0c3c97a65 SHA512 fc73d9c32144ac93c2db9c981ec53b7cfe99edbdcf4c59c5d7088c94c842244fa1c6f4850e88a8e44ae56b2d543a3496dcbeffb34b52ea1009c446d76bbd2251
+EBUILD catalyst-3.0.9.ebuild 1912 BLAKE2B f136ef07278a13065b7df59cd1917d5b4075cb4dc4ea17d28ea8c402d25c4061feb334c59f99741ec9edf0370bfe4debd4fc6e57dc0287c2c19e65b0b4c2aea5 SHA512 298b705f37e8edd9bfd45e690793ee0c6b608ada57ca2d1510e61fe7882abe4f8ae380c6fdcff1b4c3fa9b687fa87b97722471145afbfbb8374dcca94e96c408
+EBUILD catalyst-9999.ebuild 2212 BLAKE2B e1a4a73daca1ced17410bb085ccce87eb9beff96f8a33711427206ccca95725aa3f30834b6c34a4bf8dcdf1f197cbc8710f206c7b60742f83b630a70654d146c SHA512 7eaf48a7631a02e8af91a6d52f7594dacf8ea23a3b75de033fb0facbb1d0da5fd082dd876b718db737d430d4c9200426c8d86e05dd954f798e49d19d5b654662
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.8.ebuild b/dev-util/catalyst/catalyst-3.0.8.ebuild
deleted file mode 100644
index 38f72b6a4c22..000000000000
--- a/dev-util/catalyst/catalyst-3.0.8.ebuild
+++ /dev/null
@@ -1,68 +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} )
-
-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
index 9b107bd9beb5..39bbd3250f4c 100644
--- a/dev-util/catalyst/catalyst-3.0.9.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.9.ebuild
@@ -9,10 +9,11 @@ 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_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 9b107bd9beb5..a9b0c858e543 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,6 +13,7 @@ else
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}
 
@@ -23,30 +24,63 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="ccache doc +iso kernel_linux system-bootloader"
 
+COMMON_DEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
 DEPEND="
+	${COMMON_DEPEND}
 	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}
 	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
 	app-arch/lbzip2
-	app-crypt/shash
+	app-arch/tar[xattr]
+	app-misc/zisofs-tools
 	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 )
+	>=sys-fs/squashfs-tools-2.1
 	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+
+	iso? (
+		virtual/cdrtools
+
+		alpha? (
+			dev-libs/libisoburn
+		)
+		ia64?  (
+			dev-libs/libisoburn
+			sys-boot/grub[grub_platforms_efi-64]
+			sys-fs/mtools
+		)
+		ppc?   (
+			dev-libs/libisoburn
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		ppc64? (
+			dev-libs/libisoburn
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		sparc? (
+			dev-libs/libisoburn
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+	)
+
+	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] )
+	)
 "
-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