gentoo resync : 30.05.2020

3 files changed, 37 insertions, 10 deletions

diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 7f2bc4aced81..e94f12c8da42 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,7 +1,8 @@
+AUX zstandard-0.13.0-compiler.patch 770 BLAKE2B 43ef34c46cf54d5e872c74a12870a3dfba561ea1e91aa0b950dfcdd5f08d68c4a8dceaac3617dd2aa9fd4f05c1c3a556c194c37863bb1dea46e8bd289d35a0f2 SHA512 83eed984669604d84a597c93a86539b6768199947c9e742105fe6fd6eff667e2b738b889ca99165b50cd9b35b804fbaddcc19c15aaeeca0085452f42667631a9
 DIST zstandard-0.12.0.tar.gz 648827 BLAKE2B bb644150e4126997d447dad3e5aec9f6e15ee344366634772d75b246a9ab82fad13f85ce986f36e45331fff26449b05a0864ad77d949def8cb024f598a218c74 SHA512 ebf896a77ce5cdc82a1edb658a0b96bcf99deee7aa031163879fc21fe3d03623061182fd2c11840a5a46a8ad0a08b98b802b4703b963d448a25c0b52685d3b64
 DIST zstandard-0.13.0.tar.gz 659422 BLAKE2B 8ebdb7f7ca1671fa87cc1bb8a67cde4f408c49b9146041ca2a713a1457d9a4acfed5335484294d61b076f4a8e42ab3b2bcd0d09b4af54fca3a82a511c73d6d83 SHA512 3a6151de640515f21626d150e1295c1f2e524d377b3b1ccabf2719fae6da89f95480a50ec80eac4d07d317c7abe50ed7a26162b3291169e139c4ddd71b6ada98
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
 EBUILD zstandard-0.12.0.ebuild 859 BLAKE2B 97e7550806562e05879ba14d5fd2794d2b24607b87c8bfc582bd405740c7843a4e1a23802bdf23020662ac4e7931778819771be6ecab6ff5c5b5cb83c11e4ff2 SHA512 3bfd23c6f6ebea1c12ef618449915e6103f2b304a92e8ee56707d8938d5542482a6d4a35baac041c7884c348fd41047033ccb21fc181f89dcefa80a9dd07f2da
-EBUILD zstandard-0.13.0.ebuild 869 BLAKE2B 25d6e6b2afe4cb829c19ef1ac117fb17e485fe6ae8280fc1566827e4ee23e734c3ddc297910b1b63fea5d1032bb98596886dc8bccaf8706bf2a0e3607a0ce912 SHA512 00b425da1a46edcf771326b1d5239f503cf03a89f21dd946bbdff50597e7d8e819234287b821898760e9d4aa41148bb0b56b496552855643d6ab6bfea11c9cd6
+EBUILD zstandard-0.13.0.ebuild 909 BLAKE2B b6c7d84d886f4eb8307fc56cabd8d75ed14ecd46b65d483beccd816f7a8e161654acd56391c5669bc887b3e0a65416f92975285e340884530c45aeab0ff69619 SHA512 e624b56e8a256cd7a8e1c46bd30e8c1d698a99afe018a3b73d24d30016a2ddaf2f59a3e974a4f017ce3d5db618eb153c680ea84a74814dff77f362f0d8ab88f5
 EBUILD zstandard-0.8.1.ebuild 664 BLAKE2B 1b8903a1d059e9e3f8a903784a03658d733fb55648acd4c9b5fa49e89e49898263a48b77c38ef38d50612102b8d7cf46ff140b28ffa14890be691baeed24e4f5 SHA512 b8da1b96c32dda93794ee527971e607500097b8227f0e9cbb5dfac03ee4ed6a81846b60f88a295f31753bfad5d913adf49831bf61d946362ad4b54040e829c56
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch b/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch
new file mode 100644
index 000000000000..fdaa4aa03922
--- /dev/null
+++ b/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch
@@ -0,0 +1,26 @@
+diff --git a/make_cffi.py b/make_cffi.py
+index 0db4f71..4fe9cc4 100644
+--- a/make_cffi.py
++++ b/make_cffi.py
+@@ -8,6 +8,7 @@ from __future__ import absolute_import
+ 
+ import cffi
+ import distutils.ccompiler
++import distutils.sysconfig
+ import os
+ import re
+ import subprocess
+@@ -75,10 +76,12 @@ compiler = distutils.ccompiler.new_compiler()
+ if hasattr(compiler, "initialize"):
+     compiler.initialize()
+ 
++distutils.sysconfig.customize_compiler(compiler)
++
+ # Distutils doesn't set compiler.preprocessor, so invoke the preprocessor
+ # manually.
+ if compiler.compiler_type == "unix":
+-    args = list(compiler.executables["compiler"])
++    args = compiler.compiler
+     args.extend(
+         ["-E", "-DZSTD_STATIC_LINKING_ONLY", "-DZDICT_STATIC_LINKING_ONLY",]
+     )
diff --git a/dev-python/zstandard/zstandard-0.13.0.ebuild b/dev-python/zstandard/zstandard-0.13.0.ebuild
index 2b6a5215994b..9a1047476527 100644
--- a/dev-python/zstandard/zstandard-0.13.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.13.0.ebuild
@@ -14,19 +14,19 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
+BDEPEND="
 	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
 
+distutils_enable_tests setup.py
+
+PATCHES=(
+	# https://github.com/indygreg/python-zstandard/issues/103
+	"${FILESDIR}"/zstandard-0.13.0-compiler.patch
+)
+
 python_compile() {
 	local MAKEOPTS=-j1
 	distutils-r1_python_compile
 }
-
-python_test() {
-	esetup.py test
-}