Change xkbdata dep to || with xkeyboard-config, reported by Jure Repinc <jlp@holodeck1.com>.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 46 insertions, 11 deletions

diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog
index 28940f1bb102..e365a9c2366e 100644
--- a/kde-base/kxkb/ChangeLog
+++ b/kde-base/kxkb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kxkb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.41 2006/02/03 17:39:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.42 2006/02/12 18:12:04 spyderous Exp $
+
+  12 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; kxkb-3.5.0.ebuild,
+  kxkb-3.5.1.ebuild, kxkb-3.5.1-r1.ebuild:
+  Change xkbdata dep to || with xkeyboard-config, reported by Jure Repinc
+  <jlp@holodeck1.com>.
 
 *kxkb-3.5.1-r1 (03 Feb 2006)
 
diff --git a/kde-base/kxkb/Manifest b/kde-base/kxkb/Manifest
index c2f90eca3e35..f236853da040 100644
--- a/kde-base/kxkb/Manifest
+++ b/kde-base/kxkb/Manifest
@@ -1,15 +1,45 @@
-MD5 d82359a58f399f68eaad3752225842b4 ChangeLog 5299
+MD5 e43abc69cdbd6c8eb266d827fe9911ad ChangeLog 5518
+RMD160 88fd6f623cb65b4d2fae263f26542cbe4f37eac3 ChangeLog 5518
+SHA256 d27dd0ff0694219bf149440dbccacfead05da66822403ca7538fdb9e94c1a3fe ChangeLog 5518
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kxkb-3.4.1 212
+RMD160 507b5780112807385327a808ffffb5c897cbf1f4 files/digest-kxkb-3.4.1 212
+SHA256 a64c99717e47d1f6143f531b9767e3e022d6c789e8d5a14aaf174814cb51a21d files/digest-kxkb-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kxkb-3.4.2 287
+RMD160 db88376c4259165535f83f3529f0834fb2209612 files/digest-kxkb-3.4.2 287
+SHA256 3f1b77c90587a110ffb3a1402c6f10a87ef93bfdbc1345bb2138188a52c9cb8b files/digest-kxkb-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kxkb-3.4.3 68
+RMD160 fe4b253b0a7c2e30a2aa1d0d796dfcb11e30590a files/digest-kxkb-3.4.3 68
+SHA256 2c163305cf238b4283a2263d089f3a5cdacfe053018c1fa5d8a5879593baf1a8 files/digest-kxkb-3.4.3 68
 MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kxkb-3.5.0 142
+RMD160 5a25b9d5e731ecbb0238d4016eec7d640fd809ca files/digest-kxkb-3.5.0 142
+SHA256 2aa9daeb1aa26a4ddbc37c210bcd1cde8dbaa15d45bfd5f58d45ac26f7d36aea files/digest-kxkb-3.5.0 142
 MD5 358c22d072b322d89bd54d98403c5eb6 files/digest-kxkb-3.5.1 68
+RMD160 e8de4cf825e2775377e7f125b1429912ad1e826e files/digest-kxkb-3.5.1 68
+SHA256 10f133d38f99c77b6ed8c236ac66bdcfb0451b0e213dc5ec626d6adff17382b5 files/digest-kxkb-3.5.1 68
 MD5 358c22d072b322d89bd54d98403c5eb6 files/digest-kxkb-3.5.1-r1 68
+RMD160 e8de4cf825e2775377e7f125b1429912ad1e826e files/digest-kxkb-3.5.1-r1 68
+SHA256 10f133d38f99c77b6ed8c236ac66bdcfb0451b0e213dc5ec626d6adff17382b5 files/digest-kxkb-3.5.1-r1 68
 MD5 42226b3baf60c509e74036e7bb7a7b4e files/kxkb3.5.1.xx_XX_layouts.patch 806
+RMD160 9c0f77dd658e01795ad4ec0fa7ed11fcb2218af1 files/kxkb3.5.1.xx_XX_layouts.patch 806
+SHA256 fd3010f128ad54327558857135d0ab8f814b2e88cb4fb99086b4ac831c7dc83d files/kxkb3.5.1.xx_XX_layouts.patch 806
 MD5 421bfb1b3a38ff0fa7428dca89981ff3 kxkb-3.4.1.ebuild 399
+RMD160 dd76c6217739de13ae9aa34472ee871287644f89 kxkb-3.4.1.ebuild 399
+SHA256 0aea5b91f5efa4b170fc62a845d47e00d3184c85a63c0151590caa41348798d9 kxkb-3.4.1.ebuild 399
 MD5 fba2ac6062d3c7e87e6c3762ee19c245 kxkb-3.4.2.ebuild 412
+RMD160 372f3dbc94aa00cd3549020e99d8838e17f306fc kxkb-3.4.2.ebuild 412
+SHA256 69e9dc2937ed76680ac33f8f8e96314dc9897817a11ab10175574e0fab516465 kxkb-3.4.2.ebuild 412
 MD5 6bb9bb872499703635e47ca53c1b4981 kxkb-3.4.3.ebuild 406
-MD5 d0864f4c15353d727b87e1a21ca3e077 kxkb-3.5.0.ebuild 707
-MD5 0201c843a6d06e7e97281abc14d742a7 kxkb-3.5.1-r1.ebuild 555
-MD5 201d512ececea0b9c91100a1f3390a00 kxkb-3.5.1.ebuild 502
+RMD160 41374a1dd7e607e895cefb7d8727f8bf65e3c74f kxkb-3.4.3.ebuild 406
+SHA256 9b97a30400c6eceee0a2630655ebe90c38321e5b8daee6198f7b7b138b168c0d kxkb-3.4.3.ebuild 406
+MD5 5fc6178866623a451c649144f67609f6 kxkb-3.5.0.ebuild 741
+RMD160 894a1fffd7850488bbcd93a8980a62c702744767 kxkb-3.5.0.ebuild 741
+SHA256 66583e7a7b92735acf1d94f0bc128b1b8ea58e4104985208320a662d229fc57b kxkb-3.5.0.ebuild 741
+MD5 2559182ad8e85bc151ac65a7a9010046 kxkb-3.5.1-r1.ebuild 592
+RMD160 6726ced6e070b495a125d65736a775b02c2804b0 kxkb-3.5.1-r1.ebuild 592
+SHA256 cbad8ca0bf6b06d2ec39e46787676ce5fceff539535debeb3ec9b05380e079b6 kxkb-3.5.1-r1.ebuild 592
+MD5 486c3fa7dee528af5d2ec7a4f37c696e kxkb-3.5.1.ebuild 536
+RMD160 5fddfffc6d2d4f4afe52782f809b79abfe892ea9 kxkb-3.5.1.ebuild 536
+SHA256 0eaefa2f009630ebe3948ccfe1a1eb89a9448300b545addc0553a425ff8963bc kxkb-3.5.1.ebuild 536
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
diff --git a/kde-base/kxkb/kxkb-3.5.0.ebuild b/kde-base/kxkb/kxkb-3.5.0.ebuild
index d7cfc648a2c7..a221a9c6c9a9 100644
--- a/kde-base/kxkb/kxkb-3.5.0.ebuild
+++ b/kde-base/kxkb/kxkb-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0.ebuild,v 1.9 2006/01/14 09:26:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0.ebuild,v 1.10 2006/02/12 18:12:04 spyderous Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="${RDEPEND}
 	|| ( (
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )"
 
diff --git a/kde-base/kxkb/kxkb-3.5.1-r1.ebuild b/kde-base/kxkb/kxkb-3.5.1-r1.ebuild
index e98ca33a8631..500f8195c368 100644
--- a/kde-base/kxkb/kxkb-3.5.1-r1.ebuild
+++ b/kde-base/kxkb/kxkb-3.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.1-r1.ebuild,v 1.1 2006/02/03 17:39:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.1-r1.ebuild,v 1.2 2006/02/12 18:12:04 spyderous Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -13,7 +13,7 @@ IUSE=""
 
 RDEPEND="${RDEPEND}
 	|| ( (
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )"
 
diff --git a/kde-base/kxkb/kxkb-3.5.1.ebuild b/kde-base/kxkb/kxkb-3.5.1.ebuild
index 38846614894f..450358fd0295 100644
--- a/kde-base/kxkb/kxkb-3.5.1.ebuild
+++ b/kde-base/kxkb/kxkb-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.1.ebuild,v 1.1 2006/01/22 22:53:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.1.ebuild,v 1.2 2006/02/12 18:12:04 spyderous Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -13,6 +13,6 @@ IUSE=""
 
 RDEPEND="${RDEPEND}
 	|| ( (
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )"