Punt ldap until fixed updstream, feature is nice but non-working with system libs.

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

4 files changed, 17 insertions, 16 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 8a9a1199aefc..7ba2b6c9b954 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.190 2011/11/02 19:18:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.191 2011/11/07 18:04:49 scarabeus Exp $
+
+  07 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.4.2.ebuild, libreoffice-3.4.9999-r1.ebuild,
+  libreoffice-9999-r1.ebuild:
+  Punt ldap until fixed updstream, feature is nice but non-working with system
+  libs.
 
 *libreoffice-3.4.4.2 (02 Nov 2011)
 
diff --git a/app-office/libreoffice/libreoffice-3.4.4.2.ebuild b/app-office/libreoffice/libreoffice-3.4.4.2.ebuild
index 52e05398323f..58b5f92b01d5 100644
--- a/app-office/libreoffice/libreoffice-3.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2.ebuild,v 1.1 2011/11/02 19:18:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2.ebuild,v 1.2 2011/11/07 18:04:49 scarabeus Exp $
 
 EAPI=4
 
@@ -76,7 +76,7 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
-gstreamer gtk jemalloc kde ldap mysql nsplugin odk opengl pdfimport python
+gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python
 templates test +vba webdav"
 LICENSE="LGPL-3"
 SLOT="0"
@@ -137,7 +137,6 @@ COMMON_DEPEND="
 		dev-java/saxon:0
 	)
 	jemalloc? ( dev-libs/jemalloc )
-	ldap? ( net-nds/openldap )
 	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
 	nsplugin? (
 		net-libs/xulrunner:1.9
@@ -441,6 +440,7 @@ src_configure() {
 		--disable-gnome-vfs \
 		--disable-kdeab \
 		--disable-kde \
+		--disable-ldap \
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
@@ -480,7 +480,6 @@ src_configure() {
 		$(use_enable gtk systray) \
 		$(use_enable java ext-scripting-beanshell) \
 		$(use_enable kde kde4) \
-		$(use_enable ldap) \
 		$(use_enable mysql ext-mysql-connector) \
 		$(use_enable nsplugin mozilla) \
 		$(use_enable odk) \
@@ -491,7 +490,6 @@ src_configure() {
 		$(use_enable vba activex-component) \
 		$(use_enable webdav neon) \
 		$(use_with java) \
-		$(use_with ldap openldap) \
 		$(use_with mysql system-mysql-cppconn) \
 		$(use_with nsplugin system-mozilla libxul) \
 		$(use_with templates sun-templates) \
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index fc1493f16bac..4960ef15a791 100644
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.18 2011/11/02 12:28:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.19 2011/11/07 18:04:49 scarabeus Exp $
 
 EAPI=4
 
@@ -76,7 +76,7 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
-gstreamer gtk jemalloc kde ldap mysql nsplugin odk opengl pdfimport python
+gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python
 templates test +vba webdav"
 LICENSE="LGPL-3"
 SLOT="0"
@@ -137,7 +137,6 @@ COMMON_DEPEND="
 		dev-java/saxon:0
 	)
 	jemalloc? ( dev-libs/jemalloc )
-	ldap? ( net-nds/openldap )
 	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
 	nsplugin? (
 		net-libs/xulrunner:1.9
@@ -441,6 +440,7 @@ src_configure() {
 		--disable-gnome-vfs \
 		--disable-kdeab \
 		--disable-kde \
+		--disable-ldap \
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
@@ -480,7 +480,6 @@ src_configure() {
 		$(use_enable gtk systray) \
 		$(use_enable java ext-scripting-beanshell) \
 		$(use_enable kde kde4) \
-		$(use_enable ldap) \
 		$(use_enable mysql ext-mysql-connector) \
 		$(use_enable nsplugin mozilla) \
 		$(use_enable odk) \
@@ -491,7 +490,6 @@ src_configure() {
 		$(use_enable vba activex-component) \
 		$(use_enable webdav neon) \
 		$(use_with java) \
-		$(use_with ldap openldap) \
 		$(use_with mysql system-mysql-cppconn) \
 		$(use_with nsplugin system-mozilla libxul) \
 		$(use_with templates sun-templates) \
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 90ed930471da..a0876f4d81bd 100644
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.52 2011/11/02 18:27:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.53 2011/11/07 18:04:49 scarabeus Exp $
 
 EAPI=4
 
@@ -77,7 +77,7 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk
-+jemalloc kde ldap mysql nsplugin odk opengl pdfimport svg templates test +vba
++jemalloc kde mysql nsplugin odk opengl pdfimport svg templates test +vba
 +webdav +xmlsec"
 LICENSE="LGPL-3"
 SLOT="0"
@@ -147,7 +147,6 @@ COMMON_DEPEND="
 		dev-java/saxon:0
 	)
 	jemalloc? ( dev-libs/jemalloc )
-	ldap? ( net-nds/openldap )
 	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
 	nsplugin? (
 		net-libs/xulrunner:1.9
@@ -366,6 +365,7 @@ src_configure() {
 	# --disable-gnome-vfs: old gnome virtual fs support
 	# --disable-kdeab: kde3 adressbook
 	# --disable-kde: kde3 support
+	# --disable-ldap: ldap requires internal mozilla stuff, same like mozab
 	# --disable-pch: precompiled headers cause build crashes
 	# --disable-rpath: relative runtime path is not desired
 	# --disable-static-gtk: ensure that gtk is linked dynamically
@@ -398,6 +398,7 @@ src_configure() {
 		--disable-ext-report-builder \
 		--disable-kdeab \
 		--disable-kde \
+		--disable-ldap \
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
@@ -439,7 +440,6 @@ src_configure() {
 		$(use_enable gtk systray) \
 		$(use_enable java ext-scripting-beanshell) \
 		$(use_enable kde kde4) \
-		$(use_enable ldap) \
 		$(use_enable mysql ext-mysql-connector) \
 		$(use_enable nsplugin mozilla) \
 		$(use_enable odk) \
@@ -452,7 +452,6 @@ src_configure() {
 		$(use_enable webdav neon) \
 		$(use_enable xmlsec) \
 		$(use_with java) \
-		$(use_with ldap openldap) \
 		$(use_with mysql system-mysql-cppconn) \
 		$(use_with nsplugin system-mozilla libxul) \
 		$(use_with templates sun-templates) \