summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-05-14 08:46:15 +0000
committerMichał Górny <mgorny@gentoo.org>2014-05-14 08:46:15 +0000
commit63c95d9f4c3268a67ce0273903a90d75a12fb16f (patch)
treecb039033249b82c7b70cedc5f8caa1fa0cdc99b4 /profiles
parentbump; drop py2.6 support, drop IUSE doc, update deps (diff)
downloadhistorical-63c95d9f4c3268a67ce0273903a90d75a12fb16f.tar.gz
historical-63c95d9f4c3268a67ce0273903a90d75a12fb16f.tar.bz2
historical-63c95d9f4c3268a67ce0273903a90d75a12fb16f.zip
Mask multilib cups.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask4
2 files changed, 7 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index a8ecbcc18df5..39e40b3760a7 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.8958 2014/05/14 06:15:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8959 2014/05/14 08:46:15 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!
+ 14 May 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Mask multilib cups.
+
14 May 2014; Hans de Graaff <graaff@gentoo.org> +updates/2Q-2014:
Add missing slotmove for dev-ruby/listen version, bug 510226.
diff --git a/profiles/package.mask b/profiles/package.mask
index 4b13299a5d03..544df299c9fc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15685 2014/05/13 21:55:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15686 2014/05/14 08:46:15 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
@@ -453,6 +453,8 @@ lxde-base/lxpolkit
>=dev-libs/libevent-2.0.21-r1
>=net-dns/unbound-1.4.21-r2
>=net-libs/gnutls-3.3.1-r1
+>=net-print/cups-1.7.1-r2
+>=app-emulation/emul-linux-x86-baselibs-20140508-r1
# Luca Barbato <lu_zero@gentoo.org> (20 Feb 2014)
# Beta ebuild, unmask to test the tree.