diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-12-16 11:12:06 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-12-16 11:12:06 +0000 |
| commit | 6aa3a63e0e0820d93c1e69b6704a7b00b08d7d2e (patch) | |
| tree | eac28295dc0071b547261cc8345c67322d1a1cc5 /virtual/jdk | |
| parent | alpha/ia64/sparc stable wrt #202168 (diff) | |
| download | gentoo-2-6aa3a63e0e0820d93c1e69b6704a7b00b08d7d2e.tar.gz gentoo-2-6aa3a63e0e0820d93c1e69b6704a7b00b08d7d2e.tar.bz2 gentoo-2-6aa3a63e0e0820d93c1e69b6704a7b00b08d7d2e.zip | |
Add ibm-jdk-bin-1.6 to jdk-1.6 alternatives.
(Portage version: 2.1.4_rc9)
Diffstat (limited to 'virtual/jdk')
| -rw-r--r-- | virtual/jdk/ChangeLog | 5 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.6.0.ebuild | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog index c096b4d31b47..5b38b02a0ede 100644 --- a/virtual/jdk/ChangeLog +++ b/virtual/jdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for virtual/jdk # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.16 2007/10/19 14:55:03 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.17 2007/12/16 11:12:06 caster Exp $ + + 16 Dec 2007; Vlastimil Babka <caster@gentoo.org> jdk-1.6.0.ebuild: + Add ibm-jdk-bin-1.6 to jdk-1.6 alternatives. 19 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org> jdk-1.6.0.ebuild: amd64 stable, bug #194711 diff --git a/virtual/jdk/jdk-1.6.0.ebuild b/virtual/jdk/jdk-1.6.0.ebuild index eb2f448f6c0c..3a938eff8c14 100644 --- a/virtual/jdk/jdk-1.6.0.ebuild +++ b/virtual/jdk/jdk-1.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.3 2007/10/19 14:55:03 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.4 2007/12/16 11:12:06 caster Exp $ DESCRIPTION="Virtual for JDK" HOMEPAGE="http://java.sun.com/" @@ -11,5 +11,8 @@ SLOT="1.6" KEYWORDS="amd64 x86" IUSE="" -RDEPEND="=dev-java/sun-jdk-1.6.0*" +RDEPEND="|| ( + =dev-java/sun-jdk-1.6.0* + =dev-java/ibm-jdk-bin-1.6.0* + )" DEPEND="" |