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

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/python/web/PyYAML/build   | 3 ++-
 packages/python/web/PyYAML/install | 7 +------
 packages/python/web/PyYAML/meta    | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/python/web/PyYAML/build b/packages/python/web/PyYAML/build
index a5c7622968..69832db409 100755
--- a/packages/python/web/PyYAML/build
+++ b/packages/python/web/PyYAML/build
@@ -27,4 +27,5 @@ 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 --root=./.install --prefix=/usr
diff --git a/packages/python/web/PyYAML/install b/packages/python/web/PyYAML/install
index f113043c99..85a37ef61d 100755
--- a/packages/python/web/PyYAML/install
+++ b/packages/python/web/PyYAML/install
@@ -22,9 +22,4 @@
 
 . config/options $1
 
-PKG_SRC_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 $PKG_BUILD/.install/* $INSTALL
diff --git a/packages/python/web/PyYAML/meta b/packages/python/web/PyYAML/meta
index 08ef29fd3c..ad8d384e71 100644
--- a/packages/python/web/PyYAML/meta
+++ b/packages/python/web/PyYAML/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://pyyaml.org/"
 PKG_URL="http://pyyaml.org/download/pyyaml/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="Python distribute yaml"
-PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross yaml"
+PKG_DEPENDS="Python yaml"
+PKG_BUILD_DEPENDS="toolchain Python distutilscross yaml"
 PKG_PRIORITY="optional"
 PKG_SECTION="python/web"
 PKG_SHORTDESC="PyYAML: a next generation YAML parser and emitter for Python."