Merge branch 'edge' into next

3 files changed, 19 insertions, 76 deletions

diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index f5040713af32..5159470ec73c 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,9 +1,8 @@
 AUX llvmlite-0.15.0-use-system-six.patch 1274 BLAKE2B 366bc8425139e8b56d4bae78e21088b49d1bab059c2a246497f45ea377aefd3df1bdfe3dbc9692eb5d00538466aee689118b907d01a45f211ea26ed6c7215992 SHA512 5db6b819e0a9e0d6b7963272ef7fd9c9fee778cb4c2d577325de6602e7a283a98752e870b83df4978d063c84b73045e2f65bc9aeb482dd487255efe24792db69
-AUX llvmlite-0.28.0-llvm710.patch 2095 BLAKE2B 78b009a935b9014da648fae3a077cba7db8f3469d2c49509bb8d5f97f139bcf5d91b9c727ee74a114e191bcf79ea2d848953fac45a07d19e1bcdcff83107e819 SHA512 d09485b7e93bc9cf3bcf89dbe734934ff4fbc634142408ed54544d0c3a0b7fe3700dd227bdad2d3fa4585898c60da2e46c097877b9620838678bc40d3bf0034a
-DIST llvmlite-0.28.0.gh.tar.gz 191141 BLAKE2B 23c86c28311a4e8c7f9c209a7ed7816ad5002c26f9fda7a47cf2b54c4578db28ed0781b54a716726db8a7c1abce79a79a99c3f5bf4be2a61d547eb74d06cb507 SHA512 c00c767c80a507975a055088ca4328766c992e7267219dea54376daf5eb11397532b243352976d3569185149007650d5e94839b61aa55502e1991f72b1ba492a
 DIST llvmlite-0.29.0.gh.tar.gz 196507 BLAKE2B d4870ca042d446857b7409c0c50c370458747ee744c24611e88da4bc8780c26125b2e8db3db7fe9d4f553f9aae5769b62effe1ac94cfaf234bab54d43c8086e9 SHA512 8735b46b1a3053b89306bf6e05c8c6c375d15371d33635f1d27e5533d7a78a85f773e04b7ed8d39ebab40a892c374839e1324665d81459cb797f760d6d2c81d1
 DIST llvmlite-0.30.0.gh.tar.gz 199354 BLAKE2B 71ba1b0572d115a28d838a7fa5daca136fb793d41cdebca5834d2977813b4a02837e99d8b1b48d0fa965c5d3bdfe7783314ecbd2a7e7075b82247ea5fa4f90a4 SHA512 e3a64a3170efe1bffb6eeb8d6cfdc5a9bf8cc9e123da0b317b6b8dd93dacd3a54d5117c22eca43226915e7ff2793ab66cdee00c5e6ada442d9c2f7fed6e40763
-EBUILD llvmlite-0.28.0.ebuild 1492 BLAKE2B 28f9c049ea004412bef5d5559287ae008064fe0676448d883bc1b423051174c181aed386c84ff2d5420539b55df57de21ad84076f2e16a788cf36874b12ed202 SHA512 fda3cd3615d98d121a436e0061fc0bfa5f51b7abd7b1a2696043bc582e8eb8f9f933f033afe2d192cf0088646ac7a472aa7304479e190280508695b98c1441c2
+DIST llvmlite-0.32.1.gh.tar.gz 194191 BLAKE2B 4d35ce0f4903a17285b6f6296f0260787cc102804f1144c1b329815d41ca7471e1942aaecac26f06aa76804cc1b8a77130063de22376c78f30819554e459716f SHA512 00ce075deb8048350f4d4ac23e2e8a629b7c12aefefe3855e430aaf5e2df8170cf97a043001397a84101a7d0065671b30eb327837b24f86dd36b855309c19bfa
 EBUILD llvmlite-0.29.0.ebuild 1451 BLAKE2B 0b5f4787b0ebd81640f9b71ce15b2ae93d14777ef20ae2cfee01b24cd1f22c125581759776ad0289d4581492b60be229f27a0e69e1f195c8af5fad719e1b77c2 SHA512 67dcd7ae4afc3b72fefa2484c7392d621866f7cad0fcba4c2f5732baf3f7c5be7f4af036e425167aab02acc366033ff87cbe87463a42ded54b8c85bc3a14ea17
 EBUILD llvmlite-0.30.0.ebuild 1455 BLAKE2B 16be8211b855c6ca41cd7fd86caebfecfe528c0fb9329b247b889aa6a4bbbbe0f67aa2a6548c9c951bd868820e0c98346aef663ccf9c2b2a4deb707f92237f87 SHA512 7d2fb4b689d6a1eccc89051d1beaf827ee18d271746b877c0bc95695ab373bc9aea9421ecdfaa31832a916676deb33863e0c515755593486c9032162733c8909
+EBUILD llvmlite-0.32.1.ebuild 1608 BLAKE2B 2f588519db4c9def2d1bff835cec129fc90a16ca4e9196172d319dae75ecb9331696d591338f80f5e1ec2be6e9374e1be4535a336b71329309c1119dade752f9 SHA512 21e7f355dfa1835cc64849a29fc37bcd2cc46354a25b524e770a0d0083db98f66ed8a7c911c7476b974c46229dcc18046df568440cdd43e190ddc8752475253f
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/files/llvmlite-0.28.0-llvm710.patch b/dev-python/llvmlite/files/llvmlite-0.28.0-llvm710.patch
deleted file mode 100644
index db06adb41c1a..000000000000
--- a/dev-python/llvmlite/files/llvmlite-0.28.0-llvm710.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 3845caca60120a8f9a094833e44bc4184b1d6827 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 21 Apr 2019 13:56:00 +0200
-Subject: [PATCH] Permit building against LLVM 7.1.0
-
-Restrict building to any 7.* version rather than 7.0.*, as 7.1.0 has
-been released that is API-compatible with 7.0.*.
----
- README.rst                     | 2 +-
- ffi/build.py                   | 4 ++--
- llvmlite/tests/test_binding.py | 3 ++-
- 3 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/README.rst b/README.rst
-index 2462e3f..8e551eb 100644
---- a/README.rst
-+++ b/README.rst
-@@ -70,7 +70,7 @@ Historical compatibility table:
- =================  ========================
- llvmlite versions  compatible LLVM versions
- =================  ========================
--0.27.0 - ...       7.0.x
-+0.27.0 - ...       7.y.x
- 0.23.0 - 0.26.0    6.0.x
- 0.21.0 - 0.22.0    5.0.x
- 0.17.0 - 0.20.0    4.0.x
-diff --git a/ffi/build.py b/ffi/build.py
-index 7d5247d..a87e857 100755
---- a/ffi/build.py
-+++ b/ffi/build.py
-@@ -109,9 +109,9 @@ def main_posix(kind, library_ext):
- 
-     out = out.decode('latin1')
-     print(out)
--    if not out.startswith('7.0.'):
-+    if not out.startswith('7.'):
-         msg = (
--            "Building llvmlite requires LLVM 7.0.x. Be sure to "
-+            "Building llvmlite requires LLVM 7.y.x. Be sure to "
-             "set LLVM_CONFIG to the right executable path.\n"
-             "Read the documentation at http://llvmlite.pydata.org/ for more "
-             "information about building llvmlite.\n"
-diff --git a/llvmlite/tests/test_binding.py b/llvmlite/tests/test_binding.py
-index 335c30d..134f356 100644
---- a/llvmlite/tests/test_binding.py
-+++ b/llvmlite/tests/test_binding.py
-@@ -339,7 +339,8 @@ class TestMisc(BaseTest):
- 
-     def test_version(self):
-         major, minor, patch = llvm.llvm_version_info
--        self.assertEqual((major, minor), (7, 0))
-+        self.assertEqual(major, 7)
-+        self.assertIn(minor, (0, 1))
-         self.assertIn(patch, range(10))
- 
-     def test_check_jit_execution(self):
--- 
-2.21.0
-
diff --git a/dev-python/llvmlite/llvmlite-0.28.0.ebuild b/dev-python/llvmlite/llvmlite-0.32.1.ebuild
index ccc4a40f973c..a733f9617dcc 100644
--- a/dev-python/llvmlite/llvmlite-0.28.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.32.1.ebuild
@@ -1,38 +1,39 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 llvm
 
 DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
+HOMEPAGE="https://llvmlite.pydata.org/"
 SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
+S=${WORKDIR}/${P/_/}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
-LLVM_MAX_SLOT=7
+LLVM_MAX_SLOT=9
 
 RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
 	sys-devel/llvm:${LLVM_MAX_SLOT}
 	sys-libs/zlib:0=
 "
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${P/_/}
+src_prepare() {
+	# test_version hardcodes permitted versions
+	# test_parse* relies on exact error message
+	sed -e 's:test_version:_&:' \
+		-e 's:test_parse_bitcode_error:_&:' \
+		-i llvmlite/tests/test_binding.py || die
 
-PATCHES=(
-	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-	"${FILESDIR}"/llvmlite-0.28.0-llvm710.patch
-)
+	distutils-r1_src_prepare
+}
 
 python_configure_all() {
 	# upstream's build system is just horrible, and they ignored the PR
@@ -48,6 +49,8 @@ python_configure_all() {
 ffi/libllvmlite.so: ${files[*]/.cpp/.o}
 	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
 EOF
+
+	export LLVMLITE_SKIP_LLVM_VERSION_CHECK=1
 }
 
 python_test() {