Mask Opera 10.11 (bug #326571 and bug #326413).

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 7547fe38dce9fb71f2aebbab8c89ed49ce4dd387..ba6a74ea6cbc13eaaa1e70453d6a1bdaa7d7a53d 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4383 2010/07/09 10:18:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4384 2010/07/09 16:44:59 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!
 
+  09 Jul 2010; Jeroen Roovers <jer@gentoo.org> package.mask:
+  Mask Opera 10.11 (bug #326571 and bug #326413).
+
   09 Jul 2010; Pacho Ramos <pacho@gentoo.org> package.mask:
   Mask dev-libs/gnome-build for removal
 

diff --git a/profiles/package.mask b/profiles/package.mask
index 6d4f5e6e413ae443d15a962a4bdb30c2d892fd66..770427d4c925517f0e1d10755cfa77e020f68723 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11754 2010/07/09 13:31:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11755 2010/07/09 16:44:59 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
@@ -31,6 +31,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Jeroen Roovers <jer@gentoo.org> (08 Jul 2010)
+# Unmask this only if you need to import certificates
+# manually and when Opera >=10.60 refuses to (bug #326571)
+=www-client/opera-10.11
+
 # Pacho Ramos <pacho@gentoo.org> (09 Jul 2010)
 # Masked for removal in 30 days since it's no longer needed now that we
 # don't have old anjuta versions in the tree, see bug #327593