Fix installation, bug #385251 by Henrique Dias and work properly when python3 is main interpreter. Remove old.

(Portage version: 2.1.10.27/cvs/Linux x86_64)

7 files changed, 15 insertions, 350 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 9d66e41fd20b..9c34677e9306 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,13 @@
 # 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.179 2011/10/14 21:25:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.180 2011/10/16 00:05:35 pacho Exp $
+
+  16 Oct 2011; Pacho Ramos <pacho@gentoo.org> -libgda-4.2.2.ebuild,
+  -files/libgda-4.2.5-missing-m4.patch, -libgda-4.2.8.ebuild,
+  -files/libgda-4.2.8-ldap.patch, -files/libgda-4.2.8-sandbox-fix.patch,
+  libgda-4.99.4.ebuild:
+  Fix installation, bug #385251 by Henrique Dias and work properly when python3
+  is main interpreter. Remove old.
 
   14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> libgda-4.2.9.ebuild:
   amd64 stable wrt #385699
diff --git a/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch b/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch
deleted file mode 100644
index bea88cf70bbb..000000000000
--- a/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 7ce16f8..3f5ae10 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,6 +5,7 @@ m4_define([gda_stable],
- 	m4_if(m4_eval(minor % 2), [0], [yes], [no]))
- AC_CONFIG_MACRO_DIR([m4])
- m4_include(m4/introspection.m4)
-+m4_include(m4/dk-warn.m4)
- m4_include(m4/mdbtools.m4)
- m4_include(m4/bdb.m4)
- m4_include(m4/mysql.m4)
diff --git a/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch b/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch
deleted file mode 100644
index b8f6d3119b0a..000000000000
--- a/gnome-extra/libgda/files/libgda-4.2.8-ldap.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/files/libgda-4.2.8-sandbox-fix.patch b/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch
deleted file mode 100644
index 8d24430972d5..000000000000
--- a/gnome-extra/libgda/files/libgda-4.2.8-sandbox-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 9c1a1809650321c3d752a143f87089d325c49237 Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Mon, 06 Jun 2011 18:42:19 +0000
-Subject: Correction for bug #651922 - libgda-4.2.8 wants to write on /etc/libgda-4.0/config during compilation with --enable-gtk-doc
-
----
-diff --git a/libgda/gda-config.c b/libgda/gda-config.c
-index e1b65c0..e0a51c7 100644
---- a/libgda/gda-config.c
-+++ b/libgda/gda-config.c
-@@ -20,6 +20,7 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#include <unistd.h>
- #include <stdio.h>
- #include <gmodule.h>
- #include <libgda/gda-config.h>
-@@ -630,12 +631,34 @@ gda_config_constructor (GType type,
- 										    LIBGDA_ABI_NAME, "config", NULL);
- 		unique_instance->priv->system_config_allowed = FALSE;
- 		if (unique_instance->priv->system_file) {
-+#ifdef G_OS_WIN32
-+
- 			FILE *file;
-                         file = fopen (unique_instance->priv->system_file, "a");  /* Flawfinder: ignore */
-                         if (file) {
-                                 unique_instance->priv->system_config_allowed = TRUE;
-                                 fclose (file);
-                         }
-+#else
-+			struct stat stbuf;
-+			if (stat (unique_instance->priv->system_file, &stbuf) == 0) {
-+				/* use effective user and group IDs */
-+				uid_t euid;
-+				gid_t egid;
-+				euid = geteuid ();
-+				egid = getegid ();
-+				if (euid == stbuf.st_uid) {
-+					if ((stbuf.st_mode & S_IWUSR) && (stbuf.st_mode & S_IRUSR))
-+						unique_instance->priv->system_config_allowed = TRUE;
-+				}
-+				else if (egid == stbuf.st_gid) {
-+					if ((stbuf.st_mode & S_IWGRP) && (stbuf.st_mode & S_IRGRP))
-+						unique_instance->priv->system_config_allowed = TRUE;
-+				}
-+				else if ((stbuf.st_mode & S_IWOTH) && (stbuf.st_mode & S_IROTH))
-+					unique_instance->priv->system_config_allowed = TRUE;
-+			}
-+#endif
- 		}
- 
- 		/* Setup file monitoring */
---
-cgit v0.9
diff --git a/gnome-extra/libgda/libgda-4.2.2.ebuild b/gnome-extra/libgda/libgda-4.2.2.ebuild
deleted file mode 100644
index 6f83b3b5caf0..000000000000
--- a/gnome-extra/libgda/libgda-4.2.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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.2.ebuild,v 1.8 2011/03/22 19:30:35 ranger Exp $
-
-EAPI="3"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2
-
-DESCRIPTION="Gnome Database Access Library"
-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"
-SLOT="4"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-# FIXME: sqlite is automagic, but maybe it is a hard-dep
-# FIXME: autoconf is a hell of inconsistencies
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	dev-libs/libunique:1
-	sys-libs/readline
-	sys-libs/ncurses
-	berkdb?   ( sys-libs/db )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	gtk? (
-		>=x11-libs/gtk+-2.12:2
-		canvas? ( x11-libs/goocanvas:0 )
-		sourceview? ( x11-libs/gtksourceview:2.0 )
-		graphviz? ( media-gfx/graphviz )
-	)
-	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
-	http? ( >=net-libs/libsoup-2.24:2.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
-	json?     ( dev-libs/json-glib )
-	mysql?    ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ssl?      ( dev-libs/openssl )
-	>=dev-db/sqlite-3.6.22:3"
-#	mdb?      ( >app-office/mdbtools-0.5 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.18
-	>=dev-util/intltool-0.35.5
-	>=app-text/gnome-doc-utils-0.9
-	>=dev-util/gtk-doc-am-1
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-# Tests are not really good
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use canvas || use graphviz || use sourceview; then
-		if ! use gtk; then
-			ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
-			ewarn "Disabling for now."
-			G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
-		else
-			G2CONF="${G2CONF}
-				$(use_with canvas goocanvas)
-				$(use_with graphviz)
-				$(use_with sourceview gtksourceview)"
-		fi
-	fi
-
-	G2CONF="${G2CONF}
-		--with-unique
-		--disable-scrollkeeper
-		--disable-static
-		--enable-system-sqlite
-		$(use_with berkdb bdb /usr)
-		$(use_with gnome-keyring)
-		$(use_with gtk ui)
-		$(use_with http libsoup)
-		$(use_enable introspection)
-		$(use_with java java $JAVA_HOME)
-		$(use_with mysql mysql /usr)
-		$(use_with postgres postgres /usr)
-		$(use_enable ssl crypto)
-		--without-mdb"
-#		$(use_with mdb mdb /usr)
-
-	if use bindist; then
-		# firebird license is not GPL compatible
-		G2CONF="${G2CONF} --without-firebird"
-	else
-		G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
-	fi
-
-	use berkdb && append-cppflags "-I$(db_includedir)"
-	# --disable-json doesn't work, upstream bug #636439
-	use json && G2CONF="${G2CONF} --enable-json"
-	use oci8 || G2CONF="${G2CONF} --without-oracle"
-
-	# Not in portage
-	G2CONF="${G2CONF}
-		--disable-default-binary"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix build order for generated content, upstream #630958
-	epatch "${FILESDIR}/${PN}-4.2.2-fix-build-order.patch"
-
-	# Fix compilation failure of keyword_hash.c, upstream #630959
-	epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
-
-	intltoolize --force --copy --automake || die
-	eautoreconf
-}
-
-src_test() {
-	emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
-}
diff --git a/gnome-extra/libgda/libgda-4.2.8.ebuild b/gnome-extra/libgda/libgda-4.2.8.ebuild
deleted file mode 100644
index c8b95da67d2d..000000000000
--- a/gnome-extra/libgda/libgda-4.2.8.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.4 2011/06/25 15:30:46 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2
-
-DESCRIPTION="Gnome Database Access Library"
-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 ldap mysql oci8 postgres sourceview ssl"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# FIXME: sqlite is automagic, but maybe it is a hard-dep
-# FIXME: autoconf is a hell of inconsistencies
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	dev-libs/libunique:1
-	sys-libs/readline
-	sys-libs/ncurses
-	berkdb?   ( sys-libs/db )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	gtk? (
-		|| ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 )
-		canvas? ( x11-libs/goocanvas:0 )
-		sourceview? ( x11-libs/gtksourceview:2.0 )
-		graphviz? ( media-gfx/graphviz )
-	)
-	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
-	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 )
-	>=dev-db/sqlite-3.6.22:3"
-#	mdb?      ( >app-office/mdbtools-0.5 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.18
-	>=dev-util/intltool-0.35.5
-	>=app-text/gnome-doc-utils-0.9
-	>=dev-util/gtk-doc-am-1
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-# Tests are not really good
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use canvas || use graphviz || use sourceview; then
-		if ! use gtk; then
-			ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
-			ewarn "Disabling for now."
-			G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
-		else
-			G2CONF="${G2CONF}
-				$(use_with canvas goocanvas)
-				$(use_with graphviz)
-				$(use_with sourceview gtksourceview)"
-		fi
-	fi
-
-	G2CONF="${G2CONF}
-		--with-unique
-		--disable-scrollkeeper
-		--disable-static
-		--enable-system-sqlite
-		$(use_with berkdb bdb /usr)
-		$(use_with gnome-keyring)
-		$(use_with gtk ui)
-		$(use_with http libsoup)
-		$(use_enable introspection)
-		$(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)
-		--without-mdb"
-#		$(use_with mdb mdb /usr)
-
-	if use bindist; then
-		# firebird license is not GPL compatible
-		G2CONF="${G2CONF} --without-firebird"
-	else
-		G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
-	fi
-
-	use berkdb && append-cppflags "-I$(db_includedir)"
-	# --disable-json doesn't work, upstream bug #636439
-	use json && G2CONF="${G2CONF} --enable-json"
-	use oci8 || G2CONF="${G2CONF} --without-oracle"
-
-	# Not in portage
-	G2CONF="${G2CONF}
-		--disable-default-binary"
-
-	export XDG_DATA_HOME="${T}/.local"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix build order for generated content, upstream #630958
-	epatch "${FILESDIR}/${PN}-4.2.2-fix-build-order.patch"
-
-	# 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"
-
-	# Fix sandbox violations with USE doc, bug #370013, upstream #651922
-	epatch "${FILESDIR}/${P}-sandbox-fix.patch"
-
-	intltoolize --force --copy --automake || die
-	eautoreconf
-}
diff --git a/gnome-extra/libgda/libgda-4.99.4.ebuild b/gnome-extra/libgda/libgda-4.99.4.ebuild
index 7f57bdec9a94..fad8e8c6cd84 100644
--- a/gnome-extra/libgda/libgda-4.99.4.ebuild
+++ b/gnome-extra/libgda/libgda-4.99.4.ebuild
@@ -1,11 +1,10 @@
 # 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.99.4.ebuild,v 1.1 2011/09/30 19:27:46 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.99.4.ebuild,v 1.2 2011/10/16 00:05:35 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="xz" # remove when python eclass supports EAPI 4
 PYTHON_DEPEND="2"
 
 inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
@@ -103,6 +102,11 @@ pkg_setup() {
 	# Not in portage
 	G2CONF="${G2CONF}
 		--disable-default-binary"
+
+	export XDG_DATA_HOME="${T}/.local"
+
+	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {