Add two internal dependencies if we need to build python

1 files changed, 66 insertions, 5 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 1042ba7f..04c243c1 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -30,8 +30,9 @@
 # URL:        http://calibre-ebook.com/
 # Needs:      icu4c, podofo;
 #             And if your system already has python2.7, you will also need:
-#             BeautifulSoup, dnspython, pysetuptools, python-cssutils,
-#             python-imaging, python-lxml, python-dateutil, python-mechanize 
+#             BeautifulSoup, dnspython, pysetuptools, python-cssselect,
+#             python-cssutils, python-dateutil, python-imaging, python-lxml,
+#             python-mechanize, python-psutil
 # Changelog:  
 # 0.7.20-1:   25/Sep/2010 by Eric Hameleers <alien@slackware.com>
 #             * Initial build.
@@ -182,7 +183,9 @@
 #             * New release, one day earlier than expected.
 # 0.9.3-1:    19/oct/2012 by Eric Hameleers <alien@slackware.com>
 #             * New release.
-# 
+# 0.9.3-2:    20/oct/2012 by Eric Hameleers <alien@slackware.com>
+#             * Forgot to add two new dependencies: python-cssselect and
+#               python-psutil.
 # 
 # Run 'sh calibre.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -194,7 +197,7 @@
 
 PRGNAM=calibre
 VERSION=${VERSION:-0.9.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
@@ -210,12 +213,14 @@ INT_PYTHON=2.7.3
 INT_SETUPTOOLS=0.6c11
 INT_BEAUTIFULSOUP=3.2.0
 INT_DNSPYTHON=1.9.4
+INT_CSSSELECT=0.7.1
 INT_CSSUTILS=0.9.9
 INT_DATEUTIL=1.5
 INT_IMAGING=1.1.7
 INT_LXML=2.3
 INT_MECHANIZE=0.2.5
 INT_NETIFACES=0.8
+INT_PSUTIL=0.6.1
 INT_SIP=4.13.2
 INT_DBUSPYTHON=0.84.0
 INT_PYCRYPTO=2.6
@@ -286,6 +291,12 @@ if [ "$BUILD_PYTHON" = "YES" ]; then
   SOURCE[14]="$SRCDIR/netifaces-${INT_NETIFACES}.tar.gz"
   SRCURL[14]="http://alastairs-place.net/projects/netifaces//netifaces-${INT_NETIFACES}.tar.gz"
 
+  SOURCE[15]="$SRCDIR/cssselect-${INT_CSSSELECT}.tar.gz"
+  SRCURL[15]="http://pypi.python.org/packages/source/c/cssselect/cssselect-${INT_CSSSELECT}.tar.gz"
+
+  SOURCE[16]="$SRCDIR/psutil-${INT_PSUTIL}.tar.gz"
+  SRCURL[16]="http://psutil.googlecode.com/files/psutil-${INT_PSUTIL}.tar.gz"
+
 fi
 
 ##
@@ -784,6 +795,50 @@ make_netifaces() {
 } # End make_netifaces
 
 
+#
+# Build cssselect:
+#
+make_cssselect() {
+
+  echo -e "\n**  cssselect  **\n"
+
+  cd $TMP/tmp-$PRGNAM/cssselect-${INT_CSSSELECT}
+
+  # Compile and install
+  export CFLAGS="$SLKCFLAGS"
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_cssselect.log
+
+  # Add documentation:
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/cssselect
+  cp -a AUTHORS CHANGES LICENSE PKG-INFO README.rst \
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/cssselect || true
+
+} # End make_cssselect
+
+
+#
+# Build psutil:
+#
+make_psutil() {
+
+  echo -e "\n**  psutil  **\n"
+
+  cd $TMP/tmp-$PRGNAM/psutil-${INT_CSSSELECT}
+
+  # Compile and install
+  export CFLAGS="$SLKCFLAGS"
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_psutil.log
+
+  # Add documentation:
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/psutil
+  cp -a CREDITS HISTORY INSTALL LICENSE PKG-INFO README \
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/psutil || true
+
+} # End make_psutil
+
+
 # --------------
 # Build calibre:
 # --------------
@@ -970,6 +1025,12 @@ if [ "$BUILD_PYTHON" = "YES" ]; then
     make_netifaces
     rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
+    make_cssselect
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
+    make_psutil
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
     make_sip
     rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
@@ -1060,7 +1121,7 @@ mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 if [ "$BUILD_PYTHON" = "YES" ]; then
   cat $SRCDIR/slack-required \
-    | grep -Ev "BeautifulSoup|dnspython|pycrypto|pysetuptools|python-cssutils|python-dateutil|python-imaging|python-mechanize|python-netifaces|python-lxml" \
+    | grep -Ev "BeautifulSoup|dnspython|pycrypto|pysetuptools|python-cssselect|python-cssutils|python-dateutil|python-imaging|python-lxml|python-mechanize|python-netifaces|python-psutil" \
     > $PKG/install/slack-required
 else
   cat $SRCDIR/slack-required > $PKG/install/slack-required