version bump, also some cleanup

8 files changed, 16 insertions, 561 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index efe728ae7e2b..8fc38816733f 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.74 2004/09/09 06:38:19 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.75 2004/09/19 14:32:59 suka Exp $
+
+*openoffice-ximian-1.3.5 (19 Sep 2004)
+
+  19 Sep 2004; suka@gentoo.org -files/1.1.2/gentoo-1.3.3-r1.patch,
+  -files/1.1.2/gentoo-1.3.3.patch, +files/1.1.2/gentoo-1.3.5.patch,
+  -openoffice-ximian-1.3.3-r1.ebuild, -openoffice-ximian-1.3.3.ebuild,
+  +openoffice-ximian-1.3.5.ebuild:
+  new patch release, mainly bug fixes.
 
 *openoffice-ximian-1.3.4 (09 Sep 2004)
 
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 8933f9a0d2d2..6aa752474a1b 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,13 +1,11 @@
-MD5 7316185ff51c861316a810fba2e79e69 openoffice-ximian-1.3.3-r1.ebuild 16382
-MD5 5b2f09bb7d220c1e7031645107269373 openoffice-ximian-1.3.3.ebuild 16002
+MD5 b490535b03dcfed5f5d7ace9bdde4325 openoffice-ximian-1.3.5.ebuild 16376
 MD5 84a7b7cc8a310ca581074341880fa8ee openoffice-ximian-1.1.55.ebuild 15343
 MD5 53a519045a2417084987708004a2d020 openoffice-ximian-1.1.61.ebuild 16287
 MD5 3d7e2487ddd4805e3ff7b5362e94d695 openoffice-ximian-1.3.4.ebuild 16376
-MD5 ef96053bff74ae74aaa6b6a6fac1c4dc ChangeLog 18784
+MD5 cd24369f004047ff46110ba0060572cf ChangeLog 19105
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
-MD5 af19ccb09648f0e94c2945b1da20ed9d files/digest-openoffice-ximian-1.3.3-r1 435
-MD5 af19ccb09648f0e94c2945b1da20ed9d files/digest-openoffice-ximian-1.3.3 435
 MD5 09dc4da36dcc534fe45759d3a40d1262 files/digest-openoffice-ximian-1.3.4 435
+MD5 2eda0016f8f36321491d0ac056ce799b files/digest-openoffice-ximian-1.3.5 435
 MD5 e464f89e2de9200bc7f6c0e43bcb2b8a files/digest-openoffice-ximian-1.1.55 215
 MD5 4448ae80f966581ae798bf217b10567d files/digest-openoffice-ximian-1.1.61 290
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.1/ximian-openoffice.applications 980
@@ -24,9 +22,8 @@ MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890
 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.2/ximian-openoffice.keys 6298
 MD5 e3c1dc0a3108091c8acfab788a5c9282 files/1.1.2/xooffice-wrapper-1.3 9336
 MD5 0165c3a11c99e85ee1fde1c59d580e21 files/1.1.2/rm-nonexistant.diff 334
-MD5 4616da7c365ad64c4cc622165806b1ba files/1.1.2/gentoo-1.3.3.patch 533
 MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.4.patch 597
-MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.3-r1.patch 597
 MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362
 MD5 6fd623d53d17e17f953232da5b04447f files/1.1.2/fixscale.patch 1035
 MD5 5230f0537c695e54b5475d203d213ef6 files/1.1.2/curlfix.patch 1367
+MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5.patch 597
diff --git a/app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.3.patch b/app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.3.patch
deleted file mode 100644
index e5d9cbc33daa..000000000000
--- a/app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- patches/OOO_1_1_2/apply 2004-08-20 23:49:28.172509416 +0200
-+++ patches/OOO_1_1_2/apply 2004-08-20 23:49:28.174509112 +0200
-@@ -27,6 +27,8 @@
- NLD  : NovellBase, NLDOnly
- PLD  : PLDOnly, LinuxCommon, KDECommon, GlobalDesktopFiles, NonDebianCommon
- KDE  : LinuxCommon, KDEOnly
-+Gentoo : LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonDebianCommon, NovellOnly
-+GentooKDE : LinuxCommon, KDECommon, GlobalDesktopFiles, NonDebianCommon
- 
- # Odd one, very few patches:
- Ark : ArkOnly, LinuxCommon, GlobalDesktopFiles, ODKFixes, VBABits
diff --git a/app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.3-r1.patch b/app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.5.patch
index c8b42fac14f3..c8b42fac14f3 100644
--- a/app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.3-r1.patch
+++ b/app-office/openoffice-ximian/files/1.1.2/gentoo-1.3.5.patch
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.3-r1 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.3-r1
deleted file mode 100644
index 5474ce36fabb..000000000000
--- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.3-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d6fd3f6cb34bdbc14287460e1cfa3f76 OOo_1.1.2_source.tar.gz 220632989
-MD5 4e6545323eb456d1a3aa5980373a607f ooo-build-1.3.3.tar.gz 2790436
-MD5 c3d8c9f5ae2abbe1b7091817265b9ef3 libwpd-snap-20040823.tar.gz 447710
-MD5 07af8dbf461df3e01a30124009f3e1ec OOo-gentoo-splash-1.1.tar.bz2 57631
-MD5 be79d3cb5f64d2c0ac8a75e65a59cb09 ooo-icons-OOO_1_1-10.tar.gz 1563326
-MD5 05ff784fff01c54cd3dd7b975b46bae2 ooo-KDE_icons-OOO_1_1-0.3.tar.gz 1017540
diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.3 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.5
index 5474ce36fabb..6e704ecd811d 100644
--- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.3
+++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.5
@@ -1,5 +1,5 @@
 MD5 d6fd3f6cb34bdbc14287460e1cfa3f76 OOo_1.1.2_source.tar.gz 220632989
-MD5 4e6545323eb456d1a3aa5980373a607f ooo-build-1.3.3.tar.gz 2790436
+MD5 ca5b892accf16c845a2c21bcf540dda1 ooo-build-1.3.5.tar.gz 2843171
 MD5 c3d8c9f5ae2abbe1b7091817265b9ef3 libwpd-snap-20040823.tar.gz 447710
 MD5 07af8dbf461df3e01a30124009f3e1ec OOo-gentoo-splash-1.1.tar.bz2 57631
 MD5 be79d3cb5f64d2c0ac8a75e65a59cb09 ooo-icons-OOO_1_1-10.tar.gz 1563326
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild
deleted file mode 100644
index efb8dcf38b04..000000000000
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild
+++ /dev/null
@@ -1,533 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.3.ebuild,v 1.2 2004/09/04 15:17:44 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"
-
-OO_VER=1.1.2
-PATCHLEVEL=OOO_1_1_2
-ICON_VER=OOO_1_1-10
-KDE_ICON_VER=OOO_1_1-0.3
-KDE_ICON_PATH=documents/159/1975
-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}_source.tar.gz
-	http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
-	http://ooo.ximian.com/packages/libwpd-snap-20040823.tar.gz
-	mirror://gentoo/OOo-gentoo-splash-1.1.tar.bz2
-	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 ~ppc"
-
-RDEPEND="virtual/libc
-	!=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
-	sys-libs/pam
-	!dev-util/dmake
-	dev-util/intltool"
-
-pkg_setup() {
-
-	ewarn "****************************************************************"
-	ewarn " This ebuild now also includes optional support for kde "
-	ewarn " integration. If you want to use it you will have to put "
-	ewarn " 'ooo-kde' into your USE FLAGS. "
-	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
-
-	# We want gcc3 if possible!!!!
-	export WANT_GCC_3="yes"
-
-	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" ] && [ "$(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 or gcc-3.3!"
-					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}
-
-	#Beginnings of our own patchset
-	cd ${PATCHDIR}
-	epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch
-
-	#Still needed: The STLport patch
-	cd ${S}
-	rm stlport/STLport-4.5.3.patch
-	epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch
-
-	#Add our own splash screen
-	epatch ${FILESDIR}/${OO_VER}/gentoo-splash.diff
-
-	if use ooo-kde; then
-		DISTRO=GentooKDE
-		ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
-		WIDGETSET=kde
-	else
-		DISTRO=Gentoo
-		ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
-		WIDGETSET=gtk
-	fi
-
-	einfo "Applying Ximian OO.org Patches"
-	${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 -af ${ICONDIR}/* ${S}
-
-	einfo "Copying splash screens in place"
-	cp -af ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/
-
-	einfo "Copying libpwd tarball in build dir"
-	mkdir -p ${S}/libwpd/download/
-	cp -af ${DISTDIR}/libwpd-snap-20040823.tar.gz ${S}/libwpd/download/
-
-	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"
-	filter-flags "-fstack-protector"
-	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
-}
-
-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
-	local buildcmd=""
-
-	# 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}..."
-	einfo "Using Native widgest set for ${WIDGETSET}"
-	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 \
-		--with-system-xrender \
-		--disable-java \
-		--disable-mozilla \
-		--enable-${WIDGETSET}"
-	./configure ${myconf} || die
-
-	cd ${S}
-	get_EnvSet
-
-	# 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
-		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"
-	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>/.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"
-	insinto /usr/share/applications
-	doins *.desktop
-
-	einfo "Installing mime info (need \"gnome\" or \"kde\" in USE)..."
-	if use gnome
-	then
-		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 use kde
-	then
-		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
-
-	# 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() {
-
-	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.3.3-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.5.ebuild
index caea614c3dd1..e12f7bed8d34 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.3-r1.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.5.ebuild
@@ -1,6 +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-ximian/openoffice-ximian-1.3.3-r1.ebuild,v 1.2 2004/09/06 18:33:53 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.5.ebuild,v 1.1 2004/09/19 14:32:59 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -238,7 +238,7 @@ src_unpack() {
 
 	#Beginnings of our own patchset
 	cd ${PATCHDIR}
-	epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}-r1.patch
+	epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch
 
 	#Still needed: The STLport patch
 	cd ${S}