summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-08 14:22:40 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-08 14:22:40 +0000
commitf398192a72d5e05545b307660650b2d32caee5fe (patch)
tree9e491619992ae8c786270b6a929b287fe7d169e9 /kde-base/kcontrol
parentMigrate to EAPI 2. (diff)
downloadhistorical-f398192a72d5e05545b307660650b2d32caee5fe.tar.gz
historical-f398192a72d5e05545b307660650b2d32caee5fe.tar.bz2
historical-f398192a72d5e05545b307660650b2d32caee5fe.zip
Semi-automatic merge, Update deps.
Package-Manager: portage-2.2_rc23/cvs/Linux i686
Diffstat (limited to 'kde-base/kcontrol')
-rw-r--r--kde-base/kcontrol/ChangeLog5
-rw-r--r--kde-base/kcontrol/kcontrol-4.2.1.ebuild14
2 files changed, 11 insertions, 8 deletions
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index b32337b6f275..8c4a1f2f08db 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.133 2009/03/04 20:41:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.134 2009/03/08 13:26:11 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kcontrol-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*kcontrol-4.2.1 (04 Mar 2009)
diff --git a/kde-base/kcontrol/kcontrol-4.2.1.ebuild b/kde-base/kcontrol/kcontrol-4.2.1.ebuild
index 5c91a32865c3..82f6fe911347 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.1 2009/03/04 20:41:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.2.1.ebuild,v 1.2 2009/03/08 13:26:11 scarabeus Exp $
EAPI="2"
@@ -11,9 +11,9 @@ DESCRIPTION="The KDE Control Center"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug"
-DEPEND="
- !<kde-base/ksmserver-${PV}:${SLOT}[kdeprefix=]
- !kdeprefix? ( !<kde-base/ksmserver-${PV}[-kdeprefix] )
- >=kde-base/kdnssd-${PV}:${SLOT}
- >=kde-base/khotkeys-${PV}:${SLOT}
- "
+RDEPEND="
+ !kdeprefix? ( !<kde-base/ksmserver-${PV} )
+ kdeprefix? ( !<kde-base/ksmserver-${PV}:${SLOT} )
+ >=kde-base/kdnssd-${PV}:${SLOT}[kdeprefix=]
+ >=kde-base/khotkeys-${PV}:${SLOT}[kdeprefix=]
+"