From 4a2e10a93259d17fb4f210da88c82f623d4abf88 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 9 Feb 2006 15:28:54 +0000 Subject: Version bump to 2.0_rc35. This fixes an indentation bug in 2.0_rc34 along with adding some hfs-hide options for PPC64. This also has some updates to the motd for the LiveCD to make it easier for users to know what to do when they get to the command line. (Portage version: 2.1_pre4-r1) --- dev-util/catalyst/ChangeLog | 12 ++- dev-util/catalyst/catalyst-2.0_rc34.ebuild | 105 --------------------- dev-util/catalyst/catalyst-2.0_rc35.ebuild | 105 +++++++++++++++++++++ .../catalyst/files/catalyst-2.0_rc34-slot.patch | 30 ------ .../catalyst/files/catalyst-2.0_rc35-slot.patch | 30 ++++++ dev-util/catalyst/files/digest-catalyst-2.0_rc34 | 3 - dev-util/catalyst/files/digest-catalyst-2.0_rc35 | 3 + 7 files changed, 149 insertions(+), 139 deletions(-) delete mode 100644 dev-util/catalyst/catalyst-2.0_rc34.ebuild create mode 100644 dev-util/catalyst/catalyst-2.0_rc35.ebuild delete mode 100644 dev-util/catalyst/files/catalyst-2.0_rc34-slot.patch create mode 100644 dev-util/catalyst/files/catalyst-2.0_rc35-slot.patch delete mode 100644 dev-util/catalyst/files/digest-catalyst-2.0_rc34 create mode 100644 dev-util/catalyst/files/digest-catalyst-2.0_rc35 (limited to 'dev-util/catalyst') diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog index 8316a3ac49a7..f28025e19807 100644 --- a/dev-util/catalyst/ChangeLog +++ b/dev-util/catalyst/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-util/catalyst # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.133 2006/02/08 22:23:58 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.134 2006/02/09 15:28:54 wolf31o2 Exp $ + +*catalyst-2.0_rc35 (09 Feb 2006) + + 09 Feb 2006; Chris Gianelloni + -files/catalyst-2.0_rc34-slot.patch, +files/catalyst-2.0_rc35-slot.patch, + -catalyst-2.0_rc34.ebuild, +catalyst-2.0_rc35.ebuild: + Version bump to 2.0_rc35. This fixes an indentation bug in 2.0_rc34 along + with adding some hfs-hide options for PPC64. This also has some updates to + the motd for the LiveCD to make it easier for users to know what to do when + they get to the command line. *catalyst-2.0_rc34 (08 Feb 2006) diff --git a/dev-util/catalyst/catalyst-2.0_rc34.ebuild b/dev-util/catalyst/catalyst-2.0_rc34.ebuild deleted file mode 100644 index 62a5dd38615c..000000000000 --- a/dev-util/catalyst/catalyst-2.0_rc34.ebuild +++ /dev/null @@ -1,105 +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_rc34.ebuild,v 1.1 2006/02/08 22:23:58 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/linux32 ) - ppc64? ( - sys-devel/ppc32 ) - ccache? ( - dev-util/ccache ) - cdr? ( - virtual/cdrtools - ia64? ( - sys-fs/dosfstools ) - !sh? ( - app-misc/zisofs-tools ) - !mips? ( - !sh? ( - >=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 - # This is the dirty hack for missing dev-perl/Archive-Zip - dosed 's:hash_function="crc32":hash_function="md5":' \ - /etc/catalyst2/catalyst2.conf - # Here is where we actually enable 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/catalyst-2.0_rc35.ebuild b/dev-util/catalyst/catalyst-2.0_rc35.ebuild new file mode 100644 index 000000000000..4adf6e6c6aac --- /dev/null +++ b/dev-util/catalyst/catalyst-2.0_rc35.ebuild @@ -0,0 +1,105 @@ +# 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_rc35.ebuild,v 1.1 2006/02/09 15: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/linux32 ) + ppc64? ( + sys-devel/ppc32 ) + ccache? ( + dev-util/ccache ) + cdr? ( + virtual/cdrtools + ia64? ( + sys-fs/dosfstools ) + !sh? ( + app-misc/zisofs-tools ) + !mips? ( + !sh? ( + >=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 + # This is the dirty hack for missing dev-perl/Archive-Zip + dosed 's:hash_function="crc32":hash_function="md5":' \ + /etc/catalyst2/catalyst2.conf + # Here is where we actually enable 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_rc34-slot.patch b/dev-util/catalyst/files/catalyst-2.0_rc34-slot.patch deleted file mode 100644 index a5ecea999eca..000000000000 --- a/dev-util/catalyst/files/catalyst-2.0_rc34-slot.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urN catalyst-2.0_rc34.orig/catalyst catalyst-2.0_rc34/catalyst ---- catalyst-2.0_rc34.orig/catalyst 2005-12-20 07:07:45.000000000 -0500 -+++ catalyst-2.0_rc34/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/catalyst-2.0_rc35-slot.patch b/dev-util/catalyst/files/catalyst-2.0_rc35-slot.patch new file mode 100644 index 000000000000..8eeefefa908c --- /dev/null +++ b/dev-util/catalyst/files/catalyst-2.0_rc35-slot.patch @@ -0,0 +1,30 @@ +diff -urN catalyst-2.0_rc35.orig/catalyst catalyst-2.0_rc35/catalyst +--- catalyst-2.0_rc35.orig/catalyst 2005-12-20 07:07:45.000000000 -0500 ++++ catalyst-2.0_rc35/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_rc34 b/dev-util/catalyst/files/digest-catalyst-2.0_rc34 deleted file mode 100644 index bec9c57e48ec..000000000000 --- a/dev-util/catalyst/files/digest-catalyst-2.0_rc34 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 2a18491da590f72e21bacd21c3aa41b1 catalyst-2.0_rc34.tar.bz2 972580 -RMD160 dce73b1ca696ee5a2142683465b76ec8b93a024c catalyst-2.0_rc34.tar.bz2 972580 -SHA256 3b569e73fbbdc24cdc99bb76f0b1828fdc5386bc2d39eaba552b3e5f903b670b catalyst-2.0_rc34.tar.bz2 972580 diff --git a/dev-util/catalyst/files/digest-catalyst-2.0_rc35 b/dev-util/catalyst/files/digest-catalyst-2.0_rc35 new file mode 100644 index 000000000000..2da04de6d216 --- /dev/null +++ b/dev-util/catalyst/files/digest-catalyst-2.0_rc35 @@ -0,0 +1,3 @@ +MD5 049fdba25470dc02331057d0d4f2a581 catalyst-2.0_rc35.tar.bz2 972860 +RMD160 4f87a58d9184e5fcc78f864ec9c783e1496b8b08 catalyst-2.0_rc35.tar.bz2 972860 +SHA256 9fdd7c89d483c1e317e54f8b92ae0911c88bf6a237b59ccbf7c76269f852f3f0 catalyst-2.0_rc35.tar.bz2 972860 -- cgit v1.2.3-65-gdbad