Mask jdk/jre 1.7 until icedtea7 is ready, bug #382485.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 6e32e0555bcc746f01b41a711dd65d907adcba5b..ef76515ca543f36eda7e0788d239761d45225772 100644 (file)
--- 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.5689 2011/09/11 07:34:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5690 2011/09/11 20:02:42 caster 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 2011; Vlastimil Babka <caster@gentoo.org> package.mask:
+  Mask jdk/jre 1.7 until icedtea7 is ready, bug #382485.
+
   11 Sep 2011; Michał Górny <mgorny@gentoo.org> base/package.use.mask:
   Unmask systemd[audit] as audit-2 is no longer masked, bug #372865.
 

diff --git a/profiles/package.mask b/profiles/package.mask
index e1b247b7d31a43554e5c0d1cbf31bbf461ef51e2..dd201c4ffd2d5cb18855f8946fb0755b7e4332d7 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13037 2011/09/11 02:59:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13038 2011/09/11 20:02:42 caster 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,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Vlastimil Babka <caster@gentoo.org> (11 Sep 2011)
+# Masked until Icedtea7 final is released, to prevent pulling oracle-jdk-bin for everyone.
+# If you want oracle-jdk-bin as the only installed JDK, unmask this locally.
+# Bug #382485.
+=virtual/jdk-1.7*
+=virtual/jre-1.7*
+
 # Alexis Ballier <aballier@gentoo.org> (07 Sep 2011)
 # New releases from Jane Street, breaks their rev. deps for now
 >=dev-ml/sexplib-7