19 files changed, 227 insertions, 102 deletions
diff --git a/community/ascii/PKGBUILD b/community/ascii/PKGBUILD
index d98c31f7b..243e6aafe 100644
--- a/community/ascii/PKGBUILD
+++ b/community/ascii/PKGBUILD
@@ -1,26 +1,32 @@
 # Maintainer: Peter Lewis <plewis@aur.archlinux.org>
+# Contributor: Grigorios Bouzakis <grbzks@xsmail.com>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=ascii
-pkgver=3.8
+pkgver=3.11
 pkgrel=1
+pkgdesc="Utility for conversion between various byte representations and the ASCII character table"
 arch=('i686' 'x86_64')
-pkgdesc="Report character aliases and codes"
-url="http://www.catb.org/~esr/ascii/"
-depends=('glibc')
-license=('GPL2')
-source=("http://www.catb.org/~esr/ascii/$pkgname-$pkgver.tar.gz")
-md5sums=('8fb7540bf2a7a8e1fa0086708ed9b881')
+url="http://www.catb.org/~esr/ascii"
+license=('BSD')
+source=("http://www.catb.org/~esr/ascii/ascii-${pkgver}.tar.gz")
+md5sums=('ba8a9392f8aa8c6b7a52923fba870579')
 
 build() {
-  cd $srcdir/"$pkgname"-"$pkgver"
+  cd ascii-${pkgver}
 
-  make ascii ascii.1
+  make
 }
 
 package() {
-  cd $srcdir/"$pkgname"-"$pkgver"
-  install -D -m 755 ascii "$pkgdir"/usr/bin/ascii
-  install -D -m 644 ascii.1 "$pkgdir"/usr/share/man/man1/ascii.1
-}
+  cd ascii-${pkgver}
+
+  install -D ascii \
+    ${pkgdir}/usr/bin/ascii
 
+  install -D -m644 ascii.1 \
+    ${pkgdir}/usr/share/man/man1/ascii.1
+
+  install -D -m644 COPYING \
+    ${pkgdir}/usr/share/licenses/ascii/LICENSE
+}
diff --git a/community/eiciel/PKGBUILD b/community/eiciel/PKGBUILD
index 6ed083a7f..057c3fe28 100644
--- a/community/eiciel/PKGBUILD
+++ b/community/eiciel/PKGBUILD
@@ -1,35 +1,27 @@
-# $Id: PKGBUILD 33518 2010-11-25 04:43:14Z foutrelis $
+# $Id: PKGBUILD 49658 2011-06-18 21:23:03Z ebelanger $
 # Contributor: Roman Kyrylych <roman@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=eiciel
-pkgver=0.9.8
-pkgrel=2
+pkgver=0.9.8.1
+pkgrel=1
 pkgdesc="GNOME file ACL editor"
 arch=('i686' 'x86_64')
 url="http://rofi.roger-ferrer.org/eiciel/"
 license=('GPL')
-depends=('acl' 'gtkmm' 'nautilus' 'desktop-file-utils' 'gnome-vfs' 'libgnome'
-         'libgnomeui')
+depends=('acl' 'gtkmm3' 'nautilus' 'desktop-file-utils' 'gnome-vfs')
 options=('!libtool')
 install=eiciel.install
 source=(http://rofi.roger-ferrer.org/eiciel/download/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5e515a6f92cff0824a8a93f38c553c0b')
+md5sums=('2c9c459f0604ce03ec49bb425cc42681')
 
 build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-scrollkeeper
-
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/eiciel/eiciel.install b/community/eiciel/eiciel.install
index a203bc01d..80312d4a6 100644
--- a/community/eiciel/eiciel.install
+++ b/community/eiciel/eiciel.install
@@ -2,15 +2,10 @@ post_install() {
   update-desktop-database -q
 }
 
-pre_upgrade() {
-  pre_remove $1
-}
-
 post_upgrade() {
-  post_install $1
+  update-desktop-database -q
 }
 
 post_remove() {
   update-desktop-database -q
 }
-
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index dd4b57014..c4b934aad 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 27614 2010-09-26 06:47:20Z ebelanger $
+# $Id: PKGBUILD 49560 2011-06-18 07:28:14Z andrea $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=electricsheep
@@ -12,7 +12,7 @@ depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade')
 makedepends=('xscreensaver')
 optdepends=('xscreensaver: to use electricsheep with xscreensaver')
 changelog=ChangeLog
-source=(ftp://ftp.archlinux.org/other/electricsheep/${pkgname}-${pkgver}.tar.bz2)
+source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('9c66691538941593ca9442e087b183d1')
 sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32')
 
diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD
index 469adf4b8..a3250ded2 100755
--- a/community/emesene/PKGBUILD
+++ b/community/emesene/PKGBUILD
@@ -1,9 +1,10 @@
+# $Id: PKGBUILD 49565 2011-06-18 07:30:46Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Claudio Riva <firetux83@gmail.com>
 
 pkgname=emesene
 pkgver=2.11.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A pygtk MSN Messenger client"
 url="http://www.emesene.org/"
 license=('custom:PSF' 'GPL' 'LGPL2.1')
@@ -20,12 +21,12 @@ optdepends=('gnome-python-extras: spell-check plugin'
 	'pywebkitgtk: for alternative conversation window' 
         'xmpppy: for gtalk and facebook chat support'
 	'pyqt: alternative qt4 interface (emesene -e main:qt4_main')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" \
-	'emesene.run')
+source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'emesene.run')
 install=emesene.install
 options=('!libtool')
 sha1sums=('54e5fe81e99ddf5909b50c1c4f938480ed43f691'
-          '2d72b485875803d4675d1e1b36c90778e4475651')
+          'fee7a7731b32f6fe0b5ade1abc06115bcef92c41')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -55,4 +56,3 @@ package() {
   # create executable
   install -Dm755 ${srcdir}/emesene.run ${pkgdir}/usr/bin/emesene
 }
-
diff --git a/community/emesene/emesene.run b/community/emesene/emesene.run
index 3b0aacdf9..eca282589 100644
--- a/community/emesene/emesene.run
+++ b/community/emesene/emesene.run
@@ -1,3 +1,2 @@
 #!/bin/bash
-python2 /usr/share/emesene/emesene.py $@
-
+python2 /usr/share/emesene/emesene.py "$@"
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 02cc11ffd..35d8e14dd 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47971 2011-05-26 16:56:27Z ibiru $
+# $Id: PKGBUILD 49674 2011-06-19 07:22:21Z ibiru $
 #Maintainer:  Ionut Biru <ibiru@archlinux.org>
 #Contributor: Hugo Doria <hugo@archlinux.org>
 #Contributor: Sergej Chodarev <sergejx@centrum.sk>
 #Contributor: zhuqin <zhuqin83@gmail.com>
 
 pkgname=gedit-plugins
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=1
 pkgdesc="Set of plugins for gedit"
 arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@ depends=('gedit' 'dbus-python')
 makedepends=('intltool' 'gnome-doc-utils')
 options=('!libtool' '!emptydirs')
 install=gedit-plugins.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.bz2)
-sha256sums=('d574accc1238fb45759c7b088154f934cdd1ef8f7dcb42420db02ee73a46af4b')
+source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.xz)
+sha256sums=('e1e16790300f7f51a1f2e6871e7b0604d9e242e507533697b529380d25a24879')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/iat/PKGBUILD b/community/iat/PKGBUILD
index 4c5b876dd..1a965d77b 100644
--- a/community/iat/PKGBUILD
+++ b/community/iat/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 4868 2009-11-01 21:39:07Z ibiru $
-# Maintainer:  Biru Ionut <ionut@archlinux.ro>
+# $Id: PKGBUILD 49702 2011-06-19 11:29:43Z andrea $
+# Maintainer:
+# Contributor:  Biru Ionut <ionut@archlinux.ro>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 
 pkgname=iat
 pkgver=0.1.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Detects many formats of cd-rom image files (BIN,MDF,PDI,CDI,NRG,B5I) and converts them to ISO-9660"
 arch=('i686' 'x86_64')
 url="http://iat.berlios.de/"
 license=('GPL')
 depends=('glibc')
-makedepends=()
-source=(http://download.berlios.de/iat/$pkgname-$pkgver.tar.bz2)
+source=("http://download.berlios.de/${pkgname}/$pkgname-$pkgver.tar.bz2")
+md5sums=('5e1ffd82000ea4c80ffb2d63ae55120c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --includedir=/usr/include/$pkgname
-  make || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('5e1ffd82000ea4c80ffb2d63ae55120c')
diff --git a/community/luasocket/PKGBUILD b/community/luasocket/PKGBUILD
index 17405e25b..21e96f09d 100644
--- a/community/luasocket/PKGBUILD
+++ b/community/luasocket/PKGBUILD
@@ -1,21 +1,19 @@
-# $Id: PKGBUILD 41828 2011-03-09 12:08:16Z spupykin $
+# $Id: PKGBUILD 49637 2011-06-18 20:20:18Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Anders Bergh <anders1@gmail.com>
 
 pkgname=luasocket
 pkgver=2.0.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Luasocket is the most comprehensive networking support library for the Lua language."
 arch=('i686' 'x86_64')
 url="http://www.cs.princeton.edu/~diego/professional/luasocket/"
 license=('MIT')
 depends=(lua)
 source=(http://luaforge.net/frs/download.php/2664/luasocket-$pkgver.tar.gz
-	lua-license.html::http://www.lua.org/copyright.html
 	luasocket-arch.patch
 	luasocket-unixsocket.patch)
 md5sums=('41445b138deb7bcfe97bff957503da8e'
-         '54af76b72c22a75aa468cb688017e78e'
          '3270f42ff374f230c6450f49132f8625'
          '8d116bb70bd7a2fa15cbe949d4cfc35e')
 
@@ -25,5 +23,5 @@ build() {
   patch -p1 < $srcdir/luasocket-unixsocket.patch
   make
   make DESTDIR="$pkgdir" install
-  install -D -m0644 $srcdir/lua-license.html $pkgdir/usr/share/licenses/$pkgname/lua-license.html
+  install -D -m0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/community/mediastreamer/PKGBUILD b/community/mediastreamer/PKGBUILD
new file mode 100644
index 000000000..3eed51d6d
--- /dev/null
+++ b/community/mediastreamer/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 49670 2011-06-19 06:56:40Z andrea $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
+
+pkgname=mediastreamer
+pkgver=2.7.3
+pkgrel=3
+pkgdesc="A library written in C that allows you to create and run audio and video streams."
+arch=('i686' 'x86_64')
+url="http://www.linphone.org"
+license=('GPL')
+depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg')
+makedepends=('cmake' 'automoc4')
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        "disable-v4l1.patch")
+md5sums=('5213307f557d86aa648f1a53a885138c'
+         '7ee15689eed1adbdcf0ddab8fadca34a')
+options=('!libtool')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver/
+  patch -p2 -i "${srcdir}"/disable-v4l1.patch
+  ./configure --prefix=/usr --libexecdir=/usr/lib/mediastreamer/
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mediastreamer/disable-v4l1.patch b/community/mediastreamer/disable-v4l1.patch
new file mode 100644
index 000000000..9f6cb84d4
--- /dev/null
+++ b/community/mediastreamer/disable-v4l1.patch
@@ -0,0 +1,50 @@
+diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
+--- linphone-3.4.3/mediastreamer2/src/Makefile.am	2011-02-09 08:43:11.000000000 +0000
++++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am	2011-04-01 14:54:04.000000000 +0000
+@@ -117,7 +117,7 @@
+ endif
+ 
+ if BUILD_V4L
+-libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
++libmediastreamer_la_SOURCES+=msv4l2.c
+ endif
+ 
+ if BUILD_WIN32
+diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
+--- linphone-3.4.3/mediastreamer2/src/Makefile.in	2011-03-28 18:34:07.000000000 +0000
++++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in	2011-04-01 14:55:00.000000000 +0000
+@@ -54,7 +54,7 @@
+ @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c
+ @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
+ @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
+-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c
++@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
+ @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
+ @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
+ @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \
+@@ -135,7 +135,7 @@
+ 	audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
+ 	msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
+ 	msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
+-	aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
++	aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
+ 	drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
+ 	sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
+ 	h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
+@@ -156,7 +156,7 @@
+ @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo
+ @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo
+ @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo
+-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo
++@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo
+ @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \
+ @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@	drawdib-display.lo
+ @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo
+@@ -600,7 +600,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@
diff --git a/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD
index 06a9eacd0..9bf37940b 100644
--- a/community/ngspice/PKGBUILD
+++ b/community/ngspice/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 39270 2011-02-07 23:09:46Z bisson $
-# Maintainer: Abhishek Dasgupta <abhidg@gmail.com>
+# $Id: PKGBUILD 49542 2011-06-18 04:13:44Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
 
 pkgname=ngspice
-pkgver=22
+pkgver=23
 pkgrel=1
 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.'
 url='http://ngspice.sourceforge.net'
@@ -11,7 +12,7 @@ license=('BSD')
 arch=('i686' 'x86_64')
 depends=('libxaw' 'libedit')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgver/ngspice-$pkgver.tar.gz")
-sha1sums=('abb232613fb4859f17bcdefeef869e702bd3f0dc')
+sha1sums=('65fa23d1168cb3af7651b990344f763c77bf6132')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD
new file mode 100644
index 000000000..c878b3563
--- /dev/null
+++ b/community/pcsxr/PKGBUILD
@@ -0,0 +1,28 @@
+## Maintainer: schuay <jakob.gruber@gmail.com>
+## Contributor: quantax -- contact via Arch Linux forum or AUR
+## Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=pcsxr
+pkgver=1.9.92
+pkgrel=3
+pkgdesc='A Sony PlayStation emulator based on the PCSX-df Project'
+arch=('i686' 'x86_64')
+url='http://pcsxr.codeplex.com/'
+license=('GPL')
+depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'mesa')
+conflicts=('pcsx-df')
+_pkgurl="http://download.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=$pkgname&DownloadId=140521&FileTime=129254829621800000&Build=$(wget -qO - http://www.codeplex.com/ | sed -nr 's/^[[:space:]]*Version [[:digit:]]{4}\.([[:digit:]]{1,2}\.){2}([[:digit:]]+)[[:space:]]*$/\2/p' | tail -n 1)"
+source=($pkgname-$pkgver.tar.bz2::$_pkgurl)
+md5sums=('28411aed0b4424f97227d94bdefaec83')
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+    ./configure --prefix=/usr --enable-libcdio --enable-opengl
+    make
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
+}
+
diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD
index 0fc9a2d88..961c6bc99 100644
--- a/community/qbittorrent/PKGBUILD
+++ b/community/qbittorrent/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=qbittorrent
-pkgver=2.8.1
+pkgver=2.8.2
 pkgrel=1
 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('python2: needed for search'
 install='qbittorrent.install'
 source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz"
         'python2.patch')
-md5sums=('4fb4490117a0909f1f0989b4b797b41a'
+md5sums=('58008b6b0233c7997067a61cf07af50d'
          'db0d79fee8ce3470ad3741d36b02a94c')
 
 build() {
diff --git a/community/qgis/PKGBUILD b/community/qgis/PKGBUILD
index ed384fa0f..377c9e6e6 100644
--- a/community/qgis/PKGBUILD
+++ b/community/qgis/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 46475 2011-05-07 18:42:52Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=qgis
-pkgver=1.6.0
-pkgrel=6
+pkgver=1.7.0
+pkgrel=1
 pkgdesc='A Geographic Information System (GIS) that supports vector, raster & database formats'
 url='http://qgis.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
 # update to http://www.qgis.org/wiki/Building_QGIS_from_Source#Overview
 depends=('libmysqlclient' 'postgresql-libs' 'sqlite3' 'jasper' 'curl' 'qt' 'python2' 'python2-qt' 'giflib' 'xerces-c' 'cfitsio' 'qwt' 'gdal')
-makedepends=('grass' 'gsl' 'postgis' 'netcdf' 'cmake' 'fcgi' 'python2-sip')
+makedepends=('cmake' 'grass' 'gsl' 'postgis' 'netcdf' 'fcgi' 'python2-sip' 'txt2tags')
 optdepends=('postgis: postgis support and SPIT plugin'
             'fcgi: qgis mapserver'
             'python2-sip: python-support'
             'grass: grass plugin'
             'gsl: georeferencer  ')
 options=('!makeflags')
-source=("http://qgis.org/downloads/${pkgname}-${pkgver}.tar.bz2"
+source=("http://qgis.org/downloads/qgis-${pkgver}.tar.bz2"
         'qgis.desktop'
         'ticket_3378.diff')
-md5sums=('9ea8a784d970f5009b0e6271820248f6'
+md5sums=('d8506990f52563d39c7b916f500f282f'
          '8ab66039f2aba519b92f52272ec3c13e'
          '402f3d39a344367fd55bdaa324deb797')
 
@@ -30,16 +29,16 @@ build() {
   # Fix insecure RPATH is weird, but just works ;)
 #        echo "os.system(\"sed -i '/^LFLAGS/s|-Wl,-rpath,.\+ ||g' gui/Makefile core/Makefile\")" >> python/configure.py.in
 
-  cd ${pkgname}-${pkgver}
+  #cd qgis-${pkgver}
   # fix compilation error https://trac.osgeo.org/qgis/ticket/3378
-  patch -Np3 -i ${srcdir}/ticket_3378.diff
-  cd ${srcdir}
+  #patch -Np3 -i ${srcdir}/ticket_3378.diff
+  #cd ${srcdir}
 
   rm -rf build
   mkdir build
   cd build
 
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../qgis-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -55,6 +54,6 @@ package() {
   make DESTDIR=${pkgdir} install
 
   # install some freedesktop.org compatibility
-  install -D -m644 ${srcdir}/${pkgname}.desktop \
-    ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -D -m644 ${srcdir}/qgis.desktop \
+    ${pkgdir}/usr/share/applications/qgis.desktop
 }
diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD
index af0593ccc..dd879bd65 100644
--- a/community/solfege/PKGBUILD
+++ b/community/solfege/PKGBUILD
@@ -1,10 +1,13 @@
-# $Id: PKGBUILD 48966 2011-06-08 20:39:27Z schiv $
+# $Id: PKGBUILD 49619 2011-06-18 17:40:00Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: sickhate <sickhate@tux-linux.net>
 
+# TODO:
+#   bring in pyalsa, csound, mma
+
 pkgname=solfege
-pkgver=3.18.8
+pkgver=3.20.0
 pkgrel=1
 pkgdesc="Music education and ear training software"
 arch=('i686' 'x86_64')
@@ -13,22 +16,24 @@ license=('GPL3')
 depends=('pygtk' 'libgtkhtml')
 makedepends=('ghostscript' 'gnome-doc-utils' 'librsvg' 'libxslt'
              'lilypond' 'swig' 'texinfo' 'txt2man' 'pkg-config')
-optdepends=('timidity++: Software MIDI support')
+optdepends=('timidity++: or any MIDI player & MIDI-WAV converter'
+            'mpg123: or any MP3 player'
+            'lame: or any WAV-MP3 converter'
+            'vorbis-tools: or any OGG player & WAV-OGG converter'
+            'lilypond: for generating print-outs & score sheets'
+            'texlive-bin: use LaTeX to replace HTML reports with DVI')
 changelog=$pkgname.changelog
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'solfege.desktop')
-md5sums=('5e166de37f223b79e78c656661828e5d'
-         '22b89dcfd9e7c98ab238942139b8a970')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('3deb355d57f009201f2c5486b93c5950')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # python2 fix
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
+  # python2 fix for entire build
+  export PYTHON=/usr/bin/python2
+
+  # python2 fix for rogue Makefile
+  sed -i 's/shell python/shell python2/g' help/Makefile
 
   ./configure --prefix=/usr \
               --sysconfdir=/etc
@@ -38,10 +43,13 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  # python2 fix for runtime
+  for i in $(find "$pkgdir" -name '*.py'); do
+    sed -i 's:^#!.*bin/python$:#!/usr/bin/python2:' "$i"
+    sed -i 's:^#!.*bin/env python$:#!/usr/bin/env python2:' "$i"
+  done
 
-  install -Dm644 ../$pkgname.desktop \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/solfege/solfege.changelog b/community/solfege/solfege.changelog
index a2c6f173b..b42401c9c 100644
--- a/community/solfege/solfege.changelog
+++ b/community/solfege/solfege.changelog
@@ -1,3 +1,14 @@
+2011-06-17 Ray Rashif <schiv@archlinux.org>
+
+	* 3.20.0-1:
+	Upstream release
+	Added some optional dependencies
+	Removed install file;
+		timidity is now the default synthesizer
+		users should be able to figure stuff out
+	Removed desktop file;
+		already included in upstream tarball
+
 2010-10-02 Ray Rashif <schiv@archlinux.org>
 
 	* Version bump: 3.17.0
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index 5a7415639..11f396d2e 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
 
 pkgname=stone-soup
-pkgver=0.8.0
+pkgver=0.8.1
 pkgrel=1
 pkgdesc="An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('custom')
 install=('stone-soup.install')
 source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.bz2"
         "${pkgname}.desktop")
-md5sums=('cac7ae05da835bd87ace3b4de3822eb9'
+md5sums=('7ddeb1ff048401e55af0d1c11038f937'
          '98be780cddb2a0915bbab15ad93644f1')
 
 build() {
diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD
index f14eae4e0..69ebd635d 100644
--- a/community/xmlrpc-c/PKGBUILD
+++ b/community/xmlrpc-c/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: $
+# $Id: PKGBUILD 49552 2011-06-18 07:22:08Z andrea $
+# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Vitaliy Berdinskikh <skipper13@root.ua>
-# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 
 pkgname=xmlrpc-c
 pkgver=1858
@@ -13,7 +13,7 @@ license=('custom:xmlrpc-c')
 depends=('curl' 'libxml2' 'gcc-libs' 'zlib')
 makedepends=('libtool')
 options=('!makeflags' '!libtool')
-source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2")
+source=("ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.bz2")
 md5sums=('2bd41d1827ebd12ca8f0b9ef0b015228')
 
 build() {
@@ -27,10 +27,14 @@ build() {
 		--disable-libwww-client \
 		--disable-wininet-client
 
-	make CFLAGS_PERSONAL="${CFLAGS}" || return 1
+	make CFLAGS_PERSONAL="${CFLAGS}"
+}
+
+package() {
+	cd $srcdir/$pkgname
 	make DESTDIR=$pkgdir install
 
-	install -m 644 -D doc/COPYING $pkgdir/usr/share/licenses/${pkgname}/COPYING
+	install -m 644 -D doc/COPYING $pkgdir/usr/share/licenses/${pkgname}/LICENSE
   mv $pkgdir/usr/man $pkgdir/usr/share/man
 }
 # vim:set ts=2 sw=2 et: