Version bump to 2.0_rc48. Closing bug #137252.

(Portage version: 2.1.1_pre1-r1)
 (Signed Manifest commit)

4 files changed, 19 insertions, 147 deletions

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 769c6c4c3a55..107eefbb4b26 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX catalyst-2.0_rc47-slot.patch 1267 RMD160 0ffbb8a3c7b5ffef59e267badc5bad535553f7f6 SHA1 66d586cc95b1179d5e0033b7ebe88ec8917b918a SHA256 aecfccd90aeac5977d238606eb9d624d46dc594eb59f68b6637fffe12d3a6200
-MD5 f6503d888a282f9a9cb785cc62cbbec9 files/catalyst-2.0_rc47-slot.patch 1267
-RMD160 0ffbb8a3c7b5ffef59e267badc5bad535553f7f6 files/catalyst-2.0_rc47-slot.patch 1267
-SHA256 aecfccd90aeac5977d238606eb9d624d46dc594eb59f68b6637fffe12d3a6200 files/catalyst-2.0_rc47-slot.patch 1267
+AUX catalyst-2.0_rc48-slot.patch 1267 RMD160 00103c06dc8b7a846f964462fcd99c5ef486cf58 SHA1 d3ad83f8506f1501b8f2e87cbc6acde068edfd58 SHA256 f4d10f650b7eb4f26139605f5a6aacf8a3d12ede0a9c7f0e0e12fed0ff91b147
+MD5 a1655f2d2feca6f9c9adefca94ee48f6 files/catalyst-2.0_rc48-slot.patch 1267
+RMD160 00103c06dc8b7a846f964462fcd99c5ef486cf58 files/catalyst-2.0_rc48-slot.patch 1267
+SHA256 f4d10f650b7eb4f26139605f5a6aacf8a3d12ede0a9c7f0e0e12fed0ff91b147 files/catalyst-2.0_rc48-slot.patch 1267
 DIST catalyst-1.1.10.10.tar.bz2 570620
-DIST catalyst-2.0_rc47.tar.bz2 865250 RMD160 91af2ce861e35f7401630e35a15c96687e8fdbcd SHA1 18d50664ed235cc5cb7cdc96240bea6d2fbc7797 SHA256 1b0942b782c0f20e9668dbbe1b20eed983f07693238020d6c5c1494209228a8c
+DIST catalyst-2.0_rc48.tar.bz2 891178 RMD160 785c08975a7cebda0d7d69590dc26f9fae93599e SHA1 07000c61c926aab494921d273b2dd9234db0f6ec SHA256 2c0da2996a59c4e9452c6aa61a989a23f09dd10f834718de6b7e038e99049351
 EBUILD catalyst-1.1.10.10.ebuild 2236 RMD160 36a6ad29c0dea85bf4bf805e0502eed23a6a10f4 SHA1 6ee828b46769b1bb191a37716009ac3574041fae SHA256 2c235bb7a4459d4b9d9a90d206a2dd0f5e9daed8b613389514abb9f065da73c1
 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_rc47.ebuild 3100 RMD160 bbb149c758f64061ee5a4761dbe26c2942fdb3d3 SHA1 54e3d4c119e954c371cc1827190124050b733bd3 SHA256 02577fe22c807553a8b16fe0a0f3814c278180aa13a35e55db96dffab41c48af
-MD5 8489938ab2bab0068ccc1058f0b016a0 catalyst-2.0_rc47.ebuild 3100
-RMD160 bbb149c758f64061ee5a4761dbe26c2942fdb3d3 catalyst-2.0_rc47.ebuild 3100
-SHA256 02577fe22c807553a8b16fe0a0f3814c278180aa13a35e55db96dffab41c48af catalyst-2.0_rc47.ebuild 3100
-MISC ChangeLog 33140 RMD160 22c70ec8a4507ac7486a995dada2a208a74d8672 SHA1 5780e15c8333fcf1617dec47e6c0bbc7fdaa34c1 SHA256 256cc517a6ba3163c387c3fde99be414a4d14c99a042baf019f4e963bf8ce9a5
-MD5 132df04a4a09a9eb81635716311c280c ChangeLog 33140
-RMD160 22c70ec8a4507ac7486a995dada2a208a74d8672 ChangeLog 33140
-SHA256 256cc517a6ba3163c387c3fde99be414a4d14c99a042baf019f4e963bf8ce9a5 ChangeLog 33140
+EBUILD catalyst-2.0_rc48.ebuild 3100 RMD160 80f7d48ae75e5cb6059046b8ab422628ddb94e0e SHA1 59743f1e7f6fae63e4cfc0d55cb3901723584cc9 SHA256 dba7584dd824e75282052a2a465f6845774263a29be7c41186a4215e485111fa
+MD5 5c920a5bdeeec256d72ac5ae02bcc914 catalyst-2.0_rc48.ebuild 3100
+RMD160 80f7d48ae75e5cb6059046b8ab422628ddb94e0e catalyst-2.0_rc48.ebuild 3100
+SHA256 dba7584dd824e75282052a2a465f6845774263a29be7c41186a4215e485111fa catalyst-2.0_rc48.ebuild 3100
+MISC ChangeLog 33411 RMD160 43b6a1be26f937b44fbb5a2ac809822d8325a5dc SHA1 a7fea0c49ed0c392997fb1e828a6c015744847c3 SHA256 4d642c4bed3fcbf24e630057d9100fd99f2aba14ee83a622f1c95de6c76410aa
+MD5 fd0246a07799a9fea0638791db44bd43 ChangeLog 33411
+RMD160 43b6a1be26f937b44fbb5a2ac809822d8325a5dc ChangeLog 33411
+SHA256 4d642c4bed3fcbf24e630057d9100fd99f2aba14ee83a622f1c95de6c76410aa ChangeLog 33411
 MISC metadata.xml 223 RMD160 cd1cc28ce9a44a5bcf0835859270b312c2a9c057 SHA1 99dbb429b3fbea01bf260400c5686461329f8f2c SHA256 df88f8a951c171af2582027db09973af5e5f0a5f578636a8f836ecea8c55cd4d
 MD5 8c971ca7e043237b69754a9d88238bd4 metadata.xml 223
 RMD160 cd1cc28ce9a44a5bcf0835859270b312c2a9c057 metadata.xml 223
@@ -26,13 +26,13 @@ SHA256 df88f8a951c171af2582027db09973af5e5f0a5f578636a8f836ecea8c55cd4d metadata
 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 8376f2adac96544cdb08ef3cdeed1eaf files/digest-catalyst-2.0_rc47 256
-RMD160 207d4edc564a71daf10154514ace635dc73c350a files/digest-catalyst-2.0_rc47 256
-SHA256 31c33c8fe5eba1d30409128f861868f4d61c0bcb915a439c369e8a960e9d9108 files/digest-catalyst-2.0_rc47 256
+MD5 7d9f56517bf2d46cccceb882992419a7 files/digest-catalyst-2.0_rc48 256
+RMD160 6979692fb9144332a4fde26e050667649b5f7a5c files/digest-catalyst-2.0_rc48 256
+SHA256 b6b5ca9fe1dfd3982b1961e208128222a17e17d47071b58fbbd2710e8820f043 files/digest-catalyst-2.0_rc48 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEiMWRkT4lNIS36YERAv0YAKCRnjVxhjAScpyQ3Z8VAU8vrgFHGQCgpcU1
-+kqDnsawAEsNvRRdbCApivk=
-=iRfj
+iD8DBQFEmqkskT4lNIS36YERAkrXAKCagUAcZ83mV0vPbE9fcBEZhh5moQCeJo9S
+qt2YM8XADJkAVgRDThRKLbI=
+=4jnb
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.0_rc47.ebuild b/dev-util/catalyst/catalyst-2.0_rc47.ebuild
deleted file mode 100644
index 1c04a0e435bd..000000000000
--- a/dev-util/catalyst/catalyst-2.0_rc47.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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_rc47.ebuild,v 1.1 2006/06/09 00:49:16 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_rc47-slot.patch b/dev-util/catalyst/files/catalyst-2.0_rc47-slot.patch
deleted file mode 100644
index 71f69b7bc16e..000000000000
--- a/dev-util/catalyst/files/catalyst-2.0_rc47-slot.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN catalyst-2.0_rc47.orig/catalyst catalyst-2.0_rc44/catalyst
---- catalyst-2.0_rc47.orig/catalyst	2005-12-20 07:07:45.000000000 -0500
-+++ catalyst-2.0_rc47/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_rc47 b/dev-util/catalyst/files/digest-catalyst-2.0_rc47
deleted file mode 100644
index 4edf03df2458..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-2.0_rc47
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6b2666dec2ab7aab3290655eb714f392 catalyst-2.0_rc47.tar.bz2 865250
-RMD160 91af2ce861e35f7401630e35a15c96687e8fdbcd catalyst-2.0_rc47.tar.bz2 865250
-SHA256 1b0942b782c0f20e9668dbbe1b20eed983f07693238020d6c5c1494209228a8c catalyst-2.0_rc47.tar.bz2 865250