--- xprint-009.1.ebuild.orig	2005-04-27 19:30:02.000000000 +0200
+++ xprint-009.1.ebuild	2005-04-29 01:00:02.000000000 +0200
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xprint/xprint-009.1.ebuild,v 1.1 2004/08/24 12:12:09 lanius Exp $
+# $Header: $
+
+inherit x11-prefix
 
 DESCRIPTION="An advanced printing system which enables X11 applications to use devices like printers in formats like PostScript, PDF, PCL, etc."
 HOMEPAGE="http://xprint.mozdev.org"
@@ -16,13 +18,25 @@
 
 S=${WORKDIR}/xprint/src/xprint_main/xc/
 
+src_unpack() {
+	unpack ${A}
+	sed -i 's:XPRINTDIR = .*$:XPRINTDIR = /usr/share/Xprint/xserver:' \
+		${S}/config/cf/X11.tmpl
+	sed -i "/ProjectRoot/s:/usr/X11R6:${X11_PREFIX}:" \
+		${S}/config/cf/linux.cf
+	sed -i "s:=/tmp/:=${T}/:" ${S}/packager/tarball/make_xprint_binary_tarball.sh
+}
+
 src_compile() {
-	sed 's:XPRINTDIR = .*$:XPRINTDIR = /usr/share/Xprint/xserver:' -i config/cf/X11.tmpl
-	make XPRINTDIR=/usr/share/Xprint/xserver World || die
+	make World || die "make World failed"
 }
 
 src_install() {
-	make XPRINTDIR=/usr/share/Xprint/xserver XPDESTTARFILE=${S}/xprint.tar.gz make_xprint_tarball -C ${S}/packager
+	make MANPATH=/usr/share/man \
+		XPDESTTARFILE=${S}/xprint.tar.gz \
+		-C ${S}/packager \
+		make_xprint_tarball \
+		|| die "make make_xprint_tarball failed"
 
 	tar -xzf xprint.tar.gz
 	mv xprint/install/* ${D}
@@ -32,9 +46,9 @@
 	rm -fR ${D}/etc/profile.d
 	dodir /usr/sbin
 	mv ${D}/etc/init.d/xprint ${D}/usr/sbin/
-	cp ${FILESDIR}/xprint.rc6 ${D}/etc/init.d/xprint
-	dodoc ${D}/usr/X11R6/lib/X11/xserver/README
-	rm -f ${D}/usr/X11R6/lib/X11/xserver/README
+	newinitd ${FILESDIR}/xprint.rc6 xprint
+	dodoc ${D}/usr/share/Xprint/xserver/README
+	rm -f ${D}/usr/share/Xprint/xserver/README
 
 	sed -i -e 's:XPCUSTOMGLUE=default:XPCUSTOMGLUE=DebianGlue:' ${D}/usr/sbin/xprint
 }