First release candidate for openoffice 3.2.1, masked for now

Package-Manager: portage-2.2_rc67/cvs/Linux i686

5 files changed, 477 insertions, 8 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 09c6a319ef74..0bd05df9b1d2 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.532 2010/05/15 07:13:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.533 2010/05/24 14:23:11 suka Exp $
+
+*openoffice-3.2.1_rc1 (24 May 2010)
+
+  24 May 2010; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-3.2.1_rc1.ebuild, +files/gentoo-3.2.1_rc1.diff:
+  First release candidate for openoffice 3.2.1, masked for now
 
   15 May 2010; Andreas Proschofsky <suka@gentoo.org>
   +files/gcc45-buildfix.diff, openoffice-3.2.0.ebuild,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 719ed17862e6..9ad13a4294b0 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,6 +1,7 @@
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX gcc45-buildfix.diff 840 RMD160 fcb6c08ee67b61f60641d641daa329d5fd17772b SHA1 6344952a2d0d9690d4f864b3273713f95068eabd SHA256 2d5b95e94f9b9e95c97876db669aabe523d01194c9f7ce2f0a3ccb9bde9221bc
 AUX gentoo-3.2.0.diff 1972 RMD160 7c17515819d13c84c73b6361bc2c5fa3bcf26d17 SHA1 8d5df16b03e066e67a536e361b3670bca9651666 SHA256 f622b98d8988e904e6d168cbdc05ec44ae6388178f555d5943959f59282129f1
+AUX gentoo-3.2.1_rc1.diff 1533 RMD160 80501d8346d05e2cf4446ec96ebebf949ef50c23 SHA1 416f3102d956dafeb054b119bf7936f696719a79 SHA256 029ac1bae522c62b134b3ad73fe4d54deeb959725f427d9c25615d3bac475194
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX neon-remove-SSPI-support.diff 1091 RMD160 5dee3324b22b9c8d9f14b0e7998695a212c046a8 SHA1 e8541e791a03836d986d8e0db0d488570bb6ab36 SHA256 90d88d2fb96a0e82afe6b55e77c478ee9b1925e14dfbc998c2af0ef05edfd508
 AUX npwrap-fix-nogtk.diff 382 RMD160 557fe38a19d9a0e4505af34bed4033884f1075ab SHA1 209f73c706adabb1e2b2b3e4bc706f9afbbee172 SHA256 ad64cea66e4e4d9b351a44b3ed2774484baaaebe5e37ebea3121f4a0981d231f
@@ -12,6 +13,12 @@ DIST OOo_3.2.0_src_extensions.tar.bz2 13921000 RMD160 a274fabcc76bcc39640fe0c47a
 DIST OOo_3.2.0_src_l10n-fixed.tar.bz2 104366307 RMD160 f82cf11833e0cb77038921d127db6da8a14cc0cf SHA1 1cf8bb2c5a37e3d5aab6bf59bd018a0209b33e35 SHA256 3e633557845657dabab634e347827f56668c4c1d01ef3f925084ac30b43d01da
 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 OOo_3.2.1rc1_20100506_src_binfilter.tar.bz2 6454808 RMD160 d8e69d108983174f2de97892d6b4ed9a8d7315ac SHA1 ee6257270c39f459a5ff6130b4d857b59a1a1e6a SHA256 a5673675f07f0ea7ea6e21855fe2909c22dd391c3868643fb87825da236c0b1b
+DIST OOo_3.2.1rc1_20100506_src_core.tar.bz2 214628215 RMD160 3bfd8f3942bcab49f69989ef5c345f11dbd9c7bc SHA1 31c8685f389ccfc387f6489dd534ad2fa0f435bd SHA256 4d1bdcdff89bde406cd392bd32f2148a48c577874aca4828f8df008e5ee44da7
+DIST OOo_3.2.1rc1_20100506_src_extensions.tar.bz2 13978789 RMD160 e8291a4fadda38b7157dd29d437c3e1fa1b77193 SHA1 9ee8e39226bc2f1c017a17357674f4a2ec623aad SHA256 bfe5c1b341a446a3e5dce7eb970b9f693213965c545c5dfac94a3b916b324367
+DIST OOo_3.2.1rc1_20100506_src_l10n.tar.bz2 106142968 RMD160 0a34f446f87478224b22c4815ecb416e00cba410 SHA1 c66c3f31ab6243316df1107c474f1b4b2829704a SHA256 96e66552ac3a64fd6950e3ff3b68b8e7872be75f43bbc53b43c981d473f1ab5d
+DIST OOo_3.2.1rc1_20100506_src_system.tar.bz2 60992865 RMD160 9e9537c6376033877ad9ba9f9e8f2415fe9dd208 SHA1 d8d4095c358c4dee0aa7470132dfd86e12d589a4 SHA256 1d6d9830c3a7d2b32630967a14eaa08a681556c7c7a95c6c539abae1eb78e8cf
+DIST OOo_3.2.1rc1_20100506_src_testautomation.tar.bz2 48988905 RMD160 6bd44fd3b6693a993a8378f96314152a010fe059 SHA1 29c0c17389e6cd4dcfaa5311ba4d7cabb4ddf912 SHA256 ffbd8d9db97fec635f5d302ce39fb3f0c615632d21a2e1a40a6dc65a09205995
 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
@@ -22,10 +29,13 @@ DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a
 DIST extras-3.tar.bz2 130640 RMD160 c6b6efb20cbec79b48bd21046f93959367fe1bd4 SHA1 fb7d85a9827cd1280766db2641fb1896bd5d1c7b SHA256 6cf85181c21dadda4fa4d8fbc227012d63a2558642195a46b0ae2ab144facce8
 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 mdds_0.3.0.tar.bz2 43041 RMD160 76d894e8f083d03ef1795e9c4c764c4b20c90a3a SHA1 3a1d839b9a36287074c3724fa16ac1e04d343fbe SHA256 4d28548468bb63edf630ebfc8c14f80531f12265f8fa5694c01b401594d01dff
 DIST ooo-build-3.2.0.10.tar.gz 13064810 RMD160 da7a0d18dee79db651fa144e9775511af1f0efdb SHA1 b6ebdf18e9022e62c5a6a457405d694ff218dde2 SHA256 41f42155d2d453576821ae6d24b125e6dce0bf9d95ea2f4267c6ae785305d63c
+DIST ooo-build-3.2.1.1.tar.gz 14448636 RMD160 09e675981735e6f436d8517162e54706cbad76d1 SHA1 49ebd1fd22187e0090698f606068447f160b8bc5 SHA256 82719e1126460a189db42685eccb8204891df34456b02e95375016b068d8093f
 DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a
 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.2.0.ebuild 13472 RMD160 59dc5ae8a392d25f1876939a49faa8650efaddb9 SHA1 fb882cb7177e9b918ca32f2f13c99d179e981f5f SHA256 e40e8b790446a6bd604198202f92ecaeb4d86660b1acbeb6fb9a84d438d4c131
-MISC ChangeLog 109070 RMD160 d4c23d9de53845f7c01b8933f729c61196a531da SHA1 91f5d967e2d29359d537e11f414929ed04ad6edd SHA256 c0b950b94bd816cc09b68ba5e519fc9b43cc9c89d7b9651ec9f60f8f77f26264
+EBUILD openoffice-3.2.1_rc1.ebuild 13232 RMD160 d5330eb179c66719a5c83f2e307fc9cc155a4f2d SHA1 5208e19af1675607fb362d2a5c9ee12ebe135400 SHA256 d5498f204c5868cf74edd5031cafff4931c645fd2bade27f14770e33a20a09a6
+MISC ChangeLog 109286 RMD160 0a22f3bcf7642f2036a745563a8ea5b7b144fb88 SHA1 51dc59021853ce9ece510fabcf8f339972b504f6 SHA256 f9c4e18a694ce5d38b31306bd1b2fad77cab8aaef10e3ac6de8b31a5d532a5e2
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/gentoo-3.2.1_rc1.diff b/app-office/openoffice/files/gentoo-3.2.1_rc1.diff
new file mode 100644
index 000000000000..0bdfde41f361
--- /dev/null
+++ b/app-office/openoffice/files/gentoo-3.2.1_rc1.diff
@@ -0,0 +1,54 @@
+--- patches/dev300/apply 
++++ patches/dev300/apply
+@@ -1687,14 +1687,10 @@
+ [ GentooOnly ]
+ SectionOwner => aprosky
+ 
+-# Allow build to proceed with PaX enabled
+-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
+ ibm-j9vm.diff, hmth
+-# system db check
+-system-db-check.diff, i#65979, hmth
+ # User ~/.ooo3 as user dir
+ scp2-user-config-ooo3.diff, pmladek
+ # default inc/lib
+--- configure.in 
++++ configure.in 
+@@ -1326,12 +1326,18 @@
+ 	done
+     fi
+     SUNTEMPLATES_LANG=
+-    # check whether the langs are requested at all
+-    for lang in $wanted_sun_templates ; do
+-	if test -n "`echo $with_lang | grep "$lang"`" ; then
+-		SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+-	fi
+-    done
++
++    # --with-lang="" now used for en-US
++    if test "z$with_lang" = "z" ; then
++        SUNTEMPLATES_LANG="en-US"
++    else
++        # check whether the langs are requested at all
++        for lang in $wanted_sun_templates ; do
++	    if test -n "`echo $with_lang | grep "$lang"`" ; then
++		  SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
++	    fi
++        done
++    fi
+     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
+ fi
+ AC_SUBST(SUNTEMPLATES_LANG)
+@@ -1584,7 +1584,7 @@
+ elif test "$with_tag" = "OOO320_m8" ; then
+    UPSTREAM_VERSION=3.2.0
+ elif test "$with_tag" = "OOO320_m17" ; then
+-   UPSTREAM_VERSION=3.2.1
++   UPSTREAM_VERSION=3.2.1rc1_20100506
+ fi
+ if test -n "$UPSTREAM_VERSION"; then
+    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
+
diff --git a/app-office/openoffice/openoffice-3.2.1_rc1.ebuild b/app-office/openoffice/openoffice-3.2.1_rc1.ebuild
new file mode 100644
index 000000000000..1fdc803c5e11
--- /dev/null
+++ b/app-office/openoffice/openoffice-3.2.1_rc1.ebuild
@@ -0,0 +1,399 @@
+# 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.1_rc1.ebuild,v 1.1 2010/05/24 14:23:11 suka Exp $
+
+WANT_AUTOMAKE="1.9"
+EAPI="2"
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="never"
+
+inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib toolchain-funcs
+
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl pam templates"
+
+MY_PV=3.2.1.1
+PATCHLEVEL=OOO320
+SRC=OOo_${PV/_/}_20100506_src
+MST=OOO320_m17
+DEVPATH=http://download.services.openoffice.org/files/extended/${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}_system.tar.bz2
+	${DEVPATH}_testautomation.tar.bz2
+	${DEVPATH}_l10n.tar.bz2
+	binfilter? ( ${DEVPATH}_binfilter.tar.bz2 )
+	templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
+		http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt
+		http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt
+		http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt
+		http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt
+		ftp://ftp.devall.hu/kami/go-oo//Sun_ODF_Template_Pack_hu.oxt )
+	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
+	http://multidimalgorithm.googlecode.com/files/mdds_0.3.0.tar.bz2"
+
+LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el 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 ~sparc ~x86"
+
+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 )
+	nsplugin? ( net-libs/xulrunner:1.9
+		>=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
+	>=media-libs/vigra-1.4
+	>=app-text/poppler-0.12.3-r3[xpdf-headers]
+	>=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.36
+	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 aggressive 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}
+
+	# en_US is built by default, upstream needs us to use --with-lang="" in this case though, so strip it out
+	export LINGUAS_TEMP=$(echo ${LINGUAS} | sed -e 's/\ben_US\b//g;s/en//g;s/_GB/en_GB/g;s/_ZA/en_ZA/g')
+
+	if [[ -z "${LINGUAS_TEMP}" ]] || [[ ${LINGUAS_TEMP} == " " ]]; then
+		export LINGUAS_OOO=""
+	else
+		# always build en-US as a fallback (needed for broken code / translations)
+		export LINGUAS_OOO="en-US ${LINGUAS_TEMP//_/-}"
+	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
+
+	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}/qt-use-native-backend.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/neon-remove-SSPI-support.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
+
+	echo $(use_enable nsplugin mozilla) >> ${CONFFILE}
+	echo $(use_with nsplugin system-mozilla libxul) >> ${CONFFILE}
+
+	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.png\\\"" >> ${CONFFILE}
+
+	# Upstream this, disabled for now #i108911
+	#echo "--with-system-redland" >> ${CONFFILE}
+
+	# needed for sun-templates patch
+	eautoreconf
+
+}
+
+src_configure() {
+
+	use kde && export KDE4DIR="${KDEDIR}"
+	use kde && export QT4LIB="/usr/$(get_libdir)/qt4"
+
+	# 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} \
+		--disable-mono \
+		--disable-kde \
+		$(use_enable kde kde4) \
+		$(use_enable !debug strip) \
+		$(use_enable odk) \
+		$(use_enable pam) \
+		$(use_with java) \
+		$(use_with templates 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
+	BASHCOMPLETION_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
+
+}
diff --git a/app-office/taxbird/Manifest b/app-office/taxbird/Manifest
index 6f8a064ddc01..ef43c9a30a3b 100644
--- a/app-office/taxbird/Manifest
+++ b/app-office/taxbird/Manifest
@@ -10,12 +10,12 @@ EBUILD taxbird-0.13-r1.ebuild 1077 RMD160 1e7a3cd97c0a1c81de823307842db67aa11937
 EBUILD taxbird-0.13.ebuild 1182 RMD160 1cdc27bcdb84770ad080c1dd6e09b57d73ec75f2 SHA1 928c5951cfccbe7178a9544602be16494af9e478 SHA256 8d4f5a1168722b5ae1a017b0aa97b2f5472aae3bb233dab1f7f0a67ec4ef80b9
 EBUILD taxbird-0.14.ebuild 1074 RMD160 f15f466ea83d2b527e48f53421d7994809ac26ab SHA1 b8c3886f7aed9c5f83155c13210157349fa1aa67 SHA256 ae2fcf1563b510994cc17f1717b04b53f9a7a6fd4111734845aabf0ff258703f
 EBUILD taxbird-0.15.ebuild 1038 RMD160 0760a348baad0f82f40c1e15535279bfea83302a SHA1 08317994a44f92758bacc1ed538ee966875ecff4 SHA256 acb85334ed5e1a46da9eb5674f6bce635cc87ba8f22a6dcb866dd2aaffb6b9f1
-MISC ChangeLog 3045 RMD160 48b315bfae88c8317f892f6a9701378ded505287 SHA1 476a88c52adb46e1af3f4bc51f52a46e29289ee7 SHA256 224877c47f6bb15740a65277282cbb3607a73d89c3fd10b9e932d5b9be322e34
-MISC metadata.xml 251 RMD160 df09f36bb4d3177fcaabb5ff023a13abcb149133 SHA1 f51074ec5d852f680e7a65f36824b53f27a6aea9 SHA256 0a85c558984a637e5466304392dc868dbf156c1a1640d35d3906c6cc994b8eee
+MISC ChangeLog 3151 RMD160 5e970de7a758a27cd41e9cd81407a0ec665fac8e SHA1 ddfad9063910cb86b9e0d05f6ff0c6ac68e11f51 SHA256 21c2230cf489b7a15cf97d83cb11bcbaeeb0db9e01cd31a52dc9942533929784
+MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktrFZ4ACgkQr2QksT29OyDdHACdH8N4pA2OMSyx1LASFJJtIaQX
-4kAAniRmNaddL6ZClQGIu1tISD0AWPNu
-=6L5v
+iEYEARECAAYFAkv6jMcACgkQV3J2n04Eauy8mwCgyJGsuwfuR24vlniphFtEQk49
+YasAoIk/LJKfWc8kuDN5mggPPQDW9Y4Z
+=taEv
 -----END PGP SIGNATURE-----