From 3a8e2136c82c284287f1bba0ba540c3ce45669d6 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 09:23:55 +0200
Subject: [PATCH 01/13] nano: update to nano-2.3.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/tools/nano/meta | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/tools/nano/meta b/packages/tools/nano/meta
index 3ceafb228c..e2ac257fea 100644
--- a/packages/tools/nano/meta
+++ b/packages/tools/nano/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="nano"
-PKG_VERSION="2.2.6"
+PKG_VERSION="2.3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nano-editor.org/"
-PKG_URL="http://www.nano-editor.org/dist/v2.2/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftp.gnu.org/gnu/nano/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="ncurses"
 PKG_BUILD_DEPENDS="toolchain ncurses"
 PKG_PRIORITY="optional"

From f8043e23a90baf9b5398417de1362ca79525e949 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 09:24:25 +0200
Subject: [PATCH 02/13] libmicrohttpd: update to libmicrohttpd-0.9.9

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/web/libmicrohttpd/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web/libmicrohttpd/meta b/packages/web/libmicrohttpd/meta
index 81f736a041..1c98852e19 100644
--- a/packages/web/libmicrohttpd/meta
+++ b/packages/web/libmicrohttpd/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libmicrohttpd"
-PKG_VERSION="0.9.4"
+PKG_VERSION="0.9.9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

From c807a5d8e01ca6cdc62acf0b07db8d23142f504e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 10:16:28 +0200
Subject: [PATCH 03/13] new package: add package 'Imaging'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc/meta                |  3 ++
 packages/python/graphics/Imaging/build        | 36 +++++++++++++++++++
 packages/python/graphics/Imaging/install      | 25 +++++++++++++
 packages/python/graphics/Imaging/meta         | 36 +++++++++++++++++++
 .../Imaging-1.1.7-crosscompiling-0.1.patch    | 34 ++++++++++++++++++
 .../Imaging-1.1.7-setuptools-0.1.patch        | 12 +++++++
 6 files changed, 146 insertions(+)
 create mode 100755 packages/python/graphics/Imaging/build
 create mode 100755 packages/python/graphics/Imaging/install
 create mode 100644 packages/python/graphics/Imaging/meta
 create mode 100644 packages/python/graphics/Imaging/patches/Imaging-1.1.7-crosscompiling-0.1.patch
 create mode 100644 packages/python/graphics/Imaging/patches/Imaging-1.1.7-setuptools-0.1.patch

diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index b06ed9b17f..4896a4c568 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -73,3 +73,6 @@ fi
 if [ "$PS3REMOTE_SUPPORT" = yes ]; then
   PKG_DEPENDS="$PKG_DEPENDS PyBluez"
 fi
+
+# some python stuff needed for various addons
+  PKG_DEPENDS="$PKG_DEPENDS Imaging"
diff --git a/packages/python/graphics/Imaging/build b/packages/python/graphics/Imaging/build
new file mode 100755
index 0000000000..3d37a7f15b
--- /dev/null
+++ b/packages/python/graphics/Imaging/build
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
+export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
+cd $PKG_BUILD
+
+python setup.py build --cross-compile
+python setup.py install -O1 --skip-build --prefix /usr --root .install
+
+find .install -name "*.py" -exec rm -rf "{}" ";"
+find .install -name "*.pyo" -exec rm -rf "{}" ";"
+
+rm -rf .install/usr/bin
diff --git a/packages/python/graphics/Imaging/install b/packages/python/graphics/Imaging/install
new file mode 100755
index 0000000000..a9c8b9924b
--- /dev/null
+++ b/packages/python/graphics/Imaging/install
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cp -PR $PKG_BUILD/.install/* $INSTALL
diff --git a/packages/python/graphics/Imaging/meta b/packages/python/graphics/Imaging/meta
new file mode 100644
index 0000000000..c7928a6268
--- /dev/null
+++ b/packages/python/graphics/Imaging/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="Imaging"
+PKG_VERSION="1.1.7"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="http://www.pythonware.com/products/pil/"
+PKG_URL="http://effbot.org/downloads/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="Python distribute zlib freetype $LIBJPEG"
+PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross zlib freetype $LIBJPEG"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/system"
+PKG_SHORTDESC="pil: Imaging handling/processing for Python"
+PKG_LONGDESC="The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library supports many file formats, and provides powerful image processing and graphics capabilities."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
diff --git a/packages/python/graphics/Imaging/patches/Imaging-1.1.7-crosscompiling-0.1.patch b/packages/python/graphics/Imaging/patches/Imaging-1.1.7-crosscompiling-0.1.patch
new file mode 100644
index 0000000000..ccd7afde48
--- /dev/null
+++ b/packages/python/graphics/Imaging/patches/Imaging-1.1.7-crosscompiling-0.1.patch
@@ -0,0 +1,34 @@
+diff -Naur Imaging-1.1.7/setup.py Imaging-1.1.7.patch/setup.py
+--- Imaging-1.1.7/setup.py	2011-04-17 09:31:07.000000000 +0200
++++ Imaging-1.1.7.patch/setup.py	2011-04-17 09:54:20.880047886 +0200
+@@ -147,7 +147,6 @@
+             add_directory(library_dirs, "/opt/local/lib")
+             add_directory(include_dirs, "/opt/local/include")
+ 
+-        add_directory(library_dirs, "/usr/local/lib")
+         # FIXME: check /opt/stuff directories here?
+ 
+         prefix = sysconfig.get_config_var("prefix")
+@@ -199,22 +198,6 @@
+             add_directory(include_dirs, include_root)
+ 
+         #
+-        # add standard directories
+-
+-        # look for tcl specific subdirectory (e.g debian)
+-        if _tkinter:
+-            tcl_dir = "/usr/include/tcl" + TCL_VERSION
+-            if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
+-                add_directory(include_dirs, tcl_dir)
+-
+-        # standard locations
+-        add_directory(library_dirs, "/usr/local/lib")
+-        add_directory(include_dirs, "/usr/local/include")
+-
+-        add_directory(library_dirs, "/usr/lib")
+-        add_directory(include_dirs, "/usr/include")
+-
+-        #
+         # insert new dirs *before* default libs, to avoid conflicts
+         # between Python PYD stub libs and real libraries
+ 
diff --git a/packages/python/graphics/Imaging/patches/Imaging-1.1.7-setuptools-0.1.patch b/packages/python/graphics/Imaging/patches/Imaging-1.1.7-setuptools-0.1.patch
new file mode 100644
index 0000000000..a59ea79c5b
--- /dev/null
+++ b/packages/python/graphics/Imaging/patches/Imaging-1.1.7-setuptools-0.1.patch
@@ -0,0 +1,12 @@
+diff -Naur Imaging-1.1.7/setup.py Imaging-1.1.7.patch/setup.py
+--- Imaging-1.1.7/setup.py	2009-11-15 17:06:10.000000000 +0100
++++ Imaging-1.1.7.patch/setup.py	2011-04-17 09:31:07.545708559 +0200
+@@ -83,7 +83,7 @@
+ # --------------------------------------------------------------------
+ 
+ from distutils import sysconfig
+-from distutils.core import Extension, setup
++from setuptools import Extension, setup
+ from distutils.command.build_ext import build_ext
+ 
+ try:

From 489bb51e40bf6cb8130d67e4bc517c73242409c6 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 10:18:30 +0200
Subject: [PATCH 04/13] xbmc: install 'simplejson' per default

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc/meta | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 4896a4c568..9a28ef04b3 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -76,3 +76,4 @@ fi
 
 # some python stuff needed for various addons
   PKG_DEPENDS="$PKG_DEPENDS Imaging"
+  PKG_DEPENDS="$PKG_DEPENDS simplejson"

From 5da675ceecf12657420061f2257f7a09dbf7a084 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 10:21:36 +0200
Subject: [PATCH 05/13] TwistedCore: update to TwistedCore-11.0.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/python/web/TwistedCore/meta                          | 4 ++--
 ...0-setuptools.patch => TwistedCore-11.0.0-setuptools.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename packages/python/web/TwistedCore/patches/{TwistedCore-10.1.0-setuptools.patch => TwistedCore-11.0.0-setuptools.patch} (100%)

diff --git a/packages/python/web/TwistedCore/meta b/packages/python/web/TwistedCore/meta
index 178eeb45fb..4b08e999db 100644
--- a/packages/python/web/TwistedCore/meta
+++ b/packages/python/web/TwistedCore/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="TwistedCore"
-PKG_VERSION="10.1.0"
+PKG_VERSION="11.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://twistedmatrix.com/"
-PKG_URL="http://tmrc.mit.edu/mirror/twisted/Core/10.1/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://twistedmatrix.com/Releases/Core/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="Python distribute"
 PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross"
 PKG_PRIORITY="optional"
diff --git a/packages/python/web/TwistedCore/patches/TwistedCore-10.1.0-setuptools.patch b/packages/python/web/TwistedCore/patches/TwistedCore-11.0.0-setuptools.patch
similarity index 100%
rename from packages/python/web/TwistedCore/patches/TwistedCore-10.1.0-setuptools.patch
rename to packages/python/web/TwistedCore/patches/TwistedCore-11.0.0-setuptools.patch

From f3198f63a3f9aca0f7194df9ad3809767c4d5e34 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 10:22:00 +0200
Subject: [PATCH 06/13] TwistedNames: update to TwistedNames-11.0.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/python/web/TwistedNames/meta | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/python/web/TwistedNames/meta b/packages/python/web/TwistedNames/meta
index 1f49d2acb7..e505e88f53 100644
--- a/packages/python/web/TwistedNames/meta
+++ b/packages/python/web/TwistedNames/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="TwistedNames"
-PKG_VERSION="10.1.0"
+PKG_VERSION="11.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://twistedmatrix.com/"
-PKG_URL="http://tmrc.mit.edu/mirror/twisted/Names/10.1/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://twistedmatrix.com/Releases/Names/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="Python distribute TwistedCore"
 PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross TwistedCore"
 PKG_PRIORITY="optional"

From 3f752a9588572eddc8ac3154a552bcf46e999b58 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 10:22:26 +0200
Subject: [PATCH 07/13] TwistedWords: update to TwistedWords-11.0.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/python/web/TwistedWords/meta | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/python/web/TwistedWords/meta b/packages/python/web/TwistedWords/meta
index c1afc2a4e8..191ae07680 100644
--- a/packages/python/web/TwistedWords/meta
+++ b/packages/python/web/TwistedWords/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="TwistedWords"
-PKG_VERSION="10.1.0"
+PKG_VERSION="11.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://twistedmatrix.com/"
-PKG_URL="http://tmrc.mit.edu/mirror/twisted/Words/10.1/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://twistedmatrix.com/Releases/Words/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="Python distribute TwistedCore"
 PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross TwistedCore"
 PKG_PRIORITY="optional"

From 6ced383ea76f8b8fcb2b41121206766ada860d7e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 10:22:43 +0200
Subject: [PATCH 08/13] TwistedWeb: update to TwistedWeb-11.0.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/python/web/TwistedWeb/meta | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/python/web/TwistedWeb/meta b/packages/python/web/TwistedWeb/meta
index e9672476ba..838afd4d3f 100644
--- a/packages/python/web/TwistedWeb/meta
+++ b/packages/python/web/TwistedWeb/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="TwistedWeb"
-PKG_VERSION="10.1.0"
+PKG_VERSION="11.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://twistedmatrix.com/"
-PKG_URL="http://tmrc.mit.edu/mirror/twisted/Web/10.1/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://twistedmatrix.com/Releases/Web/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="Python distribute TwistedCore"
 PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross TwistedCore"
 PKG_PRIORITY="optional"

From b2bdee3a9b570f008f10cecd9c1961d1549c9c27 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 10:23:14 +0200
Subject: [PATCH 09/13] new package: add package 'TwistedConch'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/python/web/TwistedConch/build   | 39 ++++++++++++++++++++++++
 packages/python/web/TwistedConch/install | 25 +++++++++++++++
 packages/python/web/TwistedConch/meta    | 36 ++++++++++++++++++++++
 3 files changed, 100 insertions(+)
 create mode 100755 packages/python/web/TwistedConch/build
 create mode 100755 packages/python/web/TwistedConch/install
 create mode 100644 packages/python/web/TwistedConch/meta

diff --git a/packages/python/web/TwistedConch/build b/packages/python/web/TwistedConch/build
new file mode 100755
index 0000000000..326cfea30a
--- /dev/null
+++ b/packages/python/web/TwistedConch/build
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
+export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
+cd $PKG_BUILD
+
+python setup.py build --cross-compile
+python setup.py install -O1 --skip-build --prefix /usr --root .install
+
+# install to toolchain because its needed for other twisted modules
+  python setup.py install -O1 --skip-build --prefix $ROOT/$TOOLCHAIN
+
+find .install -name "*.py" -exec rm -rf "{}" ";"
+find .install -name "*.pyo" -exec rm -rf "{}" ";"
+
+rm -rf .install/usr/lib/python*/site-packages/twisted/names/test
diff --git a/packages/python/web/TwistedConch/install b/packages/python/web/TwistedConch/install
new file mode 100755
index 0000000000..f5b110db15
--- /dev/null
+++ b/packages/python/web/TwistedConch/install
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cp -PR $PKG_BUILD/.install/* $INSTALL
\ No newline at end of file
diff --git a/packages/python/web/TwistedConch/meta b/packages/python/web/TwistedConch/meta
new file mode 100644
index 0000000000..e122c9c524
--- /dev/null
+++ b/packages/python/web/TwistedConch/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="TwistedConch"
+PKG_VERSION="11.0.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="MIT"
+PKG_SITE="http://twistedmatrix.com/"
+PKG_URL="http://twistedmatrix.com/Releases/Conch/11.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="Python distribute TwistedCore"
+PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross TwistedCore"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/web"
+PKG_SHORTDESC="TwistedConch: an SSHv2 implementation written in Python"
+PKG_LONGDESC="TwistedConch is an SSHv2 implementation written in Python. SSH is a protocol designed to allow remote access to shells and commands, but it is generic enough to allow everything from TCP forwarding to generic filesystem access. Since conch is written in Python, it interfaces well with other Python projects, such as Imagination. Conch also includes a implementations of the telnet and vt102 protocols, as well as support for rudimentary line editing behaviors. A new implementation of Twisted's Manhole application is also included, featuring server-side input history and interactive syntax coloring."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

From e2606d2392e829e2671670b8dbda5d2a73010d81 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 14:18:16 +0200
Subject: [PATCH 10/13] avahi: update to avahi-0.6.30

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/avahi/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/network/avahi/meta b/packages/network/avahi/meta
index 29d362d40d..e3644f222a 100644
--- a/packages/network/avahi/meta
+++ b/packages/network/avahi/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="avahi"
-PKG_VERSION="0.6.29"
+PKG_VERSION="0.6.30"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

From d7f234041128f531e003f085099e2d16be875a25 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 14:18:40 +0200
Subject: [PATCH 11/13] atk: update to atk-2.0.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/accessibility/atk/meta | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/accessibility/atk/meta b/packages/accessibility/atk/meta
index 862dab9da2..7aec38fe1f 100644
--- a/packages/accessibility/atk/meta
+++ b/packages/accessibility/atk/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="atk"
-PKG_VERSION="1.33.6"
+PKG_VERSION="2.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://library.gnome.org/devel/atk/"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/1.33/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/2.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="glib"
 PKG_BUILD_DEPENDS="toolchain glib"
 PKG_PRIORITY="optional"

From e0b40b0665f97c90bf7ee5a78725ef661b5048da Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 14:19:10 +0200
Subject: [PATCH 12/13] libva: update to libva-1.0.12

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/multimedia/libva/meta | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/multimedia/libva/meta b/packages/multimedia/libva/meta
index 9a79cf4eec..79f10bdf72 100644
--- a/packages/multimedia/libva/meta
+++ b/packages/multimedia/libva/meta
@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="libva"
-PKG_VERSION="bdc106e"
+PKG_VERSION="1.0.12"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"
-#PKG_URL="http://cgit.freedesktop.org/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://cgit.freedesktop.org/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
+#PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libX11 libXext libXfixes libdrm Mesa"
 PKG_BUILD_DEPENDS="toolchain libX11 libXext libXfixes libdrm Mesa"
 PKG_PRIORITY="optional"

From e196568f6a315a00951c2bbbd0bcfdc3e4103ddb Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Apr 2011 15:18:01 +0200
Subject: [PATCH 13/13] projects/*/linux: build FUSE driver statically

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 projects/Generic/linux/linux.i386.conf | 2 +-
 projects/ION/linux/linux.i386.conf     | 2 +-
 projects/ION/linux/linux.x86_64.conf   | 2 +-
 projects/Intel/linux/linux.i386.conf   | 2 +-
 projects/Intel/linux/linux.x86_64.conf | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index 2ed7fb4dfe..2cde09f6d3 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -2565,7 +2565,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 
 #
diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index 35a186bd22..f23300b7b7 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -2425,7 +2425,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 
 #
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index de19546653..d375b38811 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -2368,7 +2368,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 
 #
diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf
index f3f2361e5b..33628f6d17 100644
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@@ -2424,7 +2424,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 
 #
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index ef9216c9d7..9f42a3f345 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -2363,7 +2363,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
+CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 
 #