Fix gnucash import, bug 384871

Package-Manager: portage-2.1.10.29/cvs/Linux x86_64

4 files changed, 123 insertions, 15 deletions

diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index cbee7ebd46fa..2313eefa7902 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/kmymoney
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.21 2011/08/09 22:10:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.22 2011/10/21 22:45:39 dilfridge Exp $
+
+*kmymoney-4.6.0-r1 (21 Oct 2011)
+
+  21 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kmymoney-4.6.0-r1.ebuild, +files/kmymoney-4.6.0-gnucash.patch:
+  Fix gnucash import, bug 384871
 
 *kmymoney-4.6.0 (09 Aug 2011)
 
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 1fe06f1fd86e..d4a930a12ce5 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -2,26 +2,28 @@
 Hash: SHA512
 
 AUX kmymoney-4.5.3-underlinking.patch 960 RMD160 fc4f54a5d5094668e6c37553661a12523f9ec79d SHA1 385fb9bd22625ddeb7b2545fe4e92d29b8ba42e5 SHA256 33d04cd3fc549871264ee02e9532e0afe07e2e9223008feac6c57e87d4bf6849
+AUX kmymoney-4.6.0-gnucash.patch 916 RMD160 0ea0f923930c90727369730c76c8474a3e415b83 SHA1 25a854e8b1c9da7164364d81dbaec009ce2cebd7 SHA256 2882c9eacae40031022e8488a410a39be739240d0351e0b5aa768577ba9ba045
 DIST kmymoney-4.5.3.tar.bz2 14937401 RMD160 896e2efcfe7ec400327f74d40b9393eaf38cbce5 SHA1 3333d19d2c84eae45b1be3aeb3d90780f2beb9e1 SHA256 a9b37275cf3cdcd5ce865d94391df44c7822639b830fccb9962a54b7fcf76ffb
 DIST kmymoney-4.6.0.tar.bz2 20914001 RMD160 e71d10a768ed19c4a4f264d70600f683f997565e SHA1 b3f250e82e67166bd7425a4343e744f1f2a6f743 SHA256 8f034a92682cc61dfa76c2593893524d00658c49360b17ddc67671e32ec7edf8
 EBUILD kmymoney-4.5.3.ebuild 1789 RMD160 c031816a32d50e03694c8ea57f2e2df4020450b5 SHA1 48fdc7e30572f47d41652fa31027723fb0278a87 SHA256 3a2a194601332f3af474305d9694f0546b9a4dfe771e9bc918d0078d388f4a67
+EBUILD kmymoney-4.6.0-r1.ebuild 1926 RMD160 a762148984097bed5caa924f1d297492f7fdeb8d SHA1 fdd2191929c70008c0437fe117f2413fea3dd3d3 SHA256 0752ffa0ff41d34b7f7494e99dc2080245b4cd8d78c0945d281b6a8406dc5682
 EBUILD kmymoney-4.6.0.ebuild 1881 RMD160 322e189063ece0801e38ba80a3040f46483e3bb8 SHA1 1e8993170a4aeb18ac2265016cf696ded7970062 SHA256 2a0149d458378c49167fc86e2784024692fd3bf57168b9f8942936b9d839becf
-MISC ChangeLog 3176 RMD160 359d23f5f3e12490fca648f0ce0b9c56a7712fef SHA1 b29fdfbaed59bb810e8e12c3a04ce4e39328b028 SHA256 7f594a15ee75285cf2f92eeb076ed075cd3586189be289273b18ff014cfcbe01
+MISC ChangeLog 3367 RMD160 3cc88882d4f0e51f16fb6830cc826744e411b6c3 SHA1 1f6229f9db418336c6e2afbaadb207b1ec0ef21f SHA256 7719c454ce1207d88bf7fea50b789bb31aa3ef7d51bebe7ed823a95e7d58f084
 MISC metadata.xml 327 RMD160 337c462e38007a529ca6c979b341426898a9af04 SHA1 62bfe203a842760f95655a42acdd1da8f4436637 SHA256 af0c2dc62649bae5e9a0b375d7106bee7952dda0b258ad375e2cf1551c75246f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOQbCAAAoJENwGBM22xffeWtcQAI27MWNjY3Yj+P7f106v38Zq
-lnvxQ0AxbAMDzkQIZJs3pbioNFrDHrmG0Ku8nZf6/untkByEYkdZYUW68ESkLVfE
-nGZT4kf/Tiv0HjODU62SEjRia0UEMrkmhXQbJm5yowg0o9DkAlh6P//MRn52ASpO
-ETHPVJUcadGIX8i9xZsj5SSinTZ+CG4ZcJ6l3A8Uc61qBY1eEjIQgmgO71PPWEVh
-JklDzWu+8LXCTXnyH2assWlDb2rUiTzB/joPevN91Qwn2QZAyevSu2ViO6H409g4
-+N2tkfDMpW9swn2GeV+go+FyqJPjXqypDpKoqPMdJpKCOsx9to7ltxQI8ZAVzWmk
-zN+o53VlUUDB1aQsLl7Mlvy1XZYMcjarwVG1dwQMFLxzYNnmMX6KC5nbt7O/yuFJ
-v0BznlZme2+EQhBkOFXZmnvqzu4XdKliYZnoEX6nTBLqpm5K9832kWMLe/9Q8saV
-woGnp6I42+Ryz1dTL3woSPyWPaT9x0WEyoQ0Oaa+s0QyHbYieG62syj8UbqKwRgk
-BVcd1ibB1E7CxP+Ol5XOcZSviDgvACMBkaaDcQv68oCjXKFo/diBBbzWYtjg5o+3
-vi5CxAwYOLdAnCAMhYO4Wp0baqaBGVzw34XWqjBbL83zdBsK7JLSKAYtbn+unGVL
-/wGiCM+b+APK2kJmNzsK
-=3RtJ
+iQIcBAEBCgAGBQJOofYlAAoJENwGBM22xffeBr8QAIx8jVh22hHmjZMEJojLCQtK
+TQUuGuCzEGS3iah0XJ1UzoOTyvT6aY2Js3mdp0cSF/YCy/sngnCAZRT6SCJ0IQ8F
+SIjYxCGXH7eubHC9oLfGzXKugjaUdJGr59GlrczKmyyzfbdDLuGIBaXoegc5hkP4
+lJ3BDC30rDvi5/0c7tdYJIPTP5vTrOVok6wp/VCjBVuhtFx6Y3QqrD8rD+Ey35Md
+LDbkKVtnRLRvaBsnyAmXIqVKukswKZ3Sqtg8G8nDqoDqt4Ti3doMXpnoypwX8Ti+
+oiGWgsz1FjfrM044U2e2fnZPxLB/wSYgShDz/gtqXJC5ZxtzBxJqQrKElUuxROjP
+tCUigXUr4jtYWvgP2qAlygEEv5qAmqA9rt1xoGAkvjWYQh874LUISP2ykT0/S+Ju
+IG9k/77i5bKgHLRh1iM+VIyyWcU+QQhhWMAfVGfsmQy2vsegtdJ8Fre6P7sFuxUG
+pxBwdbhZI0kMsGGCfaH7f8PPxi7Yh9qAumsqkt03iR0SiKs/Wrlyx3iEVdJrQuuS
+0xyzrmMNdo/kAPgxXgPY2eVosYRPJq6i8dMLhQjJUyzF1B0llt/ti0NtmfNo8+uv
+j4AORZKqH4B+kze75RQwBHVdADceMPRBeHdKgeliwjzv06+KELWbjgXs8RMtXrgu
+Qv/LAE6SauTczBaTqDbh
+=3u/W
 -----END PGP SIGNATURE-----
diff --git a/app-office/kmymoney/files/kmymoney-4.6.0-gnucash.patch b/app-office/kmymoney/files/kmymoney-4.6.0-gnucash.patch
new file mode 100644
index 000000000000..240ad186e9eb
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.6.0-gnucash.patch
@@ -0,0 +1,19 @@
+diff -ruN kmymoney-4.6.0.orig/kmymoney/converter/mymoneygncreader.cpp kmymoney-4.6.0/kmymoney/converter/mymoneygncreader.cpp
+--- kmymoney-4.6.0.orig/kmymoney/converter/mymoneygncreader.cpp	2011-08-09 07:48:04.000000000 +0200
++++ kmymoney-4.6.0/kmymoney/converter/mymoneygncreader.cpp	2011-10-22 00:40:05.731618915 +0200
+@@ -1267,6 +1267,7 @@
+   if (bAnonymize) setFileHideFactor();
+   //m_defaultPayee = createPayee (i18n("Unknown payee"));
+ 
++  MyMoneyFile::instance()->attachStorage(m_storage);
+   MyMoneyFileTransaction ft;
+   m_xr = new XmlReader(this);
+   try {
+@@ -1277,6 +1278,7 @@
+     KMessageBox::error(0, i18n("Import failed:\n\n%1", e->what()), PACKAGE);
+     qWarning("%s", qPrintable(e->what()));
+   } // end catch
++  MyMoneyFile::instance()->detachStorage(m_storage);
+   signalProgress(0, 1, i18n("Import complete"));  // switch off progress bar
+   delete m_xr;
+   qDebug("Exiting gnucash importer");
diff --git a/app-office/kmymoney/kmymoney-4.6.0-r1.ebuild b/app-office/kmymoney/kmymoney-4.6.0-r1.ebuild
new file mode 100644
index 000000000000..876bc5c87c49
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-4.6.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.0-r1.ebuild,v 1.1 2011/10/21 22:45:39 dilfridge Exp $
+
+EAPI=4
+
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et
+			eu fi fr ga gl hu it ja lt ms nds nl pl pt
+			pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
+	KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
+	KDE_HANDBOOK="optional"
+	SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
+fi
+
+VIRTUALX_REQUIRED=test
+
+inherit kde4-base
+
+DESCRIPTION="Personal finance manager for KDE"
+HOMEPAGE="http://kmymoney2.sourceforge.net/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug calendar doc hbci ofx quotes test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme
+	>=app-office/libalkimia-4.3.1
+	dev-cpp/glibmm:2
+	dev-cpp/libxmlpp
+	dev-libs/boost
+	dev-libs/glib:2
+	dev-libs/gmp
+	dev-libs/libgpg-error
+	dev-libs/libxml2
+	$(add_kdebase_dep kdepimlibs)
+	x11-misc/shared-mime-info
+	calendar? ( dev-libs/libical )
+	hbci? (
+		>=net-libs/aqbanking-5.0.1
+		>=sys-libs/gwenhywfar-4.0.1[qt4]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	quotes? ( dev-perl/Finance-Quote )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.3-underlinking.patch"
+	"${FILESDIR}/${PN}-4.6.0-gnucash.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DUSE_QT_DESIGNER=OFF
+		$(cmake-utils_use_enable calendar LIBICAL)
+		$(cmake-utils_use_use doc DEVELOPER_DOC)
+		$(cmake-utils_use_enable hbci KBANKING)
+		$(cmake-utils_use_enable ofx LIBOFX)
+		$(cmake-utils_use test KDE4_BUILD_TESTS)
+	)
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+	use doc && kde4-base_src_compile apidoc
+}
+
+src_install() {
+	use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/apidocs/html/")
+	kde4-base_src_install
+}