diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-07-28 21:30:35 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-07-28 21:30:35 +0000 |
commit | 34afd1b0535a0956ba6899766cc1856f8bb5871e (patch) | |
tree | ae6c5e548415f1d14640d62b6c5fe015a6d5fa03 /gnome-extra/libgda | |
parent | new revision featuring multilib enabled libcuefile and libreplaygain (diff) | |
download | historical-34afd1b0535a0956ba6899766cc1856f8bb5871e.tar.gz historical-34afd1b0535a0956ba6899766cc1856f8bb5871e.tar.bz2 historical-34afd1b0535a0956ba6899766cc1856f8bb5871e.zip |
Version bump with various bugfixes.
Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'gnome-extra/libgda')
-rw-r--r-- | gnome-extra/libgda/ChangeLog | 8 | ||||
-rw-r--r-- | gnome-extra/libgda/Manifest | 19 | ||||
-rw-r--r-- | gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch | 100 | ||||
-rw-r--r-- | gnome-extra/libgda/libgda-5.1.2.ebuild | 149 | ||||
-rw-r--r-- | gnome-extra/libgda/metadata.xml | 2 |
5 files changed, 271 insertions, 7 deletions
diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog index 5f21e13827f3..ac80f583a8c7 100644 --- a/gnome-extra/libgda/ChangeLog +++ b/gnome-extra/libgda/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-extra/libgda # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.218 2013/06/30 15:24:19 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.219 2013/07/28 21:30:30 tetromino Exp $ + +*libgda-5.1.2 (28 Jul 2013) + + 28 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + +libgda-5.1.2.ebuild, +files/libgda-5.1.2-graphviz.patch, metadata.xml: + Version bump with various bugfixes. 30 Jun 2013; Justin Lecher <jlec@gentoo.org> libgda-5.0.4.ebuild, libgda-5.1.1-r1.ebuild, metadata.xml: diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index d53b462d0675..8e7b64b46b95 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX libgda-4.99.1-control-center-icon-collision.patch 2266 SHA256 dc52049ea4706fc8a8a91bc7c572abc275a312f7e0df15cf1b82c73ef8e4f63e SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5 WHIRLPOOL f766d52e6c9591b4a7040105f0765df63412da92e7aa60aa4921cedf2f05ba60a732d72f443358ab78735c9dd44e51ce8e12ca5c3892b9e077f04b0772412650 AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 SHA256 d89d44e62a1a483cd77f13c723f0541f39a71a5f0651197d3e25d1093567d78c SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353 WHIRLPOOL c4f2b570f5fb486a4f1a6d3575e0849a13c78fcc1d05d2b64d4cb15f0af83a54bb8d184ec14ce501ee7e7dcc10f4b3a6c32c1d458e312c13716bde7752ff71c6 @@ -7,20 +7,27 @@ AUX libgda-4.99.1-gda-browser-help-collision.patch 1270 SHA256 b9d20506fe89fd021 AUX libgda-4.99.4-disable-broken-tests.patch 363 SHA256 cbc8b5bbd5577538f68d1625616f3812ebb1976d05b356b13feb491eb1174f5c SHA512 748e26b7319ba07da1efba9c5350d0b7724aef0d940516252499474b479201fa8b726c9965c95812122cb3cda3937dc2bf96a203943cbc9a9fe5f3b45990c0f2 WHIRLPOOL 846cde3fc8c3db5bd9dc87e879cfb4599b7d0a99af7c2cbc5894946ee0fa09b24c979fa39ae4a7f094166b39a1fc8b7de0186a6179fefb438588dc7f9e38cd19 AUX libgda-4.99.4-statement-rewriting-fix.patch 17054 SHA256 81c6089b0899ef43428e5e6f182df153c85730e879f2ecefa7c769b0073c756d SHA512 773d69abaa3c13333e4dae2d5c3661053227e4e1ecfcc8a7fb27e6ba63a8f973ac0db559648c1cf89f975a82324b444dd65cb86429dc7f5255e11d605f05a85a WHIRLPOOL 64f05e45dc2a7cf96f7bae67ac60af6b6a6c19d4331b84126705eb033f7a16426936de9b6f087d225bb2e31adaebf52e223bc2869bf92507c4f309e3cd3f6da0 AUX libgda-5.0.3-custom.vala 171 SHA256 28be89b84fdb22a38d7c0d9bb65e6d1a8ebfc3aa16eff424e26bdcfe95e2d0bf SHA512 5894e70dec948f1db4d85a03c6fad580e1f9cd411bcf6e424f536dc1b695841051b1f83782c249661cd5f1307b9cc772f58025d21b66f75637485feabe591ce2 WHIRLPOOL 3e8cbb33b45d7e57f0b611f35041e463fad7a9de56843afc515e14bbf5a7c05f1b4b743d445fb1b59a155f544790311b2223c3e05bbef0e2c23ccadd5e34c0a0 +AUX libgda-5.1.2-graphviz.patch 3346 SHA256 29de3081c8fc5a8eaef92bfcc5bb4cf662faf22b96b8ac858af4a2ebe21198e0 SHA512 fdf43692755dee496a85532f1b155c36f1bfebc0c16b860a97e85172021f1b0131d94824283f175321bf63f44b6726dcb9d672544f7a7fc716a558d5535fa8b1 WHIRLPOOL 7a8bddfcc7a2014a10f6f894b1ae3488e6dda76d5a3e571760de5ac4525d90f4fb670e26fb9de627f59917869da33a66a3ecc0148af3a274debdd60da0a065a2 DIST libgda-4.2.13.tar.xz 11247816 SHA256 25b75951f8f38fd58a403389566a0aae2f83b39d4225bc3acf5f2d68895ab4c3 SHA512 54506b65ac7127ab67168f8169aba4d366ea1c7f9e5401c27c00a7eee7ea5ce33821faef0c7f2d397455869bd98025990b527cb7ad8cca1a88d32bd699d44f22 WHIRLPOOL c958ecb735b5ba84236bd80f20f39017dca35911452ad95c65c82e4ee40eadecc683d78f7d459f65d576d520e309f19ceddf0da3054696d83261ebd141db13b8 DIST libgda-5.0.3.tar.xz 11623340 SHA256 82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc SHA512 ee71b3be95f735aeb536b5af5c873e1175e934f930657eca567d79f12cf471d0f5714cd749e9cde483efd868db00e83fad6c1698da0a004d8653fc544f361b55 WHIRLPOOL c321c4344d50965927951050ee1e5c55205e23cc286b627b5a5fddd2bd7756fcc48b8852078b2b092f315113304ec8734d2bd048f0bbde24ad93f890e1f4ef10 DIST libgda-5.0.4.tar.xz 11565144 SHA256 e4fbb17ba2f0630172b364fea2b6ef413fce81b8dbc4ee5c0957087b8f31c5ff SHA512 97a4f9eef6bbd7cab4b7082398f6515df9f3aa50285ff73a821611a3c908a10bb2429fd4020de4598230a4985833ba4b4035cd7c8ee398341fae9e5dfd4a42ee WHIRLPOOL 7bb8191090cb28ace9e0493105d67f7683d1375a089e2358a134ebdd7fec8b27236a77f4cfadd310ae474b411f758e31e9086884711f0accc1cef3f831f85b1a DIST libgda-5.1.1.tar.xz 11848808 SHA256 41a54e60d91758d1d239e5127c856ff0412a5709e92440e9107178af928ed5e1 SHA512 db699a07e8bd541baaf425e76e8e06f252ed4714ae51d8f1b95c644357ba3084dcf93cd0b784fa4165a0a817420012131bc6352347b8842f8b95adf5fcac8c5a WHIRLPOOL bc9f02b512a98268a01b1e2586213b02a95c8bee6fb5da039289d8130acb50dd3c467aa239b2cf5f7a37708546978c1731caa7af5c9d06ba04cb3e732aa734d4 +DIST libgda-5.1.2.tar.xz 12030848 SHA256 59c4416a151297a406091fcfe7af781ea88af3381d10b365ba73b1eb8e23b6c5 SHA512 027b2ecdcbf666c69e32f4c638cf7a144cb761fb694811ee6af749f34e584ff578ae601fdbae8aa88330c3f335db2f46db2296042c213aca14a1adc7b5192659 WHIRLPOOL 5f125ae1fcdbb0bae7ff7e437245183a60cee28e6c0df5fd303d5e12fb3e9ab8e1a5cd19c8d9df19e2c229ba51ecd3c07b7fac9b35391c3a606a0bf19db603c9 EBUILD libgda-4.2.13.ebuild 3084 SHA256 0c62b2eb9a28bd9171b640d4822543a8e3b12b3c86e95eda16b66b7ff49876fb SHA512 f52006e896e7b5cf0365091bd360db2b46072eef90c0e8df6edea3bcafc3e458c78270529c7b916a2c5a01efb314aef04889866756810abfe3b6a63a596b569a WHIRLPOOL 2ba71cbc8c746bd95214d31503fcf3ac7badd7a9be2faf9d3fa58665f9604ce205433890e3dc837368ba43af4a46d4068492c813f783813de816a0c5268cdbbb EBUILD libgda-5.0.3-r1.ebuild 4709 SHA256 902e25377accf9bb7e66467789a09f1be725a1fb4e00a0650514aa86730de0d8 SHA512 3be584cf6e950c273de9a63dfeea74f535dedf4a1da94bf8b609043e26682da70cf2e974fc780d70463acb130d4304d05bdeadbc20d411aaadfd980a60a18c29 WHIRLPOOL 7bc9d59494af35cd63f97735ac29ea9b60b65d3416fb3fd92df2b581efed652461326f54227430d4df54674557caf4397646d9e55c477d781aaa3b0d042200d8 EBUILD libgda-5.0.4.ebuild 4373 SHA256 0333e8de3b12874b24c27150206a99e50bbab330d919afe85ccbefef9d625eb6 SHA512 b2fe2c82092bf3dbe2b5b166a7f480f811f341ce812753e5f37752ab14b44c45d05d9cf4ed4f060686e6b56d5f1fc92a4121f09d9a1fa8fbfcb8b705cfb36007 WHIRLPOOL e4bc9ce7c39007adfd658765051aeb677115c2831acd893e61a64efa4ce5321e8225feffdc0023bf75e6a04f04efa2e712cadac72cecd8c2acac51b24e30133f EBUILD libgda-5.1.1-r1.ebuild 4307 SHA256 28be777195562c476dfef519e1ce078779540e63a227d34af6000ae320624db0 SHA512 ce01d1059903911f9a58c0ee076953579fdeb8c2a4dfa27c64178c8f27037c0c7c737a13b2d4aeec5ff64a6d5f46c67ef4cec06f5e1287026e4919cbc9ba681f WHIRLPOOL c37d6a61c3b4a7dd7209a68c2ec7b3e25d6873810dcbeb391948e4222a27ecf482f49f04f153d88bd1c86e46ca5a641bd4812386d2ace340f191b298d3e1f734 -MISC ChangeLog 33876 SHA256 5750c551f8c5ad9ea570099ef9d6fcacd186c59768ed3cfa10532981b15b4f55 SHA512 caa84b3e9d146e63c59752db7bdd9c56289e316f7532529e1fc716848300413b75853f4eb5602fb39f20aa046b28c136e9c3de4798735f54b6b432129da3862f WHIRLPOOL 3165cfe9880a4dc638f9a1d7d92024b4bded9bb72c778bffed349a65562d1d758c98bc65f11771e080a0455d790ababa63476049af1c27ee51e3abfa85b058aa -MISC metadata.xml 802 SHA256 4e734dfca94aeac4dc1ad5a47b4deacee8716fbf2b8a4115ea5fec4a7aab2c8e SHA512 09edfcf4ea7bdbd31034d2ed8ed24c67f97a34b7491f858248f5bb39d80d76a2e6a726a60583a6f2e0cb9ee3ea3f482dbc0be10ba837c0f866ac703aaff9d2f2 WHIRLPOOL 2e08566cfced0f1ff034303e2192e0505d05e01405d62507ef23c864423f1143aaa7527bd97f63c4b211e54960384be64f8a4c0fe1d9670806b10c0190ab5e6b +EBUILD libgda-5.1.2.ebuild 4435 SHA256 14e71d805a62dddfd19d65f4c36ab406aac2584858f135fadf451321ba32e1ef SHA512 fdfc238fbdcb4dc6d54df7fb96c61892b49df314bf92c6d812c521bbca854b25baa4fa885f50d43b4ed8670ae8d0103f9ae19d7cbfd23d29b7e0655e0e4bbe7d WHIRLPOOL f32af015b9b83309acf937b956477114e8a1fa316c7dc3f034c61441453e75b32faca134a81ad5f8813148d43cf5cf776711b84566d11291a218bf51569e4f7d +MISC ChangeLog 34082 SHA256 7c88b1d82e8f0fb32dce8dd769cac19a6d0d907004fa2515077084f78081ef4a SHA512 b8a1f91d84ae4c0eec360b439fe131601a64ba35133cad910e0afecffde45820558672829e7ca6e2aabc18e28a2c2767fd319ff574b43e4d18fd656246ee3f78 WHIRLPOOL 8f566d3d8296b21e9e9e45982ae92aa5125db8e64c2fece0f42e866e24b6433b7f9ba0aac35a52093627de888a0fabd97a8f86cd9e65168abca6783e0750c908 +MISC metadata.xml 908 SHA256 950b0cbb48f8f9254e4457efc8d4e290edcc814a1b07dfb85eb0d61b077bfc4c SHA512 e9b04c54efd1d15fed1e3820e0b5ccb9c6bd8260deabc9e850278132906263e18f4156598b3bafc26ef57ae0e83a95a6560e182bf7b3c63db045611ee36549b7 WHIRLPOOL d8f28595e61688646263d534b60235072294c96a62f1c86bd42a83ce481dc584c4939ad354b55718169c64522656d135ab4f0733db2a9fa05e27a6490aff3e5c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREKAAYFAlHQTaQACgkQgAnW8HDreRYVdQCgy7Hn0HAyUhjDpYMx9/g3K+v1 -F8QAnjgjwY036dtmAmpDOQ6IDaVkkoyi -=kCKy +iQEcBAEBCAAGBQJR9Y13AAoJEJ0WA1zPCt1hV48H/0Big4xNNIXhlh1MfGIC8VC6 +0z98XPgPD8oa6GBsZ85rATPaylnuIv/WLGdpGlsIFY5ESngIt3zfE0AQvAYWeE7l +LvGzxFnPklTY2jlqMAWiRws5fXYzT0enXVpZodyc0sb/7A5f6ZAKtEvFr6EJOreI +ATgKy+lRMR67mFE1p70eiwt6Ho9DinyGG9hySZUFc+ZFxAh+2QzFZ+wqw7ykSCwI +2D/j4lCv3zkoz5sd9tP6Y4ui5j3mxX5HJKIKSnsAZMs7cseFLJzQuHKNHtaAYoD1 +6gspUvrxHywcVYTXGuaS8sksMYuXwijo5sy84/P+IehWKBiFUoIQkq4YMPEpTTw= +=aP1Z -----END PGP SIGNATURE----- diff --git a/gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch b/gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch new file mode 100644 index 000000000000..b9242275d3a0 --- /dev/null +++ b/gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch @@ -0,0 +1,100 @@ +From 071bd53b80621cf2bf3cea9ef2a97c5b3fc56ee6 Mon Sep 17 00:00:00 2001 +From: Vivien Malerba <malerba@gnome-db.org> +Date: Tue, 30 Apr 2013 20:51:04 +0200 +Subject: [PATCH] Allow compiling even with old Graphviz API + +cf changes made in commit #cc5d429567e21ec62bf61b7e3b54348af11965b9 +--- + configure.ac | 19 +++++++++++++++++++ + tools/browser/canvas/browser-canvas.c | 23 +++++++++++++++++++++-- + 2 files changed, 40 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0a61cef..84aad65 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -251,6 +251,25 @@ then + AC_MSG_ERROR([Graphviz support requested but not found.]) + fi + have_graphviz=no]) ++ if test "x$have_graphviz" = "xyes" ++ then ++ dnl test if new API is supported ++ AC_MSG_CHECKING([whether Graphviz's new API is supported]) ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++#include <gvc.h> ++int main() { ++ Agraph_t *graph; ++ graph = agopen ("BrowserCanvasLayout", Agdirected, NULL); ++ return 0; ++} ++])], ++ graphviz_new_api=yes, graphviz_new_api=no) ++ ++ AC_MSG_RESULT($graphviz_new_api) ++ if test "$graphviz_new_api" = "yes"; then ++ AC_DEFINE(GRAPHVIZ_NEW_API,[1],[define if Graphviz's new API is available]) ++ fi ++ fi + fi + + PKG_CHECK_MODULES(GLADE, "gladeui-2.0", [ +diff --git a/tools/browser/canvas/browser-canvas.c b/tools/browser/canvas/browser-canvas.c +index b228fd3..e173c1b 100644 +--- a/tools/browser/canvas/browser-canvas.c ++++ b/tools/browser/canvas/browser-canvas.c +@@ -851,6 +851,7 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro + if (!gvc) + gvc = gvContext (); + ++#ifdef GRAPHVIZ_NEW_API + graph = agopen ("BrowserCanvasLayout", Agdirected, NULL); + agnode (graph, "shape", "box"); + agset (graph, "height", ".1"); +@@ -858,6 +859,15 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro + agset (graph, "fixedsize", "true"); + agset (graph, "pack", "true"); + agset (graph, "packmode", "node"); ++#else ++ graph = agopen ("BrowserCanvasLayout", AGRAPH); ++ agnodeattr (graph, "shape", "box"); ++ agnodeattr (graph, "height", ".1"); ++ agnodeattr (graph, "width", ".1"); ++ agnodeattr (graph, "fixedsize", "true"); ++ agnodeattr (graph, "pack", "true"); ++ agnodeattr (graph, "packmode", "node"); ++#endif + + + if (class->get_layout_items) +@@ -885,7 +895,11 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro + nodes_list = g_slist_prepend (nodes_list, nl); + + tmp = g_strdup_printf ("%p", item); ++#ifdef GRAPHVIZ_NEW_API + node = agnode (graph, tmp, 0); ++#else ++ node = agnode (graph, tmp); ++#endif + nl->node = node; + g_hash_table_insert (nodes_hash, item, node); + +@@ -928,8 +942,13 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro + Agnode_t *from_node, *to_node; + from_node = (Agnode_t*) g_hash_table_lookup (nodes_hash, from); + to_node = (Agnode_t*) g_hash_table_lookup (nodes_hash, to); +- if (from_node && to_node) +- agedge (graph, from_node, to_node, "", 0); ++ if (from_node && to_node) { ++#ifdef GRAPHVIZ_NEW_API ++ agedge (graph, from_node, to_node, "", 0); ++#else ++ agedge (graph, from_node, to_node); ++#endif ++ } + } + } + +-- +1.8.3.2 + diff --git a/gnome-extra/libgda/libgda-5.1.2.ebuild b/gnome-extra/libgda/libgda-5.1.2.ebuild new file mode 100644 index 000000000000..84a1fafe4e12 --- /dev/null +++ b/gnome-extra/libgda/libgda-5.1.2.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.1.2.ebuild,v 1.1 2013/07/28 21:30:30 tetromino Exp $ + +EAPI="5" +GNOME2_LA_PUNT="yes" +GCONF_DEBUG="yes" +PYTHON_COMPAT=( python{2_6,2_7} ) +#VALA_MIN_API_VERSION="0.18" +#VALA_MAX_API_VERSION="0.18" # configure explicitly checks for 0.18 +#VALA_USE_DEPEND="vapigen" + +inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 # vala + +DESCRIPTION="GNOME database access library" +HOMEPAGE="http://www.gnome-db.org/" +LICENSE="GPL-2+ LGPL-2+" + +IUSE="berkdb bindist canvas firebird gtk graphviz http +introspection json ldap libsecret mdb mysql oci8 postgres reports sourceview ssl" # vala +REQUIRED_USE=" + reports? ( ${PYTHON_REQUIRED_USE} ) + canvas? ( gtk ) + firebird? ( !bindist ) + graphviz? ( gtk ) + sourceview? ( gtk )" +# firebird license is not GPL compatible +SLOT="5/4" # subslot = libgda-5.0 soname version +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +RDEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.32:2 + >=dev-libs/libxml2-2 + dev-libs/libxslt + sys-libs/readline:= + sys-libs/ncurses:= + berkdb? ( sys-libs/db ) + !bindist? ( firebird? ( dev-db/firebird ) ) + gtk? ( + >=x11-libs/gtk+-3.0.0:3 + canvas? ( x11-libs/goocanvas:2.0= ) + sourceview? ( x11-libs/gtksourceview:3.0 ) + graphviz? ( media-gfx/graphviz ) + ) + http? ( >=net-libs/libsoup-2.24:2.4 ) + introspection? ( >=dev-libs/gobject-introspection-1.30 ) + json? ( dev-libs/json-glib ) + ldap? ( net-nds/openldap:= ) + libsecret? ( app-crypt/libsecret ) + mdb? ( >app-office/mdbtools-0.5:= ) + mysql? ( virtual/mysql:= ) + postgres? ( dev-db/postgresql-base:= ) + reports? ( + ${PYTHON_DEPS} + dev-java/fop + dev-python/reportlab ) + ssl? ( dev-libs/openssl:= ) + >=dev-db/sqlite-3.6.22:3= +" +# vala? ( dev-libs/libgee:0.8 ) +DEPEND="${RDEPEND} + >=app-text/gnome-doc-utils-0.9 + dev-util/gtk-doc-am + >=dev-util/intltool-0.40.6 + virtual/pkgconfig + java? ( virtual/jdk:1.6 )" +# vala? ( $(vala_depend) ) + +# FIXME: lots of tests failing. Check if they still fail in 5.1.2 +RESTRICT="test" + +pkg_setup() { + java-pkg-opt-2_pkg_setup + use reports && python-single-r1_pkg_setup +} + +src_prepare() { + use berkdb && append-cppflags "-I$(db_includedir)" + + use reports || + sed -e '/SUBDIRS =/ s/trml2html//' \ + -e '/SUBDIRS =/ s/trml2pdf//' \ + -i libgda-report/RML/Makefile.{am,in} || die + + # fixed in 5.1.3 + epatch "${FILESDIR}/${P}-graphviz.patch" + + # Prevent file collisions with libgda:4 + epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch" + epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch" + epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch" + # Move files with mv (since epatch can't handle rename diffs) and + # update pre-generated gtk-doc files (for non-git versions of libgda) + local f + for f in tools/browser/doc/gda-browser* ; do + mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed" + done + for f in tools/browser/doc/html/gda-browser.devhelp* ; do + sed -e 's:name="gda-browser":name="gda-browser-5.0":' \ + -i ${f} || die "sed ${f} failed" + mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed" + done + for f in control-center/data/*_gda-control-center.png ; do + mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} || + die "mv ${f} failed" + done + + eautoreconf + gnome2_src_prepare + java-pkg-opt-2_src_prepare + # use vala && vala_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --disable-scrollkeeper \ + --disable-static \ + --enable-system-sqlite \ + $(use_with berkdb bdb /usr) \ + $(use_with canvas goocanvas) \ + $(use_with firebird firebird /usr) \ + $(use_with graphviz) \ + $(use_with gtk ui) \ + $(use_with http libsoup) \ + $(use_enable introspection) \ + "$(use_with java java $JAVA_HOME)" \ + $(use_enable json) \ + $(use_with ldap) \ + $(use_with libsecret) \ + $(use_with mdb mdb /usr) \ + $(use_with mysql mysql /usr) \ + $(use_with oci8 oracle) \ + $(use_with postgres postgres /usr) \ + $(use_enable ssl crypto) \ + $(use_with sourceview gtksourceview) \ + --disable-default-binary \ + --disable-vala + # vala bindings fail to build +} + +src_install() { + gnome2_src_install + if use reports; then + for t in trml2{html,pdf}; do + python_scriptinto /usr/share/libgda-5.0/gda_${t} + python_doscript libgda-report/RML/${t}/${t}.py + done + fi +} diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml index 6997cb05fe1c..c0e384d11509 100644 --- a/gnome-extra/libgda/metadata.xml +++ b/gnome-extra/libgda/metadata.xml @@ -7,6 +7,8 @@ which is not GPL compatible.</flag> <flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag> <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag> + <flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to + store login credentials</flag> <flag name="json">Enable support for JSON format</flag> <flag name="mdb">Enable support for Microsoft Access database using <pkg>app-office/mdbtools</pkg></flag> |