From 1f63e2f05b972f5113bd91bdeb6081e9c7df5d60 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 19 Apr 2006 15:40:01 +0000 Subject: Version bumped to 2.0_rc43 as this fixes a major bug in 2.0_rc42 and also fixes bug #130476. (Portage version: 2.1_pre7-r5) --- dev-util/catalyst/ChangeLog | 10 ++- dev-util/catalyst/catalyst-2.0_rc42.ebuild | 96 ---------------------- dev-util/catalyst/catalyst-2.0_rc43.ebuild | 96 ++++++++++++++++++++++ .../catalyst/files/catalyst-2.0_rc42-slot.patch | 30 ------- .../catalyst/files/catalyst-2.0_rc43-slot.patch | 30 +++++++ dev-util/catalyst/files/digest-catalyst-2.0_rc42 | 3 - dev-util/catalyst/files/digest-catalyst-2.0_rc43 | 3 + 7 files changed, 138 insertions(+), 130 deletions(-) delete mode 100644 dev-util/catalyst/catalyst-2.0_rc42.ebuild create mode 100644 dev-util/catalyst/catalyst-2.0_rc43.ebuild delete mode 100644 dev-util/catalyst/files/catalyst-2.0_rc42-slot.patch create mode 100644 dev-util/catalyst/files/catalyst-2.0_rc43-slot.patch delete mode 100644 dev-util/catalyst/files/digest-catalyst-2.0_rc42 create mode 100644 dev-util/catalyst/files/digest-catalyst-2.0_rc43 (limited to 'dev-util') diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog index 0abd77199ae5..a0800679b092 100644 --- a/dev-util/catalyst/ChangeLog +++ b/dev-util/catalyst/ChangeLog @@ -1,6 +1,14 @@ # 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.144 2006/04/19 13:29:32 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.145 2006/04/19 15:40:01 wolf31o2 Exp $ + +*catalyst-2.0_rc43 (19 Apr 2006) + + 19 Apr 2006; Chris Gianelloni + -files/catalyst-2.0_rc42-slot.patch, +files/catalyst-2.0_rc43-slot.patch, + -catalyst-2.0_rc42.ebuild, +catalyst-2.0_rc43.ebuild: + Version bumped to 2.0_rc43 as this fixes a major bug in 2.0_rc42 and also + fixes bug #130476. 19 Apr 2006; Chris Gianelloni catalyst-2.0_rc42.ebuild: diff --git a/dev-util/catalyst/catalyst-2.0_rc42.ebuild b/dev-util/catalyst/catalyst-2.0_rc42.ebuild deleted file mode 100644 index c1b70363fd7d..000000000000 --- a/dev-util/catalyst/catalyst-2.0_rc42.ebuild +++ /dev/null @@ -1,96 +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_rc42.ebuild,v 1.2 2006/04/19 13:29:32 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/setarch ) - ppc64? ( sys-apps/setarch ) - ccache? ( dev-util/ccache ) - cdr? ( - virtual/cdrtools - ia64? ( sys-fs/dosfstools ) - 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 "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 - # Here is where we actually enable ccache - use 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_rc43.ebuild b/dev-util/catalyst/catalyst-2.0_rc43.ebuild new file mode 100644 index 000000000000..ce9a3c1bc4f6 --- /dev/null +++ b/dev-util/catalyst/catalyst-2.0_rc43.ebuild @@ -0,0 +1,96 @@ +# 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_rc43.ebuild,v 1.1 2006/04/19 15:40:01 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/setarch ) + ppc64? ( sys-apps/setarch ) + ccache? ( dev-util/ccache ) + cdr? ( + virtual/cdrtools + ia64? ( sys-fs/dosfstools ) + 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 "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 + # Here is where we actually enable ccache + use 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_rc42-slot.patch b/dev-util/catalyst/files/catalyst-2.0_rc42-slot.patch deleted file mode 100644 index ecd0d08b6deb..000000000000 --- a/dev-util/catalyst/files/catalyst-2.0_rc42-slot.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urN catalyst-2.0_rc42.orig/catalyst catalyst-2.0_rc42/catalyst ---- catalyst-2.0_rc42.orig/catalyst 2005-12-20 07:07:45.000000000 -0500 -+++ catalyst-2.0_rc42/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_rc43-slot.patch b/dev-util/catalyst/files/catalyst-2.0_rc43-slot.patch new file mode 100644 index 000000000000..a226f99f71a9 --- /dev/null +++ b/dev-util/catalyst/files/catalyst-2.0_rc43-slot.patch @@ -0,0 +1,30 @@ +diff -urN catalyst-2.0_rc43.orig/catalyst catalyst-2.0_rc43/catalyst +--- catalyst-2.0_rc43.orig/catalyst 2005-12-20 07:07:45.000000000 -0500 ++++ catalyst-2.0_rc43/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_rc42 b/dev-util/catalyst/files/digest-catalyst-2.0_rc42 deleted file mode 100644 index fe592dbd4fca..000000000000 --- a/dev-util/catalyst/files/digest-catalyst-2.0_rc42 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f50860cc0e182c9e8e45250fa48a1fd9 catalyst-2.0_rc42.tar.bz2 864171 -RMD160 1756b51b1e7790467e4264a5fbcdaef7d15fdd59 catalyst-2.0_rc42.tar.bz2 864171 -SHA256 80b25f3e88fc8d428ef46e973a9ec618178bf65ef577ac73a4d46fb648ea3dae catalyst-2.0_rc42.tar.bz2 864171 diff --git a/dev-util/catalyst/files/digest-catalyst-2.0_rc43 b/dev-util/catalyst/files/digest-catalyst-2.0_rc43 new file mode 100644 index 000000000000..8dc6151dfd2b --- /dev/null +++ b/dev-util/catalyst/files/digest-catalyst-2.0_rc43 @@ -0,0 +1,3 @@ +MD5 d59b514e1853b6fd354551e14658b6a5 catalyst-2.0_rc43.tar.bz2 864076 +RMD160 d46e58fe91df07ddf7768d63e18eb1f1c679f392 catalyst-2.0_rc43.tar.bz2 864076 +SHA256 eeb8daf71b8c5de4e2a1b3695221bb414bae4ff9a7badf754d43ca0fe75cb43e catalyst-2.0_rc43.tar.bz2 864076 -- cgit v1.2.3-65-gdbad