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 | c6962f0512dafd617b3c13eae5fe4b6dba4cbf84 (patch) | |
| tree | 5e08f4d7fdc2dda91d95347bd1a52eb31661a8b0 /virtual | |
| parent | alpha/ia64/sparc stable wrt #202168 (diff) | |
| download | historical-c6962f0512dafd617b3c13eae5fe4b6dba4cbf84.tar.gz historical-c6962f0512dafd617b3c13eae5fe4b6dba4cbf84.tar.bz2 historical-c6962f0512dafd617b3c13eae5fe4b6dba4cbf84.zip | |
Add ibm-jdk-bin-1.6 to jdk-1.6 alternatives.
Package-Manager: portage-2.1.4_rc9
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/jdk/ChangeLog | 5 | ||||
| -rw-r--r-- | virtual/jdk/Manifest | 16 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.6.0.ebuild | 7 |
3 files changed, 17 insertions, 11 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/Manifest b/virtual/jdk/Manifest index 771043220d94..1fd0e7011deb 100644 --- a/virtual/jdk/Manifest +++ b/virtual/jdk/Manifest @@ -10,14 +10,14 @@ EBUILD jdk-1.5.0.ebuild 518 RMD160 60930b8ef10ca5c60d1532717f1366a86fff7820 SHA1 MD5 0770c8128f9e226861b50b2b6948e107 jdk-1.5.0.ebuild 518 RMD160 60930b8ef10ca5c60d1532717f1366a86fff7820 jdk-1.5.0.ebuild 518 SHA256 7044ead32acc0064ba646149514def04c9d1e6b0c02969eb8817ca6698fdfe77 jdk-1.5.0.ebuild 518 -EBUILD jdk-1.6.0.ebuild 386 RMD160 6a0bf76d68757b7d9a794f465b59f172f8e8efe9 SHA1 8401ef74ef5620205d4afd26d63d673f259fb6a6 SHA256 3681881bdc4e1b7edbd8b09fac29a32280a119e7da90defb85036a083c0b54ec -MD5 1c98f2a8ea27d9ebb889a48f40fa8a6a jdk-1.6.0.ebuild 386 -RMD160 6a0bf76d68757b7d9a794f465b59f172f8e8efe9 jdk-1.6.0.ebuild 386 -SHA256 3681881bdc4e1b7edbd8b09fac29a32280a119e7da90defb85036a083c0b54ec jdk-1.6.0.ebuild 386 -MISC ChangeLog 2290 RMD160 2caeeef9adcf165efbb7771da87d80d872e62181 SHA1 78f2b85b258fdffaf2557b2982b86621ff519d11 SHA256 d3733616eafd86f6404d88573469badefe24aee16e1452047e380f455cd0da3a -MD5 09528aac0012dd9fd5673182ba945902 ChangeLog 2290 -RMD160 2caeeef9adcf165efbb7771da87d80d872e62181 ChangeLog 2290 -SHA256 d3733616eafd86f6404d88573469badefe24aee16e1452047e380f455cd0da3a ChangeLog 2290 +EBUILD jdk-1.6.0.ebuild 428 RMD160 aa384ea3de76b92d85cdd2b7ef682d4df3412700 SHA1 6c7e7c56493e7c0d2a06c67f59c478e8e45240a3 SHA256 fd8ada608e887fa6f767a113f607d243937e1c3ce5700ce7c191cc731b21cc33 +MD5 f9c89e5e28f957f8ac00aaff8a266752 jdk-1.6.0.ebuild 428 +RMD160 aa384ea3de76b92d85cdd2b7ef682d4df3412700 jdk-1.6.0.ebuild 428 +SHA256 fd8ada608e887fa6f767a113f607d243937e1c3ce5700ce7c191cc731b21cc33 jdk-1.6.0.ebuild 428 +MISC ChangeLog 2408 RMD160 24cabf297574cd425efa05c6c490ace4ed2c4660 SHA1 a31705e54fc05f2655369812321b6dbf8a1be2f5 SHA256 7bbc7faff6ad5896252bebe20afad5114a94047cffdcec611ebc967e8700dba8 +MD5 cb4162e18b230646765b41a66c777e2b ChangeLog 2408 +RMD160 24cabf297574cd425efa05c6c490ace4ed2c4660 ChangeLog 2408 +SHA256 7bbc7faff6ad5896252bebe20afad5114a94047cffdcec611ebc967e8700dba8 ChangeLog 2408 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 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="" |