sci-biology/exonerate: We need USE=utils for testing, #453978; move to autotool-utils.eclass

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 46 insertions, 35 deletions

diff --git a/sci-biology/exonerate/ChangeLog b/sci-biology/exonerate/ChangeLog
index fd8e112282a1..95aebedcaaec 100644
--- a/sci-biology/exonerate/ChangeLog
+++ b/sci-biology/exonerate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/exonerate
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/exonerate/ChangeLog,v 1.5 2011/12/13 14:56:55 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/exonerate/ChangeLog,v 1.6 2013/01/25 16:24:50 jlec Exp $
+
+  25 Jan 2013; Justin Lecher <jlec@gentoo.org> exonerate-2.2.0-r1.ebuild,
+  metadata.xml:
+  We need USE=utils for testing, #453978; move to autotool-utils.eclass
 
   13 Dec 2011; Justin Lecher <jlec@gentoo.org> exonerate-2.2.0-r1.ebuild:
   Respect CFLAGS and CC, #394545
diff --git a/sci-biology/exonerate/Manifest b/sci-biology/exonerate/Manifest
index d401cf20a017..bfa41f0b2a29 100644
--- a/sci-biology/exonerate/Manifest
+++ b/sci-biology/exonerate/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX exonerate-2.2.0-asneeded.patch 358 RMD160 a0eefe021fc96000bf525139776da63396b9b0ff SHA1 e05ed5649b17cbdd5ccf1f69d6d84364e7a9e1de SHA256 0f22b06cf915449bd84afb20100d2014c126fc62efb46f7a1a58cf907b69feec
-DIST exonerate-2.2.0.tar.gz 509870 RMD160 3441a642c75af8b5676253b020f47650360ba320 SHA1 ad4de207511e4d421e5cc28dda2261421c515bf0 SHA256 0ea2720b1388fa329f889522f43029b416ae311f57b229129a65e779616fe5ff
-EBUILD exonerate-2.2.0-r1.ebuild 1025 RMD160 ecca1020ab88834f50d068a4280fa4d1ece1abd2 SHA1 4331b12586c8f87bfa93edf545e10de2beb78bc9 SHA256 2db6427282d610f5011dd528d2a37b56e2aaed2d3f89dde441154e0bf113309c
-EBUILD exonerate-2.2.0.ebuild 793 RMD160 3ca5f6eeace24df6b5eef87c2e8cf352e4bd25a5 SHA1 4ff705c49d30511adc2731732f882ab0eedfc6f7 SHA256 97757b879c2e0fec7fcbfac0e4bcd604c27aa504fa06127ad30873a203eb6fed
-MISC ChangeLog 1130 RMD160 ab0768d9927375d4daac1f9f033a95772aec8132 SHA1 23766d54997ecb2c4b1e495394325c808921e890 SHA256 8b164e3abde3998a2c7ec43d0e96b8f5d389f8d5f2cf91ab274e4420f2c40759
-MISC metadata.xml 435 RMD160 f91fd7aee2f7691606000ff4655467123eba3f2f SHA1 0ee673e7f77aacb6e3205e99b2be521ca0e23ea8 SHA256 65a421b9a3e74373af88227e95688ee42389a74afb395098a1ff901df83494a7
+AUX exonerate-2.2.0-asneeded.patch 358 SHA256 0f22b06cf915449bd84afb20100d2014c126fc62efb46f7a1a58cf907b69feec SHA512 bd7f53fa9b7dee777fb21e265293e90ca34daf69e78671c1515d61a542baefea240d35c6c853ba9beda673ba6eeda820e975cc042ca923e2414b5fb756664afc WHIRLPOOL 0858bbd3a5d850fea9c4b2c80208c2e877f5de7a07a09e860a3c286a2b16275cb5c49cb25cec70e157432c1e1cc774620de16c566f73a5214bf97e7f9a3633c2
+DIST exonerate-2.2.0.tar.gz 509870 SHA256 0ea2720b1388fa329f889522f43029b416ae311f57b229129a65e779616fe5ff SHA512 c0aec4df83fbf6bcd1b27242397349769211ab88d71e2d081e20cb5453a03acd805807535a69841e991cf543d99fcd458cbd22d60b21f0fc6ce813eac45b838c WHIRLPOOL dd7ba7a94b93f41d5ddbc66cc14740973dde20e875f37814229614c85312dcc1de031faab5153bc28be3284144d0f8451bd5e5115f8d9e312e4f88d771ce620c
+EBUILD exonerate-2.2.0-r1.ebuild 1104 SHA256 87945a1ce4e646359012d84c654b62d2d507295f2239dad08a5f9cc1d70658f8 SHA512 c4f339107715429e24ca6fcedb03fa8b5876389a359c84765d2650db7775a657349ca1df17dc263542f81f27fea9ed13a5bab58be7eccccd8c468968d8d94f31 WHIRLPOOL cc570836a022b481d99d8aa628a6272364062edd63a7531d98872f9d44833d3950abe654996d32ab2666f0c2fe3762a3960ec92ed6a1103675a3611505db1512
+EBUILD exonerate-2.2.0.ebuild 793 SHA256 97757b879c2e0fec7fcbfac0e4bcd604c27aa504fa06127ad30873a203eb6fed SHA512 78969def522c0a6807c055434131c04d20924078b9a0dab650fd6577d2453b1a86bfc0ac46849b226913cbe12cb96c20e331c70d2e9a3e337b6493b877b6f7ef WHIRLPOOL b74dd1247b793f0b88502560137ed1cf58925c98987e86792f1763dbe2a63e1f6b126d724fc733bb39a2207f6586c1ba3fb2f66a148d61a0d2c3bbdf248cf4cd
+MISC ChangeLog 1293 SHA256 d0c8a433cf94a7373dfe3a98484d21b44edb9b8872f9d3ffa20f68cdf6ff2b03 SHA512 cfdb36b2f0b86cbab96143185afd0b621c35b8b3e1a103ba7835d04ab0ea7d0b465ae9639176c7cb5158d9465c001dbd4227c2db528b01024e7b14c4fc1f9def WHIRLPOOL 329f3d555bf2d5ef6f98fcb4b1b578141e804dda10ebd56233d71c25248c69cae74a4a82f5e6d79cd0d00638726a7b45e68752ec34f8aa15b5a5336241b7e1e6
+MISC metadata.xml 446 SHA256 55c3cb41dd6e1108230b01f893f96739838c11db1e97e533527406858358a652 SHA512 960c61859267cacba8b8bbf17edb99bbaa080a332ecef861134ea2ce93cda8c3999ad845ff10b6368fdaa256cfb936d95eea7545ece06ae211f51ca6fc066916 WHIRLPOOL 1e94c954711a5a04203e8dd6ace0ccc7ae92f2f25264b389de58d58ebcd90fe6fb821a3666352f44f27d73c489b79a5fd36610c6cde7d519c963c9495279a3e9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk7nZ70ACgkQgAnW8HDreRZHZwCgvxZ2exP8GTIfgIcJ6/CxNgpJ
-+PEAoK0GyUd7Waa34OTS9/QXhIV8el68
-=u9sX
+iEYEAREIAAYFAlECsdMACgkQgAnW8HDreRbxTQCfY2ex1HnGpzqB8CSOTxOtzYpq
+We4AoJ5v8jIjUXKCDmj0btnR/s9lKBIq
+=LwEW
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/exonerate/exonerate-2.2.0-r1.ebuild b/sci-biology/exonerate/exonerate-2.2.0-r1.ebuild
index 3262b1dc3ea1..715e85367658 100644
--- a/sci-biology/exonerate/exonerate-2.2.0-r1.ebuild
+++ b/sci-biology/exonerate/exonerate-2.2.0-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/exonerate/exonerate-2.2.0-r1.ebuild,v 1.4 2011/12/13 14:56:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/exonerate/exonerate-2.2.0-r1.ebuild,v 1.5 2013/01/25 16:24:50 jlec Exp $
 
 EAPI=4
 
-inherit autotools eutils toolchain-funcs
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils toolchain-funcs
 
 DESCRIPTION="Generic tool for pairwise sequence comparison"
 HOMEPAGE="http://www.ebi.ac.uk/~guy/exonerate/"
@@ -13,30 +15,36 @@ SRC_URI="http://www.ebi.ac.uk/~guy/exonerate/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
-IUSE="utils threads"
+IUSE="utils test threads"
+
+REQUIRED_USE="test? ( utils )"
 
 DEPEND="dev-libs/glib:2"
 RDEPEND="${DEPEND}"
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}"/${P}-asneeded.patch )
+
 src_prepare() {
 	tc-export CC
 	sed \
 		-e 's: -O3 -finline-functions::g' \
 		-i configure.in || die
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		$(use_enable utils utilities) \
-		$(use_enable threads pthreads) \
-		--enable-largefile \
+	local myeconfargs=(
+		$(use_enable utils utilities)
+		$(use_enable threads pthreads)
+		--enable-largefile
 		--enable-glib2
+	)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
+	autotools-utils_src_install
 	doman doc/man/man1/*.1
-	dodoc README TODO NEWS AUTHORS ChangeLog || die
 }
diff --git a/sci-biology/exonerate/metadata.xml b/sci-biology/exonerate/metadata.xml
index 386684adda49..711d805d77e7 100644
--- a/sci-biology/exonerate/metadata.xml
+++ b/sci-biology/exonerate/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
-	<maintainer>
-		<email>je_fro@gentoo.org</email>
-		<name>Jeff Gardner</name>
-	</maintainer>
-	<longdescription lang="en">
+  <herd>sci-biology</herd>
+  <maintainer>
+    <email>je_fro@gentoo.org</email>
+    <name>Jeff Gardner</name>
+  </maintainer>
+  <longdescription lang="en">
 		exonerate is a generic tool for pairwise sequence comparison
 	</longdescription>
-	<use>
-		<flag name='utils'>Install all utilities</flag>
-	</use>
+  <use>
+    <flag name="utils">Install all utilities</flag>
+  </use>
 </pkgmetadata>
-