From: Chris Gianelloni Date: Tue, 29 Nov 2005 20:51:09 +0000 (+0000) Subject: Here's catalyst 2.0_rc1, which I will be unmasking to get more wide-spread testing... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=158e8f71fab7b97c6fd9fa077cf99f8f68eb3306;p=gentoo.git Here's catalyst 2.0_rc1, which I will be unmasking to get more wide-spread testing. This should be production-ready. Package-Manager: portage-2.0.53_rc7 --- diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog index 5b12d079a8ae..f886fe2736fc 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.95 2005/11/29 15:32:24 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.96 2005/11/29 20:51:09 wolf31o2 Exp $ + +*catalyst-2.0_rc1 (29 Nov 2005) + + 29 Nov 2005; Chris Gianelloni + -files/catalyst-2.0_pre20051129-slot.patch, + +files/catalyst-2.0_rc1-slot.patch, -catalyst-2.0_pre20051129.ebuild, + +catalyst-2.0_rc1.ebuild: + Here's catalyst 2.0_rc1, which I will be unmasking to get more wide-spread + testing. This should be production-ready. *catalyst-2.0_pre20051129 (29 Nov 2005) diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index 7b41b7f3519b..1c890302b593 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,7 +1,7 @@ -MD5 06d69ccda544e13937ca5ca9b08f7f1e ChangeLog 17285 +MD5 1fd81de4f28fc3d0562c5727504efd50 ChangeLog 17640 MD5 f514d037aa3187a2e5a96fe6c4ae626b catalyst-1.1.10.10.ebuild 2250 -MD5 cc421e9d53c26d28a7377d7b1ae181f3 catalyst-2.0_pre20051129.ebuild 2927 -MD5 37a3fb804bde655d4dc3ea35b178ad2e files/catalyst-2.0_pre20051129-slot.patch 1282 +MD5 3833fc9629f2a5901d500cd8bfc89ef3 catalyst-2.0_rc1.ebuild 2810 +MD5 ac7daa97bd1a35a43781b333c3026ffc files/catalyst-2.0_rc1-slot.patch 1250 MD5 1579d7c79eaa1035a84a4247cd4a5fb6 files/digest-catalyst-1.1.10.10 71 -MD5 5b49506425465545216a658152d0ca89 files/digest-catalyst-2.0_pre20051129 77 +MD5 0e99fe4a75eb52a2fb2e6e26f939a2d8 files/digest-catalyst-2.0_rc1 69 MD5 8c971ca7e043237b69754a9d88238bd4 metadata.xml 223 diff --git a/dev-util/catalyst/catalyst-2.0_pre20051129.ebuild b/dev-util/catalyst/catalyst-2.0_rc1.ebuild similarity index 79% rename from dev-util/catalyst/catalyst-2.0_pre20051129.ebuild rename to dev-util/catalyst/catalyst-2.0_rc1.ebuild index b73ff6312a90..d83b6f461507 100644 --- a/dev-util/catalyst/catalyst-2.0_pre20051129.ebuild +++ b/dev-util/catalyst/catalyst-2.0_rc1.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-2.0_pre20051129.ebuild,v 1.1 2005/11/29 15:32:24 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0_rc1.ebuild,v 1.1 2005/11/29 20:51:09 wolf31o2 Exp $ inherit eutils @@ -10,8 +10,8 @@ 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 sparc x86" -IUSE="doc ccache cdr examples" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="ccache cdr" DEPEND="" RDEPEND="dev-lang/python @@ -24,10 +24,7 @@ RDEPEND="dev-lang/python cdr? ( virtual/cdrtools app-misc/zisofs-tools - !mips? ( >=sys-fs/squashfs-tools-2.1 ) ) - examples? ( - dev-util/livecd-kconfigs - dev-util/livecd-specs )" + !mips? ( >=sys-fs/squashfs-tools-2.1 ) )" pkg_setup() { if use ccache @@ -38,12 +35,10 @@ pkg_setup() { ewarn "If this is not what you intended," ewarn "then you should add ccache to your USE." fi - if use examples || use doc - then - ewarn "The examples and documentation in this experimental ebuild have" - ewarn "not been fully updated. Please use the gentoo-catalyst mailing" - ewarn "list if you have any issues with this build." - fi + echo + einfo "The template spec files are now installed by default. You can find" + einfo "them under /usr/share/doc/${PF}/examples and they are considered to" + einfo "be the authorative source of information on catalyst." } src_unpack() { @@ -75,9 +70,7 @@ src_install() { dosym /usr/lib/${PN}2/catalyst2 /usr/bin/catalyst2 insinto /etc/catalyst2 newins files/catalyst.conf catalyst2.conf - if use doc; then - DOCDESTTREE="." dohtml -A spec,msg,example -r examples files - fi + 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 diff --git a/dev-util/catalyst/files/catalyst-2.0_pre20051129-slot.patch b/dev-util/catalyst/files/catalyst-2.0_rc1-slot.patch similarity index 81% rename from dev-util/catalyst/files/catalyst-2.0_pre20051129-slot.patch rename to dev-util/catalyst/files/catalyst-2.0_rc1-slot.patch index c32d430bdde7..ebfed785c6b2 100644 --- a/dev-util/catalyst/files/catalyst-2.0_pre20051129-slot.patch +++ b/dev-util/catalyst/files/catalyst-2.0_rc1-slot.patch @@ -1,6 +1,6 @@ -diff -urN catalyst-2.0_pre20051129.orig/catalyst catalyst-2.0_pre20051122/catalyst ---- catalyst-2.0_pre20051129.orig/catalyst 2005-10-17 16:07:14.000000000 -0400 -+++ catalyst-2.0_pre20051129/catalyst 2005-10-17 16:06:23.000000000 -0400 +diff -urN catalyst-2.0_rc1.orig/catalyst catalyst-2.0_rc1/catalyst +--- catalyst-2.0_rc1.orig/catalyst 2005-10-17 16:07:14.000000000 -0400 ++++ catalyst-2.0_rc1/catalyst 2005-10-17 16:06:23.000000000 -0400 @@ -50,10 +50,10 @@ myconf={} config_file="" diff --git a/dev-util/catalyst/files/digest-catalyst-2.0_pre20051129 b/dev-util/catalyst/files/digest-catalyst-2.0_pre20051129 deleted file mode 100644 index 3b2155d632d4..000000000000 --- a/dev-util/catalyst/files/digest-catalyst-2.0_pre20051129 +++ /dev/null @@ -1 +0,0 @@ -MD5 2b9862aead48cc023641b771633de64d catalyst-2.0_pre20051129.tar.bz2 762012 diff --git a/dev-util/catalyst/files/digest-catalyst-2.0_rc1 b/dev-util/catalyst/files/digest-catalyst-2.0_rc1 new file mode 100644 index 000000000000..d30485fa0873 --- /dev/null +++ b/dev-util/catalyst/files/digest-catalyst-2.0_rc1 @@ -0,0 +1 @@ +MD5 e5a9068ec61ad426a3031dc032ae1521 catalyst-2.0_rc1.tar.bz2 762106