From 2e62bf28797d6cb72dee6fdf2f7b5bdd9c81074c Mon Sep 17 00:00:00 2001 From: Gregorio Guidi Date: Sun, 29 May 2005 14:45:03 +0000 Subject: Correct libofx dependency. Add patch for bug #94379, thanks to . (Portage version: 2.0.51.19) --- app-office/kmymoney2/ChangeLog | 9 +- .../kmymoney2/files/digest-kmymoney2-0.7.1-r1 | 1 + .../files/kmymoney2-0.7.1-csv-export.patch | 164 +++++++++++++++++++++ app-office/kmymoney2/kmymoney2-0.7.1-r1.ebuild | 40 +++++ 4 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 app-office/kmymoney2/files/digest-kmymoney2-0.7.1-r1 create mode 100644 app-office/kmymoney2/files/kmymoney2-0.7.1-csv-export.patch create mode 100644 app-office/kmymoney2/kmymoney2-0.7.1-r1.ebuild (limited to 'app-office/kmymoney2') diff --git a/app-office/kmymoney2/ChangeLog b/app-office/kmymoney2/ChangeLog index abbb6ef7ee85..ed591195cc78 100644 --- a/app-office/kmymoney2/ChangeLog +++ b/app-office/kmymoney2/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/kmymoney2 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.26 2005/05/22 00:17:12 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.27 2005/05/29 14:45:03 greg_g Exp $ + +*kmymoney2-0.7.1-r1 (29 May 2005) + + 29 May 2005; Gregorio Guidi + +files/kmymoney2-0.7.1-csv-export.patch, +kmymoney2-0.7.1-r1.ebuild: + Correct libofx dependency. Add patch for bug #94379, thanks to + . *kmymoney2-0.7.1 (22 May 2005) diff --git a/app-office/kmymoney2/files/digest-kmymoney2-0.7.1-r1 b/app-office/kmymoney2/files/digest-kmymoney2-0.7.1-r1 new file mode 100644 index 000000000000..a6f0b87178bf --- /dev/null +++ b/app-office/kmymoney2/files/digest-kmymoney2-0.7.1-r1 @@ -0,0 +1 @@ +MD5 28deaba467d513f20cc44048656d0a06 kmymoney2-0.7.1.tar.bz2 2725951 diff --git a/app-office/kmymoney2/files/kmymoney2-0.7.1-csv-export.patch b/app-office/kmymoney2/files/kmymoney2-0.7.1-csv-export.patch new file mode 100644 index 000000000000..0b5093bfab88 --- /dev/null +++ b/app-office/kmymoney2/files/kmymoney2-0.7.1-csv-export.patch @@ -0,0 +1,164 @@ +--- kmymoney2-0.7.1.backup/kmymoney2/reports/querytable.cpp 2005-03-19 16:21:11.000000000 +0100 ++++ kmymoney2-0.7.1/kmymoney2/reports/querytable.cpp 2005-05-28 17:06:09.000000000 +0200 +@@ -40,6 +40,7 @@ + #include "reportdebug.h" + #include "querytable.h" + ++ + namespace reports { + + // this should be in mymoneysplit.h +@@ -752,6 +753,11 @@ + // MyMoneyMoney::signPosition savesignpos = MyMoneyMoney::negativeMonetarySignPosition(); + unsigned char savethsep = MyMoneyMoney::thousandSeparator(); + ++#ifndef CSV_SEPARATOR ++#define CSV_SEPARATOR "\t"; ++#endif ++ String g_csvSep = CSV_SEPARATOR; ++ + MyMoneyMoney grandtotal; + + result=""; +@@ -829,7 +835,7 @@ + if ( i18nName.isEmpty() ) + i18nName = *it_column; + result += "" + i18nName + ""; +- csv += i18nName + ","; ++ csv += i18nName + g_csvSep; + ++it_column; + } + +@@ -899,7 +905,7 @@ + "colspan=\"" + QString::number(columns.count()-1) + "\">"+ + i18n("Total")+" " + (*it_group).oldName() + "" + "" + subtotal_html + "\n"; +- csv += "\"" + i18n("Total") + " " + (*it_group).oldName() + "\"," + subtotal_csv + "\n"; ++ csv += "\"" + i18n("Total") + " " + (*it_group).oldName() + "\"" + g_csvSep + subtotal_csv + "\n"; + } + --it_group; + } +@@ -936,7 +942,7 @@ + + MyMoneyMoney::setThousandSeparator('\0'); + +- csv += MyMoneyMoney(data).formatMoney() + ","; ++ csv += MyMoneyMoney(data).formatMoney() + g_csvSep; + + MyMoneyMoney::setThousandSeparator(savethsep); + } +@@ -948,7 +954,7 @@ + + MyMoneyMoney::setThousandSeparator('\0'); + +- csv += (*it_row)["currency"] + " " + MyMoneyMoney(data).formatMoney() + ","; ++ csv += (*it_row)["currency"] + " " + MyMoneyMoney(data).formatMoney() + g_csvSep; + + MyMoneyMoney::setThousandSeparator(savethsep); + +@@ -964,7 +970,7 @@ + { + result += QString("%1") + .arg(data); +- csv += "\""+ data + "\","; ++ csv += "\""+ data + "\"" + g_csvSep; + } + ++it_column; + } +@@ -1001,7 +1007,7 @@ + "colspan=\"" + QString::number(columns.count()-1) + "\">"+ + i18n("Total")+" " + (*it_group).oldName() + "" + "" + subtotal_html + "\n"; +- csv += "\"" + i18n("Total") + " " + (*it_group).oldName() + "\"," + subtotal_csv + "\n"; ++ csv += "\"" + i18n("Total") + " " + (*it_group).oldName() + "\"" + g_csvSep + subtotal_csv + "\n"; + --it_group; + } + +@@ -1019,7 +1025,7 @@ + "colspan=\"" + QString::number(columns.count()-1) + "\">"+ + i18n("Grand Total") + "" + "" + grandtotal_html + "\n"; +- csv += "\"" + i18n("Grand Total") + "\"," + grandtotal_csv + "\n"; ++ csv += "\"" + i18n("Grand Total") + "\"" + g_csvSep + grandtotal_csv + "\n"; + } + result += "\n"; + } +--- kmymoney2-0.7.1.backup/kmymoney2/reports/pivottable.cpp 2005-03-19 16:21:11.000000000 +0100 ++++ kmymoney2-0.7.1/kmymoney2/reports/pivottable.cpp 2005-05-28 17:06:08.000000000 +0200 +@@ -739,6 +739,11 @@ + { + DEBUG_ENTER(__PRETTY_FUNCTION__); + ++#ifndef CSV_SEPARATOR ++#define CSV_SEPARATOR "\t"; ++#endif ++ String g_csvSep = CSV_SEPARATOR; ++ + char saveseparator = MyMoneyMoney::thousandSeparator(); + MyMoneyMoney::setThousandSeparator('\0'); + +@@ -760,10 +765,10 @@ + + unsigned column = 1; + while ( column < m_numColumns ) +- result += QString(",%1").arg(QString(m_columnHeadings[column++])); ++ result += g_csvSep + QString("%1").arg(QString(m_columnHeadings[column++])); + + if ( m_config_f.isShowingRowTotals() ) +- result += QString(",%1").arg(i18n("Total")); ++ result += g_csvSep + QString("%1").arg(i18n("Total")); + + result += "\n"; + +@@ -804,10 +809,10 @@ + QString rowdata; + unsigned column = 1; + while ( column < m_numColumns ) +- rowdata += QString(",%1").arg(it_row.data()[column++].formatMoney()); ++ rowdata += g_csvSep + QString("%1").arg(it_row.data()[column++].formatMoney()); + + if ( m_config_f.isShowingRowTotals() ) +- rowdata += QString(",%1").arg((*it_row).m_total.formatMoney()); ++ rowdata += g_csvSep + QString("%1").arg((*it_row).m_total.formatMoney()); + + // + // Row Header +@@ -865,10 +870,10 @@ + { + unsigned column = 1; + while ( column < m_numColumns ) +- result += QString(",%1").arg((*it_innergroup).m_total[column++].formatMoney()); ++ result += g_csvSep + QString("%1").arg((*it_innergroup).m_total[column++].formatMoney()); + + if ( m_config_f.isShowingRowTotals() ) +- result += QString(",%1").arg((*it_innergroup).m_total.m_total.formatMoney()); ++ result += g_csvSep + QString("%1").arg((*it_innergroup).m_total.m_total.formatMoney()); + + result += "\n"; + } +@@ -886,10 +891,10 @@ + result += QString("%1 %2").arg(i18n("Total")).arg(it_outergroup.key()); + unsigned column = 1; + while ( column < m_numColumns ) +- result += QString(",%1").arg((*it_outergroup).m_total[column++].formatMoney()); ++ result += g_csvSep + QString("%1").arg((*it_outergroup).m_total[column++].formatMoney()); + + if ( m_config_f.isShowingRowTotals() ) +- result += QString(",%1").arg((*it_outergroup).m_total.m_total.formatMoney()); ++ result += g_csvSep + QString("%1").arg((*it_outergroup).m_total.m_total.formatMoney()); + + result += "\n"; + } +@@ -905,10 +910,10 @@ + result += i18n("Grand Total"); + unsigned totalcolumn = 1; + while ( totalcolumn < m_numColumns ) +- result += QString(",%1").arg(m_grid.m_total[totalcolumn++].formatMoney()); ++ result += g_csvSep + QString("%1").arg(m_grid.m_total[totalcolumn++].formatMoney()); + + if ( m_config_f.isShowingRowTotals() ) +- result += QString(",%1").arg(m_grid.m_total.m_total.formatMoney()); ++ result += g_csvSep + QString("%1").arg(m_grid.m_total.m_total.formatMoney()); + + result += "\n"; + } diff --git a/app-office/kmymoney2/kmymoney2-0.7.1-r1.ebuild b/app-office/kmymoney2/kmymoney2-0.7.1-r1.ebuild new file mode 100644 index 000000000000..f7bf93fecabd --- /dev/null +++ b/app-office/kmymoney2/kmymoney2-0.7.1-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.7.1-r1.ebuild,v 1.1 2005/05/29 14:45:03 greg_g Exp $ + +inherit kde eutils + +DESCRIPTION="Personal Finances Manager for KDE." +HOMEPAGE="http://kmymoney2.sourceforge.net" +SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~x86 ~ppc ~amd64 ~sparc" +IUSE="crypt ofx" + +DEPEND="dev-libs/libxml2 + ofx? ( >=dev-libs/libofx-0.7 )" + +RDEPEND="${DEPEND} + crypt? ( app-crypt/gnupg )" + +need-kde 3.2 + +# TODO: support maketest +# (needs cppunit in DEPEND) + +src_unpack() { + kde_src_unpack + + # See bug 1210755 on sourceforge.net + epatch "${FILESDIR}/${P}-csv-export.patch" +} + +src_compile() { + local myconf="$(use_enable ofx ofxplugin) + --disable-kbanking + --disable-cppunit" + + kde_src_compile +} -- cgit v1.2.3-65-gdbad