5 files changed, 32 insertions, 32 deletions
diff --git a/multimedia/gpodder/README b/multimedia/gpodder/README
index 2a228fdc03435..4b8531a5b37db 100644
--- a/multimedia/gpodder/README
+++ b/multimedia/gpodder/README
@@ -1,5 +1,3 @@
-gPodder is a GTK2 media aggregator
-
 gPodder is a podcast receiver/catcher written in Python utilizing PyGTK for
 its user interface.  gPodder allows the user to subscribe to RSS feeds for
 podcasts, videocasts, and other similar content and download media files
diff --git a/multimedia/gpodder/doinst.sh b/multimedia/gpodder/doinst.sh
index 3e5691a052b5b..1f8ff67dedb29 100644
--- a/multimedia/gpodder/doinst.sh
+++ b/multimedia/gpodder/doinst.sh
@@ -7,3 +7,4 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
+
diff --git a/multimedia/gpodder/gpodder.SlackBuild b/multimedia/gpodder/gpodder.SlackBuild
index fafc4ead5ac35..bc3fffc7b4f6e 100644
--- a/multimedia/gpodder/gpodder.SlackBuild
+++ b/multimedia/gpodder/gpodder.SlackBuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 # Slackware build script for gPodder
-# Modified by Luis Henrique <lmello.009@gmail.com>
 
 # Copyright 2008-2009 Chess Griffin <chess@chessgriffin.com>
 # All rights reserved.
@@ -23,17 +22,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by Luis Henrique <lmello.009@gmail.com>
+
 PRGNAM=gpodder
-VERSION=2.6
+VERSION=${VERSION:-3.4.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
@@ -43,7 +42,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="README COPYING PKG-INFO INSTALL ChangeLog"
+DOCS="README COPYING PKG-INFO ChangeLog"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -59,11 +58,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar zxvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -71,23 +72,23 @@ 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 {} \;
+ 
+# On Slackware, ip and ifconfig are in /sbin, which is not in normal user $PATH
+sed -i \
+  "/Popen(\['ip\|Popen(\['ifconfig/s/Popen(\['/Popen(['\/sbin\//" \
+  src/gpodder/util.py 
 
 make install DESTDIR=$PKG || exit 1
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/man/man1
-mv $PKG/usr/share/man/man1/* $PKG/usr/man/man1/
-rm -rf $PKG/usr/share/man/
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+mkdir -p $PKG/usr/
+mv $PKG/usr/share/man $PKG/usr
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/gpodder/gpodder.info b/multimedia/gpodder/gpodder.info
index 34fdb88b6da2f..1d3e680ec5072 100644
--- a/multimedia/gpodder/gpodder.info
+++ b/multimedia/gpodder/gpodder.info
@@ -1,10 +1,10 @@
 PRGNAM="gpodder"
-VERSION="2.6"
-HOMEPAGE="http://gpodder.berlios.de"
-DOWNLOAD="http://download.berlios.de/gpodder/gpodder-2.6.tar.gz"
-MD5SUM="61ddfbf63c0f1de4b5d89c6b94f07339"
+VERSION="3.4.0"
+HOMEPAGE="http://gpodder.org/"
+DOWNLOAD="http://gpodder.org/src/gpodder-3.4.0.tar.gz"
+MD5SUM="1fc04fdc8ff3666316cd7fa74400d30e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="feedparser mygpoclient"
-MAINTAINER="Luis Henrique"
-EMAIL="lmello.009@gmail.com"
+MAINTAINER="Chris Farrell"
+EMAIL="haikuhacker@gmail.com"
diff --git a/multimedia/gpodder/slack-desc b/multimedia/gpodder/slack-desc
index fc3f05869413f..20f88e0d3ddb2 100644
--- a/multimedia/gpodder/slack-desc
+++ b/multimedia/gpodder/slack-desc
@@ -1,19 +1,19 @@
 # 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 ':'.
+# 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 ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
 gpodder: gPodder (GTK2 media aggregator)
-gpodder:      
+gpodder:
 gpodder: gPodder is a podcast receiver/catcher written in Python utilizing
 gpodder: PyGTK for its user interface.  gPodder allows the user to subscribe
 gpodder: to RSS feeds for podcasts, videocasts, and other similar content
 gpodder: and download media files found in those feeds.
 gpodder: gPodder has system-tray notifications, support for optional iPod
 gpodder: synchronization, and MP3/Ogg id3 tag editing.
-gpodder:      
-gpodder: Homepage:  http://gpodder.berlios.de 
-gpodder:      
+gpodder:
+gpodder: Homepage:  http://gpodder.org/
+gpodder: