Revision bump for bug #208001, uses external icu again

Package-Manager: portage-2.1.4.1

4 files changed, 413 insertions, 2 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 25b5e3f1d4ac..66b92461182f 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.363 2008/01/19 03:16:46 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.364 2008/02/02 18:28:41 suka Exp $
+
+*openoffice-2.3.1-r1 (02 Feb 2008)
+
+  02 Feb 2008; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.3.1/gentoo-2.3.1-r1.diff, +openoffice-2.3.1-r1.ebuild:
+  Revision bump for bug #208001, uses external icu again.
 
   19 Jan 2008; Mark Loeser <halcy0n@gentoo.org> openoffice-2.3.1.ebuild:
   package.use.mask mono on ppc instead of disabling it in the ebuild (bug
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index a7dc21bfd880..8bb44efb9a2a 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,6 +1,7 @@
 AUX 2.3.1/config_office-fix-system-icu-check.diff 740 RMD160 96fb3ddce67ff9a377cc57d29307eb69d396da18 SHA1 c2ef5dd0d90e2e78e07ee2b0b68d9fe792258836 SHA256 f2b3020bc3e2032ea3ffb9b96fe70c21e305c4db58ab85944b0b32e0a8f83df7
 AUX 2.3.1/disable-regcomp-java.diff 965 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e SHA1 d5768499c6bf9290dd0dab867918596369dbbfab SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19
 AUX 2.3.1/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 SHA1 700513af0ae8eb2a1dcd4b62f06bbf3bc034b339 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1
+AUX 2.3.1/gentoo-2.3.1-r1.diff 381 RMD160 9c6f5727f4ffa1185d110cb25ccda5b171602b01 SHA1 92a48078b6db1a68e8a07cf677b3cd53e1f2ef19 SHA256 6c32bcc344c0405bded86368ab99066ac48fe063e180fe1bef3ce14aa6cf0019
 AUX 2.3.1/gentoo-2.3.1.diff 539 RMD160 136075423096a14625cc45a06982de6fed49f8ce SHA1 6ecde5c785b09917732fd9736e5d7d9d64980502 SHA256 ef77fdaf236c968e7715daf9c63f4e0464bd13207ee61ad07b103efc3c721163
 AUX 2.3.1/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX 2.3.1/regcompapply.diff 312 RMD160 6f92774febf7a78091f2eddf2f589d271f155864 SHA1 a9328d636b94416d9a7ffdd6aa8a94d1cca77aeb SHA256 e6245f28282c5a43bca1c127f2622cf4ea5726bc5761c3d3a7be3dd0bf6068a8
@@ -19,6 +20,7 @@ DIST ooo-build-2.3.1.2.tar.gz 8919121 RMD160 bbf48c05b9bfbd4633bc798b2e92c45c464
 DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 SHA1 88336ac37450db579246212026c5b2c7745bd47a SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
+EBUILD openoffice-2.3.1-r1.ebuild 12385 RMD160 278205b7ad4acb546c4384698e9eb88e1c3de534 SHA1 f40467fcbc6b0670a01874a1e2f0fe0937d52f33 SHA256 d46cf189af19c8be65e2a4a5cbc90c058bca130c81c58a306ef6afb22cd6b3fe
 EBUILD openoffice-2.3.1.ebuild 12325 RMD160 280affb4f271cb4fc46292247e082cdc79532459 SHA1 4e1375dee062b78fd537559cf8d1cacc7a32df2e SHA256 e0aa4c67c47950da2c56595e4919934d400d52ccf7925cae2670348f26aa4a38
-MISC ChangeLog 76416 RMD160 1d431cfe6e98def756954e9e6797ec8f38526e5e SHA1 663e4e9d3b00b9a179a99173b69608a49227e397 SHA256 edd1a6da53d7fdf641aa4b467b8ee27a6028fb2c09fd6c9c8a3d3232e1f19fc0
+MISC ChangeLog 76627 RMD160 4bbe76b1c188866d1bf8ca41592cb6800e09300c SHA1 b0c12ad334050d56b5bd57b9be8fd4978dc4cb4e SHA256 22cb13bac042d38d4728d19861ebb5787be3950d976b938b6abd660b09a93266
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
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
new file mode 100644
index 000000000000..d7143c73274c
--- /dev/null
+++ b/app-office/openoffice/files/2.3.1/gentoo-2.3.1-r1.diff
@@ -0,0 +1,20 @@
+--- 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/openoffice-2.3.1-r1.ebuild b/app-office/openoffice/openoffice-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..9a6a75fbfae2
--- /dev/null
+++ b/app-office/openoffice/openoffice-2.3.1-r1.ebuild
@@ -0,0 +1,383 @@
+# 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.1 2008/02/02 18:28:41 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.2 )
+	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-1.5-r9
+		>=dev-libs/nspr-4.6.6
+		>=dev-libs/nss-3.11-r1 )
+	!firefox? ( seamonkey? ( www-client/seamonkey
+		>=dev-libs/nspr-4.6.6
+		>=dev-libs/nss-3.11-r1 ) )
+	!firefox? ( !seamonkey? ( xulrunner? ( net-libs/xulrunner
+		>=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.24.7 )
+	>=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.6
+	>=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. "
+
+}