From 3af89efa2d033ea1250bbb8b4c285bcba6ac3dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Thu, 25 Aug 2022 18:53:07 +0200
Subject: [PATCH] dev-python/pypy-exe-bin: Extend to arm64 and ppc64le
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-python/pypy-exe-bin/Manifest              |  2 ++
 .../pypy-exe-bin/pypy-exe-bin-7.3.9-r1.ebuild | 35 ++++++++++++++-----
 profiles/arch/powerpc/ppc64/64le/package.mask |  5 +++
 profiles/arch/powerpc/ppc64/package.mask      |  5 +++
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 73fe3a518f663..b7913e4a7b3d6 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,2 +1,4 @@
+DIST pypy-exe-7.3.9-1.arm64.xpak 13757730 BLAKE2B d5e2bddc32a9cd199d01280dfbe2ff6e73583094583bf9ec3bc469911754df86270c8cfc5a9284cf06dba7ce267d897f864f6f357418e96e853a6e0f31d627e6 SHA512 570ca27d1ca411281a002c9c33ebb54d088032d6aa1898967e637f6bf06c8a32a16576f8c637fc13a0fb8294e7ba5b0b9b16600902037680b7d7f2b4edd6cfe7
+DIST pypy-exe-7.3.9-1.ppc64le.xpak 11755620 BLAKE2B 09d9b8f9ae6abdd1b6cb9d7d3337a2760b33b31b2def8b10ec5b3dd3b2820d21548544c1cf6da455fba197ef49d3db481e69311f3ddc1be722e9ec3e534f5542 SHA512 64717dee54948473317603d64627024d3c65d0df1de008840d5676c9b94aa46b97b564134d10d97b3cdc6092f79900ec3db320151f8513771ed827517014e69f
 DIST pypy-exe-7.3.9-2.amd64.xpak 13715525 BLAKE2B 17ace55d2c06a0e9a15cf980c2741aa68e2b91083acc5fbc64c736353d2abe325ac9949d0a3a6fd8b825e345ce76b372564434752c3541b663d9532eeecb1d73 SHA512 bae5a9ff57b708523eab2b95de564f7c7d5c5837cfb201e890a6cd7377b41d1ab0229e22d9596a3096f0641649d189ce1a88c67e71dbb578d24f420b83de6ccd
 DIST pypy-exe-7.3.9-2.x86.xpak 10199358 BLAKE2B 502748c1c90db9ee1d626c33ead656d472ec2f2e6df24fb185df251d40fc8aad033d693d4dc248fa210a26b63052a9cdba7b9d3998b6ede72e2df14631bdd31b SHA512 aca7a25757f479e3c684596662c173c687e3f3cb20f7b9a1a397a1642d45cc8ea98d35d173696146763ffa24e797882a8b9d35fb14533b432256ac874ec94a6f
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r1.ebuild
index 32d2d2a4ed513..bd3bcd4e79863 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r1.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r1.ebuild
@@ -5,24 +5,32 @@ EAPI=8
 
 inherit pax-utils
 
-MY_P=pypy-exe-${PV}-2
+MY_P=pypy-exe-${PV}
 DESCRIPTION="PyPy executable (pre-built version)"
 HOMEPAGE="https://www.pypy.org/"
 SRC_URI="
 	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}-2.xpak
+			-> ${MY_P}-2.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}-1.xpak
+			-> ${MY_P}-1.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/${MY_P}-1.xpak
+			-> ${MY_P}-1.ppc64le.xpak
 	)
 	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}-2.xpak
+			-> ${MY_P}-2.x86.xpak
 	)
 "
 S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	app-arch/bzip2:0/1
@@ -39,9 +47,18 @@ QA_PREBUILT="
 "
 
 src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
+	local file=${MY_P}-1.${ARCH}.xpak
+	case ${ARCH} in
+		amd64|x86)
+			file=${MY_P}-2.${ARCH}.xpak
+			;;
+		ppc64)
+			file=${MY_P}-1.ppc64le.xpak
+			;;
+	esac
+	ebegin "Unpacking ${file}"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${file}")
+	eend ${?} || die "Unpacking ${file} failed"
 }
 
 src_install() {
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 316f1445a8691..5c48095368a9e 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2022-08-25)
+# Only ppc64le binpkg is provided.
+-dev-python/pypy-exe-bin
+-dev-python/pypy3-exe-bin
+
 # Sam James <sam@gentoo.org> (2022-01-18)
 # No bootstrap binary available on big endian PPC64 right now, but there is
 # one for ppc64le.
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index 61ac288e671c0..ec04b7c84143e 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2022-08-25)
+# Only ppc64le binpkg is provided.
+dev-python/pypy-exe-bin
+dev-python/pypy3-exe-bin
+
 # Sam James <sam@gentoo.org> (2022-01-18)
 # No bootstrap binary available on big endian PPC64 right now
 dev-lisp/sbcl