kde-base/kdebase: drop x11-misc/xkbdata support (see bug #196650)

(Portage version: 2.2_rc33/cvs/Linux x86_64)

6 files changed, 21 insertions, 16 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 6ad0db9630e0..80dbde58f618 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdebase
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.452 2009/03/06 01:11:31 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.453 2009/05/05 16:44:21 remi Exp $
+
+  05 May 2009; Rémi Cardona <remi@gentoo.org> kdebase-3.5.9.ebuild,
+  kdebase-3.5.9-r1.ebuild, kdebase-3.5.9-r2.ebuild, kdebase-3.5.9-r3.ebuild,
+  kdebase-3.5.9-r4.ebuild:
+  drop x11-misc/xkbdata support (see bug #196650)
 
   06 Mar 2009; Jeroen Roovers <jer@gentoo.org> kdebase-3.5.9-r4.ebuild:
   Stable for HPPA (bug #258257).
diff --git a/kde-base/kdebase/kdebase-3.5.9-r1.ebuild b/kde-base/kdebase/kdebase-3.5.9-r1.ebuild
index 9f6f702b195a..d71e1696532f 100644
--- a/kde-base/kdebase/kdebase-3.5.9-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r1.ebuild,v 1.2 2008/03/21 12:50:02 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r1.ebuild,v 1.3 2009/05/05 16:44:21 remi Exp $
 
 EAPI="1"
 inherit multilib kde-dist eutils flag-o-matic
@@ -50,7 +50,7 @@ RDEPEND="${DEPEND}
 	x11-apps/mkfontdir
 	x11-apps/setxkbmap
 	x11-apps/xinit
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-misc/xkeyboard-config
 	x11-apps/xmessage
 	x11-apps/xprop
 	x11-apps/xrandr
diff --git a/kde-base/kdebase/kdebase-3.5.9-r2.ebuild b/kde-base/kdebase/kdebase-3.5.9-r2.ebuild
index 86eddbcb17eb..93b5b508a207 100644
--- a/kde-base/kdebase/kdebase-3.5.9-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r2.ebuild,v 1.1 2008/04/15 10:05:10 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r2.ebuild,v 1.2 2009/05/05 16:44:21 remi Exp $
 
 EAPI="1"
 inherit multilib kde-dist eutils flag-o-matic
@@ -51,7 +51,7 @@ RDEPEND="${DEPEND}
 	x11-apps/mkfontdir
 	x11-apps/setxkbmap
 	x11-apps/xinit
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-misc/xkeyboard-config
 	x11-apps/xmessage
 	x11-apps/xprop
 	x11-apps/xrandr
diff --git a/kde-base/kdebase/kdebase-3.5.9-r3.ebuild b/kde-base/kdebase/kdebase-3.5.9-r3.ebuild
index 6480e559f180..937f1a0c50b1 100644
--- a/kde-base/kdebase/kdebase-3.5.9-r3.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.9-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r3.ebuild,v 1.7 2008/05/18 21:24:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r3.ebuild,v 1.8 2009/05/05 16:44:21 remi Exp $
 
 EAPI="1"
 inherit multilib kde-dist eutils flag-o-matic
@@ -51,7 +51,7 @@ RDEPEND="${DEPEND}
 	x11-apps/mkfontdir
 	x11-apps/setxkbmap
 	x11-apps/xinit
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-misc/xkeyboard-config
 	x11-apps/xmessage
 	x11-apps/xprop
 	x11-apps/xrandr
diff --git a/kde-base/kdebase/kdebase-3.5.9-r4.ebuild b/kde-base/kdebase/kdebase-3.5.9-r4.ebuild
index 18ddae01b366..84030f305a14 100644
--- a/kde-base/kdebase/kdebase-3.5.9-r4.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.9-r4.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/kdebase/kdebase-3.5.9-r4.ebuild,v 1.6 2009/03/06 01:11:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r4.ebuild,v 1.7 2009/05/05 16:44:21 remi Exp $
 
 EAPI="1"
 inherit multilib kde-dist eutils flag-o-matic
@@ -51,7 +51,7 @@ RDEPEND="${DEPEND}
 	x11-apps/mkfontdir
 	x11-apps/setxkbmap
 	x11-apps/xinit
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-misc/xkeyboard-config
 	x11-apps/xmessage
 	x11-apps/xprop
 	x11-apps/xrandr
diff --git a/kde-base/kdebase/kdebase-3.5.9.ebuild b/kde-base/kdebase/kdebase-3.5.9.ebuild
index 9e4c57bde187..0e9b89284f2c 100644
--- a/kde-base/kdebase/kdebase-3.5.9.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9.ebuild,v 1.3 2008/03/07 00:35:36 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9.ebuild,v 1.4 2009/05/05 16:44:21 remi Exp $
 
 EAPI="1"
 inherit multilib kde-dist eutils flag-o-matic
@@ -50,7 +50,7 @@ RDEPEND="${DEPEND}
 	x11-apps/mkfontdir
 	x11-apps/setxkbmap
 	x11-apps/xinit
-	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-misc/xkeyboard-config
 	x11-apps/xmessage
 	x11-apps/xprop
 	x11-apps/xrandr