libraries/pycairo: Updated for version 1.4.0

4 files changed, 29 insertions, 23 deletions

diff --git a/libraries/pycairo/README b/libraries/pycairo/README
index f06d31ca0f..d967817ee1 100644
--- a/libraries/pycairo/README
+++ b/libraries/pycairo/README
@@ -1,5 +1 @@
 Pycairo is set of Python bindings for the cairo graphics library.
-
-The version has to match the installed cairo libraries,
-so we have to stick with 1.0.2 for Slackware 11.0.
-
diff --git a/libraries/pycairo/pycairo.SlackBuild b/libraries/pycairo/pycairo.SlackBuild
index a32d5acbfd..7f28c8ffd8 100644
--- a/libraries/pycairo/pycairo.SlackBuild
+++ b/libraries/pycairo/pycairo.SlackBuild
@@ -22,15 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Exit on most errors
-set -e
-
 PRGNAM=pycairo
-VERSION=1.0.2
+VERSION=1.4.0
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -41,35 +39,39 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e # Exit on most errors
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
-            --localstatedir=/var \
-            --sysconfdir=/etc \
-            --program-prefix="" \
-            --program-suffix="" \
-            $ARCH-slackware-linux \
+./configure \
+  --prefix=/usr \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --program-prefix="" \
+  --program-suffix=""
 
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog INSTALL NEWS NOTES README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog INSTALL NEWS NOTES README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/pycairo/pycairo.info b/libraries/pycairo/pycairo.info
index 7f1cd8d4e8..163acb82d2 100644
--- a/libraries/pycairo/pycairo.info
+++ b/libraries/pycairo/pycairo.info
@@ -1,8 +1,8 @@
 PRGNAM="pycairo"
-VERSION="1.0.2"
+VERSION="1.4.0"
 HOMEPAGE="http://cairographics.org/pycairo"
-DOWNLOAD="http://cairographics.org/releases/pycairo-1.0.2.tar.gz"
-MD5SUM="5bb6a202ebc3990712bced1da6dfb7a8"
+DOWNLOAD="http://cairographics.org/releases/pycairo-1.4.0.tar.gz"
+MD5SUM="e26e77919b606113f565d70036c1f504"
 MAINTAINER="Eric Hameleers"
 EMAIL="alien@slackbuilds.org"
-APPROVED="robw810"
+APPROVED="rworkman"
diff --git a/libraries/pycairo/slack-desc b/libraries/pycairo/slack-desc
index 327ea4614a..4ca11b3e1b 100644
--- a/libraries/pycairo/slack-desc
+++ b/libraries/pycairo/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
 pycairo: pycairo (a set of Python bindings for the cairo graphics library)
 pycairo:
 pycairo: Pycairo is set of Python bindings for the cairo graphics library.