Bump to ooo-build-3.1.1.4, also re-fix kde4/qt4-support

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

4 files changed, 23 insertions, 48 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 639ad0eec6bc..b2a97ca49982 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.493 2009/10/27 14:27:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.494 2009/10/28 11:53:24 suka Exp $
+
+  28 Oct 2009; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.1.1.ebuild, files/gentoo-3.1.1.diff:
+  Bump to ooo-build-3.1.1.4, also re-fix kde4/qt4-support
 
   27 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   openoffice-3.1.1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 6fb75726a93b..758237e5ef7c 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,9 +1,6 @@
------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 gentoo-3.1.1.diff 1869 RMD160 bd517c6cfe97710cb6f4c1f6a83d5f72c4686098 SHA1 c08c2a393611296e69b0ff46adecd583d24fa020 SHA256 14aa1b87b252c133f0e6917d89b75a42fa3bd5c558db26285771009201f37266
+AUX gentoo-3.1.1.diff 921 RMD160 4c7f829baa476a4c98552e0e404401c7fcad7e9e SHA1 e3488b2301036f3475b11613b43bf3efe9ffef9e SHA256 8e377dff22687df8d3f8e1c7070218e9fce290cedefc3d79ccd8c1fda256b4a2
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
@@ -17,7 +14,7 @@ DIST extras-3.tar.bz2 130640 RMD160 c6b6efb20cbec79b48bd21046f93959367fe1bd4 SHA
 DIST libwpg-0.1.3.tar.gz 410799 RMD160 6e9e0545215af2ee05780887ad57ca1ae7ef78f5 SHA1 6d350eb0ad57b97499ef8335506f172b0c21375a SHA256 19a52f4eede1da890ac6a5dfa5f0d9a63a73a6dfc3f17cb3423563c53cc665e3
 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 ooo-build-3.1.1.2.tar.gz 13981745 RMD160 505db0e1673765d3e398e022f03535b00f76a01b SHA1 0d4533cedcfd7a7f22715668764b599f1fc6a10d SHA256 e94729b359ab5f5db6eb506b4562e8e4ab5140463be13a7d5536d43a6e8227b5
+DIST ooo-build-3.1.1.4.tar.gz 14009955 RMD160 9d1071d54b3c4bfa593085f206d6a865d3c65751 SHA1 4fbd62270587642f7e629fb9c63b069eb95aa66d SHA256 d6cc2838026ff5aeb6596d657c3aafd5c98a90cae0ed3d9ec5a2e42b4c74a1a8
 DIST ooo310-m19-artwork.tar.bz2 9813919 RMD160 08f5228c9e85f7a287ccca70e25ecc66a4bbd053 SHA1 14ff8ae12d43c7f1c725c3c913fda848ecf54b0f SHA256 9e741c889c1bc80aea8d15ea5e1087d4750f874a8690e1926d6b88c24a133ff8
 DIST ooo310-m19-base.tar.bz2 3336925 RMD160 ea26c3664d1c52f0030e8fa5a1f0962b147f726b SHA1 18f33c1976d0e427cb4ac98041d82e0a8cd948c8 SHA256 9f6ff29dd9be1d7618bb8dc558ec4a4001b6e7bd8db8c70270ea756a36e1bc4a
 DIST ooo310-m19-bootstrap.tar.bz2 7270281 RMD160 456198813294cb74fccc80461f4e65d5c1f39638 SHA1 cbf62263d6b094cb348f16bb3e345425beee05f7 SHA256 3cc9653477d9a491dd2412e5a8cae848700a0a5b8a23d0c7a9e7b076751de287
@@ -40,13 +37,6 @@ DIST ooo310-m19-writer.tar.bz2 9021103 RMD160 47d18795af5e643d4f9eb323b27458ad1f
 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.1.1.ebuild 13685 RMD160 32ea1964cee7fb81bb1640ef034123664e643f0a SHA1 e08d3140b2cc546f61efa01d43fdf85caa844d90 SHA256 47aedeedfda0c4291b30b3a533ebbbcb5221591696b4be8b18a09c9859c23884
-MISC ChangeLog 102421 RMD160 9a253649f57511b81e4b5bc5bcd62d14b64d9de3 SHA1 ce5dd9ac94c4590c8fb8a1fca4bb4134728adf5e SHA256 15950b9418f4d35f4e605724196a6f739e430e4fc82f1c35ac8cfa0f74753df9
+EBUILD openoffice-3.1.1.ebuild 13680 RMD160 948af90fcfe507f38a51aa751087552c606ec0fe SHA1 092bf30ea4588a70932ce57fc9e8270b5b36968b SHA256 8d6c496fa05bc71dda6adbc85a9e87c75341e84761665a575bbf03a3fe143559
+MISC ChangeLog 102580 RMD160 88c584d6a628310bb5fc18d720821c9868eb1412 SHA1 90c231b80df2c2b94318d0658b11363002e980c4 SHA256 a392b048435bc2fc7a25ae2983aa30d1c03f357f63d3bd469056eb944c505345
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkrnA2UACgkQHB6c3gNBRYdiBwCdF1L3Sz27zvDrSFrgafrUldp1
-46gAoKQ4NXD4F4GV1TnozPUBEtshfrbN
-=dNlC
------END PGP SIGNATURE-----
diff --git a/app-office/openoffice/files/gentoo-3.1.1.diff b/app-office/openoffice/files/gentoo-3.1.1.diff
index 35e273314dd1..46afca36d0fc 100644
--- a/app-office/openoffice/files/gentoo-3.1.1.diff
+++ b/app-office/openoffice/files/gentoo-3.1.1.diff
@@ -11,34 +11,15 @@
  
  [ LinuxOnly ]
  # fix that allows OOo to work with a standard (unpatched) libjpeg,
---- patches/dev300/system-db-check.diff 
-+++ patches/dev300/system-db-check.diff 
-@@ -12,14 +12,16 @@
- -             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
- -        ], []
- -    )
--+    for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
-+-    AC_MSG_CHECKING([whether db is at least 4.1])
-+-    for v in `seq 1 7`; do
-++    for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
- +       AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
- +    done
- +    if test "$DB_INCLUDES" = ""; then
- +       AC_MSG_ERROR(no. install the db4-dev package)
- +    fi
--     AC_MSG_CHECKING([whether db is at least 4.1])
--     for v in 1 2 3 4 5; do
-++     AC_MSG_CHECKING([whether db is at least 4.1])
-++    for v in `seq 1 8`; do
-         AC_TRY_RUN([
- @@ -3302,12 +3300,13 @@
-      else
-@@ -32,7 +34,7 @@
- -      [AC_MSG_ERROR([db not installed or functional])], [])
- -    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
- +    save_LIBS="$LIBS"
--+    for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
-++    for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
- +       AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
- +    done
- +    AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])
+--- patches/dev300/kde4-configure2.diff
++++ patches/dev300/kde4-configure2.diff
+@@ -7,7 +7,7 @@
+ -   qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+ -   qt_libdirs="$QTLIB /usr/lib $x_libraries"
+ +   qt_incdirs="$QT4INC $QT4DIR $QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+-+   qt_libdirs="$QT4LIB $QTLIB /usr/lib $x_libraries"
+++   qt_libdirs="$QT4LIB $QTLIB /usr/lib/qt4 /usr/lib $x_libraries"
+     
+     kde_incdirs="/usr/include $x_includes"
+     kde_libdirs="/usr/lib $x_libraries"
+
diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild
index 19b343fd217f..1d159bfbb5df 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.14 2009/10/27 14:27:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.15 2009/10/28 11:53:24 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.2
+MY_PV=3.1.1.4
 PATCHLEVEL=OOO310
 SRC=OOo_${PV}_src
 MST=ooo310-m19