From 714deebfde0ff9a5d8d41d8ba3dc0dc8fcd18043 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 11 Sep 2011 20:02:42 +0000 Subject: [PATCH] Mask jdk/jre 1.7 until icedtea7 is ready, bug #382485. --- profiles/ChangeLog | 5 ++++- profiles/package.mask | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 6e32e0555bcc..ef76515ca543 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.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 package.mask: + Mask jdk/jre 1.7 until icedtea7 is ready, bug #382485. + 11 Sep 2011; Michał Górny 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 e1b247b7d31a..dd201c4ffd2d 100644 --- 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 (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 (07 Sep 2011) # New releases from Jane Street, breaks their rev. deps for now >=dev-ml/sexplib-7 -- 2.26.2