Removed lib-compat from dependencies because it is not needed by 1.4.2 or 1.5, fixes bug #115011. Also added proper dependencies to sun-jdk-1.4.2.10.ebuild.

Package-Manager: portage-2.0.53

4 files changed, 38 insertions, 17 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 290e97a2d123..c2a222fff2a5 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.130 2005/12/07 23:06:48 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.131 2005/12/09 20:22:50 betelgeuse Exp $
+
+  09 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
+  sun-jdk-1.4.2.10.ebuild, sun-jdk-1.5.0.06.ebuild:
+  Removed lib-compat from dependencies because it is not needed by 1.4.2 or
+  1.5, fixes bug #115011. Also added proper dependencies to
+  sun-jdk-1.4.2.10.ebuild.
 
 *sun-jdk-1.5.0.06 (07 Dec 2005)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 7e4adb77432d..f384af68ec31 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 069bc82d95bded21a438b45f2a867954 ChangeLog 26715
+MD5 2890d686ed1d5139335d7d120321bce7 ChangeLog 26984
 MD5 92fc551c12c9a260dd9ced69d15cf0f3 files/digest-sun-jdk-1.2.2.017 78
 MD5 7339eea38c2cfdfdc4cd777a02c4cbc1 files/digest-sun-jdk-1.3.1.16 76
 MD5 ce8f1c0c94a74aadae5d58b68c254161 files/digest-sun-jdk-1.4.2.09 140
@@ -19,13 +19,13 @@ MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 MD5 6e6334f4e89e27aca419bc2dea752336 sun-jdk-1.2.2.017.ebuild 2898
 MD5 89ea449d6a1117e1995a2d7bf53a3d0d sun-jdk-1.3.1.16.ebuild 4149
 MD5 668a0b7c052c6d32ec1183e8beef1d09 sun-jdk-1.4.2.09.ebuild 6866
-MD5 e9955abd573ac0dd3c65b7cda17647dd sun-jdk-1.4.2.10.ebuild 6865
+MD5 5e60f423dc76ea1de9958374482190e1 sun-jdk-1.4.2.10.ebuild 7138
 MD5 881e1d3c90a77528a35f1953302c7450 sun-jdk-1.5.0.05.ebuild 7350
-MD5 87a394239c5ac10843300ffa5797fe38 sun-jdk-1.5.0.06.ebuild 7628
+MD5 9cf8a3a0a1c35e6357d42f00c73c5328 sun-jdk-1.5.0.06.ebuild 7600
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDl2sWQiJ/wx066S4RAp90AJ9RvTHTiEkJ/IKc7+HyQHwbl/Zb5ACePOka
-jk/nbG8LUbYgCXhmRZjQ5pg=
-=Y0JX
+iD8DBQFDmefHQiJ/wx066S4RAk2UAJ9iFKEdpB95I7kNfXJZUZ89UDlpDgCgjcwZ
+lTtL4YdGEWBm9nxf+Zq34wY=
+=d5Ew
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild
index e39ac189cc5f..93f09d4cb9ec 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4.2.10.ebuild,v 1.2 2005/11/29 09:40:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild,v 1.3 2005/12/09 20:22:50 betelgeuse Exp $
 
 inherit java eutils
 
@@ -26,10 +26,25 @@ IUSE="doc browserplugin nsplugin jce mozilla examples"
 DEPEND=">=dev-java/java-config-1.1.5
 	>=sys-libs/glibc-2.3.5
 	sys-apps/sed
-	app-arch/unzip
-	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
-
-RDEPEND="sys-libs/lib-compat"
+	app-arch/unzip"
+
+RDEPEND=">=sys-libs/glibc-2.3.5
+	alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.4.2* )
+	X? ( || ( ( x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libX11
+				x11-libs/libXau
+				x11-libs/libXdmcp
+				x11-libs/libXext
+				x11-libs/libXi
+				x11-libs/libXp
+				x11-libs/libXt
+				x11-libs/libXtst
+			  )
+				virtual/x11
+			)
+		)"
 
 PROVIDE="virtual/jre virtual/jdk"
 
@@ -125,9 +140,9 @@ src_install() {
 		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
 	fi
 
-	if use nsplugin ||       # global useflag for netscape-compat plugins
+	if use nsplugin ||		 # global useflag for netscape-compat plugins
 	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then     # wrong but used to honor it
+	   use mozilla; then	 # wrong but used to honor it
 		local plugin_dir="ns610"
 		if has_version '>=sys-devel/gcc-3.2' ; then
 			plugin_dir="ns610-gcc32"
@@ -199,7 +214,7 @@ pkg_postinst() {
 	if ! use nsplugin && ( use browserplugin || use mozilla ); then
 		echo
 		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
+		ewarn "future jdk/jre ebuilds for plugin installation.	Please"
 		ewarn "update your USE to include 'nsplugin'."
 	fi
 }
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild
index c31399521a0e..cb1065ea7bbc 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.5.0.06.ebuild,v 1.1 2005/12/07 22:59:33 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild,v 1.2 2005/12/09 20:22:50 betelgeuse Exp $
 
 inherit java eutils
 
@@ -35,7 +35,7 @@ DEPEND=">=dev-java/java-config-1.2
 	jce? ( app-arch/unzip )
 	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
 
-RDEPEND="x86? ( sys-libs/lib-compat )
+RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	doc? ( =dev-java/java-sdk-docs-1.5.0* )
 	X? ( || ( ( x11-libs/libICE