summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2010-06-30 21:28:37 +0000
committerVlastimil Babka <caster@gentoo.org>2010-06-30 21:28:37 +0000
commit97f87469b72b051e9159ee956e94e2bb59d32e99 (patch)
tree5f77350de9e019ac8c5635374e2763068b9cfe31 /profiles
parentDelete removed packages from mask. (diff)
downloadhistorical-97f87469b72b051e9159ee956e94e2bb59d32e99.tar.gz
historical-97f87469b72b051e9159ee956e94e2bb59d32e99.tar.bz2
historical-97f87469b72b051e9159ee956e94e2bb59d32e99.zip
Mask sun-jdk-1.5 for removal due to EOL and security, bug #292001.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask13
2 files changed, 16 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0191230c71f1..e0d6f6932166 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4362 2010/06/30 21:13:41 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4363 2010/06/30 21:28:37 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!
30 Jun 2010; Vlastimil Babka <caster@gentoo.org> package.mask:
+ Mask sun-jdk-1.5 for removal due to EOL and security, bug #292001.
+
+ 30 Jun 2010; Vlastimil Babka <caster@gentoo.org> package.mask:
Delete removed packages from mask.
30 Jun 2010; Alexey Shvetsov <alexxy@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index 6b2d5c939646..d9372619baa9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11726 2010/06/30 21:13:41 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11727 2010/06/30 21:28:37 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,17 @@
#--- END OF EXAMPLES ---
+# Vlastimil Babka <caster@gentoo.org> (30 Jun 2010)
+# Masked for removal due to EOL and security, bug #292001.
+# Do this to avoid pulling other 1.5 JDK:
+# emerge -av --depclean sun-jdk:1.5 jdk:1.5 jre:1.5
+=dev-java/sun-jdk-1.5*
+
+# Vlastimil Babka <caster@gentoo.org> (30 Jun 2010)
+# Masked for removal due to 1.5 JDK removal, bug #292001.
+# Use dev-java/tijmp for the 1.6 java replacement.
+dev-java/jmp
+
# Alexey Shvetsov <alexxy@gentoo.org> (30 Jun 10)
# Mask for adding
~kde-base/akonadi-4.4.5