From e4bf0757ed9a5fdca9634b22c1535fa1b10f1674 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 24 May 2012 17:07:45 +0200
Subject: [PATCH] CherryPy: cleanup build and install scripts, dont use
 'easy_install', dont depend on 'distribute'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/python/web/CherryPy/build   |  4 ++--
 packages/python/web/CherryPy/install | 25 +++++++++++++++++++++++++
 packages/python/web/CherryPy/meta    |  4 ++--
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100755 packages/python/web/CherryPy/install

diff --git a/packages/python/web/CherryPy/build b/packages/python/web/CherryPy/build
index 2bff9f0705..285d2998d2 100755
--- a/packages/python/web/CherryPy/build
+++ b/packages/python/web/CherryPy/build
@@ -27,7 +27,7 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 
 cd $PKG_BUILD
 
-python setup.py build
-python setup.py install -O0 --no-compile --prefix /usr --root .install
+python setup.py build --cross-compile
+python setup.py install --root=./.install --prefix=/usr
 
 rm -rf .install/usr/bin
diff --git a/packages/python/web/CherryPy/install b/packages/python/web/CherryPy/install
new file mode 100755
index 0000000000..85a37ef61d
--- /dev/null
+++ b/packages/python/web/CherryPy/install
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cp -PR $PKG_BUILD/.install/* $INSTALL
diff --git a/packages/python/web/CherryPy/meta b/packages/python/web/CherryPy/meta
index d5a69ee5b9..7d02834923 100644
--- a/packages/python/web/CherryPy/meta
+++ b/packages/python/web/CherryPy/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://cherrypy.org/"
 PKG_URL="http://download.cherrypy.org/cherrypy/3.2.2/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="Python distribute"
-PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross"
+PKG_DEPENDS="Python"
+PKG_BUILD_DEPENDS="toolchain Python distutilscross"
 PKG_PRIORITY="optional"
 PKG_SECTION="python/web"
 PKG_SHORTDESC="CherrPy: A Pythonic, object-orientated web framework"