diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2009-12-23 00:24:00 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-12-23 00:24:00 +0000 |
| commit | 91593fc650609174605a411459270322da327b5b (patch) | |
| tree | 105ef45a70fd3844f7b65e5a276a0e6cd8681cd3 /kde-base/kmail | |
| parent | Raise jre dep to 1.5 as the jar contains 1.5 bytecode. Fixes bug #297462. (diff) | |
| download | gentoo-2-91593fc650609174605a411459270322da327b5b.tar.gz gentoo-2-91593fc650609174605a411459270322da327b5b.tar.bz2 gentoo-2-91593fc650609174605a411459270322da327b5b.zip | |
Pull in changes from overlay
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'kde-base/kmail')
| -rw-r--r-- | kde-base/kmail/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kmail/kmail-4.3.4.ebuild | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog index 8a7949597d6a..f77b39b74cea 100644 --- a/kde-base/kmail/ChangeLog +++ b/kde-base/kmail/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kmail # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.191 2009/12/10 23:05:07 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.192 2009/12/23 00:24:00 abcd Exp $ + + 23 Dec 2009; Jonathan Callen <abcd@gentoo.org> kmail-4.3.4.ebuild: + Pull in changes from overlay 10 Dec 2009; Jonathan Callen <abcd@gentoo.org> -files/kmail-4.3.1-fix-rename-folder-on-disconnected-IMAP.patch: diff --git a/kde-base/kmail/kmail-4.3.4.ebuild b/kde-base/kmail/kmail-4.3.4.ebuild index 548945e6e50c..e301ea7420a0 100644 --- a/kde-base/kmail/kmail-4.3.4.ebuild +++ b/kde-base/kmail/kmail-4.3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.3.4.ebuild,v 1.1 2009/12/01 10:46:22 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.3.4.ebuild,v 1.2 2009/12/23 00:24:00 abcd Exp $ EAPI="2" @@ -40,8 +40,9 @@ KMLOADLIBS="libkdepim" PATCHES=( "${FILESDIR}/${PN}-4.1.72-fix.patch" ) src_configure() { - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_with semantic-desktop Nepomuk)" + mycmakeargs=( + $(cmake-utils_use_with semantic-desktop Nepomuk) + ) kde4-meta_src_configure } @@ -49,8 +50,9 @@ src_configure() { src_compile() { # Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built # Upstream as KDE Bug #198807 - # (setting via MAKEOPTS to trigger a repoman warning) - MAKEOPTS="${MAKEOPTS} -j1" + # (setting MAKEOPTS to trigger a repoman warning) + : || MAKEOPTS="-j1" + kde4-meta_src_compile kmail_xml kde4-meta_src_compile } |