[gentoo-commits] repo/proj/guru:dev commit in: dev-python/orjson-bin/

[Shaoyu Tseng]

commit:     105c4f33190043c2c3210ccc0591c0ec5830b2cb
Author:     Shaoyu Tseng <shaoyu0209 <AT> tuta <DOT> io>
AuthorDate: Sat Jul 31 07:22:26 2021 +0000
Commit:     Shaoyu Tseng <shaoyu0209 <AT> tuta <DOT> io>
CommitDate: Sat Jul 31 07:22:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=105c4f33

dev-python/orjson-bin: fix multi-impl install

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Shaoyu Tseng <shaoyu0209 <AT> tuta.io>

 dev-python/orjson-bin/Manifest                |  4 ++--
 dev-python/orjson-bin/orjson-bin-3.6.0.ebuild | 33 ++++++++++++---------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/dev-python/orjson-bin/Manifest b/dev-python/orjson-bin/Manifest
index 665d13755..2fce030d8 100644
--- a/dev-python/orjson-bin/Manifest
+++ b/dev-python/orjson-bin/Manifest
@@ -1,2 +1,2 @@
-DIST orjson-bin-3.6.0_aarch64.zip 218609 BLAKE2B 
880852a268f833b906bb6ef1cd7c9f2f40fe6ce043f52a8a7bdf965b4274a2ac0c215849b55da994f8bb328b903bc4a6a9414d0c3f16cb1a9be4f5c029e5b632
 SHA512 
70382465c3676fe3722688e0c223de3c86bb4555c1c996dd586aa782a3ecd3f6003a5c0f4154bfe90c18b2d4027b0a2c169b97315206e656a48557a5415eabd2
-DIST orjson-bin-3.6.0_x86_64.zip 235974 BLAKE2B 
8d80d7b40fa87be2b5a6b25840c02392e411dbce45247e46ebbfef94c15fd9e1596ba7ac6a40a53dde775f68d82b6c66c7350b392ce0f07ad92bb6ae65455767
 SHA512 
e80a7e0c785d6927a1d971553d04fca75e4b13fe5fb099ab362465cdfea69e911918ce94a480e9fead564a795f4a96a594918f4326e407f015b7d3c00ff08764
+DIST orjson-bin-3.6.0-amd64.zip 235974 BLAKE2B 
8d80d7b40fa87be2b5a6b25840c02392e411dbce45247e46ebbfef94c15fd9e1596ba7ac6a40a53dde775f68d82b6c66c7350b392ce0f07ad92bb6ae65455767
 SHA512 
e80a7e0c785d6927a1d971553d04fca75e4b13fe5fb099ab362465cdfea69e911918ce94a480e9fead564a795f4a96a594918f4326e407f015b7d3c00ff08764
+DIST orjson-bin-3.6.0-arm64.zip 218609 BLAKE2B 
880852a268f833b906bb6ef1cd7c9f2f40fe6ce043f52a8a7bdf965b4274a2ac0c215849b55da994f8bb328b903bc4a6a9414d0c3f16cb1a9be4f5c029e5b632
 SHA512 
70382465c3676fe3722688e0c223de3c86bb4555c1c996dd586aa782a3ecd3f6003a5c0f4154bfe90c18b2d4027b0a2c169b97315206e656a48557a5415eabd2

diff --git a/dev-python/orjson-bin/orjson-bin-3.6.0.ebuild 
b/dev-python/orjson-bin/orjson-bin-3.6.0.ebuild
index 60742f444..526e5a4b8 100644
--- a/dev-python/orjson-bin/orjson-bin-3.6.0.ebuild
+++ b/dev-python/orjson-bin/orjson-bin-3.6.0.ebuild
@@ -4,22 +4,24 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..9} )
-inherit python-r1 python-utils-r1
+inherit python-r1
 
-MY_PN=${PN//-bin/}
-MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, 
datetimes, and numpy"
 HOMEPAGE="https://github.com/ijl/orjson";
 
+# As per PEP 600 manylinux platform tag specfication, a wheel tagged
+# manylinux_x_y should work with systems with >=glibc-x.y , and on Python
+# versions 3.8 to 3.10
 SRC_URI="
        amd64? (
-       
https://files.pythonhosted.org/packages/cp310/${P:0:1}/${MY_PN}/${MY_P}-cp310-cp310-manylinux_2_24_x86_64.whl
 -> ${P}_x86_64.zip
+               
https://files.pythonhosted.org/packages/cp310/${P:0:1}/${PN%%-bin}/${P//-bin}-cp310-cp310-manylinux_2_24_x86_64.whl
+               -> ${P}-amd64.zip
        )
        arm64? (
-       
https://files.pythonhosted.org/packages/cp310/${P:0:1}/${MY_PN}/${MY_P}-cp310-cp310-manylinux_2_24_aarch64.whl
 -> ${P}_aarch64.zip
+               
https://files.pythonhosted.org/packages/cp310/${P:0:1}/${PN%%-bin}/${P//-bin}-cp310-cp310-manylinux_2_24_aarch64.whl
+               -> ${P}-arm64.zip
        )
-
        "
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -32,23 +34,18 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="app-arch/unzip"
 RDEPEND="${PYTHON_DEPS}"
 
-S="${WORKDIR}/"
-
 pkg_setup() {
        python_setup
 }
 
-src_install(){
-       insinto "$(python_get_sitedir)"
+S="${WORKDIR}"
+
+src_install() {
        if use amd64; then
-               doins orjson.cpython-310-x86_64-linux-gnu.so
-               dosym  
$(python_get_sitedir)/orjson.cpython-310-x86_64-linux-gnu.so 
$(python_get_sitedir)/orjson.cpython-39-x86_64-linux-gnu.so
-               dosym  
$(python_get_sitedir)/orjson.cpython-310-x86_64-linux-gnu.so 
$(python_get_sitedir)/orjson.cpython-38-x86_64-linux-gnu.so
-               dosym  
$(python_get_sitedir)/orjson.cpython-310-x86_64-linux-gnu.so 
$(python_get_sitedir)/orjson.cpython-37-x86_64-linux-gnu.so
+               ARCH="x86_64"
        elif use arm64; then
-               doins orjson.cpython-310-aarch64-linux-gnu.so
-               dosym  
$(python_get_sitedir)/orjson.cpython-310-aarch64-linux-gnu.so 
$(python_get_sitedir)/orjson.cpython-39-aarch64-linux-gnu.so
-               dosym  
$(python_get_sitedir)/orjson.cpython-310-aarch64-linux-gnu.so 
$(python_get_sitedir)/orjson.cpython-38-aarch64-linux-gnu.so
-               dosym  
$(python_get_sitedir)/orjson.cpython-310-aarch64-linux-gnu.so 
$(python_get_sitedir)/orjson.cpython-37-aarch64-linux-gnu.so
+               ARCH="aarch64"
        fi
+       python_foreach_impl python_domodule 
${PN//-bin}.cpython-310-${ARCH}-linux-gnu.so
 }
+