Version bumped to 2.0.4 for 2007.0's release. This resolves bug #173002, bug #173532, bug #173740, and bug #173826.

(Portage version: 2.1.2.3)

6 files changed, 12 insertions, 85 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 15ad40a95be6..9435b2b205ed 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.167 2007/04/07 04:20:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.168 2007/04/12 19:43:30 wolf31o2 Exp $
+
+*catalyst-2.0.4 (12 Apr 2007)
+
+  12 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  -catalyst-2.0.2.ebuild, -catalyst-2.0.3.ebuild, +catalyst-2.0.4.ebuild:
+  Version bumped to 2.0.4 for 2007.0's release. This resolves bug #173002, bug
+  #173532, bug #173740, and bug #173826.
 
   07 Apr 2007; Mike Frysinger <vapier@gentoo.org> catalyst-1.1.10.10.ebuild,
   catalyst-2.0.2.ebuild, catalyst-2.0.3.ebuild:
diff --git a/dev-util/catalyst/catalyst-2.0.2.ebuild b/dev-util/catalyst/catalyst-2.0.2.ebuild
deleted file mode 100644
index b322b17c067a..000000000000
--- a/dev-util/catalyst/catalyst-2.0.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.2.ebuild,v 1.4 2007/04/07 04:20:04 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Gentoo Linux official release metatool"
-HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst"
-SRC_URI="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"
-IUSE="ccache cdr"
-
-DEPEND=""
-RDEPEND="dev-lang/python
-	app-crypt/shash
-	amd64? ( sys-apps/setarch )
-	ppc64? ( sys-apps/setarch )
-	ccache? ( dev-util/ccache )
-	cdr? (
-		virtual/cdrtools
-		ia64? ( sys-fs/dosfstools )
-		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
-	elog "The template spec files are now installed by default.  You can find"
-	elog "them under /usr/share/doc/${PF}/examples"
-	elog "and they are considered to be the authorative source of information"
-	elog "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() {
-	elog "You can find more information about catalyst by checking out the"
-	elog "catalyst project page at:"
-	elog "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-	echo
-}
diff --git a/dev-util/catalyst/catalyst-2.0.3.ebuild b/dev-util/catalyst/catalyst-2.0.4.ebuild
index be4d45869b9f..9a63f752f82d 100644
--- a/dev-util/catalyst/catalyst-2.0.3.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.3.ebuild,v 1.3 2007/04/07 04:20:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.4.ebuild,v 1.1 2007/04/12 19:43:30 wolf31o2 Exp $
 
 inherit eutils
 
diff --git a/dev-util/catalyst/files/digest-catalyst-2.0.2 b/dev-util/catalyst/files/digest-catalyst-2.0.2
deleted file mode 100644
index da84310102c2..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-2.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 637c249f797dc8a7aa23665049dbb310 catalyst-2.0.2.tar.bz2 782576
-RMD160 06cd53d2ec71a69137f655c2b3b1dbf00f7852aa catalyst-2.0.2.tar.bz2 782576
-SHA256 dec7118411f06322792720c8dc0977ae020552bdf2e35c5ef1735f37b2266a65 catalyst-2.0.2.tar.bz2 782576
diff --git a/dev-util/catalyst/files/digest-catalyst-2.0.3 b/dev-util/catalyst/files/digest-catalyst-2.0.3
deleted file mode 100644
index 5b5355f2a10d..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-2.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 274f5b89f6ea164bbd3ef99e8f034d12 catalyst-2.0.3.tar.bz2 783648
-RMD160 f59d8cb5e08464ebac8c3dbc7292903a4cc08812 catalyst-2.0.3.tar.bz2 783648
-SHA256 7355cb93f23071be80d10a5269b8f2a78edd9626cf4ad8f717a79139a4189ad5 catalyst-2.0.3.tar.bz2 783648
diff --git a/dev-util/catalyst/files/digest-catalyst-2.0.4 b/dev-util/catalyst/files/digest-catalyst-2.0.4
new file mode 100644
index 000000000000..89b50c019833
--- /dev/null
+++ b/dev-util/catalyst/files/digest-catalyst-2.0.4
@@ -0,0 +1,3 @@
+MD5 193e84c9b38201a38f3201d45910e221 catalyst-2.0.4.tar.bz2 784337
+RMD160 dec8bc5d84bc567d54b49d9be5a5f9c601d73b92 catalyst-2.0.4.tar.bz2 784337
+SHA256 7a84540f8aab6287e68aa50465ae70a25b0ef7bf3e3aff778958e37b5dd0081c catalyst-2.0.4.tar.bz2 784337