summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-15 14:44:37 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-15 14:44:37 +0000
commit4f570858d8bb01899198c9d42cfec21cfeb5d278 (patch)
treeeab6531ea0b8d7e0a76167a5c5cffb842cc486e7 /kde-base/libkworkspace
parentManifest fix (diff)
downloadhistorical-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/libkworkspace')
-rw-r--r--kde-base/libkworkspace/ChangeLog6
-rw-r--r--kde-base/libkworkspace/libkworkspace-4.2.1.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/kde-base/libkworkspace/ChangeLog b/kde-base/libkworkspace/ChangeLog
index 1ba55d89ca3d..540a9724399f 100644
--- a/kde-base/libkworkspace/ChangeLog
+++ b/kde-base/libkworkspace/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/libkworkspace
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.23 2009/03/08 20:49:11 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.24 2009/03/15 14:40:05 scarabeus Exp $
+
+ 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+ libkworkspace-4.2.1.ebuild:
+ Automatic-merge: merge updates for 4.2.1 from kde-testing.
08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
-libkworkspace-4.2.0.ebuild:
diff --git a/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild b/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild
index 991a6335c280..0e5d90b1e758 100644
--- a/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-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/libkworkspace/libkworkspace-4.2.1.ebuild,v 1.3 2009/03/08 15:06:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild,v 1.4 2009/03/15 14:40:05 scarabeus Exp $
EAPI="2"
@@ -14,7 +14,7 @@ IUSE="debug"
RDEPEND="
!kdeprefix? ( !<kde-base/libkworkspace-${PV}[-kdeprefix] )
- kdeprefix? ( !<kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=] )
+ kdeprefix? ( !<kde-base/libkworkspace-${PV}:${SLOT} )
"
KMEXTRACTONLY="