This is catalyst 2.0.6.915

diff --git a/ChangeLog b/ChangeLog
index 791f0e3dbe3e5322eaebd09d369584c5b6db42a9..5cc5e61480c6bf9e1ff9dd02d7a62bfeb773edef 100644 (file)
--- 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 <armin76@gentoo.org> catalyst,
+  targets/support/chroot-functions.sh:
+  This is catalyst 2.0.6.915
+
+  10 Apr 2011; Raúl Porcel <armin76@gentoo.org>
+  targets/support/chroot-functions.sh:
+  Replace virtual/portage with sys-apps/portage, bug #358847
+
   05 Feb 2011; Raúl Porcel <armin76@gentoo.org> catalyst:
   This is catalyst 2.0.6.914
 

diff --git a/catalyst b/catalyst
index b8fd848ee1fcb9e96f02795f03277489f7c70237..fdf85707ee34db897c82d8bb7d2ab11b67ebdbf9 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -17,7 +17,7 @@ import catalyst.config
 import catalyst.util
 
 __maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__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 4e07d44e7000888aaa9fc11d41cd982bdd7ed758..72fee20d6aae02f2e757da76ba836a0f5a7d1caf 100644 (file)
--- 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
 }