Version bump #409651 by Tomáš Chvátal.

(Portage version: 2.2.0_alpha95/cvs/Linux x86_64)

8 files changed, 22 insertions, 1686 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index cd5eafddc475..e26e69f0a3cd 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.124 2012/03/29 16:20:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.125 2012/03/29 16:22:51 vapier Exp $
+
+*xbmc-11.0 (29 Mar 2012)
+
+  29 Mar 2012; Mike Frysinger <vapier@gentoo.org>
+  -files/xbmc-10.0-python-2.7.patch, -xbmc-10.1.ebuild,
+  -files/xbmc-10.1-gcc-4.6.patch, -files/xbmc-10.1-headers.patch,
+  -files/xbmc-10.1-libpng-1.5.patch, -xbmc-11.0_rc2.ebuild, +xbmc-11.0.ebuild,
+  xbmc-9999.ebuild:
+  Version bump #409651 by Tomáš Chvátal.
 
   29 Mar 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Disable internal vdpau/ffmpeg checks since we handle this ourselves
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
deleted file mode 100644
index e3d17a5e074d..000000000000
--- a/media-tv/xbmc/files/xbmc-10.0-python-2.7.patch
+++ /dev/null
@@ -1,768 +0,0 @@
-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/files/xbmc-10.1-gcc-4.6.patch b/media-tv/xbmc/files/xbmc-10.1-gcc-4.6.patch
deleted file mode 100644
index b3e8c7c242fa..000000000000
--- a/media-tv/xbmc/files/xbmc-10.1-gcc-4.6.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-http://trac.xbmc.org/ticket/11383
-http://bugs.gentoo.org/367261
-
-From c66099c4d8e6b2d748ca3ddc31ee90b731d0f620 Mon Sep 17 00:00:00 2001
-From: Stephan Raue <stephan@openelec.tv>
-Date: Wed, 30 Mar 2011 14:57:28 +0200
-Subject: [PATCH] dvdplayer: fix build with gcc-4.6. Flags to the Linker must be passed via -Wl,. This fixes ticket #11383
-
-Signed-off-by: Stephan Raue <stephan@openelec.tv>
----
- xbmc/cores/dvdplayer/Codecs/Makefile.in        |   18 +++++++++---------
- xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in |    4 ++--
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/xbmc/cores/dvdplayer/Codecs/Makefile.in b/xbmc/cores/dvdplayer/Codecs/Makefile.in
-index a7ef1a0..308664a 100644
---- a/xbmc/cores/dvdplayer/Codecs/Makefile.in
-+++ b/xbmc/cores/dvdplayer/Codecs/Makefile.in
-@@ -148,32 +148,32 @@ liba52:
- else
- 
- $(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libavutil/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/avcodec-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavcodec/libavcodec.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libavcodec/*.o ffmpeg/libavcodec/$(ARCH_DIR)/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libavformat/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- ifneq ($(ARCH), arm)
- $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libswscale/*.o ffmpeg/libswscale/$(ARCH_DIR)/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- else # No ARM version of swscale available yet.
- $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libswscale/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- endif
- 
- $(SYSDIR)/postproc-51-$(ARCH).so: $(WRAPPER) ffmpeg/libpostproc/libpostproc.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libpostproc/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- ffmpeg/libavutil/libavutil.so     : ffmpeg;
-@@ -185,17 +185,17 @@ ffmpeg:
- 	$(MAKE) -C $@
- 
- $(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER) libdts/libdts/libdts.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
- 		libdts/libdts/bitstream.o \
- 		libdts/libdts/downmix.o libdts/libdts/parse.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER) liba52/liba52/liba52.la
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/liba52/.libs/*.o \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/liba52/.libs/*.o \
- 		-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/libao-$(ARCH).so: $(WRAPPER) liba52/libao/libao.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/libao/libao.a \
- 		-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- libdts/libdts/libdts.a : libdts;
-diff --git a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
-index 3c487e9..6d4abd4 100644
---- a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
-+++ b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
-@@ -49,12 +49,12 @@ $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvd
- else
- 
- $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
- 		libdvdcss/src/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- endif
--- 
-1.7.0.2
-
diff --git a/media-tv/xbmc/files/xbmc-10.1-headers.patch b/media-tv/xbmc/files/xbmc-10.1-headers.patch
deleted file mode 100644
index 8c23db86529a..000000000000
--- a/media-tv/xbmc/files/xbmc-10.1-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/TexturePacker/XBTFWriter.cpp
-+++ b/tools/TexturePacker/XBTFWriter.cpp
-@@ -28,6 +28,7 @@
- #include "EndianSwap.h"
- #define __STDC_FORMAT_MACROS
- #include <inttypes.h>
-+#include <unistd.h> /* for unlink() prototype */
- 
- #define TEMP_FILE "temp.xbt"
- #define TEMP_SIZE (10*1024*1024)
diff --git a/media-tv/xbmc/files/xbmc-10.1-libpng-1.5.patch b/media-tv/xbmc/files/xbmc-10.1-libpng-1.5.patch
deleted file mode 100644
index 4d9922758ad1..000000000000
--- a/media-tv/xbmc/files/xbmc-10.1-libpng-1.5.patch
+++ /dev/null
@@ -1,596 +0,0 @@
-fix building with newer libpng.  patch by Ian Stakenvicius.
-
-https://bugs.gentoo.org/380127
-
---- a/xbmc/lib/cximage-6.0/CxImage/ximapng.h
-+++ b/xbmc/lib/cximage-6.0/CxImage/ximapng.h
-@@ -69,8 +69,13 @@
- 

-     static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)

- 	{

-+#if PNG_LIBPNG_VER > 10399

-+		strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);

-+		longjmp(png_jmpbuf(png_ptr), 1);

-+#else

- 		strncpy((char*)png_ptr->error_ptr,error_msg,255);

- 		longjmp(png_ptr->jmpbuf, 1);

-+#endif

- 	}

- };

- 

---- a/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp
-+++ b/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp
-@@ -15,7 +15,11 @@
- void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)

- {

- 	strcpy(info.szLastError,message);

-+#if PNG_LIBPNG_VER > 10399

-+	longjmp(png_jmpbuf(png_ptr), 1);

-+#else

- 	longjmp(png_ptr->jmpbuf, 1);

-+#endif

- }

- ////////////////////////////////////////////////////////////////////////////////

- #if CXIMAGE_SUPPORT_DECODE

-@@ -62,7 +66,11 @@
-     /* Set error handling if you are using the setjmp/longjmp method (this is

-     * the normal method of doing things with libpng).  REQUIRED unless you

-     * set up your own error handlers in the png_create_read_struct() earlier. */

-+#if PNG_LIBPNG_VER > 10399

-+	if (setjmp(png_jmpbuf(png_ptr))) {

-+#else

- 	if (setjmp(png_ptr->jmpbuf)) {

-+#endif

- 		/* Free all of the memory associated with the png_ptr and info_ptr */

- 		delete [] row_pointers;

- 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);

-@@ -70,16 +78,35 @@
- 	/* read the file information */

- 	png_read_info(png_ptr, info_ptr);

- 

-+	png_uint_32 _width,_height;

-+	int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;

-+#if PNG_LIBPNG_VER > 10399

-+	png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,

-+		&_interlace_type,&_compression_type,&_filter_type);

-+#else

-+	_width=info_ptr->width;

-+	_height=info_ptr->height;

-+	_bit_depth=info_ptr->bit_depth;

-+	_color_type=info_ptr->color_type;

-+	_interlace_type=info_ptr->interlace_type;

-+	_compression_type=info_ptr->compression_type;

-+	_filter_type=info_ptr->filter_type;

-+#endif

-+

- 	if (info.nEscape == -1){

--		head.biWidth = info_ptr->width;

--		head.biHeight= info_ptr->height;

-+		head.biWidth = _width;

-+		head.biHeight= _height;

- 		info.dwType = CXIMAGE_FORMAT_PNG;

-+#if PNG_LIBPNG_VER > 10399

-+		longjmp(png_jmpbuf(png_ptr), 1);

-+#else

- 		longjmp(png_ptr->jmpbuf, 1);

-+#endif

- 	}

- 

- 	/* calculate new number of channels */

- 	int channels=0;

--	switch(info_ptr->color_type){

-+	switch(_color_type){

- 	case PNG_COLOR_TYPE_GRAY:

- 	case PNG_COLOR_TYPE_PALETTE:

- 		channels = 1;

-@@ -101,71 +128,108 @@
- 		break;

- 	default:

- 		strcpy(info.szLastError,"unknown PNG color type");

-+#if PNG_LIBPNG_VER > 10399

-+		longjmp(png_jmpbuf(png_ptr), 1);

-+#else

- 		longjmp(png_ptr->jmpbuf, 1);

-+#endif

- 	}

- 

- 	//find the right pixel depth used for cximage

-+#if PNG_LIBPNG_VER > 10399

-+	int pixel_depth = _bit_depth * png_get_channels(png_ptr,info_ptr);

-+#else

- 	int pixel_depth = info_ptr->pixel_depth;

-+#endif

- 	if (channels == 1 && pixel_depth>8) pixel_depth=8;

- 	if (channels == 2) pixel_depth=8;

- 	if (channels >= 3) pixel_depth=24;

- 

--	if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){

-+	if (!Create(_width, _height, pixel_depth, CXIMAGE_FORMAT_PNG)){

-+#if PNG_LIBPNG_VER > 10399

-+		longjmp(png_jmpbuf(png_ptr), 1);

-+#else

- 		longjmp(png_ptr->jmpbuf, 1);

-+#endif

- 	}

- 

- 	/* get metrics */

--	switch (info_ptr->phys_unit_type)

-+	png_uint_32 _x_pixels_per_unit,_y_pixels_per_unit;

-+	int _phys_unit_type;

-+#if PNG_LIBPNG_VER > 10399

-+	png_get_pHYs(png_ptr,info_ptr,&_x_pixels_per_unit,&_y_pixels_per_unit,&_phys_unit_type);

-+#else

-+	_x_pixels_per_unit=info_ptr->x_pixels_per_unit;

-+	_y_pixels_per_unit=info_ptr->y_pixels_per_unit;

-+	_phys_unit_type=info_ptr->phys_unit_type;

-+#endif

-+	switch (_phys_unit_type)

- 	{

- 	case PNG_RESOLUTION_UNKNOWN:

--		SetXDPI(info_ptr->x_pixels_per_unit);

--		SetYDPI(info_ptr->y_pixels_per_unit);

-+		SetXDPI(_x_pixels_per_unit);

-+		SetYDPI(_y_pixels_per_unit);

- 		break;

- 	case PNG_RESOLUTION_METER:

--		SetXDPI((long)floor(info_ptr->x_pixels_per_unit * 254.0 / 10000.0 + 0.5));

--		SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5));

-+		SetXDPI((long)floor(_x_pixels_per_unit * 254.0 / 10000.0 + 0.5));

-+		SetYDPI((long)floor(_y_pixels_per_unit * 254.0 / 10000.0 + 0.5));

- 		break;

- 	}

- 

--	if (info_ptr->num_palette>0){

--		SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette);

--		SetClrImportant(info_ptr->num_palette);

--	} else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs

-+	int _num_palette;

-+	png_colorp _palette;

-+#if PNG_LIBPNG_VER > 10399

-+	png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);

-+#else

-+	_num_palette=info_ptr->num_palette;

-+	_palette=info_ptr->palette;

-+#endif

-+	if (_num_palette>0){

-+		SetPalette((rgb_color*)_palette,_num_palette);

-+		SetClrImportant(_num_palette);

-+	} else if (_bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs

- 		SetPaletteColor(0,0,0,0);

- 		SetPaletteColor(1,85,85,85);

- 		SetPaletteColor(2,170,170,170);

- 		SetPaletteColor(3,255,255,255);

- 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs

- 	

--	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;

-+	int nshift = max(0,(_bit_depth>>3)-1)<<3;

- 

--	if (info_ptr->num_trans!=0){ //palette transparency

--		if (info_ptr->num_trans==1){

--			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){

-+	png_bytep _trans_alpha;

-+	int _num_trans;

-+	png_color_16p _trans_color;

-+#if PNG_LIBPNG_VER > 10399

-+	png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color);

-+#else

-+	_num_trans=info_ptr->num_trans;

-+#endif

-+	if (_num_trans!=0){ //palette transparency

-+		if (_num_trans==1){

-+			if (_color_type == PNG_COLOR_TYPE_PALETTE){

- #if PNG_LIBPNG_VER > 10399

--				info.nBkgndIndex = info_ptr->trans_color.index;

-+				info.nBkgndIndex = _trans_color->index;

- #else

- 				info.nBkgndIndex = info_ptr->trans_values.index;

- #endif

- 			} else{

- #if PNG_LIBPNG_VER > 10399

--				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;

-+				info.nBkgndIndex = _trans_color->gray>>nshift;

- #else

- 				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;

- #endif

- 			}

- 		}

--		if (info_ptr->num_trans>1){

-+		if (_num_trans>1){

- 			RGBQUAD* pal=GetPalette();

- 			if (pal){

- 				DWORD ip;

--				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)

-+				for (ip=0;ip<min(head.biClrUsed,(unsigned long)_num_trans);ip++)

- #if PNG_LIBPNG_VER > 10399

--					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];

-+					pal[ip].rgbReserved=_trans_alpha[ip];

- #else

- 					pal[ip].rgbReserved=info_ptr->trans[ip];

- #endif

--				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){

-+				for (ip=_num_trans;ip<head.biClrUsed;ip++){

- 					pal[ip].rgbReserved=255;

- 				}

- 				info.bAlphaPaletteEnabled=true;

-@@ -174,14 +238,12 @@
- 	}

- 

- 	if (channels == 3){ //check RGB binary transparency

--		png_bytep trans;

--		int num_trans;

--		png_color_16 *image_background;

--		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){

--#if PNG_LIBPNG_VER > 10399

--			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);

--			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);

--			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);

-+		/* seems unnecessary to call again, but the conditional must be important so... */

-+		if (png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color)){

-+#if PNG_LIBPNG_VER > 10399

-+			info.nBkgndColor.rgbRed   = (BYTE)(_trans_color->red>>nshift);

-+			info.nBkgndColor.rgbGreen = (BYTE)(_trans_color->green>>nshift);

-+			info.nBkgndColor.rgbBlue  = (BYTE)(_trans_color->blue>>nshift);

- #else

- 			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);

- 			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);

-@@ -202,15 +264,24 @@
- 	}

- 

- 	// <vho> - flip the RGB pixels to BGR (or RGBA to BGRA)

--	if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){

-+	if (_color_type & PNG_COLOR_MASK_COLOR){

- 		png_set_bgr(png_ptr);

- 	}

- 

- 	// <vho> - handle cancel

--	if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);

-+	if (info.nEscape)

-+#if PNG_LIBPNG_VER > 10399

-+		longjmp(png_jmpbuf(png_ptr), 1);

-+#else

-+		longjmp(png_ptr->jmpbuf, 1);

-+#endif

- 

- 	// row_bytes is the width x number of channels x (bit-depth / 8)

-+#if PNG_LIBPNG_VER > 10399

-+	row_pointers = new BYTE[png_get_rowbytes(png_ptr,info_ptr) + 8];

-+#else

- 	row_pointers = new BYTE[info_ptr->rowbytes + 8];

-+#endif

- 

- 	// turn on interlace handling

- 	int number_passes = png_set_interlace_handling(png_ptr);

-@@ -221,8 +292,12 @@
- 		SetCodecOption(0);

- 	}

- 

--	int chan_offset = info_ptr->bit_depth >> 3;

-+	int chan_offset = _bit_depth >> 3;

-+#if PNG_LIBPNG_VER > 10399

-+	int pixel_offset = (_bit_depth * png_get_channels(png_ptr,info_ptr)) >> 3;

-+#else

- 	int pixel_offset = info_ptr->pixel_depth >> 3;

-+#endif

- 

- 	for (int pass=0; pass < number_passes; pass++) {

- 		iter.Upset();

-@@ -230,7 +305,12 @@
- 		do	{

- 

- 			// <vho> - handle cancel

--			if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);

-+			if (info.nEscape)

-+#if PNG_LIBPNG_VER > 10399

-+				longjmp(png_jmpbuf(png_ptr), 1);

-+#else

-+				longjmp(png_ptr->jmpbuf, 1);

-+#endif

- 

- #if CXIMAGE_SUPPORT_ALPHA	// <vho>

- 			if (AlphaIsValid()) {

-@@ -241,7 +321,7 @@
- 				BYTE* prow= iter.GetRow(ay);

- 

- 				//recover data from previous scan

--				if (info_ptr->interlace_type && pass>0 && pass!=7){

-+				if (_interlace_type && pass>0 && pass!=7){

- 					for(ax=0;ax<head.biWidth;ax++){

- 						long px = ax * pixel_offset;

- 						if (channels == 2){

-@@ -278,10 +358,14 @@
- #endif // CXIMAGE_SUPPORT_ALPHA		// vho

- 			{

- 				//recover data from previous scan

--				if (info_ptr->interlace_type && pass>0){

-+				if (_interlace_type && pass>0){

-+#if PNG_LIBPNG_VER > 10399

-+					iter.GetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));

-+#else

- 					iter.GetRow(row_pointers, info_ptr->rowbytes);

-+#endif

- 					//re-expand buffer for images with bit depth > 8

--					if (info_ptr->bit_depth > 8){

-+					if (_bit_depth > 8){

- 						for(long ax=(head.biWidth*channels-1);ax>=0;ax--)

- 							row_pointers[ax*chan_offset] = row_pointers[ax];

- 					}

-@@ -291,15 +375,19 @@
- 				png_read_row(png_ptr, row_pointers, NULL);

- 

- 				//shrink 16 bit depth images down to 8 bits

--				if (info_ptr->bit_depth > 8){

-+				if (_bit_depth > 8){

- 					for(long ax=0;ax<(head.biWidth*channels);ax++)

- 						row_pointers[ax] = row_pointers[ax*chan_offset];

- 				}

- 

- 				//copy the pixels

-+#if PNG_LIBPNG_VER > 10399

-+				iter.SetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));

-+#else

- 				iter.SetRow(row_pointers, info_ptr->rowbytes);

-+#endif

- 				//<DP> expand 2 bpp images only in the last pass

--				if (info_ptr->bit_depth==2 && pass==(number_passes-1))

-+				if (_bit_depth==2 && pass==(number_passes-1))

- 					expand2to4bpp(iter.GetRow());

- 

- 				//go on

-@@ -361,9 +449,13 @@
-    /* Set error handling.  REQUIRED if you aren't supplying your own

-     * error hadnling functions in the png_create_write_struct() call.

-     */

-+#if PNG_LIBPNG_VER > 10399

-+	if (setjmp(png_jmpbuf(png_ptr))){

-+#else

- 	if (setjmp(png_ptr->jmpbuf)){

- 		/* If we get here, we had a problem reading the file */

- 		if (info_ptr->palette) free(info_ptr->palette);

-+#endif

- 		png_destroy_write_struct(&png_ptr,  (png_infopp)&info_ptr);

- 		cx_throw("Error saving PNG file");

- 	}

-@@ -372,9 +464,23 @@
- 	//png_init_io(png_ptr, hFile);

- 

- 	// use custom I/O functions

--    png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);

-+	png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);

- 

- 	/* set the file information here */

-+#if PNG_LIBPNG_VER > 10399

-+	/* use variables to hold the values so it isnt necessary to png_get them later */

-+	png_uint_32 _width,_height;

-+	int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;

-+	png_byte _channels,_pixel_depth;

-+

-+	_width = GetWidth();

-+	_height = GetHeight();

-+	_pixel_depth = (BYTE)GetBpp();

-+	_channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;

-+	_bit_depth = (BYTE)(GetBpp()/_channels);

-+	_compression_type = PNG_COMPRESSION_TYPE_DEFAULT;

-+	_filter_type = PNG_FILTER_TYPE_DEFAULT;

-+#else

- 	info_ptr->width = GetWidth();

- 	info_ptr->height = GetHeight();

- 	info_ptr->pixel_depth = (BYTE)GetBpp();

-@@ -382,13 +488,22 @@
- 	info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels);

- 	info_ptr->compression_type = info_ptr->filter_type = 0;

- 	info_ptr->valid = 0;

-+#endif

- 

- 	switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){

- 	case 1:

-+#if PNG_LIBPNG_VER > 10399

-+		_interlace_type = PNG_INTERLACE_ADAM7;

-+#else

- 		info_ptr->interlace_type = PNG_INTERLACE_ADAM7;

-+#endif

- 		break;

- 	default:

-+#if PNG_LIBPNG_VER > 10399

-+		_interlace_type = PNG_INTERLACE_NONE;

-+#else

- 		info_ptr->interlace_type = PNG_INTERLACE_NONE;

-+#endif

- 	}

- 

- 	/* set compression level */

-@@ -398,22 +513,47 @@
- 

- 	if (GetNumColors()){

- 		if (bGrayScale){

-+#if PNG_LIBPNG_VER > 10399

-+			_color_type = PNG_COLOR_TYPE_GRAY;

-+#else

- 			info_ptr->color_type = PNG_COLOR_TYPE_GRAY;

-+#endif

- 		} else {

-+#if PNG_LIBPNG_VER > 10399

-+			_color_type = PNG_COLOR_TYPE_PALETTE;

-+#else

- 			info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;

-+#endif

- 		}

- 	} else {

-+#if PNG_LIBPNG_VER > 10399

-+		_color_type = PNG_COLOR_TYPE_RGB;

-+#else

- 		info_ptr->color_type = PNG_COLOR_TYPE_RGB;

-+#endif

- 	}

- #if CXIMAGE_SUPPORT_ALPHA

- 	if (AlphaIsValid()){

-+#if PNG_LIBPNG_VER > 10399

-+		_color_type |= PNG_COLOR_MASK_ALPHA;

-+		_channels++;

-+		_bit_depth = 8;

-+		_pixel_depth += 8;

-+#else

- 		info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;

- 		info_ptr->channels++;

- 		info_ptr->bit_depth = 8;

- 		info_ptr->pixel_depth += 8;

-+#endif

- 	}

- #endif

- 

-+#if PNG_LIBPNG_VER > 10399

-+	/* set the header here, since we're done modifying these values */

-+	png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,_interlace_type,

-+		_compression_type,_filter_type);

-+#endif

-+

- 	/* set background */

- 	png_color_16 image_background={ 0, 255, 255, 255, 0 };

- 	RGBQUAD tc = GetTransColor();

-@@ -427,22 +567,24 @@
- 	/* set metrics */

- 	png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER);

- 

-+#if PNG_LIBPNG_VER <= 10399

- 	png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth,

- 				info_ptr->color_type, info_ptr->interlace_type,

- 				PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);

-+#endif

- 

- 	//<DP> simple transparency

- 	if (info.nBkgndIndex >= 0){

--		info_ptr->num_trans = 1;

--		info_ptr->valid |= PNG_INFO_tRNS;

- #if PNG_LIBPNG_VER > 10399

--		info_ptr->trans_alpha = trans;

--		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;

--		info_ptr->trans_color.red   = tc.rgbRed;

--		info_ptr->trans_color.green = tc.rgbGreen;

--		info_ptr->trans_color.blue  = tc.rgbBlue;

--		info_ptr->trans_color.gray  = info_ptr->trans_color.index;

-+		png_color_16 _trans_color;

-+		_trans_color.index = (BYTE)info.nBkgndIndex;

-+		_trans_color.red   = tc.rgbRed;

-+		_trans_color.green = tc.rgbGreen;

-+		_trans_color.blue  = tc.rgbBlue;

-+		_trans_color.gray  = _trans_color.index;

- #else

-+		info_ptr->num_trans = 1;

-+		info_ptr->valid |= PNG_INFO_tRNS;

- 		info_ptr->trans = trans;

- 		info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;

- 		info_ptr->trans_values.red   = tc.rgbRed;

-@@ -454,34 +596,53 @@
- 		// the transparency indexes start from 0 for non grayscale palette

- 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)

- 			SwapIndex(0,(BYTE)info.nBkgndIndex);

-+

-+#if PNG_LIBPNG_VER > 10399

-+		png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,1,&_trans_color);

-+#endif

- 	}

- 

- 	/* set the palette if there is one */

-+#if PNG_LIBPNG_VER > 10399

-+	png_colorp _palette;

-+#endif

- 	if (GetPalette()){

-+#if PNG_LIBPNG_VER <= 10399

- 		if (!bGrayScale){

- 			info_ptr->valid |= PNG_INFO_PLTE;

- 		}

-+#endif

- 

- 		int nc = GetClrImportant();

- 		if (nc==0) nc = GetNumColors();

- 

-+		// copy the palette colors

-+#if PNG_LIBPNG_VER > 10399

-+		_palette = new png_color[nc];

-+#else

-+		info_ptr->palette = new png_color[nc];

-+		info_ptr->num_palette = (png_uint_16) nc;

-+#endif

-+		for (int i=0; i<nc; i++)

-+#if PNG_LIBPNG_VER > 10399

-+			GetPaletteColor(i, &_palette[i].red, &_palette[i].green, &_palette[i].blue);

-+

-+		png_set_PLTE(png_ptr,info_ptr,_palette,nc);

-+#else

-+			GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);

-+#endif

-+

- 		if (info.bAlphaPaletteEnabled){

- 			for(WORD ip=0; ip<nc;ip++)

- 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;

--			info_ptr->num_trans = (WORD)nc;

--			info_ptr->valid |= PNG_INFO_tRNS;

- #if PNG_LIBPNG_VER > 10399

--			info_ptr->trans_alpha = trans;

-+			png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,nc,NULL);

- #else

-+			info_ptr->num_trans = (WORD)nc;

-+			info_ptr->valid |= PNG_INFO_tRNS;

- 			info_ptr->trans = trans;

- #endif

- 		}

--

--		// copy the palette colors

--		info_ptr->palette = new png_color[nc];

--		info_ptr->num_palette = (png_uint_16) nc;

--		for (int i=0; i<nc; i++)

--			GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);

- 	}  

- 

- #if CXIMAGE_SUPPORT_ALPHA	// <vho>

-@@ -495,8 +656,12 @@
- 	}	}	}

- #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>

- 

-+#if PNG_LIBPNG_VER > 10399

-+	int row_size = max(info.dwEffWidth, (_width * _channels * _bit_depth / 8));

-+#else

- 	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));

- 	info_ptr->rowbytes = row_size;

-+#endif

- 	BYTE *row_pointers = new BYTE[row_size];

- 

- 	/* write the file information */

-@@ -514,7 +679,11 @@
- 			if (AlphaIsValid()){

- 				for (long ax=head.biWidth-1; ax>=0;ax--){

- 					c = BlindGetPixelColor(ax,ay);

-+#if PNG_LIBPNG_VER > 10399

-+					int px = ax * _channels;

-+#else

- 					int px = ax * info_ptr->channels;

-+#endif

- 					if (!bGrayScale){

- 						row_pointers[px++]=c.rgbRed;

- 						row_pointers[px++]=c.rgbGreen;

-@@ -529,7 +698,11 @@
- #endif //CXIMAGE_SUPPORT_ALPHA	// <vho>

- 			{

- 				iter.GetRow(row_pointers, row_size);

-+#if PNG_LIBPNG_VER > 10399

-+				if (_color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP

-+#else

- 				if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP

-+#endif

- 					RGBtoBGR(row_pointers, row_size);

- 				png_write_row(png_ptr, row_pointers);

- 			}

-@@ -546,9 +719,14 @@
- 	png_write_end(png_ptr, info_ptr);

- 

- 	/* if you malloced the palette, free it here */

-+#if PNG_LIBPNG_VER > 10399

-+	if (_palette){

-+		delete [] (_palette);

-+#else

- 	if (info_ptr->palette){

- 		delete [] (info_ptr->palette);

- 		info_ptr->palette = NULL;

-+#endif

- 	}

- 

- 	/* clean up after the write, and free any memory allocated */

diff --git a/media-tv/xbmc/xbmc-10.1.ebuild b/media-tv/xbmc/xbmc-10.1.ebuild
deleted file mode 100644
index 79e80eb4eb8a..000000000000
--- a/media-tv/xbmc/xbmc-10.1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-10.1.ebuild,v 1.9 2012/03/27 18:37:13 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils python
-
-# Use XBMC_ESVN_REPO_URI to track a different branch
-ESVN_REPO_URI=${XBMC_ESVN_REPO_URI:-http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk}
-ESVN_PROJECT=${ESVN_REPO_URI##*/svnroot/}
-ESVN_PROJECT=${ESVN_PROJECT%/*}
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion autotools
-	KEYWORDS=""
-else
-	inherit autotools
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
-HOMEPAGE="http://xbmc.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa altivec avahi css debug joystick midi profile pulseaudio rtmp sse sse2 udev vaapi vdpau webserver +xrandr"
-
-COMMON_DEPEND="virtual/opengl
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-i18n/enca
-	dev-libs/boost
-	dev-libs/fribidi
-	dev-libs/libcdio[-minimal]
-	dev-libs/libpcre[cxx]
-	>=dev-libs/lzo-2.04
-	>=dev-python/pysqlite-2
-	media-libs/alsa-lib
-	media-libs/faad2
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-1.5.6
-	media-libs/jasper
-	media-libs/jbigkit
-	virtual/jpeg
-	>=media-libs/libass-0.9.7
-	css? ( media-libs/libdvdcss )
-	media-libs/libmad
-	media-libs/libmms
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	media-libs/libsamplerate
-	media-libs/libsdl[audio,opengl,video,X]
-	alsa? ( media-libs/libsdl[alsa] )
-	media-libs/libvorbis
-	media-libs/sdl-gfx
-	>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
-	media-libs/sdl-mixer
-	media-libs/sdl-sound
-	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
-	media-sound/wavpack
-	>=virtual/ffmpeg-0.6
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	webserver? ( net-libs/libmicrohttpd )
-	net-misc/curl
-	|| ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.3 )
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/mysql
-	x11-apps/xdpyinfo
-	x11-apps/mesa-progs
-	vaapi? ( x11-libs/libva )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		virtual/ffmpeg[vdpau]
-	)
-	x11-libs/libXinerama
-	xrandr? ( x11-libs/libXrandr )
-	x11-libs/libXrender"
-RDEPEND="${COMMON_DEPEND}
-	udev? (	sys-fs/udisks:0 sys-power/upower )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	x11-proto/xineramaproto
-	dev-util/cmake
-	x86? ( dev-lang/nasm )"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		subversion_src_unpack
-		cd "${S}"
-		rm -f configure
-	else
-		unpack ${A}
-		cd "${S}"
-	fi
-
-	# Fix case sensitivity
-	mv media/Fonts/{a,A}rial.ttf || die
-	mv media/{S,s}plash.png || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-10.0-python-2.7.patch #350098
-	epatch "${FILESDIR}"/${PN}-10.1-gcc-4.6.patch #367261
-	epatch "${FILESDIR}"/${P}-libpng-1.5.patch #380127
-	epatch "${FILESDIR}"/${PN}-10.1-headers.patch #380127
-
-	# some dirs ship generated autotools, some dont
-	local d
-	for d in . xbmc/cores/dvdplayer/Codecs/{libdts,libdvd/lib*/} lib/cpluff ; do
-		[[ -e ${d}/configure ]] && continue
-		pushd ${d} >/dev/null
-		einfo "Generating autotools in ${d}"
-		eautoreconf
-		popd >/dev/null
-	done
-
-	local squish #290564
-	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
-	use sse && squish="-DSQUISH_USE_SSE=1 -msse"
-	use sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
-	sed -i \
-		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
-		-e "1iCXXFLAGS += ${squish}" \
-		xbmc/lib/libsquish/Makefile.in || die
-
-	# Fix XBMC's final version string showing as "exported"
-	# instead of the SVN revision number.
-	export SVN_REV=${ESVN_WC_REVISION:-exported}
-
-	# Avoid lsb-release dependency
-	sed -i \
-		-e 's:lsb_release -d:cat /etc/gentoo-release:' \
-		xbmc/utils/SystemInfo.cpp
-
-	# Do not use termcap #262822
-	sed -i 's:-ltermcap::' xbmc/lib/libPython/Python/configure
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	epatch_user #293109
-
-	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_configure() {
-	# Disable documentation generation
-	export ac_cv_path_LATEX=no
-	# Avoid help2man
-	export HELP2MAN=$(type -P help2man || echo true)
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--enable-external-libraries \
-		--disable-external-python \
-		--enable-goom \
-		--enable-gl \
-		--disable-liba52 \
-		--disable-libdts \
-		$(use_enable avahi) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		--disable-hal \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable profile profiling) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable rtmp) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc keymapping.txt README.linux
-	rm "${D}"/usr/share/doc/${PF}/{copying.txt,LICENSE.GPL} || die
-
-#	insinto /usr/share/applications
-#	doins tools/Linux/xbmc.desktop
-#	doicon tools/Linux/xbmc.png
-
-	insinto "$(python_get_sitedir)" #309885
-	doins tools/EventClients/lib/python/xbmcclient.py || die
-	newbin "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send || die
-}
-
-pkg_postinst() {
-	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
-}
diff --git a/media-tv/xbmc/xbmc-11.0_rc2.ebuild b/media-tv/xbmc/xbmc-11.0.ebuild
index 94a07b52fbd6..6ee4ec232996 100644
--- a/media-tv/xbmc/xbmc-11.0_rc2.ebuild
+++ b/media-tv/xbmc/xbmc-11.0.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0_rc2.ebuild,v 1.4 2012/03/27 18:37:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0.ebuild,v 1.1 2012/03/29 16:22:51 vapier Exp $
 
 EAPI="4"
 
 # Does not work with py3 here
 # It might work with py:2.5 but I didn't test that
 PYTHON_DEPEND="2:2.6"
+
 inherit eutils python
 
 EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
@@ -14,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2 autotools
 else
 	inherit autotools
-	MY_P=${P/_/-Eden_}
+	MY_P=${P/_/-*_}
 	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
@@ -120,7 +121,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11.0-libpng-1.5.patch #380127
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
 	epatch "${FILESDIR}"/${PN}-9999-no-exec-stack.patch
@@ -150,6 +150,10 @@ src_prepare() {
 		-e "1iCXXFLAGS += ${squish}" \
 		lib/libsquish/Makefile.in || die
 
+	# Disable internal func checks as our USE/DEPEND
+	# stuff handles this just fine already #408395
+	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
+
 	# Fix XBMC's final version string showing as "exported"
 	# instead of the SVN revision number.
 	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index ff3e6aae5be6..016f5bbb8d5b 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.107 2012/03/29 16:20:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.108 2012/03/29 16:22:51 vapier Exp $
 
 EAPI="4"
 
@@ -15,8 +15,8 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2 autotools
 else
 	inherit autotools
-	MY_P=${P/_/-}
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+	MY_P=${P/_/-*_}
+	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
@@ -123,6 +123,8 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+	# The mythtv patch touches configure.ac, so force a regen
+	rm -f configure
 
 	# some dirs ship generated autotools, some dont
 	local d