New version + a clean up

16 files changed, 372 insertions, 386 deletions

diff --git a/dev-java/sun-j2sdk/ChangeLog b/dev-java/sun-j2sdk/ChangeLog
index 2345c87f7c73..b445cd95efe1 100644
--- a/dev-java/sun-j2sdk/ChangeLog
+++ b/dev-java/sun-j2sdk/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for dev-java/sun-j2sdk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.11 2002/12/17 19:18:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.12 2003/01/12 12:21:42 cretin Exp $
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
+*sun-j2sdk-1.4.1 (12 Jan 2003)
+  12 Jan 2003; Stefan Jones <cretin@gentoo.org>:
+  New version, works here, have fun!
+
 *sun-j2sdk-1.4.0-r3 (21 Nov 2002)
+  12 Jan 2003; Stefan Jones <cretin@gentoo.org> sun-j2sdk-1.4.0-r3.ebuild:
+  Cleaned up the last update.
 
   21 Nov 2002; phoen][x <phoenix@gentoo.org> sun-j2sdk-1.4.0-r3.ebuild,
   files/digest-sun-j2sdk-1.4.0-r3 :
diff --git a/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-disable-sanity-check.patch b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-disable-sanity-check.patch
new file mode 100644
index 000000000000..c7e10b9d4062
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-disable-sanity-check.patch
@@ -0,0 +1,15 @@
+diff -ur Build-j2sdk-1.4.0.orig/control/make/Makefile Build-j2sdk-1.4.0/control/make/Makefile
+--- Build-j2sdk-1.4.0.orig/control/make/Makefile	2002-02-12 07:51:48.000000000 -0600
++++ Build-j2sdk-1.4.0/control/make/Makefile	2002-09-09 15:35:39.000000000 -0500
+@@ -77,7 +77,10 @@
+ include $(BUILDDIR)/generics-rules.gmk
+ include $(BUILDDIR)/cobundle-rules.gmk
+ 
+-all:: sanity $(HOTSPOT) $(MOTIF) $(GENERICS) $(J2SE)
++# Removed sanity dependecy, it will fail on gcc-3.1 (by Tushar <tush@yahoo.com>)
++# Anyone compiling with gcc-3.1 gotta be insane:))
++
++all:: $(HOTSPOT) $(MOTIF) $(GENERICS) $(J2SE)
+ 
+ ifndef DEV_ONLY
+   ifneq ($(ARCH_DATA_MODEL), 64)
diff --git a/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-fix-intl-files.patch b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-fix-intl-files.patch
new file mode 100644
index 000000000000..402cc3b04b6a
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-fix-intl-files.patch
@@ -0,0 +1,30 @@
+diff -ur Build-j2sdk-1.4.0.orig/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po Build-j2sdk-1.4.0/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po
+--- Build-j2sdk-1.4.0.orig/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po	2002-02-12 08:10:28.000000000 -0600
++++ Build-j2sdk-1.4.0/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po	2002-09-09 15:35:39.000000000 -0500
+@@ -21,8 +21,9 @@
+ msgstr "plugin: java á£Ê©ÄØÇÞعæÀÈÔäÚ"
+ msgid  "  a core file was generated"
+ msgstr "  ÄØܨÆíÕøÅÀóòÕù"
+-msgid  "Plugin: trouble with work request from child"
+-msgstr "Plugin: ÄÍùËɱÍÔÓÑÊåÎûÄÖÉ¢àõÆíÙÂ÷î"
++# Duplicate msgid. Removed by Tushar <tush@yahoo.com>
++#msgid  "Plugin: trouble with work request from child"
++#msgstr "Plugin: ÄÍùËɱÍÔÓÑÊåÎûÄÖÉ¢àõÆíÙÂ÷î"
+ msgid  "Plugin: can't find IP address for current host"
+ msgstr "Plugin: ÊÆÄâ̯ÆøЩÅäñ¢Îû IP ÈíÉß"
+ msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
+diff -ur Build-j2sdk-1.4.0.orig/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po Build-j2sdk-1.4.0/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po
+--- Build-j2sdk-1.4.0.orig/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po	2002-02-12 08:10:28.000000000 -0600
++++ Build-j2sdk-1.4.0/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po	2002-09-09 15:35:39.000000000 -0500
+@@ -21,8 +21,9 @@
+ msgstr "plugin: java µ{§Ç¤w¦]°T¸¹¦Ó·´"
+ msgid  "  a core file was generated"
+ msgstr "  ¤w²£¥Í®Ö¤ßÀÉ®×"
+-msgid  "Plugin: trouble with work request from child"
+-msgstr "Plugin: ¤lÃþ§O©Ò­n¨Dªº¤u§@µo¥Í°ÝÃD"
++# Duplicate msgid, removed by Tushar <tush@yahoo.com>
++#msgid  "Plugin: trouble with work request from child"
++#msgstr "Plugin: ¤lÃþ§O©Ò­n¨Dªº¤u§@µo¥Í°ÝÃD"
+ msgid  "Plugin: can't find IP address for current host"
+ msgstr "Plugin: §ä¤£¨ì¥Ø«e¥D¾÷ªº IP ¦ì§}"
+ msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
diff --git a/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch
new file mode 100644
index 000000000000..69414c956dc3
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch
@@ -0,0 +1,35 @@
+--- j2sdk.orig/control/make/motif-rules.gmk	2002-09-06 07:00:16.000000000 +0000
++++ j2sdk/control/make/motif-rules.gmk	2003-01-11 22:02:07.000000000 +0000
+@@ -34,6 +34,9 @@
+ motif-build:
+   ifdef BUILD_MOTIF
+ 	$(CD) $(MOTIF_TOPDIR)/lib/Xm ; \
++	$(CD) util ; \
++	$(MAKE) -k ; \
++	$(CD) .. ; \
+ 	$(MAKE) MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL); \
+ 	$(MAKE) includes MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
+   endif
+@@ -42,16 +45,16 @@
+ 
+ motif-install-lib: $(MOTIF_DIR)/lib 
+   ifdef BUILD_MOTIF
+-	$(CD) $(MOTIF_DIR)/lib; \
+-	$(RM) libXm.a ; \
+-	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/libXm.a .
++#	$(CD) $(MOTIF_DIR)/lib; \
++#	$(RM) libXm.a ; \
++#	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/libXm.a .
+   endif
+ 
+ motif-install-include: $(MOTIF_DIR)/include 
+   ifdef BUILD_MOTIF
+-	$(CD) $(MOTIF_DIR)/include; \
+-	$(RM) Xm ; \
+-	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/Xm/exports/include/Xm .
++#	$(CD) $(MOTIF_DIR)/include; \
++#	$(RM) Xm ; \
++#	$(LN) -s $(ABS_MOTIF_TOPDIR)/lib/Xm/exports/include/Xm .
+   endif
+ #
+ # clobber the workspace, but note that the motif code misses some
diff --git a/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-gcc3-syntax.patch b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-gcc3-syntax.patch
new file mode 100644
index 000000000000..6a714e3086d3
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-gcc3-syntax.patch
@@ -0,0 +1,51 @@
+diff -ru j2sdk.orig/hotspot/src/share/vm/c1/c1_FrameMap.hpp j2sdk/hotspot/src/share/vm/c1/c1_FrameMap.hpp
+--- j2sdk.orig/hotspot/src/share/vm/c1/c1_FrameMap.hpp	2002-09-06 07:03:41.000000000 +0000
++++ j2sdk/hotspot/src/share/vm/c1/c1_FrameMap.hpp	2003-01-11 16:08:49.000000000 +0000
+@@ -196,7 +196,9 @@
+ //--------------------------------------------------------
+ 
+ class ArgumentLocation VALUE_OBJ_CLASS_SPEC {
+-  friend CallingConvention;
++  // friend CallingConvention;
++  // Syntax Error, corrected by Tushar <tush@yahoo.com>
++  friend struct CallingConvention;
+  private:
+   int _n;         // either a register number 0-5 (I0-I5 or O0-O5), or an offset (in words) from SP/FP
+ 
+@@ -246,7 +248,9 @@
+ //--------------------------------------------------------
+ 
+ class CallingConvention: public ResourceObj {
+-  friend FrameMap;
++  // friend FrameMap;
++  // Syntax Error. Corrected by Tushar <tush@yahoo.com>
++  friend class FrameMap;
+ 
+  private:
+   intStack* _args;
+diff -ru j2sdk.orig/hotspot/src/share/vm/opto/loopnode.hpp j2sdk/hotspot/src/share/vm/opto/loopnode.hpp
+--- j2sdk.orig/hotspot/src/share/vm/opto/loopnode.hpp	2002-09-06 07:04:33.000000000 +0000
++++ j2sdk/hotspot/src/share/vm/opto/loopnode.hpp	2003-01-11 16:08:49.000000000 +0000
+@@ -308,7 +308,9 @@
+ // Computes the mapping from Nodes to IdealLoopTrees.  Organizes IdealLoopTrees into a
+ // loop tree.  Drives the loop-based transformations on the ideal graph.
+ class PhaseIdealLoop : public PhaseTransform {
+-  friend IdealLoopTree;
++  // friend IdealLoopTree;
++  // Syntax Error. Corrected by Tushar <tush@yahoo.com>
++  friend class IdealLoopTree;
+   // Pre-computed def-use info
+   PhaseIterGVN &_igvn;
+ 
+diff -ru j2sdk.orig/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c j2sdk/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c
+--- j2sdk.orig/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c	2002-09-06 07:31:43.000000000 +0000
++++ j2sdk/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c	2003-01-11 16:08:52.000000000 +0000
+@@ -12,6 +12,8 @@
+ #include <locale.h>
+ #include <errno.h>
+ #include <strings.h>
++// Required for newer gcc. Added by Tushar <tush@yahoo.com>.
++#include <string.h>
+ #include <dlfcn.h>
+ #include "plugin_defs.h"
+ #include "pluginversion.h"
diff --git a/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-glibc-2.3.1-fixes.patch b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-glibc-2.3.1-fixes.patch
new file mode 100644
index 000000000000..1b273d41b765
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-glibc-2.3.1-fixes.patch
@@ -0,0 +1,12 @@
+diff -ru j2sdk.orig/j2se/ext/plugin/oji-plugin/src/motif/navig5/ProxySupport5.cpp j2sdk/j2se/ext/plugin/oji-plugin/src/motif/navig5/ProxySupport5.cpp
+--- j2sdk.orig/j2se/ext/plugin/oji-plugin/src/motif/navig5/ProxySupport5.cpp	2002-09-06 07:31:45.000000000 +0000
++++ j2sdk/j2se/ext/plugin/oji-plugin/src/motif/navig5/ProxySupport5.cpp	2003-01-11 16:22:40.000000000 +0000
+@@ -30,7 +30,7 @@
+ #include "ProxySupport5.h"
+ extern "C" {
+ #ifdef __linux__
+-extern int gethostname(char *, size_t);
++extern int gethostname(char *, size_t) __THROW;
+ #else
+ extern int gethostname(char *, int);
+ #endif
diff --git a/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-link-jpda-2-libjvm.patch b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-link-jpda-2-libjvm.patch
new file mode 100644
index 000000000000..8aef389db917
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-link-jpda-2-libjvm.patch
@@ -0,0 +1,13 @@
+diff -ur Build-j2sdk-1.4.0.orig/j2se/make/jpda/back/Makefile Build-j2sdk-1.4.0/j2se/make/jpda/back/Makefile
+--- Build-j2sdk-1.4.0.orig/j2se/make/jpda/back/Makefile	2002-02-12 07:55:28.000000000 -0600
++++ Build-j2sdk-1.4.0/j2se/make/jpda/back/Makefile	2002-09-09 15:35:39.000000000 -0500
+@@ -35,6 +35,9 @@
+ OTHER_LDLIBS = -ldl -lsocket
+ endif # PLATFORM
+ 
++# Link to libjvm since it contains fork1
++# Added by Tushar <tush@yahoo.com>
++OTHER_LDLIBS += $(JVMLIB)
+ 
+ #
+ # Files to compile.
diff --git a/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-remove-fixed-paths.patch b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-remove-fixed-paths.patch
new file mode 100644
index 000000000000..a18ffed8e375
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-remove-fixed-paths.patch
@@ -0,0 +1,146 @@
+diff -ru j2sdk.orig/control/make/common/Defs-linux.gmk j2sdk/control/make/common/Defs-linux.gmk
+--- j2sdk.orig/control/make/common/Defs-linux.gmk	2002-09-06 07:00:17.000000000 +0000
++++ j2sdk/control/make/common/Defs-linux.gmk	2003-01-11 16:30:01.000000000 +0000
+@@ -44,52 +44,54 @@
+ # define these to avoid picking up ones from aliases or from
+ # non-standard locations
+ #
++# It is more appropriate to honor the user's path; removing fixed paths.
++# --Tushar <tush@yahoo.com>
+ 
+-AR             = $(USRBIN_PATH)ar
+-BASENAME       = $(UNIXCOMMAND_PATH)basename
+-CAT            = $(UNIXCOMMAND_PATH)cat
++AR             = ar
++BASENAME       = basename
++CAT            = cat
+ CD             = cd # intrinsic unix command
+-CHMOD          = $(UNIXCOMMAND_PATH)chmod
+-CMP            = $(USRBIN_PATH)cmp
+-COMM           = $(USRBIN_PATH)comm
+-COMPRESS       = $(USRBIN_PATH)compress
+-CP             = $(UNIXCOMMAND_PATH)cp
+-CPIO           = $(UNIXCOMMAND_PATH)cpio
+-CUT            = $(USRBIN_PATH)cut
+-DATE           = $(UNIXCOMMAND_PATH)date
+-DF             = $(UNIXCOMMAND_PATH)df
+-DIFF           = $(USRBIN_PATH)diff
+-DIRNAME        = $(USRBIN_PATH)dirname
++CHMOD          = chmod
++CMP            = cmp
++COMM           = comm
++COMPRESS       = compress
++CP             = cp
++CPIO           = cpio
++CUT            = cut
++DATE           = date
++DF             = df
++DIFF           = diff
++DIRNAME        = dirname
+ ECHO           = echo -e # intrinsic unix command, with backslash-escaped character interpretation 
+-EGREP          = $(UNIXCOMMAND_PATH)egrep
+-EXPR           = $(USRBIN_PATH)expr
+-FIND           = $(USRBIN_PATH)find
+-GREP           = $(UNIXCOMMAND_PATH)grep
+-LEX            = $(USRBIN_PATH)lex
+-LN             = $(UNIXCOMMAND_PATH)ln
+-LS             = $(UNIXCOMMAND_PATH)ls
+-M4             = $(USRBIN_PATH)m4
+-MKDIR          = $(UNIXCOMMAND_PATH)mkdir
+-MV             = $(UNIXCOMMAND_PATH)mv
+-NAWK           = $(USRBIN_PATH)gawk
+-PWD            = $(UNIXCOMMAND_PATH)pwd
++EGREP          = egrep
++EXPR           = expr
++FIND           = find
++GREP           = grep
++LEX            = lex
++LN             = ln
++LS             = ls
++M4             = m4
++MKDIR          = mkdir
++MV             = mv
++NAWK           = gawk
++PWD            = pwd
+ #RM   is defined by GNU Make as 'rm -f'
+-RMDIR          = $(UNIXCOMMAND_PATH)rmdir
+-RPM            = $(UNIXCOMMAND_PATH)rpm
+-SED            = $(UNIXCOMMAND_PATH)sed
+-SH             = $(UNIXCOMMAND_PATH)sh
+-SORT           = $(UNIXCOMMAND_PATH)sort
+-STRIP          = $(USRBIN_PATH)strip
+-TAR            = $(UNIXCOMMAND_PATH)tar
+-TOUCH          = $(UNIXCOMMAND_PATH)touch
+-TR             = $(USRBIN_PATH)tr
+-TRUE           = $(UNIXCOMMAND_PATH)true
+-UNAME          = $(UNIXCOMMAND_PATH)uname
+-UNIQ           = $(USRBIN_PATH)uniq
+-UNZIP          = $(USRBIN_PATH)unzip
+-WC             = $(USRBIN_PATH)wc
+-YACC           = $(USRBIN_PATH)yacc
+-ZIPEXE         = $(USRBIN_PATH)zip
++RMDIR          = rmdir
++RPM            = rpm
++SED            = sed
++SH             = sh
++SORT           = sort
++STRIP          = strip
++TAR            = tar
++TOUCH          = touch
++TR             = tr
++TRUE           = true
++UNAME          = uname
++UNIQ           = uniq
++UNZIP          = unzip
++WC             = wc
++YACC           = yacc
++ZIPEXE         = zip
+ 
+ 
+ archExpr = case "`$(UNAME) -m`" in  \
+diff -ru j2sdk.orig/j2se/make/common/Defs-linux.gmk j2sdk/j2se/make/common/Defs-linux.gmk
+--- j2sdk.orig/j2se/make/common/Defs-linux.gmk	2002-09-06 07:07:13.000000000 +0000
++++ j2sdk/j2se/make/common/Defs-linux.gmk	2003-01-11 16:36:16.000000000 +0000
+@@ -120,30 +120,30 @@
+ 
+ # UNIXCOMMAND_PATH is the path to where the most common Unix
+ # commands are installed.
+-UNIXCOMMAND_PATH = /bin/
++UNIXCOMMAND_PATH = 
+ # Allow the user to override the default value...
+-ifdef ALT_UNIXCOMMAND_PATH
++#ifdef ALT_UNIXCOMMAND_PATH
+ # make sure that there is a "/" on the end...
+-UNIXCOMMAND_PATH = $(subst //,/,$(ALT_UNIXCOMMAND_PATH)/)
+-endif
++#UNIXCOMMAND_PATH = $(subst //,/,$(ALT_UNIXCOMMAND_PATH)/)
++#endif
+ 
+ # USRBIN_PATH is the path to where the most common Unix
+ # commands are installed.
+-USRBIN_PATH = /usr/bin/
++USRBIN_PATH = 
+ # Allow the user to override the default value...
+-ifdef ALT_USRBIN_PATH
++#ifdef ALT_USRBIN_PATH
+ # make sure that there is a "/" on the end...
+-USRBIN_PATH = $(subst //,/,$(ALT_USRBIN_PATH)/)
+-endif
++#USRBIN_PATH = $(subst //,/,$(ALT_USRBIN_PATH)/)
++#endif
+ 
+ # COMPILER_PATH is the path to where the compiler and tools 
+ # are installed.
+-COMPILER_PATH = /usr/bin/
++COMPILER_PATH = 
+ #
+ # Allow the user to override the default value...
+-ifdef ALT_COMPILER_PATH
+-COMPILER_PATH = $(subst //,/,$(subst \,/,$(ALT_COMPILER_PATH))/)
+-endif
++#ifdef ALT_COMPILER_PATH
++#COMPILER_PATH = $(subst //,/,$(subst \,/,$(ALT_COMPILER_PATH))/)
++#endif
+ 
+ # DEVTOOLS_PATH is for other tools required for building (such as
+ # zip, etc.)
diff --git a/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.0 b/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.0
deleted file mode 100644
index d2cf995a6633..000000000000
--- a/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.0
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 71458396566ebfa82ba64ce104c8ffe3 j2sdk-1_4_0-src-scsl.zip 45652516
-MD5 cde82327c7f6443399ad80a6a0a0aa15 j2sdk-sec-1_4_0-src-scsl.zip 565434
-MD5 2cddf9413919e7760fd05207979db222 j2sdk-1_4_0-motif-linux-i386.zip 1380844
-MD5 a2a393dc237d168918b11728038d8239 j2sdk-1_4_0-mozilla_headers-unix.zip 6455027
diff --git a/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.0-r1 b/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.0-r1
deleted file mode 100644
index ac97e5a21b50..000000000000
--- a/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea16358be41384870acbdc372f9db152 zlib-1.1.4.tar.bz2 147014
diff --git a/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.1 b/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/digest-sun-j2sdk-1.4.1
diff --git a/dev-java/sun-j2sdk/files/j2sdk-1.4.0-gcc3.patch b/dev-java/sun-j2sdk/files/j2sdk-1.4.0-gcc3.patch
deleted file mode 100644
index 81c9694ec54b..000000000000
--- a/dev-java/sun-j2sdk/files/j2sdk-1.4.0-gcc3.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -urNd j2sdk/hotspot/src/share/vm/c1/c1_FrameMap.hpp j2sdk-new/hotspot/src/share/vm/c1/c1_FrameMap.hpp
---- j2sdk/hotspot/src/share/vm/c1/c1_FrameMap.hpp	Tue Feb 12 07:53:20 2002
-+++ j2sdk-new/hotspot/src/share/vm/c1/c1_FrameMap.hpp	Fri Jun  7 03:16:23 2002
-@@ -171,7 +171,7 @@
- //--------------------------------------------------------
- 
- class ArgumentLocation VALUE_OBJ_CLASS_SPEC {
--  friend CallingConvention;
-+  friend class CallingConvention;
-  private:
-   int _n;         // either a register number 0-5 (I0-I5 or O0-O5), or an offset (in words) from SP/FP
- 
-@@ -221,7 +221,7 @@
- //--------------------------------------------------------
- 
- class CallingConvention: public ResourceObj {
--  friend FrameMap;
-+  friend class FrameMap;
- 
-  private:
-   intStack* _args;
-diff -urNd j2sdk/hotspot/src/share/vm/opto/loopnode.hpp j2sdk-new/hotspot/src/share/vm/opto/loopnode.hpp
---- j2sdk/hotspot/src/share/vm/opto/loopnode.hpp	Tue Feb 12 07:53:44 2002
-+++ j2sdk-new/hotspot/src/share/vm/opto/loopnode.hpp	Fri Jun  7 03:16:23 2002
-@@ -308,7 +308,7 @@
- // Computes the mapping from Nodes to IdealLoopTrees.  Organizes IdealLoopTrees into a
- // loop tree.  Drives the loop-based transformations on the ideal graph.
- class PhaseIdealLoop : public PhaseTransform {
--  friend IdealLoopTree;
-+  friend class IdealLoopTree;
-   // Pre-computed def-use info
-   PhaseIterGVN &_igvn;
- 
-diff -urNd j2sdk/hotspot/src/share/vm/prims/jvmdi.cpp j2sdk-new/hotspot/src/share/vm/prims/jvmdi.cpp
---- j2sdk/hotspot/src/share/vm/prims/jvmdi.cpp	Tue Feb 12 07:53:48 2002
-+++ j2sdk-new/hotspot/src/share/vm/prims/jvmdi.cpp	Fri Jun  7 03:16:23 2002
-@@ -3770,7 +3770,8 @@
-       }
-       // remove the frame's entry
-       JvmdiFramePops* fps = thread->jvmdi_thread_state()->get_jvmdi_frame_pops();
--      fps->clear(JvmdiFramePop(cur_frame_number));
-+      JvmdiFramePop tmp(cur_frame_number);
-+      fps->clear(tmp);
-       // recompute method entry and exit flags if no more frame pops
-       if (fps->length() == 0) {
-         recompute_method_entry_and_exit_on();
-diff -urNd j2sdk/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c j2sdk-new/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c
---- j2sdk/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c	Tue Feb 12 08:10:26 2002
-+++ j2sdk-new/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c	Fri Jun  7 02:06:33 2002
-@@ -11,6 +11,7 @@
- #include <sys/socket.h>
- #include <locale.h>
- #include <errno.h>
-+#include <string.h>
- #include <strings.h>
- #include <dlfcn.h>
- #include "plugin_defs.h"
-diff -urNd j2sdk/j2se/ext/plugin/oji-plugin/src/motif/navig5/remotejni.cpp j2sdk-new/j2se/ext/plugin/oji-plugin/src/motif/navig5/remotejni.cpp
---- j2sdk/j2se/ext/plugin/oji-plugin/src/motif/navig5/remotejni.cpp	Tue Feb 12 08:10:28 2002
-+++ j2sdk-new/j2se/ext/plugin/oji-plugin/src/motif/navig5/remotejni.cpp	Fri Jun  7 02:06:33 2002
-@@ -16,6 +16,7 @@
- #include <sys/ipc.h>
- #include <sys/types.h>
- #include <sys/time.h>
-+#include <time.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-diff -urNd j2sdk/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po j2sdk-new/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po
---- j2sdk/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po	Tue Feb 12 08:10:28 2002
-+++ j2sdk-new/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po	Fri Jun  7 02:06:33 2002
-@@ -21,8 +21,6 @@
- msgstr "plugin: java á£Ê©ÄØÇÞعæÀÈÔäÚ"
- msgid  "  a core file was generated"
- msgstr "  ÄØܨÆíÕøÅÀóòÕù"
--msgid  "Plugin: trouble with work request from child"
--msgstr "Plugin: ÄÍùËɱÍÔÓÑÊåÎûÄÖÉ¢àõÆíÙÂ÷î"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: ÊÆÄâ̯ÆøЩÅäñ¢Îû IP ÈíÉß"
- msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-diff -urNd j2sdk/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po j2sdk-new/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po
---- j2sdk/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po	Tue Feb 12 08:10:28 2002
-+++ j2sdk-new/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po	Fri Jun  7 02:06:33 2002
-@@ -21,8 +21,6 @@
- msgstr "plugin: java µ{§Ç¤w¦]°T¸¹¦Ó·´"
- msgid  "  a core file was generated"
- msgstr "  ¤w²£¥Í®Ö¤ßÀÉ®×"
--msgid  "Plugin: trouble with work request from child"
--msgstr "Plugin: ¤lÃþ§O©Ò­n¨Dªº¤u§@µo¥Í°ÝÃD"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: §ä¤£¨ì¥Ø«e¥D¾÷ªº IP ¦ì§}"
- msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-diff -urNd j2sdk/j2se/make/common/Defs-linux.gmk j2sdk-new/j2se/make/common/Defs-linux.gmk
---- j2sdk/j2se/make/common/Defs-linux.gmk	Tue Feb 12 07:55:14 2002
-+++ j2sdk-new/j2se/make/common/Defs-linux.gmk	Fri Jun  7 02:07:54 2002
-@@ -38,7 +38,7 @@
- CMP            = $(USRBIN_PATH)cmp
- COMPRESS       = $(USRBIN_PATH)compress
- CP             = $(UNIXCOMMAND_PATH)cp
--CPIO           = $(UNIXCOMMAND_PATH)cpio
-+CPIO           = $(USRBIN_PATH)cpio
- CUT            = $(USRBIN_PATH)cut
- DATE           = $(UNIXCOMMAND_PATH)date
- DF             = $(UNIXCOMMAND_PATH)df
-diff -urNd j2sdk/j2se/make/common/Library.gmk j2sdk-new/j2se/make/common/Library.gmk
---- j2sdk/j2se/make/common/Library.gmk	Tue Feb 12 07:55:14 2002
-+++ j2sdk-new/j2se/make/common/Library.gmk	Fri Jun  7 02:06:33 2002
-@@ -42,6 +42,19 @@
- 
- $(OPTIMIZED) $(DEBUG):: $(INIT) $(OBJDIR) $(TMPDIR) $(LIBDIR) $(EXTDIR) $(BINDIR) classheaders
- 
-+#
-+# Note that we have to link -lthread even when USE_PTHREADS is true.
-+# This is becuase checkForCorrectLibthread() croaks otherwise.
-+#
-+ifneq ($(PLATFORM), win32)
-+LIBTHREAD = -lthread
-+ifeq ($(USE_PTHREADS),true)
-+THREADLIBS = -lpthread $(LIBTHREAD)
-+else # USE_PTHREADS
-+THREADLIBS = $(LIBTHREAD)
-+endif # USE_PTHREADS
-+endif # PLATFORM
-+
- ifeq ($(PLATFORM), win32)
- 
- #
-@@ -131,9 +144,9 @@
- 	$(AR) -r $@ $(FILES_o)
- else # LIBRARY
- ifeq ($(CC_VERSION), gcc)
--	$(LINKER) -shared -mimpure-text -o $@ $(FILES_o) $(LDLIBS)
-+	$(LINKER) -shared -mimpure-text -o $@ $(FILES_o) $(THREADLIBS) $(LDLIBS)
- else # CC_VERSION
--	$(LINKER) -G -o $@ $(FILES_o) $(LDLIBS)
-+	$(LINKER) -G -o $@ $(FILES_o) $(THREADLIBS) $(LDLIBS)
- endif # CC_VERSION
- 	$(POST_PROCESS)
- 
-diff -urNd j2sdk/j2se/make/common/Sanity.gmk j2sdk-new/j2se/make/common/Sanity.gmk
---- j2sdk/j2se/make/common/Sanity.gmk	Tue Feb 12 07:55:14 2002
-+++ j2sdk-new/j2se/make/common/Sanity.gmk	Fri Jun  7 02:07:26 2002
-@@ -695,6 +695,7 @@
- # Check for existence of DEVTOOLS_PATH
- ######################################################
- devtools_path:
-+ifneq ($(PLATFORM), linux)
- 	@if [ ! -r $(DEVTOOLS_PATH) ]; then \
- 	  $(ECHO) "ERROR: You do not have a valid DEVTOOLS_PATH setting. \n" \
- 	    "      Please check your access to \n" \
-@@ -702,6 +703,7 @@
- 	    "      and/or check your value of ALT_DEVTOOLS_PATH. \n" \
- 	    "" >> $(ERROR_FILE) ; \
- 	fi
-+endif
- 
- ######################################################
- # Check for existence of COMPILER_PATH
-@@ -902,16 +904,7 @@
- 	@#
- 	@# On Linux we need egcs-2.91.66
- 	@#
--	@if [ -r $(CC) ]; then \
--	  if [ ! "$(CC_VER)" = 2.91.66 ]; then \
--	    $(ECHO) "ERROR: The Linux GCC compiler must be version  egcs-2.91.66. \n" \
--	      "      You are using the following compiler version: $(CC_VER) \n" \
--	      "      The compiler was obtained from the following location: \n" \
--	      "      $(COMPILER_PATH) \n" \
--	      "      Please change your compiler. \n" \
--	      "" >> $(ERROR_FILE) ; \
--	  fi \
--	else \
-+	@if [ ! -r $(CC) ]; then \
- 	  $(ECHO) "ERROR: There is no GNU CC compiler at the location: \n" \
- 	    "      $(COMPILER_PATH) \n" \
- 	    "" >> $(ERROR_FILE) ; \
-diff -urNd j2sdk/j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/fontObject.cpp j2sdk-new/j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/fontObject.cpp
---- j2sdk/j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/fontObject.cpp	Tue Feb 12 08:06:58 2002
-+++ j2sdk-new/j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/fontObject.cpp	Fri Jun  7 02:06:33 2002
-@@ -900,7 +900,7 @@
- /*
-  * u_strncmpi - Compare unicode strings case independent
-  */
--u_strncmpi(const Unicode * n1, const Unicode * n2, int len) {
-+int u_strncmpi(const Unicode * n1, const Unicode * n2, int len) {
-     int  len2 = 0;
-     const Unicode * str2 = n2;
- 
-diff -urNd j2sdk/j2se/src/solaris/back/exec_md.c j2sdk-new/j2se/src/solaris/back/exec_md.c
---- j2sdk/j2se/src/solaris/back/exec_md.c	Tue Feb 12 08:08:22 2002
-+++ j2sdk-new/j2se/src/solaris/back/exec_md.c	Fri Jun  7 02:06:33 2002
-@@ -72,7 +72,7 @@
-     }
-     argv[i] = NULL;  /* NULL terminate */
- 
--    if ((pid = fork1()) == 0) {
-+    if ((pid = fork()) == 0) {
-         /* Child process */
-         int i, max_fd;
- 
diff --git a/dev-java/sun-j2sdk/files/sun-j2sdk-1.4.1 b/dev-java/sun-j2sdk/files/sun-j2sdk-1.4.1
new file mode 100644
index 000000000000..c131eaf533ad
--- /dev/null
+++ b/dev-java/sun-j2sdk/files/sun-j2sdk-1.4.1
@@ -0,0 +1,15 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Karl Trygve Kalleberg
+# Maintainer: Tools Team <tools@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/files/sun-j2sdk-1.4.1,v 1.1 2003/01/12 12:21:42 cretin Exp $
+
+VERSION="Sun JDK @PV@"
+JAVA_HOME=/opt/@P@
+CLASSPATH=/opt/@P@/jre/lib/rt.jar:.
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="/opt/@P@/jre/lib/"
+
+ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r3.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r3.ebuild
index 016ea6d14fb4..29702cea623b 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r3.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r3.ebuild,v 1.2 2002/12/09 04:20:57 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r3.ebuild,v 1.3 2003/01/12 12:21:42 cretin Exp $
 
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
@@ -33,7 +33,7 @@ DESCRIPTION="Sun's J2SE Development Kit, version 1.4.0"
 HOMEPAGE="http://wwws.sun.com/software/java2/download.html"
 
 SLOT="0"
-KEYWORDS="x86 -ppc -alpha -sparc "
+KEYWORDS="~x86 -ppc -alpha -sparc "
 LICENSE="sun-csl"
 
 RDEPEND="virtual/glibc
@@ -179,11 +179,7 @@ src_install () {
 	dodir /opt/${P}/share/
 	cp -a demo src.zip ${D}/opt/${P}/share/
 	
-        if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji140.so /usr/lib/mozilla/plugins/
-	fi
-
+	inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji140.so
 	set_java_env ${FILESDIR}/${VMHANDLE}
 
 }
@@ -191,5 +187,4 @@ src_install () {
 pkg_postinst () {                                                               
 	# Set as default VM if none exists
 	java_pkg_postinst
-	inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji140.so
 }
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.0.ebuild
deleted file mode 100644
index 570f462706e9..000000000000
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Maintainer: Tools Team <tools@gentoo.org>
-# Author: Daniel Mettler <mettlerd@icu.unizh.ch>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.0.ebuild,v 1.4 2002/10/04 05:11:43 vapier Exp $
-
-P=sun-jdk-1.4.0
-S=${WORKDIR}/j2sdk
-SRC_URI="http://java.sun.com/j2sdk-1_4_0-src-scsl.zip
-	http://java.sun.com/j2sdk-sec-1_4_0-src-scsl.zip
-	http://java.sun.com/j2sdk-1_4_0-motif-linux-i386.zip
-	http://java.sun.com/j2sdk-1_4_0-mozilla_headers-unix.zip"
-DESCRIPTION="Sun's J2SE Development Kit, version 1.4.0"
-HOMEPAGE="http://java.sun.com/j2se/1.4/download.html"
-
-SLOT="0"
-KEYWORDS="x86 -ppc"
-LICENSE="sun-csl"
-
-RDEPEND="virtual/glibc
-	virtual/x11
-	>=dev-java/java-config-0.1.3"
-DEPEND="$RDEPEND
-	app-arch/unzip
-	~dev-java/sun-jdk-1.4.0"
-
-PROVIDE="virtual/jre-1.4
-	virtual/jdk-1.4
-	virtual/java-scheme-2"
-	
-src_unpack() {
-	mkdir ${S}
-	cd ${S}
-	unzip -o ${DISTDIR}/j2sdk-1_4_0-src-scsl.zip
-	unzip -o ${DISTDIR}/j2sdk-sec-1_4_0-src-scsl.zip
-	mkdir mozilla
-	cd mozilla
-	unzip -o ${DISTDIR}/j2sdk-1_4_0-mozilla_headers-unix.zip
-	cd ..
-	mkdir motif
-	cd motif
-	unzip -o ${DISTDIR}/j2sdk-1_4_0-motif-linux-i386.zip
-	cd ../..
-	chmod u+w `grep "\--- j2sdk/" ${FILESDIR}/j2sdk-1.4.0-gcc3.patch | awk '{print $2}'`
-	cd ${S}
-	patch -p1 <${FILESDIR}/j2sdk-1.4.0-gcc3.patch || die "Failed to apply GCC patch"
-	cd j2se/make/common
-	mv Defs-linux.gmk Defs-linux.gmk_orig
-	sed -e "s#^\(CFLAGS_OPT.*\)#\1 ${CFLAGS}#g" \
-	    -e "s#^\(CXXFLAGS_OPT.*\)#\1 ${CXXFLAGS}#g" \
-	    Defs-linux.gmk_orig > Defs-linux.gmk
-	cd ../../../..
-	chmod u-w `grep "\--- j2sdk/" ${FILESDIR}/j2sdk-1.4.0-gcc3.patch | awk '{print $2}'`
-	cd ${S}
-}
-
-src_compile () {
-	unset CLASSPATH JAVA_HOME JAVAC
-	export ALT_MOZILLA_PATH="${S}/mozilla"
-	export ALT_BOOTDIR="/opt/${P}"
-	export ALT_MOTIF_DIR="${S}/motif"
-	cd control/make
-
-	# MUST use make, we DONT want any -j options!
-	JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
-	if [ -z "$JOBS" ]; then
-	    JOBS=1
-	fi
-	make all DEV_ONLY=true HOTSPOT_BUILD_JOBS=${JOBS} || die
-}
-
-src_install () {
-	dodir /opt/${P}
-
-	cd ${S}/control/build/linux-*/j2sdk-image
-	local dirs="bin include jre lib"
-	dodir /opt/${P}
-	
-	for i in $dirs ; do
-		cp -a $i ${D}/opt/${P}/
-	done
-	
-	dodoc COPYRIGHT README LICENSE
-	dohtml README.html
-	
-	doman man/man1/*.1
-	
-	dodir /opt/${P}/share/
-	cp -a demo src.zip ${D}/opt/${P}/share/
-	
-        if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji140.so /usr/lib/mozilla/plugins/
-	fi
-	
-        dodir /etc/env.d/java 
-	sed \
-		-e "s/@P@/${P}/g" \
-		-e "s/@PV@/${PV}/g" \
-		-e "s/@PF@/${PF}/g" \
-		< ${FILESDIR}/sun-jdk-${PV} \
-                > ${D}/etc/env.d/java/20sun-jdk-${PV} 
-}
-
-pkg_postinst () {                                                               
-	if [ "`use mozilla`" ] ; then                                           
-		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/libjavaplugin_oji140.so"
-	else                                                                    
-		einfo "To install the Java plugin for Mozilla manually, do:"
-		einfo "ln -s /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji140.so /usr/lib/mozilla/plugins/"
-		einfo "(Make certain the directory /usr/lib/mozilla/plugins exists first)"
-	fi
-}
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r1.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild
index 29119c8a4d87..8ff975641bc8 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r1.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild
@@ -1,46 +1,47 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild,v 1.1 2003/01/12 12:21:42 cretin Exp $
+
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r1.ebuild,v 1.10 2002/12/09 04:20:57 manson Exp $
 
-# Based on http://tushar.lfsforum.org/javafromscratch.txt (LFS)
+# Based on http://www.linuxfromscratch.org/~tushar/hints/javafromscratch.txt (LFS)
 # By Tushar Teredesai <Tush@Yahoo.Com>
 
 IUSE=""
 
-inherit java
-
-ZLIB_VERSION=1.1.4
+inherit java nsplugins
 
-JAVA_PATCHES="j2sdk-1.4.0-disable-sanity-check.patch.bz2
-              j2sdk-1.4.0-fix-intl-files.patch.bz2
-              j2sdk-1.4.0-gcc3-syntax.patch.bz2
-              j2sdk-1.4.0-glibc-2.3.1-fixes.patch.bz2
-              j2sdk-1.4.0-link-jpda-2-libjvm.patch.bz2
-              j2sdk-1.4.0-remove-fixed-paths.patch.bz2"
+JAVA_PATCHES="disable-sanity-check
+			fix-intl-files
+			gcc3-syntax
+			glibc-2.3.1-fixes
+			link-jpda-2-libjvm
+			remove-fixed-paths
+			force-motif"
 
 S=${WORKDIR}/j2sdk
 
-SRC_JAVA="j2sdk-1_4_0-src-scsl.zip"
-SRC_MOZHEADERS="j2sdk-1_4_0-mozilla_headers-unix.zip"
+SRC_JAVA="j2sdk-1_4_1-src-scsl.zip"
+SRC_MOZHEADERS="j2sdk-1_4_1-mozilla_headers-unix.zip"
+
+SRC_URI=""
 
-SRC_URI="http://www.gzip.org/zlib/zlib-${ZLIB_VERSION}.tar.bz2"
-		 
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.0"
-HOMEPAGE="http://java.sun.com/j2se/1.4/download.html"
+HOMEPAGE="http://wwws.sun.com/software/java2/download.html"
 
 SLOT="0"
-KEYWORDS="x86 -ppc -alpha -sparc "
+KEYWORDS="~x86 -ppc -alpha -sparc"
 LICENSE="sun-csl"
 
 RDEPEND="virtual/glibc
 	virtual/x11
 	>=dev-java/java-config-0.1.3"
 DEPEND="${RDEPEND}
+	app-arch/zip
 	app-arch/unzip
 	>=virtual/jdk-1.4
-	>=x11-libs/lesstif-0.93.36-r1
+	!x11-libs/lesstif
 	!x11-libs/openmotif"
 
 PROVIDE="virtual/jre-1.4.0
@@ -56,25 +57,31 @@ pkg_setup() {
 	fi
 
 	#Check the Current java-version ~ 1.4 and is jdk
-	java-config --javac > /dev/null 2>&1 || die "The version of java set by java-config doesn't contain javac"
-
+	JAVAC=`java-config --javac`
+	if [ -z $JAVAC ] ; then
+		eerror "Set java-config to use a jdk not a jre" 
+		die "The version of java set by java-config doesn't contain javac"
+	fi
+	
 	if [ `java-config --java-version 2>&1 | grep "1\.4\."  | wc -l` -lt 1 ]  ; then
 		eerror "JDK is too old, >= 1.4 is required"
 		die "The version of jdk pointed to by java-config is not >=1.4"
 	fi
-	
 }
 
 src_unpack() {
 	die_flag=""
 	if [ ! -f ${DISTDIR}/${SRC_MOZHEADERS} ] ; then
-      eerror "Please download ${SRC_MOZHEADERS} from ${HOMEPAGE} to ${DISTDIR}"
-      die_flag=1
+		eerror "Please download ${SRC_MOZHEADERS} from ${HOMEPAGE} to ${DISTDIR}"
+		die_flag=1
 	fi
 			
 	if [ ! -f ${DISTDIR}/${SRC_JAVA} ] ; then
-      eerror "Please download ${SRC_JAVA} from ${HOMEPAGE} to ${DISTDIR}"
-	  die_flag=1
+		eerror "Please download ${SRC_JAVA} from ${HOMEPAGE} to ${DISTDIR}"
+		einfo "The file is split into two parts on the sun site"
+		einfo "Join them together to form the file ${SRC_JAVA}"
+		einfo "Use \"cat j2sdk-1_4_1-src-scsl-a.zip j2sdk-1_4_1-src-scsl-b.zip > j2sdk-1_4_1-src-scsl.zip\""
+		die_flag=1
 	fi
 
 	[ ! -z ${die_flag} ] && die "Some source files were not found"
@@ -89,21 +96,9 @@ src_unpack() {
 
 	cd ${S}
 	for patch in $JAVA_PATCHES ; do
-		bzip2 -dc ${FILESDIR}/patches/${patch} | patch -p1 || die "Failed to apply ${patch}"
+		einfo "Applying patch ${patch}"
+		cat ${FILESDIR}/${PV}/j2sdk-${PV}-${patch}.patch | patch -p1 || die "Failed to apply ${patch}"
 	done
-
-	# Update zlib to avoid security problem with zlib-1.1.3
-	cd ${S}/j2se/src/share/native/java/util/zip
-	rm -rf zlib-1.1.3
-	unpack zlib-${ZLIB_VERSION}.tar.bz2
-	cd zlib-${ZLIB_VERSION}
-	mv adler32.c zadler32.c
-	mv crc32.c zcrc32.c
-	cd ${S}/j2se/make/java/zip/
-	cp Makefile Makefile.orig
-	chmod +w Makefile
-	sed -e "s:1.1.3:${ZLIB_VERSION}:" Makefile.orig > Makefile
-											
 }
 
 src_compile () {
@@ -125,20 +120,22 @@ src_compile () {
 	
 	export ALT_MOZILLA_PATH="${S}/mozilla"
 	export ALT_BOOTDIR=`java-config --jdk-home`
-	export ALT_MOTIF_DIR="/usr"
+	export ALT_MOTIF_DIR="${S}/motif"
 	export ALT_DEVTOOLS_PATH="/usr/bin"
 	export MILESTONE="gentoo"
 	export BUILD_NUMBER=`date +%s`
+	export LIBS="-lstdc++"
+	export OTHER_LDFLAGS="-lpthread"
 	export INSANE=true
 	export MAKE_VERBOSE=true
-	export OTHER_LDFLAGS="-lpthread"
 	export DEV_ONLY=true 
+	export USRBIN_PATH=""
 
 	cd ${S}/control/make
 	# MUST use make, we DONT want any -j options!
-    JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
+	JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
 	if [ -z "$JOBS" ]; then
-	   JOBS=1
+		JOBS=1
 	fi
 	make HOTSPOT_BUILD_JOBS=${JOBS} || die
 
@@ -163,25 +160,14 @@ src_install () {
 	
 	dodir /opt/${P}/share/
 	cp -a demo src.zip ${D}/opt/${P}/share/
-	
-        if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji140.so /usr/lib/mozilla/plugins/
-	fi
 
-	set_java_env ${FILESDIR}/${VMHANDLE}
+	chown -R root.root ${D}/opt/${P}
 
+	inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
+	set_java_env ${FILESDIR}/${VMHANDLE}
 }
 
 pkg_postinst () {                                                               
 	# Set as default VM if none exists
-	java_pkg_postinst	
-
-	if [ "`use mozilla`" ] ; then                                           
-		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/libjavaplugin_oji140.so"
-	else                                                                    
-		einfo "To install the Java plugin for Mozilla manually, do:"
-		einfo "ln -s /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji140.so /usr/lib/mozilla/plugins/"
-		einfo "(Make certain the directory /usr/lib/mozilla/plugins exists first)"
-	fi
+	java_pkg_postinst
 }