Add new version and various fixes

8 files changed, 698 insertions, 8 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 782a17d571bc..f1a28cc6140a 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.2 2003/11/04 11:55:54 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.3 2003/11/04 19:53:55 pauldv Exp $
+
+*openoffice-ximian-1.1.0-r1 (04 Nov 2003)
+
+  04 Nov 2003; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-ximian-1.1.0-r1.ebuild:
+  Add a revised version with newer ximian patches and without a need for java.
+  Again mostly based on <suka@t0.or.at> in bug #25241
 
   04 Nov 2003; Paul de Vrieze <pauldv@gentoo.org>
   openoffice-ximian-1.1.0.ebuild:
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 062fc1bd975f..7439981d028c 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,9 +1,14 @@
-MD5 adc67aa8c979d83fcf8e22c35b4ab330 ChangeLog 552
-MD5 ba6f29161bf16172c6a5da9849f93934 openoffice-ximian-1.1.0.ebuild 19418
+MD5 6f4c059ced9b9517cdef5072fea22596 ChangeLog 816
+MD5 a810996bb6003f57e81744d9c6ae14f4 openoffice-ximian-1.1.0.ebuild 19442
+MD5 1336ba310baeb45a4bc780f48649b326 openoffice-ximian-1.1.0-r1.ebuild 18400
+MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 06b11dad767b42f319fd60d1c369619e files/digest-openoffice-ximian-1.1.0 212
+MD5 7d38c4970f229bab1ff5870d4491a2d8 files/digest-openoffice-ximian-1.1.0-r1 212
+MD5 57dffa4a9df0ca77ebcca05122634d9e files/1.1.0/newstlportfix.patch 10867
+MD5 028fbe21a2c72ae662729ed63a72cd80 files/1.1.0/solar_segfix.patch 577
 MD5 7992a51f23c05fdc0b3c422c171f637a files/1.1.0/config.patch 502
+MD5 9d6957b6b4f84033d6073c3acdd2928f files/1.1.0/ooffice-wrapper-1.3 8952
 MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644
-MD5 57dffa4a9df0ca77ebcca05122634d9e files/1.1.0/newstlportfix.patch 10867
+MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603
+MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
 MD5 35644fff64e993d64c44a56383263186 files/1.1.0/oo_1.1-nptl.patch 538
-MD5 9d6957b6b4f84033d6073c3acdd2928f files/1.1.0/ooffice-wrapper-1.3 8952
-MD5 028fbe21a2c72ae662729ed63a72cd80 files/1.1.0/solar_segfix.patch 577
diff --git a/app-office/openoffice-ximian/files/1.1.0/nptl.patch b/app-office/openoffice-ximian/files/1.1.0/nptl.patch
new file mode 100644
index 000000000000..212ff05c51b6
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.0/nptl.patch
@@ -0,0 +1,42 @@
+--- 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-ximian/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch b/app-office/openoffice-ximian/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch
new file mode 100644
index 000000000000..15c90b2e456c
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch
@@ -0,0 +1,16 @@
+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-ximian/files/digest-openoffice-ximian-1.1.0-r1 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.0-r1
new file mode 100644
index 000000000000..dcd409e73cef
--- /dev/null
+++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.0-r1
@@ -0,0 +1,3 @@
+MD5 bec8b41089ebdad2831f3c456973ad4e OOo_1.1.0_source.tar.bz2 189164050
+MD5 b0739e30f8a5211758495e90cb787866 ooo-build-1.1.45.tar.gz 742796
+MD5 cc1db8528a70e18a674b09993d78e617 ooo-icons-OOO_1_1-5.tar.gz 1355399
diff --git a/app-office/openoffice-ximian/metadata.xml b/app-office/openoffice-ximian/metadata.xml
new file mode 100644
index 000000000000..362db259797a
--- /dev/null
+++ b/app-office/openoffice-ximian/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>openoffice</herd>
+<longdescription>This package provides the ximian flavour of openoffice. It
+ needs a long time to compile so be warned</longdescription>
+</pkgmetadata>
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.0-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..06b267186fd9
--- /dev/null
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.0-r1.ebuild
@@ -0,0 +1,609 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.0-r1.ebuild,v 1.1 2003/11/04 19:53:55 pauldv Exp $
+
+# IMPORTANT:  This is extremely alpha!!!
+
+# Notes:
+#
+#   This will take a HELL of a long time to compile, be warned.
+#   According to openoffice.org, it takes approximately 12 hours on a
+#   P3/600 with 256mb ram.  And thats where building is its only task.
+#
+#   It takes about 6 hours on my P4 1.8 with 512mb memory, and the
+#   build only needs about 2.1GB of disk space - Azarah.
+#
+#   You will also need a bucketload of diskspace ... in the order of
+#   4-5 gb free to store all the compiled files and installation
+#   directories.
+#
+#   The information on how to build and what is required comes from:
+#   http://www.openoffice.org/dev_docs/source/build_linux.html
+#   http://tools.openoffice.org/ext_comp.html
+#
+# Todo:
+#
+#   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 kernel-mod
+# Compile problems with these ...
+filter-flags "-funroll-loops"
+filter-flags "-fomit-frame-pointer"
+append-flags "-fno-strict-aliasing"
+replace-flags "-O3" "-O2"
+replace-flags "-Os" "-O2"
+
+# Enable Bytecode Interpreter for freetype ...
+append-flags "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
+
+inherit 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"
+
+
+XIMIAN_VER=1.1.45
+PATCHLEVEL=OOO_1_1_0
+ICON_VER=OOO_1_1-5
+INSTDIR="/opt/Ximian-OpenOffice"
+PATCHDIR=${WORKDIR}/ooo-build-${XIMIAN_VER}
+ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
+S="${WORKDIR}/oo_${PV/1.1.0/1.1}_src"
+DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite."
+SRC_URI="mirror://openoffice/stable/${PV}/OOo_${PV}_source.tar.bz2
+	http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${XIMIAN_VER}.tar.gz
+	http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz"
+
+HOMEPAGE="http://ooo.ximian.com"
+
+LICENSE="LGPL-2 | SISSL-1.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="gnome kde"
+
+RDEPEND=">=sys-libs/glibc-2.1
+	!=sys-libs/glibc-2.3.1*
+	>=dev-lang/perl-5.0
+	>=x11-libs/gtk+-2.0
+	>=gnome-base/libgnome-2.2
+	>=gnome-base/gnome-vfs-2.0
+	>=net-print/libgnomecups-0.1.4
+	>=net-print/gnome-cups-manager-0.16
+	>=dev-libs/libxml2-2.0
+	>=media-libs/libart_lgpl-2.3.13
+	>=x11-libs/startup-notification-0.5
+	media-fonts/ttf-bitstream-vera
+	media-libs/fontconfig
+	media-gfx/imagemagick
+	media-libs/libpng
+	sys-devel/flex
+	sys-devel/bison
+	virtual/x11
+	app-arch/zip
+	app-arch/unzip
+	dev-libs/expat
+	virtual/lpr
+	ppc? ( >=sys-libs/glibc-2.2.5-r7
+	>=sys-devel/gcc-3.2.1 )"
+
+DEPEND="${RDEPEND}
+	app-shells/tcsh
+	!app-office/openoffice-bin
+	!app-office/openoffice
+	>=sys-apps/findutils-4.1.20-r1
+	!sys-apps/star"
+
+# fix a bug with tcsh and dircolors
+#
+# Azarah -- 10 April 2002
+export LS_COLORS=""
+
+
+pkg_setup() {
+
+	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  "
+	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
+	ewarn " merge again.					               "
+	ewarn "****************************************************************"
+
+	set_languages
+
+}
+
+
+set_languages () {
+
+	if [ -z "$LANGUAGE" ]; then
+		LANGUAGE=01
+	fi
+
+	case "$LANGUAGE" in
+		01 | ENUS ) LANGNO=01; LANGNAME=ENUS; LFULLNAME="US English (default)"
+			;;
+		03 | PORT ) LANGNO=03; LANGNAME=PORT; LFULLNAME=Portuguese
+			;;
+		07 | RUSS ) LANGNO=07; LANGNAME=RUSS; LFULLNAME=Russian
+			;;
+		30 | GREEK ) LANGNO=30; LANGNAME=GREEK; LFULLNAME=Greek
+			;;
+		31 | DTCH ) LANGNO=31; LANGNAME=DTCH; LFULLNAME=Dutch
+			;;
+		33 | FREN ) LANGNO=33; LANGNAME=FREN; LFULLNAME=French
+			;;
+		34 | SPAN ) LANGNO=34; LANGNAME=SPAN; LFULLNAME=Spanish
+			;;
+		35 | FINN ) LANGNO=35; LANGNAME=FINN; LFULLNAME=Finnish
+			;;
+		37 | CAT ) LANGNO=37; LANGNAME=CAT; LFULLNAME=Catalan
+			;;
+		39 | ITAL ) LANGNO=39; LANGNAME=ITAL; LFULLNAME=Italian
+			;;
+		42 | CZECH ) LANGNO=42; LANGNAME=CZECH; LFULLNAME=Czech
+			;;
+		43 | SLOVAK ) LANGNO=43; LANGNAME=SLOVAK; LFULLNAME=Slovak
+			;;
+		45 | DAN ) LANGNO=45; LANGNAME=DAN; LFULLNAME=Danish
+			;;
+		46 | SWED ) LANGNO=46; LANGNAME=SWED; LFULLNAME=Swedish
+			;;
+		48 | POL ) LANGNO=48; LANGNAME=POL; LFULLNAME=Polish
+			;;
+		49 | GER ) LANGNO=49; LANGNAME=GER; LFULLNAME=German
+			;;
+		55 | PORTBR ) LANGNO=55; LANGNAME=PORTBR; LFULLNAME="Portuguese brazilian"
+			;;
+		66 | THAI ) LANGNO=66; LANGNAME=THAI; LFULLNAME=Thai
+			;;
+		77 | ESTONIAN ) LANGNO=77; LANGNAME=ESTONIAN; LFULLNAME=Estonian
+			;;
+		81 | JAPN ) LANGNO=81; LANGNAME=JAPN; LFULLNAME="Japanese"
+			;;
+		82 | KOREAN ) LANGNO=82; LANGNAME=KOREAN; LFULLNAME=Korean
+			;;
+		86 | CHINSIM ) LANGNO=86; LANGNAME=CHINSIM; LFULLNAME="Simplified Chinese (PRC)"
+			;;
+		88 | CHINTRAD ) LANGNO=88; LANGNAME=CHINTRAD; LFULLNAME="Traditional Chinese (taiwan)"
+			;;
+		90 | TURK ) LANGNO=90; LANGNAME=TURK; LFULLNAME=Turkish
+			;;
+		91 | HINDI ) LANGNO=91; LANGNAME=HINDI; LFULLNAME=Hindi
+			;;
+		96 | ARAB ) LANGNO=96; LANGNAME=ARAB; LFULLNAME=Arabic
+			;;
+		97 | HEBREW ) LANGNO=97; LANGNAME=HEBREW; LFULLNAME=Hebrew
+			;;
+		* )
+			eerror "Unknown LANGUAGE setting!"
+			eerror
+			eerror "Known LANGUAGE settings are:"
+			eerror "  ENUS | PORT | RUSS | GREEK | DTCH | FREN | SPAN | FINN | CAT | ITAL |"
+			eerror "  CZECH | SLOVAK | DAN | SWED | POL | GER | PORTBR | THAI | ESTONIAN |"
+			eerror "  JAPN | KOREAN | CHINSIM | CHINTRAD | TURK | HINDI | ARAB | HEBREW"
+			die
+			;;
+	esac
+}
+
+oo_setup() {
+
+	unset LANGUAGE
+	unset LANG
+
+	export NEW_GCC="0"
+
+	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 -a "$(gcc-version)" != "3.3" ]
+			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
+				then
+					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.1 or later!"
+					eerror
+					eerror "Use gcc-config to change your gcc profile:"
+					eerror
+					eerror "  # gcc-config $CHOST-3.2.1"
+					eerror
+					eerror "or whatever gcc version is relevant."
+					die
+				fi
+			fi
+		fi
+	fi
+
+}
+
+src_unpack() {
+
+	oo_setup
+
+	cd ${WORKDIR}
+	unpack OOo_${PV}_source.tar.bz2 ooo-build-${XIMIAN_VER}.tar.gz ooo-icons-${ICON_VER}.tar.gz
+
+	#Still needed: The STLport patch
+	cd ${S}
+	rm stlport/STLport-4.5.3.patch
+	epatch ${FILESDIR}/${PV}/newstlportfix.patch
+
+	#Fix compilation with gcc 3.2.x	
+	epatch ${FILESDIR}/${PV}/config.patch
+
+	#Fix nptl compile issues
+	epatch ${FILESDIR}/${PV}/nptl.patch
+
+	#Additional patch for Kernel 2.6
+	epatch ${FILESDIR}/${PV}/openoffice-1.1.0-linux-2.6-fix.patch
+
+	einfo "Applying Ximian OO.org Patches"
+	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=Ximian || die "Ximian patches failed"
+
+	einfo "Installing / Scaling Icons"
+	${PATCHDIR}/bin/scale-icons ${S}
+	cp -avf ${ICONDIR}/* ${S}
+
+	# Now for our optimization flags ...
+	perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
+		${S}/solenv/inc/unxlngi3.mk
+	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
+
+	#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
+}
+
+get_EnvSet() {
+
+	# Determine what Env file we should be using (Az)
+	export LinuxEnvSet="LinuxIntelEnv.Set.sh"
+	use sparc && export LinuxEnvSet="LinuxSparcEnv.Set.sh"
+	use sparc64 && 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 '/^UPD=/ {gsub(/\"/, ""); gsub(/UPD=/, ""); print $0}' ${LinuxEnvSet})"
+	export SOLPATH="$(awk '/^INPATH=/ {gsub(/\"/, ""); gsub(/INPATH=/, ""); print $0}' ${LinuxEnvSet})"
+
+}
+
+src_compile() {
+
+	if [ "$(gcc-version)" == "3.2" ]; then
+		replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
+	fi
+
+	addpredict /bin
+	addpredict /root/.gconfd
+	local buildcmd=""
+
+	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 ]
+	then
+		einfo "We're using ccache for this build..."
+		# 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}"
+	fi
+
+	# Enable distcc for this build (Az)
+	if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \
+	     "${FEATURES/distcc/}" != "${FEATURES}" -a \
+		 -x /usr/bin/distcc ]
+	then
+		einfo "We're using distcc for this build..."
+		# 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)"
+
+		export CC="distcc ${CC}"
+		export CXX="distcc ${CXX}"
+	fi
+
+	# dmake security patch
+	cd ${S}/dmake
+	autoconf || die
+
+	# Do NOT compile with a external STLport, as gcc-2.95.3 users will
+	# get linker errors due to the ABI being different (STLport will be
+	# compiled with 2.95.3, while OO is compiled with 3.x). (Az)
+	einfo "Configuring OpenOffice.org with language support for ${LFULLNAME}..."
+	cd ${S}/config_office
+	rm -f config.cache
+	autoconf
+	./configure \
+		--enable-libart \
+		--enable-libsn \
+		--enable-crashdump=no \
+		--with-lang=ENUS,${LANGNAME} \
+		--without-fonts \
+		--disable-rpath \
+		--disable-java \
+		--enable-fontconfig \
+		--with-system-zlib || die
+
+	cd ${S}
+	get_EnvSet
+
+	# Build as minimal as possible
+	export BUILD_MINIMAL="${LANGNO}"
+
+	# 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}
+
+	if [ "${NEW_GCC}" -eq "1" ]
+	then
+		local gcc_path="$(/usr/sbin/gcc-config --get-bin-path ${GCC_PROFILE})"
+
+		# 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
+
+	# Should the build use multiprocessing?
+	if [ "${ECPUS}" -gt 1 ]
+	then
+		buildcmd="${S}/solenv/bin/build.pl --all -P ${ECPUS} product=full --dlv_switch link"
+	else
+		buildcmd="${S}/solenv/bin/build.pl --all product=full --dlv_switch link"
+	fi
+
+	if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
+	then
+		# Set CCCOMP and CXXCOMP.  This is still needed for STLport
+		export CCCOMP=${CC}
+		export CXXCOMP=${CXX}
+	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}
+	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
+
+	einfo "Building OpenOffice.org..."
+	# Setup virtualmake
+	export maketype="sh"
+	echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${buildcmd}" > build.sh
+	# Build needs X to compile! (Az)
+	virtualmake build.sh || die "Build failed!"
+
+#	einfo "Building Language Pack"
+	# Setup virtualmake
+#	export maketype="sh"
+#	echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${buildcmd} --from instsetoo -- instsetext=${LANGNO}" > buildlang.sh
+	# Build needs X to compile! (Az)
+#	virtualmake buildlang.sh || die "Build failed!"
+
+	[ -d ${S}/instsetoo/${SOLPATH} ] || die "Cannot find build directory!"
+}
+
+src_install() {
+
+	# Sandbox issues; bug #11838
+	addpredict "/user"
+	addpredict "/share"
+	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
+
+	# 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
+	# 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.
+	#
+	# <azarah@gentoo.org> (9 Sep 2002)
+
+	# Autoresponse file for main installation
+	cat > ${T}/rsfile-global <<-"END_RS"
+		[ENVIRONMENT]
+		INSTALLATIONMODE=INSTALL_NETWORK
+		INSTALLATIONTYPE=STANDARD
+		DESTINATIONPATH=<destdir>
+		OUTERPATH=
+		LOGFILE=
+		LANGUAGELIST=<LANGUAGE>
+
+		[JAVA]
+		JavaSupport=preinstalled_or_none
+	END_RS
+
+	# Autoresponse file for user installation
+	cat > ${T}/rsfile-local <<-"END_RS"
+		[ENVIRONMENT]
+		INSTALLATIONMODE=INSTALL_WORKSTATION
+		INSTALLATIONTYPE=WORKSTATION
+		DESTINATIONPATH=<home>/.openoffice/<pv>
+
+		[JAVA]
+		JavaSupport=none
+	END_RS
+
+	# Fixing install location in response file
+	sed -e "s|<destdir>|${D}${INSTDIR}|" \
+		${T}/rsfile-global > ${T}/autoresponse
+
+	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 -noexit -r:${T}/autoresponse"
+
+	echo
+	einfo "Removing build root from registy..."
+	# Remove totally useless stuff.
+	rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh}
+	# Remove build root from registry and co
+	egrep -rl "${D}" ${D}${INSTDIR}/* | \
+		xargs -i perl -pi -e "s|${D}||g" {} || :
+
+	einfo "Fixing permissions..."
+	# Fix permissions
+	find ${D}${INSTDIR}/ -type f -exec chmod a+r {} \;
+	chmod a+x ${D}${INSTDIR}/share/config/webcast/*.pl
+
+	# Fix symlinks
+	dosym program/setup ${INSTDIR}/setup
+
+	# Install user autoresponse file
+	insinto /etc/openoffice
+	sed -e "s|<pv>|${PV}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
+	doins ${T}/autoresponse-${PV}.conf
+
+	# Install wrapper script
+	exeinto /usr/bin
+	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
+
+	# Install ximian icons
+	cd ${PATCHDIR}/desktop/
+	insinto /usr/share/pixmaps
+	doins *.png
+
+	einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..."
+	cd ${PATCHDIR}/desktop
+	rm -f *1.1*
+	if [ -n "`use gnome`" ]
+	then
+		insinto /usr/share/gnome/apps/OpenOffice.org
+		doins *.desktop
+	fi
+
+	# Unneeded, as they get installed into /usr/share...
+	# They are needed else user installation fails.
+#	rm -rf ${D}${INSTDIR}/share/{cde,gnome,kde}
+	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}
+}
+
+pkg_postinst() {
+
+	einfo "******************************************************************"
+	einfo " To start OpenOffice.org, run:"
+	einfo
+	einfo "   $ ooffice"
+	einfo
+	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"
+	einfo
+	einfo "******************************************************************"
+}
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.0.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.0.ebuild
index d2faba2bb5a3..180a701f51df 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.0.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.0.ebuild,v 1.4 2003/11/04 18:56:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.0.ebuild,v 1.5 2003/11/04 19:53:55 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -332,10 +332,11 @@ get_EnvSet() {
 
 src_compile() {
 
-	if [ "$(gcc-version)" = "3.2" ]; then
+	if [ "$(gcc-version)" == "3.2" ]; then
 		replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
 	fi
 
+	addpredict /root/.gconfd
 	addpredict /bin
 	local buildcmd=""