Version bumped to 2.0_rc10.

Package-Manager: portage-2.0.53

7 files changed, 55 insertions, 35 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index bb00327b25b1..113d2e6cf01d 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,13 @@
 # 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.104 2005/12/13 23:03:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.105 2005/12/20 17:01:08 wolf31o2 Exp $
+
+*catalyst-2.0_rc10 (20 Dec 2005)
+
+  20 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/catalyst-2.0_rc10-slot.patch, -files/catalyst-2.0_rc9-slot.patch,
+  -catalyst-2.0_rc9.ebuild, +catalyst-2.0_rc10.ebuild:
+  Version bumped to 2.0_rc10.
 
 *catalyst-2.0_rc9 (13 Dec 2005)
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index f3078d29eb44..e48aa61d0a69 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9cecbdfe79bafbe7768a82af2e6a6f0e ChangeLog 20174
-MD5 6b3ac73054ed1deb0754ef1b45d50570 catalyst-1.1.10.10.ebuild 2251
-MD5 5af81e276710f751f9bdeb26311d8640 catalyst-2.0_rc9.ebuild 2878
-MD5 581608aa8f2b5d469231661b508b1178 files/catalyst-2.0_rc9-slot.patch 1250
+MD5 7b7d6e615c5c243bb7e40d7ae6e4fe53 ChangeLog 20423
+MD5 0b8c46e78330bff6ba7a248924ac4341 catalyst-1.1.10.10.ebuild 2281
+MD5 d8a20092ed379a0a1ca3f3b61848b04e catalyst-2.0_rc10.ebuild 3342
+MD5 b8b1764df11a169006bb0293f65a7ff9 files/catalyst-2.0_rc10-slot.patch 1267
 MD5 1579d7c79eaa1035a84a4247cd4a5fb6 files/digest-catalyst-1.1.10.10 71
-MD5 537a143a71b6f03e12016e1a092efb9f files/digest-catalyst-2.0_rc9 69
+MD5 bbd2786fa50613fcb21c6284461d9f12 files/digest-catalyst-2.0_rc10 70
 MD5 8c971ca7e043237b69754a9d88238bd4 metadata.xml 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDoi5H2+ySkm8kpY0RAj+nAJ9SNKU+8SPoqG8WAYpy5PlSfuV/HwCeIR1R
-aFmtq0svBukwWWepUtu//Ys=
-=LKU4
------END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-1.1.10.10.ebuild b/dev-util/catalyst/catalyst-1.1.10.10.ebuild
index d65f90481e44..5ba128de80cf 100644
--- a/dev-util/catalyst/catalyst-1.1.10.10.ebuild
+++ b/dev-util/catalyst/catalyst-1.1.10.10.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-1.1.10.10.ebuild,v 1.2 2005/12/16 03:01:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-1.1.10.10.ebuild,v 1.3 2005/12/20 17:01:08 wolf31o2 Exp $
 
 inherit eutils
 
@@ -23,8 +23,11 @@ RDEPEND="dev-lang/python
 		dev-util/ccache )
 	cdr? (
 		virtual/cdrtools
-		app-misc/zisofs-tools
-		!mips? ( >=sys-fs/squashfs-tools-2.1 ) )
+		!sh? (
+			app-misc/zisofs-tools )
+		!mips? (
+			!sh? (
+				>=sys-fs/squashfs-tools-2.1 ) ) )
 	examples? (
 		dev-util/livecd-kconfigs
 		dev-util/livecd-specs )"
diff --git a/dev-util/catalyst/catalyst-2.0_rc9.ebuild b/dev-util/catalyst/catalyst-2.0_rc10.ebuild
index a75cb72a01c3..fcaf992c74b7 100644
--- a/dev-util/catalyst/catalyst-2.0_rc9.ebuild
+++ b/dev-util/catalyst/catalyst-2.0_rc10.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_rc9.ebuild,v 1.2 2005/12/16 03:01:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0_rc10.ebuild,v 1.1 2005/12/20 17:01:08 wolf31o2 Exp $
 
 inherit eutils
 
@@ -15,7 +15,15 @@ IUSE="ccache cdr"
 
 DEPEND=""
 RDEPEND="dev-lang/python
+	!arm? (
+		!hppa? (
+			!s390? (
+				!sh? (
+					dev-perl/Archive-Zip ) ) ) )
+	x86? (
+		app-crypt/shash )
 	amd64? (
+		app-crypt/shash
 		sys-apps/linux32 )
 	ppc64? (
 		sys-devel/ppc32 )
@@ -23,8 +31,11 @@ RDEPEND="dev-lang/python
 		dev-util/ccache )
 	cdr? (
 		virtual/cdrtools
-		app-misc/zisofs-tools
-		!mips? ( >=sys-fs/squashfs-tools-2.1 ) )
+		!sh? (
+			app-misc/zisofs-tools )
+		!mips? (
+			!sh? (
+				>=sys-fs/squashfs-tools-2.1 ) ) )
 	examples? (
 		dev-util/livecd-kconfigs
 		dev-util/livecd-specs )"
@@ -40,8 +51,9 @@ pkg_setup() {
 	fi
 	echo
 	einfo "The template spec files are now installed by default.  You can find"
-	einfo "them under /usr/share/doc/${PF}/examples and they are considered to"
-	einfo "be the authorative source of information on catalyst."
+	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() {
@@ -77,8 +89,16 @@ src_install() {
 	dodoc README ChangeLog ChangeLog.old AUTHORS
 	newman files/catalyst.1 catalyst2.1
 	# This will go away in the future
-	dosed "s:/usr/lib/catalyst:/usr/lib/catalyst2:" /etc/catalyst2/catalyst2.conf
-	dosed "s:/var/tmp/catalyst:/var/tmp/catalyst2:" /etc/catalyst2/catalyst2.conf
+	dosed "s:/usr/lib/catalyst:/usr/lib/catalyst2:" \
+		/etc/catalyst2/catalyst2.conf
+	dosed "s:/var/tmp/catalyst:/var/tmp/catalyst2:" \
+		/etc/catalyst2/catalyst2.conf
+	# This is the dirty hack for missing dev-perl/Archive-Zip
+	dosed 's:hash_function="crc32":hash_function="md5":' \
+		/etc/catalyst2/catalyst2.conf
+	# Here is where we actually enable ccache
+	dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
+		/etc/catalyst2/catalyst2.conf
 }
 
 pkg_postinst() {
diff --git a/dev-util/catalyst/files/catalyst-2.0_rc9-slot.patch b/dev-util/catalyst/files/catalyst-2.0_rc10-slot.patch
index aab4d99e3571..eea816e8d887 100644
--- a/dev-util/catalyst/files/catalyst-2.0_rc9-slot.patch
+++ b/dev-util/catalyst/files/catalyst-2.0_rc10-slot.patch
@@ -1,7 +1,7 @@
-diff -urN catalyst-2.0_rc9.orig/catalyst catalyst-2.0_rc9/catalyst
---- catalyst-2.0_rc9.orig/catalyst	2005-10-17 16:07:14.000000000 -0400
-+++ catalyst-2.0_rc9/catalyst	2005-10-17 16:06:23.000000000 -0400
-@@ -50,10 +50,10 @@
+diff -urN catalyst-2.0_rc10.orig/catalyst catalyst-2.0_rc10/catalyst
+--- catalyst-2.0_rc10.orig/catalyst	2005-12-20 07:07:45.000000000 -0500
++++ catalyst-2.0_rc10/catalyst	2005-12-20 07:09:19.000000000 -0500
+@@ -51,10 +51,10 @@
  	myconf={}
  	config_file=""
  
@@ -10,12 +10,12 @@ diff -urN catalyst-2.0_rc9.orig/catalyst catalyst-2.0_rc9/catalyst
 +	confdefaults={ "storedir":"/var/tmp/catalyst2",\
 +		"sharedir":"/usr/share/catalyst2","distdir":"/usr/portage/distfiles",\
  		"portdir":"/usr/portage","options":"",\
--		"snapshot_cache":"/var/tmp/catalyst/snapshot_cache" }
-+		"snapshot_cache":"/var/tmp/catalyst2/snapshot_cache" }
+-		"snapshot_cache":"/var/tmp/catalyst/snapshot_cache",\
++		"snapshot_cache":"/var/tmp/catalyst2/snapshot_cache",\
+ 		"hash_function":"crc32"}
  		
  	# first, try the one passed (presumably from the cmdline)
- 	if myconfig:
-@@ -67,9 +67,9 @@
+@@ -69,9 +69,9 @@
  			sys.exit(1)
  	
  	# next, try the default location
diff --git a/dev-util/catalyst/files/digest-catalyst-2.0_rc10 b/dev-util/catalyst/files/digest-catalyst-2.0_rc10
new file mode 100644
index 000000000000..65ee1d9d0643
--- /dev/null
+++ b/dev-util/catalyst/files/digest-catalyst-2.0_rc10
@@ -0,0 +1 @@
+MD5 08a3917407affaa15323d21dc58c13ed catalyst-2.0_rc10.tar.bz2 766102
diff --git a/dev-util/catalyst/files/digest-catalyst-2.0_rc9 b/dev-util/catalyst/files/digest-catalyst-2.0_rc9
deleted file mode 100644
index 9bbfd175b62a..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-2.0_rc9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 54f9d3cd46bc26a3bd45ad6cab24d71e catalyst-2.0_rc9.tar.bz2 765192