diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-09-16 11:21:46 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-09-16 11:21:46 +0000 |
| commit | 5b4cfc8376c0d4cb7f13fd5474759e913c285a9f (patch) | |
| tree | 6dd3886299aaa1d18b5d06adcd6a21a9ea35429d /profiles | |
| parent | fix php/gd dependency (bug #337034) (diff) | |
| download | gentoo-2-5b4cfc8376c0d4cb7f13fd5474759e913c285a9f.tar.gz gentoo-2-5b4cfc8376c0d4cb7f13fd5474759e913c285a9f.tar.bz2 gentoo-2-5b4cfc8376c0d4cb7f13fd5474759e913c285a9f.zip | |
Remove mask for sun-jdk-1.5 and jmp which were removed.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 13 |
2 files changed, 5 insertions, 13 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 9506c7dde662..41db5e1971fb 100644 --- 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.4560 2010/09/15 10:55:08 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4561 2010/09/16 11:21:46 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! + 16 Sep 2010; Vlastimil Babka <caster@gentoo.org> package.mask: + Remove mask for sun-jdk-1.5 and jmp which were removed. + 15 Sep 2010; Pacho Ramos <pacho@gentoo.org> package.mask: Mask new emul-linux-x86-opengl version for ~arch and overlay users. diff --git a/profiles/package.mask b/profiles/package.mask index b4ec77adc33b..42e67a732dc6 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11945 2010/09/15 10:55:08 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11946 2010/09/16 11:21:46 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 @@ -531,17 +531,6 @@ dev-php5/znf >=dev-util/nvidia-cuda-sdk-3.1 >=dev-util/nvidia-cuda-toolkit-3.1 -# 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 - # Nirbheek Chauhan <nirbheek@gentoo.org> (29 Jun 2010) # Mask dev-libs/seed; several ebuild issues, and missing pure-runtime deps # Also needs USE=introspection to be unmasked |