First shot at fixing bug #108898, added patch to fix broken OOo configure-script

Package-Manager: portage-2.0.53_rc5

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 2b2fb55a98c0ed58c06cb6e59fc0203cbcf1bf34..37653bef29f2a8bcd21ef3eab87d4bd4aa16cb79 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.128 2005/10/11 15:18:07 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.129 2005/10/11 19:01:22 suka Exp $
+
+  11 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0_rc2.diff,
+  +files/2.0.0/config_office-openldap-fix.diff, openoffice-2.0.0_rc2.ebuild:
+  First shot at fixing bug #108898, added patch to fix broken OOo
+  configure-script
 
   11 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.0_rc2.ebuild:

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index dce1492acd4d18920e0315af5c067b7143cdfc53..25e871da7acdead7230c87b18c1632def6f3a264 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 0310da2a8c9eddbe154771f4a52599a2 ChangeLog 28264
+MD5 f4a88283d84a6e650573dd419aad8244 ChangeLog 28517
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
@@ -31,11 +31,12 @@ MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092
 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
-MD5 451ba8a0ffcf837d73ff47b26205e931 files/2.0.0/gentoo-2.0.0_rc2.diff 1034
+MD5 4821a498748cc2b42dd3d32b27c95da9 files/2.0.0/config_office-openldap-fix.diff 484
+MD5 6fca6d01f51be3563e9e7cb8b4c52ea0 files/2.0.0/gentoo-2.0.0_rc2.diff 1364
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
 MD5 c42ff313cdc05c1102bbe41e5d9d5f07 files/digest-openoffice-2.0.0_rc2 414
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 15a6d6f1adee9e4b71ab14c4b9b12708 openoffice-2.0.0_rc2.ebuild 6862
+MD5 24a71b651725fb2020f2104b88fee37a openoffice-2.0.0_rc2.ebuild 6999

diff --git a/app-office/openoffice/files/2.0.0/config_office-openldap-fix.diff b/app-office/openoffice/files/2.0.0/config_office-openldap-fix.diff
new file mode 100644 (file)
index 0000000..0c3f859
--- /dev/null
+++ b/app-office/openoffice/files/2.0.0/config_office-openldap-fix.diff
@@ -0,0 +1,11 @@
+--- config_office/configure.in 
++++ config_office/configure.in
+@@ -2885,7 +2885,7 @@
+    dnl Test whether we want to use the Mozilla or the OpenLDAP LDAP SDK
+    dnl ===================================================================
+    AC_MSG_CHECKING([which LDAP SDK to use])
+-   if test -n "$enable_openldap"; then
++   if test -n "$enable_openldap" && test "$enable_openldap" != "no"; then
+          AC_MSG_RESULT([OpenLDAP])
+          WITH_OPENLDAP=YES
+          AC_CHECK_HEADERS(ldap.h, [],

diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff
index b21d0fd7b69dde01523fe5ce9203de10343a8c4f..3faa396f17ab9c3b210478118fb504634cb93d9a 100644 (file)
--- a/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff
+++ b/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff
@@ -10,6 +10,15 @@
  
  [ DebianBaseOnly ]
  odk-remove-non-free.diff
+@@ -496,6 +496,8 @@
+ config_office-system-db-4.3.diff
+ # fix the configure check for system mozilla and python, thanks to suka
+ config_office-system-mozila-python-fix.diff
++# fix the configure check for openldap
++config_office-openldap-fix.diff
+ 
+ # Don't fail when building --without-stlport4
+ buildfix-ucb-without-stlport4.diff
 @@ -733,6 +730,7 @@
  [ GentooOnly ]
  version-2-0-sysuserconfig.diff

diff --git a/app-office/openoffice/openoffice-2.0.0_rc2.ebuild b/app-office/openoffice/openoffice-2.0.0_rc2.ebuild
index a7d8ea23301a2f70cd85d0ed486e06c7308f199f..40d04b5233c308b19e678ebfdb5843a6ed258b4d 100644 (file)
--- a/app-office/openoffice/openoffice-2.0.0_rc2.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0_rc2.ebuild,v 1.3 2005/10/11 15:25:15 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0_rc2.ebuild,v 1.4 2005/10/11 19:01:22 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -122,6 +122,9 @@ src_unpack() {
        cd ${PATCHDIR}
        epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.diff
 
+       #Additional and new patches get here
+       cp -pPRf ${FILESDIR}/${OO_VER}/config_office-openldap-fix.diff ${PATCHDIR}/patches/src680 || die
+
        #Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only
        use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo"