Ebuild clean-up

(Portage version: 2.0.53)

4 files changed, 37 insertions, 30 deletions

diff --git a/sci-biology/trnascan-se/ChangeLog b/sci-biology/trnascan-se/ChangeLog
index 6e72da4e8dcc..8002e8ce7413 100644
--- a/sci-biology/trnascan-se/ChangeLog
+++ b/sci-biology/trnascan-se/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/trnascan-se
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/trnascan-se/ChangeLog,v 1.3 2005/08/12 21:14:38 ribosome Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/trnascan-se/ChangeLog,v 1.4 2006/01/21 18:36:49 ribosome Exp $
+
+  21 Jan 2006; Olivier Fisette <ribosome@gentoo.org>
+  trnascan-se-1.23-r1.ebuild:
+  Ebuild clean-up.
 
 *trnascan-se-1.23-r1 (12 Aug 2005)
 
diff --git a/sci-biology/trnascan-se/trnascan-se-1.23-r1.ebuild b/sci-biology/trnascan-se/trnascan-se-1.23-r1.ebuild
index 805ec8f762f0..fabae2fff939 100644
--- a/sci-biology/trnascan-se/trnascan-se-1.23-r1.ebuild
+++ b/sci-biology/trnascan-se/trnascan-se-1.23-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/trnascan-se/trnascan-se-1.23-r1.ebuild,v 1.1 2005/08/12 21:14:38 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/trnascan-se/trnascan-se-1.23-r1.ebuild,v 1.2 2006/01/21 18:36:49 ribosome Exp $
 
 inherit toolchain-funcs
 
@@ -17,7 +17,7 @@ DEPEND="dev-lang/perl"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -e "s%BINDIR  = \$(HOME)/bin%BINDIR = ${ROOT}/usr/bin%" \
 		-e "s%LIBDIR  = \$(HOME)/lib/tRNAscan-SE%LIBDIR = ${ROOT}/usr/lib/${PN}%" \
 		-e "s%MANDIR  = \$(HOME)/man%MANDIR = ${ROOT}/usr/share/man%" \
@@ -28,17 +28,17 @@ src_unpack() {
 
 src_compile() {
 	emake || die
-	mv tRNAscan-SE.man tRNAscan-SE.man.1
+	mv tRNAscan-SE.man tRNAscan-SE.man.1 || die
 }
 
 src_install() {
-	dobin covels-SE coves-SE eufindtRNA tRNAscan-SE trnascan-1.4
-	doman tRNAscan-SE.man.1
-	dodoc MANUAL README Release.history
+	dobin covels-SE coves-SE eufindtRNA tRNAscan-SE trnascan-1.4 || die
+	doman tRNAscan-SE.man.1 || die
+	dodoc MANUAL README Release.history || die
 	insinto /usr/lib/${PN}/
-	doins *.cm gcode.* Dsignal TPCsignal
+	doins *.cm gcode.* Dsignal TPCsignal || die
 	insinto /usr/share/doc/${PF}
-	doins Manual.ps
+	doins Manual.ps || die
 }
 
 src_test() {
diff --git a/sci-biology/wise/ChangeLog b/sci-biology/wise/ChangeLog
index 050e1d7f934c..93fa8c050ecd 100644
--- a/sci-biology/wise/ChangeLog
+++ b/sci-biology/wise/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-biology/wise
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/ChangeLog,v 1.3 2005/05/21 23:31:50 weeve Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/ChangeLog,v 1.4 2006/01/21 18:40:12 ribosome Exp $
+
+  21 Jan 2006; Olivier Fisette <ribosome@gentoo.org> wise-2.2.0.ebuild:
+  Ebuild clean-up.
 
   21 May 2005; Jason Wever <weeve@gentoo.org> wise-2.2.0.ebuild:
   Added ~sparc keyword.
diff --git a/sci-biology/wise/wise-2.2.0.ebuild b/sci-biology/wise/wise-2.2.0.ebuild
index 34b74139b706..98474672dbe0 100644
--- a/sci-biology/wise/wise-2.2.0.ebuild
+++ b/sci-biology/wise/wise-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/wise-2.2.0.ebuild,v 1.3 2005/05/21 23:31:50 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/wise-2.2.0.ebuild,v 1.4 2006/01/21 18:40:12 ribosome Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,11 +20,11 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	virtual/tetex"
 
-S=${WORKDIR}/${PN}${PV}
+S="${WORKDIR}/${PN}${PV}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/src
+	cd "${S}"/src
 #	if use threads; then
 #		append-flags "-DPTHREAD"
 #		sed -e "s/#EXTRALIBS = -lpthread/EXTRALIBS = -lpthread/" -i makefile || die
@@ -32,16 +32,16 @@ src_unpack() {
 	sed -e "s/CC = cc/CC = $(tc-getCC)/" \
 		-e "s/CFLAGS = -c -O/CFLAGS = -c ${CFLAGS}/" \
 		-i makefile || die
-	cd ${S}/docs
-	cat ${S}/src/models/*.tex ${S}/src/dynlibsrc/*.tex | perl gettex.pl > temp.tex
+	cd "${S}"/docs
+	cat "${S}"/src/models/*.tex "${S}"/src/dynlibsrc/*.tex | perl gettex.pl > temp.tex
 	cat wise2api.tex temp.tex apiend.tex > api.tex
-	epatch ${FILESDIR}/${PN}-api.tex.patch
+	epatch "${FILESDIR}"/${PN}-api.tex.patch
 }
 
 src_compile() {
 	cd src
 	make all || die
-	cd ${S}/docs
+	cd "${S}"/docs
 	for i in api appendix dynamite wise2 wise3arch; do
 		latex ${i} || die
 		latex ${i} || die
@@ -50,19 +50,19 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${S}/src/bin/*
-	dolib ${S}/src/base/libwisebase.a
-	dolib ${S}/src/dynlibsrc/libdyna.a
-	dobin ${S}/src/dynlibsrc/testgendb
-	dolib ${S}/src/models/libmodel.a
+	dobin "${S}"/src/bin/*
+	dolib "${S}"/src/base/libwisebase.a
+	dolib "${S}"/src/dynlibsrc/libdyna.a
+	dobin "${S}"/src/dynlibsrc/testgendb
+	dolib "${S}"/src/models/libmodel.a
 	insinto /usr/share/${PN}
-	doins -r ${S}/wisecfg
+	doins -r "${S}"/wisecfg
 	insinto /usr/share/doc/${PF}
-	doins ${S}/docs/*.ps
-	newenvd ${FILESDIR}/${PN}-env 24wise
+	doins "${S}"/docs/*.ps
+	newenvd "${FILESDIR}"/${PN}-env 24wise
 }
 
 src_test() {
-	cd ${S}/src
+	cd "${S}"/src
 	WISECONFIGDIR="${S}/wisecfg" make test || die
 }