From 88734d3a635b3cccd86ae3e6c7cbaad58adfc23f Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sun, 15 Mar 2009 14:37:54 +0000 Subject: Automatic-merge: merge updates for 4.2.1 from kde-testing. (Portage version: 2.2_rc25/cvs/Linux x86_64) --- kde-base/kwrited/ChangeLog | 5 ++++- kde-base/kwrited/kwrited-4.2.1.ebuild | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'kde-base') diff --git a/kde-base/kwrited/ChangeLog b/kde-base/kwrited/ChangeLog index 2a77cfb5a66f..6b6bea240fcf 100644 --- a/kde-base/kwrited/ChangeLog +++ b/kde-base/kwrited/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kwrited # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/ChangeLog,v 1.5 2009/03/08 20:40:54 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/ChangeLog,v 1.6 2009/03/15 14:37:54 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal kwrited-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov -kwrited-4.2.0.ebuild: Drop KDE 4.2.0 diff --git a/kde-base/kwrited/kwrited-4.2.1.ebuild b/kde-base/kwrited/kwrited-4.2.1.ebuild index 03482c7cd905..6902e0df4a4b 100644 --- a/kde-base/kwrited/kwrited-4.2.1.ebuild +++ b/kde-base/kwrited/kwrited-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/kwrited/kwrited-4.2.1.ebuild,v 1.2 2009/03/08 14:10:31 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.2.1.ebuild,v 1.3 2009/03/15 14:37:54 scarabeus Exp $ EAPI="2" KMNAME="kdebase-workspace" @@ -14,5 +14,5 @@ DEPEND=" >=sys-libs/libutempter-1.1.5 " RDEPEND="${DEPEND} - !kdeprefix? ( !kde-base/konsole:4.1 ) + !kdeprefix? ( !kde-base/konsole:4.1[-kdeprefix] ) " -- cgit v1.2.3-65-gdbad