some cleanup work

3 files changed, 12 insertions, 44 deletions

diff --git a/app-office/openoffice-ximian/files/1.1.1/build.patch b/app-office/openoffice-ximian/files/1.1.1/build.patch
deleted file mode 100644
index 8049215b8186..000000000000
--- a/app-office/openoffice-ximian/files/1.1.1/build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- solenv/bin/build.pl.orig	2004-04-11 12:13:16.296275784 +0000
-+++ solenv/bin/build.pl	2004-04-11 12:13:37.367072536 +0000
-@@ -1,6 +1,5 @@
--    :
--    eval 'exec perl -S $0 ${1+"$@"}'
--        if 0;
-+#!/usr/bin/perl
-+
- #*************************************************************************
- #
- #   $RCSfile: build.patch,v $
diff --git a/app-office/openoffice-ximian/files/1.1.1/gentoo-1.1.55.patch b/app-office/openoffice-ximian/files/1.1.1/gentoo-1.1.55.patch
deleted file mode 100644
index 21e15c29d953..000000000000
--- a/app-office/openoffice-ximian/files/1.1.1/gentoo-1.1.55.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- patches/OOO_1_1_1/apply 2004-05-08 08:54:17.055306480 +0200
-+++ patches/OOO_1_1_1/apply 2004-05-08 08:54:17.057306176 +0200
-@@ -25,6 +25,7 @@
- SuSE : SuSEOnly, LinuxCommon, KDEBase, GlobalDesktopFiles, VBABits
- PLD : PLDOnly, LinuxCommon, KDEBase, OOoCUPS, GlobalDesktopFiles, StartupNotification, ODKFixes, VBABits
- Ark : ArkOnly, LinuxCommon, NativeWidgets, GlobalDesktopFiles, ODKFixes, VBABits, OOoCUPS
-+Gentoo : XimianOnly, LinuxCommon, GnomeVFS, GnomeCUPS, GlobalDesktopFiles, StartupNotification, ODKFixes, VBABits, NativeWidgets
- # somewhat odder:
- Win32 : Common, ODKFixes, VBABits, Win32Only
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 fd15eb4111a7..18f754ece567 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.7 2004/06/02 02:30:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild,v 1.8 2004/06/06 13:44:47 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -27,16 +27,8 @@
 #   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"
 
-# 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"
+IUSE="gnome kde"
 
 OO_VER=1.1.1
 PATCHLEVEL=OOO_1_1_1
@@ -183,6 +175,9 @@ oo_setup() {
 	unset LANG
 	unset LC_ALL
 
+	# We want gcc3 if possible!!!!
+	export WANT_GCC_3="yes"
+
 	export NEW_GCC="0"
 
 	if [ -x /usr/sbin/gcc-config ]
@@ -238,9 +233,6 @@ src_unpack() {
 	#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
@@ -301,10 +293,6 @@ src_compile() {
 	addpredict /root/.gconfd
 	local buildcmd=""
 
-	set_languages
-
-	oo_setup
-
 	# dmake security patch
 	cd ${S}/dmake
 	autoconf || die
@@ -335,6 +323,12 @@ src_compile() {
 	# Build as minimal as possible
 	export BUILD_MINIMAL="${LANGNO}"
 
+	# 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?
 	if [ "${ECPUS}" -gt 1 ]
 	then
@@ -372,10 +366,6 @@ src_install() {
 	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
@@ -490,9 +480,7 @@ src_install() {
 	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}
+	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() {