From ad90db943cb1a39c0698e1cdfc15af0dd1cdcb5d Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Sun, 15 Mar 2009 14:23:46 +0000
Subject: Automatic-merge: merge updates for 4.2.1 from kde-testing. (Portage
 version: 2.2_rc25/cvs/Linux x86_64)

---
 kde-base/kdebase-data/ChangeLog                 | 6 +++++-
 kde-base/kdebase-data/kdebase-data-4.2.1.ebuild | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'kde-base')

diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog
index 49188f8ff281..a21254c24742 100644
--- a/kde-base/kdebase-data/ChangeLog
+++ b/kde-base/kdebase-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-data
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.109 2009/03/08 19:17:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.110 2009/03/15 14:23:46 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdebase-data-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-data-4.2.0.ebuild:
diff --git a/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild b/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild
index dc705ce688e2..ebe887349352 100644
--- a/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-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/kdebase-data/kdebase-data-4.2.1.ebuild,v 1.4 2009/03/08 15:01:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild,v 1.5 2009/03/15 14:23:46 scarabeus Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 # releases. Thus we need to block older versions of dolphin, including the :4.1 versions.
 RDEPEND="
 	!kdeprefix? ( !<kde-base/dolphin-${PV}[-kdeprefix] )
-	kdeprefix? ( !<kde-base/dolphin-${PV}:${SLOT}[kdeprefix=] )
+	kdeprefix? ( !<kde-base/dolphin-${PV}:${SLOT} )
 	x11-themes/hicolor-icon-theme
 "
 
-- 
cgit v1.2.3-65-gdbad