Drop old. Add kernel_linux to IUSE.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

9 files changed, 15 insertions, 283 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index eaad31bb7a65..e6c267937102 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.241 2012/04/22 21:27:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.242 2012/05/03 03:50:25 mattst88 Exp $
+
+  03 May 2012; Matt Turner <mattst88@gentoo.org> -catalyst-2.0.6.ebuild,
+  -catalyst-2.0.6.916.ebuild, -catalyst-2.0.6.918.ebuild:
+  Drop old. Add kernel_linux to IUSE.
 
   22 Apr 2012; Mike Gilbert <floppym@gentoo.org> catalyst-2.0.8.ebuild,
   catalyst-2.9999.ebuild, catalyst-9999.ebuild:
diff --git a/dev-util/catalyst/catalyst-2.0.6.916.ebuild b/dev-util/catalyst/catalyst-2.0.6.916.ebuild
deleted file mode 100644
index f43cbebc742d..000000000000
--- a/dev-util/catalyst/catalyst-2.0.6.916.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.916.ebuild,v 1.5 2011/07/17 00:29:56 mattst88 Exp $
-
-# catalyst-9999         -> latest Git
-# catalyst-2.9999       -> catalyst_2 branch from Git
-# catalyst-VER          -> normal catalyst release
-
-EAPI=2
-
-if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
-	inherit git-2
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-inherit eutils multilib
-
-DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ccache"
-
-DEPEND=""
-RDEPEND="dev-lang/python
-	app-crypt/shash
-	virtual/cdrtools
-	ccache? ( dev-util/ccache )
-	ia64? ( sys-fs/dosfstools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
-
-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
-	if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
-		ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains"
-		ewarn "work-in-progress code. Be aware that it's likely that it will not"
-		ewarn "be in a working state at any given point. Please do not file bugs"
-		ewarn "until you have posted on the gentoo-catalyst mailing list and we"
-		ewarn "have asked you to do so."
-	fi
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-	if [[ ${PV} == 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
-	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 ChangeLog AUTHORS
-	doman files/catalyst.1
-	# Here is where we actually enable ccache
-	use ccache && \
-		dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
-		/etc/catalyst/catalyst.conf
-	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		/etc/catalyst/catalyst.conf
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-	echo
-}
diff --git a/dev-util/catalyst/catalyst-2.0.6.918.ebuild b/dev-util/catalyst/catalyst-2.0.6.918.ebuild
deleted file mode 100644
index 0cee8ca37fd0..000000000000
--- a/dev-util/catalyst/catalyst-2.0.6.918.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.918.ebuild,v 1.2 2011/07/17 00:29:56 mattst88 Exp $
-
-# catalyst-9999         -> latest Git
-# catalyst-2.9999       -> catalyst_2 branch from Git
-# catalyst-VER          -> normal catalyst release
-
-EAPI=2
-
-if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
-	inherit git-2
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-inherit eutils multilib
-
-DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ccache"
-
-DEPEND="app-text/asciidoc"
-RDEPEND="dev-lang/python
-	app-crypt/shash
-	virtual/cdrtools
-	ccache? ( dev-util/ccache )
-	ia64? ( sys-fs/dosfstools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
-
-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
-	if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
-		ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains"
-		ewarn "work-in-progress code. Be aware that it's likely that it will not"
-		ewarn "be in a working state at any given point. Please do not file bugs"
-		ewarn "until you have posted on the gentoo-catalyst mailing list and we"
-		ewarn "have asked you to do so."
-	fi
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-	if [[ ${PV} == 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
-	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 ChangeLog AUTHORS
-	doman files/catalyst.1
-	# Here is where we actually enable ccache
-	use ccache && \
-		dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
-		/etc/catalyst/catalyst.conf
-	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		/etc/catalyst/catalyst.conf
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-	echo
-}
diff --git a/dev-util/catalyst/catalyst-2.0.6.ebuild b/dev-util/catalyst/catalyst-2.0.6.ebuild
deleted file mode 100644
index 774a909ce8a3..000000000000
--- a/dev-util/catalyst/catalyst-2.0.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.ebuild,v 1.7 2011/07/17 00:29:56 mattst88 Exp $
-
-# catalyst-9999         -> latest Git
-# catalyst-2.9999       -> catalyst_2 branch from Git
-# catalyst-VER          -> normal catalyst release
-
-inherit eutils multilib
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://wolf31o2.org/sources/${PN}/${P}.tar.bz2"
-
-DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-#KEYWORDS=""
-RESTRICT=""
-IUSE="ccache"
-
-DEPEND=""
-RDEPEND="dev-lang/python
-	app-crypt/shash
-	virtual/cdrtools
-	ccache? ( dev-util/ccache )
-	ia64? ( sys-fs/dosfstools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
-
-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."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-	doins -r arch modules livecd || die "copying files"
-	for x in targets/*; do
-		exeinto /usr/$(get_libdir)/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-	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 ChangeLog AUTHORS
-	doman files/catalyst.1
-	# Here is where we actually enable ccache
-	use ccache && \
-		dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
-		/etc/catalyst/catalyst.conf
-	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		/etc/catalyst/catalyst.conf
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-	echo
-}
diff --git a/dev-util/catalyst/catalyst-2.0.7.1-r1.ebuild b/dev-util/catalyst/catalyst-2.0.7.1-r1.ebuild
index a9bf92462960..02b06dcce70d 100644
--- a/dev-util/catalyst/catalyst-2.0.7.1-r1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.7.1-r1.ebuild,v 1.1 2012/03/06 16:31:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.7.1-r1.ebuild,v 1.2 2012/05/03 03:50:25 mattst88 Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
 LICENSE="GPL-2"
 SLOT="0"
 RESTRICT=""
-IUSE="ccache"
+IUSE="ccache kernel_linux"
 
 DEPEND="app-text/asciidoc"
 RDEPEND="dev-lang/python
diff --git a/dev-util/catalyst/catalyst-2.0.7.1.ebuild b/dev-util/catalyst/catalyst-2.0.7.1.ebuild
index af0dfb5fafa3..4ccd72365fe5 100644
--- a/dev-util/catalyst/catalyst-2.0.7.1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.7.1.ebuild,v 1.1 2011/11/19 20:28:00 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.7.1.ebuild,v 1.2 2012/05/03 03:50:25 mattst88 Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
 LICENSE="GPL-2"
 SLOT="0"
 RESTRICT=""
-IUSE="ccache"
+IUSE="ccache kernel_linux"
 
 DEPEND="app-text/asciidoc"
 RDEPEND="dev-lang/python
diff --git a/dev-util/catalyst/catalyst-2.0.8.ebuild b/dev-util/catalyst/catalyst-2.0.8.ebuild
index b60e81c54b24..91096ef1954f 100644
--- a/dev-util/catalyst/catalyst-2.0.8.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.8.ebuild,v 1.4 2012/04/22 21:27:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.8.ebuild,v 1.5 2012/05/03 03:50:25 mattst88 Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
 LICENSE="GPL-2"
 SLOT="0"
 RESTRICT=""
-IUSE="ccache"
+IUSE="ccache kernel_linux"
 
 DEPEND="app-text/asciidoc"
 RDEPEND="app-crypt/shash
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 3296753bc854..6dd955c88453 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.9999.ebuild,v 1.4 2012/04/22 21:27:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.9999.ebuild,v 1.5 2012/05/03 03:50:25 mattst88 Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
 LICENSE="GPL-2"
 SLOT="0"
 RESTRICT=""
-IUSE="ccache"
+IUSE="ccache kernel_linux"
 
 DEPEND="app-text/asciidoc"
 RDEPEND="app-crypt/shash
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index ed95d34ab112..4bd2ae9eb695 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.18 2012/04/22 21:27:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.19 2012/05/03 03:50:25 mattst88 Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
 LICENSE="GPL-2"
 SLOT="0"
 RESTRICT=""
-IUSE="ccache"
+IUSE="ccache kernel_linux"
 
 DEPEND="app-text/asciidoc"
 RDEPEND="app-crypt/shash