Version bump. Closing bug #136351, bug #138080, and bug #138255.

Package-Manager: portage-2.1.1_pre1-r2

4 files changed, 19 insertions, 147 deletions

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 107eefbb4b26..1898e24b6476 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_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
+AUX catalyst-2.0_rc49-slot.patch 1267 RMD160 cffae49f2dd6e58be2d82b871d3cd833b8086dbb SHA1 469b4c66ba5eb2512e89ba78cadb1427995d8a68 SHA256 7e3655468cae8b142853ced89f3f3059cfffab7979985291f0be0830bb6809c0
+MD5 dca39b1195e100cc9833c7614b9db066 files/catalyst-2.0_rc49-slot.patch 1267
+RMD160 cffae49f2dd6e58be2d82b871d3cd833b8086dbb files/catalyst-2.0_rc49-slot.patch 1267
+SHA256 7e3655468cae8b142853ced89f3f3059cfffab7979985291f0be0830bb6809c0 files/catalyst-2.0_rc49-slot.patch 1267
 DIST catalyst-1.1.10.10.tar.bz2 570620
-DIST catalyst-2.0_rc48.tar.bz2 891178 RMD160 785c08975a7cebda0d7d69590dc26f9fae93599e SHA1 07000c61c926aab494921d273b2dd9234db0f6ec SHA256 2c0da2996a59c4e9452c6aa61a989a23f09dd10f834718de6b7e038e99049351
+DIST catalyst-2.0_rc49.tar.bz2 891251 RMD160 2d2776405661fb4bc8442ba40989b8bd4974b6c7 SHA1 0884504ff69e6eb7e9ca82d3b4aa3a4a347a7812 SHA256 e71942fa5a8b3ce07c3a8b7996df980c7afa5e41fae3ae15e32792a497a5858c
 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_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
+EBUILD catalyst-2.0_rc49.ebuild 3100 RMD160 e32b6595cbd4eab08e9c22655e101882da0a0e67 SHA1 c4c649b1e29172b70a3a7dbba622a016042f4400 SHA256 65892137d311cdc9ce727709b3c2bea127066f21526f4782d6c019e6a7bbc264
+MD5 b3f275f157040af243bc76ce2e49759a catalyst-2.0_rc49.ebuild 3100
+RMD160 e32b6595cbd4eab08e9c22655e101882da0a0e67 catalyst-2.0_rc49.ebuild 3100
+SHA256 65892137d311cdc9ce727709b3c2bea127066f21526f4782d6c019e6a7bbc264 catalyst-2.0_rc49.ebuild 3100
+MISC ChangeLog 33700 RMD160 501e0e3de0eeaa361302eef8cab94f022c3d135a SHA1 8c639ade27492c2e178ecec8703b639126b050ca SHA256 75c598814fe89b0cfe2fcf695b117bce0f9b6f3aa590874a2694a8baddc597b9
+MD5 58b3dd99319063b929093a02b37719e1 ChangeLog 33700
+RMD160 501e0e3de0eeaa361302eef8cab94f022c3d135a ChangeLog 33700
+SHA256 75c598814fe89b0cfe2fcf695b117bce0f9b6f3aa590874a2694a8baddc597b9 ChangeLog 33700
 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 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
+MD5 42e69b5e72d7d7a1a14c812cd861672d files/digest-catalyst-2.0_rc49 256
+RMD160 740c9e9b68531922c9dd39e2bcd637fbecf0750f files/digest-catalyst-2.0_rc49 256
+SHA256 8dc7b3778df5afb5e9ef46f546513fc1d131dca3468140767354f04f93704bcf files/digest-catalyst-2.0_rc49 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEmqkskT4lNIS36YERAkrXAKCagUAcZ83mV0vPbE9fcBEZhh5moQCeJo9S
-qt2YM8XADJkAVgRDThRKLbI=
-=4jnb
+iD8DBQFEon2mkT4lNIS36YERAgYdAJ9vYCRL80ZSDqB4HZ6NXyYulAlWUQCffnVq
+E94bErpyxGwXKNuRvpiB/wQ=
+=1t5z
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.0_rc48.ebuild b/dev-util/catalyst/catalyst-2.0_rc48.ebuild
deleted file mode 100644
index a55f9b6a45e9..000000000000
--- a/dev-util/catalyst/catalyst-2.0_rc48.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_rc48.ebuild,v 1.1 2006/06/22 14:28:54 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_rc48-slot.patch b/dev-util/catalyst/files/catalyst-2.0_rc48-slot.patch
deleted file mode 100644
index 6e5af809c81a..000000000000
--- a/dev-util/catalyst/files/catalyst-2.0_rc48-slot.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN catalyst-2.0_rc48.orig/catalyst catalyst-2.0_rc44/catalyst
---- catalyst-2.0_rc48.orig/catalyst	2005-12-20 07:07:45.000000000 -0500
-+++ catalyst-2.0_rc48/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_rc48 b/dev-util/catalyst/files/digest-catalyst-2.0_rc48
deleted file mode 100644
index fb1dba4215de..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-2.0_rc48
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 df6e5ac26fa96a5a72c43d92d672a0dc catalyst-2.0_rc48.tar.bz2 891178
-RMD160 785c08975a7cebda0d7d69590dc26f9fae93599e catalyst-2.0_rc48.tar.bz2 891178
-SHA256 2c0da2996a59c4e9452c6aa61a989a23f09dd10f834718de6b7e038e99049351 catalyst-2.0_rc48.tar.bz2 891178