summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-09-11 14:24:03 +0000
committerMichał Górny <mgorny@gentoo.org>2014-09-11 14:24:03 +0000
commit2707d040156e58cf851efcfc53b018ffb9314e7e (patch)
treef75d2bc174615fcaf9da0d52107e56cfe17b4459 /profiles
parentfix security bug 522576 (diff)
downloadgentoo-2-2707d040156e58cf851efcfc53b018ffb9314e7e.tar.gz
gentoo-2-2707d040156e58cf851efcfc53b018ffb9314e7e.tar.bz2
gentoo-2-2707d040156e58cf851efcfc53b018ffb9314e7e.zip
Mask new version of gentoo-bashcomp aside bash-completion-2.1-r90.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask7
2 files changed, 10 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 1387726f0a5b..cc704e6a267e 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9366 2014/09/11 02:57:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9367 2014/09/11 14:24:03 mgorny 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!
+ 11 Sep 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Mask new version of gentoo-bashcomp aside bash-completion-2.1-r90.
+
11 Sep 2014; Patrick Lauer <patrick@gentoo.org> package.mask:
Mask dev-libs/ibpp as it has unsatisfied dependencies
diff --git a/profiles/package.mask b/profiles/package.mask
index c8bd8eee8098..6f64a6bc475a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16026 2014/09/11 02:57:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16027 2014/09/11 14:24:03 mgorny 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
@@ -162,7 +162,12 @@ virtual/ruby-threads:jruby
# Work-in-progress. Mask for some more testing and documentation,
# a news item and till at least some of the blockers are fixed.
# Bug #521146 for a tracker.
+#
+# Mask relevant gentoo-bashcomp too, since pretty much all it does is
+# splitting the completions. Upgrading before switching to -r90 would
+# mean that users have to re-enable all the completions.
>=app-shells/bash-completion-2.1-r90
+>=app-shells/gentoo-bashcomp-20140911
# Sergey Popov <pinkbyte@gentoo.org> (27 Aug 2014)
# Does not work since late 2013, due to update servers shutdown