Adding calibre. This involved also:

- Adding podofo
- Adding some new python packages
- Making new pkgs attributes for python packages to build with python 2.6
- Updating some python packages expressions to allow python 2.6, and not only 2.5.


svn path=/nixpkgs/trunk/; revision=19303

pkgs/development/python-modules/setuptools/default.nix

@@ -29,16 +29,16 @@ rec {
   '') ["addInputs" "doUnpack"];
 
   doInstall = a.fullDepEntry(''
-    ensureDir "$out/lib/python2.5/site-packages"
+    ensureDir "$out/lib/${a.python.libPrefix}/site-packages"
 
-    PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \
+    PYTHONPATH="$out/lib/${a.python.libPrefix}/site-packages:$PYTHONPATH" \
     python setup.py install --prefix="$out"
 
     for i in "$out/bin/"*
     do
       wrapProgram "$i"                          \
         --prefix PYTHONPATH ":"			\
-          "$out/lib/python2.5/site-packages"
+          "$out/lib/${a.python.libPrefix}/site-packages"
     done
   '') ["doBuild"];