From 57e8f4946243ceddb339521e08e208464cfc6726 Mon Sep 17 00:00:00 2001
From: David Spencer <idlemoor@slackbuilds.org>
Date: Tue, 19 Jan 2016 23:38:21 +0000
Subject: Multiple: Support alternate tarball name.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 python/PyXB/PyXB.SlackBuild                             | 4 ++--
 python/ps_mem/ps_mem.SlackBuild                         | 4 +---
 python/pyPdf/pyPdf.SlackBuild                           | 4 ++--
 python/python-ipcalc/python-ipcalc.SlackBuild           | 4 ++--
 python/python-whisper/python-whisper.SlackBuild         | 2 +-
 python/python3-defusedxml/python3-defusedxml.SlackBuild | 2 +-
 python/python3-dugong/python3-dugong.SlackBuild         | 2 +-
 7 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'python')

diff --git a/python/PyXB/PyXB.SlackBuild b/python/PyXB/PyXB.SlackBuild
index 1f7c67aaac..92097ccff2 100644
--- a/python/PyXB/PyXB.SlackBuild
+++ b/python/PyXB/PyXB.SlackBuild
@@ -59,8 +59,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf pyxb-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/pyxb-$PRGNAM-$VERSION.tar.gz
 cd pyxb-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/python/ps_mem/ps_mem.SlackBuild b/python/ps_mem/ps_mem.SlackBuild
index f77f629b1e..5dd178d029 100644
--- a/python/ps_mem/ps_mem.SlackBuild
+++ b/python/ps_mem/ps_mem.SlackBuild
@@ -56,13 +56,11 @@ fi
 
 set -e
 
-SRCVER="v3.6"
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCVER.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/python/pyPdf/pyPdf.SlackBuild b/python/pyPdf/pyPdf.SlackBuild
index 8933033457..1f5f7149a5 100644
--- a/python/pyPdf/pyPdf.SlackBuild
+++ b/python/pyPdf/pyPdf.SlackBuild
@@ -50,8 +50,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+rm -rf $SRCDIRNAM-$VERSION
+tar xvf $CWD/$SRCDIRNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $SRCDIRNAM-$VERSION
 
 chown -R root:root .
diff --git a/python/python-ipcalc/python-ipcalc.SlackBuild b/python/python-ipcalc/python-ipcalc.SlackBuild
index 9d274df6fc..9255fdcfa3 100644
--- a/python/python-ipcalc/python-ipcalc.SlackBuild
+++ b/python/python-ipcalc/python-ipcalc.SlackBuild
@@ -62,8 +62,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+rm -rf $SRCNAM-$SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/python/python-whisper/python-whisper.SlackBuild b/python/python-whisper/python-whisper.SlackBuild
index bfdca3622c..175b827bda 100644
--- a/python/python-whisper/python-whisper.SlackBuild
+++ b/python/python-whisper/python-whisper.SlackBuild
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$SRCVER
-tar xvf $CWD/$SRCVER.tar.gz
+tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
 cd $SRCNAM-$SRCVER
 chown -R root:root .
 find -L . \
diff --git a/python/python3-defusedxml/python3-defusedxml.SlackBuild b/python/python3-defusedxml/python3-defusedxml.SlackBuild
index b2f87eb682..a5bdd82b6f 100644
--- a/python/python3-defusedxml/python3-defusedxml.SlackBuild
+++ b/python/python3-defusedxml/python3-defusedxml.SlackBuild
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$REV
-tar xvf $CWD/v$VERSION.tar.bz2
+tar xvf $CWD/v$VERSION.tar.bz2 || tar xvf $CWD/$SRCNAM-$REV.tar.bz2
 cd $SRCNAM-$REV
 chown -R root:root .
 find -L . \
diff --git a/python/python3-dugong/python3-dugong.SlackBuild b/python/python3-dugong/python3-dugong.SlackBuild
index f743d393b5..08603f2ff2 100644
--- a/python/python3-dugong/python3-dugong.SlackBuild
+++ b/python/python3-dugong/python3-dugong.SlackBuild
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$REV
-tar xvf $CWD/release-$VERSION.tar.bz2
+tar xvf $CWD/release-$VERSION.tar.bz2 || tar xvf $CWD/$SRCNAM-$REV.tar.bz2
 cd $SRCNAM-$REV
 chown -R root:root .
 find -L . \
-- 
cgit v1.2.3