Fix parallel build wrt bug 311919. Thanks to Myckel Habets <m.e.j.habets@biology.leidenuniv.nl> for patch and report. Fix buffer overflow wrt bug 338179 and respect LDFLAGS wrt bug 338177. Thanks to Diego Elio Pettenò for the reports. Drop old.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

5 files changed, 87 insertions, 7 deletions

diff --git a/sci-biology/infernal/ChangeLog b/sci-biology/infernal/ChangeLog
index a76b543f0c6d..082d50dec5e4 100644
--- a/sci-biology/infernal/ChangeLog
+++ b/sci-biology/infernal/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-biology/infernal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/infernal/ChangeLog,v 1.7 2010/04/05 12:14:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/infernal/ChangeLog,v 1.8 2010/11/04 10:06:22 xarthisius Exp $
+
+*infernal-1.0.2-r1 (04 Nov 2010)
+
+  04 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> -infernal-1.0.ebuild,
+  +infernal-1.0.2-r1.ebuild, +files/infernal-1.0.2-ldflags.patch,
+  +files/infernal-1.0.2-overflows.patch,
+  +files/infernal-1.0.2-parallel-build.patch:
+  Fix parallel build wrt bug 311919. Thanks to Myckel Habets
+  <m.e.j.habets@biology.leidenuniv.nl> for patch and report. Fix buffer
+  overflow wrt bug 338179 and respect LDFLAGS wrt bug 338177. Thanks to
+  Diego Elio Pettenò for the reports. Drop old.
 
   05 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   infernal-1.0.2.ebuild:
diff --git a/sci-biology/infernal/files/infernal-1.0.2-ldflags.patch b/sci-biology/infernal/files/infernal-1.0.2-ldflags.patch
new file mode 100644
index 000000000000..5bc5bd008ff6
--- /dev/null
+++ b/sci-biology/infernal/files/infernal-1.0.2-ldflags.patch
@@ -0,0 +1,15 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=338177
+
+--- src/Makefile.in
++++ src/Makefile.in
+@@ -86,7 +86,7 @@
+ all: 	$(PROGS) 
+ 
+ $(PROGS): @EXEC_DEPENDENCY@ $(OBJS) ${HDRS}
+-	$(CC) $(CFLAGS) $(DEFS) $(MYLIBDIR) -o $@ $@.o $(OBJS) $(MYLIBS) $(LIBS) $(MPILIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) $(MYLIBDIR) -o $@ $@.o $(OBJS) $(MYLIBS) $(LIBS) $(MPILIBS)
+ 
+ 
+ #################################################################
diff --git a/sci-biology/infernal/files/infernal-1.0.2-overflows.patch b/sci-biology/infernal/files/infernal-1.0.2-overflows.patch
new file mode 100644
index 000000000000..b9791fa1ca2e
--- /dev/null
+++ b/sci-biology/infernal/files/infernal-1.0.2-overflows.patch
@@ -0,0 +1,15 @@
+Fix buffer overflow
+
+http://bugs.gentoo.org/show_bug.cgi?id=338179
+
+--- easel/esl_getopts.c
++++ easel/esl_getopts.c
+@@ -1270,7 +1270,7 @@
+ 		   "Arg looks like option? Use %.24s%.24s if you really mean it.",
+ 		   g->opt[opti].name, *ret_optarg);
+       } else 
+-	ESL_FAIL(eslESYNTAX, "Option %.24s requires an argument", g->opt[opti].name);
++	ESL_FAIL(eslESYNTAX, g->errbuf, "Option %.24s requires an argument", g->opt[opti].name);
+ 
+       g->optstring = NULL;   /* An optchar that takes an arg must terminate an optstring. */
+     }
diff --git a/sci-biology/infernal/files/infernal-1.0.2-parallel-build.patch b/sci-biology/infernal/files/infernal-1.0.2-parallel-build.patch
new file mode 100644
index 000000000000..004742546f00
--- /dev/null
+++ b/sci-biology/infernal/files/infernal-1.0.2-parallel-build.patch
@@ -0,0 +1,31 @@
+Fix parallel build 
+
+http://bugs.gentoo.org/show_bug.cgi?id=311919
+
+--- Makefile.in
++++ Makefile.in
+@@ -82,9 +82,10 @@
+ all: core 
+ 
+ core:
+-	(cd easel;     make CC="$(CC)" CFLAGS="$(CFLAGS)"; make)
+-	(cd src;       make CC="$(CC)" CFLAGS="$(CFLAGS)"; make module)
+-	(cd testsuite; make CC="$(CC)" CFLAGS="$(CFLAGS)")
++	$(MAKE) -C easel
++	$(MAKE) -C src 
++	$(MAKE) -C src module
++	$(MAKE) -C testsuite
+ 
+ #.PHONY: $(RIGFILTERS)
+ #$(RIGFILTERS): core
+--- easel/Makefile.in
++++ easel/Makefile.in
+@@ -132,7 +132,7 @@
+ 	esl_wuss.o
+ 
+ all: libeasel.a
+-	(cd miniapps; make)
++	$(MAKE) -C miniapps
+ 
+ .c.o: 
+ 	${CC} -I. ${CFLAGS} ${SIMDFLAGS} ${DEFS} -c $<		
diff --git a/sci-biology/infernal/infernal-1.0.ebuild b/sci-biology/infernal/infernal-1.0.2-r1.ebuild
index e7eaf8ff5d83..0930bfea766c 100644
--- a/sci-biology/infernal/infernal-1.0.ebuild
+++ b/sci-biology/infernal/infernal-1.0.2-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/infernal/infernal-1.0.ebuild,v 1.4 2009/09/22 13:05:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/infernal/infernal-1.0.2-r1.ebuild,v 1.1 2010/11/04 10:06:22 xarthisius Exp $
 
 EAPI="2"
 
+inherit eutils
+
 DESCRIPTION="Inference of RNA alignments"
 HOMEPAGE="http://infernal.janelia.org/"
 SRC_URI="ftp://selab.janelia.org/pub/software/${PN}/${P}.tar.gz"
@@ -11,20 +13,26 @@ SRC_URI="ftp://selab.janelia.org/pub/software/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="mpi"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-parallel-build.patch \
+		"${FILESDIR}"/${P}-overflows.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+}
+
 src_configure() {
 	econf --prefix="${D}/usr" \
-		$(use_enable mpi) || die
+		$(use_enable mpi)
 }
 
 src_install() {
 	emake install || die
 	(cd documentation/manpages; for i in *; do newman ${i} ${i/.man/.1}; done)
 	insinto /usr/share/${PN}
-	doins -r benchmarks tutorial intro matrices
-	dodoc 00README* Userguide.pdf documentation/release-notes/*
+	doins -r benchmarks tutorial intro matrices || die
+	dodoc 00README* Userguide.pdf documentation/release-notes/* || die
 }