Version bump to fix a few bugs. Closing bug #131181, bug #131190, and bug #131502.

Package-Manager: portage-2.1_pre9-r4

5 files changed, 165 insertions, 10 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index c445f791a812..8df90bcd138c 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.146 2006/04/20 15:24:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.147 2006/05/01 19:47:05 wolf31o2 Exp $
+
+*catalyst-2.0_rc45 (01 May 2006)
+
+  01 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/catalyst-2.0_rc45-slot.patch, +catalyst-2.0_rc45.ebuild:
+  Version bump to fix a few bugs. Closing bug #131181, bug #131190, and bug
+  #131502.
 
 *catalyst-2.0_rc44 (20 Apr 2006)
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 2d2298077bde..a2e67efc0a83 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,21 +1,40 @@
-MD5 3afdd146307e4f13420f66d4984bd4ac ChangeLog 32169
-RMD160 6ce537f757d2ad34a00066edea01514618c52dc3 ChangeLog 32169
-SHA256 00fb37f3bf0fa75c5001d49518ec5c473aa8f718754851f964d36bcbd70390b1 ChangeLog 32169
+AUX catalyst-2.0_rc44-slot.patch 1267 RMD160 bc1bd65150c5bfb299624e7d7ab7a524e2dfff81 SHA1 ced0e74c6afabf0dc3b4de0f8183484631279066 SHA256 8c761a7f067fd13c8030db921b587915be8b1622fb4444d51b0fd5a8bbfeb23d size 1267
+MD5 f320f1d5e0dbc698686e9da51849bf8d files/catalyst-2.0_rc44-slot.patch 1267
+RMD160 bc1bd65150c5bfb299624e7d7ab7a524e2dfff81 files/catalyst-2.0_rc44-slot.patch 1267
+SHA256 8c761a7f067fd13c8030db921b587915be8b1622fb4444d51b0fd5a8bbfeb23d files/catalyst-2.0_rc44-slot.patch 1267
+AUX catalyst-2.0_rc45-slot.patch 1267 RMD160 7179f88012df004051cca4f8f05f8f65c620350f SHA1 f1cd17b982856a5ecd40480f223592df72f0567c SHA256 9a04b747375b1be5dfa09b578b985a03349c79709bb997c07faf378be1c57542 size 1267
+MD5 a54750a69c27089b185e5be9fa38cc5c files/catalyst-2.0_rc45-slot.patch 1267
+RMD160 7179f88012df004051cca4f8f05f8f65c620350f files/catalyst-2.0_rc45-slot.patch 1267
+SHA256 9a04b747375b1be5dfa09b578b985a03349c79709bb997c07faf378be1c57542 files/catalyst-2.0_rc45-slot.patch 1267
+DIST catalyst-1.1.10.10.tar.bz2 570620 size 570620
+DIST catalyst-2.0_rc44.tar.bz2 864296 RMD160 5c35a0010db5f2c9868b5e622608908f8dd76ecd SHA256 aaf00f144a93e519f754c9185a2e203e4a5506b4345627d18b8ebc978d7b753c size 864296
+DIST catalyst-2.0_rc45.tar.bz2 864602 RMD160 4b1ca5964ed0beabc1cafcebcd34c0346be625c4 SHA256 cdb1f37732714683dea2ba4d1a20b1919fcc3550630f93e4b875ce8d365cc086 size 864602
+EBUILD catalyst-1.1.10.10.ebuild 2236 RMD160 36a6ad29c0dea85bf4bf805e0502eed23a6a10f4 SHA1 6ee828b46769b1bb191a37716009ac3574041fae SHA256 2c235bb7a4459d4b9d9a90d206a2dd0f5e9daed8b613389514abb9f065da73c1 size 2236
 MD5 c288111d23145da40395fec1b16e5d0b catalyst-1.1.10.10.ebuild 2236
 RMD160 36a6ad29c0dea85bf4bf805e0502eed23a6a10f4 catalyst-1.1.10.10.ebuild 2236
 SHA256 2c235bb7a4459d4b9d9a90d206a2dd0f5e9daed8b613389514abb9f065da73c1 catalyst-1.1.10.10.ebuild 2236
+EBUILD catalyst-2.0_rc44.ebuild 3097 RMD160 4e9cf8ba08c810f580e2cdbd7ee8b10b61bab009 SHA1 ae44051a120c161d81ac7216c3d01f37f3bec1fd SHA256 8c017aaf6c6bd4f283e6cbf82e1e4ed898853a5db2136f44ecb970afd8c1a34b size 3097
 MD5 c242dfa75dc0f956707e9c2dc79e4ac5 catalyst-2.0_rc44.ebuild 3097
 RMD160 4e9cf8ba08c810f580e2cdbd7ee8b10b61bab009 catalyst-2.0_rc44.ebuild 3097
 SHA256 8c017aaf6c6bd4f283e6cbf82e1e4ed898853a5db2136f44ecb970afd8c1a34b catalyst-2.0_rc44.ebuild 3097
-MD5 f320f1d5e0dbc698686e9da51849bf8d files/catalyst-2.0_rc44-slot.patch 1267
-RMD160 bc1bd65150c5bfb299624e7d7ab7a524e2dfff81 files/catalyst-2.0_rc44-slot.patch 1267
-SHA256 8c761a7f067fd13c8030db921b587915be8b1622fb4444d51b0fd5a8bbfeb23d files/catalyst-2.0_rc44-slot.patch 1267
+EBUILD catalyst-2.0_rc45.ebuild 3097 RMD160 e0ab1940f15fca1d14468d267202b2cd0b2f13bd SHA1 1704c1fa2e0085b8283f8d3eca87b1411e9f12c5 SHA256 23a5019337594f2ad187e0294534205ca05f450ab0d614e677b08322d1fd6e03 size 3097
+MD5 56edfb48201629473ec13881caabae2e catalyst-2.0_rc45.ebuild 3097
+RMD160 e0ab1940f15fca1d14468d267202b2cd0b2f13bd catalyst-2.0_rc45.ebuild 3097
+SHA256 23a5019337594f2ad187e0294534205ca05f450ab0d614e677b08322d1fd6e03 catalyst-2.0_rc45.ebuild 3097
+MISC ChangeLog 32411 RMD160 1ccc568c483e2d4bbb64dfa702d1ac0d81732ca1 SHA1 fc650c7b57ceda4ebc50385f10ba95def217b8d2 SHA256 d1f2a89d365282aed2b5bf68b2b1408afe05dc1ea0129045591d7db44440c2fd size 32411
+MD5 7e3250e1c0ad799a95f5f0ceb9b59765 ChangeLog 32411
+RMD160 1ccc568c483e2d4bbb64dfa702d1ac0d81732ca1 ChangeLog 32411
+SHA256 d1f2a89d365282aed2b5bf68b2b1408afe05dc1ea0129045591d7db44440c2fd ChangeLog 32411
+MISC metadata.xml 223 RMD160 cd1cc28ce9a44a5bcf0835859270b312c2a9c057 SHA1 99dbb429b3fbea01bf260400c5686461329f8f2c SHA256 df88f8a951c171af2582027db09973af5e5f0a5f578636a8f836ecea8c55cd4d size 223
+MD5 8c971ca7e043237b69754a9d88238bd4 metadata.xml 223
+RMD160 cd1cc28ce9a44a5bcf0835859270b312c2a9c057 metadata.xml 223
+SHA256 df88f8a951c171af2582027db09973af5e5f0a5f578636a8f836ecea8c55cd4d metadata.xml 223
 MD5 1579d7c79eaa1035a84a4247cd4a5fb6 files/digest-catalyst-1.1.10.10 71
 RMD160 b17e3c8d0e219600ad0b22ab63fd157ad92fb65e files/digest-catalyst-1.1.10.10 71
 SHA256 c73c68283081b07af3faf137aa5852f2414ca0f3831fa3b1a1ef2eb4dd9f179b files/digest-catalyst-1.1.10.10 71
 MD5 5e8ca83608497233439a44e77665356f files/digest-catalyst-2.0_rc44 256
 RMD160 06557d41a918b3af31a91114b579bf832d1c93b6 files/digest-catalyst-2.0_rc44 256
 SHA256 3cf1afc8b7e2e1f2a0fc9f6ad4be558a37e9df0ca713bef16b4db13e6fdf5a25 files/digest-catalyst-2.0_rc44 256
-MD5 8c971ca7e043237b69754a9d88238bd4 metadata.xml 223
-RMD160 cd1cc28ce9a44a5bcf0835859270b312c2a9c057 metadata.xml 223
-SHA256 df88f8a951c171af2582027db09973af5e5f0a5f578636a8f836ecea8c55cd4d metadata.xml 223
+MD5 2a6cc3cf23f3d3551751bd9f7dfe0ad0 files/digest-catalyst-2.0_rc45 256
+RMD160 f01d67bfd8d58eed9cfbab2634499b168d1862a3 files/digest-catalyst-2.0_rc45 256
+SHA256 1429bf900677170d4d299c4ebf5c53fcec980243d8b04e81de96c3491964e96f files/digest-catalyst-2.0_rc45 256
diff --git a/dev-util/catalyst/catalyst-2.0_rc45.ebuild b/dev-util/catalyst/catalyst-2.0_rc45.ebuild
new file mode 100644
index 000000000000..ff0cc951348d
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0_rc45.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0_rc45.ebuild,v 1.1 2006/05/01 19:47:05 wolf31o2 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/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+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
+	)
+	examples? (
+		dev-util/livecd-kconfigs
+		dev-util/livecd-specs )"
+
+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_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-slot.patch
+}
+
+src_install() {
+	ewarn "This version of the ebuild is slotted to allow side-by-side"
+	ewarn "installation with catalyst 1.x for use on build servers.  The final"
+	ewarn "version of this ebuild will not be slotted, as catalyst 2.0 is to"
+	ewarn "supercede catalyst 1.x in every way.  It is currently slotted for"
+	ewarn "testing purposes only."
+	insinto /usr/lib/${PN}2/arch
+	doins arch/* || die "copying arch/*"
+	insinto /usr/lib/${PN}2/modules
+	doins modules/* || die "copying modules/*"
+	insinto /usr/lib/${PN}2/livecd/cdtar
+	doins livecd/cdtar/* || die "copying cdtar/*"
+	insinto /usr/lib/${PN}2/livecd/files
+	doins livecd/files/* || die "copying files/*"
+	for x in targets/*; do
+		exeinto /usr/lib/${PN}2/$x
+		doexe $x/* || die "copying ${x}"
+	done
+	exeinto /usr/lib/${PN}2
+	newexe catalyst catalyst2 || die "copying catalyst"
+	dodir /usr/bin
+	dosym /usr/lib/${PN}2/catalyst2 /usr/bin/catalyst2
+	insinto /etc/catalyst2
+	newins files/catalyst.conf catalyst2.conf
+	DOCDESTTREE="." dohtml -A spec,msg,example -r examples files
+	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
+	# Here is where we actually enable ccache
+	use ccache && \
+		dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
+		/etc/catalyst2/catalyst2.conf
+}
+
+pkg_postinst() {
+	echo
+	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/files/catalyst-2.0_rc45-slot.patch b/dev-util/catalyst/files/catalyst-2.0_rc45-slot.patch
new file mode 100644
index 000000000000..1ffb8b3edfe6
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0_rc45-slot.patch
@@ -0,0 +1,30 @@
+diff -urN catalyst-2.0_rc45.orig/catalyst catalyst-2.0_rc44/catalyst
+--- catalyst-2.0_rc45.orig/catalyst	2005-12-20 07:07:45.000000000 -0500
++++ catalyst-2.0_rc45/catalyst	2005-12-20 07:09:19.000000000 -0500
+@@ -51,10 +51,10 @@
+ 	myconf={}
+ 	config_file=""
+ 
+-	confdefaults={ "storedir":"/var/tmp/catalyst",\
+-		"sharedir":"/usr/share/catalyst","distdir":"/usr/portage/distfiles",\
++	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",\
+ 		"hash_function":"crc32"}
+ 		
+ 	# first, try the one passed (presumably from the cmdline)
+@@ -69,9 +69,9 @@
+ 			sys.exit(1)
+ 	
+ 	# next, try the default location
+-	elif os.path.exists("/etc/catalyst/catalyst.conf"):
+-		print "Using default Catalyst configuration file, /etc/catalyst/catalyst.conf"
+-		config_file="/etc/catalyst/catalyst.conf"
++	elif os.path.exists("/etc/catalyst2/catalyst2.conf"):
++		print "Using default Catalyst configuration file, /etc/catalyst2/catalyst2.conf"
++		config_file="/etc/catalyst2/catalyst2.conf"
+ 	
+ 	# can't find a config file (we are screwed), so bail out
+ 	else:
diff --git a/dev-util/catalyst/files/digest-catalyst-2.0_rc45 b/dev-util/catalyst/files/digest-catalyst-2.0_rc45
new file mode 100644
index 000000000000..7193f2d5bf7a
--- /dev/null
+++ b/dev-util/catalyst/files/digest-catalyst-2.0_rc45
@@ -0,0 +1,3 @@
+MD5 9527aef124463694f86c38b29f97b2d0 catalyst-2.0_rc45.tar.bz2 864602
+RMD160 4b1ca5964ed0beabc1cafcebcd34c0346be625c4 catalyst-2.0_rc45.tar.bz2 864602
+SHA256 cdb1f37732714683dea2ba4d1a20b1919fcc3550630f93e4b875ce8d365cc086 catalyst-2.0_rc45.tar.bz2 864602