summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-08 13:53:48 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-08 13:53:48 +0000
commit3935b697ed383bbfbfc1e789522118d10071833a (patch)
treed3d0b1e6fa5d2630254653ee296fe250cbc40eb7 /kde-base/kontact
parentSemi-automatic merge, Update deps. (diff)
downloadgentoo-2-3935b697ed383bbfbfc1e789522118d10071833a.tar.gz
gentoo-2-3935b697ed383bbfbfc1e789522118d10071833a.tar.bz2
gentoo-2-3935b697ed383bbfbfc1e789522118d10071833a.zip
Semi-automatic merge, Update deps.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'kde-base/kontact')
-rw-r--r--kde-base/kontact/ChangeLog5
-rw-r--r--kde-base/kontact/kontact-4.2.1.ebuild18
2 files changed, 15 insertions, 8 deletions
diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index 8d4d18f2d86a..9d00538f66fd 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-base/kontact/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kontact
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.107 2009/03/04 22:02:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.108 2009/03/08 13:53:48 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kontact-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*kontact-4.2.1 (04 Mar 2009)
diff --git a/kde-base/kontact/kontact-4.2.1.ebuild b/kde-base/kontact/kontact-4.2.1.ebuild
index 3f07feae14e0..a154d0080e6e 100644
--- a/kde-base/kontact/kontact-4.2.1.ebuild
+++ b/kde-base/kontact/kontact-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/kontact/kontact-4.2.1.ebuild,v 1.1 2009/03/04 22:02:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.2.1.ebuild,v 1.2 2009/03/08 13:53:48 scarabeus Exp $
EAPI="2"
@@ -11,11 +11,14 @@ DESCRIPTION="KDE personal information manager"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug"
-DEPEND="app-crypt/gnupg
+DEPEND="
app-crypt/gpgme
- >=kde-base/kontactinterfaces-${PV}:${SLOT}
- >=kde-base/libkdepim-${PV}:${SLOT}"
-RDEPEND="${DEPEND}"
+ >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=]
+ >=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+ app-crypt/gnupg
+"
KMLOADLIBS="libkdepim"
KMSAVELIBS="true"
@@ -24,7 +27,7 @@ KMSAVELIBS="true"
# kontact doesn't have to depend on all programs it has plugins for.
#
# xml targets from kmail/ are being uncommented by kde4-meta.eclass
-KMEXTRACTONLY="libkdepim/
+KMEXTRACTONLY="
kmail/
kontact/plugins/akregator/
kontact/plugins/kaddressbook/
@@ -37,4 +40,5 @@ KMEXTRACTONLY="libkdepim/
kontact/plugins/ktimetracker/
kontact/plugins/planner/
kontact/plugins/specialdates/
- kontactinterfaces/"
+ kontactinterfaces/
+"