gentoo resync : 18.12.2020

4 files changed, 75 insertions, 4 deletions

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 530b8d0e9312..1079e0142059 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,6 @@
 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
+DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2 SHA512 ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5
+EBUILD catalyst-3.0.14.ebuild 1913 BLAKE2B 2db4135e9407c87207c82b1840730eaf99564804a85724e67c8d37c458538297915ef7f032477493bace51a49fc96e185b2d2a5894ed9757951c338cf29142c2 SHA512 ddec3a42d64f74b99c676a6a2c142e105e10f50930bae2309053c854607ea6d9ba11b1589cc172cf71a6a5c83319a6fac7344b549b4811db7aa7afcf53c87771
+EBUILD catalyst-3.0.15.ebuild 1911 BLAKE2B cb5cdf33e45e54e4da861722d1397e4f5fc668a46df2f468f970806d5269422a8202d6618c74f64c2e00628a290cde75732cc46d2deb9855f39485f576522a4a SHA512 37fcd1eb807a304b1f09e90fb396b4c6c0cf42605d3888523cde5a97469d794e3eb05be44ce660688fb1afa2ce81cd539a969d55d5733445ba12c0e5fa47188f
+EBUILD catalyst-9999.ebuild 2317 BLAKE2B 1dd7412eaedad3469696b829a3bf412da30f77d3ce89de0cd7c7d3ecd95ed6f7e05ba9659d15ef146d02ca54cd3fa553cabe5e6aba19c9a1556229fd8d4f13fb SHA512 56fba8b3d3f2bd6479f2fb014b5a292d81ae599f6a07f7daa16844a3be3041f918e69a34b3a9f0b26993330895e3d48945870db39d1a0a5833d3129515581d00
 MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 09099da1323e..5294c9749a86 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
+	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
diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild b/dev-util/catalyst/catalyst-3.0.15.ebuild
new file mode 100644
index 000000000000..f1c19554ff9f
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.15.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_{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? ( 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-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 27ca55eff349..22943633c710 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 	sys-fs/squashfs-tools-ng
 
 	iso? (
-		virtual/cdrtools
+		app-cdr/cdrtools
 
 		amd64? (
 			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]