Add support from upstream for python-2.7 #350098 by Tom Flair.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

4 files changed, 784 insertions, 9 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 803e08fe39a1..fef68233696a 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.73 2010/12/31 18:19:26 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.74 2011/01/01 21:31:21 vapier Exp $
+
+  01 Jan 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.0.ebuild,
+  +files/xbmc-10.0-python-2.7.patch:
+  Add support from upstream for python-2.7 #350098 by Tom Flair.
 
   31 Dec 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Patch by Samuli Suominen to drop hal support in favor of upstream
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index cf56327a0b3b..6564c0922750 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xbmc-10.0-python-2.7.patch 30308 RMD160 15f01d93b0db903eadb5deb94d5092b0a4b68de4 SHA1 4f6da8045b575a80fd7d556c5b1f2fbbe2bc2da4 SHA256 8f6b2a0a962ad250fc317542d0fa180585d3c9e630ca98f99299b6f750555085
 AUX xbmc-9.11-TexturePacker-parallel-build.patch 357 RMD160 37802ec3ce31d10d58802acf267aaf568d3ef8d0 SHA1 5909a4a61e1dbac3f51c6a8c393f1d4cfd7a38ca SHA256 a9b990cdd5473e72cc83cda36cc9faaf67e97649cec45af9c529455464b12d43
 AUX xbmc-9.11-external-python.patch 751 RMD160 b7774014df1addd0c4479acefccacc8596759763 SHA1 93dd96b787c4b88a9bbb7e10f44deb2bdec96b4d SHA256 a0c8325ebc742c7e1164a50ea380460b38eff58dd59c60e56b3eee78bb6aacc9
 AUX xbmc-9.11-jpeg-speedup.patch 804 RMD160 2aff1749ee8f4b85ce9199a78fcfb779c373d086 SHA1 ecef76650156b7fcba60f909496e43ae83bafd20 SHA256 3115b8668b60e307536a9314fc02c837d4f94f89571d403761b614a22447e2d8
@@ -11,15 +12,15 @@ AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a072
 AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc
 DIST xbmc-10.0.tar.gz 130239951 RMD160 dcb94d89c0cb35e8a4cb021a19f6dec23dd59fb6 SHA1 8752c0c26e872b408b3575d2744fdd812d5775ac SHA256 06fa5332f4f448f4f68bf705e0e159591a866b1cace52840c78ea4f5925a404a
 DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87
-EBUILD xbmc-10.0.ebuild 5161 RMD160 886671e81bd2a21eca211a7f94d703286650811b SHA1 2747930fded60bbcf638451e962c11a4036830ee SHA256 4f1a56688f0f21175abe8c35b1214bfacf387516087175f368bfde683d151433
+EBUILD xbmc-10.0.ebuild 5214 RMD160 80c01328ce440afbe8330584c8d7d2cc4ad059b5 SHA1 7faec1c2c8e38bbc7f660377602aa5227fa9a012 SHA256 987412af0d8fbcc906cab0346dc9ebe33c631da300487b4206936635e8dd89a8
 EBUILD xbmc-9.11-r5.ebuild 5783 RMD160 a9799026ec29b74cb9cf002c89958274f546f202 SHA1 10ef102e761d16f931731088f27be73e7ff667fe SHA256 eb959e3ab1cbae5f9ed5eeba5a3235b2dab53381d77d0a5d0901b78b7e8be4b0
 EBUILD xbmc-9999.ebuild 5155 RMD160 fa4f0f00256590041bf9b1b89b05739c18404524 SHA1 9f9d342eac3d80fa4f80ccff0862945bfb2aab85 SHA256 fb9db2169d8f391c790cbdeadf8a33de69f92269e73106d96fc2d2b49b7feb71
-MISC ChangeLog 12037 RMD160 3bd4a5d8d63178580e0b4faacb3ea964a1afe341 SHA1 fc78c014a56ff71740bb216d592d8362e899a3d3 SHA256 849003692f2029d657d83b67cd196cc9ab147c76a3f916cc03b895d7c7a04d08
+MISC ChangeLog 12208 RMD160 7854f1c9a849610c9a0bf4f82069b05c227f975d SHA1 5fbb76762af312b25f01be0469cc2d052df11f0e SHA256 6146593de21fc10ce94bbac80396f844ce7cf5593758d967ff8d2da091e15ea0
 MISC metadata.xml 579 RMD160 cf1a05346b2c33147e752be840dfb562726b42dd SHA1 0fabb20c84367962605b88b9030fabf6acf3045d SHA256 f61dd5617b99b9fa5505269e6633d317f90a2c6903108bdcc84370cfb8858afb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAk0eHpUACgkQaC/OocHi7JayLwEAm77/vJRzQM+/eowC2uhEwN4N
-ZFXvKtdnUVFZCAyR0r0A/iuIxkmMtMaYlzz+ym5ybhx7YXzURtHbzCYVh3rOLG72
-=vaDc
+iF4EAREIAAYFAk0fnRAACgkQaC/OocHi7JYfXwD/WvGjGGW9HGujLHQvY9wr4Ofe
+WKPCYyQ8eWUJVC6m9KYA/1a9JPS2nAaTCIhO/DKomVzlBFF/40PA1TEWaMAdO+td
+=0ANC
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-10.0-python-2.7.patch b/media-tv/xbmc/files/xbmc-10.0-python-2.7.patch
new file mode 100644
index 000000000000..e3d17a5e074d
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-10.0-python-2.7.patch
@@ -0,0 +1,768 @@
+patch from upstream
+
+https://bugs.gentoo.org/350098
+
+From ab0f816c6307f38d7248d0469379c981f94b816d Mon Sep 17 00:00:00 2001
+From: ceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
+Date: Mon, 30 Aug 2010 16:46:50 +0000
+Subject: [PATCH] Support external python2.7.
+
+git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/python2.7@33342 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
+---
+ configure.in                                       |   10 ++++++-
+ xbmc/lib/libPython/XBPyThread.cpp                  |    5 +++-
+ xbmc/lib/libPython/XBPyThread.h                    |    4 ++-
+ xbmc/lib/libPython/XBPython.cpp                    |   24 +++++++++++++++-----
+ xbmc/lib/libPython/XBPythonDll.cpp                 |    4 ++-
+ xbmc/lib/libPython/XBPythonDllFuncs.S              |    4 ++-
+ xbmc/lib/libPython/linux/Makefile.in               |    5 +++-
+ xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h    |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/PythonAddon.h        |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/PythonPlayer.h       |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/action.h             |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/control.h            |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/controlbutton.cpp    |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/controlgroup.cpp     |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/controlimage.cpp     |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/controllabel.cpp     |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/controllist.cpp      |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/controlprogress.cpp  |    4 ++-
+ .../libPython/xbmcmodule/controlradiobutton.cpp    |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/controlslider.cpp    |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/controlspin.cpp      |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/controltextbox.cpp   |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/dialog.cpp           |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/dialog.h             |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/infotagmusic.h       |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/infotagvideo.h       |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/keyboard.h           |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/listitem.cpp         |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/listitem.h           |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/player.h             |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp       |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/pyplaylist.h         |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/pyutil.h             |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/window.h             |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/winxml.cpp           |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/winxml.h             |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp     |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp  |    4 ++-
+ xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp    |    5 +++-
+ xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp       |    4 ++-
+ 42 files changed, 149 insertions(+), 48 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 4c0b1b7..cd3429e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -901,7 +901,11 @@ fi
+ 
+ # External Python
+ if test "$use_external_python" = "yes"; then
+-  AC_CHECK_LIB([python2.6], [main],
++  AC_CHECK_LIB([python2.7], [main],
++    [AC_DEFINE([HAVE_LIBPYTHON2_7], [1],
++    [Define to 1 if you have the 'python2.7' library.])
++    USE_PYTHON2_7=1],
++  [AC_CHECK_LIB([python2.6], [main],
+     [AC_DEFINE([HAVE_LIBPYTHON2_6], [1],
+     [Define to 1 if you have the 'python2.6' library.])
+     USE_PYTHON2_6=1],
+@@ -913,9 +917,10 @@ if test "$use_external_python" = "yes"; then
+     [AC_DEFINE([HAVE_LIBPYTHON2_4], [1],
+     [Define to 1 if you have the 'python2.4' library.])
+     USE_PYTHON2_4=1],
+-  [AC_MSG_ERROR($missing_library)] )] )] )
++  [AC_MSG_ERROR($missing_library)] )] )] )] )
+ 
+   AC_MSG_NOTICE($external_python_enabled)
++  test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7])
+   test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
+   test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
+   test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
+@@ -1471,6 +1476,7 @@ AC_SUBST(USE_INTERNAL_LIBDTS)
+ AC_SUBST(USE_EXTERNAL_LIBMPEG2)
+ AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
+ AC_SUBST(USE_EXTERNAL_PYTHON)
++AC_SUBST(USE_PYTHON2_7)
+ AC_SUBST(USE_PYTHON2_6)
+ AC_SUBST(USE_PYTHON2_5)
+ AC_SUBST(USE_PYTHON2_4)
+diff --git a/xbmc/lib/libPython/XBPyThread.cpp b/xbmc/lib/libPython/XBPyThread.cpp
+index 3a6f34e..71b4b9a 100644
+--- a/xbmc/lib/libPython/XBPyThread.cpp
++++ b/xbmc/lib/libPython/XBPyThread.cpp
+@@ -24,7 +24,10 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++    #include <python2.7/osdefs.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+     #include <python2.6/osdefs.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+diff --git a/xbmc/lib/libPython/XBPyThread.h b/xbmc/lib/libPython/XBPyThread.h
+index c3da337..eea7fea 100644
+--- a/xbmc/lib/libPython/XBPyThread.h
++++ b/xbmc/lib/libPython/XBPyThread.h
+@@ -26,7 +26,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/XBPython.cpp b/xbmc/lib/libPython/XBPython.cpp
+index e52cdfb..defcf14 100644
+--- a/xbmc/lib/libPython/XBPython.cpp
++++ b/xbmc/lib/libPython/XBPython.cpp
+@@ -24,7 +24,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+@@ -61,7 +63,9 @@ XBPython g_pythonParser;
+ #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so"
+ #endif
+ #elif defined(__x86_64__)
+-#if (defined HAVE_LIBPYTHON2_6)
++#if (defined HAVE_LIBPYTHON2_7)
++#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-linux.so"
++#elif (defined HAVE_LIBPYTHON2_6)
+ #define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so"
+ #elif (defined HAVE_LIBPYTHON2_5)
+ #define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so"
+@@ -69,7 +73,9 @@ XBPython g_pythonParser;
+ #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so"
+ #endif
+ #elif defined(_POWERPC)
+-#if (defined HAVE_LIBPYTHON2_6)
++#if (defined HAVE_LIBPYTHON2_7)
++#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc-linux.so"
++#elif (defined HAVE_LIBPYTHON2_6)
+ #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so"
+ #elif (defined HAVE_LIBPYTHON2_5)
+ #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so"
+@@ -77,7 +83,9 @@ XBPython g_pythonParser;
+ #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so"
+ #endif
+ #elif defined(_POWERPC64)
+-#if (defined HAVE_LIBPYTHON2_6)
++#if (defined HAVE_LIBPYTHON2_7)
++#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc64-linux.so"
++#elif (defined HAVE_LIBPYTHON2_6)
+ #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so"
+ #elif (defined HAVE_LIBPYTHON2_5)
+ #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so"
+@@ -85,7 +93,9 @@ XBPython g_pythonParser;
+ #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so"
+ #endif
+ #elif defined(_ARMEL)
+-#if (defined HAVE_LIBPYTHON2_6)
++#if (defined HAVE_LIBPYTHON2_7)
++#define PYTHON_DLL "special://xbmc/system/python/python27-arm.so"
++#elif (defined HAVE_LIBPYTHON2_6)
+ #define PYTHON_DLL "special://xbmc/system/python/python26-arm.so"
+ #elif (defined HAVE_LIBPYTHON2_5)
+ #define PYTHON_DLL "special://xbmc/system/python/python25-arm.so"
+@@ -93,7 +103,9 @@ XBPython g_pythonParser;
+ #define PYTHON_DLL "special://xbmc/system/python/python24-arm.so"
+ #endif
+ #else /* !__x86_64__ && !__powerpc__ */
+-#if (defined HAVE_LIBPYTHON2_6)
++#if (defined HAVE_LIBPYTHON2_7)
++#define PYTHON_DLL "special://xbmcbin/system/python/python27-i486-linux.so"
++#elif (defined HAVE_LIBPYTHON2_6)
+ #define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so"
+ #elif (defined HAVE_LIBPYTHON2_5)
+ #define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so"
+diff --git a/xbmc/lib/libPython/XBPythonDll.cpp b/xbmc/lib/libPython/XBPythonDll.cpp
+index bc9d827..87ac7d7 100644
+--- a/xbmc/lib/libPython/XBPythonDll.cpp
++++ b/xbmc/lib/libPython/XBPythonDll.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/pyconfig.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/pyconfig.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/pyconfig.h>
+diff --git a/xbmc/lib/libPython/XBPythonDllFuncs.S b/xbmc/lib/libPython/XBPythonDllFuncs.S
+index 6b7a6c3..f59b192 100644
+--- a/xbmc/lib/libPython/XBPythonDllFuncs.S
++++ b/xbmc/lib/libPython/XBPythonDllFuncs.S
+@@ -2,7 +2,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/pyconfig.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/pyconfig.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/pyconfig.h>
+diff --git a/xbmc/lib/libPython/linux/Makefile.in b/xbmc/lib/libPython/linux/Makefile.in
+index 7011434..0786937 100644
+--- a/xbmc/lib/libPython/linux/Makefile.in
++++ b/xbmc/lib/libPython/linux/Makefile.in
+@@ -5,7 +5,10 @@ LDFLAGS=@LDFLAGS@
+ SHELL=/bin/bash
+ SYSDIR=../../../../system/python
+ 
+-ifeq (@USE_PYTHON2_6@,1)
++ifeq (@USE_PYTHON2_7@,1)
++    PYVERSION=python2.7
++    SO=python27-$(ARCH).so
++else ifeq (@USE_PYTHON2_6@,1)
+     PYVERSION=python2.6
+     SO=python26-$(ARCH).so
+ else ifeq (@USE_PYTHON2_5@,1)
+diff --git a/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h b/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
+index 620d9bd..06fa146 100644
+--- a/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
++++ b/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
+@@ -26,7 +26,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/PythonAddon.h b/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
+index ec7ed28..41eb8ea 100644
+--- a/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
++++ b/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
+@@ -25,7 +25,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h b/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
+index ecee993..24a1c87 100644
+--- a/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
++++ b/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
+@@ -25,7 +25,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/action.h b/xbmc/lib/libPython/xbmcmodule/action.h
+index 0e20000..7f8b1bc 100644
+--- a/xbmc/lib/libPython/xbmcmodule/action.h
++++ b/xbmc/lib/libPython/xbmcmodule/action.h
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/control.h b/xbmc/lib/libPython/xbmcmodule/control.h
+index c76b37c..a9ec63d 100644
+--- a/xbmc/lib/libPython/xbmcmodule/control.h
++++ b/xbmc/lib/libPython/xbmcmodule/control.h
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp b/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
+index b24ccce..7455ca7 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp b/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
+index 96e4743..86a7d8b 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp b/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
+index 68442d8..c6eb052 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp b/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
+index aadfc17..8275324 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controlimage.cpp b/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
+index 79835d6..f106e90 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controllabel.cpp b/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
+index aca22e4..38a9c07 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controllist.cpp b/xbmc/lib/libPython/xbmcmodule/controllist.cpp
+index 0c67b5c..bb57776 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controllist.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controllist.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp b/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
+index a21e462..b460a2a 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp b/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
+index ec54efd..b966a17 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controlslider.cpp b/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
+index 21ea5e7..c5f65b3 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controlspin.cpp b/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
+index 4e24e14..feead3c 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp b/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
+index b4c44d5..4a7c688 100644
+--- a/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/dialog.cpp b/xbmc/lib/libPython/xbmcmodule/dialog.cpp
+index caa8986..cffe485 100644
+--- a/xbmc/lib/libPython/xbmcmodule/dialog.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/dialog.cpp
+@@ -24,7 +24,9 @@
+ #endif
+ #include "dialog.h"
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/dialog.h b/xbmc/lib/libPython/xbmcmodule/dialog.h
+index edcae41..a61c4b1 100644
+--- a/xbmc/lib/libPython/xbmcmodule/dialog.h
++++ b/xbmc/lib/libPython/xbmcmodule/dialog.h
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/infotagmusic.h b/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
+index d202e48..590b858 100644
+--- a/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
++++ b/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/infotagvideo.h b/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
+index f2bb300..e808573 100644
+--- a/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
++++ b/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/keyboard.h b/xbmc/lib/libPython/xbmcmodule/keyboard.h
+index e5c817f..0f069e3 100644
+--- a/xbmc/lib/libPython/xbmcmodule/keyboard.h
++++ b/xbmc/lib/libPython/xbmcmodule/keyboard.h
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/listitem.cpp b/xbmc/lib/libPython/xbmcmodule/listitem.cpp
+index 137436e..20105ef 100644
+--- a/xbmc/lib/libPython/xbmcmodule/listitem.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/listitem.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/listitem.h b/xbmc/lib/libPython/xbmcmodule/listitem.h
+index 7ebcd6c..3d4a6c8 100644
+--- a/xbmc/lib/libPython/xbmcmodule/listitem.h
++++ b/xbmc/lib/libPython/xbmcmodule/listitem.h
+@@ -25,7 +25,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/player.h b/xbmc/lib/libPython/xbmcmodule/player.h
+index 48dc9c7..34a102d 100644
+--- a/xbmc/lib/libPython/xbmcmodule/player.h
++++ b/xbmc/lib/libPython/xbmcmodule/player.h
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp b/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
+index c7e7f62..6df8548 100644
+--- a/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
+@@ -26,7 +26,9 @@
+ #include "Util.h"
+ #include "pyplaylist.h"
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/pyplaylist.h b/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
+index f2334bb..2410314 100644
+--- a/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
++++ b/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
+@@ -25,7 +25,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/pyutil.h b/xbmc/lib/libPython/xbmcmodule/pyutil.h
+index 4acf6e5..1a156f8 100644
+--- a/xbmc/lib/libPython/xbmcmodule/pyutil.h
++++ b/xbmc/lib/libPython/xbmcmodule/pyutil.h
+@@ -25,7 +25,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/window.h b/xbmc/lib/libPython/xbmcmodule/window.h
+index 6ce8e72..40304ff 100644
+--- a/xbmc/lib/libPython/xbmcmodule/window.h
++++ b/xbmc/lib/libPython/xbmcmodule/window.h
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/winxml.cpp b/xbmc/lib/libPython/xbmcmodule/winxml.cpp
+index d3b703f..3e1b3c8 100644
+--- a/xbmc/lib/libPython/xbmcmodule/winxml.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/winxml.cpp
+@@ -24,7 +24,9 @@
+ #endif
+ #include "winxml.h"
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/winxml.h b/xbmc/lib/libPython/xbmcmodule/winxml.h
+index 6e6489e..f3a8dd8 100644
+--- a/xbmc/lib/libPython/xbmcmodule/winxml.h
++++ b/xbmc/lib/libPython/xbmcmodule/winxml.h
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp b/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
+index b021501..92d9903 100644
+--- a/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
+@@ -24,7 +24,9 @@
+ #endif
+ #include "winxml.h"
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
+index b8bc0a3..c65aded 100644
+--- a/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"

+ #endif

+ #if (defined USE_EXTERNAL_PYTHON)

+-  #if (defined HAVE_LIBPYTHON2_6)

++  #if (defined HAVE_LIBPYTHON2_7)

++    #include <python2.7/Python.h>

++  #elif (defined HAVE_LIBPYTHON2_6)

+     #include <python2.6/Python.h>

+   #elif (defined HAVE_LIBPYTHON2_5)

+     #include <python2.5/Python.h>

+diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
+index 87c0ead..9941769 100644
+--- a/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
+@@ -23,7 +23,10 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++    #include <python2.7/structmember.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+     #include <python2.6/structmember.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
+index 3bab5a9..1e2c480 100644
+--- a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
++++ b/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
+@@ -23,7 +23,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+-- 
+1.7.3.1
+
diff --git a/media-tv/xbmc/xbmc-10.0.ebuild b/media-tv/xbmc/xbmc-10.0.ebuild
index a4f317dd4215..ca855d56230f 100644
--- a/media-tv/xbmc/xbmc-10.0.ebuild
+++ b/media-tv/xbmc/xbmc-10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-10.0.ebuild,v 1.2 2010/12/23 22:22:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-10.0.ebuild,v 1.3 2011/01/01 21:31:21 vapier Exp $
 
 EAPI="2"
 
@@ -112,6 +112,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-python-2.7.patch #350098
+
 	# some dirs ship generated autotools, some dont
 	local d
 	for d in . xbmc/cores/dvdplayer/Codecs/{libdts,libdvd/lib*/} lib/cpluff ; do