diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2010-09-29 22:12:54 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-09-29 22:12:54 +0000 |
commit | 7bf530ff94fa442408fa9ed2a9a207d46c09c0f6 (patch) | |
tree | 427e4cb276d0065251674874aef9a1877b827022 /gnome-extra/libgda | |
parent | Marking webmock-0.9.1 ~ppc64 for bug 321283 (diff) | |
download | historical-7bf530ff94fa442408fa9ed2a9a207d46c09c0f6.tar.gz historical-7bf530ff94fa442408fa9ed2a9a207d46c09c0f6.tar.bz2 historical-7bf530ff94fa442408fa9ed2a9a207d46c09c0f6.zip |
Version bump. Translation updates. Cryptographic support.
Package-Manager: portage-2.2_rc88/cvs/Linux x86_64
Diffstat (limited to 'gnome-extra/libgda')
-rw-r--r-- | gnome-extra/libgda/ChangeLog | 12 | ||||
-rw-r--r-- | gnome-extra/libgda/Manifest | 16 | ||||
-rw-r--r-- | gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch | 36 | ||||
-rw-r--r-- | gnome-extra/libgda/files/libgda-4.2.0-fix-undefined-mdb.patch | 35 | ||||
-rw-r--r-- | gnome-extra/libgda/files/libgda-4.2.0-json-libcrypto-automagic.patch | 80 | ||||
-rw-r--r-- | gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch | 27 | ||||
-rw-r--r-- | gnome-extra/libgda/libgda-4.2.0.ebuild | 137 | ||||
-rw-r--r-- | gnome-extra/libgda/metadata.xml | 4 |
8 files changed, 341 insertions, 6 deletions
diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog index ff598de996dd..aac0671f9e5c 100644 --- a/gnome-extra/libgda/ChangeLog +++ b/gnome-extra/libgda/ChangeLog @@ -1,6 +1,16 @@ # 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.149 2010/09/13 20:59:26 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.150 2010/09/29 22:12:54 eva Exp $ + +*libgda-4.2.0 (29 Sep 2010) + + 29 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> +libgda-4.2.0.ebuild, + +files/libgda-4.2.0-fix-build-order.patch, + +files/libgda-4.2.0-fix-undefined-mdb.patch, + +files/libgda-4.2.0-json-libcrypto-automagic.patch, + +files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch, + metadata.xml: + Version bump. Translation updates. Cryptographic support. 13 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> libgda-4.1.10.ebuild: gnome-keyring does not depend on the gtk USE flag. diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index 42c43b3122d7..30e41d0f6549 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -6,22 +6,28 @@ AUX libgda-1.2.4-freetds_api_fixes.patch 14119 RMD160 2c2becec232a74eb9e430288b3 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 +AUX libgda-4.2.0-fix-build-order.patch 1260 RMD160 45d51d47cc3e7117e80d30f360d6bf5988330153 SHA1 15ebfd96457e72b9c04f4b94e615576eb7a590ff SHA256 e7cf87eece86ecdbb1ee8a877b757b5cff05a8efe309f7551b865a01a07b75ab +AUX libgda-4.2.0-fix-undefined-mdb.patch 878 RMD160 2dec9f85f1d37a2c0d629b2f9fc60f085cd34e2a SHA1 b26bd7b9fb6b9e067eb20e233280b43336bb7505 SHA256 c63ed8660cb96482a1ce36af3524c10a1bc5468a3038c2fc75cbe3cce855688a +AUX libgda-4.2.0-json-libcrypto-automagic.patch 3004 RMD160 6aeb885ea26b920d3e8ce8a43826ac91c1c782f4 SHA1 8804ff4ee4ad830720baadf792382218c2dcc0ba SHA256 127e654e7e6fd71ae62a9a9107d7997a67aa3e1d87234e632e0ba7fbd4e0eeb9 +AUX libgda-4.2.0-missing-include-in-keyword_hash-generator.patch 897 RMD160 2a879a730831b7d6c05bf3a48df542cbf025adc4 SHA1 d76018f2b545290174cce55be7c4561edf7772bc SHA256 7cc133de8931b1dc86a08ee7a620e8b9218071723549734ea2290440318a7b8f 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 DIST libgda-4.1.10.tar.bz2 12944110 RMD160 979abd512ff437eded06d770568ca7d36d7c4e5d SHA1 78f7018734905ba1aa83b4b8add9184eed369fa0 SHA256 2800989489410ba5cc4c0adbd0efd79a539175b17ee19342e737fb11824aad55 DIST libgda-4.1.4.tar.bz2 12217669 RMD160 a2331b9ece709e215a4c8b73d33cc0557142ab32 SHA1 b18c1b7d3114ca370a54bb7bbd6bbb931509a46a SHA256 82866d2d9628f2605f7fd22f12953d2516259401f3d234c208865d7881659235 +DIST libgda-4.2.0.tar.bz2 13932542 RMD160 fa284ee1bc98ff81fcd788c77fdd467fab861b63 SHA1 98da33580855525c927afcbdaea83625156ec206 SHA256 2e639957f50719957cea5326b0d95511794322a54f9ef8547d3241f409765441 EBUILD libgda-1.2.4.ebuild 2283 RMD160 b306c86af14692c872e890531d5bda5eb257d87b SHA1 d34d29c4bbdfbdf1be035e4cbb64bba40d02713f SHA256 a829c7280f55733b294c6ea3bf90c592842a61c0575dc64e66690bb8e0ad8e68 EBUILD libgda-3.0.4.ebuild 1995 RMD160 e8c0f30a4cc85d69c98ac3162a61c4cdb70cb039 SHA1 5aa1b85875f7aa3b64f7af9c6eaec3dbb00f4653 SHA256 daddd4b35901c0848fcd1f7c7f63193c44e1d9935701f0d49ce71aecc448832b EBUILD libgda-4.1.0.ebuild 2630 RMD160 6ac4a78e79d1d89ed7df1b81cb9a7c36cbe45bdc SHA1 c1027deed2c3048ed85f752027c39db5ce53aa68 SHA256 c1609cf64076c6e144cf744a8bfa66a3a92318df7ff8cc51c62691f5f0112476 EBUILD libgda-4.1.10.ebuild 3234 RMD160 22e494e6c2fa22a6db3ec7038d5ddc2602427db3 SHA1 6ac697f2d129e77ee56a3a14abc57b233b658dfc SHA256 987f2b3ec9ba413042ac42642d72ba091654bfae78a4fbcfaeefd441460b0914 EBUILD libgda-4.1.4-r1.ebuild 3189 RMD160 84a96d1ed770389ce8c39b36f224fa62995ab25e SHA1 2f8b3b5cdd0278d9ee585dddbabd9ddabf5e0a1a SHA256 10e1c8ed5358f47e97f4d666f767908912ac9c41dc9d0f86289392a0d3b24932 -MISC ChangeLog 22135 RMD160 71414d6e70c2215d382b128af4f650ebf9b18d0c SHA1 b116b43dedf632a07724e1730585286d87b7951b SHA256 0b05e74bacdded9bbce09570f971d11264420a0d2c8ea42f71266541905d18bc -MISC metadata.xml 482 RMD160 5606e5667abb906457110f9c0cadf2be3c09de87 SHA1 de00b738ede7b0666380dfe48c28d58a4af5b269 SHA256 3cada1182bf0ebe4ad41cc820124dd841b411072a36e9aefbe44a60f1244268a +EBUILD libgda-4.2.0.ebuild 3960 RMD160 5f2f011c0d629fa8b360005ed9f55477575004dc SHA1 47b812948fcdf0e4ae239fe196e45b14345f6cf2 SHA256 ff088745c071b81a9317d7976eb17a5caf8fe33f6f681357b708c8f10df8338d +MISC ChangeLog 22534 RMD160 b51c8ea0abf4fabfc05b8d93fb5efb03fbf575e6 SHA1 0d3469cea547d8d020af523a58c7623bb57253a1 SHA256 f770e3e95a094d1806fa4e058a6b50491339ab9b3e4e2924f248397e00e8870b +MISC metadata.xml 723 RMD160 9d9142462b76a2f63fef0aae5234b82bdaa691b5 SHA1 1f1bfff922d1a5ee49ad825212f8b865d30c818a SHA256 e4a93d5cfd3ca132966e5a14daafbbf8c99f944e70e184bfa137a0bb4df676e9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkyOkLMACgkQ1fmVwcYIWAbxgACdHddaKTJxkxZts75JVN+lhnoS -WW8An0OzrS7jYUXbLsudxwke+b9O+uBZ -=B74N +iEYEARECAAYFAkyjuesACgkQ1fmVwcYIWAbdTwCgx9TH3V4zE181aAWrbrlyCwRu +1rgAoKyxa1FYARWWELdIFjoEXKnVLLs2 +=5csc -----END PGP SIGNATURE----- diff --git a/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch b/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch new file mode 100644 index 000000000000..4c1aca08642a --- /dev/null +++ b/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch @@ -0,0 +1,36 @@ +From f39858f84155d0346d31a2607997257a54e246ff Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Wed, 29 Sep 2010 23:45:46 +0200 +Subject: [PATCH] fix build order for xml_embedded.h + +--- + libgda/sqlite/Makefile.am | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am +index 1d2df2c..ecce04b 100644 +--- a/libgda/sqlite/Makefile.am ++++ b/libgda/sqlite/Makefile.am +@@ -58,9 +58,9 @@ sqlitesources = \ + gda-sqlite.h \ + keywords_hash.h \ + gda-symbols-util.h \ +- gda-symbols-util.c +- +-$(libgda_sqlite_la_OBJECTS): xml_embedded.h keywords_hash.c ++ gda-symbols-util.c \ ++ xml_embedded.h \ ++ keywords_hash.c + + libgda_sqlite_la_SOURCES = $(sqlitesources) + libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\" +@@ -85,4 +85,5 @@ gdainclude_HEADERS=$(sqliteheaders) + + EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list + +-CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) xml_embedded.h mkkeywordhash$(EXEEXT_FOR_BUILD) keywords_hash.c ++CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES) ++BUILT_SOURCES = xml_embedded.h keywords_hash.c +-- +1.7.3 + diff --git a/gnome-extra/libgda/files/libgda-4.2.0-fix-undefined-mdb.patch b/gnome-extra/libgda/files/libgda-4.2.0-fix-undefined-mdb.patch new file mode 100644 index 000000000000..d35365ffb4cd --- /dev/null +++ b/gnome-extra/libgda/files/libgda-4.2.0-fix-undefined-mdb.patch @@ -0,0 +1,35 @@ +From f52ea81599e21a63b29933f7b7b5cc15754125dd Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Wed, 29 Sep 2010 23:28:58 +0200 +Subject: [PATCH] Fix error: conditional "MDB" was never defined + +--- + m4/mdbtools.m4 | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/m4/mdbtools.m4 b/m4/mdbtools.m4 +index 2421ef4..544634b 100644 +--- a/m4/mdbtools.m4 ++++ b/m4/mdbtools.m4 +@@ -152,10 +152,7 @@ int main() { + if test "x$MDB_LIBS" = x + then + AC_MSG_NOTICE([MDB backend not used]) +- AM_CONDITIONAL(MDB,[false]) + else +- AC_DEFINE(HAVE_MDB,[1],[Have MDB]) +- AM_CONDITIONAL(MDB,[true]) + mdbtools_found=yes + + save_CFLAGS="$CFLAGS" +@@ -199,6 +196,7 @@ int main() { + fi + fi + ++ AM_CONDITIONAL(MDB,[test "$mdbtools_found" = "yes"]) + AC_SUBST(MDB_LIBS) + AC_SUBST(MDB_CFLAGS) + ]) +-- +1.7.3 + diff --git a/gnome-extra/libgda/files/libgda-4.2.0-json-libcrypto-automagic.patch b/gnome-extra/libgda/files/libgda-4.2.0-json-libcrypto-automagic.patch new file mode 100644 index 000000000000..ac72131a3113 --- /dev/null +++ b/gnome-extra/libgda/files/libgda-4.2.0-json-libcrypto-automagic.patch @@ -0,0 +1,80 @@ +From 308a341ae545d991e0ad8f18e08050df393edbfa Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Wed, 29 Sep 2010 22:39:19 +0200 +Subject: [PATCH] Fix json/libcrypto automagic + +--- + configure.ac | 41 +++++++++++++++++++++++++++++------------ + 1 files changed, 29 insertions(+), 12 deletions(-) + +diff --git a/configure.ac b/configure.ac +index df31138..5abaa31 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -403,13 +403,21 @@ dnl ****************************** + dnl Checks for json-glib + dnl ****************************** + ++AC_ARG_ENABLE([json], ++ AS_HELP_STRING([--disable-json], [Enable support for JSON]), ++ , ++ [enable_json=yes]) ++ + JSON_GLIB_MODULES="json-glib-1.0" +-PKG_CHECK_MODULES(JSON_GLIB, $JSON_GLIB_MODULES, have_json=yes, have_json=no) +-AM_CONDITIONAL(HAVE_JSON_GLIB, test x"$have_json" = "xyes") +-if test x"$have_json" = "xyes" +-then +- JSON_GLIB_CFLAGS="$JSON_GLIB_CFLAGS -DHAVE_JSON_GLIB" +-fi ++PKG_CHECK_MODULES(JSON_GLIB, $JSON_GLIB_MODULES, ++ AC_DEFINE(HAVE_JSON_GLIB, [], [Defined if JSON support is enabled]) ++ have_json=yes, ++ if test "$enable_json" = "yes"; then ++ AC_MSG_ERROR([JSON support requested but not found]) ++ fi ++ have_json=no ++) ++AM_CONDITIONAL(HAVE_JSON_GLIB, [test "$have_json" = "yes"]) + AC_SUBST(JSON_GLIB_CFLAGS) + AC_SUBST(JSON_GLIB_LIBS) + +@@ -422,13 +430,21 @@ dnl ****************************** + dnl Checks for libcrypto + dnl ****************************** + ++AC_ARG_ENABLE([crypto], ++ AS_HELP_STRING([--disable-crypto], [Enable cryptographic support for SQL]), ++ , ++ [enable_crypto=yes]) ++ + LIBCRYPTO_MODULES="libcrypto" +-PKG_CHECK_MODULES(LIBCRYPTO, $LIBCRYPTO_MODULES, have_crypto=yes, have_crypto=no) +-AM_CONDITIONAL(HAVE_LIBCRYPTO, test x"$have_crypto" = "xyes") +-if test x"$have_crypto" = "xyes" +-then +- LIBCRYPTO_CFLAGS="$LIBCRYPTO_CFLAGS -DHAVE_LIBCRYPTO" +-fi ++PKG_CHECK_MODULES(LIBCRYPTO, $LIBCRYPTO_MODULES, ++ AC_DEFINE(HAVE_LIBCRYPTO, [], [Defined if cryptographic support is enabled]) ++ have_crypto=yes, ++ if test "$enable_crypto" = "yes"; then ++ AC_MSG_ERROR([libcrypto support requested but not found]) ++ fi ++ have_crypto=no ++) ++AM_CONDITIONAL(HAVE_LIBCRYPTO, [test "$have_crypto" = "yes"]) + AC_SUBST(LIBCRYPTO_CFLAGS) + AC_SUBST(LIBCRYPTO_LIBS) + +@@ -1832,6 +1848,7 @@ dnl echo " mSQL = `if test x$msqldir != x; then echo yes; else echo no; fi` + dnl echo " ODBC = `if test x$odbcdir != x; then echo yes; else echo no; fi`" + echo " Oracle = `if test x$oracledir != x; then echo yes; else echo no; fi`" + echo " PostgreSQL = `if test x$postgresdir != x; then echo yes; else echo no; fi`" ++echo " JSON = `if test x$have_json != xyes; then echo no; else echo yes; fi`" + echo " SQLite = yes `if test x$have_sqlite = xyes; then echo '(from system installation)'; else echo '(embedded)'; fi`" + echo " SQLCipher = `if test x$have_crypto != xyes; then echo no; else echo yes; fi`" + dnl echo " Sybase = `if test x$sybasedir != x; then echo yes; else echo no; fi`" +-- +1.7.3 + diff --git a/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch b/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch new file mode 100644 index 000000000000..5e7dd6147287 --- /dev/null +++ b/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch @@ -0,0 +1,27 @@ +From 9f219a98731085ef9588622ecdc9d7ba93de92bb Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Wed, 29 Sep 2010 23:53:54 +0200 +Subject: [PATCH] Fix missing include in keyword_hash generator + +--- + libgda/sqlite/mkkeywordhash.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/libgda/sqlite/mkkeywordhash.c b/libgda/sqlite/mkkeywordhash.c +index dc6ce89..28f4f83 100644 +--- a/libgda/sqlite/mkkeywordhash.c ++++ b/libgda/sqlite/mkkeywordhash.c +@@ -370,6 +370,10 @@ main (int argc, char **argv) + } + + /* Begin generating code */ ++ printf("#include <stdio.h>\n"); ++ printf("#include <string.h>\n"); ++ printf("#include <glib.h>\n"); ++ + printf("/* Hash score: %d */\n", bestCount); + printf("static int %skeywordCode(const char *z, int n){\n", prefix ? prefix : ""); + printf(" /* zText[] encodes %d bytes of keywords in %d bytes */\n", +-- +1.7.3 + diff --git a/gnome-extra/libgda/libgda-4.2.0.ebuild b/gnome-extra/libgda/libgda-4.2.0.ebuild new file mode 100644 index 000000000000..8dea7bd4a635 --- /dev/null +++ b/gnome-extra/libgda/libgda-4.2.0.ebuild @@ -0,0 +1,137 @@ +# 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.2.0.ebuild,v 1.1 2010/09/29 22:12:54 eva 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 freetds gnome-keyring gtk graphviz http +introspection json ldap mysql oci8 odbc postgres sourceview ssl 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 + 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 ) + ) + 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-2.0.25 ) + mysql? ( virtual/mysql ) + odbc? ( >=dev-db/unixODBC-2.0.6 ) + postgres? ( dev-db/postgresql-base ) + ssl? ( dev-libs/openssl ) + xbase? ( dev-db/xbase ) + >=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 )" + +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 + --disable-scrollkeeper + --disable-static + --enable-system-sqlite + $(use_with berkdb bdb /usr) + $(use_with freetds tds /usr) + $(use_with gnome-keyring) + $(use_with gtk ui) + $(use_enable http libsoup) + $(use_enable introspection) + $(use_with java java $JAVA_HOME) + $(use_enable json) + $(use_with ldap ldap /usr) + $(use_with mysql mysql /usr) + $(use_with odbc odbc /usr) + $(use_with postgres postgres /usr) + $(use_enable ssl crypto) + $(use_with xbase xbase /usr) + --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 automagic json-glib and libcrypto, upstream #630953 + epatch "${FILESDIR}/${P}-json-libcrypto-automagic.patch" + + # Fix undefined MDB, upstream #630955 + epatch "${FILESDIR}/${P}-fix-undefined-mdb.patch" + + # Fix build order for generated content, upstream #630958 + epatch "${FILESDIR}/${P}-fix-build-order.patch" + + # Fix compilation failure of keyword_hash.c, upstream #630959 + epatch "${FILESDIR}/${P}-missing-include-in-keyword_hash-generator.patch" + + intltoolize --force --copy --automake || die + eautoreconf +} + +src_test() { + emake check HOME=$(unset HOME; echo "~") || die "tests failed" +} diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml index 0ecc26db4d8e..99f3e02a62ae 100644 --- a/gnome-extra/libgda/metadata.xml +++ b/gnome-extra/libgda/metadata.xml @@ -4,6 +4,10 @@ <herd>gnome</herd> <use> <flag name="canvas">Enables support for <pkg>x11-libs/goocanvas</pkg></flag> + <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag> + <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for + introspection</flag> + <flag name="json">Enable support for JSON format</flag> <flag name='mdb'>Enables Microsoft Access DB support</flag> <flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag> <flag name='xbase'>Enables support for xbase databases (dBase, FoxPro, |