[arch-commits] Commit in cloog-ppl/repos (testing-x86_64)

2010-04-21 Thread Allan McRae
Date: Wednesday, April 21, 2010 @ 22:44:31
  Author: allan
Revision: 78359

archrelease: copy trunk to testing-x86_64

Added:
  cloog-ppl/repos/testing-x86_64/



[arch-commits] Commit in cloog-ppl/repos (testing-i686)

2010-04-21 Thread Allan McRae
Date: Wednesday, April 21, 2010 @ 22:43:54
  Author: allan
Revision: 78358

archrelease: copy trunk to testing-i686

Added:
  cloog-ppl/repos/testing-i686/



[arch-commits] Commit in cloog-ppl/trunk (PKGBUILD)

2010-04-21 Thread Allan McRae
Date: Wednesday, April 21, 2010 @ 22:43:20
  Author: allan
Revision: 78357

upgpkg: cloog-ppl 0.15.9-1
upstream update

Modified:
  cloog-ppl/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-21 23:05:10 UTC (rev 78356)
+++ PKGBUILD2010-04-22 02:43:20 UTC (rev 78357)
@@ -3,23 +3,27 @@
 # Contributor: ezzetabi 
 
 pkgname=cloog-ppl
-pkgver=0.15.8
+pkgver=0.15.9
 pkgrel=1
 pkgdesc="Library that generates loops for scanning polyhedra"
 arch=('i686' 'x86_64')
 url="http://www.cloog.org/";
 license=('GPL')
-depends=('ppl>=0.10.2-3')
+depends=('ppl')
 options=('!libtool')
 source=(ftp://gcc.gnu.org/pub/gcc/infrastructure/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b27bc188e3e99dca2923ce9323b8fb63')
+md5sums=('806e001d1b1a6b130069ff6274900af5')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   ./configure --prefix=/usr --infodir=/usr/share/info \
 --with-bits=gmp --with-ppl=/usr 
-  make || return 1
+  make
   make check
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir/ install
 }



[arch-commits] Commit in deluge/repos (extra-x86_64)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 19:05:10
  Author: ibiru
Revision: 78356

archrelease: copy trunk to extra-x86_64

Added:
  deluge/repos/extra-x86_64/



[arch-commits] Commit in deluge/repos (extra-x86_64)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 19:04:51
  Author: ibiru
Revision: 78355

archrelease: remove extra-x86_64

Deleted:
  deluge/repos/extra-x86_64/



[arch-commits] Commit in deluge/repos (extra-i686)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 19:04:33
  Author: ibiru
Revision: 78354

archrelease: copy trunk to extra-i686

Added:
  deluge/repos/extra-i686/



[arch-commits] Commit in deluge/repos (extra-i686)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 19:04:15
  Author: ibiru
Revision: 78353

archrelease: remove extra-i686

Deleted:
  deluge/repos/extra-i686/



[arch-commits] Commit in deluge/trunk (PKGBUILD deluge-web deluged)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 19:03:56
  Author: ibiru
Revision: 78352

upgpkg: deluge 1.2.3-3
revert FS#19047, the logic is plain wrong

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge-web
  deluge/trunk/deluged

+
 PKGBUILD   |6 +++---
 deluge-web |1 -
 deluged|1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-21 16:48:34 UTC (rev 78351)
+++ PKGBUILD2010-04-21 23:03:56 UTC (rev 78352)
@@ -4,7 +4,7 @@
 
 pkgname=deluge
 pkgver=1.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
@@ -18,8 +18,8 @@
 source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web)
 install=deluge.install
 backup=(etc/conf.d/deluged)
-md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'a873e1935688df487e2f5ca5dda1176d'
- '332d23fe0d21ce92b494efd73322856c' '0fdce620e4e6ac0e2205509dc8ce99b0')
+md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'a623a074720135dad49708eca17ba03c'
+ '332d23fe0d21ce92b494efd73322856c' 'de148d12ecee40203f0c5517cdf319a4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: deluge-web
===
--- deluge-web  2010-04-21 16:48:34 UTC (rev 78351)
+++ deluge-web  2010-04-21 23:03:56 UTC (rev 78352)
@@ -11,7 +11,6 @@
   start)
 stat_busy "Starting Deluge WebUI"
 [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web -f" $DELUGE_USER
-sleep 1
 if [ $? -gt 0 ]; then
   stat_fail
 else

Modified: deluged
===
--- deluged 2010-04-21 16:48:34 UTC (rev 78351)
+++ deluged 2010-04-21 23:03:56 UTC (rev 78352)
@@ -11,7 +11,6 @@
   start)
 stat_busy "Starting Deluge Daemon"
 [[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged" $DELUGE_USER
-sleep 1
 if [ $? -gt 0 ]; then
   stat_fail
 else



[arch-commits] Commit in goffice/repos (extra-x86_64)

2010-04-21 Thread Jan de Groot
Date: Wednesday, April 21, 2010 @ 12:48:34
  Author: jgc
Revision: 78351

archrelease: copy trunk to extra-x86_64

Added:
  goffice/repos/extra-x86_64/



[arch-commits] Commit in goffice/repos (extra-x86_64)

2010-04-21 Thread Jan de Groot
Date: Wednesday, April 21, 2010 @ 12:48:28
  Author: jgc
Revision: 78350

archrelease: remove extra-x86_64

Deleted:
  goffice/repos/extra-x86_64/



[arch-commits] Commit in goffice/repos (extra-i686)

2010-04-21 Thread Jan de Groot
Date: Wednesday, April 21, 2010 @ 12:48:20
  Author: jgc
Revision: 78349

archrelease: copy trunk to extra-i686

Added:
  goffice/repos/extra-i686/



[arch-commits] Commit in goffice/repos (extra-i686)

2010-04-21 Thread Jan de Groot
Date: Wednesday, April 21, 2010 @ 12:48:14
  Author: jgc
Revision: 78348

archrelease: remove extra-i686

Deleted:
  goffice/repos/extra-i686/



[arch-commits] Commit in goffice/trunk (PKGBUILD)

2010-04-21 Thread Jan de Groot
Date: Wednesday, April 21, 2010 @ 10:50:15
  Author: jgc
Revision: 78347

Update to 0.8.2 - seems namcap is no longer used:
ATTENTION PACKAGERS: goffice no longer depends on libgnome and libgnomeui.
ATTENTION PACKAGERS: goffice no longer depends on gnome-vfs.
ATTENTION PACKAGERS: please don't ship goffice with equation enabled.

Modified:
  goffice/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-21 14:02:32 UTC (rev 78346)
+++ PKGBUILD2010-04-21 14:50:15 UTC (rev 78347)
@@ -2,24 +2,22 @@
 # Maintainer: Aaron Griffin 
 
 pkgname=goffice
-pkgver=0.8.1
+pkgver=0.8.2
 pkgrel=1
 pkgdesc="A library of document-centric objects and utilities built on top of 
GLib and Gtk+"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org";
 license=('GPL')
-depends=('libgnomeui>=2.24' 'libgsf-gnome>=1.14')
-makedepends=('perlxml' 'pkgconfig' 'intltool')
-optdepends=('libxml2' 'libsm' 'gtk2' 'popt')
 options=('!libtool')
+depends=('gconf' 'libgsf')
+makedepends=('perlxml' 'pkgconfig' 'intltool')
 
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('fdc43c5e04f6ead55bebc034c1d34296')
-sha1sums=('5d9a4dd72b10cc884a0e27f2baab4f90c25d0e72')
+sha256sums=('06d55d419fccd30250bbc8d8930c5221deffa15794858ae0f2ddab85a8e7b138')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-  --localstatedir=/var --disable-static || return 1
+  --localstatedir=/var --disable-static || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
 }



[arch-commits] Commit in tor/repos (extra-x86_64)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 10:02:32
  Author: ibiru
Revision: 78346

archrelease: copy trunk to extra-x86_64

Added:
  tor/repos/extra-x86_64/



[arch-commits] Commit in tor/repos (extra-x86_64)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 10:01:27
  Author: ibiru
Revision: 78345

archrelease: remove extra-x86_64

Deleted:
  tor/repos/extra-x86_64/



[arch-commits] Commit in tor/repos (extra-i686)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 10:00:47
  Author: ibiru
Revision: 78344

archrelease: copy trunk to extra-i686

Added:
  tor/repos/extra-i686/



[arch-commits] Commit in tor/trunk (PKGBUILD tor.install)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 09:59:07
  Author: ibiru
Revision: 78342

upgpkg: tor 0.2.1.25-3
fix inverted condition on removal

Modified:
  tor/trunk/PKGBUILD
  tor/trunk/tor.install

-+
 PKGBUILD|2 +-
 tor.install |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-21 13:50:31 UTC (rev 78341)
+++ PKGBUILD2010-04-21 13:59:07 UTC (rev 78342)
@@ -4,7 +4,7 @@
 
 pkgname=tor
 pkgver=0.2.1.25
-pkgrel=2
+pkgrel=3
 pkgdesc="Anonymizing overlay network"
 arch=('i686' 'x86_64')
 url="http://www.torproject.org/";

Modified: tor.install
===
--- tor.install 2010-04-21 13:50:31 UTC (rev 78341)
+++ tor.install 2010-04-21 13:59:07 UTC (rev 78342)
@@ -14,6 +14,6 @@
 }
 
 pre_remove() {
-  getent passwd tor &>/dev/null || userdel tor &> /dev/null
-  getent group tor &>/dev/null || groupdel tor &> /dev/null
+  getent passwd tor &>/dev/null && userdel tor &> /dev/null
+  getent group tor &>/dev/null && groupdel tor &> /dev/null
 }



[arch-commits] Commit in tor/repos (extra-i686)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 09:59:52
  Author: ibiru
Revision: 78343

archrelease: remove extra-i686

Deleted:
  tor/repos/extra-i686/



[arch-commits] Commit in deluge/repos (extra-x86_64)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 09:50:31
  Author: ibiru
Revision: 78341

archrelease: copy trunk to extra-x86_64

Added:
  deluge/repos/extra-x86_64/



[arch-commits] Commit in deluge/repos (extra-x86_64)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 09:50:14
  Author: ibiru
Revision: 78340

archrelease: remove extra-x86_64

Deleted:
  deluge/repos/extra-x86_64/



[arch-commits] Commit in deluge/repos (extra-i686)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 09:49:59
  Author: ibiru
Revision: 78339

archrelease: copy trunk to extra-i686

Added:
  deluge/repos/extra-i686/



[arch-commits] Commit in deluge/repos (extra-i686)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 09:46:56
  Author: ibiru
Revision: 78338

archrelease: remove extra-i686

Deleted:
  deluge/repos/extra-i686/



[arch-commits] Commit in deluge/trunk (PKGBUILD deluge-web deluge.install deluged)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 09:45:04
  Author: ibiru
Revision: 78337

upgpkg: deluge 1.2.3-2
check if we have a stalled process, changed the default shell from bin/bash to 
/bin/false, fixes FS#19193,FS#19191 and FS#19047

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge-web
  deluge/trunk/deluge.install
  deluge/trunk/deluged

+
 PKGBUILD   |6 +++---
 deluge-web |6 --
 deluge.install |6 +-
 deluged|6 --
 4 files changed, 16 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-21 12:48:29 UTC (rev 78336)
+++ PKGBUILD2010-04-21 13:45:04 UTC (rev 78337)
@@ -4,7 +4,7 @@
 
 pkgname=deluge
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A bittorrent client written with python and pygtk"
 arch=('i686' 'x86_64')
 url="http://deluge-torrent.org/";
@@ -18,8 +18,8 @@
 source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d deluge-web)
 install=deluge.install
 backup=(etc/conf.d/deluged)
-md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'e187f10be1f4a445ae1bc76693a16e8a'
- '332d23fe0d21ce92b494efd73322856c' '25a4c2b62e0e00427dd72247c0da1617')
+md5sums=('f1dbc8734c1881b115b98f572e523a4d' 'a873e1935688df487e2f5ca5dda1176d'
+ '332d23fe0d21ce92b494efd73322856c' '0fdce620e4e6ac0e2205509dc8ce99b0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: deluge-web
===
--- deluge-web  2010-04-21 12:48:29 UTC (rev 78336)
+++ deluge-web  2010-04-21 13:45:04 UTC (rev 78337)
@@ -4,12 +4,14 @@
 . /etc/rc.d/functions
 . /etc/conf.d/deluged
 
-[[ -f /var/run/deluge-web.pid ]] && PID=`cat /var/run/deluge-web.pid`
+[[ -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 -c "/usr/bin/deluge-web -f" $DELUGE_USER
+[[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web -f" $DELUGE_USER
+sleep 1
 if [ $? -gt 0 ]; then
   stat_fail
 else

Modified: deluge.install
===
--- deluge.install  2010-04-21 12:48:29 UTC (rev 78336)
+++ deluge.install  2010-04-21 13:45:04 UTC (rev 78337)
@@ -1,6 +1,10 @@
 post_install() {
   getent group deluge >/dev/null 2>&1 || usr/sbin/groupadd -g 125 deluge
-  getent passwd deluge >/dev/null 2>&1 || usr/sbin/useradd -c 'Deluge user' -u 
125 -g deluge -d /srv/deluge -s /bin/bash 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 -R

Modified: deluged
===
--- deluged 2010-04-21 12:48:29 UTC (rev 78336)
+++ deluged 2010-04-21 13:45:04 UTC (rev 78337)
@@ -4,12 +4,14 @@
 . /etc/rc.d/functions
 . /etc/conf.d/deluged
 
-[[ -f /var/run/deluged.pid ]] && PID=`cat /var/run/deluged.pid`
+[[ -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 -c "/usr/bin/deluged" $DELUGE_USER
+[[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluged" $DELUGE_USER
+sleep 1
 if [ $? -gt 0 ]; then
   stat_fail
 else



[arch-commits] Commit in at-spi/repos (extra-x86_64)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 08:48:29
  Author: ibiru
Revision: 78336

archrelease: copy trunk to extra-x86_64

Added:
  at-spi/repos/extra-x86_64/



[arch-commits] Commit in at-spi/repos (extra-x86_64)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 08:48:13
  Author: ibiru
Revision: 78335

archrelease: remove extra-x86_64

Deleted:
  at-spi/repos/extra-x86_64/



[arch-commits] Commit in at-spi/repos (extra-i686)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 08:48:05
  Author: ibiru
Revision: 78334

archrelease: copy trunk to extra-i686

Added:
  at-spi/repos/extra-i686/



[arch-commits] Commit in at-spi/repos (extra-i686)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 08:47:48
  Author: ibiru
Revision: 78333

archrelease: remove extra-i686

Deleted:
  at-spi/repos/extra-i686/



[arch-commits] Commit in at-spi/trunk (PKGBUILD at-spi.install)

2010-04-21 Thread Ionut Biru
Date: Wednesday, April 21, 2010 @ 08:47:32
  Author: ibiru
Revision: 78332

upgpkg: at-spi 1.30.0-2
implement install gconf schema

Added:
  at-spi/trunk/at-spi.install
Modified:
  at-spi/trunk/PKGBUILD

+
 PKGBUILD   |   13 +
 at-spi.install |   17 +
 2 files changed, 26 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-21 10:48:02 UTC (rev 78331)
+++ PKGBUILD2010-04-21 12:47:32 UTC (rev 78332)
@@ -3,14 +3,15 @@
 
 pkgname=at-spi
 pkgver=1.30.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Assistive Technology Service Provider Interface"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libbonobo>=2.24.2' 'libxtst' 'gtk2>=2.20.0' 'gconf>=2.28.0')
+depends=('libbonobo>=2.24.2' 'libxtst' 'gtk2>=2.20.0' 'gconf>=2.28.1')
 makedepends=('pkgconfig' 'python' 'intltool')
-options=('!libtool')
+options=('!libtool' '!emptydirs')
 url="http://www.gnome.org";
+install=at-spi.install
 
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.30/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('b3119a6ffcdc8aa18244e964bb4acdf23c13e1815153dc85c69ba0567b68bddb')
 
@@ -20,5 +21,9 @@
   --localstatedir=/var --disable-static \
   --libexecdir=/usr/lib/at-spi || return 1
   make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || 
return 1
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" 
--domain at-spi ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Added: at-spi.install
===
--- at-spi.install  (rev 0)
+++ at-spi.install  2010-04-21 12:47:32 UTC (rev 78332)
@@ -0,0 +1,17 @@
+pkgname=at-spi
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}



[arch-commits] Commit in glib2/repos (gnome-unstable-i686 gnome-unstable-x86_64)

2010-04-21 Thread Jan de Groot
Date: Wednesday, April 21, 2010 @ 06:48:02
  Author: jgc
Revision: 78331

Remove gnome-unstable stuff

Deleted:
  glib2/repos/gnome-unstable-i686/
  glib2/repos/gnome-unstable-x86_64/



[arch-commits] Commit in gstreamer0.10-good/trunk (PKGBUILD)

2010-04-21 Thread Jan de Groot
Date: Wednesday, April 21, 2010 @ 06:32:39
  Author: jgc
Revision: 78330

Disable hal. Remove imlib2 dependency, I cannot find any reference to this in 
upstream sources

Modified:
  gstreamer0.10-good/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-20 22:15:30 UTC (rev 78329)
+++ PKGBUILD2010-04-21 10:32:39 UTC (rev 78330)
@@ -7,7 +7,7 @@
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.28' 
'libavc1394>=0.5.3-3' 'hal>=0.5.14' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 
'libshout>=2.2.2' 'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.0' 
'wavpack>=4.50.1' 'taglib>=1.5' 'libsoup-gnome>=2.28.2' 'libv4l>=0.6.0' 
'libcaca>=0.99.beta16' 'bzip2' 'gtk2>=2.18.6' 'imlib2>=1.4.2-4')
+makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.28' 
'libavc1394>=0.5.3-3' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 'libshout>=2.2.2' 
'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.0' 'wavpack>=4.50.1' 
'taglib>=1.5' 'libsoup-gnome>=2.28.2' 'libv4l>=0.6.0' 'libcaca>=0.99.beta16' 
'bzip2' 'gtk2>=2.18.6')
 url="http://gstreamer.freedesktop.org/";
 options=(!libtool !emptydirs)
 source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2
@@ -21,6 +21,7 @@
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 --disable-static --enable-experimental \
 --disable-schemas-install \
+--disable-hal \
 --with-package-name="GStreamer Good Plugins (Archlinux)" \
 --with-package-origin="http://www.archlinux.org/"; || return 1
 
@@ -39,11 +40,11 @@
 }
 
 package_gstreamer0.10-good-plugins() {
-  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394>=0.5.3-3' 'hal>=0.5.13' 
'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 'libshout>=2.2.2' 'libdv>=1.0.0' 
'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.0' 'wavpack>=4.50.1' 'taglib>=1.5' 
'libsoup-gnome>=2.28.0' 'libv4l>=0.6.0' 'libcaca>=0.99.beta16' 'libpng>=1.4.0' 
'libjpeg>=8' 'imlib2>=1.4.2-4')
+  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394>=0.5.3-3' 
'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 'libshout>=2.2.2' 'libdv>=1.0.0' 
'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.0' 'wavpack>=4.50.1' 'taglib>=1.5' 
'libsoup-gnome>=2.28.0' 'libv4l>=0.6.0' 'libcaca>=0.99.beta16' 'libpng>=1.4.0' 
'libjpeg>=8')
   pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)"
   groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 
'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 
'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 
'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 
'gstreamer0.10-hal' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 
'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 
'gstreamer0.10-dv' 'gstreamer0.10-soup')
-  conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 
'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 
'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 
'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 
'gstreamer0.10-hal' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 
'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 
'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup')
+  replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 
'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 
'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 
'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 
'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 
'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 
'gstreamer0.10-soup')
+  conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 
'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 
'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 
'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 
'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 
'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 
'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup')
   install=gstreamer0.10-good-plugins.install
 
   cd "${srcdir}/gst-plugins-good-${pkgver}"