summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2014-03-31 12:01:43 +0000
committerTom Wijsman <tomwij@gentoo.org>2014-03-31 12:01:43 +0000
commitb12e0acb4c1059ba1eab6bf166c2ac54d1babb9c (patch)
tree4391b84aa65fae74078333d25a847dbbfd307584
parentVersion bump. Deblob script not available at this momment. Will update ebuild... (diff)
downloadgentoo-2-b12e0acb4c1059ba1eab6bf166c2ac54d1babb9c.tar.gz
gentoo-2-b12e0acb4c1059ba1eab6bf166c2ac54d1babb9c.tar.bz2
gentoo-2-b12e0acb4c1059ba1eab6bf166c2ac54d1babb9c.zip
Prevent users from switching JDK / JRE implementation.
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask10
2 files changed, 12 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index a31df43661ff..b86fe59ed06c 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.8762 2014/03/30 23:04:13 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8763 2014/03/31 12:01:43 tomwij 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!
+ 31 Mar 2014; Tom Wijsman <TomWij@gentoo.org> package.mask:
+ Prevent users from switching JDK / JRE implementation.
+
30 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
arch/amd64/package.use.stable.mask, arch/x86/package.use.stable.mask,
-default/linux/amd64/13.0/package.use.stable.mask,
diff --git a/profiles/package.mask b/profiles/package.mask
index b4745e774c25..b49a1e6ce482 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15524 2014/03/30 18:53:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15525 2014/03/31 12:01:43 tomwij 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
@@ -30,11 +30,17 @@
#--- END OF EXAMPLES ---
+# Tom Wijsman <TomWij@gentoo.org> (31 Mar 2014)
+# Prevent users from switching JDK / JRE implementation.
+#
+# Unmask this if you want to upgrade or switch to Oracle JDK / JRE 1.8.
+>=virtual/jdk-1.8
+>=virtual/jre-1.8
+
# Luca Barbato <lu_zero@gentoo.org> (30 Mar 2014)
# Current stable for upstream, pending a tinderbox run.
~media-video/libav-10
-
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (26 Mar 2014)
# Affected by multiple vulnerabilities, #445916, #471098 and #472280
<media-libs/mesa-9.1.4