Add gb_FULLDEPS patch. Clear up other patches.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

16 files changed, 42 insertions, 459 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 1c21021993cb..10d7dac6cd16 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.254 2012/03/17 18:17:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.255 2012/03/18 09:11:13 scarabeus Exp $
+
+  18 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libreoffice-3.5-propagate-gb_FULLDEPS.patch,
+  -files/enable-startup-notification.diff, -files/env_log.diff,
+  -files/fix-ooo-collision.diff, -files/gentoo-3.3.1.diff,
+  -files/gentoo-3.3.2.diff, -files/gentoo-pythonpath.diff,
+  -files/libreoffice-3.3-libpng-1.5.diff,
+  -files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff,
+  -files/libreoffice-3.3.2-bison25.diff,
+  -files/libreoffice-3.3.4-poppler-0.18.0.diff, -files/scrap-pixmap-links.diff,
+  -files/wrapper.in, libreoffice-3.5.1.2.ebuild, libreoffice-3.5.9999.ebuild:
+  Add gb_FULLDEPS patch. Clear up other patches.
 
   17 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/libreoffice-3.6-system-pyuno.patch, libreoffice-3.5.1.2.ebuild,
diff --git a/app-office/libreoffice/files/enable-startup-notification.diff b/app-office/libreoffice/files/enable-startup-notification.diff
deleted file mode 100644
index 39e1172300a1..000000000000
--- a/app-office/libreoffice/files/enable-startup-notification.diff
+++ /dev/null
@@ -1,108 +0,0 @@
---- 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
- Icon=ooo-gulls@OOO_BINSUFFIX@
- Type=Application
- Categories=X-SuSE-Core-Office;Office;
--StartupNotify=false
-+StartupNotify=true
- _Name=LibreOffice
- _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/libreoffice/files/env_log.diff b/app-office/libreoffice/files/env_log.diff
deleted file mode 100644
index 908169ab6c5a..000000000000
--- a/app-office/libreoffice/files/env_log.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- bin/build-ooo.orig	2007-04-18 18:32:06.000000000 +0200
-+++ bin/build-ooo	2007-04-18 18:32:45.000000000 +0200
-@@ -21,9 +21,8 @@
- echo "configuring ...";
- autoconf || exit 1;
- 
--echo "Env for configure:"
--set
--echo "Env for configure ends"
-+echo "Log Env for configure to `pwd`/env.log"
-+set > env.log
- 
- eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
- 
-@@ -88,8 +88,8 @@
- # similar that gives child nmake's pain.
- unset MAKEFLAGS
- 
--echo "Env:"
--set
-+echo "Log Env to `pwd`/env.log"
-+set > env.log
- 
- # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
- # already merged?
diff --git a/app-office/libreoffice/files/fix-ooo-collision.diff b/app-office/libreoffice/files/fix-ooo-collision.diff
deleted file mode 100644
index 5bdc5c20bee0..000000000000
--- a/app-office/libreoffice/files/fix-ooo-collision.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- bin/package-ooo.orig	2010-11-29 20:16:08.700004578 +0100
-+++ bin/package-ooo	2010-11-29 20:20:47.972004579 +0100
-@@ -104,12 +104,12 @@
- ln -sf $OOINSTBASE/program/soffice$BINSUFFIX $PREFIX/bin/soffice$BINSUFFIX
- 
- # no man-page so ...
--if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva"; then
-+if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva" -a "z$VENDORNAME" != "zGentoo"; then
-     install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig
-     install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
- fi
- 
--if test "z$VENDORNAME" = "zMandriva"; then
-+if test "z$VENDORNAME" = "zMandriva" -o "z$VENDORNAME" = "zGentoo"; then
-     install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig$BINSUFFIX
-     install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
- fi
-@@ -210,9 +210,9 @@
- 	done
- 	
- 	# shared MIME info
--	mkdir -p $PREFIX/share/mime/packages
-+	mkdir -p $DATADIR/mime/packages
- 	cd $TOOLSDIR/desktop
--	cp openoffice.xml $PREFIX/share/mime/packages
-+	cp openoffice.xml $DATADIR/mime/packages/libreoffice.xml
- 	if test "z$RUN_POST_INSTALL_SCRIPTS" = "zyes" && 
- 	   which update-mime-database >/dev/null 2>&1 ; then
- 	    update-mime-database /usr/share/mime || :
diff --git a/app-office/libreoffice/files/gentoo-3.3.1.diff b/app-office/libreoffice/files/gentoo-3.3.1.diff
deleted file mode 100644
index 8f0bcc167255..000000000000
--- a/app-office/libreoffice/files/gentoo-3.3.1.diff
+++ /dev/null
@@ -1,68 +0,0 @@
---- distro-configs/Gentoo.conf.in
-+++ distro-configs/Gentoo.conf.in
-@@ -1,5 +1,3 @@
----disable-fontooo
----disable-qadevooo
- --enable-neon
- --enable-xrender-link
- --with-external-dict-dir=/usr/share/myspell
---- patches/dev300/apply 
-+++ patches/dev300/apply
-@@ -1687,16 +1687,8 @@
- [ 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
- config_office-XINC-XLIB-defaults.diff, i#65976
- # Sandbox problem with wrong path
---- 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)
---- bin/package-ooo
-+++ bin/package-ooo
-@@ -126,8 +126,8 @@
- fi
- 
- # create bash completion
--mkdir -p $OODESTDIR/etc/bash_completion.d
--$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh
-+mkdir -p $SYSCONFDIR/bash_completion.d
-+$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BINSUFFIX}.sh
- if test "$COMPAT_OOWRAPPERS" = "YES" ; then
-     $TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuffix="$BINSUFFIX"  $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
- fi
-
diff --git a/app-office/libreoffice/files/gentoo-3.3.2.diff b/app-office/libreoffice/files/gentoo-3.3.2.diff
deleted file mode 100644
index 2a4b293ea2af..000000000000
--- a/app-office/libreoffice/files/gentoo-3.3.2.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- distro-configs/Gentoo.conf.in
-+++ distro-configs/Gentoo.conf.in
-@@ -1,5 +1,3 @@
----disable-fontooo
----disable-qadevooo
- --enable-neon
- --enable-xrender-link
- --with-external-dict-dir=/usr/share/myspell
---- 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)
---- bin/package-ooo
-+++ bin/package-ooo
-@@ -126,8 +126,8 @@
- fi
- 
- # create bash completion
--mkdir -p $OODESTDIR/etc/bash_completion.d
--$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh
-+mkdir -p $SYSCONFDIR/bash_completion.d
-+$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BINSUFFIX}.sh
- if test "$COMPAT_OOWRAPPERS" = "YES" ; then
-     $TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuffix="$BINSUFFIX"  $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
- fi
-
diff --git a/app-office/libreoffice/files/gentoo-pythonpath.diff b/app-office/libreoffice/files/gentoo-pythonpath.diff
deleted file mode 100644
index 4714b0abb0a2..000000000000
--- a/app-office/libreoffice/files/gentoo-pythonpath.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -33,6 +33,7 @@
- {
-     cat <<EOT >$1
- #!/bin/sh
-+unset PYTHONPATH
- $OOINSTBASE/program/soffice $2 "\$@"
- EOT
-     chmod 755 $1
-
diff --git a/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff b/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff
deleted file mode 100644
index d0ca2eda56e7..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- desktop/unx/source/splashx.c.ark	2011-01-16 20:25:10.846685172 +0100
-+++ desktop/unx/source/splashx.c	2011-01-16 20:27:12.673351839 +0100
-@@ -137,8 +137,8 @@ int splash_load_bmp( const char *filenam
-                   PNG_TRANSFORM_GRAY_TO_RGB | PNG_TRANSFORM_BGR, NULL);
- 
-     bitmap_rows = png_get_rows( png_ptr, info_ptr );
--    width = info_ptr->width;
--    height = info_ptr->height;
-+    width = png_get_image_width( png_ptr, info_ptr );
-+    height = png_get_image_height( png_ptr, info_ptr );
- 
- #if 0
-     {
diff --git a/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff b/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff
deleted file mode 100644
index 168d27216a0b..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- libxmlsec/makefile.mk.ORIGINAL	2010-11-11 09:35:21.000000000 -0600
-+++ libxmlsec/makefile.mk	2011-02-13 03:13:41.496866392 -0600
-@@ -67,7 +67,8 @@
-    xmlsec1-noverify.patch \
-    xmlsec1-mingw32.patch \
-    xmlsec1-mingw-keymgr-mscrypto.patch \
--   xmlsec1-vc10.patch
-+   xmlsec1-vc10.patch \
-+   xmlsec1-1.2.14_fix_extern_c.patch
- 
- ADDITIONAL_FILES= \
-     include$/xmlsec$/mscrypto$/akmngr.h \
---- libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.ORIGINAL	1969-12-31 18:00:00.000000000 -0600
-+++ libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch	2011-02-13 03:11:34.740594681 -0600
-@@ -0,0 +1,23 @@
-+--- misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h.ORIGINAL	2009-12-05 15:19:18.000000000 -0600
-++++ misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h	2011-02-13 03:09:42.917240245 -0600
-+@@ -11,16 +11,16 @@
-+ #ifndef __XMLSEC_H__
-+ #define __XMLSEC_H__    
-+ 
-+-#ifdef __cplusplus
-+-extern "C" {
-+-#endif /* __cplusplus */ 
-+-
-+ #include <libxml/tree.h>
-+ 
-+ #include <xmlsec/version.h>
-+ #include <xmlsec/exports.h>
-+ #include <xmlsec/strings.h>
-+ 
-++#ifdef __cplusplus
-++extern "C" {
-++#endif /* __cplusplus */ 
-++
-+ /***********************************************************************
-+  *
-+  * Basic types to make ports to exotic platforms easier
diff --git a/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff b/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff
deleted file mode 100644
index 869b6c81e2bc..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- connectivity/source/parse/sqlbison.y	2011-05-20 13:21:02.000000000 -0600
-+++ connectivity/source/parse/sqlbison.y	2011-05-20 13:22:11.000000000 -0600
-@@ -4338,7 +4338,7 @@
- }
- 
- // -------------------------------------------------------------------------
--void OSQLParser::error(sal_Char *fmt)
-+void OSQLParser::error(const sal_Char *fmt)
- {
- 	if(!m_sErrorMessage.getLength())
- 	{
---- connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:58.000000000 -0600
-+++ connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:46.000000000 -0600
-@@ -233,7 +233,7 @@
-         // returns the type for a parameter in a given function name
-         static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
- 
--        void error(sal_Char *fmt);
-+        void error(const sal_Char *fmt);
-         int SQLlex();
- #ifdef YYBISON
-         void setParseTree(OSQLParseNode * pNewParseTree);
-
diff --git a/app-office/libreoffice/files/libreoffice-3.3.4-poppler-0.18.0.diff b/app-office/libreoffice/files/libreoffice-3.3.4-poppler-0.18.0.diff
deleted file mode 100644
index 0f279f93ef6e..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.3.4-poppler-0.18.0.diff
+++ /dev/null
@@ -1,52 +0,0 @@
---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer )
- void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
- {
-     // dump JPEG file as-is
-+#if POPPLER_CHECK_VERSION(0, 17, 3)
-+    str = str->getBaseStream();
-+#else
-     str = ((DCTStream *)str)->getRawStream();
-+#endif
-     str->reset();
- 
-     int c;
-@@ -489,7 +493,11 @@ void PDFOutDev::endPage()
-     printf("endPage\n");
- }
- 
-+#if POPPLER_CHECK_VERSION(0, 17, 0)
-+void PDFOutDev::processLink(AnnotLink *link, Catalog *)
-+#else
- void PDFOutDev::processLink(Link* link, Catalog*)
-+#endif
- {
-     assert(link);
- 
---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -65,7 +65,10 @@ class GfxPath;
- class GfxFont;
- class PDFDoc;
- #ifndef SYSTEM_POPPLER
-+#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
- typedef GString GooString;
-+#else
-+#include <glib/poppler-features.h>
- #endif
- 
- namespace pdfi
-@@ -194,8 +197,12 @@ namespace pdfi
-         // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
-         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
-         
-+        #if POPPLER_CHECK_VERSION(0, 17, 0)
-+        virtual void processLink(AnnotLink *link, Catalog *catalog);
-+        #else
-         //----- link borders
-         virtual void processLink(Link *link, Catalog *catalog);
-+        #endif
-         
-         //----- save/restore graphics state
-         virtual void saveState(GfxState *state);
diff --git a/app-office/libreoffice/files/libreoffice-3.5-propagate-gb_FULLDEPS.patch b/app-office/libreoffice/files/libreoffice-3.5-propagate-gb_FULLDEPS.patch
new file mode 100644
index 000000000000..8175e8a34d4a
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.5-propagate-gb_FULLDEPS.patch
@@ -0,0 +1,25 @@
+From 07fc748fb1b242859913df178a0c41dc95a9f3e7 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Wed, 21 Dec 2011 22:29:02 +0100
+Subject: [PATCH] propagate gb_FULLDEPS
+
+---
+ solenv/gbuild/source_and_rerun.mk |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk
+index a2aaea0..27de233 100644
+--- a/solenv/gbuild/source_and_rerun.mk
++++ b/solenv/gbuild/source_and_rerun.mk
+@@ -2,7 +2,7 @@
+ gb_MAKEFILEDIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+ 
+ define gb_SourceEnvAndRecurse_recurse
+-$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j $${GMAKE_PARALLELISM} $(1) gb_SourceEnvAndRecurse_STAGE=$(2)
++$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j $${GMAKE_PARALLELISM} $(1) gb_SourceEnvAndRecurse_STAGE=$(2) gb_FULLDEPS=$(gb_FULLDEPS)
+ endef
+ 
+ ifneq ($(strip $(gb_PARTIALBUILD)),)
+-- 
+1.7.5.4
+
diff --git a/app-office/libreoffice/files/scrap-pixmap-links.diff b/app-office/libreoffice/files/scrap-pixmap-links.diff
deleted file mode 100644
index 69cfbbeff4f1..000000000000
--- a/app-office/libreoffice/files/scrap-pixmap-links.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -212,14 +212,6 @@
- 	    done
- 	done
- 
--	# create symlinks below share/pixmaps to keep the backward compatibility
--	pixmapsdir=$PREFIX/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 $DATADIR/mime/packages
- 	cd $TOOLSDIR/desktop
---- 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/libreoffice/files/wrapper.in b/app-office/libreoffice/files/wrapper.in
deleted file mode 100644
index 712ea60ef336..000000000000
--- a/app-office/libreoffice/files/wrapper.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-unset PYTHONPATH
-exec @GENTOO_PORTAGE_EPREFIX@/usr/LIBDIR/libreoffice/program/soffice  "$@"
diff --git a/app-office/libreoffice/libreoffice-3.5.1.2.ebuild b/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
index a1f36c500a8f..7bcb1f7f3728 100644
--- a/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.1.2.ebuild,v 1.3 2012/03/17 18:17:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.1.2.ebuild,v 1.4 2012/03/18 09:11:13 scarabeus Exp $
 
 EAPI=4
 
@@ -192,6 +192,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# this can't be upstreamed :(
 	"${FILESDIR}/${PN}-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
 	"${FILESDIR}/libreoffice-3.5.1-kde-4.8.1-namespace.patch"
 )
 
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
index d417c7d31b17..a843fc485cf0 100644
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.21 2012/03/17 18:17:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.22 2012/03/18 09:11:13 scarabeus Exp $
 
 EAPI=4
 
@@ -192,6 +192,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# this can't be upstreamed :(
 	"${FILESDIR}/${PN}-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
 )
 
 REQUIRED_USE="