Version bump, remove old.

(Portage version: 2.1.11.3/cvs/Linux x86_64)

11 files changed, 52 insertions, 1337 deletions

diff --git a/app-office/grisbi/ChangeLog b/app-office/grisbi/ChangeLog
index a670f39a7b01..60009657014d 100644
--- a/app-office/grisbi/ChangeLog
+++ b/app-office/grisbi/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-office/grisbi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/ChangeLog,v 1.56 2012/05/03 20:00:40 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/ChangeLog,v 1.57 2012/06/30 17:50:39 pacho Exp $
+
+*grisbi-0.8.9 (30 Jun 2012)
+
+  30 Jun 2012; Pacho Ramos <pacho@gentoo.org> +grisbi-0.8.9.ebuild,
+  -files/0.6.0_rc2-properly-detect-gmodule.patch,
+  -files/0.8.2-0001-fixes-bug-1289.patch,
+  -files/0.8.2-0002-fixes-a-crash-when-importing-a-file-without-extensio.patch,
+  -files/0.8.2-0003-fixes-bug-1293-Problem-of-updating-of-the-pointing-b.patch,
+  -files/0.8.2-0004-fix-memory-leaks-thanks-Philippe-D.patch,
+  -files/0.8.2-0005-fixes-bug-of-compilation.patch, -files/grisbi.desktop,
+  -grisbi-0.6.0_rc2.ebuild, -grisbi-0.8.2.ebuild:
+  Version bump, remove old.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> grisbi-0.6.0_rc2.ebuild,
   grisbi-0.8.2.ebuild, grisbi-0.8.8.ebuild:
@@ -237,4 +249,3 @@
   new accounting office package. Ebuild submitted by: Guillaume Castagnino
   <guilc@fr.st> in bug #52595. Guillaume will be the third party maintainer for
   this package. Seemant will be his gentoo proxy
-
diff --git a/app-office/grisbi/files/0.6.0_rc2-properly-detect-gmodule.patch b/app-office/grisbi/files/0.6.0_rc2-properly-detect-gmodule.patch
deleted file mode 100644
index d36bcdbc4166..000000000000
--- a/app-office/grisbi/files/0.6.0_rc2-properly-detect-gmodule.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ad49bfcb6a29dda93170ea14c38d599df2bbf72d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Sun, 14 Feb 2010 21:39:50 +0100
-Subject: [PATCH 1/2] properly detect gmodule
-
-This usually doesn't happen unless gcc is configured to force
---as-needed through spec files.
----
- configure.in |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 972fbc2..e2e84ce 100644
---- a/configure.in
-+++ b/configure.in
-@@ -32,7 +32,7 @@ AC_CHECK_LIB(intl,main)
- dnl
- dnl Standard GTK checks
- dnl
--PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2.0 glib-2.0 >= 2.2)
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.2.0 glib-2.0 >= 2.2 gmodule-2.0 >= 2.2])
- LDFLAGS="${LDFLAGS} ${GTK_LIBS}"
- CFLAGS="${CFLAGS} ${GTK_CFLAGS}"
- 
-@@ -44,8 +44,8 @@ dnl
- AC_MSG_CHECKING(whether GLib supports loadable modules)
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
--CFLAGS="$CFLAGS $GLIB_CFLAGS"
--LIBS="$GLIB_LIBS $LIBS"
-+CFLAGS="$CFLAGS $GTK_CFLAGS"
-+LIBS="$GTK_LIBS $LIBS"
- AC_TRY_RUN([
- #include <glib.h>
- #include <gmodule.h>
--- 
-1.6.6.1
-
diff --git a/app-office/grisbi/files/0.8.2-0001-fixes-bug-1289.patch b/app-office/grisbi/files/0.8.2-0001-fixes-bug-1289.patch
deleted file mode 100644
index 484791f11b46..000000000000
--- a/app-office/grisbi/files/0.8.2-0001-fixes-bug-1289.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3af09ff549167fd9de721f1434422faa9969645d Mon Sep 17 00:00:00 2001
-From: pbiava <pierre.biava@nerim.net>
-Date: Wed, 23 Feb 2011 20:34:30 +0100
-Subject: [PATCH 1/5] fixes bug 1289
-
----
- src/etats_config.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/etats_config.c b/src/etats_config.c
-index 9db2da3..9bf8e7d 100644
---- a/src/etats_config.c
-+++ b/src/etats_config.c
-@@ -5576,7 +5576,7 @@ GtkWidget *cree_ligne_comparaison_montant ( gint amount_comparison_number )
- 
-     /* on crée alors le bouton de lien */
- 
--    widget = cree_bouton_lien ( widget );
-+    widget = cree_bouton_lien ( widget_1 );
-     gtk_box_pack_start ( GTK_BOX ( hbox ),
- 			 widget,
- 			 FALSE,
--- 
-1.7.4
-
diff --git a/app-office/grisbi/files/0.8.2-0002-fixes-a-crash-when-importing-a-file-without-extensio.patch b/app-office/grisbi/files/0.8.2-0002-fixes-a-crash-when-importing-a-file-without-extensio.patch
deleted file mode 100644
index 8e8ae17aff24..000000000000
--- a/app-office/grisbi/files/0.8.2-0002-fixes-a-crash-when-importing-a-file-without-extensio.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3aeefce5f46ae6989cc6a9c2569af895a9a00659 Mon Sep 17 00:00:00 2001
-From: pbiava <pierre.biava@nerim.net>
-Date: Thu, 24 Feb 2011 23:07:02 +0100
-Subject: [PATCH 2/5] fixes a crash when importing a file without extension
-
----
- src/import.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/import.c b/src/import.c
-index 44802bf..1d5ceeb 100644
---- a/src/import.c
-+++ b/src/import.c
-@@ -681,7 +681,7 @@ gboolean import_select_file ( GtkWidget * button, GtkWidget * assistant )
-     extension = strrchr ( iterator -> data, '.' );
- 
-     /* unzip Gnucash file if necessary */
--    if ( strcmp ( extension, ".gnc" ) == 0 )
-+    if ( extension && strcmp ( extension, ".gnc" ) == 0 )
-         gsb_import_gunzip_file ( iterator -> data );
- 
-     /* get contents of file */
--- 
-1.7.4
-
diff --git a/app-office/grisbi/files/0.8.2-0003-fixes-bug-1293-Problem-of-updating-of-the-pointing-b.patch b/app-office/grisbi/files/0.8.2-0003-fixes-bug-1293-Problem-of-updating-of-the-pointing-b.patch
deleted file mode 100644
index f80e5596363b..000000000000
--- a/app-office/grisbi/files/0.8.2-0003-fixes-bug-1293-Problem-of-updating-of-the-pointing-b.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 63b110a42e88e2b06c0ff432df0282db395cef17 Mon Sep 17 00:00:00 2001
-From: pbiava <pierre.biava@nerim.net>
-Date: Fri, 25 Feb 2011 20:56:03 +0100
-Subject: [PATCH 3/5] fixes bug 1293 : Problem of updating of the pointing balance
-
----
- src/gsb_form.c |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/src/gsb_form.c b/src/gsb_form.c
-index fc81b59..e66c7c2 100644
---- a/src/gsb_form.c
-+++ b/src/gsb_form.c
-@@ -105,6 +105,7 @@ static gboolean gsb_form_validate_form_transaction ( gint transaction_number,
- 
- /*START_EXTERN*/
- extern GdkColor calendar_entry_color;
-+extern gint mise_a_jour_liste_comptes_accueil;
- extern GtkWidget *navigation_tree_view;
- extern gsb_real null_real;
- extern GtkWidget *window;
-@@ -2660,7 +2661,12 @@ gboolean gsb_form_finish_edition ( void )
-     if ( is_transaction )
-     {
-         affiche_dialogue_soldes_minimaux ();
--        update_transaction_in_trees (transaction_number);
-+        update_transaction_in_trees ( transaction_number );
-+        if ( gsb_data_transaction_get_marked_transaction ( transaction_number ) == OPERATION_POINTEE )
-+        {
-+            gsb_navigation_update_statement_label ( account_number );
-+            mise_a_jour_liste_comptes_accueil = 1;
-+        }
-     }
- 
-     /* as we modify or create a transaction, we invalidate the current report */
--- 
-1.7.4
-
diff --git a/app-office/grisbi/files/0.8.2-0004-fix-memory-leaks-thanks-Philippe-D.patch b/app-office/grisbi/files/0.8.2-0004-fix-memory-leaks-thanks-Philippe-D.patch
deleted file mode 100644
index b93cefcffb00..000000000000
--- a/app-office/grisbi/files/0.8.2-0004-fix-memory-leaks-thanks-Philippe-D.patch
+++ /dev/null
@@ -1,682 +0,0 @@
-From 5e25d0add90786446d6083ac46c8f374ae1463cc Mon Sep 17 00:00:00 2001
-From: pbiava <pierre.biava@nerim.net>
-Date: Fri, 25 Feb 2011 21:33:51 +0100
-Subject: [PATCH 4/5] fix memory leaks thanks Philippe D.
-
----
- src/bet_data.c              |  199 +++++++++++++++++++++++++++++++-----------
- src/gsb_assistant_account.c |    1 +
- src/gsb_file_config.c       |    3 +
- src/gsb_file_load.c         |    3 +
- src/gsb_select_icon.c       |   12 ++-
- src/import.c                |    5 +-
- src/import_csv.c            |    3 +
- src/utils.c                 |    1 +
- src/utils_dates.c           |    5 +-
- src/utils_editables.c       |    3 +
- src/utils_files.c           |    3 +-
- src/utils_str.c             |   11 ++-
- 12 files changed, 188 insertions(+), 61 deletions(-)
-
-diff --git a/src/bet_data.c b/src/bet_data.c
-index 0c9f7e5..fbc25d7 100644
---- a/src/bet_data.c
-+++ b/src/bet_data.c
-@@ -264,13 +264,19 @@ gboolean bet_data_hist_add_div ( gint account_number,
- {
-     gchar *key;
-     gchar *sub_key;
-+    gchar *div_number_str, *account_number_str; // only to avoid memory leaks
-     struct_hist_div *shd;
- 
-+    div_number_str = utils_str_itoa ( div_number );
-     if ( account_number == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
-+        key = g_strconcat ("0:", div_number_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( account_number ), ":",
--                        utils_str_itoa ( div_number ), NULL );
-+    {
-+        account_number_str = utils_str_itoa ( account_number );
-+        key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
-+        g_free ( account_number_str );
-+    }
-+    g_free ( div_number_str );
- 
-     if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -342,13 +348,19 @@ void bet_data_insert_div_hist ( struct_hist_div *shd, struct_hist_div *sub_shd )
- {
-     gchar *key;
-     gchar *sub_key;
-+    gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
-     struct_hist_div *tmp_shd;
- 
-+    div_number_str = utils_str_itoa ( shd -> div_number );
-     if ( shd -> account_nb == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( shd -> div_number ), NULL );
-+        key = g_strconcat ("0:", div_number_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( shd -> account_nb ), ":",
--                        utils_str_itoa ( shd -> div_number ), NULL );
-+    {
-+        account_nb_str = utils_str_itoa ( shd -> account_nb );
-+        key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
-+        g_free ( account_nb_str );
-+    }
-+    g_free ( div_number_str );
- 
-     if ( ( tmp_shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -383,13 +395,19 @@ gboolean bet_data_remove_div_hist ( gint account_number, gint div_number, gint s
- {
-     gchar *key;
-     char *sub_key;
-+    gchar *div_number_str, *account_number_str; // only to avoid memory leaks
-     struct_hist_div *shd;
-     
-+    div_number_str = utils_str_itoa ( div_number );
-     if ( account_number == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
-+        key = g_strconcat ("0:", div_number_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( account_number ), ":",
--                        utils_str_itoa ( div_number ), NULL );
-+    {
-+        account_number_str = utils_str_itoa ( account_number );
-+        key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
-+        g_free ( account_number_str );
-+    }
-+    g_free ( div_number_str );
- 
-     if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -418,14 +436,20 @@ gboolean bet_data_search_div_hist ( gint account_number, gint div_number, gint s
- {
-     gchar *key;
-     gchar *sub_key;
-+    gchar *div_number_str, *account_number_str; // only to avoid memory leaks
-     gint origin;
-     struct_hist_div *shd;
- 
-+    div_number_str = utils_str_itoa ( div_number );
-     if ( account_number == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
-+        key = g_strconcat ("0:", div_number_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( account_number ), ":",
--                        utils_str_itoa ( div_number ), NULL );
-+    {
-+        account_number_str = utils_str_itoa ( account_number );
-+        key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
-+        g_free ( account_number_str );
-+    }
-+    g_free ( div_number_str );
- 
-     origin = gsb_data_account_get_bet_hist_data ( account_number );
- 
-@@ -539,15 +563,21 @@ gchar *bet_data_get_div_name ( gint div_num,
- gboolean bet_data_get_div_edited ( gint account_number, gint div_number, gint sub_div_nb )
- {
-     gchar *key;
-+    gchar *div_number_str, *account_number_str; // only to avoid memory leaks
-     gint origin;
-     struct_hist_div *shd;
-     gboolean edited;
- 
-+    div_number_str = utils_str_itoa ( div_number );
-     if ( account_number == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
-+        key = g_strconcat ("0:", div_number_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( account_number ), ":",
--                        utils_str_itoa ( div_number ), NULL );
-+    {
-+        account_number_str = utils_str_itoa ( account_number );
-+        key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
-+        g_free ( account_number_str );
-+    }
-+    g_free ( div_number_str );
- 
-     origin = gsb_data_account_get_bet_hist_data ( account_number );
- 
-@@ -589,13 +619,19 @@ gboolean bet_data_set_div_edited ( gint account_nb,
-                         gboolean edited )
- {
-     gchar *key;
-+    gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
-     struct_hist_div *shd;
- 
-+    div_number_str = utils_str_itoa ( div_number );
-     if ( account_nb == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
-+        key = g_strconcat ("0:", div_number_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( account_nb ), ":",
--                        utils_str_itoa ( div_number ), NULL );
-+    {
-+        account_nb_str = utils_str_itoa ( account_nb );
-+        key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
-+        g_free ( account_nb_str );
-+    }
-+    g_free ( div_number_str );
- 
-     if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -628,14 +664,20 @@ gboolean bet_data_set_div_edited ( gint account_nb,
- gsb_real bet_data_hist_get_div_amount ( gint account_nb, gint div_number, gint sub_div_nb )
- {
-     gchar *key;
-+    gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
-     struct_hist_div *shd;
-     gsb_real amount;
- 
-+    div_number_str = utils_str_itoa ( div_number );
-     if ( account_nb == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
-+        key = g_strconcat ("0:", div_number_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( account_nb ), ":",
--                        utils_str_itoa ( div_number ), NULL );
-+    {
-+        account_nb_str = utils_str_itoa ( account_nb );
-+        key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
-+        g_free ( account_nb_str );
-+    }
-+    g_free ( div_number_str );
- 
-     if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -674,13 +716,19 @@ gboolean bet_data_set_div_amount ( gint account_nb,
-                         gsb_real amount )
- {
-     gchar *key;
-+    gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
-     struct_hist_div *shd;
- 
-+    div_number_str = utils_str_itoa ( div_number );
-     if ( account_nb == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
-+        key = g_strconcat ("0:", div_number_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( account_nb ), ":",
--                        utils_str_itoa ( div_number ), NULL );
-+    {
-+        account_nb_str = utils_str_itoa ( account_nb );
-+        key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
-+        g_free ( account_nb_str );
-+    }
-+    g_free ( div_number_str );
- 
-     if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -1167,16 +1215,22 @@ void struct_free_bet_future ( struct_futur_data *scheduled )
- gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
- {
-     gchar *key;
-+    gchar *future_number_str, *account_nb_str; // only to avoid memory leaks
-     
-     future_number ++;
- 
-     if ( scheduled -> frequency == 0 )
-     {
-+        future_number_str = utils_str_itoa ( future_number );
-         if ( scheduled -> account_number == 0 )
--            key = g_strconcat ("0:", utils_str_itoa ( future_number ), NULL );
-+            key = g_strconcat ("0:", future_number_str, NULL );
-         else
--            key = g_strconcat ( utils_str_itoa ( scheduled -> account_number ), ":",
--                        utils_str_itoa ( future_number ), NULL );
-+        {
-+            account_nb_str = utils_str_itoa ( scheduled -> account_number );
-+            key = g_strconcat ( account_nb_str, ":", future_number_str, NULL );
-+            g_free ( account_nb_str );
-+        }
-+        g_free ( future_number_str );
- 
-         scheduled -> number = future_number;
-         g_hash_table_insert ( bet_future_list, key, scheduled );
-@@ -1196,11 +1250,16 @@ gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
-         date = gsb_date_copy ( scheduled -> date );
-         while ( date != NULL && g_date_valid ( date ) )
-         {
-+            future_number_str = utils_str_itoa ( future_number );
-             if ( scheduled -> account_number == 0 )
-                 key = g_strconcat ("0:", utils_str_itoa ( future_number ), NULL );
-             else
--                key = g_strconcat ( utils_str_itoa ( scheduled -> account_number ), ":",
--                        utils_str_itoa ( future_number ), NULL );
-+            {
-+                account_nb_str = utils_str_itoa ( scheduled -> account_number );
-+                key = g_strconcat ( account_nb_str, ":", future_number_str, NULL );
-+                g_free ( account_nb_str );
-+            }
-+            g_free ( future_number_str );
- 
-             if ( mother_row == future_number )
-                 new_sch = scheduled;
-@@ -1236,16 +1295,22 @@ gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
- gboolean bet_data_future_set_lines_from_file ( struct_futur_data *scheduled )
- {
-     gchar *key;
-+    gchar *number_str, *account_nb_str; // only to avoid memory leaks
- 
--        if ( scheduled -> account_number == 0 )
--            key = g_strconcat ("0:", utils_str_itoa ( scheduled -> number ), NULL );
--        else
--            key = g_strconcat ( utils_str_itoa ( scheduled -> account_number ), ":",
--                        utils_str_itoa ( scheduled -> number ), NULL );
-+    number_str = utils_str_itoa ( scheduled -> number );
-+    if ( scheduled -> account_number == 0 )
-+        key = g_strconcat ("0:", number_str, NULL );
-+    else
-+    {
-+        account_nb_str = utils_str_itoa ( scheduled -> account_number );
-+        key = g_strconcat ( account_nb_str, ":", number_str, NULL );
-+        g_free ( account_nb_str );
-+    }
-+    g_free ( number_str );
- 
--        bet_data_future_set_max_number ( scheduled -> number );
-+    bet_data_future_set_max_number ( scheduled -> number );
- 
--        g_hash_table_insert ( bet_future_list, key, scheduled );
-+    g_hash_table_insert ( bet_future_list, key, scheduled );
- 
-     return TRUE;
- }
-@@ -1557,12 +1622,18 @@ GDate *bet_data_array_get_date_max ( gint account_number )
- gboolean bet_data_future_modify_lines ( struct_futur_data *scheduled )
- {
-     gchar *key;
-+    gchar *number_str, *account_nb_str; // only to avoid memory leaks
- 
-+    number_str = utils_str_itoa ( scheduled -> number );
-     if ( scheduled -> account_number == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( scheduled -> number ), NULL );
-+        key = g_strconcat ("0:", number_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( scheduled -> account_number ), ":",
--                        utils_str_itoa ( scheduled -> number ), NULL );
-+    {
-+        account_nb_str = utils_str_itoa ( scheduled -> account_number );
-+        key = g_strconcat ( account_nb_str, ":", number_str, NULL );
-+        g_free ( account_nb_str );
-+    }
-+    g_free ( number_str );
- 
-     g_hash_table_replace ( bet_future_list, key, scheduled );
- 
-@@ -1582,13 +1653,19 @@ gboolean bet_data_future_modify_lines ( struct_futur_data *scheduled )
- struct_futur_data *bet_data_future_get_struct ( gint account_number, gint number )
- {
-     gchar *key;
-+    gchar *number_str, *account_nb_str; // only to avoid memory leaks
-     struct_futur_data *scheduled;
- 
--    if ( account_number == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( number ), NULL );
-+    number_str = utils_str_itoa ( number );
-+    if ( scheduled -> account_number == 0 )
-+        key = g_strconcat ("0:", number_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( account_number ), ":",
--                        utils_str_itoa ( number ), NULL );
-+    {
-+        account_nb_str = utils_str_itoa ( account_number );
-+        key = g_strconcat ( account_nb_str, ":", number_str, NULL );
-+        g_free ( account_nb_str );
-+    }
-+    g_free ( number_str );
- 
-     if ( ( scheduled = g_hash_table_lookup ( bet_future_list, key ) ) )
-         return scheduled;
-@@ -1651,14 +1728,20 @@ GHashTable *bet_data_transfert_get_list ( void )
- gboolean bet_data_transfert_add_line ( struct_transfert_data *transfert )
- {
-     gchar *key;
-+    gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
-     
-     transfert_number ++;
- 
-+    transfert_nb_str = utils_str_itoa ( transfert_number );
-     if ( transfert -> account_number == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( transfert_number ), NULL );
-+        key = g_strconcat ("0:", transfert_nb_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( transfert -> account_number ), ":",
--                        utils_str_itoa ( transfert_number ), NULL );
-+    {
-+        account_nb_str = utils_str_itoa ( transfert -> account_number );
-+        key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
-+        g_free ( account_nb_str );
-+    }
-+    g_free ( transfert_nb_str );
- 
-     transfert -> number = transfert_number;
-     g_hash_table_insert ( bet_transfert_list, key, transfert );
-@@ -1715,12 +1798,18 @@ gboolean bet_data_transfert_remove_line ( gint account_number, gint number )
- gboolean bet_data_transfert_set_line_from_file ( struct_transfert_data *transfert )
- {
-     gchar *key;
-+    gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
- 
-+    transfert_nb_str = utils_str_itoa ( transfert -> number );
-     if ( transfert -> account_number == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( transfert -> number ), NULL );
-+        key = g_strconcat ("0:", transfert_nb_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( transfert -> account_number ), ":",
--                        utils_str_itoa ( transfert -> number ), NULL );
-+    {
-+        account_nb_str = utils_str_itoa ( transfert -> account_number );
-+        key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
-+        g_free ( account_nb_str );
-+    }
-+    g_free ( transfert_nb_str );
- 
-     if ( transfert -> number >  transfert_number )
-         transfert_number = transfert -> number;
-@@ -1740,12 +1829,18 @@ gboolean bet_data_transfert_set_line_from_file ( struct_transfert_data *transfer
- gboolean bet_data_transfert_modify_line ( struct_transfert_data *transfert )
- {
-     gchar *key;
-+    gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
- 
-+    transfert_nb_str = utils_str_itoa ( transfert -> number );
-     if ( transfert -> account_number == 0 )
--        key = g_strconcat ("0:", utils_str_itoa ( transfert -> number ), NULL );
-+        key = g_strconcat ("0:", transfert_nb_str, NULL );
-     else
--        key = g_strconcat ( utils_str_itoa ( transfert -> account_number ), ":",
--                        utils_str_itoa ( transfert -> number ), NULL );
-+    {
-+        account_nb_str = utils_str_itoa ( transfert -> account_number );
-+        key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
-+        g_free ( account_nb_str );
-+    }
-+    g_free ( transfert_nb_str );
- 
-     g_hash_table_replace ( bet_transfert_list, key, transfert );
- 
-diff --git a/src/gsb_assistant_account.c b/src/gsb_assistant_account.c
-index 84f1caf..83eb348 100644
---- a/src/gsb_assistant_account.c
-+++ b/src/gsb_assistant_account.c
-@@ -498,6 +498,7 @@ void gsb_assistant_account_change_account_icon ( GtkWidget *button, gpointer dat
-     {
-         devel_debug ( error -> message );
-         dialogue_error ( error -> message );
-+        g_error_free ( error );
-     }
-     else
-     {
-diff --git a/src/gsb_file_config.c b/src/gsb_file_config.c
-index 851552c..6dcfb94 100644
---- a/src/gsb_file_config.c
-+++ b/src/gsb_file_config.c
-@@ -1540,7 +1540,10 @@ gchar *gsb_config_get_old_conf_name ( void )
-         }
-     }
-     else
-+    {
-         dialogue_error ( error -> message );
-+        g_error_free ( error );
-+    }
- 
-     if ( g_slist_length ( liste ) == 0 )
-         return NULL;
-diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
-index f5be275..4c78fb8 100644
---- a/src/gsb_file_load.c
-+++ b/src/gsb_file_load.c
-@@ -9027,7 +9027,10 @@ void gsb_file_load_copy_old_file ( gchar *filename, gchar *file_content)
-         file_copy = g_file_new_for_path ( copy_old_filename );
-         if ( !g_file_copy ( file_ori, file_copy, G_FILE_COPY_OVERWRITE, 
-                         NULL, NULL, NULL, &error ) )
-+        {
-             dialogue_error (error -> message );
-+            g_error_free ( error );
-+        }
-     }
- }
- /* Local Variables: */
-diff --git a/src/gsb_select_icon.c b/src/gsb_select_icon.c
-index bbbf6d9..7a75142 100644
---- a/src/gsb_select_icon.c
-+++ b/src/gsb_select_icon.c
-@@ -369,7 +369,10 @@ GtkTreePath * gsb_select_icon_fill_icon_view (  gchar * name_icon )
-         g_dir_close ( dir );
-     }
-     else
-+    {
-         dialogue_error ( error -> message );
-+        g_error_free ( error );
-+    }
- 
-     if ( tree_path == NULL )
-         tree_path = gtk_tree_path_new_from_string ( "0" );
-@@ -657,7 +660,10 @@ GdkPixbuf *gsb_select_icon_get_default_logo_pixbuf ( void )
-                         (GRISBI_PIXMAPS_DIR, "grisbi-logo.png", NULL), &error );
- 
-     if ( ! pixbuf )
-+    {
-         devel_debug ( error -> message );
-+        g_error_free ( error );
-+    }
- 
-     if ( gdk_pixbuf_get_width (pixbuf) > LOGO_WIDTH ||
- 	     gdk_pixbuf_get_height (pixbuf) > LOGO_HEIGHT )
-@@ -890,6 +896,7 @@ gboolean gsb_select_icon_new_account_icon_from_file ( gint account_number,
-                         filename, NULL );
-         devel_debug ( tmp_str );
-         dialogue_error ( tmp_str );
-+        g_error_free ( error );
-         g_free ( tmp_str );
-         g_free ( icon );
- 
-@@ -909,13 +916,12 @@ GdkPixbuf *gsb_select_icon_change_account_pixbuf ( gint account_number,
- {
-     GSList *list_tmp;
-     GdkPixbuf *pixbuf;
--    GError *error = NULL;
- 
-     if ( icon_buffer
- 	 &&
- 	 icon_buffer -> account_number == account_number )
-     {
--        pixbuf = gdk_pixbuf_new_from_file_at_size ( filename , 32, 32, &error );
-+        pixbuf = gdk_pixbuf_new_from_file_at_size ( filename , 32, 32, NULL );
-         if ( pixbuf )
-         {
-             g_object_unref ( icon_buffer -> pixbuf );
-@@ -937,7 +943,7 @@ GdkPixbuf *gsb_select_icon_change_account_pixbuf ( gint account_number,
- 
-         if ( icon -> account_number == account_number )
-         {
--            pixbuf = gdk_pixbuf_new_from_file_at_size ( filename , 32, 32, &error );
-+            pixbuf = gdk_pixbuf_new_from_file_at_size ( filename , 32, 32, NULL );
-             if ( pixbuf )
-             {
-                 g_object_unref ( icon -> pixbuf );
-diff --git a/src/import.c b/src/import.c
-index 1d5ceeb..5543aa1 100644
---- a/src/import.c
-+++ b/src/import.c
-@@ -534,6 +534,7 @@ gboolean import_switch_type ( GtkCellRendererText *cell, const gchar *path,
-         if ( ! g_file_get_contents ( nom_fichier, &tmp_str, NULL, &error ) )
-         {
-             g_print ( _("Unable to read file: %s\n"), error -> message);
-+            g_error_free ( error );
-             return FALSE;
-         }
- 
-@@ -688,6 +689,7 @@ gboolean import_select_file ( GtkWidget * button, GtkWidget * assistant )
-     if ( ! g_file_get_contents ( iterator -> data, &tmp_str, NULL, &error ) )
-     {
-         g_print ( _("Unable to read file: %s\n"), error -> message);
-+        g_error_free ( error );
-         return FALSE;
-     }
- 
-@@ -4386,6 +4388,7 @@ gboolean gsb_import_by_rule ( gint rule )
-             if ( ! g_file_get_contents ( filename, &pointeur_char, NULL, &error ) )
-             {
-                 g_print ( _("Unable to read file: %s\n"), error -> message);
-+                g_error_free ( error );
-                 i++;
-                 continue;
-             }
-@@ -4677,6 +4680,7 @@ gboolean gsb_import_set_tmp_file ( gchar *filename,
-     {
-         g_free (contenu_fichier);
-         g_print ( _("Unable to create tmp file: %s\n"), error -> message);
-+        g_error_free ( error );
-         return FALSE;
-     }
- 
-@@ -4710,7 +4714,6 @@ gboolean gsb_import_gunzip_file ( gchar *filename )
-             dialogue_error ( tmpstr );
-             g_free ( file_content);
-             g_error_free (error);
--
-             return FALSE;
-         }
-         else
-diff --git a/src/import_csv.c b/src/import_csv.c
-index 88b1462..4b1707f 100644
---- a/src/import_csv.c
-+++ b/src/import_csv.c
-@@ -1081,6 +1081,7 @@ gboolean import_enter_csv_preview_page ( GtkWidget * assistant )
-     if ( ! g_file_get_contents ( filename, &tmp_str, &size, &error ) )
-     {
-         g_print ( _("Unable to read file: %s\n"), error -> message);
-+        g_error_free ( error );
-         return FALSE;
-     }
- 
-@@ -1091,6 +1092,7 @@ gboolean import_enter_csv_preview_page ( GtkWidget * assistant )
- 
-     if ( contents == NULL )
-     {
-+        g_error_free ( error );
-         error = NULL;
-         size = 0;
-         bytes_written = 0;
-@@ -1105,6 +1107,7 @@ gboolean import_enter_csv_preview_page ( GtkWidget * assistant )
-         if ( bytes_written == 0 )
-         {
-             g_print ( _("Unable to read file: %s\n"), error -> message);
-+            g_error_free ( error );
-             return FALSE;
-         }
-     }
-diff --git a/src/utils.c b/src/utils.c
-index 16361ef..aeb64ef 100644
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -555,6 +555,7 @@ void lance_mailer ( const gchar *uri )
-         tmp_str = g_strdup_printf ( _("Grisbi was unable to execute a mailer to write at <tt>%s</tt>.\n"
-                     "The error was: %s."),
-                     uri, error -> message );
-+        g_error_free ( error );
-         dialogue_error_hint ( tmp_str, _("Cannot execute mailer") );
-         g_free(tmp_str);
-     }
-diff --git a/src/utils_dates.c b/src/utils_dates.c
-index 4f45bb2..c84118e 100644
---- a/src/utils_dates.c
-+++ b/src/utils_dates.c
-@@ -79,6 +79,7 @@ gchar *gsb_date_today ( void )
-         date = gdate_today ( );
-         date_string = gsb_format_gdate ( date );
-         gsb_date_set_last_date ( date_string );
-+        g_free ( date_string );
-         g_date_free ( date );
-     }
-     return (last_date);
-@@ -678,8 +679,10 @@ gchar *gsb_date_get_compiled_time ( void )
- 
-     date = g_date_new_dmy ( atoi ( tab[1] ), mois, atoi ( tab[2] ) );
-     g_strfreev (tab);
-+    str = gsb_format_gdate ( date );
-+    g_date_free ( date );
- 
--    return gsb_format_gdate ( date );
-+    return str;
- }
- 
- 
-diff --git a/src/utils_editables.c b/src/utils_editables.c
-index ecfd082..6b15472 100644
---- a/src/utils_editables.c
-+++ b/src/utils_editables.c
-@@ -155,7 +155,10 @@ gsb_real gsb_utils_edit_calculate_entry ( GtkWidget *entry )
-     if ( string && strlen ( string ) )
-         pointeur = string + strlen ( string );
-     else
-+    {
-+        g_free ( string );
-         return total;
-+    }
- 
-     if ( g_utf8_strchr ( string, -1, '-' ) || g_utf8_strchr ( string, -1, '+' ) )
-     {
-diff --git a/src/utils_files.c b/src/utils_files.c
-index d86629a..032db50 100644
---- a/src/utils_files.c
-+++ b/src/utils_files.c
-@@ -534,7 +534,6 @@ GSList *utils_files_check_UTF8_validity ( const gchar *contents,
-     gint long_str = 0;
-     gsize size = 0;
-     gsize bytes_written = 0;
--    GError * error = NULL;
-     gint i = 0;
-     gchar *ptr;
- 
-@@ -565,7 +564,7 @@ GSList *utils_files_check_UTF8_validity ( const gchar *contents,
-                 do
-                 {
-                      tmp_str = g_convert ( string, long_str, "UTF-8", charset_array[i],
--                                &size, &bytes_written, &error );
-+                                &size, &bytes_written, NULL );
-                     if ( tmp_str )
-                     {
-                         result = g_malloc0 ( sizeof ( struct struc_check_encoding ) );
-diff --git a/src/utils_str.c b/src/utils_str.c
-index 8c1e881..729a8a8 100644
---- a/src/utils_str.c
-+++ b/src/utils_str.c
-@@ -892,12 +892,16 @@ gchar *utils_str_dtostr ( gdouble number, gint nbre_decimal, gboolean canonical
- {
-     gchar buffer[G_ASCII_DTOSTR_BUF_SIZE];
-     gchar *str_number;
-+    gchar *decimal;
-     gchar *format;
-     gint nbre_char;
- 
--    format = g_strconcat ( "%.", utils_str_itoa ( nbre_decimal ), "f", NULL );
--
-+    decimal = utils_str_itoa ( nbre_decimal );
-+    format = g_strconcat ( "%.", decimal, "f", NULL );
-     nbre_char = g_sprintf ( buffer, format, number );
-+    g_free ( decimal );
-+    g_free ( format );
-+
-     if ( nbre_char > G_ASCII_DTOSTR_BUF_SIZE )
-         return NULL;
- 
-@@ -1004,7 +1008,10 @@ gchar *utils_str_incremente_number_from_str ( const gchar *str_number, gint incr
-     new_str_number = utils_str_itoa ( number );
- 
-     if ( prefix && strlen ( prefix ) > 0 )
-+    {
-         new_str_number = g_strconcat ( prefix, new_str_number, NULL );
-+        g_free ( prefix );
-+    }
- 
-     return new_str_number;
- }
--- 
-1.7.4
-
diff --git a/app-office/grisbi/files/0.8.2-0005-fixes-bug-of-compilation.patch b/app-office/grisbi/files/0.8.2-0005-fixes-bug-of-compilation.patch
deleted file mode 100644
index c209d0d0b0bc..000000000000
--- a/app-office/grisbi/files/0.8.2-0005-fixes-bug-of-compilation.patch
+++ /dev/null
@@ -1,397 +0,0 @@
-From 6697ec365f3829f945b82888e59851657ca198ca Mon Sep 17 00:00:00 2001
-From: pbiava <pierre.biava@nerim.net>
-Date: Fri, 25 Feb 2011 22:57:45 +0100
-Subject: [PATCH 5/5] fixes bug of compilation
-
----
- src/bet_data.c |  221 ++++++++++++--------------------------------------------
- 1 files changed, 46 insertions(+), 175 deletions(-)
-
-diff --git a/src/bet_data.c b/src/bet_data.c
-index fbc25d7..d0067f3 100644
---- a/src/bet_data.c
-+++ b/src/bet_data.c
-@@ -55,6 +55,7 @@ static GDate *bet_data_futur_get_next_date ( struct_futur_data *scheduled,
-                         const GDate *date_max );
- static struct_futur_data *bet_data_future_copy_struct ( struct_futur_data *scheduled );
- static void bet_data_future_set_max_number ( gint number );
-+static gchar *bet_data_get_key ( gint account_number, gint div_number );
- static gboolean bet_data_update_div ( SH *sh,
-                         gint transaction_number,
-                         gint sub_div,
-@@ -264,19 +265,9 @@ gboolean bet_data_hist_add_div ( gint account_number,
- {
-     gchar *key;
-     gchar *sub_key;
--    gchar *div_number_str, *account_number_str; // only to avoid memory leaks
-     struct_hist_div *shd;
- 
--    div_number_str = utils_str_itoa ( div_number );
--    if ( account_number == 0 )
--        key = g_strconcat ("0:", div_number_str, NULL );
--    else
--    {
--        account_number_str = utils_str_itoa ( account_number );
--        key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
--        g_free ( account_number_str );
--    }
--    g_free ( div_number_str );
-+    key = bet_data_get_key ( account_number, div_number );
- 
-     if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -348,19 +339,9 @@ void bet_data_insert_div_hist ( struct_hist_div *shd, struct_hist_div *sub_shd )
- {
-     gchar *key;
-     gchar *sub_key;
--    gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
-     struct_hist_div *tmp_shd;
- 
--    div_number_str = utils_str_itoa ( shd -> div_number );
--    if ( shd -> account_nb == 0 )
--        key = g_strconcat ("0:", div_number_str, NULL );
--    else
--    {
--        account_nb_str = utils_str_itoa ( shd -> account_nb );
--        key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
--        g_free ( account_nb_str );
--    }
--    g_free ( div_number_str );
-+    key = bet_data_get_key ( shd -> account_nb, shd -> div_number );
- 
-     if ( ( tmp_shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -395,19 +376,9 @@ gboolean bet_data_remove_div_hist ( gint account_number, gint div_number, gint s
- {
-     gchar *key;
-     char *sub_key;
--    gchar *div_number_str, *account_number_str; // only to avoid memory leaks
-     struct_hist_div *shd;
-     
--    div_number_str = utils_str_itoa ( div_number );
--    if ( account_number == 0 )
--        key = g_strconcat ("0:", div_number_str, NULL );
--    else
--    {
--        account_number_str = utils_str_itoa ( account_number );
--        key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
--        g_free ( account_number_str );
--    }
--    g_free ( div_number_str );
-+    key = bet_data_get_key ( account_number, div_number );
- 
-     if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -436,20 +407,10 @@ gboolean bet_data_search_div_hist ( gint account_number, gint div_number, gint s
- {
-     gchar *key;
-     gchar *sub_key;
--    gchar *div_number_str, *account_number_str; // only to avoid memory leaks
-     gint origin;
-     struct_hist_div *shd;
- 
--    div_number_str = utils_str_itoa ( div_number );
--    if ( account_number == 0 )
--        key = g_strconcat ("0:", div_number_str, NULL );
--    else
--    {
--        account_number_str = utils_str_itoa ( account_number );
--        key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
--        g_free ( account_number_str );
--    }
--    g_free ( div_number_str );
-+    key = bet_data_get_key ( account_number, div_number );
- 
-     origin = gsb_data_account_get_bet_hist_data ( account_number );
- 
-@@ -563,21 +524,11 @@ gchar *bet_data_get_div_name ( gint div_num,
- gboolean bet_data_get_div_edited ( gint account_number, gint div_number, gint sub_div_nb )
- {
-     gchar *key;
--    gchar *div_number_str, *account_number_str; // only to avoid memory leaks
-     gint origin;
-     struct_hist_div *shd;
-     gboolean edited;
- 
--    div_number_str = utils_str_itoa ( div_number );
--    if ( account_number == 0 )
--        key = g_strconcat ("0:", div_number_str, NULL );
--    else
--    {
--        account_number_str = utils_str_itoa ( account_number );
--        key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
--        g_free ( account_number_str );
--    }
--    g_free ( div_number_str );
-+    key = bet_data_get_key ( account_number, div_number );
- 
-     origin = gsb_data_account_get_bet_hist_data ( account_number );
- 
-@@ -619,19 +570,9 @@ gboolean bet_data_set_div_edited ( gint account_nb,
-                         gboolean edited )
- {
-     gchar *key;
--    gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
-     struct_hist_div *shd;
- 
--    div_number_str = utils_str_itoa ( div_number );
--    if ( account_nb == 0 )
--        key = g_strconcat ("0:", div_number_str, NULL );
--    else
--    {
--        account_nb_str = utils_str_itoa ( account_nb );
--        key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
--        g_free ( account_nb_str );
--    }
--    g_free ( div_number_str );
-+    key = bet_data_get_key ( account_nb, div_number );
- 
-     if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -664,20 +605,10 @@ gboolean bet_data_set_div_edited ( gint account_nb,
- gsb_real bet_data_hist_get_div_amount ( gint account_nb, gint div_number, gint sub_div_nb )
- {
-     gchar *key;
--    gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
-     struct_hist_div *shd;
-     gsb_real amount;
- 
--    div_number_str = utils_str_itoa ( div_number );
--    if ( account_nb == 0 )
--        key = g_strconcat ("0:", div_number_str, NULL );
--    else
--    {
--        account_nb_str = utils_str_itoa ( account_nb );
--        key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
--        g_free ( account_nb_str );
--    }
--    g_free ( div_number_str );
-+    key = bet_data_get_key ( account_nb, div_number );
- 
-     if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -716,19 +647,9 @@ gboolean bet_data_set_div_amount ( gint account_nb,
-                         gsb_real amount )
- {
-     gchar *key;
--    gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
-     struct_hist_div *shd;
- 
--    div_number_str = utils_str_itoa ( div_number );
--    if ( account_nb == 0 )
--        key = g_strconcat ("0:", div_number_str, NULL );
--    else
--    {
--        account_nb_str = utils_str_itoa ( account_nb );
--        key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
--        g_free ( account_nb_str );
--    }
--    g_free ( div_number_str );
-+    key = bet_data_get_key ( account_nb, div_number );
- 
-     if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
-     {
-@@ -1215,22 +1136,12 @@ void struct_free_bet_future ( struct_futur_data *scheduled )
- gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
- {
-     gchar *key;
--    gchar *future_number_str, *account_nb_str; // only to avoid memory leaks
-     
-     future_number ++;
- 
-     if ( scheduled -> frequency == 0 )
-     {
--        future_number_str = utils_str_itoa ( future_number );
--        if ( scheduled -> account_number == 0 )
--            key = g_strconcat ("0:", future_number_str, NULL );
--        else
--        {
--            account_nb_str = utils_str_itoa ( scheduled -> account_number );
--            key = g_strconcat ( account_nb_str, ":", future_number_str, NULL );
--            g_free ( account_nb_str );
--        }
--        g_free ( future_number_str );
-+        key = bet_data_get_key ( scheduled -> account_number, future_number );
- 
-         scheduled -> number = future_number;
-         g_hash_table_insert ( bet_future_list, key, scheduled );
-@@ -1250,16 +1161,7 @@ gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
-         date = gsb_date_copy ( scheduled -> date );
-         while ( date != NULL && g_date_valid ( date ) )
-         {
--            future_number_str = utils_str_itoa ( future_number );
--            if ( scheduled -> account_number == 0 )
--                key = g_strconcat ("0:", utils_str_itoa ( future_number ), NULL );
--            else
--            {
--                account_nb_str = utils_str_itoa ( scheduled -> account_number );
--                key = g_strconcat ( account_nb_str, ":", future_number_str, NULL );
--                g_free ( account_nb_str );
--            }
--            g_free ( future_number_str );
-+            key = bet_data_get_key ( scheduled -> account_number, future_number );
- 
-             if ( mother_row == future_number )
-                 new_sch = scheduled;
-@@ -1295,18 +1197,8 @@ gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
- gboolean bet_data_future_set_lines_from_file ( struct_futur_data *scheduled )
- {
-     gchar *key;
--    gchar *number_str, *account_nb_str; // only to avoid memory leaks
- 
--    number_str = utils_str_itoa ( scheduled -> number );
--    if ( scheduled -> account_number == 0 )
--        key = g_strconcat ("0:", number_str, NULL );
--    else
--    {
--        account_nb_str = utils_str_itoa ( scheduled -> account_number );
--        key = g_strconcat ( account_nb_str, ":", number_str, NULL );
--        g_free ( account_nb_str );
--    }
--    g_free ( number_str );
-+    key = bet_data_get_key ( scheduled -> account_number, scheduled -> number );
- 
-     bet_data_future_set_max_number ( scheduled -> number );
- 
-@@ -1622,18 +1514,8 @@ GDate *bet_data_array_get_date_max ( gint account_number )
- gboolean bet_data_future_modify_lines ( struct_futur_data *scheduled )
- {
-     gchar *key;
--    gchar *number_str, *account_nb_str; // only to avoid memory leaks
- 
--    number_str = utils_str_itoa ( scheduled -> number );
--    if ( scheduled -> account_number == 0 )
--        key = g_strconcat ("0:", number_str, NULL );
--    else
--    {
--        account_nb_str = utils_str_itoa ( scheduled -> account_number );
--        key = g_strconcat ( account_nb_str, ":", number_str, NULL );
--        g_free ( account_nb_str );
--    }
--    g_free ( number_str );
-+    key = bet_data_get_key ( scheduled -> account_number, scheduled -> number );
- 
-     g_hash_table_replace ( bet_future_list, key, scheduled );
- 
-@@ -1653,19 +1535,9 @@ gboolean bet_data_future_modify_lines ( struct_futur_data *scheduled )
- struct_futur_data *bet_data_future_get_struct ( gint account_number, gint number )
- {
-     gchar *key;
--    gchar *number_str, *account_nb_str; // only to avoid memory leaks
-     struct_futur_data *scheduled;
- 
--    number_str = utils_str_itoa ( number );
--    if ( scheduled -> account_number == 0 )
--        key = g_strconcat ("0:", number_str, NULL );
--    else
--    {
--        account_nb_str = utils_str_itoa ( account_number );
--        key = g_strconcat ( account_nb_str, ":", number_str, NULL );
--        g_free ( account_nb_str );
--    }
--    g_free ( number_str );
-+    key = bet_data_get_key ( account_number, number );
- 
-     if ( ( scheduled = g_hash_table_lookup ( bet_future_list, key ) ) )
-         return scheduled;
-@@ -1728,20 +1600,10 @@ GHashTable *bet_data_transfert_get_list ( void )
- gboolean bet_data_transfert_add_line ( struct_transfert_data *transfert )
- {
-     gchar *key;
--    gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
-     
-     transfert_number ++;
- 
--    transfert_nb_str = utils_str_itoa ( transfert_number );
--    if ( transfert -> account_number == 0 )
--        key = g_strconcat ("0:", transfert_nb_str, NULL );
--    else
--    {
--        account_nb_str = utils_str_itoa ( transfert -> account_number );
--        key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
--        g_free ( account_nb_str );
--    }
--    g_free ( transfert_nb_str );
-+    key = bet_data_get_key ( transfert -> account_number, transfert_number );
- 
-     transfert -> number = transfert_number;
-     g_hash_table_insert ( bet_transfert_list, key, transfert );
-@@ -1798,18 +1660,8 @@ gboolean bet_data_transfert_remove_line ( gint account_number, gint number )
- gboolean bet_data_transfert_set_line_from_file ( struct_transfert_data *transfert )
- {
-     gchar *key;
--    gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
- 
--    transfert_nb_str = utils_str_itoa ( transfert -> number );
--    if ( transfert -> account_number == 0 )
--        key = g_strconcat ("0:", transfert_nb_str, NULL );
--    else
--    {
--        account_nb_str = utils_str_itoa ( transfert -> account_number );
--        key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
--        g_free ( account_nb_str );
--    }
--    g_free ( transfert_nb_str );
-+    key = bet_data_get_key ( transfert -> account_number, transfert -> number );
- 
-     if ( transfert -> number >  transfert_number )
-         transfert_number = transfert -> number;
-@@ -1829,18 +1681,8 @@ gboolean bet_data_transfert_set_line_from_file ( struct_transfert_data *transfer
- gboolean bet_data_transfert_modify_line ( struct_transfert_data *transfert )
- {
-     gchar *key;
--    gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
- 
--    transfert_nb_str = utils_str_itoa ( transfert -> number );
--    if ( transfert -> account_number == 0 )
--        key = g_strconcat ("0:", transfert_nb_str, NULL );
--    else
--    {
--        account_nb_str = utils_str_itoa ( transfert -> account_number );
--        key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
--        g_free ( account_nb_str );
--    }
--    g_free ( transfert_nb_str );
-+    key = bet_data_get_key ( transfert -> account_number, transfert -> number );
- 
-     g_hash_table_replace ( bet_transfert_list, key, transfert );
- 
-@@ -1962,6 +1804,35 @@ gboolean bet_data_remove_all_bet_data ( gint account_number )
- }
- 
- 
-+/**
-+ * retourne la clef de recherche de la division passée en paramètre.
-+ *
-+ *
-+ *
-+ * */
-+gchar *bet_data_get_key ( gint account_number, gint div_number )
-+{
-+    gchar *key;
-+    gchar *div_number_str, *account_number_str; /* only to avoid memory leaks */
-+
-+    div_number_str = utils_str_itoa ( div_number );
-+
-+    if ( account_number == 0 )
-+        key = g_strconcat ("0:", div_number_str, NULL );
-+    else
-+    {
-+        account_number_str = utils_str_itoa ( account_number );
-+        key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
-+
-+        g_free ( account_number_str );
-+    }
-+
-+    g_free ( div_number_str );
-+
-+    return key;
-+}
-+
-+
- /* Local Variables: */
- /* c-basic-offset: 4 */
- /* End: */
--- 
-1.7.4
-
diff --git a/app-office/grisbi/files/grisbi.desktop b/app-office/grisbi/files/grisbi.desktop
deleted file mode 100644
index ebf5e0882b41..000000000000
--- a/app-office/grisbi/files/grisbi.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Grisbi
-Comment=A personnal account manager
-Exec=grisbi
-Icon=grisbi
-Terminal=false
-Type=Application
-MimeType=application/x-grisbi;
-Categories=Office;
diff --git a/app-office/grisbi/grisbi-0.6.0_rc2.ebuild b/app-office/grisbi/grisbi-0.6.0_rc2.ebuild
deleted file mode 100644
index 32762db8ee24..000000000000
--- a/app-office/grisbi/grisbi-0.6.0_rc2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.6.0_rc2.ebuild,v 1.9 2012/05/03 20:00:40 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-IUSE="nls ofx ssl"
-
-MY_PV=${PV/_rc/rc}
-DESCRIPTION="Grisbi is a personal accounting application for Linux"
-HOMEPAGE="http://www.grisbi.org"
-SRC_URI="mirror://sourceforge/grisbi/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# minimum gtk 2.10 to have print support
-RDEPEND="dev-libs/libxml2
-	>=x11-libs/gtk+-2.10.0:2
-	ssl? ( dev-libs/openssl )
-	ofx? ( >=dev-libs/libofx-0.7.0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/0.6.0_rc2-properly-detect-gmodule.patch"
-
-	# Apply location patchs
-	ebegin "Applying Gentoo documentation location patch"
-	for i in \
-		$(find ./ -name 'Makefile.am') \
-		$(find ./ -name 'grisbi-manuel.html')
-			do
-				sed -i "s;doc/grisbi/;doc/${PF}/;g" "${i}"
-			done
-	eend 0
-
-	# Fix Icon value in desktop file
-	sed -i "s/grisbi.png/grisbi/" share/grisbi.desktop || die
-
-	AT_M4DIR="macros" eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-plugins \
-		$(use_with ofx) \
-		$(use_enable nls) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS NEWS README
-}
-
-pkg_postinst() {
-	elog "The first thing you should do is set up the browser command in"
-	elog "preferences after you start up grisbi.  Otherwise you will not"
-	elog "be able to see the help and manuals."
-}
diff --git a/app-office/grisbi/grisbi-0.8.2.ebuild b/app-office/grisbi/grisbi-0.8.2.ebuild
deleted file mode 100644
index 50a6b03675aa..000000000000
--- a/app-office/grisbi/grisbi-0.8.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.8.2.ebuild,v 1.6 2012/05/03 20:00:40 jdhore Exp $
-
-EAPI="3"
-
-inherit eutils gnome2
-
-IUSE="nls ofx ssl"
-
-DESCRIPTION="Grisbi is a personal accounting application for Linux"
-HOMEPAGE="http://www.grisbi.org"
-SRC_URI="mirror://sourceforge/grisbi/grisbi%20stable/0.8.x/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="dev-libs/libxml2
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.12.0:2
-	ssl? ( >=dev-libs/openssl-0.9.5 )
-	ofx? ( >=dev-libs/libofx-0.7.0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	G2CONF="
-		--with-plugins
-		--with-libxml2
-		$(use_with ssl openssl)
-		$(use_with ofx)
-		$(use_enable nls)"
-	DOCS="AUTHORS NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	epatch \
-		"${FILESDIR}/0.8.2-0001-fixes-bug-1289.patch" \
-		"${FILESDIR}/0.8.2-0002-fixes-a-crash-when-importing-a-file-without-extensio.patch" \
-		"${FILESDIR}/0.8.2-0003-fixes-bug-1293-Problem-of-updating-of-the-pointing-b.patch" \
-		"${FILESDIR}/0.8.2-0004-fix-memory-leaks-thanks-Philippe-D.patch" \
-		"${FILESDIR}/0.8.2-0005-fixes-bug-of-compilation.patch"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "The first thing you should do is set up the browser command in"
-	elog "preferences after you start up grisbi.  Otherwise you will not"
-	elog "be able to see the help and manuals."
-}
diff --git a/app-office/grisbi/grisbi-0.8.9.ebuild b/app-office/grisbi/grisbi-0.8.9.ebuild
new file mode 100644
index 000000000000..a441797028f8
--- /dev/null
+++ b/app-office/grisbi/grisbi-0.8.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.8.9.ebuild,v 1.1 2012/06/30 17:50:39 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Grisbi is a personal accounting application for Linux"
+HOMEPAGE="http://www.grisbi.org"
+SRC_URI="mirror://sourceforge/grisbi/grisbi%20stable/0.8.x/${P}.tar.bz2"
+IUSE="nls ofx ssl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="dev-libs/libxml2
+	>=dev-libs/glib-2.18.0:2
+	>=x11-libs/gtk+-2.12.0:2
+	x11-misc/xdg-utils
+	ssl? ( >=dev-libs/openssl-0.9.5 )
+	ofx? ( >=dev-libs/libofx-0.7.0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	G2CONF+="--with-plugins
+		--with-libxml2
+		--without-cunit
+		--disable-static
+		$(use_with ssl openssl)
+		$(use_with ofx)
+		$(use_enable nls)"
+	DOCS="AUTHORS NEWS README"
+}