Fix implicits, add missing explicit RDEPEND, respect LDFLAGS wrt #359045. Thanks to Diego for the report.

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

3 files changed, 72 insertions, 2 deletions

diff --git a/sci-biology/ariadne/ChangeLog b/sci-biology/ariadne/ChangeLog
index 3650569c84e3..2714a97cfc27 100644
--- a/sci-biology/ariadne/ChangeLog
+++ b/sci-biology/ariadne/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/ariadne
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ariadne/ChangeLog,v 1.9 2008/09/30 20:20:33 darkside Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ariadne/ChangeLog,v 1.10 2011/03/15 18:39:51 xarthisius Exp $
+
+*ariadne-1.3-r2 (15 Mar 2011)
+
+  15 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> +ariadne-1.3-r2.ebuild,
+  +files/ariadne-1.3-implicits.patch:
+  Fix implicits, add missing explicit RDEPEND, respect LDFLAGS wrt #359045.
+  Thanks to Diego for the report.
 
   30 Sep 2008; Jeremy Olexa <darkside@gentoo.org> ariadne-1.3-r1.ebuild:
   add ~amd64 kw based on Chad's testing. bug #239159
diff --git a/sci-biology/ariadne/ariadne-1.3-r2.ebuild b/sci-biology/ariadne/ariadne-1.3-r2.ebuild
new file mode 100644
index 000000000000..10cc37a322a9
--- /dev/null
+++ b/sci-biology/ariadne/ariadne-1.3-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ariadne/ariadne-1.3-r2.ebuild,v 1.1 2011/03/15 18:39:51 xarthisius Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Protein sequences and profiles comparison"
+LICENSE="as-is"
+HOMEPAGE="http://www.well.ox.ac.uk/ariadne/"
+SRC_URI="http://www.well.ox.ac.uk/${PN}/${P}.tar.Z"
+
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=sci-biology/ncbi-tools-20041020-r1"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/SRC-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc4.patch \
+		"${FILESDIR}"/${P}-implicits.patch
+	sed -i -e "s/\$(CFLAGS)/\$(LDFLAGS) &/" Makefile || die #359045
+	sed -e "s/blosum62/BLOSUM62/" -i prospero.c || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" OPTIMISE="${CFLAGS}" || die
+}
+
+src_install() {
+	dobin Linux/{ariadne,prospero} || die
+	dolib Linux/libseq.a || die
+	insinto /usr/include/${PN}
+	doins Include/*.h || die
+	dodoc README || die
+}
diff --git a/sci-biology/ariadne/files/ariadne-1.3-implicits.patch b/sci-biology/ariadne/files/ariadne-1.3-implicits.patch
new file mode 100644
index 000000000000..31c442b12265
--- /dev/null
+++ b/sci-biology/ariadne/files/ariadne-1.3-implicits.patch
@@ -0,0 +1,23 @@
+topalign.c:96:5: warning: implicit declaration of function ‘toupper’
+prospero.c:63:3: warning: implicit declaration of function ‘strcpy’
+
+--- SRC-1.3/prospero.c
++++ SRC-1.3/prospero.c
+@@ -26,6 +26,7 @@
+ */
+ 
+ #include<stdio.h>
++#include<string.h>
+ #include<math.h>
+ #include"cl.h"
+ #include"seq_util.h"
+--- SRC-1.3/topalign.c
++++ SRC-1.3/topalign.c
+@@ -26,6 +26,7 @@
+ */
+ 
+ #include<stdio.h>
++#include<ctype.h>
+ #include<math.h>
+ #include"seq_util.h"
+ #include"ariadne.h"