Update the qt patch as the 3.4 branch lacks quite few commits.

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

3 files changed, 24 insertions, 33 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 55447d015879..94bec8b0c09d 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.81 2011/08/03 17:23:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.82 2011/08/03 20:21:09 scarabeus Exp $
+
+  03 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/libreoffice-32b-qt4-libdir.patch:
+  Update the qt patch as the 3.4 branch lacks quite few commits.
 
   03 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild,
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9fd24091257d..76f79525cdf0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -12,7 +12,7 @@ AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ce
 AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
 AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
 AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
-AUX libreoffice-32b-qt4-libdir.patch 1099 RMD160 2482665c0d40a42ce32df5608d3462790f93ffad SHA1 c88de6c9f203b3c2cd933e09420c28d38b8d5275 SHA256 0a5565fbd096221d9e2cd69a4e6432bdb6ccaf4fdb2ff817116bd2aa5190598b
+AUX libreoffice-32b-qt4-libdir.patch 878 RMD160 5d1d90ca61106ac4962d7f70489910191f4347b6 SHA1 5be37237f9564613c893a7e486b2a1ebb24584c7 SHA256 9785fe9ae6c11f922b13941a5b60733a8bce70b08db71a9447e960191b210f0d
 AUX libreoffice-append-no-avx.patch 9329 RMD160 fce82cac5b15592cc9bd7b4af90372987fb198cb SHA1 4145cd7741c5b1e9ee2fb3974db7bda0f68282c5 SHA256 fab496a65e583bd484d5a5671d712acc17643c8f655e419f5148b2de9fc5c256
 AUX libreoffice-as-needed-gtk.patch 403 RMD160 c1c5733d282eb3b59b7fe03d5258e9c917d9c6c4 SHA1 7516a3d554d96b7a27e5884ef124f9f5166a5939 SHA256 88609b6bac793423dee7af79110a05981669471170f9473a2bc591d35927117a
 AUX libreoffice-fix-sandbox-install.patch 1609 RMD160 e79859f6343e04808cc261c101483ff2ba0f1a5d SHA1 579d30eafb7a7e54531faf4bc8d3bd35150494f7 SHA256 fdb54126c78837d73e7a095ceedba9329b121ce2ce1d1a23ad75247b8f144b50
@@ -170,12 +170,12 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.2.3.ebuild 18768 RMD160 8f8402a6439e032f6d85f28e503e5c5406a734f8 SHA1 0a59fe9a554120034288df4d70a32481ce4fac6e SHA256 774b56c62b29a23153f44c03a86e13b96d72416b37cfd5f1f16620f29a80968f
 EBUILD libreoffice-3.4.9999.ebuild 18680 RMD160 6f9c763b9980005d26b9de08df1456ffe7ce2443 SHA1 7b3702902b61332c6e87faeca6594ee9904d6c08 SHA256 4bb3fab5fd3b5736dc0f4e1e3a7ac7ff8dc5257734acf0f3e47130e98a2f8310
-MISC ChangeLog 16277 RMD160 ed180a270758bd988c6713a0e92bee6e9e69fe75 SHA1 cd0eb2a1b80ae3587cef3dd9ed952ec28246b4c2 SHA256 18fb6a66d98f4e13bed9c6b5b1f2d6e9e3e8ff3d5cbdb5274478feb28be13060
+MISC ChangeLog 16440 RMD160 9ca5a4a818503bb72cabbd8c181bcb6e3a052350 SHA1 2653ae67396bb1b73e376438157ea7e63d8522b6 SHA256 bef885b2a36333b11d7285d01856f6c9d252bf450855c57164df3f8ba33c88c3
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk45g/sACgkQHB6c3gNBRYfbYwCcD4JWji+y/G8GpqPDEoaZJ4t8
-gLIAn35Frda3867BhCTcgNVrr84sgVQs
-=YL2/
+iEYEARECAAYFAk45rZ0ACgkQHB6c3gNBRYdLwACgxDM9E/1NpJfUW5gxXT+VCTNf
++zYAoKu4gLbqgHCUD/IATBv9QHYYCko1
+=g+HC
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch b/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch
index f8c5f57d451b..1b0c7a604ffb 100644
--- a/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch
+++ b/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch
@@ -1,30 +1,17 @@
-From d1c187bd6005339ba260c166b2539791628e4702 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
-Date: Wed, 3 Aug 2011 13:02:38 +0200
-Subject: [PATCH] Add one more libdir path for detection with qt4 on 32b platform to be same with 64b. Fixes gentoo bug #377377.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Tomáš Chvátal <tomas.chvatal@gmail.com>
----
- configure.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index f4363db..cf308dc 100755
---- a/configure.in
-+++ b/configure.in
-@@ -7310,7 +7310,7 @@ KDE_GLIB_LIBS=""
+diff -urN libreoffice-bootstrap-3.4.2.3.old/configure.in libreoffice-bootstrap-3.4.2.3/configure.in
+--- libreoffice-bootstrap-3.4.2.3.old/configure.in	2011-08-03 22:11:11.000000000 +0200
++++ libreoffice-bootstrap-3.4.2.3/configure.in	2011-08-03 22:13:55.000000000 +0200
+@@ -6878,10 +6878,10 @@
  KDE_HAVE_GLIB=""
  if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
-     qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes"
--    qt_libdirs="$QT4LIB /usr/lib $x_libraries"
-+    qt_libdirs="$QT4LIB /usr/lib/qt4 /usr/lib $x_libraries"
+    qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes"
+-   qt_libdirs="$QT4LIB /usr/lib $x_libraries"
++   qt_libdirs="$QT4LIB /usr/lib/qt4 /usr/lib/qt /usr/lib $x_libraries"
  
-     kde_incdirs="/usr/include /usr/include/kde4 $x_includes"
-     kde_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries"
--- 
-1.7.3.4
-
+-   kde_incdirs="/usr/include $x_includes"
+-   kde_libdirs="/usr/lib $x_libraries"
++   kde_incdirs="/usr/include /usr/include/kde4 $x_includes"
++   kde_libdirs="/usr/lib /usr/lib/kde4 $x_libraries"
+ 
+    if test "$host_cpu" = "x86_64" ; then
+       qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"