diff options
author | Manuel Rüger <mrueg@gentoo.org> | 2013-12-24 14:32:13 +0000 |
---|---|---|
committer | Manuel Rüger <mrueg@gentoo.org> | 2013-12-24 14:32:13 +0000 |
commit | 3064e0ff298d318c5e5f18f9e50fa1ff51ccea2b (patch) | |
tree | 2a5c9eff3644420664569d94a9cda313a2252977 /app-office | |
parent | Cleanup old. (diff) | |
download | historical-3064e0ff298d318c5e5f18f9e50fa1ff51ccea2b.tar.gz historical-3064e0ff298d318c5e5f18f9e50fa1ff51ccea2b.tar.bz2 historical-3064e0ff298d318c5e5f18f9e50fa1ff51ccea2b.zip |
Cleanup old.
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/kmymoney/ChangeLog | 7 | ||||
-rw-r--r-- | app-office/kmymoney/Manifest | 26 | ||||
-rw-r--r-- | app-office/kmymoney/files/kmymoney-4.6.2-gcc-4.7.patch | 18 | ||||
-rw-r--r-- | app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch | 29 | ||||
-rw-r--r-- | app-office/kmymoney/kmymoney-4.6.3-r1.ebuild | 79 |
5 files changed, 7 insertions, 152 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/Manifest b/app-office/kmymoney/Manifest index 909f3db1a9a5..33c6571c4ae2 100644 --- a/app-office/kmymoney/Manifest +++ b/app-office/kmymoney/Manifest @@ -1,28 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX kmymoney-4.6.2-gcc-4.7.patch 561 SHA256 652cd8ada83f9fdbce1809a27ac2b8bcfc4cd3807bcdf2137662b09527b9f780 SHA512 efdde69168abbb42adf041b5c9afa7ee217bdc73692532e57004e4ca4e427f59ab7dcdc9051515fb99c861e672b3b1e4ff7c6d1e707ce64d837b5dcff511f261 WHIRLPOOL b28ef04d51a2cac0086efc203bb1c056b297a695b51ba7d1128c26e70baf88fbf283b3bf0ceff71b920db52202e53f9b6ba9519ad43da80e7fe382c353e54b0f -AUX kmymoney-4.6.3-gmp-5.1.0.patch 1101 SHA256 515dbbb70d07137886dd01f5522908858b09aaeedcb7c6bcdb07243d31797412 SHA512 262b4e8fe16f0bb8178ddeb297e20ea1416adfe131925735a98546c7088e77db6dbe11ca59ec9bb611142bc258d21305319e4bc95eece125cde40e0bb9336d24 WHIRLPOOL fb47ca60173c9af02ca4cb92b6c69154b06c7241da60084cb81c8b4e3a1447e9e972fb24095a72f06d1a3a479610dfb5e9a52ed9be50f398bf3a8309368a8f7d -DIST kmymoney-4.6.3.tar.bz2 22114966 SHA256 94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e SHA512 4fc618718463a324c67abc4d8b43f682b364c63299aca25c6730c9a2f6a1affc1bec02b65352de1e6e5b58f06b66c600e96f1c20de126719d90c2a0b933fd00a WHIRLPOOL fd53a0dee4ccad438a3c15dee85aa9270b0806d39311045a1ca1e4f3cc1f969800e723a9aa780966c84c3a8f909a3d5e09e805deddfd548077f07fe1c7bdc015 DIST kmymoney-4.6.4.tar.xz 19917068 SHA256 89522fadb4a9f06f3f20e2d6ac47a147f70b4265abad2fdf3aa6672fe2a3c012 SHA512 1c390f7bd722344ed8f6a1ede76a20905e53cdfd27c74715ae95ae79bfa02ee6918b60b9ec198d5b26c2fd0af3b987db3cac0d02fcbfa69af95331f6d7e750dd WHIRLPOOL ad51eaaf351bf24df1e9ed8069d77eaa8f681fb500c0bace721d3aa2fe3d5949426cc1f057b2d8e376978d748ec4e52c9b5797c0536c5adb984e3e1d3ed2d95c -EBUILD kmymoney-4.6.3-r1.ebuild 1897 SHA256 ec1c2c7385a1ea83120ec27d5e7c6440c693060bd53529055230611c717d90a6 SHA512 034ddee5392d41d863c8a8055c022853ba8db1724901c7efd038a69ddbe62113a72f51bfa2ea0d80e0ead385deb02beb873f7de05c9d0fad168fd4332065a06a WHIRLPOOL b1104f44437e07591b24cabcdd864e2a82fde163e7c577372a25b2807a973eaeaa674ae35b9a2c47da243048aa40ed1d82f75cfc019b8aa841783167867dabb6 EBUILD kmymoney-4.6.4.ebuild 1799 SHA256 c4ab26b39d0e478ea64482714f910cf5dfc8916acfbe7aa4895588c5014ee4eb SHA512 57a201e54a529478b6f15acb9b72e2d70ddb057c77caab73380924a73ea244f41804933f7d69524631fb3706bdb33035a9c44b266743ab8d63104c6324114fa7 WHIRLPOOL 5faa3e6aca683a9fd26a4a3a2bd5062fa1e777a689f1c41abf87c952d92551ef05ee1c52287d9fbc41189dc18d3c97727441d970984cdb059b2792575d399978 -MISC ChangeLog 7308 SHA256 8bba46904b555961355b1aebde0ee8e91f264b44d9e5b0abc82aebb0ae525afd SHA512 c23b79e6c73dfee8814c8c385a27d7965f561ac1d4efc98d948c933cd6a6b23ff8eb4e7ba6615c40dae46ca3f62f940347bd39bd9750d619fe61a6b88f9563ec WHIRLPOOL ce8595b5daa11547f588d37cf64bb58d1ebe53cb965526f93a240b50493f41bbbd09f28ff70a590aa2722000661c20d300c4e70b28913d6576a1b70ad2e83197 +MISC ChangeLog 7481 SHA256 818b106ed4cbc5cfc96b35589c870a19ac8f6a8af534cf4aa688449660b30f63 SHA512 be18203956ff86dd57facfacd691a2d7c4b9a0101eccf76ee8e15cda4590fb0cfdd16fb6cde9f09db73763f28b70ebaa19c41fb76e5df334cf26190a2ecbc2ee WHIRLPOOL 8681d1c2aed31d6422542c1dc6f5eb1814a83c5e5f95d286ca109f1056c20c1adb0927719f515ecd84b0145e4ff7ea91b955f6affd3cc304e986a80df8a8063f MISC metadata.xml 327 SHA256 af0c2dc62649bae5e9a0b375d7106bee7952dda0b258ad375e2cf1551c75246f SHA512 351c6dfb599393ce68da6cf8cee124a2074389e2419db77206e92a4cb5e37168d5c71bacc06024cc621b06456a5550306df29c40381538962b08a2a2b3f2a3d0 WHIRLPOOL f9f7364383513c4fff4875967aeeef0fb67cd472b3b6f04d19e9f6ba528bf4838389e8f24fc93a320b984d5040a6e21f7b7cedc50559f9033cb7c714e643b342 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAEBCAAGBQJSuYJHAAoJELp701BxlEWfEvEQAIhPhAmomr4GV14qbUfg9gk3 -ZT+l/JsS9XgPGkNIb/C2WBNLiFDWpfOBto9nn5d3foKN7EHNYfJBLrxGqoGJh71E -kp+1qNK6D+tozFdWd1OeAndCDKxY6Uw89ByR79xqr89gmASe3dBMn0Od563UJ1Uz -JW74PU/c//rNn2mUUa3IL/I9AIOGmUbggA5PvoyXWfsY3E9eU+sOGqiTcmQq+glm -rDldGQOfUyPR04NEx1hX7fokeVbbr10VKGkuEJcUCmcuKr6AyFhekIxlq2eQ9yas -hbhVXrqAQpDX0zGG62ruaISwazXf/BNSmDEaru1YuBBRLva3sPxPKNudvH3UeE86 -iiWl38Zewm5jNkKOGj6/qdlaWN8Trp5QCv6WTRdwdwkL9OiGKqQZIZbj4cCJXbIv -Z9B2Nc/oCh4VtdfRa3zHKrTjYfZbqTZqYiOXR/N4CwQ4jjP2XndLMfAahYS9h1iu -NTU0RTXh2B24LMvGEZq3EaulMjA8QFL/BtUDhSFeoDigARFTSgEaaUK3fpcVIuF6 -MmHEF36v9CU2j5OeabVJr59Obrm/4v2iGPw9TxAvYJ9To7ld1FnD9xTxlQCYhyto -mQTiWE+L11d9fYwJ1UNo+6NzHS+ZjW2Kbr/OsjwyZCXRdO+RtyK1Rjlj3cRsxfK6 -+sbdqf3E/UmXfRk63pi1 -=sN82 ------END PGP SIGNATURE----- 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 -} |