Really fix the build with -ldap

Package-Manager: portage-2.0.53_rc5

6 files changed, 51 insertions, 12 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 37653bef29f2..d53df66f30d3 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.129 2005/10/11 19:01:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.130 2005/10/12 10:21:47 suka Exp $
+
+  12 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.0/no-ldap-mozilla.diff, files/2.0.0/gentoo-2.0.0_rc2.diff,
+  openoffice-2.0.0_rc2.ebuild:
+  Really fix the build with -ldap
 
   11 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
   files/2.0.0/gentoo-2.0.0_rc2.diff,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 25e871da7acd..e6eb83bcdba2 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 f4a88283d84a6e650573dd419aad8244 ChangeLog 28517
+MD5 44c5fd238aa72b697819310901a494d7 ChangeLog 28708
 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
@@ -32,11 +32,12 @@ 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 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 f9ceaf5d6ea10d047fbcf55e1dd71630 files/2.0.0/gentoo-2.0.0_rc2.diff 1386
+MD5 078172057d5be938e24273c359b42435 files/2.0.0/no-ldap-mozilla.diff 1292
 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 cd8007c1f613acc2ee85255b0d20b711 files/digest-openoffice-2.0.0_rc2 416
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 24a71b651725fb2020f2104b88fee37a openoffice-2.0.0_rc2.ebuild 6999
+MD5 159fb7fbb76e97136b7fb924143563c6 openoffice-2.0.0_rc2.ebuild 6968
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 3faa396f17ab..b4993c1198e3 100644
--- 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
@@ -19,11 +19,12 @@
  
  # Don't fail when building --without-stlport4
  buildfix-ucb-without-stlport4.diff
-@@ -733,6 +730,7 @@
+@@ -732,6 +734,8 @@
  [ GentooOnly ]
  version-2-0-sysuserconfig.diff
  gentoo-splash.diff
 +no-fontooo-wizard.diff
++no-ldap-mozilla.diff
  
  #
  # NOTE: 64 bit OOo is work in progress!
diff --git a/app-office/openoffice/files/2.0.0/no-ldap-mozilla.diff b/app-office/openoffice/files/2.0.0/no-ldap-mozilla.diff
new file mode 100644
index 000000000000..da503de579b1
--- /dev/null
+++ b/app-office/openoffice/files/2.0.0/no-ldap-mozilla.diff
@@ -0,0 +1,33 @@
+--- config_office/configure.in.orig	2005-08-11 16:07:16.000000000 +0200
++++ config_office/configure.in	2005-08-13 12:39:17.000000000 +0200
+@@ -2784,7 +2784,7 @@
+ fi
+ 
+ AC_MSG_CHECKING([whether to build LDAP configuration backend])
+-if test "$enable_mozilla" = "no" && test "$enable_openldap" != "yes"; then
++if test "$enable_openldap" != "yes"; then
+    AC_MSG_RESULT([no. Either Mozilla or OpenLDAP needed.])
+    WITH_LDAP=NO
+ elif test "$with_system_mozilla" = "yes" || test "$enable_openldap" = "yes"; then
+--- extensions/source/config/ldap/makefile.mk.orig	2005-06-19 02:53:37.725788224 +0200
++++ extensions/source/config/ldap/makefile.mk	2005-06-19 02:54:17.068807176 +0200
+@@ -75,7 +75,7 @@
+ .INCLUDE : settings.mk
+ DLLPRE =
+ 
+-.IF "$(WITH_MOZILLA)" == "NO" && "$(WITH_OPENLDAP)" != "YES"
++.IF "$(WITH_OPENLDAP)" != "YES"
+ @all:
+ 	@echo "Mozilla disabled and no OpenLDAP wanted -> LDAP disabled."
+ .ENDIF
+--- scp2/source/ooo/file_library_ooo.scp.orig	2005-08-18 14:53:05.000000000 +0200
++++ scp2/source/ooo/file_library_ooo.scp	2005-08-18 14:53:11.000000000 +0200
+@@ -185,7 +185,7 @@
+ End
+ 
+ #ifndef WITHOUT_LDAP
+-#if !defined WITHOUT_MOZILLA || defined WITH_OPENLDAP
++#if defined WITH_OPENLDAP
+ File gid_File_Lib_Ldapbe2
+     TXT_FILE_BODY;
+     Styles = (PACKED,UNO_COMPONENT,PATCH);
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.0_rc2 b/app-office/openoffice/files/digest-openoffice-2.0.0_rc2
index 401d0aadf074..a52f57f19cf4 100644
--- a/app-office/openoffice/files/digest-openoffice-2.0.0_rc2
+++ b/app-office/openoffice/files/digest-openoffice-2.0.0_rc2
@@ -1,5 +1,5 @@
 MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
-MD5 b02c7bc05031f4fb7ac15c8a31a01ef4 ooo-build-2.0.rc2.tar.gz 4142886
+MD5 9359995ab8e140e0eaab7c6f571b6d46 ooo-build-2.0.rc2-2.tar.gz 4130987
 MD5 953371e1907b03e14895bababd019443 ooo680-m2-core.tar.bz2 156979138
 MD5 793c55bcf17e52b7d888729f55d984b6 ooo680-m2-lang.tar.bz2 33104453
 MD5 e5ec50d3c1b78d6880037d88036657e5 ooo680-m2-system.tar.bz2 19325507
diff --git a/app-office/openoffice/openoffice-2.0.0_rc2.ebuild b/app-office/openoffice/openoffice-2.0.0_rc2.ebuild
index 40d04b5233c3..d92cd02d09b0 100644
--- a/app-office/openoffice/openoffice-2.0.0_rc2.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0_rc2.ebuild
@@ -1,13 +1,13 @@
 # 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.4 2005/10/11 19:01:22 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0_rc2.ebuild,v 1.5 2005/10/12 10:21:47 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
 IUSE="curl eds gnome java kde ldap mozilla nas python zlib xml2"
 
 OO_VER="${PV/_rc2}"
-MY_PV="2.0.rc2"
+MY_PV="2.0.rc2-2"
 PATCHLEVEL="OOO680"
 PATCHDIR="${WORKDIR}/ooo-build-${MY_PV}"
 SRC="ooo680-m2"
@@ -39,6 +39,7 @@ RDEPEND="!app-office/openoffice-bin
 		>=gnome-base/gconf-2.0 )
 	eds? ( >=gnome-extra/evolution-data-server-1.2 )
 	kde? ( kde-base/kdelibs )
+	mozilla? ( >=www-client/mozilla-1.7.10 )
 	>=x11-libs/startup-notification-0.5
 	>=media-libs/freetype-2.1.4
 	>=media-libs/fontconfig-2.2.0
@@ -78,10 +79,7 @@ PROVIDE="virtual/ooo"
 pkg_setup() {
 
 	ewarn
-	ewarn " This is a pre-release, so expect stuff to be broken, in fact there are "
-	ewarn " known problems. To sum it up: Good luck, you are on your own. "
 
-	ewarn
 	ewarn " It is important to note that OpenOffice.org is a very fragile  "
 	ewarn " build when it comes to CFLAGS.  A number of flags have already "
 	ewarn " been filtered out.  If you experience difficulty merging this  "
@@ -124,6 +122,7 @@ src_unpack() {
 
 	#Additional and new patches get here
 	cp -pPRf ${FILESDIR}/${OO_VER}/config_office-openldap-fix.diff ${PATCHDIR}/patches/src680 || die
+	cp -pPRf ${FILESDIR}/${OO_VER}/no-ldap-mozilla.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"