add inherit eutils

4 files changed, 28 insertions, 36 deletions

diff --git a/app-text/gocr/gocr-0.3.6-r3.ebuild b/app-text/gocr/gocr-0.3.6-r3.ebuild
index 487b4449cfb8..41aee14929de 100644
--- a/app-text/gocr/gocr-0.3.6-r3.ebuild
+++ b/app-text/gocr/gocr-0.3.6-r3.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.3.6-r3.ebuild,v 1.2 2004/03/21 19:16:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.3.6-r3.ebuild,v 1.3 2004/04/08 17:27:02 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Converts PNM to ASCII"
-SRC_URI="mirror://sourceforge/jocr/${P}.tar.gz"
 HOMEPAGE="http://jocr.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jocr/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
 IUSE="doc"
 
@@ -22,20 +24,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoo.diff
 	cd ${S}
 	autoconf || die
-	cd ${S}/doc
-	cp Makefile.in Makefile.orig
-	sed -e "s:\$(DVIPS) \$?:\$(DVIPS) -o \$(OCRDOC).ps \$?:" \
-		Makefile.orig > Makefile.in
-	cd ../bin
-	mv gocr.tcl gocr.orig
-	sed -e "s:\.\./examples:/usr/share/gocr/fonts:" \
-		gocr.orig > gocr.tcl
-	cd ../src
-	cp database.c database.orig
-	sed -e "s:\./db/:${D}/usr/share/gocr/db/:" database.orig > database.c
-	cd ../examples
-	cp Makefile Makefile.orig
-	sed -e "s:polish.pbm man.pbm:polish.pbm:" Makefile.orig > Makefile
+	sed -i -e "s:\$(DVIPS) \$?:\$(DVIPS) -o \$(OCRDOC).ps \$?:" doc/Makefile.in
+	sed -i -e "s:\.\./examples:/usr/share/gocr/fonts:" bin/gocr.tcl
+	sed -i -e "s:\./db/:${D}/usr/share/gocr/db/:" src/database.c
+	sed -i -e "s:polish.pbm man.pbm:polish.pbm:" examples/Makefile
 }
 
 src_compile() {
@@ -44,7 +36,7 @@ src_compile() {
 	econf || die
 	emake -j1 || die
 	emake -j1 src frontend database || die
-	if [ "`use doc`" ] ; then
+	if use doc ; then
 		emake -j1 examples || die
 	fi
 }
diff --git a/app-text/gv/gv-3.5.8-r2.ebuild b/app-text/gv/gv-3.5.8-r2.ebuild
index ae74dc783bc0..7f19db8f2880 100644
--- a/app-text/gv/gv-3.5.8-r2.ebuild
+++ b/app-text/gv/gv-3.5.8-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.5.8-r2.ebuild,v 1.12 2004/04/08 10:36:20 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.5.8-r2.ebuild,v 1.13 2004/04/08 17:27:49 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="standard ghostscript frontend used by programs like LyX"
 HOMEPAGE="http://wwwthep.physik.uni-mainz.de/~plass/gv/"
@@ -24,10 +26,10 @@ src_unpack() {
 }
 
 src_compile() {
-	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
+	sed -i \
+		-e 's:usr/local:usr:' \
+		-e "s:SCRATCH_DIR = ~/:SCRATCH_DIR = /tmp/:g" \
+		config.Unix
 
 	xmkmf || die
 	make Makefiles || die
diff --git a/app-text/html2text/html2text-1.3.1.ebuild b/app-text/html2text/html2text-1.3.1.ebuild
index 524aea96321b..ae516ab9dbc0 100644
--- a/app-text/html2text/html2text-1.3.1.ebuild
+++ b/app-text/html2text/html2text-1.3.1.ebuild
@@ -1,41 +1,37 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/html2text-1.3.1.ebuild,v 1.5 2004/01/20 20:15:03 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/html2text-1.3.1.ebuild,v 1.6 2004/04/08 17:28:25 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A HTML to text converter"
-SRC_URI="http://userpage.fu-berlin.de/~mbayer/tools/${P}.tar.gz"
 HOMEPAGE="http://userpage.fu-berlin.de/~mbayer/tools/html2text.html"
+SRC_URI="http://userpage.fu-berlin.de/~mbayer/tools/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~sparc ~amd64"
 IUSE=""
 
 DEPEND="virtual/glibc"
 
 src_unpack() {
-
 	unpack ${A}
 	# apply a patch for g++ 3.3, provided by the html2text
 	# people (see homepage) <obz@gentoo.org>
 	if has_version ">=sys-devel/gcc-3.3*"; then
 		epatch ${FILESDIR}/${PN}-gcc3.3.patch
 	fi
-
 }
 
 src_compile() {
-
 	./configure || die
 	emake || die
-
 }
 
 src_install() {
-
 	dobin html2text
 	doman html2text.1.gz
 	doman html2textrc.5.gz
 	dodoc CHANGES CREDITS INSTALL KNOWN_BUGS README TODO
-
 }
diff --git a/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild b/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild
index 54f71e4d50ea..05fd76250dc3 100644
--- a/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild,v 1.5 2004/03/12 08:24:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/htmldoc-1.8.20-r1.ebuild,v 1.6 2004/04/08 17:28:54 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Convert HTML pages into a PDF document"
-SRC_URI="ftp://ftp.easysw.com/pub/htmldoc/1.8.20/${P}-1-source.tar.bz2"
 HOMEPAGE="http://www.easysw.com/htmldoc/"
+SRC_URI="ftp://ftp.easysw.com/pub/htmldoc/1.8.20/${P}-1-source.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc ppc"
 
 DEPEND="virtual/x11"
@@ -39,7 +41,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall
+	einstall || die
 
 	# Minor cleanups
 	mv ${D}/usr/share/doc/htmldoc ${D}/usr/share/doc/${PF}