Version bump to 2.0.5_pre4, which fixes bug #120076, bug #131504, bug #169041, and bug #191524.

(Portage version: 2.1.3.12)

6 files changed, 15 insertions, 82 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 270abf108acd..f04932ab4f4c 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,14 @@
 # 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.173 2007/08/31 22:07:34 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.174 2007/10/12 00:09:59 wolf31o2 Exp $
+
+*catalyst-2.0.5_pre4 (12 Oct 2007)
+
+  12 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  -catalyst-2.0.4.ebuild, -catalyst-2.0.5_pre2.ebuild,
+  +catalyst-2.0.5_pre4.ebuild:
+  Version bump to 2.0.5_pre4, which fixes bug #120076, bug #131504, bug
+  #169041, and bug #191524.
 
 *catalyst-2.0.5_pre3 (31 Aug 2007)
 
diff --git a/dev-util/catalyst/catalyst-2.0.4.ebuild b/dev-util/catalyst/catalyst-2.0.4.ebuild
deleted file mode 100644
index e602166c6a6e..000000000000
--- a/dev-util/catalyst/catalyst-2.0.4.ebuild
+++ /dev/null
@@ -1,74 +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.4.ebuild,v 1.2 2007/07/12 06:37:40 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Gentoo Linux official release metatool"
-HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~wolf31o2/sources/catalyst/${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"
-
-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.5_pre2.ebuild b/dev-util/catalyst/catalyst-2.0.5_pre4.ebuild
index f027b1f62c3b..1259ce7d6573 100644
--- a/dev-util/catalyst/catalyst-2.0.5_pre2.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.5_pre4.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.5_pre2.ebuild,v 1.1 2007/08/29 18:19:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.5_pre4.ebuild,v 1.1 2007/10/12 00:09:59 wolf31o2 Exp $
 
 inherit eutils
 
@@ -9,9 +9,11 @@ HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	http://dev.gentoo.org/~wolf31o2/${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=""
diff --git a/dev-util/catalyst/files/digest-catalyst-2.0.4 b/dev-util/catalyst/files/digest-catalyst-2.0.4
deleted file mode 100644
index 89b50c019833..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-2.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/dev-util/catalyst/files/digest-catalyst-2.0.5_pre2 b/dev-util/catalyst/files/digest-catalyst-2.0.5_pre2
deleted file mode 100644
index 662e673ed147..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-2.0.5_pre2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 308846b67138509d78f0b825428d5af9 catalyst-2.0.5_pre2.tar.bz2 787736
-RMD160 6609cd5bd505b1ad3c8757b2b871762dac9a69ba catalyst-2.0.5_pre2.tar.bz2 787736
-SHA256 df6e571d0f21aac20c418abc135f1f1fd5234483c9cb6937cbfd2c84281df6f1 catalyst-2.0.5_pre2.tar.bz2 787736
diff --git a/dev-util/catalyst/files/digest-catalyst-2.0.5_pre4 b/dev-util/catalyst/files/digest-catalyst-2.0.5_pre4
new file mode 100644
index 000000000000..5b38d4300d4b
--- /dev/null
+++ b/dev-util/catalyst/files/digest-catalyst-2.0.5_pre4
@@ -0,0 +1,3 @@
+MD5 08874f4cd3312a20c3e5e09cf2715a49 catalyst-2.0.5_pre4.tar.bz2 788312
+RMD160 026228c733cf491026f545209d8bf5c002097f80 catalyst-2.0.5_pre4.tar.bz2 788312
+SHA256 807a395c74441ebc61779fe9da5338927ade7701c7c7a9dbf6c65d8e55ac77d8 catalyst-2.0.5_pre4.tar.bz2 788312