summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-11-11 17:37:14 +0000
committerJeroen Roovers <jer@gentoo.org>2011-11-11 17:37:14 +0000
commitd511ba413358f569274e3e58ad37b26e38b370f1 (patch)
tree5beaec0b102585e74365eee5038ff4569a6f6982 /profiles
parentChange hardcoded machine-id path to /etc wrt #390143 by Ewgenij Starostin (diff)
downloadgentoo-2-d511ba413358f569274e3e58ad37b26e38b370f1.tar.gz
gentoo-2-d511ba413358f569274e3e58ad37b26e38b370f1.tar.bz2
gentoo-2-d511ba413358f569274e3e58ad37b26e38b370f1.zip
Mask new opera 11.60 snapshot.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask3
2 files changed, 6 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 89596aa3d041..8ba7a2082e74 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5889 2011/11/10 20:53:03 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5890 2011/11/11 17:37:14 jer 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 Nov 2011; Jeroen Roovers <jer@gentoo.org> package.mask:
+ Mask new opera 11.60 snapshot.
+
11 Nov 2011: Patrick Kursawe <phosphan@gentoo.org> desc/sane_backends.desc:
Added pnm backend description.
diff --git a/profiles/package.mask b/profiles/package.mask
index 5e5a3bae5fa8..126bff031361 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13224 2011/11/11 13:53:32 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13225 2011/11/11 17:37:14 jer 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
@@ -85,6 +85,7 @@ x11-themes/polyester
=www-client/opera-11.60.1139
=www-client/opera-11.60.1144
=www-client/opera-11.60.1145
+=www-client/opera-11.60.1150
# Alexis Ballier <aballier@gentoo.org> (04 Nov 2011)
# Pre-releases of vlc 1.2. Mask it until final version is out