Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-base/kdebase
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2006-02-12 18:38:08 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2006-02-12 18:38:08 +0000
commit5263f06a1571bdfc270977dae2eb49ea48512ac3 (patch)
treef733634397a0a876ff46bd46b15f2c513e0b3535 /kde-base/kdebase
parentUSE flags for netqmail (diff)
downloadgentoo-2-5263f06a1571bdfc270977dae2eb49ea48512ac3.tar.gz
gentoo-2-5263f06a1571bdfc270977dae2eb49ea48512ac3.tar.bz2
gentoo-2-5263f06a1571bdfc270977dae2eb49ea48512ac3.zip
Change xkbdata dep to || with xkeyboard-config, reported by Jure Repinc <jlp@holodeck1.com>.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'kde-base/kdebase')
-rw-r--r--kde-base/kdebase/kdebase-3.3.2-r1.ebuild4
-rw-r--r--kde-base/kdebase/kdebase-3.3.2-r2.ebuild4
-rw-r--r--kde-base/kdebase/kdebase-3.3.2-r3.ebuild4
-rw-r--r--kde-base/kdebase/kdebase-3.4.1-r1.ebuild4
-rw-r--r--kde-base/kdebase/kdebase-3.4.2-r1.ebuild4
-rw-r--r--kde-base/kdebase/kdebase-3.4.2-r2.ebuild4
-rw-r--r--kde-base/kdebase/kdebase-3.4.2.ebuild4
-rw-r--r--kde-base/kdebase/kdebase-3.4.3-r1.ebuild4
-rw-r--r--kde-base/kdebase/kdebase-3.4.3.ebuild4
-rw-r--r--kde-base/kdebase/kdebase-3.5.0-r1.ebuild4
-rw-r--r--kde-base/kdebase/kdebase-3.5.1-r1.ebuild4
-rw-r--r--kde-base/kdebase/kdebase-3.5.1.ebuild4
12 files changed, 24 insertions, 24 deletions
diff --git a/kde-base/kdebase/kdebase-3.3.2-r1.ebuild b/kde-base/kdebase/kdebase-3.3.2-r1.ebuild
index b616bc0bec63..93f215ca400f 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-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/kdebase/kdebase-3.3.2-r1.ebuild,v 1.14 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r1.ebuild,v 1.15 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
sys-apps/eject"
diff --git a/kde-base/kdebase/kdebase-3.3.2-r2.ebuild b/kde-base/kdebase/kdebase-3.3.2-r2.ebuild
index 0ad7470db6c4..6b37bc8e9b51 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-r2.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/kdebase/kdebase-3.3.2-r2.ebuild,v 1.11 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r2.ebuild,v 1.12 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
sys-apps/eject"
diff --git a/kde-base/kdebase/kdebase-3.3.2-r3.ebuild b/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
index 7e954b8e9c0d..b63dde5b2b56 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-r3.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/kdebase/kdebase-3.3.2-r3.ebuild,v 1.6 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r3.ebuild,v 1.7 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
sys-apps/eject"
diff --git a/kde-base/kdebase/kdebase-3.4.1-r1.ebuild b/kde-base/kdebase/kdebase-3.4.1-r1.ebuild
index a840c8eaa5de..c2353d3febba 100644
--- a/kde-base/kdebase/kdebase-3.4.1-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.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/kdebase/kdebase-3.4.1-r1.ebuild,v 1.10 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.1-r1.ebuild,v 1.11 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
java? ( || ( virtual/jdk virtual/jre ) )
diff --git a/kde-base/kdebase/kdebase-3.4.2-r1.ebuild b/kde-base/kdebase/kdebase-3.4.2-r1.ebuild
index 895dec0c8552..3b1b8a5fac81 100644
--- a/kde-base/kdebase/kdebase-3.4.2-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.2-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/kdebase/kdebase-3.4.2-r1.ebuild,v 1.3 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2-r1.ebuild,v 1.4 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
java? ( >=virtual/jre-1.4 )
diff --git a/kde-base/kdebase/kdebase-3.4.2-r2.ebuild b/kde-base/kdebase/kdebase-3.4.2-r2.ebuild
index c204636cbb01..9306b34912ae 100644
--- a/kde-base/kdebase/kdebase-3.4.2-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.2-r2.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/kdebase/kdebase-3.4.2-r2.ebuild,v 1.2 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2-r2.ebuild,v 1.3 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
java? ( >=virtual/jre-1.4 )
diff --git a/kde-base/kdebase/kdebase-3.4.2.ebuild b/kde-base/kdebase/kdebase-3.4.2.ebuild
index f1545642784f..792ad3cc6f93 100644
--- a/kde-base/kdebase/kdebase-3.4.2.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.2.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/kdebase/kdebase-3.4.2.ebuild,v 1.3 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2.ebuild,v 1.4 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils
@@ -38,7 +38,7 @@ DEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
dev-util/pkgconfig"
diff --git a/kde-base/kdebase/kdebase-3.4.3-r1.ebuild b/kde-base/kdebase/kdebase-3.4.3-r1.ebuild
index 692802ffe862..b0bb7422b0fe 100644
--- a/kde-base/kdebase/kdebase-3.4.3-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.3-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/kdebase/kdebase-3.4.3-r1.ebuild,v 1.10 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.3-r1.ebuild,v 1.11 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
java? ( >=virtual/jre-1.4 )
diff --git a/kde-base/kdebase/kdebase-3.4.3.ebuild b/kde-base/kdebase/kdebase-3.4.3.ebuild
index 3bc35d986fa2..5d044d69782f 100644
--- a/kde-base/kdebase/kdebase-3.4.3.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.3.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/kdebase/kdebase-3.4.3.ebuild,v 1.3 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.3.ebuild,v 1.4 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
java? ( >=virtual/jre-1.4 )
diff --git a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
index 65eb70d9a747..d97326f10286 100644
--- a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.0-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/kdebase/kdebase-3.5.0-r1.ebuild,v 1.14 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0-r1.ebuild,v 1.15 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils flag-o-matic
@@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
xcomposite? ( || ( (
diff --git a/kde-base/kdebase/kdebase-3.5.1-r1.ebuild b/kde-base/kdebase/kdebase-3.5.1-r1.ebuild
index e0122e482abe..5f23f4ee68e0 100644
--- a/kde-base/kdebase/kdebase-3.5.1-r1.ebuild
+++ b/kde-base/kdebase/kdebase-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/kdebase/kdebase-3.5.1-r1.ebuild,v 1.1 2006/02/03 17:47:28 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1-r1.ebuild,v 1.2 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils flag-o-matic
@@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
xcomposite? ( || ( (
diff --git a/kde-base/kdebase/kdebase-3.5.1.ebuild b/kde-base/kdebase/kdebase-3.5.1.ebuild
index a3d1661b6c39..3c2f1e6b3927 100644
--- a/kde-base/kdebase/kdebase-3.5.1.ebuild
+++ b/kde-base/kdebase/kdebase-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/kdebase/kdebase-3.5.1.ebuild,v 1.2 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1.ebuild,v 1.3 2006/02/12 18:38:08 spyderous Exp $
inherit kde-dist eutils flag-o-matic
@@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
x11-apps/xset
x11-apps/xrandr
x11-apps/mkfontdir
- x11-misc/xkbdata
+ || ( x11-misc/xkeyboard-config x11-misc/xkbdata )
x11-apps/setxkbmap
) virtual/x11 )
xcomposite? ( || ( (