7 files changed, 16 insertions, 85 deletions
diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 2fe1df7dc7e9..707783c1a9c7 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.75 2005/07/06 20:29:10 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.76 2005/07/08 13:12:17 wolf31o2 Exp $
+
+*catalyst-1.1.10 (08 Jul 2005)
+
+  08 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -catalyst-1.1.9.ebuild, -catalyst-1.1.10_pre18.ebuild,
+  +catalyst-1.1.10.ebuild:
+  Version bumped to catalyst 1.1.10 and removing all previous versions. This
+  is the last catalyst 1.x release other than bugfix releases. I'd like to
+  thank everyone for the success of catalyst and hope you all enjoy catalyst
+  2.0 when it is released.
 
 *catalyst-1.1.10_pre18 (06 Jul 2005)
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index af5b52e92642..6bb5cb4a283c 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,4 @@
-MD5 5f5a41af67432f64dc891a9ebc0d3b83 ChangeLog 12192
-MD5 d751a7634670cbec76a240e3c6fb4cbf catalyst-1.1.10_pre18.ebuild 2235
+MD5 be98ed08a68ede9d67f586cd5708c2e5 ChangeLog 12619
 MD5 8c971ca7e043237b69754a9d88238bd4 metadata.xml 223
-MD5 a97d242285f11d87f55f8b3a34d4bafd catalyst-1.1.9.ebuild 2337
-MD5 518919dcf08d3ac5e22b42b7f1d1325e files/digest-catalyst-1.1.10_pre18 74
-MD5 a080f3b13f1dbba1cf67faf9c5fdcb2f files/digest-catalyst-1.1.9 67
+MD5 7ba5597d3465752ad13edadf942bb4cf catalyst-1.1.10.ebuild 2229
+MD5 cd7e9ad3d824e0ebf214eb0686414e71 files/digest-catalyst-1.1.10 68
diff --git a/dev-util/catalyst/catalyst-1.1.10_pre18.ebuild b/dev-util/catalyst/catalyst-1.1.10.ebuild
index 10a9aa19266f..a85ebb537c2e 100644
--- a/dev-util/catalyst/catalyst-1.1.10_pre18.ebuild
+++ b/dev-util/catalyst/catalyst-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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_pre18.ebuild,v 1.1 2005/07/06 20:29:10 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-1.1.10.ebuild,v 1.1 2005/07/08 13:12:17 wolf31o2 Exp $
 
 inherit eutils
 
diff --git a/dev-util/catalyst/catalyst-1.1.9.ebuild b/dev-util/catalyst/catalyst-1.1.9.ebuild
deleted file mode 100644
index be6d3a975fae..000000000000
--- a/dev-util/catalyst/catalyst-1.1.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-1.1.9.ebuild,v 1.3 2005/06/01 20:17:09 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 sparc x86"
-IUSE="doc ccache cdr examples"
-
-DEPEND=""
-RDEPEND="dev-lang/python
-	sys-apps/portage
-	amd64? ( sys-apps/linux32 )
-	ccache? ( dev-util/ccache )
-	cdr? (
-		virtual/cdrtools
-		app-misc/zisofs-tools
-		!mips? (
-			>=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/isogen
-	doexe livecd/isogen/* || die "copying isogen/*"
-	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
-	if use doc;	then
-		DOCDESTTREE="." dohtml -A spec,msg,example -r examples files
-	fi
-	dodoc TODO README ChangeLog ChangeLog.old AUTHORS COPYING REMARKS
-	doman files/catalyst.1
-}
-
-pkg_postinst() {
-	echo
-	einfo "You can find more information about catalyst by checking out the
-catalyst"
-	einfo "project page at:"
-	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-	echo
-}
diff --git a/dev-util/catalyst/files/digest-catalyst-1.1.10 b/dev-util/catalyst/files/digest-catalyst-1.1.10
new file mode 100644
index 000000000000..07fc6204d8df
--- /dev/null
+++ b/dev-util/catalyst/files/digest-catalyst-1.1.10
@@ -0,0 +1 @@
+MD5 2fb3b35e071ea3e33dc0263dd601a71b catalyst-1.1.10.tar.bz2 567528
diff --git a/dev-util/catalyst/files/digest-catalyst-1.1.10_pre18 b/dev-util/catalyst/files/digest-catalyst-1.1.10_pre18
deleted file mode 100644
index b83e81904028..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-1.1.10_pre18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50d85eb354a335946190c927fa6fa332 catalyst-1.1.10_pre18.tar.bz2 562448
diff --git a/dev-util/catalyst/files/digest-catalyst-1.1.9 b/dev-util/catalyst/files/digest-catalyst-1.1.9
deleted file mode 100644
index 033a2179da5d..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-1.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2203bd7952d1c3dc4a9c1e7b9e375ac2 catalyst-1.1.9.tar.bz2 453511