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 2EC97138335 for ; Sat, 16 Feb 2019 15:08:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB802E08AA; Sat, 16 Feb 2019 15:08:39 +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 B50C1E08AB for ; Sat, 16 Feb 2019 15:08:39 +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 61367335CF4 for ; Sat, 16 Feb 2019 15:08:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71A29546 for ; Sat, 16 Feb 2019 15:08:36 +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: <1550329705.f0f07e9b5bfd4fedaf6b08342275e8f0e80b5df7.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-bin/files/, dev-python/pypy3-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild X-VCS-Directories: dev-python/pypy3-bin/ dev-python/pypy3-bin/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f0f07e9b5bfd4fedaf6b08342275e8f0e80b5df7 X-VCS-Branch: master Date: Sat, 16 Feb 2019 15:08:36 +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: 255f3135-372f-4999-aedb-aee2da4fdfff X-Archives-Hash: fd4092b05d94d53f57d2cba045da1995 commit: f0f07e9b5bfd4fedaf6b08342275e8f0e80b5df7 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 16 14:46:11 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 16 15:08:25 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f07e9b dev-python/pypy3-bin: Restore Gentoo path patch Signed-off-by: Michał Górny gentoo.org> dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch | 52 ++++++++++++++++++++++ ...-bin-7.0.0.ebuild => pypy3-bin-7.0.0-r1.ebuild} | 4 ++ 2 files changed, 56 insertions(+) diff --git a/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch b/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch new file mode 100644 index 00000000000..17409fa89a4 --- /dev/null +++ b/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch @@ -0,0 +1,52 @@ +From 44c16c344f137cc91a145294c4124174fc25ad16 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Fri, 27 Nov 2015 17:02:42 +0100 +Subject: [PATCH] Gentoo: override paths for system-wide install based on + sys.prefix + +Override all default distutils install paths to ones suitable for +system-wide install when sys.prefix indicates we're running the Gentoo +system-wide install of PyPy with no prefix overrides (e.g. virtualenv). + +Fixes: https://bugs.gentoo.org/462306 +Fixes: https://bugs.gentoo.org/465546 + +[updated for 7.0.0] +--- + lib-python/3/distutils/command/install.py | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py +index 77a1827d4b..255603967f 100644 +--- a/lib-python/3/distutils/command/install.py ++++ b/lib-python/3/distutils/command/install.py +@@ -50,6 +50,13 @@ INSTALL_SCHEMES = { + 'scripts': '$base/bin', + 'data' : '$base', + }, ++ 'gentoo': { ++ 'purelib': '$base/site-packages', ++ 'platlib': '$base/site-packages', ++ 'headers': '$base/include', ++ 'scripts': '@EPREFIX@/usr/bin', ++ 'data' : '@EPREFIX@/usr', ++ }, + } + + # user site schemes +@@ -461,7 +468,11 @@ class install(Command): + # it's the caller's problem if they supply a bad name! + if (hasattr(sys, 'pypy_version_info') and + not name.endswith(('_user', '_home'))): +- name = 'pypy' ++ if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy3.5'): ++ # override paths for system-wide install ++ name = 'gentoo' ++ else: ++ name = 'pypy' + scheme = INSTALL_SCHEMES[name] + for key in SCHEME_KEYS: + attrname = 'install_' + key +-- +2.21.0.rc1 + diff --git a/dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild similarity index 97% rename from dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild rename to dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild index 820cb2321a3..94c2fed28bf 100644 --- a/dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild +++ b/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild @@ -65,9 +65,13 @@ QA_PREBUILT=" usr/lib*/pypy3/libpypy3-c.so" src_prepare() { + eapply "${FILESDIR}/7.0.0-gentoo-path.patch" eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch + sed -e "s^@EPREFIX@^${EPREFIX}^" \ + -i lib-python/3/distutils/command/install.py || die + # apply CPython stdlib patches pushd lib-python/3 > /dev/null || die eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch