Silent bump too ooo-build-2.1.5, bunch of bugfixes as usual[

Package-Manager: portage-2.1.2-r9

5 files changed, 38 insertions, 24 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index cbb4564a251f..6ae6107b05e0 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.302 2007/01/31 12:02:32 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.303 2007/02/10 17:04:55 suka Exp $
+
+  10 Feb 2007; Andreas Proschofsky <suka@gentoo.org>
+  files/2.1.0/gentoo-2.1.0.diff, openoffice-2.1.0.ebuild:
+  Silent bump too ooo-build-2.1.5, bunch of bugfixes as usual
 
   31 Jan 2007; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.1.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index f3c3fa7ab8ae..3d301bce7d38 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -22,10 +22,10 @@ AUX 2.1.0/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fff
 MD5 1d4f1d467652abdd8481cfffc4ee64de files/2.1.0/disable-regcomp-python.diff 934
 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 files/2.1.0/disable-regcomp-python.diff 934
 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1 files/2.1.0/disable-regcomp-python.diff 934
-AUX 2.1.0/gentoo-2.1.0.diff 181 RMD160 8ac1700851de1216bf6c342fd697d65d123b13ae SHA1 d88a87f0e53d84ccb7102a4beb2d5fba8fba2a2a SHA256 c0bcfd92976525c66f9e77a728c1dc71c8f09712177af9454d286082ba6e3d8d
-MD5 0ac100c746d44b8f92d7034cf41db54b files/2.1.0/gentoo-2.1.0.diff 181
-RMD160 8ac1700851de1216bf6c342fd697d65d123b13ae files/2.1.0/gentoo-2.1.0.diff 181
-SHA256 c0bcfd92976525c66f9e77a728c1dc71c8f09712177af9454d286082ba6e3d8d files/2.1.0/gentoo-2.1.0.diff 181
+AUX 2.1.0/gentoo-2.1.0.diff 400 RMD160 2d9d387568f0672b5aea49f1ba10698e201b8698 SHA1 c977770f74f61cc50cdddd4bc4c5ebcbc7f45e11 SHA256 2e03f46bef47b678bd26f5e1a37ca25725be131e36b27285db4594a611020bd8
+MD5 be9a73f3ccc28937a34e785131c6a311 files/2.1.0/gentoo-2.1.0.diff 400
+RMD160 2d9d387568f0672b5aea49f1ba10698e201b8698 files/2.1.0/gentoo-2.1.0.diff 400
+SHA256 2e03f46bef47b678bd26f5e1a37ca25725be131e36b27285db4594a611020bd8 files/2.1.0/gentoo-2.1.0.diff 400
 AUX 2.1.0/ooo-wrapper.in 2650 RMD160 081f34f44be85f13224b59c7199fa27265563760 SHA1 77654213fbc2f1ef20e2a76b4bc87230865036c8 SHA256 ec974e0323c7cf89bea75f56ccc6db2fd90b2be45e676851ea62d7130defcdce
 MD5 3998f6afdb1e322b138d3d1c65449866 files/2.1.0/ooo-wrapper.in 2650
 RMD160 081f34f44be85f13224b59c7199fa27265563760 files/2.1.0/ooo-wrapper.in 2650
@@ -50,24 +50,24 @@ DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a
 DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA1 2c7fca93c106e23961f4aaa7cdfcaeb97064eed1 SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
 DIST hunspell_UNO_1.1.tar.gz 13774 RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 SHA1 d72420069de87062b3e5b4f45235a7bc2c1e124a SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149
 DIST libwpd-0.8.8.tar.gz 563088 RMD160 09632cf9c84f12d7850399e0119407b1a0d29139 SHA1 8d40e1e7b66dc97ca531194035a62be89279de1e SHA256 3ded0ca9a24b55c844c2e82b84e6e55db4c46acbed4137c7be1f44b2cd68232b
-DIST libwps-0.1.0~svn20070129.tar.gz 426668 RMD160 5936f952392ec44aaa7d3fb836bc76421377f669 SHA256 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec
+DIST libwps-0.1.0~svn20070129.tar.gz 426668 RMD160 5936f952392ec44aaa7d3fb836bc76421377f669 SHA1 928c486d53277072e90fec5dcaa762934e8467d6 SHA256 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec
 DIST lp_solve_5.5.tar.gz 495452 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 SHA1 1cb19a392a4b3370adc3513964f7a351ad605875 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1
 DIST ooo-build-2.0.4.11.tar.gz 4675395 RMD160 73f7f981f3d4a15f879bbd8cc41d1690be4d6dd7 SHA1 102c4df8e14a95bbf410c0364089d39c4f70e563 SHA256 f3164e2242fa8bbe4e196bcac8c9ab332f33542940c3677d58bd13fc3a3c55ca
-DIST ooo-build-2.1.2.tar.gz 4181810 RMD160 0e8d5861cc56cbf897957c0677a6a112aae664c6 SHA1 2184745efedca088e9e25b81128e1e4d9b6d7f72 SHA256 f2a914156b18720e990e5737ca931beed62c40bb3e755743026a2c86b9527ba4
+DIST ooo-build-2.1.5.tar.gz 4238696 RMD160 f1f892eb2381ab30b26bb11e28f5cf62e97b1b1c SHA1 439e7e76d5c210ec4f2dc07e486098f5018a1365 SHA256 2e19cc2bb4f9b914cd134182232508ba1cb2c13a3806afb7dfbe2c0a8b0f518e
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
 EBUILD openoffice-2.0.4.ebuild 9982 RMD160 fe84e166003512e52dd38bb7eff5b9e32460e699 SHA1 3614e69bcf12deb27c684c985d1812588ef158e5 SHA256 a77b3db85f2cccb31eec1e732ea02262aa47d3d441e46ec033fe544dea42c6da
 MD5 6aaf7f5d2d7a9225aa07a2e76c2834e7 openoffice-2.0.4.ebuild 9982
 RMD160 fe84e166003512e52dd38bb7eff5b9e32460e699 openoffice-2.0.4.ebuild 9982
 SHA256 a77b3db85f2cccb31eec1e732ea02262aa47d3d441e46ec033fe544dea42c6da openoffice-2.0.4.ebuild 9982
-EBUILD openoffice-2.1.0.ebuild 11729 RMD160 b6be33942f893efab435b09ba8033adb319f3fbb SHA1 e55df2077f08278efa4f7c5ab9c80f5ad2dcc493 SHA256 47fb2265de1134a8bc500cdf7b8d52ca4e15213a562d0521fd919efec73b4a39
-MD5 89f3adb6b187e47138f2dfd497adca0b openoffice-2.1.0.ebuild 11729
-RMD160 b6be33942f893efab435b09ba8033adb319f3fbb openoffice-2.1.0.ebuild 11729
-SHA256 47fb2265de1134a8bc500cdf7b8d52ca4e15213a562d0521fd919efec73b4a39 openoffice-2.1.0.ebuild 11729
-MISC ChangeLog 63050 RMD160 06522a25994ccd4322d1f07954ea2abdf4b8e5e5 SHA1 d878050e21a333d36c17b5f5d6e37f021b413cb5 SHA256 8d1fba15a6a0d8f4ebccc71afe0a5d1959860543fe3f6250974bed401eedd790
-MD5 089247b01b7581b783939608ded42bc6 ChangeLog 63050
-RMD160 06522a25994ccd4322d1f07954ea2abdf4b8e5e5 ChangeLog 63050
-SHA256 8d1fba15a6a0d8f4ebccc71afe0a5d1959860543fe3f6250974bed401eedd790 ChangeLog 63050
+EBUILD openoffice-2.1.0.ebuild 11656 RMD160 d665d4f31eada7eea769bb5b9afa411b6eab04e0 SHA1 79388581da7fe31a02de48083d24296be5637631 SHA256 960ffea020cd8baf6b164982903035e42110598e513a13f336ee63c225f8fcc5
+MD5 ab7f9af6162bd3a4a237da2e4be7cccf openoffice-2.1.0.ebuild 11656
+RMD160 d665d4f31eada7eea769bb5b9afa411b6eab04e0 openoffice-2.1.0.ebuild 11656
+SHA256 960ffea020cd8baf6b164982903035e42110598e513a13f336ee63c225f8fcc5 openoffice-2.1.0.ebuild 11656
+MISC ChangeLog 63224 RMD160 ce3822947e7eb77b1e385c46079057016d64cc1d SHA1 ae183fb7c9ef4b539fb11366a6c18f863575fb3f SHA256 17442217b5928079cb61cd2f9ad1d3f4677503387a2614a427deb3b05883f656
+MD5 69340210c8790c7e249dc5e7a32f1394 ChangeLog 63224
+RMD160 ce3822947e7eb77b1e385c46079057016d64cc1d ChangeLog 63224
+SHA256 17442217b5928079cb61cd2f9ad1d3f4677503387a2614a427deb3b05883f656 ChangeLog 63224
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -75,6 +75,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 e837d4be9f6b62e483edd69a87b84a45 files/digest-openoffice-2.0.4 2690
 RMD160 fe56e14aa7634660083562d9114978cfded8e489 files/digest-openoffice-2.0.4 2690
 SHA256 b069f01aacb01cc7136aad7b37f65aee07a3cfc574902972e4b1d48cabcd0890 files/digest-openoffice-2.0.4 2690
-MD5 b06b51b20fef251b54515c5b1628295c files/digest-openoffice-2.1.0 3232
-RMD160 e2a926b9a1a708e40c597f3ebbe8a37530e22af3 files/digest-openoffice-2.1.0 3232
-SHA256 d5152d363cbd22459a3384285fc78ccf195329a3da9af69de2c5c3029926d788 files/digest-openoffice-2.1.0 3232
+MD5 79357706ca5e4dbb095d31ade6d914fc files/digest-openoffice-2.1.0 3232
+RMD160 d623e3a93b7d28101395f134b2f169670d67c26d files/digest-openoffice-2.1.0 3232
+SHA256 9e44a6d767331f820cd6c1efc47deae16ce93ed85ac8aa164b418a176d0fe963 files/digest-openoffice-2.1.0 3232
diff --git a/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff b/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff
index b911c448b251..55c5e7d5e8ee 100644
--- a/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff
+++ b/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff
@@ -8,3 +8,14 @@
  EOT
      chmod 755 $1
  }
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -1630,6 +1630,8 @@
+ 
+ [ GentooExperimental ]
+ disable-parser-jaxp.diff, hmth
++
++[ GentooOnly ]
+ # db.jar unused with CXXHelpLinker
+ no-db.jar.diff, i#70155, hmth
+ 
diff --git a/app-office/openoffice/files/digest-openoffice-2.1.0 b/app-office/openoffice/files/digest-openoffice-2.1.0
index 81a31e8366b9..fa8084fe0c06 100644
--- a/app-office/openoffice/files/digest-openoffice-2.1.0
+++ b/app-office/openoffice/files/digest-openoffice-2.1.0
@@ -28,9 +28,9 @@ SHA256 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec libwps-0
 MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
-MD5 2b04e8e674554cc81d3401ca68bfccbe ooo-build-2.1.2.tar.gz 4181810
-RMD160 0e8d5861cc56cbf897957c0677a6a112aae664c6 ooo-build-2.1.2.tar.gz 4181810
-SHA256 f2a914156b18720e990e5737ca931beed62c40bb3e755743026a2c86b9527ba4 ooo-build-2.1.2.tar.gz 4181810
+MD5 fbf7e3fde71d1b557da154d1b4c9a61c ooo-build-2.1.5.tar.gz 4238696
+RMD160 f1f892eb2381ab30b26bb11e28f5cf62e97b1b1c ooo-build-2.1.5.tar.gz 4238696
+SHA256 2e19cc2bb4f9b914cd134182232508ba1cb2c13a3806afb7dfbe2c0a8b0f518e ooo-build-2.1.5.tar.gz 4238696
 MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
 SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
diff --git a/app-office/openoffice/openoffice-2.1.0.ebuild b/app-office/openoffice/openoffice-2.1.0.ebuild
index 6eff2575bf51..ef32a70ff847 100644
--- a/app-office/openoffice/openoffice-2.1.0.ebuild
+++ b/app-office/openoffice/openoffice-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.15 2007/01/31 12:02:32 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.16 2007/02/10 17:04:55 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -9,7 +9,7 @@ inherit check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functi
 
 IUSE="binfilter branding cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap sound odk pam seamonkey webdav"
 
-MY_PV="2.1.2"
+MY_PV="2.1.5"
 PATCHLEVEL="OOE680"
 SRC="OOo_${PV}_src"
 S="${WORKDIR}/ooo"
@@ -212,7 +212,6 @@ src_unpack() {
 	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-db-jar=/usr/share/db-${db_ver}/lib/db.jar" >> ${CONFFILE}
 		echo "--with-system-beanshell" >> ${CONFFILE}
 		echo "--with-system-xalan" >> ${CONFFILE}
 		echo "--with-system-xerces" >> ${CONFFILE}