summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2008-01-23 21:07:38 +0000
committerVlastimil Babka <caster@gentoo.org>2008-01-23 21:07:38 +0000
commit4fcdc02831348b1626b22bde3c4c927f5de18fd5 (patch)
tree4b646405d9c58195dc3f69d71d8e0828b5ac8bec /dev-java
parentFix require_kernel_config call thanks to Pacho Ramos in bug #207207 (diff)
downloadhistorical-4fcdc02831348b1626b22bde3c4c927f5de18fd5.tar.gz
historical-4fcdc02831348b1626b22bde3c4c927f5de18fd5.tar.bz2
historical-4fcdc02831348b1626b22bde3c4c927f5de18fd5.zip
Put back dependency on java-sdk-docs with USE=doc - bug #207181.
Package-Manager: portage-2.1.4
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/sun-jdk/ChangeLog5
-rw-r--r--dev-java/sun-jdk/Manifest16
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.6.0.04.ebuild4
3 files changed, 14 insertions, 11 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 95c4822c082b..99156c4ffe36 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/sun-jdk
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.223 2008/01/18 14:47:33 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.224 2008/01/23 21:07:38 caster Exp $
+
+ 23 Jan 2008; Vlastimil Babka <caster@gentoo.org> sun-jdk-1.6.0.04.ebuild:
+ Put back dependency on java-sdk-docs with USE=doc - bug #207181.
*sun-jdk-1.6.0.04 (18 Jan 2008)
*sun-jdk-1.5.0.14 (18 Jan 2008)
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 60745b34a599..68416a369d34 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -40,14 +40,14 @@ EBUILD sun-jdk-1.6.0.03.ebuild 4808 RMD160 2518cd8c39d92fa07c1c156b91acb8756bb74
MD5 f3b0794aea1e2d275fbb50b40440cf27 sun-jdk-1.6.0.03.ebuild 4808
RMD160 2518cd8c39d92fa07c1c156b91acb8756bb74d29 sun-jdk-1.6.0.03.ebuild 4808
SHA256 5946505911f45ff895860406ac6fe2b08be9a10f19b1364da7d1929605c3669a sun-jdk-1.6.0.03.ebuild 4808
-EBUILD sun-jdk-1.6.0.04.ebuild 4529 RMD160 cc0d2d08bea0da3c79618e7f3d5bf0001520152a SHA1 bfd3521a814908473f7315a37bc7efd2fec4dbad SHA256 bbf8a12ea35d3f33da1c34908b2d52a0e4f1cccea3628bd7b5d8d065a6169a9d
-MD5 2c94b7010e6206a79b29d30926f16f25 sun-jdk-1.6.0.04.ebuild 4529
-RMD160 cc0d2d08bea0da3c79618e7f3d5bf0001520152a sun-jdk-1.6.0.04.ebuild 4529
-SHA256 bbf8a12ea35d3f33da1c34908b2d52a0e4f1cccea3628bd7b5d8d065a6169a9d sun-jdk-1.6.0.04.ebuild 4529
-MISC ChangeLog 42924 RMD160 9fbef3ca73c13f77448cba21ef6e1c3837806309 SHA1 3134b060d4595a3881b40e4a9f298c956a7c0cd2 SHA256 4306ed1a3bf22406fbc8b0dc4385495f3187643eba9413bacfdc0bec977033a1
-MD5 2a8b16dde0388514ed0ab177b7c9b6a1 ChangeLog 42924
-RMD160 9fbef3ca73c13f77448cba21ef6e1c3837806309 ChangeLog 42924
-SHA256 4306ed1a3bf22406fbc8b0dc4385495f3187643eba9413bacfdc0bec977033a1 ChangeLog 42924
+EBUILD sun-jdk-1.6.0.04.ebuild 4568 RMD160 b330c226c51a6f898f88c781617648c8c7c151e1 SHA1 f09939447f7127419d84193bb3e1925f870ef5e6 SHA256 665c1272e896dfeb8d138021411cfe4b46d08789b9d45c176005abbf456e5252
+MD5 f5eb8e7f4282b8cc8e9c988a5e41cffc sun-jdk-1.6.0.04.ebuild 4568
+RMD160 b330c226c51a6f898f88c781617648c8c7c151e1 sun-jdk-1.6.0.04.ebuild 4568
+SHA256 665c1272e896dfeb8d138021411cfe4b46d08789b9d45c176005abbf456e5252 sun-jdk-1.6.0.04.ebuild 4568
+MISC ChangeLog 43068 RMD160 4c8e4f30f2dda8329f357f74e35d721531168c56 SHA1 aae44965e95f86d95c533eca38be70296997853b SHA256 6df7855989be0bc60bdc3247e9fb5310882020d42cf02c34849202e455c78152
+MD5 8a385658828f9e166a54b8cb95579609 ChangeLog 43068
+RMD160 4c8e4f30f2dda8329f357f74e35d721531168c56 ChangeLog 43068
+SHA256 6df7855989be0bc60bdc3247e9fb5310882020d42cf02c34849202e455c78152 ChangeLog 43068
MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.04.ebuild
index 9c2e8f706dd4..a2059e9a410e 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.04.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.04.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.04.ebuild,v 1.1 2008/01/18 14:47:33 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.04.ebuild,v 1.2 2008/01/23 21:07:38 caster Exp $
inherit versionator java-vm-2 eutils pax-utils
@@ -27,7 +27,7 @@ QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so
opt/${P}/jre/lib/i386/server/libjvm.so"
DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
-RDEPEND="
+RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* )
x86? ( =virtual/libstdc++-3.3 )
sys-libs/glibc
alsa? ( media-libs/alsa-lib )