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

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

[Anthony G. Basile]

commit:     3560659deb3ca379245acb780183f8e4b9492a04
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 02:25:15 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 02:25:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3560659d

dev-util/catalyst: back out of 2.0.18-r5, might break dbus-uuidgen in sys-apps/dbus

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-util/catalyst/catalyst-2.0.18-r5.ebuild        | 120 ---------------------
 .../files/catalyst-2.0.18-empty-machine-id.patch   |  12 ---
 2 files changed, 132 deletions(-)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r5.ebuild b/dev-util/catalyst/catalyst-2.0.18-r5.ebuild
deleted file mode 100644
index 727b6cfeb1f..00000000000
--- a/dev-util/catalyst/catalyst-2.0.18-r5.ebuild
+++ /dev/null
@@ -1,120 +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="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://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}
-
-PATCHES=(
-	"${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch"
-	"${FILESDIR}/catalyst-2.0.18-fix-quotes.patch"
-	"${FILESDIR}/catalyst-2.0.18-empty-machine-id.patch"
-	"${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.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://wiki.gentoo.org/wiki/Catalyst"
-}

diff --git a/dev-util/catalyst/files/catalyst-2.0.18-empty-machine-id.patch b/dev-util/catalyst/files/catalyst-2.0.18-empty-machine-id.patch
deleted file mode 100644
index e2e7f5a0b8c..00000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-empty-machine-id.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
-index 6c1a31c..67874a0 100755
---- a/targets/support/chroot-functions.sh
-+++ b/targets/support/chroot-functions.sh
-@@ -223,6 +223,7 @@ cleanup_stages() {
- 		stage1|stage2|stage3|system)
- 			rm -f /var/lib/portage/world
- 			touch /var/lib/portage/world
-+			>/etc/machine-id
- 			;;
- 		*)
- 			echo "Skipping removal of world file for ${clst_target}"

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

[Anthony G. Basile]

commit:     bec89348d7ebad23d0818a9d45932f316b940c9d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 02:12:14 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 02:12:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec89348

dev-util/catalyst: 2.0.18-r5 - create empty /etc/machine-id for systemd

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-util/catalyst/catalyst-2.0.18-r5.ebuild        | 120 +++++++++++++++++++++
 .../files/catalyst-2.0.18-empty-machine-id.patch   |  12 +++
 2 files changed, 132 insertions(+)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r5.ebuild b/dev-util/catalyst/catalyst-2.0.18-r5.ebuild
new file mode 100644
index 00000000000..863607bc649
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.18-r5.ebuild
@@ -0,0 +1,120 @@
+# 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="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://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}
+
+PATCHES=(
+	"${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch"
+	"${FILESDIR}/catalyst-2.0.18-fix-quotes.patch"
+	"${FILESDIR}/catalyst-2.0.18-empty-machine-id.patch"
+	"${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.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://wiki.gentoo.org/wiki/Catalyst"
+}

diff --git a/dev-util/catalyst/files/catalyst-2.0.18-empty-machine-id.patch b/dev-util/catalyst/files/catalyst-2.0.18-empty-machine-id.patch
new file mode 100644
index 00000000000..e2e7f5a0b8c
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-empty-machine-id.patch
@@ -0,0 +1,12 @@
+diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
+index 6c1a31c..67874a0 100755
+--- a/targets/support/chroot-functions.sh
++++ b/targets/support/chroot-functions.sh
+@@ -223,6 +223,7 @@ cleanup_stages() {
+ 		stage1|stage2|stage3|system)
+ 			rm -f /var/lib/portage/world
+ 			touch /var/lib/portage/world
++			>/etc/machine-id
+ 			;;
+ 		*)
+ 			echo "Skipping removal of world file for ${clst_target}"

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

[Anthony G. Basile]

commit:     6d9cbada4bb926777efe07a18021ccfa52732d32
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  4 21:15:34 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jun  4 21:15:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d9cbada

dev-util/catalyst: version bump to 2.0.18-r4, bug #584234

Package-Manager: portage-2.2.28

 dev-util/catalyst/catalyst-2.0.18-r4.ebuild        | 121 +++++++++++++++++++++
 .../files/catalyst-2.0.18-stage1-export-ROOT.patch |  42 +++++++
 2 files changed, 163 insertions(+)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
new file mode 100644
index 0000000..39728ec
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -0,0 +1,121 @@
+# 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"
+	"${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.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/files/catalyst-2.0.18-stage1-export-ROOT.patch b/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch
new file mode 100644
index 0000000..67fc2c6
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch
@@ -0,0 +1,42 @@
+From 5fd2d5edd3c4c1e99687beb9acc130bab162866b Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Sat, 4 Jun 2016 12:43:44 -0400
+Subject: stage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for
+ setup_gcc()
+
+setup_gcc() calls gcc-config to select a particular gcc profile.  At stage1 this
+needs to be done in the /tmp/stage1root chroot.  gcc-config looks for ROOT to
+choose the root directory in which to make the selection.  If we don't export
+ROOT, then setup_gcc is ineffective.
+
+X-Gentoo-Bug: 584234
+X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=584234
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ targets/stage1/stage1-preclean-chroot.sh | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
+index a80fc92..dc67521 100755
+--- a/targets/stage1/stage1-preclean-chroot.sh
++++ b/targets/stage1/stage1-preclean-chroot.sh
+@@ -1,5 +1,6 @@
+ #!/bin/bash
+ 
++export ROOT=/tmp/stage1root
+ export RUN_DEFAULT_FUNCS="no"
+ 
+ source /tmp/chroot-functions.sh
+@@ -8,8 +9,6 @@ update_env_settings
+ show_debug
+ 
+ # Now, some finishing touches to initialize gcc-config....
+-unset ROOT
+-
+ setup_gcc
+ setup_binutils
+ 
+-- 
+cgit v0.12
+

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

[Anthony G. Basile]

commit:     468965432fa32bccb02a594a733b40e22ab6214b
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  4 02:25:30 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar  4 02:25:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46896543

dev-util/catalyst: version bump to 2.0.18-r2

Package-Manager: portage-2.2.26

 dev-util/catalyst/catalyst-2.0.18-r2.ebuild        | 119 +++++++++++++++++++++
 .../files/catalyst-2.0.18-fix-quotes.patch         |  38 +++++++
 2 files changed, 157 insertions(+)

diff --git a/dev-util/catalyst/catalyst-2.0.18-r2.ebuild b/dev-util/catalyst/catalyst-2.0.18-r2.ebuild
new file mode 100644
index 0000000..8405874
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.18-r2.ebuild
@@ -0,0 +1,119 @@
+# 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/files/catalyst-2.0.18-fix-quotes.patch b/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch
new file mode 100644
index 0000000..ccaffbe
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch
@@ -0,0 +1,38 @@
+From 1eabce3a9c15c5caf022e71c1959e8c8f4819fad Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Thu, 3 Mar 2016 20:48:43 -0500
+Subject: [PATCH] targets/support/chroot-functions.sh: correct quotes to allow
+ expansion of $1
+
+This is a backport of commit b2473eff.  The single quotes prevented the proper
+expansion of $1 in setup_pkgmgr().  Since this is usually called as
+`setup_pkgmgr "build"` during stage1 builds, it is surprising this was
+not caught earlier.
+---
+ targets/support/chroot-functions.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
+index 3b7f77b..6c1a31c 100755
+--- a/targets/support/chroot-functions.sh
++++ b/targets/support/chroot-functions.sh
+@@ -172,12 +172,12 @@ setup_pkgmgr(){
+ 	# Use --update or portage might just waste time/cycles and reinstall the same version.
+ 	# Use --newuse to make sure it rebuilds with any changed use flags.
+ 	if [ -n "$1" ];then
+-		echo "Adding USE='${USE} $1' to make.conf for portage build"
+-		[ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf
++		echo "Adding USE=\"${USE} $1\" to make.conf for portage build"
++		[ -e /etc/portage/make.conf ] && echo "USE=\"\${USE} $1\"" >> /etc/portage/make.conf
+ 		run_merge --oneshot --update --newuse sys-apps/portage
+-		sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf
++		sed -i "/USE=\"\${USE} $1\"/d" /etc/portage/make.conf
+ 	else
+-		echo "Updating portage with USE='${USE}'"
++		echo "Updating portage with USE=\"${USE}\""
+ 		run_merge --oneshot --update --newuse sys-apps/portage
+ 	fi
+ }
+-- 
+2.4.10
+