diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:21:36 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:21:36 +0000 |
| commit | 664afcb522ad30f40a4b96b91d00d7e913c536cd (patch) | |
| tree | 8a5627db8dc5544f9ca5177a9e6a785464358496 | |
| parent | Merge missed ebuild from kde-testing. (diff) | |
| download | gentoo-2-664afcb522ad30f40a4b96b91d00d7e913c536cd.tar.gz gentoo-2-664afcb522ad30f40a4b96b91d00d7e913c536cd.tar.bz2 gentoo-2-664afcb522ad30f40a4b96b91d00d7e913c536cd.zip | |
Automatic-merge: merge updates for 4.2.1 from kde-testing.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
| -rw-r--r-- | kde-base/kcontrol/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kcontrol/kcontrol-4.2.1.ebuild | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog index 3f156773b953..7c35288f82d5 100644 --- a/kde-base/kcontrol/ChangeLog +++ b/kde-base/kcontrol/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kcontrol # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.135 2009/03/08 19:09:15 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.136 2009/03/15 14:21:36 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kcontrol-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kcontrol-4.2.0.ebuild, -kcontrol-4.2.0-r1.ebuild: diff --git a/kde-base/kcontrol/kcontrol-4.2.1.ebuild b/kde-base/kcontrol/kcontrol-4.2.1.ebuild index 50879bf9ccab..907d0126dabc 100644 --- a/kde-base/kcontrol/kcontrol-4.2.1.ebuild +++ b/kde-base/kcontrol/kcontrol-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/kcontrol/kcontrol-4.2.1.ebuild,v 1.3 2009/03/08 14:53:17 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.2.1.ebuild,v 1.4 2009/03/15 14:21:36 scarabeus Exp $ EAPI="2" @@ -12,8 +12,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="debug" RDEPEND=" - !kdeprefix? ( !<kde-base/ksmserver-${PV}[-kdeprefix] ) - kdeprefix? ( !<kde-base/ksmserver-${PV}:${SLOT}[kdeprefix=] ) + !kdeprefix? ( !kde-base/ksmserver:4.1[-kdeprefix] ) >=kde-base/kdnssd-${PV}:${SLOT}[kdeprefix=] >=kde-base/khotkeys-${PV}:${SLOT}[kdeprefix=] " |