Semi-automatic merge, Update deps.

(Portage version: 2.2_rc23/cvs/Linux i686)

2 files changed, 18 insertions, 10 deletions

diff --git a/kde-base/kdepim-wizards/ChangeLog b/kde-base/kdepim-wizards/ChangeLog
index 4782729d1d84..fc0bb784753b 100644
--- a/kde-base/kdepim-wizards/ChangeLog
+++ b/kde-base/kdepim-wizards/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-wizards
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.96 2009/03/04 21:11:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.97 2009/03/08 13:38:36 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdepim-wizards-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdepim-wizards-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.2.1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.2.1.ebuild
index 3107241e8185..6be3c9e4df3b 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.2.1.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-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/kdepim-wizards/kdepim-wizards-4.2.1.ebuild,v 1.1 2009/03/04 21:11:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.2.1.ebuild,v 1.2 2009/03/08 13:38:36 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,22 +12,24 @@ DESCRIPTION="KDE PIM wizards"
 IUSE="debug"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-DEPEND="app-crypt/gpgme:1
-	kde-base/kdepim-kresources:${SLOT}
-	kde-base/libkdepim:${SLOT}"
+DEPEND="
+	app-crypt/gpgme:1
+	>=kde-base/kdepim-kresources-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="knotes/
+KMEXTRACTONLY="
 	kmail/
+	knotes/
 	kresources/egroupware/
 	kresources/groupwise/
 	kresources/kolab/
 	kresources/scalix/
 	kresources/slox/
-	libkdepim"
-
-src_unpack() {
-	kde4-meta_src_unpack
+"
 
+src_prepare() {
 	ln -s "${PREFIX}"/include/kdepim-kresources/{kabc,kcal,knotes}_egroupwareprefs.h \
 		"${WORKDIR}"/${P}/kresources/egroupware/ \
 		|| die "Failed to link extra_headers."
@@ -37,4 +39,6 @@ src_unpack() {
 	ln -s "${PREFIX}"/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
 		"${WORKDIR}"/${P}/kresources/groupwise/ \
 		|| die "Failed to link extra_headers."
+
+	kde4-meta_src_prepare
 }