summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gentoo.org>2011-04-14 23:03:34 +0000
committerTheo Chatzimichos <tampakrap@gentoo.org>2011-04-14 23:03:34 +0000
commit19483ae5d355ccca00511256450c093948db5aae (patch)
tree425fa6766fda526dd4d2b0f17be901451d851438 /kde-base/kdeplasma-addons
parentadded qt-declarative in DEPEND (diff)
downloadgentoo-2-19483ae5d355ccca00511256450c093948db5aae.tar.gz
gentoo-2-19483ae5d355ccca00511256450c093948db5aae.tar.bz2
gentoo-2-19483ae5d355ccca00511256450c093948db5aae.zip
Apply the akonadi-optional patch conditionally
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kdeplasma-addons')
-rw-r--r--kde-base/kdeplasma-addons/ChangeLog6
-rw-r--r--kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild5
2 files changed, 7 insertions, 4 deletions
diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index e691e41c626e..01ba055b7114 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdeplasma-addons
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.82 2011/04/13 13:02:30 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.83 2011/04/14 23:03:34 tampakrap Exp $
+
+ 14 Apr 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+ kdeplasma-addons-4.6.2.ebuild:
+ Apply the akonadi-optional patch conditionally
13 Apr 2011; Theo Chatzimichos <tampakrap@gentoo.org>
kdeplasma-addons-4.6.2.ebuild,
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild
index ae8d805586f1..c4b11370763a 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild,v 1.3 2011/04/13 13:02:30 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild,v 1.4 2011/04/14 23:03:34 tampakrap Exp $
EAPI=3
@@ -49,9 +49,8 @@ RDEPEND="${COMMON_DEPEND}
# kdebase-data: some svg icons moved from data directly here.
add_blocker kdebase-data '<4.2.88'
-PATCHES=( "${FILESDIR}/${P}-optional-akonadi.patch" )
-
src_prepare() {
+ use !semantic-desktop && epatch "${FILESDIR}/${P}-optional-akonadi.patch"
find "${S}" -name CMakeLists.txt | \
xargs sed -i \
-e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \