From 687c78d5604ce299d5164ffd69de88f2dd10fefc Mon Sep 17 00:00:00 2001 From: dsomero Date: Fri, 22 Nov 2013 02:34:22 -0500 Subject: various: Fix SlackBuild formatting and comment nit picks. Signed-off-by: dsomero --- python/PyAudio/PyAudio.SlackBuild | 2 +- python/SOAPpy/SOAPpy.SlackBuild | 4 +--- python/babel/babel.SlackBuild | 2 +- python/cddb-py/cddb-py.SlackBuild | 2 -- python/easygui/easygui.SlackBuild | 2 +- python/ecdsa/ecdsa.SlackBuild | 2 +- python/geopy/geopy.SlackBuild | 4 ++-- python/google-api-python-client/google-api-python-client.SlackBuild | 4 ++-- python/httplib2/httplib2.SlackBuild | 2 +- python/ipaddr-py/ipaddr-py.SlackBuild | 4 +--- python/json-py/json-py.SlackBuild | 4 +--- python/p4python/p4python.SlackBuild | 2 +- python/pyPdf/pyPdf.SlackBuild | 2 -- python/pychm/pychm.SlackBuild | 4 +--- python/pydblite/pydblite.SlackBuild | 2 +- python/pygame/pygame.SlackBuild | 4 +--- python/pygobject3/pygobject3.SlackBuild | 6 +++--- python/pygoocanvas/pygoocanvas.SlackBuild | 6 ++---- python/pylirc/pylirc.SlackBuild | 4 +--- python/pyorbit/pyorbit.SlackBuild | 2 -- python/pyserial/pyserial.SlackBuild | 2 +- python/pysmssend/pysmssend.SlackBuild | 2 +- python/python-authres/python-authres.SlackBuild | 2 -- python/python-bigfloat/python-bigfloat.SlackBuild | 2 +- python/python-cheetah/python-cheetah.SlackBuild | 2 +- python/python-cluster/python-cluster.SlackBuild | 4 +--- python/python-cmdln/python-cmdln.SlackBuild | 2 +- python/python-demjson/python-demjson.SlackBuild | 2 +- python/python-elementtree/python-elementtree.SlackBuild | 2 +- python/python-lastfm/python-lastfm.SlackBuild | 2 -- python/python-magick/python-magick.SlackBuild | 2 +- python/python-morbid/python-morbid.SlackBuild | 2 +- python/python-orbited/python-orbited.SlackBuild | 2 +- python/python-stomper/python-stomper.SlackBuild | 2 +- python/python-transaction/python-transaction.SlackBuild | 2 -- python/python-twisted-web2/python-twisted-web2.SlackBuild | 2 -- python/python-twitter/python-twitter.SlackBuild | 2 -- python/python-urllib3/python-urllib3.SlackBuild | 2 +- python/python-uuid/python-uuid.SlackBuild | 2 +- python/python-xlib/python-xlib.SlackBuild | 2 -- python/python-xrandr/python-xrandr.SlackBuild | 2 +- python/pyudev/pyudev.SlackBuild | 2 +- python/pyusb/pyusb.SlackBuild | 2 -- python/turses/turses.SlackBuild | 2 +- python/tweepy/tweepy.SlackBuild | 2 +- python/winpdb/winpdb.SlackBuild | 2 +- 46 files changed, 41 insertions(+), 77 deletions(-) (limited to 'python') diff --git a/python/PyAudio/PyAudio.SlackBuild b/python/PyAudio/PyAudio.SlackBuild index 263c5e59c4d2..7e0fc183c9cd 100644 --- a/python/PyAudio/PyAudio.SlackBuild +++ b/python/PyAudio/PyAudio.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/SOAPpy/SOAPpy.SlackBuild b/python/SOAPpy/SOAPpy.SlackBuild index 08215d32d7d0..c707f69b238e 100644 --- a/python/SOAPpy/SOAPpy.SlackBuild +++ b/python/SOAPpy/SOAPpy.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.11.6 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -48,7 +46,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION diff --git a/python/babel/babel.SlackBuild b/python/babel/babel.SlackBuild index 89698f1109b7..8d6d6f161150 100644 --- a/python/babel/babel.SlackBuild +++ b/python/babel/babel.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/cddb-py/cddb-py.SlackBuild b/python/cddb-py/cddb-py.SlackBuild index 8d3ce53a9aec..0b828e4a3be2 100644 --- a/python/cddb-py/cddb-py.SlackBuild +++ b/python/cddb-py/cddb-py.SlackBuild @@ -11,12 +11,10 @@ VERSION=${VERSION:-1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/python/easygui/easygui.SlackBuild b/python/easygui/easygui.SlackBuild index 25dfad377aac..672523370564 100644 --- a/python/easygui/easygui.SlackBuild +++ b/python/easygui/easygui.SlackBuild @@ -57,7 +57,7 @@ fi PYTHONDIR=$(python -c "import sys, os; print os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:3], 'site-packages')") DOCFILES="cookbook faq epydoc pydoc tutorial" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/ecdsa/ecdsa.SlackBuild b/python/ecdsa/ecdsa.SlackBuild index 6c09ed797939..c491094a67fd 100644 --- a/python/ecdsa/ecdsa.SlackBuild +++ b/python/ecdsa/ecdsa.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/geopy/geopy.SlackBuild b/python/geopy/geopy.SlackBuild index 8994185daaa2..49462204a4fb 100644 --- a/python/geopy/geopy.SlackBuild +++ b/python/geopy/geopy.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# SlackBuild for geopy python library +# SlackBuild for geopy python library # Written by Dominik Drobek # Currently maintained by Francisco Sokol @@ -37,7 +37,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/google-api-python-client/google-api-python-client.SlackBuild b/python/google-api-python-client/google-api-python-client.SlackBuild index a2ed0ba3f5fb..1f129b3217a3 100644 --- a/python/google-api-python-client/google-api-python-client.SlackBuild +++ b/python/google-api-python-client/google-api-python-client.SlackBuild @@ -22,7 +22,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=google-api-python-client +PRGNAM=google-api-python-client VERSION=${VERSION:-1.0beta2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/httplib2/httplib2.SlackBuild b/python/httplib2/httplib2.SlackBuild index c08ec84928df..c4fc145f2056 100644 --- a/python/httplib2/httplib2.SlackBuild +++ b/python/httplib2/httplib2.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="CHANGELOG README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/ipaddr-py/ipaddr-py.SlackBuild b/python/ipaddr-py/ipaddr-py.SlackBuild index f12fdf30d849..3d41c762425a 100644 --- a/python/ipaddr-py/ipaddr-py.SlackBuild +++ b/python/ipaddr-py/ipaddr-py.SlackBuild @@ -29,12 +29,10 @@ TAG=${TAG:-_SBo} SRCNAM=ipaddr -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -58,7 +56,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/json-py/json-py.SlackBuild b/python/json-py/json-py.SlackBuild index 85e22f62ff44..1842af4ab88b 100644 --- a/python/json-py/json-py.SlackBuild +++ b/python/json-py/json-py.SlackBuild @@ -27,12 +27,10 @@ VERSION=3.4 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -50,7 +48,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION mkdir $PRGNAM-$VERSION cd $PRGNAM-$VERSION diff --git a/python/p4python/p4python.SlackBuild b/python/p4python/p4python.SlackBuild index dfb79e9f4d46..cbf626b64789 100644 --- a/python/p4python/p4python.SlackBuild +++ b/python/p4python/p4python.SlackBuild @@ -35,7 +35,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/pyPdf/pyPdf.SlackBuild b/python/pyPdf/pyPdf.SlackBuild index 5589036d2c5f..8eaa10df5394 100644 --- a/python/pyPdf/pyPdf.SlackBuild +++ b/python/pyPdf/pyPdf.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.13 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/python/pychm/pychm.SlackBuild b/python/pychm/pychm.SlackBuild index b275ddcf3163..f060be74874c 100644 --- a/python/pychm/pychm.SlackBuild +++ b/python/pychm/pychm.SlackBuild @@ -26,16 +26,14 @@ # THE SOFTWARE. PRGNAM=pychm -VERSION=${VERSION:-0.8.4} +VERSION=${VERSION:-0.8.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/python/pydblite/pydblite.SlackBuild b/python/pydblite/pydblite.SlackBuild index 7686037e453b..804796b27296 100644 --- a/python/pydblite/pydblite.SlackBuild +++ b/python/pydblite/pydblite.SlackBuild @@ -45,7 +45,7 @@ DOCFILES="PKG-INFO README.txt LICENCE.txt doc/*" # SLKCFLAGS are not used -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/pygame/pygame.SlackBuild b/python/pygame/pygame.SlackBuild index e0242ddbe6b5..715d7fbd3425 100644 --- a/python/pygame/pygame.SlackBuild +++ b/python/pygame/pygame.SlackBuild @@ -8,12 +8,10 @@ VERSION=1.7.1 BUILD=${BUILD:-3} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -28,7 +26,7 @@ SRCVERSION=${VERSION}release rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 -rm -rf $NAME-$SRCVERSION +rm -rf $NAME-$SRCVERSION tar xvf $CWD/$NAME-$SRCVERSION.tar.?z* || exit 1 cd $NAME-$SRCVERSION || exit 1 chown -R root:root . diff --git a/python/pygobject3/pygobject3.SlackBuild b/python/pygobject3/pygobject3.SlackBuild index efa50a9784d7..fc359c5ad3f0 100644 --- a/python/pygobject3/pygobject3.SlackBuild +++ b/python/pygobject3/pygobject3.SlackBuild @@ -59,7 +59,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.xz cd $SRCNAM-$VERSION @@ -88,8 +88,8 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ INSTALL AUTHORS COPYING* NEWS README* \ $PKG/usr/doc/$PRGNAM-$VERSION -( cd $PKG/usr/doc/$PRGNAM-$VERSION - ln -s ../../share/gtk-doc/html/pygobject html +( cd $PKG/usr/doc/$PRGNAM-$VERSION + ln -s ../../share/gtk-doc/html/pygobject html ) mkdir -p $PKG/install diff --git a/python/pygoocanvas/pygoocanvas.SlackBuild b/python/pygoocanvas/pygoocanvas.SlackBuild index 7ce1ce0dc41a..2d03a1e4fff9 100644 --- a/python/pygoocanvas/pygoocanvas.SlackBuild +++ b/python/pygoocanvas/pygoocanvas.SlackBuild @@ -31,12 +31,10 @@ VERSION=0.14.1 BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -60,7 +58,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -74,7 +72,7 @@ find . \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; - + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/python/pylirc/pylirc.SlackBuild b/python/pylirc/pylirc.SlackBuild index d5e98c03d76c..a74a99f716a8 100644 --- a/python/pylirc/pylirc.SlackBuild +++ b/python/pylirc/pylirc.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; -# Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/pyorbit/pyorbit.SlackBuild b/python/pyorbit/pyorbit.SlackBuild index dc2270709ec3..1a75f4287715 100644 --- a/python/pyorbit/pyorbit.SlackBuild +++ b/python/pyorbit/pyorbit.SlackBuild @@ -27,12 +27,10 @@ VERSION=2.24.0 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/python/pyserial/pyserial.SlackBuild b/python/pyserial/pyserial.SlackBuild index f03cd72e7e21..afa50abb69b4 100644 --- a/python/pyserial/pyserial.SlackBuild +++ b/python/pyserial/pyserial.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for pyserial # Written by Grissiom -# Updated to 2.5_rc2 by Dustin Schnee +# Updated to 2.5_rc2 by Dustin Schnee PRGNAM=pyserial VERSION=${VERSION:-2.6} diff --git a/python/pysmssend/pysmssend.SlackBuild b/python/pysmssend/pysmssend.SlackBuild index c8c931f79fcb..525df20dbfe8 100644 --- a/python/pysmssend/pysmssend.SlackBuild +++ b/python/pysmssend/pysmssend.SlackBuild @@ -17,7 +17,7 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/python/python-authres/python-authres.SlackBuild b/python/python-authres/python-authres.SlackBuild index b2cbfe8be77b..e3b0f3b98527 100644 --- a/python/python-authres/python-authres.SlackBuild +++ b/python/python-authres/python-authres.SlackBuild @@ -29,12 +29,10 @@ TAG=${TAG:-_SBo} SRCNAM=authres -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/python/python-bigfloat/python-bigfloat.SlackBuild b/python/python-bigfloat/python-bigfloat.SlackBuild index d509011a3eeb..27872756d8c7 100644 --- a/python/python-bigfloat/python-bigfloat.SlackBuild +++ b/python/python-bigfloat/python-bigfloat.SlackBuild @@ -38,7 +38,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/python-cheetah/python-cheetah.SlackBuild b/python/python-cheetah/python-cheetah.SlackBuild index ca07caa90794..455e3b29cec5 100644 --- a/python/python-cheetah/python-cheetah.SlackBuild +++ b/python/python-cheetah/python-cheetah.SlackBuild @@ -38,7 +38,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/python-cluster/python-cluster.SlackBuild b/python/python-cluster/python-cluster.SlackBuild index fa065d91bcdb..4ab1cac5b9dd 100644 --- a/python/python-cluster/python-cluster.SlackBuild +++ b/python/python-cluster/python-cluster.SlackBuild @@ -28,12 +28,10 @@ VERSION=1.1.1b3 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -49,7 +47,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $SRCNAM-$VERSION tar -xzvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION diff --git a/python/python-cmdln/python-cmdln.SlackBuild b/python/python-cmdln/python-cmdln.SlackBuild index 851cc23d7b40..2bb1435e5195 100644 --- a/python/python-cmdln/python-cmdln.SlackBuild +++ b/python/python-cmdln/python-cmdln.SlackBuild @@ -56,7 +56,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/python-demjson/python-demjson.SlackBuild b/python/python-demjson/python-demjson.SlackBuild index afc81180f7ac..99707be1f2fe 100644 --- a/python/python-demjson/python-demjson.SlackBuild +++ b/python/python-demjson/python-demjson.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/python-elementtree/python-elementtree.SlackBuild b/python/python-elementtree/python-elementtree.SlackBuild index fead173deba0..7e20af998408 100644 --- a/python/python-elementtree/python-elementtree.SlackBuild +++ b/python/python-elementtree/python-elementtree.SlackBuild @@ -56,7 +56,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/python-lastfm/python-lastfm.SlackBuild b/python/python-lastfm/python-lastfm.SlackBuild index 9a8fde69f527..b01b82682f65 100644 --- a/python/python-lastfm/python-lastfm.SlackBuild +++ b/python/python-lastfm/python-lastfm.SlackBuild @@ -11,12 +11,10 @@ VERSION=${VERSION:-0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/python/python-magick/python-magick.SlackBuild b/python/python-magick/python-magick.SlackBuild index 5ad3eab51563..82504889af36 100644 --- a/python/python-magick/python-magick.SlackBuild +++ b/python/python-magick/python-magick.SlackBuild @@ -56,7 +56,7 @@ fi DOCS="ChangeLog LICENSE README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/python-morbid/python-morbid.SlackBuild b/python/python-morbid/python-morbid.SlackBuild index 1733508866e4..d39ac4025583 100644 --- a/python/python-morbid/python-morbid.SlackBuild +++ b/python/python-morbid/python-morbid.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/python-orbited/python-orbited.SlackBuild b/python/python-orbited/python-orbited.SlackBuild index e9c87d15ea0e..36b88ae96338 100644 --- a/python/python-orbited/python-orbited.SlackBuild +++ b/python/python-orbited/python-orbited.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/python-stomper/python-stomper.SlackBuild b/python/python-stomper/python-stomper.SlackBuild index ee28ec7082a0..7e42606742d2 100644 --- a/python/python-stomper/python-stomper.SlackBuild +++ b/python/python-stomper/python-stomper.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/python-transaction/python-transaction.SlackBuild b/python/python-transaction/python-transaction.SlackBuild index d3c6b7a2d6e1..d1290b13f43b 100644 --- a/python/python-transaction/python-transaction.SlackBuild +++ b/python/python-transaction/python-transaction.SlackBuild @@ -12,12 +12,10 @@ VERSION=${VERSION:-1.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/python/python-twisted-web2/python-twisted-web2.SlackBuild b/python/python-twisted-web2/python-twisted-web2.SlackBuild index 4d66a780c29c..c2347449f910 100644 --- a/python/python-twisted-web2/python-twisted-web2.SlackBuild +++ b/python/python-twisted-web2/python-twisted-web2.SlackBuild @@ -29,12 +29,10 @@ VERSION=${VERSION:-8.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/python/python-twitter/python-twitter.SlackBuild b/python/python-twitter/python-twitter.SlackBuild index f6a6c30727e8..04e5b0aa5ed8 100644 --- a/python/python-twitter/python-twitter.SlackBuild +++ b/python/python-twitter/python-twitter.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-0.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/python/python-urllib3/python-urllib3.SlackBuild b/python/python-urllib3/python-urllib3.SlackBuild index 896e8936ee74..5a4c22737d7c 100644 --- a/python/python-urllib3/python-urllib3.SlackBuild +++ b/python/python-urllib3/python-urllib3.SlackBuild @@ -56,7 +56,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/python-uuid/python-uuid.SlackBuild b/python/python-uuid/python-uuid.SlackBuild index adc507ca1bd7..cf314e42f75a 100644 --- a/python/python-uuid/python-uuid.SlackBuild +++ b/python/python-uuid/python-uuid.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/python-xlib/python-xlib.SlackBuild b/python/python-xlib/python-xlib.SlackBuild index 866f54be3e5d..599cffff15cc 100644 --- a/python/python-xlib/python-xlib.SlackBuild +++ b/python/python-xlib/python-xlib.SlackBuild @@ -10,12 +10,10 @@ VERSION=0.14 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/python/python-xrandr/python-xrandr.SlackBuild b/python/python-xrandr/python-xrandr.SlackBuild index ee2f6052d550..b47961982e86 100644 --- a/python/python-xrandr/python-xrandr.SlackBuild +++ b/python/python-xrandr/python-xrandr.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/pyudev/pyudev.SlackBuild b/python/pyudev/pyudev.SlackBuild index e4c09833a1fd..5a8023e3be65 100644 --- a/python/pyudev/pyudev.SlackBuild +++ b/python/pyudev/pyudev.SlackBuild @@ -68,7 +68,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -python setup.py install --root=$PKG +python setup.py install --root=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION install -m 0644 *.txt *.rst COPYING $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/python/pyusb/pyusb.SlackBuild b/python/pyusb/pyusb.SlackBuild index c7b73e018bbd..3486a3d86e64 100644 --- a/python/pyusb/pyusb.SlackBuild +++ b/python/pyusb/pyusb.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-0.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/python/turses/turses.SlackBuild b/python/turses/turses.SlackBuild index efe23b2f39af..6e75bee43d09 100644 --- a/python/turses/turses.SlackBuild +++ b/python/turses/turses.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="AUTHORS HISTORY.rst LICENSE README.rst" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/tweepy/tweepy.SlackBuild b/python/tweepy/tweepy.SlackBuild index fb8e1a81b964..8c01329c3b06 100644 --- a/python/tweepy/tweepy.SlackBuild +++ b/python/tweepy/tweepy.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="CONTRIBUTORS LICENSE README.md" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/python/winpdb/winpdb.SlackBuild b/python/winpdb/winpdb.SlackBuild index 68e0327050e4..4078cbe894da 100644 --- a/python/winpdb/winpdb.SlackBuild +++ b/python/winpdb/winpdb.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -- cgit v1.2.3