summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Rüger <mrueg@gentoo.org>2013-12-24 14:32:09 +0000
committerManuel Rüger <mrueg@gentoo.org>2013-12-24 14:32:09 +0000
commit421bb4c9fe4477de9eac98bad9c92ef2a6b37d81 (patch)
treea2c0e5d09ea421e4dcecae8be6983ed3053d10e4 /app-office
parentCleanup old. (diff)
downloadgentoo-2-421bb4c9fe4477de9eac98bad9c92ef2a6b37d81.tar.gz
gentoo-2-421bb4c9fe4477de9eac98bad9c92ef2a6b37d81.tar.bz2
gentoo-2-421bb4c9fe4477de9eac98bad9c92ef2a6b37d81.zip
Cleanup old.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'app-office')
-rw-r--r--app-office/kmymoney/ChangeLog7
-rw-r--r--app-office/kmymoney/files/kmymoney-4.6.2-gcc-4.7.patch18
-rw-r--r--app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch29
-rw-r--r--app-office/kmymoney/kmymoney-4.6.3-r1.ebuild79
4 files changed, 6 insertions, 127 deletions
diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index 74abca936e6f..416853118f54 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/kmymoney
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.50 2013/12/24 12:47:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.51 2013/12/24 14:32:08 mrueg Exp $
+
+ 24 Dec 2013; Manuel Rüger <mrueg@gentoo.org>
+ -files/kmymoney-4.6.2-gcc-4.7.patch, -files/kmymoney-4.6.3-gmp-5.1.0.patch,
+ -kmymoney-4.6.3-r1.ebuild:
+ Cleanup old.
24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> kmymoney-4.6.4.ebuild:
Stable for x86, wrt bug #492682
diff --git a/app-office/kmymoney/files/kmymoney-4.6.2-gcc-4.7.patch b/app-office/kmymoney/files/kmymoney-4.6.2-gcc-4.7.patch
deleted file mode 100644
index 69f492468244..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.6.2-gcc-4.7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 9b6f96a38b8c84cb87bb07165b503acbe5ea81ff
-Author: Christoph Feck <christoph@maxiom.de>
-Date: Fri Mar 23 23:05:19 2012 +0100
-
- Fix includes
-
-diff --git a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
-index ff217e3..d31bb02 100644
---- a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
-+++ b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
-@@ -16,6 +16,7 @@
-
- #include "mymoneydatabasemgrtest.h"
- #include <pwd.h>
-+#include <unistd.h>
- #include <iostream>
-
- #include <QtTest/QtTest>
diff --git a/app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch b/app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch
deleted file mode 100644
index 6e6752709352..000000000000
--- a/app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 77209f84a85360e98d2e805d412956a8f2a77db3 Mon Sep 17 00:00:00 2001
-From: Alex Merry <kde@randomguy3.me.uk>
-Date: Fri, 1 Feb 2013 15:31:54 +0000
-Subject: [PATCH] Fix build with GMP 5.1.0
-
-GMP 5.1.0 no longer has implicit conversions to mpz_class from mpq_class
-or mpf_class. So we have to have an explicit conversion.
-
-BUG: 312481
----
- kmymoney/mymoney/mymoneymoney.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kmymoney/mymoney/mymoneymoney.cpp b/kmymoney/mymoney/mymoneymoney.cpp
-index aeed135..5de7fa9 100644
---- a/kmymoney/mymoney/mymoneymoney.cpp
-+++ b/kmymoney/mymoney/mymoneymoney.cpp
-@@ -158,7 +158,7 @@ QString MyMoneyMoney::formatMoney(const QString& currency, const int prec, bool
- // be much better than using KGlobal::locale()->formatMoney.
- bool bNegative = false;
- mpz_class left = value / static_cast<MyMoneyMoney>(convertDenominator(d)).valueRef().get_den();
-- mpz_class right = (valueRef() - mpq_class(left)) * denom;
-+ mpz_class right = mpz_class((valueRef() - mpq_class(left)) * denom);
-
- if (right < 0) {
- right = -right;
---
-1.8.1.2
-
diff --git a/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild b/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild
deleted file mode 100644
index f78a7d16a184..000000000000
--- a/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild,v 1.3 2013/03/10 13:38:44 ago Exp $
-
-EAPI=5
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl
-hu it ja kk 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"
-CPPUNIT_REQUIRED="test"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-
-inherit kde4-base
-
-DESCRIPTION="Personal finance manager for KDE"
-HOMEPAGE="http://kmymoney2.sourceforge.net/"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug calendar doc hbci ofx quotes"
-
-COMMON_DEPEND="
- app-crypt/gpgme
- >=app-office/libalkimia-4.3.2
- dev-cpp/glibmm:2
- dev-cpp/libxmlpp:2.6
- 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}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.6.2-gcc-4.7.patch"
- "${FILESDIR}/${PN}-4.6.3-gmp-5.1.0.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)
- )
- 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
-}