summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2013-12-18 10:17:48 +0000
committerAlex Alexander <wired@gentoo.org>2013-12-18 10:17:48 +0000
commit2e5fe9430c41e573430ec1a05b7e150309c52451 (patch)
treeb4e886ec1f81d67ca56de5962cb63d0d7be7c310 /profiles
parentAnd PYTHON_USEDEP (diff)
downloadgentoo-2-2e5fe9430c41e573430ec1a05b7e150309c52451.tar.gz
gentoo-2-2e5fe9430c41e573430ec1a05b7e150309c52451.tar.bz2
gentoo-2-2e5fe9430c41e573430ec1a05b7e150309c52451.zip
removed old slotmoves from 2Q-2013, they were conflicting with newer ones in 4Q-2013 that revert them.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/updates/2Q-20135
2 files changed, 5 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index e5348f95f702..7d54e0663131 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8431 2013/12/17 12:49:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8432 2013/12/18 10:17:48 wired 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!
+ 18 Dec 2013; Alex Alexander <wired@gentoo.org> updates/2Q-2013:
+ removed old slotmoves from 2Q-2013, they were conflicting with newer ones in
+ 4Q-2013 that revert them.
+
17 Dec 2013; Anthony G. Basile <blueness@gentoo.org> desc/linguas.desc:
Add ky_KG and eo_UY locales
diff --git a/profiles/updates/2Q-2013 b/profiles/updates/2Q-2013
index 7c2e69b804d9..dbcb7472c0cd 100644
--- a/profiles/updates/2Q-2013
+++ b/profiles/updates/2Q-2013
@@ -1,11 +1,6 @@
move kde-misc/print-manager kde-base/print-manager
-slotmove =dev-haskell/cairo-0.12* 0 2
-slotmove =dev-haskell/gio-0.12* 0 2
slotmove =dev-haskell/glade-0.12* 0 2
-slotmove =dev-haskell/glib-0.12* 0 2
slotmove =dev-haskell/gtk-0.12* 0 2
-slotmove =dev-haskell/gtk2hs-buildtools-0.12* 0 2
-slotmove =dev-haskell/pango-0.12* 0 2
slotmove =media-sound/ardour-2.8* 0 2
slotmove =net-libs/libgrss-0.5.0* 0 0.5
move games-engines/gambatte games-emulation/gambatte