Version bump. Add graphical tools.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 4c82202994ae07acbeac58481231d0d98914022a..80db9d570d8d1c1c2fa2f5e3f68212cde37bd8a6 100644 (file)
--- 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.132 2010/03/06 20:12:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.133 2010/03/07 23:56:54 eva Exp $
+
+*libgda-4.1.4 (07 Mar 2010)
+
+  07 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org> +libgda-4.1.4.ebuild,
+  metadata.xml:
+  Version bump. Add graphical tools.
 
   06 Mar 2010; Pacho Ramos <pacho@gentoo.org> libgda-4.1.0.ebuild:
   amd64 stable, bug 298201

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 89ae4c69bffe4704af76e8bded70c4fbb399b00c..b6318f588ffacb28195c3ef57dfa8e210656c4d7 100644 (file)
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -8,15 +8,17 @@ AUX libgda-4.0.2-sandbox.patch 1459 RMD160 3d7c270744344d9275954c7a9d5d24ff30d3f
 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.4.tar.bz2 12217669 RMD160 a2331b9ece709e215a4c8b73d33cc0557142ab32 SHA1 b18c1b7d3114ca370a54bb7bbd6bbb931509a46a SHA256 82866d2d9628f2605f7fd22f12953d2516259401f3d234c208865d7881659235
 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 2653 RMD160 f297334c3ce8028f263238571a4ff755642ff484 SHA1 68c5f9fe7df6a3678c44fd1be06a1f349079ec0f SHA256 db858d535f07210d7a409b8274cb4c095b54446344343674c01c4a03676e7ffc
-MISC ChangeLog 19585 RMD160 6ee144fb46a9f9b173d6975f4a757466e1ccc451 SHA1 596d878d79b6070e583190621f5ec473c5431db2 SHA256 a11ceb28d3ecde8a3934a02e62723792e423cb1f7b2f54fffb390f6bd06e0f91
-MISC metadata.xml 319 RMD160 9c87ab9b6a8b5ddac19ec4d1613e31bad795376c SHA1 2bbc7eef247354f4fe2b5cb040d9a460f8e69c75 SHA256 60c377f9bd2483a6fa51d28da8a6a64ec09b92afd68f7378d1dedf4f103e344e
+EBUILD libgda-4.1.4.ebuild 3021 RMD160 86845b631ae422bcf459c6067ae93911332bd4e0 SHA1 d78f19c990d757ce9da331003c718f78267ac74d SHA256 19dc6e33a56253bf89ce0a11bbc83a52b0d7c51f1099b11400027ed1685c40c0
+MISC ChangeLog 19742 RMD160 7e9961451a4cebc2679e5ee84945e303b7673cf3 SHA1 f4d943d556e4461e9fc0996986e66269c9f2ca46 SHA256 c70e98dae4b7f8701f82a5eb03059bc97af6c7db5bc001cdbeef137b991a3b1f
+MISC metadata.xml 482 RMD160 5606e5667abb906457110f9c0cadf2be3c09de87 SHA1 de00b738ede7b0666380dfe48c28d58a4af5b269 SHA256 3cada1182bf0ebe4ad41cc820124dd841b411072a36e9aefbe44a60f1244268a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuStx8ACgkQCaWpQKGI+9QJUACeMogK70BdO2q46wm9di9izJQb
-+SoAn22tuEpi8P2PjFTD7acKTcVbV1Va
-=QWQ5
+iEYEARECAAYFAkuUPXgACgkQ1fmVwcYIWAbLlwCfTOSSXAy4No5/BtyUue4FVMFU
+mesAn1OPL6JOrV+1up6QmTNw7oqEzKQL
+=NsQL
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/libgda/libgda-4.1.4.ebuild b/gnome-extra/libgda/libgda-4.1.4.ebuild
new file mode 100644 (file)
index 0000000..c4e3fbf
--- /dev/null
+++ b/gnome-extra/libgda/libgda-4.1.4.ebuild
@@ -0,0 +1,110 @@
+# 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.ebuild,v 1.1 2010/03/07 23:56:54 eva Exp $
+
+EAPI="2"
+
+inherit db-use 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 ~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_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 f9c6e0ac17c6dd4bd74fe8b06c1d4aeeb1eea7a5..0ecc26db4d8ec0abbad90bb387a5bb02c082a44b 100644 (file)
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -3,7 +3,9 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
+       <flag name="canvas">Enables support for <pkg>x11-libs/goocanvas</pkg></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,
                etc.)</flag>
 </use>