Add dependencies for modular X (startkde), thanks to Ryan Hill in bug #117033.

(Portage version: 2.1_pre4-r1)

12 files changed, 118 insertions, 20 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index ec841c291850..54bef52b36ce 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.256 2006/01/28 14:29:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.257 2006/01/30 01:01:04 flameeyes Exp $
+
+  30 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdebase-3.3.2-r1.ebuild, kdebase-3.3.2-r2.ebuild, kdebase-3.3.2-r3.ebuild,
+  kdebase-3.4.1-r1.ebuild, kdebase-3.4.2.ebuild, kdebase-3.4.2-r1.ebuild,
+  kdebase-3.4.2-r2.ebuild, kdebase-3.4.3.ebuild, kdebase-3.4.3-r1.ebuild,
+  kdebase-3.5.0-r1.ebuild, kdebase-3.5.1.ebuild:
+  Add dependencies for modular X (startkde), thanks to Ryan Hill in bug #117033.
 
   28 Jan 2006; Dan Armak <danarmak@gentoo.org> +kdebase-3.5.1.ebuild:
   Version 3.5.1. Not yet released upstream, so package.masked for now.
diff --git a/kde-base/kdebase/kdebase-3.3.2-r1.ebuild b/kde-base/kdebase/kdebase-3.3.2-r1.ebuild
index c7594b58f6b0..b616bc0bec63 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-2005 Gentoo Foundation
+# 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.13 2005/02/22 02:36:41 hardave Exp $
+# $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 $
 
 inherit kde-dist eutils
 
@@ -18,6 +18,15 @@ DEPEND="arts? ( ~kde-base/arts-${PV//3.3/1.3} )
 	samba? ( >=net-fs/samba-3.0.1 )
 	java? ( || ( virtual/jdk virtual/jre ) )"
 RDEPEND="${DEPEND}
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+			x11-misc/xkbdata
+			x11-apps/setxkbmap
+		) virtual/x11 )
 	sys-apps/eject"
 
 src_unpack() {
diff --git a/kde-base/kdebase/kdebase-3.3.2-r2.ebuild b/kde-base/kdebase/kdebase-3.3.2-r2.ebuild
index 4613b230f112..0ad7470db6c4 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-2005 Gentoo Foundation
+# 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.10 2005/06/12 23:33:44 kloeri Exp $
+# $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 $
 
 inherit kde-dist eutils
 
@@ -19,6 +19,15 @@ DEPEND="arts? ( ~kde-base/arts-${PV//3.3/1.3} )
 	java? ( || ( virtual/jdk virtual/jre ) )"
 
 RDEPEND="${DEPEND}
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+			x11-misc/xkbdata
+			x11-apps/setxkbmap
+		) virtual/x11 )
 	sys-apps/eject"
 
 src_unpack() {
diff --git a/kde-base/kdebase/kdebase-3.3.2-r3.ebuild b/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
index 1e6fe280117e..7e954b8e9c0d 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-2005 Gentoo Foundation
+# 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.5 2005/07/01 23:35:28 hardave Exp $
+# $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 $
 
 inherit kde-dist eutils
 
@@ -19,6 +19,15 @@ DEPEND="arts? ( ~kde-base/arts-${PV//3.3/1.3} )
 	java? ( || ( virtual/jdk virtual/jre ) )"
 
 RDEPEND="${DEPEND}
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+			x11-misc/xkbdata
+			x11-apps/setxkbmap
+		) virtual/x11 )
 	sys-apps/eject"
 
 src_unpack() {
diff --git a/kde-base/kdebase/kdebase-3.4.1-r1.ebuild b/kde-base/kdebase/kdebase-3.4.1-r1.ebuild
index 5b98c7011c0c..a840c8eaa5de 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-2005 Gentoo Foundation
+# 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.9 2005/10/03 14:36:50 agriffis Exp $
+# $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 $
 
 inherit kde-dist eutils
 
@@ -25,6 +25,15 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	       =sys-apps/hal-0.4* )"
 
 RDEPEND="${DEPEND}
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+			x11-misc/xkbdata
+			x11-apps/setxkbmap
+		) virtual/x11 )
 	java? ( || ( virtual/jdk virtual/jre ) )
 	virtual/eject"
 
diff --git a/kde-base/kdebase/kdebase-3.4.2-r1.ebuild b/kde-base/kdebase/kdebase-3.4.2-r1.ebuild
index f6ec1bcfc37a..895dec0c8552 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-2005 Gentoo Foundation
+# 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.2 2005/10/06 23:15:54 hardave Exp $
+# $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 $
 
 inherit kde-dist eutils
 
@@ -28,6 +28,15 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	       =sys-apps/hal-0.4* )"
 
 RDEPEND="${DEPEND}
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+			x11-misc/xkbdata
+			x11-apps/setxkbmap
+		) virtual/x11 )
 	java? ( >=virtual/jre-1.4 )
 	virtual/eject"
 
diff --git a/kde-base/kdebase/kdebase-3.4.2-r2.ebuild b/kde-base/kdebase/kdebase-3.4.2-r2.ebuild
index 9dc4e896132e..c204636cbb01 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-2005 Gentoo Foundation
+# 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.1 2005/10/04 09:40:15 greg_g Exp $
+# $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 $
 
 inherit kde-dist eutils
 
@@ -30,6 +30,15 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	       sys-apps/hal )"
 
 RDEPEND="${DEPEND}
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+			x11-misc/xkbdata
+			x11-apps/setxkbmap
+		) virtual/x11 )
 	java? ( >=virtual/jre-1.4 )
 	virtual/eject"
 
diff --git a/kde-base/kdebase/kdebase-3.4.2.ebuild b/kde-base/kdebase/kdebase-3.4.2.ebuild
index 5e98b9929d12..f1545642784f 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-2005 Gentoo Foundation
+# 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.2 2005/07/30 14:05:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2.ebuild,v 1.3 2006/01/30 01:01:04 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -32,6 +32,15 @@ RDEPEND="${DEPEND}
 	virtual/eject"
 
 DEPEND="${DEPEND}
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+			x11-misc/xkbdata
+			x11-apps/setxkbmap
+		) virtual/x11 )
 	dev-util/pkgconfig"
 
 src_unpack() {
diff --git a/kde-base/kdebase/kdebase-3.4.3-r1.ebuild b/kde-base/kdebase/kdebase-3.4.3-r1.ebuild
index c41983cfe730..692802ffe862 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.9 2006/01/22 09:26:42 corsair Exp $
+# $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 $
 
 inherit kde-dist eutils
 
@@ -30,6 +30,15 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	       sys-apps/hal )"
 
 RDEPEND="${DEPEND}
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+			x11-misc/xkbdata
+			x11-apps/setxkbmap
+		) virtual/x11 )
 	java? ( >=virtual/jre-1.4 )
 	virtual/eject"
 
diff --git a/kde-base/kdebase/kdebase-3.4.3.ebuild b/kde-base/kdebase/kdebase-3.4.3.ebuild
index 8d32a601f96b..3bc35d986fa2 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-2005 Gentoo Foundation
+# 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.2 2005/12/14 02:03:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.3.ebuild,v 1.3 2006/01/30 01:01:04 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -30,6 +30,15 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	       sys-apps/hal )"
 
 RDEPEND="${DEPEND}
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+			x11-misc/xkbdata
+			x11-apps/setxkbmap
+		) virtual/x11 )
 	java? ( >=virtual/jre-1.4 )
 	virtual/eject"
 
diff --git a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
index 16e66f3051af..65eb70d9a747 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.13 2006/01/14 08:59:45 flameeyes Exp $
+# $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 $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -38,6 +38,11 @@ RDEPEND="${DEPEND}
 	java? ( >=virtual/jre-1.4 )
 	virtual/eject
 	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
 			x11-misc/xkbdata
 			x11-apps/setxkbmap
 		) virtual/x11 )
diff --git a/kde-base/kdebase/kdebase-3.5.1.ebuild b/kde-base/kdebase/kdebase-3.5.1.ebuild
index 38b24d8929c3..a3d1661b6c39 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.1 2006/01/28 14:29:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1.ebuild,v 1.2 2006/01/30 01:01:04 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -38,6 +38,11 @@ RDEPEND="${DEPEND}
 	java? ( >=virtual/jre-1.4 )
 	virtual/eject
 	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
 			x11-misc/xkbdata
 			x11-apps/setxkbmap
 		) virtual/x11 )