summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-05-07 12:27:57 +0000
committerJohannes Huber <johu@gentoo.org>2012-05-07 12:27:57 +0000
commitc5302e2e5cf94ca347c2c7efcd61dbf6d88f3ec6 (patch)
tree165c6483c5029912fa169a1b386c6b339c982990 /app-office
parentVersion bump. (diff)
downloadhistorical-c5302e2e5cf94ca347c2c7efcd61dbf6d88f3ec6.tar.gz
historical-c5302e2e5cf94ca347c2c7efcd61dbf6d88f3ec6.tar.bz2
historical-c5302e2e5cf94ca347c2c7efcd61dbf6d88f3ec6.zip
Revision bump adds upstream parallel build fix wrt bug #407611.
Package-Manager: portage-2.2.0_alpha101/cvs/Linux i686
Diffstat (limited to 'app-office')
-rw-r--r--app-office/kmymoney/ChangeLog8
-rw-r--r--app-office/kmymoney/Manifest18
-rw-r--r--app-office/kmymoney/files/kmymoney-4.6.2-fix-parallel-build.patch21
-rw-r--r--app-office/kmymoney/kmymoney-4.6.2-r1.ebuild85
4 files changed, 130 insertions, 2 deletions
diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index 47e876060fbc..665f8f1d7c6c 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,12 @@
# 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.31 2012/05/03 20:00:41 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.32 2012/05/07 12:27:57 johu Exp $
+
+*kmymoney-4.6.2-r1 (07 May 2012)
+
+ 07 May 2012; Johannes Huber <johu@gentoo.org>
+ +files/kmymoney-4.6.2-fix-parallel-build.patch, +kmymoney-4.6.2-r1.ebuild:
+ Revision bump adds upstream parallel build fix wrt bug #407611.
03 May 2012; Jeff Horelick <jdhore@gentoo.org> kmymoney-4.6.2.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 7751f27011e2..8d12e73711c2 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX kmymoney-4.6.1-qt48.patch 961 RMD160 8a44caa45c864687339a9f1d008e52d39bbc6a65 SHA1 b29a7cfbf4398e91bd4401a71a678d7ceb1f0cba SHA256 5fde218c7d0b62702e4d5bcac299472d3e6bff155e04680ef4923a4f42ec539d
+AUX kmymoney-4.6.2-fix-parallel-build.patch 887 RMD160 c73f3b750eb0940e61bedd00af2f746dd080bc84 SHA1 9a228c16aec47da720a54dfd33d984de2442601e SHA256 49e56dc703ac314b83883ca09694858fc36030bf92d729a1189ea73adad25264
DIST kmymoney-4.6.2.tar.bz2 22762330 RMD160 b71f82f7fed3daba5711437db29cd225f38262d9 SHA1 b7dc6ce3a36c441ae2d199725db9aa2ec23fdd1f SHA256 add8acba2f0d4c212ac1c7fbbdad2fd43a24caceed586b13d90dcd2a20a12b75
+EBUILD kmymoney-4.6.2-r1.ebuild 1950 RMD160 9392099abaee4c88bd40feb790089b4339d2b609 SHA1 91227bfc17bb5abf937c3c502445957099890b30 SHA256 51ff0b24fd20c0c25b4a5839894c8be8b450b5b9d60f2f28ed4a8e4fc67301d1
EBUILD kmymoney-4.6.2.ebuild 1945 RMD160 a8e1afb68b8d3352073326d1198e3df64522817e SHA1 827c69d5f7aaa692c2f08fca4a8d22233a1c4251 SHA256 a0b0d705df2d6d17844c794056bf1bed0d087327c983622b7ad446dd1280b1dc
-MISC ChangeLog 4595 RMD160 702eb36526b4bb1a48379e40d9cfa585ff36bcac SHA1 ba936374edf223fef5eb1b29dee2c523c653a82c SHA256 e3ad766d9f753e6ddddad1e21af4ed18bd054409daac94f0010913149219a807
+MISC ChangeLog 4819 RMD160 473bf1645ab8b636bffcc7cdab5bc9cf8490371c SHA1 117a94d2a9bc60bafe59fd6e62b7ac4551ec279e SHA256 9221a4643e762a78b145a1b09c2bf866e478f57a271341c21a7f8780b3659c8e
MISC metadata.xml 327 RMD160 337c462e38007a529ca6c979b341426898a9af04 SHA1 62bfe203a842760f95655a42acdd1da8f4436637 SHA256 af0c2dc62649bae5e9a0b375d7106bee7952dda0b258ad375e2cf1551c75246f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPp8AlAAoJEO+t9ga+3I3aNPUH/3ZojVHbEXoOZ1xNq0XdfBpf
+mX20e0+yLTNCPZN+6/zlw8nLw/N+Nz3dQHs5F9vbfZHIaA+rKGVvbYN8XAwu8Zga
+cn5Uw5REowT0uge0KnVpPs36WpHjzY32hihcq4FYlWH1oMO8ewvzh6k/o495PE+B
+a8WXGpTLtVvxCvw+nTa16xVTYPqxCJMGq1Z7GRonalUqWYM6A80F4tyl9LPGAhdU
+4ULqYKETNTz+DiX4jWGnVGi2QmTjXtmdgZzvCcSxmrXfl13oGv8QEmPhcHcG+Grp
+Xj4aK1OkPim5VKLXQple/MsNC83pCGVmX5MsKrHBEyE1Q55tnzmVngD9qb71hQ8=
+=qO9W
+-----END PGP SIGNATURE-----
diff --git a/app-office/kmymoney/files/kmymoney-4.6.2-fix-parallel-build.patch b/app-office/kmymoney/files/kmymoney-4.6.2-fix-parallel-build.patch
new file mode 100644
index 000000000000..15ea2e4d9a4c
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.6.2-fix-parallel-build.patch
@@ -0,0 +1,21 @@
+commit 25ee292b205e6085ba624b8ac8a45fe11a99e5cc
+Author: Cristian Oneț <onet.cristian@gmail.com>
+Date: Tue Apr 10 20:25:26 2012 +0300
+
+ The kmymoney_base target must depend on the kmm_config config target to avoid build failures when aggresive parallel make is used.
+
+ BUG: 297008
+
+diff --git a/kmymoney/widgets/CMakeLists.txt b/kmymoney/widgets/CMakeLists.txt
+index 20d910d..5c6d28d 100644
+--- a/kmymoney/widgets/CMakeLists.txt
++++ b/kmymoney/widgets/CMakeLists.txt
+@@ -89,6 +89,8 @@ ADD_CUSTOM_TARGET(generate_base_ui_srcs DEPENDS
+ # We can compile the uncritical sources without KMM_DESIGNER flags
+ KDE4_ADD_LIBRARY(kmymoney_base STATIC ${_uncritial_common_sources})
+
++ADD_DEPENDENCIES(kmymoney_base kmm_config)
++
+ ########### QtDesigner Widget Library (kmymoneywidgets) #################
+ # we never link against this library,
+ # but it is needed for uic and QtDesigner
diff --git a/app-office/kmymoney/kmymoney-4.6.2-r1.ebuild b/app-office/kmymoney/kmymoney-4.6.2-r1.ebuild
new file mode 100644
index 000000000000..7c3740815dc0
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-4.6.2-r1.ebuild
@@ -0,0 +1,85 @@
+# 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.2-r1.ebuild,v 1.1 2012/05/07 12:27:57 johu 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.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}
+ dev-util/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.6.1-qt48.patch"
+ "${FILESDIR}/${P}-fix-parallel-build.patch"
+)
+
+RESTRICT=test
+# bug 399467
+
+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
+}