From: Raúl Porcel Date: Sun, 10 Apr 2011 17:09:15 +0000 (+0000) Subject: This is catalyst 2.0.6.915 X-Git-Tag: CATALYST_2_0_6_916~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d77540ab2d1993fa85122b987b272f74ccb42bc;p=catalyst.git This is catalyst 2.0.6.915 --- diff --git a/ChangeLog b/ChangeLog index 791f0e3d..5cc5e614 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,16 @@ # ChangeLog for catalyst -# Copyright 1999-2011 Gentoo Foundation; 2008-2010 Various authors (see AUTHORS) +# Copyright 1999-2011 Gentoo Foundation; 2008-2011 Various authors (see AUTHORS) # Distributed under the GPL v2 # $Id$ + 10 Apr 2011; Raúl Porcel catalyst, + targets/support/chroot-functions.sh: + This is catalyst 2.0.6.915 + + 10 Apr 2011; Raúl Porcel + targets/support/chroot-functions.sh: + Replace virtual/portage with sys-apps/portage, bug #358847 + 05 Feb 2011; Raúl Porcel catalyst: This is catalyst 2.0.6.914 diff --git a/catalyst b/catalyst index b8fd848e..fdf85707 100755 --- a/catalyst +++ b/catalyst @@ -17,7 +17,7 @@ import catalyst.config import catalyst.util __maintainer__="Chris Gianelloni " -__version__="2.0.6.914" +__version__="2.0.6.915" conf_values={} @@ -50,7 +50,7 @@ def usage(): def version(): print "Catalyst, version "+__version__ print "Copyright 2003-2008 Gentoo Foundation" - print "Copyright 2008-2010 various authors" + print "Copyright 2008-2011 various authors" print "Distributed under the GNU General Public License version 2.1\n" def parse_config(myconfig): diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 4e07d44e..72fee20d 100644 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -167,7 +167,7 @@ setup_pkgmgr(){ # portage to avoid frying our /etc/make.conf file. Otherwise, we could # just let emerge system could merge it. [ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf - run_merge --oneshot --nodeps virtual/portage + run_merge --oneshot --nodeps sys-apps/portage sed -i '/USE="${USE} build"/d' /etc/make.conf }