touchups

2 files changed, 19 insertions, 60 deletions

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"
 }