diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2009-12-22 22:31:03 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-12-22 22:31:03 +0000 |
| commit | 703895c645a035bf7a6611dfdb9e34d0650ddaa7 (patch) | |
| tree | c2865e727437ea3c6f40d7358b6b31344b0bdca6 /kde-base/akonadi | |
| parent | Drop restriction as it installs a binary file. (diff) | |
| download | gentoo-2-703895c645a035bf7a6611dfdb9e34d0650ddaa7.tar.gz gentoo-2-703895c645a035bf7a6611dfdb9e34d0650ddaa7.tar.bz2 gentoo-2-703895c645a035bf7a6611dfdb9e34d0650ddaa7.zip | |
Pull in changes from overlay and prefix support
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'kde-base/akonadi')
| -rw-r--r-- | kde-base/akonadi/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/akonadi/akonadi-4.3.4.ebuild | 19 |
2 files changed, 14 insertions, 10 deletions
diff --git a/kde-base/akonadi/ChangeLog b/kde-base/akonadi/ChangeLog index 79e98c159708..753659130c9e 100644 --- a/kde-base/akonadi/ChangeLog +++ b/kde-base/akonadi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/akonadi # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.45 2009/12/10 18:55:49 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.46 2009/12/22 22:31:03 abcd Exp $ + + 22 Dec 2009; Jonathan Callen <abcd@gentoo.org> akonadi-4.3.4.ebuild: + Pull in changes from overlay and prefix support 10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -akonadi-4.3.1.ebuild: diff --git a/kde-base/akonadi/akonadi-4.3.4.ebuild b/kde-base/akonadi/akonadi-4.3.4.ebuild index 8e2f87abf159..e8ce86ad0b52 100644 --- a/kde-base/akonadi/akonadi-4.3.4.ebuild +++ b/kde-base/akonadi/akonadi-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/akonadi/akonadi-4.3.4.ebuild,v 1.1 2009/12/01 09:55:21 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v 1.2 2009/12/22 22:31:03 abcd Exp $ EAPI="2" @@ -52,19 +52,20 @@ src_prepare() { } src_configure() { - # Set the dbus dirs, otherwise it searches in KDEDIR - mycmakeargs="${mycmakeargs} - -DAKONADI_DBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces - -DAKONADI_DBUS_SERVICES_INSTALL_DIR=/usr/share/dbus-1/services" - # replace with $(cmake-utils_use_with exchange OpenChange) when libmapi becomes available with an ebuild - mycmakeargs="${mycmakeargs} + mycmakeargs=( + # Set the dbus dirs, otherwise it searches in KDEDIR + -DAKONADI_DBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces" + -DAKONADI_DBUS_SERVICES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/services" + -DWITH_LibXslt=ON + # replace with $(cmake-utils_use_with exchange OpenChange) when libmapi becomes available with an ebuild -DWITH_OpenChange=OFF -DWITH_GNOKII=OFF -DWITH_GLIB2=OFF -DWITH_OpenSync=OFF $(cmake-utils_use_with semantic-desktop Nepomuk) - $(cmake-utils_use_with semantic-desktop Soprano)" + $(cmake-utils_use_with semantic-desktop Soprano) + ) ${eclass}_src_configure } @@ -84,5 +85,5 @@ src_test() { src_install() { ${eclass}_src_install # colliding files with nepomuk - rm -rf "${D}"/${KDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig} + rm -rf "${ED}"/${KDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig} } |