gentoo resync : 12.03.2021

3 files changed, 11 insertions, 44 deletions

diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 472a137565bb..1a8d8f54cb25 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,11 +1,9 @@
 DIST zstandard-0.14.0.tar.gz 676761 BLAKE2B f90fcee6571f89eb5964ba50c722be8f3b846a0aaa6f79bd41389131ce332a4c6f7ec3d2eabd16268a42d211c7c02c2f7379019ef44272eb23cc74a20e5e9b3d SHA512 57c62eb7dedde2a2178f79a5658b87b5c5f176b282311273953003824272afa03e126a79b57fc8b75e9e15585d44d6b9931318a8ea5e7c75ec0feebbd7eb6cf0
 DIST zstandard-0.14.1.tar.gz 676849 BLAKE2B ad2a89371301e64428de90adf8770ebb7b43b06d720f5e0e9b490dc8771c55a974625105128c3a8052d68230d2670a802adfbf64708729440fdf624ca8d4fccb SHA512 e49f294816f0c7da35914363dbbdfcc4d432f7fa8367192e07a5d0c093ec8af76966fd0a95b4e8316091f056a8027c383ca73cc9ed506b29e2f9a31bc9ad3379
 DIST zstandard-0.15.0.tar.gz 990208 BLAKE2B d31a4c3cec60b642ec8c3a85b9038d6b0153e2be25696591db1a8e8f45b44018e370eb10bc4a902df3da03048a26ad55b2358d3b9912b1802c61bb63ce920523 SHA512 2de5a2047b1a9a146160bfa1cc50adb0ae1ddf23ae346b22d49b04e38987f90dcbb1f15d75c486fb37bf7084de66ebe19d917a37515dedac462102543533c407
-DIST zstandard-0.15.1.tar.gz 992126 BLAKE2B 7f6e987402bb5ddada70b56660d6e9d4eb5cd17dfa0041323ba2ef75bdb5362e7bc4fc8415132079a929e34fefdb654860088356b38dc0546b7c4f7108f93252 SHA512 7aabe647fa8c9a696084da6544c27287fe7d57e3a0ce2594c061fd20136e147ded4ea3da3648f6ef93c49636edc1d04ca4f29561514fb13f1a5d0340cd51996b
 DIST zstandard-0.15.2.tar.gz 1012864 BLAKE2B 3239a7003d8869182becbaf952b43da8923518e4b5202b115d59fc1492d26bf9703c1ea2dcf525459da023470c134c70525bd040a2d728d24861f7bc1e3a8948 SHA512 0102f3522145c80ec096e9dfac34a5bdd2a98b43b50b8c1e99bcfb0057904c551ababeeb82ced5f8b65945d42b39479cbc29472058679af1f8f91b68ae79f70f
 EBUILD zstandard-0.14.0-r1.ebuild 777 BLAKE2B aa61d4659110f07d40acfdd5e3c31e8557138ed9266323337d957dd588a838e8bd5eccab02d6aac549f014d7819fe5b50f90f782c02b51b806dd28b39e65bb91 SHA512 3e4cba50c243d2604b53eb5b284343427aaf1912c4cf1362ae8cdc19d3475c6e293ccb383ca64c7a95763606739ea4b7628c0e698cc4b95330de16ac27673f45
 EBUILD zstandard-0.14.1.ebuild 779 BLAKE2B fc38dda68bc290c1dfe450b3733eee2eb241ef7e213efe3e8cb60f5a47de6034f11b0822e04e61774bea2a17562d0d1332f393352913d77bc800d33cc4fc625f SHA512 ad392c8eaba60a3fc905840b17e50876ca98bdbb109998095eff564eec8cb2e39d742fd314f3786a5afe924e369703f7b160abf630a0cd2dfb664f343c940705
 EBUILD zstandard-0.15.0.ebuild 783 BLAKE2B 89e7f68224ee060cca75e92bc1bc714b1163752204f9fbc9184463325847006ac516874eee2b5cbaac862cd0a9cd30767667843ed3b9b26edcf131643ff4e14d SHA512 f88092d3e344b66f42082d85880fb3ca6ff7c3856efbc662a660ecebaa765e05d8726210cea88dc50d4fb0a9725f639c763961ec7fc609854711ed98b4d5b118
-EBUILD zstandard-0.15.1.ebuild 941 BLAKE2B 2c85553683b281b0c3b0dfee4470fd744bf190abc68776ec50cb036af83d468848d2362a45223807b5ca78b79e2c396b94def1248bfe6937786eb7081a59bd17 SHA512 1bad138a1524b76d9be258e3e16572f693538a713d47a8fd61c940589a9ee6332df343bf428bdbd601efeea4aa362dbd05415fe02d698646faaa9329e56a145c
-EBUILD zstandard-0.15.2.ebuild 942 BLAKE2B d6fc0d52c313571d68b6c4a0b8c71af11d311f8dc0ec090757b40b25fd1b13aa0a5d48867fb90fe7da6882db7d83b81e902ae4c0425166cf93473b1a7b1110bb SHA512 6de2881097963a26b9c79282272190a2a6ca2bea90f891c43017d5b9acf9b6792c95615bd825b44a72556b6b38dbca157d60c092b86960caf117073af907baef
+EBUILD zstandard-0.15.2-r1.ebuild 1049 BLAKE2B b08d6bc0fc7dd761c0555ae913feec4e2d9efc7466ff9a63b05d0eb23bc400e7fc75c3747b74438a61e5d9444f2cb27f9f73ec65e70b99d4a0576b864ad8f5a3 SHA512 20ef99bb5f972af33cae31a00d4959ca6774a2b5c33eb41363ec380354915fbab2048ea6e949f6c25b4445517af3048b5ae6e8fa2e1286ab0d4217c6c8a436db
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.15.1.ebuild b/dev-python/zstandard/zstandard-0.15.1.ebuild
deleted file mode 100644
index 1bc00826f8c2..000000000000
--- a/dev-python/zstandard/zstandard-0.15.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	app-arch/zstd:="
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]' 'python*')
-"
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-python_compile() {
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile --system-zstd
-}
-
-python_install() {
-	distutils-r1_python_install --system-zstd
-}
diff --git a/dev-python/zstandard/zstandard-0.15.2.ebuild b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
index 605c6dd344ad..1fe9edfd1a63 100644
--- a/dev-python/zstandard/zstandard-0.15.2.ebuild
+++ b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
@@ -25,11 +25,15 @@ BDEPEND="
 
 distutils_enable_tests setup.py
 
-python_compile() {
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile --system-zstd
-}
+src_prepare() {
+	# the C backend is repeatedly broken, so force CFFI instead
+	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
+		-i zstandard/__init__.py || die
+
+	distutils-r1_src_prepare
 
-python_install() {
-	distutils-r1_python_install --system-zstd
+	mydistutilsargs=(
+		--no-c-backend
+		--system-zstd
+	)
 }