...and God looked down upon Catalyst 1.1.2, and He saw that it was good. This closes bugs #73556, #76530, #70663, #70518, #76146, #70425, #68307, #77480, #76542, #66592, and #75336.

9 files changed, 31 insertions, 148 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 9b0d6bfd42a5..e4ccaf7a2a57 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,15 @@
 # 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.37 2005/01/07 19:44:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.38 2005/01/14 20:02:30 wolf31o2 Exp $
+
+*catalyst-1.1.2 (14 Jan 2005)
+
+  14 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -catalyst-1.0.8.1-r1.ebuild, -catalyst-1.0.8.1.ebuild,
+  -catalyst-1.0.9.ebuild, +catalyst-1.1.2.ebuild:
+  ...and God looked down upon Catalyst 1.1.2, and He saw that it was good.
+  This closes bugs #73556, #76530, #70663, #70518, #76146, #70425, #68307,
+  #77480, #76542, #66592, and #75336.
 
   07 Jan 2005; Markus Rothe <corsair@gentoo.org> catalyst-1.1.1.ebuild:
   Stable on ppc64
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 3edeb31dbb12..f5b7393a7949 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,12 +1,8 @@
-MD5 efc4c2c7c80d2f3df46c770ba167126d ChangeLog 5117
-MD5 b71b540f49c6ab8e97bd7d7bb7450f44 catalyst-1.0.8.1-r1.ebuild 1800
-MD5 332af3d9956f7bcb5e53a941c0abacec catalyst-1.0.8.1.ebuild 1588
-MD5 b0a140e87c1877b6c3396415c6f1ce84 catalyst-1.0.9.ebuild 1678
-MD5 84c2b9f71cbe39524f3e29772ec2ae10 catalyst-1.1.0.ebuild 1627
 MD5 61d44a6d01ad97069ed2a3a121c2a78b catalyst-1.1.1.ebuild 1619
+MD5 84c2b9f71cbe39524f3e29772ec2ae10 catalyst-1.1.0.ebuild 1627
+MD5 7a3886d6b0ead336408a9c4f7948c77a catalyst-1.1.2.ebuild 1853
+MD5 467f82bfeb9092281f3f1107388866a1 ChangeLog 5499
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
-MD5 8b93639cf9ca506e429bc0669d77235f files/digest-catalyst-1.0.8.1 69
-MD5 fa63e0207d038fe77410c3f2992d4a40 files/digest-catalyst-1.0.8.1-r1 155
-MD5 c24df23caba46c0311c53560d33fe392 files/digest-catalyst-1.0.9 67
 MD5 43a7b4fc270384f0887b0b604f0f483b files/digest-catalyst-1.1.0 67
 MD5 76eb9537d8e02bedf4ed278bd049623d files/digest-catalyst-1.1.1 67
+MD5 d33ed49661a9c9f051ede3a93e9115ab files/digest-catalyst-1.1.2 67
diff --git a/dev-util/catalyst/catalyst-1.0.8.1-r1.ebuild b/dev-util/catalyst/catalyst-1.0.8.1-r1.ebuild
deleted file mode 100644
index 8fd2bbcec011..000000000000
--- a/dev-util/catalyst/catalyst-1.0.8.1-r1.ebuild
+++ /dev/null
@@ -1,67 +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.0.8.1-r1.ebuild,v 1.2 2005/01/06 21:01:56 kloeri Exp $
-
-inherit eutils
-
-DESCRIPTION="Gentoo Linux official release metatool"
-HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zhen/catalyst/${P}.tar.bz2
-	http://dev.gentoo.org/~vapier/uclibc/${P}-stacked-profiles.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-*" #x86 ~arm ~s390 ~amd64 ~alpha ~sparc hppa ppc64"
-IUSE="doc cdr"
-
-DEPEND=""
-RDEPEND="dev-lang/python
-	sys-apps/portage
-	dev-util/ccache
-	amd64? ( sys-apps/linux32 )
-	cdr? ( app-cdr/cdrtools app-misc/zisofs-tools sys-fs/squashfs-tools )
-	>=sys-kernel/genkernel-3.0.2b"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${P}-stacked-profiles.patch
-}
-
-src_install() {
-	insinto /usr/lib/${PN}/arch
-	doins arch/*
-	insinto /usr/lib/${PN}/modules
-	doins modules/*
-	insinto /usr/lib/${PN}/livecd/kconfig
-	doins livecd/kconfig/*
-	insinto /usr/lib/${PN}/livecd/cdtar
-	doins livecd/cdtar/*
-	exeinto /usr/lib/${PN}/livecd/isogen
-	doexe livecd/isogen/*
-	exeinto /usr/lib/${PN}/livecd/runscript
-	doexe livecd/runscript/*
-	exeinto /usr/lib/${PN}/livecd/runscript-support
-	doexe livecd/runscript-support/*
-	insinto /usr/lib/${PN}/livecd/files
-	doins livecd/files/*
-	for x in targets/*
-	do
-		exeinto /usr/lib/${PN}/$x
-		doexe $x/*
-	done
-	exeinto /usr/lib/${PN}
-	doexe 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 -r examples files
-	fi
-	dodoc TODO README ChangeLog ChangeLog.old AUTHORS COPYING REMARKS
-}
diff --git a/dev-util/catalyst/catalyst-1.0.8.1.ebuild b/dev-util/catalyst/catalyst-1.0.8.1.ebuild
deleted file mode 100644
index ad7e42de8813..000000000000
--- a/dev-util/catalyst/catalyst-1.0.8.1.ebuild
+++ /dev/null
@@ -1,57 +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.0.8.1.ebuild,v 1.12 2005/01/06 21:01:56 kloeri 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 ~arm ~s390 amd64 ~alpha sparc hppa ppc64"
-IUSE="doc cdr"
-
-DEPEND=""
-RDEPEND="dev-lang/python
-	sys-apps/portage
-	dev-util/ccache
-	amd64? ( sys-apps/linux32 )
-	cdr? ( app-cdr/cdrtools app-misc/zisofs-tools sys-fs/squashfs-tools )
-	>=sys-kernel/genkernel-3.0.2b"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	insinto /usr/lib/${PN}/arch
-	doins arch/*
-	insinto /usr/lib/${PN}/modules
-	doins modules/*
-	insinto /usr/lib/${PN}/livecd/kconfig
-	doins livecd/kconfig/*
-	insinto /usr/lib/${PN}/livecd/cdtar
-	doins livecd/cdtar/*
-	exeinto /usr/lib/${PN}/livecd/isogen
-	doexe livecd/isogen/*
-	exeinto /usr/lib/${PN}/livecd/runscript
-	doexe livecd/runscript/*
-	exeinto /usr/lib/${PN}/livecd/runscript-support
-	doexe livecd/runscript-support/*
-	insinto /usr/lib/${PN}/livecd/files
-	doins livecd/files/*
-	for x in targets/*
-	do
-		exeinto /usr/lib/${PN}/$x
-		doexe $x/*
-	done
-	exeinto /usr/lib/${PN}
-	doexe 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 -r examples files
-	fi
-	dodoc TODO README ChangeLog ChangeLog.old AUTHORS COPYING REMARKS
-}
diff --git a/dev-util/catalyst/catalyst-1.0.9.ebuild b/dev-util/catalyst/catalyst-1.1.2.ebuild
index 4045176b77cb..916f0b8f5d1c 100644
--- a/dev-util/catalyst/catalyst-1.0.9.ebuild
+++ b/dev-util/catalyst/catalyst-1.1.2.ebuild
@@ -1,37 +1,42 @@
 # 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.0.9.ebuild,v 1.4 2005/01/06 21:01:56 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-1.1.2.ebuild,v 1.1 2005/01/14 20:02:30 wolf31o2 Exp $
 
 inherit eutils
 
 DESCRIPTION="Gentoo Linux official release metatool"
 HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~zhen/catalyst/${P}.tar.bz2"
-
+SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/catalyst/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="doc cdr"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc ccache cdr"
 
 DEPEND=""
 RDEPEND="dev-lang/python
 	sys-apps/portage
-	dev-util/ccache
 	amd64? ( sys-apps/linux32 )
-	cdr? ( app-cdr/cdrtools app-misc/zisofs-tools sys-fs/squashfs-tools )
-	>=sys-kernel/genkernel-3.0.2b"
+	ccache? ( dev-util/ccache )
+	cdr? ( app-cdr/cdrtools app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+	>=sys-kernel/genkernel-3.1.0a"
 
 S=${WORKDIR}/${PN}
 
+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/*
 	insinto /usr/lib/${PN}/modules
 	doins modules/*
-	insinto /usr/lib/${PN}/livecd/kconfig
-	doins livecd/kconfig/*
 	insinto /usr/lib/${PN}/livecd/cdtar
 	doins livecd/cdtar/*
 	exeinto /usr/lib/${PN}/livecd/isogen
diff --git a/dev-util/catalyst/files/digest-catalyst-1.0.8.1 b/dev-util/catalyst/files/digest-catalyst-1.0.8.1
deleted file mode 100644
index b52c6ae52468..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-1.0.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63aed4e4b6241f1bf5454accc20052ce catalyst-1.0.8.1.tar.bz2 532110
diff --git a/dev-util/catalyst/files/digest-catalyst-1.0.8.1-r1 b/dev-util/catalyst/files/digest-catalyst-1.0.8.1-r1
deleted file mode 100644
index 26d00bf3fe1f..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-1.0.8.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 63aed4e4b6241f1bf5454accc20052ce catalyst-1.0.8.1.tar.bz2 532110
-MD5 fc4b446b13be875e31fbd33bf6346fb2 catalyst-1.0.8.1-stacked-profiles.patch.bz2 2562
diff --git a/dev-util/catalyst/files/digest-catalyst-1.0.9 b/dev-util/catalyst/files/digest-catalyst-1.0.9
deleted file mode 100644
index 02b48229be32..000000000000
--- a/dev-util/catalyst/files/digest-catalyst-1.0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab6c5a24ad5840ac210c8421b16cfaba catalyst-1.0.9.tar.bz2 521385
diff --git a/dev-util/catalyst/files/digest-catalyst-1.1.2 b/dev-util/catalyst/files/digest-catalyst-1.1.2
new file mode 100644
index 000000000000..d5d50ecc7a61
--- /dev/null
+++ b/dev-util/catalyst/files/digest-catalyst-1.1.2
@@ -0,0 +1 @@
+MD5 2506c697e384c2aba6236121ab68438e catalyst-1.1.2.tar.bz2 663003