Bump to EAPI=5

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 59 insertions, 50 deletions

diff --git a/sci-biology/wise/ChangeLog b/sci-biology/wise/ChangeLog
index 3415a34a9413..ee92a04407e0 100644
--- a/sci-biology/wise/ChangeLog
+++ b/sci-biology/wise/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/wise
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/ChangeLog,v 1.16 2010/10/02 15:08:42 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/ChangeLog,v 1.17 2015/03/29 13:39:24 jlec Exp $
+
+  29 Mar 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
+  wise-2.4.0_alpha.ebuild:
+  Bump to EAPI=5
 
   02 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org> wise-2.2.0.ebuild,
   wise-2.4.0_alpha.ebuild:
@@ -65,4 +69,3 @@
   06 Mar 2005; Olivier Fisette <ribosome@gentoo.org> +metadata.xml,
   +files/wise-api.tex.patch, +files/wise-env, +wise-2.2.0.ebuild:
   Initial import.
-
diff --git a/sci-biology/wise/Manifest b/sci-biology/wise/Manifest
index 44d164e127d9..f71df4823348 100644
--- a/sci-biology/wise/Manifest
+++ b/sci-biology/wise/Manifest
@@ -1,31 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX wise-2.2.0-glibc-2.10.patch 7044 RMD160 bf7e9b784fee83bca6f532550a44911f65b83a44 SHA1 7b70e9734b18259c78e8ea4bb0362c4072a8afa5 SHA256 92086174f059ab9732cf502acd9619fc5c9e1c34c5018b6c493d5203ec629503
-AUX wise-2.4.0_alpha-cflags.patch 27241 RMD160 78ba87656ebb7206dd9e386c782ddbfdf971ae12 SHA1 2ba82038aba35e222e48e8ffe1bda444fdb5ffa8 SHA256 281c95e7f37f217a9bd730ba4d80640a6085dc134fb3dcd837f217b36f5b5b87
-AUX wise-2.4.0_alpha-glibc-2.10.patch 8068 RMD160 740e3f2ce7041be4c69520775620e08dc816efc6 SHA1 1a17a7e827418f6b3833c56056eaa63d3addb4f2 SHA256 caaacdde33b1f0b12aa0854fa27e3b2c4d6bab099dbc627e18057609763ce265
-AUX wise-api.tex.patch 2234 RMD160 c1780513680ad00562ba7589bd44ffa86ee996f4 SHA1 16c2b37efc603003448d37de2b67986b86020777 SHA256 31042f660669ea9df9bc608006cd40479e004f5cbb9aed055d3ec58a853c145d
-AUX wise-env 40 RMD160 2ac8408df8a36f789c28d8d55cf892dba78359c5 SHA1 76bce2a14ae2c2afa82e2c537383d4e730dfcb07 SHA256 de6f742147c43b3820ea261fd158647ae1d2d9e8fe562e0b5c4c0d7e878ced36
-DIST wise2.2.0.tar.gz 2108151 RMD160 a4292fbfb405d19b628fe5c829d746297e740862 SHA1 77cc08e9cda9416641370c9b45191192fc7cacd3 SHA256 192db34ffa76ef14a9804cc5a7ab72554498284c841f940f8951b4bfae96d780
-DIST wise2.4.0alpha.tar.gz 3296399 RMD160 e4c56b965c83d961716c3870f57e4368757dd976 SHA1 97ee5997d2ffb7d1d9eec9d7d8ff7b68ce10a305 SHA256 6ec8be1ea6f0559d8a2659fe9c0626408fa2b3e327cae345d0e48bb971531853
-EBUILD wise-2.2.0.ebuild 2057 RMD160 ef2a4dfe87f8b8c2c3d4697d3423e1b011937804 SHA1 2f35dc36982b553368014ddd6d3f580ea3232193 SHA256 04fde7ed22aa32ece4421616fa532a4616b954d5d822560b82a0160a5f34f10d
-EBUILD wise-2.4.0_alpha.ebuild 1978 RMD160 7338bf6d77e3998d459d016e25676c67386ab6af SHA1 b81434cb9c4e0483ed31beab745c8533e2dd2a62 SHA256 cae6d2e74720bd3f4e20eb0e1eddfd1e7638193bd87d4a9f71135cbb8477d5b0
-MISC ChangeLog 2449 RMD160 73e9cb8ef3227e00775bcd8e72ffe87b6362dc88 SHA1 c656dfa14808dbb757dbf5339a6bb48f923bba92 SHA256 a9eb5b00b3531057961f51fbd7012aa8fdc74297811552a13c7bfd2d18d52fc1
-MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
+AUX wise-2.2.0-glibc-2.10.patch 7044 SHA256 92086174f059ab9732cf502acd9619fc5c9e1c34c5018b6c493d5203ec629503 SHA512 9e9ce8a5954b5cceee6bfff8af49d9d085e5bd5b922033bd2bf539d27bcdee6dd531a7fb5a17bf317decc6f870eb95184974cc0b724cf5531a2fb52306ac8357 WHIRLPOOL ed56101ecc68ea776359f1fa578a98ca2b4d60046e4e6d8482be17075eb8ec9d77408e223a2dd4f63773053f24f60787d8a9285f21213441405b6beba57ccfe7
+AUX wise-2.4.0_alpha-cflags.patch 27241 SHA256 281c95e7f37f217a9bd730ba4d80640a6085dc134fb3dcd837f217b36f5b5b87 SHA512 2f4faaff8198c63fb22edde934584fa2d00d2a333c5caefbbbc569e6136546aa274060453f093e0791a4d61bc901e1f199c47bb60d1be9f0ac32b3709cb025ab WHIRLPOOL 2b48020dde9e0f19a3ff32f2db6d0d08ea5626e0f11eb8560c23160ae716fa55ac3a2946bcfb6e90c018db98df7ee38eb66f44acef6828d29f67d00fbd9f58d6
+AUX wise-2.4.0_alpha-glibc-2.10.patch 8068 SHA256 caaacdde33b1f0b12aa0854fa27e3b2c4d6bab099dbc627e18057609763ce265 SHA512 eba50ed8e12ca94d026fed95602ec1d1683ea26f0195952304a1caebdb94df700b547168a6da4a9ad4289dd9c6060572b4ed9dcfcc7698dff2812765adc556e1 WHIRLPOOL 38228826603523ab1d5d31b02e57016e128788d3767820f6a2efb79234f01e6ffec63480430c5ec7cf21ea24351aece8ad0303ea7ec0aacfa4868989bb4a82dd
+AUX wise-api.tex.patch 2234 SHA256 31042f660669ea9df9bc608006cd40479e004f5cbb9aed055d3ec58a853c145d SHA512 1cb7b5f5377d4d235707d32d74087598db5abc793b2aba8272a7da941a25d5618691212240eb25c078df39868ea7adfacfba3d218bd77fcea5d57b3b2ef51a0b WHIRLPOOL 523d0b0fa7c97669ca1e4e2229bb432ebe1002d7d0249064217591b0c542d4fc6171e5e924bd650c71d46e02d4c180b2763d1b1f1d87b077a55cbf1e53e3c6ac
+AUX wise-env 40 SHA256 de6f742147c43b3820ea261fd158647ae1d2d9e8fe562e0b5c4c0d7e878ced36 SHA512 58cfa40d4d3b2623df82bb321f8dd2f5ebbee099ccfd4ac0e3eb9edf5693dbaee0581f8986b4923c60060d92c028e731f15c047e18f86efb76adaf4ec386e96c WHIRLPOOL 62228e902a0b962ad13514b76a2fe52eb3d6626c7536d63c3425c1e11abed08f4c9e971b7d30b78950e3ba0fbf5e020cd6286148419692f5c6d93876e0e6a8eb
+DIST wise2.2.0.tar.gz 2108151 SHA256 192db34ffa76ef14a9804cc5a7ab72554498284c841f940f8951b4bfae96d780
+DIST wise2.4.0alpha.tar.gz 3296399 SHA256 6ec8be1ea6f0559d8a2659fe9c0626408fa2b3e327cae345d0e48bb971531853 SHA512 a2288d7304e7768328689514a986aeff62a0ca6538ee61177a434fb08065f83ab5db39e0cb9101dd8ae9a91f7d95d05528d7ad23df0c394587717c584bf2341c WHIRLPOOL cb6b34dc7d6b758d83a97af491e803230f8dfbd0d0600600fc4c2513b9450d7b6da988d5d584bf9db6193f938df59899e49f2a4e26d5f29c5e089a741d00f6ec
+EBUILD wise-2.2.0.ebuild 2057 SHA256 04fde7ed22aa32ece4421616fa532a4616b954d5d822560b82a0160a5f34f10d SHA512 c618a179cf4de50acdb38d32b22ef79c2d3d377c4839d862865da15adfd09028448550a1bab5d9e11e125ed28aa0e809782971d42ca922ed4927e0a7f763b9c4 WHIRLPOOL 6e198616ce821feed1fb790285451ce6073b4c28838d76d3d0a44f60aa8766cf699a2fe15c0fc8405ea02e0990090622e300eb21316632effdb890c11bfb20d7
+EBUILD wise-2.4.0_alpha.ebuild 1762 SHA256 6b21643dcaa04e6a643bcfeaabf1586b9309f51463e36b83812b4ad4da398796 SHA512 e56f6d297a1018638d176c4adfb6f85c8ef54ee651fad062a9e3d64bb7188ab53daad774e149d3221c0bae6b11dbd7810d02c2bbeb5f4838516ff57c42c52e9b WHIRLPOOL 92158469e432ff52e498999352578d76cb10b215904accf1ae6f5ed307d5c16fe9b91b3c937e7202ddfd9c9d4d2d1ca8d828392ea409985add5feffd5252495c
+MISC ChangeLog 2549 SHA256 41ea2c63ff32327d418b9a244957ca494af40b13f2c54f1281d5566eefac8037 SHA512 16d468b818a31a6859f427176b6497c1d334c86a41fccf17b8179ac218ed4d9c96cc58f6c01699cde3c3c5bbef83911f2cbff1ab1fcc3f8d8d7a67e20f912316 WHIRLPOOL fdf1cbe98cc63f481affa04250f7ab1956a5ee20fa739fe3089857fb967a783d9598805d44a8e3491d69d5340f7dca62d7db5ba3609e687e5dac3daba7a80777
+MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBAgAGBQJMp0rWAAoJENwGBM22xffeBDQP/2RkIUNpTPVWJmhKk+JCwvWe
-dPMW7D7C/2uN0ZExKsYYR1CyASbh5OBoC6jO1Ry46mMmHM37m1trk+52po0af+hP
-tabjO3jDd4dgQLl2KnDsf5KWEHpXbZkD3V1QZwFnOg9kF/hF7pU8vtnIc/116YpK
-D9WBOvWHfShqzOPOMq9XwvpNRPgQiEO1IFv+wpi6qDGStX/SUoJfk6QQF9YLoHeC
-W8IBMYbpdl5YrEiH0gdEn3lLBpL9+fgD6fQVAJldObsn2Kc2ySAhOcD34EwYYhBr
-ODTdL1JbTfyi45TU6NOaEhX+NaYJnzY/nBdR3bDmmMZXHRyj5ILhK3zFxf08qF/5
-neL/7FqJH/57qLk1BlT0z5pByw2QC2grtvD8jxsk7LkEKnUO1p5hHs408tvh9bbW
-lHg5fnEvPyod7mve2bYRUCaXCizm1pEMCZwANvdpuzq/44b/jRvLdkye4Hr9wbIu
-fo4K1aFg6O2yKx2mHszasTducRiLv5aSGT6ApSngKCRpoFBlS+T2y000un4+Refy
-/BX3s4PadvSKpg1SQiwaZ2ub36SkXgcHBC/ddbnYcQvMNcgMxztQNrgRV04CreJy
-lK7NhRSMtTNyMxA5KXoj1qowoA7s30XEK2O+Ogpeg+uNCit3Ys03FKjzpiUp0JzQ
-th8vRWjwADzVtn520cc0
-=5Dc/
+iQJ8BAEBCgBmBQJVGACQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirOm0P/AwBg7iuCk5B3FyUhs/P3kMQ
+dW09Z/41JvLc4sqhroq8307BEkJ8AvCzIQYif2vy93NCR6APN5og4HCVSlChIngA
+HA6Z/RR4G0IzzWEqzdhl2PQRfEHW/jhL3+P133xNGAoskJk1Dk7DOgdg+yKrfps9
+z27mGl0QWb8mEhVGOR87Ee7iDmHpw2UZoy10JUaRYVmmfpHps7sfkQeda5/jUY9+
+RTDh8Vxw3zuo8rUD5KEkjCp/KZzadzZ1baQCRIqN+pw7C7CTuc/oIXpd9m0lZhtD
+rvE4vwVlflH1E8ttlmXUYRc1uf6hGQ9Wdslu6zaY52ELK8HvjpBn4xmE6tTvxmfe
+sRN/CeF7qjgMWkoXEQgSrGEE4MGzGaalS4LR8bbJbolDiYja/AN+5FqCrrllOhCH
+dBJ6pbiKDyZMj8EAThrxFOlNFcVvsWSez3VCJrFn2OzffFzUMgMuqBTLtIBQVVzU
+Ir1vA4NsdXhFgreC+YSMJYi8rDMyZvm0Y8XiiwKCX+CH1OGOyk+K4OA1/4x9FQJu
+OimyhjpQ+mR629Ex4xCR0mgxrETTjx7GtkNcLbkm9WQEK0W9nSDKX/N7/DLJUTMI
+DtV8g2rkJg8vON9tuMc7pO7GBZywyHCuPaQ29iy/pZSdJt68Y0JMzL1Wgs01JTA9
+dZwNyF2hEA7pLNRxO4Vp
+=52dt
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/wise/metadata.xml b/sci-biology/wise/metadata.xml
index d4648212cbad..f17a827e3101 100644
--- a/sci-biology/wise/metadata.xml
+++ b/sci-biology/wise/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
+  <herd>sci-biology</herd>
 </pkgmetadata>
diff --git a/sci-biology/wise/wise-2.4.0_alpha.ebuild b/sci-biology/wise/wise-2.4.0_alpha.ebuild
index 1bbeefd22659..8ea29c9d9a42 100644
--- a/sci-biology/wise/wise-2.4.0_alpha.ebuild
+++ b/sci-biology/wise/wise-2.4.0_alpha.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/wise-2.4.0_alpha.ebuild,v 1.2 2010/10/02 15:08:42 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/wise-2.4.0_alpha.ebuild,v 1.3 2015/03/29 13:39:24 jlec Exp $
 
-EAPI="3"
+EAPI=5
 
 inherit eutils toolchain-funcs versionator
 
@@ -12,8 +12,8 @@ SRC_URI="ftp://ftp.ebi.ac.uk/pub/software/${PN}2/${PN}$(delete_version_separator
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc"
 KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
+IUSE="doc static-libs"
 
 RDEPEND="~sci-biology/hmmer-2.3.2"
 DEPEND="
@@ -25,11 +25,12 @@ DEPEND="
 S="${WORKDIR}"/${PN}$(delete_version_separator 3)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	cd "${S}"/docs
-	cat "${S}"/src/models/*.tex "${S}"/src/dynlibsrc/*.tex | perl gettex.pl > temp.tex
-	cat wise2api.tex temp.tex apiend.tex > api.tex
+	epatch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch \
+		"${FILESDIR}"/${P}-cflags.patch
+	cd "${S}"/docs || die
+	cat "${S}"/src/models/*.tex "${S}"/src/dynlibsrc/*.tex | perl gettex.pl > temp.tex || die
+	cat wise2api.tex temp.tex apiend.tex > api.tex || die
 	epatch "${FILESDIR}"/${PN}-api.tex.patch
 }
 
@@ -37,9 +38,9 @@ src_compile() {
 	emake \
 		-C src \
 		CC="$(tc-getCC)" \
-		all || die
+		all
 	if use doc; then
-		cd "${S}"/docs
+		cd "${S}"/docs || die
 		for i in api appendix dynamite wise2 wise3arch; do
 			latex ${i} || die
 			latex ${i} || die
@@ -49,21 +50,24 @@ src_compile() {
 }
 
 src_test() {
-	cd "${S}"/src
-	WISECONFIGDIR="${S}/wisecfg" make test || die
+	cd "${S}"/src || die
+	WISECONFIGDIR="${S}/wisecfg" emake test
 }
 
 src_install() {
-	dobin "${S}"/src/bin/* || die "Failed to install program"
-	dolib.a "${S}"/src/base/libwisebase.a || die "Failed to install libwisebase"
-	dolib.a "${S}"/src/dynlibsrc/libdyna.a || die "Failed to install libdyna"
-	dobin "${S}"/src/dynlibsrc/testgendb || die "Failed to install testgendb"
-	dolib.a "${S}"/src/models/libmodel.a || die "Failed to install libmodel"
+	dobin "${S}"/src/bin/* "${S}"/src/dynlibsrc/testgendb
+	use static-libs && \
+		dolib.a \
+			"${S}"/src/base/libwisebase.a \
+			"${S}"/src/dynlibsrc/libdyna.a \
+			"${S}"/src/models/libmodel.a
+
 	insinto /usr/share/${PN}
-	doins -r "${S}"/wisecfg || die "Failed to install wisecfg"
+	doins -r "${S}"/wisecfg
+
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins "${S}"/docs/*.ps || die "Failed to install documentation"
+		doins "${S}"/docs/*.ps
 	fi
 	newenvd "${FILESDIR}"/${PN}-env 24wise || die "Failed to install env file"
 }