Silent bump to ooo-build-2.4.0.10, only some minor bug fixes

(Portage version: 2.1.5_rc7)

10 files changed, 12 insertions, 529 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index b95d8f301939..54a3be7c9bd7 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.394 2008/04/28 16:10:25 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.395 2008/05/09 14:01:04 suka Exp $
+
+  09 May 2008; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.3.1/regcompapply.diff, -files/2.3.1/gentoo-2.3.1-r1.diff,
+  -files/2.3.1/disable-regcomp-java.diff, -files/2.3.1/ooo-env_log.diff,
+  -files/2.3.1/stlport-ppc-buildfix.diff,
+  -files/2.3.1/disable-regcomp-python.diff,
+  -files/2.3.1/stlport-ppc-buildfix-apply.diff, -openoffice-2.3.1-r1.ebuild,
+  openoffice-2.4.0.ebuild:
+  Silent bump to ooo-build-2.4.0.10, only some minor bugfixes
 
   28 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   openoffice-2.4.0.ebuild:
diff --git a/app-office/openoffice/files/2.3.1/disable-regcomp-java.diff b/app-office/openoffice/files/2.3.1/disable-regcomp-java.diff
deleted file mode 100644
index f9a1ff10a483..000000000000
--- a/app-office/openoffice/files/2.3.1/disable-regcomp-java.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
---- solenv/bin/modules/installer/servicesfile.pm.orig	2006-04-29 11:25:25.000000000 +0200
-+++ solenv/bin/modules/installer/servicesfile.pm	2006-04-29 12:24:45.000000000 +0200
-@@ -471,7 +473,7 @@
- 	$python_error_occured = 0;
- 
- 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
--	if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
-+	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
- 	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
- 		
- 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
diff --git a/app-office/openoffice/files/2.3.1/disable-regcomp-python.diff b/app-office/openoffice/files/2.3.1/disable-regcomp-python.diff
deleted file mode 100644
index e63a91f009eb..000000000000
--- a/app-office/openoffice/files/2.3.1/disable-regcomp-python.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
---- solenv/bin/modules/installer/servicesfile.pm.orig	2006-10-23 13:49:24.000000000 +0200
-+++ solenv/bin/modules/installer/servicesfile.pm	2006-10-23 13:50:04.000000000 +0200
-@@ -472,7 +472,7 @@
- 
- 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
- 	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
--	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
-+	if ( 0 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
- 		
- 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
- 	
diff --git a/app-office/openoffice/files/2.3.1/gentoo-2.3.1-r1.diff b/app-office/openoffice/files/2.3.1/gentoo-2.3.1-r1.diff
deleted file mode 100644
index d7143c73274c..000000000000
--- a/app-office/openoffice/files/2.3.1/gentoo-2.3.1-r1.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -33,6 +33,7 @@
- {
-     cat <<EOT >$1
- #!/bin/sh
-+unset PYTHONPATH
- $OOINSTBASE/program/soffice $2 "\$@"
- EOT
-     chmod 755 $1
---- distro-configs/Gentoo.conf.in 
-+++ distro-configs/Gentoo.conf.in 
-@@ -3,5 +3,4 @@
- --enable-libsn
- --enable-xsltproc
- --with-dynamic-xinerama
----with-stlport=/usr
- --with-system-boost
- --with-system-curl
-
diff --git a/app-office/openoffice/files/2.3.1/ooo-env_log.diff b/app-office/openoffice/files/2.3.1/ooo-env_log.diff
deleted file mode 100644
index 908169ab6c5a..000000000000
--- a/app-office/openoffice/files/2.3.1/ooo-env_log.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- bin/build-ooo.orig	2007-04-18 18:32:06.000000000 +0200
-+++ bin/build-ooo	2007-04-18 18:32:45.000000000 +0200
-@@ -21,9 +21,8 @@
- echo "configuring ...";
- autoconf || exit 1;
- 
--echo "Env for configure:"
--set
--echo "Env for configure ends"
-+echo "Log Env for configure to `pwd`/env.log"
-+set > env.log
- 
- eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
- 
-@@ -88,8 +88,8 @@
- # similar that gives child nmake's pain.
- unset MAKEFLAGS
- 
--echo "Env:"
--set
-+echo "Log Env to `pwd`/env.log"
-+set > env.log
- 
- # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
- # already merged?
diff --git a/app-office/openoffice/files/2.3.1/regcompapply.diff b/app-office/openoffice/files/2.3.1/regcompapply.diff
deleted file mode 100644
index e3554ea16aa8..000000000000
--- a/app-office/openoffice/files/2.3.1/regcompapply.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -1087,6 +1087,9 @@
- [ GentooOnly ]
- SectionOwner => aprosky
- 
-+#fix build on ppc
-+disable-regcomp-java.diff
-+disable-regcomp-python.diff
- # Allow build to proceed with PaX enabled
- gentoo-pax-fix.diff, aprosky
- # support server-only versions of 64bit JDKs
-
diff --git a/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix-apply.diff b/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix-apply.diff
deleted file mode 100644
index 49f69c796699..000000000000
--- a/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix-apply.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -1063,6 +1063,8 @@
- vcl_font-NO_LIST.diff
- # linux-headers-2.6.22 issue?!
- linux-headers.diff
-+# stlport build problem on ppc
-+stlport-ppc-buildfix.diff
- 
- [ DebianBaseOnly ]
- SectionOwner => rengelha
-
diff --git a/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix.diff b/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix.diff
deleted file mode 100644
index af70e4f26f13..000000000000
--- a/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- stlport/STLport-4.5.patch	2005-01-06 12:26:48.770546592 +1100
-+++ stlport/STLport-4.5.patch	2005-01-06 12:26:01.125789696 +1100
-@@ -509,6 +509,45 @@
-   
-   CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-   CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+--- misc/build/STLport-4.5/src/gcc-linux.mak.old	2005-01-06 12:22:54.127217800 +1100
-++++ misc/build/STLport-4.5/src/gcc-linux.mak	2005-01-06 12:24:28.192917640 +1100
-+@@ -46,8 +46,8 @@
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
-+ 
-+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC
-+ 
-+ include common_percent_rules.mak
-+ include common_rules.mak
-+--- misc/build/STLport-4.5/src/gcc.mak.old	2005-01-06 15:20:18.840975336 +1100
-++++ misc/build/STLport-4.5/src/gcc.mak	2005-01-06 15:21:00.373661408 +1100
-+@@ -44,8 +44,8 @@
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
-+ 
-+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
-+ 
-+ include common_percent_rules.mak
-+ include common_rules.mak
-+--- misc/build/STLport-4.5/src/gcc-3.0.mak.orig
-++++ misc/build/STLport-4.5/src/gcc-3.0.mak 
-+@@ -43,8 +43,8 @@
-+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+ 
-+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
-++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
-+ 
-+ include common_percent_rules.mak
-+ include common_rules.mak
- *** misc/STLport-4.5/stlport/config/stl_gcc.h	Tue Sep  4 19:10:16 2001
- --- misc/build/STLport-4.5/stlport/config/stl_gcc.h	Thu Jul 26 12:13:03 2007
- ***************
-
diff --git a/app-office/openoffice/openoffice-2.3.1-r1.ebuild b/app-office/openoffice/openoffice-2.3.1-r1.ebuild
deleted file mode 100644
index f62269d5306e..000000000000
--- a/app-office/openoffice/openoffice-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1-r1.ebuild,v 1.9 2008/03/24 16:05:36 suka Exp $
-
-WANT_AUTOCONF="2.5"
-WANT_AUTOMAKE="1.9"
-
-inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
-
-IUSE="binfilter cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono sound odk pam seamonkey webdav xulrunner"
-
-MY_PV="2.3.1.2"
-PATCHLEVEL="OOG680"
-SRC="OOo_${PV}_src"
-S="${WORKDIR}/ooo"
-S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
-CONFFILE="${S}/distro-configs/Gentoo.conf.in"
-DESCRIPTION="OpenOffice.org, a full office productivity suite."
-
-SRC_URI="mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
-	binfilter? ( mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2 )
-	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
-	odk? ( mirror://openoffice/stable/${PV}/${SRC}_sdk.tar.bz2
-		java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
-	http://go-oo.org/packages/SRC680/extras-2.tar.bz2
-	http://go-oo.org/packages/SRC680/biblio.tar.bz2
-	http://go-oo.org/packages/xt/xt-20051206-src-only.zip
-	http://go-oo.org/packages/SRC680/lp_solve_5.5.0.10_source.tar.gz
-	http://go-oo.org/packages/SRC680/libwps-0.1.0.tar.gz
-	http://go-oo.org/packages/SRC680/libwpg-0.1.0.tar.gz
-	http://go-oo.org/packages/SRC680/oox.2007-09-05.tar.bz2"
-
-LANGS1="af ar as_IN be_BY bg bn br bs ca cs cy da de dz el en_GB en_ZA eo es et fa fi fr ga gl gu_IN he hi_IN hr hu it ja km ko ku lt lv mk ml_IN mr_IN nb ne nl nn nr ns or_IN pa_IN pl pt pt_BR ru rw sh_YU sk sl sr_CS ss st sv sw_TZ ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN ve vi xh zh_CN zh_TW zu"
-LANGS="${LANGS1} en en_US"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-for Y in ${LANGS1} ; do
-	SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/stable/${PV}/${SRC}_l10n.tar.bz2 )"
-done
-
-HOMEPAGE="http://go-oo.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc -sparc x86"
-
-COMMON_DEPEND="!app-office/openoffice-bin
-	x11-libs/libXaw
-	x11-libs/libXinerama
-	>=dev-lang/perl-5.0
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	gnome? ( >=x11-libs/gtk+-2.10
-		>=gnome-base/gnome-vfs-2.6
-		>=gnome-base/gconf-2.0 )
-	gtk? ( >=x11-libs/gtk+-2.10 )
-	cairo? ( >=x11-libs/cairo-1.0.2
-		>=x11-libs/gtk+-2.10 )
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	gstreamer? ( >=media-libs/gstreamer-0.10
-			>=media-libs/gst-plugins-base-0.10 )
-	kde? ( =kde-base/kdelibs-3* )
-	java? ( >=dev-java/bsh-2.0_beta4
-		>=dev-java/xalan-2.7
-		>=dev-java/xerces-2.7
-		=dev-java/xml-commons-external-1.3* )
-	mono? ( >=dev-lang/mono-1.2.3.1 )
-	firefox? ( =www-client/mozilla-firefox-2*
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 )
-	!firefox? ( seamonkey? ( =www-client/seamonkey-1*
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 ) )
-	!firefox? ( !seamonkey? ( xulrunner? ( =net-libs/xulrunner-1.8*
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 ) ) )
-	sound? ( >=media-libs/portaudio-18.1-r5
-			>=media-libs/libsndfile-1.0.9 )
-	webdav? ( =net-misc/neon-0.26* )
-	>=x11-libs/startup-notification-0.5
-	>=media-libs/freetype-2.1.10-r2
-	>=media-libs/fontconfig-2.3.0
-	cups? ( net-print/cups )
-	media-libs/jpeg
-	media-libs/libpng
-	sys-devel/flex
-	sys-devel/bison
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.1.4-r1
-	>=app-admin/eselect-oodict-20060706
-	dev-libs/expat
-	>=dev-libs/icu-3.8
-	>=sys-libs/db-4.3
-	>=app-text/libwpd-0.8.8
-	>=media-libs/libsvg-0.1.4
-	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 )"
-
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXrender
-	x11-proto/printproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xineramaproto
-	>=sys-apps/findutils-4.1.20-r1
-	dev-perl/Archive-Zip
-	dev-perl/Compress-Zlib
-	>=dev-perl/Compress-Raw-Zlib-2.002
-	dev-perl/IO-Compress-Base
-	dev-util/pkgconfig
-	dev-util/intltool
-	>=dev-libs/boost-1.33.1
-	dev-libs/libxslt
-	>=dev-libs/libxml2-2.0
-	dev-util/gperf
-	>=net-misc/curl-7.9.8
-	sys-libs/zlib
-	sys-apps/coreutils
-	pam? ( sys-libs/pam )
-	!dev-util/dmake
-	>=dev-lang/python-2.3.4
-	java? ( || ( !amd64? ( =virtual/jdk-1.5* ) =virtual/jdk-1.4* )
-		dev-java/ant-core )
-	ldap? ( net-nds/openldap )"
-
-PROVIDE="virtual/ooo"
-
-if use amd64; then
-	# All available Java 1.5 JDKs are broken, in one way or another, on amd64.
-	# Thus we force the use of a Java 1.4 JDK on amd64 (and amd64 only).
-	export JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
-fi
-
-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. Also note that building OOo takes a lot of time and "
-	ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
-	ewarn " the minimum requirements. If you have less, use openoffice-bin "
-	ewarn " instead. "
-	ewarn
-
-	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="256"
-	use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="5120"
-	check_reqs
-
-	strip-linguas ${LANGS}
-
-	if [[ -z "${LINGUAS}" ]]; then
-		export LINGUAS_OOO="en-US"
-		ewarn
-		ewarn " To get a localized build, set the according LINGUAS variable(s). "
-		ewarn
-	else
-		export LINGUAS_OOO=`echo ${LINGUAS} | \
-			sed -e 's/\ben\b/en_US/g' -e 's/_/-/g'`
-	fi
-
-	if use !java; then
-		ewarn " You are building with java-support disabled, this results in some "
-		ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. "
-		ewarn " If something you need does not work for you, rebuild with "
-		ewarn " java in your USE-flags. "
-		ewarn
-	fi
-
-	if is-flagq -ffast-math ; then
-		eerror " You are using -ffast-math, which is known to cause problems. "
-		eerror " Please remove it from your CFLAGS, using this globally causes "
-		eerror " all sorts of problems. "
-		eerror " After that you will also have to - at least - rebuild python otherwise "
-		eerror " the openoffice build will break. "
-		die
-	fi
-
-	java-pkg-opt-2_pkg_setup
-
-	# sys-libs/db version used
-	local db_ver="$(db_findver '>=sys-libs/db-4.3')"
-
-}
-
-src_unpack() {
-
-	unpack ooo-build-${MY_PV}.tar.gz
-
-	# Hackish workaround for overlong path problem, see bug #130837
-	mv "${S_OLD}" "${S}" || die
-
-	#Some fixes for our patchset
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}/gentoo-${PV}-r1.diff"
-	epatch "${FILESDIR}/${PV}/ooo-env_log.diff"
-
-	if use ppc ; then
-		cp -f "${FILESDIR}/${PV}/disable-regcomp-java.diff" "${S}/patches/src680" || die
-		cp -f "${FILESDIR}/${PV}/disable-regcomp-python.diff" "${S}/patches/src680" || die
-		epatch "${FILESDIR}/${PV}/regcompapply.diff"
-		#Fix for internal STLport
-		cp -f "${FILESDIR}/${PV}/stlport-ppc-buildfix.diff" "${S}/patches/src680" || die
-		epatch "${FILESDIR}/${PV}/stlport-ppc-buildfix-apply.diff"
-	fi
-
-	#Use flag checks
-	if use java ; then
-		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
-		echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
-		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
-		echo "--with-system-beanshell" >> ${CONFFILE}
-		echo "--with-system-xalan" >> ${CONFFILE}
-		echo "--with-system-xerces" >> ${CONFFILE}
-		echo "--with-system-xml-apis" >> ${CONFFILE}
-		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
-		echo "--with-serializer-jar=$(java-pkg_getjar xalan serializer.jar)" >> ${CONFFILE}
-		echo "--with-xalan-jar=$(java-pkg_getjar xalan xalan.jar)" >> ${CONFFILE}
-		echo "--with-xerces-jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> ${CONFFILE}
-		echo "--with-xml-apis-jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" >> ${CONFFILE}
-	fi
-
-	# Upstream bitmaps are broken, so force ours for now
-	echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
-
-	echo "`use_enable binfilter`" >> ${CONFFILE}
-
-	if use firefox || use seamonkey || use xulrunner ; then
-		echo "--enable-mozilla" >> ${CONFFILE}
-		local browser
-		use xulrunner && browser="xulrunner"
-		use seamonkey && browser="seamonkey"
-		use firefox && browser="firefox"
-
-		echo "--with-system-mozilla=${browser}" >> ${CONFFILE}
-	else
-		echo "--disable-mozilla" >> ${CONFFILE}
-		echo "--without-system-mozilla" >> ${CONFFILE}
-	fi
-
-	echo "`use_enable cups`" >> ${CONFFILE}
-	echo "`use_enable ldap`" >> ${CONFFILE}
-	echo "`use_with ldap openldap`" >> ${CONFFILE}
-	echo "`use_enable eds evolution2`" >> ${CONFFILE}
-	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
-	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
-	echo "`use_enable gnome atkbridge`" >> ${CONFFILE}
-	echo "`use_enable gstreamer`" >> ${CONFFILE}
-	echo "`use_enable dbus`" >> ${CONFFILE}
-	echo "`use_enable webdav neon`" >> ${CONFFILE}
-	echo "`use_with webdav system-neon`" >> ${CONFFILE}
-
-	echo "`use_enable sound pasf`" >> ${CONFFILE}
-	echo "`use_with sound system-portaudio`" >> ${CONFFILE}
-	echo "`use_with sound system-sndfile`" >> ${CONFFILE}
-
-	echo "`use_enable debug crashdump`" >> ${CONFFILE}
-
-	eautoreconf
-
-}
-
-src_compile() {
-
-	unset LIBC
-	addpredict "/bin"
-	addpredict "/root/.gconfd"
-	addpredict "/root/.gnome"
-
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break
-	export JOBS="1"
-	if [[ "${WANT_MP}" == "true" ]]; then
-		export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
-	fi
-
-	# Compile problems with these ...
-	filter-flags "-funroll-loops"
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-fno-default-inline"
-	filter-flags "-fstack-protector"
-	filter-flags "-fstack-protector-all"
-	filter-flags "-ftracer"
-	filter-flags "-fforce-addr"
-	replace-flags "-O?" "-O2"
-
-	# Build problems with STLport and regcomp without these
-	use ppc && append-flags "-D_STLP_STRICT_ANSI -fno-schedule-insns"
-
-	# Now for our optimization flags ...
-	export ARCH_FLAGS="${CXXFLAGS}"
-	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
-	# Make sure gnome-users get gtk-support
-	export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
-
-	cd "${S}"
-	./configure "${MYCONF}" \
-		--with-distro="Gentoo" \
-		--with-arch="${ARCH}" \
-		--host="${CHOST}" \
-		--with-srcdir="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-num-cpus="${JOBS}" \
-		--without-binsuffix \
-		--with-installed-ooo-dirname="openoffice" \
-		--with-tag="OOG680_m9" \
-		"${GTKFLAG}" \
-		`use_enable mono` \
-		`use_enable kde` \
-		`use_enable cairo` \
-		`use_with cairo system-cairo` \
-		`use_enable gnome quickstart` \
-		`use_enable pam` \
-		`use_enable !debug strip` \
-		`use_enable odk` \
-		`use_with java` \
-		--disable-access \
-		--disable-post-install-scripts \
-		--enable-hunspell \
-		--enable-openxml \
-		--with-system-hunspell \
-		--with-system-libwpd \
-		--with-system-libsvg \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		|| die "Configuration failed!"
-
-	einfo "Building OpenOffice.org..."
-	use kde && set-kdedir 3
-	make || die "Build failed"
-
-}
-
-src_install() {
-
-	export PYTHONPATH=""
-
-	einfo "Preparing Installation"
-	make DESTDIR="${D}" install || die "Installation failed!"
-
-	# Fix the permissions for security reasons
-	chown -R root:0 "${D}"
-
-	# record java libraries
-	use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/program/classes/*.jar
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	eselect oodict update --libdir $(get_libdir)
-
-	[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
-
-	# Add available & useful jars to openoffice classpath
-	use java && /usr/$(get_libdir)/openoffice/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
-
-	elog " To start OpenOffice.org, run:"
-	elog
-	elog " $ ooffice"
-	elog
-	elog " Also, for individual components, you can use any of:"
-	elog
-	elog " oobase, oocalc, oodraw, oofromtemplate, ooimpress, oomath,"
-	elog " ooweb or oowriter"
-	elog
-	elog " Spell checking is now provided through our own myspell-ebuilds, "
-	elog " if you want to use it, please install the correct myspell package "
-	elog " according to your language needs. "
-
-}
diff --git a/app-office/openoffice/openoffice-2.4.0.ebuild b/app-office/openoffice/openoffice-2.4.0.ebuild
index 34d2a1cdbb8e..83efe8b32df8 100644
--- a/app-office/openoffice/openoffice-2.4.0.ebuild
+++ b/app-office/openoffice/openoffice-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.16 2008/04/28 16:10:25 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.17 2008/05/09 14:01:04 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -9,7 +9,7 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono odk opengl pam seamonkey webdav xulrunner"
 
-MY_PV="2.4.0.8"
+MY_PV="2.4.0.10"
 PATCHLEVEL="OOH680"
 SRC="OOo_${PV}_src"
 MST="OOH680_m12"