[gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe-bin/

[Michał Górny]

commit:     ed51593239405d0d33570dfeb329e6ec30c5c728
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 16:56:44 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 16:56:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed515932

dev-python/pypy3-exe-bin: Add musl binpkgs

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pypy3-exe-bin/Manifest                  |  4 ++
 .../pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r2.ebuild | 61 +++++++++++++++-------
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 9b1658c8c73b..c02df520bbbd 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,4 +1,8 @@
+DIST pypy3-exe-7.3.9_p3-1.amd64-musl.xpak 12452882 BLAKE2B 73be01098cc4295e63b76fd7f542e9002ff6929220f02d86f99f051c76edabec68e0ed97695fe68d56a082e5bd915d9e68e04ee1dc7e1a3d8120a76ccf5f6e3f SHA512 9c6eb74844ed021dabf11998690e3099d6c37930378c1869726d96451a3847fc2bd60df06a3d7234b2fa182e4294328f292f4c24bdc49a4e5baa7ae3a0704805
 DIST pypy3-exe-7.3.9_p3-1.amd64.xpak 12394274 BLAKE2B 8f7a041839fdd1dd55fd0293660369310aaa1f118e34a730e066899c09ced71fa37d70d59952fb68d932f63e907b903c41c91b5ba4d646637fcfe628a20861b2 SHA512 166722fec0288b8c69645e0c8e630aa4c0b74f8d41817148147556ce6f0491e7251cbc202b62f7a1dec6b1da3e2f2c6313f02952b11220f35be2c1ad6276f89a
+DIST pypy3-exe-7.3.9_p3-1.arm64-musl.xpak 10473390 BLAKE2B 0d791a39850c51ff914885e5bff4a3f44164b77df4771db968b90e144857c8a045df3a61ebe0e386c3aeb3c63b45ccfbb58d5b4811a0a1aeadb75335a6bb586c SHA512 9f3c871d0b624d1f2f65933f85fad9d177046ad96a206e9ef1bd40c5fbac09144f1d87685cac9f31a19b4f1ec25b62477675cce9a99d4fb2cc5eef86578d4655
 DIST pypy3-exe-7.3.9_p3-1.arm64.xpak 10482599 BLAKE2B c48c9a19db30315be223bfc1121bc9a0300c91c511678a1d11bcf3a1601a3d1fd7d7852cc196d22650ec4ab4234d68f7a9046b01bf2f4f1f7104ae2d31797e9e SHA512 3200f7faf3b9c2211d828f6c434775138a1543a75b2ff4403c896f4941682ff40e16242045ec65908540b6537711c459ce7b0fdcdc201bc9768b2521bbe4cedb
+DIST pypy3-exe-7.3.9_p3-1.ppc64le-musl.xpak 6663514 BLAKE2B c8778a594f9999be4efe398901c5deab7fa22475faad55d047b995933708d861c0adf435d26c691f63ff49d8bf561081f96b64287846065bbcf8845c476ef909 SHA512 1feda175f90274fc214f9b018dddefdc40234ff398262a55523849c5f48bf543ab12fe86ac56e973900c39169e0d45d1150217a9b3597381f7e087af285f4811
 DIST pypy3-exe-7.3.9_p3-1.ppc64le.xpak 10930518 BLAKE2B fca375a3466ee51c9436587104d5f13cb4642a8efb347124fcc2880c2382bf56921889b2c3aa96f26d22fb734cbd27adcf5f0c8feeff92c2d625df1daaa38ade SHA512 ee33067b964c33701b687ace463cfc11795af37bf3302c8e3e2d1e0610728945d370f88d97d1ba3fd66ac9bbf905930857e78e5bc96c911d3a663c2e9c74a5cc
+DIST pypy3-exe-7.3.9_p3-1.x86-musl.xpak 9246639 BLAKE2B 7475f9a273157b55d1568e5d9f36a045969bb629047a8b8f478e6cd0e27bf2f46b0a141197047bd2779332acb5b36b069ad1bd371030a6a5d75b4dd0aadbb808 SHA512 783260846ec8057479808a7d7aab3c712ee6822293232099cfbe970cb3e8e5e3cf07ec08bb5ecd703c084c6a798dab70de5073146f8698430472196b351d19fb
 DIST pypy3-exe-7.3.9_p3-1.x86.xpak 9210827 BLAKE2B a740ef7e1d4559308c129399cda498b7c0fe8e654e4d36830ded5197a7788168dbc8b4f83908a41869cd51343dd9b371ba53de8e88655b2728b8f6351f502ef2 SHA512 bd2ef07e980bd37b7ecfb052a9304a80ee527c61f8a60344e8e9b1bfcdf1f50038e7b281257194c388e0452aa968f984f5b6bc7d9f7c89bf08279e9a169ed8e6

diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r2.ebuild
index 6a83f611cc92..4367d44c529c 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r2.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r2.ebuild
@@ -9,21 +9,41 @@ MY_P=pypy3-exe-${PV}-1
 DESCRIPTION="PyPy3 executable (pre-built version)"
 HOMEPAGE="https://www.pypy.org/"
 SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
+	elibc_glibc? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.amd64.xpak
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.arm64.xpak
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.ppc64le.xpak
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.x86.xpak
+		)
 	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.ppc64le.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
+	elibc_musl? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.amd64-musl.xpak
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.arm64-musl.xpak
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.ppc64le-musl.xpak
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.x86-musl.xpak
+		)
 	)
 "
 S="${WORKDIR}"
@@ -36,10 +56,10 @@ RDEPEND="
 	app-arch/bzip2:0/1
 	dev-libs/expat:0/0
 	dev-libs/libffi:0/8
-	>=sys-libs/glibc-2.35
 	sys-libs/ncurses:0/6
 	>=sys-libs/zlib-1.1.3:0/1
 	virtual/libintl:0/0
+	elibc_glibc? ( >=sys-libs/glibc-2.35 )
 	!dev-python/pypy3-exe:${SLOT}
 "
 
@@ -49,10 +69,13 @@ QA_PREBUILT="
 "
 
 src_unpack() {
-	local pkg=${MY_P}.${ARCH/ppc64/ppc64le}.xpak
-	ebegin "Unpacking ${pkg}"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${pkg}")
-	eend ${?} || die "Unpacking ${pkg} failed"
+	if [[ -z ${A} ]]; then
+		die "No binary package available for ${ARCH}/${ELIBC}"
+	fi
+
+	ebegin "Unpacking ${A}"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${A}")
+	eend ${?} || die "Unpacking ${A} failed"
 }
 
 src_install() {