Silent bump to ooo-build-2.1.7, also try to fix build with db-4.5, see bug #169526

Package-Manager: portage-2.1.2.1

6 files changed, 44 insertions, 42 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 6ae6107b05e0..14f79d709cde 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.303 2007/02/10 17:04:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.304 2007/03/06 19:04:22 suka Exp $
+
+  06 Mar 2007; Andreas Proschofsky <suka@gentoo.org>
+  files/2.1.0/wrapper-readd.diff, files/2.1.0/gentoo-2.1.0.diff,
+  openoffice-2.1.0.ebuild:
+  Silent bump to ooo-build-2.1.7, also try to fix build with db-4.5, see bug
+  #169526
 
   10 Feb 2007; Andreas Proschofsky <suka@gentoo.org>
   files/2.1.0/gentoo-2.1.0.diff, openoffice-2.1.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 3d301bce7d38..2e1d257855ff 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 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/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/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
@@ -34,10 +34,10 @@ AUX 2.1.0/regcompapply.diff 306 RMD160 1ea8ae87049aaba655b95e0700c53d6cf17df87d
 MD5 df1c2b425e5eb0c3f710997078dbab71 files/2.1.0/regcompapply.diff 306
 RMD160 1ea8ae87049aaba655b95e0700c53d6cf17df87d files/2.1.0/regcompapply.diff 306
 SHA256 f3a600f6178ab276bf58d69d97acf02200d99be07df00fcdd61442625f3a37ae files/2.1.0/regcompapply.diff 306
-AUX 2.1.0/wrapper-readd.diff 12211 RMD160 1014399ec5ae7d5c036f93725dfac6d7337df0d9 SHA1 0e5183e5f23653d7895f9255e12df3c173c7d59e SHA256 807f857d509b9c3817d46255bc243c56305eab4f36c581645787f4576cf4818b
-MD5 586494b3dae1789214b572a9c10ee8db files/2.1.0/wrapper-readd.diff 12211
-RMD160 1014399ec5ae7d5c036f93725dfac6d7337df0d9 files/2.1.0/wrapper-readd.diff 12211
-SHA256 807f857d509b9c3817d46255bc243c56305eab4f36c581645787f4576cf4818b files/2.1.0/wrapper-readd.diff 12211
+AUX 2.1.0/wrapper-readd.diff 12546 RMD160 7913918ebc923ee121a52b10855fc48496f92c52 SHA1 ee6ccba3391d0f75e6e7b4bc340b5747739eb728 SHA256 96475bbe2bad69f2eceace9636558b87b81c1f1f4181796693481593e5268ac3
+MD5 1090186c4184d658e59ceed5911ae88d files/2.1.0/wrapper-readd.diff 12546
+RMD160 7913918ebc923ee121a52b10855fc48496f92c52 files/2.1.0/wrapper-readd.diff 12546
+SHA256 96475bbe2bad69f2eceace9636558b87b81c1f1f4181796693481593e5268ac3 files/2.1.0/wrapper-readd.diff 12546
 DIST OOO_2_0_4-binfilter.tar.bz2 16802527 RMD160 2574dd0cef9d6976b62e0a16d75b577d8002b139 SHA1 706032793396dcfbe462c8eff212d11a15b54a03 SHA256 45bf3993ddeab5a1bc724111f6066933cac9129493db24204ffe35840842af35
 DIST OOO_2_0_4-core.tar.bz2 121332967 RMD160 bc57ce5f6ff0a4ef714cbf7097b319d61d7ffc25 SHA1 19adc4be9306d3d05ed6da23f2d9c66bcededa51 SHA256 010dfa7b87a426ccea82a14c53877280a771448b9d935a49a636e82512e58cff
 DIST OOO_2_0_4-lang.tar.bz2 71585371 RMD160 acc3c0507011bad12a8c423e73bf5ea4750500e1 SHA1 aa517e80b6bdf3c80d738b6dd18aee85588f19ab SHA256 f22f54afe7a8bc4aae9b0714b5028600911bc8bd2b54b4c4f40839c508daaa5f
@@ -53,21 +53,21 @@ DIST libwpd-0.8.8.tar.gz 563088 RMD160 09632cf9c84f12d7850399e0119407b1a0d29139
 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.5.tar.gz 4238696 RMD160 f1f892eb2381ab30b26bb11e28f5cf62e97b1b1c SHA1 439e7e76d5c210ec4f2dc07e486098f5018a1365 SHA256 2e19cc2bb4f9b914cd134182232508ba1cb2c13a3806afb7dfbe2c0a8b0f518e
+DIST ooo-build-2.1.7.tar.gz 4250358 RMD160 91d5d40affc7ca8a5db7b4324e5ba28733f14bc6 SHA1 c7ea704722544da247f544557b4885120c676938 SHA256 8ef5f8f65619f32dfe0ced5b53901a28696b524f9584658e36c76fae632e724e
 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 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
+EBUILD openoffice-2.1.0.ebuild 11700 RMD160 9c463d17db4e47890d575e48174eb04697c3ab2c SHA1 9a7882fae286397124c84b75fb9e83735acc2eac SHA256 0c53d55eb802f697d8c1ea309ba8c8193a59ac4dd4bff4b21b15e6a6f603375d
+MD5 40497d586ce540d59c0d826ed76eaaf8 openoffice-2.1.0.ebuild 11700
+RMD160 9c463d17db4e47890d575e48174eb04697c3ab2c openoffice-2.1.0.ebuild 11700
+SHA256 0c53d55eb802f697d8c1ea309ba8c8193a59ac4dd4bff4b21b15e6a6f603375d openoffice-2.1.0.ebuild 11700
+MISC ChangeLog 63457 RMD160 ee07a3c227d3eb8336329f4b489ea4c58c3f02be SHA1 3c9f2e49a2691f9f966a295a41fefe2d43d48db3 SHA256 11cae0815c78b7af790132adffa427171bb971d25df4d85d32f57e77c7717c13
+MD5 c478aeb4ae5aa2ec55ffafd40535fb58 ChangeLog 63457
+RMD160 ee07a3c227d3eb8336329f4b489ea4c58c3f02be ChangeLog 63457
+SHA256 11cae0815c78b7af790132adffa427171bb971d25df4d85d32f57e77c7717c13 ChangeLog 63457
 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 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
+MD5 c85832554136787a45115b4aaf9938f6 files/digest-openoffice-2.1.0 3232
+RMD160 51dc0494f89693175424d707a90934923aaa62d1 files/digest-openoffice-2.1.0 3232
+SHA256 2e2b3e9ccea46b0016c000f9aad9c3742e742f16a1215119f306bf8ed469e9a9 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 55c5e7d5e8ee..b911c448b251 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,14 +8,3 @@
  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/2.1.0/wrapper-readd.diff b/app-office/openoffice/files/2.1.0/wrapper-readd.diff
index 531aa1a9defc..bbd315e6c41f 100644
--- a/app-office/openoffice/files/2.1.0/wrapper-readd.diff
+++ b/app-office/openoffice/files/2.1.0/wrapper-readd.diff
@@ -46,7 +46,7 @@
  
  create_qstart_wrapper()
  {
-@@ -45,44 +67,60 @@
+@@ -45,50 +67,60 @@
      chmod +x $2
  }
  
@@ -60,7 +60,8 @@
 -create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" "" "slot:5500" || exit 1;
 -create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" "" || exit 1;
 -if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
--    -o "z$VENDORNAME" = "zDebian"; then
+-    -o "z$VENDORNAME" = "zDebian" \
+-    -o "z$VENDORNAME" = "zMandriva"; then
 -    for app in calc draw impress math web writer base fromtemplate ffice ; do
 -        echo ".so man1/openoffice$BINSUFFIX.1" >| $MANDIR/man1/oo${app}$BINSUFFIX.1;
 -    done
@@ -76,11 +77,16 @@
 -ln -sf $OOINSTBASE/program/soffice $PREFIX/bin/soffice
 -
 -# no man-page so ...
--if test "z$VENDORNAME" != "zDebian"; then
+-if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva"; 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
+-    install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig$BINSUFFIX
+-    install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
+-fi
+-
 -# create bash completion
 -mkdir -p $OODESTDIR/etc/bash_completion.d
 -gen_bash_comp_opts=--binsuffix="$BINSUFFIX"
@@ -252,7 +258,7 @@
  Categories=Office;Spreadsheet
 -StartupNotify=false
 +StartupNotify=@STARTUPNOTIFY@
- MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;text/x-comma-separated-values;text/x-csv;application/vnd.lotus-1-2-3;text/spreadsheet;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls
+ MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;text/x-comma-separated-values;text/x-csv;application/vnd.lotus-1-2-3;text/spreadsheet;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls@ADD_OPENXML_SPREADSHEET_MIME@
  _Name=OpenOffice.org Calc
  _GenericName=Spreadsheet
 --- desktop/draw.desktop.in.in 
@@ -274,7 +280,7 @@
  Categories=Office;Presentation
 -StartupNotify=false
 +StartupNotify=@STARTUPNOTIFY@
- MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint
+ MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint@ADD_OPENXML_PRESENTATION_MIME@
  InitialPreference=5
  _Name=OpenOffice.org Impress
 --- desktop/math.desktop.in.in 
diff --git a/app-office/openoffice/files/digest-openoffice-2.1.0 b/app-office/openoffice/files/digest-openoffice-2.1.0
index fa8084fe0c06..7a8e6dad03b7 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 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 82bb16b6595200216155736e3a04a791 ooo-build-2.1.7.tar.gz 4250358
+RMD160 91d5d40affc7ca8a5db7b4324e5ba28733f14bc6 ooo-build-2.1.7.tar.gz 4250358
+SHA256 8ef5f8f65619f32dfe0ced5b53901a28696b524f9584658e36c76fae632e724e ooo-build-2.1.7.tar.gz 4250358
 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 ef32a70ff847..5ef704b2406f 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.16 2007/02/10 17:04:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.17 2007/03/06 19:04:22 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.5"
+MY_PV="2.1.7"
 PATCHLEVEL="OOE680"
 SRC="OOo_${PV}_src"
 S="${WORKDIR}/ooo"
@@ -199,6 +199,7 @@ src_unpack() {
 	#Some fixes for our patchset
 	cd ${S}
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
+	epatch ${FILESDIR}/${PV}/detect-db4.5.diff
 	epatch ${FILESDIR}/${PV}/wrapper-readd.diff
 	cp -f ${FILESDIR}/${PV}/ooo-wrapper.in ${S}/bin || die