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 62428138334 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 1030BE08B0; Sat, 16 Feb 2019 15:08:40 +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 B68CFE08B0 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 D4395335CE7 for ; Sat, 16 Feb 2019 15:08:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21673537 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: <1550329701.4c0261d9ad80c7ffbb7c3cd82b06cbed86f5eb33.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.0.0-gentoo-path.patch dev-python/pypy/pypy-7.0.0-r1.ebuild dev-python/pypy/pypy-7.0.0.ebuild dev-python/pypy/pypy-9999.ebuild X-VCS-Directories: dev-python/pypy/ dev-python/pypy/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4c0261d9ad80c7ffbb7c3cd82b06cbed86f5eb33 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: a0473a72-a443-498b-9835-8f06a2c94c1d X-Archives-Hash: a5b0c9179c0ed9fca55f2ff1a1cc36ee commit: 4c0261d9ad80c7ffbb7c3cd82b06cbed86f5eb33 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 16 14:33:31 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 16 15:08:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0261d9 dev-python/pypy: Restore Gentoo path patch Signed-off-by: Michał Górny gentoo.org> dev-python/pypy/files/7.0.0-gentoo-path.patch | 52 ++++++++++++++++++++++ .../{pypy-7.0.0.ebuild => pypy-7.0.0-r1.ebuild} | 4 ++ dev-python/pypy/pypy-9999.ebuild | 4 ++ 3 files changed, 60 insertions(+) diff --git a/dev-python/pypy/files/7.0.0-gentoo-path.patch b/dev-python/pypy/files/7.0.0-gentoo-path.patch new file mode 100644 index 00000000000..9be52cd0b75 --- /dev/null +++ b/dev-python/pypy/files/7.0.0-gentoo-path.patch @@ -0,0 +1,52 @@ +From 959e2aafbe6cabd4e6860f842bce9b8644f627ca 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/2.7/distutils/command/install.py | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py +index fc43951da0..c2564188cb 100644 +--- a/lib-python/2.7/distutils/command/install.py ++++ b/lib-python/2.7/distutils/command/install.py +@@ -90,6 +90,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', ++ }, + } + + # The keys to an installation scheme; if any new types of files are to be +@@ -476,7 +483,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/pypy2.7'): ++ # 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/pypy/pypy-7.0.0.ebuild b/dev-python/pypy/pypy-7.0.0-r1.ebuild similarity index 98% rename from dev-python/pypy/pypy-7.0.0.ebuild rename to dev-python/pypy/pypy-7.0.0-r1.ebuild index b3575616959..7a956b9f4a0 100644 --- a/dev-python/pypy/pypy-7.0.0.ebuild +++ b/dev-python/pypy/pypy-7.0.0-r1.ebuild @@ -99,9 +99,13 @@ pkg_setup() { } src_prepare() { + eapply "${FILESDIR}/7.0.0-gentoo-path.patch" eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002 + sed -e "s^@EPREFIX@^${EPREFIX}^" \ + -i lib-python/2.7/distutils/command/install.py || die + # apply CPython stdlib patches pushd lib-python/2.7 > /dev/null || die # TODO: cpy turkish locale patch now fixes C code diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild index 762e9c5e7e9..708273fc4d5 100644 --- a/dev-python/pypy/pypy-9999.ebuild +++ b/dev-python/pypy/pypy-9999.ebuild @@ -105,9 +105,13 @@ src_unpack() { } src_prepare() { + eapply "${FILESDIR}/7.0.0-gentoo-path.patch" eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002 + sed -e "s^@EPREFIX@^${EPREFIX}^" \ + -i lib-python/2.7/distutils/command/install.py || die + # apply CPython stdlib patches pushd lib-python/2.7 > /dev/null || die # TODO: cpy turkish locale patch now fixes C code