--- gv-3.5.8-r4.ebuild.orig	2005-04-28 16:36:28.000000000 +0200
+++ gv-3.5.8-r4.ebuild	2005-04-28 22:28:28.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/app-text/gv/gv-3.5.8-r4.ebuild,v 1.12 2005/04/15 16:40:08 nigoro Exp $
+# $Header: $
 
-inherit eutils
+inherit eutils x11-prefix
 
 DESCRIPTION="standard ghostscript frontend used by programs like LyX"
 HOMEPAGE="http://wwwthep.physik.uni-mainz.de/~plass/gv/"
@@ -25,37 +25,22 @@
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-debian.diff.gz
-}
-
-src_compile() {
 
 	use ppc-macos && epatch ${FILESDIR}/${P}-setenv.diff
 
-	cp config.Unix 1
-	sed -e 's:usr/local:usr:' 1 > config.Unix
-	sed -i -e "s:SCRATCH_DIR = ~/:SCRATCH_DIR = /tmp/:g" config.Unix
-	rm 1
-
-	xmkmf || die
-	make Makefiles || die
-
-	cd source
-	sed -i \
-		-e 's/install.man:: gv.man/install.man::/' \
-		-e 's/all:: gv./\#all:: gv./' \
-		-e '/gv.man/ c \#removed by sed for ebuilding' \
-		Makefile
-	if [ ! "`grep gv.man Makefile`" = "" ] ; then
-		ewarn "sed didn't completely remove gv.man references from the Makefile."
-		ewarn "We'll just run make and pray."
-	fi
+	xmkmf || die "xmkmf failed"
+	make Makefiles || die "make Makefiles failed"
+	local my_makefile
+	for my_makefile in {doc/source,doc,source,.}/Makefile ; do
+		fix_Imake_Makefile ${my_makefile} \
+			|| die "fix_Imake_Makefile ${my_makefile} failed"
+	done
 
-	cd ${S}
-	emake || die
+	# make will fail otherwise:
+	cp ${S}/doc/gv.man ${S}/source/gv.man
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	make GV_DOCDIR=${D}/usr/share/doc/${PF} install.doc || die
-	newman doc/gv.man gv.1
+	make DESTDIR=${D} install{,.doc,.man} \
+		|| die "make install failed"
 }