sci-biology/tree-puzzle: Move to EAPI=4

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

4 files changed, 33 insertions, 29 deletions

diff --git a/sci-biology/ncbi-tools/Manifest b/sci-biology/ncbi-tools/Manifest
index 216e30a7dc21..564c830f8236 100644
--- a/sci-biology/ncbi-tools/Manifest
+++ b/sci-biology/ncbi-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 21ncbi-r1 232 RMD160 ba65fe937c9a29f4cc185d99db18522343bbb28b SHA1 5674f379f7a70e71394bca272fedd72a1622a7da SHA256 55d5d53c177200d4a9369102d3e2d8ef232f09dd8559aab6c6e4d2173e8bb411
 AUX ncbi-tools-asn2all.patch 1190 RMD160 3aaccc677bd8b9bad6c6424f5080c71cdac553d7 SHA1 ae22c77cfcd7d416a89ea3fe1e0331264473669d SHA256 e2fd71fdaa07b9e1c9cf646b2d3aa02c2ec822d41dcd45cadfced4164f458bed
@@ -10,16 +10,15 @@ DIST ncbi-tools-20080302.tar.gz 17294669 RMD160 e269bcadc9e498163252e348a314bab8
 DIST ncbi-tools-20090809.tar.gz 64646971 RMD160 a1482a252647b2ea878ac9b08093cfd48bfaa82a SHA1 9727c13d94cc06cfe2f70148fa6bc5dfe011af50 SHA256 0c874961baf1bbfde9c209cc65fdcc5fe07f6f644b69674a89703b6726b66b15
 DIST ncbi-tools-20100808.tar.gz 65119702 RMD160 24d5f9f09869eacd01db2ff793f29a7c938e64ed SHA1 ae1e1e780c52ba9da539f1d3d50418d36e9fd1e2 SHA256 5302481373b86e5d9fc41cc6b405f63000d56cc2ee9fc0ffa5aeb9e611c45ff0
 DIST ncbi-tools-sdk-doc.tar.bz2 263568 RMD160 f9c4d610c2535ec2b4afae6ecef065fd5746910b SHA1 6fd259b1fc75684db43bd817fc4720e92f56e81c SHA256 352ec02e527f24d03bafb7d40b31c98e0a6f931bed34c4933c5f7153b8034cb2
-EBUILD ncbi-tools-20080302.ebuild 7149 RMD160 fb79ae6629ac4b39d025243427adef2a11fbf7b2 SHA1 7cb2a51eaad50b86a4b22c74b3d22e70bacf53c3 SHA256 bf68cd60ace1a90e69af79d8e52ca6b8ebc68d227716906d1435d5bd733c64e4
-EBUILD ncbi-tools-20090809-r2.ebuild 6534 RMD160 3117e2758be9222fe1f9a1f3fb60f99263f59fab SHA1 dfda53d181979e60fe51215a1a46a027a3178471 SHA256 9def4a2c7adcf63fd7c7f46c9a3a6fc800cbbf53f74b3dd6f8f7b170d8c50a9e
+EBUILD ncbi-tools-20080302.ebuild 7142 RMD160 d811a387661d106ddf35acccb3a3c9f9281ef003 SHA1 014d046b2f6740a22868829fc9c41a3c53a4460d SHA256 d8a024dd92be47691821d5ffd85819f754d6046254c5c739ac47066cf5f8462a
 EBUILD ncbi-tools-20090809.ebuild 6132 RMD160 142da7c23b3aadf119c99e63b08d3feb41baf2e2 SHA1 b51624b2fa20b9a85efce7f52887c6435e7c2d81 SHA256 5b2f2e55d63e35b430d6d843aa14d7348098f7de74bb2c8ee038cf360c724041
 EBUILD ncbi-tools-20100808.ebuild 6854 RMD160 2f94fee11c390fb370c5e184ec83f98ec10fb61b SHA1 3581135e44670c7eabc0793d5b3195bcf96d1692 SHA256 474dd4b5350dd6ff5daa05482fb785285bf08a8e3c849744437a4a389577088b
-MISC ChangeLog 16504 RMD160 fe143f4b6e7f97ac49233df8c97663c5cec64a2a SHA1 96be38f58b16a4b9fd6d6c3e3ad3c8e30b960038 SHA256 69ae77dac15e430a48eb5442d6ea12549159216f0e127ad1f1516f7ede0101ab
+MISC ChangeLog 16628 RMD160 a0d3bc6b8a6af01ae31101b6652fe3e7a2130857 SHA1 9d37393e8eb8d04a118ad7fd431a58771dcf2104 SHA256 ad52852f3409315b5a90875e413772d512d927194b5d2d8414ebbceadcfe2942
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkzhoSUACgkQgAnW8HDreRYETwCgt1zJLfDsS29gjTeDwo/Co8RG
-/8gAnijSGO19EBlvVGpxu1uW7X//JL8k
-=dyB2
+iEYEAREKAAYFAk+ZcwkACgkQgAnW8HDreRYwxwCfcKNoyst52LdMnJAoEbnkKU6l
+nFAAoLwP48lBx9zApPdOlb+UTlojx3Y+
+=j+xv
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/tree-puzzle/ChangeLog b/sci-biology/tree-puzzle/ChangeLog
index 5c6d5f08c2b5..dec1c08c776c 100644
--- a/sci-biology/tree-puzzle/ChangeLog
+++ b/sci-biology/tree-puzzle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-biology/tree-puzzle
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/ChangeLog,v 1.15 2010/01/01 21:44:45 fauli Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/ChangeLog,v 1.16 2012/04/26 16:06:44 jlec Exp $
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> tree-puzzle-5.2.ebuild:
+  Move to EAPI=4
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   tree-puzzle-5.2.ebuild:
diff --git a/sci-biology/tree-puzzle/Manifest b/sci-biology/tree-puzzle/Manifest
index ddf16727d4cc..eeb8d92db491 100644
--- a/sci-biology/tree-puzzle/Manifest
+++ b/sci-biology/tree-puzzle/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST tree-puzzle-5.2.tar.gz 875142 RMD160 8a69f5ab2ad56a05c0faa6cd02e344c19271bf7a SHA1 fd52a9f04dc871b765d9f7464f68bdb8edc22e37 SHA256 3396d3b80b03b0600afb479dc33f0bd3e5631298337295a4fa454211ac44c3fb
-EBUILD tree-puzzle-5.2.ebuild 1389 RMD160 7439ce7debdd02672621f29e983b35d1addd6b3c SHA1 5b4ec655ca4ee7c5d7eba643867470715edf9045 SHA256 aefd9d9002a362d651d3184ad79cb23885d31b40093acf683dfd02e230d6e187
-MISC ChangeLog 2844 RMD160 66f2f3978fac565a4afc94925d6fb3f269b218bc SHA1 924c26c00f297174fcd2c9ebe99e8001a1abaaba SHA256 50df3235bc3957bf4b4d0213818489e618a92cfbb6653064a208f20290af1629
+EBUILD tree-puzzle-5.2.ebuild 1398 RMD160 d157e66bd7e305517609b7a14719b3972aba2e83 SHA1 5dcd2b638e14c8278c863948d470c7e6248d7133 SHA256 43ae57b37850399cc8345404ad1fc350492e6ededcc357e0f29726f23f34ffda
+MISC ChangeLog 2932 RMD160 b3786d3fdb4a89ec273961b0c6e944fc8576ba1c SHA1 b8fdd409bad129a693151bbc23cfb9843870a855 SHA256 2e0ee14c045c0f73b60e4b60205c3d71efa65d3b770e1657907943e10aae8221
 MISC metadata.xml 1459 RMD160 1fd787e9bb6887264319e3484e30fd3612b855e0 SHA1 e3bcb0cffa751c79b5c61cb38e8006f368bd01d2 SHA256 ccefdd7d49206f9e090218494a5857e711977a75f24136f3916a34d4dab6219d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAks+bNMACgkQNQqtfCuFneOe5wCeNi1sSUIrIAMXZyLRnKpMggaX
-JuYAoJillwa6inLM+dZSsCvkYYmZv3hf
-=AVUC
+iEYEAREKAAYFAk+ZcpkACgkQgAnW8HDreRZR3wCglHKTDb183XIpwJA7zcWn/Pja
+tZoAnAwHtj4lBU8WhGjAuCx0oqjTuDDV
+=/c0y
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild b/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
index 5c22237acc30..1d5a2b540bb5 100644
--- a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
+++ b/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2010 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/tree-puzzle/tree-puzzle-5.2.ebuild,v 1.10 2010/01/01 21:44:45 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild,v 1.11 2012/04/26 16:06:44 jlec Exp $
+
+EAPI=4
 
 inherit toolchain-funcs
 
-DESCRIPTION="Maximum likelihood analysis for nucleotide, amino acid, and two-state data."
+DESCRIPTION="Maximum likelihood analysis for nucleotide, amino acid, and two-state data"
 HOMEPAGE="http://www.tree-puzzle.de"
 SRC_URI="http://www.tree-puzzle.de/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="mpi"
 
 DEPEND="mpi? ( sys-cluster/lam-mpi )"
+RDEPEND="${DEPEND}"
 
 pkg_setup () {
 	use mpi && [ $(tc-getCC) = icc ] && die "The parallelized version of tree-puzzle cannot be compiled using icc.
@@ -21,16 +24,15 @@ pkg_setup () {
 	version of the program, or use gcc as your compiler (CC=\"gcc\")."
 }
 
-src_compile() {
-	econf || die
-	cd ${S}/src
+src_prepare() {
 	if ! use mpi; then
-		sed -e 's:bin_PROGRAMS = puzzle$(EXEEXT) ppuzzle:bin_PROGRAMS = puzzle :' \
-			-e 's:DIST_SOURCES = $(ppuzzle_SOURCES) $(puzzle_SOURCES):DIST_SOURCES = $(puzzle_SOURCES):' \
-			-i Makefile || die
+		cd ${S}/src
+			sed \
+				-e 's:bin_PROGRAMS = puzzle$(EXEEXT) ppuzzle:bin_PROGRAMS = puzzle :' \
+				-e 's:DIST_SOURCES = $(ppuzzle_SOURCES) $(puzzle_SOURCES):DIST_SOURCES = $(puzzle_SOURCES):' \
+				-i Makefile || die
+		cd ${S}
 	fi
-	cd ${S}
-	emake || die
 }
 
 src_install() {