Revision bump for ooo-build 3.2.1.6 and security bug #332321

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

5 files changed, 561 insertions, 2 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index cddc79d43be2..a440b7da6c4e 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.539 2010/11/07 18:50:48 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.540 2010/11/11 19:24:21 suka Exp $
+
+*openoffice-3.2.1-r1 (11 Nov 2010)
+
+  11 Nov 2010; Andreas Proschofsky <suka@gentoo.org> +openoffice-3.2.1-r1.ebuild,
+  +files/enable-startup-notification.diff, +files/scrap-pixmap-links.diff:
+  Add new revision, based on ooo-build 3.2.1.6, bump for security fixes bug
+  #332321
 
   07 Nov 2010; Jory A. Pratt <anarchy@gentoo.org> openoffice-3.2.1.ebuild:
   Convert media-libs/jpeg to virtual/jpeg
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index f56c650d4063..82cb0ac91dbe 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,5 @@
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
+AUX enable-startup-notification.diff 6396 RMD160 e444175640eaa2fac7cbc9a425c58e5c51c857f0 SHA1 0d8d51ae8de4d13b884bb2cd065807c75e1c3dc3 SHA256 e27eb3682c5cf8153caff674ec5964f20c54ced5faa47f129e3a806a5e95f5bb
 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.diff 1239 RMD160 f55c9c7c0b228da729f03886ea90c2302655c30e SHA1 a9f57a94f2093f8e3c88629c3d5704154d6c364a SHA256 6f62dca2b15828e5644201daf82096b077f50e53fce1e41ddacf91d7f7dfe251
@@ -7,6 +8,7 @@ AUX neon-remove-SSPI-support.diff 1091 RMD160 5dee3324b22b9c8d9f14b0e7998695a212
 AUX npwrap-fix-nogtk.diff 382 RMD160 557fe38a19d9a0e4505af34bed4033884f1075ab SHA1 209f73c706adabb1e2b2b3e4bc706f9afbbee172 SHA256 ad64cea66e4e4d9b351a44b3ed2774484baaaebe5e37ebea3121f4a0981d231f
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX qt-use-native-backend.diff 391 RMD160 602d444e9768c1bb0a8f2ad36567c8ab571bc569 SHA1 148a3431222e7405eb16c42330da7f0a2f01e1eb SHA256 f3ba5e9390f47d42acb955c04f5ef62a5b62a5776bd9d5d3226d5034fafe6be9
+AUX scrap-pixmap-links.diff 1082 RMD160 2d5dd83fbae0317186263d38b1f05433011670b0 SHA1 9c126e8f7fde6ad1dbb5095302926dd0ce9c7df7 SHA256 d5f64aaa8004cb38dae8259bcee8ec5b35e985a401b3253d5f3e3a83fc3ee4b7
 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
@@ -31,10 +33,12 @@ DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a1
 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.4.tar.gz 14513961 RMD160 6dbf5f98f4b898ad9520475c49c932eda737d558 SHA1 04c7b3ea2d20647fec587ebe9e3711802890ad99 SHA256 a8e8b3b65e293f7786e24474dae0b510591a3a6d1ac9fad9919a3807132494f5
+DIST ooo-build-3.2.1.6.tar.gz 14547953 RMD160 2fbb9a5dfcee854b18584cdd5b49f4801a3fbb5d SHA1 e3c77576f4ea8e097360897e8e9adf0418769b08 SHA256 bed78b0bbdff8bc08e1198d8aa7f026f3defff6147195b5ed4127b1eccbb33d1
 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 13523 RMD160 6f345170a473ee282a709c96596e0888eba86a3d SHA1 db61af77548107be1b3fa8c80696b4a0fc08a801 SHA256 f904363bea2e48deb579e062a5a21fafee8906299f106af6c80d16f552cad371
+EBUILD openoffice-3.2.1-r1.ebuild 13328 RMD160 c486e10aa1d5843a83e5f512049bc7c9578066a3 SHA1 0a2eb6cae310bb77c9a6fe6dd7892b59650e0a07 SHA256 36321b1ce8d2f8d64ead32a44ba8a23281d93bb169be788bbd14623b7c2c9dc7
 EBUILD openoffice-3.2.1.ebuild 13227 RMD160 12080cab383e0cd978cbe1850452adfd5a3d5a00 SHA1 80511fcfa63b9e4ee442a573c83a490fe0dd4377 SHA256 41f2bd2c084da4a64f08cdb5e284f4c50cd0f85df7cdbc586e3eae9fb211cc6e
-MISC ChangeLog 110284 RMD160 26f7062eeade9d2ab31fcbb0f113977c76b1064a SHA1 2b297118af0501f12e047c7d95f8daf67104f15e SHA256 5c156f83baf2e7c117e5abb5a5e33af425b98271b720983ae11faa9b77d9b62a
+MISC ChangeLog 110561 RMD160 c84dca1279201c0568956e77c7672c563d3d6851 SHA1 b70f6ce586fce4ad2a13cda316ecbebb950409e1 SHA256 bcc7a6683bfc053c6468fed94b14ff7e1a7f815930762cf16a80fb50c9de9bb2
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/enable-startup-notification.diff b/app-office/openoffice/files/enable-startup-notification.diff
new file mode 100644
index 000000000000..494035711e0c
--- /dev/null
+++ b/app-office/openoffice/files/enable-startup-notification.diff
@@ -0,0 +1,109 @@
+--- desktop/base.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/base.desktop.in.in	2010-03-25 14:23:29.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-base@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;Database;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
+ _Name=OpenOffice.org Base
+ _GenericName=Database
+--- desktop/calc.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/calc.desktop.in.in	2010-03-25 14:23:36.000000000 +0200
+@@ -7,7 +7,7 @@
+ Type=Application
+ InitialPreference=6
+ Categories=Office;Spreadsheet;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/msexcel;application/vnd.lotus-1-2-3;application/vnd.ms-excel;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-dbase;application/x-dbf;application/x-quattropro;text/csv;text/spreadsheet;text/x-csv;application/vnd.ms-excel.sheet.binary.macroEnabled.12;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/csv;application/excel;application/tab-separated-values;application/x-123;application/x-dos_ms_excel;application/x-excel;application/x-ms-excel;application/x-msexcel;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;
+ _Name=OpenOffice.org Calc
+ _GenericName=Spreadsheet
+--- desktop/draw.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/draw.desktop.in.in	2010-03-25 14:23:44.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-draw@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Graphics;VectorGraphics;
+-StartupNotify=false
++StartupNotify=true
+ InitialPreference=6
+ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.stardivision.draw;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
+ _Name=OpenOffice.org Draw
+--- desktop/impress.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/impress.desktop.in.in	2010-03-25 14:23:52.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-impress@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;Presentation;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.stardivision.impress;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;
+ InitialPreference=5
+ _Name=OpenOffice.org Impress
+--- desktop/math.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/math.desktop.in.in	2010-03-25 14:24:02.000000000 +0200
+@@ -7,7 +7,7 @@
+ Icon=ooo-math@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;Math;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.formula-template;application/vnd.stardivision.math;application/vnd.sun.xml.math;text/mathml;
+ _Name=OpenOffice.org Math
+ _GenericName=Formula
+--- desktop/ooo-extension-manager.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/ooo-extension-manager.desktop.in.in	2010-03-25 14:24:10.000000000 +0200
+@@ -5,7 +5,7 @@
+ Exec=unopkg@OOO_BINSUFFIX@ gui %U
+ NoDisplay=true
+ Type=Application
+-StartupNotify=false
++StartupNotify=true
+ Categories=X-SuSE-Core-Office;Office;
+ MimeType=application/vnd.openofficeorg.extension;
+ Name=OpenOffice.org Extension Manager
+--- desktop/startcenter.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/startcenter.desktop.in.in	2010-03-25 14:24:20.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-gulls@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;X-SuSE-Core-Office;
+-StartupNotify=false
++StartupNotify=true
+ InitialPreference=5
+ _Name=OpenOffice.org
+ _GenericName=Office
+--- desktop/template.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/template.desktop.in.in	2010-03-25 14:24:27.000000000 +0200
+@@ -7,6 +7,6 @@
+ Icon=ooo-gulls@OOO_BINSUFFIX@
+ Type=Application
+ Categories=X-SuSE-Core-Office;Office;
+-StartupNotify=false
++StartupNotify=true
+ _Name=OpenOffice.org
+ _GenericName=Office Suite
+--- desktop/web.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/web.desktop.in.in	2010-03-25 14:24:33.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-web@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Network;WebDevelopment;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/vnd.oasis.opendocument.text-web;
+ _Name=OpenOffice.org Writer/Web
+ _GenericName=Web Page Creation
+--- desktop/writer.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/writer.desktop.in.in	2010-03-25 14:24:39.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-writer@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;WordProcessor;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/msword;application/rtf;application/vnd.ms-works;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.stardivision.writer-global;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.wordperfect;application/wordperfect;application/x-extension-txt;application/x-t602;text/plain;text/rtf;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;
+ InitialPreference=5
+ _Name=OpenOffice.org Writer
diff --git a/app-office/openoffice/files/scrap-pixmap-links.diff b/app-office/openoffice/files/scrap-pixmap-links.diff
new file mode 100644
index 000000000000..c85bdfe6528c
--- /dev/null
+++ b/app-office/openoffice/files/scrap-pixmap-links.diff
@@ -0,0 +1,36 @@
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -201,13 +201,6 @@
+ 	    done
+ 	done
+ 
+-	# create symlinks below share/pixmaps to keep the backward compatibility
+-	pixmapsdir=$OODESTDIR/usr/share/pixmaps
+-	mkdir -p $pixmapsdir
+-	cd $OODESTDIR/$icondir/48x48/apps
+-	for icon in ooo-*.png ; do
+-	    ln -sf $icondir/48x48/apps/$icon $pixmapsdir
+-	done
+ 	
+ 	# shared MIME info
+ 	mkdir -p $OODESTDIR/usr/share/mime/packages
+--- bin/piece/desktop-support-app 
++++ bin/piese/desktop-support-app 
+@@ -75,17 +75,6 @@
+ 	test -n "$list_icon_dirs" && echo "%dir $icon_dir/$size/$category" >>files-$piece.txt
+     done
+ 
+-    # create symlink below share/pixmaps to keep the backward compatibility
+-    if test "$category" = "apps" ; then
+-	file=$DESTDIR/$icon_dir/48x48/apps/$icon_name.png
+-	if test -f $file ; then
+-	    filename=`basename $file`
+-	    pixmaps_dir=/usr/share/pixmaps
+-	    mkdir -p $DESTDIR$pixmaps_dir
+-	    ln -sf $icon_dir/48x48/apps/$filename $DESTDIR$pixmaps_dir
+-	    test -n "$DESTDIR" && echo "$pixmaps_dir/$filename" >>files-$piece.txt
+-	fi
+-    fi
+ }
+ 
+ case "$app" in
diff --git a/app-office/openoffice/openoffice-3.2.1-r1.ebuild b/app-office/openoffice/openoffice-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..aa94423a15ff
--- /dev/null
+++ b/app-office/openoffice/openoffice-3.2.1-r1.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.1-r1.ebuild,v 1.1 2010/11/11 19:24:21 suka Exp $
+
+WANT_AUTOMAKE="1.9"
+EAPI="2"
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="never"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
+
+inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib python toolchain-funcs
+
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl pam templates"
+
+MY_PV=3.2.1.6
+PATCHLEVEL=OOO320
+SRC=OOo_${PV}_src
+MST=OOO320_m19
+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}_system.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 )
+	>=net-libs/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 )
+	virtual/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] )
+	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
+
+	python_set_active_version 2
+	python_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"
+	epatch "${FILESDIR}/scrap-pixmap-links.diff"
+	epatch "${FILESDIR}/enable-startup-notification.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
+
+}