Ebuild cleanups

(Portage version: 2.0.51-r15)

10 files changed, 49 insertions, 31 deletions

diff --git a/sci-biology/seaview/ChangeLog b/sci-biology/seaview/ChangeLog
index e108db353718..441d6327e446 100644
--- a/sci-biology/seaview/ChangeLog
+++ b/sci-biology/seaview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/seaview
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.3 2005/01/09 18:39:11 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.4 2005/01/30 18:21:08 ribosome Exp $
+
+  30 Jan 2005; Olivier Fisette <ribosome@gentoo.org>
+  seaview-20041220.ebuild:
+  Ebuild cleanup.
 
 *seaview-20041220 (09 Jan 2005)
 
diff --git a/sci-biology/seaview/seaview-20041220.ebuild b/sci-biology/seaview/seaview-20041220.ebuild
index 00dfb5320c4b..b786d9e46349 100644
--- a/sci-biology/seaview/seaview-20041220.ebuild
+++ b/sci-biology/seaview/seaview-20041220.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20041220.ebuild,v 1.1 2005/01/09 18:39:11 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20041220.ebuild,v 1.2 2005/01/30 18:21:09 ribosome Exp $
 
 DESCRIPTION="A graphical multiple sequence alignment editor"
 HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html"
@@ -17,8 +17,8 @@ DEPEND="x11-libs/fltk
 src_compile() {
 	# Corrects location of libfltk.
 	CFLAGS="${CFLAGS} -c -I/usr/include/fltk-1.1"
-	sed -i -e "s%\"seaview.help\", %\"/usr/share/${PN}/seaview.help\", %" seaview.cxx
-	sed -i -e 's:-L$(FLTK)/lib:-L/usr/lib/fltk-1.1:' Makefile
+	sed -i -e "s%\"seaview.help\", %\"/usr/share/${PN}/seaview.help\", %" seaview.cxx || die
+	sed -i -e 's:-L$(FLTK)/lib:-L/usr/lib/fltk-1.1:' Makefile || die
 
 	emake -e || die
 }
diff --git a/sci-biology/staden/ChangeLog b/sci-biology/staden/ChangeLog
index 233cc1793ebe..d314f704a87a 100644
--- a/sci-biology/staden/ChangeLog
+++ b/sci-biology/staden/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-biology/staden
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/staden/ChangeLog,v 1.9 2005/01/25 04:19:24 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/staden/ChangeLog,v 1.10 2005/01/30 18:21:09 ribosome Exp $
+
+  30 Jan 2005; Olivier Fisette <ribosome@gentoo.org> staden-1.5.3.ebuild:
+  Ebuild cleanup.
 
   24 Jan 2005; Olivier Fisette <ribosome@gentoo.org>
   +files/staden-1.5.3-mutlib-gcc-3.4.patch, staden-1.5.3.ebuild:
diff --git a/sci-biology/staden/staden-1.5.3.ebuild b/sci-biology/staden/staden-1.5.3.ebuild
index 0d0a5891b7fc..7f14ec42e436 100644
--- a/sci-biology/staden/staden-1.5.3.ebuild
+++ b/sci-biology/staden/staden-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/staden/staden-1.5.3.ebuild,v 1.3 2005/01/25 04:19:24 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/staden/staden-1.5.3.ebuild,v 1.4 2005/01/30 18:21:09 ribosome Exp $
 
 inherit eutils toolchain-funcs
 
@@ -76,7 +76,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-mutlib-gcc-3.4.patch
 	cd ${S}/src/mk
 	# Remove the "-fpic" flag. This will be replaced by "-fPIC".
-	sed -i -e 's/SHLIB_CFLAGS		= -fpic/SHLIB_CFLAGS		= /' linux.mk
+	sed -i -e 's/SHLIB_CFLAGS		= -fpic/SHLIB_CFLAGS		= /' linux.mk || die
 	cd ${S}
 
 	# "getopt" is incorrectly included as an extern (for Win32 compatibility).
@@ -99,15 +99,15 @@ src_unpack() {
 
 	# Documentation build process cannot find "update-nodes.el".
 	cd ${S}/doc/manual/tools
-	sed -i -e 's%emacs -batch $1 -l ${DOCDIR:-.}/tools/update-nodes.el%emacs -batch $1 -l ${DOCDIR:-..}/manual/tools/update-nodes.el%' update-nodes
+	sed -i -e 's%emacs -batch $1 -l ${DOCDIR:-.}/tools/update-nodes.el%emacs -batch $1 -l ${DOCDIR:-..}/manual/tools/update-nodes.el%' update-nodes || die
 
 	# Perl scripts search for "pearl" in "/usr/local".
 	for SCRIPT in *.pl texi2html; do
-		sed -i -e 's%/usr/local/bin/perl%/usr/bin/perl%' ${SCRIPT}
+		sed -i -e 's%/usr/local/bin/perl%/usr/bin/perl%' ${SCRIPT} || die
 	done
 
 	# The "convert" tool from Imagemagick is searched for in "/usr/X11R6".
-	sed -i -e 's%/usr/X11R6/bin/convert%/usr/bin/convert%' make_ps
+	sed -i -e 's%/usr/X11R6/bin/convert%/usr/bin/convert%' make_ps | die
 
 	# Solves issues with images in the exercise* texi files.
 	cd ${S}/course/texi
@@ -120,8 +120,9 @@ src_unpack() {
 	# system global Makefile. We also want only "-fPIC" shared libraries.
 	einfo "Applying user-defined compilation/linking flags:"
 	cd ${S}/src/mk
-	sed -i -e "s/COPT		= -O2 -g3 -DNDEBUG/COPT = ${CFLAGS:-"-O2 -g3 -DNDEBUG"} -fPIC/" global.mk
-	sed -i -e "s/FOPT		= -O2 -g3 -DNDEBUG/FOPT = ${FFLAGS:-"-O2 -g3 -DNDEBUG"} -fPIC/" global.mk
+	sed -e "s/COPT		= -O2 -g3 -DNDEBUG/COPT = ${CFLAGS:-"-O2 -g3 -DNDEBUG"} -fPIC/" \
+		-e "s/FOPT		= -O2 -g3 -DNDEBUG/FOPT = ${FFLAGS:-"-O2 -g3 -DNDEBUG"} -fPIC/" \
+		-i global.mk || die
 }
 
 src_compile() {
diff --git a/sci-biology/tree-puzzle/ChangeLog b/sci-biology/tree-puzzle/ChangeLog
index 6c04fe8b9907..f55cb102ddbe 100644
--- a/sci-biology/tree-puzzle/ChangeLog
+++ b/sci-biology/tree-puzzle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-biology/tree-puzzle
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/ChangeLog,v 1.5 2005/01/18 17:13:08 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/ChangeLog,v 1.6 2005/01/30 18:21:09 ribosome Exp $
+
+  30 Jan 2005; Olivier Fisette <ribosome@gentoo.org> tree-puzzle-5.2.ebuild:
+  Ebuild cleanup.
 
   18 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> tree-puzzle-5.2.ebuild:
   added ~amd64 to KEYWORDS. fixes bug #78237
diff --git a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild b/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
index 2e8169627e2a..60f2c53dbf3e 100644
--- a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
+++ b/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild,v 1.3 2005/01/18 17:13:08 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild,v 1.4 2005/01/30 18:21:09 ribosome Exp $
 
 inherit toolchain-funcs
 
@@ -26,8 +26,9 @@ src_compile() {
 	econf || die
 	cd ${S}/src
 	if ! use mpi; then
-		sed -i -e 's:bin_PROGRAMS = puzzle$(EXEEXT) ppuzzle:bin_PROGRAMS = puzzle :' Makefile
-		sed -i -e 's:DIST_SOURCES = $(ppuzzle_SOURCES) $(puzzle_SOURCES):DIST_SOURCES = $(puzzle_SOURCES):' Makefile
+		sed -e 's:bin_PROGRAMS = puzzle$(EXEEXT) ppuzzle:bin_PROGRAMS = puzzle :' \
+			-e 's:DIST_SOURCES = $(ppuzzle_SOURCES) $(puzzle_SOURCES):DIST_SOURCES = $(puzzle_SOURCES):' \
+			-i Makefile || die
 	fi
 	cd ${S}
 	emake || die
diff --git a/sci-biology/treeviewx/ChangeLog b/sci-biology/treeviewx/ChangeLog
index c8c33e4f7e54..6c7fffe15720 100644
--- a/sci-biology/treeviewx/ChangeLog
+++ b/sci-biology/treeviewx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-biology/treeviewx
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.2 2004/12/23 20:20:43 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.3 2005/01/30 18:21:09 ribosome Exp $
+
+  30 Jan 2005; Olivier Fisette <ribosome@gentoo.org> treeviewx-0.4.ebuild:
+  Ebuild cleanup.
 
 *treeviewx-0.4 (23 Dec 2004)
 
diff --git a/sci-biology/treeviewx/treeviewx-0.4.ebuild b/sci-biology/treeviewx/treeviewx-0.4.ebuild
index 4731c52a315d..fa113cc6130d 100644
--- a/sci-biology/treeviewx/treeviewx-0.4.ebuild
+++ b/sci-biology/treeviewx/treeviewx-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/treeviewx-0.4.ebuild,v 1.1 2004/12/23 18:11:05 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/treeviewx-0.4.ebuild,v 1.2 2005/01/30 18:21:09 ribosome Exp $
 
 DESCRIPTION="A phylogenetic tree viewer"
 HOMEPAGE="http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/"
@@ -29,13 +29,13 @@ src_compile() {
 	econf || die
 	# The configure script may pick the Unicode wxGTK.
 	if grep -q "gtk2u" Makefile; then
-		sed -i -e 's/gtk2u/gtk2/' Makefile
+		sed -i -e 's/gtk2u/gtk2/' Makefile || die
 		cd TreeLib
-		sed -i -e 's/gtk2u/gtk2/' Makefile
+		sed -i -e 's/gtk2u/gtk2/' Makefile || die
 		cd ../ncl-2.0
-		sed -i -e 's/gtk2u/gtk2/' Makefile
+		sed -i -e 's/gtk2u/gtk2/' Makefile || die
 		cd src
-		sed -i -e 's/gtk2u/gtk2/' Makefile
+		sed -i -e 's/gtk2u/gtk2/' Makefile || die
 	fi
 	cd ${S}
 	emake || die
diff --git a/sci-biology/vienna-rna/ChangeLog b/sci-biology/vienna-rna/ChangeLog
index 881a324cf7ac..82cd35e907d0 100644
--- a/sci-biology/vienna-rna/ChangeLog
+++ b/sci-biology/vienna-rna/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-biology/vienna-rna
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/ChangeLog,v 1.4 2005/01/09 18:48:37 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/ChangeLog,v 1.5 2005/01/30 18:21:09 ribosome Exp $
+
+  30 Jan 2005; Olivier Fisette <ribosome@gentoo.org> vienna-rna-1.4.ebuild:
+  Ebuild cleanup.
 
 *vienna-rna-1.5_beta (09 Jan 2005)
 
diff --git a/sci-biology/vienna-rna/vienna-rna-1.4.ebuild b/sci-biology/vienna-rna/vienna-rna-1.4.ebuild
index fd01ab896cd9..fd15d62688d2 100644
--- a/sci-biology/vienna-rna/vienna-rna-1.4.ebuild
+++ b/sci-biology/vienna-rna/vienna-rna-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-1.4.ebuild,v 1.2 2005/01/09 18:48:37 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-1.4.ebuild,v 1.3 2005/01/30 18:21:09 ribosome Exp $
 
 inherit flag-o-matic
 
@@ -19,11 +19,11 @@ DEPEND="perl? ( dev-lang/perl )
 S="${WORKDIR}/ViennaRNA-${PV}"
 
 src_compile() {
-	sed -ie 's:/usr/local/bin/perl:/usr/bin/perl:' Perl/RNAfold.pl
-	sed -ie 's:/usr/local/bin/perl:/usr/bin/perl:' Utils/ct2b.pl
-	sed -ie 's:/usr/local/bin/perl:/usr/bin/perl:' Utils/b2mt.pl
-	sed -ie 's:/usr/local/bin/perl:/usr/bin/perl:' Utils/dpzoom.pl
-	sed -ie 's:/usr/local/bin/perl:/usr/bin/perl:' Utils/mountain.pl
+	sed -i -e 's:/usr/local/bin/perl:/usr/bin/perl:' Perl/RNAfold.pl || die
+	sed -i -e 's:/usr/local/bin/perl:/usr/bin/perl:' Utils/ct2b.pl || die
+	sed -i -e 's:/usr/local/bin/perl:/usr/bin/perl:' Utils/b2mt.pl || die
+	sed -i -e 's:/usr/local/bin/perl:/usr/bin/perl:' Utils/dpzoom.pl || die
+	sed -i -e 's:/usr/local/bin/perl:/usr/bin/perl:' Utils/mountain.pl || die
 	append-flags -I../H
 	make -e library programs gammel subopt || die
 	use perl && make -e perl || die