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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C52713835B for ; Thu, 17 Sep 2020 16:56:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53841E085A; Thu, 17 Sep 2020 16:56:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 36C1CE0858 for ; Thu, 17 Sep 2020 16:56:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44DFD340D5E for ; Thu, 17 Sep 2020 16:56:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 494F7370 for ; Thu, 17 Sep 2020 16:56:24 +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: <1600361779.f4c4fadca0f269d7e2bc305f37e4d43af016d02b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy/pypy-7.3.1-r2.ebuild dev-python/pypy/pypy-7.3.1-r3.ebuild dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild dev-python/pypy/pypy-7.3.2_rc2.ebuild X-VCS-Directories: dev-python/pypy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f4c4fadca0f269d7e2bc305f37e4d43af016d02b X-VCS-Branch: master Date: Thu, 17 Sep 2020 16:56:24 +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: d038b520-f4ab-4b5a-98e4-9b20d9df1b83 X-Archives-Hash: 49b10210d5483bcb639afffd5566a31c commit: f4c4fadca0f269d7e2bc305f37e4d43af016d02b Author: Michał Górny gentoo org> AuthorDate: Thu Sep 17 14:07:08 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Sep 17 16:56:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c4fadc dev-python/pypy: Fix PYTHON path for byte-compiling modules Signed-off-by: Michał Górny gentoo.org> dev-python/pypy/{pypy-7.3.1-r2.ebuild => pypy-7.3.1-r3.ebuild} | 7 ++++++- .../pypy/{pypy-7.3.2_rc2.ebuild => pypy-7.3.2_rc2-r1.ebuild} | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dev-python/pypy/pypy-7.3.1-r2.ebuild b/dev-python/pypy/pypy-7.3.1-r3.ebuild similarity index 96% rename from dev-python/pypy/pypy-7.3.1-r2.ebuild rename to dev-python/pypy/pypy-7.3.1-r3.ebuild index 59902f3b0a5..8508153c294 100644 --- a/dev-python/pypy/pypy-7.3.1-r2.ebuild +++ b/dev-python/pypy/pypy-7.3.1-r3.ebuild @@ -166,7 +166,9 @@ src_install() { fi local -x EPYTHON=pypy - local -x PYTHON=${ED}${dest}/pypy-c + local -x PYTHON=${ED}${dest}/pypy-c-${PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die echo "EPYTHON='${EPYTHON}'" > epython.py || die python_moduleinto /usr/lib/pypy2.7/site-packages @@ -174,4 +176,7 @@ src_install() { einfo "Byte-compiling Python standard library..." python_optimize "${ED}${dest}" + + # remove to avoid collisions + rm "${PYTHON}" || die } diff --git a/dev-python/pypy/pypy-7.3.2_rc2.ebuild b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild similarity index 96% rename from dev-python/pypy/pypy-7.3.2_rc2.ebuild rename to dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild index d6556f35ca7..a5a678ffa9d 100644 --- a/dev-python/pypy/pypy-7.3.2_rc2.ebuild +++ b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild @@ -159,7 +159,9 @@ src_install() { fi local -x EPYTHON=pypy - local -x PYTHON=${ED}${dest}/pypy-c + local -x PYTHON=${ED}${dest}/pypy-c-${PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die echo "EPYTHON='${EPYTHON}'" > epython.py || die python_moduleinto /usr/lib/pypy2.7/site-packages @@ -167,4 +169,7 @@ src_install() { einfo "Byte-compiling Python standard library..." python_optimize "${ED}${dest}" + + # remove to avoid collisions + rm "${PYTHON}" || die }