touchups

7 files changed, 56 insertions, 123 deletions

diff --git a/app-text/antiword/antiword-0.32.ebuild b/app-text/antiword/antiword-0.32.ebuild
index 75f3c86ba714..19f1a006568a 100644
--- a/app-text/antiword/antiword-0.32.ebuild
+++ b/app-text/antiword/antiword-0.32.ebuild
@@ -1,26 +1,25 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/antiword-0.32.ebuild,v 1.10 2003/02/13 09:32:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/antiword-0.32.ebuild,v 1.11 2003/03/01 04:12:35 vapier Exp $
 
-S=${WORKDIR}/${PN}.0.32
-DESCRIPTION="Antiword is a free MS Word reader for Linux and RISC OS"
+DESCRIPTION="free MS Word reader for Linux and RISC OS"
 SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz"
 HOMEPAGE="http://www.winfield.demon.nl"
 
-DEPEND="app-text/ghostscript
-	"
 IUSE="kde"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
+
+DEPEND="app-text/ghostscript"
+
+S=${WORKDIR}/${PN}.${PV}
 
 src_unpack() {
 	unpack ${A}
-	
 	cd ${S}
-	patch -p0 < ${FILESDIR}/gentoo-antiword.diff
 
-	rm Makefile
+	patch -p0 < ${FILESDIR}/gentoo-antiword.diff
 
 	sed -e '/pedantic/d' -e 's/$(CFLAGS)/$(CFLAGS) -D$(DB)/' \
 		Makefile.Linux > Makefile
@@ -30,20 +29,14 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
-	exeinto /usr/bin
-	doexe antiword
+src_install() {
+	dobin antiword
+	use kde && dobin kantiword
 
-	if [`use kde`]
-	then
-		kantiword
-	fi
+	insinto /usr/share/${PN}
+	doins Resources/*
 
 	cd Docs
 	doman antiword.1
 	dodoc COPYING ChangeLog FAQ History Netscape QandA ReadMe
-
-	cd ..
-	insinto /usr/share/${PN}
-	doins Resources/*
 }
diff --git a/app-text/antiword/antiword-0.33.ebuild b/app-text/antiword/antiword-0.33.ebuild
index 08b35e607f54..68f2a1c8fea4 100644
--- a/app-text/antiword/antiword-0.33.ebuild
+++ b/app-text/antiword/antiword-0.33.ebuild
@@ -1,26 +1,21 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/antiword-0.33.ebuild,v 1.6 2003/02/13 09:32:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/antiword-0.33.ebuild,v 1.7 2003/03/01 04:12:35 vapier Exp $
 
-S=${WORKDIR}/${PN}-0.33
-DESCRIPTION="Antiword is a free MS Word reader for Linux and RISC OS"
+DESCRIPTION="free MS Word reader for Linux and RISC OS"
 SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz"
 HOMEPAGE="http://www.winfield.demon.nl"
 
-DEPEND="app-text/ghostscript
-	"
 IUSE="kde"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
+
+DEPEND="app-text/ghostscript"
 
 src_unpack() {
 	unpack ${A}
-	
 	cd ${S}
-	#patch -p0 < ${FILESDIR}/gentoo-antiword.diff
-
-	rm Makefile
 
 	sed -e '/pedantic/d' -e 's/$(CFLAGS)/$(CFLAGS) -D$(DB)/' \
 		Makefile.Linux > Makefile
@@ -30,19 +25,14 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dobin antiword
+	use kde && dobin kantiword
 
-	if [ `use kde` ]
-	then
-		dobin kantiword
-	fi
+	insinto /usr/share/${PN}
+	doins Resources/*
 
 	cd Docs
 	doman antiword.1
 	dodoc COPYING ChangeLog FAQ History Netscape QandA ReadMe
-
-	cd ..
-	insinto /usr/share/${PN}
-	doins Resources/*
 }
diff --git a/app-text/dbacl/dbacl-1.0.ebuild b/app-text/dbacl/dbacl-1.0.ebuild
index e0c42324e977..599aaa70687c 100644
--- a/app-text/dbacl/dbacl-1.0.ebuild
+++ b/app-text/dbacl/dbacl-1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dbacl/dbacl-1.0.ebuild,v 1.2 2003/02/13 09:33:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dbacl/dbacl-1.0.ebuild,v 1.3 2003/03/01 04:13:02 vapier Exp $
 
-DESCRIPTION="dbacl is a digramic Bayesian text classifier"
+DESCRIPTION="digramic Bayesian text classifier"
 HOMEPAGE="http://www.lbreyer.com/gpl.html"
 SRC_URI="http://www.lbreyer.com/gpl/${P}.tar.gz"
 
@@ -11,10 +11,9 @@ SLOT="0"
 KEYWORDS="~x86"
 
 DEPEND="virtual/glibc"
-S="${WORKDIR}/${P}"
 
 src_compile() {
-	econf
+	econf || die
 	emake || die
 }
 
diff --git a/app-text/dbacl/dbacl-1.3.ebuild b/app-text/dbacl/dbacl-1.3.ebuild
index 26ec3391ec56..737503ce5cb3 100644
--- a/app-text/dbacl/dbacl-1.3.ebuild
+++ b/app-text/dbacl/dbacl-1.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dbacl/dbacl-1.3.ebuild,v 1.2 2003/02/13 09:33:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dbacl/dbacl-1.3.ebuild,v 1.3 2003/03/01 04:13:02 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="dbacl is a digramic Bayesian text classifier"
+DESCRIPTION="digramic Bayesian text classifier"
 HOMEPAGE="http://www.lbreyer.com/gpl.html"
 SRC_URI="http://www.lbreyer.com/gpl/${P}.tar.gz"
 
diff --git a/app-text/dvipdfm/dvipdfm-0.13.2c.ebuild b/app-text/dvipdfm/dvipdfm-0.13.2c.ebuild
index e0493328d7b8..f5c92b2aa7b5 100644
--- a/app-text/dvipdfm/dvipdfm-0.13.2c.ebuild
+++ b/app-text/dvipdfm/dvipdfm-0.13.2c.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfm/dvipdfm-0.13.2c.ebuild,v 1.8 2003/02/13 09:36:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfm/dvipdfm-0.13.2c.ebuild,v 1.9 2003/03/01 04:14:55 vapier Exp $
 
-S=${WORKDIR}/${PN}
-DESCRIPTION="Dvipdfm is a DVI to PDF translator."
+DESCRIPTION="DVI to PDF translator"
 SRC_URI="http://gaspra.kettering.edu/dvipdfm/${P}.tar.gz"
 HOMEPAGE="http://gaspra.kettering.edu/dvipdfm/"
-KEYWORDS="x86 ppc sparc "
+
+KEYWORDS="x86 ppc sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -14,25 +14,17 @@ DEPEND=">=app-text/tetex-1.0.7
 	>=media-libs/libpng-1.2.1
 	>=sys-libs/zlib-1.1.4"
 
-src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=/usr/share \
-		--mandir=/usr/share/man || die
+S=${WORKDIR}/${PN}
 
+src_compile() {
+	econf || die
 	emake || die
 }
 
 src_install () {
-	make prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		datadir=${D}/usr/share \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	dodoc AUTHORS COPYING ChangeLog Credits INSTALL* NEWS OBTAINING README* TODO
+	einstall || die
+
+	dodoc AUTHORS ChangeLog Credits INSTALL* NEWS OBTAINING README* TODO
 
 	cp latex-support/dvipdfm.def ${D}/usr/share/doc/${P}/
 	cp -a doc ${D}/usr/share/doc/${P}/manual
diff --git a/app-text/enscript/enscript-1.6.3-r1.ebuild b/app-text/enscript/enscript-1.6.3-r1.ebuild
index db4d2472f7b0..db0b1b1c1356 100644
--- a/app-text/enscript/enscript-1.6.3-r1.ebuild
+++ b/app-text/enscript/enscript-1.6.3-r1.ebuild
@@ -1,57 +1,31 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.3-r1.ebuild,v 1.10 2003/02/15 07:17:05 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.3-r1.ebuild,v 1.11 2003/03/01 04:16:57 vapier Exp $
 
-IUSE="nls"
-
-S=${WORKDIR}/${P}
+DESCRIPTION="GNU's enscript is a powerful text-to-postsript converter"
 SRC_URI="http://www.iki.fi/mtr/genscript/${P}.tar.gz"
-
 HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"
-KEYWORDS="x86 sparc  ~ppc"
+
+KEYWORDS="x86 ~ppc sparc"
 SLOT="0"
 LICENSE="GPL-2"
-DESCRIPTION="GNU's enscript is a powerful text-to-postsript converter"
+IUSE="nls"
 
 DEPEND="sys-devel/flex
 	sys-devel/bison
 	nls? ( sys-devel/gettext )"
-
 RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myopts 
-	
-	if [ -z "`use nls`" ] 
-	then
-		myopts="--disable-nls"
-	else
-		myopts="--enable-nls"
-	fi
-
-	./configure 	--host=${CHOST} \
-			--prefix=/usr \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--sysconfdir=/etc \
-			${myopts}
-	assert
-
+	econf `use_enable nls` || die
 	emake || die
 }
 
-src_install () {
-	make 	prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc \
-		install || die
-	
-	dodoc AUTHORS COPYING ChangeLog FAQ.html NEWS README* THANKS TODO
+src_install() {
+	einstall || die
+	dodoc AUTHORS ChangeLog FAQ.html NEWS README* THANKS TODO
 }
 
 pkg_postinst() {
-	echo "
-	Now, customize /etc/enscript.cfg.
-	"
+	einfo "Now, customize /etc/enscript.cfg."
 }
diff --git a/app-text/enscript/enscript-1.6.3.ebuild b/app-text/enscript/enscript-1.6.3.ebuild
index abf76f60db7e..459a0d0eeac8 100644
--- a/app-text/enscript/enscript-1.6.3.ebuild
+++ b/app-text/enscript/enscript-1.6.3.ebuild
@@ -1,43 +1,28 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.3.ebuild,v 1.9 2003/02/13 09:36:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.3.ebuild,v 1.10 2003/03/01 04:16:57 vapier Exp $
 
-S=${WORKDIR}/${P}
+DESCRIPTION="GNU's enscript is a powerful text-to-postsript converter"
 SRC_URI="http://www.iki.fi/mtr/genscript/${P}.tar.gz"
-
 HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"
-KEYWORDS="x86 sparc "
+
+KEYWORDS="x86 sparc"
 SLOT="0"
 LICENSE="GPL-2"
-DESCRIPTION="GNU's enscript is a powerful text-to-postsript converter"
 
 DEPEND="sys-devel/flex
 	sys-devel/bison"
 
 src_compile() {
-
-	./configure 	--host=${CHOST} \
-			--prefix=/usr \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--sysconfdir=/etc
-	assert
-
+	econf || die
 	emake || die
 }
 
-src_install () {
-	make 	prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc \
-		install || die
-	
-	dodoc AUTHORS COPYING ChangeLog FAQ.html NEWS README* THANKS TODO
+src_install() {
+	einstall || die
+	dodoc AUTHORS ChangeLog FAQ.html NEWS README* THANKS TODO
 }
 
 pkg_postinst() {
-	echo "
-	Now, customize /etc/enscript.cfg.
-	"
+	einfo "Now, customize /etc/enscript.cfg"
 }