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 39DB0138359 for ; Sun, 2 Aug 2020 09:35:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8571FE0B8B; Sun, 2 Aug 2020 09:35:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 706C4E0B47 for ; Sun, 2 Aug 2020 09:35:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8A66D34F0C0 for ; Sun, 2 Aug 2020 09:35:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 33F1C2CE for ; Sun, 2 Aug 2020 09:35:30 +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: <1596360897.142555b7efeff4b8da9297ab20a0b91728b1ad51.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/files/, dev-python/pypy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy/files/7.3.1-gentoo-path.patch dev-python/pypy/pypy-7.3.1-r1.ebuild dev-python/pypy/pypy-7.3.1-r2.ebuild X-VCS-Directories: dev-python/pypy/files/ dev-python/pypy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 142555b7efeff4b8da9297ab20a0b91728b1ad51 X-VCS-Branch: master Date: Sun, 2 Aug 2020 09:35:30 +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: 404d400e-186a-44f8-942e-0d4f833a068a X-Archives-Hash: 697fd479b653b362914b87a4fe21bb37 commit: 142555b7efeff4b8da9297ab20a0b91728b1ad51 Author: Tom Gillespie gmail com> AuthorDate: Sun Aug 2 08:37:07 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Aug 2 09:34:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142555b7 dev-python/pypy: fix gentoo-path.patch and rev bump Signed-off-by: Tom Gillespie gmail.com> Signed-off-by: Michał Górny gentoo.org> dev-python/pypy/files/7.3.1-gentoo-path.patch | 2 +- dev-python/pypy/{pypy-7.3.1-r1.ebuild => pypy-7.3.1-r2.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/pypy/files/7.3.1-gentoo-path.patch b/dev-python/pypy/files/7.3.1-gentoo-path.patch index 5281781865a..74ca86a84ac 100644 --- a/dev-python/pypy/files/7.3.1-gentoo-path.patch +++ b/dev-python/pypy/files/7.3.1-gentoo-path.patch @@ -30,7 +30,7 @@ index 6fe62be..a4e9f0d 100644 if (hasattr(sys, 'pypy_version_info') and not name.endswith(('_user', '_home'))): - if os.name == 'nt': -+ if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'): ++ if self.install_base.startswith(os.path.normpath('@EPREFIX@/usr/lib/pypy')): + # override paths for system-wide install + name = 'gentoo' + elif os.name == 'nt': diff --git a/dev-python/pypy/pypy-7.3.1-r1.ebuild b/dev-python/pypy/pypy-7.3.1-r2.ebuild similarity index 100% rename from dev-python/pypy/pypy-7.3.1-r1.ebuild rename to dev-python/pypy/pypy-7.3.1-r2.ebuild