Resolve file collision for sci-libs/Fiona between SLOTs

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 88af6c91dad35bdf6c340af4da4b794df7c96e82..b1ba13887176ccbeaf3129cf6c53e04fd5632709 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9669 2015/01/08 12:19:45 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9670 2015/01/08 12:49:11 jlec 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!
 
+  08 Jan 2015; Justin Lecher <jlec@gentoo.org> +updates/1Q-2015:
+  Resolve file collision for sci-libs/Fiona between SLOTs
+
   08 Jan 2015; Eray Aslan <eras@gentoo.org> package.mask:
   Unmask mail-client/squirrelmail-1.4.23_pre - bug #524238
 
@@ -28,6 +31,7 @@
   05 Jan 2015; Tony Vroon <chainsaw@gentoo.org> package.mask:
   Mask Asterisk 13 branch.
 
+>>>>>>> 1.9669
   01 Jan 2015; Mikle Kolyada <zlogene@gentoo.org> package.mask:
   Remove obsolete dev-perl masks.
 

diff --git a/profiles/updates/1Q-2015 b/profiles/updates/1Q-2015
new file mode 100644 (file)
index 0000000..28fcc7e
--- /dev/null
+++ b/profiles/updates/1Q-2015
@@ -0,0 +1,2 @@
+slotmove sci-libs/Fiona 1.1 0
+slotmove sci-libs/Fiona 1.4 0