gentoo resync : 06.08.2019

4 files changed, 74 insertions, 4 deletions

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 13f5d39e0fa7..7911431e6c50 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,6 @@
 DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
-EBUILD catalyst-3.0.5.ebuild 1899 BLAKE2B 4de4d9971e7420b86257f67037ede0afdfd0a531cc1c59a588f8daeca00b624436ca650cda73b1bf6732e096b8b481bd6b8ce1e5d94a73029771058ec90a42de SHA512 771e7a8960f9783a8ac9a36a00187f10871cc3b3ac413bb4162277a29a6a086b1ae1315814f122c6072d39d8be0ca7cc54dbd2abe792a0f21a35f3733bc29cbe
-EBUILD catalyst-9999.ebuild 1911 BLAKE2B 5efac1e33f57d80c79510e6a5110c631464c197d926ee8b4362f8f36b5bd2fca844c26ac3aeb939d33154eb0007bcda2238177862312ade31a5042026995fff1 SHA512 984489ead5a1707b52c7f693aa727de8a7f8f0c79c0657d5faec883b74cb36af5e9c974556785440881e10d8e7aaa2248e1e429a42353f34a3a637874c906d61
+DIST catalyst-3.0.6.tar.bz2 873468 BLAKE2B 146228e6a8eca293a93ab50661b1a3852fe587036d2d2ff9fde132ccb1f0642cbdd4332a13f912927ef8e7c5d8dea5bb738aa3327b559e18c7d31308a289a7fc SHA512 01de8405f48c698366cbb675e75ecbe6cfb5a7236d5b5a0f1f9bc6200b07c728fca41925b34177019b207d8ef2c1b688306a37b1571a7fd91138d31e81758bce
+EBUILD catalyst-3.0.5.ebuild 1895 BLAKE2B f4663a60dc96ca4073824942212dd667835590cec1c438de659e6251655411155bde2855c7fb47517366e04bd7ac50a0070578e1783b99c9602dfd84a917ac9e SHA512 771b85e3640689425a709c7cbd69bf81db2d42b49b6178592adec4107e803191eb1fb7e4fee8e25bb82728ecd95b55d2737631409298a4a410d7ac0789e146fe
+EBUILD catalyst-3.0.6.ebuild 1906 BLAKE2B 13c1e83fb4fabc66644fa5b82fc359866349a4864f1b4e3043ce344812a7d9828bc5bea5734582b34e34fff5cbe067591bd1a5cc7de9f1642701186c20091eff SHA512 79542ae9b5ffef341570dd5b0460f85692cf05c785a5dc97b26922f3139494f97e1d0b8f55ea2ed530df01b0e0d70aaeaaedf65898600da49948b4389f43d175
+EBUILD catalyst-9999.ebuild 1907 BLAKE2B 997e4453538efdf5bb87d27f5cca2b47025d211d7a3e3b1e8e8e5f66c19c12c06a9cefe55516327be248812b5a1df29026c29cbc0769f6620e06da3cea67a0eb SHA512 d90667ec0e6d1d9d4ad25dd00c8ae8a040e843af0de43cfd5edc1e23d4c8b654e6ccbf31209def8971688e47483700d8ec0d7eff08659079a2f964294ace968b
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.5.ebuild b/dev-util/catalyst/catalyst-3.0.5.ebuild
index 0ca5875c8c60..8369b04fcc0d 100644
--- a/dev-util/catalyst/catalyst-3.0.5.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.5.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catalyst/catalyst-3.0.6.ebuild b/dev-util/catalyst/catalyst-3.0.6.ebuild
new file mode 100644
index 000000000000..15c75f926c40
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 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 ~sh sparc ~x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+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-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 8126cc048190..25b4d5dcd3c9 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 ${SRC_ECLASS}