Marking catalyst 2.0.5 stable and removing 1.1.10.10 so I never have to get another stupid catalyst 1.x bug, again.

Package-Manager: portage-2.1.4_rc11

5 files changed, 20 insertions, 102 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index a6272b948ef3..b97334a70b1b 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.177 2008/01/10 00:28:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.178 2008/01/25 17:38:22 wolf31o2 Exp $
+
+  25 Jan 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  -catalyst-1.1.10.10.ebuild, catalyst-2.0.5.ebuild:
+  Marking catalyst 2.0.5 stable and removing 1.1.10.10 so I never have to get
+  another stupid catalyst 1.x bug, again.
 
 *catalyst-2.0.5 (10 Jan 2008)
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index f9dd81cecc76..6d7853a10be8 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,34 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST catalyst-1.1.10.10.tar.bz2 570620 RMD160 18365ba9697c4e44091973daf709c497f1cb2b13 SHA1 86c5020914225eacdbd4d651adb8aa8ee65cc490 SHA256 2c3c0ef8970897f741e31ff6f84d400fa2ea3b8e6af7f1b4fb6ca1daff8048eb
 DIST catalyst-2.0.5.tar.bz2 788974 RMD160 6b61621e26aafc55240a41a88b4f5e772be037a5 SHA1 afa6ffd69558b5673cfe112617b4191ba359ebae SHA256 bd4070462f2718e1622539c749b0cb5df3c416d97b7531d3524717836c16db90
-EBUILD catalyst-1.1.10.10.ebuild 2269 RMD160 4a5fedb53daa2c9175731f0e111502188577aeff SHA1 d561dd8ba6bff3d0338cd87a919d1207dc38c7ac SHA256 354ebb158a7d0227e2129c70c887025591eef340dbe71307fc7ad8f2714985ab
-MD5 546f3df5fa3907e7ec1824d3e2cf273e catalyst-1.1.10.10.ebuild 2269
-RMD160 4a5fedb53daa2c9175731f0e111502188577aeff catalyst-1.1.10.10.ebuild 2269
-SHA256 354ebb158a7d0227e2129c70c887025591eef340dbe71307fc7ad8f2714985ab catalyst-1.1.10.10.ebuild 2269
-EBUILD catalyst-2.0.5.ebuild 2438 RMD160 f5975553f477de15becec90cdf6c495c3ea7d96a SHA1 2695df72493d7dd39e080d4ce08fc40ea2ad1629 SHA256 7ecb7a4897e381810dfa4af9892a548aeec2af8edfaf5e18ac9ac4fc27034177
-MD5 b26b6e683b01ec74923205a0f020f1ea catalyst-2.0.5.ebuild 2438
-RMD160 f5975553f477de15becec90cdf6c495c3ea7d96a catalyst-2.0.5.ebuild 2438
-SHA256 7ecb7a4897e381810dfa4af9892a548aeec2af8edfaf5e18ac9ac4fc27034177 catalyst-2.0.5.ebuild 2438
-MISC ChangeLog 39003 RMD160 619a2635782d3f70e1e0f6c7f60f67c0d053d508 SHA1 ec22c5aeb091507fb1eb903cbdc52243189b2c7f SHA256 9a55c7fe4bc89138ed578aad67d8723eebeea3c30cbdd0bb911db63c32fbccab
-MD5 7c5c808233dc7c5c50655a1a260e97ec ChangeLog 39003
-RMD160 619a2635782d3f70e1e0f6c7f60f67c0d053d508 ChangeLog 39003
-SHA256 9a55c7fe4bc89138ed578aad67d8723eebeea3c30cbdd0bb911db63c32fbccab ChangeLog 39003
+EBUILD catalyst-2.0.5.ebuild 2426 RMD160 a1f743b67a11b0e271180f5b8201979bee6a894c SHA1 54871540f219f5e079723c0dd8460203e1c05c7a SHA256 235c7dd86bfe64d46394cfac58c4b62a3840a64eb944f91cf77353ae48589c10
+MD5 d535d136b8cb3329a7dc4fa46b562f88 catalyst-2.0.5.ebuild 2426
+RMD160 a1f743b67a11b0e271180f5b8201979bee6a894c catalyst-2.0.5.ebuild 2426
+SHA256 235c7dd86bfe64d46394cfac58c4b62a3840a64eb944f91cf77353ae48589c10 catalyst-2.0.5.ebuild 2426
+MISC ChangeLog 39231 RMD160 3edb167f23b1253828f13e13c77a3f47400b8fee SHA1 6c967c7577bca042be02b61c50d9753bd345f5e7 SHA256 ebc10b1055713398a7ec262b241999248105f32b7b162e146cb3cf5ebe94d440
+MD5 555555fd22d7d78b9d3293adc092df6d ChangeLog 39231
+RMD160 3edb167f23b1253828f13e13c77a3f47400b8fee ChangeLog 39231
+SHA256 ebc10b1055713398a7ec262b241999248105f32b7b162e146cb3cf5ebe94d440 ChangeLog 39231
 MISC metadata.xml 223 RMD160 cd1cc28ce9a44a5bcf0835859270b312c2a9c057 SHA1 99dbb429b3fbea01bf260400c5686461329f8f2c SHA256 df88f8a951c171af2582027db09973af5e5f0a5f578636a8f836ecea8c55cd4d
 MD5 8c971ca7e043237b69754a9d88238bd4 metadata.xml 223
 RMD160 cd1cc28ce9a44a5bcf0835859270b312c2a9c057 metadata.xml 223
 SHA256 df88f8a951c171af2582027db09973af5e5f0a5f578636a8f836ecea8c55cd4d metadata.xml 223
-MD5 9a7f1869cf19003e146f44aacedcc5fd files/digest-catalyst-1.1.10.10 259
-RMD160 2c77da05e9c5b416be13a48f0a6a8ed46566a02e files/digest-catalyst-1.1.10.10 259
-SHA256 e8f03d6ab7c5ad50c0de772a72201d50cae1b1ab9c7f2177fc034c1272d797b8 files/digest-catalyst-1.1.10.10 259
 MD5 0a432741967b819708d45f60e884395e files/digest-catalyst-2.0.5 247
 RMD160 dc3635d5889868fabc6e458b71d9f80b79643511 files/digest-catalyst-2.0.5 247
 SHA256 268448a7b74fb7cd74283c858020d3fefbbcb55b904dae3279171cca7febe3bd files/digest-catalyst-2.0.5 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHhWaXkT4lNIS36YERAiDDAKCgxcDwnVrzdw423gOPryU2L3QZXACbBDlE
-7toO1hgF+EHolW9kzCxDrY4=
-=6WPN
+iEYEARECAAYFAkeaHpMACgkQkT4lNIS36YHgnQCfZnDhjD3I9ABrwdelIniZAAlo
+mwkAoKiAp+H7wf1Ky+BUsuzyYoPgjl0H
+=odd3
 -----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
deleted file mode 100644
index f72e4afeee30..000000000000
--- a/dev-util/catalyst/catalyst-1.1.10.10.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2007 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.8 2007/08/28 18:34:24 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/sources/catalyst/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc ccache cdr examples"
-
-DEPEND=""
-RDEPEND="dev-lang/python
-	ccache? ( dev-util/ccache )
-	cdr? (
-		virtual/cdrtools
-		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 "Disabling ccache support for catalyst.  If this is not what you intended,"
-		ewarn "then you should add ccache to your USE."
-	fi
-}
-
-src_install() {
-	insinto /usr/lib/${PN}/arch
-	doins arch/* || die "copying arch/*"
-	insinto /usr/lib/${PN}/modules
-	doins modules/* || die "copying modules/*"
-	insinto /usr/lib/${PN}/livecd/cdtar
-	doins livecd/cdtar/* || die "copying cdtar/*"
-	exeinto /usr/lib/${PN}/livecd/runscript
-	doexe livecd/runscript/* || die "copying runscript/*"
-	exeinto /usr/lib/${PN}/livecd/runscript-support
-	doexe livecd/runscript-support/* || die "copying runscript-support/*"
-	insinto /usr/lib/${PN}/livecd/files
-	doins livecd/files/* || die "copying files/*"
-	for x in targets/*; do
-		exeinto /usr/lib/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-	exeinto /usr/lib/${PN}
-	doexe catalyst || die "copying catalyst"
-	dodir /usr/bin
-	dosym /usr/lib/${PN}/catalyst /usr/bin/catalyst
-	insinto /etc/catalyst
-	doins files/catalyst.conf
-	dodoc README ChangeLog ChangeLog.old AUTHORS
-	doman files/catalyst.1
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/* || die
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "You can find more information about catalyst by checking out the"
-	elog "catalyst project page at:"
-	elog "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-	echo
-	elog "This version of catalyst is considered obsolete. Please use 2.x or better"
-	echo
-}
diff --git a/dev-util/catalyst/catalyst-2.0.5.ebuild b/dev-util/catalyst/catalyst-2.0.5.ebuild
index 63b9fbee968b..b756b4ab83b2 100644
--- a/dev-util/catalyst/catalyst-2.0.5.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.5.ebuild,v 1.1 2008/01/10 00:28:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.5.ebuild,v 1.2 2008/01/25 17:38:22 wolf31o2 Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 RESTRICT=""
 IUSE="ccache"
 
diff --git a/dev-util/catalyst/files/digest-catalyst-1.1.10.10 b/dev-util/catalyst/files/digest-catalyst-1.1.10.10
deleted file mode 100644
index 6b642f55047a..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-1.1.10.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 90024d0601ad57e49b6a3b4efac039bc catalyst-1.1.10.10.tar.bz2 570620
-RMD160 18365ba9697c4e44091973daf709c497f1cb2b13 catalyst-1.1.10.10.tar.bz2 570620
-SHA256 2c3c0ef8970897f741e31ff6f84d400fa2ea3b8e6af7f1b4fb6ca1daff8048eb catalyst-1.1.10.10.tar.bz2 570620