Merge branch 'testing' of ssh://linhes.org/mount/repository/linhes_pkgbuild into testing

51 files changed, 813 insertions, 421 deletions

diff --git a/abs/extra/bash-completion/PKGBUILD b/abs/extra/bash-completion/PKGBUILD
index 5aa6b22..a20fa08 100644
--- a/abs/extra/bash-completion/PKGBUILD
+++ b/abs/extra/bash-completion/PKGBUILD
@@ -1,34 +1,33 @@
-# $Id: PKGBUILD 67318 2010-02-06 09:38:55Z eric $
+# $Id: PKGBUILD 95183 2010-10-16 21:57:23Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-# Contributor: Evangelos Foutras <foutrelis@gmail.com>
 
 pkgname=bash-completion
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Programmable completion for the bash shell"
-arch=(any)
+arch=('any')
 url="http://bash-completion.alioth.debian.org/"
 license=('GPL')
 depends=('bash')
-source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.gz cowsay.bashcomp)
+source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.bz2)
+md5sums=('88c022a98a02a02293716f840eadd884')
+sha1sums=('47e6fb919ae227e74172870379b0fe999a2ae70d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # fixes for archlinux
-  sed -i 's#/sbin/lsmod#/bin/lsmod#' bash_completion || return 1
+  sed -i 's#/sbin" lsmod#/bin" lsmod#' bash_completion
 
   ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-  install -D -m644 "$srcdir/cowsay.bashcomp" "$pkgdir/etc/bash_completion.d/cowsay"
 
-  # apache2ctl doesn't work, even when renamed to apachectl (and sed'd)
-  rm "$pkgdir/etc/bash_completion.d/apache2ctl"
-  # munin-node doesn't work, even i've updated munin to 1.4.0
-  rm "$pkgdir/etc/bash_completion.d/munin-node"
+# Doesn't work on Arch Linux and cause problems (FS#20112)
+  rm "$pkgdir/etc/bash_completion.d/service"
 }
-# vim:set ts=2 sw=2 et:
-md5sums=('457c8808ed54f2b2cdd737b1f37ffa24'
-         'e9766bdc391caf825cb24e704422987e')
+
diff --git a/abs/extra/community/agg/PKGBUILD b/abs/extra/community/agg/PKGBUILD
new file mode 100644
index 0000000..b0d6d40
--- /dev/null
+++ b/abs/extra/community/agg/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 49798 2009-08-16 14:04:06Z jgc $
+# Maintainer:
+
+pkgname=agg
+pkgver=2.5
+pkgrel=3
+pkgdesc="A High Quality Rendering Engine for C++"
+arch=('i686' 'x86_64')
+url="http://www.antigrain.com/"
+license=('GPL')
+depends=('gcc-libs>=4.4.1' 'sdl>=1.2.13' 'freetype2>=2.3.9')
+makedepends=('automake')
+provides=('antigrain')
+replaces=('antigrain')
+options=('!libtool' '!makeflags')
+source=(http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz
+        agg-2.4-depends.patch
+        agg-2.5-pkgconfig.patch)
+md5sums=('0229a488bc47be10a2fee6cf0b2febd6'
+         '22f8e48c137d25038181c86d5e40b110'
+         '43a19a7b1564c591e56c8d09a0fd8da5')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/agg-2.4-depends.patch" || return 1
+  patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch" || return 1
+  sh ./autogen.sh || return 1
+  ./configure --prefix=/usr --disable-static || return 1
+  make || return 1
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
+}
diff --git a/abs/extra/community/agg/agg-2.4-depends.patch b/abs/extra/community/agg/agg-2.4-depends.patch
new file mode 100644
index 0000000..9d4f6e3
--- /dev/null
+++ b/abs/extra/community/agg/agg-2.4-depends.patch
@@ -0,0 +1,48 @@
+--- agg-2.4.orig/font_freetype/Makefile.am	2005-10-18 11:45:40.000000000 +0100
++++ agg-2.4/font_freetype/Makefile.am	2006-07-10 15:11:55.000000000 +0100
+@@ -4,8 +4,9 @@
+ agginclude_HEADERS = agg_font_freetype.h
+ lib_LTLIBRARIES = libaggfontfreetype.la
+ 
+-libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ 
++libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
+ libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp
+ libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ 
++libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@
+ endif
+ 
+--- agg-2.4.orig/src/platform/sdl/Makefile.am	2005-10-17 23:49:35.000000000 +0100
++++ agg-2.4/src/platform/sdl/Makefile.am	2006-07-10 15:11:55.000000000 +0100
+@@ -5,6 +5,6 @@
+ libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
+ libaggplatformsdl_la_SOURCES = agg_platform_support.cpp
+ libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@
+-libaggplatformsdl_la_LIBADD = @SDL_LIBS@
++libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@
+ endif
+ 
+--- agg-2.5.orig/configure.in	2006-10-09 05:06:36.000000000 +0100
++++ agg-2.5/configure.in	2007-01-07 14:07:39.000000000 +0000
+@@ -122,7 +122,8 @@
+ fi
+ AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes])
+ AC_SUBST(x_includes)
+-AC_SUBST(x_libraries)
++test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries"
++AC_SUBST(X_LDFLAGS)
+ dnl ###############################################
+ 
+ dnl Settung up library version
+--- agg-2.5.orig/src/platform/X11/Makefile.am	2006-12-11 00:59:45.000000000 +0000
++++ agg-2.5/src/platform/X11/Makefile.am	2007-01-07 14:07:39.000000000 +0000
+@@ -1,8 +1,8 @@
+ if ENABLE_X11
+ lib_LTLIBRARIES = libaggplatformX11.la
+ 
+-libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@  -L@x_libraries@
++libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@
+ libaggplatformX11_la_SOURCES = agg_platform_support.cpp
+ libaggplatformX11_la_CXXFLAGS =  -I$(top_srcdir)/include -I@x_includes@
+-libaggplatformX11_la_LIBADD = -lX11
++libaggplatformX11_la_LIBADD = ../../libagg.la -lX11
+ endif
diff --git a/abs/extra/community/agg/agg-2.5-pkgconfig.patch b/abs/extra/community/agg/agg-2.5-pkgconfig.patch
new file mode 100644
index 0000000..a303bfb
--- /dev/null
+++ b/abs/extra/community/agg/agg-2.5-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- agg-2.5/libagg.pc.in.orig	2007-01-07 13:58:28.000000000 +0000
++++ agg-2.5/libagg.pc.in	2007-01-07 14:02:40.000000000 +0000
+@@ -6,5 +6,6 @@
+ Name: libagg
+ Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
+ Version: @VERSION@
+-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
++Requires.private: freetype2
++Libs: -L${libdir} -lagg
+ Cflags: -I${includedir}
diff --git a/abs/extra/community/athcool/PKGBUILD b/abs/extra/community/athcool/PKGBUILD
index c5a3290..fb24df1 100644
--- a/abs/extra/community/athcool/PKGBUILD
+++ b/abs/extra/community/athcool/PKGBUILD
@@ -1,24 +1,28 @@
 pkgname=athcool
 pkgver=0.3.12
-pkgrel=3
+pkgrel=4
 pkgdesc="Small utility allowing to enable powersaving mode on AMD Duron/Athlon/Athlon XP processors."
 url="http://members.jcom.home.ne.jp/jacobi/linux/softwares.html"
-depends=(pciutils)
-license="GPL"
+depends=('pciutils')
+license=('GPL')
 install=athcool.install
-arch=(i686)
+arch=('i686')
 source=(http://members.jcom.home.ne.jp/jacobi/linux/files/$pkgname-$pkgver.tar.gz
-athcool run finish)
-md5sums=('f2e0f4fbd04f5e1f09aa60a3ecb24645'
-	 'bbf32484cec6431568ccf51c2516f9e7'
-	 'b9cf31ac580c1665d50d70e405d276bc')
+        athcool run finish)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  /bin/install -D -m0755 ../athcool $startdir/pkg/etc/rc.d/athcool
-  mkdir -p $pkgdir/etc/sv/athcool/supervise
-  install -D -m0755 ../run $pkgdir/etc/sv/athcool
-  install -D -m0755 ../finish $pkgdir/etc/sv/athcool
 }
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  /bin/install -D -m0755 ../athcool ${pkgdir}/etc/rc.d/athcool
+  mkdir -p ${pkgdir}/etc/sv/athcool/supervise
+  install -D -m0755 ../run ${pkgdir}/etc/sv/athcool
+  install -D -m0755 ../finish ${pkgdir}/etc/sv/athcool
+}
+md5sums=('f2e0f4fbd04f5e1f09aa60a3ecb24645'
+         'bbf32484cec6431568ccf51c2516f9e7'
+         'b9cf31ac580c1665d50d70e405d276bc'
+         'f854a49b2430852fddab2b7baa0591ad')
diff --git a/abs/extra/community/cwiid-git/PKGBUILD b/abs/extra/community/cwiid-git/PKGBUILD
index 909f224..b87571a 100644
--- a/abs/extra/community/cwiid-git/PKGBUILD
+++ b/abs/extra/community/cwiid-git/PKGBUILD
@@ -1,14 +1,14 @@
 #Contributor:Andrea Tarocchi <valdar@email.it> 
 pkgname=cwiid-git
 #pkgver=`date +%Y%m%d`
-pkgver=20100716
+pkgver=20101204
 pkgrel=1
 pkgdesc="Cwiid-git is the bleeding edge version of a wiimote's driver and utility tools"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://github.com/abstrakraft/cwiid"
 license=('GPL')
 
-depends=('bluez>=4' 'gtk2' 'python')
+depends=('bluez>=4' 'gtk2' 'python2')
 makedepends=('git' 'make' 'automake' 'autoconf')
 replaces=('cwiid' 'cwiid-svn')
 provides=('cwiid' 'cwiid-git')
@@ -21,7 +21,7 @@ _builddir=$srcdir/$_gitname-build
 
 build() {
   
-  export LDFLAGS=
+  export LDFLAGS=""
 
   cd $srcdir/
   msg "Connecting to github.com GIT server...."
@@ -40,9 +40,13 @@ build() {
   
   aclocal
   autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-ldconfig
+  ./configure --prefix=/usr --sysconfdir=/etc --with-python=python`python2 --version 2>&1 | cut -d ' ' -f2` --disable-ldconfig
 
   make || return 1
+}
+
+package() {
+  cd ${_builddir}
   make DESTDIR="${pkgdir}" install || return 1
 
 #  aclocal
diff --git a/abs/extra/community/deluge/PKGBUILD b/abs/extra/community/deluge/PKGBUILD
index 8238baa..3d36405 100644
--- a/abs/extra/community/deluge/PKGBUILD
+++ b/abs/extra/community/deluge/PKGBUILD
@@ -1,25 +1,40 @@
-# $Id: PKGBUILD 26558 2009-02-09 16:10:09Z hugo $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
+# $Id: PKGBUILD 97661 2010-10-31 22:31:52Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=deluge
-pkgver=1.2.2
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="A bittorrent client written with python and pygtk"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://deluge-torrent.org/"
 license=('GPL3')
-depends=('pygtk' 'boost>=1.37.0' 'pyxdg' 'dbus-python' 'librsvg' 'setuptools')
-makedepends=('subversion' 'intltool')
-options=('!emptydirs')
-source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.gz)
+depends=('pyxdg' 'python2-distribute' 'libtorrent-rasterbar>=0.15.0' 'twisted' 'pyopenssl' 'xdg-utils' 'python-chardet')
+makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako')
+optdepends=('python-notify: libnotify notifications'
+	    'pygtk: needed for gtk ui'
+	    'librsvg: needed for gtk ui'
+	    'python-mako: needed for web ui')
+source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 deluged deluged.conf.d deluge-web)
+backup=(etc/conf.d/deluged)
+install=deluge.install
+md5sums=('496a9cfaf01e6cf7ab141498acf2d1f1'
+         '7d5790eeb14cd0b47d1bb3e0a19c9935'
+         '332d23fe0d21ce92b494efd73322856c'
+         '6c913ec7322eaa60494ac9d53103005f')
 
 build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python2 setup.py build
+}
 
-  cd ${srcdir}/${pkgname}-${pkgver}/
-  python setup.py build
-  python setup.py install --prefix=/usr --root=${pkgdir}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
 
-  install -D -m644 deluge/data/pixmaps/deluge.svg ${pkgdir}/usr/share/pixmaps/deluge.svg 
+  install -d -m755 "${pkgdir}"/srv/deluge
+  install -D -m644 deluge/data/pixmaps/deluge.svg "${pkgdir}"/usr/share/pixmaps/deluge.svg
+  install -D -m755 "${srcdir}"/deluged "${pkgdir}"/etc/rc.d/deluged
+  install -D -m755 "${srcdir}"/deluge-web "${pkgdir}"/etc/rc.d/deluge-web
+  install -D -m644 "${srcdir}"/deluged.conf.d "${pkgdir}"/etc/conf.d/deluged
 }
-
-md5sums=('5165c6113efa75e2be0310976ce55e43')
diff --git a/abs/extra/community/deluge/__changelog b/abs/extra/community/deluge/__changelog
new file mode 100644
index 0000000..c5602d9
--- /dev/null
+++ b/abs/extra/community/deluge/__changelog
@@ -0,0 +1 @@
+change 'setuptools' dep to 'python2-distribute'
diff --git a/abs/extra/community/deluge/deluge-web b/abs/extra/community/deluge/deluge-web
new file mode 100644
index 0000000..587496f
--- /dev/null
+++ b/abs/extra/community/deluge/deluge-web
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/deluged
+
+[[ -f /var/run/deluge-web.pid ]] && PID=$(cat /var/run/deluge-web.pid)
+[[ -d /proc/$PID ]] || PID=
+
+case "$1" in
+  start)
+    stat_busy "Starting Deluge WebUI"
+    [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web -f >/dev/null" $DELUGE_USER
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      sleep 1
+      echo $(pgrep -u $DELUGE_USER deluge-web) > /var/run/deluge-web.pid
+      add_daemon deluge-web
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Deluge WebUI"
+    [[ ! -z $PID ]] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm /var/run/deluge-web.pid
+      rm_daemon deluge-web
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/abs/extra/community/deluge/deluge.install b/abs/extra/community/deluge/deluge.install
new file mode 100644
index 0000000..9377a63
--- /dev/null
+++ b/abs/extra/community/deluge/deluge.install
@@ -0,0 +1,29 @@
+post_install() {
+  getent group deluge >/dev/null 2>&1 || usr/sbin/groupadd -g 125 deluge
+  if getent passwd deluge > /dev/null 2>&1; then
+      usr/sbin/usermod -c 'Deluge user' -d /srv/deluge -s /bin/false deluge > /dev/null 2>&1
+  else
+      usr/sbin/useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge
+  fi
+  usr/bin/passwd -l deluge &>/dev/null
+
+  chown deluge.deluge srv/deluge
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+
+cat << _EOF
+>>> Deluge's daemon is running default with the "deluge" user. The default download directory is /srv/deluge/.
+    You can change the user by editing /etc/conf.d/deluged
+_EOF
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  getent passwd deluge >/dev/null 2>&1 && userdel deluge
+  getent group deluge >/dev/null 2>&1 && groupdel deluge
+
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
diff --git a/abs/extra/community/deluge/deluged b/abs/extra/community/deluge/deluged
new file mode 100644
index 0000000..096d36a
--- /dev/null
+++ b/abs/extra/community/deluge/deluged
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/deluged
+
+[[ -f /var/run/deluged.pid ]] && PID=$(cat /var/run/deluged.pid)
+[[ -d /proc/$PID ]] || PID=
+
+case "$1" in
+  start)
+    stat_busy "Starting Deluge Daemon"
+    [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged >/dev/null" $DELUGE_USER
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      sleep 1
+      echo $(pgrep -u $DELUGE_USER deluged) > /var/run/deluged.pid
+      add_daemon deluged
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Deluge Daemon"
+    [[ ! -z $PID ]] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm /var/run/deluged.pid
+      rm_daemon deluged
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
diff --git a/abs/extra/community/deluge/deluged.conf.d b/abs/extra/community/deluge/deluged.conf.d
new file mode 100644
index 0000000..7f4e873
--- /dev/null
+++ b/abs/extra/community/deluge/deluged.conf.d
@@ -0,0 +1 @@
+DELUGE_USER="deluge"
diff --git a/abs/extra/community/fuzemux/PKGBUILD b/abs/extra/community/fuzemux-svn/PKGBUILD
index 5cce2d0..1acc914 100644
--- a/abs/extra/community/fuzemux/PKGBUILD
+++ b/abs/extra/community/fuzemux-svn/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Hanson <hansonorders@verizon.net>
 pkgname=fuzemux-svn
 pkgver=11
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to remux AVI video files for the San Disk Sansa Fuze portable media player"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fuzemux"
@@ -39,4 +39,3 @@ build() {
   make || return 1
   make DESTDIR="$pkgdir/" install
 }
-md5sums=()
diff --git a/abs/extra/community/fuzemux/fuzemux-svn.install b/abs/extra/community/fuzemux-svn/fuzemux-svn.install
index 877ec1b..877ec1b 100644
--- a/abs/extra/community/fuzemux/fuzemux-svn.install
+++ b/abs/extra/community/fuzemux-svn/fuzemux-svn.install
diff --git a/abs/extra/community/gnash-common/PKGBUILD b/abs/extra/community/gnash-common/PKGBUILD
deleted file mode 100644
index 107afb8..0000000
--- a/abs/extra/community/gnash-common/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 17544 2008-10-30 22:40:52Z pierre $
-
-pkgname=gnash-common
-pkgver=0.8.4
-pkgrel=1
-pkgdesc='A GNU Flash movie player'
-arch=('i686' 'x86_64')
-url='http://www.gnu.org/software/gnash/'
-license=('GPL3')
-depends=('curl' 'giflib' 'boost' 'libldap' 'gstreamer0.10-base' 'sdl' 'libgl'
-         'libjpeg' 'libpng' 'mesa')
-makedepends=('pkgconfig')
-source=("http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2")
-options=('!libtool' '!emptydirs' '!docs')
-provides=('gnash')
-replaces=('gnash')
-md5sums=('b47a7ed4b7c66b8c2ebacc2286ef0d4b')
-
-build() {
-	cd $srcdir/gnash-$pkgver
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-plugins \
-		--disable-menus \
-		--enable-gui=sdl \
-		--enable-renderer=ogl \
-		--enable-z \
-		--enable-jpeg \
-		--enable-libpng \
-		--enable-gif \
-		--enable-fontconfig \
-		--enable-Xft \
-		--enable-expat \
-		--enable-gstreamer \
-		--enable-media=gst || return 1
-
-	make || return 1
-	make DESTDIR=$pkgdir install || return 1
-}
diff --git a/abs/extra/community/gnash-gtk/PKGBUILD b/abs/extra/community/gnash-gtk/PKGBUILD
deleted file mode 100644
index 45ba804..0000000
--- a/abs/extra/community/gnash-gtk/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 17609 2008-10-31 06:16:21Z pierre $
-
-pkgname=gnash-gtk
-pkgver=0.8.4
-pkgrel=1
-pkgdesc='A GNU Flash movie player (gtk)'
-arch=('i686' 'x86_64')
-url='http://www.gnu.org/software/gnash/'
-license=("GPL3")
-depends=("gnash-common=$pkgver" 'gtk2' 'gtkglext')
-makedepends=('pkgconfig')
-source=("http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2")
-options=('!libtool' '!emptydirs' '!docs')
-md5sums=('b47a7ed4b7c66b8c2ebacc2286ef0d4b')
-
-build() {
-	cd $srcdir/gnash-$pkgver
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-gui=gtk \
-		--with-plugins-install=system \
-		--with-npapi-plugindir=/usr/lib/mozilla/plugins \
-		--enable-renderer=ogl \
-		--enable-z \
-		--enable-jpeg \
-		--enable-libpng \
-		--enable-gif \
-		--enable-fontconfig \
-		--enable-Xft \
-		--enable-expat \
-		--enable-gstreamer \
-		--enable-media=gst || return 1
-
-	make || return 1
-	make DESTDIR=$pkgdir install install-plugin || return 1
-	rm -rf $pkgdir/usr/{lib/gnash,share}
-	rm -f $pkgdir/usr/bin/{gnash,gprocessor,dumpshm,soldumper,flvdumper}
-	rm -rf $pkgdir/etc
-}
diff --git a/abs/extra/community/gnash/PKGBUILD b/abs/extra/community/gnash/PKGBUILD
new file mode 100644
index 0000000..daed440
--- /dev/null
+++ b/abs/extra/community/gnash/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgbase=gnash
+pkgname=(gnash-common gnash-gtk)
+pkgver=0.8.8
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/gnash/"
+license=(GPL3)
+makedepends=(curl giflib boost-libs libldap sdl agg libjpeg libpng libtool
+             speex fontconfig libva ffmpeg libxinerama
+             gstreamer0.10-base gstreamer0.10-ffmpeg
+             gtk2 libldap
+             pkgconfig boost)
+options=(!libtool !emptydirs)
+source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2)
+md5sums=('ce57f66e222f7eb1adf7f7b4a1274612')
+
+build() {
+  cd "$srcdir/gnash-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-plugins-install=system \
+    --with-npapi-plugindir=/usr/lib/mozilla/plugins \
+    --enable-gui=sdl,gtk \
+    --enable-renderer=agg \
+    --enable-media=gst,ffmpeg \
+    --enable-hwaccel=vaapi
+
+  make
+}
+
+package_gnash-common() {
+  pkgdesc="A GNU Flash movie player"
+  depends=(curl giflib boost-libs libldap ffmpeg sdl agg libjpeg libpng
+           speex fontconfig libva libxinerama
+           gstreamer0.10-base gstreamer0.10-ffmpeg)
+  backup=(etc/gnashrc etc/gnashpluginrc)
+
+  cd "$srcdir/gnash-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  mv "$pkgdir/usr/bin/gtk-gnash" "$srcdir"
+}
+
+package_gnash-gtk() {
+  pkgdesc="A GNU Flash movie player"
+  depends=("gnash-common=$pkgver" gtk2 libldap)
+
+  cd "$srcdir/gnash-$pkgver"
+
+  make DESTDIR="$pkgdir" install-plugin
+
+  install -D "$srcdir/gtk-gnash" "$pkgdir/usr/bin/gtk-gnash"
+}
diff --git a/abs/extra/community/gstreamer0.10-base/PKGBUILD b/abs/extra/community/gstreamer0.10-base/PKGBUILD
index b1b065d..8b115a1 100644
--- a/abs/extra/community/gstreamer0.10-base/PKGBUILD
+++ b/abs/extra/community/gstreamer0.10-base/PKGBUILD
@@ -1,28 +1,46 @@
-# $Id: PKGBUILD 14433 2008-10-06 17:33:22Z jgc $
+# $Id: PKGBUILD 87769 2010-08-18 09:20:05Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=gstreamer0.10-base
-pkgver=0.10.21
+pkgbase=('gstreamer0.10-base')
+pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins')
+pkgver=0.10.30
 pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Base plugin libraries"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gstreamer0.10>=0.10.21' 'liboil>=0.3.15' 'libsm' 'libxv')
-makedepends=('pkgconfig')
-options=(!libtool)
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('pkgconfig' 'gstreamer0.10>=0.10.30' 'orc>=0.4.6' 'libsm>=1.1.1' 'libxv>=1.0.5' 'alsa-lib>=1.0.23' 'cdparanoia>=10.2' 'libvisual>=0.4.0' 'libvorbis>=1.3.1' 'libtheora>=1.1.1' 'pango>=1.28.1' 'udev>=151' 'gobject-introspection')
+options=(!libtool !emptydirs)
 url="http://gstreamer.freedesktop.org/"
-_relname=gst-plugins-base
-source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
-md5sums=('0e0cd485311502ad1c0c028148e3186a')
+source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.bz2)
+sha256sums=('63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7')
 
 build() {
-  cd ${startdir}/src/${_relname}-${pkgver}
+  cd "${srcdir}/gst-plugins-base-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental --disable-external \
-    --disable-docs-build --disable-plugin-docs \
+    --disable-static --enable-experimental --disable-gnome_vfs \
     --with-package-name="GStreamer Base Plugins (Archlinux)" \
     --with-package-origin="http://www.archlinux.org/" || return 1
 
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile || return 1
+}
+
+package_gstreamer0.10-base() {
+  pkgdesc="GStreamer Multimedia Framework Base plugin libraries"
+  depends=('gstreamer0.10>=0.10.30' 'orc>=0.4.6' 'libsm>=1.1.1' 'libxv>=1.0.5' 'udev>=151')
+
+  cd "${srcdir}/gst-plugins-base-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
+}
+
+package_gstreamer0.10-base-plugins() {
+  pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base)"
+  depends=("gstreamer0.10-base=${pkgver}" 'alsa-lib>=1.0.23' 'cdparanoia>=10.2' 'libvisual>=0.4.0' 'libvorbis>=1.3.1' 'libtheora>=1.1.1' 'pango>=1.28.1')
+  replaces=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg')
+  conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg')
+  groups=('gstreamer0.10-plugins')
+
+  cd "${srcdir}/gst-plugins-base-${pkgver}"
+  make -C gst-libs DESTDIR="${pkgdir}" install || return 1
+  make -C ext DESTDIR="${pkgdir}" install || return 1
+  make -C gst-libs DESTDIR="${pkgdir}" uninstall || return 1
 }
diff --git a/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD
new file mode 100644
index 0000000..7922430
--- /dev/null
+++ b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 72240 2010-03-13 20:27:01Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gstreamer0.10-ffmpeg
+pkgver=0.10.10
+pkgrel=1
+pkgdesc="Gstreamer FFMpeg Plugin"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gstreamer0.10-base>=0.10.30' 'bzip2')
+makedepends=('pkgconfig')
+url="http://www.gstreamer.net"
+groups=('gstreamer0.10-plugins')
+source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2)
+sha256sums=('697114483444a0a469028857a1d58145c99e6f5d2cd7edd8cb04cdc3fc72ad94')
+
+build() {
+  cd "${srcdir}/gst-ffmpeg-${pkgver}"
+  unset CFLAGS
+  unset CXXFLAGS
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
+  make || return 1
+}
+package() {
+  cd "${srcdir}/gst-ffmpeg-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
+  rm -f ${pkgdir}/usr/lib/gstreamer-0.10/*.{l,}a
+}
diff --git a/abs/extra/community/gstreamer0.10/PKGBUILD b/abs/extra/community/gstreamer0.10/PKGBUILD
index 52934e2..0a52614 100644
--- a/abs/extra/community/gstreamer0.10/PKGBUILD
+++ b/abs/extra/community/gstreamer0.10/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 18833 2008-11-09 14:51:01Z jgc $
+# $Id: PKGBUILD 87764 2010-08-18 09:05:27Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer0.10
-pkgver=0.10.21
-pkgrel=2
+pkgver=0.10.30
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
-depends=('libxml2>=2.6.32' 'glib2>=2.18.1')
-makedepends=('perlxml' 'pkgconfig' 'gtk-doc')
+depends=('libxml2>=2.7.7' 'glib2>=2.24.1')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
 options=('!libtool')
-source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2
-	bgo555631.patch)
-md5sums=('7bad90af3fd81a1535363cf85359125c'
-         '71eb301845184638e6556dacd1ca7d55')
+source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2)
+sha256sums=('e8ef301be423797ff36a0bb3615930b112b4175634051d19fd655e0ed974532a')
 
 build() {
   cd "${srcdir}/gstreamer-${pkgver}"
-  patch -Np0 -i "${srcdir}/bgo555631.patch" || return 1
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc --localstatedir=/var \
-	--disable-docs-build || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
+    --with-package-name="GStreamer (Archlinux)" \
+    --with-package-origin="http://www.archlinux.org/"
+  make
+}
+package() {
+  cd "${srcdir}/gstreamer-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   cd "${pkgdir}/usr/bin"
 
   #Remove unversioned gst-* binaries to get rid of conflicts
diff --git a/abs/extra/community/gstreamer0.10/bgo555631.patch b/abs/extra/community/gstreamer0.10/bgo555631.patch
deleted file mode 100644
index b9a18f4..0000000
--- a/abs/extra/community/gstreamer0.10/bgo555631.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- libs/gst/base/gstbasetransform.c	2008/10/20 13:29:06	1.126
-+++ libs/gst/base/gstbasetransform.c	2008/10/21 16:30:41	1.127
-@@ -251,7 +251,7 @@
-   /* upstream caps and size suggestions */
-   GstCaps *sink_suggest;
-   guint size_suggest;
--  gint suggest_pending;
-+  gboolean suggest_pending;
- 
-   gboolean reconfigure;
- };
-@@ -1224,7 +1224,7 @@
-             gst_caps_unref (priv->sink_suggest);
-           priv->sink_suggest = gst_caps_ref (othercaps);
-           priv->size_suggest = size_suggest;
--          g_atomic_int_set (&trans->priv->suggest_pending, 1);
-+          trans->priv->suggest_pending = TRUE;
-           GST_OBJECT_UNLOCK (trans->sinkpad);
-         }
-         gst_caps_unref (othercaps);
-@@ -1366,7 +1366,7 @@
-   GstBaseTransform *trans;
-   GstBaseTransformPrivate *priv;
-   GstFlowReturn res;
--  gboolean proxy, suggest;
-+  gboolean proxy, suggest, same_caps;
-   GstCaps *sink_suggest;
-   guint size_suggest;
- 
-@@ -1384,8 +1384,12 @@
- 
-   /* we remember our previous alloc request to quickly see if we can proxy or
-    * not. We skip this check if we have a pending suggestion. */
--  if (g_atomic_int_get (&priv->suggest_pending) == 0 && caps &&
--      gst_caps_is_equal (priv->sink_alloc, caps)) {
-+  GST_OBJECT_LOCK (pad);
-+  same_caps = !priv->suggest_pending && caps &&
-+      gst_caps_is_equal (priv->sink_alloc, caps);
-+  GST_OBJECT_UNLOCK (pad);
-+
-+  if (same_caps) {
-     /* we have seen this before, see below if we need to proxy */
-     GST_DEBUG_OBJECT (trans, "have old caps");
-     sink_suggest = caps;
-@@ -1414,7 +1418,7 @@
-       size_suggest = size;
-       suggest = FALSE;
-     }
--    g_atomic_int_set (&priv->suggest_pending, 0);
-+    priv->suggest_pending = FALSE;
-     GST_OBJECT_UNLOCK (pad);
- 
-     /* check if we actually handle this format on the sinkpad */
-@@ -1462,7 +1466,10 @@
-     }
-   }
-   /* remember the new caps */
-+  GST_OBJECT_LOCK (pad);
-   gst_caps_replace (&priv->sink_alloc, sink_suggest);
-+  GST_OBJECT_UNLOCK (pad);
-+
-   proxy = priv->proxy_alloc;
-   GST_DEBUG_OBJECT (trans, "doing default alloc, proxy %d", proxy);
- 
-@@ -1487,11 +1494,13 @@
-     if (!gst_caps_is_equal (newcaps, caps)) {
-       GST_DEBUG_OBJECT (trans, "caps are new");
-       /* we have new caps, see if we can proxy downstream */
--      if (gst_pad_peer_accept_caps (trans->sinkpad, newcaps)) {
-+      if (gst_pad_peer_accept_caps (pad, newcaps)) {
-         /* peer accepts the caps, return a buffer in this format */
-         GST_DEBUG_OBJECT (trans, "peer accepted new caps");
-         /* remember the format */
-+        GST_OBJECT_LOCK (pad);
-         gst_caps_replace (&priv->sink_alloc, newcaps);
-+        GST_OBJECT_UNLOCK (pad);
-       } else {
-         GST_DEBUG_OBJECT (trans, "peer did not accept new caps");
-         /* peer does not accept the caps, free the buffer we received and
-@@ -2306,7 +2315,7 @@
-     caps = gst_caps_copy (caps);
-   trans->priv->sink_suggest = caps;
-   trans->priv->size_suggest = size;
--  g_atomic_int_set (&trans->priv->suggest_pending, 1);
-+  trans->priv->suggest_pending = TRUE;
-   GST_DEBUG_OBJECT (trans, "new suggest %" GST_PTR_FORMAT, caps);
-   GST_OBJECT_UNLOCK (trans->sinkpad);
- }
diff --git a/abs/extra/community/libelf/PKGBUILD b/abs/extra/community/libelf/PKGBUILD
index 0cf517b..18bd118 100644
--- a/abs/extra/community/libelf/PKGBUILD
+++ b/abs/extra/community/libelf/PKGBUILD
@@ -3,20 +3,23 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libelf
-pkgver=0.8.10
-pkgrel=3
+pkgver=0.8.13
+pkgrel=1
 pkgdesc="libelf is a free ELF object file access library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 source=(http://www.mr511.de/software/${pkgname}-${pkgver}.tar.gz)
 url="http://directory.fsf.org/libs/misc/libelf.html"
 depends=('glibc')
-md5sums=('9db4d36c283d9790d8fa7df1f4d7b4d9')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure --prefix=/usr --enable-shared \
       --enable-gnu-names --enable-compat || return 1
     make || return 1
+}
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make prefix="${pkgdir}/usr" install || return 1
 }
+md5sums=('4136d7b4c04df68b686570afa26988ac')
diff --git a/abs/extra/community/libtorrent-rasterbar/PKGBUILD b/abs/extra/community/libtorrent-rasterbar/PKGBUILD
new file mode 100644
index 0000000..dc719f9
--- /dev/null
+++ b/abs/extra/community/libtorrent-rasterbar/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 100316 2010-11-22 16:29:19Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+# Contributor: Andrea Scarpino <bash.lnx@gmail.com>
+
+pkgname=libtorrent-rasterbar
+pkgver=0.15.4
+pkgrel=3
+pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
+url="http://www.rasterbar.com/products/libtorrent/"
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('boost-libs>=1.44.0' 'python2')
+makedepends=('boost')
+source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+md5sums=('58750b3a246d056335745f9e805bb949')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-python-binding \
+              --with-boost-filesystem=mt \
+              --with-boost-thread=mt
+  make
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+}
+
diff --git a/abs/extra/community/libtorrent-rasterbar/__changelog b/abs/extra/community/libtorrent-rasterbar/__changelog
new file mode 100644
index 0000000..6528095
--- /dev/null
+++ b/abs/extra/community/libtorrent-rasterbar/__changelog
@@ -0,0 +1 @@
+change boost-lib dep to >=1.44
diff --git a/abs/extra/community/moblock/MoBlock-nfq.sh.patch b/abs/extra/community/moblock/MoBlock-nfq.sh.patch
index 15e742f..f9136c3 100644
--- a/abs/extra/community/moblock/MoBlock-nfq.sh.patch
+++ b/abs/extra/community/moblock/MoBlock-nfq.sh.patch
@@ -28,7 +28,7 @@
 +    iptables -I MOBLOCK_OUT -p all -m iprange --dst-range $IP -j ACCEPT
 +done
 +for IP in $WHITE_IP_IN; do
-+    iptables -I MOBLOCK_IN -p all -m iprange --dst-range $IP -j ACCEPT
++    iptables -I MOBLOCK_IN -p all -m iprange --src-range $IP -j ACCEPT
 +done
 +for IP in $WHITE_IP_FW; do
 +    iptables -I MOBLOCK_FW -p all -m iprange --dst-range $IP -j ACCEPT
diff --git a/abs/extra/community/moblock/PKGBUILD b/abs/extra/community/moblock/PKGBUILD
index f6c7e51..0f3ff26 100755
--- a/abs/extra/community/moblock/PKGBUILD
+++ b/abs/extra/community/moblock/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=moblock
 pkgver=0.9rc2
-pkgrel=8
+pkgrel=9
 pkgdesc="Console application that blocks connections from/to hosts listed in a file in peerguardian format"
 arch=('i686' 'x86_64')
 url="http://moblock.berlios.de/"
@@ -19,17 +19,9 @@ source=(http://download.berlios.de/moblock/MoBlock-0.8-i586.tar.bz2 \
         moblock-update \
         moblock \
         moblock.logrotate)
-md5sums=('199967adb48b153be90db10fe21325c5'
-         'e4e33c515677fa53eaca4616591d4e44'
-         '1193adccce219d31a7c0540807a4a8e8'
-         'b23b5214965df59632de5cec317ddbde'
-         '840bb52a99529305e49212a69c9ced8a'
-         '49a16feb221d4d912cc7200313517f7b'
-         '1bdc949fcff0ce751a5096e489061513'
-         'a8285fd3e68043cd8d21993d3dbbf9d4')
 
 build() {
-    cd $startdir/src/MoBlock-0.8
+    cd ${srcdir}/MoBlock-0.8
     
     # patch to update moblock to the latest cvs version
     patch -Np1 -i ../moblock_0.9_rc2.patch || return 1
@@ -43,14 +35,23 @@ build() {
     
     # build
     make || return 1
-    
-    #move the files
-    install -D -m 755 ./MoBlock-nfq.sh $startdir/pkg/usr/bin/moblock-nfq || return 1
-    install -D -m 744 ./moblock $startdir/pkg/usr/bin/moblock || return 1
-    install -D -m 755 ../moblock-update $startdir/pkg/usr/bin/moblock-update || return 1
-    install -D -m 744 ../moblock $startdir/pkg/etc/rc.d/moblock || return 1
-    install -D -m 644 ../config $startdir/pkg/etc/moblock/config || return 1
-    install -D -m 644 ../moblock.logrotate $startdir/pkg/etc/logrotate.d/moblock || return 1
 }
 
-
+package() {
+    cd ${srcdir}/MoBlock-0.8
+    #move the files
+    install -D -m 755 ./MoBlock-nfq.sh ${pkgdir}/usr/bin/moblock-nfq || return 1
+    install -D -m 744 ./moblock ${pkgdir}/usr/bin/moblock || return 1
+    install -D -m 755 ../moblock-update ${pkgdir}/usr/bin/moblock-update || return 1
+    install -D -m 744 ../moblock ${pkgdir}/etc/rc.d/moblock || return 1
+    install -D -m 644 ../config ${pkgdir}/etc/moblock/config || return 1
+    install -D -m 644 ../moblock.logrotate ${pkgdir}/etc/logrotate.d/moblock || return 1
+}
+md5sums=('199967adb48b153be90db10fe21325c5'
+         'e4e33c515677fa53eaca4616591d4e44'
+         'e9f3c6b09f5e07dee948450780340ea3'
+         'b23b5214965df59632de5cec317ddbde'
+         '840bb52a99529305e49212a69c9ced8a'
+         '49a16feb221d4d912cc7200313517f7b'
+         '1bdc949fcff0ce751a5096e489061513'
+         'a8285fd3e68043cd8d21993d3dbbf9d4')
diff --git a/abs/extra/community/moblock/moblock.install b/abs/extra/community/moblock/moblock.install
index c7715e7..6afe1d5 100644
--- a/abs/extra/community/moblock/moblock.install
+++ b/abs/extra/community/moblock/moblock.install
@@ -7,10 +7,6 @@ post_install() {
     echo ">>> moblock-update script no longer uses /var/spool/moblock"
     echo ">>> as a temporary directory.  You can safely delete it."
     echo ""
-    if [ ! -d /var/spool/moblock/used ]
-    then
-        mkdir -p /var/spool/moblock/used
-    fi
 }
 
 post_upgrade() {
@@ -18,10 +14,10 @@ post_upgrade() {
     if [ -h /usr/lib/libnfnetlink.so.1 ]; then
         rm /usr/lib/libnfnetlink.so.1
     fi
-    if [ ! -d /var/spool/moblock/used ]
-    then
-        mkdir -p /var/spool/moblock/used
-   fi
+    echo ""
+    echo ">>> moblock-update script no longer uses /var/spool/moblock"
+    echo ">>> as a temporary directory.  You can safely delete it."
+    echo ""
 }
 
 op=$1
diff --git a/abs/extra/community/peardb/PKGBUILD b/abs/extra/community/peardb/PKGBUILD
index dafe00f..01164eb 100755
--- a/abs/extra/community/peardb/PKGBUILD
+++ b/abs/extra/community/peardb/PKGBUILD
@@ -1,22 +1,24 @@
-arch=('i686')
-pkgname=PearDB
+pkgname=peardb
 pkgver=1.7.13
-pkgrel=1
-_kernver=2.6.28-LinHES
+pkgrel=2
+arch=('i686')
 pkgdesc="Pear Database Abstraction Layer"
 url="http://pear.php.net/"
-license=('GPL-2')
-source=('http://download.pear.php.net/package/DB-1.7.13.tgz')
-#install=('')
+license=('GPL2')
+replaces=('PearDB')
+source=(http://download.pear.php.net/package/DB-${pkgver}.tgz)
 
 build() {
-	mkdir -p $startdir/pkg/usr/share/pear/
-	cp -r $startdir/src/DB-$pkgver/DB* $startdir/pkg/usr/share/pear/
-	mkdir -p $startdir/pkg/usr/share/pear/docs/DB/
-	cp -r $startdir/src/DB-$pkgver/doc/* $startdir/pkg/usr/share/pear/docs/DB/
-	mkdir -p $startdir/pkg/usr/share/pear/tests/DB/
-	cp -r $startdir/src/DB-$pkgver/tests/* $startdir/pkg/usr/share/pear/tests/DB/
+        /bin/true
+}
 
-	}
+package() {
+        mkdir -p ${pkgdir}/usr/share/pear/
+        cp -r ${srcdir}/DB-$pkgver/DB* ${pkgdir}/usr/share/pear/
+        mkdir -p ${pkgdir}/usr/share/pear/docs/DB/
+        cp -r ${srcdir}/DB-$pkgver/doc/* ${pkgdir}/usr/share/pear/docs/DB/
+        mkdir -p ${pkgdir}/usr/share/pear/tests/DB/
+        cp -r ${srcdir}/DB-$pkgver/tests/* ${pkgdir}/usr/share/pear/tests/DB/
+}
 
 md5sums=('39b451245941a7059511a852f18b4946')
diff --git a/abs/extra/community/pearlog/PKGBUILD b/abs/extra/community/pearlog/PKGBUILD
index 5bc4ccc..31ad2b3 100755
--- a/abs/extra/community/pearlog/PKGBUILD
+++ b/abs/extra/community/pearlog/PKGBUILD
@@ -1,25 +1,27 @@
-arch=('i686')
-pkgname=PearLog
-pkgver=1.12.0
+pkgname=pearlog
+pkgver=1.12.3
 pkgrel=1
-_kernver=2.6.28-LinHES
 pkgdesc="Pear Logging Framework"
+arch=('i686')
 url="http://pear.php.net/"
-license=('GPL-2')
-source=('http://download.pear.php.net/package/Log-1.12.0.tgz')
-#install=('')
+license=('GPL2')
+replaces=('PearLog')
+source=(http://download.pear.php.net/package/Log-${pkgver}.tgz)
 
 build() {
-	mkdir -p $startdir/pkg/usr/share/pear/
-	cp -r $startdir/src/Log-$pkgver/Log* $startdir/pkg/usr/share/pear/
-	mkdir -p $startdir/pkg/usr/share/pear/docs/Log
-	cp -r $startdir/src/Log-$pkgver/docs/* $startdir/pkg/usr/share/pear/docs/Log/
-	mkdir -p $startdir/pkg/usr/share/pear/examples/Log
-	cp -r $startdir/src/Log-$pkgver/examples/* $startdir/pkg/usr/share/pear/examples/Log/
-	mkdir -p $startdir/pkg/usr/share/pear/misc/Log
-	cp -r $startdir/src/Log-$pkgver/misc/* $startdir/pkg/usr/share/pear/misc/Log/
-	mkdir -p $startdir/pkg/usr/share/pear/tests/Log
-	cp -r $startdir/src/Log-$pkgver/tests/* $startdir/pkg/usr/share/pear/tests/Log/
-	}
+        /bin/true
+}
 
-md5sums=('7fe68920afc4b122cb15aba40d735cb6')
+package() {
+        mkdir -p ${pkgdir}/usr/share/pear/
+        cp -r ${srcdir}/Log-${pkgver}/Log* ${pkgdir}/usr/share/pear/
+        mkdir -p ${pkgdir}/usr/share/pear/docs/Log
+        cp -r ${srcdir}/Log-${pkgver}/docs/* ${pkgdir}/usr/share/pear/docs/Log/
+        mkdir -p ${pkgdir}/usr/share/pear/examples/Log
+        cp -r ${srcdir}/Log-${pkgver}/examples/* ${pkgdir}/usr/share/pear/examples/Log/
+        mkdir -p ${pkgdir}/usr/share/pear/misc/Log
+        cp -r ${srcdir}/Log-${pkgver}/misc/* ${pkgdir}/usr/share/pear/misc/Log/
+        mkdir -p ${pkgdir}/usr/share/pear/tests/Log
+        cp -r ${srcdir}/Log-${pkgver}/tests/* ${pkgdir}/usr/share/pear/tests/Log/
+}
+md5sums=('9930cb6d52b3af2ca6a24db267e237f0')
diff --git a/abs/extra/community/python-beaker/PKGBUILD b/abs/extra/community/python-beaker/PKGBUILD
new file mode 100644
index 0000000..6cf06b4
--- /dev/null
+++ b/abs/extra/community/python-beaker/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 87715 2010-08-18 03:37:40Z allan $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Massimiliano Torromeo < massimiliano DOT torromeo AT gmail DOT com >
+pkgname=python-beaker
+pkgver=1.5.4
+pkgrel=2
+arch=('any')
+license=('custom')
+pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications"
+url="http://beaker.groovie.org/"
+depends=('python2')
+makedepends=('python2-distribute')
+source=("http://cheeseshop.python.org/packages/source/B/Beaker/Beaker-$pkgver.tar.gz")
+md5sums=('de84e7511119dc0b8eb4ac177d3e2512')
+
+build() {
+    cd ${srcdir}/Beaker-${pkgver}
+    sed -i "s#/usr/bin/python#/usr/bin/python2#" beaker/crypto/pbkdf2.py
+    python2 setup.py install --root=${pkgdir} --optimize=1
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/abs/extra/community/python-beaker/__changelog b/abs/extra/community/python-beaker/__changelog
new file mode 100644
index 0000000..9e2b603
--- /dev/null
+++ b/abs/extra/community/python-beaker/__changelog
@@ -0,0 +1 @@
+makedepends=('setuptools') -> makedepends=('python2-distribute')
diff --git a/abs/extra/community/python-chardet/PKGBUILD b/abs/extra/community/python-chardet/PKGBUILD
new file mode 100644
index 0000000..6ed1086
--- /dev/null
+++ b/abs/extra/community/python-chardet/PKGBUILD
@@ -0,0 +1,20 @@
+# $Id: PKGBUILD 87872 2010-08-18 15:26:20Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+pkgname=python-chardet
+_pkgnamebase=python2-chardet
+pkgver=2.0.1
+pkgrel=2
+pkgdesc="Python module for character encoding auto-detection"
+arch=('any')
+url="http://chardet.feedparser.org"
+license=('LGPL')
+depends=('python2')
+source=(http://chardet.feedparser.org/download/${_pkgnamebase}-${pkgver}.tgz)
+sha256sums=('56fa0c37189b0a5f082d064dec59d69a044aaa3eeb7acb9b3081e2ba306deaa4')
+
+build() {
+  cd "${srcdir}/${_pkgnamebase}-${pkgver}"
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+}
+
diff --git a/abs/extra/community/python-mako/PKGBUILD b/abs/extra/community/python-mako/PKGBUILD
new file mode 100644
index 0000000..8d68c9b
--- /dev/null
+++ b/abs/extra/community/python-mako/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 87883 2010-08-18 15:32:33Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Roberto Alsina <ralsina@kde.org>
+pkgname=python-mako
+pkgver=0.3.4
+pkgrel=4
+pkgdesc="Hyperfast and lightweight templating for the Python platform."
+arch=('any')
+url="http://www.makotemplates.org/"
+license=('custom')
+depends=('python2' 'python-markupsafe>=0.9.2' 'python-beaker>=1.5.4')
+makedepends=('setuptools')
+source=(http://www.makotemplates.org/downloads/Mako-$pkgver.tar.gz)
+md5sums=('2ae56ccc6c9b5c4e2e67f42b69475009')
+
+build() {
+  cd "$srcdir/Mako-$pkgver"
+  python2 setup.py install --root="$pkgdir" --optimize=1 || return 1
+  install -D LICENSE "$pkgdir/usr/share/licenses/python-mako/COPYING" || return 1
+}
+
diff --git a/abs/extra/community/python-markupsafe/PKGBUILD b/abs/extra/community/python-markupsafe/PKGBUILD
new file mode 100644
index 0000000..92c9282
--- /dev/null
+++ b/abs/extra/community/python-markupsafe/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 87877 2010-08-18 15:28:18Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Alex Anthony <alex.anthony28991@gmail.com>
+
+pkgname=python-markupsafe
+pkgver=0.9.2
+pkgrel=2
+pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
+arch=('i686' 'x86_64')
+url="http://pypi.python.org/pypi/MarkupSafe"
+license=('custom')
+depends=('python2')
+makedepends=('setuptools')
+source=(http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz)
+md5sums=('69b72d1afdd9e808f9c1ef65f819c7a6')
+
+build() {
+  cd ${srcdir}/MarkupSafe-${pkgver}
+  python2 setup.py install --root=${pkgdir} --optimize=1
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
diff --git a/abs/extra/community/pyxdg/PKGBUILD b/abs/extra/community/pyxdg/PKGBUILD
index c56fd55..8c3d7bc 100644
--- a/abs/extra/community/pyxdg/PKGBUILD
+++ b/abs/extra/community/pyxdg/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 16878 2008-10-23 00:28:55Z douglas $
-# Maintainer: Aaron Griffin <aarongriffin@gmail.com>
+# $Id: PKGBUILD 89531 2010-09-01 15:23:06Z remy $
+# Maintainer: Hugo Doria <hugo@archlinux.org>
 # Contributor: Mario A. Vazquez <mario_vazq@hotmail.com>
+
 pkgname=pyxdg
-pkgver=0.15
-pkgrel=3
+pkgver=0.19
+pkgrel=2
 pkgdesc="Python library to access freedesktop.org standards."
-arch=(i686 x86_64)
+arch=('any')
 url="http://freedesktop.org/Software/pyxdg"
 license=("LGPL")
-depends=('python')
-source=(http://gentoolabs.com.ar/distfiles/${pkgname}-${pkgver}.tar.gz)
+depends=('python2')
+source=(http://www.freedesktop.org/~lanius/${pkgname}-${pkgver}.tar.gz)
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  python setup.py install --prefix=/usr --root=${startdir}/pkg || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python2 setup.py install --prefix=/usr --root=${pkgdir} || return 1
 }
-md5sums=('86a5441285fc908145414b63348d11a3')
+md5sums=('9f33542e846d0fc1e0bfa992a8555b0a')
+
diff --git a/abs/extra/community/transmission-cli/PKGBUILD b/abs/extra/community/transmission-cli/PKGBUILD
index 40af42a..11dbf60 100644
--- a/abs/extra/community/transmission-cli/PKGBUILD
+++ b/abs/extra/community/transmission-cli/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=transmission-cli
-pkgver=2.04
+pkgver=2.12
 pkgrel=1
 pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
 arch=('i686' 'x86_64')
@@ -25,6 +25,10 @@ build() {
 
   ./configure --prefix=/usr --disable-gtk || return 1
   make || return 1
+}
+
+package() {
+  cd "$srcdir/transmission-$pkgver"
   make DESTDIR="$pkgdir" install || return 1
 
   mkdir -p -m744 "$pkgdir/etc/sv/transmissiond" || return 1
@@ -34,7 +38,7 @@ build() {
   install -D -m644 "$srcdir/transmission.include" "$pkgdir/etc/transmission/transmission.include" || return 1
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" || return 1
 }
-md5sums=('84fe15eb7e000fdc369def513299358b'
+md5sums=('f3d34fdbbf3ae25635f9e7bf7e662cd9'
          'b91534aaf2e403331c611c615ab2c03d'
          'ff22c13dbd52565f9e88b1de22514eb9'
          'b5a49ea375333cd0fee40f70dbac4c2e'
diff --git a/abs/extra/community/twisted/PKGBUILD b/abs/extra/community/twisted/PKGBUILD
new file mode 100644
index 0000000..e008e92
--- /dev/null
+++ b/abs/extra/community/twisted/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 94591 2010-10-08 12:55:33Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
+
+pkgname=twisted
+pkgver=10.1.0
+pkgrel=1
+pkgdesc="Asynchronous networking framework written in Python."
+arch=('i686' 'x86_64')
+url="http://twistedmatrix.com/"
+license=('MIT')
+depends=('python2' 'pycrypto' 'zope-interface')
+optdepends=('pyopenssl'
+            'python-soappy:for twisted.web.soap')
+install=twisted.install
+source=(http://tmrc.mit.edu/mirror/twisted/Twisted/${pkgver%.*}/Twisted-${pkgver}.tar.bz2)
+md5sums=('04cca97506e830074cffc1965297da3f')
+build() {
+  cd "${srcdir}/Twisted-${pkgver}"
+
+  python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+
+  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
+  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
+}
diff --git a/abs/extra/community/twisted/twisted.install b/abs/extra/community/twisted/twisted.install
new file mode 100644
index 0000000..8e93ffd
--- /dev/null
+++ b/abs/extra/community/twisted/twisted.install
@@ -0,0 +1,11 @@
+post_install() {
+  python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
+}
diff --git a/abs/extra/community/zope-interface/PKGBUILD b/abs/extra/community/zope-interface/PKGBUILD
new file mode 100644
index 0000000..a2918bf
--- /dev/null
+++ b/abs/extra/community/zope-interface/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 87850 2010-08-18 13:23:55Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+
+pkgname=zope-interface
+pkgver=3.5.3
+pkgrel=2
+pkgdesc="Separate distribution of the zope.interface package used in Zope 3."
+license=('ZPL')
+arch=('i686' 'x86_64')
+url="http://www.zope.org/Products/ZopeInterface/"
+depends=('python2')
+source=(http://pypi.python.org/packages/source/z/zope.interface/zope.interface-${pkgver}.tar.gz)
+md5sums=('1fdb9a77f92d3ada3e795a8c9b58d0c6')
+
+build() {
+  cd ${srcdir}/zope.interface-${pkgver}
+  python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
+  # Blabla.
+  rm $pkgdir/usr/lib/python2.7/site-packages/zope/interface/README*.txt
+}
diff --git a/abs/extra/lcdproc/PKGBUILD b/abs/extra/lcdproc/PKGBUILD
index e5cc719..03b4333 100644
--- a/abs/extra/lcdproc/PKGBUILD
+++ b/abs/extra/lcdproc/PKGBUILD
@@ -1,25 +1,27 @@
 # Contributor: Bernhard Walle <bernhard.walle@gmx.de>
 pkgname=lcdproc
 pkgver=0.5.3
-pkgrel=3
+pkgrel=4
 pkgdesc="LCDproc is a utility to drive one or more LCD (and LCD-like) devices attached to a host."
 url="http://lcdproc.omnipotent.net/"
 license="GPL"
 depends=(libusb serdisplib libftdi autoconf automake lirc libnxml libmrss pkgconfig xosd)
 backup=(etc/LCDd.conf)
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 install=lcdproc.install
 source=(http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-        lcdproc-add-serdisplib
-        )
+        lcdproc-add-serdisplib)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
 #  patch -p1 < ../lcdproc-add-serdisplib
   autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc --enable-libusb --enable-lcdproc-menus --enable-stat-smbfs --enable-drivers=all
   make
-  make DESTDIR=$startdir/pkg install
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
   sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" LCDd.conf > $pkgdir/etc/LCDd.conf
 }
 md5sums=('fe9a7c9d8f2c5e76250ce2ea8f644921'
diff --git a/abs/extra/mime-types/PKGBUILD b/abs/extra/mime-types/PKGBUILD
index 563857d..0457da6 100644
--- a/abs/extra/mime-types/PKGBUILD
+++ b/abs/extra/mime-types/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=mime-types
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Provides /etc/mime.types"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/"
diff --git a/abs/extra/monitorix/PKGBUILD b/abs/extra/monitorix/PKGBUILD
index e73fcd1..d2dceec 100644
--- a/abs/extra/monitorix/PKGBUILD
+++ b/abs/extra/monitorix/PKGBUILD
@@ -1,22 +1,22 @@
-# Maintainer: graysky <da_audiophile yahoo>
+# Contributor: graysky <graysky AT archlinux dot us>
+# Contributor: res <andres87p gmail>
 
 pkgname=monitorix
-pkgver=1.4.2
-pkgrel=8
+pkgver=1.5.2
+pkgrel=1
 pkgdesc='A lightweight system monitoring tool that uses rrd databases.'
-arch=(i686)
+arch=(any)
 url=http://www.$pkgname.org/
 license=(GPL)
-depends=(dcron rrdtool lighttpd )
+depends=('rrdtool' 'perl-libwww')
 optdepends=('lm_sensors: enable support for system temp monitoring'
-'hddtemp: enable support for hdd temp monitoring')
+'hddtemp: enable support for hdd temp monitoring'
+'metamail: enable support for reports via system mail')
 
 backup=(etc/$pkgname.conf)
 source=($url$pkgname-$pkgver.tar.gz
         monitorix.rc.d)
-md5sums=('6db1bdbeeb0d128622590dfecb9694e4'
-'34e7cb2d78bb4e3ece4aeb4ed26a0d43')
-install=('monitorix.install')
+install=('readme.install')
 
 build() {
   cd $pkgname-$pkgver
@@ -24,22 +24,10 @@ build() {
   install -D $pkgname.pl $pkgdir/usr/sbin/$pkgname.pl
   install -D ../$pkgname.rc.d $pkgdir/etc/rc.d/$pkgname
 
-# use LinHES defaults
+# use Arch defaults
   sed -e '/^our $OSTYPE/ s,RHFC,Arch,' \
-      -e '/^our $TITLE/ s,FIBRANET NSP\, SL,LinHES,' \
-      -e '/^our @HDDTEMP_LIST/ s,hda,sda,' \
-      -e '/^our $ENABLE_CROND_MAIL/ s,Y,N,' \
-      -e '/^our $ENABLE_SERVU/ s,Y,N,' \
-      -e '/^our $ENABLE_PORT/ s,Y,N,' \
-      -e '/^our $ENABLE_USER/ s,Y,N,' \
-      -e '/^our $ENABLE_INT/ s,Y,N,' \
-      -e '/^our @HDDTEMP_LIST/ s,hda,sda,' \
-      -e '/^our @MNT_LIST/ s,boot,myth,' \
-      -e '/^\s*"Linux-Arch"/ s,/var/log/httpd/access.log,/var/log/httpd/access_log,' \
-      -e '/^\s*"Linux-Arch"/ s,/var/log/secure,/var/log/auth.log,' \
-      -e '/^\s*"Linux-Arch"/ s,/srv/http,/data/srv/httpd/htdocs,' < $pkgname.conf \
-                                                                        > $pkgdir/etc/$pkgname.conf
-
+      -e '/^our @HDDTEMP_LIST/ s,hda,sda,' < $pkgname.conf \
+                                           > $pkgdir/etc/$pkgname.conf
   mkdir -p $pkgdir/var/lib/$pkgname/usage
   cp -r reports $pkgdir/var/lib/$pkgname
 
@@ -47,12 +35,13 @@ build() {
   cp Changes $pkgname-apache.conf $pkgname-alert.sh README README.nginx TODO \
      $pkgdir/usr/share/doc/$pkgname
 
-  install -dm777 $pkgdir/data/srv/httpd/htdocs/$pkgname/imgs
-  cp {logo_bot,logo_top,${pkgname}ico}.png $pkgdir/data/srv/httpd/htdocs/$pkgname
+  install -dm777 $pkgdir/srv/http/$pkgname/imgs
+  cp {logo_bot,logo_top,${pkgname}ico}.png $pkgdir/srv/http/$pkgname
 
-  install -D $pkgname.cgi $pkgdir/data/srv/httpd/htdocs/cgi-bin/$pkgname.cgi
+  install -D $pkgname.cgi $pkgdir/srv/http/cgi-bin/$pkgname.cgi
 
   gzip -9 man/man5/$pkgname.conf.5
   install -Dm644 man/man5/$pkgname.conf.5.gz $pkgdir/usr/share/man/man5/$pkgname.conf.5.gz
 }
-
+sha256sums=('3d025d097fe8dd458501b8cf3345b80b1b66625ae257e21452b95d1596ec5b6d'
+            'f9ba4e09f8e583808bc9fa5476ddac067182799512e103ea40565b7da47dbab6')
diff --git a/abs/extra/monitorix/monitorix.rc.d b/abs/extra/monitorix/monitorix.rc.d
index 9649519..24eb433 100644
--- a/abs/extra/monitorix/monitorix.rc.d
+++ b/abs/extra/monitorix/monitorix.rc.d
@@ -10,15 +10,16 @@ case $1 in
     start)
         stat_busy "Starting Monitorix"
         if ck_daemon monitorix; then
-	if [ -x /etc/cron.hourly/sync-monitorix.sh ]; then
+        # check for monitorix-tmps and if present execute it
+        if [ -x /etc/cron.hourly/sync-monitorix.sh ]; then
                 /etc/cron.hourly/sync-monitorix.sh >/dev/null 2>&1
         fi
             # Creates RRDs files if needed
             /usr/sbin/monitorix.pl create >/dev/null 2>&1 || stat_die $?
             /usr/sbin/monitorix.pl init >/dev/null 2>&1 || stat_die $?
             add_daemon monitorix
-        # restart crond so data gets collected
-        /sbin/sv restart cron
+	# restart crond so data gets collected
+	/etc/rc.d/crond restart
             stat_done
         else
             stat_fail
@@ -28,13 +29,14 @@ case $1 in
     stop)
         stat_busy "Stopping Monitorix"
         if ! ck_daemon monitorix; then
+        # check for monitorix-tmps and if present execute it
         if [ -x /etc/cron.hourly/sync-monitorix.sh ]; then
                 /etc/cron.hourly/sync-monitorix.sh >/dev/null 2>&1
         fi
             /usr/sbin/monitorix.pl stop 2>&1 || stat_die $?
             rm_daemon monitorix
         # restart crond data stops getting collected
-        /sbin/sv restart cron
+        /etc/rc.d/crond restart
             stat_done
         else
             stat_fail
diff --git a/abs/extra/monitorix/readme.install b/abs/extra/monitorix/readme.install
new file mode 100644
index 0000000..2630018
--- /dev/null
+++ b/abs/extra/monitorix/readme.install
@@ -0,0 +1,54 @@
+post_install() {
+ echo '----------------------------------------------------------------------'
+ echo 'NOTE that you will need a mono-font for this package to work.'
+ echo 'There are many options here so I did not add one as a formal dep.'
+ echo 'You may use for example terminus-font.  If your graphs have no numbers'
+ echo 'go ahead and install it.  If they work as is you do not need it.'
+ echo ' '
+ echo 'Consider having your rrd databases for monitorix reside in RAM.'
+ echo 'D/L and build the monitorix-tmpfs package from the AUR:'
+ echo
+ echo '            http://aur.archlinux.org/packages.php?ID=34134'
+ echo '----------------------------------------------------------------------'
+}
+
+post_remove() {
+ echo '----------------------------------------------------------------------'
+ echo 'To remove all traces of monitorix from your system, you must manually'
+ echo 'remove the following dir trees (doing so will delete your databases):'
+ echo
+ echo '/var/lib/monitorix'
+ echo '/srv/http/monitorix'
+ echo '----------------------------------------------------------------------'
+}
+
+# $1: The new package version
+# $2: The old package version
+
+post_upgrade() {
+NEW=`echo $1 | cut -f-1 -d '-'`
+OLD=`echo $2 | cut -f-1 -d '-'`
+
+# if running the 1.4.2 series then display warning message
+
+if [ "$OLD" = "1.4.2" ]; then
+ echo '----------------------------------------------------------------------'
+ echo ' WARNING:'
+ echo
+ echo 'With this upgrade you MUST replace your current version of'
+ echo '/etc/monitorix.conf with /etc/monitorix.conf.pacnew which contains new'
+ echo 'configs needed by the 1.5.0 release of monitorix.'
+ echo
+ echo 'Simply do the following:'
+ echo '# cp /etc/monitorix.conf /etc/monitorix.conf.old'
+ echo '# mv /etc/monitorix.conf.pacnew /etc/monitorix.conf'
+ echo
+ echo 'Now you can compare your old config saved as /etc/monitorix.conf.old'
+ echo 'to your new config to ensure that you get all your config options into'
+ echo 'the new version.'
+ echo
+ echo 'Restart monitorix when you have completed the edit as well:'
+ echo '# /etc/rc.d/monitorix restart'
+ echo '----------------------------------------------------------------------'
+fi
+}
diff --git a/abs/extra/mpeg_stat/PKGBUILD b/abs/extra/mpeg_stat/PKGBUILD
index 37be249..b0f7315 100644
--- a/abs/extra/mpeg_stat/PKGBUILD
+++ b/abs/extra/mpeg_stat/PKGBUILD
@@ -10,10 +10,13 @@ depends=('ffmpeg')
 source=(http://www.sfr-fresh.com/unix/misc/old/${pkgname}-${pkgver}-src.tar.gz)
 
 build() {
+   cd ${srcdir}/${pkgname}
 
-cd $startdir/src/mpeg_stat
-make || return 1
-install -m755 -D $startdir/src/mpeg_stat/mpeg_stat $startdir/pkg/usr/bin/mpeg_stat
-install -m644 -D $startdir/src/mpeg_stat/COPYRIGHT $startdir/pkg/usr/share/licenses/mpeg_stat/COPYRIGHT
+   make || return 1
 }
-
+package() {
+   cd ${srcdir}/${pkgname}
+   install -m755 -D ${srcdir}/mpeg_stat/mpeg_stat ${pkgdir}/usr/bin/mpeg_stat
+   install -m644 -D ${srcdir}/mpeg_stat/COPYRIGHT ${pkgdir}/usr/share/licenses/mpeg_stat/COPYRIGHT
+}
+md5sums=('d0eca3833b76855c4e348b39deaf667d')
diff --git a/abs/extra/mpgtx/PKGBUILD b/abs/extra/mpgtx/PKGBUILD
index 1181564..8474da3 100644
--- a/abs/extra/mpgtx/PKGBUILD
+++ b/abs/extra/mpgtx/PKGBUILD
@@ -1,16 +1,23 @@
-pkgname="mpgtx"
-pkgver="1.3.1"
-pkgrel=1
-arch=('i686')
-pkgdesc="mpgtx is a commandline MPEG audio/video/system file toolbox."
-url="http://mpgtx.sourceforge.net/"
-source=(http://downloads.sourceforge.net/project/mpgtx/mpgtx/$pkgver/mpgtx-$pkgver.tar.gz)
+# $Id: PKGBUILD 5185 2009-11-07 02:20:01Z dgriffiths $
+# Contributor: Peter Baldwin <bald_pete@hotmail.com>
+pkgname=mpgtx
+pkgver=1.3.1
+pkgrel=2
+pkgdesc="A command line MPEG audio/video/system toolkit"
+arch=('i686' 'x86_64')
+url="http://mpgtx.sourceforge.net"
+license=("GPL")
+depends=()
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('d628060aa04ad3b40a175bf35f5167cf')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make || return 1
-  make INSTALLDIR=$startdir/pkg/usr/bin MANDIR=$startdir/pkg/usr/man/man1 MANDIRDE=$startdir/usr/man/de/man1 install
 }
-
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make PREFIX=${pkgdir}/usr install
+  mv ${pkgdir}/usr/man ${pkgdir}/usr/share/
+}
diff --git a/abs/extra/qscintilla/ChangeLog b/abs/extra/qscintilla/ChangeLog
deleted file mode 100644
index 8e78889..0000000
--- a/abs/extra/qscintilla/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-
-2008-11-22  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.3.2
-
-2008-10-15  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.3
-
-2008-07-06  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.2
-
diff --git a/abs/extra/serdisplib/PKGBUILD b/abs/extra/serdisplib/PKGBUILD
index 454769b..e888a7d 100644
--- a/abs/extra/serdisplib/PKGBUILD
+++ b/abs/extra/serdisplib/PKGBUILD
@@ -1,22 +1,26 @@
-# Contributor: Bernhard Walle <bernhard.walle@gmx.de>
+# Contributor: Bernhard Walle <bernhard@bwalle.de>
+# AUR Category: system
 pkgname=serdisplib
-pkgver=1.97.8
+pkgver=1.97.9
 pkgrel=1
 pkgdesc="Library for Certain Serial and Parallel LC Displays"
 url="http://serdisplib.sourceforge.net/"
 license="GPL"
 depends=(libusb gd)
-backup=(etc/LCDd.conf)
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 source=(http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('2aa91c43d01d2dfc9fbc1116e3063ae1')
+md5sums=('130552ec60d01e974712a60274f34de7')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --enable-libusb
-  make
-  make DESTDIR=$startdir/pkg includedir=$startdir/pkg/usr/include \
-        libdir=$startdir/pkg/usr/lib bindir=$startdir/pkg/usr/bin \
+  make || return 1
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} includedir=${pkgdir}/usr/include \
+        libdir=${pkgdir}/usr/lib bindir=${pkgdir}/usr/bin \
         install
 }
 # :mode=shellscript:
+
diff --git a/abs/extra/shepherd/PKGBUILD b/abs/extra/shepherd/PKGBUILD
index f7b3048..34f45ff 100644
--- a/abs/extra/shepherd/PKGBUILD
+++ b/abs/extra/shepherd/PKGBUILD
@@ -1,16 +1,16 @@
 # $Id: PKGBUILD 23123 2009-01-03 02:43:02Z kevin $
 # Maintainer: Greg Frost <gregfrost1@bigpond.com>
 pkgname=shepherd
-pkgver=1
-pkgrel=2
+pkgver=1.45
+pkgrel=1
 pkgdesc="Australian EPG Grabber."
-arch=i686
+license=('unknown')
+arch=('i686')
 depends=(perl-pathtools perl-digest-sha1 perl-algorithm-diff perl-javascript perl-list-compare)
-makedepends=()
 source=(http://www.whuffy.com/shepherd/shepherd)
 
 build() {
-    mkdir -p ${startdir}/pkg/usr/bin/
-    install -m 0755 shepherd ${startdir}/pkg/usr/bin/
+    mkdir -p ${pkgdir}/usr/bin/
+    install -m 0755 shepherd ${pkgdir}/usr/bin/
 }
-md5sums=('2b826e4a08810d360e9f6843beb6aa42')
+md5sums=('09d201253e0a41ed28999a97845001f0')
diff --git a/abs/extra/wireshark/wireshark.desktop b/abs/extra/wireshark/wireshark.desktop
deleted file mode 100644
index f4317f6..0000000
--- a/abs/extra/wireshark/wireshark.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-GenericName=Wireshark
-Comment=Network protocol analyzer
-Name=wireshark
-Exec=wireshark
-Icon=/usr/share/icons/wireshark.png
-Type=Application
-Terminal=false
-Categories=Application;Network;
diff --git a/abs/extra/wireshark/wireshark.png b/abs/extra/wireshark/wireshark.png
deleted file mode 100644
index 4e40263..0000000
--- a/abs/extra/wireshark/wireshark.png
+++ /dev/null