Install missing header file, bug #308793.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 166 insertions, 1 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 8f6bac464982..c00b6402a594 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.136 2010/03/16 18:23:57 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.137 2010/03/31 21:31:30 eva Exp $
+
+*libgda-4.1.4-r1 (31 Mar 2010)
+
+  31 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +libgda-4.1.4-r1.ebuild, +files/libgda-4.1.4-install-header.patch:
+  Install missing header file, bug #308793.
 
   16 Mar 2010; Christian Faulhammer <fauli@gentoo.org> libgda-4.1.0.ebuild:
   stable x86, bug 298201
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
new file mode 100644
index 000000000000..269fee3542ba
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.1.4-install-header.patch
@@ -0,0 +1,42 @@
+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.1.4-r1.ebuild
new file mode 100644
index 000000000000..9e006c633f3f
--- /dev/null
+++ b/gnome-extra/libgda/libgda-4.1.4-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2010 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.1 2010/03/31 21:31:30 eva Exp $
+
+EAPI="2"
+
+inherit 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"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~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
+	>=dev-libs/libxml2-2
+	dev-libs/libxslt
+	dev-libs/libunique
+	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
+		canvas? ( x11-libs/goocanvas )
+		sourceview? ( x11-libs/gtksourceview:2.0 )
+		graphviz? ( media-gfx/graphviz )
+	)
+	ldap?     ( >=net-nds/openldap-2.0.25 )
+	mysql?    ( virtual/mysql )
+	odbc?     ( >=dev-db/unixODBC-2.0.6 )
+	postgres? ( >=virtual/postgresql-base-7.2.1 )
+	xbase?    ( dev-db/xbase )
+	>=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
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+# Tests are not really good
+RESTRICT="test"
+
+pkg_setup() {
+	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
+		--with-libsoup
+		--disable-introspection
+		--disable-static
+		--enable-system-sqlite
+		$(use_with gtk ui)
+		$(use_with berkdb bdb /usr)
+		$(use_with odbc odbc /usr)
+		$(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)
+		--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)"
+	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"
+}
+
+src_test() {
+	emake check HOME=$(unset HOME; echo "~") || die "tests failed"
+}