Add dependency over xinit or x11 for the xdm init.d script. Thanks to Michael Weyershäuser for reporting.

(Portage version: 2.1.1_pre1-r3)

3 files changed, 25 insertions, 17 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 6077f31a66dd..32da50c40f0f 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,12 @@
 # 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.295 2006/06/22 12:45:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.296 2006/06/28 02:31:34 flameeyes Exp $
+
+  28 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -kdebase-3.5.2-r1.ebuild, kdebase-3.5.2-r2.ebuild, -kdebase-3.5.3.ebuild,
+  -kdebase-3.5.3-r1.ebuild, kdebase-3.5.3-r2.ebuild:
+  Add dependency over xinit or x11 for the xdm init.d script. Thanks to
+  Michael Weyershäuser for reporting.
 
   22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   kdebase-3.5.2-r2.ebuild, kdebase-3.5.3-r2.ebuild:
diff --git a/kde-base/kdebase/kdebase-3.5.2-r2.ebuild b/kde-base/kdebase/kdebase-3.5.2-r2.ebuild
index 11299af93b9a..3bfafbfdb3ed 100644
--- a/kde-base/kdebase/kdebase-3.5.2-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.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.5.2-r2.ebuild,v 1.6 2006/06/22 12:45:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.2-r2.ebuild,v 1.7 2006/06/28 02:31:34 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -30,7 +30,7 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
 	ieee1394? ( sys-libs/libraw1394 )
 	hal? ( >=sys-apps/dbus-0.33
-	       =sys-apps/hal-0.5*
+		   =sys-apps/hal-0.5*
 		   sys-apps/pmount )
 	zeroconf? ( net-misc/mDNSResponder )
 	xcomposite? ( || ( (
@@ -59,6 +59,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
+			x11-apps/xinit
 			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )"
@@ -101,12 +102,12 @@ src_unpack() {
 
 src_compile() {
 	local myconf="--with-dpms
-	              $(use_with arts) $(use_with ldap)
-	              $(use_with opengl gl) $(use_with ssl)
-	              $(use_with samba) $(use_with openexr)
-	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
-	              $(use_with ieee1394 libraw1394) $(use_with hal)
-	              $(use_enable zeroconf dnssd)
+				  $(use_with arts) $(use_with ldap)
+				  $(use_with opengl gl) $(use_with ssl)
+				  $(use_with samba) $(use_with openexr)
+				  $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
+				  $(use_with ieee1394 libraw1394) $(use_with hal)
+				  $(use_enable zeroconf dnssd)
 				  $(use_with xcomposite composite)
 				  $(use_with xscreensaver)
 				  $(use_with xinerama)
diff --git a/kde-base/kdebase/kdebase-3.5.3-r2.ebuild b/kde-base/kdebase/kdebase-3.5.3-r2.ebuild
index d4e343e8ff55..1aead7022867 100644
--- a/kde-base/kdebase/kdebase-3.5.3-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.3-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.5.3-r2.ebuild,v 1.2 2006/06/22 12:45:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.3-r2.ebuild,v 1.3 2006/06/28 02:31:34 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -29,7 +29,7 @@ DEPEND="arts? ( ~kde-base/arts-${PV} )
 	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
 	ieee1394? ( sys-libs/libraw1394 )
 	hal? ( >=sys-apps/dbus-0.33
-	       =sys-apps/hal-0.5*
+		   =sys-apps/hal-0.5*
 		   sys-apps/pmount )
 	zeroconf? ( net-misc/mDNSResponder )
 	xcomposite? ( || ( (
@@ -58,6 +58,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
+			x11-apps/xinit
 			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )"
@@ -102,12 +103,12 @@ src_unpack() {
 
 src_compile() {
 	local myconf="--with-dpms
-	              $(use_with arts) $(use_with ldap)
-	              $(use_with opengl gl) $(use_with ssl)
-	              $(use_with samba) $(use_with openexr)
-	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
-	              $(use_with ieee1394 libraw1394) $(use_with hal)
-	              $(use_enable zeroconf dnssd)
+				  $(use_with arts) $(use_with ldap)
+				  $(use_with opengl gl) $(use_with ssl)
+				  $(use_with samba) $(use_with openexr)
+				  $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
+				  $(use_with ieee1394 libraw1394) $(use_with hal)
+				  $(use_enable zeroconf dnssd)
 				  $(use_with xcomposite composite)
 				  $(use_with xscreensaver)
 				  $(use_with xinerama)