summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2009-05-05 16:22:08 +0000
committerRémi Cardona <remi@gentoo.org>2009-05-05 16:22:08 +0000
commit0b09a0a83faa457c50263b4eb90d92df8e479a68 (patch)
tree56864513129d462f5d44773764a999ac17734106
parentStable for HPPA (bug #267922). (diff)
downloadgentoo-2-0b09a0a83faa457c50263b4eb90d92df8e479a68.tar.gz
gentoo-2-0b09a0a83faa457c50263b4eb90d92df8e479a68.tar.bz2
gentoo-2-0b09a0a83faa457c50263b4eb90d92df8e479a68.zip
kde-base/systemsettings: drop x11-misc/xkbdata support (see bug #196650)
(Portage version: 2.2_rc33/cvs/Linux x86_64)
-rw-r--r--kde-base/systemsettings/ChangeLog5
-rw-r--r--kde-base/systemsettings/systemsettings-4.2.2.ebuild7
2 files changed, 6 insertions, 6 deletions
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index a3f0f5fcbc25..1c9fd6ae4405 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/systemsettings
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.30 2009/04/17 06:48:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.31 2009/05/05 16:22:08 remi Exp $
+
+ 05 May 2009; Rémi Cardona <remi@gentoo.org> systemsettings-4.2.2.ebuild:
+ drop x11-misc/xkbdata support (see bug #196650)
17 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org>
-systemsettings-4.2.1.ebuild, -systemsettings-4.2.1-r1.ebuild,
diff --git a/kde-base/systemsettings/systemsettings-4.2.2.ebuild b/kde-base/systemsettings/systemsettings-4.2.2.ebuild
index 806f95fc9a4c..c728efc04c25 100644
--- a/kde-base/systemsettings/systemsettings-4.2.2.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.2.2.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/systemsettings/systemsettings-4.2.2.ebuild,v 1.3 2009/04/17 06:48:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.2.2.ebuild,v 1.4 2009/05/05 16:22:08 remi Exp $
EAPI="2"
@@ -35,10 +35,7 @@ DEPEND="${COMMONDEPEND}
RDEPEND="${COMMONDEPEND}
>=kde-base/kcontrol-${PV}:${SLOT}[kdeprefix=]
x11-apps/setxkbmap
- || (
- x11-misc/xkbdata
- x11-misc/xkeyboard-config
- )
+ x11-misc/xkeyboard-config
"
KMEXTRA="