public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r1.ebuild ChangeLog libreoffice-3.4.9999-r1.ebuild libreoffice-3.4.4.2.ebuild
@ 2011-11-07 18:04 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; only message in thread
From: Tomas Chvatal (scarabeus) @ 2011-11-07 18:04 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/11/07 18:04:49

  Modified:             libreoffice-9999-r1.ebuild ChangeLog
                        libreoffice-3.4.9999-r1.ebuild
                        libreoffice-3.4.4.2.ebuild
  Log:
  Punt ldap until fixed updstream, feature is nice but non-working with system libs.
  
  (Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

Revision  Changes    Path
1.53                 app-office/libreoffice/libreoffice-9999-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?r1=1.52&r2=1.53

Index: libreoffice-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- libreoffice-9999-r1.ebuild	2 Nov 2011 18:27:01 -0000	1.52
+++ libreoffice-9999-r1.ebuild	7 Nov 2011 18:04:49 -0000	1.53
@@ -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 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 @@
 		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 @@
 	# --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 @@
 		--disable-ext-report-builder \
 		--disable-kdeab \
 		--disable-kde \
+		--disable-ldap \
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
@@ -439,7 +440,6 @@
 		$(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 @@
 		$(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) \



1.191                app-office/libreoffice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.191&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.191&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.190&r2=1.191

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- ChangeLog	2 Nov 2011 19:18:36 -0000	1.190
+++ ChangeLog	7 Nov 2011 18:04:49 -0000	1.191
@@ -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)
 



1.19                 app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?r1=1.18&r2=1.19

Index: libreoffice-3.4.9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libreoffice-3.4.9999-r1.ebuild	2 Nov 2011 12:28:22 -0000	1.18
+++ libreoffice-3.4.9999-r1.ebuild	7 Nov 2011 18:04:49 -0000	1.19
@@ -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 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 @@
 		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 @@
 		--disable-gnome-vfs \
 		--disable-kdeab \
 		--disable-kde \
+		--disable-ldap \
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
@@ -480,7 +480,6 @@
 		$(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 @@
 		$(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) \



1.2                  app-office/libreoffice/libreoffice-3.4.4.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2.ebuild?r1=1.1&r2=1.2

Index: libreoffice-3.4.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-3.4.4.2.ebuild	2 Nov 2011 19:18:36 -0000	1.1
+++ libreoffice-3.4.4.2.ebuild	7 Nov 2011 18:04:49 -0000	1.2
@@ -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 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 @@
 		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 @@
 		--disable-gnome-vfs \
 		--disable-kdeab \
 		--disable-kde \
+		--disable-ldap \
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
@@ -480,7 +480,6 @@
 		$(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 @@
 		$(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) \






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-11-07 18:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-07 18:04 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r1.ebuild ChangeLog libreoffice-3.4.9999-r1.ebuild libreoffice-3.4.4.2.ebuild Tomas Chvatal (scarabeus)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox