From 34bebff24548589e1631b97532a3faf34e708982 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@dv9000.openelec.tv>
Date: Sat, 9 May 2009 03:34:25 +0200
Subject: [PATCH] install elisa as egg files and simplify build and install
 scripts

---
 .../python/multimedia/elisa-plugins-bad/build | 28 ++++++-------------
 .../multimedia/elisa-plugins-bad/install      | 10 +++----
 .../multimedia/elisa-plugins-good/build       | 22 ++++++---------
 .../multimedia/elisa-plugins-good/install     |  9 ++++--
 .../multimedia/elisa-plugins-ugly/build       | 19 ++++++-------
 .../multimedia/elisa-plugins-ugly/install     |  9 ++++--
 packages/python/multimedia/elisa/build        | 18 ++----------
 packages/python/multimedia/elisa/install      | 12 ++++++--
 8 files changed, 56 insertions(+), 71 deletions(-)

diff --git a/packages/python/multimedia/elisa-plugins-bad/build b/packages/python/multimedia/elisa-plugins-bad/build
index de461e6b67..fd28af8553 100755
--- a/packages/python/multimedia/elisa-plugins-bad/build
+++ b/packages/python/multimedia/elisa-plugins-bad/build
@@ -7,25 +7,15 @@ $SCRIPTS/build elisa
 
 . config/options.python
 
+PLUGINS_BAD="amazon amp avahi coherence daap database discogs dvd elisa_updater favorites filtered_shares gstreamer http_client ipod osso pigment poblesec rss search shelf themoviedb thetvdb"
+
 cd $BUILD/$1*
 
-#$PYTHON setup.py build
+mkdir -p dist
+for plugin in $PLUGINS_BAD; do
+  (cd elisa/plugins/$plugin; \
+    $PYTHON setup.py bdist_egg ; \
+  );
+done
 
-$PYTHON setup.py install --single-version-externally-managed -O1 --root ./.install --prefix /usr
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
-
-rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/*/tests
-
-rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/wmd
-rm -rf .install/usr/lib/python*/site-packages/elisa_plugin_wmd*
-
-rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/smbwin32
-rm -rf .install/usr/lib/python*/site-packages/elisa_plugin_smb_win32*
-
-rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/winremote
-rm -rf .install/usr/lib/python*/site-packages/elisa_plugin_winremote*
-
-rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/elisa_updater
-rm -rf .install/usr/lib/python*/site-packages/elisa_plugin_elisa_updater*
+## --exclude-source-files
diff --git a/packages/python/multimedia/elisa-plugins-bad/install b/packages/python/multimedia/elisa-plugins-bad/install
index c7c9895922..cc2f4938a7 100755
--- a/packages/python/multimedia/elisa-plugins-bad/install
+++ b/packages/python/multimedia/elisa-plugins-bad/install
@@ -3,14 +3,14 @@
 . config/options
 
 $SCRIPTS/install Python
-#$SCRIPTS/install elisa
 $SCRIPTS/install libgpod
 $SCRIPTS/install avahi
 $SCRIPTS/install Coherence
 
-PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*`
+. config/options.python
 
-cp -PR $BUILD/$1*/.install/* $INSTALL
+PLUGINS_BAD="amazon amp avahi coherence daap database discogs dvd elisa_updater favorites filtered_shares gstreamer http_client ipod osso pigment poblesec rss search shelf themoviedb thetvdb"
 
-mkdir -p $PYTHON_LIB_DIR/site-packages/elisa/plugins/amp
-cp -PR $BUILD/$1*/elisa/plugins/amp/slave.py $PYTHON_LIB_DIR/site-packages/elisa/plugins/amp/slave.py
\ No newline at end of file
+for plugin in $PLUGINS_BAD; do
+  $TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $BUILD/$1*/elisa/plugins/$plugin/dist/*.egg
+done
diff --git a/packages/python/multimedia/elisa-plugins-good/build b/packages/python/multimedia/elisa-plugins-good/build
index dfac3d7d62..9687df3c47 100755
--- a/packages/python/multimedia/elisa-plugins-good/build
+++ b/packages/python/multimedia/elisa-plugins-good/build
@@ -7,19 +7,13 @@ $SCRIPTS/build elisa
 
 . config/options.python
 
+PLUGINS_GOOD="base hal"
+
 cd $BUILD/$1*
 
-#$PYTHON setup.py build
-
-$PYTHON setup.py install --single-version-externally-managed -O1 --root ./.install --prefix /usr
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
-
-rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/*/tests
-
-rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/winscreensaver
-rm -rf .install/usr/lib/python*/site-packages/elisa_plugin_winscreensaver*
-
-rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/gnome
-rm -rf .install/usr/lib/python*/site-packages/elisa_plugin_gnome*
+mkdir -p dist
+for plugin in $PLUGINS_GOOD; do
+  (cd elisa/plugins/$plugin; \
+    $PYTHON setup.py bdist_egg  --exclude-source-files; \
+  );
+done
diff --git a/packages/python/multimedia/elisa-plugins-good/install b/packages/python/multimedia/elisa-plugins-good/install
index 0157942196..39300b094b 100755
--- a/packages/python/multimedia/elisa-plugins-good/install
+++ b/packages/python/multimedia/elisa-plugins-good/install
@@ -3,6 +3,11 @@
 . config/options
 
 $SCRIPTS/install Python
-#$SCRIPTS/install elisa
 
-cp -PR $BUILD/$1*/.install/* $INSTALL
\ No newline at end of file
+. config/options.python
+
+PLUGINS_GOOD="base hal"
+
+for plugin in $PLUGINS_GOOD; do
+  $TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $BUILD/$1*/elisa/plugins/$plugin/dist/*.egg
+done
diff --git a/packages/python/multimedia/elisa-plugins-ugly/build b/packages/python/multimedia/elisa-plugins-ugly/build
index 769c0b71f2..d3a6682c3d 100755
--- a/packages/python/multimedia/elisa-plugins-ugly/build
+++ b/packages/python/multimedia/elisa-plugins-ugly/build
@@ -7,16 +7,13 @@ $SCRIPTS/build elisa
 
 . config/options.python
 
+PLUGINS_UGLY="flickr lirc shoutcast youtube"
+
 cd $BUILD/$1*
 
-#$PYTHON setup.py build
-
-$PYTHON setup.py install --single-version-externally-managed -O1 --root ./.install --prefix /usr
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
-
-rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/*/tests
-
-#rm -rf .install/usr/lib/python*/site-packages/*flickr*
-#rm -rf .install/usr/lib/python*/site-packages/elisa/plugins/flickr
+mkdir -p dist
+for plugin in $PLUGINS_UGLY; do
+  (cd elisa/plugins/$plugin; \
+    $PYTHON setup.py bdist_egg  --exclude-source-files; \
+  );
+done
diff --git a/packages/python/multimedia/elisa-plugins-ugly/install b/packages/python/multimedia/elisa-plugins-ugly/install
index 0157942196..0024620d1d 100755
--- a/packages/python/multimedia/elisa-plugins-ugly/install
+++ b/packages/python/multimedia/elisa-plugins-ugly/install
@@ -3,6 +3,11 @@
 . config/options
 
 $SCRIPTS/install Python
-#$SCRIPTS/install elisa
 
-cp -PR $BUILD/$1*/.install/* $INSTALL
\ No newline at end of file
+. config/options.python
+
+PLUGINS_UGLY="flickr lirc shoutcast youtube"
+
+for plugin in $PLUGINS_UGLY; do
+  $TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $BUILD/$1*/elisa/plugins/$plugin/dist/*.egg
+done
diff --git a/packages/python/multimedia/elisa/build b/packages/python/multimedia/elisa/build
index 0178a2297e..fe505e4aae 100755
--- a/packages/python/multimedia/elisa/build
+++ b/packages/python/multimedia/elisa/build
@@ -19,21 +19,9 @@ $SCRIPTS/build twill
 
 . config/options.python
 
-PYTHON_LIB_DIR=`ls -d $SYSROOT_PREFIX/usr/lib/python*`
-
 cd $BUILD/$1*
 
-#$PYTHON setup.py build
+$PYTHON setup.py bdist_egg --exclude-source-files
+$PYTHON setup.py install_scripts --install-dir ./.install
 
-$PYTHON setup.py install -O1 --single-version-externally-managed --root $SYSROOT_PREFIX --prefix /usr
-$PYTHON setup.py install --single-version-externally-managed -O1 --root ./.install --prefix /usr
-
-sed -i -e "s%$ROOT/$TOOLCHAIN%/usr%" .install/usr/bin/elisa
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
-
-rm -rf .install/usr/share/applications
-rm -rf .install/usr/share/icons
-rm -rf .install/usr/share/man
-#rm -rf .install/usr/share/pixmaps
+sed -i -e "s%$ROOT/$TOOLCHAIN%/usr%" .install/elisa
diff --git a/packages/python/multimedia/elisa/install b/packages/python/multimedia/elisa/install
index 06cf1410f6..12a2a8a764 100755
--- a/packages/python/multimedia/elisa/install
+++ b/packages/python/multimedia/elisa/install
@@ -2,8 +2,6 @@
 
 . config/options
 
-PKG_DIR=`find $PACKAGES -type d -name $1`
-
 $SCRIPTS/install Python
 $SCRIPTS/install pigment-python
 $SCRIPTS/install TwistedCore
@@ -22,7 +20,15 @@ $SCRIPTS/install pyOpenSSL
 
 $SCRIPTS/install liberation-fonts
 
-cp -PR $BUILD/$1*/.install/* $INSTALL
+. config/options.python
+
+PKG_DIR=`find $PACKAGES -type d -name $1`
+PKG_SRC_DIR=`ls -d $BUILD/$1[-_][0-9]*`
+
+$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg
+
+mkdir -p $INSTALL/usr/bin
+cp -PR $BUILD/$1*/.install/elisa $INSTALL/usr/bin
 
 mkdir -p $INSTALL/etc/X11/xinit/xinitrc.d
 cp -PR $PKG_DIR/scripts/xinitrc.d/* $INSTALL/etc/X11/xinit/xinitrc.d