gentoo resync : 04.01.2022

5 files changed, 4 insertions, 90 deletions

diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index f7a2263ee01b..5de9e5f97efc 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,7 +1,3 @@
-DIST numexpr-2.7.3.tar.gz 114113 BLAKE2B 95dca4fbd3148bbf198f82827a63fac3e9de29f677457f2ad45040e24a38bb05e4e09738efa0cac793970e18bdcd252e2744da96062217fd35b4054b10112989 SHA512 8234a65ce96ea0a2f20cce7dce3de652362a9edc86af2e7a333cdd8ecd87866f75970859ff39b04d529acc062b806cc8c64f262c318edd2897200d7e54b429e7
-DIST numexpr-2.8.0.tar.gz 111765 BLAKE2B 20b56ce6b5c83a72c317c1b03c1084f64a2438deaeaf73a97afc8ab75abe0d3aa3721df8e7921568ff14c36fc0737e87be82951d1911f2eedee8f0e9fcad2fb8 SHA512 33f54eed99cab552c868cc5091ea76e13da12367507161713304f48b322289a01aeabe750f13501cc5654c6068c7e6220c6adeb8703fef174a445860f142614f
 DIST numexpr-2.8.1.tar.gz 111984 BLAKE2B b5d0b5bd5507c8c513db6404917b6256d9c8d232ea5d2f027f42cdac4a5e5c5f8c2db3d2283734f80d0ae7df2551314d088ccd2ed8e2c7401cc04a15ad61751d SHA512 243cddcb1fece9410e35c87a4c3f794ac0963ddfcc054b9a9c9842a2bb4e782d6c939f532d00d724d4b447d915764c3c8bbb87a99c71a22951798329aa7494bd
-EBUILD numexpr-2.7.3.ebuild 1255 BLAKE2B b627a54ae0bb254d923c7eb1b88b3e4f014ef39f9b9e5e89cf9b87e9dd17994f73ee0a218389514709d4069207b0a30341d8b3ffe213780b340ba627d9c3eeb8 SHA512 99f04465c79281fae7bcedd1f3918ebd87e4db9e98d7266532498d7be85268f7f265a051fc8420cd96e17e062a58024448b71f743d317f8f952664c45dc373bd
-EBUILD numexpr-2.8.0.ebuild 797 BLAKE2B 11e5c5cf14c11eb7fed74de0b404ef5a1b9b2363b6786a7f51f3eef70186115c8fbd791b9455bd559c6bc3a5c0780fe010e2bba3bc501fdb6d17753677c71572 SHA512 03cf4b240399e256844e51355774bb84005991230eca5a5922fafbb2551f0d7d444523f2b83fdf183fc1de33172e49e17d2e6bc838c25d0e74a54d85cd7fd2b7
-EBUILD numexpr-2.8.1.ebuild 876 BLAKE2B deec918815c7acf5cda73bc4bfc816e7431c409817bc53026fd554b0bc27cb878e85ae4ead36fb653f61c3f157cfcf347222b70855c15fe7d1c277f837225ef2 SHA512 4f611a5774fe55213283dada1498c14d83dcfb216d0e5d95ea314af259da9a679503c6b34adb7d5f61e58bad1992e4c6c4d6e8e17fb9de27215e324ec127c61b
-MISC metadata.xml 1087 BLAKE2B e8577eb0003f4e1f922e3d55b3d69420d296bee1045ab0940cb689e36478e6bf855226cd6ef441b95089d0d4be387447461734522fb0407e80995520a36c2d10 SHA512 8d9e918be571a024d23ecf8a9dceae02f8b507dc77bd59c55817e1b0fe21d844443fde424cbcc23a49780f2527de000474c3cddd650759ae24d80467d6937361
+EBUILD numexpr-2.8.1.ebuild 870 BLAKE2B a63cf031b557058f73fffaf610a327b4ccbf0f73e29b8ebcb512c22e37b419a68a68ceab419cc39f577c4d8105e13ef932e8caca64a7c67d938657962504b52a SHA512 91e9cd7c1353b24c6602584ac963ab93496ce843b415195987f1d0180c68cd4fc4c472ae50acce458f42f0926c39147733cc68b716aa0a2051f7f26b05118106
+MISC metadata.xml 961 BLAKE2B e94e9d69b1a1f5c1dca1e9d0d791b215c7a7ef8f8b42a00bd32e16ee9ba3379a1f5049a1539c8bfcfc7adb110b8179928c5a8273429550000b1a5e6f5cf4c897 SHA512 4e59af51f1f4a44de1289ae47dea1bb2461bc3ab860191e6ed8bc0c244e43cef766d571a903cbdf4e23b3b06bbd0d240b77d1234f30362fb26d1f7a43619dd57
diff --git a/dev-python/numexpr/metadata.xml b/dev-python/numexpr/metadata.xml
index ca0038cd8456..347c251f2861 100644
--- a/dev-python/numexpr/metadata.xml
+++ b/dev-python/numexpr/metadata.xml
@@ -18,10 +18,6 @@
   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>
-  </use>
   <upstream>
     <remote-id type="pypi">numexpr</remote-id>
     <remote-id type="github">pydata/numexpr</remote-id>
diff --git a/dev-python/numexpr/numexpr-2.7.3.ebuild b/dev-python/numexpr/numexpr-2.7.3.ebuild
deleted file mode 100644
index 0f0886287f5b..000000000000
--- a/dev-python/numexpr/numexpr-2.7.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-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="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="mkl"
-
-RDEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	mkl? ( sci-libs/mkl )
-"
-
-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_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.8.0.ebuild b/dev-python/numexpr/numexpr-2.8.0.ebuild
deleted file mode 100644
index 996ad208a7c7..000000000000
--- a/dev-python/numexpr/numexpr-2.8.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
-HOMEPAGE="https://github.com/pydata/numexpr"
-SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-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.8.1.ebuild b/dev-python/numexpr/numexpr-2.8.1.ebuild
index 1e6ee29f7c87..b25a00deb39c 100644
--- a/dev-python/numexpr/numexpr-2.8.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]