gentoo resync : 25.08.2020

3 files changed, 2 insertions, 71 deletions

diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 235bd9e00cc0..f782d6ebe1e3 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,5 +1,3 @@
-DIST numexpr-2.6.9.tar.gz 94419 BLAKE2B 22492c1c59306fbd93174b5bab2ffaa32628c52cc570871bd6192a4589b65b6f679a77c8ec6f37b0a2ac09f004364a2ba87ecc26f459cb2d4b3b2705196b9fdc SHA512 d43845fb63c1e7b645b282d251f7f112784dbc04b61af1ffcbb9646cbe2e3a9f5d38aaa000f7d49880abe44c25205a6ef1e284577d36868220a197cdc0e55166
 DIST numexpr-2.7.1.tar.gz 99196 BLAKE2B 14912a0a50a46c085215f0a40467371859aedeaaf999f747d735df4c244529709b26c1257d3c5c05ed0ceea801d117bf6a330dbd30573fe274522e1101e2f4b3 SHA512 e8852ed1c7bd7f7e94ce5ad78de7a8a7ca30a5873dbfa4fae0a179fbcf956b1e66f2a09c1785f0d8d9e83a5cba359a55840a21784bc225aa01915a322709d370
-EBUILD numexpr-2.6.9.ebuild 1384 BLAKE2B 1079484cc597630dc930b9d9e497bef95903cbb8284ef5aca62a1ef95f452f3bda92fcf9ecece5eb00e53e5197dbf43e6ee5b3fbb37942454ceb27eb3b4cd343 SHA512 f57becdfa8847a6752dc1194d4157fb3f9eabd8375260a73de18a2f9af889a42542c53b95089b8b95eb7d4c9e94675f4cefa1d3f82f49ce0abfecea0e5b7dc25
-EBUILD numexpr-2.7.1.ebuild 1389 BLAKE2B ec2700682d0d4543d6c251436e93d17d922fa303888e22d24e30700d9c2c245e91f3dfe8371389a6c89d8b88b9504052d491f8019bad1c6185c3132c8d9b2bfe SHA512 fa0060822e1eec5609c171bd5b46dbd4aabbbb8a1701dc6e5ae837638e97d94d3c33f16c2f18ab26c4750ab30a62c137c35f5ca801cf366b762837c9a18a75ad
+EBUILD numexpr-2.7.1.ebuild 1246 BLAKE2B 1e124b05528f9319c99830af4d83c5c433742bab7ae7478d5c470ee3db84404fe46ef662dad1b19d87a241d82bfd8f92bbc6a3f8ad7ca7da49c457d2ade8d899 SHA512 865b624119189e888976b489b6f3c41c10854eea18d760a99f50d0c20a6dc4f909357c0c1e23ded979873de7c5e2dd06af0fe076e6bd5466fdc1f996c674cf3f
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.6.9.ebuild b/dev-python/numexpr/numexpr-2.6.9.ebuild
deleted file mode 100644
index 315336382eea..000000000000
--- a/dev-python/numexpr/numexpr-2.6.9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-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,numexpr;sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
-		|| die
-	pushd >/dev/null || die
-}
diff --git a/dev-python/numexpr/numexpr-2.7.1.ebuild b/dev-python/numexpr/numexpr-2.7.1.ebuild
index 138fd440b66e..eed440f7e010 100644
--- a/dev-python/numexpr/numexpr-2.7.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
@@ -42,15 +42,6 @@ python_prepare_all() {
 	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}" \