diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:44:37 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:44:37 +0000 |
commit | 4f570858d8bb01899198c9d42cfec21cfeb5d278 (patch) | |
tree | eab6531ea0b8d7e0a76167a5c5cffb842cc486e7 /kde-base/kwrited | |
parent | Manifest fix (diff) | |
download | historical-4f570858d8bb01899198c9d42cfec21cfeb5d278.tar.gz historical-4f570858d8bb01899198c9d42cfec21cfeb5d278.tar.bz2 historical-4f570858d8bb01899198c9d42cfec21cfeb5d278.zip |
Automatic-merge: merge updates for 4.2.1 from kde-testing.
Package-Manager: portage-2.2_rc25/cvs/Linux x86_64
Diffstat (limited to 'kde-base/kwrited')
-rw-r--r-- | kde-base/kwrited/ChangeLog | 5 | ||||
-rw-r--r-- | kde-base/kwrited/kwrited-4.2.1.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
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 <scarabeus@gentoo.org> kwrited-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -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] ) " |