diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2011-11-04 23:05:51 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2011-11-04 23:05:51 +0000 |
| commit | 82cc583700726288030dc6c7ff3b2b5fa5922a74 (patch) | |
| tree | 778597fe0e6cc828996aaa3153d3f17034d5efa5 | |
| parent | Use and require latest stable vala and vapigen, bug 383355 (diff) | |
| download | historical-82cc583700726288030dc6c7ff3b2b5fa5922a74.tar.gz historical-82cc583700726288030dc6c7ff3b2b5fa5922a74.tar.bz2 historical-82cc583700726288030dc6c7ff3b2b5fa5922a74.zip | |
Unmask jdk-7 and jre-7 now that icedtea-7 is in tree.
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index d35c082f5791..fe32f1dcf888 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.5868 2011/11/04 21:41:20 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5869 2011/11/04 23:05:51 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! + 04 Nov 2011; Vlastimil Babka <caster@gentoo.org> package.mask: + Unmask jdk-7 and jre-7 now that icedtea-7 is in tree. + 04 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> license_groups: Document why arj/freedist/lha cannot be in MISC-FREE. diff --git a/profiles/package.mask b/profiles/package.mask index 8b22f82ddc0e..e8f4575fe854 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13203 2011/11/04 19:49:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13204 2011/11/04 23:05:51 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 @@ -548,13 +548,6 @@ net-zope/zsqlmethods net-zope/zsyncer net-zope/zwiki -# 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* - # Ole Markus With <olemarkus@gentoo.org> (07 Sep 2011) # Masked for removal 7 Oct 2011. # Multiple bugs (315721,341685) and dead upstream |