summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-12-16 15:33:39 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-12-16 15:33:39 +0000
commit9b781f372f2c59c9a89735ed4db81a1a9c28d21d (patch)
treef57c080108e13a7139ef28e7fe75c372e46a1edc /dev-java/sun-jre-bin
parentmissed one (diff)
downloadgentoo-2-9b781f372f2c59c9a89735ed4db81a1a9c28d21d.tar.gz
gentoo-2-9b781f372f2c59c9a89735ed4db81a1a9c28d21d.tar.bz2
gentoo-2-9b781f372f2c59c9a89735ed4db81a1a9c28d21d.zip
No longer needs the javaws hack, was fixed upstream #115772
(Portage version: 2.0.53)
Diffstat (limited to 'dev-java/sun-jre-bin')
-rw-r--r--dev-java/sun-jre-bin/ChangeLog6
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10.ebuild11
2 files changed, 7 insertions, 10 deletions
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}