Fix compilation without LDAP (bug #370233) and add missing ldap USE flag

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 46 insertions, 9 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 19eceaeb665e..f09ca11c7d70 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.166 2011/06/03 17:42:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.167 2011/06/06 14:36:43 angelos Exp $
+
+  06 Jun 2011; Christoph Mende <angelos@gentoo.org> libgda-4.2.8.ebuild,
+  +files/libgda-4.2.8-ldap.patch:
+  Fix compilation without LDAP (bug #370233) and add missing ldap USE flag
 
 *libgda-4.2.8 (03 Jun 2011)
 
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index d425d2519c8f..db411aacdbef 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libgda-4.2.0-missing-include-in-keyword_hash-generator.patch 897 RMD160 2a879a730831b7d6c05bf3a48df542cbf025adc4 SHA1 d76018f2b545290174cce55be7c4561edf7772bc SHA256 7cc133de8931b1dc86a08ee7a620e8b9218071723549734ea2290440318a7b8f
 AUX libgda-4.2.2-fix-build-order.patch 738 RMD160 b17874c3aab6b50b342e612e24bc706f4b6a077d SHA1 f72ecb1dd74a776decfb8fc6c7de1b0ceec90d43 SHA256 d8a293598d8277b766f5971066b27aeab45e2ead491b2250b5d700577c44a0e1
 AUX libgda-4.2.5-missing-m4.patch 359 RMD160 495d1eb184ffeb1d529a385291b61b41fccff445 SHA1 55c70bfdbaf9411a10ddf6f63b71f6e12b315703 SHA256 ed03d29bdb6454d6a54bd21cb1844ecd294e2d58593ec58496deb09953176b2f
+AUX libgda-4.2.8-ldap.patch 900 RMD160 aa2bb0c3972cbc06408b3905cea97ecde7b4d3c8 SHA1 c343c8f054706738691a3691b1db601b3d7df20a SHA256 fe2ca3407626b87b9daca3f20293ba91de7faeb099312ee0a1b627561f19f07f
 DIST libgda-3.0.4.tar.bz2 2908854 RMD160 6efbf5a0f40277124dcc5464168677cc97be40e3 SHA1 50ba121e05ab1fbe95b66e8df4f54a0c6a30ef23 SHA256 3f9d75e9bc50610bf6033863b79265c7c9c702323b918caf90eb3923f971da48
 DIST libgda-4.2.2.tar.bz2 14091997 RMD160 2604f68f25ee1a44b9b44897a6d06a7d2ede63c1 SHA1 124c00c977b0cfd4a615c925ec79ee0ff97e107f SHA256 7d0bfca2eda3158fb44ff05890aabd79e6e4b357a03574eacf380dc03bcb9d87
 DIST libgda-4.2.7.tar.bz2 12636540 RMD160 ab3587f3ed2d049cd1e7bd1f051188e7f2405470 SHA1 8c2b1a744ba50008fa230be0f0abebdb8ea9b0b9 SHA256 0c95d2ae4563bbb024c9179a20e95a4b544a7d4fc687ca79ac6b33c5adc113d5
@@ -11,13 +12,13 @@ DIST libgda-4.2.8.tar.bz2 13130319 RMD160 ae4d1264b68122b3670c7bfbb7bc9b80fee9ae
 EBUILD libgda-3.0.4.ebuild 1995 RMD160 e8c0f30a4cc85d69c98ac3162a61c4cdb70cb039 SHA1 5aa1b85875f7aa3b64f7af9c6eaec3dbb00f4653 SHA256 daddd4b35901c0848fcd1f7c7f63193c44e1d9935701f0d49ce71aecc448832b
 EBUILD libgda-4.2.2.ebuild 3523 RMD160 3c2d6d860bce908a4899a1e4650423d767757cad SHA1 a029fdb96de02751d8a6751ca542deb90925c835 SHA256 4f0926ae46da5228ab8f6d389c7988acab75ca186fdb887898b202d8d6482bd9
 EBUILD libgda-4.2.7.ebuild 3673 RMD160 13189551efe8edf9338506a5bc6e3021055954dc SHA1 3e455d0345232a7781a0ff80e552d8f67ac41e10 SHA256 ceeb342355f59f7ef04088d1ab30e0e51fab76983fad85d68f3ab9841ce47bbf
-EBUILD libgda-4.2.8.ebuild 3673 RMD160 423df451e16239926f460586f10541ba44f76f4e SHA1 2cb2346edb93839f88e2592d174546198578382d SHA256 037aac3f6bf6e58b644de99dbd5d8639e5f2c8263d3f6ceb5f5ea8a7df5df877
-MISC ChangeLog 25110 RMD160 3df498f95d253f80e09ef4b8b81f6cdecd183c79 SHA1 6caa0b868c234eaf799a699e44faa7e9857ab012 SHA256 c2bd77a5226d9217d68c1a1ac5a94d1d08525a2b3584ef591f48c743b75c9086
+EBUILD libgda-4.2.8.ebuild 3833 RMD160 367a3972ce822ffb4bb88fb7bd311fce6483148b SHA1 d450aa3ddd83fa5a332d86664dc1010eca42fc60 SHA256 866adfdd2da33f3b9f514f930fc5d9744dfed774762fb3c0d8a31751f51b81c9
+MISC ChangeLog 25295 RMD160 899b2c990d6cbe82f9157e9a704859fd83b52613 SHA1 08e4aa51a485ecaa3a41dda41f68cd79f9c4f6c4 SHA256 199d4a96ff42728ff32d31f210d40bf2992d6bfee2b419511ba557d48aec8c7a
 MISC metadata.xml 662 RMD160 b1ccb1efcefacfebab6e65d48e8bcd9cb5fa26b2 SHA1 d2faa83fd89fb86dbadfb846dd163633871a00b9 SHA256 ec5b2e3142cec4f76603d13d30843a887294646f285c278fc9e1258dae8e78e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3pHP4ACgkQCaWpQKGI+9Q3XgCfVdPyZXuzu2OIIOdaj+m7rYvO
-NygAni6kRWq3swASvjvUd9RJU+yg7yL1
-=Zerb
+iF4EAREIAAYFAk3s5gEACgkQmWq1bYTyC0MH6QD/TbWtZd2ON0Xw2x91dlRIV1qk
+3mm655pPaRlqmQUNIYUA/0TuNdH1WDC9ZTxQioqavs61RzB+ZG/jB/0bABMjFh9m
+=iCw3
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch b/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch
new file mode 100644
index 000000000000..b8f6d3119b0a
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch
@@ -0,0 +1,27 @@
+From f8042173c2139f65c69502a393fb44e00124ecc6 Mon Sep 17 00:00:00 2001
+From: Daniel Espinosa <esodan@gmail.com>
+Date: Thu, 02 Jun 2011 15:51:52 +0000
+Subject: Added checks for LDAP on table-columns for GdaBrowser
+
+---
+diff --git a/tools/browser/schema-browser/table-columns.c b/tools/browser/schema-browser/table-columns.c
+index 80cdaee..26ad771 100644
+--- a/tools/browser/schema-browser/table-columns.c
++++ b/tools/browser/schema-browser/table-columns.c
+@@ -117,12 +117,14 @@ table_columns_show_all (GtkWidget *widget)
+ {
+ 	TableColumns *tcolumns = (TableColumns *) widget;
+         GTK_WIDGET_CLASS (parent_class)->show_all (widget);
++#ifdef HAVE_LDAP
+ 	if (browser_connection_is_ldap (tcolumns->priv->bcnc)) {
+ 		if (! tcolumns->priv->ldap_props_shown) {
+ 			gtk_widget_hide (tcolumns->priv->ldap_header);
+ 			gtk_widget_hide (tcolumns->priv->ldap_text);
+ 		}
+ 	}
++#endif
+ }
+ 
+ GType
+--
+cgit v0.9
diff --git a/gnome-extra/libgda/libgda-4.2.8.ebuild b/gnome-extra/libgda/libgda-4.2.8.ebuild
index ed3d2c1da539..93d5e61721e5 100644
--- a/gnome-extra/libgda/libgda-4.2.8.ebuild
+++ b/gnome-extra/libgda/libgda-4.2.8.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/gnome-extra/libgda/libgda-4.2.8.ebuild,v 1.1 2011/06/03 17:42:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.8.ebuild,v 1.2 2011/06/06 14:36:43 angelos Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome-db.org/"
 LICENSE="GPL-2 LGPL-2"
 
 # MDB support currently works with CVS only, so disable it in the meantime
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json mysql oci8 postgres sourceview ssl"
+IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mysql oci8 postgres sourceview ssl"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
@@ -39,6 +39,7 @@ RDEPEND="
 	http? ( >=net-libs/libsoup-2.24:2.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
 	json?     ( dev-libs/json-glib )
+	ldap?     ( net-nds/openldap )
 	mysql?    ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
 	ssl?      ( dev-libs/openssl )
@@ -84,6 +85,7 @@ pkg_setup() {
 		$(use_enable introspection gda-gi)
 		$(use_enable introspection gdaui-gi)
 		$(use_with java java $JAVA_HOME)
+		$(use_with ldap)
 		$(use_with mysql mysql /usr)
 		$(use_with postgres postgres /usr)
 		$(use_enable ssl crypto)
@@ -116,6 +118,9 @@ src_prepare() {
 	# Fix compilation failure of keyword_hash.c, upstream #630959
 	epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
 
+	# Fix compilation without ldap, bug #370233, upstream #651713
+	epatch "${FILESDIR}/${P}-ldap.patch"
+
 	intltoolize --force --copy --automake || die
 	eautoreconf
 }