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

(Portage version: 2.1.2.1)

5 files changed, 24 insertions, 22 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/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