Index: x11-base/xorg-server/xorg-server-1.2.0.ebuild
===================================================================
--- x11-base/xorg-server/xorg-server-1.2.0.ebuild	(revision 1172)
+++ x11-base/xorg-server/xorg-server-1.2.0.ebuild	(working copy)
@@ -499,22 +499,18 @@
 xprint_src_install() {
 	# RH-style init script, we provide a wrapper
 	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
+	doexe ${S}/hw/xprint/etc/init.d/xprint
 	# Install the wrapper
 	newinitd ${FILESDIR}/xprint.init xprint
 	# Install profile scripts
 	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
+	doins ${S}/hw/xprint/etc/profile.d/xprint*
 	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
+	doins ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
 	# Patch profile scripts
 	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
 		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
+		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
 	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
 	dodoc ${D}/etc/profile.d/xprint*
 	rm -f ${D}/etc/profile.d/xprint*