Version bump, remove old.

(Portage version: 2.1.9.46/cvs/Linux x86_64)

3 files changed, 49 insertions, 72 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 42b711d9beb2..18c61fd51cf0 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,12 @@
 # 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.163 2011/04/04 15:40:19 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.164 2011/04/20 16:54:11 pacho Exp $
+
+*libgda-4.2.6 (20 Apr 2011)
+
+  20 Apr 2011; Pacho Ramos <pacho@gentoo.org> -libgda-4.1.4-r1.ebuild,
+  -files/libgda-4.1.4-install-header.patch, +libgda-4.2.6.ebuild:
+  Version bump, remove old.
 
 *libgda-4.2.5-r1 (04 Apr 2011)
 
diff --git a/gnome-extra/libgda/files/libgda-4.1.4-install-header.patch b/gnome-extra/libgda/files/libgda-4.1.4-install-header.patch
deleted file mode 100644
index 269fee3542ba..000000000000
--- a/gnome-extra/libgda/files/libgda-4.1.4-install-header.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 342b5fdef11e4894e975df5563ab24ac66cf899a Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Tue, 19 Jan 2010 20:56:02 +0000
-Subject: Correctly install libgda.h, bug #607357
-
----
-diff --git a/libgda/Makefile.am b/libgda/Makefile.am
-index e3ea991..8da4548 100644
---- a/libgda/Makefile.am
-+++ b/libgda/Makefile.am
-@@ -247,7 +247,7 @@ uninstall-def-files:
- endif
- 
- gdaincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda
--gdainclude_HEADERS=$(libgda_built_headers) $(gda_headers)
-+gdainclude_HEADERS=$(libgda_built_headers) $(gda_headers) libgda.h
- 
- CLEANFILES = $(libgda_built_headers) $(libgda_built_cfiles) \
- 	gda-marshal.c \
---
-cgit v0.8.3.1
-
---- a/libgda/Makefile.in	2010-03-31 23:18:30.000000000 +0200
-+++ b/libgda/Makefile.in	2010-03-31 23:18:50.000000000 +0200
-@@ -220,7 +220,7 @@
- 	gda-tree.h gda-tree-mgr-columns.h gda-tree-mgr-schemas.h \
- 	gda-tree-mgr-tables.h gda-tree-node.h gda-tree-manager.h \
- 	gda-tree-mgr-label.h gda-tree-mgr-select.h gda-util.h \
--	gda-value.h gda-xa-transaction.h
-+	gda-value.h gda-xa-transaction.h libgda.h
- HEADERS = $(gdainclude_HEADERS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
-@@ -686,7 +688,7 @@
- 
- @PLATFORM_WIN32_TRUE@libgda_4_0_la_DEPENDENCIES = libgda.def
- gdaincludedir = $(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda
--gdainclude_HEADERS = $(libgda_built_headers) $(gda_headers)
-+gdainclude_HEADERS = $(libgda_built_headers) $(gda_headers) libgda.h
- CLEANFILES = $(libgda_built_headers) $(libgda_built_cfiles) \
- 	gda-marshal.c gda-enum-types.h s-enum-types-h gda-enum-types.c \
- 	s-enum-types-c libgda.def libgda-$(GDA_ABI_VERSION).lib \
diff --git a/gnome-extra/libgda/libgda-4.1.4-r1.ebuild b/gnome-extra/libgda/libgda-4.2.6.ebuild
index ca420320367f..e95b0ea801ea 100644
--- a/gnome-extra/libgda/libgda-4.1.4-r1.ebuild
+++ b/gnome-extra/libgda/libgda-4.2.6.ebuild
@@ -1,20 +1,20 @@
 # 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.1.4-r1.ebuild,v 1.9 2011/03/08 05:21:17 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.6.ebuild,v 1.1 2011/04/20 16:54:11 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
 
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2
+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
-# experimental IUSE: introspection
-IUSE="berkdb bindist canvas doc firebird freetds gtk graphviz ldap mysql oci8 odbc postgres sourceview xbase"
+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"
+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
@@ -26,36 +26,37 @@ RDEPEND="
 	dev-libs/libunique:1
 	sys-libs/readline
 	sys-libs/ncurses
-	>=net-libs/libsoup-2.24:2.4
 	berkdb?   ( sys-libs/db )
-	freetds?  ( >=dev-db/freetds-0.62 )
 	!bindist? ( firebird? ( dev-db/firebird ) )
 	gtk? (
-		>=x11-libs/gtk+-2.12:2
+		|| ( >=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 )
 	)
-	ldap?     ( >=net-nds/openldap-2.0.25 )
+	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 )
-	odbc?     ( >=dev-db/unixODBC-2.0.6 )
 	postgres? ( dev-db/postgresql-base )
-	xbase?    ( dev-db/xbase )
+	ssl?      ( dev-libs/openssl )
 	>=dev-db/sqlite-3.6.22:3"
-#   json?     ( dev-libs/json-glib )
 #	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 )"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 # 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."
@@ -71,19 +72,20 @@ pkg_setup() {
 
 	G2CONF="${G2CONF}
 		--with-unique
-		--with-libsoup
-		--disable-introspection
+		--disable-scrollkeeper
 		--disable-static
 		--enable-system-sqlite
-		$(use_with gtk ui)
 		$(use_with berkdb bdb /usr)
-		$(use_with odbc odbc /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 mysql mysql /usr)
 		$(use_with postgres postgres /usr)
-		$(use_with freetds tds /usr)
-		$(use_with xbase xbase /usr)
-		$(use_with ldap ldap /usr)
-		$(use_with java java $JAVA_HOME)
+		$(use_enable ssl crypto)
 		--without-mdb"
 #		$(use_with mdb mdb /usr)
 
@@ -95,23 +97,34 @@ pkg_setup() {
 	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}
-		--without-msql
-		--without-sybase
-		--without-ibmdb2
 		--disable-default-binary"
 }
 
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix missing header installation, bug #308793
-	epatch "${FILESDIR}/${PN}-4.1.4-install-header.patch"
+	# 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 HOME=$(unset HOME; echo "~") || die "tests failed"
+	emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
+}
+
+src_install() {
+	gnome2_src_install
+	# Nothing uses these in the tree
+	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
 }