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

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 30 insertions, 25 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/Manifest b/sci-biology/ariadne/Manifest
index fb100d3912c8..19c38eb854c4 100644
--- a/sci-biology/ariadne/Manifest
+++ b/sci-biology/ariadne/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX ariadne-1.3-gcc4.patch 279 RMD160 c36395250c0791d9db6f6b05eb7fee976a3bb553 SHA1 3e383d49b7bbac276a4821e235cc79d396e06b1c SHA256 4d5d273beb35d28d8d15311c98f928c77ccb4ca78d537cecae8563cddb7d9fcd
 AUX ariadne-1.3-implicits.patch 480 RMD160 890d9eabf35ae43d3b7c8839ea6907e1ac213c9d SHA1 47e6d21cc9ff02a3ea56291f9f7b72457d381382 SHA256 994186ec3843ab228e00f3c30c96e5830dfe76da91a7ef59d58f75e6ec2536da
 DIST ariadne-1.3.tar.Z 69427 RMD160 084b40d38346f2cd5e99a9c49aeee303fe591805 SHA1 ff1886c0d7ac547cdece5cde50b531e878918afd SHA256 8b6b0acb6e8d02b1303d94b20906bf2bf1dee3de4eceeb1b927cfba7a96fd00d
-EBUILD ariadne-1.3-r1.ebuild 943 RMD160 584ca14ef7c69a21ae50b3ac9a15e5b76be61d0e SHA1 81b6288c98d645ed585a34eabe8fdf22fdfb8aa9 SHA256 03ab5da46a85402d9de1b0c0e916c000bc3be681dae2aedc348ed9291c4cee5b
-EBUILD ariadne-1.3-r2.ebuild 1017 RMD160 5b1fe7a6d96e975b589cb5d06114c22d190108e5 SHA1 a7d5431f6b732c856bc2c37a2d6eb6da678fb9ab SHA256 cdfc0426d61c63ef4285ee6e201869e387a59beee515787b65a80ab8355a407b
-MISC ChangeLog 1741 RMD160 c8fc6f7eecc36a32361a85a3c3f95d5e9c566512 SHA1 43f222fb0e22845c12021d0d4658868e895db902 SHA256 67c71db4402f48b0463b49b3940bf317d5c66cf2227c59f238aba4d4b97edade
+EBUILD ariadne-1.3-r1.ebuild 962 RMD160 696d87711b1c228f74d0f3fa1237ab24228bcaad SHA1 806ad8de44332df3790eba18ee90994815c1a523 SHA256 4c64f4bff851b86e4064cd9637fe92a892127b05f6b58c30919656e5c0ce44ae
+EBUILD ariadne-1.3-r2.ebuild 1022 RMD160 8dfb931b8c1a936e9cc1c4b7297f21104d866c6c SHA1 e18026a3c41800e5972622476fb877374dd23f73 SHA256 de92ded859a01c509fc3da3412d445cfd7e881810961b84d8491c92ba87eb0aa
+MISC ChangeLog 1877 RMD160 9e6d6467931ddfb1493b3893ea64d0ea900c1513 SHA1 02862f439bbeb6b68a04dc57a5aa9e894cf62b77 SHA256 6fcf1070201f77cc15c41a4481aeb431c9e8ebd7b98fec3e3e0930ff6ed3ed70
 MISC metadata.xml 858 RMD160 70c593695266c020ed15c8fa22e28e977543d30a SHA1 bb899131813b051b33caab2269ab1e432b196d12 SHA256 5b9caa5d4bcdaf27c0e6053805351e6e4450da667d352a629befbb8f50c325ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iJwEAQECAAYFAk1/soEACgkQIiMqcbOVdxQC5gQAj1G9Mth930HKPam4p3X8rJgh
-xiDlHySyQs6TyMNJkv79UV9El8mOi7ctDumlmZBaNhYP0lnrNJdVWBs+fqXmalFB
-Ux+ALeqAvfV0KMLQ4STaQ/MtZ2KSpGk97BEXIkXXHPCNXp0ibgsA9kper4ogaWuu
-KVAw5NGPL2LCgosoAH8=
-=NdBx
+iEYEAREKAAYFAk/aNQQACgkQgAnW8HDreRZr2gCeOSti+4FkBkBZWRtKRhQVOiXl
+KIsAoKxti9f+4f4JbgAx6HyO4rQitiHi
+=auta
 -----END PGP SIGNATURE-----
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