[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Richard Farina]

commit:     9a77f571ccae6b891e4de3ea4f914737a24aa651
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 17:24:48 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 17:24:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a77f571

dev-util/catalyst: fix snakeoil dep to reflect broken snakeoil versions

Package-Manager: portage-2.2.20.1

 dev-util/catalyst/catalyst-2.9999.ebuild | 1 +
 dev-util/catalyst/catalyst-9999.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 6ef2034..3a76b36 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -33,6 +33,7 @@ IUSE="ccache doc kernel_linux"
 DEPEND="
 	app-text/asciidoc
 	>=dev-python/snakeoil-0.5.2
+	<dev-python/snakeoil-0.6.5
 "
 RDEPEND="
 	app-arch/lbzip2

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 2e19fce..8be9f7d 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -32,6 +32,7 @@ IUSE="ccache doc kernel_linux"
 DEPEND="
 	app-text/asciidoc
 	>=dev-python/snakeoil-0.5.2
+	<dev-python/snakeoil-0.6.5
 "
 RDEPEND="
 	app-arch/lbzip2

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Brian Dolbec]

commit:     b0ba0ac8ae09afa484b7f5599b7bdbc24bbe6185
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 16:24:28 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 16:25:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ba0ac8

Reset the dep on snakeoil as the code in the master branch has been fixed

 dev-util/catalyst/catalyst-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 8be9f7d..2e19fce 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -32,7 +32,6 @@ IUSE="ccache doc kernel_linux"
 DEPEND="
 	app-text/asciidoc
 	>=dev-python/snakeoil-0.5.2
-	<dev-python/snakeoil-0.6.5
 "
 RDEPEND="
 	app-arch/lbzip2

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Brian Dolbec]

commit:     700404ee7363954d26294cf84af75844a6639b54
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 03:13:21 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 03:13:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700404ee

dev-util/catalyst: Update 2.9999 to the pending branch, add pyDeComp dep

Package-Manager: portage-2.2.20

 dev-util/catalyst/catalyst-2.9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 3a76b36..6055252 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_ECLASS="git-2"
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
 	EGIT_MASTER="master"
-	EGIT_BRANCH="3.0"
+	EGIT_BRANCH="pending"
 	SRC_URI=""
 	KEYWORDS=""
 	S="${WORKDIR}/${PN}"
@@ -33,9 +33,9 @@ IUSE="ccache doc kernel_linux"
 DEPEND="
 	app-text/asciidoc
 	>=dev-python/snakeoil-0.5.2
-	<dev-python/snakeoil-0.6.5
 "
 RDEPEND="
+	=dev-python/pyDeComp-9999
 	app-arch/lbzip2
 	app-crypt/shash
 	virtual/cdrtools

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Brian Dolbec]

commit:     a6eb02e64bd4d6cbb9af36efc1020fd1ec73e26d
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 21:24:36 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 21:25:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6eb02e6

dev-util/catalyst-9999: Add the new pydecomp dependency

 dev-util/catalyst/catalyst-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 2e19fce..525a3b1 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -34,6 +34,7 @@ DEPEND="
 	>=dev-python/snakeoil-0.5.2
 "
 RDEPEND="
+	=dev-python/pydecomp-9999
 	app-arch/lbzip2
 	app-crypt/shash
 	virtual/cdrtools

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Mike Frysinger]

commit:     707a34d9817b0063e4125349fa06fe7e50f4189d
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 17:58:05 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 18:00:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=707a34d9

dev-util/catalyst: drop redundant SRC_URI/KEYWORDS setup

This makes it easier to use `ekeywords`.

 dev-util/catalyst/catalyst-2.0.18-r1.ebuild | 2 --
 dev-util/catalyst/catalyst-2.0.9999.ebuild  | 2 --
 dev-util/catalyst/catalyst-2.9999.ebuild    | 2 --
 dev-util/catalyst/catalyst-9999.ebuild      | 2 --
 4 files changed, 8 deletions(-)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
index 7f7203d..83d358c 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
@@ -8,8 +8,6 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_ECLASS="git-2"
 	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
 	EGIT_MASTER="master"
-	SRC_URI=""
-	KEYWORDS=""
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2

diff --git a/dev-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
index f67796d..0e9708e 100644
--- a/dev-util/catalyst/catalyst-2.0.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.9999.ebuild
@@ -9,8 +9,6 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
 	EGIT_MASTER="master"
 	EGIT_BRANCH="2.X"
-	SRC_URI=""
-	KEYWORDS=""
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2

diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 0c6f8e3..da1281a 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -9,8 +9,6 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
 	EGIT_MASTER="master"
 	EGIT_BRANCH="pending"
-	SRC_URI=""
-	KEYWORDS=""
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 525a3b1..ec9b18b 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -8,8 +8,6 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_ECLASS="git-2"
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
 	EGIT_BRANCH="master"
-	SRC_URI=""
-	KEYWORDS=""
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Mike Frysinger]

commit:     f97ffffa6da968f490a2e8d05c383a3cf6f178fe
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 18:00:01 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 18:00:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97ffffa

dev-util/catalyst: require tar[xattr] #552888

Since the build hardcodes xattr related tar flags, make sure the system
tar was built with them enabled.

 dev-util/catalyst/catalyst-2.0.18-r1.ebuild | 1 +
 dev-util/catalyst/catalyst-2.0.9999.ebuild  | 1 +
 dev-util/catalyst/catalyst-2.9999.ebuild    | 1 +
 dev-util/catalyst/catalyst-9999.ebuild      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
index 83d358c..8521851 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
@@ -36,6 +36,7 @@ DEPEND="
 RDEPEND="
 	app-arch/lbzip2
 	app-crypt/shash
+	app-arch/tar[xattr]
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	ia64? ( sys-fs/dosfstools )

diff --git a/dev-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
index 0e9708e..89cb7b0 100644
--- a/dev-util/catalyst/catalyst-2.0.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.9999.ebuild
@@ -35,6 +35,7 @@ DEPEND="
 RDEPEND="
 	app-arch/lbzip2
 	app-crypt/shash
+	app-arch/tar[xattr]
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	ia64? ( sys-fs/dosfstools )

diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index da1281a..3724762 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 	=dev-python/pydecomp-9999
 	app-arch/lbzip2
 	app-crypt/shash
+	app-arch/tar[xattr]
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	ia64? ( sys-fs/dosfstools )

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index ec9b18b..116a803 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
 	=dev-python/pydecomp-9999
 	app-arch/lbzip2
 	app-crypt/shash
+	app-arch/tar[xattr]
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	ia64? ( sys-fs/dosfstools )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Mike Frysinger]

commit:     2b38ba339c59963a5e095564b6b03dc6b10b77f1
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 17:57:32 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 18:00:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b38ba33

dev-util/catalyst: drop old versions

 dev-util/catalyst/Manifest               |   2 -
 dev-util/catalyst/catalyst-2.0.16.ebuild | 111 -------------------------------
 dev-util/catalyst/catalyst-2.0.17.ebuild | 111 -------------------------------
 dev-util/catalyst/catalyst-2.0.18.ebuild | 111 -------------------------------
 4 files changed, 335 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index d7654b4..822c3d4 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1 @@
-DIST catalyst-2.0.16.tar.bz2 878929 SHA256 4578cbbc36a5d913b51967faad6feb9b8bb10a04794fe44e73b71790fa389142 SHA512 460ee4c996a7197f2d3e2504ef5ff205c74c0e7ca763a67dc57932a8df6199334fef3b234d90da1717d3f59b36081a29c768a864efa82129cd4f6e2de34ac3a8 WHIRLPOOL e43861bcb7286f85e8d0857d32f4e0ba9f39eea5bae2eac05e0b9e782ee2edad2a8171e1a0ea451c7ee67b21f2210f8ff3f2a9e37c16d16552c6c46e74637233
-DIST catalyst-2.0.17.tar.bz2 861341 SHA256 5f4142598d921e5174ff06f9571856760a324e79db5f3b63caf0d1a16adc813c SHA512 9d7b9ad383dcc5d4ba058596c0b607eb9601b28025d9300f63e68d78cbd5bca8fa3f3e03a81dc6b233021e773ba4301df0bf5cec51ca4368eb3577a68d33a92c WHIRLPOOL e97fc120141cc4f9f5c297652d8b43313780f615429c0eb3d9b85cba40aeca01dcbc6efb0f8d388cc5e7debabb2563cfc9b5a5aa00e3d00d306aed0f799fc642
 DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542

diff --git a/dev-util/catalyst/catalyst-2.0.16.ebuild b/dev-util/catalyst/catalyst-2.0.16.ebuild
deleted file mode 100644
index 0bd3e47..0000000
--- a/dev-util/catalyst/catalyst-2.0.16.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	SRC_URI=""
-	KEYWORDS=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${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://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
-	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://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-}

diff --git a/dev-util/catalyst/catalyst-2.0.17.ebuild b/dev-util/catalyst/catalyst-2.0.17.ebuild
deleted file mode 100644
index 0bd3e47..0000000
--- a/dev-util/catalyst/catalyst-2.0.17.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	SRC_URI=""
-	KEYWORDS=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${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://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
-	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://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-}

diff --git a/dev-util/catalyst/catalyst-2.0.18.ebuild b/dev-util/catalyst/catalyst-2.0.18.ebuild
deleted file mode 100644
index 0bd3e47..0000000
--- a/dev-util/catalyst/catalyst-2.0.18.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	SRC_URI=""
-	KEYWORDS=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${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://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
-	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://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Richard Farina]

commit:     fca0bdba71cc08e7e70d2c850092a259263654f2
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 20:25:36 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 20:27:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca0bdba

dev-util/catalyst: recent commits require newer snakeoil

Package-Manager: portage-2.2.23

 dev-util/catalyst/catalyst-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 116a803..a0c932f 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -29,7 +29,7 @@ IUSE="ccache doc kernel_linux"
 
 DEPEND="
 	app-text/asciidoc
-	>=dev-python/snakeoil-0.5.2
+	>=dev-python/snakeoil-0.6.5
 "
 RDEPEND="
 	=dev-python/pydecomp-9999

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Mike Frysinger]

commit:     2c0d4a87989a1d4d6279940cf098d2c4d9bb1ed6
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 04:21:07 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 04:21:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0d4a87

dev-util/catalyst: update git to permit python-3

The latest version should work w/py3, so start allowing people to test.

 dev-util/catalyst/catalyst-9999.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index a0c932f..5586792 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
@@ -29,10 +29,10 @@ IUSE="ccache doc kernel_linux"
 
 DEPEND="
 	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	=dev-python/pydecomp-9999
+	=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
 	app-arch/tar[xattr]
@@ -45,7 +45,6 @@ RDEPEND="
 "
 
 python_prepare_all() {
-	python_export_best
 	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
 	VERSION="${PV}" "${PYTHON}" setup.py set_version
 }
@@ -55,7 +54,7 @@ python_compile_all() {
 	emake
 }
 
-python_install_all(){
+python_install_all() {
 	distutils-r1_python_install_all
 	if use doc; then
 		dodoc files/HOWTO.html files/docbook-xsl.css

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Brian Dolbec]

commit:     531bdc14699e2acc48c7c8942f46b99582008aa8
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 05:36:43 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 05:38:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531bdc14

dev-util/catalyst: First release of the 3.0 codebase

Update the 9999 ebuild.

Package-Manager: portage-2.2.27_p58_p97174

 dev-util/catalyst/Manifest                                         | 1 +
 .../catalyst/{catalyst-9999.ebuild => catalyst-3.0_rc1.ebuild}     | 7 ++++---
 dev-util/catalyst/catalyst-9999.ebuild                             | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 822c3d4..b4e9fbc 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
 DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542
+DIST catalyst-3.0_rc1.tar.bz2 874429 SHA256 b21eabc059ef618b617fdd0fa7c558878393d58ff66ce77a7fc6ff87384608c6 SHA512 ca33a1142785f10471e675c9dce784e1f92d6029f2fcf82d2fb1a14292e7aa9063e7942e187faa5d4253f316c032b066a6aba0f32e29cc0125ef757654cbd845 WHIRLPOOL f7b3e7ea61c1e590141cc2ff1ec1883e8b07727ee52c2e1d64f8fd371312d1ef84806f5b40fc16d2178b4b9ffcdcaa3d4d3cac0e4ef52625e5f41c8b0a3ec25e

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-3.0_rc1.ebuild
similarity index 84%
copy from dev-util/catalyst/catalyst-9999.ebuild
copy to dev-util/catalyst/catalyst-3.0_rc1.ebuild
index 5586792..338d0a7 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-3.0_rc1.ebuild
@@ -11,12 +11,13 @@ if [[ ${PV} == *9999* ]]; then
 	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 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
@@ -32,7 +33,7 @@ DEPEND="
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.1[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
 	app-arch/tar[xattr]

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 5586792..3bc86e6 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -11,12 +11,13 @@ if [[ ${PV} == *9999* ]]; then
 	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 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Anthony G. Basile]

commit:     eb5b8d1689318ea5ef05abd68102ff0f7e206e24
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  4 02:27:17 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar  4 02:27:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb5b8d16

dev-util/catalyst: 2.0.18-r2 stable on amd64

Package-Manager: portage-2.2.26

 dev-util/catalyst/catalyst-2.0.18-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r2.ebuild b/dev-util/catalyst/catalyst-2.0.18-r2.ebuild
index 8405874..1e8d79e 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r2.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r2.ebuild
@@ -15,7 +15,7 @@ else
 		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python2_7 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Anthony G. Basile]

commit:     43bb59a0b1db6bef8988bdb50e02e50e609a53c3
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 22:19:09 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 22:19:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43bb59a0

dev-util/catalyst: stable on amd64, remove older

Package-Manager: portage-2.2.26

 dev-util/catalyst/catalyst-2.0.18-r2.ebuild | 119 ----------------------------
 dev-util/catalyst/catalyst-2.0.18-r3.ebuild |   2 +-
 2 files changed, 1 insertion(+), 120 deletions(-)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r2.ebuild b/dev-util/catalyst/catalyst-2.0.18-r2.ebuild
deleted file mode 100644
index 1e8d79e..0000000
--- a/dev-util/catalyst/catalyst-2.0.18-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${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://www.gentoo.org/proj/en/releng/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]
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
-	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}
-
-PATCHES=(
-	"${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch"
-	"${FILESDIR}/catalyst-2.0.18-fix-quotes.patch"
-)
-
-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_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-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://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-}

diff --git a/dev-util/catalyst/catalyst-2.0.18-r3.ebuild b/dev-util/catalyst/catalyst-2.0.18-r3.ebuild
index 700be0c..d98ff14 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r3.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r3.ebuild
@@ -15,7 +15,7 @@ else
 		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python2_7 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Mike Frysinger]

commit:     85d836bb2ee2dc084f94fa0891f3a09b8be7a58f
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 15:45:38 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed May 25 17:17:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d836bb

dev-util/catalyst: drop python-2 support in catalyst-3+

Since python-3 has been stable for years now, it shouldn't be a problem
to start requiring it in this utility.  Let's update the ebuild and see
if anyone complains.

 dev-util/catalyst/catalyst-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 6015ff9..adc1244 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -17,7 +17,7 @@ else
 	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} )
+PYTHON_COMPAT=( python{3_4,3_5} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Mike Frysinger]

commit:     bf0eee41d1268c95f16011c84b037d88458d377b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 15:45:22 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed May 25 17:17:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf0eee41

dev-util/catalyst: fix up KEYWORDS in git ebuilds

 dev-util/catalyst/catalyst-2.0.9999.ebuild | 2 +-
 dev-util/catalyst/catalyst-2.9999.ebuild   | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
index 89cb7b0..658359d 100644
--- a/dev-util/catalyst/catalyst-2.0.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.9999.ebuild
@@ -14,7 +14,7 @@ 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python2_7 )

diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 3724762..2cc33a2 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -14,7 +14,7 @@ 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python2_7 )

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 3bc86e6..6015ff9 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -14,7 +14,7 @@ else
 		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 ~x86-fbsd"
+	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} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Anthony G. Basile]

commit:     c753fb4d776ca7918ec318aa3ce3c171cbb7dcd9
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 11:45:12 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 11:45:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c753fb4d

dev-util/catalyst: stable on amd64, remove older

Package-Manager: portage-2.2.28

 dev-util/catalyst/catalyst-2.0.18-r3.ebuild | 120 ----------------------------
 dev-util/catalyst/catalyst-2.0.18-r4.ebuild |   2 +-
 2 files changed, 1 insertion(+), 121 deletions(-)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r3.ebuild b/dev-util/catalyst/catalyst-2.0.18-r3.ebuild
deleted file mode 100644
index d98ff14..0000000
--- a/dev-util/catalyst/catalyst-2.0.18-r3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${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://www.gentoo.org/proj/en/releng/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]
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
-	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}
-
-PATCHES=(
-	"${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch"
-	"${FILESDIR}/catalyst-2.0.18-fix-quotes.patch"
-	"${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch"
-)
-
-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_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-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://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-}

diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
index 39728ec..b013aab 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -15,7 +15,7 @@ else
 		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python2_7 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Anthony G. Basile]

commit:     e8a47249fc29e6d3094f239e957f3ac5c3e6e060
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 13:43:42 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 13:43:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a47249

dev-util/catalyst: stable on ppc

Package-Manager: portage-2.2.28

 dev-util/catalyst/catalyst-2.0.18-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
index b013aab..11c82fb 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -15,7 +15,7 @@ else
 		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python2_7 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Patrice Clement]

commit:     f14dd505b43b94f4c8afb02723b6035b3493a026
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Thu Nov 10 07:44:11 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 00:23:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f14dd505

dev-util/catalyst: update HOMEPAGE.

Gentoo-Bug: https://bugs.gentoo.org/#586096

Closes: https://github.com/gentoo/gentoo/pull/2795

 dev-util/catalyst/catalyst-2.0.18-r1.ebuild | 2 +-
 dev-util/catalyst/catalyst-2.0.18-r4.ebuild | 2 +-
 dev-util/catalyst/catalyst-2.0.9999.ebuild  | 2 +-
 dev-util/catalyst/catalyst-2.9999.ebuild    | 2 +-
 dev-util/catalyst/catalyst-3.0_rc1.ebuild   | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
index 8521851..1d93181 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
@@ -23,7 +23,7 @@ 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://www.gentoo.org/proj/en/releng/catalyst/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
index 11c82fb..efe8cef 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -23,7 +23,7 @@ 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://www.gentoo.org/proj/en/releng/catalyst/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/dev-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
index 658359d..dc22603 100644
--- a/dev-util/catalyst/catalyst-2.0.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.9999.ebuild
@@ -22,7 +22,7 @@ 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://www.gentoo.org/proj/en/releng/catalyst/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 2cc33a2..9f4c459 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -22,7 +22,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://www.gentoo.org/proj/en/releng/catalyst/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/dev-util/catalyst/catalyst-3.0_rc1.ebuild b/dev-util/catalyst/catalyst-3.0_rc1.ebuild
index 338d0a7..3c319b4 100644
--- a/dev-util/catalyst/catalyst-3.0_rc1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0_rc1.ebuild
@@ -22,7 +22,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://www.gentoo.org/proj/en/releng/catalyst/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index adc1244..badd60c 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -22,7 +22,7 @@ PYTHON_COMPAT=( python{3_4,3_5} )
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://www.gentoo.org/proj/en/releng/catalyst/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Richard Farina]

commit:     6e8508704a25e203adb6254c1f583ec948f26da5
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 02:46:41 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 02:47:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e850870

dev-util/catalyst: correct half the QA warnings

Package-Manager: Portage-2.3.4, Repoman-2.3.1

 dev-util/catalyst/catalyst-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index d17b3bd6a5f..b257d2ff766 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -47,6 +47,7 @@ RDEPEND="
 python_prepare_all() {
 	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
 	VERSION="${PV}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
 }
 
 python_compile_all() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Anthony G. Basile]

commit:     c907a6a7a9ffbc459761b2239b31f7e7041e6d5e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 22:34:07 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 22:34:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c907a6a7

dev-util/catalyst: 2.0.18-r4 stable on arm and x86

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-util/catalyst/catalyst-2.0.18-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
index 11b0a8f8f69..45b66c35b87 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ else
 		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python2_7 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Brian Dolbec]

commit:     c9fe0491000c7542cde484f23fb62dd287f9ff9e
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 17:17:21 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 18:00:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9fe0491

dev-util/catalyst: Version bump, clean old

Drop ~x86-fbsd keyword due to snakeoil missing that keyword.
Updated tar dep to use libarchive as an alternative.
Clean up obsolete 2.9999 and 3.0_rc1 ebuilds.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-util/catalyst/Manifest                         |  4 +-
 dev-util/catalyst/catalyst-2.9999.ebuild           | 63 ----------------------
 ...talyst-3.0_rc1.ebuild => catalyst-3.0.0.ebuild} |  9 ++--
 dev-util/catalyst/catalyst-9999.ebuild             |  7 +--
 4 files changed, 11 insertions(+), 72 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index b4e9fbca7e2..e3a9bb6ec35 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,2 @@
-DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542
-DIST catalyst-3.0_rc1.tar.bz2 874429 SHA256 b21eabc059ef618b617fdd0fa7c558878393d58ff66ce77a7fc6ff87384608c6 SHA512 ca33a1142785f10471e675c9dce784e1f92d6029f2fcf82d2fb1a14292e7aa9063e7942e187faa5d4253f316c032b066a6aba0f32e29cc0125ef757654cbd845 WHIRLPOOL f7b3e7ea61c1e590141cc2ff1ec1883e8b07727ee52c2e1d64f8fd371312d1ef84806f5b40fc16d2178b4b9ffcdcaa3d4d3cac0e4ef52625e5f41c8b0a3ec25e
+DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
+DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f

diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
deleted file mode 100644
index c5105d8669b..00000000000
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 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="pending"
-	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 distutils-r1 multilib ${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"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.5.2
-"
-RDEPEND="
-	=dev-python/pydecomp-9999
-	app-arch/lbzip2
-	app-crypt/shash
-	app-arch/tar[xattr]
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-
-python_prepare_all() {
-	python_export_best
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version
-}
-
-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_rc1.ebuild b/dev-util/catalyst/catalyst-3.0.0.ebuild
similarity index 86%
rename from dev-util/catalyst/catalyst-3.0_rc1.ebuild
rename to dev-util/catalyst/catalyst-3.0.0.ebuild
index 920665f9a5e..25437e6d4b0 100644
--- a/dev-util/catalyst/catalyst-3.0_rc1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,10 +13,10 @@ else
 		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 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
@@ -35,7 +35,8 @@ RDEPEND="
 	>=dev-python/pydecomp-0.1[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
-	app-arch/tar[xattr]
+	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	x86-fbsd? ( app-arch/libarchive[xattr] )
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	ia64? ( sys-fs/dosfstools )

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index b257d2ff766..514a27d90a6 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,10 +13,10 @@ else
 		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 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
@@ -35,7 +35,8 @@ RDEPEND="
 	=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
-	app-arch/tar[xattr]
+	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	x86-fbsd? ( app-arch/libarchive[xattr] )
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	ia64? ( sys-fs/dosfstools )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Brian Dolbec]

commit:     bb8c1d30722867d3514994c99dddcfadf9a0f0d3
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 17:30:52 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 17:32:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb8c1d30

dev-util/catalyst: Adjust pydecomp dep, bug 639446

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-util/catalyst/catalyst-3.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.0.ebuild b/dev-util/catalyst/catalyst-3.0.0.ebuild
index 25437e6d4b0..d92c866043e 100644
--- a/dev-util/catalyst/catalyst-3.0.0.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.0.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	>=dev-python/pydecomp-0.1[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
 	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Robin H. Johnson]

commit:     899dd626a5ec4086537fbf69c97e787a43bd08d7
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 23:50:59 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 23:52:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=899dd626

dev-util/catalyst: dosfstools needed for EFI.

EFI on x86, amd64, arm64, ia64 all need a VFAT filesystem, make it a
common dependency.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-util/catalyst/catalyst-2.0.18-r1.ebuild | 4 ++--
 dev-util/catalyst/catalyst-2.0.18-r4.ebuild | 2 +-
 dev-util/catalyst/catalyst-2.0.9999.ebuild  | 4 ++--
 dev-util/catalyst/catalyst-3.0.0.ebuild     | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
index c16137f9236..8d447124601 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,9 +36,9 @@ RDEPEND="
 	app-arch/lbzip2
 	app-crypt/shash
 	app-arch/tar[xattr]
+	sys-fs/dosfstools
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )

diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
index 45b66c35b87..d82b44c2606 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -36,9 +36,9 @@ RDEPEND="
 	app-arch/lbzip2
 	app-crypt/shash
 	app-arch/tar[xattr]
+	sys-fs/dosfstools
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )

diff --git a/dev-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
index c715f64e47b..8fea2ecdcce 100644
--- a/dev-util/catalyst/catalyst-2.0.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,9 +35,9 @@ RDEPEND="
 	app-arch/lbzip2
 	app-crypt/shash
 	app-arch/tar[xattr]
+	sys-fs/dosfstools
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )

diff --git a/dev-util/catalyst/catalyst-3.0.0.ebuild b/dev-util/catalyst/catalyst-3.0.0.ebuild
index d92c866043e..2128e995740 100644
--- a/dev-util/catalyst/catalyst-3.0.0.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.0.ebuild
@@ -35,11 +35,11 @@ RDEPEND="
 	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
 	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] )
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 514a27d90a6..ef20b4711c2 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -35,11 +35,11 @@ RDEPEND="
 	=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
 	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] )
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Brian Dolbec]

commit:     49196e34b3d6123bb9fe080882084c2288afebd7
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 19:06:49 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 19:09:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49196e34

dev-util/catalyst: Version bump, re-adds x86-fbsd

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-util/catalyst/Manifest                                    |  1 +
 .../catalyst/{catalyst-9999.ebuild => catalyst-3.0.1.ebuild}  | 11 +++++------
 dev-util/catalyst/catalyst-9999.ebuild                        |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index e3a9bb6ec35..14db1af23d3 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild
similarity index 85%
copy from dev-util/catalyst/catalyst-9999.ebuild
copy to dev-util/catalyst/catalyst-3.0.1.ebuild
index ef20b4711c2..353a6e728bd 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.1.ebuild
@@ -13,10 +13,10 @@ else
 		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{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
@@ -32,12 +32,12 @@ DEPEND="
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
 	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 )
@@ -48,7 +48,6 @@ RDEPEND="
 python_prepare_all() {
 	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
 	VERSION="${PV}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
 }
 
 python_compile_all() {

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index ef20b4711c2..e7cb785d333 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,7 +13,7 @@ else
 		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{3_4,3_5,3_6} )
@@ -36,8 +36,8 @@ 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 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Mike Gilbert]

commit:     adadf31355e7c5ae457696d7d2135e0efbfe62b2
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 23:35:11 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 23:35:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adadf313

dev-util/catalyst: setup.py || die

Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37

 dev-util/catalyst/catalyst-3.0.1.ebuild | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.1.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild
index 5d163f46519..2e0198f3ece 100644
--- a/dev-util/catalyst/catalyst-3.0.1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 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
 }
 

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 8bf0f6c1ad0..c5635f4c74e 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 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
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Mike Gilbert]

commit:     5a4e3df46d1dc0e34e4b8ef8bad379426ecba269
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 23:32:41 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 23:32:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4e3df4

dev-util/catalyst: fix python_prepare_all

Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37

 dev-util/catalyst/catalyst-3.0.1.ebuild | 2 ++
 dev-util/catalyst/catalyst-9999.ebuild  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/dev-util/catalyst/catalyst-3.0.1.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild
index 353a6e728bd..5d163f46519 100644
--- a/dev-util/catalyst/catalyst-3.0.1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.1.ebuild
@@ -46,8 +46,10 @@ RDEPEND="
 "
 
 python_prepare_all() {
+	python_setup
 	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
 	VERSION="${PV}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
 }
 
 python_compile_all() {

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index e7cb785d333..8bf0f6c1ad0 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -46,6 +46,7 @@ RDEPEND="
 "
 
 python_prepare_all() {
+	python_setup
 	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
 	VERSION="${PV}" "${PYTHON}" setup.py set_version
 	distutils-r1_python_prepare_all

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Mike Frysinger]

commit:     a07ee0b43dbada0fa204642c9146d652d5eab53f
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 04:51:50 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 04:51:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a07ee0b4

dev-util/catalyst: mark 2.0.18-r4 arm64/hppa/ia64/ppc64/s390/sh/sparc stable

 dev-util/catalyst/catalyst-2.0.18-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
index d82b44c2606..3cf2b1bb66e 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -14,7 +14,7 @@ else
 		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python2_7 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Anthony G. Basile]

commit:     941c11fbd7b5b50488a87f91572bb992193db43c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 02:16:31 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 02:16:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941c11fb

dev-util/catalyst: 2.0.18-r5 stable on amd64

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-util/catalyst/catalyst-2.0.18-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r5.ebuild b/dev-util/catalyst/catalyst-2.0.18-r5.ebuild
index 863607bc649..727b6cfeb1f 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r5.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r5.ebuild
@@ -14,7 +14,7 @@ else
 		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python2_7 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Richard Farina]

commit:     873239607ff9e3dabad29b5b6d3bb2a16e930849
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 18:09:30 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 18:10:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87323960

dev-util/catalyst: deps for building bootloader

allow catalyst on x86 and amd64 to build a bootloader from the host
instead of requiring a cdtar.  these changes are to make sure the needed
deps are in place to match the changes in catalyst

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/catalyst/catalyst-9999.ebuild | 8 ++++++--
 dev-util/catalyst/metadata.xml         | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index c5635f4c74e..e3bf4c22c44 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ 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
@@ -44,6 +44,10 @@ RDEPEND="
 	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
+				sys-boot/syslinux
+				sys-boot/shim )"
 
 python_prepare_all() {
 	python_setup

diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index 6c4b9cdbcce..988e80de6cc 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -10,5 +10,6 @@
   </maintainer>
   <use>
     <flag name="ccache">Enables ccache support</flag>
+    <flag name="system-bootloader">Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar</flag>
   </use>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Richard Farina]

commit:     421c2d47de22ffcb26bafabe0ad332909665b363
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  3 02:04:24 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 02:05:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=421c2d47

dev-util/catalyst: more correct deps

building cdtar on the fly requires a bit more

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-util/catalyst/catalyst-9999.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index e3bf4c22c44..32ee71fab19 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -46,6 +46,8 @@ RDEPEND="
 "
 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 )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     dbdb934b65b8c937c8275d28379ce2dc9e92d831
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 18:13:40 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 18:15:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbdb934b

dev-util/catalyst: update live ebuild to EAPI=6 & git-r3

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 dev-util/catalyst/catalyst-9999.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 32ee71fab19..e825da32526 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,13 +1,12 @@
 # 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

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     25b0fbd4aff40e80c28de8b805e20d5b5cce9feb
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 19:47:09 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 19:48:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25b0fbd4

dev-util/catalyst: remove unused multilib inherit

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 dev-util/catalyst/catalyst-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index e825da32526..bc08ecaef51 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -17,7 +17,7 @@ fi
 
 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"

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Brian Dolbec]

commit:     867bc008627c8d41b0f84b53001397bbe51c1f9d
Author:     Brian Dolbec dolsen <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 20:20:54 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 20:26:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=867bc008

dev-util/catalyst: Version bump to 3.0.2

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/catalyst/Manifest              |  1 +
 dev-util/catalyst/catalyst-3.0.2.ebuild | 70 +++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 14db1af23d3..7793da33032 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/dev-util/catalyst/catalyst-3.0.2.ebuild b/dev-util/catalyst/catalyst-3.0.2.ebuild
new file mode 100644
index 00000000000..b253f77f24a
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="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 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+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 system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pydecomp-0.2[${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] )
+	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 || 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Brian Dolbec]

commit:     3e7c34aa1361c95ae1292f9ac85eba94352c8029
Author:     Brian Dolbec dolsen <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 20:22:55 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 20:26:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7c34aa

dev-util/catalyst: Clean old versions

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/catalyst/Manifest                 |   1 -
 dev-util/catalyst/catalyst-2.0.9999.ebuild | 108 -----------------------------
 dev-util/catalyst/catalyst-3.0.0.ebuild    |  63 -----------------
 3 files changed, 172 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 7793da33032..77d918a0caa 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,3 @@
 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

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 3d4ac9380dc..00000000000
--- 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.0.ebuild
deleted file mode 100644
index 2128e995740..00000000000
--- a/dev-util/catalyst/catalyst-3.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 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_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"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 multilib ${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"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
-	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] )
-	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_prepare_all() {
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     9fd9bf35d357acfd54e4684d0fbbcfa44f023b81
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 17:01:23 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 17:01:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd9bf35

dev-util/catalyst: 3.0.2 stable on amd64 & x86

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 dev-util/catalyst/catalyst-3.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.2.ebuild b/dev-util/catalyst/catalyst-3.0.2.ebuild
index b253f77f24a..cc286d0a242 100644
--- a/dev-util/catalyst/catalyst-3.0.2.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.2.ebuild
@@ -12,7 +12,7 @@ else
 		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 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     36040969e5f41263ebdd7133a8a760840b5c8408
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 19:19:52 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 19:20:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36040969

dev-util/catalyst: add missing snakeoil RDEPEND, revbump

Fixes: https://bugs.gentoo.org/651230
Package-Manager: Portage-2.3.48, Repoman-2.3.10
RepoMan-Options: --force

 dev-util/catalyst/catalyst-3.0.2-r1.ebuild | 71 ++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild b/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
new file mode 100644
index 00000000000..74acf27f4ce
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="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 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+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 system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	app-arch/lbzip2
+	app-crypt/shash
+	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	sys-fs/dosfstools
+	!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 || 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     101298e63dbbab133474f903ddb4f0c618ea64a4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 05:49:47 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 05:54:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=101298e6

dev-util/catalyst: Depend on a released version of dev-python/pydecomp

dev-python/pydecomp-0.3 is the latest commit in git.

 dev-util/catalyst/catalyst-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index bc08ecaef51..1eeaf9d7e09 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
 	sys-fs/dosfstools

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     9d8a1065e1272d4372b6084c95944e22d5fd0422
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 11:37:02 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 11:37:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d8a1065

dev-util/catalyst: 3.0.2-r1 stable on sparc

Package-Manager: Portage-2.3.50, Repoman-2.3.11

 dev-util/catalyst/catalyst-3.0.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild b/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
index 74acf27f4ce..5e5de2a1b16 100644
--- a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
 		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 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     a6952a07105b1700add641d0dad369ce34471ff8
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  3 12:45:33 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Oct  3 12:47:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6952a07

dev-util/catalyst: bump to 3.0.3

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 dev-util/catalyst/Manifest              |  1 +
 dev-util/catalyst/catalyst-3.0.3.ebuild | 71 +++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 77d918a0caa..0f6d108c4e1 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1,4 @@
 DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
 DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
 DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749af96a1de6401749131a40c2f1f70975d0c449e1a116623c1aec4d3302670ac058fffd80c4f546fae0609d0c3b7f SHA512 02092b39c70095ab49db28c3289a5d3eb4f73cb3aeda79b3e707cbe2710761cf0060493da7d8a5098e1453320b65654bbe34dd37d5f07623fa90d52579869070
+DIST catalyst-3.0.3.tar.bz2 878309 BLAKE2B 38cba740718a034c104d272aa24fa6964a8dd7fc77d5ccbb481308bb0a38c01d3f0d64e48c1708cab4a723b5a4e0f23727d1c2a0dd0ae4832810e09f76aa335c SHA512 26024dbea3afbc843563a0bf2cd68cc953818caccdf8a42c45ac1df25bd396064a604787807e2db847b4467e9a19df6b2f746eb178d99cbe79889070a2fc4b8a

diff --git a/dev-util/catalyst/catalyst-3.0.3.ebuild b/dev-util/catalyst/catalyst-3.0.3.ebuild
new file mode 100644
index 00000000000..aa1bef2ffa1
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 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="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 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+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 system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	app-arch/lbzip2
+	app-crypt/shash
+	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	sys-fs/dosfstools
+	!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 || 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     b19c0733c8d28b8717366f5ef9c6a12e60c77a51
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 12 19:50:06 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Oct 12 19:50:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b19c0733

dev-util/catalyst: 3.0.3 stable on amd64 sparc x86

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-util/catalyst/catalyst-3.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.3.ebuild b/dev-util/catalyst/catalyst-3.0.3.ebuild
index aa1bef2ffa1..5e5de2a1b16 100644
--- a/dev-util/catalyst/catalyst-3.0.3.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.3.ebuild
@@ -12,7 +12,7 @@ else
 		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 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     faed93018e19a90fd8eb4ad5a6541b4d7bdc08e2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  5 03:04:52 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Feb  5 03:11:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faed9301

dev-util/catalyst: Version bump to 3.0.4

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest                                        | 1 +
 dev-util/catalyst/{catalyst-9999.ebuild => catalyst-3.0.4.ebuild} | 8 +++-----
 dev-util/catalyst/catalyst-9999.ebuild                            | 8 +++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 0f6d108c4e1..5c807b53198 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -2,3 +2,4 @@ DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a
 DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
 DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749af96a1de6401749131a40c2f1f70975d0c449e1a116623c1aec4d3302670ac058fffd80c4f546fae0609d0c3b7f SHA512 02092b39c70095ab49db28c3289a5d3eb4f73cb3aeda79b3e707cbe2710761cf0060493da7d8a5098e1453320b65654bbe34dd37d5f07623fa90d52579869070
 DIST catalyst-3.0.3.tar.bz2 878309 BLAKE2B 38cba740718a034c104d272aa24fa6964a8dd7fc77d5ccbb481308bb0a38c01d3f0d64e48c1708cab4a723b5a4e0f23727d1c2a0dd0ae4832810e09f76aa335c SHA512 26024dbea3afbc843563a0bf2cd68cc953818caccdf8a42c45ac1df25bd396064a604787807e2db847b4467e9a19df6b2f746eb178d99cbe79889070a2fc4b8a
+DIST catalyst-3.0.4.tar.bz2 873281 BLAKE2B 8177cee09402ccd02343766facbac3011b45165211a207e8e2c07d53a40091202c84e8294a58ed02a193cab3b3d704fafb50322719257a62092fe39b895d7771 SHA512 5fc5ee9faba6874d1b57fed47a9f92fab9adc03544938d1b1f1d6d867215a36f1efd391849b21300034d27be3207bcc28b4792b8c9c4caec72040d4d30741c2a

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-3.0.4.ebuild
similarity index 86%
copy from dev-util/catalyst/catalyst-9999.ebuild
copy to dev-util/catalyst/catalyst-3.0.4.ebuild
index 1eeaf9d7e09..e8b8bb017df 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,10 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
 	EGIT_BRANCH="master"
 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"
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
@@ -31,6 +28,7 @@ DEPEND="
 	>=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

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 1eeaf9d7e09..e8b8bb017df 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,10 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
 	EGIT_BRANCH="master"
 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"
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
@@ -31,6 +28,7 @@ DEPEND="
 	>=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

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     26cbe19b58431261172e58366c07531db1fc1c11
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 19:23:21 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May  4 19:25:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26cbe19b

dev-util/catalyst: keyword ~riscv

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.4.ebuild | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.4.ebuild b/dev-util/catalyst/catalyst-3.0.4.ebuild
index 0a171813dc5..85870e20421 100644
--- a/dev-util/catalyst/catalyst-3.0.4.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.4.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	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} )

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 0a171813dc5..85870e20421 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	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} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     0305f42b822a4085b2aeb9fbb3af7798aecf8992
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 22:25:50 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May  4 22:25:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0305f42b

dev-util/catalyst: Works fine with python-3.7

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.4.ebuild b/dev-util/catalyst/catalyst-3.0.4.ebuild
index 85870e20421..c891993d68a 100644
--- a/dev-util/catalyst/catalyst-3.0.4.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.4.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} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     47690e36f57959bf97371e24d9268cad88ed81f8
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 15:56:10 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun May  5 15:56:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47690e36

dev-util/catalyst: Add iso useflag, to make keywording easier

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.4.ebuild | 4 ++--
 dev-util/catalyst/catalyst-9999.ebuild  | 6 +++---
 dev-util/catalyst/metadata.xml          | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.4.ebuild b/dev-util/catalyst/catalyst-3.0.4.ebuild
index c891993d68a..8126cc04819 100644
--- a/dev-util/catalyst/catalyst-3.0.4.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.4.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ccache doc kernel_linux system-bootloader"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
 
 DEPEND="
 	app-text/asciidoc
@@ -35,10 +35,10 @@ RDEPEND="
 	sys-fs/dosfstools
 	!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 )
+	iso? ( virtual/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-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 85870e20421..8126cc04819 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} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ccache doc kernel_linux system-bootloader"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
 
 DEPEND="
 	app-text/asciidoc
@@ -35,10 +35,10 @@ RDEPEND="
 	sys-fs/dosfstools
 	!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 )
+	iso? ( virtual/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/metadata.xml b/dev-util/catalyst/metadata.xml
index 988e80de6cc..f89291ab293 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -10,6 +10,7 @@
   </maintainer>
   <use>
     <flag name="ccache">Enables ccache support</flag>
+    <flag name="iso">Pulls in the depends for building iso images</flag>
     <flag name="system-bootloader">Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar</flag>
   </use>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     4065a487f2c9e3a6a4d44d0a541a2f4ad97f472e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 18:37:08 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 18:37:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4065a487

dev-util/catalyst: Version bump to 3.0.5

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest              |  1 +
 dev-util/catalyst/catalyst-3.0.5.ebuild | 68 +++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 5c807b53198..05f5851fdef 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -3,3 +3,4 @@ DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f4
 DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749af96a1de6401749131a40c2f1f70975d0c449e1a116623c1aec4d3302670ac058fffd80c4f546fae0609d0c3b7f SHA512 02092b39c70095ab49db28c3289a5d3eb4f73cb3aeda79b3e707cbe2710761cf0060493da7d8a5098e1453320b65654bbe34dd37d5f07623fa90d52579869070
 DIST catalyst-3.0.3.tar.bz2 878309 BLAKE2B 38cba740718a034c104d272aa24fa6964a8dd7fc77d5ccbb481308bb0a38c01d3f0d64e48c1708cab4a723b5a4e0f23727d1c2a0dd0ae4832810e09f76aa335c SHA512 26024dbea3afbc843563a0bf2cd68cc953818caccdf8a42c45ac1df25bd396064a604787807e2db847b4467e9a19df6b2f746eb178d99cbe79889070a2fc4b8a
 DIST catalyst-3.0.4.tar.bz2 873281 BLAKE2B 8177cee09402ccd02343766facbac3011b45165211a207e8e2c07d53a40091202c84e8294a58ed02a193cab3b3d704fafb50322719257a62092fe39b895d7771 SHA512 5fc5ee9faba6874d1b57fed47a9f92fab9adc03544938d1b1f1d6d867215a36f1efd391849b21300034d27be3207bcc28b4792b8c9c4caec72040d4d30741c2a
+DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4

diff --git a/dev-util/catalyst/catalyst-3.0.5.ebuild b/dev-util/catalyst/catalyst-3.0.5.ebuild
new file mode 100644
index 00000000000..8126cc04819
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.5.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_5,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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     8a9db98cb4931d6f31d708501f9426192eb3a5b7
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 16:05:33 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 16:06:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a9db98c

dev-util/catalyst: Stabilize 3.0.5

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.5.ebuild b/dev-util/catalyst/catalyst-3.0.5.ebuild
index 8126cc04819..0ca5875c8c6 100644
--- a/dev-util/catalyst/catalyst-3.0.5.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.5.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	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} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Michał Górny]

commit:     83da39fef67e5509f9a0dc8678b8ed91a651aa79
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 07:29:30 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 07:30:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83da39fe

dev-util/catalyst: Remove py3.5 support due to snakeoil dropping it

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.5.ebuild | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.5.ebuild b/dev-util/catalyst/catalyst-3.0.5.ebuild
index 0ca5875c8c6..8369b04fcc0 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-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 8126cc04819..25b4d5dcd3c 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}
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     c67fbf172c26f34f862e65db49bbe6aa4faa96c6
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 26 16:57:13 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 16:57:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c67fbf17

dev-util/catalyst: Version bump to 3.0.6

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest              |  1 +
 dev-util/catalyst/catalyst-3.0.6.ebuild | 68 +++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index b3742172451..171a8fa7651 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
 DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
+DIST catalyst-3.0.6.tar.bz2 873468 BLAKE2B 146228e6a8eca293a93ab50661b1a3852fe587036d2d2ff9fde132ccb1f0642cbdd4332a13f912927ef8e7c5d8dea5bb738aa3327b559e18c7d31308a289a7fc SHA512 01de8405f48c698366cbb675e75ecbe6cfb5a7236d5b5a0f1f9bc6200b07c728fca41925b34177019b207d8ef2c1b688306a37b1571a7fd91138d31e81758bce

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 00000000000..25b4d5dcd3c
--- /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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     8dc848b0cd033d83b02bfe37ee292b5051bb7356
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 01:55:30 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 01:55:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc848b0

dev-util/catalyst-3.0.6: sparc stable

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.6.ebuild b/dev-util/catalyst/catalyst-3.0.6.ebuild
index 25b4d5dcd3c..15c75f926c4 100644
--- a/dev-util/catalyst/catalyst-3.0.6.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.6.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	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} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     72a45b5c86feaf35ba9949296c549b1454a04b13
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 00:03:11 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 00:04:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72a45b5c

dev-util/catalyst: Version bump to 3.0.7

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest              |  1 +
 dev-util/catalyst/catalyst-3.0.7.ebuild | 68 +++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 171a8fa7651..1b7fb027e44 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
 DIST catalyst-3.0.6.tar.bz2 873468 BLAKE2B 146228e6a8eca293a93ab50661b1a3852fe587036d2d2ff9fde132ccb1f0642cbdd4332a13f912927ef8e7c5d8dea5bb738aa3327b559e18c7d31308a289a7fc SHA512 01de8405f48c698366cbb675e75ecbe6cfb5a7236d5b5a0f1f9bc6200b07c728fca41925b34177019b207d8ef2c1b688306a37b1571a7fd91138d31e81758bce
+DIST catalyst-3.0.7.tar.bz2 873526 BLAKE2B e056c2ac7589e2423a984c8a089faef87af24d401d4b2c2c4c3752b0af290e42df1fd1f5fd3dad5586fd96b23ecdfa90482f913b2be4181727048cf8fdef8d43 SHA512 403d33c10324e4bfd7c7c2f9a63bc41823230b0450e3e153fb051e8efb18263f1d7f260a11d8acdfa052efa8d41cb2ba4570e65d68c41e342d83477c755e68ab

diff --git a/dev-util/catalyst/catalyst-3.0.7.ebuild b/dev-util/catalyst/catalyst-3.0.7.ebuild
new file mode 100644
index 00000000000..9b191cbaf51
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.7.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"
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     85da97085ddfdd6a8295e4866783773ba463f473
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 15:05:56 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 15:06:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85da9708

dev-util/catalyst: Version bump to 3.0.8

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest              |  1 +
 dev-util/catalyst/catalyst-3.0.8.ebuild | 68 +++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 1b7fb027e44..93f94df0c18 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1,4 @@
 DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
 DIST catalyst-3.0.6.tar.bz2 873468 BLAKE2B 146228e6a8eca293a93ab50661b1a3852fe587036d2d2ff9fde132ccb1f0642cbdd4332a13f912927ef8e7c5d8dea5bb738aa3327b559e18c7d31308a289a7fc SHA512 01de8405f48c698366cbb675e75ecbe6cfb5a7236d5b5a0f1f9bc6200b07c728fca41925b34177019b207d8ef2c1b688306a37b1571a7fd91138d31e81758bce
 DIST catalyst-3.0.7.tar.bz2 873526 BLAKE2B e056c2ac7589e2423a984c8a089faef87af24d401d4b2c2c4c3752b0af290e42df1fd1f5fd3dad5586fd96b23ecdfa90482f913b2be4181727048cf8fdef8d43 SHA512 403d33c10324e4bfd7c7c2f9a63bc41823230b0450e3e153fb051e8efb18263f1d7f260a11d8acdfa052efa8d41cb2ba4570e65d68c41e342d83477c755e68ab
+DIST catalyst-3.0.8.tar.bz2 873610 BLAKE2B af6fca5dd8dea377795d1b50b942773b0cb8383e1727ba547f1511f126ad4f1494d64ca3d4b3e479664de366e8ed2f8ad8c09c206bbd213d6f95aa51ae56ea8c SHA512 b00a31d9af9b3c1d220080eb6068c924f6ca9f4d574f4805f2b833e61e0fdb79290ec6f5b190c0c7501e015068eb756ede6aea7a959d2e22cef8a055968b7203

diff --git a/dev-util/catalyst/catalyst-3.0.8.ebuild b/dev-util/catalyst/catalyst-3.0.8.ebuild
new file mode 100644
index 00000000000..9b191cbaf51
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.8.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"
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     22c18dd1b13317e05804bb9700f2a893f3758e25
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 15:16:42 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 15:16:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c18dd1

dev-util/catalyst: Stabilize 3.0.8

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.8.ebuild b/dev-util/catalyst/catalyst-3.0.8.ebuild
index 9b191cbaf51..7da190c26fe 100644
--- a/dev-util/catalyst/catalyst-3.0.8.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.8.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_6,3_7} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     d0840288c93f08c8ad134646a19bd30393b6cd6a
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  7 14:17:07 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 14:23:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0840288

dev-util/catalyst: update PYTHON_COMPAT

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.8.ebuild | 4 ++--
 dev-util/catalyst/catalyst-9999.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.8.ebuild b/dev-util/catalyst/catalyst-3.0.8.ebuild
index 7da190c26fe..06458c752dc 100644
--- a/dev-util/catalyst/catalyst-3.0.8.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 9b191cbaf51..f49e1e66af5 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     329e08c3c27b02b1db931b38f873bce8d1d329c0
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  7 14:23:12 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 14:23:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329e08c3

dev-util/catalyst: drop old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/Manifest              |  3 --
 dev-util/catalyst/catalyst-3.0.5.ebuild | 68 ---------------------------------
 dev-util/catalyst/catalyst-3.0.6.ebuild | 68 ---------------------------------
 dev-util/catalyst/catalyst-3.0.7.ebuild | 68 ---------------------------------
 4 files changed, 207 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 93f94df0c18..2752f7eaaf1 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1 @@
-DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
-DIST catalyst-3.0.6.tar.bz2 873468 BLAKE2B 146228e6a8eca293a93ab50661b1a3852fe587036d2d2ff9fde132ccb1f0642cbdd4332a13f912927ef8e7c5d8dea5bb738aa3327b559e18c7d31308a289a7fc SHA512 01de8405f48c698366cbb675e75ecbe6cfb5a7236d5b5a0f1f9bc6200b07c728fca41925b34177019b207d8ef2c1b688306a37b1571a7fd91138d31e81758bce
-DIST catalyst-3.0.7.tar.bz2 873526 BLAKE2B e056c2ac7589e2423a984c8a089faef87af24d401d4b2c2c4c3752b0af290e42df1fd1f5fd3dad5586fd96b23ecdfa90482f913b2be4181727048cf8fdef8d43 SHA512 403d33c10324e4bfd7c7c2f9a63bc41823230b0450e3e153fb051e8efb18263f1d7f260a11d8acdfa052efa8d41cb2ba4570e65d68c41e342d83477c755e68ab
 DIST catalyst-3.0.8.tar.bz2 873610 BLAKE2B af6fca5dd8dea377795d1b50b942773b0cb8383e1727ba547f1511f126ad4f1494d64ca3d4b3e479664de366e8ed2f8ad8c09c206bbd213d6f95aa51ae56ea8c SHA512 b00a31d9af9b3c1d220080eb6068c924f6ca9f4d574f4805f2b833e61e0fdb79290ec6f5b190c0c7501e015068eb756ede6aea7a959d2e22cef8a055968b7203

diff --git a/dev-util/catalyst/catalyst-3.0.5.ebuild b/dev-util/catalyst/catalyst-3.0.5.ebuild
deleted file mode 100644
index 7da190c26fe..00000000000
--- a/dev-util/catalyst/catalyst-3.0.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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"
-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-3.0.6.ebuild b/dev-util/catalyst/catalyst-3.0.6.ebuild
deleted file mode 100644
index a2ca1e9a487..00000000000
--- a/dev-util/catalyst/catalyst-3.0.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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"
-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-3.0.7.ebuild b/dev-util/catalyst/catalyst-3.0.7.ebuild
deleted file mode 100644
index 9b191cbaf51..00000000000
--- a/dev-util/catalyst/catalyst-3.0.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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"
-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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     c6a01f6a1bcc13eaaee7a6ea39f20d55cb87cbbc
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 10 18:35:31 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 18:38:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a01f6a

dev-util/catalyst: Version bump to 3.0.9

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest              |  1 +
 dev-util/catalyst/catalyst-3.0.9.ebuild | 68 +++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 2752f7eaaf1..fb419264506 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
 DIST catalyst-3.0.8.tar.bz2 873610 BLAKE2B af6fca5dd8dea377795d1b50b942773b0cb8383e1727ba547f1511f126ad4f1494d64ca3d4b3e479664de366e8ed2f8ad8c09c206bbd213d6f95aa51ae56ea8c SHA512 b00a31d9af9b3c1d220080eb6068c924f6ca9f4d574f4805f2b833e61e0fdb79290ec6f5b190c0c7501e015068eb756ede6aea7a959d2e22cef8a055968b7203
+DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.9.ebuild b/dev-util/catalyst/catalyst-3.0.9.ebuild
new file mode 100644
index 00000000000..f49e1e66af5
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.9.ebuild
@@ -0,0 +1,68 @@
+# 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 ~sh ~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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Mike Gilbert]

commit:     db934e8d9cc73032a9241d7aed7acfdee0639f1a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 15 05:42:19 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Apr 15 05:42:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db934e8d

dev-util/catalyst: DISTUTILS_USE_SETUPTOOLS=no

Package-Manager: Portage-2.3.99_p1, Repoman-2.3.22_p30
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.9.ebuild | 1 +
 dev-util/catalyst/catalyst-9999.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-util/catalyst/catalyst-3.0.9.ebuild b/dev-util/catalyst/catalyst-3.0.9.ebuild
index 9b107bd9beb..644bdda6962 100644
--- a/dev-util/catalyst/catalyst-3.0.9.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.9.ebuild
@@ -13,6 +13,7 @@ else
 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 9b107bd9beb..644bdda6962 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}
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     a250b386ba46f50ee1149ce566b5900b0bc2cd9f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 07:00:36 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 07:30:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a250b386

dev-util/catalyst: Drop FreeBSD dependencies

Also drop libarchive option. It's not clear to me how that was supposed
to work. I don't see any code in pydecomp nor catalyst that appears to
use bsdtar.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 644bdda6962..0e58e9160c4 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -32,10 +32,9 @@ RDEPEND="
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
 	app-arch/lbzip2
+	app-arch/tar[xattr]
 	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 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     9f417971f1e9138938d4c83a601f758047e7dbd9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 07:06:35 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 07:30:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f417971

dev-util/catalyst: Depend on dev-python/toml

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 6221c476514..0c21d188dea 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -24,12 +24,16 @@ 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-arch/tar[xattr]

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     5b33f35e2614bd54ea148c42b89855275980ee54
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 07:07:19 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 07:30:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b33f35e

dev-util/catalyst-3.0.9: Stabilize

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.9.ebuild b/dev-util/catalyst/catalyst-3.0.9.ebuild
index 644bdda6962..39bbd3250f4 100644
--- a/dev-util/catalyst/catalyst-3.0.9.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.9.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="~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} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     9f75fe72d3c6bf6699136e5ed7f9944be119c958
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 07:30:08 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 07:30:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f75fe72

dev-util/catalyst: Add USE=iso dependencies for other arches

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 0c21d188dea..a9b0c858e54 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -42,7 +42,30 @@ RDEPEND="
 	>=sys-fs/squashfs-tools-2.1
 	ccache? ( dev-util/ccache )
 
-	iso? ( virtual/cdrtools )
+	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 )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     80aaf821ee7bae376a13419e7559b3705399885c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 07:03:18 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 07:30:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80aaf821

dev-util/catalyst: Reformat dependencies

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 0e58e9160c4..ea6a5b43445 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -33,20 +33,28 @@ RDEPEND="
 	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-arch/tar[xattr]
+	app-misc/zisofs-tools
 	app-crypt/shash
 	sys-fs/dosfstools
-	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 )
+
+	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

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     faec07499d51d3d0ce1693f1d803f15d3edc08de
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 07:07:28 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 07:30:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faec0749

dev-util/catalyst: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest              |  1 -
 dev-util/catalyst/catalyst-3.0.8.ebuild | 68 ---------------------------------
 2 files changed, 69 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index fb419264506..df39280f7ad 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1 @@
-DIST catalyst-3.0.8.tar.bz2 873610 BLAKE2B af6fca5dd8dea377795d1b50b942773b0cb8383e1727ba547f1511f126ad4f1494d64ca3d4b3e479664de366e8ed2f8ad8c09c206bbd213d6f95aa51ae56ea8c SHA512 b00a31d9af9b3c1d220080eb6068c924f6ca9f4d574f4805f2b833e61e0fdb79290ec6f5b190c0c7501e015068eb756ede6aea7a959d2e22cef8a055968b7203
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

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 38f72b6a4c2..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     7712ca5d2ea5180f67bdcf5ac9f2fad0f99a7679
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 07:04:13 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 07:30:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7712ca5d

dev-util/catalyst: Drop no longer used shash dep

Was replaced by python's hashlib.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index ea6a5b43445..6221c476514 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -34,7 +34,6 @@ RDEPEND="
 	app-arch/lbzip2
 	app-arch/tar[xattr]
 	app-misc/zisofs-tools
-	app-crypt/shash
 	sys-fs/dosfstools
 	>=sys-fs/squashfs-tools-2.1
 	ccache? ( dev-util/ccache )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     c42997017faedd211b9522eb0633996245ecd2b9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 00:44:28 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May  5 00:44:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4299701

dev-util/catalyst: Update dependencies

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index a9b0c858e54..89afd4a5529 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -37,9 +37,8 @@ RDEPEND="
 	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-arch/tar[xattr]
-	app-misc/zisofs-tools
 	sys-fs/dosfstools
-	>=sys-fs/squashfs-tools-2.1
+	sys-fs/squashfs-tools-ng
 	ccache? ( dev-util/ccache )
 
 	iso? (

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     ff847fd1b212359109b301db4e349a433ad604d3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 18:49:47 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May  9 18:50:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff847fd1

dev-util/catalyst: Add dependency on dev-vcs/git

Catalyst uses git in the snapshot target, and I forgot to add the
dependency when I added squashfs-tools-ng (the other new dependency).

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 89afd4a5529..e50d1271d9a 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
 	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-arch/tar[xattr]
+	dev-vcs/git
 	sys-fs/dosfstools
 	sys-fs/squashfs-tools-ng
 	ccache? ( dev-util/ccache )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     5f801bcbef1bb12496fdea0e40829fc213b38ae0
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 18:30:38 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 17 18:34:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f801bcb

dev-util/catalyst: Version bump to 3.0.10

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 +
 dev-util/catalyst/catalyst-3.0.10.ebuild | 69 ++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index df39280f7ad..5d0be8ceac2 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
+DIST catalyst-3.0.10.tar.bz2 621118 BLAKE2B 07c7d79400aad81db60034685bed31c4e3d13bb45cd89689e4e3328c14573a1b824fd13310a14bdef8e638df2374c967520ae919d347e8a8a89059038436e28a SHA512 480377ff8e774484bfbcc223b2bcf3b80641772363c08f80431db9840129a83abb2a69228d681c71dad7395462733ab3c15542bc456d7b92bbf68bb3c97f999a
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.10.ebuild b/dev-util/catalyst/catalyst-3.0.10.ebuild
new file mode 100644
index 00000000000..644bdda6962
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.10.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_{6,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? ( 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     fb09b7959f13d6b4463c6219aaf5514ec33f55ba
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon May 18 20:04:01 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May 18 20:04:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb09b795

dev-util/catalyst: Version bump to 3.0.11

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest                                           | 2 +-
 dev-util/catalyst/{catalyst-3.0.10.ebuild => catalyst-3.0.11.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 5d0be8ceac2..658cafd144e 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,2 @@
-DIST catalyst-3.0.10.tar.bz2 621118 BLAKE2B 07c7d79400aad81db60034685bed31c4e3d13bb45cd89689e4e3328c14573a1b824fd13310a14bdef8e638df2374c967520ae919d347e8a8a89059038436e28a SHA512 480377ff8e774484bfbcc223b2bcf3b80641772363c08f80431db9840129a83abb2a69228d681c71dad7395462733ab3c15542bc456d7b92bbf68bb3c97f999a
+DIST catalyst-3.0.11.tar.bz2 621111 BLAKE2B 0104e989e70f8629c43eac0b5b850efe8ed153b3423f24d0dd62ca1f52e1e9a6b1c652f89acfe35f63e80775958c93d7ddb93b9a1a43f7a7bdfbf8fb13a3c93f SHA512 f9a5cbd44d380b1725a771c8f9e88e9123f2fcf10339f66ea653737ab93ceed15870efe1a1c175b5fe7e43c36196afda69ae98ee02df345f7b00da92fd91130d
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.10.ebuild b/dev-util/catalyst/catalyst-3.0.11.ebuild
similarity index 100%
rename from dev-util/catalyst/catalyst-3.0.10.ebuild
rename to dev-util/catalyst/catalyst-3.0.11.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     580a3c74ed4677d3c9754fe85087e89bb6fd279d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May 19 03:55:21 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 19 03:56:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580a3c74

dev-util/catalyst: Drop PYTHON_COMPAT=python3_6

We're using python 3.7 features in git.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index e50d1271d9a..2c7b1791e8c 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 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     8903c0cc2b2637c7823fe96cfbf2d07bdce112b8
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May 19 15:50:53 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 19 16:22:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8903c0cc

dev-util/catalyst: Version bump to 3.0.12

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest                                           | 2 +-
 dev-util/catalyst/{catalyst-3.0.11.ebuild => catalyst-3.0.12.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 658cafd144e..a550f90a9b7 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,2 @@
-DIST catalyst-3.0.11.tar.bz2 621111 BLAKE2B 0104e989e70f8629c43eac0b5b850efe8ed153b3423f24d0dd62ca1f52e1e9a6b1c652f89acfe35f63e80775958c93d7ddb93b9a1a43f7a7bdfbf8fb13a3c93f SHA512 f9a5cbd44d380b1725a771c8f9e88e9123f2fcf10339f66ea653737ab93ceed15870efe1a1c175b5fe7e43c36196afda69ae98ee02df345f7b00da92fd91130d
+DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb SHA512 8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.11.ebuild b/dev-util/catalyst/catalyst-3.0.12.ebuild
similarity index 100%
rename from dev-util/catalyst/catalyst-3.0.11.ebuild
rename to dev-util/catalyst/catalyst-3.0.12.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     2728d71b3ac92daa51603971112fac918a5c16e8
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 20:27:50 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 23 20:28:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2728d71b

dev-util/catalyst: Stabilize 3.0.12

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.12.ebuild b/dev-util/catalyst/catalyst-3.0.12.ebuild
index 644bdda6962..39bbd3250f4 100644
--- a/dev-util/catalyst/catalyst-3.0.12.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.12.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="~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} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     c29052d0f72ee95e3f62eef794505f788009d947
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 18:30:17 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 18:31:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c29052d0

dev-util/catalyst: Version bump to 3.0.13

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 +
 dev-util/catalyst/catalyst-3.0.13.ebuild | 69 ++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index a550f90a9b7..d6da9ead53b 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb SHA512 8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda
+DIST catalyst-3.0.13.tar.bz2 621326 BLAKE2B f87a94b696d897fad8cab5e033a68a944dd5f73cbb110c3051432f9ae8baf8d341e456e1c9935345ac9102e99301c912abe706225023b3bdf28372095410cb26 SHA512 87f66b56056000ebee061003ae08d6e4e6b64aadbe89d71f6d50fe86e838e04d3f534dd3bc2f561fe42762de4108bf4d5536fab485fa260c251f90b45e97e8a9
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.13.ebuild b/dev-util/catalyst/catalyst-3.0.13.ebuild
new file mode 100644
index 00000000000..644bdda6962
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.13.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_{6,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? ( 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     ef3a5360eae10d6806ddedbe1825739d55fa6e1f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 16:06:38 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 16:07:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3a5360

dev-util/catalyst: Version bump to 3.0.14

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 +
 dev-util/catalyst/catalyst-3.0.14.ebuild | 69 ++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index d6da9ead53b..8dd66880f2f 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1,4 @@
 DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb SHA512 8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda
 DIST catalyst-3.0.13.tar.bz2 621326 BLAKE2B f87a94b696d897fad8cab5e033a68a944dd5f73cbb110c3051432f9ae8baf8d341e456e1c9935345ac9102e99301c912abe706225023b3bdf28372095410cb26 SHA512 87f66b56056000ebee061003ae08d6e4e6b64aadbe89d71f6d50fe86e838e04d3f534dd3bc2f561fe42762de4108bf4d5536fab485fa260c251f90b45e97e8a9
+DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
new file mode 100644
index 00000000000..644bdda6962
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.14.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_{6,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? ( 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     7e1b03f30c4672fa11d1c22ee8acbe3758dfb351
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 21:04:14 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:06:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e1b03f3

dev-util/catalyst: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  3 --
 dev-util/catalyst/catalyst-3.0.12.ebuild | 69 --------------------------------
 dev-util/catalyst/catalyst-3.0.13.ebuild | 69 --------------------------------
 dev-util/catalyst/catalyst-3.0.9.ebuild  | 69 --------------------------------
 4 files changed, 210 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 8dd66880f2f..f015253b6cf 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1 @@
-DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb SHA512 8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda
-DIST catalyst-3.0.13.tar.bz2 621326 BLAKE2B f87a94b696d897fad8cab5e033a68a944dd5f73cbb110c3051432f9ae8baf8d341e456e1c9935345ac9102e99301c912abe706225023b3bdf28372095410cb26 SHA512 87f66b56056000ebee061003ae08d6e4e6b64aadbe89d71f6d50fe86e838e04d3f534dd3bc2f561fe42762de4108bf4d5536fab485fa260c251f90b45e97e8a9
 DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
-DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.12.ebuild b/dev-util/catalyst/catalyst-3.0.12.ebuild
deleted file mode 100644
index 39bbd3250f4..00000000000
--- a/dev-util/catalyst/catalyst-3.0.12.ebuild
+++ /dev/null
@@ -1,69 +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} )
-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? ( 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.13.ebuild b/dev-util/catalyst/catalyst-3.0.13.ebuild
deleted file mode 100644
index 644bdda6962..00000000000
--- a/dev-util/catalyst/catalyst-3.0.13.ebuild
+++ /dev/null
@@ -1,69 +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} )
-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? ( 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
deleted file mode 100644
index 39bbd3250f4..00000000000
--- a/dev-util/catalyst/catalyst-3.0.9.ebuild
+++ /dev/null
@@ -1,69 +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} )
-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? ( 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     6ab1b86e18cc593b83ea95b23fc77355502dac7e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 20:39:26 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:06:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab1b86e

dev-util/catalyst: Depend on sys-apps/portage

Since catalyst/defaults.py imports portage, portage is needed at build
time to produce the man pages.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 2c7b1791e8c..de182b946c6 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -25,6 +25,7 @@ SLOT="0"
 IUSE="ccache doc +iso kernel_linux system-bootloader"
 
 COMMON_DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 "

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     d69507b33a883cc0ab89aef0df18a42447c18c9a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 20:54:26 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:06:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69507b3

dev-util/catalyst: EAPI=7

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 21053974649..0091eacf302 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == *9999* ]]; then
 	SRC_ECLASS="git-r3"
@@ -24,17 +24,16 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc +iso system-bootloader"
 
-COMMON_DEPEND="
+BDEPEND="
+	app-text/asciidoc
+"
+DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 "
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/asciidoc
-"
 RDEPEND="
-	${COMMON_DEPEND}
+	${DEPEND}
 	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-arch/pixz

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     3399e44f01301037e4643bad0efb52e114bcd17a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 21:03:32 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:06:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3399e44f

dev-util/catalyst: Propagate stable keywords

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 644bdda6962..39bbd3250f4 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.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="~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} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     f8465671cfe9352d37a65530cb46e7f9b99ef599
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 20:43:26 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:06:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8465671

dev-util/catalyst: Add dependency on app-arch/pixz

pixz is not a required dependency, strictly speaking, but it's commonly
used in .spec files and is an extremely small dependency. Additionally,
the failure mode if it's not available is to produce a 0-byte tar.xz
file at the end of the build, which is not good.

Closes: https://bugs.gentoo.org/742569
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index e6f0e1676b7..3e307e5f833 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
 	${COMMON_DEPEND}
 	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
 	app-arch/lbzip2
+	app-arch/pixz
 	app-arch/tar[xattr]
 	dev-vcs/git
 	sys-fs/dosfstools

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     509180bcd9b588112cb080cb2e62aabedf1b3836
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 20:41:27 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:06:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=509180bc

dev-util/catalyst: Remove some dependencies

In upstream commit 0a27a7a39a7d (targets: Use GRUB for BIOS boot) I
dropped the uses of these packages.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index de182b946c6..e6f0e1676b7 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -67,16 +67,10 @@ RDEPEND="
 			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] )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     25c135ab978c7af867351141b73f5a65e49b8aba
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 20:48:43 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:06:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c135ab

dev-util/catalyst: Drop IUSE=ccache

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 3e307e5f833..2d78bcbe611 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -15,14 +15,14 @@ fi
 PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 ${SRC_ECLASS}
+inherit distutils-r1 optfeature ${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"
+IUSE="doc +iso kernel_linux system-bootloader"
 
 COMMON_DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
@@ -42,7 +42,6 @@ RDEPEND="
 	dev-vcs/git
 	sys-fs/dosfstools
 	sys-fs/squashfs-tools-ng
-	ccache? ( dev-util/ccache )
 
 	iso? (
 		virtual/cdrtools
@@ -96,3 +95,7 @@ python_install_all() {
 		dodoc files/HOWTO.html files/docbook-xsl.css
 	fi
 }
+
+pkg_postinst() {
+	optfeature "ccache support" "dev-util/ccache"
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     6ee833c002816350b75e1990f248e22829188a54
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 20:56:43 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:06:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee833c0

dev-util/catalyst: Remove IUSE=system-bootloader

I'm honestly not sure what the idea was here. The system's grub has
always been needed for producing ISOs on amd64/x86 and catalyst doesn't
produce anything else that uses grub. Just fold this into IUSE=iso.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 0091eacf302..a8df688e16a 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -45,6 +45,9 @@ RDEPEND="
 	iso? (
 		virtual/cdrtools
 
+		amd64? (
+			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+		)
 		alpha? (
 			dev-libs/libisoburn
 		)
@@ -65,14 +68,9 @@ RDEPEND="
 			dev-libs/libisoburn
 			sys-boot/grub:2[grub_platforms_ieee1275]
 		)
-	)
-"
-PDEPEND="
-	system-bootloader? (
-		sys-boot/grub:2
-
-		amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-		x86?   ( sys-boot/grub[grub_platforms_efi-32] )
+		x86?   (
+			sys-boot/grub[grub_platforms_efi-32]
+		)
 	)
 "
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     20b4436a70e39098b0748c71c3cf702507d1ccce
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 20:51:59 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:06:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20b4436a

dev-util/catalyst: Drop unused IUSE=kernel_linux

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 2d78bcbe611..21053974649 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc +iso kernel_linux system-bootloader"
+IUSE="doc +iso system-bootloader"
 
 COMMON_DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     549bbcbd72f60ebf57760739508ec59291464320
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 21:08:21 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:08:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=549bbcbd

dev-util/catalyst: Finish removing IUSE=system-bootloader

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index a8df688e16a..fa531458676 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc +iso system-bootloader"
+IUSE="doc +iso"
 
 BDEPEND="
 	app-text/asciidoc

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     78fc35f2e766117caa26928db5a0a09b8af18c3c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 21:22:44 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:46:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fc35f2

dev-util/catalyst: Correct the license

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.14.ebuild | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 39bbd3250f4..09099da1323 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -20,7 +20,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"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="ccache doc +iso kernel_linux system-bootloader"
 

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index fa531458676..1edccfd19e6 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -20,7 +20,7 @@ inherit distutils-r1 optfeature ${SRC_ECLASS}
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="doc +iso"
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     770065afe985c7f3bc4a9a4f7f2e2a14eea027c4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 23:20:53 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 23:22:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770065af

dev-util/catalyst: Improve pkg_postinst()

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 1edccfd19e6..aa0697220eb 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -94,5 +94,9 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	optfeature "ccache support" "dev-util/ccache"
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "You may consider installing the following optional packages:"
+		optfeature "ccache support" dev-util/ccache
+	fi
 }

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     a4f52fce9b7808efed188061d38def995e899eee
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 17:57:48 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 17:58:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f52fce

dev-util/catalyst: Check for UTS_NS IPC_NS Kconfig options

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index aa0697220eb..8b532c332b7 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -15,7 +15,7 @@ fi
 PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 optfeature ${SRC_ECLASS}
+inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}
 
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
@@ -74,6 +74,11 @@ RDEPEND="
 	)
 "
 
+pkg_setup() {
+	CONFIG_CHECK="~UTS_NS ~IPC_NS"
+	linux-info_pkg_setup
+}
+
 python_prepare_all() {
 	python_setup
 	echo VERSION="${PV}" "${PYTHON}" setup.py set_version

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     b203936ca1f8c298b68fbe506b5245dff7debd5f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 16:24:51 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 22:33:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b203936c

dev-util/catalyst: Depend on sys-apps/util-linux[python]

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 8b532c332b7..e51ab58b667 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
+	sys-apps/util-linux[python,${PYTHON_USEDEP}]
 "
 RDEPEND="
 	${DEPEND}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     108891a186ac0756c72da2a3f93f05c1aa4c0fc2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 16:27:23 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 22:33:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108891a1

dev-util/catalyst: Remove python3_7

Catalyst now requires Python 3.8+ (uses the assignment expression
operator).

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index e51ab58b667..60587f23f48 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 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     62ec2589def0a1c18b415e558210c0d7123c93c9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 23:47:54 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 23:49:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ec2589

dev-util/catalyst: Check for SQUASHFS Kconfig options

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 60587f23f48..27ca55eff34 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -76,7 +76,10 @@ RDEPEND="
 "
 
 pkg_setup() {
-	CONFIG_CHECK="~UTS_NS ~IPC_NS"
+	CONFIG_CHECK="
+		~UTS_NS ~IPC_NS
+		~SQUASHFS ~SQUASHFS_ZLIB
+	"
 	linux-info_pkg_setup
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     53fb2d3d011a7b4590f2137a141015831ab068cb
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 22:50:47 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 22:50:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53fb2d3d

dev-util/catalyst: Remove livecd@ as maintainer

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index f89291ab293..70cd8c55a58 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -4,10 +4,6 @@
   <maintainer type="project">
     <email>catalyst@gentoo.org</email>
   </maintainer>
-  <maintainer type="project">
-    <email>livecd@gentoo.org</email>
-    <name>Gentoo LiveCD Project</name>
-  </maintainer>
   <use>
     <flag name="ccache">Enables ccache support</flag>
     <flag name="iso">Pulls in the depends for building iso images</flag>

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     bf71c7855ffcc0471cf6102e860d84213a87ab9d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 16:05:43 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 16:05:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf71c785

dev-util/catalyst: Version bump to 3.0.15

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 +
 dev-util/catalyst/catalyst-3.0.15.ebuild | 69 ++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index f015253b6cf..8964c9e53de 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
 DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
+DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2 SHA512 ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5

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 00000000000..cf9fc644a64
--- /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? ( 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     d21829bee828e23b2c942c4606b6470d4ddeeea8
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 14:07:17 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 14:08:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21829be

dev-util/catalyst: 3.0.15 stable everywhere

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild b/dev-util/catalyst/catalyst-3.0.15.ebuild
index cf9fc644a64..a987630870f 100644
--- a/dev-util/catalyst/catalyst-3.0.15.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.15.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="~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_{7,8} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Michał Górny]

commit:     6935fa260a8deb1aaadbcfe2950106aa3a0ee908
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 08:57:25 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 09:00:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6935fa26

dev-util/catalyst: Inline virtual/cdrtools

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.14.ebuild | 2 +-
 dev-util/catalyst/catalyst-3.0.15.ebuild | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 09099da1323..5294c9749a8 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
index a987630870f..f1c19554ff9 100644
--- a/dev-util/catalyst/catalyst-3.0.15.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.15.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-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 27ca55eff34..22943633c71 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]

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     b1524fbd01b7ac4631137e2d60a2158c8809c043
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 00:30:57 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 03:15:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1524fbd

dev-util/catalyst: Depend on squashfs-tools-ng with USE=tools

Catalyst executes the tar2sqfs tool, which is installed with USE=tools.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 22943633c71..f72a52d76d0 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	app-arch/tar[xattr]
 	dev-vcs/git
 	sys-fs/dosfstools
-	sys-fs/squashfs-tools-ng
+	sys-fs/squashfs-tools-ng[tools]
 
 	iso? (
 		app-cdr/cdrtools

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     ca939a9932badb507a80b6f8b9bccdba8f18970e
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 15:16:52 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 15:33:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca939a99

dev-util/catalyst: add python3_9 support

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../catalyst/{catalyst-3.0.15.ebuild => catalyst-3.0.15-r1.ebuild}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild b/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
similarity index 96%
rename from dev-util/catalyst/catalyst-3.0.15.ebuild
rename to dev-util/catalyst/catalyst-3.0.15-r1.ebuild
index faee3ee3c2b..0d75c589a34 100644
--- a/dev-util/catalyst/catalyst-3.0.15.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     32f10a518fff70d4456e07d9146288e295a9bfce
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  4 14:51:54 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Mar  4 14:54:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f10a51

dev-util/catalyst: bump to 3.0.17

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 +
 dev-util/catalyst/catalyst-3.0.17.ebuild | 69 ++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 8964c9e53de..681c1171644 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
 DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2 SHA512 ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5
+DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39 SHA512 636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d

diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild b/dev-util/catalyst/catalyst-3.0.17.ebuild
new file mode 100644
index 00000000000..0d75c589a34
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.17.ebuild
@@ -0,0 +1,69 @@
+# 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 ~riscv s390 sparc x86"
+fi
+
+PYTHON_COMPAT=( python3_{7,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}]
+"
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     b4cff343d7f9d60a3e94d2d449ab460e090c2d82
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  9 01:48:35 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar  9 05:00:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4cff343

dev-util/catalyst: Add Python 3.9 compat

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index f72a52d76d0..49b1882354c 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Michał Górny]

commit:     aa08b3133c4d5dc960a938b63e96a16df6d30f21
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 07:14:04 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 09:48:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa08b313

dev-util/catalyst: Remove py3.7 due to snakeoil dep

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.14.ebuild    | 4 ++--
 dev-util/catalyst/catalyst-3.0.15-r1.ebuild | 2 +-
 dev-util/catalyst/catalyst-3.0.17.ebuild    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index faee3ee3c2b..b8e4d9fc8c8 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}

diff --git a/dev-util/catalyst/catalyst-3.0.15-r1.ebuild b/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
index 0d75c589a34..47938879932 100644
--- a/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}

diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild b/dev-util/catalyst/catalyst-3.0.17.ebuild
index 0d75c589a34..47938879932 100644
--- a/dev-util/catalyst/catalyst-3.0.17.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.17.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     e537d7484f0b25f96a44eced4c9614f9ec8003f8
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 29 17:35:47 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Mar 29 17:48:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e537d748

dev-util/catalyst: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/Manifest                  |  2 -
 dev-util/catalyst/catalyst-3.0.14.ebuild    | 69 -----------------------------
 dev-util/catalyst/catalyst-3.0.15-r1.ebuild | 69 -----------------------------
 3 files changed, 140 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 681c1171644..d9de95884c5 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1 @@
-DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
-DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2 SHA512 ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5
 DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39 SHA512 636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
deleted file mode 100644
index b8e4d9fc8c8..00000000000
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ /dev/null
@@ -1,69 +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 ~riscv s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_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-3.0.15-r1.ebuild b/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
deleted file mode 100644
index 47938879932..00000000000
--- a/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
+++ /dev/null
@@ -1,69 +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 ~riscv 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}]
-"
-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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     48497562d55f01a56efe80249b8746505e2d17a8
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 29 17:37:32 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Mar 29 17:48:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48497562

dev-util/catalyst: drop riscv keywords

This isn't currently being tested on riscv and there are no currently
usable (for catalyst) versions of snakeoil with riscv keywords.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.17.ebuild | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild b/dev-util/catalyst/catalyst-3.0.17.ebuild
index 47938879932..2eeaa89d0d8 100644
--- a/dev-util/catalyst/catalyst-3.0.17.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.17.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="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 49b1882354c..9b3efc06144 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     cfb1d769a5602607b6018c6311be245d69a0718f
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 29 17:41:56 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Mar 29 17:48:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb1d769

dev-util/catalyst: restrict snakeoil to <0.9.6

This commit released in 0.9.6 removes features we're still using in
catalyst:
https://github.com/pkgcore/snakeoil/commit/d7c9c2a40fd6fdf7e62d2f041b7dee3765abbf5f

Closes: https://bugs.gentoo.org/778902
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.17.ebuild | 2 ++
 dev-util/catalyst/catalyst-9999.ebuild   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild b/dev-util/catalyst/catalyst-3.0.17.ebuild
index 2eeaa89d0d8..af6dd3d1875 100644
--- a/dev-util/catalyst/catalyst-3.0.17.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.17.ebuild
@@ -27,9 +27,11 @@ 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

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 9b3efc06144..77444cb250b 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -30,6 +30,7 @@ BDEPEND="
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	<dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 	sys-apps/util-linux[python,${PYTHON_USEDEP}]
 "

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     18dfe13ff3b0d3157717d91cbb8e819bb63ac245
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  6 22:39:31 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jun  6 22:39:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18dfe13f

dev-util/catalyst: Version bump to 3.0.18

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 +
 dev-util/catalyst/catalyst-3.0.18.ebuild | 71 ++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index d9de95884c5..5b1e39de2d1 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
 DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39 SHA512 636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d
+DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild b/dev-util/catalyst/catalyst-3.0.18.ebuild
new file mode 100644
index 00000000000..5793fe90fae
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.18.ebuild
@@ -0,0 +1,71 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     37734954b611c9cb2ae468419ee7079124b40a94
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 11 03:56:47 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 04:21:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37734954

dev-util/catalyst: Depend on dev-python/fasteners

Bug: https://bugs.gentoo.org/791583
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 989f9cf1c4b..a9a093b04c9 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -30,7 +30,7 @@ BDEPEND="
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	<dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 	sys-apps/util-linux[python,${PYTHON_USEDEP}]
 "

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     6ef7061d6e1f7ba02cdacb98636a9abbfeed26f0
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 11 04:15:15 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 04:21:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef7061d

dev-util/catalyst: Version bump to 3.0.19

Bug: https://bugs.gentoo.org/519656
Closes: https://bugs.gentoo.org/791583
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 +
 dev-util/catalyst/catalyst-3.0.19.ebuild | 71 ++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 5b1e39de2d1..73c7cafd0ec 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild b/dev-util/catalyst/catalyst-3.0.19.ebuild
new file mode 100644
index 00000000000..9032f75b75b
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.19.ebuild
@@ -0,0 +1,71 @@
+# 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="~amd64 ~arm ~arm64 ~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/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Georgy Yakovlev]

commit:     f6aab22c0f72f1de4612738d09d89a2cbe1c9aa9
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 12 02:52:14 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jun 12 02:53:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6aab22c

dev-util/catalyst: keyword 3.0.19 for ~ppc64, bug #795318

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild b/dev-util/catalyst/catalyst-3.0.19.ebuild
index 9032f75b75b..72eb091628d 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     b72d92eef09759276ca623d2bc546b97b45c807a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 12 18:25:06 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jun 12 18:25:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72d92ee

dev-util/catalyst: Depend on libisoburn irrespective of arch

Closes: https://bugs.gentoo.org/783951
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index a9a093b04c9..173090ac993 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -46,28 +46,22 @@ RDEPEND="
 
 	iso? (
 		app-cdr/cdrtools
+		dev-libs/libisoburn
 
 		amd64? (
 			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
 		)
-		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]
 		)
 		x86?   (

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Joshua Kinard]

commit:     8c324cd2a1bb3bbd5dafa76d94ebe71c0200de98
Author:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 01:23:13 2021 +0000
Commit:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 06:28:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c324cd2

dev-util/catalyst: Added ~mips to KEYWORDS

Bug: https://bugs.gentoo.org/795318
Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild b/dev-util/catalyst/catalyst-3.0.19.ebuild
index 72eb091628d..37a0f189aa7 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.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 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sergei Trofimovich]

commit:     5fc24ccb1ae7d51a848d3ec0a74197b1fc1c3f9d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 15:28:38 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 15:29:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc24ccb

dev-util/catalyst: keyworded 3.0.19 for ia64

keyworded wrt bug #795318

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild b/dev-util/catalyst/catalyst-3.0.19.ebuild
index 37a0f189aa7..886a109dff0 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.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 ~mips ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     1e4ec39fb834af45e8ad7e304f564d27229c9508
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 01:44:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 01:44:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4ec39f

dev-util/catalyst: Keyword 3.0.19 sparc, #795318

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild b/dev-util/catalyst/catalyst-3.0.19.ebuild
index 886a109dff0..25513071967 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.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 ~ia64 ~mips ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sergei Trofimovich]

commit:     a3cbb2269075750d7b51afd47f61b73a7ce37e7b
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 21:07:05 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 21:07:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3cbb226

dev-util/catalyst: keyworded 3.0.19 for ppc

keyworded wrt bug #795318

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild b/dev-util/catalyst/catalyst-3.0.19.ebuild
index 25513071967..f465da63bec 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.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 ~ia64 ~mips ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sergei Trofimovich]

commit:     e4f6db38f5bb405409a66646a057648278dec541
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri Jun 25 18:09:55 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jun 25 18:23:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f6db38

dev-util/catalyst: keyworded 3.0.19 for hppa, bug #795318

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild b/dev-util/catalyst/catalyst-3.0.19.ebuild
index f465da63bec..a95863df1de 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     005a24d742e76c2f16d9a907b5b81fd176e433ef
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  6 22:15:29 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jul  6 22:16:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005a24d7

dev-util/catalyst: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  2 -
 dev-util/catalyst/catalyst-3.0.17.ebuild | 71 --------------------------------
 dev-util/catalyst/catalyst-3.0.19.ebuild | 71 --------------------------------
 3 files changed, 144 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 500a5350da4..7bf82317e46 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,2 @@
-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
 DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa SHA512 f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e

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 5793fe90fae..00000000000
--- 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.19.ebuild
deleted file mode 100644
index a95863df1de..00000000000
--- a/dev-util/catalyst/catalyst-3.0.19.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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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/fasteners[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/fasteners[${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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     426001969ca022f60246630c6a4a18753c35358e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  6 22:14:21 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jul  6 22:16:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42600196

dev-util/catalyst: Version bump to 3.0.20

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 +
 dev-util/catalyst/catalyst-3.0.20.ebuild | 71 ++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 73c7cafd0ec..500a5350da4 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1,4 @@
 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
+DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa SHA512 f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
new file mode 100644
index 00000000000..a95863df1de
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -0,0 +1,71 @@
+# 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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     b4db85841e208da392bfc857805f0f5b4cb4640e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  7 00:32:55 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jul  7 00:33:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4db8584

dev-util/catalyst: Keyword 3.0.20 s390, #795318

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index a95863df1de..a674a9c53c8 100644
--- a/dev-util/catalyst/catalyst-3.0.20.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} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     626a60c40af5c2a28107add3f648ab906cac2999
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 02:43:53 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 03:16:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=626a60c4

dev-util/catalyst: Keyword 3.0.20 alpha, #795318

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index a674a9c53c8..39d9a197113 100644
--- a/dev-util/catalyst/catalyst-3.0.20.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 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     9271ad9d9e856c6e1752e2348da05ced61d1561c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 21:42:59 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 21:43:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9271ad9d

dev-util/catalyst: Add ISO dependencies for arm64

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 173090ac993..f32567cf665 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -51,6 +51,10 @@ RDEPEND="
 		amd64? (
 			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
 		)
+		arm64?  (
+			sys-boot/grub[grub_platforms_efi-64]
+			sys-fs/mtools
+		)
 		ia64?  (
 			sys-boot/grub[grub_platforms_efi-64]
 			sys-fs/mtools

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     f90ac4b452f03e179d002631713c36a0e02f00ec
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 22:15:05 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 22:16:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f90ac4b4

dev-util/catalyst: Depend on sys-fs/mtools on amd64

Closes: https://bugs.gentoo.org/813714
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index f32567cf665..b00c806fd8f 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -50,6 +50,7 @@ RDEPEND="
 
 		amd64? (
 			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+			sys-fs/mtools
 		)
 		arm64?  (
 			sys-boot/grub[grub_platforms_efi-64]

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Yixun Lan]

commit:     c099879c970c278ec1e8b5da6ae1472563ab934b
Author:     Ahmed Charles <me <AT> ahmedcharles <DOT> com>
AuthorDate: Mon Sep  6 09:20:17 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 10:56:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c099879c

dev-util/catalyst: keyword ~riscv.

Closes: https://github.com/gentoo/gentoo/pull/22347
Signed-off-by: Ahmed Charles <me <AT> ahmedcharles.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 39d9a197113..0136d592703 100644
--- a/dev-util/catalyst/catalyst-3.0.20.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index b00c806fd8f..96c71919d02 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     0eedc4fe96f275806e2503cf41f8b1d787b7a58e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 05:37:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 05:37:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eedc4fe

dev-util/catalyst: Stabilize 3.0.20 ppc, #824106

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 0136d5927037..69c45cc060cb 100644
--- a/dev-util/catalyst/catalyst-3.0.20.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="~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_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     8fc63c495f04a434dcaa290f2a2059a65ebae18d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 05:38:43 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 05:38:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc63c49

dev-util/catalyst: Stabilize 3.0.20 arm64, #824106

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 69c45cc060cb..a7a00d4a7487 100644
--- a/dev-util/catalyst/catalyst-3.0.20.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="~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_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     12cd04d5573b313f00e789dfa81095e98754e820
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 09:08:20 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 09:08:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12cd04d5

dev-util/catalyst: Stabilize 3.0.20 ppc64, #824106

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index a7a00d4a7487..30f5d2708a3b 100644
--- a/dev-util/catalyst/catalyst-3.0.20.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="~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_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Agostino Sarubbo]

commit:     ac7872d75f6c5416fd8862b5606946fc120dd1dc
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 12:25:26 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 12:25:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7872d7

dev-util/catalyst: sparc stable wrt bug #824106

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 30f5d2708a3b..066424eb6658 100644
--- a/dev-util/catalyst/catalyst-3.0.20.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="~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_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Jakov Smolić]

commit:     613c8a457dd2dc8d34acae988962fdbe0696e1ef
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 14:00:35 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 14:00:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=613c8a45

dev-util/catalyst: Stabilize 3.0.20 amd64, #824106

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 066424eb6658..b9f54b9c2414 100644
--- a/dev-util/catalyst/catalyst-3.0.20.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="~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_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Agostino Sarubbo]

commit:     bdea3cc7a9082390a1fa7ee06e77ae2bbc5e0569
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 07:28:14 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 07:28:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdea3cc7

dev-util/catalyst: x86 stable wrt bug #824106

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index b9f54b9c2414..5ddbc0da3ad9 100644
--- a/dev-util/catalyst/catalyst-3.0.20.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="~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_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Michał Górny]

commit:     bd31e00e0730294b759ff99d95241d6d7d44cd5b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 16:42:15 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 16:43:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd31e00e

dev-util/catalyst: Remove old

Acked by mattst88.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 -
 dev-util/catalyst/catalyst-3.0.18.ebuild | 71 --------------------------------
 2 files changed, 72 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 7bf82317e463..ed98acb9b3cf 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1 @@
-DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa SHA512 f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild b/dev-util/catalyst/catalyst-3.0.18.ebuild
deleted file mode 100644
index 5793fe90faef..000000000000
--- a/dev-util/catalyst/catalyst-3.0.18.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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     e659e8b5323476bf99ebd71b1f2588990cf4f7d6
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 24 19:48:04 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 24 19:50:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e659e8b5

Revert "dev-util/catalyst: Remove old" (needed for releng testing, no keywords)

This reverts commit bd31e00e0730294b759ff99d95241d6d7d44cd5b.

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 +
 dev-util/catalyst/catalyst-3.0.18.ebuild | 71 ++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index ed98acb9b3cf..7bf82317e463 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
+DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa SHA512 f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild b/dev-util/catalyst/catalyst-3.0.18.ebuild
new file mode 100644
index 000000000000..e66f66b6de2d
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.18.ebuild
@@ -0,0 +1,71 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     2e5b267a2dd75376934c3e6d83e3dbbe9ba23dbb
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 24 22:59:54 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 24 23:01:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e5b267a

dev-util/catalyst: Restore keywords (3.0.20 is broken)

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild b/dev-util/catalyst/catalyst-3.0.18.ebuild
index e66f66b6de2d..5793fe90faef 100644
--- a/dev-util/catalyst/catalyst-3.0.18.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.18.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="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     d118e22483ef33e517af245eb27eb50c827de4b9
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 24 23:00:44 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 24 23:01:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d118e224

dev-util/catalyst: 3.0.20 drop keywords, fails to unpack snapshot

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 3973e6a9f9cc..fc94fc1efeab 100644
--- a/dev-util/catalyst/catalyst-3.0.20.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="~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_{8,9} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     609786b8ff4054ee1b6781cb48995c3898dcce35
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 16:25:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 03:28:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=609786b8

dev-util/catalyst: remove kernel_FreeBSD

Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.18.ebuild | 8 +++++---
 dev-util/catalyst/catalyst-3.0.20.ebuild | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild b/dev-util/catalyst/catalyst-3.0.18.ebuild
index 5793fe90faef..adc7a1b2c6bc 100644
--- a/dev-util/catalyst/catalyst-3.0.18.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,8 +36,10 @@ RDEPEND="
 	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] )
+	|| (
+		app-arch/tar[xattr]
+		app-arch/libarchive[xattr]
+	)
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index fc94fc1efeab..d77525dfc17e 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,8 +36,10 @@ RDEPEND="
 	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] )
+	|| (
+		app-arch/tar[xattr]
+		app-arch/libarchive[xattr]
+	)
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     6c1b319aabf2d8f9ae527a2c3788bac0f4856917
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 30 21:05:26 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 21:07:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1b319a

dev-util/catalyst: Add Python 3.10 compatibility

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 96c71919d029..003c1f3c2ac1 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     ed2c497ad2dd13997997b85c96e52ffd0673fbbd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 30 21:03:17 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 21:07:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2c497a

dev-util/catalyst: Version bump to 3.0.21

Closes: https://bugs.gentoo.org/806229
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 +
 dev-util/catalyst/catalyst-3.0.21.ebuild | 73 ++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 7bf82317e463..7471a715bc46 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa SHA512 f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e
+DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild b/dev-util/catalyst/catalyst-3.0.21.ebuild
new file mode 100644
index 000000000000..282eccf985ea
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.21.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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_{8..10} )
+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 system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	|| (
+		app-arch/tar[xattr]
+		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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     7877d931e4ce5479d15033132dc31295ddaf9ad4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 30 21:04:05 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 21:07:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7877d931

dev-util/catalyst: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 -
 dev-util/catalyst/catalyst-3.0.20.ebuild | 73 --------------------------------
 2 files changed, 74 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 7471a715bc46..b5babf4abeb6 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1,2 @@
 DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
-DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa SHA512 f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
deleted file mode 100644
index 8bf7848b4cc1..000000000000
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 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_{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 system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	|| (
-		app-arch/tar[xattr]
-		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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     74530679b923373acc5265cb46ed1740765a176c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  1 18:33:46 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 18:34:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74530679

dev-util/catalyst: Switch to dev-python/tomli

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 003c1f3c2ac1..494d05142502 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 	dev-python/fasteners[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
 	sys-apps/util-linux[python,${PYTHON_USEDEP}]
 "
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Jakov Smolić]

commit:     eb1d7177916c6f8e6940ad2e7b793aa482e61905
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 11:33:09 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 11:33:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1d7177

dev-util/catalyst: Stabilize 3.0.21 x86, #849482

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild b/dev-util/catalyst/catalyst-3.0.21.ebuild
index 282eccf985ea..b6d5491fd450 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.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="~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_{8..10} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Jakov Smolić]

commit:     20345dd48c41e4a7856a45fcffe42edab93586e8
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 11:33:50 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 11:33:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20345dd4

dev-util/catalyst: Stabilize 3.0.21 amd64, #849482

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild b/dev-util/catalyst/catalyst-3.0.21.ebuild
index b6d5491fd450..85c64746a0a2 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.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="~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_{8..10} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Jakov Smolić]

commit:     bf10c52db3d90716daf17b903ca539f244d8dbcd
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 11:47:22 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 11:47:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf10c52d

dev-util/catalyst: Stabilize 3.0.21 ppc, #849482

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild b/dev-util/catalyst/catalyst-3.0.21.ebuild
index c0bcf7e2d31d..2ec8ad6d0cf0 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.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="~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_{8..10} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Jakov Smolić]

commit:     39f376c297b2b35981bd7d455e0af8404627cdf3
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 11:47:21 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 11:47:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f376c2

dev-util/catalyst: Stabilize 3.0.21 sparc, #849482

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild b/dev-util/catalyst/catalyst-3.0.21.ebuild
index 85c64746a0a2..c0bcf7e2d31d 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.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="~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_{8..10} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Jakov Smolić]

commit:     8c7561ac496c7b70089fe662937de623854d6016
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 21:30:38 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 21:30:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7561ac

dev-util/catalyst: Stabilize 3.0.21 arm64, #849482

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild b/dev-util/catalyst/catalyst-3.0.21.ebuild
index 904d16dc09b6..48e3e2e606d2 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.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="~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_{8..10} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Jakov Smolić]

commit:     f3a940685bbce4d9d52f40043361e53af8b57c39
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 21:30:37 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 21:30:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a94068

dev-util/catalyst: Stabilize 3.0.21 ppc64, #849482

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild b/dev-util/catalyst/catalyst-3.0.21.ebuild
index 2ec8ad6d0cf0..904d16dc09b6 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.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="~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_{8..10} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Arthur Zamarin]

commit:     b5dc694174518917eaac176d2bfa93442dac5edd
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 18:25:10 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 18:25:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5dc6941

dev-util/catalyst: Stabilize 3.0.21 arm, #849482

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild b/dev-util/catalyst/catalyst-3.0.21.ebuild
index 48e3e2e606d2..a2a90b57634d 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.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="~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_{8..10} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas Sturmlechner]

commit:     94e2ba9a4777553899c2f26b87d58eac07fd99b1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 18:32:21 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 15:02:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94e2ba9a

dev-util/catalyst: drop 3.0.18, EAPI-6--

Closes: https://bugs.gentoo.org/849482
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 -
 dev-util/catalyst/catalyst-3.0.18.ebuild | 73 --------------------------------
 2 files changed, 74 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index b5babf4abeb6..02379c1ffa34 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1 @@
-DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild b/dev-util/catalyst/catalyst-3.0.18.ebuild
deleted file mode 100644
index 3a8a525c1ceb..000000000000
--- a/dev-util/catalyst/catalyst-3.0.18.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 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 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
-	|| (
-		app-arch/tar[xattr]
-		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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     aba9bb58fceaf075f2829dcbfc3f9ab918a23a68
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  1 16:31:38 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct  1 16:32:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba9bb58

dev-util/catalyst: Version bump 3.0.22

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/Manifest               |  1 +
 dev-util/catalyst/catalyst-3.0.22.ebuild | 73 ++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 02379c1ffa34..cd53736eaea9 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c
+DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2 SHA512 c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4

diff --git a/dev-util/catalyst/catalyst-3.0.22.ebuild b/dev-util/catalyst/catalyst-3.0.22.ebuild
new file mode 100644
index 000000000000..282eccf985ea
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.22.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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_{8..10} )
+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 system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	|| (
+		app-arch/tar[xattr]
+		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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Robin H. Johnson]

commit:     45ef9f6e6a2ae027e7184770f32289d422b554f2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 00:29:15 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 00:33:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ef9f6e

dev-util/catalyst: revbumps to drop python38 support, for stable snakeoil-0.10.3

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 dev-util/catalyst/{catalyst-3.0.21.ebuild => catalyst-3.0.21-r1.ebuild} | 2 +-
 dev-util/catalyst/{catalyst-3.0.22.ebuild => catalyst-3.0.22-r1.ebuild} | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild                                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild b/dev-util/catalyst/catalyst-3.0.21-r1.ebuild
similarity index 98%
rename from dev-util/catalyst/catalyst-3.0.21.ebuild
rename to dev-util/catalyst/catalyst-3.0.21-r1.ebuild
index a2a90b57634d..0017e34636a4 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21-r1.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}

diff --git a/dev-util/catalyst/catalyst-3.0.22.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
similarity index 98%
rename from dev-util/catalyst/catalyst-3.0.22.ebuild
rename to dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index 282eccf985ea..fee73e953a7f 100644
--- a/dev-util/catalyst/catalyst-3.0.22.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 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 494d05142502..81289d3b60f3 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 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     a0758d395f9e00df7e09b1c30be40fc39ca7687a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 08:04:32 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 08:07:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0758d39

dev-util/catalyst: add gentoo upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index 5b1e3035ac3a..80d9321a87b6 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -9,4 +9,7 @@
     <flag name="iso">Pulls in the depends for building iso images</flag>
     <flag name="system-bootloader">Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar</flag>
   </use>
+  <upstream>
+    <remote-id type="gentoo">proj/catalyst</remote-id>
+  </upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     ae2e3cc2e1120b630620c1634e01b5d83b11da81
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 08:04:52 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 08:07:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae2e3cc2

dev-util/catalyst: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index 80d9321a87b6..d8a6b705dc27 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -11,5 +11,6 @@
   </use>
   <upstream>
     <remote-id type="gentoo">proj/catalyst</remote-id>
+    <remote-id type="github">gentoo/catalyst</remote-id>
   </upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     a28d72e1da1ed7c8f73df467f230b93d7871261b
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 17:36:14 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 17:36:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a28d72e1

dev-util/catalyst: protect /var/tmp/catalyst via tmpfiles.d

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 81289d3b60f3..537719e8622a 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ fi
 PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}
+inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}
 
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
@@ -102,6 +102,13 @@ python_install_all() {
 	fi
 }
 
+src_install() {
+	distutils-r1_src_install
+
+	echo 'd /var/tmp/catalyst 0755 root root' > "${T}"/catalyst-tmpdir.conf
+	dotmpfiles "${T}"/catalyst-tmpdir.conf
+}
+
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		optfeature "ccache support" dev-util/ccache

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     edbc15ab2f0f896a017062f22411d2aa823165c0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 10:58:21 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 10:58:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edbc15ab

dev-util/catalyst: enable py3.11

Closes: https://bugs.gentoo.org/896920
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 4 ++--
 dev-util/catalyst/catalyst-9999.ebuild      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index fee73e953a7f..1c81713146c4 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 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 537719e8622a..75ea55a47e53 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} == *9999* ]]; then
 	SRC_ECLASS="git-r3"
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     49fa81a7b8652dc33c62184e53b8359cb95384df
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 20:10:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  2 20:10:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49fa81a7

dev-util/catalyst: Stabilize 3.0.22-r1 amd64, #905615

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index 1c81713146c4..e686fb7ecd86 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.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="~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_{9..11} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     e805a639634bc958d49bf815f34b837d50dfe85b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 20:26:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  2 20:26:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e805a639

dev-util/catalyst: Stabilize 3.0.22-r1 x86, #905615

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index e686fb7ecd86..857cc02f62e4 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.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="~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_{9..11} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     7d01a3442f57f4167de60aa4ced237ed52a89620
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 20:49:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  2 20:49:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d01a344

dev-util/catalyst: Stabilize 3.0.22-r1 ppc, #905615

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index 857cc02f62e4..2c0e11b9e5aa 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.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="~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_{9..11} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Sam James]

commit:     db760ea0a19da75d34ca5bcc4654409ebe76dc8c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 05:25:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  3 05:25:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db760ea0

dev-util/catalyst: Stabilize 3.0.22-r1 ppc64, #905615

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index 2c0e11b9e5aa..bc03aa7bbd37 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.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="~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_{9..11} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Arthur Zamarin]

commit:     f9aab93cc73045e2dba953e0055527d3ee16afab
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 10:18:25 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed May  3 10:18:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9aab93c

dev-util/catalyst: Stabilize 3.0.22-r1 arm64, #905615

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index c10f43568ab7..116f53d905a3 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.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="~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_{9..11} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Arthur Zamarin]

commit:     f92db7850e69f8b33b96bd32c0424994823611fd
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 10:18:20 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed May  3 10:18:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92db785

dev-util/catalyst: Stabilize 3.0.22-r1 sparc, #905615

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index bc03aa7bbd37..d3cd91cd8f8a 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.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="~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_{9..11} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Arthur Zamarin]

commit:     73f8c755757d59455890939363d166556f523da5
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 10:18:22 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed May  3 10:18:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73f8c755

dev-util/catalyst: Stabilize 3.0.22-r1 arm, #905615

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index d3cd91cd8f8a..c10f43568ab7 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.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="~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_{9..11} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     e25dc19957b596c0044aaaa3ef0c57dc55116c0a
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 14:59:59 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 18:41:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25dc199

dev-util/catalyst: use PEP517 build

Closes: https://bugs.gentoo.org/909976

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r2.ebuild | 74 +++++++++++++++++++++++++++++
 dev-util/catalyst/catalyst-9999.ebuild      |  6 ++-
 2 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r2.ebuild b/dev-util/catalyst/catalyst-3.0.22-r2.ebuild
new file mode 100644
index 000000000000..2cde6cf92ea9
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.22-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+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 system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	|| (
+		app-arch/tar[xattr]
+		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
+}
+
+# Build man pages here so as to not clobber default src_compile
+src_configure() {
+	# 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 75ea55a47e53..06017c76d1fb 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,7 +13,7 @@ else
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}
 
@@ -90,7 +90,8 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
+# Build man pages here so as to not clobber default src_compile
+src_configure() {
 	# build the man pages and docs
 	emake
 }
@@ -113,4 +114,5 @@ pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		optfeature "ccache support" dev-util/ccache
 	fi
+	tmpfiles_process catalyst-tmpdir.conf
 }

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     8cb5483f0ef5ea115748f8db5545a77aca4fcdcf
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 16:12:50 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 16:16:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb5483f

dev-util/catalyst: restore missing configs & man from PEP517 conversion

Closes: https://bugs.gentoo.org/910261

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../{catalyst-3.0.22-r2.ebuild => catalyst-3.0.22-r3.ebuild}      | 8 ++++++++
 dev-util/catalyst/catalyst-9999.ebuild                            | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r2.ebuild b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild
similarity index 92%
rename from dev-util/catalyst/catalyst-3.0.22-r2.ebuild
rename to dev-util/catalyst/catalyst-3.0.22-r3.ebuild
index 2cde6cf92ea9..49063325fdd8 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r2.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild
@@ -72,3 +72,11 @@ python_install_all() {
 		dodoc files/HOWTO.html files/docbook-xsl.css
 	fi
 }
+
+src_install() {
+	distutils-r1_src_install
+
+	doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5
+	insinto /etc/catalyst
+	doins etc/*
+}

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 06017c76d1fb..ab85324f0c98 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -108,6 +108,10 @@ src_install() {
 
 	echo 'd /var/tmp/catalyst 0755 root root' > "${T}"/catalyst-tmpdir.conf
 	dotmpfiles "${T}"/catalyst-tmpdir.conf
+
+	doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5
+	insinto /etc/catalyst
+	doins etc/*
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     c0d8787da91972e579e084f2cdcb17ed2b103c1c
Author:     Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Fri Jan 26 16:35:44 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 15:41:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d8787d

dev-util/catalyst: add 4.0_rc1

Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/Manifest                |   1 +
 dev-util/catalyst/catalyst-4.0_rc1.ebuild | 125 ++++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index cd53736eaea9..6e330cfa382b 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c
 DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2 SHA512 c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4
+DIST catalyst-4.0-rc1.tar.bz2 355575 BLAKE2B 373f3fa4a340e14461ab4881ae17cb8266e01a3d66fdffe37d648e5b816e95064e36360b3ced7dd4dc9f05c80eabdeb41dac506d4c156fa3072056b35a6e1074 SHA512 89660b603ecb6acf39b6bb7eb6e43f035c30b1610636586c84b9a75140963e2aefe4a9d97f465c15c293da9c4fc4146f0edce5685293a290d5d182e131dabb7b

diff --git a/dev-util/catalyst/catalyst-4.0_rc1.ebuild b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
new file mode 100644
index 000000000000..3a8ec2cf9cb1
--- /dev/null
+++ b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${P/_/-}
+
+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/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P/_/-}"
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 linux-info optfeature tmpfiles ${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="doc +iso"
+
+BDEPEND="
+	app-text/asciidoc
+"
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	sys-apps/util-linux[python,${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-arch/pixz
+	app-arch/tar[xattr]
+	dev-vcs/git
+	sys-fs/dosfstools
+	sys-fs/squashfs-tools-ng[tools]
+
+	iso? (
+		app-cdr/cdrtools
+		dev-libs/libisoburn
+
+		amd64? (
+			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+			sys-fs/mtools
+		)
+		arm64?  (
+			sys-boot/grub[grub_platforms_efi-64]
+			sys-fs/mtools
+		)
+		ia64?  (
+			sys-boot/grub[grub_platforms_efi-64]
+			sys-fs/mtools
+		)
+		ppc?   (
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		ppc64? (
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		sparc? (
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		x86?   (
+			sys-boot/grub[grub_platforms_efi-32]
+		)
+	)
+"
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~UTS_NS ~IPC_NS
+		~SQUASHFS ~SQUASHFS_ZLIB
+	"
+	linux-info_pkg_setup
+}
+
+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
+}
+
+# Build man pages here so as to not clobber default src_compile
+src_configure() {
+	# 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
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	echo 'd /var/tmp/catalyst 0755 root root' > "${T}"/catalyst-tmpdir.conf
+	dotmpfiles "${T}"/catalyst-tmpdir.conf
+
+	doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5
+	insinto /etc/catalyst
+	doins etc/*
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		optfeature "ccache support" dev-util/ccache
+	fi
+	tmpfiles_process catalyst-tmpdir.conf
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     ed2ea05fdfde812665d40d35b44f48b4de60deb0
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 17:12:07 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 17:13:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2ea05f

dev-util/catalyst: remove extra (wrong) man page installations

Closes: https://bugs.gentoo.org/923039

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/catalyst-4.0_rc1.ebuild | 5 +++++
 dev-util/catalyst/catalyst-9999.ebuild    | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-4.0_rc1.ebuild b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
index 3a8ec2cf9cb1..9bf921904e91 100644
--- a/dev-util/catalyst/catalyst-4.0_rc1.ebuild
+++ b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
@@ -106,6 +106,11 @@ python_install_all() {
 	fi
 }
 
+python_install() {
+	distutils-r1_python_install
+	rm -rv "${D}"$(python_get_sitedir)/usr
+}
+
 src_install() {
 	distutils-r1_src_install
 

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index ab85324f0c98..c5bd9ff2d041 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -103,6 +103,11 @@ python_install_all() {
 	fi
 }
 
+python_install() {
+	distutils-r1_python_install
+	rm -rv "${D}"$(python_get_sitedir)/usr
+}
+
 src_install() {
 	distutils-r1_src_install
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Ben Kohler]

commit:     dc4346e5fe8cdec8567c215c51b598f810d0f971
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 17:06:06 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 17:06:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc4346e5

dev-util/catalyst: enable py3.12

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 dev-util/catalyst/catalyst-4.0_rc1.ebuild | 2 +-
 dev-util/catalyst/catalyst-9999.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-4.0_rc1.ebuild b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
index 9bf921904e91..7bc3d781337b 100644
--- a/dev-util/catalyst/catalyst-4.0_rc1.ebuild
+++ b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
@@ -15,7 +15,7 @@ else
 	S="${WORKDIR}/${MY_P/_/-}"
 fi
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index c5bd9ff2d041..541b54e2bacc 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 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[James Le Cuirot]

commit:     1f9cbf1786aaaafe9e56fd4e6c4a2d7c773b2dd7
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 28 15:14:23 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 15:15:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f9cbf17

dev-util/catalyst: Version bump to 4.0_rc2

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-util/catalyst/Manifest                |   1 +
 dev-util/catalyst/catalyst-4.0_rc2.ebuild | 130 ++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 6e330cfa382b..2ce9f0ec5b9f 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1,4 @@
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c
 DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2 SHA512 c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4
 DIST catalyst-4.0-rc1.tar.bz2 355575 BLAKE2B 373f3fa4a340e14461ab4881ae17cb8266e01a3d66fdffe37d648e5b816e95064e36360b3ced7dd4dc9f05c80eabdeb41dac506d4c156fa3072056b35a6e1074 SHA512 89660b603ecb6acf39b6bb7eb6e43f035c30b1610636586c84b9a75140963e2aefe4a9d97f465c15c293da9c4fc4146f0edce5685293a290d5d182e131dabb7b
+DIST catalyst-4.0-rc2.tar.bz2 355924 BLAKE2B b14905e989674a9b547c6e7c83129e1bcc0b55cf64b86e0668532d067518d7a66dd0d494b9e1f84bf0ba9f6d57c79baeb39c35d7ffd9ef09602dd4c1be9a1bd9 SHA512 16ffdf74639bde74e043480d3c756121489033cf72850b38959701c53a689263b46bb10403496de222af00321b5d691aba7bcb41eafb8b5dcb1dd56dd658ace5

diff --git a/dev-util/catalyst/catalyst-4.0_rc2.ebuild b/dev-util/catalyst/catalyst-4.0_rc2.ebuild
new file mode 100644
index 000000000000..7bc3d781337b
--- /dev/null
+++ b/dev-util/catalyst/catalyst-4.0_rc2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${P/_/-}
+
+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/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P/_/-}"
+fi
+
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 linux-info optfeature tmpfiles ${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="doc +iso"
+
+BDEPEND="
+	app-text/asciidoc
+"
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	sys-apps/util-linux[python,${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-arch/pixz
+	app-arch/tar[xattr]
+	dev-vcs/git
+	sys-fs/dosfstools
+	sys-fs/squashfs-tools-ng[tools]
+
+	iso? (
+		app-cdr/cdrtools
+		dev-libs/libisoburn
+
+		amd64? (
+			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+			sys-fs/mtools
+		)
+		arm64?  (
+			sys-boot/grub[grub_platforms_efi-64]
+			sys-fs/mtools
+		)
+		ia64?  (
+			sys-boot/grub[grub_platforms_efi-64]
+			sys-fs/mtools
+		)
+		ppc?   (
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		ppc64? (
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		sparc? (
+			sys-boot/grub:2[grub_platforms_ieee1275]
+		)
+		x86?   (
+			sys-boot/grub[grub_platforms_efi-32]
+		)
+	)
+"
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~UTS_NS ~IPC_NS
+		~SQUASHFS ~SQUASHFS_ZLIB
+	"
+	linux-info_pkg_setup
+}
+
+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
+}
+
+# Build man pages here so as to not clobber default src_compile
+src_configure() {
+	# 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
+}
+
+python_install() {
+	distutils-r1_python_install
+	rm -rv "${D}"$(python_get_sitedir)/usr
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	echo 'd /var/tmp/catalyst 0755 root root' > "${T}"/catalyst-tmpdir.conf
+	dotmpfiles "${T}"/catalyst-tmpdir.conf
+
+	doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5
+	insinto /etc/catalyst
+	doins etc/*
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		optfeature "ccache support" dev-util/ccache
+	fi
+	tmpfiles_process catalyst-tmpdir.conf
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     71533530a173dbe8cfe9258b8e26a05775773b9c
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 12:48:31 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 12:49:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71533530

dev-util/catalyst: drop 3.0.21-r1, 3.0.22-r1, 4.0_rc1

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/Manifest                  |   2 -
 dev-util/catalyst/catalyst-3.0.21-r1.ebuild |  73 ----------------
 dev-util/catalyst/catalyst-3.0.22-r1.ebuild |  73 ----------------
 dev-util/catalyst/catalyst-4.0_rc1.ebuild   | 126 ----------------------------
 4 files changed, 274 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 2ce9f0ec5b9f..32b748ec6486 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,2 @@
-DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c
 DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2 SHA512 c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4
-DIST catalyst-4.0-rc1.tar.bz2 355575 BLAKE2B 373f3fa4a340e14461ab4881ae17cb8266e01a3d66fdffe37d648e5b816e95064e36360b3ced7dd4dc9f05c80eabdeb41dac506d4c156fa3072056b35a6e1074 SHA512 89660b603ecb6acf39b6bb7eb6e43f035c30b1610636586c84b9a75140963e2aefe4a9d97f465c15c293da9c4fc4146f0edce5685293a290d5d182e131dabb7b
 DIST catalyst-4.0-rc2.tar.bz2 355924 BLAKE2B b14905e989674a9b547c6e7c83129e1bcc0b55cf64b86e0668532d067518d7a66dd0d494b9e1f84bf0ba9f6d57c79baeb39c35d7ffd9ef09602dd4c1be9a1bd9 SHA512 16ffdf74639bde74e043480d3c756121489033cf72850b38959701c53a689263b46bb10403496de222af00321b5d691aba7bcb41eafb8b5dcb1dd56dd658ace5

diff --git a/dev-util/catalyst/catalyst-3.0.21-r1.ebuild b/dev-util/catalyst/catalyst-3.0.21-r1.ebuild
deleted file mode 100644
index 5f5ae319bea7..000000000000
--- a/dev-util/catalyst/catalyst-3.0.21-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{9..10} )
-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 system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	|| (
-		app-arch/tar[xattr]
-		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.22-r1.ebuild b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
deleted file mode 100644
index d13e57d7431b..000000000000
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-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 system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	|| (
-		app-arch/tar[xattr]
-		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-4.0_rc1.ebuild b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
deleted file mode 100644
index 31c694a326bd..000000000000
--- a/dev-util/catalyst/catalyst-4.0_rc1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P=${P/_/-}
-
-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/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	S="${WORKDIR}/${MY_P/_/-}"
-fi
-
-PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 linux-info optfeature tmpfiles ${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="doc +iso"
-
-BDEPEND="
-	app-text/asciidoc
-"
-DEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	sys-apps/util-linux[python,${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-arch/pixz
-	app-arch/tar[xattr]
-	dev-vcs/git
-	sys-fs/dosfstools
-	sys-fs/squashfs-tools-ng[tools]
-
-	iso? (
-		app-cdr/cdrtools
-		dev-libs/libisoburn
-
-		amd64? (
-			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
-			sys-fs/mtools
-		)
-		arm64?  (
-			sys-boot/grub[grub_platforms_efi-64]
-			sys-fs/mtools
-		)
-		ppc?   (
-			sys-boot/grub:2[grub_platforms_ieee1275]
-		)
-		ppc64? (
-			sys-boot/grub:2[grub_platforms_ieee1275]
-		)
-		sparc? (
-			sys-boot/grub:2[grub_platforms_ieee1275]
-		)
-		x86?   (
-			sys-boot/grub[grub_platforms_efi-32]
-		)
-	)
-"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~UTS_NS ~IPC_NS
-		~SQUASHFS ~SQUASHFS_ZLIB
-	"
-	linux-info_pkg_setup
-}
-
-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
-}
-
-# Build man pages here so as to not clobber default src_compile
-src_configure() {
-	# 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
-}
-
-python_install() {
-	distutils-r1_python_install
-	rm -rv "${D}"$(python_get_sitedir)/usr
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	echo 'd /var/tmp/catalyst 0755 root root' > "${T}"/catalyst-tmpdir.conf
-	dotmpfiles "${T}"/catalyst-tmpdir.conf
-
-	doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5
-	insinto /etc/catalyst
-	doins etc/*
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		optfeature "ccache support" dev-util/ccache
-	fi
-	tmpfiles_process catalyst-tmpdir.conf
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     434958e55a202a85cded3b68c438aa4a59303780
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 12:52:17 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 12:52:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=434958e5

dev-util/catalyst: add 4.0.0

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/Manifest                                        | 1 +
 dev-util/catalyst/{catalyst-9999.ebuild => catalyst-4.0.0.ebuild} | 5 ++++-
 dev-util/catalyst/catalyst-9999.ebuild                            | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 32b748ec6486..de8a439b0695 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2 SHA512 c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4
 DIST catalyst-4.0-rc2.tar.bz2 355924 BLAKE2B b14905e989674a9b547c6e7c83129e1bcc0b55cf64b86e0668532d067518d7a66dd0d494b9e1f84bf0ba9f6d57c79baeb39c35d7ffd9ef09602dd4c1be9a1bd9 SHA512 16ffdf74639bde74e043480d3c756121489033cf72850b38959701c53a689263b46bb10403496de222af00321b5d691aba7bcb41eafb8b5dcb1dd56dd658ace5
+DIST catalyst-4.0.0.tar.bz2 356445 BLAKE2B 1e3dc5fa5a3603b2c7e46277da00877ba34a4bd7a63a3e0f3728cdb9a76782e4dbb1b2f6f950e752e8814fa9da2db1e43280711bd7df44abe649c641760d9240 SHA512 332c9519fd59618c59367299ca1208280a973a0b99f03937831f9b39c643b090599733a0ad3735488de5b11d8581afd2b585a19bfb6a196c4eed899912388499

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-4.0.0.ebuild
similarity index 97%
copy from dev-util/catalyst/catalyst-9999.ebuild
copy to dev-util/catalyst/catalyst-4.0.0.ebuild
index d9b01c943af4..31c694a326bd 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-4.0.0.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=8
 
+MY_P=${P/_/-}
+
 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"
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${MY_P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P/_/-}"
 fi
 
 PYTHON_COMPAT=( python3_{9..12} )

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index d9b01c943af4..31c694a326bd 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=8
 
+MY_P=${P/_/-}
+
 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"
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${MY_P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P/_/-}"
 fi
 
 PYTHON_COMPAT=( python3_{9..12} )

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     278cdf4b1d97fe3b059e0fd572e2eb626629b33a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 00:36:43 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 00:37:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278cdf4b

dev-util/catalyst: Update dependencies for qcow2 builds

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 14 ++++++++++++--
 dev-util/catalyst/metadata.xml         |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 31c694a326bd..0c6d0cd86b4e 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="doc +iso"
+IUSE="doc +iso qcow2"
 
 BDEPEND="
 	app-text/asciidoc
@@ -72,12 +72,22 @@ RDEPEND="
 			sys-boot/grub[grub_platforms_efi-32]
 		)
 	)
+
+	qcow2? (
+		amd64? (
+			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+			sys-fs/dosfstools
+			sys-fs/xfsprogs
+			sys-block/parted
+			app-emulation/qemu
+		)
+	)
 "
 
 pkg_setup() {
 	CONFIG_CHECK="
 		~UTS_NS ~IPC_NS
-		~SQUASHFS ~SQUASHFS_ZLIB
+		~SQUASHFS ~SQUASHFS_ZLIB ~XFS_FS ~VFAT_FS
 	"
 	linux-info_pkg_setup
 }

diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index 2567283aae7e..2787ae5baea1 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -6,6 +6,7 @@
   </maintainer>
   <use>
     <flag name="iso">Pulls in the depends for building iso images</flag>
+    <flag name="qcow2">Pulls in the depends for building qcow2 images</flag>
   </use>
   <upstream>
     <remote-id type="gentoo">proj/catalyst</remote-id>

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Andreas K. Hüttel]

commit:     2b32b247c3b59636c7d02c5bc24e4a18360ec9bb
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  8 20:30:48 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 00:37:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b32b247

dev-util/catalyst: drop 3.0.22-r3, 4.0_rc2

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 dev-util/catalyst/Manifest                  |   2 -
 dev-util/catalyst/catalyst-3.0.22-r3.ebuild |  82 ------------------
 dev-util/catalyst/catalyst-4.0_rc2.ebuild   | 126 ----------------------------
 dev-util/catalyst/metadata.xml              |   2 -
 4 files changed, 212 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index de8a439b0695..666e6e8b10ab 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1 @@
-DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2 SHA512 c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4
-DIST catalyst-4.0-rc2.tar.bz2 355924 BLAKE2B b14905e989674a9b547c6e7c83129e1bcc0b55cf64b86e0668532d067518d7a66dd0d494b9e1f84bf0ba9f6d57c79baeb39c35d7ffd9ef09602dd4c1be9a1bd9 SHA512 16ffdf74639bde74e043480d3c756121489033cf72850b38959701c53a689263b46bb10403496de222af00321b5d691aba7bcb41eafb8b5dcb1dd56dd658ace5
 DIST catalyst-4.0.0.tar.bz2 356445 BLAKE2B 1e3dc5fa5a3603b2c7e46277da00877ba34a4bd7a63a3e0f3728cdb9a76782e4dbb1b2f6f950e752e8814fa9da2db1e43280711bd7df44abe649c641760d9240 SHA512 332c9519fd59618c59367299ca1208280a973a0b99f03937831f9b39c643b090599733a0ad3735488de5b11d8581afd2b585a19bfb6a196c4eed899912388499

diff --git a/dev-util/catalyst/catalyst-3.0.22-r3.ebuild b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild
deleted file mode 100644
index 752cca6f7a24..000000000000
--- a/dev-util/catalyst/catalyst-3.0.22-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-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 system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	|| (
-		app-arch/tar[xattr]
-		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
-}
-
-# Build man pages here so as to not clobber default src_compile
-src_configure() {
-	# 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
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5
-	insinto /etc/catalyst
-	doins etc/*
-}

diff --git a/dev-util/catalyst/catalyst-4.0_rc2.ebuild b/dev-util/catalyst/catalyst-4.0_rc2.ebuild
deleted file mode 100644
index 31c694a326bd..000000000000
--- a/dev-util/catalyst/catalyst-4.0_rc2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P=${P/_/-}
-
-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/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	S="${WORKDIR}/${MY_P/_/-}"
-fi
-
-PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 linux-info optfeature tmpfiles ${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="doc +iso"
-
-BDEPEND="
-	app-text/asciidoc
-"
-DEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/fasteners[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	sys-apps/util-linux[python,${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-arch/pixz
-	app-arch/tar[xattr]
-	dev-vcs/git
-	sys-fs/dosfstools
-	sys-fs/squashfs-tools-ng[tools]
-
-	iso? (
-		app-cdr/cdrtools
-		dev-libs/libisoburn
-
-		amd64? (
-			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
-			sys-fs/mtools
-		)
-		arm64?  (
-			sys-boot/grub[grub_platforms_efi-64]
-			sys-fs/mtools
-		)
-		ppc?   (
-			sys-boot/grub:2[grub_platforms_ieee1275]
-		)
-		ppc64? (
-			sys-boot/grub:2[grub_platforms_ieee1275]
-		)
-		sparc? (
-			sys-boot/grub:2[grub_platforms_ieee1275]
-		)
-		x86?   (
-			sys-boot/grub[grub_platforms_efi-32]
-		)
-	)
-"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~UTS_NS ~IPC_NS
-		~SQUASHFS ~SQUASHFS_ZLIB
-	"
-	linux-info_pkg_setup
-}
-
-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
-}
-
-# Build man pages here so as to not clobber default src_compile
-src_configure() {
-	# 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
-}
-
-python_install() {
-	distutils-r1_python_install
-	rm -rv "${D}"$(python_get_sitedir)/usr
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	echo 'd /var/tmp/catalyst 0755 root root' > "${T}"/catalyst-tmpdir.conf
-	dotmpfiles "${T}"/catalyst-tmpdir.conf
-
-	doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5
-	insinto /etc/catalyst
-	doins etc/*
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		optfeature "ccache support" dev-util/ccache
-	fi
-	tmpfiles_process catalyst-tmpdir.conf
-}

diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index d8a6b705dc27..2567283aae7e 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -5,9 +5,7 @@
     <email>catalyst@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="ccache">Enables ccache support</flag>
     <flag name="iso">Pulls in the depends for building iso images</flag>
-    <flag name="system-bootloader">Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar</flag>
   </use>
   <upstream>
     <remote-id type="gentoo">proj/catalyst</remote-id>