summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2015-07-05 06:39:06 +0000
committerHans de Graaff <graaff@gentoo.org>2015-07-05 06:39:06 +0000
commita970f327d6649f6a44c90e67dc5a37324242c47e (patch)
treed957cf37038d6af169380bba0b8aa0cdf6c00b81 /profiles
parentRemove mask for removed www-servers/gorg. (diff)
downloadgentoo-2-a970f327d6649f6a44c90e67dc5a37324242c47e.tar.gz
gentoo-2-a970f327d6649f6a44c90e67dc5a37324242c47e.tar.bz2
gentoo-2-a970f327d6649f6a44c90e67dc5a37324242c47e.zip
Mask old slot of dev-ruby/dotenv for removal, fixing bug 553402.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask9
2 files changed, 12 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index fd84421c8046..2e6e0efce686 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.10165 2015/07/05 06:32:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.10166 2015/07/05 06:39:05 graaff 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!
05 Jul 2015; Hans de Graaff <graaff@gentoo.org> package.mask:
+ Mask old slot of dev-ruby/dotenv for removal, fixing bug 553402.
+
+ 05 Jul 2015; Hans de Graaff <graaff@gentoo.org> package.mask:
Remove mask for removed www-servers/gorg.
04 Jul 2015; Anthony G. Basile <blueness@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index 2f5a467847b3..9fea4c9f4315 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16649 2015/07/05 06:32:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16650 2015/07/05 06:39:06 graaff Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,13 @@
#--- END OF EXAMPLES ---
+# Hans de Graaff <graaff@gentoo.org> (5 Jul 2015)
+# Mask for removal in 30 days. This is an old slot with a supporting
+# package only needed for this slot. Use dev-ruby/dotenv:2 instead.
+# This also fixes bug #553402 (file collision between slots).
+dev-ruby/dotenv:0
+dev-ruby/dotenv-deployment
+
# Michael Orlitzky <mjo@gentoo.org> (3 Jul 2015)
# Mask for removal in 30 days. Superseded by dev-haskell/biosff;
# use that instead. Bug #553636.