1 |
commit: 3af89efa2d033ea1250bbb8b4c285bcba6ac3dc7 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 25 16:53:07 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 25 16:55:12 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af89efa |
7 |
|
8 |
dev-python/pypy-exe-bin: Extend to arm64 and ppc64le |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pypy-exe-bin/Manifest | 2 ++ |
13 |
.../pypy-exe-bin/pypy-exe-bin-7.3.9-r1.ebuild | 35 ++++++++++++++++------ |
14 |
profiles/arch/powerpc/ppc64/64le/package.mask | 5 ++++ |
15 |
profiles/arch/powerpc/ppc64/package.mask | 5 ++++ |
16 |
4 files changed, 38 insertions(+), 9 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest |
19 |
index 73fe3a518f66..b7913e4a7b3d 100644 |
20 |
--- a/dev-python/pypy-exe-bin/Manifest |
21 |
+++ b/dev-python/pypy-exe-bin/Manifest |
22 |
@@ -1,2 +1,4 @@ |
23 |
+DIST pypy-exe-7.3.9-1.arm64.xpak 13757730 BLAKE2B d5e2bddc32a9cd199d01280dfbe2ff6e73583094583bf9ec3bc469911754df86270c8cfc5a9284cf06dba7ce267d897f864f6f357418e96e853a6e0f31d627e6 SHA512 570ca27d1ca411281a002c9c33ebb54d088032d6aa1898967e637f6bf06c8a32a16576f8c637fc13a0fb8294e7ba5b0b9b16600902037680b7d7f2b4edd6cfe7 |
24 |
+DIST pypy-exe-7.3.9-1.ppc64le.xpak 11755620 BLAKE2B 09d9b8f9ae6abdd1b6cb9d7d3337a2760b33b31b2def8b10ec5b3dd3b2820d21548544c1cf6da455fba197ef49d3db481e69311f3ddc1be722e9ec3e534f5542 SHA512 64717dee54948473317603d64627024d3c65d0df1de008840d5676c9b94aa46b97b564134d10d97b3cdc6092f79900ec3db320151f8513771ed827517014e69f |
25 |
DIST pypy-exe-7.3.9-2.amd64.xpak 13715525 BLAKE2B 17ace55d2c06a0e9a15cf980c2741aa68e2b91083acc5fbc64c736353d2abe325ac9949d0a3a6fd8b825e345ce76b372564434752c3541b663d9532eeecb1d73 SHA512 bae5a9ff57b708523eab2b95de564f7c7d5c5837cfb201e890a6cd7377b41d1ab0229e22d9596a3096f0641649d189ce1a88c67e71dbb578d24f420b83de6ccd |
26 |
DIST pypy-exe-7.3.9-2.x86.xpak 10199358 BLAKE2B 502748c1c90db9ee1d626c33ead656d472ec2f2e6df24fb185df251d40fc8aad033d693d4dc248fa210a26b63052a9cdba7b9d3998b6ede72e2df14631bdd31b SHA512 aca7a25757f479e3c684596662c173c687e3f3cb20f7b9a1a397a1642d45cc8ea98d35d173696146763ffa24e797882a8b9d35fb14533b432256ac874ec94a6f |
27 |
|
28 |
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 |
29 |
index 32d2d2a4ed51..bd3bcd4e7986 100644 |
30 |
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r1.ebuild |
31 |
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r1.ebuild |
32 |
@@ -5,24 +5,32 @@ EAPI=8 |
33 |
|
34 |
inherit pax-utils |
35 |
|
36 |
-MY_P=pypy-exe-${PV}-2 |
37 |
+MY_P=pypy-exe-${PV} |
38 |
DESCRIPTION="PyPy executable (pre-built version)" |
39 |
HOMEPAGE="https://www.pypy.org/" |
40 |
SRC_URI=" |
41 |
amd64? ( |
42 |
- https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak |
43 |
- -> ${MY_P}.amd64.xpak |
44 |
+ https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}-2.xpak |
45 |
+ -> ${MY_P}-2.amd64.xpak |
46 |
+ ) |
47 |
+ arm64? ( |
48 |
+ https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}-1.xpak |
49 |
+ -> ${MY_P}-1.arm64.xpak |
50 |
+ ) |
51 |
+ ppc64? ( |
52 |
+ https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/${MY_P}-1.xpak |
53 |
+ -> ${MY_P}-1.ppc64le.xpak |
54 |
) |
55 |
x86? ( |
56 |
- https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak |
57 |
- -> ${MY_P}.x86.xpak |
58 |
+ https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}-2.xpak |
59 |
+ -> ${MY_P}-2.x86.xpak |
60 |
) |
61 |
" |
62 |
S="${WORKDIR}" |
63 |
|
64 |
LICENSE="MIT" |
65 |
SLOT="${PV%_p*}" |
66 |
-KEYWORDS="amd64 x86" |
67 |
+KEYWORDS="amd64 ~arm64 ~ppc64 x86" |
68 |
|
69 |
RDEPEND=" |
70 |
app-arch/bzip2:0/1 |
71 |
@@ -39,9 +47,18 @@ QA_PREBUILT=" |
72 |
" |
73 |
|
74 |
src_unpack() { |
75 |
- ebegin "Unpacking ${MY_P}.${ARCH}.xpak" |
76 |
- tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") |
77 |
- eend ${?} || die "Unpacking ${MY_P} failed" |
78 |
+ local file=${MY_P}-1.${ARCH}.xpak |
79 |
+ case ${ARCH} in |
80 |
+ amd64|x86) |
81 |
+ file=${MY_P}-2.${ARCH}.xpak |
82 |
+ ;; |
83 |
+ ppc64) |
84 |
+ file=${MY_P}-1.ppc64le.xpak |
85 |
+ ;; |
86 |
+ esac |
87 |
+ ebegin "Unpacking ${file}" |
88 |
+ tar -x < <(xz -c -d --single-stream "${DISTDIR}/${file}") |
89 |
+ eend ${?} || die "Unpacking ${file} failed" |
90 |
} |
91 |
|
92 |
src_install() { |
93 |
|
94 |
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask |
95 |
index 316f1445a869..5c48095368a9 100644 |
96 |
--- a/profiles/arch/powerpc/ppc64/64le/package.mask |
97 |
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask |
98 |
@@ -1,6 +1,11 @@ |
99 |
# Copyright 1999-2022 Gentoo Authors |
100 |
# Distributed under the terms of the GNU General Public License v2 |
101 |
|
102 |
+# Michał Górny <mgorny@g.o> (2022-08-25) |
103 |
+# Only ppc64le binpkg is provided. |
104 |
+-dev-python/pypy-exe-bin |
105 |
+-dev-python/pypy3-exe-bin |
106 |
+ |
107 |
# Sam James <sam@g.o> (2022-01-18) |
108 |
# No bootstrap binary available on big endian PPC64 right now, but there is |
109 |
# one for ppc64le. |
110 |
|
111 |
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask |
112 |
index 61ac288e671c..ec04b7c84143 100644 |
113 |
--- a/profiles/arch/powerpc/ppc64/package.mask |
114 |
+++ b/profiles/arch/powerpc/ppc64/package.mask |
115 |
@@ -1,6 +1,11 @@ |
116 |
# Copyright 1999-2022 Gentoo Authors |
117 |
# Distributed under the terms of the GNU General Public License v2 |
118 |
|
119 |
+# Michał Górny <mgorny@g.o> (2022-08-25) |
120 |
+# Only ppc64le binpkg is provided. |
121 |
+dev-python/pypy-exe-bin |
122 |
+dev-python/pypy3-exe-bin |
123 |
+ |
124 |
# Sam James <sam@g.o> (2022-01-18) |
125 |
# No bootstrap binary available on big endian PPC64 right now |
126 |
dev-lisp/sbcl |