summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-08 13:14:30 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-08 13:14:30 +0000
commitdb507e8a8ac6c6e2a064c7533064d7674b733e1f (patch)
tree6be96abe109e1b6e25669b616d0377b905d8ac30 /kde-base
parentSemi-automatic merge, Update deps. (diff)
downloadhistorical-db507e8a8ac6c6e2a064c7533064d7674b733e1f.tar.gz
historical-db507e8a8ac6c6e2a064c7533064d7674b733e1f.tar.bz2
historical-db507e8a8ac6c6e2a064c7533064d7674b733e1f.zip
Semi-automatic merge, Update deps.
Package-Manager: portage-2.2_rc23/cvs/Linux i686
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/akonadi/ChangeLog5
-rw-r--r--kde-base/akonadi/akonadi-4.2.1.ebuild10
-rw-r--r--kde-base/akregator/ChangeLog5
-rw-r--r--kde-base/akregator/akregator-4.2.1.ebuild8
-rw-r--r--kde-base/blinken/ChangeLog5
-rw-r--r--kde-base/blinken/blinken-4.2.1.ebuild9
-rw-r--r--kde-base/cervisia/ChangeLog5
-rw-r--r--kde-base/cervisia/cervisia-4.2.1.ebuild7
-rw-r--r--kde-base/dragonplayer/ChangeLog6
-rw-r--r--kde-base/dragonplayer/dragonplayer-4.2.1.ebuild9
-rw-r--r--kde-base/kaddressbook/ChangeLog6
-rw-r--r--kde-base/kaddressbook/kaddressbook-4.2.1.ebuild17
-rw-r--r--kde-base/kalzium/ChangeLog5
-rw-r--r--kde-base/kalzium/kalzium-4.2.1.ebuild19
-rw-r--r--kde-base/kamera/ChangeLog5
-rw-r--r--kde-base/kamera/kamera-4.2.1.ebuild6
-rw-r--r--kde-base/kanagram/ChangeLog5
-rw-r--r--kde-base/kanagram/kanagram-4.2.1.ebuild12
-rw-r--r--kde-base/kappfinder/ChangeLog5
-rw-r--r--kde-base/kappfinder/kappfinder-4.2.1.ebuild12
20 files changed, 108 insertions, 53 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/
"
diff --git a/kde-base/akregator/ChangeLog b/kde-base/akregator/ChangeLog
index c8af2395f312..ce30ee1caf4b 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/akregator
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.111 2009/03/04 20:19:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.112 2009/03/08 13:07:54 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> akregator-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*akregator-4.2.1 (04 Mar 2009)
diff --git a/kde-base/akregator/akregator-4.2.1.ebuild b/kde-base/akregator/akregator-4.2.1.ebuild
index 598c5b4070b1..f7c1b2681040 100644
--- a/kde-base/akregator/akregator-4.2.1.ebuild
+++ b/kde-base/akregator/akregator-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/akregator/akregator-4.2.1.ebuild,v 1.1 2009/03/04 20:19:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.2.1.ebuild,v 1.2 2009/03/08 13:07:54 scarabeus Exp $
EAPI="2"
@@ -11,9 +11,9 @@ DESCRIPTION="KDE news feed aggregator."
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug"
-DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}"
+DEPEND="
+ >=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+"
RDEPEND="${DEPEND}"
KMLOADLIBS="libkdepim"
-
-KMEXTRACTONLY="libkdepim/"
diff --git a/kde-base/blinken/ChangeLog b/kde-base/blinken/ChangeLog
index c8091f5da7b2..b1652b4dda2d 100644
--- a/kde-base/blinken/ChangeLog
+++ b/kde-base/blinken/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/blinken
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.79 2009/03/04 20:20:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.80 2009/03/08 13:08:52 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> blinken-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*blinken-4.2.1 (04 Mar 2009)
diff --git a/kde-base/blinken/blinken-4.2.1.ebuild b/kde-base/blinken/blinken-4.2.1.ebuild
index a804b60a1e2a..2f34812792c0 100644
--- a/kde-base/blinken/blinken-4.2.1.ebuild
+++ b/kde-base/blinken/blinken-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/blinken/blinken-4.2.1.ebuild,v 1.1 2009/03/04 20:20:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.2.1.ebuild,v 1.2 2009/03/08 13:08:52 scarabeus Exp $
EAPI="2"
@@ -11,8 +11,11 @@ DESCRIPTION="KDE version of the Simon Says game."
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug"
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
+DEPEND="
+ >=kde-base/libkdeedu-${PV}:${SLOT}[kdeprefix=]
+"
RDEPEND="${DEPEND}
- >=kde-base/knotify-${PV}:${SLOT}"
+ >=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
+"
KMEXTRACTONLY="libkdeedu/kdeeduui"
diff --git a/kde-base/cervisia/ChangeLog b/kde-base/cervisia/ChangeLog
index 3607fe0edea2..d8f12af3581e 100644
--- a/kde-base/cervisia/ChangeLog
+++ b/kde-base/cervisia/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/cervisia
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.102 2009/03/04 20:22:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.103 2009/03/08 13:09:40 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> cervisia-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*cervisia-4.2.1 (04 Mar 2009)
diff --git a/kde-base/cervisia/cervisia-4.2.1.ebuild b/kde-base/cervisia/cervisia-4.2.1.ebuild
index 7504567938c2..3f0dfce3c620 100644
--- a/kde-base/cervisia/cervisia-4.2.1.ebuild
+++ b/kde-base/cervisia/cervisia-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/cervisia/cervisia-4.2.1.ebuild,v 1.1 2009/03/04 20:22:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-4.2.1.ebuild,v 1.2 2009/03/08 13:09:40 scarabeus Exp $
EAPI="2"
@@ -11,5 +11,6 @@ DESCRIPTION="Cervisia - A KDE CVS frontend"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug"
-RDEPEND="${RDEPEND}
- dev-util/cvs"
+RDEPEND="
+ dev-util/cvs
+"
diff --git a/kde-base/dragonplayer/ChangeLog b/kde-base/dragonplayer/ChangeLog
index 39c7beaf3571..cc00b8cab4e5 100644
--- a/kde-base/dragonplayer/ChangeLog
+++ b/kde-base/dragonplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/dragonplayer
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/ChangeLog,v 1.13 2009/03/04 20:23:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/ChangeLog,v 1.14 2009/03/08 13:10:11 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+ dragonplayer-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*dragonplayer-4.2.1 (04 Mar 2009)
diff --git a/kde-base/dragonplayer/dragonplayer-4.2.1.ebuild b/kde-base/dragonplayer/dragonplayer-4.2.1.ebuild
index 418a9aba8fed..2bc7a5df92e2 100644
--- a/kde-base/dragonplayer/dragonplayer-4.2.1.ebuild
+++ b/kde-base/dragonplayer/dragonplayer-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/dragonplayer/dragonplayer-4.2.1.ebuild,v 1.1 2009/03/04 20:23:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dragonplayer/dragonplayer-4.2.1.ebuild,v 1.2 2009/03/08 13:10:11 scarabeus Exp $
EAPI="2"
@@ -14,6 +14,9 @@ LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
-RDEPEND=">=media-libs/xine-lib-1.1.9"
+RDEPEND="
+ >=media-libs/xine-lib-1.1.9
+"
DEPEND="${RDEPEND}
- sys-devel/gettext"
+ sys-devel/gettext
+"
diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 97ce58d5c848..bccbc44c422c 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kaddressbook
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.105 2009/03/04 20:26:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.106 2009/03/08 13:11:02 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+ kaddressbook-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*kaddressbook-4.2.1 (04 Mar 2009)
diff --git a/kde-base/kaddressbook/kaddressbook-4.2.1.ebuild b/kde-base/kaddressbook/kaddressbook-4.2.1.ebuild
index 9b3747c15b22..0cf102c9c318 100644
--- a/kde-base/kaddressbook/kaddressbook-4.2.1.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-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/kaddressbook/kaddressbook-4.2.1.ebuild,v 1.1 2009/03/04 20:26:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.2.1.ebuild,v 1.2 2009/03/08 13:11:02 scarabeus Exp $
EAPI="2"
@@ -11,15 +11,18 @@ DESCRIPTION="The KDE Address Book"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug gnokii"
-DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
- >=kde-base/libkleo-${PV}:${SLOT}
- gnokii? ( app-mobilephone/gnokii )"
+DEPEND="
+ >=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+ >=kde-base/libkleo-${PV}:${SLOT}[kdeprefix=]
+ gnokii? ( app-mobilephone/gnokii )
+"
RDEPEND="${DEPEND}"
# xml targets from kmail are being uncommented by kde4-meta.eclass
-KMEXTRACTONLY="kmail/
- libkdepim/
- libkleo/"
+KMEXTRACTONLY="
+ kmail/
+ libkleo/
+"
KMLOADLIBS="libkdepim libkleo"
src_configure() {
diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index 074849a6a02d..83f2ccc5bb2e 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kalzium
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.112 2009/03/04 20:28:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.113 2009/03/08 13:11:54 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kalzium-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*kalzium-4.2.1 (04 Mar 2009)
diff --git a/kde-base/kalzium/kalzium-4.2.1.ebuild b/kde-base/kalzium/kalzium-4.2.1.ebuild
index a49102821571..8e7238407b95 100644
--- a/kde-base/kalzium/kalzium-4.2.1.ebuild
+++ b/kde-base/kalzium/kalzium-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/kalzium/kalzium-4.2.1.ebuild,v 1.1 2009/03/04 20:28:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-4.2.1.ebuild,v 1.2 2009/03/08 13:11:54 scarabeus Exp $
EAPI="2"
@@ -13,13 +13,20 @@ DESCRIPTION="KDE: periodic table of the elements."
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="editor debug +plasma solver"
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}
- editor? ( >=dev-cpp/eigen-1.0.5
- >=sci-chemistry/openbabel-2.2 )
- solver? ( dev-ml/facile[ocamlopt] )"
+DEPEND="
+ >=kde-base/libkdeedu-${PV}:${SLOT}[kdeprefix=]
+ editor? (
+ >=dev-cpp/eigen-1.0.5
+ >=sci-chemistry/openbabel-2.2
+ )
+ solver? ( dev-ml/facile[ocamlopt] )
+"
RDEPEND="${RDEPEND}"
-KMEXTRACTONLY="libkdeedu/kdeeduui libkdeedu/libscience"
+KMEXTRACTONLY="
+ libkdeedu/kdeeduui/
+ libkdeedu/libscience/
+"
src_configure(){
mycmakeargs="${mycmakeargs}
diff --git a/kde-base/kamera/ChangeLog b/kde-base/kamera/ChangeLog
index 25eb3c94f671..b9c37042cbcd 100644
--- a/kde-base/kamera/ChangeLog
+++ b/kde-base/kamera/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kamera
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.102 2009/03/04 20:28:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.103 2009/03/08 13:12:43 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kamera-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*kamera-4.2.1 (04 Mar 2009)
diff --git a/kde-base/kamera/kamera-4.2.1.ebuild b/kde-base/kamera/kamera-4.2.1.ebuild
index c49a00dbef37..d4cd1178e037 100644
--- a/kde-base/kamera/kamera-4.2.1.ebuild
+++ b/kde-base/kamera/kamera-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/kamera/kamera-4.2.1.ebuild,v 1.1 2009/03/04 20:28:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-4.2.1.ebuild,v 1.2 2009/03/08 13:12:43 scarabeus Exp $
EAPI="2"
@@ -11,5 +11,7 @@ DESCRIPTION="KDE digital camera manager"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug"
-DEPEND="media-libs/libgphoto2"
+DEPEND="
+ media-libs/libgphoto2
+"
RDEPEND="${DEPEND}"
diff --git a/kde-base/kanagram/ChangeLog b/kde-base/kanagram/ChangeLog
index 18e2939eeeaf..c727a856b425 100644
--- a/kde-base/kanagram/ChangeLog
+++ b/kde-base/kanagram/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kanagram
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.79 2009/03/04 20:29:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.80 2009/03/08 13:13:36 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kanagram-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*kanagram-4.2.1 (04 Mar 2009)
diff --git a/kde-base/kanagram/kanagram-4.2.1.ebuild b/kde-base/kanagram/kanagram-4.2.1.ebuild
index 5635b7846cf5..42f91680cf39 100644
--- a/kde-base/kanagram/kanagram-4.2.1.ebuild
+++ b/kde-base/kanagram/kanagram-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/kanagram/kanagram-4.2.1.ebuild,v 1.1 2009/03/04 20:29:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-4.2.1.ebuild,v 1.2 2009/03/08 13:13:36 scarabeus Exp $
EAPI="2"
@@ -11,6 +11,12 @@ DESCRIPTION="KDE: letter order game."
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug"
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
+DEPEND="
+ >=kde-base/libkdeedu-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
-KMEXTRACTONLY="libkdeedu/kdeeduui libkdeedu/keduvocdocument"
+KMEXTRACTONLY="
+ libkdeedu/kdeeduui/
+ libkdeedu/keduvocdocument/
+"
diff --git a/kde-base/kappfinder/ChangeLog b/kde-base/kappfinder/ChangeLog
index 6ddac5fcf0be..69ca3297de9c 100644
--- a/kde-base/kappfinder/ChangeLog
+++ b/kde-base/kappfinder/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kappfinder
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/ChangeLog,v 1.105 2009/03/04 20:30:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/ChangeLog,v 1.106 2009/03/08 13:14:30 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kappfinder-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*kappfinder-4.2.1 (04 Mar 2009)
diff --git a/kde-base/kappfinder/kappfinder-4.2.1.ebuild b/kde-base/kappfinder/kappfinder-4.2.1.ebuild
index 3230822ab5b1..8055b52a8f01 100644
--- a/kde-base/kappfinder/kappfinder-4.2.1.ebuild
+++ b/kde-base/kappfinder/kappfinder-4.2.1.ebuild
@@ -1,18 +1,16 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-4.2.1.ebuild,v 1.1 2009/03/04 20:30:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-4.2.1.ebuild,v 1.2 2009/03/08 13:14:30 scarabeus Exp $
EAPI="2"
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
inherit kde4-meta
DESCRIPTION="KDE tool that looks for well-known apps in your path and creates entries for them in the KDE menu"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug"
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-KMEXTRA="apps/doc/${PN}"
+KMEXTRA="
+ doc/${PN}
+"