4 files changed, 24 insertions, 23 deletions
diff --git a/development/pysetuptools/README b/development/pysetuptools/README
index a7e5aa9e21..851e044f23 100644
--- a/development/pysetuptools/README
+++ b/development/pysetuptools/README
@@ -1,14 +1,14 @@
 pysetuptools (a collection of enhancements to Python distutils)
-Note: the name of the source package is 'setuptools'.  Since 'setuptools' 
-is such a generic name, this package uses the name 'pysetuptools' to avoid 
+Note: the name of the source package is 'setuptools'.  Since 'setuptools'
+is such a generic name, this package uses the name 'pysetuptools' to avoid
 any potential future conflicts.  The actual installation paths and file 
 names are not modified in any way.
 
-setuptools allow you to more easily build and distribute Python packages, 
+setuptools allow you to more easily build and distribute Python packages,
 especially ones that have dependencies on other packages.
 
-Packages built and distributed using setuptools look to the user like ordinary 
-Python packages based on the distutils. Your users don't need to install or 
+Packages built and distributed using setuptools look to the user like ordinary
+Python packages based on the distutils. Your users don't need to install or
 even know about setuptools in order to use them, and you don't have to include
 the entire setuptools package in your distributions. By including just a single
 bootstrap module (an 8K .py file), your package will automatically download and
diff --git a/development/pysetuptools/pysetuptools.SlackBuild b/development/pysetuptools/pysetuptools.SlackBuild
index 14890bfb8c..37105795a2 100644
--- a/development/pysetuptools/pysetuptools.SlackBuild
+++ b/development/pysetuptools/pysetuptools.SlackBuild
@@ -9,9 +9,11 @@
 
 # Mofified by the SlackBuilds.org project
 
+# Maintained by Audrius Kažukauskas <audrius@neutrino.lt>
+
 PRGNAM=pysetuptools
 SRC_NAME=setuptools
-VERSION=0.6c9
+VERSION=0.6c11
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -32,15 +34,12 @@ cd $SRC_NAME-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-python setup.py install --root=$PKG
+# Don't need this.
+rm -f setuptools/*.exe
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+python setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
 install -m 0644 *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -48,4 +47,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/pysetuptools/pysetuptools.info b/development/pysetuptools/pysetuptools.info
index 32d714289b..d91f758617 100644
--- a/development/pysetuptools/pysetuptools.info
+++ b/development/pysetuptools/pysetuptools.info
@@ -1,8 +1,10 @@
 PRGNAM="pysetuptools"
-VERSION="0.6c9"
+VERSION="0.6c11"
 HOMEPAGE="http://peak.telecommunity.com/DevCenter/setuptools"
-DOWNLOAD="http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c9.tar.gz"
-MD5SUM="3864c01d9c719c8924c455714492295e"
-MAINTAINER="Nobody"
-EMAIL="nobody@nowhere"
-APPROVED="rworkman"
+DOWNLOAD="http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c11.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="7df2a529a074f613b509fb44feefe74e"
+MD5SUM_x86_64=""
+MAINTAINER="Audrius Kazukauskas"
+EMAIL="audrius@neutrino.lt"
+APPROVED="Erik Hanson"
diff --git a/development/pysetuptools/slack-desc b/development/pysetuptools/slack-desc
index f0d5f78410..816e24c7c4 100644
--- a/development/pysetuptools/slack-desc
+++ b/development/pysetuptools/slack-desc
@@ -5,12 +5,12 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+            |-----handy-ruler------------------------------------------------------|
 pysetuptools: pysetuptools (a collection of enhancements to Python distutils)
 pysetuptools:
-pysetuptools: setuptools allow you to more easily build and distribute 
-pysetuptools: Python packages, especially ones that have dependencies on 
-pysetuptools: other packages.
+pysetuptools: setuptools allow you to more easily build and distribute
+pysetuptools: Python packages, especially ones that have dependencies on
+pysetuptools: other packages
 pysetuptools:
 pysetuptools:
 pysetuptools: