Version bumped to 2.0_rc2. This adds autoresume points between each kernel on multiple builds and fixes a nasty livecd-stage1 USE issue.

Package-Manager: portage-2.0.53_rc7

6 files changed, 22 insertions, 11 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index f886fe2736fc..608115a8c403 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.96 2005/11/29 20:51:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.97 2005/11/30 21:48:13 wolf31o2 Exp $
+
+*catalyst-2.0_rc2 (30 Nov 2005)
+
+  30 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -files/catalyst-2.0_rc1-slot.patch, +files/catalyst-2.0_rc2-slot.patch,
+  -catalyst-2.0_rc1.ebuild, +catalyst-2.0_rc2.ebuild:
+  Version bumped to 2.0_rc2. This adds autoresume points between each kernel
+  on multiple builds and fixes a nasty livecd-stage1 USE issue.
 
 *catalyst-2.0_rc1 (29 Nov 2005)
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 1c890302b593..6539fbb26755 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,7 +1,7 @@
-MD5 1fd81de4f28fc3d0562c5727504efd50 ChangeLog 17640
+MD5 fa44db290d185ce0b58ba6a5ef6b671f ChangeLog 17997
 MD5 f514d037aa3187a2e5a96fe6c4ae626b catalyst-1.1.10.10.ebuild 2250
-MD5 3833fc9629f2a5901d500cd8bfc89ef3 catalyst-2.0_rc1.ebuild 2810
-MD5 ac7daa97bd1a35a43781b333c3026ffc files/catalyst-2.0_rc1-slot.patch 1250
+MD5 33c4a69157d0dbc7a977b58e687f6c61 catalyst-2.0_rc2.ebuild 2876
+MD5 fa0105c43ee7901b9dadd2a200819888 files/catalyst-2.0_rc2-slot.patch 1250
 MD5 1579d7c79eaa1035a84a4247cd4a5fb6 files/digest-catalyst-1.1.10.10 71
-MD5 0e99fe4a75eb52a2fb2e6e26f939a2d8 files/digest-catalyst-2.0_rc1 69
+MD5 186de73710773b770abd9da8a32887ee files/digest-catalyst-2.0_rc2 69
 MD5 8c971ca7e043237b69754a9d88238bd4 metadata.xml 223
diff --git a/dev-util/catalyst/catalyst-2.0_rc1.ebuild b/dev-util/catalyst/catalyst-2.0_rc2.ebuild
index d83b6f461507..5eb3be26d71a 100644
--- a/dev-util/catalyst/catalyst-2.0_rc1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0_rc1.ebuild,v 1.1 2005/11/29 20:51:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0_rc2.ebuild,v 1.1 2005/11/30 21:48:13 wolf31o2 Exp $
 
 inherit eutils
 
@@ -24,7 +24,10 @@ RDEPEND="dev-lang/python
 	cdr? (
 		virtual/cdrtools
 		app-misc/zisofs-tools
-		!mips? ( >=sys-fs/squashfs-tools-2.1 ) )"
+		!mips? ( >=sys-fs/squashfs-tools-2.1 ) )
+	examples? (
+		dev-util/livecd-kconfigs
+		dev-util/livecd-specs )"
 
 pkg_setup() {
 	if use ccache
diff --git a/dev-util/catalyst/files/catalyst-2.0_rc1-slot.patch b/dev-util/catalyst/files/catalyst-2.0_rc2-slot.patch
index ebfed785c6b2..57402047601e 100644
--- a/dev-util/catalyst/files/catalyst-2.0_rc1-slot.patch
+++ b/dev-util/catalyst/files/catalyst-2.0_rc2-slot.patch
@@ -1,6 +1,6 @@
-diff -urN catalyst-2.0_rc1.orig/catalyst catalyst-2.0_rc1/catalyst
---- catalyst-2.0_rc1.orig/catalyst	2005-10-17 16:07:14.000000000 -0400
-+++ catalyst-2.0_rc1/catalyst	2005-10-17 16:06:23.000000000 -0400
+diff -urN catalyst-2.0_rc2.orig/catalyst catalyst-2.0_rc2/catalyst
+--- catalyst-2.0_rc2.orig/catalyst	2005-10-17 16:07:14.000000000 -0400
++++ catalyst-2.0_rc2/catalyst	2005-10-17 16:06:23.000000000 -0400
 @@ -50,10 +50,10 @@
  	myconf={}
  	config_file=""
diff --git a/dev-util/catalyst/files/digest-catalyst-2.0_rc1 b/dev-util/catalyst/files/digest-catalyst-2.0_rc1
deleted file mode 100644
index d30485fa0873..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-2.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e5a9068ec61ad426a3031dc032ae1521 catalyst-2.0_rc1.tar.bz2 762106
diff --git a/dev-util/catalyst/files/digest-catalyst-2.0_rc2 b/dev-util/catalyst/files/digest-catalyst-2.0_rc2
new file mode 100644
index 000000000000..36984f687d0d
--- /dev/null
+++ b/dev-util/catalyst/files/digest-catalyst-2.0_rc2
@@ -0,0 +1 @@
+MD5 7b5cafd7cc2590916b425aa6d41b6217 catalyst-2.0_rc2.tar.bz2 761764