From 95701f1b440807bd9cea5af2906525f6439e5157 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 8 Jan 2015 12:49:11 +0000 Subject: [PATCH] Resolve file collision for sci-libs/Fiona between SLOTs --- profiles/ChangeLog | 6 +++++- profiles/updates/1Q-2015 | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 profiles/updates/1Q-2015 diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 88af6c91dad3..b1ba13887176 100644 --- 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 +updates/1Q-2015: + Resolve file collision for sci-libs/Fiona between SLOTs + 08 Jan 2015; Eray Aslan package.mask: Unmask mail-client/squirrelmail-1.4.23_pre - bug #524238 @@ -28,6 +31,7 @@ 05 Jan 2015; Tony Vroon package.mask: Mask Asterisk 13 branch. +>>>>>>> 1.9669 01 Jan 2015; Mikle Kolyada package.mask: Remove obsolete dev-perl masks. diff --git a/profiles/updates/1Q-2015 b/profiles/updates/1Q-2015 new file mode 100644 index 000000000000..28fcc7e643f8 --- /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 -- 2.26.2