--- synaptics-0.14.1.ebuild.orig	2005-04-29 02:40:41.000000000 +0200
+++ synaptics-0.14.1.ebuild	2005-04-29 00:43:45.000000000 +0200
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.14.1.ebuild,v 1.1 2005/03/15 03:32:18 battousai Exp $
+# $Header: $
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils x11-prefix
 
 # This ebuild overwrites synaptics files installed by <= xfree-4.3.0-r6
 # and xfree-4.3.99.14 >= X >= xfree-4.3.99.8.
@@ -20,13 +20,16 @@
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-
-	# Put stuff into /usr/X11R6, also switch up the CC and CFLAGS stuff.
-	sed -i -e "s:BINDIR = \\\$(DESTDIR)/usr/local/bin:BINDIR = ${D}/usr/X11R6/bin:g" ${S}/Makefile
-	sed -i -e "s:CC = gcc:CC = $(tc-getCC):g" ${S}/Makefile
-	sed -i -e "s:CDEBUGFLAGS = -O2:CDEBUGFLAGS = ${CFLAGS}:g" ${S}/Makefile
-	sed -i -e "s:MANDIR = .*:MANDIR = \\\$(DESTDIR)/usr/man/man1:" ${S}/Makefile
+	# Put stuff into $X11_PREFIX, also switch up the CC and CFLAGS stuff.
+	sed -i \
+		-e "/^BINDIR = /s:/usr/local:${X11_PREFIX}:" \
+		-e "/^CC = /s:gcc:$(tc-getCC):" \
+		-e "/^CDEBUGFLAGS = /s:-O2:${CFLAGS}:" \
+		-e "/^MANDIR = /s:/usr/local/man:/usr/share/man:" \
+		-e "/^INSTALLED_X = /s:/usr/X11R6:${X11_PREFIX}:" \
+		${S}/Makefile
+	sed -e "s:/usr/X11R6:${X11_PREFIX}:" \
+		${FILESDIR}/rc.init > ${S}/rc.init
 }
 
 src_compile() {
@@ -34,12 +37,12 @@
 }
 
 src_install() {
-	dodir /usr/X11R6/{bin,lib/modules/input}
+	dodir ${X11_PREFIX}/{bin,lib/modules/input}
 
 	# Yes, they got the DESTDIR stuff going. And there was much rejoicing.
 	make DESTDIR=${D} install || die
 	dodoc {script/usbmouse,alps.patch,COMPATIBILITY,FILES,INSTALL{,.DE},LICENSE,NEWS,TODO,README{,.alps}}
 	# Stupid new daemon, didn't work for me because of shm issues
-	exeinto /etc/init.d && newexe ${FILESDIR}/rc.init syndaemon
-	insinto /etc/conf.d && newins ${FILESDIR}/rc.conf syndaemon
+	newinitd ${S}/rc.init syndaemon
+	newconfd ${FILESDIR}/rc.conf syndaemon
 }