diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2009-12-23 01:14:33 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-12-23 01:14:33 +0000 |
| commit | 06190940789c14e6ad245716241f5cfb4502bd7e (patch) | |
| tree | 2107e0017973ca5da8ab57e9a09add532e9e65fc /kde-base | |
| parent | Pull in changes from overlay (diff) | |
| download | gentoo-2-06190940789c14e6ad245716241f5cfb4502bd7e.tar.gz gentoo-2-06190940789c14e6ad245716241f5cfb4502bd7e.tar.bz2 gentoo-2-06190940789c14e6ad245716241f5cfb4502bd7e.zip | |
Pull in changes from overlay
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/marble/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/marble/marble-4.3.4.ebuild | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog index 10033d5afdfa..d0f0cad0b552 100644 --- a/kde-base/marble/ChangeLog +++ b/kde-base/marble/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/marble # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.54 2009/12/10 23:35:50 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.55 2009/12/23 01:14:33 abcd Exp $ + + 23 Dec 2009; Jonathan Callen <abcd@gentoo.org> marble-4.3.4.ebuild: + Pull in changes from overlay 10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -marble-4.3.1.ebuild: Drop KDE SC-4.3.1. diff --git a/kde-base/marble/marble-4.3.4.ebuild b/kde-base/marble/marble-4.3.4.ebuild index e618bb2f6bc6..38aee27d145c 100644 --- a/kde-base/marble/marble-4.3.4.ebuild +++ b/kde-base/marble/marble-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/marble/marble-4.3.4.ebuild,v 1.1 2009/12/01 11:25:46 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.3.4.ebuild,v 1.2 2009/12/23 01:14:33 abcd Exp $ EAPI="2" @@ -27,18 +27,19 @@ RDEPEND="${DEPEND} " src_configure() { - mycmakeargs="${mycmakeargs} + mycmakeargs=( $(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN) $(cmake-utils_use_with plasma) $(cmake-utils_use_with python PyKDE4) $(cmake-utils_use_with python PyQt4) $(cmake-utils_use_with python PythonLibrary) - $(cmake-utils_use_with python SIP)" + $(cmake-utils_use_with python SIP) + ) find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </' if use gps; then - mycmakeargs="${mycmakeargs} -DHAVE_LIBGPS=1" + mycmakeargs+=(-DHAVE_LIBGPS=1) else sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \ marble/Findlibgps.cmake || die "sed to disable gpsd failed." |