summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2012-03-08 02:45:11 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2012-03-08 02:45:11 +0000
commit14c202cc75dcc7bff1f6846940e1c8d01f151aef (patch)
tree30ff97e0d78f2b5d0c597b332f8f3aa4f7252aca
parentRemove old version (diff)
downloadgentoo-2-14c202cc75dcc7bff1f6846940e1c8d01f151aef.tar.gz
gentoo-2-14c202cc75dcc7bff1f6846940e1c8d01f151aef.tar.bz2
gentoo-2-14c202cc75dcc7bff1f6846940e1c8d01f151aef.zip
Version bump; remove old
(Portage version: 2.1.10.49/cvs/Linux x86_64)
-rw-r--r--app-office/kmymoney/ChangeLog9
-rw-r--r--app-office/kmymoney/files/kmymoney-4.6.0-gnucash.patch19
-rw-r--r--app-office/kmymoney/kmymoney-4.6.2.ebuild (renamed from app-office/kmymoney/kmymoney-4.6.0-r1.ebuild)11
3 files changed, 13 insertions, 26 deletions
diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index 6414ae31e476..b33b31fb2a07 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-office/kmymoney
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.24 2012/02/13 18:46:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.25 2012/03/08 02:45:10 dilfridge Exp $
+
+*kmymoney-4.6.2 (08 Mar 2012)
+
+ 08 Mar 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ -kmymoney-4.6.0-r1.ebuild, -files/kmymoney-4.6.0-gnucash.patch,
+ +kmymoney-4.6.2.ebuild:
+ Version bump; remove old
13 Feb 2012; Johannes Huber <johu@gentoo.org>
+files/kmymoney-4.6.1-qt48.patch, kmymoney-4.6.1.ebuild:
diff --git a/app-office/kmymoney/files/kmymoney-4.6.0-gnucash.patch b/app-office/kmymoney/files/kmymoney-4.6.0-gnucash.patch
deleted file mode 100644
index 240ad186e9eb..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.6.0-gnucash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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.2.ebuild
index 876bc5c87c49..348350c76766 100644
--- a/app-office/kmymoney/kmymoney-4.6.0-r1.ebuild
+++ b/app-office/kmymoney/kmymoney-4.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.2.ebuild,v 1.1 2012/03/08 02:45:10 dilfridge Exp $
EAPI=4
@@ -27,9 +27,9 @@ IUSE="debug calendar doc hbci ofx quotes test"
COMMON_DEPEND="
app-crypt/gpgme
- >=app-office/libalkimia-4.3.1
+ >=app-office/libalkimia-4.3.2
dev-cpp/glibmm:2
- dev-cpp/libxmlpp
+ dev-cpp/libxmlpp:2.6
dev-libs/boost
dev-libs/glib:2
dev-libs/gmp
@@ -54,8 +54,7 @@ DEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-4.5.3-underlinking.patch"
- "${FILESDIR}/${PN}-4.6.0-gnucash.patch"
+ "${FILESDIR}/${PN}-4.6.1-qt48.patch"
)
src_configure() {