Version bump to 2.0_rc47 and closing bug #135051 and bug #135971.

(Portage version: 2.1_rc4-r3)
 (Signed Manifest commit)

4 files changed, 19 insertions, 148 deletions

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index f2fd4f89e788..769c6c4c3a55 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_rc46-slot.patch 1267 RMD160 19913daba353ec50b4c3be235b07c96c54aa93cc SHA1 484acfb59da074c7d8d3c26ec3089dcbed87e2de SHA256 976ac8e745a2478e5a6ba40c8ffbf5b192c5adce20d25131ec7028f1422fbd18
-MD5 c9425af75f091e6c761ccce64afa3eef files/catalyst-2.0_rc46-slot.patch 1267
-RMD160 19913daba353ec50b4c3be235b07c96c54aa93cc files/catalyst-2.0_rc46-slot.patch 1267
-SHA256 976ac8e745a2478e5a6ba40c8ffbf5b192c5adce20d25131ec7028f1422fbd18 files/catalyst-2.0_rc46-slot.patch 1267
+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
 DIST catalyst-1.1.10.10.tar.bz2 570620
-DIST catalyst-2.0_rc46.tar.bz2 864939 RMD160 94863644e1ebd84e7817291b01ef7c6cf35bc591 SHA1 73aec90fd26efe91ae62424a43f9d75ee3811f9e SHA256 11dc76c90cd483826955a31b3031988393ff4a00a06d51e8487702d2490403d7
+DIST catalyst-2.0_rc47.tar.bz2 865250 RMD160 91af2ce861e35f7401630e35a15c96687e8fdbcd SHA1 18d50664ed235cc5cb7cdc96240bea6d2fbc7797 SHA256 1b0942b782c0f20e9668dbbe1b20eed983f07693238020d6c5c1494209228a8c
 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_rc46.ebuild 3097 RMD160 94cc635d9937b23e2dbde1bbfe6b8a35a9bc79c3 SHA1 bcc99d3db179b342211c6da3ba955dab0e81d43a SHA256 3dae960a16f6c35a18b57ec153807675de91ee096fd184f2c7b600add9d07863
-MD5 ab5f415bda34ecfba6213ec8884199e3 catalyst-2.0_rc46.ebuild 3097
-RMD160 94cc635d9937b23e2dbde1bbfe6b8a35a9bc79c3 catalyst-2.0_rc46.ebuild 3097
-SHA256 3dae960a16f6c35a18b57ec153807675de91ee096fd184f2c7b600add9d07863 catalyst-2.0_rc46.ebuild 3097
-MISC ChangeLog 32851 RMD160 8ca3aafe0d4eaca6ba9d6fcf5e6ee991111e73e2 SHA1 e63b1bcc9af6dd277a4f8265886a104a60d5878c SHA256 9819ab1287ee859405614461a5061309fa0c14f6648de2615e24e527b4991fc4
-MD5 d2d1225aaf5de635e7c2ebe5c51ac2da ChangeLog 32851
-RMD160 8ca3aafe0d4eaca6ba9d6fcf5e6ee991111e73e2 ChangeLog 32851
-SHA256 9819ab1287ee859405614461a5061309fa0c14f6648de2615e24e527b4991fc4 ChangeLog 32851
+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
 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 35e104695fc03806f1c49fde00a1e09f files/digest-catalyst-2.0_rc46 256
-RMD160 be53e5210392f4f48307f61e294dcbfac96e55d4 files/digest-catalyst-2.0_rc46 256
-SHA256 134eedb4e4648bbb09ea310f621854b655b8b837f37d0ad70f3da77dcbfb2ccf files/digest-catalyst-2.0_rc46 256
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEddvxkT4lNIS36YERAkBaAJ9ffLM3cx0qP75yDdFk7dMZboa8WQCcCcNz
-ii2W1AA57acNh2xJ4PNCTMU=
-=BqPI
+iD8DBQFEiMWRkT4lNIS36YERAv0YAKCRnjVxhjAScpyQ3Z8VAU8vrgFHGQCgpcU1
++kqDnsawAEsNvRRdbCApivk=
+=iRfj
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.0_rc46.ebuild b/dev-util/catalyst/catalyst-2.0_rc46.ebuild
deleted file mode 100644
index 0acd3300815e..000000000000
--- a/dev-util/catalyst/catalyst-2.0_rc46.ebuild
+++ /dev/null
@@ -1,96 +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_rc46.ebuild,v 1.1 2006/05/25 16:31:39 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_rc46-slot.patch b/dev-util/catalyst/files/catalyst-2.0_rc46-slot.patch
deleted file mode 100644
index 0fb98324e5dd..000000000000
--- a/dev-util/catalyst/files/catalyst-2.0_rc46-slot.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN catalyst-2.0_rc46.orig/catalyst catalyst-2.0_rc44/catalyst
---- catalyst-2.0_rc46.orig/catalyst	2005-12-20 07:07:45.000000000 -0500
-+++ catalyst-2.0_rc46/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_rc46 b/dev-util/catalyst/files/digest-catalyst-2.0_rc46
deleted file mode 100644
index 890dd25dc055..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-2.0_rc46
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b44ac9d2da109c86b83ad85f35789c6c catalyst-2.0_rc46.tar.bz2 864939
-RMD160 94863644e1ebd84e7817291b01ef7c6cf35bc591 catalyst-2.0_rc46.tar.bz2 864939
-SHA256 11dc76c90cd483826955a31b3031988393ff4a00a06d51e8487702d2490403d7 catalyst-2.0_rc46.tar.bz2 864939