From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 547D7158094 for ; Mon, 29 Aug 2022 11:48:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94097E0886; Mon, 29 Aug 2022 11:48:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79BBEE0886 for ; Mon, 29 Aug 2022 11:48:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BF26340F58 for ; Mon, 29 Aug 2022 11:48:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C914568 for ; Mon, 29 Aug 2022 11:48:05 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1661773682.04dfee5ff9271ccb5637e252066fca6d61bf00b9.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-exe-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy-exe-bin/Manifest dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r2.ebuild X-VCS-Directories: dev-python/pypy-exe-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 04dfee5ff9271ccb5637e252066fca6d61bf00b9 X-VCS-Branch: master Date: Mon, 29 Aug 2022 11:48:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 688a78f6-e669-4819-b3d4-7092133a94f5 X-Archives-Hash: 8509acb64b54703543ec0bbb1a1aae99 commit: 04dfee5ff9271ccb5637e252066fca6d61bf00b9 Author: Michał Górny gentoo org> AuthorDate: Mon Aug 29 11:47:38 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Aug 29 11:48:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04dfee5f dev-python/pypy-exe-bin: Add musl binpkgs Signed-off-by: Michał Górny gentoo.org> dev-python/pypy-exe-bin/Manifest | 4 ++ .../pypy-exe-bin/pypy-exe-bin-7.3.9-r2.ebuild | 69 +++++++++++++--------- 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest index 0a884e244c72..051a70738c23 100644 --- a/dev-python/pypy-exe-bin/Manifest +++ b/dev-python/pypy-exe-bin/Manifest @@ -1,4 +1,8 @@ +DIST pypy-exe-7.3.9-1.amd64-musl.xpak 13714379 BLAKE2B 0d1f66cfa19f50f6cfc4e2d46400afb9e0aea190833c57aed9617a0f57924585c78b23926421a29dd677b3e771e902d6d97c167798672266c90ba4ffc9c13750 SHA512 a661302c749e0904561745ffd852fb106bb3df885190df141faa06bc83bc33066c21f096352f55d458e68873d4ff6ae3738d66d6defeb54aa7bcf5474a7f79f5 +DIST pypy-exe-7.3.9-1.arm64-musl.xpak 11551216 BLAKE2B 13d055e0060e1f03bb579a8e619cf8b299f9b04aa7f66bdbcd66382283459de93612cb196baaed08f3b780615051ac4638fd578f57ed3f05cb40ea8dd7af4767 SHA512 91c36d2190722f2967f321193b780569f1d0d73805dcf25e2b3984be13a4ccad7863be3001fc0c14bcde1a20ec696b6e624ef9b7273206ec69355d07015e415d DIST pypy-exe-7.3.9-1.arm64.xpak 11597382 BLAKE2B b41921e299435e11c54dbfff33adf83ca1772e58d71e73d5d9612eef451b649805e5cc93d3550667d34d93cb8097b156aae1e86b66e78cbba662e568a39b5a4d SHA512 4ea6bf282555a1c8f8f0464f456bbe61ebd20c7feda58b84269f68ca40c18b011102ed7906d56c98337c357e290fdc208af5caf71a6cef47ef4bd4618db940b8 +DIST pypy-exe-7.3.9-1.ppc64le-musl.xpak 6720652 BLAKE2B c55e73b80458df5bf211493f62ca7c3be457639173bf7242b9a8e666e9d0edbc0f757e506dffdf87454188036ae78a03a93f1767d44f8606bb4db297610237f7 SHA512 bc9255f9c9f66d4b8e1ef4649db45950201b7bfd16984f9bc6ff74f5a4cb6a0f34a8553ecc0e21d59d851c90ab488c12db89ecbd9490ba8344e1bf911a61bb94 DIST pypy-exe-7.3.9-1.ppc64le.xpak 11755620 BLAKE2B 09d9b8f9ae6abdd1b6cb9d7d3337a2760b33b31b2def8b10ec5b3dd3b2820d21548544c1cf6da455fba197ef49d3db481e69311f3ddc1be722e9ec3e534f5542 SHA512 64717dee54948473317603d64627024d3c65d0df1de008840d5676c9b94aa46b97b564134d10d97b3cdc6092f79900ec3db320151f8513771ed827517014e69f +DIST pypy-exe-7.3.9-1.x86-musl.xpak 10118700 BLAKE2B 5ab545378d9ba48ffe167aaf80449e97201b3607d7a2477420c4766347b23c3993b5b241ea776690e0c448b329dfa10a3b912cef859ac70b0d4f755dc37e5771 SHA512 48b8b8a89d1a7d533b8683de3335d18b6f680e0a13862b65b9d181b22eb70feef0ba1c14124bab5a2bd0b0bb43bbf417f58d1dd95f76e6c5baf482521d3a4d63 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-r2.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r2.ebuild index f278e845859e..6ce281fb0f66 100644 --- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r2.ebuild +++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r2.ebuild @@ -9,21 +9,41 @@ 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}-2.xpak - -> ${MY_P}-2.amd64.xpak + elibc_glibc? ( + amd64? ( + 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/arm64/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}-2.xpak + -> ${MY_P}-2.x86.xpak + ) ) - arm64? ( - https://dev.gentoo.org/~mgorny/binpkg/arm64/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}-2.xpak - -> ${MY_P}-2.x86.xpak + elibc_musl? ( + amd64? ( + https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/${MY_P}-1.xpak + -> ${MY_P}-1.amd64-musl.xpak + ) + arm64? ( + https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/${MY_P}-1.xpak + -> ${MY_P}-1.arm64-musl.xpak + ) + ppc64? ( + https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/${MY_P}-1.xpak + -> ${MY_P}-1.ppc64le-musl.xpak + ) + x86? ( + https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/${MY_P}-1.xpak + -> ${MY_P}-1.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/pypy-exe:${SLOT} " @@ -48,18 +68,13 @@ QA_PREBUILT=" " src_unpack() { - 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" + 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() {