Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 107526 | Differences between
and this patch

Collapse All | Expand All

(-)slim-1.2.4.ebuild (-10 / +9 lines)
Lines 30-36 Link Here
30
	unpack ${A}
30
	unpack ${A}
31
	cd ${S}
31
	cd ${S}
32
	epatch ${FILESDIR}/${PN}-cflags.patch
32
	epatch ${FILESDIR}/${PN}-cflags.patch
33
#	epatch ${FILESDIR}/${P}-daemon-configoption.patch
34
33
35
	if [ -e /etc/init.d/xdm ] && [ -z "`grep slim /etc/init.d/xdm`" ]; then
34
	if [ -e /etc/init.d/xdm ] && [ -z "`grep slim /etc/init.d/xdm`" ]; then
36
		einfo "Patching /etc/init.d/xdm file..."
35
		einfo "Patching /etc/init.d/xdm file..."
Lines 44-50 Link Here
44
		epatch ${FILESDIR}/${PN}-rc.patch
43
		epatch ${FILESDIR}/${PN}-rc.patch
45
	fi
44
	fi
46
	# Remove all X11R6 references from slim.conf
45
	# Remove all X11R6 references from slim.conf
47
	sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' slim.conf
46
	# Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop
47
	# Set the default logfile to /dev/null to avoid cluttering up the harddisk - slim puts a lot of garbage in it's logfile
48
	sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' \
49
		-e 's/# daemon/daemon/' \
50
		-e 's#/var/log/slim.log#/dev/null#g' \
51
		slim.conf || die "sed slim.conf"
48
}
52
}
49
53
50
src_compile() {
54
src_compile() {
Lines 56-64 Link Here
56
	dodoc xinitrc.sample README TODO THEMES
60
	dodoc xinitrc.sample README TODO THEMES
57
	exeinto /etc/init.d
61
	exeinto /etc/init.d
58
	newexe ${FILESDIR}/slim.rc slim
62
	newexe ${FILESDIR}/slim.rc slim
59
	doexe xdm
63
	[ -e ./xdm ] && doexe xdm
60
	into /etc
64
	insinto /etc
61
	doins rc.conf
65
	[ -e ./rc.conf ] && doins rc.conf
62
}
66
}
63
67
64
pkg_postinst() {
68
pkg_postinst() {
Lines 72-79 Link Here
72
	einfo "xinitrc.sample in /usr/share/doc/${PF}"
76
	einfo "xinitrc.sample in /usr/share/doc/${PF}"
73
}
77
}
74
78
75
pkg_postrm() {
76
	patch -R --no-backup-if-mismatch /etc/init.d/xdm ${FILESDIR}/${PN}-xdm.patch
77
	patch -R --no-backup-if-mismatch /etc/rc.conf ${FILESDIR}/${PN}-rc.patch
78
}
79

Return to bug 107526