--- slim-1.2.4.ebuild	2006-02-16 11:43:58.000000000 +0100
+++ slim-1.2.4-r2.ebuild	2006-02-16 11:29:32.000000000 +0100
@@ -30,7 +30,6 @@
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-cflags.patch
-#	epatch ${FILESDIR}/${P}-daemon-configoption.patch
 
 	if [ -e /etc/init.d/xdm ] && [ -z "`grep slim /etc/init.d/xdm`" ]; then
 		einfo "Patching /etc/init.d/xdm file..."
@@ -44,7 +43,12 @@
 		epatch ${FILESDIR}/${PN}-rc.patch
 	fi
 	# Remove all X11R6 references from slim.conf
-	sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' slim.conf
+	# Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop
+	# Set the default logfile to /dev/null to avoid cluttering up the harddisk - slim puts a lot of garbage in it's logfile
+	sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' \
+		-e 's/# daemon/daemon/' \
+		-e 's#/var/log/slim.log#/dev/null#g' \
+		slim.conf || die "sed slim.conf"
 }
 
 src_compile() {
@@ -56,9 +60,9 @@
 	dodoc xinitrc.sample README TODO THEMES
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/slim.rc slim
-	doexe xdm
-	into /etc
-	doins rc.conf
+	[ -e ./xdm ] && doexe xdm
+	insinto /etc
+	[ -e ./rc.conf ] && doins rc.conf
 }
 
 pkg_postinst() {
@@ -72,8 +76,3 @@
 	einfo "xinitrc.sample in /usr/share/doc/${PF}"
 }
 
-pkg_postrm() {
-	patch -R --no-backup-if-mismatch /etc/init.d/xdm ${FILESDIR}/${PN}-xdm.patch
-	patch -R --no-backup-if-mismatch /etc/rc.conf ${FILESDIR}/${PN}-rc.patch
-}
-