summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-08 13:07:10 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-08 13:07:10 +0000
commit6e33474bd9bfa688b4866c7ccd84879d1f2d919f (patch)
treefa8dfc1cb66822a8d6d3a48bd9002be68ccedb05 /kde-base/akonadi
parentReadding xvid useflag and deps. Closes #261608. Again. (diff)
downloadgentoo-2-6e33474bd9bfa688b4866c7ccd84879d1f2d919f.tar.gz
gentoo-2-6e33474bd9bfa688b4866c7ccd84879d1f2d919f.tar.bz2
gentoo-2-6e33474bd9bfa688b4866c7ccd84879d1f2d919f.zip
Semi-automatic merge, Update deps.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'kde-base/akonadi')
-rw-r--r--kde-base/akonadi/ChangeLog5
-rw-r--r--kde-base/akonadi/akonadi-4.2.1.ebuild10
2 files changed, 9 insertions, 6 deletions
diff --git a/kde-base/akonadi/ChangeLog b/kde-base/akonadi/ChangeLog
index 87389d8c53d8..09e6d01e3c1c 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.12 2009/03/04 20:18:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.13 2009/03/08 13:07:10 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> akonadi-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*akonadi-4.2.1 (04 Mar 2009)
diff --git a/kde-base/akonadi/akonadi-4.2.1.ebuild b/kde-base/akonadi/akonadi-4.2.1.ebuild
index f96d0e6e13ae..80f2e8fe65a4 100644
--- a/kde-base/akonadi/akonadi-4.2.1.ebuild
+++ b/kde-base/akonadi/akonadi-4.2.1.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.2.1.ebuild,v 1.1 2009/03/04 20:18:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.2.1.ebuild,v 1.2 2009/03/08 13:07:10 scarabeus Exp $
EAPI="2"
@@ -16,14 +16,15 @@ IUSE="debug +semantic-desktop"
# add when libmapi becomes available with an ebuild
#exchange? ( net-libs/libmapi )
# not sure about libxml2... - reavertm
+
DEPEND="
dev-libs/boost
dev-libs/libxml2
dev-libs/libxslt
- >=kde-base/kdemaildir-${PV}:${SLOT}
- >=kde-base/libkdepim-${PV}:${SLOT}
+ >=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
+ >=kde-base/kdemaildir-${PV}:${SLOT}[kdeprefix=]
+ >=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
x11-misc/shared-mime-info
- >=kde-base/kdelibs-${PV}:${SLOT}[semantic-desktop?]
"
RDEPEND="${DEPEND}
@@ -31,7 +32,6 @@ RDEPEND="${DEPEND}
"
KMEXTRACTONLY="
- libkdepim/
maildir/
"