KDE integration stuff needs to be tested better, so out it goes into a hard masked version

9 files changed, 576 insertions, 80 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 302be07ada94..aecd634bd1de 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.38 2004/05/06 21:21:54 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.39 2004/05/07 15:30:49 suka Exp $
+
+*openoffice-ximian-1.1.55-r1 (07 May 2004)
+
+  07 May 2004; suka@gentoo.org -files/1.1.1/distro_kde.patch,
+  openoffice-ximian-1.1.53.ebuild, openoffice-ximian-1.1.54.ebuild,
+  +openoffice-ximian-1.1.55-r1.ebuild, openoffice-ximian-1.1.55.ebuild:
+  Back out KDE integration stuff of 1.1.54 and 1.1.55, if you want to try it
+  out, use 1.1.55-r1 which is hard-masked, as there are still some known
+  problems
 
 *openoffice-ximian-1.1.55 (06 May 2004)
 
diff --git a/app-office/openoffice-ximian/files/1.1.1/distro_kde.patch b/app-office/openoffice-ximian/files/1.1.1/distro_kde.patch
deleted file mode 100644
index e8bbf90a6c71..000000000000
--- a/app-office/openoffice-ximian/files/1.1.1/distro_kde.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ooo-build-1.1.54/patches/OOO_1_1_1/apply 2004-04-30 22:21:18.000000000 -0500
-+++ ooo-build-1.1.54/patches/OOO_1_1_1/apply.new 2004-04-30 22:08:04.000000000 -0500
-@@ -21,7 +21,7 @@ RHFedora : RedHatBase, RHFedoraOnly
- RHTaroon : RedHatBase, RHTaroonOnly, OldLibArt
- RHShrike : RedHatBase, RHShrikeOnly, OldLibArt
- KDE : LinuxCommon, NativeWidgets, StartupNotification, ODKFixes
--SuSE : SuSEOnly, LinuxCommon, KDE, GlobalDesktopFiles, VBABits
-+SuSE : SuSEOnly, LinuxCommon, NativeWidgets, StartupNotification ODKFixes, GlobalDesktopFiles, VBABits
- # somewhat odder:
- Win32 : Common, ODKFixes, VBABits, Win32Only
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.54 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.54
index f6f4e3bcf329..9bd483e253cb 100644
--- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.54
+++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.54
@@ -1,4 +1,3 @@
 MD5 3cc04c46514cd4b663cab3ca5637d501 OOo_1.1.1p1_source.tar.bz2 192388698
 MD5 22a459b68c2534c2213805d1445d947d ooo-build-1.1.54.tar.gz 1865464
-MD5 5157d4453d17cae586ce24989d34357a ooo-KDE_icons-OOO_1_1-0.1.tar.gz 1037481
 MD5 32a0e62f89ef36a91437fc705fbe6440 ooo-icons-OOO_1_1-9.tar.gz 1561812
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.55 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.55
index 7500f7c8a0c2..1ce7f0b5fbdd 100644
--- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.55
+++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.55
@@ -1,4 +1,3 @@
 MD5 3cc04c46514cd4b663cab3ca5637d501 OOo_1.1.1p1_source.tar.bz2 192388698
 MD5 79e885131d99a0a507eb3ffb7ecf19af ooo-build-1.1.55.tar.gz 1996476
-MD5 5157d4453d17cae586ce24989d34357a ooo-KDE_icons-OOO_1_1-0.1.tar.gz 1037481
 MD5 32a0e62f89ef36a91437fc705fbe6440 ooo-icons-OOO_1_1-9.tar.gz 1561812
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.55-r1 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.55-r1
new file mode 100644
index 000000000000..7500f7c8a0c2
--- /dev/null
+++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.55-r1
@@ -0,0 +1,4 @@
+MD5 3cc04c46514cd4b663cab3ca5637d501 OOo_1.1.1p1_source.tar.bz2 192388698
+MD5 79e885131d99a0a507eb3ffb7ecf19af ooo-build-1.1.55.tar.gz 1996476
+MD5 5157d4453d17cae586ce24989d34357a ooo-KDE_icons-OOO_1_1-0.1.tar.gz 1037481
+MD5 32a0e62f89ef36a91437fc705fbe6440 ooo-icons-OOO_1_1-9.tar.gz 1561812
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild
index 9670f0e8c157..022090165536 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.53.ebuild,v 1.5 2004/05/07 06:29:31 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild,v 1.6 2004/05/07 15:30:49 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -27,6 +27,7 @@
 #   need to be able to install more than one language pack.
 
 inherit flag-o-matic eutils gcc
+IUSE="gnome kde"
 
 # We want gcc3 if possible!!!!
 export WANT_GCC_3="yes"
@@ -54,7 +55,6 @@ HOMEPAGE="http://ooo.ximian.com"
 LICENSE="LGPL-2 | SISSL-1.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-IUSE="gnome kde"
 
 RDEPEND=">=sys-libs/glibc-2.1
 	!=sys-libs/glibc-2.3.1*
@@ -221,7 +221,7 @@ src_unpack() {
 	oo_setup
 
 	cd ${WORKDIR}
-	unpack OOo_${OO_VER}p1_source.tar.bz2 ooo-build-${PV}.tar.gz ooo-icons-${ICON_VER}.tar.gz
+	unpack ${A}
 
 	#Still needed: The STLport patch
 	cd ${S}
@@ -252,11 +252,6 @@ src_unpack() {
 	${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu
 	echo "done munging fonts."
 
-	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
-
 	# Compile problems with these ...
 	filter-flags "-funroll-loops"
 	filter-flags "-fomit-frame-pointer"
@@ -266,6 +261,11 @@ src_unpack() {
 	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" \
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild
index f3b0460ea938..6e0db9d0ca49 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.54.ebuild,v 1.7 2004/05/07 06:29:31 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild,v 1.8 2004/05/07 15:30:49 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -27,8 +27,7 @@
 #   need to be able to install more than one language pack.
 
 inherit flag-o-matic eutils gcc
-
-IUSE="gnome kde ooo-kde"
+IUSE="gnome kde"
 
 # We want gcc3 if possible!!!!
 export WANT_GCC_3="yes"
@@ -42,17 +41,14 @@ export WANT_GCC_3="yes"
 OO_VER=1.1.1
 PATCHLEVEL=OOO_1_1_1
 ICON_VER=OOO_1_1-9
-KDE_ICON_VER=OOO_1_1-0.1
-KDE_ICON_PATH=documents/159/1785
 INSTDIR="/opt/Ximian-OpenOffice"
 PATCHDIR=${WORKDIR}/ooo-build-${PV}
-ICONDIR=${WORKDIR}/${ICON}
+ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
 S="${WORKDIR}/oo_${OO_VER}_src"
 DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite."
 SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}p1_source.tar.bz2
 	http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
-	ooo-kde? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/ooo-KDE_icons-${KDE_ICON_VER}.tar.gz )
-	!ooo-kde? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz )"
+	http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz"
 
 HOMEPAGE="http://ooo.ximian.com"
 
@@ -63,12 +59,12 @@ KEYWORDS="~x86"
 RDEPEND=">=sys-libs/glibc-2.1
 	!=sys-libs/glibc-2.3.1*
 	>=dev-lang/perl-5.0
-	!ooo-kde? ( >=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 )
+	>=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
@@ -85,8 +81,7 @@ RDEPEND=">=sys-libs/glibc-2.1
 	!app-office/openoffice-ximian-bin
 	ppc? ( >=sys-libs/glibc-2.2.5-r7
 	>=sys-devel/gcc-3.2.1 )
-	>=media-libs/freetype-2.1.4
-	ooo-kde? ( kde-base/kdelibs )"
+	>=media-libs/freetype-2.1.4"
 
 DEPEND="${RDEPEND}
 	app-shells/tcsh
@@ -228,9 +223,6 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack ${A}
 
-	#Fix KDE as terminal node of distro
-	epatch ${FILESDIR}/${OO_VER}/distro_kde.patch
-
 	#Still needed: The STLport patch
 	cd ${S}
 	rm stlport/STLport-4.5.3.patch
@@ -250,13 +242,7 @@ src_unpack() {
 	fi
 
 	einfo "Applying Ximian OO.org Patches"
-	if [ `use ooo-kde` ]; then
-		DISTRO=KDE
-	else
-		DISTRO=Ximian
-	fi
-
-	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed"
+	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=Ximian || die "Ximian patches failed"
 
 	einfo "Installing / Scaling Icons"
 	${PATCHDIR}/bin/scale-icons ${S}
@@ -326,8 +312,8 @@ src_compile() {
 	cd ${S}/config_office
 	rm -f config.cache
 	autoconf
-	local myconf
-	myconf="--enable-libart \
+	./configure \
+		--enable-libart \
 		--enable-libsn \
 		--enable-crashdump=no \
 		--with-lang=ENUS,${LANGNAME} \
@@ -337,9 +323,7 @@ src_compile() {
 		--with-system-zlib \
 		--with-system-freetype \
 		--with-system-curl \
-		--disable-java"
-	use ooo-kde && myconf="${myconf} --with-widgetset=kde"
-	./configure ${myconf} || die
+		--disable-java || die
 
 	cd ${S}
 	get_EnvSet
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild
new file mode 100644
index 000000000000..15f7a9eb2fd1
--- /dev/null
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild
@@ -0,0 +1,524 @@
+# Copyright 1999-2004 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.55-r1.ebuild,v 1.1 2004/05/07 15:30:49 suka 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 gcc
+
+IUSE="gnome kde ooo-kde"
+
+# We want gcc3 if possible!!!!
+export WANT_GCC_3="yes"
+
+# 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"
+
+OO_VER=1.1.1
+PATCHLEVEL=OOO_1_1_1
+ICON_VER=OOO_1_1-9
+KDE_ICON_VER=OOO_1_1-0.1
+KDE_ICON_PATH=documents/159/1785
+INSTDIR="/opt/Ximian-OpenOffice"
+PATCHDIR=${WORKDIR}/ooo-build-${PV}
+S="${WORKDIR}/oo_${OO_VER}_src"
+DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite."
+SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}p1_source.tar.bz2
+	http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
+	ooo-kde? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/ooo-KDE_icons-${KDE_ICON_VER}.tar.gz )
+	!ooo-kde? ( 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"
+
+RDEPEND=">=sys-libs/glibc-2.1
+	!=sys-libs/glibc-2.3.1*
+	>=dev-lang/perl-5.0
+	!ooo-kde? ( >=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
+	!app-office/openoffice-ximian-bin
+	ppc? ( >=sys-libs/glibc-2.2.5-r7
+	>=sys-devel/gcc-3.2.1 )
+	>=media-libs/freetype-2.1.4
+	ooo-kde? ( kde-base/kdelibs )"
+
+DEPEND="${RDEPEND}
+	app-shells/tcsh
+	>=sys-apps/findutils-4.1.20-r1
+	dev-libs/libxslt
+	net-misc/curl
+	!dev-util/dmake
+	dev-util/intltool"
+
+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
+	unset LC_ALL
+
+	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 ${A}
+
+	#Fix Sandbox problems with scale-icons script
+	cd ${PATCHDIR}
+	epatch ${FILESDIR}/${OO_VER}/fixscale.patch
+
+	#Still needed: The STLport patch
+	cd ${S}
+	rm stlport/STLport-4.5.3.patch
+	epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch
+
+	#Fix nptl compile issues
+	epatch ${FILESDIR}/${OO_VER}/nptl.patch
+
+	#Additional patch for Kernel 2.6
+	epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-linux-2.6-fix.patch
+
+	#Work around recent portage sandbox troubles
+	epatch ${FILESDIR}/${OO_VER}/build.patch
+
+	if [ ${ARCH} = "sparc" ]; then
+		epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch
+	fi
+
+	einfo "Applying Ximian OO.org Patches"
+	if [ `use ooo-kde` ]; then
+		DISTRO=KDE
+		ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
+	else
+		DISTRO=Ximian
+		ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
+	fi
+
+	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed"
+
+	einfo "Installing / Scaling Icons"
+	${PATCHDIR}/bin/scale-icons ${S}
+	cp -avf ${ICONDIR}/* ${S}
+
+	einfo "Munging font mappings ..."
+	${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu
+	echo "done munging fonts."
+
+	# Compile problems with these ...
+	filter-flags "-funroll-loops"
+	filter-flags "-fomit-frame-pointer"
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-fno-default-inline"
+	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
+
+	#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() {
+
+	addpredict /bin
+	addpredict /root/.gconfd
+	local buildcmd=""
+
+	set_languages
+
+	oo_setup
+
+	# 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
+	local myconf
+	myconf="--enable-libart \
+		--enable-libsn \
+		--enable-crashdump=no \
+		--with-lang=ENUS,${LANGNAME} \
+		--without-fonts \
+		--disable-rpath \
+		--enable-fontconfig \
+		--with-system-zlib \
+		--with-system-freetype \
+		--with-system-curl \
+		--disable-java"
+	use ooo-kde && myconf="${myconf} --with-widgetset=kde"
+	./configure ${myconf} || die
+
+	cd ${S}
+	get_EnvSet
+
+	# Build as minimal as possible
+	export BUILD_MINIMAL="${LANGNO}"
+
+	# Should the build use multiprocessing?
+	if [ "${ECPUS}" -gt 1 ]
+	then
+		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 strip=true --dlv_switch link"
+	fi
+
+	if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
+	then
+		# Set CCCOMP and CXXCOMP.  This is still needed for STLport
+		export CCCOMP="$(gcc-getCC)"
+		export CXXCOMP="$(gcc-getCXX)"
+	fi
+
+	einfo "Bootstrapping OpenOffice.org..."
+	# Get things ready for bootstrap (Az)
+	chmod 0755 ${S}/solenv/bin/*.pl
+	# Bootstrap ...
+	./bootstrap
+
+	einfo "Building OpenOffice.org..."
+	echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${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"
+
+	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.  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>/.xopenoffice/<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 Ximian-OpenOffice.org into build root..."
+	dodir ${INSTDIR}
+	cd ${S}/instsetoo/${SOLPATH}/${LANGNO}/normal
+	./setup -v -noexit -nogui -r:${T}/autoresponse || die "Setup failed"
+
+	#Fix for parallel install
+	sed -i -e s/sversionrc/xversionrc/g ${D}${INSTDIR}/program/bootstraprc ${D}${INSTDIR}/program/instdb.ins
+
+	echo
+	einfo "Removing build root from registry..."
+	# 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/ximian-openoffice
+	sed -e "s|<pv>|${OO_VER}|g" ${T}/rsfile-local > ${T}/autoresponse-${OO_VER}.conf
+	doins ${T}/autoresponse-${OO_VER}.conf
+
+	# Install wrapper script
+	exeinto /usr/bin
+	sed -e "s|<pv>|${OO_VER}|g" \
+		${FILESDIR}/${OO_VER}/xooffice-wrapper-1.3 > ${T}/xooffice
+	doexe ${T}/xooffice
+
+	# Component symlinks
+	for app in calc draw impress html math writer setup; do
+		dosym xooffice /usr/bin/xoo${app}
+	done
+
+	# Install ximian icons
+	cd ${PATCHDIR}/desktop/
+	insinto /usr/share/pixmaps
+	doins *.png
+	for menu in drawing presentation spreadsheet textdoc; do
+		intltool-merge -d ../po ${menu}.desktop.in xoo-${menu}.desktop;
+	done
+	sed -i -e s/'=oo'/'=xoo'/g *.desktop
+
+	einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
+	if [ -n "`use gnome`" ]
+	then
+		insinto /usr/share/applications
+		doins *.desktop
+		insinto /usr/share/application-registry
+		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.applications
+		insinto /usr/share/mime-info
+		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys
+	fi
+
+	if [ -n "`use kde`" ]
+	then
+		insinto /usr/share/applnk/Ximian-OpenOffice.org
+		doins *.desktop
+		insinto /usr/share/mimelnk/application
+		doins ${S}/sysui/${SOLPATH}/misc/kde/share/mimelnk/application/*
+	fi
+
+	# Install corrected Symbol Font
+	insinto /usr/share/fonts/TTF/
+	doins ${PATCHDIR}/fonts/*.ttf
+
+	# Remove unneeded stuff
+	rm -rf ${D}${INSTDIR}/share/cde
+
+	# 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 Ximian-OpenOffice.org, run:"
+	einfo
+	einfo "   $ xooffice"
+	einfo
+	einfo " Also, for individual components, you can use any of:"
+	einfo
+	einfo "   xoocalc, xoodraw, xooimpress, xoomath, xooweb or xoowriter"
+	einfo
+	einfo "******************************************************************"
+}
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild
index 91f64746bb7f..66fdf3606a2d 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.55.ebuild,v 1.3 2004/05/07 06:29:31 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild,v 1.4 2004/05/07 15:30:49 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -27,8 +27,7 @@
 #   need to be able to install more than one language pack.
 
 inherit flag-o-matic eutils gcc
-
-IUSE="gnome kde ooo-kde"
+IUSE="gnome kde"
 
 # We want gcc3 if possible!!!!
 export WANT_GCC_3="yes"
@@ -42,17 +41,14 @@ export WANT_GCC_3="yes"
 OO_VER=1.1.1
 PATCHLEVEL=OOO_1_1_1
 ICON_VER=OOO_1_1-9
-KDE_ICON_VER=OOO_1_1-0.1
-KDE_ICON_PATH=documents/159/1785
 INSTDIR="/opt/Ximian-OpenOffice"
 PATCHDIR=${WORKDIR}/ooo-build-${PV}
-ICONDIR=${WORKDIR}/${ICON}
+ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
 S="${WORKDIR}/oo_${OO_VER}_src"
 DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite."
 SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}p1_source.tar.bz2
 	http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
-	ooo-kde? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/ooo-KDE_icons-${KDE_ICON_VER}.tar.gz )
-	!ooo-kde? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz )"
+	http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz"
 
 HOMEPAGE="http://ooo.ximian.com"
 
@@ -63,12 +59,12 @@ KEYWORDS="~x86"
 RDEPEND=">=sys-libs/glibc-2.1
 	!=sys-libs/glibc-2.3.1*
 	>=dev-lang/perl-5.0
-	!ooo-kde? ( >=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 )
+	>=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
@@ -85,8 +81,7 @@ RDEPEND=">=sys-libs/glibc-2.1
 	!app-office/openoffice-ximian-bin
 	ppc? ( >=sys-libs/glibc-2.2.5-r7
 	>=sys-devel/gcc-3.2.1 )
-	>=media-libs/freetype-2.1.4
-	ooo-kde? ( kde-base/kdelibs )"
+	>=media-libs/freetype-2.1.4"
 
 DEPEND="${RDEPEND}
 	app-shells/tcsh
@@ -251,13 +246,7 @@ src_unpack() {
 	fi
 
 	einfo "Applying Ximian OO.org Patches"
-	if [ `use ooo-kde` ]; then
-		DISTRO=KDE
-	else
-		DISTRO=Ximian
-	fi
-
-	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed"
+	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=Ximian || die "Ximian patches failed"
 
 	einfo "Installing / Scaling Icons"
 	${PATCHDIR}/bin/scale-icons ${S}
@@ -327,8 +316,8 @@ src_compile() {
 	cd ${S}/config_office
 	rm -f config.cache
 	autoconf
-	local myconf
-	myconf="--enable-libart \
+	./configure \
+		--enable-libart \
 		--enable-libsn \
 		--enable-crashdump=no \
 		--with-lang=ENUS,${LANGNAME} \
@@ -338,9 +327,7 @@ src_compile() {
 		--with-system-zlib \
 		--with-system-freetype \
 		--with-system-curl \
-		--disable-java"
-	use ooo-kde && myconf="${myconf} --with-widgetset=kde"
-	./configure ${myconf} || die
+		--disable-java || die
 
 	cd ${S}
 	get_EnvSet