Fixed test, #318641; multilib, LDFLAGS, PREFIX awareness

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 79 insertions, 2 deletions

diff --git a/sci-biology/trnascan-se/ChangeLog b/sci-biology/trnascan-se/ChangeLog
index dabe53f87bf2..6b1c6bb13f18 100644
--- a/sci-biology/trnascan-se/ChangeLog
+++ b/sci-biology/trnascan-se/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/trnascan-se
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/trnascan-se/ChangeLog,v 1.10 2009/08/05 18:45:47 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/trnascan-se/ChangeLog,v 1.11 2010/06/25 09:40:04 jlec Exp $
+
+*trnascan-se-1.23-r2 (25 Jun 2010)
+
+  25 Jun 2010; Justin Lecher <jlec@gentoo.org> +trnascan-se-1.23-r2.ebuild,
+  +files/trnascan-se-1.23-ldflags.patch:
+  Fixed test, #318641; multilib, LDFLAGS, PREFIX awareness
 
   05 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   trnascan-se-1.23-r1.ebuild, +files/trnascan-se-1.23-glibc-2.10.patch:
diff --git a/sci-biology/trnascan-se/files/trnascan-se-1.23-ldflags.patch b/sci-biology/trnascan-se/files/trnascan-se-1.23-ldflags.patch
new file mode 100644
index 000000000000..783e4340823d
--- /dev/null
+++ b/sci-biology/trnascan-se/files/trnascan-se-1.23-ldflags.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 53e5c5b..a2d3feb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -109,17 +109,17 @@ MPOBJ = mpviterbi.o mp-dbviterbi.o
+ all: 	$(PROGS) tRNAscanSE setpaths
+ 
+ covels-SE:  $(OBJ) scan_main.o
+-	$(CC) $(CFLAGS) $(RFLAGS) -o covels-SE scan_main.o $(OBJ) $(LIBS)
++	$(CC) $(CFLAGS) $(RFLAGS) $(LDFLAGS) -o covels-SE scan_main.o $(OBJ) $(LIBS)
+ 
+ coves-SE: $(OBJ) score_main.o
+-	$(CC) $(CFLAGS) $(RFLAGS) -o coves-SE score_main.o $(OBJ) $(LIBS)
++	$(CC) $(CFLAGS) $(RFLAGS) $(LDFLAGS) -o coves-SE score_main.o $(OBJ) $(LIBS)
+ 
+ eufindtRNA: $(SQUIDOBJ) pavesi.o eufind_main.o
+-	$(CC) $(CFLAGS)  -o eufindtRNA eufind_main.o \
++	$(CC) $(CFLAGS)  $(LDFLAGS) -o eufindtRNA eufind_main.o \
+ 	pavesi.o $(SQUIDOBJ) $(LIBS)
+ 
+ trnascan-1.4: trnascan.o
+-	$(CC) $(CFLAGS) -DTSCANDIR=\"$(LIBDIR)\" -o trnascan-1.4 trnascan.c
++	$(CC) $(CFLAGS) -DTSCANDIR=\"$(LIBDIR)\" $(LDFLAGS) -o trnascan-1.4 trnascan.c
+ 
+ tRNAscanSE:
+ 	$(PERLDIR)/$(PERLBIN) checkversion.pl
diff --git a/sci-biology/trnascan-se/trnascan-se-1.23-r2.ebuild b/sci-biology/trnascan-se/trnascan-se-1.23-r2.ebuild
new file mode 100644
index 000000000000..e4d182fcc95f
--- /dev/null
+++ b/sci-biology/trnascan-se/trnascan-se-1.23-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 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-r2.ebuild,v 1.1 2010/06/25 09:40:04 jlec Exp $
+
+EAPI="3"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="tRNA detection in large-scale genome sequences"
+HOMEPAGE="http://lowelab.ucsc.edu/tRNAscan-SE/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	sed -e "s%BINDIR  = \$(HOME)/bin%BINDIR = ${EPREFIX}/usr/bin%" \
+		-e "s%LIBDIR  = \$(HOME)/lib/tRNAscan-SE%LIBDIR = ${EPRFIX}/usr/$(get_libdir)/${PN}%" \
+		-e "s%MANDIR  = \$(HOME)/man%MANDIR = ${EPREFIX}/usr/share/man%" \
+		-e "s%CC = gcc%CC = $(tc-getCC)%" \
+		-e "s%CFLAGS = -O%CFLAGS = ${CFLAGS}%" \
+		-i Makefile || die
+}
+
+src_install() {
+	mv tRNAscan-SE.man tRNAscan-SE.man.1 || die
+	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/$(get_libdir)/${PN}/
+	doins *.cm gcode.* Dsignal TPCsignal || die
+	insinto /usr/share/doc/${PF}
+	doins Manual.ps || die
+}
+
+src_test() {
+	make PATH="${S}:${PATH}" testrun || die
+}