Attachment #77528 for bug #107526

View | Details | Raw Unified | Return to bug 107526 | Differences between

and this patch




src_unpack() {
	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..."
		cp /etc/init.d/xdm .
		epatch ${FILESDIR}/${PN}-xdm.patch
	fi

	# Remove all X11R6 references from slim.conf

	einfo "xinitrc.sample in /usr/share/doc/${PF}"
}

pkg_postrm() {
	patch -R --no-backup-if-mismatch /etc/init.d/xdm ${FILESDIR}/${PN}-xdm.patch
}

Return to bug 107526

Lines 20-32 Link Here

(-)slim-1.2.3-r1.ebuild (-4 / +7 lines)
20	src_unpack() {	20	src_unpack() {
21	unpack ${A}	21	unpack ${A}
22	cd ${S}	22	cd ${S}
23	epatch ${FILESDIR}/${P}-cflags.patch	23	epatch ${FILESDIR}/${PN}-cflags.patch
24	epatch ${FILESDIR}/${P}-daemon-configoption.patch	24	# epatch ${FILESDIR}/${P}-daemon-configoption.patch
25		25
26	if [ -e /etc/init.d/xdm ]; then	26	if [ -e /etc/init.d/xdm ] && [ -z "`grep slim /etc/init.d/xdm`" ]; then
27	einfo "Patching /etc/init.d/xdm file..."	27	einfo "Patching /etc/init.d/xdm file..."
28	cp /etc/init.d/xdm .	28	cp /etc/init.d/xdm .
29	epatch ${FILESDIR}/${P}-xdm.patch	29	epatch ${FILESDIR}/${PN}-xdm.patch
30	fi	30	fi
31		31
32	# Remove all X11R6 references from slim.conf	32	# Remove all X11R6 references from slim.conf
Lines 56-58 Link Here
56	einfo "xinitrc.sample in /usr/share/doc/${PF}"	56	einfo "xinitrc.sample in /usr/share/doc/${PF}"
57	}	57	}
58		58
		59	pkg_postrm() {
		60	patch -R --no-backup-if-mismatch /etc/init.d/xdm ${FILESDIR}/${PN}-xdm.patch
		61	}