Revision bump for security fix, see bug #88863

Package-Manager: portage-2.0.51.19

6 files changed, 593 insertions, 2 deletions

diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 8069b2b83ad1..810e904f6498 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -30,6 +30,7 @@ MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618
 MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598
 MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.3/pthreadlink-fix.patch 1163
 MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.3/nptl.patch 785
+MD5 8b9178e67b293617cabadefbfbf51fb8 files/1.1.3/crash-objstream.diff 669
 MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.3/gcc34-sal-link-to-libsupc++.diff 405
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.3/STLport-vector.patch 1472
 MD5 dd3785621235368cc28f1f85101fcac7 files/1.1.3/nojvmfwk-fix.patch 6986
@@ -44,6 +45,7 @@ MD5 964398ef88829e5a2935d0c0f8389c9d files/1.1.4/xooffice-wrapper-1.3 6091
 MD5 6938dc2e28e840cebf4fdbde9d6e2d4b files/1.1.4/gentoo-1.3.9.patch 859
 MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.4/pthreadlink-fix.patch 1163
 MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.4/nptl.patch 243
+MD5 8b9178e67b293617cabadefbfbf51fb8 files/1.1.4/crash-objstream.diff 669
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 69a22ccaf3c62d6b96bfd30c70a2c679 files/1.1.4/regcompfix.patch 712
 MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 3a6cd1f8919c..bd6b6bf0606d 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.115 2005/04/09 07:45:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.116 2005/04/12 18:05:35 suka Exp $
+
+*openoffice-1.1.4-r1 (12 Apr 2005)
+
+  12 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/crash-objstream.diff, +openoffice-1.1.4-r1.ebuild:
+  Revision bump for security fix, see bug #88863
 
   09 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-1.1.4.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 35f1638b6c75..4abe95f4dad7 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,7 +1,9 @@
 MD5 bc81b238b2690c0839dd932fbbb8233d openoffice-1.1.4.ebuild 16447
-MD5 7f800567b4d94111aac3c62e8a1413cb ChangeLog 25539
+MD5 74d263ab8f12cacf78b3094110598c3f openoffice-1.1.4-r1.ebuild 16528
+MD5 820d515d40504bab9317edb3303b7edc ChangeLog 25744
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4 325
+MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342
 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
 MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659
@@ -14,6 +16,7 @@ MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
 MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.4/nptl.patch 785
+MD5 8b9178e67b293617cabadefbfbf51fb8 files/1.1.4/crash-objstream.diff 669
 MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.4/gcc34-sal-link-to-libsupc++.diff 405
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
diff --git a/app-office/openoffice/files/1.1.4/crash-objstream.diff b/app-office/openoffice/files/1.1.4/crash-objstream.diff
new file mode 100644
index 000000000000..b23bb413eb4c
--- /dev/null
+++ b/app-office/openoffice/files/1.1.4/crash-objstream.diff
@@ -0,0 +1,16 @@
+Index: sot/source/sdstor/stgole.cxx
+===================================================================
+RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v
+retrieving revision 1.4
+diff -u -p -u -r1.4 stgole.cxx
+--- sot/source/sdstor/stgole.cxx	22 Jul 2002 12:28:43 -0000	1.4
++++ sot/source/sdstor/stgole.cxx	12 Apr 2005 10:14:48 -0000
+@@ -157,7 +157,7 @@ BOOL StgCompObjStream::Load()
+ 		INT32 nLen1 = 0;
+ 		*this >> nLen1;
+ 		sal_Char* p = new sal_Char[ (USHORT) nLen1 ];
+-		if( Read( p, nLen1 ) == (ULONG) nLen1 )
++		if( Read( p, (USHORT) nLen1 ) == (ULONG) nLen1 )
+ 		{
+ 			aUserName = String( p, gsl_getSystemTextEncoding() );
+ /*			// Now we can read the CB format
diff --git a/app-office/openoffice/files/digest-openoffice-1.1.4-r1 b/app-office/openoffice/files/digest-openoffice-1.1.4-r1
new file mode 100644
index 000000000000..179a6c7801b2
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-1.1.4-r1
@@ -0,0 +1,5 @@
+MD5 20c10db97865ae4c51dc827d668b8939 OOo_1.1.4_source.tar.gz 219743530
+MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958
+MD5 072736926e5c04aba26b2fedaaf413fb LINUXGCCPinc.zip 4145981
+MD5 6cfa9ea26afd1effaee4497a7c82ef89 LINUXGCCPlib.zip 496451
+MD5 e77e91543d95353f742942af8f8d01b3 LINUXGCCPruntime.zip 2533976
diff --git a/app-office/openoffice/openoffice-1.1.4-r1.ebuild b/app-office/openoffice/openoffice-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..679814941332
--- /dev/null
+++ b/app-office/openoffice/openoffice-1.1.4-r1.ebuild
@@ -0,0 +1,559 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4-r1.ebuild,v 1.1 2005/04/12 18:05:35 suka Exp $
+
+# 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 eutils flag-o-matic toolchain-funcs
+
+IUSE="curl hardened java kde nptl zlib"
+
+INSTDIR="/opt/OpenOffice.org"
+S="${WORKDIR}"
+DESCRIPTION="OpenOffice.org, a full office productivity suite."
+
+SRC_URI="mirror://openoffice/stable/${PV}/OOo_${PV}_source.tar.gz
+		http://www.stlport.org/archive/STLport-4.6.2.tar.gz
+		ppc? ( http://www.openoffice.org/files/documents/111/2112/LINUXGCCPinc.zip
+			   http://www.openoffice.org/files/documents/111/2113/LINUXGCCPlib.zip
+			   http://www.openoffice.org/files/documents/111/2114/LINUXGCCPruntime.zip )"
+
+HOMEPAGE="http://www.openoffice.org/"
+
+LICENSE="|| ( LGPL-2  SISSL-1.1 )"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+RDEPEND="!app-office/openoffice-bin
+	virtual/x11
+	virtual/libc
+	virtual/lpr
+	>=dev-lang/perl-5.0
+	>=media-libs/libart_lgpl-2.3.13
+	>=x11-libs/startup-notification-0.5
+	>=media-libs/freetype-2.1.4
+	app-arch/zip
+	app-arch/unzip
+	dev-libs/expat
+	java? ( >=virtual/jre-1.4.1 )
+	ppc? ( >=sys-devel/gcc-3.2.1 )
+	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
+	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
+	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/findutils-4.1.20-r1
+	app-shells/tcsh
+	dev-util/pkgconfig
+	curl? ( net-misc/curl )
+	zlib? ( sys-libs/zlib )
+	sys-libs/pam
+	!dev-util/dmake
+	java? ( >=virtual/jdk-1.4.1 )
+	!java? ( dev-libs/libxslt )"
+
+PROVIDE="virtual/ooo"
+
+pkg_setup() {
+
+	if use java
+	then
+		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
+	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
+	ewarn " Please note that this package now uses the LINGUAS environment "
+	ewarn " variable to provide localization. The old LANGUAGE=ENUS|PORT..."
+	ewarn " system does NOT work anymore."
+	ewarn
+	ewarn " If you want localized helpcontent, please download the correct file "
+	ewarn " for your language from an OpenOffice.org-mirror "
+	ewarn " (directory /contrib/helpcontent/ e.g.) and put it in your "
+	ewarn " /usr/portage/distfiles, the ebuild will use it automatically. "
+	ewarn
+
+	set_languages
+}
+
+set_languages () {
+
+	strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb no pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
+	if [ -n "${LINGUAS}" ] ; then
+		# use the leftmost value
+		temp_lang=( ${LINGUAS} )
+		primary_lang=${temp_lang[0]}
+	else
+		primary_lang="en"
+	fi
+
+	case "${primary_lang}" in
+		en ) OOLANGNO=01; OOLANGNAME=ENUS; OOLFULLNAME="US English (default)"
+			;;
+		pt ) OOLANGNO=03; OOLANGNAME=PORT; OOLFULLNAME=Portuguese
+			;;
+		ru ) OOLANGNO=07; OOLANGNAME=RUSS; OOLFULLNAME=Russian
+			;;
+		el ) OOLANGNO=30; OOLANGNAME=GREEK; OOLFULLNAME=Greek
+			;;
+		nl ) OOLANGNO=31; OOLANGNAME=DTCH; OOLFULLNAME=Dutch
+			;;
+		fr ) OOLANGNO=33; OOLANGNAME=FREN; OOLFULLNAME=French
+			;;
+		es ) OOLANGNO=34; OOLANGNAME=SPAN; OOLFULLNAME=Spanish
+			;;
+		fi ) OOLANGNO=35; OOLANGNAME=FINN; OOLFULLNAME=Finnish
+			;;
+		hu ) OOLANGNO=36; OOLANGNAME=HUNG; OOLFULLNAME=Hungarian
+			;;
+		ca ) OOLANGNO=37; OOLANGNAME=CAT; OOLFULLNAME=Catalan
+			;;
+		it ) OOLANGNO=39; OOLANGNAME=ITAL; OOLFULLNAME=Italian
+			;;
+		cs ) OOLANGNO=42; OOLANGNAME=CZECH; OOLFULLNAME=Czech
+			;;
+		sk ) OOLANGNO=43; OOLANGNAME=SLOVAK; OOLFULLNAME=Slovak
+			;;
+		da ) OOLANGNO=45; OOLANGNAME=DAN; OOLFULLNAME=Danish
+			;;
+		sv ) OOLANGNO=46; OOLANGNAME=SWED; OOLFULLNAME=Swedish
+			;;
+		no ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
+			;;
+		pl ) OOLANGNO=48; OOLANGNAME=POL; OOLFULLNAME=Polish
+			;;
+		de ) OOLANGNO=49; OOLANGNAME=GER; OOLFULLNAME=German
+			;;
+		sl ) OOLANGNO=50; OOLANGNAME=SLOVENIAN; OOLFULLNAME=Slovenian
+			;;
+		pt_BR ) OOLANGNO=55; OOLANGNAME=PORTBR; OOLFULLNAME="Portuguese brazilian"
+			;;
+		th ) OOLANGNO=66; OOLANGNAME=THAI; OOLFULLNAME=Thai
+			;;
+		et ) OOLANGNO=77; OOLANGNAME=ESTONIAN; OOLFULLNAME=Estonian
+			;;
+		ja ) OOLANGNO=81; OOLANGNAME=JAPN; OOLFULLNAME="Japanese"
+			;;
+		ko ) OOLANGNO=82; OOLANGNAME=KOREAN; OOLFULLNAME=Korean
+			;;
+		zh_CN ) OOLANGNO=86; OOLANGNAME=CHINSIM; OOLFULLNAME="Simplified Chinese (PRC)"
+			;;
+		zh_TW ) OOLANGNO=88; OOLANGNAME=CHINTRAD; OOLFULLNAME="Traditional Chinese (taiwan)"
+			;;
+		tr ) OOLANGNO=90; OOLANGNAME=TURK; OOLFULLNAME=Turkish
+			;;
+		hi_IN ) OOLANGNO=91; OOLANGNAME=HINDI; OOLFULLNAME=Hindi
+			;;
+		ar ) OOLANGNO=96; OOLANGNAME=ARAB; OOLFULLNAME=Arabic
+			;;
+		he ) OOLANGNO=97; OOLANGNAME=HEBREW; OOLFULLNAME=Hebrew
+			;;
+	esac
+
+	einfo "Installing OpenOffice.org for ${OOLFULLNAME} environment."
+
+}
+
+oo_setup() {
+
+	unset LANGUAGE
+	unset LANG
+	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 GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
+
+			# Just recheck gcc version ...
+			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
+				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, gcc-3.3 or gcc-3.4!"
+					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 ${A}
+	cd ${S}
+
+	# 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
+
+	#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}/gcc-instlib.patch
+
+	#Another java problem
+	epatch ${FILESDIR}/${PV}/javafix.patch
+
+	# fix for bug #84548
+	epatch ${FILESDIR}/${PV}/getcompver.awk.patch
+
+	# Security fix, bug #88863
+	epatch ${FILESDIR}/${PV}/crash-objstream.diff
+
+	# Workaround for bug #73940, may break debug use flag on ppc
+	if use ppc; then
+		epatch ${FILESDIR}/${PV}/STLport-vector.patch
+	fi
+
+	#Fixes for nptl
+	if use nptl; then
+		epatch ${FILESDIR}/${PV}/nptl.patch
+	fi
+
+	#Fix for newer Freetype
+	epatch ${FILESDIR}/${PV}/freetype-217.patch
+
+	epatch ${FILESDIR}/${PV}/openoffice-java.patch
+
+	#GCC 3.4 fixes, also needed for hardened
+	epatch ${FILESDIR}/${PV}/gcc34.patch.bz2
+	epatch ${FILESDIR}/${PV}/gcc34-sal-link-to-libsupc++.diff
+	use !java && epatch ${FILESDIR}/${PV}/gcc34-nojava-fix.patch
+
+	#Fixes for hardened
+	if use hardened; then
+		epatch ${FILESDIR}/${PV}/pthreadlink-fix.patch
+		epatch ${FILESDIR}/${PV}/hardened-link.patch
+		epatch ${FILESDIR}/${PV}/pyunolink-fix.patch
+	fi
+
+	#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 || die
+}
+
+get_EnvSet() {
+
+	# Determine what Env file we should be using (Az)
+	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 '/^UPD=/ {gsub(/\"/, ""); gsub(/UPD=/, ""); print $0}' ${LinuxEnvSet})"
+	export SOLPATH="$(awk '/^INPATH=/ {gsub(/\"/, ""); gsub(/INPATH=/, ""); print $0}' ${LinuxEnvSet})"
+}
+
+src_compile() {
+
+	addpredict /bin
+	addpredict /root/.gconfd
+	export MYCONF=""
+
+	#Check if we use java
+	if use java
+	then
+		MYCONF="${MYCONF} --with-jdk-home=${JAVA_HOME}"
+	else
+		MYCONF="${MYCONF} --disable-java"
+	fi
+
+	#See if we use system-curl
+	if use curl
+	then
+		MYCONF="${MYCONF} --with-system-curl"
+	fi
+
+	#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
+	# 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)
+	cd ${S}/config_office
+	rm -f config.cache || die
+	autoconf || die
+
+	if [ "OOLANGNAME" != "ENUS" ]; then
+		OOLANGNAME="${OOLANGNAME},ENUS"
+	fi
+
+	use sparc && MYCONF="${MYCONF} --disable-mozilla"
+
+	MYCONF="${MYCONF} --enable-libart \
+		--enable-libsn \
+		--with-lang=${OOLANGNAME} \
+		--without-fonts \
+		--with-system-freetype"
+
+	./configure ${MYCONF} || die
+
+	cd ${S}
+	get_EnvSet
+
+	# unpack help files if present
+	if [ -f ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz ]; then
+		einfo "Using helpcontent for ${OOLFULLNAME}"
+		mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/pck
+		tar -xzf ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz -C ${S}/solver/${SOLVER}/${SOLPATH}/pck
+	fi
+
+	# Build as minimal as possible
+	export BUILD_MINIMAL="${OOLANGNO}"
+
+	# Embedded python dies without Home set
+	if test "z${HOME}" = "z"; then
+		export HOME=""
+	fi
+
+	#Get info for parallel build
+	export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
+
+	if [ "${JOBS}" -gt 10 ]
+	then
+		export JOBS="10"
+		einfo "dmake fails with too much parallel jobs, so limiting to 10"
+	fi
+
+	export buildcmd="${S}/solenv/bin/build.pl --all product=full strip=true --dlv_switch link"
+
+	# Should the build use multiprocessing? Not enabled by default, as it tends to break 
+	if [ "${WANT_DISTCC}" == "true" ]
+	then
+		if [ "${JOBS}" -gt 1 ]
+		then
+			export buildcmd="${buildcmd} -P${JOBS}"
+			einfo "Using distcc, Good Luck"
+		fi
+	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"
+	replace-flags "-Os" "-O2"
+
+	if [ "$(gcc-version)" == "3.2" ]; then
+		einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3"
+		replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
+	fi
+
+	# Now for our optimization flags ...
+	export CXXFLAGS="${CXXFLAGS} -fno-for-scope -fpermissive -fno-rtti"
+	perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
+		${S}/solenv/inc/unxlngi4.mk
+	perl -pi -e "s|^CFLAGSCXX=.*|CFLAGSCXX=${CXXFLAGS}|g" \
+		${S}/solenv/inc/unxlngi4.mk
+
+	if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
+	then
+		# Set CCCOMP and CXXCOMP.  This is still needed for STLport
+		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
+	# Bootstrap ...
+	./bootstrap || die
+
+	einfo "Building OpenOffice.org..."
+	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!"
+}
+
+src_install() {
+
+	# Sandbox issues; bug #11838
+	addpredict "/user"
+	addpredict "/share"
+	addpredict "/dev/dri"
+	addpredict "/usr/bin/soffice"
+	addpredict "/pspfontcache"
+	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.  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 || die
+
+	einfo "Installing OpenOffice.org into build root..."
+	dodir ${INSTDIR}
+	cd ${S}/instsetoo/${SOLPATH}/${OOLANGNO}/normal
+	./setup -v -noexit -nogui -r:${T}/autoresponse || die "Setup failed"
+
+	einfo "Removing build root from registry..."
+	# Remove totally useless stuff.
+	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" {} || :
+
+	einfo "Fixing permissions..."
+	# Fix permissions
+	find ${D}${INSTDIR}/ -type f -exec chmod a+r {} \;
+	chmod a+x ${D}${INSTDIR}/share/config/webcast/*.pl
+
+	# 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
+	for app in calc draw impress math web writer setup padmin; do
+		dosym ooffice /usr/bin/oo${app}
+	done
+
+	einfo "Installing menu shortcuts..."
+	dodir /usr/share
+	cp -a ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
+
+	use kde && cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
+
+	for x in ${D}${INSTDIR}/share/kde/net/*.desktop; do
+		# We have to handle soffice and setup differently
+		sed -i -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
+		sed -i -e "s:${INSTDIR}/program/soffice:/usr/bin/ooffice:g" ${x}
+		# Now fix the rest
+		sed -i -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
+		echo "Categories=Application;Office;" >> ${x}
+		domenu ${x}
+		rm ${x}
+	done
+
+	# Remove unneeded stuff
+	rm -rf ${D}${INSTDIR}/share/cde || die
+
+	# Fix instdb.ins, to *not* install local copies of these
+	for entry in Kdeapplnk Kdemimetext Kdeicons Gnome_Apps Gnome_Icons Gnome2_Apps; do
+		perl -pi -e "/^File gid_File_Extra_$entry/ .. /^End/ and (\
+			s|^\tSize\s+\= .*|\tSize\t\t = 0;\r| or \
+			s|^\tArchiveFiles\s+\= .*|\tArchiveFiles\t = 0;\r| or \
+			s|^\tArchiveSize\s+\= .*|\tArchiveSize\t = 0;\r| or \
+			s|^\tContains\s+\= .*|\tContains\t = ();\r| or \
+			s|\t\t\t\t\t\".*|\r|g)" \
+			${D}${INSTDIR}/program/instdb.ins
+	done
+
+	# Make sure these do not get nuked.
+	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() {
+
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	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"
+}
+