touchups

4 files changed, 33 insertions, 86 deletions

diff --git a/app-sci/chemtool/chemtool-1.5.ebuild b/app-sci/chemtool/chemtool-1.5.ebuild
index 1c6209183059..a1c5c3bed5c9 100644
--- a/app-sci/chemtool/chemtool-1.5.ebuild
+++ b/app-sci/chemtool/chemtool-1.5.ebuild
@@ -1,59 +1,40 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/chemtool-1.5.ebuild,v 1.3 2003/02/13 09:21:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/chemtool-1.5.ebuild,v 1.4 2003/03/01 01:27:48 vapier Exp $
 
-IUSE="gnome kde nls"
+[ -n "`use kde`" ] && inherit kde-functions
+inherit eutils
 
-DESCRIPTION="Chemtool is a program for drawing organic molecules"
-HOMEPAGE="http://ruby.chemie.uni-freiburg.de/~martin/chemtool"
+DESCRIPTION="program for drawing organic molecules"
+HOMEPAGE="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"
 SRC_URI="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/${P}.tar.gz"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-IUSE="gnome kde nls"
 KEYWORDS="x86"
+IUSE="gnome kde nls"
 
 DEPEND=">=media-gfx/transfig-3.2.3d
-		>=x11-libs/gtk+-1.2.10
-		gnome? ( gnome-base/gnome )
-		kde? ( kde-base/kde )
-		nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${P}"
+	>=x11-libs/gtk+-1.2.10
+	gnome? ( gnome-base/gnome )
+	kde? ( kde-base/kde )
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 
-	echo ">>> Patching configure.in..."
-	patch ${S}/configure.in \
-		${FILESDIR}/configure.in-${P}-gentoo.diff \
-		&>/dev/null
-
-	echo ">>> Patching config.h.in..."
-	patch ${S}/config.h.in \
-		${FILESDIR}/config.h.in-${P}-gentoo.diff \
-		&>/dev/null
-
-	echo ">>> Patching Makefile.in..."
-	patch ${S}/Makefile.in \
-		${FILESDIR}/Makefile.in-${P}-gentoo.diff \
-		&>/dev/null
-
-	echo ">>> Patching src-cht/Makefile.in..."
-	patch ${S}/src-cht/Makefile.in \
-		${FILESDIR}/src-cht-Makefile.in-${P}-gentoo.diff \
-		&>/dev/null
-
-	echo ">>> Running autoconf..."
-	cd "${S}" && autoconf
+	epatch ${FILESDIR}/configure.in-${P}-gentoo.diff
+	epatch ${FILESDIR}/config.h.in-${P}-gentoo.diff
+	epatch ${FILESDIR}/Makefile.in-${P}-gentoo.diff
+	epatch ${FILESDIR}/src-cht-Makefile.in-${P}-gentoo.diff
+	autoconf || die
 }
 
 src_compile() {
 	local config_opts
 
 	if [ "`use kde`" ]; then
-		inherit kde-functions
 		need-kde 2
 		config_opts="--with-kdedir=${KDEDIR}" ;
 	else
@@ -80,19 +61,13 @@ src_compile() {
 }
 
 src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		localedir=${D}/usr/share/locale \
+	einstall \
 		gnomedir=${D}/usr \
 		kdedir=${D}/${KDEDIR} \
 		install \
 		|| die "make install failed"
 
-	# Install documentation.
 	dodoc ChangeLog INSTALL README TODO
-
 	insinto /usr/share/${PN}/examples
 	doins ${S}/examples/*
 }
diff --git a/app-sci/gperiodic/gperiodic-1.3.2.ebuild b/app-sci/gperiodic/gperiodic-1.3.2.ebuild
index cb1c9e41f60a..7194108277fe 100644
--- a/app-sci/gperiodic/gperiodic-1.3.2.ebuild
+++ b/app-sci/gperiodic/gperiodic-1.3.2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/gperiodic/gperiodic-1.3.2.ebuild,v 1.10 2003/02/13 09:21:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/gperiodic/gperiodic-1.3.2.ebuild,v 1.11 2003/03/01 01:30:18 vapier Exp $
 
-IUSE="nls"
+inherit eutils
 
-S=${WORKDIR}/${P}
-DESCRIPTION="GPeriodic is a periodic table application for Linux."
+DESCRIPTION="periodic table application for Linux"
 SRC_URI="ftp://ftp.seul.org/pub/gperiodic/${P}.tar.gz"
 HOMEPAGE="http://gperiodic.seul.org/"
+
 KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
+IUSE="nls"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	=x11-libs/gtk+-1.2*
@@ -21,41 +22,16 @@ PROVIDE="app-misc/gperiodic"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
- 	#Fix version number,comment out non-working lex inquiry
- 	# to eliminate superfluous config error, and use ncurses for termcap 
-
-	patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die
+	epatch ${FILESDIR}/${P}-gentoo.diff
 }
 
 src_compile() {
-	local myconf
-
-	if [ -z "`use nls`" ]
-	then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --sysconfdir=/etc \
-		    --localstatedir=/var/lib \
-	    	    --infodir=/usr/share/info \
-		    --mandir=/usr/share/man \
-		    ${myconf} || die
-	
+	econf `use_enable nls` || die
 	emake || die
 }
 
-src_install () {
-	make prefix=${D}/usr \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib \
-	     infodir=${D}/usr/share/info \
-	     mandir=${D}/usr/share/man \
-	     install || die
-	
+src_install() {
+	einstall || die
 	doman man/gperiodic.1
-	
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README
+	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README
 }
diff --git a/app-sci/gri/gri-2.12.1.ebuild b/app-sci/gri/gri-2.12.1.ebuild
index a7a7a95d7370..765b84f16974 100644
--- a/app-sci/gri/gri-2.12.1.ebuild
+++ b/app-sci/gri/gri-2.12.1.ebuild
@@ -1,10 +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-sci/gri/gri-2.12.1.ebuild,v 1.4 2003/02/13 09:22:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/gri/gri-2.12.1.ebuild,v 1.5 2003/03/01 01:30:45 vapier Exp $
 
-IUSE=""
-
-DESCRIPTION="Gri is a language for scientific graphics programming."
+DESCRIPTION="language for scientific graphics programming"
 HOMEPAGE="http://gri.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
@@ -15,7 +13,7 @@ KEYWORDS="x86"
 DEPEND=">=app-sci/netcdf-3.5.0"
 
 src_compile() {
-	econf
+	econf || die
 	emake || die
 }
 
@@ -24,7 +22,7 @@ src_install() {
 	mv ${S}/startup.msg ${S}/startup.msg.orig
 	sed -e s,PREFIX/share/doc/gri/,/usr/share/doc/${P}/, ${S}/startup.msg.orig > ${S}/startup.msg
 
-	einstall
+	einstall || die
 
 	dodoc AUTHOR README
 	#move docs to the proper place
diff --git a/app-sci/ncview/ncview-1.92d.ebuild b/app-sci/ncview/ncview-1.92d.ebuild
index 181658ca9a71..33abf002a59a 100644
--- a/app-sci/ncview/ncview-1.92d.ebuild
+++ b/app-sci/ncview/ncview-1.92d.ebuild
@@ -1,10 +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-sci/ncview/ncview-1.92d.ebuild,v 1.2 2003/02/13 09:23:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/ncview/ncview-1.92d.ebuild,v 1.3 2003/03/01 01:31:05 vapier Exp $
 
-IUSE=""
-
-DESCRIPTION="Ncview is an X-based viewer for netCDF files."
+DESCRIPTION="X-based viewer for netCDF files"
 SRC_URI="ftp://cirrus.ucsd.edu/pub/ncview/${P}.tar.gz"
 HOMEPAGE="http://meteora.ucsd.edu/~pierce/ncview_home_page.html"