Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/kdemultimedia/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/samba/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/wine/PKGBUILD
	staging/kdemultimedia/PKGBUILD

17 files changed, 113 insertions, 70 deletions

diff --git a/community/bind-geodns/PKGBUILD b/community/bind-geodns/PKGBUILD
index 7c79aa2ec..af38472d5 100644
--- a/community/bind-geodns/PKGBUILD
+++ b/community/bind-geodns/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 65058 2012-02-20 02:37:28Z spupykin $
+# $Id: PKGBUILD 72130 2012-06-08 23:51:33Z dreisner $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=bind-geodns
 pkgver=9.4.1
 _pkgver=9.4.1-P1
-pkgrel=5
+pkgrel=6
 pkgdesc="bind named server with geoip patch can return ip depending on requester location"
 arch=(i686 x86_64 'mips64el')
 url="http://www.caraytech.com/geodns/"
 license=('custom:ISC')
-backup=(etc/named.conf etc/logrotate.d/named etc/conf.d/named etc/rndc.key)
+backup=(etc/named.conf etc/logrotate.d/named etc/conf.d/named)
 depends=('openssl' 'geoip')
 provides=('dns-server' 'bind' 'dnsutils')
 conflicts=('bind' 'dnsutils')
@@ -63,4 +63,7 @@ build() {
   chown -R 40:40 $pkgdir/var/named
 
   mv $pkgdir/usr/man $pkgdir/usr/share/
+
+  # avoid conflict with filesystem>=2012.06
+  rmdir "$pkgdir/var/run"
 }
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index 393e75ca0..5ff60e81c 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71904 2012-06-03 06:03:10Z bisson $
+# $Id: PKGBUILD 72138 2012-06-09 00:34:11Z dreisner $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
 pkgver=5.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Daemon which collects system performance statistics periodically'
 url='http://collectd.org/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -76,7 +76,10 @@ package() {
 
 	make DESTDIR="${pkgdir}" install
 
-	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service
+	install -Dm755 "$srcdir"/rc.d "${pkgdir}/etc/rc.d/${pkgname}"
+	install -Dm644 "$srcdir"/service "${pkgdir}"/usr/lib/systemd/system/collectd.service
 	install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
+
+	# avoid conflict with filesystem>=2012.06
+	rmdir "$pkgdir/var/run"
 }
diff --git a/community/courier-authlib/PKGBUILD b/community/courier-authlib/PKGBUILD
index aec16d2ac..fa5b08397 100644
--- a/community/courier-authlib/PKGBUILD
+++ b/community/courier-authlib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70428 2012-05-06 03:21:33Z svenstaro $
+# $Id: PKGBUILD 72136 2012-06-09 00:24:01Z dreisner $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=courier-authlib
 pkgver=0.64.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Authentification library for the courier mailserver(s)"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -20,8 +20,10 @@ provides=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap')
 options=(!libtool)
 install=${pkgname}.install
 source=(http://downloads.sourceforge.net/project/courier/authlib/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+        courier-authlib.tmpfiles
         authdaemond.rc.d)
 md5sums=('d946a76e81e45a139543305d310399f6'
+         'bef189740e9516b0beaace4e8954ef14'
          '7de75a9a74796f4fd2e81fd3ca16ed8d')
 
 build() {
@@ -37,7 +39,7 @@ build() {
     --with-authpam --with-authpwd --with-authshadow \
     --with-authldap --with-authmysql --with-authpgsql \
     --with-authuserdb --with-authcram --with-authdaemon \
-    --with-authdaemonvar=/var/run/authdaemon
+    --with-authdaemonvar=/run/authdaemon
   make
 }
 
@@ -60,7 +62,6 @@ package() {
   #chown -R 72:72 ${pkgdir}/var/spool/authdaemon
   mkdir -p ${pkgdir}/var/spool/courier
   chown -R 72:72 ${pkgdir}/var/spool/courier
-  chown -R 72:72 ${pkgdir}/var/run/authdaemon
   # docs say we can remove .a files after make
   find ${pkgdir} -name '*\.a' -exec rm -f {} \;
   # Make libs available to /usr/lib
@@ -68,4 +69,9 @@ package() {
   for lib in courier-authlib/*.so; do
       ln -s $lib .
   done
+
+  install -Dm644 "$srcdir/courier-authlib.tmpfiles" "$pkgdir/usr/lib/tmpfiles/courier-authlib.conf"
+
+  # avoid conflict with filesystem>=2012.06
+  rmdir "$pkgdir/run/authdaemon"
 }
diff --git a/community/courier-authlib/courier-authlib.install b/community/courier-authlib/courier-authlib.install
index cbccc636b..7b29f845f 100644
--- a/community/courier-authlib/courier-authlib.install
+++ b/community/courier-authlib/courier-authlib.install
@@ -1,12 +1,15 @@
 # arg 1:  the new package version
 post_install() {
    # creates group and user on virgin systems
-  if [ -z "`grep '^courier::' /etc/group`" ]; then
-    groupadd -g 72 courier >& /dev/null
+  if ! getent group courier >/dev/null; then
+    groupadd -g 72 courier >/dev/null 2>&1
   fi
-  if [ -z "`grep '^courier:' /etc/passwd`" ]; then
-    useradd -u 72 -d /var/spool/courier -g courier -s /bin/false courier &>/dev/null
+
+  if getent passwd courier >/dev/null; then
+    useradd -u 72 -d /var/spool/courier -g courier -s /bin/false courier >/dev/null 2>&1
   fi
+
+  systemd-tmpfiles --create /usr/lib/tmpfiles/courier-authlib.conf
 }
 
 # arg 1:  the new package version
@@ -17,16 +20,7 @@ post_upgrade() {
 
 # arg 1:  the old package version
 pre_remove() {
-    userdel courier &> /dev/null
-    groupdel courier &> /dev/null
-}
-
-
-post_remove() {
- /bin/true
-}
-
-op=$1
-shift
+  userdel courier
+  groupdel courier
+} >/dev/null 2>&1
 
-$op $*
diff --git a/community/courier-authlib/courier-authlib.tmpfiles b/community/courier-authlib/courier-authlib.tmpfiles
new file mode 100644
index 000000000..887303a4c
--- /dev/null
+++ b/community/courier-authlib/courier-authlib.tmpfiles
@@ -0,0 +1 @@
+d /run/authdaemon 0755 72 72 -
diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index df4af9e0d..367f72ea6 100755
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61936 2012-01-11 09:30:32Z ttopper $
+# $Id: PKGBUILD 72128 2012-06-08 23:36:39Z dreisner $
 # Contributor: Giorgio Lando <lando at imap dot cc>
 # Contributor: Sergej Pupykin
 # Contributor: Thomas Bächler
@@ -6,7 +6,7 @@
 
 pkgname=fcron
 pkgver=3.0.6
-pkgrel=5
+pkgrel=6
 pkgdesc="feature-rich cron implementation"
 arch=(i686 x86_64 'mips64el')
 url="http://fcron.free.fr"
@@ -21,7 +21,7 @@ backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \
 options=('emptydirs' '!makeflags')
 source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \
         systab systab.orig run-cron)
-md5sums=('69ebcb41921e2a282f41ebecb3a27053'
+md5sums=('ced7ca753517eac67502f3fec3908d39'
          'e0c3f0bdc3c98fbbe46eff19001c18f2'
          '938722c6654ef7b07f4aa10001905ba1'
          'bfb7daa22ebe22b9917e455c1ca4a382'
@@ -67,6 +67,9 @@ package() {
   
   # Install run-cron script to make fcron run without dcron
   install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron"
+
+  # avoid conflict with filesystem>=2012.06
+  rmdir "$pkgdir/var/run"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD
index f8e685e90..323a033ce 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -6,13 +6,16 @@
 
 pkgname=john
 pkgver=1.7.9
-pkgrel=2
+pkgrel=3
 _jumbover=5
 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openwall.com/$pkgname/"
 license=('GPL2' 'custom')
 depends=('openssl')
+optdepends=("perl: for executing some of the scripts at /usr/share/john"
+            "ruby: for executing some of the scripts at /usr/share/john"
+            "python: for executing some of the scripts at /usr/share/john")
 backup=('etc/john/john.conf')
 source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 
 	http://www.openwall.com/john/g/john-$pkgver-jumbo-$_jumbover.diff.gz 
@@ -59,20 +62,40 @@ package() {
 	# docs
 	install -d ${pkgdir}/usr/share/doc/john
 	install -m644 ${srcdir}/john-$pkgver/doc/* ${pkgdir}/usr/share/doc/john/
-	install -d ${pkgdir}/usr/share/john/
 	install -Dm644 ${srcdir}/john-$pkgver/doc/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 
-	# install password list and charset files
-	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{{all,alnum,alpha,digits,lanman}.chr,password.lst} \
+	# install password list, charset files and other stuff
+	install -d ${pkgdir}/usr/share/john/
+	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/password.lst ${pkgdir}/usr/share/john/
+	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/stats ${pkgdir}/usr/share/john/
+	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{all,alnum,alpha,digits,lanman}.chr \
           ${pkgdir}/usr/share/john/
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32,dynamic}.conf \
           ${pkgdir}/usr/share/john/
+	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{cmpt_cp,ldif2john,lion2john-alt,lion2john}.pl \
+          ${pkgdir}/usr/share/john
+	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{netntlm,radius2john,sap_prepare,sha-dump}.pl \
+          ${pkgdir}/usr/share/john
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/run/sha-test.pl \
+          ${pkgdir}/usr/share/john
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/run/genincstats.rb \
+          ${pkgdir}/usr/share/john
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/run/netscreen.py \
+          ${pkgdir}/usr/share/john
+
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/dynamic.conf ${pkgdir}/etc/john/
 
 	# install binaries
 	install -Dm755 ${srcdir}/john-$pkgver/run/john ${pkgdir}/usr/bin/john
+	install -Dm755 ${srcdir}/john-$pkgver/run/calc_stat ${pkgdir}/usr/bin/calc_stat
+	install -Dm755 ${srcdir}/john-$pkgver/run/genmkvpwd ${pkgdir}/usr/bin/genmkvpwd
+	install -Dm755 ${srcdir}/john-$pkgver/run/mkvcalcproba ${pkgdir}/usr/bin/mkvcalcproba
+	install -Dm755 ${srcdir}/john-$pkgver/run/relbench ${pkgdir}/usr/bin/relbench
+	install -Dm755 ${srcdir}/john-$pkgver/run/tgtsnarf ${pkgdir}/usr/bin/tgtsnarf
 	install -Dm755 ${srcdir}/john-$pkgver/run/mailer ${pkgdir}/usr/bin/john-mailer
-	cd ${pkgdir}/usr/bin
+	
+  # create links
+  cd ${pkgdir}/usr/bin
 	ln -s john unafs
 	ln -s john unique
 	ln -s john unshadow
diff --git a/community/lilyterm/PKGBUILD b/community/lilyterm/PKGBUILD
index e554ed03a..a80797e7b 100644
--- a/community/lilyterm/PKGBUILD
+++ b/community/lilyterm/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 69562 2012-04-18 14:35:46Z kkeen $
+# $Id: PKGBUILD 72085 2012-06-08 12:19:07Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: TDY <tdy@gmx.com>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=lilyterm
-pkgver=0.9.9
+pkgver=0.9.9.1
 pkgrel=1
 pkgdesc="A light and easy to use libvte based X terminal emulator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lilyterm.luna.com.tw/index_en.html"
+_watch="http://lilyterm.luna.com.tw/html/download.html"
 license=('GPL3')
 depends=('vte')
 makedepends=('gettext' 'intltool' 'pkgconfig>=0.16')
 source=(http://lilyterm.luna.com.tw/file/$pkgname-$pkgver.tar.gz)
-md5sums=('ae89dca908951ce2fafa60b90c892d1a')
+md5sums=('2ba6e18ed7c17463d5451338ca5229a5')
 
 build() {
   cd "$srcdir/lilyterm-$pkgver"
diff --git a/community/luarocks/PKGBUILD b/community/luarocks/PKGBUILD
index 5a1121a2b..f288a5461 100644
--- a/community/luarocks/PKGBUILD
+++ b/community/luarocks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68146 2012-03-18 18:24:42Z cbrannon $
+# $Id: PKGBUILD 72118 2012-06-08 21:45:36Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=luarocks
-pkgver=2.0.8
+pkgver=2.0.9
 pkgrel=1
 pkgdesc='Deployment and management system for Lua modules'
 arch=('i686' 'x86_64' 'mips64el')
@@ -33,4 +33,4 @@ package() {
   install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-md5sums=('07cf84e352d86fe161f7b2ec43f360cc')
+md5sums=('78dceb5c513fd241665688ecd229ff51')
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index 9c3ca8400..05339135d 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 62679 2012-01-24 12:52:57Z spupykin $
+# $Id: PKGBUILD 72132 2012-06-08 23:58:54Z dreisner $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=miredo
 pkgver=1.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Teredo client and server."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remlab.net/miredo/"
 license=('GPL')
 depends=(judy iproute2)
 backup=('etc/miredo/miredo.conf'
-	'etc/miredo/miredo-server.conf'
-	'etc/miredo/isatapd.conf')
+        'etc/miredo/client-hook')
 source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 	isatapd.rc.d
 	miredo.install
@@ -34,4 +33,8 @@ build() {
   install -D -m755 $srcdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server
   install -D -m755 $srcdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd
   sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook
+
+  # avoid conflict with filesystem>=2012.06
+  rmdir "$pkgdir/var/run"
 }
+
diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD
index 6f15eab87..1d07cd6ee 100644
--- a/community/mldonkey/PKGBUILD
+++ b/community/mldonkey/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69477 2012-04-16 17:52:09Z cbrannon $
+# $Id: PKGBUILD 72119 2012-06-08 21:46:06Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>   
 
 pkgname=mldonkey
-pkgver=3.1.1
+pkgver=3.1.2
 pkgrel=1
 pkgdesc="A multi-network P2P client"
 arch=('i686' 'x86_64' 'mips64el')
@@ -39,6 +39,6 @@ package() {
   install -Dm644 "distrib/mldonkey.desktop" \
     "$pkgdir/usr/share/applications/mldonkey.desktop"
 }
-md5sums=('5954ee7cfae18afb2732549fd990e7d6'
+md5sums=('85e6a0fe358b8c71a71da6d979c9760f'
          '9e90003a012cf17b548dcc647961ffa6'
          '1f86d92db51c62cded0e6f3833057dee')
diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD
index a110249fe..babbd1901 100644
--- a/community/ndisc6/PKGBUILD
+++ b/community/ndisc6/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 60785 2011-12-17 22:54:36Z cbrannon $
+# $Id: PKGBUILD 72134 2012-06-09 00:04:05Z heftig $
 # Maintainer: Chris Brannon <chris@the-brannons.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 pkgname=ndisc6
 pkgver=1.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A collection of IPv6 networking utilities - ndisc6, rdisc6, tcptraceroute6, tracert6, rltraceroute6, tcpspray6"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remlab.net/ndisc6/"
 license=("GPL")
 depends=('glibc' 'perl')
 makedepends=('glibc' 'gcc')
-options=(emptydirs)
+options=(!emptydirs)
+install=ndisc6.install
 source=(http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2
         rdnssd.rc.d
 	rdnssd.confd)
+md5sums=('50cb4c19606cf6ff2b7388e71832f579'
+         '3421fd731c4da4f9e07fc6b6ff4e5084'
+         'f1910902932e2622fc166960819db6c4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --localstatedir=/var --sysconfdir=/etc --prefix=/usr
   make
-
 }
 
 package() {
@@ -29,10 +32,7 @@ package() {
   make DESTDIR="$pkgdir" install
   install -Dm755 "$srcdir/rdnssd.rc.d" "$pkgdir/etc/rc.d/rdnssd"
   install -Dm644 "$srcdir/rdnssd.confd" "$pkgdir/etc/conf.d/rdnssd"
-  install -Dm644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-  echo "d /var/run/rdnssd 0755 nobody root" > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-}
 
-md5sums=('50cb4c19606cf6ff2b7388e71832f579'
-         '3421fd731c4da4f9e07fc6b6ff4e5084'
-         'f1910902932e2622fc166960819db6c4')
+  install -d "$pkgdir/usr/lib/tmpfiles.d"
+  echo "d /run/rdnssd 0755 nobody root" > "$pkgdir/usr/lib/tmpfiles.d/ndisc6.conf"
+}
diff --git a/community/ndisc6/ndisc6.install b/community/ndisc6/ndisc6.install
new file mode 100644
index 000000000..086fb6829
--- /dev/null
+++ b/community/ndisc6/ndisc6.install
@@ -0,0 +1,3 @@
+post_install() {
+  systemd-tmpfiles --create usr/lib/tmpfiles.d/ndisc6.conf
+}
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD
index 676001e99..10beb55de 100644
--- a/community/privoxy/PKGBUILD
+++ b/community/privoxy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69634 2012-04-20 19:51:27Z lfleischer $
+# $Id: PKGBUILD 72126 2012-06-08 23:13:24Z dreisner $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@hoetzel.info>
 # Contributor: basilburn (basilburn), Paul Bredbury (brebs) 
 
 pkgname=privoxy
 pkgver=3.0.19
-pkgrel=3
+pkgrel=4
 pkgdesc='A web proxy with advanced filtering capabilities.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.privoxy.org'
@@ -61,4 +61,7 @@ package() {
   find "${pkgdir}/etc/privoxy/" -type d | xargs chmod 0770
   find "${pkgdir}/etc/privoxy/" -type f | xargs chmod 0660
   chmod 0700 "${pkgdir}/var/log/privoxy"
+
+  # avoid conflict with filesystem>=2012.06
+  rmdir "$pkgdir/var/run"
 }
diff --git a/community/python-pyxmpp/PKGBUILD b/community/python-pyxmpp/PKGBUILD
index bc07b6259..d8e1d6018 100644
--- a/community/python-pyxmpp/PKGBUILD
+++ b/community/python-pyxmpp/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 56515 2011-10-07 20:09:45Z spupykin $
+# $Id: PKGBUILD 72079 2012-06-08 09:35:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=python-pyxmpp
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A Python XMPP and Jabber implementation based on libxml2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pyxmpp.jajcus.net/"
 license=('LGPL')
-depends=('python-dnspython' 'libxml2' 'python-m2crypto')
+depends=('python2-dnspython' 'libxml2' 'python-m2crypto')
 source=(http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz)
 md5sums=('a38abf032aca0408b6055cd94296eb75')
 
 build() {
-  cd $startdir/src/pyxmpp-$pkgver
+  cd $srcdir/pyxmpp-$pkgver
   python2 setup.py build
   python2 setup.py install --root=$pkgdir
 }
diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD
index f9979dcc4..423cbb5e2 100644
--- a/community/soundkonverter/PKGBUILD
+++ b/community/soundkonverter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71704 2012-06-01 13:28:02Z stativ $
+# $Id: PKGBUILD 72096 2012-06-08 16:40:09Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=soundkonverter
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="Front-end to various audio converters"
 arch=('i686' 'x86_64' 'mips64el')
@@ -31,7 +31,7 @@ optdepends=('cdrkit: cdda2wav backend'
             'wavpack: wavpack backend')
 install=$pkgname.install
 source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz")
-md5sums=('1d2a171b1a1c9d186cd5a644ba9fc686')
+md5sums=('7a92fef5efc67b40358d3a11030bae1f')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/soundkonverter/soundkonverter.install b/community/soundkonverter/soundkonverter.install
index 725fc0c5d..0e8feb79c 100644
--- a/community/soundkonverter/soundkonverter.install
+++ b/community/soundkonverter/soundkonverter.install
@@ -1,12 +1,12 @@
 post_install() {
-	        xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
-	        post_install
+  post_install
 }
 
 post_remove() {
-	        post_install
+  post_install
 }