Raise patchset to ooo-build 3.1.1.2, bunch of smaller fixes. Also remove

upstreamed patches
Package-Manager: portage-2.2_rc41/cvs/Linux i686

5 files changed, 12 insertions, 107 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 0b7c570940b9..ca843f9baa7f 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.485 2009/09/24 07:51:41 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.486 2009/09/24 08:27:55 suka Exp $
+
+  24 Sep 2009; Andreas Proschofsky <suka@gentoo.org>
+  -files/kde4-configure2.diff, -files/xulrunner-1.9.1.diff,
+  openoffice-3.1.1.ebuild:
+  Raise patchset to ooo-build 3.1.1.2, bunch of smaller fixes. Also remove 
+  upstreamed patches
 
   24 Sep 2009; Christian Faulhammer <fauli@gentoo.org>
   openoffice-3.1.1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index e66823ea1a23..e514c8dd399c 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
@@ -9,11 +6,9 @@ AUX gentoo-3.0.0.diff 3086 RMD160 69856c46b641e09c5ffd561cf78c7f2334649d87 SHA1
 AUX gentoo-3.1.1.diff 1869 RMD160 bd517c6cfe97710cb6f4c1f6a83d5f72c4686098 SHA1 c08c2a393611296e69b0ff46adecd583d24fa020 SHA256 14aa1b87b252c133f0e6917d89b75a42fa3bd5c558db26285771009201f37266
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX hunspell-one-dir-nocrash.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
-AUX kde4-configure2.diff 3539 RMD160 0ec3e65f8f8fd1aaa708cdb57675b4858404ea32 SHA1 3f66897dfc5ec6d50d4e96f0bffd3e9205f77794 SHA256 78178fcc17b60c336f78ae55282e00c4a5efe01e58a1a5d71d3669a972064aa3
 AUX nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX solenv.workaround-for-the-kde-mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
-AUX xulrunner-1.9.1.diff 325 RMD160 252628b530c210f2fa8466eb26f062316a7d8b28 SHA1 09f3e4c8cbdaa37f31bcd78ae7a5b4b981546f11 SHA256 f283fa82e12b792d6ae151ee18408078b5f58b8c7212a0e79535f689eb2fc94e
 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
@@ -27,7 +22,7 @@ DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44
 DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
 DIST ooo-build-3.0.0.3.6.tar.gz 10574055 RMD160 9517a4a7d0ce0557f7a220510598cea493d702c0 SHA1 c00aa4eb426e3897181ecb71ef68d1f19ac6eaa9 SHA256 0ae1d2bbdd7f73f0aa1f6f50e6ea18a4dc6c2baafae9ab3a5715270e2ec8a4da
 DIST ooo-build-3.1.0.6.tar.gz 13199374 RMD160 52193324c3e69e403ed725fdfc1ac0065eb2a51c SHA1 a3325be780a3ae2833af3dffdc0c40482f0d1c8e SHA256 9c930bf6bb93595c6b3b4227c2e6188ef31698818fe6de15dc42f09089359798
-DIST ooo-build-3.1.1.1.tar.gz 14092984 RMD160 aa5cf700472fad1796e13102f2640adb161504af SHA1 9b1ad57441d66bcb4d905bb18ac74d71f953638d SHA256 40a29b9620ed6883771fbb80dacc603ff894a028027d3a2d77dcfdc3de162756
+DIST ooo-build-3.1.1.2.tar.gz 13981745 RMD160 505db0e1673765d3e398e022f03535b00f76a01b SHA1 0d4533cedcfd7a7f22715668764b599f1fc6a10d SHA256 e94729b359ab5f5db6eb506b4562e8e4ab5140463be13a7d5536d43a6e8227b5
 DIST ooo300-m9-artwork.tar.bz2 9692435 RMD160 706e568f4af998404d2c2ea2f643f90ccc800ed4 SHA1 92bea75c7f803b11a6aa043990cbc8560d16fcaf SHA256 d181de6723a3b09e9571a22a488fa6b50ea10f19bad7fa91f1ebc2d085a7be58
 DIST ooo300-m9-base.tar.bz2 2937373 RMD160 b0c75fe7b45b56c4e3115112b0f0b59eadd0c136 SHA1 8402f672b817213f98f322ce7e622fbc52865224 SHA256 2c34b6c6229d7b8f87df50d3c4eb16cce1bdbf9af49fa31e688ba9c40e022889
 DIST ooo300-m9-bootstrap.tar.bz2 7020977 RMD160 f5163c83e77c0113ee8d98f20939ab6c7f4f50a2 SHA1 c75b506063415a43c0fe347c900341fe73234a24 SHA256 3b8964bb5d8dd93a038def27a73504416c4320115b92359a0bcd61a53c15e043
@@ -89,13 +84,6 @@ DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766ee
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD openoffice-3.0.0.ebuild 12681 RMD160 20d2e4f6ea1e979f33f033d284d97d6a8e9bd4b8 SHA1 7a79d589ade481854fa81ab0309b972883ea6390 SHA256 4d096777f0cb9a99b1dfbfc363efc641a78650032c9544b95f997383e3b6a1f3
 EBUILD openoffice-3.1.0-r1.ebuild 13569 RMD160 6e7162ea3eff111c981eb03e2dbd510110aba38c SHA1 a2b4c10d0c6877022dbfaac230ab58be9ebe8437 SHA256 ee5e3cd6a7f0d534b036b8d04b4ddaa830aff0d72bb095cea88cc145a68974f2
-EBUILD openoffice-3.1.1.ebuild 13817 RMD160 c082eb8b0bdaa8daff640dbc5644789c580284ff SHA1 7d48c40c468f07bff65dbce8296fdee627967498 SHA256 d6fefad138c3045c5f0cb5b149e9824df2bf83df3b56e9f16e6f6784793c0cc7
-MISC ChangeLog 101137 RMD160 52bd45718a680ce7cb4c87e7943f7302dfe7e649 SHA1 676f119acbb811ffc45ef82299024374275b69e3 SHA256 880ff30f403cad7e6ca6308a4f8bb19ff670781f51d3356393996372b223e45a
+EBUILD openoffice-3.1.1.ebuild 13670 RMD160 17db2fbbe1f5152de71404c7ba9d3f9fe89207fe SHA1 8fbebd0ac9b3188bc89eaf4a38c70e5adb29fc1f SHA256 d333b525c4759ecc7acbe1798819c6dac04b0a6f953ce4427d802520859ccaf2
+MISC ChangeLog 101374 RMD160 6287f1de8e930b48a09f505a1912c86227577fa2 SHA1 72db5a24c6675e3406d71a0709c09a09a90d1ad7 SHA256 ad6c57cdbb4dd6114a938ac856d6638bd20e56905051dcc07dfb1b5eee4124d4
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq7JSwACgkQNQqtfCuFneMJ1ACffZl+iwTQfiwID8JvVPl/2ByR
-rTQAn1X27SkRax/oMSMKdcJNcb2/yCvJ
-=jyCl
------END PGP SIGNATURE-----
diff --git a/app-office/openoffice/files/kde4-configure2.diff b/app-office/openoffice/files/kde4-configure2.diff
deleted file mode 100644
index 69b367237811..000000000000
--- a/app-office/openoffice/files/kde4-configure2.diff
+++ /dev/null
@@ -1,74 +0,0 @@
---- configure.in.old	2009-08-26 12:25:16.000000000 +0200
-+++ configure.in	2009-09-15 14:09:26.000000000 +0200
-@@ -6158,8 +6158,8 @@ KDE4_CFLAGS=""
- KDE4_LIBS=""
- MOC4="moc"
- if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
--   qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
--   qt_libdirs="$QTLIB /usr/lib $x_libraries"
-+   qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes"
-+   qt_libdirs="$QT4LIB /usr/lib $x_libraries"
-    
-    kde_incdirs="/usr/include $x_includes"
-    kde_libdirs="/usr/lib $x_libraries"
-@@ -6169,6 +6169,15 @@ if test "$test_kde4" = "yes" -a "$ENABLE
-       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
-    fi
- 
-+   if test -n "$KDE4DIR" ; then
-+      kde_incdirs="$KDE4DIR/include $kde_incdirs"
-+      if test "$build_cpu" != "x86_64" ; then
-+         kde_libdirs="$KDE4DIR/lib $kde_libdirs"
-+      else
-+         kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"
-+      fi
-+   fi
-+
-    qt_test_include="Qt/qobject.h"
-    qt_test_library="libQtCore.so"
-    kde_test_include="ksharedptr.h"
-@@ -6185,7 +6194,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE
-    
-    AC_MSG_RESULT([$qt_header_dir])
-    if test "x$qt_header_dir" = "xno" ; then
--      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
-+      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
-    fi
-    
-    AC_MSG_CHECKING([for Qt4 libraries])
-@@ -6200,14 +6209,14 @@ if test "$test_kde4" = "yes" -a "$ENABLE
-    AC_MSG_RESULT([$qt_lib_dir])
-    
-    if test "x$qt_lib_dir" = "xno" ; then
--      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
-+      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
-    fi
- 
-    dnl Check for Meta Object Compiler
--   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] )
-+   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
-    if test "$MOC4" = "no" ; then
-       AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
--the root of your Qt installation by exporting QTDIR before running "configure".])
-+the root of your Qt installation by exporting QT4DIR before running "configure".])
-    fi
- 
-    dnl Check for KDE4 headers
-@@ -6221,7 +6230,7 @@ the root of your Qt installation by expo
-    done
-    AC_MSG_RESULT([$kde_incdir])
-    if test "x$kde_incdir" = "xno" ; then
--      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
-+      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
-    fi
- 
-    dnl Check for KDE4 libraries
-@@ -6236,7 +6245,7 @@ the root of your Qt installation by expo
-    
-    AC_MSG_RESULT([$kde_libdir])
-    if test "x$kde_libdir" = "xno" ; then
--      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
-+      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
-    fi
- 
-    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
diff --git a/app-office/openoffice/files/xulrunner-1.9.1.diff b/app-office/openoffice/files/xulrunner-1.9.1.diff
deleted file mode 100644
index be0c32be6b14..000000000000
--- a/app-office/openoffice/files/xulrunner-1.9.1.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- np_sdk/mozsrc/npapi.h	2009-07-12 16:12:42.604105232 +0200
-+++ np_sdk/mozsrc/npapi.h	2009-07-12 16:28:59.901456708 +0200
-@@ -42,8 +42,9 @@
-  *  Netscape client plug-in API spec
-  */
- 
--#ifndef _NPAPI_H_
-+#if !defined(_NPAPI_H_) && !defined(npapi_h_)
- #define _NPAPI_H_
-+#define npapi_h_
- 
- #ifdef __OS2__
- #pragma pack(1)
diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild
index 12662c25b819..cf07f6aa17f1 100644
--- a/app-office/openoffice/openoffice-3.1.1.ebuild
+++ b/app-office/openoffice/openoffice-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.8 2009/09/24 07:51:41 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.9 2009/09/24 08:27:55 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -11,7 +11,7 @@ inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
-MY_PV=3.1.1.1
+MY_PV=3.1.1.2
 PATCHLEVEL=OOO310
 SRC=OOo_${PV}_src
 MST=ooo310-m19
@@ -241,9 +241,7 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo-pythonpath.diff"
 	epatch "${FILESDIR}/ooo-env_log.diff"
 	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
-	cp -f "${FILESDIR}/xulrunner-1.9.1.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die
-	cp -f "${FILESDIR}/kde4-configure2.diff" "${S}/patches/hotfixes" || die
 
 	#Use flag checks
 	if use java ; then