Adding 2.0.6_pre6 to replace 2.0.6_pre5, which had a really nasty little bug in it.

(Portage version: 2.1.4.4)

3 files changed, 10 insertions, 77 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 5a6b897c642d..bbf724d94945 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.186 2008/02/14 16:58:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.187 2008/02/14 19:23:49 wolf31o2 Exp $
+
+*catalyst-2.0.6_pre6 (14 Feb 2008)
+
+  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  -catalyst-2.0.5.ebuild, -catalyst-2.0.6_pre4.ebuild,
+  +catalyst-2.0.6_pre6.ebuild:
+  Adding 2.0.6_pre6 to replace 2.0.6_pre5, which had a really nasty little bug
+  in it.
 
 *catalyst-2.0.6_pre5 (14 Feb 2008)
 
diff --git a/dev-util/catalyst/catalyst-2.0.5.ebuild b/dev-util/catalyst/catalyst-2.0.5.ebuild
deleted file mode 100644
index b756b4ab83b2..000000000000
--- a/dev-util/catalyst/catalyst-2.0.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.5.ebuild,v 1.2 2008/01/25 17:38:22 wolf31o2 Exp $
-
-inherit eutils
-
-DESCRIPTION="release metatool used for creating Gentoo releases"
-HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/sources/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-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_install() {
-	insinto /usr/lib/${PN}/arch
-	doins arch/* || die "copying arch/*"
-	insinto /usr/lib/${PN}/modules
-	doins modules/* || die "copying modules/*"
-	insinto /usr/lib/${PN}/livecd/cdtar
-	doins livecd/cdtar/* || die "copying cdtar/*"
-	insinto /usr/lib/${PN}/livecd/files
-	doins livecd/files/* || die "copying files/*"
-	for x in targets/*; do
-		exeinto /usr/lib/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-	exeinto /usr/lib/${PN}
-	doexe catalyst || die "copying catalyst"
-	dodir /usr/bin
-	dosym /usr/lib/${PN}/catalyst /usr/bin/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 ChangeLog.old 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
-}
-
-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_pre4.ebuild b/dev-util/catalyst/catalyst-2.0.6_pre6.ebuild
index 2f2b792dc68e..2d2f4f4596ef 100644
--- a/dev-util/catalyst/catalyst-2.0.6_pre4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.6_pre6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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_pre4.ebuild,v 1.2 2008/02/14 06:53:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6_pre6.ebuild,v 1.1 2008/02/14 19:23:49 wolf31o2 Exp $
 
 # catalyst-9999			-> latest SVN
 # catalyst-9999.REV		-> use SVN REV