From: Andreas Proschofsky <suka@gentoo.org>
Date: Tue, 28 Dec 2004 08:41:47 +0000 (+0000)
Subject: Revision bump, closes bug #75378
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b2245330c5156111667da01a5ee7f5af0c27d219;p=gentoo.git

Revision bump, closes bug #75378
---

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 6affbe88d9c6..95b06e4ea69c 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.93 2004/12/04 15:35:31 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.94 2004/12/28 08:41:47 suka Exp $
+
+*openoffice-1.1.4 (28 Dec 2004)
+
+  28 Dec 2004; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/gcc-instlib.patch, +files/1.1.4/gcc34-nojava-fix.patch,
+  +files/1.1.4/gcc34-nptl-fix.patch, +files/1.1.4/gcc34.patch.bz2,
+  +files/1.1.4/newstlportfix-patch, +files/1.1.4/ooffice-wrapper-1.3,
+  +files/1.1.4/openoffice-java.patch, +openoffice-1.1.4.ebuild:
+  Revison bump, closes bug #75378 Also includes a fix for build problems
+  with recent freetype versions, taken from Mandrake.
 
   04 Dec 2004; Sven Wegener <swegener@gentoo.org> :
   Added missing digest entries for the ppc files.
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 616a7b98b6fe..751add49129e 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,16 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 ea7129ffd5ce5b014c22234eed1ec303 openoffice-1.1.4.ebuild 15654
 MD5 e7fff1cdeac61f986e2375f8fcb110dc openoffice-1.0.3-r2.ebuild 20531
 MD5 f63e879f61fb812d064f2e524150b667 openoffice-1.1.1-r1.ebuild 15777
-MD5 028221961eab58410eac58393c7840e5 openoffice-1.1.0-r4.ebuild 20022
 MD5 40675e126c7b38c1f5f223a101a3ca1b openoffice-1.1.3.ebuild 15687
-MD5 0d1005d461e3eacc719377dcf72f3d9c ChangeLog 20516
+MD5 5cdec46f02fa941302ccc9c3882c2ca5 ChangeLog 20998
 MD5 2e4e0aa812a48bacf4b33b838b5df978 openoffice-1.1.3-r1.ebuild 15841
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73
+MD5 daab23b72cdb79ffdb992414239a828f files/digest-openoffice-1.1.4 136
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r2 330
-MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r4 195
 MD5 8382af8b277f267e568feab0f7976f3c files/digest-openoffice-1.1.1-r1 130
 MD5 e1faaa628102992e72c3784052850778 files/digest-openoffice-1.1.3-r1 327
 MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
@@ -31,15 +28,6 @@ MD5 bf8388f4d41ad2ed1a38a0aa2d8fe4ce files/1.0.3/openoffice-1.0.3-sparc-gentoo.p
 MD5 ce580b49f86ec9ab3ceba58268c886df files/1.0.3/openoffice-1.0.1-sparc.patch.bz2 15843
 MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch 14774
 MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch 596
-MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644
-MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.0/ooffice-wrapper-1.3 8972
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.0/openoffice-java.patch 2092
-MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
-MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603
-MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.0/neon.patch 8300
-MD5 309ec50c6facc777068caebd51640c92 files/1.1.0/no-mozab.patch 2741
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
-MD5 93eb1ff95722454c0eb92a916dc4877d files/1.1.0/newstlportfix.patch 17655
 MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.1/openoffice-java.patch 2092
 MD5 866e4e913af8431072dab7ec53269c31 files/1.1.1/linux-sparc.patch 14494
@@ -55,10 +43,11 @@ MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.3/openoffice-java.patch 2092
 MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.3/gcc34-nojava-fix.patch 329
 MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618
 MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.3/newstlportfix.patch 10032
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBsdlNI1lqEGTUzyQRAsKgAKC6/dgv2wr6j/KuhiUHYGrXC1xonwCgs4Zj
-dM1HIoXuyju2jFhebWK5vXM=
-=Nxvb
------END PGP SIGNATURE-----
+MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342
+MD5 5b5b02ecb719c0a553b740edd3544bc7 files/1.1.4/ooffice-wrapper-1.3 9471
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092
+MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
+MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.4/gcc34-nptl-fix.patch 618
+MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
+MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix-patch 3638
diff --git a/app-office/openoffice/files/1.1.0/fixed-gcc.patch b/app-office/openoffice/files/1.1.0/fixed-gcc.patch
deleted file mode 100644
index 3f2ee40700af..000000000000
--- a/app-office/openoffice/files/1.1.0/fixed-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- config_office/configure.orig	2003-08-13 15:03:11.000000000 +0200
-+++ config_office/configure	2003-08-13 15:03:46.000000000 +0200
-@@ -2895,13 +2895,6 @@
- 
-    if test "$_gcc_major" = "3"; then
-       USE_GCC3="TRUE"
--      if test "$_gcc_longver"  -eq "030203"; then
--         { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\"
--		 	gives internal error, use another version please." >&5
--echo "$as_me: error: found version \"$_gcc_version\"
--		 	gives internal error, use another version please." >&2;}
--   { (exit 1); exit 1; }; }
--      fi
-    else
-       USE_GCC3="FALSE"
-       if test "$_gcc_longver"  -lt "029502"; then
diff --git a/app-office/openoffice/files/1.1.0/neon.patch b/app-office/openoffice/files/1.1.0/neon.patch
deleted file mode 100644
index d68adb2eb353..000000000000
--- a/app-office/openoffice/files/1.1.0/neon.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- /work/ooo/gnome-ooo/openoffice/build/OOO_1_1_1/neon/neon.patch	2004-03-19 17:32:52.000000000 -0500
-+++ neon/neon.patch	2004-04-05 12:38:42.000000000 -0400
-@@ -135,8 +134,8 @@
- ! #define read _read
- ! 
- ! #endif
--*** misc/neon-0.23.5/src/makefile.mk	Tue Oct 22 17:55:55 2002
----- misc/build/neon-0.23.5/src/makefile.mk	Tue Oct 22 17:35:49 2002
-+*** misc/neon-0.23.5/src/makefile.mk	2004-04-05 12:38:37.706437510 -0400
-+--- misc/build/neon-0.23.5/src/makefile.mk	2004-04-05 12:21:47.810143789 -0400
- ***************
- *** 1 ****
- ! dummy
-@@ -190,8 +189,173 @@
- ! # --- Targets ------------------------------------------------------
- ! 
- ! .INCLUDE :  target.mk
--*** misc/neon-0.23.5/src/ne_props.c	Sun Jul 14 13:18:06 2002
----- misc/build/neon-0.23.5/src/ne_props.c	Tue Oct 22 17:35:49 2002
-+*** misc/neon-0.23.5/src/ne_207.c	2002-06-23 10:04:36.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_207.c	2004-04-05 12:38:18.221460697 -0400
-+***************
-+*** 1,6 ****
-+  /* 
-+     WebDAV 207 multi-status response handling
-+!    Copyright (C) 1999-2002, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+--- 1,6 ----
-+  /* 
-+     WebDAV 207 multi-status response handling
-+!    Copyright (C) 1999-2004, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+***************
-+*** 358,369 ****
-+  	if (ne_get_status(req)->code == 207) {
-+  	    if (!ne_xml_valid(p)) { 
-+  		/* The parse was invalid */
-+! 		ne_set_error(sess, ne_xml_get_error(p));
-+  		ret = NE_ERROR;
-+  	    } else if (ctx.is_error) {
-+  		/* If we've actually got any error information
-+  		 * from the 207, then set that as the error */
-+! 		ne_set_error(sess, ctx.buf->data);
-+  		ret = NE_ERROR;
-+  	    }
-+  	} else if (ne_get_status(req)->klass != 2) {
-+--- 358,369 ----
-+  	if (ne_get_status(req)->code == 207) {
-+  	    if (!ne_xml_valid(p)) { 
-+  		/* The parse was invalid */
-+! 		ne_set_error(sess, "%s", ne_xml_get_error(p));
-+  		ret = NE_ERROR;
-+  	    } else if (ctx.is_error) {
-+  		/* If we've actually got any error information
-+  		 * from the 207, then set that as the error */
-+! 		ne_set_error(sess, "%s", ctx.buf->data);
-+  		ret = NE_ERROR;
-+  	    }
-+  	} else if (ne_get_status(req)->klass != 2) {
-+*** misc/neon-0.23.5/src/ne_auth.c	2002-10-07 16:33:17.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_auth.c	2004-04-05 12:38:18.223460387 -0400
-+***************
-+*** 908,914 ****
-+      if (areq->auth_info_hdr != NULL && 
-+  	verify_response(areq, sess, areq->auth_info_hdr)) {
-+  	NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n");
-+! 	ne_set_error(sess->sess, _(sess->spec->fail_msg));
-+  	ret = NE_ERROR;
-+      } else if (status->code == sess->spec->status_code && 
-+  	       areq->auth_hdr != NULL) {
-+--- 908,914 ----
-+      if (areq->auth_info_hdr != NULL && 
-+  	verify_response(areq, sess, areq->auth_info_hdr)) {
-+  	NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n");
-+! 	ne_set_error(sess->sess, "%s", _(sess->spec->fail_msg));
-+  	ret = NE_ERROR;
-+      } else if (status->code == sess->spec->status_code && 
-+  	       areq->auth_hdr != NULL) {
-+*** misc/neon-0.23.5/src/ne_compress.c	2002-09-18 16:50:34.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_compress.c	2004-04-05 12:38:18.225460077 -0400
-+***************
-+*** 1,6 ****
-+  /* 
-+     Handling of compressed HTTP responses
-+!    Copyright (C) 2001-2002, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+--- 1,6 ----
-+  /* 
-+     Handling of compressed HTTP responses
-+!    Copyright (C) 2001-2004, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+***************
-+*** 252,258 ****
-+  	     * doesn't work, and this does, but I have no idea why..
-+  	     * Google showed me the way. */
-+  	    if (inflateInit2(&ctx->zstr, -MAX_WBITS) != Z_OK) {
-+! 		ne_set_error(ctx->session, ctx->zstr.msg);
-+  		ctx->state = NE_Z_ERROR;
-+  		return;
-+  	    }
-+--- 252,258 ----
-+  	     * doesn't work, and this does, but I have no idea why..
-+  	     * Google showed me the way. */
-+  	    if (inflateInit2(&ctx->zstr, -MAX_WBITS) != Z_OK) {
-+! 		ne_set_error(ctx->session, "%s", ctx->zstr.msg);
-+  		ctx->state = NE_Z_ERROR;
-+  		return;
-+  	    }
-+*** misc/neon-0.23.5/src/ne_locks.c	2002-08-05 16:10:53.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_locks.c	2004-04-05 12:38:18.227459766 -0400
-+***************
-+*** 723,729 ****
-+  	}
-+  	else if (parse_failed) {
-+  	    ret = NE_ERROR;
-+! 	    ne_set_error(sess, ne_xml_get_error(parser));
-+  	}
-+  	else if (ne_get_status(req)->code == 207) {
-+  	    ret = NE_ERROR;
-+--- 723,729 ----
-+  	}
-+  	else if (parse_failed) {
-+  	    ret = NE_ERROR;
-+! 	    ne_set_error(sess, "%s", ne_xml_get_error(parser));
-+  	}
-+  	else if (ne_get_status(req)->code == 207) {
-+  	    ret = NE_ERROR;
-+***************
-+*** 792,798 ****
-+      if (ret == NE_OK && ne_get_status(req)->klass == 2) {
-+  	if (parse_failed) {
-+  	    ret = NE_ERROR;
-+! 	    ne_set_error(sess, ne_xml_get_error(parser));
-+  	}
-+  	else if (ne_get_status(req)->code == 207) {
-+  	    ret = NE_ERROR;
-+--- 792,798 ----
-+      if (ret == NE_OK && ne_get_status(req)->klass == 2) {
-+  	if (parse_failed) {
-+  	    ret = NE_ERROR;
-+! 	    ne_set_error(sess, "%s", ne_xml_get_error(parser));
-+  	}
-+  	else if (ne_get_status(req)->code == 207) {
-+  	    ret = NE_ERROR;
-+*** misc/neon-0.23.5/src/ne_props.c	2002-07-14 07:18:06.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_props.c	2004-04-05 12:38:27.458027606 -0400
-+***************
-+*** 1,6 ****
-+  /* 
-+     WebDAV property manipulation
-+!    Copyright (C) 2000-2002, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+--- 1,6 ----
-+  /* 
-+     WebDAV property manipulation
-+!    Copyright (C) 2000-2004, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+***************
-+*** 136,142 ****
-+      if (ret == NE_OK && ne_get_status(req)->klass != 2) {
-+  	ret = NE_ERROR;
-+      } else if (!ne_xml_valid(handler->parser)) {
-+! 	ne_set_error(handler->sess, ne_xml_get_error(handler->parser));
-+  	ret = NE_ERROR;
-+      }
-+  
-+--- 136,142 ----
-+      if (ret == NE_OK && ne_get_status(req)->klass != 2) {
-+  	ret = NE_ERROR;
-+      } else if (!ne_xml_valid(handler->parser)) {
-+! 	ne_set_error(handler->sess, "%s", ne_xml_get_error(handler->parser));
-+  	ret = NE_ERROR;
-+      }
-+  
- ***************
- *** 457,462 ****
- --- 457,465 ----
-@@ -204,3 +368,37 @@
-       /* If we get a non-2xx response back here, we wipe the value for
-        * each of the properties in this propstat, so the caller knows to
-        * look at the status instead. It's annoying, since for each prop
-+*** misc/neon-0.23.5/src/ne_xml.c	2002-10-08 15:11:31.000000000 -0400
-+--- misc/build/neon-0.23.5/src/ne_xml.c	2004-04-05 12:38:18.232458991 -0400
-+***************
-+*** 1,6 ****
-+  /* 
-+     Higher Level Interface to XML Parsers.
-+!    Copyright (C) 1999-2002, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+--- 1,6 ----
-+  /* 
-+     Higher Level Interface to XML Parsers.
-+!    Copyright (C) 1999-2004, Joe Orton <joe@manyfish.co.uk>
-+  
-+     This library is free software; you can redistribute it and/or
-+     modify it under the terms of the GNU Library General Public
-+***************
-+*** 860,866 ****
-+  
-+  void ne_xml_set_error(ne_xml_parser *p, const char *msg)
-+  {
-+!     ne_snprintf(p->error, ERR_SIZE, msg);
-+  }
-+  
-+  #ifdef HAVE_LIBXML
-+--- 860,866 ----
-+  
-+  void ne_xml_set_error(ne_xml_parser *p, const char *msg)
-+  {
-+!     ne_snprintf(p->error, ERR_SIZE, "%s", msg);
-+  }
-+  
-+  #ifdef HAVE_LIBXML
diff --git a/app-office/openoffice/files/1.1.0/newstlportfix.patch b/app-office/openoffice/files/1.1.0/newstlportfix.patch
deleted file mode 100644
index 88a77fb47048..000000000000
--- a/app-office/openoffice/files/1.1.0/newstlportfix.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-diff -urN stlport.orig/STLport-4.5.3.patch stlport/STLport-4.5.3.patch
---- stlport.orig/STLport-4.5.3.patch	1970-01-01 01:00:00.000000000 +0100
-+++ stlport/STLport-4.5.3.patch	2003-08-13 14:10:51.000000000 +0200
-@@ -0,0 +1,247 @@
-+*** misc/STLport-4.5.3/src/fstream.cpp	Tue Sep  4 19:10:12 2001
-+--- misc/build/STLport-4.5.3/src/fstream.cpp	Fri Jan 11 17:22:40 2002
-+***************
-+*** 293,299 ****
-+  #ifdef __MINGW32__
-+   __MINGW_IMPORT ioinfo * __pioinfo[];
-+  #else
-+!   extern _CRTIMP ioinfo * __pioinfo[];
-+  #endif
-+  
-+  } // extern "C"
-+--- 293,299 ----
-+  #ifdef __MINGW32__
-+   __MINGW_IMPORT ioinfo * __pioinfo[];
-+  #else
-+!   extern __declspec( dllimport ) ioinfo * __pioinfo[];
-+  #endif
-+  
-+  } // extern "C"
-+*** misc/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:48:44 2002
-+--- misc/build/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:47:21 2002
-+***************
-+*** 1 ****
-+! dummy
-+--- 1,59 ----
-+! #
-+! # Note : this makefile is for gcc-3 !
-+! #
-+! 
-+! #
-+! # compiler
-+! #
-+! CC = $(CCCOMP) 
-+! CXX = $(CXXCOMP) -D_REENTRANT -fexceptions
-+! 
-+! #
-+! # Basename for libraries
-+! #
-+! LIB_BASENAME = libstlport_gcc
-+! 
-+! #
-+! # guts for common stuff
-+! #
-+! #
-+! LINK=ar cr
-+! DYN_LINK=$(CXX) --fexceptions -shared -o
-+! 
-+! OBJEXT=o
-+! DYNEXT=so
-+! STEXT=a
-+! RM=rm -rf
-+! PATH_SEP=/
-+! MKDIR=mkdir -p
-+! COMP=GCC$(ARCH)
-+! INSTALL_STEP = install_unix 
-+! 
-+! all:  all_dynamic all_static symbolic_links 
-+! 
-+! include common_macros.mak
-+! 
-+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+! 
-+! CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+! 
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! 
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+! 
-+! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+! 
-+! include common_percent_rules.mak
-+! include common_rules.mak
-+! 
-+! 
-+! #install: all
-+! #	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+! 
-+! #%.s: %.cpp
-+! #	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-+! 
-+! 
-+*** misc/STLport-4.5.3/src/vc6.mak	Mon Jul 30 00:18:15 2001
-+--- misc/build/STLport-4.5.3/src/vc6.mak	Fri Jan 11 17:41:08 2002
-+***************
-+*** 10,16 ****
-+  COMP=VC6
-+  
-+  # EXTRA_COMMON_FLAGS=/D "_MBCS"
-+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS"
-+  EXTRA_DEBUG_FLAGS=
-+  EXTRA_NDEBUG_FLAGS=
-+  
-+--- 10,16 ----
-+  COMP=VC6
-+  
-+  # EXTRA_COMMON_FLAGS=/D "_MBCS"
-+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS" /D "_NTSDK" /D "_CRTIMP="
-+  EXTRA_DEBUG_FLAGS=
-+  EXTRA_NDEBUG_FLAGS=
-+  
-+*** misc/STLport-4.5.3/src/vc_common.mak	Tue Sep  4 19:10:12 2001
-+--- misc/build/STLport-4.5.3/src/vc_common.mak	Fri Jan 11 12:48:14 2002
-+***************
-+*** 62,68 ****
-+  LDFLAGS_RELEASE=/opt:ref
-+  
-+  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
-+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /dll /incremental:no
-+  
-+  
-+  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
-+--- 62,68 ----
-+  LDFLAGS_RELEASE=/opt:ref
-+  
-+  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
-+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no
-+  
-+  
-+  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
-+***************
-+*** 79,87 ****
-+  
-+  
-+  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-+  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
-+  
-+  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
-+  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
-+--- 79,87 ----
-+  
-+  
-+  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-+  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
-+  
-+  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
-+  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
-+***************
-+*** 95,101 ****
-+  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
-+  
-+  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  
-+  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
-+--- 95,101 ----
-+  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
-+  
-+  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) msvcrt.lib /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  
-+  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
-+*** misc/STLport-4.5.3/stlport/stdexcept	Tue May 22 02:50:21 2001
-+--- misc/build/STLport-4.5.3/stlport/stdexcept	Mon Jan 14 18:26:09 2002
-+***************
-+*** 49,54 ****
-+--- 49,59 ----
-+  
-+  _STLP_BEGIN_NAMESPACE
-+  
-++ /* maybe limit to gcc 3.x */
-++ #if defined( __GNUC__)
-++ #define _STLP_NOTHROW_INHERENTLY throw()
-++ #endif
-++ 
-+  class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-+  public:
-+    __Named_exception(const string& __str) 
-+*** misc/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:04 2002
-+--- misc/build/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:56 2002
-+***************
-+*** 226,233 ****
-+  
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+  
-+  # elif (__GNUC_MINOR__ < 8)
-+  
-+--- 226,233 ----
-+  
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+  
-+  # elif (__GNUC_MINOR__ < 8)
-+  
-+***************
-+*** 285,298 ****
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-+  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ )
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-+  #   endif
-+--- 285,298 ----
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-+  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-v32
-+  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ )
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-+  #   endif
-+*** misc/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:41:05 2002
-+--- misc/build/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:39:45 2002
-+***************
-+*** 84,90 ****
-+  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
-+! 	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  
-+  install_unix :
-+--- 84,90 ----
-+  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
-+! 	-ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  
-+  install_unix :
-diff -urN stlport.orig/makefile.mk stlport/makefile.mk
---- stlport.orig/makefile.mk	2003-08-13 14:09:29.000000000 +0200
-+++ stlport/makefile.mk	2003-08-13 14:12:38.000000000 +0200
-@@ -72,8 +72,8 @@
- # --- Files --------------------------------------------------------
- .EXPORT : CC CXX
- .IF "$(COMID)"=="gcc3"
--	TARFILE_NAME=STLport-4.5
--	PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
-+	TARFILE_NAME=STLport-4.5.3
-+	PATCH_FILE_NAME=$(MISC)$/STLport-4.5.3.patch
- .ELSE			# "$(COMID)"=="gcc3"
- 	.IF "$(OS)"=="MACOSX"
- 		# [ed] For gcc2, we need to use STLport 4.0.  4.5 will not compile with gcc2 on OS X.
-@@ -189,10 +189,10 @@
- .INCLUDE :	target.mk
- .INCLUDE :	tg_ext.mk
- 
--$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.patch
-+$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.3.patch
- 
--$(MISC)$/STLport-4.5.patch : STLport-4.5.patch
--	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch
-+$(MISC)$/STLport-4.5.3.patch : STLport-4.5.3.patch
-+	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.3.patch > $(MISC)$/STLport-4.5.3.patch
- 
- .IF "$(GUI)"=="WNT"
- .IF "$(CCNUMVER)"<="001300000000"
-diff -urN stlport.orig/makefile.mk.orig stlport/makefile.mk.orig
---- stlport.orig/makefile.mk.orig	1970-01-01 01:00:00.000000000 +0100
-+++ stlport/makefile.mk.orig	2003-08-13 14:10:17.000000000 +0200
-@@ -0,0 +1,228 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: newstlportfix.patch,v $
-+#
-+#   $Revision: 1.1 $
-+#
-+#   last change: $Author: pauldv $ $Date: 2003/10/03 11:39:26 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=.
-+
-+PRJNAME=so_stlport
-+TARGET=so_stlport
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :	settings.mk
-+
-+# --- Files --------------------------------------------------------
-+.EXPORT : CC CXX
-+.IF "$(COMID)"=="gcc3"
-+	TARFILE_NAME=STLport-4.5
-+	PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
-+.ELSE			# "$(COMID)"=="gcc3"
-+	.IF "$(OS)"=="MACOSX"
-+		# [ed] For gcc2, we need to use STLport 4.0.  4.5 will not compile with gcc2 on OS X.
-+		TARFILE_NAME=STLport-4.0
-+		PATCH_FILE_NAME=STLport-4.0.macosx.patch
-+	.ELSE
-+		TARFILE_NAME=STLport-4.0
-+		PATCH_FILE_NAME=STLport-4.0.patch
-+	.ENDIF			# "$(OS)"=="MACOSX"
-+.ENDIF			# "$(COMID)"=="gcc3"
-+
-+.IF "$(GUI)"=="WNT"
-+.IF "$(CCNUMVER)"<="001300000000"
-+TARFILE_NAME=STLport-4.0
-+PATCH_FILE_NAME=STLport-4.0.patch
-+.ELSE			# "$(CCNUMVER)"<="001300000000"
-+TARFILE_NAME=STLport-4.5-0119
-+PATCH_FILE_NAME=STLport-4.5-0119.patch
-+.ENDIF			# "$(CCNUMVER)"<="001300000000"
-+.ENDIF
-+
-+.IF "$(USE_SHELL)"=="4nt"
-+TAR_EXCLUDES=*/SC5/*
-+.ENDIF          # "$(USE_SHELL)"=="4nt"
-+
-+ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak
-+
-+
-+CONFIGURE_ACTION=none
-+CONFIGURE_FLAGS=
-+
-+BUILD_DIR=src
-+
-+.IF "$(COM)"=="MSC"
-+BUILD_ACTION=nmake
-+.IF "$(CCNUMVER)"<="001300000000"
-+BUILD_FLAGS=-f vc6.mak
-+.ELSE			# "$(CCNUMVER)"<="001300000000"
-+BUILD_FLAGS=-f vc7.mak
-+.ENDIF			# "$(CCNUMVER)"<="001300000000"
-+.ENDIF
-+
-+.IF "$(COM)"=="GCC"
-+	.IF "$(COMID)"=="gcc3"
-+		# FreeBSD needs a special makefile
-+		.IF "$(OS)"=="FREEBSD"
-+			BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-+		.ELIF "$(OS)"=="MACOSX"
-+			BUILD_FLAGS=-f gcc-3.0-macosx.mak
-+		.ELSE
-+			BUILD_FLAGS=-f gcc-3.0.mak
-+		.ENDIF
-+	.ELSE # "$(COMID)"=="gcc3"
-+		# MacOS X/Darwin need a special makefile
-+		.IF "$(OS)"=="MACOSX"
-+			BUILD_FLAGS=-f gcc-apple-macosx.mak
-+		.ELIF "$(OS)"=="FREEBSD"
-+			BUILD_FLAGS=-f gcc-freebsd.mak
-+		.ELSE # "$(OS)"=="MACOSX"
-+			BUILD_FLAGS=-f gcc.mak
-+		.ENDIF # "$(OS)"=="MACOSX"
-+	.ENDIF # "$(COMID)"=="gcc3"
-+	BUILD_ACTION=$(GNUMAKE)
-+	# build in parallel
-+	BUILD_FLAGS+= -j$(MAXPROCESS)
-+.ENDIF
-+
-+.IF "$(COM)"=="C52"
-+BUILD_ACTION=make
-+BUILD_FLAGS=-f sunpro6.mak
-+
-+OUT2INC= \
-+    stlport$/SC5$/*.SUNWCCh
-+.ENDIF
-+
-+.IF "$(OS)"=="IRIX"
-+TARFILE_NAME=STLport-4.5
-+PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
-+BUILD_ACTION=gmake
-+BUILD_FLAGS=-f gcc-3.0.mak
-+BUILD_FLAGS+= -j$(MAXPROCESS)
-+.ENDIF
-+
-+OUTDIR2INC= \
-+    stlport
-+
-+.IF "$(GUI)"=="WNT"
-+
-+OUT2LIB= \
-+    lib$/*.lib
-+
-+OUT2BIN= \
-+    lib$/*.dll \
-+    lib$/*.pdb
-+
-+.ELSE          # "$(GUI)"=="WNT"
-+
-+OUT2LIB= \
-+    lib$/lib*
-+
-+.ENDIF          # "$(GUI)"=="WNT"
-+
-+# --- Targets ------------------------------------------------------
-+
-+.IF "$(STLPORT4)"!="NO_STLPORT4"
-+all :
-+       @echo "         An already available installation of STLport has been chosen in the configure process."
-+       @echo "         Therefore the version provided here does not need to be built in addition."
-+       +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
-+.ENDIF
-+
-+.INCLUDE : set_ext.mk
-+.INCLUDE :	target.mk
-+.INCLUDE :	tg_ext.mk
-+
-+$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/STLport-4.5.patch
-+
-+$(MISC)$/STLport-4.5.patch : STLport-4.5.patch
-+	+$(SED)	-e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch
-+
-+.IF "$(GUI)"=="WNT"
-+.IF "$(CCNUMVER)"<="001300000000"
-+
-+$(MISC)$/$(TARFILE_ROOTDIR) : avoid_win32_patches
-+avoid_win32_patches :
-+	@+$(ECHONL)
-+	@+echo ERROR! this module can't use automated patch creation
-+	@+echo on windows.
-+	@+$(ECHONL)
-+	force_dmake_to_error
-+
-+$(PACKAGE_DIR)$/so_custom_patch :  $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
-+.IF "$(USE_SHELL)"=="4nt"
-+    +win32_custom.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-+.ELSE			# "$(USE_SHELL)"=="4nt"
-+    +win32_custom.sh $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-+.ENDIF			# "$(USE_SHELL)"=="4nt"
-+
-+$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_custom_patch
-+
-+.IF "$(USE_NEW_SDK)"!=""
-+$(PACKAGE_DIR)$/win32_sdk_patch :  $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE)
-+.IF "$(USE_SHELL)"=="4nt"
-+    +win32_sdk.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-+.ELSE			# "$(USE_SHELL)"=="4nt"
-+    +win32_sdk.sh $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@
-+.ENDIF			# "$(USE_SHELL)"=="4nt"
-+
-+$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch
-+.ENDIF			# "$(USE_NEW_SDK)"!=""
-+.ENDIF			# COMVER<=001300000000
-+.ENDIF          # "$(GUI)"=="WNT"
diff --git a/app-office/openoffice/files/1.1.0/no-mozab.patch b/app-office/openoffice/files/1.1.0/no-mozab.patch
deleted file mode 100644
index f8ccda1bda3b..000000000000
--- a/app-office/openoffice/files/1.1.0/no-mozab.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -urN oo_1.1rc2_src/connectivity/prj/build.lst oo_1.1rc2_src.new/connectivity/prj/build.lst
---- oo_1.1rc2_src/connectivity/prj/build.lst	2003-06-02 09:53:47.000000000 +0200
-+++ oo_1.1rc2_src.new/connectivity/prj/build.lst	2003-08-08 11:56:21.000000000 +0200
-@@ -1,4 +1,4 @@
--cn	connectivity	:	comphelper moz svtools unixODBC NULL
-+cn	connectivity	:	comphelper svtools unixODBC NULL
- cn	connectivity							usr1	-	all	cn_mkout NULL
- cn	connectivity\source\types				nmake	-	all	cn_types NULL
- cn	connectivity\source\commontools			nmake	-	all	cn_cmtools cn_parse cn_types NULL
-@@ -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\evoab	nmake	-	all	cn_evoab cn_dbtools cn_file 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
-diff -urN oo_1.1rc2_src/scp/source/office/files.scp oo_1.1rc2_src.new/scp/source/office/files.scp
---- oo_1.1rc2_src/scp/source/office/files.scp	2003-07-16 16:37:14.000000000 +0200
-+++ oo_1.1rc2_src.new/scp/source/office/files.scp	2003-08-08 12:15:21.000000000 +0200
-@@ -433,19 +433,6 @@
- 	Styles			= (PACKED);
- End
- 
--#ifndef MACOSX
--File GID_FILE_LIB_MOZABDRV
--	TXT_FILE_BODY;
--	#ifdef UNX
--    Name            = STRING(CONCAT2(libmozabdrv2,UNXSUFFIX));
--	#else
--    Name            = "mozabdrv2.dll";
--	#endif
--    Dir             = GID_DIR_PROGRAM;
--	Styles			= (PACKED);
--End
--#endif
--
- STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
- STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)
- 
-@@ -795,20 +782,6 @@
-         #endif
- End
- 
--#ifndef MACOSX
--File GID_FILE_LIB_MOZAB_2
--        TXT_FILE_BODY;
--        Styles          = (PACKED,UNO_COMPONENT);
--        RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
--        Dir             = GID_DIR_PROGRAM;
--        #ifdef UNX
--        Name            = STRING(CONCAT2(libmozab2,UNXSUFFIX));
--        #else
--        Name            = "mozab2.dll";
--        #endif
--End
--#endif
--
- #ifdef UNX
- 
- File GID_FILE_LIB_EVOAB_1
-@@ -3241,15 +3214,6 @@
- #endif
- 
- #endif
--                                  // of #ifdef SOLAR_JAVA
--#ifndef MACOSX
--File GID_FILE_MOZILLA_RUNTIME
--        TXT_FILE_BODY;
--        Styles = (ARCHIVE);
--        Dir    = GID_DIR_PROGRAM;
--        Name	= "mozruntime.zip";
--End
--#endif
- 
- File GID_FILE_HTML_THIRDPARTYLICENSEREADME
-         Name   = "THIRDPARTYLICENSEREADME.html";
diff --git a/app-office/openoffice/files/1.1.0/nptl.patch b/app-office/openoffice/files/1.1.0/nptl.patch
deleted file mode 100644
index 212ff05c51b6..000000000000
--- a/app-office/openoffice/files/1.1.0/nptl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- oo_1.1rc3_src/sal/osl/unx/semaphor.c.jj	2003-08-28 10:24:23.736357952 +0100
-+++ oo_1.1rc3_src/sal/osl/unx/semaphor.c	2003-08-28 10:24:26.260974152 +0100
-@@ -79,7 +79,7 @@
- /* osl_createSemaphore  */
- /*****************************************************************************/
- 
--#ifdef LINUX
-+#if 0
- /* sem_t from glibc-2.1 (/usr/include/semaphore.h) */ 
- 
- typedef struct {
-@@ -100,7 +100,7 @@
-      * larger of both
-      * XXX
-      */
--#ifdef LINUX
-+#if 0
- 	if ( sizeof(glibc_21_sem_t) > sizeof(sem_t) )
- 		Semaphore= malloc(sizeof(glibc_21_sem_t));
- 	else
---- oo_1.1rc3_src/tools/source/solar/solar.c.jj	2003-08-28 11:50:57.589772216 +0100
-+++ oo_1.1rc3_src/tools/source/solar/solar.c	2003-08-28 11:50:05.167741576 +0100
-@@ -577,7 +577,7 @@
- 
-   {
- 	char* p = NULL;
--	InfoMemoryAccess( p );
-+	/*InfoMemoryAccess( p );*/
- 	p = (char*)&p;
- 	InfoMemoryAccess( p );
- 	InfoMemoryTypeAccess( t_short );
---- oo_1.1_src/neon/neon.patch.jj	2003-10-04 10:32:18.341106008 +0100
-+++ oo_1.1_src/neon/neon.patch	2003-10-04 10:32:49.123426384 +0100
-@@ -19,7 +19,7 @@
- ! 
- ! /* Define as __inline if that's what the C compiler calls it.  */
- ! #ifdef UNX
--! #define inline
-+! #define inline inline
- ! #endif
- ! 
- ! /* Define if you need to in order for stat and other things to work.  */
diff --git a/app-office/openoffice/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch b/app-office/openoffice/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch
deleted file mode 100644
index 15c90b2e456c..000000000000
--- a/app-office/openoffice/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Submitted By: Mark Hymers <markh AT linuxfromscratch DOT org>
-Date: 2003-10-05
-Initial Package Version: 1.1.0
-Origin: http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2003-September/003771.html
-Description: Fixes critical segmentation fault on linux-2.6.0 based systems
---- oo_1.1_src/tools/source/solar/solar.c	2003-04-15 12:55:43.000000000 -0500
-+++ oo_1.1_src/tools/source/solar/solar.c.new	2003-10-05 12:31:58.000000000 -0500
-@@ -76,7 +76,7 @@
- #include <varargs.h>
- #endif
- 
--#define NO_USE_FORK_TO_CHECK
-+#define USE_FORK_TO_CHECK
- #ifdef USE_FORK_TO_CHECK
- #include <sys/wait.h>
- #else
diff --git a/app-office/openoffice/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch b/app-office/openoffice/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch
deleted file mode 100644
index 2455c273a05a..000000000000
--- a/app-office/openoffice/files/1.1.0/openoffice-1.1.0-sparc64-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- oo_1.1_src/solenv/bin/checkdll.sh.org	2003-11-13 10:54:00.000000000 -0600
-+++ oo_1.1_src/solenv/bin/checkdll.sh	2003-11-13 10:54:15.000000000 -0600
-@@ -52,8 +52,8 @@
-         export LD_LIBRARY_PATH;;
-     esac
- 
--    $checkdll "$*"
--    if [ $? -ne 0 ]; then exit 1 ; fi
-+#    $checkdll "$*"
-+#    if [ $? -ne 0 ]; then exit 1 ; fi
-     
-     for parameter in $*; do
-         library=$parameter;
diff --git a/app-office/openoffice/files/1.1.4/freetype-217.patch b/app-office/openoffice/files/1.1.4/freetype-217.patch
new file mode 100644
index 000000000000..12ed2b2f8691
--- /dev/null
+++ b/app-office/openoffice/files/1.1.4/freetype-217.patch
@@ -0,0 +1,24 @@
+--- oo_1.1_src/vcl/source/glyphs/gcach_ftyp.cxx.ft217	2004-01-08 03:36:33.000000000 -0500
++++ oo_1.1_src/vcl/source/glyphs/gcach_ftyp.cxx	2004-01-08 11:02:21.000000000 -0500
+@@ -77,7 +77,8 @@
+ #include <osl/file.hxx>
+ #include <osl/thread.hxx>
+ 
+-#include "freetype/freetype.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include "freetype/ftglyph.h"
+ #include "freetype/ftoutln.h"
+ #include "freetype/tttables.h"
+--- oo_1.1_src/vcl/source/glyphs/gcach_layout.cxx.217	2004-01-08 03:36:46.000000000 -0500
++++ oo_1.1_src/vcl/source/glyphs/gcach_layout.cxx	2004-01-08 11:03:04.000000000 -0500
+@@ -68,7 +68,8 @@
+ #endif
+ 
+ #ifndef _SV_GCACHFTYP_HXX
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <gcach_ftyp.hxx>
+ #endif
+ 
diff --git a/app-office/openoffice/files/1.1.4/gcc-instlib.patch b/app-office/openoffice/files/1.1.4/gcc-instlib.patch
new file mode 100644
index 000000000000..99e424abed01
--- /dev/null
+++ b/app-office/openoffice/files/1.1.4/gcc-instlib.patch
@@ -0,0 +1,12 @@
+diff -urN solenv/bin/gccinstlib.pl oo_1.1.2_src/solenv/bin/gccinstlib.pl
+--- solenv/bin/gccinstlib.pl	2004-03-16 11:15:42.000000000 +0100
++++ solenv/bin/gccinstlib.pl	2004-09-27 10:36:02.338394960 +0200
+@@ -63,7 +63,7 @@
+ #
+ #*************************************************************************
+ 
+-$ENV{'LC_MESSAGES'} = 'C';
++$ENV{'LC_ALL'} = 'C';
+ 
+ %SearchDirs = GetGccSearchDirs ();
+ 
diff --git a/app-office/openoffice/files/1.1.4/gcc34-nojava-fix.patch b/app-office/openoffice/files/1.1.4/gcc34-nojava-fix.patch
new file mode 100644
index 000000000000..73017c1bae19
--- /dev/null
+++ b/app-office/openoffice/files/1.1.4/gcc34-nojava-fix.patch
@@ -0,0 +1,11 @@
+--- sfx2/util/makefile.mk	2004-11-06 18:49:27.753988376 +0100
++++ sfx2/util/makefile.mk	2004-11-06 18:39:19.706425656 +0100
+@@ -70,6 +70,8 @@
+ GEN_HID=TRUE
+ GEN_HID_OTHER=TRUE
+ 
++LINKFLAGSDEFS = # do not fail with missing symbols
++
+ # --- Settings -----------------------------------------------------
+ 
+ .INCLUDE :  settings.mk
diff --git a/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch b/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch
new file mode 100644
index 000000000000..3e3360b2f422
--- /dev/null
+++ b/app-office/openoffice/files/1.1.4/gcc34-nptl-fix.patch
@@ -0,0 +1,14 @@
+--- ./sal/osl/unx/process.c.orig	2003-07-02 15:34:17.000000000 +0200
++++ ./sal/osl/unx/process.c	2004-11-01 15:16:40.976815960 +0100
+@@ -1017,11 +1017,6 @@
+ 			for (i = 0; data.m_pszEnv[i] != NULL; i++)
+ 	     		putenv(data.m_pszEnv[i]);
+ 
+-#if defined(LINUX)
+-            /* mfe: linux likes to have just one thread when the exec family is called */
+-            /*      this np function has this purpose ...                              */
+-            pthread_kill_other_threads_np();
+-#endif
+             OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]);
+      
+ 			/* Connect std IO to pipe ends */
diff --git a/app-office/openoffice/files/1.1.4/gcc34.patch.bz2 b/app-office/openoffice/files/1.1.4/gcc34.patch.bz2
new file mode 100644
index 000000000000..2c3a4e355949
Binary files /dev/null and b/app-office/openoffice/files/1.1.4/gcc34.patch.bz2 differ
diff --git a/app-office/openoffice/files/1.1.4/newstlportfix-patch b/app-office/openoffice/files/1.1.4/newstlportfix-patch
new file mode 100644
index 000000000000..f88927669a7b
--- /dev/null
+++ b/app-office/openoffice/files/1.1.4/newstlportfix-patch
@@ -0,0 +1,100 @@
+--- stlport/makefile.mk.orig	2004-01-28 11:52:04.000000000 +0100
++++ stlport/makefile.mk	2004-11-04 15:36:38.158427224 +0100
+@@ -72,11 +72,12 @@
+ # --- Files --------------------------------------------------------
+ .EXPORT : CC CXX
+ .IF "$(COMID)"=="gcc3"
+-	TARFILE_NAME=STLport-4.5
+        .IF "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX103"
++               TARFILE_NAME=STLport-4.5
+                PATCH_FILE_NAME=STLport-4.5-macxp-panther.patch
+        .ELSE
+-               PATCH_FILE_NAME=STLport-4.5.patch
++               TARFILE_NAME=STLport-4.6.2
++               PATCH_FILE_NAME=STLport-4.6.2.patch
+        .ENDIF
+ .ELSE			# "$(COMID)"=="gcc3"
+ 	.IF "$(OS)"=="MACOSX"
+@@ -127,7 +128,7 @@
+ 		.ELIF "$(OS)"=="MACOSX"
+ 			BUILD_FLAGS=-f gcc-3.0-macosx.mak
+ 		.ELSE
+-			BUILD_FLAGS=-f gcc-3.0.mak
++			BUILD_FLAGS=-f gcc.mak
+		.ENDIF
+ 	.ELSE # "$(COMID)"=="gcc3"
+ 		# MacOS X/Darwin need a special makefile
+--- /dev/null	2004-10-28 17:21:08.585283768 +0200
++++ stlport/STLport-4.6.2.patch	2004-11-04 21:27:55.986110360 +0100
+@@ -0,0 +1,71 @@
++--- misc/build/STLport-4.6.2/src/num_get_float.cpp	2003-11-02 09:58:50.000000000 +0100
+++++ misc/build/STLport-4.6.2/src/num_get_float.cpp	2004-11-04 15:26:12.605525720 +0100
++@@ -770,18 +770,18 @@
++ 
++ void  _STLP_CALL
++ __string_to_float(const string& v, float& val) {
++-    val = _Stl_string_to_double(v.data());
+++    val = _Stl_string_to_double(v.c_str());
++ }
++ 
++ void  _STLP_CALL
++ __string_to_float(const string& v, double& val) {
++-    val = _Stl_string_to_double(v.data());
+++    val = _Stl_string_to_double(v.c_str());
++ }
++ 
++ #ifndef _STLP_NO_LONG_DOUBLE
++ void  _STLP_CALL
++ __string_to_float(const string& v, long double& val) {
++-    val = _Stl_string_to_long_double(v.data());
+++    val = _Stl_string_to_long_double(v.c_str());
++ }
++ #endif
++ 
++--- misc/build/STLport-4.6.2/stlport/config/stl_gcc.h	2003-11-02 09:59:11.000000000 +0100
+++++ misc/build/STLport-4.6.2/stlport/config/stl_gcc.h	2004-11-04 15:26:12.342565696 +0100
++@@ -7,7 +7,9 @@
++ # define _STLP_USE_GLIBC
++ #endif
++ 
+++#if (__GNUC__ >= 3) && (__GNUC_MAJOR__ >= 4)
++ #   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+++#endif
++ 
++ # if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) )
++ #  define _STLP_NO_WCHAR_T
++@@ -263,7 +265,7 @@
++ 
++ # if (__GNUC__ >= 3)
++ 
++-#  if ((__GNUC_MINOR__ == 0) || (__APPLE__))
+++#  if 1 || ((__GNUC_MINOR__ == 0) || (__APPLE__))
++ #   define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
++ #   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
++ #  else
++--- misc/build/STLport-4.6.2/stlport/stdexcept	2003-11-02 09:59:01.000000000 +0100
+++++ misc/build/STLport-4.6.2/stlport/stdexcept	2004-11-04 15:26:12.474545632 +0100
++@@ -60,6 +60,11 @@
++ # endif
++ #  define _STLP_EXCEPTION_BASE exception
++ 
+++#if (__GNUC__ >= 3)
+++#undef _STLP_NOTHROW_INHERENTLY
+++#define _STLP_NOTHROW_INHERENTLY throw()
+++#endif
+++
++ class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
++ public:
++   __Named_exception(const string& __str) 
++--- misc/build/STLport-4.6.2/src/common_rules.mak	2004-11-04 21:25:58.322997872 +0100
+++++ misc/build/STLport-4.6.2/src/common_rules.mak	2004-11-04 21:26:15.731351400 +0100
++@@ -84,7 +84,8 @@
++ 	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
++ 	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
++ 	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
++-	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
+++# not needed ?
+++#	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
++ 	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
++ 
++ install_unix :
diff --git a/app-office/openoffice/files/1.1.0/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3
similarity index 91%
rename from app-office/openoffice/files/1.1.0/ooffice-wrapper-1.3
rename to app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3
index c168e6eb803c..bb980f3f6082 100644
--- a/app-office/openoffice/files/1.1.0/ooffice-wrapper-1.3
+++ b/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3
@@ -30,6 +30,19 @@ OOVERSION="OpenOffice.org ${PV}"
 ##
 [ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
 
+# Migration to new user install dir
+if [ -d "$HOME/.openoffice/1.1.3" ] ; then
+     mv $HOME/.openoffice/1.1.3 $HOME/.openoffice/1.1.4
+     sed -i -e s/'.openoffice\/1.1.3'/'.openoffice\/1.1.4'/g $HOME/.sversionrc 
+     sed -i -e s/1.1.3/1.1.4/g $HOME/.openoffice/1.1.4/user/basic/*.xlc
+     echo "Your user install dir has been moved over to the new version"
+fi
+
+#Make smooth up- and downgrading between minor versions possible
+if [ -e "$HOME/.sversionrc" ] ; then
+     sed -i -e s/1.1.3/1.1.4/g $HOME/.sversionrc
+fi
+
 ###
 ### Get user settings directory from ~/.sversionrc and echo directory name to stdout
 ### get_settings_dir <Version>
@@ -146,7 +159,7 @@ if [ -z "$OOHOME" ] ; then
       fi
 
       echo "running openoffice.org setup..."
-      if ! /opt/OpenOffice.org${PV}/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
+      if ! /opt/OpenOffice.org/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
         echo "setup failed.. abort"
         exit 1
       fi
@@ -205,15 +218,15 @@ fi
 
 if [ ! -s $OOHOME/setup ]; then
 	echo "${OOHOME}/setup links to nothing, resetting link"
-	ln -sf /opt/OpenOffice.org${PV}/program/setup ${OOHOME}/setup
+	ln -sf /opt/OpenOffice.org/program/setup ${OOHOME}/setup
 fi
 if [ ! -s $OOHOME/soffice ]; then
 	echo "${OOHOME}/soffice links to nothing, resetting link"
-	ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/soffice
+	ln -sf /opt/OpenOffice.org/program/soffice ${OOHOME}/soffice
 fi
 if [ ! -s $OOHOME/spadmin ]; then
 	echo "${OOHOME}/spadmin links to nothing, resetting link"
-	ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/spadmin
+	ln -sf /opt/OpenOffice.org/program/soffice ${OOHOME}/spadmin
 fi
 
 
diff --git a/app-office/openoffice/files/1.1.0/openoffice-java.patch b/app-office/openoffice/files/1.1.4/openoffice-java.patch
similarity index 100%
rename from app-office/openoffice/files/1.1.0/openoffice-java.patch
rename to app-office/openoffice/files/1.1.4/openoffice-java.patch
diff --git a/app-office/openoffice/files/digest-openoffice-1.1.0-r4 b/app-office/openoffice/files/digest-openoffice-1.1.0-r4
deleted file mode 100644
index ca3bad69d473..000000000000
--- a/app-office/openoffice/files/digest-openoffice-1.1.0-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bec8b41089ebdad2831f3c456973ad4e OOo_1.1.0_source.tar.bz2 189164050
-MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
-MD5 1fc0b188f1fe1216776e5855d2da141f freetype-2.1.4.tar.bz2 806647
diff --git a/app-office/openoffice/files/digest-openoffice-1.1.4 b/app-office/openoffice/files/digest-openoffice-1.1.4
new file mode 100644
index 000000000000..18e361b8e0c4
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-1.1.4
@@ -0,0 +1,2 @@
+MD5 20c10db97865ae4c51dc827d668b8939 OOo_1.1.4_source.tar.gz 219743530
+MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958
diff --git a/app-office/openoffice/openoffice-1.1.0-r4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild
similarity index 52%
rename from app-office/openoffice/openoffice-1.1.0-r4.ebuild
rename to app-office/openoffice/openoffice-1.1.4.ebuild
index 3db7270e44d1..d9db53a6090d 100644
--- a/app-office/openoffice/openoffice-1.1.0-r4.ebuild
+++ b/app-office/openoffice/openoffice-1.1.4.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r4.ebuild,v 1.10 2004/11/11 23:28:16 suka Exp $
-
-# IMPORTANT:  This is extremely alpha!!!
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.1 2004/12/28 08:41:47 suka Exp $
 
 # Notes:
 #
@@ -26,104 +24,69 @@
 #   Get support going for installing a custom language pack.  Also
 #   need to be able to install more than one language pack.
 
-inherit flag-o-matic eutils gcc
-
-# We want gcc3 if possible!!!!
-export WANT_GCC_3="yes"
-
-inherit virtualx
-
-# Set $ECPUS to amount of processes multiprocessing build should use.
-# NOTE:  Setting this too high might cause dmake to segfault!!
-#        Setting this to anything but "1" on my pentium4 causes things
-#        to segfault :(
-[ -z "${ECPUS}" ] && export ECPUS="1"
+inherit flag-o-matic eutils toolchain-funcs
 
+IUSE="gnome kde java curl nptl zlib"
 
 LOC="/opt"
-FT_VER="2.1.4"
-STLP_VER="4.5.3"
-MY_PV="${PV/_rc/rc}"
-INSTDIR="${LOC}/OpenOffice.org${PV}"
-S="${WORKDIR}/oo_${MY_PV/1.1.0/1.1}_src"
+INSTDIR="${LOC}/OpenOffice.org"
+S="${WORKDIR}"
 DESCRIPTION="OpenOffice.org, a full office productivity suite."
-SRC_URI="mirror://openoffice/stable/${MY_PV}/OOo_${MY_PV}_source.tar.bz2
-	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z
-	mirror://sourceforge/freetype/freetype-${FT_VER}.tar.bz2"
+SRC_URI="mirror://openoffice/stable/${PV}/OOo_${PV}_source.tar.gz
+		http://www.stlport.org/archive/STLport-4.6.2.tar.gz"
+
 HOMEPAGE="http://www.openoffice.org/"
 
 LICENSE="|| ( LGPL-2  SISSL-1.1 )"
 SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE="gnome kde"
+KEYWORDS="~x86"
 
-RDEPEND=">=sys-libs/glibc-2.1
+RDEPEND="!app-office/openoffice-bin
+	>=sys-libs/glibc-2.1
 	!=sys-libs/glibc-2.3.1*
 	>=dev-lang/perl-5.0
+	>=media-libs/libart_lgpl-2.3.13
+	>=x11-libs/startup-notification-0.5
+	>=media-libs/freetype-2.1.4
 	virtual/x11
 	app-arch/zip
 	app-arch/unzip
 	dev-libs/expat
-	>=virtual/jdk-1.4.1
+	java? ( >=virtual/jre-1.4.1 )
 	virtual/lpr
 	ppc? ( >=sys-libs/glibc-2.2.5-r7
-	>=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced
+	>=sys-devel/gcc-3.2.1 )"
 
 DEPEND="${RDEPEND}
+	>=sys-apps/findutils-4.1.20-r1
 	app-shells/tcsh
-	!app-office/openoffice-bin
-	sys-apps/findutils
+	dev-util/pkgconfig
+	curl? ( net-misc/curl )
+	zlib? ( sys-libs/zlib )
 	sys-libs/pam
-	!app-arch/star
-	!dev-util/dmake"
-
-# fix a bug with tcsh and dircolors
-#
-# Azarah -- 10 April 2002
-export LS_COLORS=""
-
+	!dev-util/dmake
+	java? ( >=virtual/jdk-1.4.1 )
+	!java? ( dev-libs/libxslt )"
 
 pkg_setup() {
 
-	if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ]
+	if use java
 	then
-		eerror
-		eerror "This build needs gcc-3.{2,3}.x, but due to profile"
-		eerror "settings, it cannot DEPEND on it, so please merge it"
-		eerror "manually:"
-		eerror
-		eerror " #  ebuild ${PORTDIR}/sys-devel/gcc/gcc-3.2.1.ebuild merge"
-		eerror
-		eerror "Please make sure that you use the latest availible revision of"
-		eerror "gcc."
-		eerror
-		die
-	fi
-
-	if [ -z "$(/usr/bin/java-config -O | grep "blackdown-jdk")" ] && [ "${FORCE_JAVA}" != "yes" ]
-	then
-		eerror
-		eerror "This ebuild has only been tested with the blackdown port of"
-		eerror "java.  If you use another java implementation, it could fail"
-		eerror "horribly, so please merge the blackdown-jdk and set it as"
-		eerror "system VM before proceeding:"
-		eerror
-		eerror " # emerge blackdown-jdk"
-		eerror " # java-config --set-system-vm=blackdown-jdk-<VERSION>"
-		eerror " # env-update"
-		eerror " # source /etc/profile"
-		eerror
-		eerror "Please adjust <VERSION> according to the version installed in"
-		eerror "/opt."
-		eerror
-		eerror "If you however want to test another JDK (not officially supported),"
-		eerror "you could do the following:"
-		eerror
-		eerror " # export FORCE_JAVA=yes"
-		eerror
-		die
+		if [ -z "${JDK_HOME}" ] || [ ! -d "${JDK_HOME}" ]
+		then
+			eerror "In order to compile java sources you have to set the"
+			eerror "\$JDK_HOME environment properly."
+			eerror ""
+			eerror "You can achieve this by using the java-config tool:"
+			eerror "  emerge java-config"
+			die "Couldn't find a valid JDK home"
+		fi
 	fi
 
+	ewarn " This version should now also compile fine with gcc 3.4.x "
+	ewarn " If you encounter problems in relation to this, please report "
+	ewarn " them to http://bugs.gentoo.org "
+	ewarn ""
 	ewarn " It is important to note that OpenOffice.org is a very fragile  "
 	ewarn " build when it comes to CFLAGS.  A number of flags have already "
 	ewarn " been filtered out.  If you experience difficulty merging this  "
@@ -131,10 +94,10 @@ pkg_setup() {
 	ewarn " merge again.					               "
 
 	set_languages
-
 }
 
 set_languages () {
+
 	if [ -z "$LANGUAGE" ]; then
 		LANGUAGE=01
 	fi
@@ -210,19 +173,17 @@ oo_setup() {
 
 	unset LANGUAGE
 	unset LANG
-
-	export NEW_GCC="0"
+	unset LC_ALL
 
 	if [ -x /usr/sbin/gcc-config ]
 	then
 		# Do we have a gcc that use the new layout and gcc-config ?
 		if /usr/sbin/gcc-config --get-current-profile &> /dev/null
 		then
-			export NEW_GCC="1"
 			export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
 
 			# Just recheck gcc version ...
-			if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ]
+			if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ] && [ "$(gcc-version)" != "3.4" ]
 			then
 				# See if we can get a gcc profile we know is proper ...
 				if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1 &> /dev/null
@@ -230,7 +191,7 @@ oo_setup() {
 					export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1):${PATH}"
 					export GCC_PROFILE="${CHOST}-3.2.1"
 				else
-					eerror "This build needs gcc-3.2 or gcc-3.3!"
+					eerror "This build needs gcc-3.2, gcc-3.3 or gcc-3.4!"
 					eerror
 					eerror "Use gcc-config to change your gcc profile:"
 					eerror
@@ -242,8 +203,6 @@ oo_setup() {
 			fi
 		fi
 	fi
-
-	export JAVA_BINARY="`which java`"
 }
 
 src_unpack() {
@@ -251,52 +210,45 @@ src_unpack() {
 	oo_setup
 
 	cd ${WORKDIR}
-	unpack OOo_${MY_PV}_source.tar.bz2 gpc231.tar.Z
-
-	# Install gpc
-	cd ${WORKDIR}/gpc231
-	cp gpc.* ${S}/external/gpc
-
+	unpack ${A}
 	cd ${S}
 
-	cd ${S}/stlport
-	rm STLport-4.5.3.patch
-	epatch ${FILESDIR}/${PV}/newstlportfix.patch
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/no-mozab.patch
-
-	epatch ${FILESDIR}/${PV}/nptl.patch
-
-	epatch ${FILESDIR}/${PV}/openoffice-1.1.0-linux-2.6-fix.patch
-
-	if [ ${ARCH} = "sparc" ]; then
-		epatch ${FILESDIR}/${PV}/openoffice-1.1.0-sparc64-fix.patch
+	# Fix for missing ppc mozilla includes bug #71268
+	if use ppc; then
+		cp ${DISTDIR}/LINUXGCCPinc.zip ${S}/moz/zipped || die
+		cp ${DISTDIR}/LINUXGCCPlib.zip ${S}/moz/zipped || die
+		cp ${DISTDIR}/LINUXGCCPruntime.zip ${S}/moz/zipped || die
 	fi
 
-	#Security fix
-	epatch ${FILESDIR}/${PV}/neon.patch
+	#Still needed: The STLport patch
+	cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die
+	epatch ${FILESDIR}/${PV}/newstlportfix.patch
+
+	epatch ${FILESDIR}/${PV}/openoffice-java.patch
 
-	#The gcc-3.2.3 version in gentoo is fixed for the internal error that
-	#blocks compilation with it, so remove the check from the configure script
-#	epatch ${FILESDIR}/${PV}/fixed-gcc.patch
+	epatch ${FILESDIR}/${PV}/gcc-instlib.patch
 
-#	epatch ${FILESDIR}/${PV}/no-crashrep.patch
+	#Fix for newer Freetype
+	epatch ${FILESDIR}/${PV}/freetype-217.patch
 
-#	einfo "Fixing up crashrep/source/unx/makefile.mk"
-#	sed -i -e "s,\(PRODUCT[^a-zA-Z]*\)\(FULL\),\1full," ${S}/crashrep/source/unx/makefile.mk||die
-#	einfo "Removing crashrep from the installed set"
-#	sed -i -e "s,\(crashrep \),," ${S}/instsetoo/prj/build.lst
+	# GCC 3.4.x fixes
+	if [ "$(gcc-version)" = "3.4" ]
+	then
+		epatch ${FILESDIR}/${PV}/gcc34.patch.bz2
+		use !java && epatch ${FILESDIR}/${PV}/gcc34-nojava-fix.patch
+		use nptl && epatch ${FILESDIR}/${PV}/gcc34-nptl-fix.patch
+	fi
 
 	# Compile problems with these ...
 	filter-flags "-funroll-loops"
 	filter-flags "-fomit-frame-pointer"
 	filter-flags "-fprefetch-loop-arrays"
 	filter-flags "-fno-default-inline"
+	filter-flags "-fstack-protector"
+	filter-flags "-ftracer"
 	append-flags "-fno-strict-aliasing"
 	replace-flags "-O3" "-O2"
-
-	# Enable Bytecode Interpreter for freetype ...
-	append-flags "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
+	replace-flags "-Os" "-O2"
 
 	if [ "$(gcc-version)" == "3.2" ]; then
 		einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3"
@@ -304,19 +256,11 @@ src_unpack() {
 	fi
 
 	# Now for our optimization flags ...
-	perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
-		${S}/solenv/inc/unxlngi3.mk
+	export CXXFLAGS="${CXXFLAGS} -fno-for-scope -fpermissive -fno-rtti"
 	perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
 		${S}/solenv/inc/unxlngi4.mk
-
-	# Some makefiles are not multiprocess ready (Mandrake)
-	cd ${S}; einfo "Fixing makefiles for multiprocess builds..."
-	for x in io/source/stm dtrans/source/X11 idlc/source nas zlib toolkit/util \
-		comphelper/util padmin/source svtools/util bridges/source/prot_uno \
-		framework/util framework/source/unotypes
-	do
-		perl -pi -e "s/^(PRJNAME)/MAXPROCESS=1\n\1/" ${x}/makefile.mk
-	done
+	perl -pi -e "s|^CFLAGSCXX=.*|CFLAGSCXX=${CXXFLAGS}|g" \
+		${S}/solenv/inc/unxlngi4.mk
 
 	#Do our own branding by setting gentoo linux as the vendor
 	sed -i -e "s,\(//\)\(.*\)\(my company\),\2Gentoo Linux," ${S}/offmgr/source/offapp/intro/ooo.src
@@ -325,14 +269,14 @@ src_unpack() {
 get_EnvSet() {
 
 	# Determine what Env file we should be using (Az)
-	export LinuxEnvSet="LinuxIntelEnv.Set"
-	use sparc && export LinuxEnvSet="LinuxSparcEnv.Set"
-	use ppc && export LinuxEnvSet="LinuxPPCEnv.Set"
-	use alpha && export LinuxEnvSet="LinuxAlphaEnv.Set"
+	export LinuxEnvSet="LinuxIntelEnv.Set.sh"
+	use sparc && export LinuxEnvSet="LinuxSparcEnv.Set.sh"
+	use ppc && export LinuxEnvSet="LinuxPPCEnv.Set.sh"
+	use alpha && export LinuxEnvSet="LinuxAlphaEnv.Set.sh"
 
 	# Get build specific stuff (Az)
-	export SOLVER="$(awk '/^setenv UPD / {gsub(/\"/, ""); print $3}' ${LinuxEnvSet})"
-	export SOLPATH="$(awk '/^setenv INPATH / {gsub(/\"/, ""); print $3}' ${LinuxEnvSet})"
+	export SOLVER="$(awk '/^UPD=/ {gsub(/\"/, ""); gsub(/UPD=/, ""); print $0}' ${LinuxEnvSet})"
+	export SOLPATH="$(awk '/^INPATH=/ {gsub(/\"/, ""); gsub(/INPATH=/, ""); print $0}' ${LinuxEnvSet})"
 }
 
 src_compile() {
@@ -340,48 +284,26 @@ src_compile() {
 	addpredict /bin
 	addpredict /root/.gconfd
 	local buildcmd=""
+	export MYCONF=""
 
-	set_languages
-
-	oo_setup
-
-	# Setup default compilers (We overide gcc2 if that is default here)
-	export CC="$(gcc-getCC)"
-	export CXX="$(gcc-getCXX)"
-
-	# Enable ccache for this build (Az)
-	if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
-	     "${FEATURES/ccache/}" != "${FEATURES}" -a \
-	     -d /usr/bin/ccache -a -x /usr/bin/ccache/ccache ]
-	then
-		# Build uses its own env with $PATH, etc, so
-		# we take the easy way out. (Az)
-		export CC="/usr/bin/ccache/ccache ${CC}"
-		export CXX="/usr/bin/ccache/ccache ${CXX}"
-
-	# Enable new ccache for this build
-	elif [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
-	     "${FEATURES/ccache/}" != "${FEATURES}" -a \
-	     -x /usr/bin/ccache -a ! -d /usr/bin/ccache ]
+	#Check if we use java
+	if use java
 	then
-		# Build uses its own env with $PATH, etc, so
-		# we take the easy way out. (Az)
-		export CC="/usr/bin/ccache ${CC}"
-		export CXX="/usr/bin/ccache ${CXX}"
+		MYCONF="${MYCONF} --with-jdk-home=${JAVA_HOME}"
+	else
+		MYCONF="${MYCONF} --disable-java"
 	fi
 
-	# Enable distcc for this build (Az)
-	if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \
-	     "${FEATURES/distcc/}" != "${FEATURES}" -a \
-		 -x /usr/bin/distcc ]
+	#See if we use system-curl
+	if use curl
 	then
-		# Do not bump ECPUS if the user did not touch it, as currently
-		# it -PP do not work properly (segfaulting). (Az)
-		[ "$(echo ${DISTCC_HOSTS} | wc -w)" -gt 1 -a "${ECPUS}" -qt 1 ] && \
-			export ECPUS="$(echo ${DISTCC_HOSTS} | wc -w)"
+		MYCONF="${MYCONF} --with-system-curl"
+	fi
 
-		export CC="distcc ${CC}"
-		export CXX="distcc ${CXX}"
+	#See if we use system-zlib
+	if use zlib
+	then
+		MYCONF="${MYCONF} --with-system-zlib"
 	fi
 
 	# Do NOT compile with a external STLport, as gcc-2.95.3 users will
@@ -390,87 +312,55 @@ src_compile() {
 	einfo "Configuring OpenOffice.org with language support for ${LFULLNAME}..."
 	cd ${S}/config_office
 	rm -f config.cache
+
 	if [ "LANGNAME" != "ENUS" ]; then
 		LANGNAME="${LANGNAME},ENUS"
 	fi
-	./configure --enable-gcc3 \
-		--with-jdk-home=${JAVA_HOME} \
-		--with-lang=${LANGNAME}\
-		--with-x || die
 
-	cd ${S}
-	get_EnvSet
+	use sparc && MYCONF="${MYCONF} --disable-mozilla"
 
-	# Do not include /usr/include in header search path, and
-	# same thing for internal gcc include dir, as gcc3 handles
-	# it correctly by default! (Az)
-	perl -pi -e "s| -I/usr/include||g" ${LinuxEnvSet}
-#	perl -pi -e "s| -I$(gcc-libpath)/include||g" ${LinuxEnvSet}
+	MYCONF="${MYCONF} --enable-libart \
+		--with-lang=${LANGNAME} \
+		--enable-libsn \
+		--without-fonts \
+		--with-system-freetype"
 
-	if [ "${NEW_GCC}" -eq "1" ]
-	then
-		local gcc_path="$(/usr/sbin/gcc-config --get-bin-path ${GCC_PROFILE})"
+	./configure ${MYCONF} || die
 
-		# Setup path for new gcc layout in $LinuxEnvSet, else the build
-		# environment will not find gcc ... (Az)
-		perl -pi -e "s|PATH \.:\$SOLARVER|PATH \.:${gcc_path}:\$SOLARVER|" ${LinuxEnvSet}
-		# New builds start quoting stuff ...
-		perl -pi -e "s|PATH \"\.:\$SOLARVER|PATH \"\.:${gcc_path}:\$SOLARVER|" ${LinuxEnvSet}
-	fi
+	cd ${S}
+	get_EnvSet
+
+	# Set $ECPUS to amount of processes multiprocessing build should use.
+	# NOTE:  Setting this too high might cause dmake to segfault!!
+	#        Setting this to anything but "1" on my pentium4 causes things
+	#        to segfault :(
+	[ -z "${ECPUS}" ] && export ECPUS="1"
 
 	# Should the build use multiprocessing?
 	# We use build.pl directly, as dmake tends to segfault. (Az)
 	if [ "${ECPUS}" -gt 1 ]
 	then
-		buildcmd="${S}/solenv/bin/build.pl --all -P ${ECPUS} product=full"
+		buildcmd="${S}/solenv/bin/build.pl --all -P${ECPUS} product=full strip=true --dlv_switch link"
 	else
-		buildcmd="${S}/solenv/bin/build.pl --all product=full"
+		buildcmd="${S}/solenv/bin/build.pl --all product=full strip=true --dlv_switch link"
 	fi
 
 	if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
 	then
 		# Set CCCOMP and CXXCOMP.  This is still needed for STLport
-		echo "setenv CCCOMP \"${CC}\"" >> ${S}/${LinuxEnvSet}
-		echo "setenv CXXCOMP \"${CXX}\"" >> ${S}/${LinuxEnvSet}
-	fi
-
-	if [ "$(gcc-major-version)" -eq 3 ]
-	then
-		mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/{lib,inc}
-
-		einfo "Installing GCC related libs..."
-		# Workaround for missing libs with GCC3 (thanks to Debian) (Az)
-		cd ${S}/solver/${SOLVER}/${SOLPATH}/lib
-		cp $(gcc-libpath)/libstdc++.so.$(gcc-libstdcxx-major-version)* . || \
-			die "Could not copy gcc-libs!"
-		cp $(gcc-libpath)/libgcc_s.so* . || die "Could not copy gcc-libs!"
-		cd ${S}
+		export CCCOMP="$(tc-getCC)"
+		export CXXCOMP="$(tc-getCXX)"
 	fi
 
 	einfo "Bootstrapping OpenOffice.org..."
 	# Get things ready for bootstrap (Az)
 	chmod 0755 ${S}/solenv/bin/*.pl
-	mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/inc
-	touch ${S}/solver/${SOLVER}/${SOLPATH}/inc/minormkchanged.flg
 	# Bootstrap ...
-	./bootstrap
-
-	if [ "$(gcc-major-version)" -eq 3 ]
-	then
-		local LIBFILE="$(readlink `gcc-libpath`/libstdc++.so.`gcc-libstdcxx-major-version`)"
-		local LIBVERSION="$(echo ${LIBFILE} | sed -e 's|libstdc++\.so\.||g')"
-		# Get this beast to use the right version of libstdc++ ... (Az)
-		echo "LIBSTDCPP3:=${LIBVERSION}" >> \
-			${S}/solver/${SOLVER}/${SOLPATH}/inc/comp_ver.mk
-		cd ${S}
-	fi
+	./bootstrap || die
 
 	einfo "Building OpenOffice.org..."
-	# Setup virtualmake
-	export maketype="tcsh"
-	echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${buildcmd}" > build.tcsh
-	# Build needs X to compile! (Az)
-	virtualmake build.tcsh || die "Build failed!"
+	echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && LINK=g++ ${buildcmd}" > build.sh
+	sh build.sh || die "Build failed!"
 
 	[ -d ${S}/instsetoo/${SOLPATH} ] || die "Cannot find build directory!"
 }
@@ -483,23 +373,12 @@ src_install() {
 	addpredict "/dev/dri"
 	addpredict "/usr/bin/soffice"
 	addpredict "/pspfontcache"
-
-	# This allows us to change languages without editing the ebuild.
-	#
-	#   languages1="ENUS,FREN,GERM,SPAN,ITAL,DTCH,PORT,SWED,POL,RUSS"
-	#   languages2="DAN,GREEK,TURK,CHINSIM,CHINTRAD,JAPN,KOREAN,CZECH,CAT"
-	#
-	# Supported languages for localized help files
-	#
-	#   helplangs="ENUS,FREN,GERM,SPAN,ITAL,SWED"
-	#
-	set_languages
-
-	get_EnvSet
+	addpredict "/opt/OpenOffice.org/foo.tmp"
+	addpredict "/opt/OpenOffice.org/delme"
 
 	# The install part should now be relatively OK compared to
 	# what it was.  Basically we use autoresponse files to install
-	# unattended, running under a Xvfb if needed.  Afterwards we
+	# unattended.  Afterwards we
 	# just cleanout ${D} from the registry, etc.  This way we
 	# do not need pre-generated registry, and also fixes some weird
 	# bugs related to the old way we did things.
@@ -520,7 +399,7 @@ src_install() {
 		JavaSupport=preinstalled_or_none
 	END_RS
 
-	# Autoresponse file for user isntallation
+	# Autoresponse file for user installation
 	cat > ${T}/rsfile-local <<-"END_RS"
 		[ENVIRONMENT]
 		INSTALLATIONMODE=INSTALL_WORKSTATION
@@ -533,20 +412,17 @@ src_install() {
 
 	# Fixing install location in response file
 	sed -e "s|<destdir>|${D}${INSTDIR}|" \
-		${T}/rsfile-global > ${T}/autoresponse
+		${T}/rsfile-global > ${T}/autoresponse || die
 
 	einfo "Installing OpenOffice.org into build root..."
 	dodir ${INSTDIR}
 	cd ${S}/instsetoo/${SOLPATH}/${LANGNO}/normal
-	# Setup virtualmake
-	export maketype="./setup"
-	# We need X to install...
-	virtualmake "-v -r:${T}/autoresponse" ||die
+	./setup -v -noexit -nogui -r:${T}/autoresponse || die "Setup failed"
 
 	echo
 	einfo "Removing build root from registry..."
 	# Remove totally useless stuff.
-	rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh}
+	rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh} || die
 	# Remove build root from registry and co
 	egrep -rl "${D}" ${D}${INSTDIR}/* | \
 		xargs -i perl -pi -e "s|${D}||g" {} || :
@@ -567,7 +443,7 @@ src_install() {
 
 	# Install user autoresponse file
 	insinto /etc/openoffice
-	sed -e "s|<pv>|${PV//_rc3/.0}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
+	sed -e "s|<pv>|${PV}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
 	doins ${T}/autoresponse-${PV}.conf
 
 	# Install wrapper script
@@ -575,15 +451,11 @@ src_install() {
 	sed -e "s|<pv>|${PV}|g" \
 		${FILESDIR}/${PV}/ooffice-wrapper-1.3 > ${T}/ooffice
 	doexe ${T}/ooffice
+
 	# Component symlinks
-	dosym ooffice /usr/bin/oocalc
-	dosym ooffice /usr/bin/oodraw
-	dosym ooffice /usr/bin/ooimpress
-	dosym ooffice /usr/bin/oomath
-	dosym ooffice /usr/bin/oowriter
-	dosym ooffice /usr/bin/ooweb
-	dosym ooffice /usr/bin/oosetup
-	dosym ooffice /usr/bin/oopadmin
+	for app in calc draw impress math writer web setup padmin; do
+		dosym ooffice /usr/bin/oo${app}
+	done
 
 	einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..."
 	if use gnome
@@ -593,7 +465,10 @@ src_install() {
 		doins ${D}${INSTDIR}/share/gnome/net/.directory
 		doins ${D}${INSTDIR}/share/gnome/net/.order
 
-		for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
+		# Change this to ooo*.desktop from *.desktop for now, since
+		# otherwise two sets of icons will appear in the GNOME menu.
+		# <brad@gentoo.org> (04 Aug 2003)
+		for x in ${D}${INSTDIR}/share/gnome/net/ooo*.desktop
 		do
 			# We have to handle soffice and setup differently
 			perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
@@ -626,19 +501,21 @@ src_install() {
 		done
 	fi
 
-	# Unneeded, as they get installed into /usr/share...
-	# They are needed else user installation fails.
-#	rm -rf ${D}${INSTDIR}/share/{cde,gnome,kde}
+	# Do not actually install the desktop bindings for users, we have
+	# installed them globally
+	for module in gid_Module_Optional_Gnome gid_Module_Optional_Kde gid_Module_Optional_Cde
+	do
+		perl -pi -e "/^Module $module/ .. /^End/ and s|(Installed.*)=.*|\1= NO;|" \
+		${D}${INSTDIR}/program/instdb.ins
+	done
+
+
+
+	# Remove unneeded stuff
 	rm -rf ${D}${INSTDIR}/share/cde
-#
-#	for f in ${D}/usr/share/gnome/apps/OpenOffice.org/* ; do
-#		echo 'Categories=Application;Office;' >> ${f}
-#	done
 
 	# Make sure these do not get nuked.
-	keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb}
-	keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
-	keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
+	keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} ${INSTDIR}/user/psprint/{driver,fontmetric} ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
 }
 
 pkg_postinst() {
@@ -650,8 +527,5 @@ pkg_postinst() {
 	einfo " Also, for individual components, you can use any of:"
 	einfo
 	einfo "   oocalc, oodraw, ooimpress, oomath, ooweb or oowriter"
-	einfo
-	einfo " If the fonts appear garbled in the user interface refer to "
-	einfo " Bug 8539, or http://www.openoffice.org/FAQs/fontguide.html#8"
 }