Version bumped to 2.0.4 for 2007.0's release. This resolves bug #173002, bug #173532...

Package-Manager: portage-2.1.2.3

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 15ad40a95be6c6a05a8400246b0515f1bf2901f0..9435b2b205ed667503d1835553cdc9ad19f96b6d 100644 (file)
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.167 2007/04/07 04:20:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.168 2007/04/12 19:43:30 wolf31o2 Exp $
+
+*catalyst-2.0.4 (12 Apr 2007)
+
+  12 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  -catalyst-2.0.2.ebuild, -catalyst-2.0.3.ebuild, +catalyst-2.0.4.ebuild:
+  Version bumped to 2.0.4 for 2007.0's release. This resolves bug #173002, bug
+  #173532, bug #173740, and bug #173826.
 
   07 Apr 2007; Mike Frysinger <vapier@gentoo.org> catalyst-1.1.10.10.ebuild,
   catalyst-2.0.2.ebuild, catalyst-2.0.3.ebuild:

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index bb1f9ca64255aca015dec4dd92465c5f58ae3045..702eb6b3ce03d95a78b8f7a2c105a7a9c3209393 100644 (file)
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -2,24 +2,19 @@
 Hash: SHA1
 
 DIST catalyst-1.1.10.10.tar.bz2 570620 RMD160 18365ba9697c4e44091973daf709c497f1cb2b13 SHA1 86c5020914225eacdbd4d651adb8aa8ee65cc490 SHA256 2c3c0ef8970897f741e31ff6f84d400fa2ea3b8e6af7f1b4fb6ca1daff8048eb
-DIST catalyst-2.0.2.tar.bz2 782576 RMD160 06cd53d2ec71a69137f655c2b3b1dbf00f7852aa SHA1 a21b336df799fd1ee2ebd51dfb26388fbcd14069 SHA256 dec7118411f06322792720c8dc0977ae020552bdf2e35c5ef1735f37b2266a65
-DIST catalyst-2.0.3.tar.bz2 783648 RMD160 f59d8cb5e08464ebac8c3dbc7292903a4cc08812 SHA1 d3db2ad27f76bff67d3274856fadeb8b37bc5f7f SHA256 7355cb93f23071be80d10a5269b8f2a78edd9626cf4ad8f717a79139a4189ad5
+DIST catalyst-2.0.4.tar.bz2 784337 RMD160 dec8bc5d84bc567d54b49d9be5a5f9c601d73b92 SHA1 04f4876cefb4dd35af1c4f4233cd979379fd187d SHA256 7a84540f8aab6287e68aa50465ae70a25b0ef7bf3e3aff778958e37b5dd0081c
 EBUILD catalyst-1.1.10.10.ebuild 2237 RMD160 032d4d4104be35b1c1fdc7e031515b571341982e SHA1 88e43e7cdba883ea1fe7aa024d59014d1a03a619 SHA256 c5bea5957bf67ce443d8b5d381f8c966512396807d33abfd014aa3d0d346ebc6
 MD5 7482c5ec8be950b9e681e3fa95a1957d catalyst-1.1.10.10.ebuild 2237
 RMD160 032d4d4104be35b1c1fdc7e031515b571341982e catalyst-1.1.10.10.ebuild 2237
 SHA256 c5bea5957bf67ce443d8b5d381f8c966512396807d33abfd014aa3d0d346ebc6 catalyst-1.1.10.10.ebuild 2237
-EBUILD catalyst-2.0.2.ebuild 2434 RMD160 cd8b9ed1e301a3b952ad298f4b6f9fec590150b3 SHA1 1c95688617cda36fd76861321fad0ab93a7ee8d5 SHA256 88548eeb38729e92b93049353d5797d126ab72c3c4999988a53a4b2ccfbe217b
-MD5 29893ee8c515c64cc2910da4e5fa9860 catalyst-2.0.2.ebuild 2434
-RMD160 cd8b9ed1e301a3b952ad298f4b6f9fec590150b3 catalyst-2.0.2.ebuild 2434
-SHA256 88548eeb38729e92b93049353d5797d126ab72c3c4999988a53a4b2ccfbe217b catalyst-2.0.2.ebuild 2434
-EBUILD catalyst-2.0.3.ebuild 2473 RMD160 818123a3a9c40f3db854026efd30139530268962 SHA1 e8330e6c1ead94c5f2c97156f565d5f5679e6761 SHA256 f30328387ef3b1641f3a0dbdaade08fad4f64456ac2f283a69f5ede54dba8b4b
-MD5 44877484837cb9435ea312ad7573a052 catalyst-2.0.3.ebuild 2473
-RMD160 818123a3a9c40f3db854026efd30139530268962 catalyst-2.0.3.ebuild 2473
-SHA256 f30328387ef3b1641f3a0dbdaade08fad4f64456ac2f283a69f5ede54dba8b4b catalyst-2.0.3.ebuild 2473
-MISC ChangeLog 36752 RMD160 80a67b8e226bef8266228fc07a2e7210f9321022 SHA1 07895b5ff90c3e62fd93fc33bebabbf15f10f74a SHA256 a7c8546b006ed11fdfd945b40686e95fa92af030da2469f4270e58c74a47441f
-MD5 f10ae782df933e792fe9617630ac85f4 ChangeLog 36752
-RMD160 80a67b8e226bef8266228fc07a2e7210f9321022 ChangeLog 36752
-SHA256 a7c8546b006ed11fdfd945b40686e95fa92af030da2469f4270e58c74a47441f ChangeLog 36752
+EBUILD catalyst-2.0.4.ebuild 2475 RMD160 15674a05ceab96056b5260a1278cbc65839eedb1 SHA1 963ebb721095335600c5a1c0096ca9ae858393ab SHA256 1a2659bbfea01c5e07723e8da8327629ebde9b621a255d9cd97199e0aba968e0
+MD5 1333a9ead45adc1f9a60c321a2adda3e catalyst-2.0.4.ebuild 2475
+RMD160 15674a05ceab96056b5260a1278cbc65839eedb1 catalyst-2.0.4.ebuild 2475
+SHA256 1a2659bbfea01c5e07723e8da8327629ebde9b621a255d9cd97199e0aba968e0 catalyst-2.0.4.ebuild 2475
+MISC ChangeLog 37034 RMD160 bdd550e45c4c53c355e867c54f40b01ef24b3fac SHA1 d37c27b10403d142c13a3740b6a7cfe58659b1d0 SHA256 c22f1080bc77e5f8146cdf6601d2a485209d3bf6e9217ae5e63ca6f93bb58e7e
+MD5 a4c893f8146b420e1f09672372a1100f ChangeLog 37034
+RMD160 bdd550e45c4c53c355e867c54f40b01ef24b3fac ChangeLog 37034
+SHA256 c22f1080bc77e5f8146cdf6601d2a485209d3bf6e9217ae5e63ca6f93bb58e7e ChangeLog 37034
 MISC metadata.xml 223 RMD160 cd1cc28ce9a44a5bcf0835859270b312c2a9c057 SHA1 99dbb429b3fbea01bf260400c5686461329f8f2c SHA256 df88f8a951c171af2582027db09973af5e5f0a5f578636a8f836ecea8c55cd4d
 MD5 8c971ca7e043237b69754a9d88238bd4 metadata.xml 223
 RMD160 cd1cc28ce9a44a5bcf0835859270b312c2a9c057 metadata.xml 223
@@ -27,16 +22,13 @@ SHA256 df88f8a951c171af2582027db09973af5e5f0a5f578636a8f836ecea8c55cd4d metadata
 MD5 9a7f1869cf19003e146f44aacedcc5fd files/digest-catalyst-1.1.10.10 259
 RMD160 2c77da05e9c5b416be13a48f0a6a8ed46566a02e files/digest-catalyst-1.1.10.10 259
 SHA256 e8f03d6ab7c5ad50c0de772a72201d50cae1b1ab9c7f2177fc034c1272d797b8 files/digest-catalyst-1.1.10.10 259
-MD5 69bbc1eb11983c01610b1f88044f68b2 files/digest-catalyst-2.0.2 247
-RMD160 8fdde40db82889c8a2cb9663a46d8de05f4668ee files/digest-catalyst-2.0.2 247
-SHA256 4088b0a053f9a128476be6f386198e4cbcedd8751821a89332ff74ccc2c49d57 files/digest-catalyst-2.0.2 247
-MD5 4e2137e90a81e735cb2b3d0eade1fb9f files/digest-catalyst-2.0.3 247
-RMD160 06a054e4805ed08bc7704e2b7ba88680f819e4f4 files/digest-catalyst-2.0.3 247
-SHA256 7350ee2ee526014e6853c50a63f757630f77ef3e6187a47d6258069c6b2c06bd files/digest-catalyst-2.0.3 247
+MD5 d50e8c807b57fc13f81581294bc47045 files/digest-catalyst-2.0.4 247
+RMD160 1ec6e79b52bc656d52312cc1b1ea8ea543322788 files/digest-catalyst-2.0.4 247
+SHA256 70d2f678f6814859325b6eb81aa32604477a1025f9817ec8f3e0e6c2d1109000 files/digest-catalyst-2.0.4 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGFxwL8bi6rjpTunYRAsW/AJwKwWeAYOrPnOeQ6hFnhXUUHNqbagCgpSAe
-0UKEOa1gCNItzgA5keCUBNs=
-=vCob
+iD8DBQFGHovnkT4lNIS36YERAlK0AJwMn+C8HCjq46LGp5pI6NKUeLJkGQCeNKTx
+L9OmVcsS0ksMROa/NpaXwu4=
+=xSPQ
 -----END PGP SIGNATURE-----

diff --git a/dev-util/catalyst/catalyst-2.0.2.ebuild b/dev-util/catalyst/catalyst-2.0.2.ebuild
deleted file mode 100644 (file)
index b322b17..0000000
--- a/dev-util/catalyst/catalyst-2.0.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.2.ebuild,v 1.4 2007/04/07 04:20:04 vapier 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/sources/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-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 )"
-
-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
-       elog "The template spec files are now installed by default.  You can find"
-       elog "them under /usr/share/doc/${PF}/examples"
-       elog "and they are considered to be the authorative source of information"
-       elog "on catalyst."
-}
-
-src_install() {
-       insinto /usr/lib/${PN}/arch
-       doins arch/* || die "copying arch/*"
-       insinto /usr/lib/${PN}/modules
-       doins modules/* || die "copying modules/*"
-       insinto /usr/lib/${PN}/livecd/cdtar
-       doins livecd/cdtar/* || die "copying cdtar/*"
-       insinto /usr/lib/${PN}/livecd/files
-       doins livecd/files/* || die "copying files/*"
-       for x in targets/*; do
-               exeinto /usr/lib/${PN}/$x
-               doexe $x/* || die "copying ${x}"
-       done
-       exeinto /usr/lib/${PN}
-       doexe catalyst || die "copying catalyst"
-       dodir /usr/bin
-       dosym /usr/lib/${PN}/catalyst /usr/bin/catalyst
-       insinto /etc/catalyst
-       doins files/catalyst.conf files/catalystrc || die "copying configuration"
-       insinto /usr/share/doc/${PF}/examples
-       doins examples/* || die
-       dodoc README ChangeLog ChangeLog.old AUTHORS
-       doman files/catalyst.1
-       # Here is where we actually enable ccache
-       use ccache && \
-               dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
-               /etc/catalyst/catalyst.conf
-}
-
-pkg_postinst() {
-       elog "You can find more information about catalyst by checking out the"
-       elog "catalyst project page at:"
-       elog "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-       echo
-}

diff --git a/dev-util/catalyst/catalyst-2.0.3.ebuild b/dev-util/catalyst/catalyst-2.0.4.ebuild
similarity index 97%
rename from dev-util/catalyst/catalyst-2.0.3.ebuild
rename to dev-util/catalyst/catalyst-2.0.4.ebuild
index be4d45869b9fe2c50a063ead52296b615cdaf92b..9a63f752f82ddae7583ac63be3175b12d0829eeb 100644 (file)
--- a/dev-util/catalyst/catalyst-2.0.3.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.3.ebuild,v 1.3 2007/04/07 04:20:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.4.ebuild,v 1.1 2007/04/12 19:43:30 wolf31o2 Exp $
 
 inherit eutils
 

diff --git a/dev-util/catalyst/files/digest-catalyst-2.0.2 b/dev-util/catalyst/files/digest-catalyst-2.0.2
deleted file mode 100644 (file)
index da84310..0000000
--- a/dev-util/catalyst/files/digest-catalyst-2.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 637c249f797dc8a7aa23665049dbb310 catalyst-2.0.2.tar.bz2 782576
-RMD160 06cd53d2ec71a69137f655c2b3b1dbf00f7852aa catalyst-2.0.2.tar.bz2 782576
-SHA256 dec7118411f06322792720c8dc0977ae020552bdf2e35c5ef1735f37b2266a65 catalyst-2.0.2.tar.bz2 782576

diff --git a/dev-util/catalyst/files/digest-catalyst-2.0.3 b/dev-util/catalyst/files/digest-catalyst-2.0.3
deleted file mode 100644 (file)
index 5b5355f..0000000
--- a/dev-util/catalyst/files/digest-catalyst-2.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 274f5b89f6ea164bbd3ef99e8f034d12 catalyst-2.0.3.tar.bz2 783648
-RMD160 f59d8cb5e08464ebac8c3dbc7292903a4cc08812 catalyst-2.0.3.tar.bz2 783648
-SHA256 7355cb93f23071be80d10a5269b8f2a78edd9626cf4ad8f717a79139a4189ad5 catalyst-2.0.3.tar.bz2 783648

diff --git a/dev-util/catalyst/files/digest-catalyst-2.0.4 b/dev-util/catalyst/files/digest-catalyst-2.0.4
new file mode 100644 (file)
index 0000000..89b50c0
--- /dev/null
+++ b/dev-util/catalyst/files/digest-catalyst-2.0.4
@@ -0,0 +1,3 @@
+MD5 193e84c9b38201a38f3201d45910e221 catalyst-2.0.4.tar.bz2 784337
+RMD160 dec8bc5d84bc567d54b49d9be5a5f9c601d73b92 catalyst-2.0.4.tar.bz2 784337
+SHA256 7a84540f8aab6287e68aa50465ae70a25b0ef7bf3e3aff778958e37b5dd0081c catalyst-2.0.4.tar.bz2 784337