diff --git a/dev-lang/python/patches/python-2.7.6.patchset b/dev-lang/python/patches/python-2.7.6.patchset index 22d516fe1..d518a0001 100644 --- a/dev-lang/python/patches/python-2.7.6.patchset +++ b/dev-lang/python/patches/python-2.7.6.patchset @@ -1,4 +1,4 @@ -From faaf6967e31a129b062c3a3a9b6752944aee865f Mon Sep 17 00:00:00 2001 +From 2e6d0a2e4c715dd9a3ef2ce19ae6389a6dd4e0c7 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Mar 2014 21:17:06 +0000 Subject: initial Haiku patch @@ -759,7 +759,7 @@ index 40ad843..24621ef 100644 1.8.3.4 -From 6e1205e2b0b90002f678ed93a8a27ab567e8bd86 Mon Sep 17 00:00:00 2001 +From 077cde20cfcd287454dcc131e10c00a0c7bb6e2e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 21:16:40 +0000 Subject: fix pyconfig.h path @@ -781,3 +781,35 @@ index cf75650..bb54b6f 100644 -- 1.8.3.4 + +From 6123b9d003eb7c5dd8f7cb468b8937061dc8f0dd Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Wed, 18 Jun 2014 12:19:13 +0000 +Subject: Import missed change from the 2.6.9 patches + +This makes our site- and vendor- packages work properly again. +It's sill missing the changes to addusersitepackages. This method was apparently refactored, and I don't have enough Python knowledge to redo our changes in the new code. User packages will not workas +expected with +this version of Python. + +diff --git a/Lib/site.py b/Lib/site.py +index f1b0ae8..c18a7dd 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -287,6 +287,13 @@ def getsitepackages(): + + if sys.platform in ('os2emx', 'riscos'): + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) ++ elif sys.platform.startswith('haiku'): ++ sitepackages.append(os.path.join(prefix, "non-packaged", "lib", ++ "python" + sys.version[:3], ++ "site-packages")) ++ sitepackages.append(os.path.join(prefix, "lib", ++ "python" + sys.version[:3], ++ "vendor-packages")) + elif os.sep == '/': + sitepackages.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe index ada901e8a..58437c961 100644 --- a/dev-lang/python/python-2.7.6.recipe +++ b/dev-lang/python/python-2.7.6.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="https://www.python.org/ftp/python/2.7.6/Python-2.7.6.tar.xz" CHECKSUM_SHA256="1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1" -REVISION="2" +REVISION="3" ARCHITECTURES="!x86_gcc2 !x86 x86_64" PATCHES="python-2.7.6.patchset"