Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/3rdparty/web/pycurl/meta

@@ -26,11 +26,10 @@ PKG_LICENSE="GPL-2"
 PKG_SITE="http://pycurl.sourceforge.net/"
 PKG_URL="http://pycurl.sourceforge.net/download/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="Python curl"
-PKG_BUILD_DEPENDS="toolchain Python distutilscross curl"
+PKG_BUILD_DEPENDS="toolchain Python distutilscross curl libgcrypt"
 PKG_PRIORITY="optional"
 PKG_SECTION="python/web"
 PKG_SHORTDESC="pycurl: a Python interface to libcurl"
 PKG_LONGDESC="PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program, similar to the urllib Python module. PycURL is mature, very fast, and supports a lot of features."
 PKG_IS_ADDON="no"
-
 PKG_AUTORECONF="no"

packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-linking_with_gcrypt.patch

@@ -0,0 +1,11 @@
+diff -uNr pycurl-7.19.0-orig/setup.py pycurl-7.19.0-new/setup.py
+--- pycurl-7.19.0-orig/setup.py	2012-12-21 19:20:27.000000000 +0100
++++ pycurl-7.19.0-new/setup.py	2012-12-21 19:31:11.000000000 +0100
+@@ -104,6 +104,7 @@
+             if e[2:] == 'ssl':
+                 define_macros.append(('HAVE_CURL_OPENSSL', 1))
+             if e[2:] == 'gnutls':
++                libraries.append("gcrypt")
+                 define_macros.append(('HAVE_CURL_GNUTLS', 1))
+         elif e[:2] == "-L":
+             library_dirs.append(e[2:])

packages/addons/service/downloadmanager/pyload/changelog.txt

@@ -1,4 +1,4 @@
-3.0.1
+3.0.2
 - pycrypto is installed per default now
 
 3.0.1