From 62c57c5c5eb4b27055a29dd1b24ee22e7b7566fb Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Wed, 31 Mar 2010 21:31:30 +0000 Subject: [PATCH] Install missing header file, bug #308793. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- gnome-extra/libgda/ChangeLog | 8 +- gnome-extra/libgda/Manifest | 10 +- .../files/libgda-4.1.4-install-header.patch | 42 +++++++ gnome-extra/libgda/libgda-4.1.4-r1.ebuild | 117 ++++++++++++++++++ 4 files changed, 172 insertions(+), 5 deletions(-) create mode 100644 gnome-extra/libgda/files/libgda-4.1.4-install-header.patch create mode 100644 gnome-extra/libgda/libgda-4.1.4-r1.ebuild 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 + +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 libgda-4.1.0.ebuild: stable x86, bug 298201 diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index edb802cdbd79..ac0cb3b00554 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -5,6 +5,7 @@ AUX libgda-1.2.3-mdb_api.patch 1374 RMD160 d7091403baa8b299d815be7e679fb17720d18 AUX libgda-1.2.4-freetds_api_fixes.patch 14119 RMD160 2c2becec232a74eb9e430288b3e78f70e2294f2c SHA1 125e13af1ffbf03d2f503908a67eb7575fe65dc4 SHA256 cf4dfa78d13f79d698532945ba7a26edc2a256a7b1fa3cdc89eec544d18448ea AUX libgda-4.0.2-libsoup-magic.patch 1029 RMD160 7de27c428c734e83e9475340e731e65217626418 SHA1 e28b5799ba4245253580bd2bdd1a7ef77b6a4ada SHA256 91df316d270025f7d42a7027fdc8d8a688448f54886d7060efdb5d566f25b4b5 AUX libgda-4.0.2-sandbox.patch 1459 RMD160 3d7c270744344d9275954c7a9d5d24ff30d3f30d SHA1 2a995b57738eeaa8f574e7ea0d4d8b40da0d4aa0 SHA256 0436743dc00d55c3196c66c78f9513be44ee49b71071cdd0d26310304a03bc65 +AUX libgda-4.1.4-install-header.patch 1762 RMD160 5c97195e574642bedd584e4e89a1d7e53ddea131 SHA1 328867caedb287ef996944c8bb409cce7f6ad0f2 SHA256 9779651e112172e435cc77b8d4afd1578b2050d36baf3772f4c8bd5583467d4b DIST libgda-1.2.4.tar.bz2 1087076 RMD160 83981076ac408fdd4b89f0cb97cb605d5301fcb2 SHA1 a2fefe602a07ca92cfb066492e33d4d1e4733bfc SHA256 d5e700203764e3f8d9ab3573a9b1b0e218778022c7956cf719fa0500b3027930 DIST libgda-3.0.4.tar.bz2 2908854 RMD160 6efbf5a0f40277124dcc5464168677cc97be40e3 SHA1 50ba121e05ab1fbe95b66e8df4f54a0c6a30ef23 SHA256 3f9d75e9bc50610bf6033863b79265c7c9c702323b918caf90eb3923f971da48 DIST libgda-4.1.0.tar.bz2 8574216 RMD160 ebfced03c7436b12f76838f52364f4060922fdf1 SHA1 2518f79ead114b49395812736cf170be8403210e SHA256 0abd9b4d9111451a6dca6732d3523a57b4a1f823f85c2c0c58e1a28a5badb563 @@ -12,13 +13,14 @@ DIST libgda-4.1.4.tar.bz2 12217669 RMD160 a2331b9ece709e215a4c8b73d33cc0557142ab EBUILD libgda-1.2.4.ebuild 2302 RMD160 7e27db7c9df0e16f7e1821ba0bb82a16a762df4c SHA1 5d4b68fa9dede3279a1e349e2ee661073b73f1d4 SHA256 5270a88c5bffca53e7a8264a1de6ba60837ecd582856f99724518e57f2e292d6 EBUILD libgda-3.0.4.ebuild 2008 RMD160 1c497da017dc67ee1ee1bf28f26056bd366b8135 SHA1 f325d2f9fb14b37d283264021ab51b9a1e53a613 SHA256 5ca67f542c153d2a9073fea720e671fffbe7522c16a354564d4954f4d8a40446 EBUILD libgda-4.1.0.ebuild 2650 RMD160 961a2d2581c26cad80ecc0cd3640b71820f747d0 SHA1 bb8d1e011e8162a84d54c1515e7f24c0effd4c7e SHA256 1614a254eb0a3e903ec3ae23f3ca390200659972d8aa2d93fabc51c88fe12e36 +EBUILD libgda-4.1.4-r1.ebuild 3181 RMD160 3db276e750ecfb8212382209c8595f460a4152b7 SHA1 5951483456c8ae9ad17e66d7b9c51a0fc48c6987 SHA256 ccf9d12f8860dd50976ad11849f73867101e9cb02b59db098dea945df4f114b2 EBUILD libgda-4.1.4.ebuild 3031 RMD160 1c34fbe672c35eb45228a9df34f81f33dd80ab9f SHA1 bb08f238dcb588f530a125184fbc9a7ffd64f0d1 SHA256 54ba107ff74069ffaa21d7b2643378f762bf31fd5a2f6a86ccc4e057d2973f39 -MISC ChangeLog 20046 RMD160 7aa63cb2b231123b27bdf93f637dee988dc5202b SHA1 add22b86eb4535a07e444f2d6e8028902b90da3b SHA256 aa6d71e811fa41b36a0c08f8b3ce690864debbfeed0ce7265e7ae11164453ea0 +MISC ChangeLog 20244 RMD160 e1b0d2abd7abadde0eee5ecc8d1f62912b2c88d5 SHA1 29fb7767f322d9545f4711e799f38eba56c85ad2 SHA256 7b4b42d77124ec8d28bfcb05f18f4e9a492a226fd6396b593a31847d25fca2e9 MISC metadata.xml 482 RMD160 5606e5667abb906457110f9c0cadf2be3c09de87 SHA1 de00b738ede7b0666380dfe48c28d58a4af5b269 SHA256 3cada1182bf0ebe4ad41cc820124dd841b411072a36e9aefbe44a60f1244268a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkufzMMACgkQNQqtfCuFneP9jwCfYN7Zrn1wpACbM7Mxgl/mGuA9 -BaoAnRztaalUy+XHNWc8T8P6simdhMxi -=16nV +iEUEARECAAYFAkuzvzcACgkQ1fmVwcYIWAYlzwCVEs2XFCQNK1g1XtWHt4z8E+R4 +bACg2LDZhZlf1xnkI9M5G7AxDHDx/kk= +=iFPi -----END PGP SIGNATURE----- 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 +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" +} -- 2.26.2