8 files changed, 26 insertions, 52 deletions
diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 4783d0eccbc0..23bca7eee111 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.8 2004/03/05 06:28:48 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.9 2004/04/01 20:38:16 zhen Exp $
+
+*catalyst-1.0.5 (01 Apr 2004)
+
+  01 Apr 2004; John Davis <zhen@gentoo.org> catalyst-1.0.2.ebuild,
+  catalyst-1.0.3.ebuild, catalyst-1.0.5.ebuild, metadata.xml:
+  cleaning up old files
+
+  01 Apr 2004; John Davis <zhen@gentoo.org> :
+  1.0.5 released
 
 *catalyst-1.0.4 (05 Mar 2004)
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 19f224d67651..f77561a8acc0 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,7 +1,6 @@
-MD5 f65b326118a4f9f207011d245bd056b2 catalyst-1.0.3.ebuild 1289
-MD5 a1dee5397db78205229e7b0ac18c8fd2 catalyst-1.0.2.ebuild 1070
+MD5 a38b2f92c68f7e2712bdd47651b564f6 catalyst-1.0.5.ebuild 1366
 MD5 0ff33bfbf90f883feed34104571f5036 catalyst-1.0.4.ebuild 1289
-MD5 bba1001e797e153eb59b7d3eb42253c3 ChangeLog 1245
-MD5 214871492c63dea3517aa11663b42c51 files/digest-catalyst-1.0.2 67
-MD5 3586a07bbb972a09b9207251f643a34d files/digest-catalyst-1.0.3 67
+MD5 0bd0d74afed748a041f78d02ad471afe ChangeLog 1494
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 d19248e5b7337748f0f6da6e40e5b324 files/digest-catalyst-1.0.4 67
+MD5 13d7e22153792b08be7b5ba25373081c files/digest-catalyst-1.0.5 67
diff --git a/dev-util/catalyst/catalyst-1.0.2.ebuild b/dev-util/catalyst/catalyst-1.0.2.ebuild
deleted file mode 100644
index 4566d4883100..000000000000
--- a/dev-util/catalyst/catalyst-1.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-1.0.2.ebuild,v 1.2 2004/03/02 04:25:26 vapier Exp $
-
-DESCRIPTION="Gentoo Linux official release metatool"
-HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst"
-SRC_URI="http://dev.gentoo.org/~zhen/catalyst/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ~sparc ~ppc ~alpha ~mips"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="dev-lang/python
-	sys-apps/portage"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	insinto /usr/lib/${PN}/modules
-	doins modules/*
-	for d in arch targets/*
-	do
-		exeinto /usr/lib/${PN}/${d}
-		doexe ${d}/*
-	done
-	insinto /usr/lib/${PN}
-	doins sparc64-isogen.sh x86-isogen.sh
-	exeinto /usr/lib/${PN}
-	doexe catalyst
-	dodir /usr/bin
-	dosym ../lib/${PN}/catalyst /usr/bin/catalyst
-	if use doc
-	then
-		DOCDESTTREE="." dohtml -A spec,amd64,livecd -r kconfig examples
-	fi
-	dodoc TODO README ChangeLog ChangeLog.old AUTHORS COPYING REMARKS
-	insinto /etc
-	doins files/catalyst.conf
-}
diff --git a/dev-util/catalyst/catalyst-1.0.3.ebuild b/dev-util/catalyst/catalyst-1.0.5.ebuild
index bab2011da442..f53a2a1bc6b7 100644
--- a/dev-util/catalyst/catalyst-1.0.3.ebuild
+++ b/dev-util/catalyst/catalyst-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-1.0.3.ebuild,v 1.1 2004/03/05 00:24:50 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-1.0.5.ebuild,v 1.1 2004/04/01 20:38:16 zhen Exp $
 
 DESCRIPTION="Gentoo Linux official release metatool"
 HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst"
@@ -8,12 +8,13 @@ SRC_URI="http://dev.gentoo.org/~zhen/catalyst/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64 ~sparc ~ppc ~alpha ~mips"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha ~mips"
 IUSE="doc"
 
 DEPEND=""
 RDEPEND="dev-lang/python
-	sys-apps/portage"
+	sys-apps/portage
+	dev-util/ccache"
 
 S=${WORKDIR}/${PN}
 
@@ -30,6 +31,8 @@ src_install() {
 	doexe livecd/isogen/*
 	exeinto /usr/lib/${PN}/livecd/runscript
 	doexe livecd/runscript/*
+	insinto /usr/lib/${PN}/livecd/files
+	doins livecd/files/*
 	for x in targets/*
 	do
 		exeinto /usr/lib/${PN}/$x
diff --git a/dev-util/catalyst/files/digest-catalyst-1.0.2 b/dev-util/catalyst/files/digest-catalyst-1.0.2
deleted file mode 100644
index 87583a28fafd..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 288cf9643122c4d326491605ce3958fd catalyst-1.0.2.tar.bz2 226668
diff --git a/dev-util/catalyst/files/digest-catalyst-1.0.3 b/dev-util/catalyst/files/digest-catalyst-1.0.3
deleted file mode 100644
index 1b779d975621..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c28d4f84626c2d1ec9ae99b0f328decd catalyst-1.0.3.tar.bz2 254261
diff --git a/dev-util/catalyst/files/digest-catalyst-1.0.5 b/dev-util/catalyst/files/digest-catalyst-1.0.5
new file mode 100644
index 000000000000..9e70af9930e8
--- /dev/null
+++ b/dev-util/catalyst/files/digest-catalyst-1.0.5
@@ -0,0 +1 @@
+MD5 1d68d5e87d11d3c845fbdad7cdda74d6 catalyst-1.0.5.tar.bz2 321303
diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
new file mode 100644
index 000000000000..96a2d586367d
--- /dev/null
+++ b/dev-util/catalyst/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+</pkgmetadata>