Merge remote-tracking branch 'origin/testing' into testing

Conflicts:
	abs/core/LinHES-config/PKGBUILD

14 files changed, 119 insertions, 53 deletions

diff --git a/abs/extra/alsa-firmware/PKGBUILD b/abs/extra/alsa-firmware/PKGBUILD
index d9c890b..af2c544 100644
--- a/abs/extra/alsa-firmware/PKGBUILD
+++ b/abs/extra/alsa-firmware/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 79046 2010-04-30 05:38:39Z tpowa $
+# $Id$
 # Contributor: Jochen Immendörfer <jochen dot immendoerfer at gmail dot com>
 # Package Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=alsa-firmware
-pkgver=1.0.23
+pkgver=1.0.24.1
 pkgrel=1
 pkgdesc="ALSA firmware package"
 arch=('i686' 'x86_64')
@@ -14,20 +14,24 @@ options=(!strip)
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
   # remove files which conflicts with kernel26-firmware
-  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_kernel.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_minisrc.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/korg/k1212.dsp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/alaw_main.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_capture.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_init.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_playback.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/mulaw_main.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_ctrl.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_dsp.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1e_ctrl.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/yss225_registers.bin || return 1
+  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_kernel.fw
+  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_minisrc.fw
+  rm -rf ${pkgdir}/lib/firmware/korg/k1212.dsp
+  rm -rf ${pkgdir}/lib/firmware/sb16/alaw_main.csp
+  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_capture.csp
+  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_init.csp
+  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_playback.csp
+  rm -rf ${pkgdir}/lib/firmware/sb16/mulaw_main.csp
+  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_ctrl.fw
+  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_dsp.fw
+  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1e_ctrl.fw
+  rm -rf ${pkgdir}/lib/firmware/yamaha/yss225_registers.bin
 }
-md5sums=('e3f755331d6d485f6fd697249b90f877')
+md5sums=('d37434dfcfececd8581d2f0bbe2fcf1b')
diff --git a/abs/extra/cambozola/PKGBUILD b/abs/extra/cambozola/PKGBUILD
new file mode 100644
index 0000000..27664f1
--- /dev/null
+++ b/abs/extra/cambozola/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Ernie Brodeur <ebrodeur@ujami.net>
+pkgname=cambozola
+pkgver=0.92
+pkgrel=1
+pkgdesc="A java servlet for streaming JPEG's from ip Cameras."
+url="http://www.charliemouse.com:8080/code/cambozola/"
+arch=('x86_64' 'i686')
+license=('GPL')
+depends=('java-runtime')
+makedepends=('apache-ant')
+source=("${url}${pkgname}-${pkgver}.tar.gz")
+md5sums=('602daba851e726e2399445fda3ca718f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ant
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  mkdir -p ${pkgdir}/usr/share/${pkgname}
+  cp dist/* ${pkgdir}/usr/share/${pkgname}/
+}
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/abs/extra/community/transmission-cli/PKGBUILD b/abs/extra/community/transmission-cli/PKGBUILD
index 40053ce..09609f9 100644
--- a/abs/extra/community/transmission-cli/PKGBUILD
+++ b/abs/extra/community/transmission-cli/PKGBUILD
@@ -3,14 +3,14 @@
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=transmission-cli
-pkgver=2.33
-pkgrel=1
+pkgver=2.41
+pkgrel=2
 pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
 license=('MIT')
 depends=('curl' 'libevent>=2.0.10')
-makedepends=('intltool')
+makedepends=('intltool' 'libcroco')
 replaces=('transmission')
 backup=('etc/conf.d/transmissiond')
 install=transmission-cli.install
@@ -38,8 +38,8 @@ package() {
   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=('082217a65713ac879410c622cbe6eb26'
-         'b91534aaf2e403331c611c615ab2c03d'
+md5sums=('799b7bb24e236dbbdc86275f89ea9e67'
+         'e876d24b99c401f782395b053976dffd'
          'ff22c13dbd52565f9e88b1de22514eb9'
          'b5a49ea375333cd0fee40f70dbac4c2e'
          'd05567c7a4f9df9f28602d1356d5c05c')
diff --git a/abs/extra/community/transmission-cli/run.transmissiond b/abs/extra/community/transmission-cli/run.transmissiond
index 714c946..792594a 100755
--- a/abs/extra/community/transmission-cli/run.transmissiond
+++ b/abs/extra/community/transmission-cli/run.transmissiond
@@ -13,7 +13,7 @@ PID=`pidof -o %PPID /usr/bin/transmission-daemon`
              if [ ! -f ${CONFIGDIR}/blocklists/level1 ]; then
                 # update blocklist
                # echo "updating blocklist, ~4MB"
-                wget -q -O level1.gz http://download.m0k.org/transmission/files/level1.gz
+                wget -q -O level1.gz http://www.bluetack.co.uk/config/level1.gz
                 if [ -f level1.gz ]; then
                   gunzip level1.gz
                   if [ $? -eq 0 ]; then
diff --git a/abs/extra/community/twisted/PKGBUILD b/abs/extra/community/twisted/PKGBUILD
index e008e92..13fca6b 100644
--- a/abs/extra/community/twisted/PKGBUILD
+++ b/abs/extra/community/twisted/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=twisted
 pkgver=10.1.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Asynchronous networking framework written in Python."
 arch=('i686' 'x86_64')
 url="http://twistedmatrix.com/"
@@ -23,7 +23,7 @@ build() {
   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
+      -i ${pkgdir}/usr/lib/python2.6/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
+      -i ${pkgdir}/usr/lib/python2.6/site-packages/twisted/mail/test/pop3testserver.py
 }
diff --git a/abs/extra/community/twisted/twisted.install b/abs/extra/community/twisted/twisted.install
index 8e93ffd..62a2cc5 100644
--- a/abs/extra/community/twisted/twisted.install
+++ b/abs/extra/community/twisted/twisted.install
@@ -7,5 +7,5 @@ post_upgrade() {
 }
 
 post_remove() {
-  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
+  find /usr/lib/python2.6/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
 }
diff --git a/abs/extra/geoip/PKGBUILD b/abs/extra/geoip/PKGBUILD
index 936aa57..32c5927 100644
--- a/abs/extra/geoip/PKGBUILD
+++ b/abs/extra/geoip/PKGBUILD
@@ -1,34 +1,36 @@
-# $Id: PKGBUILD 40078 2009-05-27 06:04:17Z juergen $
+# $Id$
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.4.7
+pkgver=1.4.8
 pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
-arch=(i686 x86_64)
-license=('GPL')
+arch=('i686' 'x86_64')
 url="http://www.maxmind.com/app/c"
+license=('GPL')
 depends=('zlib')
-backup=(etc/geoip/GeoIP.conf)
+backup=('etc/geoip/GeoIP.conf')
 options=('!libtool')
 source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz)
+md5sums=('05b7300435336231b556df5ab36f326d')
 
 build() {
-  cd ${srcdir}/GeoIP-${pkgver}
+  cd "${srcdir}/GeoIP-${pkgver}"
+
+  autoreconf -i
   ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/geoip
-  make || return 1
+  make
 }
 
 check() {
-
-  cd ${srcdir}/GeoIP-${pkgver}
-  make check || return 1
-
+  cd "${srcdir}/GeoIP-${pkgver}"
+  make check
 }
 
 package() {
-  cd ${srcdir}/GeoIP-${pkgver}
-  make DESTDIR=${startdir}/pkg install
+  cd "${srcdir}/GeoIP-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
-md5sums=('a802175d5b7e2b57b540a7dd308d9205')
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/help2man/help2man.install b/abs/extra/help2man/help2man.install
new file mode 100644
index 0000000..ab6585b
--- /dev/null
+++ b/abs/extra/help2man/help2man.install
@@ -0,0 +1,18 @@
+info_dir=/usr/share/info
+info_files=(help2man.info)
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
diff --git a/abs/extra/htop/htop.c.patch b/abs/extra/htop/htop.c.patch
new file mode 100644
index 0000000..41a2dd3
--- /dev/null
+++ b/abs/extra/htop/htop.c.patch
@@ -0,0 +1,15 @@
+From: Roman Kosenko <madkite@gmail.com>
+Date: Thu, 10 Mar 2011 16:23:53 +0200
+Subject: [PATCH] Fix stupid bug with --sort-key
+
+--- htop.c.old	2010-11-24 20:45:38.000000000 +0200
++++ htop.c	2011-03-10 16:32:18.473716667 +0200
+@@ -282,7 +282,7 @@
+             printVersionFlag();
+             break;
+          case 's':
+-            if (strcmp(optarg, "help")) {
++            if (!strcmp(optarg, "help")) {
+                for (int j = 1; j < LAST_PROCESSFIELD; j++)
+                   printf ("%s\n", Process_fieldNames[j]);
+                exit(0);
diff --git a/abs/extra/libebml/PKGBUILD b/abs/extra/libebml/PKGBUILD
index dfe2d6e..5ea5a45 100644
--- a/abs/extra/libebml/PKGBUILD
+++ b/abs/extra/libebml/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=libebml
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="Extensible Binary Meta Language library"
 arch=('i686' 'x86_64')
 url="http://dl.matroska.org/downloads/libebml/"
@@ -20,4 +20,4 @@ package() {
  cd ${srcdir}/${pkgname}-${pkgver}/make/linux
  make prefix=${pkgdir}/usr install
 }
-md5sums=('6d438f03d8928d83a2d120ed02705f03')
+md5sums=('726cc2bd1a525929ff35ff9854c0ebab')
diff --git a/abs/extra/libmatroska/PKGBUILD b/abs/extra/libmatroska/PKGBUILD
index 4a85d50..7df70c8 100644
--- a/abs/extra/libmatroska/PKGBUILD
+++ b/abs/extra/libmatroska/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor 03/08/04 <lefungus@altern.org>
 
 pkgname=libmatroska
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="Matroska library"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -20,4 +20,4 @@ package() {
  cd ${srcdir}/${pkgname}-${pkgver}/make/linux
  make prefix=${pkgdir}/usr install
 }
-md5sums=('4efcf3945b17a6f0320cf1aaa326a4de')
+md5sums=('f4a8c411f09d39c754eb726efd616043')
diff --git a/abs/extra/mdbtools/PKGBUILD b/abs/extra/mdbtools/PKGBUILD
index c7a562d..870551c 100644
--- a/abs/extra/mdbtools/PKGBUILD
+++ b/abs/extra/mdbtools/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
 pkgname=mdbtools
 pkgver=0.5
-pkgrel=8
+pkgrel=9
 pkgdesc="Utilities for viewing data and exporting schema from Microsoft Access Database files"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/mdbtools/"
diff --git a/abs/extra/mkvtoolnix/PKGBUILD b/abs/extra/mkvtoolnix/PKGBUILD
index 497670c..f77ecd6 100644
--- a/abs/extra/mkvtoolnix/PKGBUILD
+++ b/abs/extra/mkvtoolnix/PKGBUILD
@@ -3,13 +3,14 @@
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=mkvtoolnix
-pkgver=4.9.1
-pkgrel=2
+pkgver=5.0.1
+pkgrel=1
 pkgdesc="Set of tools to create, edit and inspect Matroska files"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 depends=('libmatroska>=1.0.0' 'libebml>=1.0.0' 'flac>=1.1.4' 'libvorbis' 'wxgtk>=2.8.0.1' 'file' 'boost' 'lzo2' 'qt')
+makedepends=('ruby' 'libcroco')
 source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2")
 
 build() {
@@ -23,4 +24,4 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./drake DESTDIR=${pkgdir} install
 }
-md5sums=('5981f266e6d25da4a49f7464e4a97cdf')
+md5sums=('93fbbe946de6013eca699c0c2a93a4e9')
diff --git a/abs/extra/webmin/PKGBUILD b/abs/extra/webmin/PKGBUILD
index 24834e1..f022902 100644
--- a/abs/extra/webmin/PKGBUILD
+++ b/abs/extra/webmin/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.550
+pkgver=1.570
 pkgrel=1
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64)
@@ -219,7 +219,7 @@ build() {
   install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
 }
 
-md5sums=('d892599a6e3e6f102a8261d2804fb1b5'
+md5sums=('20b4f488637366c39458b9b93162eff3'
          'da6bea412a5be8cf82a813078fec5847'
          'bfebb75bb94029b48c46b7f1ba1aa811'
          '0673e51af0e81418b4a6c1e205f7e5cd'