app-office/homebank: Version bump (patch not needed anymore, still broken with --as-needed)

svn path=/sunrise/; revision=5876

4 files changed, 18 insertions, 248 deletions

diff --git a/app-office/homebank/ChangeLog b/app-office/homebank/ChangeLog
index 604a209c1..1dcc10ea2 100644
--- a/app-office/homebank/ChangeLog
+++ b/app-office/homebank/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> -homebank-3.3.ebuild,
+  -files/homebank-3.3-libofx.patch, +homebank-3.6.ebuild:
+  Version bump (patch not needed anymore, still broken with --as-needed)
+
   15 Feb 2008; (Tommy[D]) tommy100@gmx.de homebank-3.3.ebuild:
   Fix typo
 
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index 1fc553960..f68d72687 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -1,5 +1,4 @@
-AUX homebank-3.3-libofx.patch 7376 RMD160 f271109a71145e85105ed164d27f5e29996beca4 SHA1 4ab70a6ce5dd2568fbaf32fb5454c2bc47acadc9 SHA256 81c11e54b640f3edeabbc38dbbdd164d2d6adb3b97c4babc95336e7ae9536cfd
-DIST homebank-3.3_unstable.tar.gz 552909 RMD160 923b940c36aed0d6d2f2d5efbd87c7c94524907d SHA1 c624708d05f4866ed3513f5fc62e5f2ca9dfe63b SHA256 9e6728b55021ea235723b837610841d2d9d6131954c2567db192a234a8c62edb
-EBUILD homebank-3.3.ebuild 800 RMD160 e238bbe11c21c70030f8be3b4bd9d41bc8af080b SHA1 870d4cc233b38568ba58643ed10423e119bbb5af SHA256 86744d7ac88db258d35c5a1ca78cf326ceb4b05b3a7d04a958188180a7be2b3e
-MISC ChangeLog 1329 RMD160 e5127e793d5bd54608ebc0e42706153aee5e6431 SHA1 d1f5d0f1ea81966816fe80f5cb025a8da8a5a464 SHA256 29c87bc0fdd6894e0660d3be83a180f79a8a57d6ec138a1e5a4175055c0cf738
+DIST homebank-3.6.tar.gz 1382032 RMD160 fda41f1f50fb18d0edcbfc6374327e429da6771b SHA1 a4f65b9867e0131173003378308a7a2ffef83e49 SHA256 897d34d51187c030e4180d9269bba0f1186f17c758cead6da5cfab19391e961a
+EBUILD homebank-3.6.ebuild 892 RMD160 fbd475c85e136aa15a2c6022a97a2cc94e617829 SHA1 596a14d191e4c191747f0b65ff37bb7419f6ab73 SHA256 7b6c6c9020ac66f1882e3bafb2d00d4fe651e225acd922ab72b4a1f85fe1779f
+MISC ChangeLog 1536 RMD160 cc38f6ab919452d9a20fcf936f2e45afe87311f7 SHA1 46fdf891bbf59c83bb8ba38f2bc5c56e691074c1 SHA256 46eccd2a1df31bdc0cfde91fb9572d919faa98e1010e1437f783f809c5ef860b
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-office/homebank/files/homebank-3.3-libofx.patch b/app-office/homebank/files/homebank-3.3-libofx.patch
deleted file mode 100644
index 79fecaea7..000000000
--- a/app-office/homebank/files/homebank-3.3-libofx.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -Naur homebank-3.3_unstable.orig/src/import.c homebank-3.3_unstable/src/import.c
---- homebank-3.3_unstable.orig/src/import.c	2007-03-30 17:49:34.000000000 +0200
-+++ homebank-3.3_unstable/src/import.c	2007-03-30 17:32:10.000000000 +0200
-@@ -21,7 +21,10 @@
- #include "import.h"
- #include "list_operation.h"
- 
-+
-+#ifndef NOOFX
- #include <libofx/libofx.h>
-+#endif
- 
- /****************************************************************************/
- /* Debug macros                                                             */
-@@ -247,6 +250,8 @@
- 	return list;
- }
- 
-+
-+#ifndef NOOFX
- /*
- ****
- ****
-@@ -599,6 +604,8 @@
- 	return ofx_ope_list;
- }
- 
-+#endif
-+
- /*
- ***
- *** qif part
-@@ -625,16 +632,17 @@
- 	gtk_list_store_clear (GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(data->imported_ope))));
- 
- 
--
-+#ifndef NOOFX
- 	ofx_acc_list = NULL;
- 	da_account_destroy(ofx_acc_list);
-+#endif
- 
- 	da_operation_destroy(data->ope_imp_list);
- 	data->ope_imp_list = NULL;
-+
-+#ifndef NOOFX
- 	ofx_ope_list = NULL;
--	
--	
--	
-+#endif	
- 	
- }
- 
-@@ -670,10 +678,12 @@
- 			case FILETYPE_UNKNOW:
- 				gtk_label_set_text(GTK_LABEL(data->user_info), _("Unknow/Invalid file..."));
- 				break;
-+#ifndef NOOFX
- 			case FILETYPE_OFX:
- 				gtk_label_set_text(GTK_LABEL(data->user_info), _("OFX file recognized !"));
- 				data->valid = TRUE;
- 				break;
-+#endif
- 			case FILETYPE_CSV_HB:
- 				gtk_label_set_text(GTK_LABEL(data->user_info), _("CSV operation file recognized !"));
- 				data->valid = TRUE;
-@@ -805,6 +815,7 @@
- 
- 	DB( g_print("(import) apply\n") );
- 
-+#ifndef NOOFX
- 	GList *tmplist = g_list_first(ofx_acc_list);
- 
- 	while (tmplist != NULL)
-@@ -815,6 +826,7 @@
- 		
- 		tmplist = g_list_next(tmplist);
- 	}
-+#endif
- 
- 	// then import operations
- 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(data->imported_ope));
-@@ -1066,13 +1078,18 @@
- 			import_clearall(data);
- 			switch(data->filetype)
- 			{
-+
-+#ifndef NOOFX
- 				case FILETYPE_OFX:
- 					/* ofx_acc_list & ofx_ope_list are filled here */
- 					data->ope_imp_list = homebank_ofx_import(data->filename);
- 					break;
-+#endif
-+
- 				case FILETYPE_CSV_HB:
- 					accnum = gtk_combo_box_get_active(GTK_COMBO_BOX(data->PO_acc));
- 					data->ope_imp_list = homebank_csv_import(data->filename, accnum);
-+				
- 					break;
- 			}
- 								
-@@ -1089,7 +1106,8 @@
- 		gchar *txt;
- 		
- 			import_count_changes(data);
--		
-+
-+		#ifndef NOOFX
- 			txt = g_strdup_printf(
- 				_(
- 				"%d account(s) will be created.\n\n" \
-@@ -1100,6 +1118,18 @@
- 				data->imported,
- 				data->total-data->imported
- 				);
-+
-+		#else
-+			txt = g_strdup_printf(
-+				_(
-+				"%d operation(s) will be imported.\n" \
-+				"%d operation(s) will be rejected."
-+				),
-+				data->imported,
-+				data->total-data->imported
-+				);
-+		#endif
-+
- 			gtk_label_set_text(GTK_LABEL(data->last_info), txt);
- 			g_free(txt);		
- 
-@@ -1149,7 +1179,7 @@
- 	
- 		"HomeBank can import operations from several file format:\n" \
- 		"\n" \
--		"- OFX/QFX\n" \
-+		"- OFX/QFX (optional)\n" \
- 		"- CSV (Homebank operation csv export format only)\n" \
- 		"\n" \
- 		"The import process has several steps. Your HomeBank accounts\n" \
-diff -Naur homebank-3.3_unstable.orig/src/list_operation.c homebank-3.3_unstable/src/list_operation.c
---- homebank-3.3_unstable.orig/src/list_operation.c	2007-03-30 17:49:34.000000000 +0200
-+++ homebank-3.3_unstable/src/list_operation.c	2007-03-30 17:32:10.000000000 +0200
-@@ -317,7 +317,7 @@
- 	gtk_tree_view_column_pack_start(column, renderer, TRUE);
- 	gtk_tree_view_column_set_cell_data_func(column, renderer, ope_date_cell_data_function, NULL, NULL);
- 	gtk_tree_view_column_set_sort_column_id (column, LST_DSPOPE_DATE);
--	//gtk_tree_view_column_set_resizable(column, TRUE);
-+	gtk_tree_view_column_set_resizable(column, TRUE);
- 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), column);
- 
- 	/* column 3: Infos */
-@@ -332,7 +332,7 @@
- 	gtk_tree_view_column_pack_start(column, renderer, TRUE);
- 	gtk_tree_view_column_set_cell_data_func(column, renderer, ope_info_cell_data_function, (gpointer)2, NULL);
- 	gtk_tree_view_column_set_sort_column_id (column, LST_DSPOPE_INFO);
--	//gtk_tree_view_column_set_resizable(column, TRUE);
-+	gtk_tree_view_column_set_resizable(column, TRUE);
- 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), column);
- 
- 	/* column 4: Payee */
-@@ -342,7 +342,7 @@
- 	gtk_tree_view_column_pack_start(column, renderer, TRUE);
- 	gtk_tree_view_column_set_cell_data_func(column, renderer, ope_payee_cell_data_function, NULL, NULL);
- 	gtk_tree_view_column_set_sort_column_id (column, LST_DSPOPE_PAYEE);
--	//gtk_tree_view_column_set_resizable(column, TRUE);
-+	gtk_tree_view_column_set_resizable(column, TRUE);
- 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), column);
- 
- 	/* column 5: Wording */
-@@ -352,7 +352,7 @@
- 	gtk_tree_view_column_pack_start(column, renderer, TRUE);
- 	gtk_tree_view_column_set_cell_data_func(column, renderer, ope_wording_cell_data_function, NULL, NULL);
- 	gtk_tree_view_column_set_sort_column_id (column, LST_DSPOPE_WORDING);
--	//gtk_tree_view_column_set_resizable(column, TRUE);
-+	gtk_tree_view_column_set_resizable(column, TRUE);
- 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), column);
- 
- 	/* column 6: Expense */
-@@ -364,7 +364,7 @@
- 	gtk_tree_view_column_set_cell_data_func(column, renderer, ope_amount_cell_data_function, (gpointer)-1, NULL);
- 	gtk_tree_view_column_set_alignment (column, 1.0);
- 	gtk_tree_view_column_set_sort_column_id (column, LST_DSPOPE_EXPENSE);
--	//gtk_tree_view_column_set_resizable(column, TRUE);
-+	gtk_tree_view_column_set_resizable(column, TRUE);
- 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), column);
- 
- 	/* column 7: Income */
-@@ -376,7 +376,7 @@
- 	gtk_tree_view_column_set_cell_data_func(column, renderer, ope_amount_cell_data_function, (gpointer)1, NULL);
- 	gtk_tree_view_column_set_alignment (column, 1.0);
- 	gtk_tree_view_column_set_sort_column_id (column, LST_DSPOPE_INCOME);
--	//gtk_tree_view_column_set_resizable(column, TRUE);
-+	gtk_tree_view_column_set_resizable(column, TRUE);
- 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), column);
- 
- 	/* column 8: Category */
-@@ -386,7 +386,7 @@
- 	gtk_tree_view_column_pack_start(column, renderer, TRUE);
- 	gtk_tree_view_column_set_cell_data_func(column, renderer, ope_category_cell_data_function, NULL, NULL);
- 	gtk_tree_view_column_set_sort_column_id (column, LST_DSPOPE_CATEGORY);
--	//gtk_tree_view_column_set_resizable(column, TRUE);
-+	gtk_tree_view_column_set_resizable(column, TRUE);
- 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), column);
- 
-   /* column 9: empty */
-@@ -416,6 +416,7 @@
- 
- /* ---------------------------------------------- */
- 
-+#ifndef NOOFX
- /*
- ** account cell function
- */
-@@ -443,6 +444,7 @@
- 
- 	g_object_set(renderer, "text", acc->name, NULL);
- }
-+#endif
- 
- /*
- ** amount cell function
-@@ -567,6 +569,7 @@
- 	gtk_tree_view_column_set_cell_data_func(column, renderer, ope_importstate_cell_data_function, NULL, NULL);
- 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), column);
- 
-+#ifndef NOOFX
- 	/* column: Account */
- 	column = gtk_tree_view_column_new();
- 	gtk_tree_view_column_set_title(column, _("Account"));
-@@ -576,6 +579,7 @@
- 	//gtk_tree_view_column_set_sort_column_id (column, LST_DSPOPE_DATE);
- 	//gtk_tree_view_column_set_resizable(column, TRUE);
- 	gtk_tree_view_append_column (GTK_TREE_VIEW(view), column);
-+#endif	
- 	
- 	/* column: Date */
- 	column = gtk_tree_view_column_new();
diff --git a/app-office/homebank/homebank-3.3.ebuild b/app-office/homebank/homebank-3.6.ebuild
index ae58e4646..bb4c12fe9 100644
--- a/app-office/homebank/homebank-3.3.ebuild
+++ b/app-office/homebank/homebank-3.6.ebuild
@@ -2,13 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+WANT_AUTOMAKE="none"
+WANT_AUTOCONF="latest"
 
-MY_P=${P}_unstable
+inherit autotools
 
 DESCRIPTION="The free software you have always wanted to manage your personal accounts at home"
 HOMEPAGE="http://homebank.free.fr/index.php"
-SRC_URI="http://homebank.free.fr/public/${MY_P}.tar.gz"
+SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="ofx"
@@ -19,11 +20,15 @@ RDEPEND=">=x11-libs/gtk+-2.0
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S=${WORKDIR}/${MY_P}
-
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}/${P}-libofx.patch"
+	cd "${S}"
+
+	sed -i \
+		-e 's|LDFLAGS="${LDFLAGS} -lofx"|LIBS="${LIBS} -lofx"|' \
+		configure.ac || die "sed failed"
+
+	eautoconf
 }
 
 src_compile() {