gentoo resync : 03.03.2019

3 files changed, 9 insertions, 69 deletions

diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 3908d27fcddc..a67c79add516 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,7 +1,5 @@
-DIST numexpr-2.6.1.tar.gz 90819 BLAKE2B 833402388e184bd38c449bcda866f68858f486d5cf30aec29dc5e9827a34a40cb166128a8fb217f0ed1614e0b759cf2164e31cb2a16198ea3e6a216c9fe01853 SHA512 07c88b1788ecad2c59260e7a6a15dfc21d486462a8866091d157286e5ce3b5b77f5fdab401fd30e2a5e4880398af53641d557003497c7d3658421bfcff38c31c
-DIST numexpr-2.6.2.tar.gz 90970 BLAKE2B 85034d7d36bd921df289f817451e7b30071b9d448dc050e4f25afd13315921e3c10d61a41983cf106606e4efd91504e94ca7d8f01d80b230a9f717f41eb687ee SHA512 730e19e61987ecb00bfc3a65db043c88a1311046f2ea5f0a48c93d6a8d7576dbaa166b0b9b0f547e344b21b5c269be1b5aa2097e88aaac55219884c7ece55261
 DIST numexpr-2.6.8.tar.gz 94517 BLAKE2B b41593183d69cd98f81107da5abc3eb59b35c6e61c0dde213c9a201c2776e4684d8af4b1a88c59ca464a7755941de9baf2157af64e8662c4219ae8ece635aefb SHA512 e610a2e3891f12b3a9fd7acb14a0362e0f03084035aa274827ec5e7d2584f2c599493afaf406d8720d915c7ed834dca11b1fbf28c0645077eb63223a2bf52cf9
-EBUILD numexpr-2.6.1.ebuild 1385 BLAKE2B 1331948ae46b9d20c3122e5d779bc00db85bd11dfca73f63ca80d1fdf27f43c6fe2297dc0556d0bc0b0275516052608f07ebd6f323b95e89c40ae8781f63078d SHA512 dba9ff2f89c309efd420ef478a1fb8bd75036eeeb66d758c008ca5e8dc33d43f95886fb8883feeec7861108b8173f54b764852f1c5993e19f30d8cff9213e50a
-EBUILD numexpr-2.6.2.ebuild 1386 BLAKE2B 2f3ce14437912a42c9ad770eda3f731f087e6eef4b6ede44a043bc9021ed04357550c25cd2bfd4f330e3ffbade391b8cacbc66516cbbd89a8d084b7c47cd70ae SHA512 4abad8046ecb5c969258e37b7884c990ea5e833250e377c9a35d493a85315eefef50d2feddd236161ad8c5142d04480509b3651356be3d881422e9bbff53b064
+DIST numexpr-2.6.9.tar.gz 94419 BLAKE2B 22492c1c59306fbd93174b5bab2ffaa32628c52cc570871bd6192a4589b65b6f679a77c8ec6f37b0a2ac09f004364a2ba87ecc26f459cb2d4b3b2705196b9fdc SHA512 d43845fb63c1e7b645b282d251f7f112784dbc04b61af1ffcbb9646cbe2e3a9f5d38aaa000f7d49880abe44c25205a6ef1e284577d36868220a197cdc0e55166
 EBUILD numexpr-2.6.8.ebuild 1389 BLAKE2B b67c872736890b18124bd50e41ec2dc8645a12a246bd3e6eaaea0969abd5e8e88d68b4dde023db11425fbba50c36dba8c695b68665bb44c40ce28ec4e318e98b SHA512 736d27ff162abf6ca4a3ea4e97a28e4e613ed61d9d5ed46697f4e3fd9d9c431df106c8da77ef26026cac873dff409ae8774f71d49b85bdcdd8af278d1c68949e
+EBUILD numexpr-2.6.9.ebuild 1400 BLAKE2B 738827dc6d6f5d699356709a86cfea4cb817c07d869fa81eb721059af4571ac8317992e1cbd41b8f46921f603173d5dbe77cfce3c2fbc82b4d98b7769f9ce937 SHA512 18303b7a41c64d8712e2d147789ec9fe803240f9bfbf60e89858d52b27864990a41a33a4ab23a54fff4f90b906047e048d46c473617b0a51a5750d0d90230a58
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.6.1.ebuild b/dev-python/numexpr/numexpr-2.6.1.ebuild
deleted file mode 100644
index 453de3de466f..000000000000
--- a/dev-python/numexpr/numexpr-2.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
-HOMEPAGE="https://github.com/pydata/numexpr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="mkl"
-
-RDEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	mkl? ( sci-libs/mkl )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-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
-		use amd64 && local ext="_lp64"
-		cat > site.cfg <<- _EOF_ || die
-		[mkl]
-		library_dirs = ${MKLROOT}/lib/em64t
-		include_dirs = ${MKLROOT}/include
-		mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
-		mkl_intel_thread, mkl_core, iomp5
-		_EOF_
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS}"
-		append-cflags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" \
-		-c "import sys;import numexpr;sys.exit(0 if numexpr.test() else 1)" \
-		|| die
-	pushd >/dev/null || die
-}
diff --git a/dev-python/numexpr/numexpr-2.6.2.ebuild b/dev-python/numexpr/numexpr-2.6.9.ebuild
index 93836f5e9c2b..6e0eb002483f 100644
--- a/dev-python/numexpr/numexpr-2.6.2.ebuild
+++ b/dev-python/numexpr/numexpr-2.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,11 +29,11 @@ python_prepare_all() {
 	if use mkl; then
 		use amd64 && local ext="_lp64"
 		cat > site.cfg <<- _EOF_ || die
-		[mkl]
-		library_dirs = ${MKLROOT}/lib/em64t
-		include_dirs = ${MKLROOT}/include
-		mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
-		mkl_intel_thread, mkl_core, iomp5
+			[mkl]
+			library_dirs = ${MKLROOT}/lib/em64t
+			include_dirs = ${MKLROOT}/include
+			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+			mkl_intel_thread, mkl_core, iomp5
 		_EOF_
 	fi
 
@@ -52,7 +52,7 @@ python_compile() {
 python_test() {
 	pushd "${BUILD_DIR}"/lib >/dev/null || die
 	"${EPYTHON}" \
-		-c "import sys;import numexpr;sys.exit(0 if numexpr.test() else 1)" \
+		-c "import sys,numexpr;sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
 		|| die
 	pushd >/dev/null || die
 }