[Lunar-commits] <moonbase> calibre: Version bump. There were some difficulties with this but none that are related to calibre,

[Dennis `stumbles` Veatch]

commit 24d87d5782e9e307e4322327d62eef67e0a856c6
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Mon Dec 28 13:56:06 2009 -0500

    calibre: Version bump. There were some difficulties with this but none that are related to calibre,
    
    instead it was these python modules; lxml, mechanize, ClientForm and python-dateutil. The issue is this;
    those modules stomp on /usr/lib/python2.6/site-packages/easy-install.pth resulting in only that package
    being listed. It should look like this;
    
    import sys; sys.__plen = len(sys.path)
    ./ClientForm-0.2.10-py2.6.egg
    ./lxml-2.2.4-py2.6-linux-x86_64.egg
    ./mechanize-0.1.11-py2.6.egg
    ./python_dateutil-1.4.1-py2.6.egg
    import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)
    
    but it does not. Instead it will look like this (using ClientForm as the example);
    
    import sys; sys.__plen = len(sys.path)
    ./ClientForm-0.2.10-py2.6.egg
    import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)
    
    I do not know what to do about those four as yet.
---
 qt4-apps/calibre/BUILD   |    7 +++++--
 qt4-apps/calibre/DETAILS |    7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/qt4-apps/calibre/BUILD b/qt4-apps/calibre/BUILD
index 3b01b7b..d776030 100644
--- a/qt4-apps/calibre/BUILD
+++ b/qt4-apps/calibre/BUILD
@@ -1,8 +1,11 @@
 (
 
   . /etc/profile.d/qt4.rc &&
-  python ./setup.py build &&
+
+  python setup.py build &&
+
   prepare_install  &&
-  python ./setup.py easy_install .
+
+  python setup.py install .
 
 ) > $C_FIFO 2>&1
diff --git a/qt4-apps/calibre/DETAILS b/qt4-apps/calibre/DETAILS
index a3ee91c..547507b 100644
--- a/qt4-apps/calibre/DETAILS
+++ b/qt4-apps/calibre/DETAILS
@@ -1,11 +1,12 @@
           MODULE=calibre
-         VERSION=0.6.10
+         VERSION=0.6.31
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://calibre.kovidgoyal.net/downloads
-      SOURCE_VFY=sha1:2ca0bfbec0c6af204b1771606a4ff2e8734d4e18
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
+      SOURCE_VFY=sha1:459a00797991638bac3b3e1fcc6c75623f4b8814
         WEB_SITE=http://calibre.kovidgoyal.net
          ENTERED=20090108
-         UPDATED=20090902
+         UPDATED=20091228
            SHORT="An eBook management application"
 
 cat << EOF