From 8eaa40f9210b7610c82bdeb528c20244f3ab7ae9 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 29 Apr 2011 15:44:15 +0200
Subject: [PATCH] Revert "TwistedCore: convert to python egg package"

This reverts commit 212916847c1f7fb3082f82ca264bba2391f89d34.
---
 packages/python/web/TwistedCore/build   | 8 +++++++-
 packages/python/web/TwistedCore/install | 9 +++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/python/web/TwistedCore/build b/packages/python/web/TwistedCore/build
index 99e018af94..cdb45ffcf1 100755
--- a/packages/python/web/TwistedCore/build
+++ b/packages/python/web/TwistedCore/build
@@ -27,7 +27,13 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 
 cd $PKG_BUILD
 
-python setup.py build --cross-compile bdist_egg --exclude-source-files
+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/bin
diff --git a/packages/python/web/TwistedCore/install b/packages/python/web/TwistedCore/install
index 6069e0238e..8170b92dd8 100755
--- a/packages/python/web/TwistedCore/install
+++ b/packages/python/web/TwistedCore/install
@@ -22,12 +22,9 @@
 
 . config/options $1
 
-PKG_SRC_DIR=`ls -d $PKG_BUILD`
+BUILD_DIR=`ls -d $PKG_BUILD`
 
-PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`"
-export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages"
-
-$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg
+cp -PR $BUILD_DIR/.install/* $INSTALL
 
 mkdir -p $INSTALL/usr/bin
-  cp $PKG_SRC_DIR/bin/twistd $INSTALL/usr/bin
+  cp $BUILD_DIR/bin/twistd $INSTALL/usr/bin