summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-08-31 15:28:08 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-08-31 15:28:08 +0000
commit7581e546ce0ab4c120dbba256b71e03b4e0ba67c (patch)
tree3e19d1ae5d75b55fb3ddd3616cf1611fa3f5ff39 /profiles
parentDrop HPPA, PPC64 (bug #381303). (diff)
downloadhistorical-7581e546ce0ab4c120dbba256b71e03b4e0ba67c.tar.gz
historical-7581e546ce0ab4c120dbba256b71e03b4e0ba67c.tar.bz2
historical-7581e546ce0ab4c120dbba256b71e03b4e0ba67c.zip
Slotmove grub2 from 0 to 2 to awoid collisions with old grub2 ebuilds that were incoherent with their slot.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/updates/3Q-20111
2 files changed, 6 insertions, 1 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index efac445b548e..ec00655d4d0d 100644
--- 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 b5255b32ecc9..bf548a2b1016 100644
--- 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