Slotmove grub2 from 0 to 2 to awoid collisions with old grub2 ebuilds that were incoh...

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index efac445b548e2bcbef2f8b7a1c18de43aa9eb993..ec00655d4d0dbd1b67f55764df1bb25e09ed7d52 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5668 2011/08/31 14:19:15 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5669 2011/08/31 15:28:08 scarabeus Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  31 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> updates/3Q-2011:
+  Slotmove grub2 from 0 to 2 to awoid collisions with old grub2 ebuilds that
+  were incoherent with their slot.
+
   31 Aug 2011; Sebastian Pipping <sping@gentoo.org> package.mask:
   Mask upcoming ~media-gfx/gimp-2.7.3
 

diff --git a/profiles/updates/3Q-2011 b/profiles/updates/3Q-2011
index b5255b32ecc97dd2b93ec6e6240517ba710f6eab..bf548a2b1016dfa364868904477536b0d18b6d4b 100644 (file)
--- a/profiles/updates/3Q-2011
+++ b/profiles/updates/3Q-2011
@@ -15,3 +15,4 @@ slotmove =kde-misc/steamcompanion-0.2.2 0 4
 move app-editors/gentoo-editor app-misc/editor-wrapper
 move dev-php5/pecl-memcache dev-php/pecl-memcache
 move kde-misc/smaragd x11-themes/smaragd
+slotmove >sys-boot/grub-1 0 2