gentoo resync : 04.08.2018

3 files changed, 21 insertions, 123 deletions

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index cc4deb0c7c6f..572555870bd0 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -3,12 +3,11 @@ AUX catalyst-2.0.18-fix-quotes.patch 1663 BLAKE2B 3fcd863f94eb9d8e659520d29b8ec9
 AUX catalyst-2.0.18-remove-machine-id.patch 778 BLAKE2B 1174a6d9c777144d204fed28e912a981b5df93c2c7de983555c53863b5f1baa2a5d1f184fff7f6bb84534f884302ebc97d525d4db2250e0602b841faa7994a41 SHA512 7e5230eacc6ca7b535d416cd2dd846fa9fbc58951ef4cbdb14108afcbcd63f2d8a7b082920d04dc51b9eb47a6d44eeb5a07d704b14e71b6a972d96ca79f807d6
 AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 BLAKE2B 336c159e54f0a629c73b61814c1d2d9be5996af4367383164c446e9d5067eedff8094724a3830f3e50c922af72e9eacb90168e603d2506c4be4769d1fc549793 SHA512 6372917d395d8129c49c4dd8de7e6a8e7797f6c535e39713fa68059d82f398aa1fb0ffb1b6a65c91f9b5a4861f29cffd4717b7a612276e78d22ac1985ee32113
 DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
-DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
 DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
+DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749af96a1de6401749131a40c2f1f70975d0c449e1a116623c1aec4d3302670ac058fffd80c4f546fae0609d0c3b7f SHA512 02092b39c70095ab49db28c3289a5d3eb4f73cb3aeda79b3e707cbe2710761cf0060493da7d8a5098e1453320b65654bbe34dd37d5f07623fa90d52579869070
 EBUILD catalyst-2.0.18-r1.ebuild 3100 BLAKE2B 18f15c937c4f3fe3790ad0dd4f665b4c2a5c100ccc8e9669ded1e45bc24bbe8391fcc3a3b0d2f17b3a9494d2fdef529b387037ec7518796e045d59faf516fa18 SHA512 111606cceb268f3f4b8c51ed8d980ef440215d622a7994c773da7b3fe7ead0ad3fb32bd4eac1835bda1fad5389aa4c995dc597fe7ccc6f8b4d7871997df3541d
 EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e515c667a6c4b05791ec059e7fa805cc648a228389045b13d71c39b1910fe8016bdde218cdc7b070a9bd7ac8beb8341a9 SHA512 19be49f4b0508aa4f091e5769463d52280693e5540b8ebda4d9745f24d16ba5a8e938081f1b345dfb25d3d7675f90d721c8fff928d3a4f7f40886e2b4cb14ade
-EBUILD catalyst-2.0.9999.ebuild 2901 BLAKE2B 6ad35b1e2bce193bdc50de8547c0918036b7b1db8339462b2a1e6bd3f4de680918ca514a5d9243c476af0a9358b8ab2c18409b2585ca0565bfee8b27dd11ae83 SHA512 ede4a30e85f2b9b55fa627ef6b7de8a2f0f83a15bd67cea54596bcbd73b4f89ae991087e55bc34187d3572f25c1c3d9d0f818626f3880e758832a58a3af95f23
-EBUILD catalyst-3.0.0.ebuild 1680 BLAKE2B ac456283dc3d7f16811b7edeb9a4e674da723ab3183dfdc6f79e7231598c3b326f737c8f5ef61064e13bd3586e9fcf33fca586207e8bed273f57c7c0930512ce SHA512 e71fb731b7d007bc26cf65eb85a23902378da0d7c931dabdeb4f5201f399a1555151cfbcfe19c4620467b0f3ad910e79456dd7f3bbf875e1b2705cb3ec1e246b
 EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
+EBUILD catalyst-3.0.2.ebuild 1993 BLAKE2B 76da50315f207c8c29dfee5598bde54749c681ed7de0726ae040c6f3e36420ac5ebd19af8d00061b35aeff0bc730b7aeebae96480b96a0e2ce8d1f3e4e448f7d SHA512 444c5e6d30bbaf61b4a6f12c404532b7be5cf5b5322c37fcfc670494b5e6dbbd726134df3d40d0915426587d05cbd1b9493b753d6ab186a7e57e8e5f917e017c
 EBUILD catalyst-9999.ebuild 1993 BLAKE2B 055a409cbb3ac2c82f776c5613b0d9e09aee320fc6a9ad445f0738f10fb5334b2f49f975606203b6005370c568d5e1648aa9b286663439c34247c4eebce32081 SHA512 3e526426383b71b906be666f5cba15f8a9dbddf0836313acbd3ccadc08dad5bae445db81560a7e47bd23b1f2f6e7b885f6c677ce124a2782af4928a5263578bc
 MISC metadata.xml 561 BLAKE2B 34d8ab6f5f0a82f20cba329a4f6ece18577bc5de7ea9828a49262cc218a36e2a2d89c9043684daf048f9c1192a6950f652c275deddee5a6d8bc99cb7f61930dc SHA512 2e8a0ea51c2ee0ea20d1ef7be45fc6606a2b0d0f3a9b841227281a5453e79352a12b9f44424aefa6fba1a61113ba6bffb4cea359cd9ce11cf1a8ee4bddf331b8
diff --git a/dev-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
deleted file mode 100644
index 3d4ac9380dca..000000000000
--- a/dev-util/catalyst/catalyst-2.0.9999.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	EGIT_BRANCH="2.X"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-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 kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	app-arch/tar[xattr]
-	sys-fs/dosfstools
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-	${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	if use ccache ; then
-		einfo "Enabling ccache support for catalyst."
-	else
-		ewarn "By default, ccache support for catalyst is disabled."
-		ewarn "If this is not what you intended,"
-		ewarn "then you should add ccache to your USE."
-	fi
-
-	echo
-	einfo "The template spec files are now installed by default.  You can find"
-	einfo "them under /usr/share/doc/${PF}/examples"
-	einfo "and they are considered to be the authorative source of information"
-	einfo "on catalyst."
-	echo
-
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-
-	if [[ ${PV} == 3.9999* ]]; then
-		doins -r modules files || die "copying files"
-	else
-		doins -r arch modules livecd || die "copying files"
-	fi
-
-	for x in targets/*; do
-		exeinto /usr/$(get_libdir)/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-
-	# Here is where we actually enable ccache
-	use ccache && \
-		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
-			files/catalyst.conf
-
-	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		files/catalyst.conf
-
-	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
-	insinto /etc/catalyst
-	doins files/catalyst.conf files/catalystrc || die "copying configuration"
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
-	dodoc README AUTHORS
-	doman files/catalyst.1 files/catalyst-spec.5
-
-	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
-	python_optimize "${ED}"
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "https://wiki.gentoo.org/wiki/Catalyst"
-}
diff --git a/dev-util/catalyst/catalyst-3.0.0.ebuild b/dev-util/catalyst/catalyst-3.0.2.ebuild
index 2128e9957405..b253f77f24a9 100644
--- a/dev-util/catalyst/catalyst-3.0.0.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.2.ebuild
@@ -1,31 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
 	EGIT_BRANCH="master"
-	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
-inherit distutils-r1 multilib ${SRC_ECLASS}
+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 kernel_linux"
+IUSE="ccache doc kernel_linux system-bootloader"
 
 DEPEND="
 	app-text/asciidoc
@@ -36,18 +35,26 @@ RDEPEND="
 	app-arch/lbzip2
 	app-crypt/shash
 	sys-fs/dosfstools
-	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	x86-fbsd? ( app-arch/libarchive[xattr] )
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
 	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
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
 }
 
 python_compile_all() {