4 files changed, 12 insertions, 20 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index c2a222fff2a5..611b7cbe3216 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.131 2005/12/09 20:22:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.132 2005/12/16 15:30:30 axxo Exp $
+
+  16 Dec 2005; Thomas Matthijs <axxo@gentoo.org> sun-jdk-1.4.2.10.ebuild:
+  No longer needs the javaws hack, was fixed upstream #115772
 
   09 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
   sun-jdk-1.4.2.10.ebuild, sun-jdk-1.5.0.06.ebuild:
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 a20ddf10a98d..3d5440009f94 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.4 2005/12/13 21:08:57 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.10.ebuild,v 1.5 2005/12/16 15:30:30 axxo Exp $
 
 inherit java eutils
 
@@ -24,7 +24,6 @@ IUSE="X alsa doc browserplugin nsplugin jce mozilla examples"
 
 #glibc dep: #102423
 DEPEND=">=dev-java/java-config-1.1.5
-	>=sys-libs/glibc-2.3.5
 	sys-apps/sed
 	app-arch/unzip"
 
@@ -101,13 +100,6 @@ src_unpack() {
 			fi
 		done
 	fi
-	#javaws hack
-	cd ${S}
-	sed -i "s,^exec,export LD_PRELOAD=/opt/${P}/jre/javaws/javaws-waitid.so\nexec," jre/javaws/javaws || die "javaws sed failed"
-}
-
-src_compile() {
-	gcc -O2 -fPIC -g0 -shared -o ${S}/jre/javaws/javaws-waitid.so ${FILESDIR}/javaws-waitid.c || die "failed to compile javaws hack"
 }
 
 src_install() {
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index dea33d334b1b..97724b31630f 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.37 2005/12/07 22:55:04 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.38 2005/12/16 15:33:39 axxo Exp $
+
+  16 Dec 2005; Thomas Matthijs <axxo@gentoo.org>
+  sun-jre-bin-1.4.2.10.ebuild:
+  No longer needs the javaws hack, was fixed upstream #115772
 
 *sun-jre-bin-1.5.0.06 (07 Dec 2005)
 
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10.ebuild
index 67f38880f156..2271c331d2be 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-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-jre-bin/sun-jre-bin-1.4.2.10.ebuild,v 1.2 2005/11/29 09:41:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10.ebuild,v 1.3 2005/12/16 15:33:39 axxo Exp $
 
 inherit java eutils
 
@@ -20,7 +20,7 @@ IUSE="browserplugin nsplugin mozilla"
 DEPEND=">=dev-java/java-config-1.1.5
 	sys-apps/sed"
 
-RDEPEND="sys-libs/lib-compat"
+RDEPEND=""
 
 PROVIDE="virtual/jre"
 
@@ -65,15 +65,8 @@ src_unpack() {
 			fi
 		done
 	fi
-	cd ${S}
-	sed -i "s,^exec,export LD_PRELOAD=/opt/${P}/javaws/javaws-waitid.so\nexec," javaws/javaws || die "javaws sed failed"
 }
 
-src_compile() {
-	gcc -O2 -fPIC -g0 -shared -o ${S}/javaws/javaws-waitid.so ${FILESDIR}/javaws-waitid.c || die "failed to compile javaws hack"
-}
-
-
 src_install() {
 	local dirs="bin lib man javaws plugin"
 	dodir /opt/${P}