Bump to OpenOffice.org 3.2.0, remove templates integration for now,

breaks the build for me
Package-Manager: portage-2.2_rc63/cvs/Linux i686

4 files changed, 439 insertions, 2 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 4011e43320a5..2ca94cde1dcb 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.506 2010/02/10 21:10:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.507 2010/02/20 17:46:28 suka Exp $
+
+*openoffice-3.2.0 (20 Feb 2010)
+
+  20 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-3.2.0.ebuild, +files/gentoo-3.2.0.diff:
+  Bump to OpenOffice.org 3.2.0, remove templates integration for now, breaks
+  the build for me
 
   10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   openoffice-3.1.1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index c2bde071b440..2963485bb035 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,9 +2,16 @@ AUX Gentoo_ODK_install.patch 868 RMD160 62a69900ce2e0250b35277d36b84a2bd8913c88d
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX gentoo-3.1.1.diff 2229 RMD160 543824148af41cfcdeaf1198591679b6c366c61e SHA1 65602b7388e8754d6c33ea641d7622f5ede80e1b SHA256 93b4f41a59a3b79880db4c5aa6eb937c9a34f4a0de94ef28f1ea24534ca2ad4b
+AUX gentoo-3.2.0.diff 532 RMD160 07e5f2cc34b79b15753b9c4caaa9299cf7aeef3a SHA1 7290aa06bc150f7fe02239ccad6d368dceb7bc85 SHA256 2c666917f3846bd1402f3ee6e114cf61979cea06f846ad0ad8714999e1a127d0
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX nocairofonts.diff 437 RMD160 56d7929870c122b228a1e673f4743cf91958753b SHA1 6a7e0a92155ad33e255d17961a2121857bf8a1fe SHA256 8afc0dee4778a46198ae95699243749cc62ee943229e42f0b827b55aa52c89a9
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
+DIST OOo_3.2.0_src_binfilter.tar.bz2 6485071 RMD160 1a92582f7e9dc4c3dd57be6db0519f5d53e0b9ad SHA1 ef1041645ae444395f004eef4dbe31c472501476 SHA256 2acbd583f8b090e0fbdb5ea01d5362ad467b713299d29344fc7c80e5ff5083ca
+DIST OOo_3.2.0_src_core.tar.bz2 214923121 RMD160 2535240f28aa99777ca3768c366d5a465e044f72 SHA1 0246b77b0cb8445eb0c3ee9fb43f6e00ca54a61b SHA256 b44ab94c75b89c9354531ddba9c211374567535e147308a934e8c35d7b26814a
+DIST OOo_3.2.0_src_extensions.tar.bz2 13921000 RMD160 a274fabcc76bcc39640fe0c47a4ab008baffbcfd SHA1 860262cc0f3c6bf0e49d34ad495b956512265ad3 SHA256 6862b728fb1b5946399ddc1c7a3735a9ab84b696309a3af6c28cba7b885f5dd0
+DIST OOo_3.2.0_src_l10n.tar.bz2 104383205 RMD160 4821366494c0f12133451d94212a15504b95e281 SHA1 7fefe877a551b4910ad40f7c828024d64ad92abd SHA256 492d6909a3cff5de47b13d109479f6adb78532ba67725d0ee29f456c725ae4ea
+DIST OOo_3.2.0_src_system.tar.bz2 59670795 RMD160 02281b8890c724b7f2ad3115578d876cd48dab0a SHA1 ea0cdaa50ac620219671deb30070d3c52d0e509c SHA256 97796333eb2f17e8199026d4ab4334d59bbbffc8d2f9d9100a0c27e823e1305a
+DIST OOo_3.2.0_src_testautomation.tar.bz2 49095034 RMD160 f8dd241fdfa788b367aaee9212a21d5085287b52 SHA1 2ceb738b76f70feb4b4459308180dd65fcedf7e5 SHA256 2acfd1e2c1f81096489dc453d8be99ab0df51130ddf29c14450aebb78a57a9a5
 DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
 DIST Sun_ODF_Template_Pack_en-US.oxt 4997184 RMD160 f7040f83aeb60355d80c42434e60d236a8875753 SHA1 58c98de9c629aae878a58c2775b8546aa78fb04c SHA256 ba443e3dc988d64e239865a0a7e11b62125212a1049b7a5d866955b235d7f195
 DIST Sun_ODF_Template_Pack_es.oxt 4972619 RMD160 3b8bf592b34256969421472b6ca492479d10d145 SHA1 2b33b91d536c39dba2ec5504f68d72c001712782 SHA256 0a00c795f4af10919d981e7409895198c9f09d2ab05f9e578a1e8428071f5bc3
@@ -17,6 +24,7 @@ DIST libwpg-0.1.3.tar.gz 410799 RMD160 6e9e0545215af2ee05780887ad57ca1ae7ef78f5
 DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 SHA1 3da402f74a6296425e88d0ab1cf197a5927288d6 SHA256 e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
 DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
 DIST ooo-build-3.1.1.5.tar.gz 14060582 RMD160 86c7753e30e3deb35395b5657f2c9b68f0cf038a SHA1 b5000935e9910aee8dd2101d82bad86381ce6b2d SHA256 b2ee3b651b56cc4cb47e0077835e5680a2eb557785ede10a645055ba5e171ade
+DIST ooo-build-3.2.0.5.tar.gz 12984221 RMD160 4f4e878484c4faa8d5db3a01cd30888769ff3627 SHA1 0b81bef6248454f35579640fc2a02be657b12fe1 SHA256 1d183d380efeb6991d3c3cd7fa439d3eca2a7822ed2163c359f106e3b58df0ad
 DIST ooo310-m19-artwork.tar.bz2 9813919 RMD160 08f5228c9e85f7a287ccca70e25ecc66a4bbd053 SHA1 14ff8ae12d43c7f1c725c3c913fda848ecf54b0f SHA256 9e741c889c1bc80aea8d15ea5e1087d4750f874a8690e1926d6b88c24a133ff8
 DIST ooo310-m19-base.tar.bz2 3336925 RMD160 ea26c3664d1c52f0030e8fa5a1f0962b147f726b SHA1 18f33c1976d0e427cb4ac98041d82e0a8cd948c8 SHA256 9f6ff29dd9be1d7618bb8dc558ec4a4001b6e7bd8db8c70270ea756a36e1bc4a
 DIST ooo310-m19-bootstrap.tar.bz2 7270281 RMD160 456198813294cb74fccc80461f4e65d5c1f39638 SHA1 cbf62263d6b094cb348f16bb3e345425beee05f7 SHA256 3cc9653477d9a491dd2412e5a8cae848700a0a5b8a23d0c7a9e7b076751de287
@@ -40,5 +48,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD openoffice-3.1.1.ebuild 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c
-MISC ChangeLog 104695 RMD160 1371e05eb9060716b911f0d69db415a8a8a1e4a8 SHA1 419cdbed7c42ee6af4fe2bd07ccc20eea20580d7 SHA256 8569eb83db64fb71a0ac64b7b9cc9b5bd76f0b096d3fe39539feadeec6ce6160
+EBUILD openoffice-3.2.0.ebuild 12711 RMD160 2ad0ae224970c64f9dd63aea7b8b572754e9e1f6 SHA1 d66d5d391a4c3ef604f4c893c89dcbb708b3e2f5 SHA256 35fa406671c774916137ed8b3660ae3933c3977e69e027f919895e07f9016aae
+MISC ChangeLog 104927 RMD160 72b112f9fd1e0635e5ac03c76f8dc85d52c20f00 SHA1 1bc964f5f7e379ac9ca187ec07220cf04ae802b0 SHA256 f513de0118f24b4d592912d9e308335130a8c19d5bddecfcada1fefab562b37d
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/gentoo-3.2.0.diff b/app-office/openoffice/files/gentoo-3.2.0.diff
new file mode 100644
index 000000000000..6abd7731d06b
--- /dev/null
+++ b/app-office/openoffice/files/gentoo-3.2.0.diff
@@ -0,0 +1,18 @@
+--- patches/dev300/apply 
++++ patches/dev300/apply
+@@ -1596,7 +1596,7 @@
+ SectionOwner => aprosky
+ 
+ # Allow build to proceed with PaX enabled
+-gentoo-pax-fix.diff, aprosky
++#gentoo-pax-fix.diff, aprosky
+ # support server-only versions of 64bit JDKs
+ 64bit-jdk-server-paths.diff, i#65974, hmth
+ # use IBM j9vm over IBM classic JVM
+@@ -3550,4 +3550,4 @@
+ [ BuildBits ]
+ # Allow oowintool to detect java sdk 1.6.x
+ oowintool-java6.diff, fridrich
+-connectivity-build-fix-mac.diff, thorsten
++#connectivity-build-fix-mac.diff, thorsten
+
diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
new file mode 100644
index 000000000000..fa9e602896d8
--- /dev/null
+++ b/app-office/openoffice/openoffice-3.2.0.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.1 2010/02/20 17:46:28 suka Exp $
+
+WANT_AUTOMAKE="1.9"
+EAPI="2"
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="false"
+
+inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base mono multilib toolchain-funcs
+
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam"
+
+MY_PV=3.2.0.5
+PATCHLEVEL=OOO320
+SRC=OOo_${PV}_src
+MST=OOO320_m12
+DEVPATH=http://download.services.openoffice.org/files/stable/${PV}/${SRC}
+S=${WORKDIR}/ooo
+S_OLD=${WORKDIR}/ooo-build-${MY_PV}
+CONFFILE=${S}/distro-configs/Gentoo.conf.in
+BASIS=basis3.2
+DESCRIPTION="OpenOffice.org, a full office productivity suite."
+
+SRC_URI="${DEVPATH}_core.tar.bz2
+	${DEVPATH}_extensions.tar.bz2
+	${DEVPATH}_l10n.tar.bz2
+	${DEVPATH}_system.tar.bz2
+	${DEVPATH}_testautomation.tar.bz2
+	binfilter? ( ${DEVPATH}_binfilter.tar.bz2 )
+	http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
+	odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
+	http://download.go-oo.org/SRC680/extras-3.tar.bz2
+	http://download.go-oo.org/SRC680/biblio.tar.bz2
+	http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz
+	http://download.go-oo.org/DEV300/scsolver.2008-10-30.tar.bz2
+	http://download.go-oo.org/DEV300/ooo_oxygen_images-2009-06-17.tar.gz
+	http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz"
+
+LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi_IN hr hu id it ja ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN nb ne nl nn nr ns oc or_IN pa_IN pl pt pt_BR ru rw sa_IN sat sd sh sk sl sr ss st sv sw_TZ ta ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN uz ve vi xh zh_CN zh_TW zu"
+LANGS="${LANGS1} en en_US"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+# intersection of available linguas and app-dicts/myspell-* dictionaries
+SPELL_DIRS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk nb nl nn pl pt ru sk sl sv tn zu"
+SPELL_DIRS_DEPEND=""
+for X in ${SPELL_DIRS} ; do
+	SPELL_DIRS_DEPEND="${SPELL_DIRS_DEPEND} linguas_${X}? ( app-dicts/myspell-${X} )"
+done
+
+HOMEPAGE="http://go-oo.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~sparc"
+
+COMMON_DEPEND="!app-office/openoffice-bin
+	x11-libs/libXaw
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	>=dev-lang/perl-5.0
+	>=dev-libs/glib-2.18
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	gnome? ( >=x11-libs/gtk+-2.10
+		>=gnome-base/gconf-2.0
+		>=gnome-base/gnome-vfs-2.6
+		>=x11-libs/cairo-1.0.2 )
+	gtk? ( >=x11-libs/gtk+-2.10
+		>=x11-libs/cairo-1.0.2 )
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	gstreamer? ( >=media-libs/gstreamer-0.10
+			>=media-libs/gst-plugins-base-0.10 )
+	java? ( >=dev-java/bsh-2.0_beta4
+		>=dev-db/hsqldb-1.8.0.9
+		dev-java/lucene:2.3
+		dev-java/lucene-analyzers:2.3
+		dev-java/rhino:1.5 )
+	mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
+	nsplugin? ( || ( net-libs/xulrunner:1.9 net-libs/xulrunner:1.8 )
+		>=dev-libs/nspr-4.6.6
+		>=dev-libs/nss-3.11-r1 )
+	opengl? ( virtual/opengl
+		virtual/glu )
+	>=net-misc/neon-0.24.7
+	>=dev-libs/openssl-0.9.8g
+	>=media-libs/freetype-2.1.10-r2
+	>=media-libs/fontconfig-2.3.0
+	cups? ( net-print/cups )
+	media-libs/jpeg
+	media-libs/libpng
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.1.4-r1
+	dev-libs/expat
+	>=dev-libs/icu-4.0
+	>=sys-libs/db-4.3
+	>=app-text/libwpd-0.8.8
+	>=dev-libs/redland-1.0.8
+	>=media-libs/vigra-1.4
+	>=app-text/poppler-0.12.3-r3
+	>=media-libs/libwpg-0.1.3"
+
+RDEPEND="java? ( >=virtual/jre-1.5 )
+	${SPELL_DIRS_DEPEND}
+	${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-proto/printproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xineramaproto
+	>=sys-apps/findutils-4.1.20-r1
+	dev-perl/Archive-Zip
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=dev-libs/boost-1.33.1
+	sys-devel/flex
+	sys-devel/bison
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.0
+	>=dev-util/gperf-3
+	>=net-misc/curl-7.12
+	sys-libs/zlib
+	sys-apps/coreutils
+	pam? ( sys-libs/pam
+		sys-apps/shadow[pam] )
+	>=dev-lang/python-2.3.4[threads]
+	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
+		>=dev-java/ant-core-1.7 )
+	ldap? ( net-nds/openldap )"
+
+PROVIDE="virtual/ooo"
+
+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
+	ewarn " Also if you experience a build break, please make sure to retry "
+	ewarn " with MAKEOPTS="-j1" before filing a bug. "
+	ewarn
+
+	# Check if we have enough RAM and free diskspace to build this beast
+	CHECKREQS_MEMORY="512"
+	use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="6144"
+	check_reqs
+
+	strip-linguas ${LANGS}
+
+	if [ -z "${LINGUAS}" ] || [[ "${LINGUAS}" == en ]]; then
+		export LINGUAS_OOO=""
+	elif [[ ${LINGUAS} =~ en([^_]|$) ]]; then
+		export LINGUAS_OOO="$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')"
+	# case: en-US lingua not set, add
+	else
+		export LINGUAS_OOO="en-US ${LINGUAS//_/-}"
+	fi
+
+	if use !java; then
+		ewarn " You are building with java-support disabled, this results in some "
+		ewarn " of the OpenOffice.org functionality being disabled. "
+		ewarn " If something you need does not work for you, rebuild with "
+		ewarn " java in your USE-flags. "
+		ewarn
+	fi
+
+	if use !gtk && use !gnome; then
+		ewarn " If you want the OpenOffice.org systray quickstarter to work "
+		ewarn " activate either the 'gtk' or 'gnome' 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
+
+	if use nsplugin; then
+		if pkg-config --exists libxul; then
+			BRWS="libxul"
+		elif pkg-config --exists xulrunner-xpcom; then
+			BRWS="xulrunner"
+		else
+			die "USE flag [nsplugin] set but no installed xulrunner found!"
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+
+	# sys-libs/db version used
+	local db_ver=$(db_findver '>=sys-libs/db-4.3')
+
+	kde4-base_pkg_setup
+
+}
+
+src_unpack() {
+
+	unpack ooo-build-${MY_PV}.tar.gz
+
+}
+
+src_prepare() {
+
+	# Hackish workaround for overlong path problem, see bug #130837
+	mv "${S_OLD}" "${S}" || die
+
+	#Some fixes for our patchset
+	cd "${S}"
+	epatch "${FILESDIR}/gentoo-${PV}.diff"
+	epatch "${FILESDIR}/gentoo-pythonpath.diff"
+	epatch "${FILESDIR}/ooo-env_log.diff"
+	cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die
+
+	#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-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
+		echo "--with-system-beanshell" >> ${CONFFILE}
+		echo "--with-system-hsqldb" >> ${CONFFILE}
+		echo "--with-system-lucene" >> ${CONFFILE}
+		echo "--with-system-rhino" >> ${CONFFILE}
+		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
+		echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
+		echo "--with-lucene-core-jar=$(java-pkg_getjar lucene-2.3 lucene-core.jar)" >> ${CONFFILE}
+		echo "--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)" >> ${CONFFILE}
+		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
+	fi
+
+	if use nsplugin ; then
+		echo "--enable-mozilla" >> ${CONFFILE}
+		echo "--with-system-mozilla=${BRWS}" >> ${CONFFILE}
+	else
+		echo "--disable-mozilla" >> ${CONFFILE}
+		echo "--without-system-mozilla" >> ${CONFFILE}
+	fi
+
+	echo $(use_enable binfilter) >> ${CONFFILE}
+	echo $(use_enable cups) >> ${CONFFILE}
+	echo $(use_enable dbus) >> ${CONFFILE}
+	echo $(use_enable eds evolution2) >> ${CONFFILE}
+	echo $(use_enable gnome gconf) >> ${CONFFILE}
+	echo $(use_enable gnome gnome-vfs) >> ${CONFFILE}
+	#gio support still gives crashes, see i#108993
+	echo "--disable-gio" >> ${CONFFILE}
+	echo $(use_enable gnome lockdown) >> ${CONFFILE}
+	echo $(use_enable gstreamer) >> ${CONFFILE}
+	echo $(use_enable gtk systray) >> ${CONFFILE}
+	echo $(use_enable ldap) >> ${CONFFILE}
+	echo $(use_enable opengl) >> ${CONFFILE}
+	echo $(use_with ldap openldap) >> ${CONFFILE}
+	echo $(use_enable debug crashdump) >> ${CONFFILE}
+	echo $(use_enable debug strip-solver) >> ${CONFFILE}
+
+	# Extension stuff
+	echo "--with-extension-integration" >> ${CONFFILE}
+	echo "--enable-minimizer" >> ${CONFFILE}
+	echo "--enable-pdfimport" >> ${CONFFILE}
+	echo "--enable-presenter-console" >> ${CONFFILE}
+
+	echo "--without-writer2latex" >> ${CONFFILE}
+
+	# Use splash screen without Sun logo
+	echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE}
+
+	# Upstream this
+	echo "--with-system-redland" >> ${CONFFILE}
+
+}
+
+src_configure() {
+
+	use kde && export KDE4DIR="${KDEDIR}"
+
+	# Use multiprocessing by default now, it gets tested by upstream
+	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
+
+	# Compile problems with these ...
+	filter-flags "-funroll-loops"
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-fno-default-inline"
+	filter-flags "-ftracer"
+	filter-flags "-fforce-addr"
+
+	filter-flags "-O[s2-9]"
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags "-fstack-protector"
+		filter-flags "-fstack-protector-all"
+		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
+	fi
+
+	# Build with NVidia cards breaks otherwise
+	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
+
+	# Now for our optimization flags ...
+	export ARCH_FLAGS="${CXXFLAGS}"
+	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+	# Make sure gnome-users get gtk-support
+	local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
+	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
+
+	cd "${S}"
+	./configure --with-distro="Gentoo" \
+		--with-arch="${ARCH}" \
+		--with-srcdir="${DISTDIR}" \
+		--with-lang="${LINGUAS_OOO}" \
+		--with-num-cpus="${JOBS}" \
+		--without-binsuffix \
+		--with-installed-ooo-dirname="openoffice" \
+		--with-tag="${MST}" \
+		--with-drink="True Blood" \
+		--without-git \
+		--without-split \
+		${GTKFLAG} \
+		$(use_enable mono) \
+		--disable-kde \
+		$(use_enable kde kde4) \
+		$(use_enable !debug strip) \
+		$(use_enable odk) \
+		$(use_enable pam) \
+		$(use_with java) \
+		--disable-sun-templates \
+		--disable-access \
+		--disable-post-install-scripts \
+		--enable-extensions \
+		--with-system-libwpd \
+		--with-system-libwpg \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		|| die "Configuration failed!"
+
+}
+
+src_compile() {
+
+	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 -RP root:0 "${D}"
+
+	# record java libraries
+	if use java; then
+			java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar
+			java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
+	fi
+
+	# Upstream places the bash-completion module in /etc. Gentoo places them in
+	# /usr/share/bash-completion. bug 226061
+	dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice
+	rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
+
+}
+
+pkg_postinst() {
+
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	BASH_COMPLETION_NAME=ooffice && bash-completion_pkg_postinst
+
+	( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/openoffice/program/soffice.bin
+
+	# Add available & useful jars to openoffice classpath
+	use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
+
+	elog " Some aditional functionality can be installed via Extension Manager: "
+	elog " *) PDF Import "
+	elog " *) Presentation Console "
+	elog " *) Presentation Minimizer "
+	elog
+	elog " Please use the packages provided in "
+	elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
+	elog " instead of those from the SUN extension site. "
+	elog
+
+	kde4-base_pkg_postinst
+
+}