From d0cb102b2c037ba6327883be0bebdab027ddb16a Mon Sep 17 00:00:00 2001
From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Wed, 28 Jun 2006 02:25:43 +0000
Subject: 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)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kde-base/kdm/ChangeLog           | 8 +++++++-
 kde-base/kdm/kdm-3.5.2-r1.ebuild | 7 ++++---
 kde-base/kdm/kdm-3.5.3-r2.ebuild | 7 ++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'kde-base')

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 83b3013ba52d..53f078375aa5 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.61 2006/06/17 23:08:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.62 2006/06/28 02:25:43 flameeyes Exp $
+
+  28 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> -kdm-3.5.2.ebuild,
+  kdm-3.5.2-r1.ebuild, -kdm-3.5.3.ebuild, -kdm-3.5.3-r1.ebuild,
+  kdm-3.5.3-r2.ebuild:
+  Add dependency over xinit or x11 for the xdm init.d script. Thanks to
+  Michael Weyershäuser for reporting.
 
 *kdm-3.5.3-r2 (17 Jun 2006)
 
diff --git a/kde-base/kdm/kdm-3.5.2-r1.ebuild b/kde-base/kdm/kdm-3.5.2-r1.ebuild
index 45b1f24c0d36..b9de91c9efe8 100644
--- a/kde-base/kdm/kdm-3.5.2-r1.ebuild
+++ b/kde-base/kdm/kdm-3.5.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/kdm/kdm-3.5.2-r1.ebuild,v 1.4 2006/06/17 12:02:31 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.2-r1.ebuild,v 1.5 2006/06/28 02:25:43 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -18,12 +18,13 @@ KMEXTRA="kdmlib/"
 # kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
 # 3.5_beta1.
 KMEXTRACTONLY="libkonq/konq_defaults.h"
-#	    kioslave/thumbnail/configure.in.in"
+#		kioslave/thumbnail/configure.in.in"
 KMCOMPILEONLY="kcontrol/background"
 DEPEND="pam? ( kde-base/kdebase-pam )
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 	# Requires the desktop background settings and kdm kcontrol modules
 RDEPEND="${DEPEND}
+	|| ( x11-apps/xinit virtual/x11 )
 	kde-base/kdepasswd"
 
 
@@ -68,7 +69,7 @@ pkg_postinst() {
 	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ];	then
 		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
 		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-		    "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
 	fi
 	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
 		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
diff --git a/kde-base/kdm/kdm-3.5.3-r2.ebuild b/kde-base/kdm/kdm-3.5.3-r2.ebuild
index ea716be1123e..fbc7eee32db4 100644
--- a/kde-base/kdm/kdm-3.5.3-r2.ebuild
+++ b/kde-base/kdm/kdm-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/kdm/kdm-3.5.3-r2.ebuild,v 1.1 2006/06/17 23:08:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.3-r2.ebuild,v 1.2 2006/06/28 02:25:43 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -18,12 +18,13 @@ KMEXTRA="kdmlib/"
 # kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
 # 3.5_beta1.
 KMEXTRACTONLY="libkonq/konq_defaults.h"
-#	    kioslave/thumbnail/configure.in.in"
+#		kioslave/thumbnail/configure.in.in"
 KMCOMPILEONLY="kcontrol/background"
 DEPEND="pam? ( kde-base/kdebase-pam )
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 	# Requires the desktop background settings and kdm kcontrol modules
 RDEPEND="${DEPEND}
+	|| ( x11-apps/xinit virtual/x11 )
 	kde-base/kdepasswd"
 
 src_unpack() {
@@ -69,7 +70,7 @@ pkg_postinst() {
 	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ];	then
 		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
 		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-		    "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
 	fi
 	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
 		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-- 
cgit v1.2.3-65-gdbad