dev-python/numexpr: Fix src_prepare handling in distutils-r1.eclass

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

6 files changed, 50 insertions, 29 deletions

diff --git a/dev-python/numexpr/ChangeLog b/dev-python/numexpr/ChangeLog
index e20af6016745..39115c53abb0 100644
--- a/dev-python/numexpr/ChangeLog
+++ b/dev-python/numexpr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numexpr
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/ChangeLog,v 1.14 2013/10/21 08:07:32 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/ChangeLog,v 1.15 2014/01/12 09:26:52 jlec Exp $
+
+  12 Jan 2014; Justin Lecher <jlec@gentoo.org> numexpr-2.1.ebuild,
+  numexpr-2.2.ebuild, numexpr-2.2.2.ebuild, metadata.xml:
+  Fix src_prepare handling in distutils-r1.eclass
 
 *numexpr-2.2.2 (21 Oct 2013)
 
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 3ac811c63b0a..23df134ef0ca 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,8 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST numexpr-2.1.tar.gz 73944 SHA256 39f2fed7f1b8125c0f2df3af454c97e5dfa636ce487ad7921025815e24c17df8 SHA512 bca4c73441b3265c60d3682b47b9a94cd9a4669b8bde284c7043dccd97177cc829e8e2e50daf99e5c8bcee7565800670319c999914f3846af15f03fc2974cbea WHIRLPOOL 7f906e2a75f888a020db95a312eb9d2592c3046fde51e25b83f716199e631c484efd570b7f7c6fc40e7dd7fb78f83ea3a35a23c88be67783c3c97a1de3539fbb
 DIST numexpr-2.2.2.tar.gz 75680 SHA256 47d3435785f59a72dc06a1c0257b83f0f656d4974e804c30a6ef8c0de293d9ee SHA512 bf04d16cfab7f71cc1bc0ab736fa4222ec24321292ca1bfe0b01b0cdf4a683fcdc297faff1abafd9f18ce7b6c07364fff855c51a5aa9a310b6664616f817a004 WHIRLPOOL 01c20554288c9fef70b488c749f6ab9a1dab834dc8e5eeb2d87c70f73e0a0ae3b48d51571bd951a2e524483b51cf9bd91da8cd72ab25edee10d1497ba8e50245
 DIST numexpr-2.2.tar.gz 75333 SHA256 78089f6ee49096ce8f16cca6649b302d658f32fba730e8bd84e0fc92b8c1d610 SHA512 1b88e4bbefb4d220e278e451ea7b1ec7b8f4db87a265a0f2328c630ad21302f4ca660efeb567e2d293d81d8e8ab254f73dceaa52728fa426d89f1a1e4c22ba90 WHIRLPOOL 4e65a39ecf414a087ec9286f969163bf145e156243361c472bac3d9beb15e7a6dd564b24ee7836f3f1aef6d3148323dad98379961c1c68019408181bdbbdbc2d
-EBUILD numexpr-2.1.ebuild 1289 SHA256 dd0cf9660c0bfd439fe31482e0b0ea125156a441c015134af3c63d7b4be068d3 SHA512 5663c7a42e6eaaa9fb8a1e10e4959fc527b6712328f4774099cdc0550952ba1c8c21b808840c2e1c262667c89183e8b565a09a2380dec417995cd4b4a7e293b4 WHIRLPOOL 00bf11338f5efb440f7d04f0173aed75df0c92c0740f69a4524e65f33156066a13156287c4f416d6811a609cbdb9be285e3fbc67e04bf5037890672b4cd04142
-EBUILD numexpr-2.2.2.ebuild 1291 SHA256 7d8c6ec867d7922ef55c3ab980393f45e6f6ea21b9a8d6b8770a44a25fe3a198 SHA512 7a973457c5780f48844d7a21de3c0aa058189f3682947fde2d17d0f171f5cb465486f4228fa4ad33e3eab629380ed74f5964ab9cabcde175d1b8767e4b60aa83 WHIRLPOOL 1e000fbbf5e457fd62d770cb064e8dc8e0a2bf77ccbe71cb92a74351d8ad410a339bdfd2a1b662dce906846c42dd6938e33b8fee0fe8cff66103cb51acb1ee12
-EBUILD numexpr-2.2.ebuild 1292 SHA256 634f8204059873adf7248ae468e1b4deb0ab0f44d0de70c923dd0f2f21ec17b8 SHA512 b2e7cade8c58ff744e71fcd48c8e63e7e25a32424182de9b26928a9647f4faab05cf6c0a4e408e8ea66445438100b18b26e431b926b83f76cf94bac9bd47d9f8 WHIRLPOOL c918db194383fabc7116eadf36b03af01e2cf2ec8183c1d1b33a521fd2abd7924b56028cb47950a155f0949c182f3d9467cadd29627077a96f7d6ac165314de3
-MISC ChangeLog 2200 SHA256 c06b4600141ed43aee949b9e259c02b036953a7d5832021a7a66eebb726d3e30 SHA512 de535c0e17c882972c9c0f6a37c86dfae8217181cbc3a40fce95054d3a178476a715e7e12b15857bc2ff25fc5eaab5cd44c7c4148c8f8f23acf5b3f3654cf48e WHIRLPOOL 2e8e131fd8cd58cc8e86811f514485f3eeb7d52917897ec2ca5cc2ce4adce60865cf7a8ba021e9df1f0169cf72a17fbf464e48b553302b0bdc24e84e63b49427
-MISC metadata.xml 879 SHA256 9bb44ce2e541a717d38e29bb689c7bc57e0d65594bde4aec7d1fead3aa8e6346 SHA512 4c42b9b40f4254c19d5773ed935729b68a67efc98556168b6d7b349f90a7295379d7bc040aaa01257a451b7e4e7985fc1eb5d26a67e8762abde91297408a001e WHIRLPOOL 5480e53ba9b36d798ec7ba85985ecddf898a9343bff3a44974c4a976efeb44adbfd05443413257085813c81a0ca1fd408d753614b05bdff06d77a4e3dbe2424c
+EBUILD numexpr-2.1.ebuild 1285 SHA256 32937a36ec0322bca5c7e9e78e987f8690acd8e1bd5925a8f0f122abc72a49d0 SHA512 09d9dedc38565fbb4efc368758d2a2f592b7e42f941e54d97e4fc3b212662350fe00b8b14ace80717f1cd790048557b73631051677ecb6bb5428eeffdbe35da6 WHIRLPOOL 17f3579e389ceb5c226e7d7c60cf7dab8c194eeb0554247ce5cd159aa3a667aa5309cce37214d7f5f6e9482fc2e6e4129e63a9e346fa00b1cd736166dcdebf16
+EBUILD numexpr-2.2.2.ebuild 1329 SHA256 9e78635d67cf50cf443e3f1311b7261de06e53c454e27398947a3d81d87bfd11 SHA512 c59f38c552be2d002b080f82124278be2b6fd4e84f1e7c5a6756ccdaff12df75a2773bf0d19a323a041ba53a1da6ea4600c4e2b712421fb213952e7e38a16795 WHIRLPOOL e6105481476340c76d4e4c2ae4fa03a2fcdf10745d595a3ea7ac50b752f13467056d94c2285445fb05ced586d4ac4a4e689072b2fc541120ce33a0e3e2f0caf3
+EBUILD numexpr-2.2.ebuild 1285 SHA256 013a88bdf9a407287215608900ab7ada4b8c14069d548128596e7b0a1173b3ca SHA512 0985942d667ae129d98636e13e1d9411d26cc192a159cdf057456260ecea5a21a5507dcc9a53b33c9e88aa6a064b96ac712fc75dce31a3c36c57ae6e05afbb1a WHIRLPOOL 3e2190bc887b68ae8a0ecf0ec282b935f8fca54d2c4399dde010dd36aba671a7da9a786f9fe0ed76bd95f1113856b2e05cf6138658fadfdc924fdb96276e5460
+MISC ChangeLog 2373 SHA256 529de14ba59c9a21b72bf0eae5e95bf713ce1af08ba3a78ee1e0b4a9f55eaff1 SHA512 f326ac20a6274535ff8d1a26d1a836a82d2304c1f7bbb03cdea0d816e253e1dca0bef252f2fa8d3eabc965ca6fb4b7eac721d94277cbbb524c8daba47781a9ed WHIRLPOOL 33ab0bba8840f62c8f2135b9f009baf3be50e3ce0889973ff62b3eee5d1c437964f06872ec465d07625d976022aabc013f781c52e1e69ba34fe062dfe2d97dd5
+MISC metadata.xml 770 SHA256 e0dfe21c21e3b0d1a150132a65f052c21d4206f90fc32b2f308c84beb3d438fa SHA512 4602da361beb7afc78d8d293f079446f53ea2ccc938c1d680477cdc9be0bde0656ce48303a81883c3fd56d7ef13ba631bc095a28b42adb348703865f5f617a8b WHIRLPOOL c9e3ebb6de06a6d70fd13852742f59be629b8cebd7d0f6572ff563664d628c88f1b6b6faa1d8b4848f83097b3b1aa59b7d26f54462ab182f0afdb25d7d2ade5d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCgAGBQJS0l/uAAoJELnU8jG9FVirNKsP/iLbTMYTSAThKOmzVJswSx5n
+quv9fUX7h4GiRlTUxpg45/2GhAb5nXp2Jri/F/tt8dwHYfGpgvaWKxi/jZPypmfm
+QC9c7H/ojkLj7hJpmO3PgJKfYjPlXwfvHIRwtR+/UErW93gO7aUg6R5wZ7ZRUC7l
+ZornJqNjKemAU/Qbc9O/RwzXrLgj3PyKH7POA9NEayEx3GFc7cNy6G0y53hPRLKY
+j0Gea3L//6h8+slzOJA6Yc2xYB03ZDiAoFXm0XLio+zvNeYzK9iSO3fIbjqUitQX
+AjhirqFHC053dbcGz2DlWClUasT10/A+8KWYbAliZMld2S6sHGkAJSqFtGAgEMVu
+dSjAu76vTjoK/nQNARBA4Imt8ZKsaUFuXW8TEsVe5/ahiiIVXPg8VQFiw6LqPqpe
+aeqSqbUhrLL+ENs/0w4OlhjZLxPTavZor0lqdOLgzkhY+Ic1KUsXcjXzcKDnjDiN
+3bsnuCrF4Ldq/oF9yw099TYWBjxzaxuFHhLMh+jc0b2nwxQXQ+SSJspmm7MgqOn/
+7HjhxaUYF1Kycf6GO8K8K5565DKNGQ9WC5e0kM1vDkdeikxg26T2+607chtvtdoM
+UU1eQ1AE+kB6N32VYkUfpRd8nKZ+KB9HjWxgJETUjHI45OTNaxFvkGceZ/zF01bZ
+NS04D0wNE4Nf9U6XugSc
+=A9Mv
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numexpr/metadata.xml b/dev-python/numexpr/metadata.xml
index f10c44013771..1668043a5a68 100644
--- a/dev-python/numexpr/metadata.xml
+++ b/dev-python/numexpr/metadata.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>proxy-maintainers</herd>
-<herd>sci</herd>
-<maintainer>
-  <email>timcera@earthlink.net</email>
-  <name>Tim Cera</name>
-</maintainer>
-<longdescription lang="en">
+  <herd>python</herd>
+  <herd>sci</herd>
+  <longdescription lang="en">
   The numexpr package evaluates multiple-operator array expressions
   many times faster than NumPy can. It accepts the expression as a
   string, analyzes it, rewrites it more efficiently, and compiles it
@@ -17,8 +12,8 @@
   just-in-time (JIT) compiler, i.e. it does not require a compiler at
   runtime.
 </longdescription>
-<use>
-  <flag name="mkl">Enable support for Intel Vector Math Library, part of
+  <use>
+    <flag name="mkl">Enable support for Intel Vector Math Library, part of
   <pkg>sci-libs/mkl</pkg>.</flag>
-</use>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/numexpr/numexpr-2.1.ebuild b/dev-python/numexpr/numexpr-2.1.ebuild
index bda0a79b0ab3..3dc752e9b776 100644
--- a/dev-python/numexpr/numexpr-2.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-2.1.ebuild,v 1.2 2013/07/20 16:45:07 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-2.1.ebuild,v 1.3 2014/01/12 09:26:52 jlec Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy."
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
 HOMEPAGE="http://code.google.com/p/numexpr/ http://pypi.python.org/pypi/numexpr"
 SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
diff --git a/dev-python/numexpr/numexpr-2.2.2.ebuild b/dev-python/numexpr/numexpr-2.2.2.ebuild
index dcaa3ee8e7f7..4fca58f678e8 100644
--- a/dev-python/numexpr/numexpr-2.2.2.ebuild
+++ b/dev-python/numexpr/numexpr-2.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-2.2.2.ebuild,v 1.1 2013/10/21 08:07:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-2.2.2.ebuild,v 1.2 2014/01/12 09:26:52 jlec Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy."
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
 HOMEPAGE="http://code.google.com/p/numexpr/ http://pypi.python.org/pypi/numexpr"
 SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
@@ -17,14 +17,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
-RDEPEND=">=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
 	mkl? ( sci-libs/mkl )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 DOCS=( ANNOUNCE.txt AUTHORS.txt README.txt RELEASE_NOTES.txt )
 
-src_prepare() {
+python_prepare_all() {
 	# TODO: mkl can be used but it fails for me
 	# only works with mkl in tree. newer mkl will use pkgconfig
 	if use mkl; then
@@ -38,6 +39,7 @@ src_prepare() {
 		mkl_intel_thread, mkl_core, iomp5
 		EOF
 	fi
+	distutils-r1_python_prepare_all
 }
 
 python_test() {
diff --git a/dev-python/numexpr/numexpr-2.2.ebuild b/dev-python/numexpr/numexpr-2.2.ebuild
index bc539bebd4ee..1025aa59d060 100644
--- a/dev-python/numexpr/numexpr-2.2.ebuild
+++ b/dev-python/numexpr/numexpr-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-2.2.ebuild,v 1.1 2013/09/01 16:15:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-2.2.ebuild,v 1.2 2014/01/12 09:26:52 jlec Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy."
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
 HOMEPAGE="http://code.google.com/p/numexpr/ http://pypi.python.org/pypi/numexpr"
 SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"