sci-biology/ariadne: Correct deps, bump EAPI, handle static-libs

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

3 files changed, 21 insertions, 15 deletions

diff --git a/sci-biology/ariadne/ChangeLog b/sci-biology/ariadne/ChangeLog
index 2714a97cfc27..cb3562616e26 100644
--- a/sci-biology/ariadne/ChangeLog
+++ b/sci-biology/ariadne/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/ariadne
-# 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 $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ariadne/ChangeLog,v 1.11 2012/06/14 19:01:19 jlec Exp $
+
+  14 Jun 2012; Justin Lecher <jlec@gentoo.org> ariadne-1.3-r1.ebuild,
+  ariadne-1.3-r2.ebuild:
+  Correct deps, bump EAPI, handle static-libs
 
 *ariadne-1.3-r2 (15 Mar 2011)
 
diff --git a/sci-biology/ariadne/ariadne-1.3-r1.ebuild b/sci-biology/ariadne/ariadne-1.3-r1.ebuild
index c2be3549ad7c..3291b7ef6287 100644
--- a/sci-biology/ariadne/ariadne-1.3-r1.ebuild
+++ b/sci-biology/ariadne/ariadne-1.3-r1.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ariadne/ariadne-1.3-r1.ebuild,v 1.7 2008/09/30 20:20:33 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ariadne/ariadne-1.3-r1.ebuild,v 1.8 2012/06/14 19:01:19 jlec Exp $
 
 inherit toolchain-funcs eutils
 
 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"
+LICENSE="as-is"
 IUSE=""
 KEYWORDS="~amd64 x86"
 
-DEPEND=">=sci-biology/ncbi-tools-20041020-r1"
+DEPEND=">=sci-biology/ncbi-tools-0.20041020-r1"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/SRC-${PV}"
 
diff --git a/sci-biology/ariadne/ariadne-1.3-r2.ebuild b/sci-biology/ariadne/ariadne-1.3-r2.ebuild
index 10cc37a322a9..8f098b521da0 100644
--- a/sci-biology/ariadne/ariadne-1.3-r2.ebuild
+++ b/sci-biology/ariadne/ariadne-1.3-r2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ariadne/ariadne-1.3-r2.ebuild,v 1.2 2012/06/14 19:01:19 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 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=""
+LICENSE="as-is"
+IUSE="static-libs"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=sci-biology/ncbi-tools-20041020-r1"
+DEPEND=">=sci-biology/ncbi-tools-0.20041020-r1"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/SRC-${PV}
@@ -28,12 +28,12 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" OPTIMISE="${CFLAGS}" || die
+	emake CC="$(tc-getCC)" OPTIMISE="${CFLAGS}"
 }
 
 src_install() {
-	dobin Linux/{ariadne,prospero} || die
-	dolib Linux/libseq.a || die
+	dobin Linux/{ariadne,prospero}
+	use static-libs && dolib.a Linux/libseq.a
 	insinto /usr/include/${PN}
 	doins Include/*.h || die
 	dodoc README || die