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

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

diff --git a/packages/python/web/TwistedConch/build b/packages/python/web/TwistedConch/build
index af40656fbe..b74cec95f9 100755
--- a/packages/python/web/TwistedConch/build
+++ b/packages/python/web/TwistedConch/build
@@ -28,9 +28,9 @@ 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 -O0 --no-compile --prefix /usr --root .install
+python setup.py install --root=./.install --prefix=/usr
 
 # install to toolchain because its needed for other twisted modules
-  python setup.py install -O0 --no-compile --prefix $ROOT/$TOOLCHAIN
+  python setup.py install --prefix $ROOT/$TOOLCHAIN
 
 rm -rf .install/usr/lib/python*/site-packages/twisted/conch/test
diff --git a/packages/python/web/TwistedConch/meta b/packages/python/web/TwistedConch/meta
index 930665ad39..bc73bf88a0 100644
--- a/packages/python/web/TwistedConch/meta
+++ b/packages/python/web/TwistedConch/meta
@@ -25,8 +25,8 @@ 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 pyasn1 pycrypto"
-PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross TwistedCore"
+PKG_DEPENDS="Python TwistedCore pyasn1 pycrypto"
+PKG_BUILD_DEPENDS="toolchain Python distutilscross TwistedCore"
 PKG_PRIORITY="optional"
 PKG_SECTION="python/web"
 PKG_SHORTDESC="TwistedConch: an SSHv2 implementation written in Python"