diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:40:31 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:40:31 +0000 |
commit | edc70fb413c5c575a72482fe1ff5fa236a706c8c (patch) | |
tree | edb3bb966759cf6d594dfd3519235b4c460c70c6 /kde-base | |
parent | Automatic-merge: merge updates for 4.2.1 from kde-testing. (diff) | |
download | gentoo-2-edc70fb413c5c575a72482fe1ff5fa236a706c8c.tar.gz gentoo-2-edc70fb413c5c575a72482fe1ff5fa236a706c8c.tar.bz2 gentoo-2-edc70fb413c5c575a72482fe1ff5fa236a706c8c.zip |
Automatic-merge: merge updates for 4.2.1 from kde-testing.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/libplasmaclock/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/kde-base/libplasmaclock/ChangeLog b/kde-base/libplasmaclock/ChangeLog index 62320bd0bbba..e4d7b1f0b016 100644 --- a/kde-base/libplasmaclock/ChangeLog +++ b/kde-base/libplasmaclock/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/libplasmaclock # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/ChangeLog,v 1.5 2009/03/08 20:49:34 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/ChangeLog,v 1.6 2009/03/15 14:40:31 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> + libplasmaclock-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -libplasmaclock-4.2.0.ebuild: diff --git a/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild index 8b305df27cc6..c765381df58c 100644 --- a/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild +++ b/kde-base/libplasmaclock/libplasmaclock-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/libplasmaclock/libplasmaclock-4.2.1.ebuild,v 1.2 2009/03/08 14:16:24 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild,v 1.3 2009/03/15 14:40:31 scarabeus Exp $ EAPI="2" @@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="debug xinerama" RDEPEND=" - !kdeprefix? ( !kde-base/plasma-workspace:4.1 ) + !kdeprefix? ( !kde-base/plasma-workspace:4.1[-kdeprefix] ) " KMSAVELIBS="true" |