From: Gregorio Guidi <greg_g@gentoo.org>
Date: Sat, 24 Sep 2005 10:14:23 +0000 (+0000)
Subject: No need to customize the kdm fonts, the defaults have changed.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d585fee7e9078028ddd2274f7d42ab5ab3696371;p=gentoo.git

No need to customize the kdm fonts, the defaults have changed.
Package-Manager: portage-2.0.51.22-r2
---

diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 03f7856d8666..eb9ecbc3e0ff 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f8fabdf3377ba617123c9c4ed476270c kdm-3.4.1.ebuild 2429
-MD5 0df16509029aeb97f13b27f5a9355056 ChangeLog 2566
-MD5 32da1a4ba2aef00f40978e17c71c0da2 kdm-3.4.2.ebuild 2442
 MD5 64a151ceb84a625dbc849417f8cb7cc2 kdm-3.5_alpha1.ebuild 2089
-MD5 d1d7503732c6126c71b497760763728e kdm-3.5_beta1.ebuild 2732
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdm-3.4.2 287
+MD5 0d1ba46ec531f3be103d2da7ac784124 kdm-3.5_beta1.ebuild 2088
+MD5 0df16509029aeb97f13b27f5a9355056 ChangeLog 2566
+MD5 f8fabdf3377ba617123c9c4ed476270c kdm-3.4.1.ebuild 2429
+MD5 32da1a4ba2aef00f40978e17c71c0da2 kdm-3.4.2.ebuild 2442
 MD5 4c82da1fa6a4aec326b681a8878c686d files/digest-kdm-3.5_alpha1 69
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdm-3.4.1 212
 MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdm-3.5_beta1 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMvw9j5H05b2HAEkRAunQAJ91mVm3ZbVLxVYjTsImCZ986+7DZACaA3Wh
-cTEY5yyvrVAytyUkULAsc50=
-=cazK
------END PGP SIGNATURE-----
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdm-3.4.2 287
diff --git a/kde-base/kdm/kdm-3.5_beta1.ebuild b/kde-base/kdm/kdm-3.5_beta1.ebuild
index a26668e4aba4..5adccb0497b3 100644
--- a/kde-base/kdm/kdm-3.5_beta1.ebuild
+++ b/kde-base/kdm/kdm-3.5_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5_beta1.ebuild,v 1.1 2005/09/22 18:46:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5_beta1.ebuild,v 1.2 2005/09/24 10:14:23 greg_g Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -39,19 +39,9 @@ src_install() {
 	kde-meta_src_install
 	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
 
-	# We tell kdm to /use session files from /usr/share/xsessions.
-	# I've removed some other kdmrc mods from here, since it's not clear why
-	# the default aren't ok (and I'm not sure about the benefits of using
-	# the xdm configfiles under /etc/X11 instead of our own ones),
-	# and it's the Gentoo Way to avoid modifying upstream behaviour.
-	# Tell me if you don't like this. --danarmak
-	cd ${D}/${KDEDIR}/share/config/kdm || die
+	# Customize the kdmrc configuration
 	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		-e "s:#GreetFont=:GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0\n#GreetFont=:" \
-		-e "s:#StdFont=:StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0\n#StdFont=:" \
-		-e "s:#FailFont=:FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0\n#FailFont=:" \
-		-e "s:#AntiAliasing=:AntiAliasing=true\n#AntiAliasing=:" \
-		kdmrc
+		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
 }
 
 pkg_postinst() {