diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-20 15:11:50 +0000 |
commit | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (patch) | |
tree | b4cfe2332c7a6c5da27b6985bf05db4508df1a92 /dev-python/pypy3 | |
parent | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff) |
gentoo resync : 20.02.2019
Diffstat (limited to 'dev-python/pypy3')
-rw-r--r-- | dev-python/pypy3/Manifest | 5 | ||||
-rw-r--r-- | dev-python/pypy3/files/7.0.0-gentoo-path.patch | 52 | ||||
-rw-r--r-- | dev-python/pypy3/pypy3-7.0.0-r1.ebuild (renamed from dev-python/pypy3/pypy3-7.0.0.ebuild) | 4 | ||||
-rw-r--r-- | dev-python/pypy3/pypy3-9999.ebuild | 4 |
4 files changed, 63 insertions, 2 deletions
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest index 9d6831e55786..4b90ccc3abfe 100644 --- a/dev-python/pypy3/Manifest +++ b/dev-python/pypy3/Manifest @@ -2,11 +2,12 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5 AUX 4.0.0-gentoo-path.patch 1906 BLAKE2B 0f09d41b6f2b26881e5f69059877d9c555a4adafe47a5b2fb269b32d7b0978b996bb1aeee9d1ddcf7dd2097a494317851408c6c9bc56a829a77126376f5c7853 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747 AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909bf4f73514ef1e9034f5a15cde7756f30fe6c4337f5c0fd254c1869758c798b9c450cd3044cca768ab8f654b19dc6c73ae SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945 +AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B 060cdfaea2c4b0e607b7f9548a161e0df8d741d8a70ece28eeccc646aaf659b8ae6f425089380b908a588e2a0ca2ed521995ef3f3aa3bfeb58ecfb0083b3584b SHA512 e67c0bb96d3c66ceecdc11a3984dbeb65a4473020ee2d4e5b093fe987f1540dd7a5cc6982be6303e7e8c49a53e02883277597d00342312a0f8144a84ff132bae AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511 DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3 SHA512 3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2 EBUILD pypy3-6.0.0.ebuild 6921 BLAKE2B ab3d2be852a4687f570f9eb5aac9c04679c5f23fa01b4fd41932fff060307c81fd8b1627aafd9e9a905473ed9bb408accda15611d3377c11c4d8fe008a42bda9 SHA512 b0e217e44bcc83566ffe7bc0bcdecc76e86103abe9fd7fa268b5370915ba3f929963bdce600ddd9857cc66936da4452aeb6aabcabfdefb87606ff645378e34b1 -EBUILD pypy3-7.0.0.ebuild 6712 BLAKE2B f57125d598cbf08d354b2aa58196868d3cfa20d94d33f85519b5430fb37436a3a58686319d9553744e173bc82b09995f6a6e05842bcf4bb08e863f53d1283ae6 SHA512 2b3e715387bdf7c468791e9367235b00ecf50d45e2d1b20bf203f167b39af8605adc1f5184570db098f80db458a98ef29d3817d70bbb59c88be5d4f7ca7650ae -EBUILD pypy3-9999.ebuild 6762 BLAKE2B 7113f6af1d63398cc2b989106146d1fa5e0fcf8705badc740e8a304482372d901969cd832ff19b97568acc63cf003e848980c4cbac7f374003f198def348a373 SHA512 e069ac6144fb99f11e38355aedeb46a8140033382de752ec070ad1ed4b36711c62cdbb9e969d1a9eaf21e909a1b6f9ea035a3863c659c2b7d5be885394c10c4b +EBUILD pypy3-7.0.0-r1.ebuild 6849 BLAKE2B 52cec3fe80dd34950bf94dac99979ce799e878b7cb3f77d43331742e2afcaec7554a852ab225d9449940c83df795142d20cb72572c8d41c0cbdd9679f2f3b43e SHA512 6cfc17e8f0c0d4cf77d3b2b217b434c3b36e662e900a0e2118af8a4cc0be27cd54e1644419862b31381b4dd416d1d5a0cbedd272e43f56a5fc7ba285c0dc81ab +EBUILD pypy3-9999.ebuild 6899 BLAKE2B deb7ad2878e9774c6f5d7c78ef8c6041849b87bd18cc85be058d1d713331f5988e129072510c84ba90172cdc557366ef57a113890b17a3ef1e502d172a8ee047 SHA512 07ba00e030bdeb26f764d0fc0ba6435c0522054b4e401757c3dc742cb833061a49ca89d19d83c5875749285b1749e54a8c616adad4edd693630bb23be1247cab MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841 diff --git a/dev-python/pypy3/files/7.0.0-gentoo-path.patch b/dev-python/pypy3/files/7.0.0-gentoo-path.patch new file mode 100644 index 000000000000..17409fa89a42 --- /dev/null +++ b/dev-python/pypy3/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?= <mgorny@gentoo.org> +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/pypy3-7.0.0.ebuild b/dev-python/pypy3/pypy3-7.0.0-r1.ebuild index c318a1f521a0..87ce4dbc2489 100644 --- a/dev-python/pypy3/pypy3-7.0.0.ebuild +++ b/dev-python/pypy3/pypy3-7.0.0-r1.ebuild @@ -84,10 +84,14 @@ 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 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 diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild index 3b0362d0252f..236616d1f286 100644 --- a/dev-python/pypy3/pypy3-9999.ebuild +++ b/dev-python/pypy3/pypy3-9999.ebuild @@ -92,10 +92,14 @@ 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 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 |