Fixed mkl flag for x86 temporarily. Verbosed metadata

(Portage version: 2.1.10.10/cvs/Linux x86_64)

3 files changed, 28 insertions, 16 deletions

diff --git a/dev-python/numexpr/ChangeLog b/dev-python/numexpr/ChangeLog
index e07606daba60..f60c2f4cd545 100644
--- a/dev-python/numexpr/ChangeLog
+++ b/dev-python/numexpr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numexpr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/ChangeLog,v 1.4 2011/01/29 09:36:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/ChangeLog,v 1.5 2011/08/06 20:28:31 bicatali Exp $
+
+  06 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> numexpr-1.4.2.ebuild,
+  metadata.xml:
+  Fixed mkl flag for x86 temporarily. Verbosed metadata
 
 *numexpr-1.4.2 (29 Jan 2011)
 
diff --git a/dev-python/numexpr/metadata.xml b/dev-python/numexpr/metadata.xml
index a1e5d4df1333..af01364bb90d 100644
--- a/dev-python/numexpr/metadata.xml
+++ b/dev-python/numexpr/metadata.xml
@@ -4,14 +4,20 @@
 <herd>python</herd>
 <herd>sci</herd>
 <maintainer>
-	<email>timcera@earthlink.net</email>
-	<name>Tim Cera</name>
+  <email>timcera@earthlink.net</email>
+  <name>Tim Cera</name>
 </maintainer>
 <longdescription lang="en">
-	Fast numerical array expression evaluator for Python and NumPy.
+  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
+  to faster Python code on the fly. It's the next best thing to
+  writing the expression in C and compiling it with a specialized
+  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
-		<pkg>sci-libs/mkl</pkg>.</flag>
+  <flag name="mkl">Enable support for Intel Vector Math Library, part of
+  <pkg>sci-libs/mkl</pkg>.</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-python/numexpr/numexpr-1.4.2.ebuild b/dev-python/numexpr/numexpr-1.4.2.ebuild
index 945fb5f88d92..b4059ec383d8 100644
--- a/dev-python/numexpr/numexpr-1.4.2.ebuild
+++ b/dev-python/numexpr/numexpr-1.4.2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-1.4.2.ebuild,v 1.1 2011/01/29 09:36:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numexpr/numexpr-1.4.2.ebuild,v 1.2 2011/08/06 20:28:31 bicatali Exp $
 
-EAPI=2
+EAPI=3
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit distutils
 
@@ -18,22 +19,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="mkl"
 
-RDEPEND=">=dev-python/numpy-1.3.1
+RDEPEND="dev-python/numpy
 	mkl? ( sci-libs/mkl )"
 DEPEND="${RDEPEND}
-	>=dev-python/setuptools-0.6_rc3
-	>=dev-util/scons-1.2.0-r1"
-
-RESTRICT_PYTHON_ABIS="3.*"
+	dev-python/setuptools"
 
 src_prepare() {
-	# TODO: alternatively icc's mkl can be used but it fails for me
+	# 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
+		local ext
+		use amd64 && ext=_lp64
 		cat <<- EOF > "${S}"/site.cfg
 		[mkl]
 		library_dirs = ${MKLROOT}/lib/em64t
 		include_dirs = ${MKLROOT}/include
-		mkl_libs = mkl_solver_ilp64, mkl_intel_ilp64, \
+		mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
 		mkl_intel_thread, mkl_core, iomp5
 		EOF
 	fi
@@ -41,7 +42,8 @@ src_prepare() {
 
 src_test() {
 	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" ${PN}/tests/test_${PN}.py
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \
+			"$(PYTHON)" ${PN}/tests/test_${PN}.py
 	}
 	python_execute_function testing
 }