summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base/plasma-apps')
-rw-r--r--kde-base/plasma-apps/ChangeLog6
-rw-r--r--kde-base/plasma-apps/plasma-apps-4.2.1.ebuild8
2 files changed, 9 insertions, 5 deletions
diff --git a/kde-base/plasma-apps/ChangeLog b/kde-base/plasma-apps/ChangeLog
index 5ad4f0051ad7..27cd5eba7547 100644
--- a/kde-base/plasma-apps/ChangeLog
+++ b/kde-base/plasma-apps/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/plasma-apps
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.12 2009/03/08 22:54:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.13 2009/03/15 14:42:42 scarabeus Exp $
+
+ 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+ plasma-apps-4.2.1.ebuild:
+ Automatic-merge: merge updates for 4.2.1 from kde-testing.
08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
plasma-apps-4.2.1.ebuild:
diff --git a/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild b/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild
index 5a46220d2b6d..11db1cfe9f3e 100644
--- a/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild
+++ b/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild,v 1.3 2009/03/08 22:54:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild,v 1.4 2009/03/15 14:42:42 scarabeus Exp $
EAPI="2"
-KMNAME="kdebase"
-KMMODULE="apps/plasma"
+KMNAME="kdebase-apps"
+KMMODULE="plasma"
inherit kde4-meta
DESCRIPTION="Additional Applets for Plasma"
@@ -16,5 +16,5 @@ DEPEND="
>=kde-base/libkonq-${PV}:${SLOT}[kdeprefix=]
"
RDEPEND="${DEPEND}
- !kdeprefix? ( !kde-base/plasma )
+ !kdeprefix? ( !kde-base/plasma[-kdeprefix] )
"