working proto

13 files changed, 567 insertions, 491 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
new file mode 100644
index 000000000000..c7607bfa78ab
--- /dev/null
+++ b/app-office/openoffice/ChangeLog
@@ -0,0 +1,17 @@
+# ChangeLog for app-office/openoffice
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.1 2002/04/24 21:57:15 azarah Exp $
+
+*openoffice-641d (24 Apr 2002)
+
+  24 Apr 2002; M.Schlemmer <azarah@gentoo.org> openoffice-641d.ebuild :
+
+  Add initial *working* version.
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/app-office/openoffice/files/641d/openoffice-641d-class-SwpHtStart-SAR.patch b/app-office/openoffice/files/641d/openoffice-641d-class-SwpHtStart-SAR.patch
new file mode 100644
index 000000000000..9c4459816480
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-class-SwpHtStart-SAR.patch
@@ -0,0 +1,29 @@
+--- oo_cvs/sw/source/core/txtnode/thints.cxx	Thu Nov  8 09:35:13 2001
++++ oo_stable1_cvs20020409_src/sw/source/core/txtnode/thints.cxx	Thu Apr 11 11:45:43 2002
+@@ -1851,7 +1851,7 @@
+ 			( SFX_ITEM_SET == rNode.GetpSwAttrSet()->GetItemState( nWhich,
+ 				FALSE, &pParaItem ) ) && ( pParaItem == &pHint->GetAttr() );
+ 		BOOL bReplace = !( SETATTR_DONTREPLACE & nMode );
+-		SwpHtStart_SAR *pTmpHints = 0;
++		::SwpHtStart_SAR *pTmpHints = 0;
+ 
+ 		USHORT i;
+ 		// Wir wollen zwar von nHtStart bis nMaxEnd, muessen aber ggf.
+@@ -2027,7 +2027,7 @@
+ 									// Beim Einfuegen spaltet es sich selbst.
+ 										if( pHistory ) pHistory->Add( pOther );
+ 										if( !pTmpHints )
+-											pTmpHints = new SwpHtStart_SAR();
++											pTmpHints = new ::SwpHtStart_SAR();
+ 										pTmpHints->C40_INSERT( SwTxtAttr, pOther,
+ 											pTmpHints->Count() );
+ 										Cut( i );
+@@ -2076,7 +2076,7 @@
+ 									// Beim Einfuegen spaltet es sich selbst.
+ 										if( pHistory ) pHistory->Add( pOther );
+ 										if( !pTmpHints )
+-											pTmpHints = new SwpHtStart_SAR();
++											pTmpHints = new ::SwpHtStart_SAR();
+ 										pTmpHints->C40_INSERT( SwTxtAttr, pOther,
+ 											pTmpHints->Count() );
+ 										Cut( i );
diff --git a/app-office/openoffice/files/641d/openoffice-641d-clk-tck-gcc-3.patch b/app-office/openoffice/files/641d/openoffice-641d-clk-tck-gcc-3.patch
new file mode 100644
index 000000000000..30e301b41c5a
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-clk-tck-gcc-3.patch
@@ -0,0 +1,25 @@
+--- oo_641c_src/tools/source/datetime/ttime.cxx.gcc3	Mon Jun 11 19:17:46 2001
++++ oo_641c_src/tools/source/datetime/ttime.cxx	Thu Feb 21 19:44:52 2002
+@@ -73,7 +73,7 @@
+ #include <dos.h>
+ #elif defined UNX
+ #include <limits.h>
+-#ifdef IRIX
++#if defined( IRIX ) || defined( UNX )
+ #include <unistd.h>
+ #endif
+ #include <sys/times.h>
+@@ -493,7 +493,13 @@
+ 
+ 	if ( !nImplTicksPerSecond )
+ 	{
++#if defined( CLK_TCK )
+ 		nImplTicksPerSecond = CLK_TCK;
++#elif defined( _SC_CLK_TCK )
++		nImplTicksPerSecond = sysconf(_SC_CLK_TCK);
++#else
++#error "I don't know how to get CLK_TCK, you lose."
++#endif
+ 		dImplTicksPerSecond = nImplTicksPerSecond;
+ 		dImplTicksULONGMAX	= (double)(ULONG)ULONG_MAX;
+ 	}
diff --git a/app-office/openoffice/files/641d/openoffice-641d-code_err.patch b/app-office/openoffice/files/641d/openoffice-641d-code_err.patch
deleted file mode 100644
index d3d7f124658c..000000000000
--- a/app-office/openoffice/files/641d/openoffice-641d-code_err.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -urNd oo_641d_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java oo_641d_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java.new
---- oo_641d_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java	Sun Mar 31 00:24:20 2002
-+++ oo_641d_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java.new	Thu Nov 30 13:03:34 2000
-@@ -79,7 +79,7 @@
- 		Class.forName(className != null
- 			      ? className
- 			      : "sun.net.www.protocol." + protocol + ".Handler");
--	    return (URLStreamHandler)handlerClass.newInstance();;
-+	    return (URLStreamHandler)handlerClass.newInstance();
- 	}
- 	catch (Exception e) {
- 	    System.err.println(e);
-diff -urNd oo_641d_src/tools/source/datetime/ttime.cxx oo_641d_src/tools/source/datetime/ttime.cxx.new
---- oo_641d_src/tools/source/datetime/ttime.cxx	Sun Mar 31 01:24:44 2002
-+++ oo_641d_src/tools/source/datetime/ttime.cxx.new	Sun Mar 31 01:26:36 2002
-@@ -493,7 +493,7 @@
- 
- 	if ( !nImplTicksPerSecond )
- 	{
--		nImplTicksPerSecond = CLK_TCK;
-+		nImplTicksPerSecond = CLOCKS_PER_SEC;
- 		dImplTicksPerSecond = nImplTicksPerSecond;
- 		dImplTicksULONGMAX	= (double)(ULONG)ULONG_MAX;
- 	}
-diff -urNd oo_641d_src/sj2/stardiv/applet/DocumentProxy.java oo_641d_src/sj2/stardiv/applet/DocumentProxy.java.new
---- oo_641d_src/sj2/stardiv/applet/DocumentProxy.java	Mon Sep 18 12:54:03 2000
-+++ oo_641d_src/sj2/stardiv/applet/DocumentProxy.java.new	Sun Mar 31 05:52:59 2002
-@@ -68,7 +68,10 @@
- import java.applet.AudioClip;
- 
- import java.io.IOException;
-+import java.io.InputStream;
- 
-+import java.util.HashMap;
-+import java.util.Iterator;
- import java.util.Enumeration;
- import java.util.Hashtable;
- import java.util.Observer;
-@@ -123,6 +126,27 @@
- 		instances --;
-     }
- 
-+
-+    /* Stream stuff to satisfy JDK 1.4 */
-+    private HashMap stream_map = new HashMap();
-+
-+    public void setStream(String key,
-+                      InputStream stream)
-+               throws IOException
-+    {
-+	stream_map.put(key, stream);
-+    }
-+
-+    public InputStream getStream(String key)
-+    {
-+	return (InputStream) stream_map.get(key);
-+    }
-+
-+    public Iterator getStreamKeys()
-+    {
-+	return stream_map.keySet().iterator();
-+    }
-+
-     /*
-     ** DocumentProxy methods
-     */
-diff -urNd oo_641d_src/sj2/stardiv/app/AppletViewer.java oo_641d_src/sj2/stardiv/app/AppletViewer.java.new
---- oo_641d_src/sj2/stardiv/app/AppletViewer.java	Sun Mar 31 06:14:33 2002
-+++ oo_641d_src/sj2/stardiv/app/AppletViewer.java.new	Sun Mar 31 06:16:11 2002
-@@ -196,7 +196,7 @@
-     public AppletViewer(int x, int y, URL doc, Hashtable atts, PrintStream statusMsgStream) {
- //  		resourceViewer = new stardiv.util.ResourceViewer();
- //  		resourceViewer.show();
--		System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
-+//		System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
- 		this.statusMsgStream = statusMsgStream;
- 		this.atts = atts;
- 
-diff -urNd oo_641d_src/svtools/inc/svarray.hxx oo_641d_src/svtools/inc/svarray.hxx.new
---- oo_641d_src/svtools/inc/svarray.hxx	Mon Apr  1 12:15:09 2002
-+++ oo_641d_src/svtools/inc/svarray.hxx.new	Mon Apr  1 12:15:18 2002
-@@ -742,11 +742,11 @@
- 
- // SORTARR - Begin
- 
--#ifdef __MWERKS__
-+// #ifdef __MWERKS__
- #define __MWERKS__PRIVATE public
--#else
--#define __MWERKS__PRIVATE private
--#endif
-+// #else
-+// #define __MWERKS__PRIVATE private
-+// #endif
- 
- #define _SORT_CLASS_DEF(nm, AE, IS, GS)\
- typedef BOOL (*FnForEach_##nm)( const AE&, void* );\
-diff -urNd oo_641d_src/sw/inc/ndhints.hxx oo_641d_src/sw/inc/ndhints.hxx.new
---- oo_641d_src/sw/inc/ndhints.hxx	Mon Apr  1 12:16:27 2002
-+++ oo_641d_src/sw/inc/ndhints.hxx.new	Mon Apr  1 12:09:50 2002
-@@ -98,7 +98,7 @@
-  *************************************************************************/
- 
- // Das neue Hintsarray:
--class SwpHintsArr : private SwpHtStart
-+class SwpHintsArr : protected SwpHtStart
- {
- 
- protected:
diff --git a/app-office/openoffice/files/641d/openoffice-641d-define-XSetIMValues.patch b/app-office/openoffice/files/641d/openoffice-641d-define-XSetIMValues.patch
new file mode 100644
index 000000000000..ff65b513946c
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-define-XSetIMValues.patch
@@ -0,0 +1,13 @@
+diff -ur oo_cvs/vcl/unx/source/app/i18n_im.cxx oo_stable1_cvs20020409_src/vcl/unx/source/app/i18n_im.cxx
+--- oo_cvs/vcl/unx/source/app/i18n_im.cxx	Thu Jan 10 14:06:51 2002
++++ oo_stable1_cvs20020409_src/vcl/unx/source/app/i18n_im.cxx	Wed Apr 10 15:59:17 2002
+@@ -90,6 +90,9 @@
+ #ifdef SOLARIS
+ extern "C" char * XSetIMValues(XIM im, ...);
+ #endif
++#ifdef LINUX
++extern "C" char * XSetIMValues(XIM im, ...);
++#endif
+ 
+ // ------------------------------------------------------------------------------------
+ //
diff --git a/app-office/openoffice/files/641d/openoffice-641d-exception-sprecs.patch b/app-office/openoffice/files/641d/openoffice-641d-exception-sprecs.patch
new file mode 100644
index 000000000000..6ec5b0e7a8f2
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-exception-sprecs.patch
@@ -0,0 +1,12 @@
+--- oo_641c_src/tools/source/memmgr/memmgr.cxx.specs	Mon Oct 15 20:40:32 2001
++++ oo_641c_src/tools/source/memmgr/memmgr.cxx	Fri Feb 15 17:02:12 2002
+@@ -121,7 +121,8 @@
+ static std::new_handler volatile g_pfnHandler = 0;
+ 
+ std::new_handler
+-SAL_CALL std::set_new_handler (std::new_handler pfnHandler) throw ()
++SAL_CALL std::set_new_handler (std::new_handler pfnHandler)
++//	throw ()
+ {
+ 	std::new_handler f = g_pfnHandler;
+ 	g_pfnHandler = pfnHandler;
diff --git a/app-office/openoffice/files/641d/openoffice-641d-gcc3.patch b/app-office/openoffice/files/641d/openoffice-641d-gcc3.patch
deleted file mode 100644
index 46553f7d9ebd..000000000000
--- a/app-office/openoffice/files/641d/openoffice-641d-gcc3.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -urNd oo_641d_src/solenv/inc/unxlngi4.mk oo_641d_src/solenv/inc/unxlngi4.mk.new
---- oo_641d_src/solenv/inc/unxlngi4.mk	Fri Dec 21 07:24:32 2001
-+++ oo_641d_src/solenv/inc/unxlngi4.mk.new	Sat Mar 30 22:57:26 2002
-@@ -100,7 +100,7 @@
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
- # Flags for disabling exception handling
--CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+# CFLAGS_NO_EXCEPTIONS=-fno-exceptions
- 
- # -fpermissive should be removed as soon as possible
- CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -fno-rtti 
-diff -urNd oo_641d_src/tools/source/fsys/unx.hxx oo_641d_src/tools/source/fsys/unx.hxx.new
---- oo_641d_src/tools/source/fsys/unx.hxx	Sun Mar 31 01:04:00 2002
-+++ oo_641d_src/tools/source/fsys/unx.hxx.new	Sun Mar 31 01:05:30 2002
-@@ -97,11 +97,11 @@
- #include <time.h>
- #include <datetime.hxx>
- 
--#ifndef localtime_r
-+/* #ifndef localtime_r
- extern "C" {
- struct tm *localtime_r(const time_t *timep, struct tm *buffer);
- }
--#endif
-+#endif */
- 
- inline Time Unx2Time( time_t nTime )
- {
-diff -urNd oo_641d_src/tools/source/datetime/ttime.cxx oo_641d_src/tools/source/datetime/ttime.cxx.new
---- oo_641d_src/tools/source/datetime/ttime.cxx	Mon Jun 11 13:17:46 2001
-+++ oo_641d_src/tools/source/datetime/ttime.cxx.new	Sun Mar 31 01:19:26 2002
-@@ -93,7 +93,7 @@
- #include <math.h>
- #endif
- 
--#ifndef WNT
-+/* #ifndef WNT
- #ifndef localtime_r
- extern "C" {
- struct tm *localtime_r(const time_t *timep, struct tm *buffer);
-@@ -105,7 +105,7 @@
- struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
- }
- #endif
--#endif
-+#endif */
- 
- // =======================================================================
- 
-diff -urNd oo_641d_src/tools/source/memmgr/memmgr.cxx oo_641d_src/tools/source/memmgr/memmgr.cxx.new
---- oo_641d_src/tools/source/memmgr/memmgr.cxx	Mon Oct 15 14:40:32 2001
-+++ oo_641d_src/tools/source/memmgr/memmgr.cxx.new	Sun Mar 31 01:31:48 2002
-@@ -121,7 +121,7 @@
- static std::new_handler volatile g_pfnHandler = 0;
- 
- std::new_handler
--SAL_CALL std::set_new_handler (std::new_handler pfnHandler) throw ()
-+SAL_CALL std::set_new_handler (std::new_handler pfnHandler)
- {
- 	std::new_handler f = g_pfnHandler;
- 	g_pfnHandler = pfnHandler;
-diff -urNd oo_641d_src/product/util/makefile.mk oo_641d_src/product/util/makefile.mk.new
---- oo_641d_src/product/util/makefile.mk	Mon Mar 11 11:09:13 2002
-+++ oo_641d_src/product/util/makefile.mk.new	Sun Mar 31 14:18:28 2002
-@@ -111,8 +111,8 @@
- ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/libgcc_s.so.1 		\
- 	$(DESTDIRDLL)$/libgcc_s.so 		\
--	$(DESTDIRDLL)$/libstdc++.so.3 		\
--	$(DESTDIRDLL)$/libstdc++.so.3.0.1
-+	$(DESTDIRDLL)$/libstdc++.so.3		\
-+	$(DESTDIRDLL)$/libstdc++.so.3.0.4
- .ENDIF
- .ELIF "$(OS)"=="FREEBSD"
- ###########
-@@ -128,7 +128,7 @@
- 	$(DESTDIRDLL)$/libgcc_s.so.1 		\
- 	$(DESTDIRDLL)$/libgcc_s.so 		\
- 	$(DESTDIRDLL)$/libstdc++.so.3 		\
--	$(DESTDIRDLL)$/libstdc++.so.3.0.1
-+	$(DESTDIRDLL)$/libstdc++.so.3.0.4
- .ENDIF
- .ELIF "$(OS)"=="IRIX"
- ###############
-@@ -422,17 +422,17 @@
- 
- #---------------------------------------------------------
- # special targets for linux gcc3 
--$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.3.0.4 : $(DLLOUT)$/libstdc++.so.3.0.4 $(DIRLIST)
- 	-rm -f $@
--	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-+	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.4 $@
- 
--$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.4 $(DIRLIST)
- 	-rm -f $@
--	+ln -s libstdc++.so.3.0.1 $@
-+	+ln -s libstdc++.so.3.0.4 $@
- 
- $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
- 	-rm -f $@
--	$(GNUCOPY) -p $(DLLOUT)$/libgcc_s.so.1 $@
-+	$(GNUCOPY) -p $(DLLOUT)$/libgcc_s.so.1 $@
- 
- $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
- 	-rm -f $@
-diff -urNd oo_641d_src/sw/source/filter/html/htmlform.cxx oo_641d_src/sw/source/filter/html/htmlform.cxx.new
---- oo_641d_src/sw/source/filter/html/htmlform.cxx	Fri Sep 28 02:27:53 2001
-+++ oo_641d_src/sw/source/filter/html/htmlform.cxx.new	Mon Apr  1 05:14:19 2002
-@@ -741,7 +741,7 @@
- 	}
- }
- 
--void SwHTMLImageWatcher::disposing(const lang::EventObject& evt)
-+void SwHTMLImageWatcher::disposing(const lang::EventObject& evt) throw ( ::com::sun::star::uno::RuntimeException)
- {
- 	Reference< awt::XImageConsumer > xTmp;
- 
diff --git a/app-office/openoffice/files/641d/openoffice-641d-no-mozab.patch b/app-office/openoffice/files/641d/openoffice-641d-no-mozab.patch
new file mode 100644
index 000000000000..4f1db5abd84d
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-no-mozab.patch
@@ -0,0 +1,11 @@
+--- oo_641c_src/connectivity/prj/build.lst.no-mozab	Tue Dec 11 18:14:02 2001
++++ oo_641c_src/connectivity/prj/build.lst	Wed Feb 20 14:22:33 2002
+@@ -7,8 +7,6 @@
+ cn	connectivity\source\resource			nmake	-	all	cn_res NULL
+ cn	connectivity\source\sdbcx				nmake	-	all	cn_sdbcx cn_types NULL
+ cn	connectivity\source\drivers\ado			nmake	-	w	cn_ado cn_dbtools NULL
+-cn	connectivity\source\drivers\mozab\mozillasrc		nmake	-	all	cn_mozab_mozillasrc cn_file NULL
+-cn	connectivity\source\drivers\mozab	nmake	-	all	cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
+ cn	connectivity\source\drivers\calc		nmake	-	all	cn_calc cn_file NULL
+ cn	connectivity\source\drivers\odbc		nmake	-	all	cn_odbc cn_dbtools NULL
+ cn	connectivity\source\drivers\jdbc		nmake	-	all	cn_jdbc cn_dbtools NULL
diff --git a/app-office/openoffice/files/641d/openoffice-641d-remove-libstdc-from-scp.patch b/app-office/openoffice/files/641d/openoffice-641d-remove-libstdc-from-scp.patch
new file mode 100644
index 000000000000..1c811b1c3a3c
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-remove-libstdc-from-scp.patch
@@ -0,0 +1,18 @@
+--- oo-src/product/inc/scp/udk_basefiles.scp	Fri Mar 15 12:58:28 2002
++++ oo_stable1_cvs20020414_src/product/inc/scp/udk_basefiles.scp	Mon Apr 15 08:25:49 2002
+@@ -10,6 +10,7 @@
+     Styles		= (PACKED, SETUPZIP);
+ End
+ 
++#ifdef NOTHING
+ File gid_File_Lib_Stdc
+     BIN_FILE_BODY;
+     Name		= STRING(libstdc++.so.3.0.1);
+@@ -23,6 +24,7 @@
+     Name        = STRING(libstdc++.so.3);
+     Styles      = (NETWORK,RELATIVE);
+ End
++#endif
+ #endif
+ 
+ File gid_File_Lib_Sal
diff --git a/app-office/openoffice/files/641d/openoffice-641d-use-libstdc++-3.0.4.patch b/app-office/openoffice/files/641d/openoffice-641d-use-libstdc++-3.0.4.patch
new file mode 100644
index 000000000000..1861470bce8e
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-use-libstdc++-3.0.4.patch
@@ -0,0 +1,30 @@
+diff -ru oo_cvs/product/util/makefile.mk oo_stable1_cvs20020409_src/product/util/makefile.mk
+--- oo_cvs/product/util/makefile.mk	Mon Apr  8 10:34:21 2002
++++ oo_stable1_cvs20020409_src/product/util/makefile.mk	Wed Apr 10 18:18:09 2002
+@@ -112,7 +112,7 @@
+ 	$(DESTDIRDLL)$/libgcc_s.so.1 		\
+ 	$(DESTDIRDLL)$/libgcc_s.so 		\
+ 	$(DESTDIRDLL)$/libstdc++.so.3 		\
+-	$(DESTDIRDLL)$/libstdc++.so.3.0.1
++	$(DESTDIRDLL)$/libstdc++.so.3.0.4
+ .ENDIF
+ .ELIF "$(OS)"=="FREEBSD"
+ ###########
+@@ -438,13 +438,13 @@
+ 
+ #---------------------------------------------------------
+ # special targets for linux gcc3 
+-$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
++$(DESTDIRDLL)$/libstdc++.so.3.0.4 : $(DLLOUT)$/libstdc++.so.3.0.4 $(DIRLIST)
+ 	-rm -f $@
+-	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
++	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.4 $@
+ 
+-$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
++$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.4 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -s libstdc++.so.3.0.4 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
diff --git a/app-office/openoffice/files/641d/read_ins.pl b/app-office/openoffice/files/641d/read_ins.pl
index a1429055de8c..159c8862b1c3 100644
--- a/app-office/openoffice/files/641d/read_ins.pl
+++ b/app-office/openoffice/files/641d/read_ins.pl
@@ -1,5 +1,21 @@
 #!/usr/bin/perl
 #
+# Author: Preston A. Elder <prez@goth.net>
+#
+# Modified: Martin Schlemmer <azarah@gentoo.org>
+#
+#   20 Apr 2002: Change from STANDALONE to NETWORK.  Also do not create
+#                the "InstLanguages" entry in the "Installation" section.
+#                Fixed a stray "Styles" entry in the "Installation" section.
+#                Updated to add " Installed\t = YES" to appropriate "Module"
+#                sections.  Added output to first remove stale config files.
+#                Modify to support $RUNARGS, as we dont want one script to
+#                do all the work.
+#
+#   21 Apr 2002: Make use of NetDir for getting a value for $dir.
+#
+#                NOTE: as I dont know any perl to start with, things may not
+#                      be done by the book ... feel free to fix .. =)
 
 use strict;
 
@@ -7,6 +23,12 @@ my ($prefix) = $ENV{PREFIX};
 my ($instdir) = $ENV{INSTDIR};
 my ($destdir) = $ENV{DESTDIR};
 my ($regcomp) = $ENV{REGCOMP};
+my ($runargs) = $ENV{RUNARGS};
+
+if (!length($runargs))
+{
+	$runargs = "install register createdb";
+}
 
 die if (!length($instdir) || !length($destdir) || !length($regcomp));
 
@@ -28,294 +50,366 @@ $directories{PREDEFINED_PROGDIR} = [ "", $destdir ];
 $directories{PREDEFINED_CONFIGDIR} = [ "", $ENV{HOME} ];
 
 open(FH, "$instdir/setup.ins");
-while (<FH>) {
-    chomp;
+while (<FH>)
+{
+	chomp;
 
-    if (/^End/)
+	if (/^End/)
     {
-	if (length($directory) && length($parent) && length($hostname))
-	{
-	    $directories{$directory} = [ $parent, $hostname ];
-	}
-	$directory = $parent = $hostname = "";
+		if (length($directory) && length($parent) && length($hostname))
+		{
+			$directories{$directory} = [ $parent, $hostname ];
+		}
+		$directory = $parent = $hostname = "";
 
-	if (length($file))
-	{
-	    if (length($filename))
-	    {
-		$files{$file} = [ $filename, $dir ];
-		push(@components, $filename) if ($component);
-	    }
-	    if (length($package) && length($dir) && length($perms))
-	    {
-		$packages{$package} = [ $dir, $perms ];
-	    }
-	}
-	$component = 0;
-	$file = $filename = $package = $dir = $perms = "";
+		if (length($file))
+		{
+			if (length($filename))
+			{
+				$files{$file} = [ $filename, $dir ];
+				push(@components, $filename) if ($component);
+			}
+			if (length($package) && length($dir) && length($perms))
+			{
+				$packages{$package} = [ $dir, $perms ];
+			}
+		}
+		$component = 0;
+		$file = $filename = $package = $dir = $perms = "";
 
-	if (length($installation))
-	{
-	    if (length($product) && length($version))
-	    {
-		push(@dblines, "\tDefaultDestPath = \"" . $product . $version . "\";");
-	    }
-	    if (length($language))
-	    {
-		push(@dblines, "\tInstLanguages = \"" . $language . ":1:1\";");
-	    }
-	    push(@dblines, "\tDestPath = \"" . $finaldestdir . "\";");
-	    push(@dblines, "\tSourcePath = \"" . $instdir . "\";");
-	    push(@dblines, "\tMode = NETWORK;");
-	}
-	$installation = $language = "";
+		if (length($installation))
+		{
+			if (length($product) && length($version))
+			{
+				push(@dblines, "\tDefaultDestPath = \"" . $product . $version . "\";");
+			}
+			push(@dblines, "\tDestPath = \"" . $finaldestdir . "\";");
+			push(@dblines, "\tSourcePath = \"" . $instdir . "\";");
+			push(@dblines, "\tMode = NETWORK;");
+			push(@dblines, "\tInstallFromNet = NO;");
+		}
+		$installation = $language = "";
 
-	if (length($shortcut) && length($scname) && length($fileid) && length($scdir))
-	{
-	    $shortcuts{$shortcut} = [ $scname, $fileid, $scdir ];
-	}
-	$shortcut = $scname = $fileid = $scdir = "";
+		if (length($shortcut) && length($scname) && length($fileid) && length($scdir))
+		{
+			$shortcuts{$shortcut} = [ $scname, $fileid, $scdir ];
+		}
+		$shortcut = $scname = $fileid = $scdir = "";
 
-	if (length($profile) && length($p_name) && length($p_dir))
-	{
-	    $profiles{$profile} = [ $p_name, $p_dir ];
-	}
-	$profile = $p_name = $p_dir = "";
+		if (length($profile) && length($p_name) && length($p_dir))
+		{
+			$profiles{$profile} = [ $p_name, $p_dir ];
+		}
+		$profile = $p_name = $p_dir = "";
 
-	if (length($profileitem) && length($pi_profile) && length($pi_sect) && length($pi_key))
-	{
-	    $profileitems{$pi_profile}->{$pi_sect}->{$pi_key} = $pi_value;
-	}
-	$profileitem = $pi_profile = $pi_sect = $pi_key = $pi_value = "";
-    }
-    elsif (/^Installation\s+(\S+)/)
-    {
-	$installation = $1;
-    }
-    elsif (/^Directory\s+(\S+)/)
-    {
-	$directory = $1;
-    }
-    elsif (/^File\s+(\S+)/)
-    {
-	$file = $1;
-    }
-    elsif (/^Shortcut\s+(\S+)/)
-    {
-	$shortcut = $1;
-    }
-    elsif (/^Profile\s+(\S+)/)
-    {
-	$profile = $1;
-    }
-    elsif (/^ProfileItem\s+(\S+)/)
-    {
-	$profileitem = $1;
-    }
-    elsif (length($installation))
-    {
-	if (/^\s*DefaultDestPath\s*=/)
-	{
-	    next;
+		if (length($profileitem) && length($pi_profile) && length($pi_sect) && length($pi_key))
+		{
+			$profileitems{$pi_profile}->{$pi_sect}->{$pi_key} = $pi_value;
+		}
+		$profileitem = $pi_profile = $pi_sect = $pi_key = $pi_value = "";
 	}
-	if (/^\s*ProductName\s*=\s*\"([^;]+)\";/)
+	elsif (/^Installation\s+(\S+)/)
 	{
-	    $product = $1;
+		$installation = $1;
 	}
-	elsif (/^\s*ProductVersion\s*=\s*\"([^"]+)\";/)
+	elsif (/^Directory\s+(\S+)/)
 	{
-	    $version = $1;
+		$directory = $1;
 	}
-	elsif (/^\s*DefaultLanguage\s*=\s*\"([^"]+)\";/)
+	elsif (/^File\s+(\S+)/)
 	{
-	    $language = $1;
+		$file = $1;
 	}
-    }
-    elsif (length($directory))
-    {
-	if (/^\s*ParentID\s*=\s*([^;]+);/)
+	elsif (/^Shortcut\s+(\S+)/)
 	{
-	    $parent = $1;
+		$shortcut = $1;
 	}
-	elsif (/^\s*HostName\s*=\s*\"([^"]+)\";/)
+	elsif (/^Profile\s+(\S+)/)
 	{
-	    $hostname = $1;
+		$profile = $1;
 	}
-    }
-    elsif (length($file))
-    {
-	if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+	elsif (/^ProfileItem\s+(\S+)/)
 	{
-	    $filename = $1;
+		$profileitem = $1;
 	}
-	elsif (/^\s*PackedName\s*=\s*\"([^"]+)\";/)
+	elsif (length($installation))
 	{
-	    $package = $1;
+		if (/^\s*DefaultDestPath\s*=/)
+		{
+			next;
+		}
+		if (/^\s*ProductName\s*=\s*\"([^;]+)\";/)
+		{
+			$product = $1;
+		}
+		elsif (/^\s*ProductVersion\s*=\s*\"([^"]+)\";/)
+		{
+			$version = $1;
+		}
+		elsif (/^\s*DefaultLanguage\s*=\s*\"([^"]+)\";/)
+		{
+			$language = $1;
+		}
 	}
-	elsif (/^\s*Dir\s*=\s*([^;]+);/)
+	elsif (length($directory))
 	{
-	    $dir = $1;
+		if (/^\s*ParentID\s*=\s*([^;]+);/)
+		{
+			$parent = $1;
+		}
+		elsif (/^\s*HostName\s*=\s*\"([^"]+)\";/)
+		{
+			$hostname = $1;
+		}
 	}
-	elsif (/^\s*UnixRights\s*=\s*([^;]+);/)
+	elsif (length($file))
 	{
-	    $perms = $1;
+		if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+		{
+			$filename = $1;
+		}
+		elsif (/^\s*PackedName\s*=\s*\"([^"]+)\";/)
+		{
+			$package = $1;
+		}
+		# Only use Dir if not $dir is not set, as otherwise
+		# $dir will contain a valid NetDir.
+		elsif (/^\s*Dir\s*=\s*([^;]+);/)
+		{
+			if (!length($dir))
+			{
+				$dir = $1;
+			}
+		}
+		elsif (/^\s*NetDir\s*=\s*([^;]+);/)
+		{
+			$dir = $1;
+		}
+		elsif (/^\s*UnixRights\s*=\s*([^;]+);/)
+		{
+			$perms = $1;
+		}
+		elsif (/^\s*Styles\s*=\s*\(.*UNO_COMPONENT.*\);/)
+		{
+			$component = 1;
+		}
 	}
-	elsif (/^\s*Styles\s*=\s*\(.*UNO_COMPONENT.*\);/)
+	elsif (length($shortcut))
 	{
-	    $component = 1;
+		if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+		{
+			$scname = $1;
+		}
+		elsif (/^\s*FileID\s*=\s*([^;]+);/)
+		{
+			$fileid = $1;
+		}
+		elsif (/^\s*Dir\s*=\s*([^;]+);/)
+		{
+			$scdir = $1;
+		}
 	}
-    }
-    elsif (length($shortcut))
-    {
-	if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+	elsif (length($profile))
 	{
-	    $scname = $1;
+		if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+		{
+			$p_name = $1;
+		}
+		elsif (/^\s*Dir\s*=\s*([^;]+);/)
+		{
+			$p_dir = $1;
+		}
 	}
-	elsif (/^\s*FileID\s*=\s*([^;]+);/)
-	{
-	    $fileid = $1;
-	}
-	elsif (/^\s*Dir\s*=\s*([^;]+);/)
-	{
-	    $scdir = $1;
-	}
-    }
-    elsif (length($profile))
-    {
-	if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+	elsif (length($profileitem))
 	{
-	    $p_name = $1;
+		if (/^\s*ProfileID\s*=\s*([^;]+);/)
+		{
+			$pi_profile = $1;
+		}
+		elsif (/^\s*Section\s*=\s*\"([^"]+)\";/)
+		{
+			$pi_sect = $1;
+		}
+		elsif (/^\s*Key\s*=\s*\"([^"]+)\";/)
+		{
+			$pi_key = $1;
+		}
+		elsif (/^\s*Value\s*=\s*\"([^"]+)\";/)
+		{
+			$pi_value = $1;
+		}
 	}
-	elsif (/^\s*Dir\s*=\s*([^;]+);/)
-	{
-	    $p_dir = $1;
-	}
-    }
-    elsif (length($profileitem))
-    {
-	if (/^\s*ProfileID\s*=\s*([^;]+);/)
-	{
-	    $pi_profile = $1;
-	}
-	elsif (/^\s*Section\s*=\s*\"([^"]+)\";/)
-	{
-	    $pi_sect = $1;
-	}
-	elsif (/^\s*Key\s*=\s*\"([^"]+)\";/)
-	{
-	    $pi_key = $1;
-	}
-	elsif (/^\s*Value\s*=\s*\"([^"]+)\";/)
-	{
-	    $pi_value = $1;
-	}
-    }
 
-    my ($line) = $_;
-    $line =~ s/[']/'"'"'/g;
-    chop($line);
+	my ($line) = $_;
+	$line =~ s/[']/'"'"'/g;
+	chop($line);
 
-    push(@dblines, $line);
+	push(@dblines, $line);
 }
 close(FH);
 
 sub getFilePath
 {
-    my ($rv);
-    my ($lookfor) = shift;
+	my ($rv);
+	my ($lookfor) = shift;
 
-    if (defined($directories{$lookfor}))
-    {
-	if (defined($directories{@{$directories{$lookfor}}[0]}))
+	if (defined($directories{$lookfor}))
 	{
-	    $rv = getFilePath(@{$directories{$lookfor}}[0]);
+		if (defined($directories{@{$directories{$lookfor}}[0]}))
+		{
+			$rv = getFilePath(@{$directories{$lookfor}}[0]);
+		}
+		$rv .= "/" if (length($rv));
+		$rv .= @{$directories{$lookfor}}[1];
 	}
-	$rv .= "/" if (length($rv));
-	$rv .= @{$directories{$lookfor}}[1];
-    }
-    return $rv;
+	return $rv;
 }
 
 foreach $tmp (sort keys %packages)
 {
-    my ($dir) = getFilePath($packages{$tmp}[0]);
-    $useddirs{$dir} = ".";
+	my ($dir) = getFilePath($packages{$tmp}[0]);
+	$useddirs{$dir} = ".";
 }
 
 print "#!/bin/sh\n";
 
-print "mkdir -p $destdir\n";
-print "chmod 755 $destdir\n";
-
-foreach $tmp (sort keys %useddirs)
+if ($runargs =~ /install/)
 {
-    print "mkdir -p $tmp\n";
-    print "chmod 755 $tmp\n";
-}
+	print "mkdir -p $destdir\n";
+	print "chmod 755 $destdir\n";
 
-print "mkdir /tmp/inst$$\n";
-print "cd /tmp/inst$$\n";
+	foreach $tmp (sort keys %useddirs)
+	{
+		print "mkdir -p $tmp\n";
+		print "chmod 755 $tmp\n";
+	}
 
-foreach $tmp (sort keys %packages)
-{
-    print "rm -f *\n";
-    print "unzip $instdir/$tmp\n";
-    print "chmod $packages{$tmp}[1] *\n";
-    print "mv * " . getFilePath($packages{$tmp}[0]) . "\n";
-}
+	print "mkdir /tmp/inst$$\n";
+	print "cd /tmp/inst$$\n";
 
-print "cd $destdir\n";
-print "rm -rf /tmp/inst$$\n";
+	foreach $tmp (sort keys %packages)
+	{
+		print "rm -f *\n";
+		print "unzip $instdir/$tmp\n";
+		print "chmod $packages{$tmp}[1] *\n";
+		print "mv * " . getFilePath($packages{$tmp}[0]) . "\n";
+	}
 
-foreach $tmp (sort keys %shortcuts)
-{
-    if (defined($files{@{$shortcuts{$tmp}}[1]}) &&
-	defined($directories{@{$shortcuts{$tmp}}[2]}))
-    {
-	my ($newdir) = getFilePath($files{$shortcuts{$tmp}[1]}[1]);
-	$newdir =~ s/^$prefix//;
-	$newdir = "/" . $newdir if ($newdir !~ /^\//);
-	print "ln -sf $newdir/$files{$shortcuts{$tmp}[1]}[0] " .
-		getFilePath($shortcuts{$tmp}[2]) . "/$shortcuts{$tmp}[0]\n";
-    }
+	print "cd $destdir\n";
+	print "rm -rf /tmp/inst$$\n";
+
+	foreach $tmp (sort keys %shortcuts)
+	{
+		if (defined($files{@{$shortcuts{$tmp}}[1]}) &&
+		defined($directories{@{$shortcuts{$tmp}}[2]}))
+		{
+			my ($newdir) = getFilePath($files{$shortcuts{$tmp}[1]}[1]);
+			$newdir =~ s/^$prefix//;
+			$newdir = "/" . $newdir if ($newdir !~ /^\//);
+			print "ln -sf $newdir/$files{$shortcuts{$tmp}[1]}[0] " .
+			getFilePath($shortcuts{$tmp}[2]) . "/$shortcuts{$tmp}[0]\n";
+		}
+	}
 }
 
-foreach $tmp (sort keys %profiles)
+if ($runargs =~ /createdb/)
 {
-    if (defined($directories{@{$profiles{$tmp}}[1]}))
-    {
-	my ($dir) = getFilePath($profiles{$tmp}[1]);
-	my ($sect);
-	foreach $sect (sort keys %{$profileitems{$tmp}})
+	foreach $tmp (sort keys %profiles)
 	{
-	    print "echo '[" . $sect . "]' >>$dir/$profiles{$tmp}[0]\n";
-	    my ($key);
-	    foreach $key (sort keys %{$profileitems{$tmp}->{$sect}})
-	    {
-		my ($key2) = $key;
-		$key2 =~ s/\%PRODUCTNAME/$product/;
-		$key2 =~ s/\%PRODUCTVERSION/$version/;
-		my ($value) = $profileitems{$tmp}->{$sect}->{$key};
-		$value =~ s/<installmode>/NETWORK/;
-		$value =~ s/<productkey>/$product $version/;
-		$value =~ s,<workpath_url>,file://$finaldestdir,;
-		print "echo '$key2 = $value' >>$dir/$profiles{$tmp}[0]\n";
-	    }
-	    print "echo '' >>$dir/$profiles{$tmp}[0]\n";
+		if (defined($directories{@{$profiles{$tmp}}[1]}))
+		{
+			my ($dir) = getFilePath($profiles{$tmp}[1]);
+			my ($sect);
+			foreach $sect (sort keys %{$profileitems{$tmp}})
+			{
+				# First remove any stale config files
+				my ($cfgfile) = $profiles{$tmp}[0];
+				if ($cfgfile !~ /sversionrc/)
+				{
+					print "rm -f $dir/$profiles{$tmp}[0]\n";
+				}
+				print "echo '[" . $sect . "]' >>$dir/$profiles{$tmp}[0]\n";
+				my ($key);
+				foreach $key (sort keys %{$profileitems{$tmp}->{$sect}})
+				{
+					my ($key2) = $key;
+					$key2 =~ s/\%PRODUCTNAME/$product/;
+					$key2 =~ s/\%PRODUCTVERSION/$version/;
+					my ($value) = $profileitems{$tmp}->{$sect}->{$key};
+					$value =~ s,<installmode>,NETWORK,;
+					$value =~ s/<productkey>/$product $version/;
+					$value =~ s,<workpath_url>,file://$finaldestdir,;
+					print "echo '$key2=$value' >>$dir/$profiles{$tmp}[0]\n";
+				}
+				print "echo '' >>$dir/$profiles{$tmp}[0]\n";
+			}
+		}
 	}
-    }
 }
 
-print "LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:$destdir/program; export LD_LIBRARY_PATH\n";
-foreach $tmp (sort @components)
+if ($runargs =~ /register/)
 {
-    print "$regcomp -register -c $destdir/program/$tmp -r $destdir/program/applicat.rdb\n";
+	print "LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:$destdir/program; export LD_LIBRARY_PATH\n";
+	foreach $tmp (sort @components)
+	{
+		print "$regcomp -register -c $destdir/program/$tmp -r $destdir/program/applicat.rdb\n";
+	}
 }
 
-print "cp $instdir/LICENSE* $destdir\n";
-print "cp $instdir/README* $destdir\n";
+if ($runargs =~ /install/)
+{
+	print "cp $instdir/LICENSE* $destdir\n";
+	print "cp $instdir/README* $destdir\n";
+}
 
-foreach $tmp (@dblines)
+if ($runargs =~ /createdb/)
 {
-    print "echo '$tmp' >>$destdir/program/instdb.ins\n";
+	print "rm -f $destdir/program/instdb.ins\n";
+
+	my ($ismod) = "0";
+	my ($isinst) = "0";
+	my ($modname) = "foo";
+	foreach $tmp (@dblines)
+	{
+		# NETWORK installation
+		$tmp =~ s,<installmode>,NETWORK,;
+	
+		# Are we in the "Installation" section?
+		if ($tmp =~ /^Installation/)
+		{
+			$isinst = "1";
+		}
+		elsif ($tmp =~ /^End/)
+		{
+			$isinst = "0";
+		}
+	
+		# Do not print a "Styles" line for the "Installation" section
+		if (!(($isinst =~ "1") and ($tmp =~ /Styles/)))
+		{
+			print "echo '$tmp' >>$destdir/program/instdb.ins\n";
+		}
+	
+		# Are we in a "Module" section?
+		if ($tmp =~ /^Module/)
+		{
+			$ismod = "1";
+			$modname = $tmp;
+		}
+		elsif ($tmp =~ /^End/)
+		{
+			$ismod = "0";
+		}
+		# All modules are installed
+		if (($ismod =~ "1") and ($tmp =~ /Default/))
+		{
+			print "echo '\tInstalled\t = YES;' >>$destdir/program/instdb.ins\n";
+		}
+		# gid_Module_Root should also be "installed"
+		elsif (($ismod =~ "1") and ($modname =~ /gid_Module_Root/) and ($tmp =~ /Description/))
+		{
+			print "echo '\tInstalled\t = YES;' >>$destdir/program/instdb.ins\n";
+		}
+	}
 }
+
diff --git a/app-office/openoffice/files/641d/registry-641d.tbz2 b/app-office/openoffice/files/641d/registry-641d.tbz2
new file mode 100644
index 000000000000..f3f5b7eee65b
--- /dev/null
+++ b/app-office/openoffice/files/641d/registry-641d.tbz2
diff --git a/app-office/openoffice/openoffice-641d.ebuild b/app-office/openoffice/openoffice-641d.ebuild
index 93f3a5c5439a..60ae0ef1f990 100644
--- a/app-office/openoffice/openoffice-641d.ebuild
+++ b/app-office/openoffice/openoffice-641d.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Authors: Preston A. Elder <prez@goth.net>, Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-641d.ebuild,v 1.2 2002/04/17 23:46:32 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-641d.ebuild,v 1.3 2002/04/24 21:57:15 azarah Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -19,7 +19,8 @@
 # http://tools.openoffice.org/ext_comp.html
 #
 # todo:
-# Some kind of install process.
+# Some kind of install process.  Works mostly, but the xml registry
+# needs to be updated via a script or some program, not a tarball.
 
 LOC="/opt"
 MAIN_VER="`echo ${PV} |sed -e "s:[a-z]::g"`"
@@ -79,10 +80,20 @@ src_unpack() {
 	patch -p1 <${FILESDIR}/${PV}/${P}-configure.patch || die
 
 	# Fixes code errors that stop compile
-	patch -p1 <${FILESDIR}/${PV}/${P}-code_err.patch || die
+#	patch -p1 <${FILESDIR}/${PV}/${P}-code_err.patch || die
 
 	# This forces exceptions to always be enabled for gcc 3.0.x
-	patch -p1 <${FILESDIR}/${PV}/${P}-gcc3.patch || die
+#	patch -p1 <${FILESDIR}/${PV}/${P}-gcc3.patch || die
+
+	# Debian patches to fix build problems with gcc-3.0.4
+	#
+	# Azarah -- 23 April 2002
+	patch -p1 <${FILESDIR}/${PV}/${P}-exception-sprecs.patch || die
+	patch -p1 <${FILESDIR}/${PV}/${P}-clk-tck-gcc-3.patch || die
+	patch -p1 <${FILESDIR}/${PV}/${P}-define-XSetIMValues.patch || die
+	patch -p1 <${FILESDIR}/${PV}/${P}-use-libstdc++-3.0.4.patch || die
+	patch -p1 <${FILESDIR}/${PV}/${P}-class-SwpHtStart-SAR.patch || die
+
 
 	# Debian patch to enable build of zipdep
 	#
@@ -98,6 +109,12 @@ src_unpack() {
 	patch -p1 <${FILESDIR}/${PV}/${P}-use-compiler-vars.patch || die
 	patch -p1 <${FILESDIR}/${PV}/${P}-ran-autoconf.patch || die
 
+	# Misc Debian patches to fixup build
+	#
+	# Azarah -- 22 April 2002
+#	patch -p1 <${FILESDIR}/${PV}/${P}-no-mozab.patch || die
+	patch -p1 <${FILESDIR}/${PV}/${P}-remove-libstdc-from-scp.patch || die
+
 	# Fix STLport to use gcc-3.x/g++-3.x as compilter when we have
 	# gcc-2.95.3 as base compiler.
 	#
@@ -165,13 +182,7 @@ src_compile() {
 	cd ${S}
 	./bootstrap || die "Bootstrap failed!"
 
-	BS=${S}/gentoo-build.csh
-	cat >${BS} <<EOT
-source LinuxIntelEnv.Set
-dmake
-EOT
-	chmod +x ${BS}
-	tcsh ${BS} || die "Build failed!"
+	tcsh -c "source LinuxIntelEnv.Set; dmake" || die "Build failed!"
 
 	GVERDIR="`grep GVERDIR LinuxIntelEnv.Set |awk '{print $3}'`"
 	[ -d ${S}/instsetoo/${GVERDIR} ] || die "Cannot find build dir!"
@@ -202,12 +213,12 @@ src_install() {
 	GVERDIR="`grep GVERDIR LinuxIntelEnv.Set |awk '{print $3}'`"
 
 	# This next lot is not really tested, and could fail horridly.
-	# what I basically do, is generate two scripts with
+	# what I basically do, is generate three scripts with
 	# Preston A. Elder's read_ins.pl script.  The first is just
 	# the install part extracted, with install location in ${D}.
-	# The second is just the db generation, and component registration,
-	# which will be done in pkg_postinst() and have the *live*
-	# ${ROOT} as target.
+	# The second is just the db generation, and third is component
+	# registration, which will be done in pkg_postinst() and have
+	# the *live* ${ROOT} as target.
 	#
 	# NOTE: this is just temporary until I can come up with a better
 	#       solution (or somebody else).  There is a way to make setup
@@ -216,28 +227,32 @@ src_install() {
 	#
 	# Azarah -- 16 April 2002
 
-	# Generate a install script template
+	# Generate a install script
 	PREFIX=${D}
 	REGCOMP=${S}/solver/${MAIN_VER}/${GVERDIR}/bin/regcomp
 	INSTDIR=${S}/instsetoo/${GVERDIR}/${LANGUAGE}/normal
 	DESTDIR=${D}${LOC}/OpenOffice-${PV}
 	export PREFIX REGCOMP INSTDIR DESTDIR
-	${FILESDIR}/${PV}/read_ins.pl >${S}/gentoo-install.sh.orig
+	export RUNARGS="install"
+	${FILESDIR}/${PV}/read_ins.pl >${S}/gentoo-install.sh
+	chmod 0755 ${S}/gentoo-install.sh
 
-	# Generate a register script template
+	# Generate createdb and register scripts
 	PREFIX=""
 	REGCOMP=${LOC}/OpenOffice-${PV}/program/regcomp
 	INSTDIR=${S}/instsetoo/${GVERDIR}/${LANGUAGE}/normal
 	DESTDIR=${LOC}/OpenOffice-${PV}
 	export PREFIX REGCOMP INSTDIR DESTDIR
-	${FILESDIR}/${PV}/read_ins.pl >${S}/gentoo-register.sh.orig
-
-	# Extract our install script
-	grep -v "^${S}" ${S}/gentoo-install.sh.orig | grep -v "^echo" > \
-		${S}/gentoo-install.sh
-	chmod 0755 ${S}/gentoo-install.sh
-	${S}/gentoo-install.sh
-
+	export RUNARGS="register"
+	${FILESDIR}/${PV}/read_ins.pl >${S}/gentoo-register.sh || die
+	chmod 0755 ${S}/gentoo-register.sh
+	export RUNARGS="createdb"
+	${FILESDIR}/${PV}/read_ins.pl >${S}/gentoo-createdb.sh || die
+	chmod 0755 ${S}/gentoo-createdb.sh
+
+	# Install to ${D}
+	${S}/gentoo-install.sh || die "Failed to install data to ${D}!"
+		
 	# Leave for now ... need for figuring the language selection
 	#
 	# Azarah -- 16 April 2002
@@ -249,23 +264,64 @@ src_install() {
 	mkdir -p ${D}${LOC}/OpenOffice-${PV}/program
 	cp bin/regcomp ${D}${LOC}/OpenOffice-${PV}/program
 
-	# Extract our register script
-	echo '#!/bin/sh' > ${D}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
-	grep "^echo" ${S}/gentoo-register.sh.orig >> \
-		${D}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
-	grep "^LD_LIBRARY_PATH" ${S}/gentoo-register.sh.orig \
-		${D}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
-	grep "^${LOC}/OpenOffice-${PV}/program/regcomp" \
-		${S}/gentoo-register.sh.orig >> \
-		${D}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
-	chmod 0755 ${D}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
+	# NOTE!!!! We need to fix the registry for network install somehow.
+	#
+	# Crappy solution for now:
+	# Unpack the registry needed for NETWORK installation.
+	# This my need to be updated for future versions of OO.
+	# Install binary with "./setup -net" to generate.
+	cd ${D}${LOC}/OpenOffice-${PV}/share/config/registry
+	rm -rf *
+	tar -jxpf ${FILESDIR}/${PV}/registry-${PV}.tbz2 || \
+		die "Could not unpack registry!"
+	# Fix paths
+	cd ${D}${LOC}/OpenOffice-${PV}/share/config/registry/instance/org/openoffice/Office
+	cp Common.xml Common.xml.orig
+	sed -e "s:/opt/OpenOffice.org641:${LOC}/OpenOffice-${PV}:g" \
+		Common.xml.orig >Common.xml
+	rm -f Common.xml.orig
+
+	# Generate ISO resource files.
+	cd ${D}${LOC}/OpenOffice-${PV}/program/resource
+	for x in ooo*.res
+	do
+		cp ${x} ${x/ooo/iso}
+	done
+
+	# Create the global fonts.dir file
+	cd ${D}${LOC}/OpenOffice-${PV}/share/fonts/truetype
+	cp -f fonts.dir  fonts_dir.global
+
+	# Create misc directories
+	cd ${D}${LOC}/OpenOffice-${PV}
+	mkdir -p user/config/registry/instance/org/openoffice/{Office,ucb}
+	mkdir -p user/psprint/{driver,fontmetric}
+	mkdir -p user/{autocorr,backup,plugin,store,temp,template}
+
+	# Move the register and createdb scripts to ${D}
+	cp -f ${S}/gentoo-register.sh ${D}${LOC}/OpenOffice-${PV}/program
+	cp -f ${S}/gentoo-createdb.sh ${D}${LOC}/OpenOffice-${PV}/program
 }
 
 pkg_postinst() {
-	# Register the components in the live $ROOT
-	if [ -x ${ROOT}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh ]
+	if [ "${ROOT}" = "/" ]
 	then
-		${ROOT}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
+		for x in bootstraprc configmgrrc instdb.ins sofficerc unorc
+		do
+			if [ -e ${LOC}/OpenOffice-${PV}/program/${x} ]
+			then
+				rm -f ${LOC}/OpenOffice-${PV}/program/${x} >/dev/null
+			fi
+		done
+		${LOC}/OpenOffice-${PV}/program/gentoo-createdb.sh || die
+		echo ">>> Registering components (this may take a few minutes)..."
+		${LOC}/OpenOffice-${PV}/program/gentoo-register.sh &>/dev/null || die
 	fi
+
+	# Make sure these do not get nuked.
+	cd ${ROOT}${LOC}/OpenOffice-${PV}
+	mkdir -p user/config/registry/instance/org/openoffice/{Office,ucb}
+	mkdir -p user/psprint/{driver,fontmetric}
+	mkdir -p user/{autocorr,backup,plugin,store,temp,template}
 }