Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD into linhes-config-python

* 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD:
  lirc: pkg bump to just make it different then the submitted version in the ticket.
  lirc: change modmce patch to version 1.5
  glass-wide: adding theme
  irqbalance:  adding pkg
  fakeroot: add package
  linhes-scripts:  adding idle.sh
  Bumped xbmc-svn to 20449 plus added common remote support
  fresh build
  bumped mythtv-svn to 20586
  First cut at XBMC (svn with vdpau)
  updated libjpeg and added libsamplerate for XBMC build
  mythtv-svn bumped for new qt4
  qt updated to 4.5.1
  which: pkg bump used for testing, no functional changes.
  Bumped version to recompile.
  Bumped version for birthday present to community.

Conflicts:
	abs/core-testing/LinHES-config/PKGBUILD

45 files changed, 812 insertions, 100 deletions

diff --git a/abs/core-testing/LinHES-config/LinHES-release b/abs/core-testing/LinHES-config/LinHES-release
index ecc4a3e..5a2be61 100644
--- a/abs/core-testing/LinHES-config/LinHES-release
+++ b/abs/core-testing/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R6.00.07 (Scale preview)
+LinHES R6.00.08 (My Gift)
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 0fc6ae9..a658e7e 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=1.0
-pkgrel=419
+pkgrel=420
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted )
diff --git a/abs/core-testing/libjpeg/PKGBUILD b/abs/core-testing/libjpeg/PKGBUILD
index 807f7f5..baedcd4 100644
--- a/abs/core-testing/libjpeg/PKGBUILD
+++ b/abs/core-testing/libjpeg/PKGBUILD
@@ -1,21 +1,28 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id$
+# Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
+
 pkgname=libjpeg
 pkgver=6b
-pkgrel=4
+pkgrel=6
 pkgdesc="Library of JPEG support functions"
 arch=('i686' 'x86_64')
+url="http://www.ijg.org/"
+license=('custom')
 depends=('glibc')
+makedepends=('libtool')
+options=(!libtool)
 source=(ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v$pkgver.tar.gz)
 md5sums=('dbd5f3b47ed13132f04c685d608a7547')
 
 build() {
-  cd $startdir/src/jpeg-$pkgver
+  cd $srcdir/jpeg-$pkgver
+  cp /usr/share/libtool/config/config.{guess,sub} .
+  sed -i "s#./libtool#libtool#" configure
   ./configure --prefix=/usr --enable-shared --enable-static
   make || return 1
-  mkdir -p $startdir/pkg/usr/{bin,lib,include,man/man1}
-  make prefix=$startdir/pkg/usr install
-
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  mkdir -p $pkgdir/usr/{bin,lib,include,share/man/man1}
+  make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man/man1 install
+  install -m644 jpegint.h $pkgdir/usr/include
+  install -Dm644 README $pkgdir/usr/share/licenses/libjpeg/README
 }
diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index 42cbb05..c1108cc 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=11
+pkgrel=13
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -14,7 +14,7 @@ source=(ftp://ftp.knoppmyth.net/R6/sources/linhes-scripts.tar.bz2)
 build() {
   cd $startdir/src/
   mkdir -p $startdir/pkg/usr/LH/bin
-  cp imp* myth* shoo* pau*sh mplayer* vdpau* screen* mplayer* $startdir/pkg/usr/LH/bin
+  cp idle.sh imp* myth* shoo* pau*sh mplayer* vdpau* screen* mplayer* $startdir/pkg/usr/LH/bin
   mkdir -p $startdir/pkg/etc/sv/pause-mythcommflag/supervise
   cp run $startdir/pkg/etc/sv/pause-mythcommflag/
   mkdir -p $startdir/pkg/etc/logrotate.d/
diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD
index de4633e..285afcc 100644
--- a/abs/core-testing/lirc/PKGBUILD
+++ b/abs/core-testing/lirc/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=lirc
 pkgver=0.8.5CVS
-pkgrel=6
+pkgrel=10
 _kernver=2.6.28-LinHES
 pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
 arch=(i686 x86_64)
@@ -18,7 +18,7 @@ source=(http://www.blushingpenguin.com/mark/lmilk/lirc-0.8.5-CVS-pvr150.tar.bz2
 	kernel-2.6.26.patch
 	kernel-2.6.27.patch
 	lirc_atiusb.patch
-	http://superb-east.dl.sourceforge.net/sourceforge/mod-mce/lirc_mod_mce-0.2.0.tar.bz2
+	http://superb-east.dl.sourceforge.net/sourceforge/mod-mce/lirc_mod_mce-0.1.5.tar.bz2
 	lirc_mod_mce.patch
 	hw_commandir.c
 	hw_commandir.h)
@@ -66,8 +66,11 @@ build() {
 	rm $startdir/pkg/lib/modules/$_kernver/kernel/drivers/misc/commandir.ko
 
 }
-md5sums=('8f3ba7eb57529992f3991d6981a3feb6'
+md5sums=('b96dae91b566143b3af433fa2714ec9a'
          '1753acd774f50b638e6173d364de53fd'
          '6f151eb4e81fc7776a06c9063e6ad9a5'
-	 '563f992342df81317fe4ae2b1157cc5e'
-	 'a966b297a0768386f845348f736c6db3')
+         '7eccd7826ab99e5cf1b9154171c8b927'
+         '21ce358809105f005e888e3b138c59e6'
+         '5e6c3e8586ce7abdcbf881c1a4939d44'
+         'f059f4030afc682c9539a03bf837c1cf'
+         '4e698654cc44fc6c4163814acda5a7ee')
diff --git a/abs/core-testing/lirc/lirc_mod_mce.patch b/abs/core-testing/lirc/lirc_mod_mce.patch
index 0d07995..c794961 100644
--- a/abs/core-testing/lirc/lirc_mod_mce.patch
+++ b/abs/core-testing/lirc/lirc_mod_mce.patch
@@ -1,7 +1,7 @@
-diff -ruaN lirc_mod_mce.orig/lirc_mod_mce.c lirc_mod_mce/lirc_mod_mce.c
---- lirc_mod_mce.orig/lirc_mod_mce.c	2008-04-26 08:42:47.000000000 +0000
-+++ lirc_mod_mce/lirc_mod_mce.c	2009-02-27 08:50:31.000000000 +0000
-@@ -1298,7 +1298,7 @@
+diff -Naru lirc_mod_mce.orig/lirc_mod_mce.c lirc_mod_mce/lirc_mod_mce.c
+--- lirc_mod_mce.orig/lirc_mod_mce.c	2008-04-18 02:12:28.000000000 +0930
++++ lirc_mod_mce/lirc_mod_mce.c	2009-05-11 22:10:39.000000000 +0930
+@@ -1108,7 +1108,7 @@
      input_dev->name = ir->name;
      input_dev->phys = ir->phys;
      usb_to_input_id(dev, &input_dev->id);
diff --git a/abs/core-testing/mythtv/stable/glass-wide/PKGBUILD b/abs/core-testing/mythtv/stable/glass-wide/PKGBUILD
new file mode 100644
index 0000000..2d0cb11
--- /dev/null
+++ b/abs/core-testing/mythtv/stable/glass-wide/PKGBUILD
@@ -0,0 +1,15 @@
+pkgname=glass-wide
+pkgver=1
+pkgrel=1
+pkgdesc="glass-wide theme for mythtv .21 ."
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="unkown"
+source="http://iw.net/~brfransen/myth/glass-wide.tar.gz"
+
+build() {
+  cd $startdir/src/
+  mkdir -p $startdir/pkg/usr/share/mythtv/themes
+  cp -a glass-wide $startdir/pkg/usr/share/mythtv/themes
+  rm -rf $startdir/pkg/usr/shar/mythtv/themes/.DS_Store
+}
diff --git a/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD b/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
index 1117ef7..4e920a7 100644
--- a/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=morethemes-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Additional themes for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mp_all.sh b/abs/core-testing/mythtv/trunk/mp_all.sh
index 6562fc8..aa95719 100755
--- a/abs/core-testing/mythtv/trunk/mp_all.sh
+++ b/abs/core-testing/mythtv/trunk/mp_all.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-_svnver=20414
+_svnver=20586
 
 # NOTE: Make sure to build and install mythtv first BEFORE building anything else
 buildlist=('mythtv' 'mytharchive' 'mythbrowser' 'mythflix' 'mythgallery' 'mythgame' 'mythmovies' 'mythmusic' 'mythnews' 'mythvideo' 'mythweather' 'mythzoneminder' 'mythweb' 'myththemes' 'morethemes')
diff --git a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
index 107e551..d4967a7 100644
--- a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mytharchive-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD b/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
index c00c9a2..8152586 100644
--- a/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythbrowser-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Mini web browser for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD b/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
index 20a7831..d5ed49f 100644
--- a/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythflix-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Netflix access plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
index 8af88f9..d849c09 100644
--- a/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythgallery-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Image gallery plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
index 4cb12ed..e2431b8 100644
--- a/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythgame-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Emulation plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
index 75d2b7f..846dc17 100644
--- a/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythmovies-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Displays information about movies playing in the area."
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
index b00c40b..9af2e84 100644
--- a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythmusic-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Music playing plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD b/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
index 99200d0..33c7b02 100644
--- a/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythnews-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="News checking plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD b/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
index 16b09bb..f20a50e 100755
--- a/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=myththemes-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Themes for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
index 3fb2082..b2b943e 100755
--- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv-svn
-pkgver=20414
-pkgrel=3
+pkgver=20586
+pkgrel=1
 pkgdesc="A personal video recorder for Linux"
 url="http://www.mythtv.org"
 license="GPL"
diff --git a/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD b/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
index 9b1e6e8..a8598c1 100644
--- a/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythvideo-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Video playback and browsing plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
index 95e42ae..c4beb8c 100644
--- a/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythweather-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Weather checking plugin for MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
index 4f7f3ab..533e4f4 100644
--- a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythweb-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Web interface for MythTV's backend"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD b/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
index bdd4c3f..398253e 100644
--- a/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
+++ b/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mythzoneminder-svn
-pkgver=20414
+pkgver=20586
 pkgrel=1
 pkgdesc="Integrates ZoneMinder into MythTV"
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/qt/PKGBUILD b/abs/core-testing/qt/PKGBUILD
index a06b7e0..b581564 100644
--- a/abs/core-testing/qt/PKGBUILD
+++ b/abs/core-testing/qt/PKGBUILD
@@ -1,31 +1,34 @@
-# $Id: PKGBUILD 18501 2008-11-06 12:11:46Z pierre $
+# $Id$
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qt
-pkgver=4.4.3
+pkgver=4.5.1
 pkgrel=2
-_qtcopyver=880178
-pkgdesc="The QT gui toolkit."
+_qtcopyver=958581
+pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
-url="http://www.trolltech.com/products/qt"
-license=('GPL3')
-options=('!libtool' '!docs')
-depends=('libpng' 'libxi' 'mesa' 'fontconfig' 'libxrandr' 'glib2' 'libtiff' 'libmng' 'sqlite3' 'dbus' 'libxcursor' 'libxinerama')
+url='http://www.qtsoftware.com/'
+license=('GPL3' 'LGPL')
+depends=('libpng' 'mesa' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama' 'libxrender')
 optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
 makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'libxfixes')
 provides=("qt4=${pkgver}")
 replaces=('qt4')
 conflicts=('qt4')
-_pkgfqn=qt-x11-opensource-src-$pkgver
-# svn export -r -${_qtcopyver} svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches/ qt-copy-patches-${_qtcopyver}
-source=("ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.bz2"
+options=('!libtool')
+_pkgfqn="qt-x11-opensource-src-${pkgver}"
+# svn export -r${_qtcopyver} svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches/ qt-copy-patches-${_qtcopyver}
+source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.bz2"
         "ftp://ftp.archlinux.org/other/qt/qt-copy-patches-${_qtcopyver}.tar.bz2"
-        'qt4-assistant.desktop' 'qt4-designer.desktop' 'qt4-linguist.desktop')
-md5sums=('00e00c6324d342a7b0d8653112b4f08c'
-         'd3a40d783528a86174b62ecfc136b031'
-         'c95e1697bf2b923199c3b8cd7d485a17'
-         '00333dca87e24767383217ba378b5980'
-         '71f7ac8206c19da7ecf71cdb391f0452')
+        'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
+        'qdoc3.patch')
+md5sums=('afc43e566341cf3e5ed0bcb974f0c3b2'
+         'b57b08ac7f990f91b85a7b1b1106e36b'
+         'b352b4b70faba2571af3fce5d119580a'
+         '491a96682faa03407f768a53cca71db5'
+         'cda7ed7e132689991dc2968a0043b4b0'
+         '717669b728a0a795217d2f52969e454c'
+         '868056a3edab09fbac0f82ec8b4a4be3')
 
 build() {
 	unset QMAKESPEC
@@ -39,58 +42,41 @@ build() {
 		patch -p0 -i $i || return 1
 	done
 
-	# remove unwanted mkspecs
-	cd mkspecs/
-	find . -maxdepth 1 -regextype posix-egrep -type d ! -regex "./linux.*|./common|./features|./qws" -exec rm -rf "{}" \;
-	cd qws
-	find . -maxdepth 1 -regextype posix-egrep -type d ! -regex "./linux.*" -exec rm -rf "{}" \;
-	cd ../../
+	patch -p1 -i $srcdir/qdoc3.patch
 
-	sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
 	sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
-	# fix postgres build
-	sed -e '/pg_config --libs/d' -i configure
-	# do not compile demos, examples and docs
-	sed -i 's|CFG_NOBUILD_PARTS=""|CFG_NOBUILD_PARTS="demos examples docs"|' configure
 
-	./configure -confirm-license \
+	./configure -confirm-license -opensource \
+		-silent \
 		-prefix /usr \
-		-docdir /usr/share/doc/qt \
+		-sysconfdir /etc \
 		-plugindir /usr/lib/qt/plugins \
-		-datadir /usr/share/qt \
 		-translationdir /usr/share/qt/translations \
-		-sysconfdir /etc \
+		-datadir /usr/share/qt \
+		-docdir /usr/share/doc/qt \
 		-examplesdir /usr/share/doc/qt/examples \
 		-demosdir /usr/share/doc/qt/demos \
-		-no-exceptions \
+		-no-separate-debug-info \
 		-plugin-sql-{psql,mysql,sqlite,odbc} \
 		-system-sqlite \
-		-no-phonon \
-		-dbus-linked \
-		-webkit \
-		-no-separate-debug-info \
+		-openssl-linked \
+		-nomake demos \
 		-nomake examples \
 		-nomake docs \
-		-nomake demos \
-		-assistant-webkit \
-		-system-libpng \
-		-system-libjpeg \
-		-system-zlib \
-		-openssl-linked \
-		-reduce-relocations \
-		-xinerama \
-		-xcursor \
-		-xfixes \
-		-optimized-qmake || return 1
+		-no-phonon \
+		-optimized-qmake \
+		-reduce-relocations
 
-	make || return 1
-	make INSTALL_ROOT=$pkgdir install || return 1
+	make
+	make INSTALL_ROOT=$pkgdir install
 
 	install -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/pixmaps/assistant.png
 	install -D -m644 tools/linguist/linguist/images/appicon.png ${pkgdir}/usr/share/pixmaps/linguist.png
 	install -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/pixmaps/designer.png
+	install -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/pixmaps/qtlogo.png
 	install -d ${pkgdir}/usr/share/applications
-	install -m644 ${srcdir}/qt4-{linguist,designer,assistant}.desktop ${pkgdir}/usr/share/applications/
+	install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/
+	install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
 
 	# cleanup and path fixes
 	find $pkgdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
diff --git a/abs/core-testing/qt/qt4-assistant.desktop b/abs/core-testing/qt/assistant.desktop
index 5d64aba..48105b9 100644
--- a/abs/core-testing/qt/qt4-assistant.desktop
+++ b/abs/core-testing/qt/assistant.desktop
@@ -1,9 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Exec=/usr/bin/assistant
-Name=Qt 4 Assistant
-GenericName=Qt4 Document Browser
-X-KDE-StartupNotify=true
+Name=Qt Assistant
+GenericName=Qt Document Browser
 Icon=/usr/share/pixmaps/assistant.png
 Terminal=false
 Type=Application
diff --git a/abs/core-testing/qt/qt4-designer.desktop b/abs/core-testing/qt/designer.desktop
index f4f91e8..fefe095 100644
--- a/abs/core-testing/qt/qt4-designer.desktop
+++ b/abs/core-testing/qt/designer.desktop
@@ -1,9 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Exec=/usr/bin/designer
-Name=Qt 4 Designer
+Name=Qt Designer
 GenericName=Interface Designer
-X-KDE-StartupNotify=true
 MimeType=application/x-designer
 Icon=/usr/share/pixmaps/designer.png
 Terminal=false
diff --git a/abs/core-testing/qt/qt4-linguist.desktop b/abs/core-testing/qt/linguist.desktop
index fee679e..04519bf 100644
--- a/abs/core-testing/qt/qt4-linguist.desktop
+++ b/abs/core-testing/qt/linguist.desktop
@@ -1,9 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Exec=/usr/bin/linguist
-Name=Qt 4 Linguist
+Name=Qt Linguist
 GenericName=Translation Tool
-X-KDE-StartupNotify=true
 MimeType=application/x-linguist
 Terminal=false
 Type=Application
diff --git a/abs/core-testing/qt/qdoc3.patch b/abs/core-testing/qt/qdoc3.patch
new file mode 100644
index 0000000..38ae735
--- /dev/null
+++ b/abs/core-testing/qt/qdoc3.patch
@@ -0,0 +1,22 @@
+diff -up qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro
+--- qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3	2009-02-25 15:09:26.000000000 -0600
++++ qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro	2009-03-04 09:30:05.000000000 -0600
+@@ -106,3 +106,7 @@ win32 {
+         QT_WINCONFIG = debug
+     }    
+ }
++
++TARGET= qdoc3
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
+diff -up qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/tools.pro
+--- qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3	2009-02-25 15:09:27.000000000 -0600
++++ qt-x11-opensource-src-4.5.0/tools/tools.pro	2009-03-04 09:44:18.000000000 -0600
+@@ -13,6 +13,7 @@ no-png {
+          SUBDIRS += designer
+      }
+      SUBDIRS     += linguist
++     SUBDIRS     += qdoc3
+      wince*: SUBDIRS = qtestlib designer
+      unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+      win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
diff --git a/abs/core-testing/qt/qtconfig.desktop b/abs/core-testing/qt/qtconfig.desktop
new file mode 100644
index 0000000..633d921
--- /dev/null
+++ b/abs/core-testing/qt/qtconfig.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Qt Config 
+Comment=Configure Qt behavior, styles, fonts
+Exec=/usr/bin/qtconfig
+Icon=/usr/share/pixmaps/qtlogo
+Terminal=false
+Type=Application
+Categories=Qt;Settings;
diff --git a/abs/core-testing/which/PKGBUILD b/abs/core-testing/which/PKGBUILD
index 065c870..41e0b60 100644
--- a/abs/core-testing/which/PKGBUILD
+++ b/abs/core-testing/which/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=which
 pkgver=2.20
-pkgrel=1
+pkgrel=10
 pkgdesc="A utility to show the full path of commands"
 arch=('i686' 'x86_64')
 url="http://www.xs4all.nl/~carlo17/which"
diff --git a/abs/extra-testing/community/xbmc-svn/CHANGELOG b/abs/extra-testing/community/xbmc-svn/CHANGELOG
new file mode 100644
index 0000000..170990b
--- /dev/null
+++ b/abs/extra-testing/community/xbmc-svn/CHANGELOG
@@ -0,0 +1,76 @@
+xbmc-svn Change log:
+--------------------
+
+19th May 2009
+20449-1 richy: 1. Removed the autoreconf line as it didn't seem to help
+               2. Added !makeflags
+               3. Rev push :-)
+
+16th May 2009
+20343-1 richy: 1. added python as a depenency and removed x-server (namcap advised),
+               2. added autoreconf to goom before aclocal - another pot-shot at the goom compile prob.
+               3. added flax and bison to makedepends - I thought they were implicitely provided, but
+                    some users didn't have them.
+               4. Rev push to 20343
+               5. Removed the --quiet flag form SVN for now as sourcforge was timing out and
+                    failing silently.
+ 
+               Note: namcap advised a number of other changes which I ignored for now.
+
+15th May 2009
+20231-3 - haggy: added libsamplerate as a dependency, it is needed for the recent smoothvideo patches
+
+14th May 2009
+20231-2 - haggy: another shot in the dark to fix that damn goom compilation error
+
+13th May 2009
+20231 - haggy: smoothvideo!
+
+12th May 2009
+20172 - haggy: a shot in the dark: try another autoreconf inside goom and see if it helps.
+
+11th May 2009
+20149 - haggy: pushed rev, removed 'hitting-o-breaks...'-patch - it got fixed in svn
+
+9th May 2009
+20101 - haggy: an updated PM3 skin made it into xbmc. added conflicts hint to this PKGBUILD
+
+8th May 2009
+20059 - haggy: minor push past 9.04, removed copying the source tree to a build tree which wastes space,
+               takes ages and stresses the hdd for no reason. instead we now use svn to revert to a 
+               clean build dir.
+
+5th May 2009
+19941 - rich: heaps more tickets closed, Mexican translation
+
+30th April 2009
+19841 - haggy: lots of closed tickets worth a release, removed xsession patch
+
+27th April 2009
+19753 - haggy: added patch for xsession file breaking installation into fakeroot.
+
+22nd April 2009
+19602 - richy: version bump to address problem with python scripts and plugins
+
+20th April 2009
+19550 - haggy: pushed rev, some .mov fixes and better i18n in xbmc
+
+17th April 2009
+19517 - haggy: pushed rev, re-added installfile
+19516-2- richy: Added back autoreconf -vif in libdvdcss - still required for some folk (me)
+19516 - haggy: pushed rev, moved patches to patchfiles, added 'safe fullscreen patch', several cleanups
+
+15th April 2009
+19484 - haggy: pushed rev, re-enabled MAKEFLAGS to allow a more streamlined package
+
+14th April 2009
+19463 - haggy: added install file 
+19463 - richy: moved _svn* back inside build() on Haggy's suggestion. Let's try and avoid broken releases!
+19463 - richy: makedepends 'subversion' instead of 'svn' because that's what's in the guidelines
+19463 - richy: changed licens from ('GPL' 'custom') to ('GPL', 'LGPL') - See: http://xbmc.org/about/
+
+13th April 2009 - initial upload to AUR, tested on 32bit and 64bit.
+19444 - richy: Moved _svn* outside of build so that users get the latest SVN.
+19444 - richy: Added a symlink for XBMCtex to usr/bin/XBMCtex
+19444 - richy: Moved libcdio into depends from opt-depends - right now it is a dependency.
+
diff --git a/abs/extra-testing/community/xbmc-svn/Lircmap.xml b/abs/extra-testing/community/xbmc-svn/Lircmap.xml
new file mode 100644
index 0000000..600567f
--- /dev/null
+++ b/abs/extra-testing/community/xbmc-svn/Lircmap.xml
@@ -0,0 +1,233 @@
+<!-- This file contains the mapping of LIRC keys to XBMC keys used in Keymap.xml  -->
+<!--                                                                              -->
+<!-- How to add remotes                                                           -->
+<!-- <remote device="name_Lirc_calls_the_remote">                                 -->
+<!--                                                                              -->
+<!-- For the commands the layout following layout is used                         -->
+<!-- <XBMC_COMMAND>LircButtonName</XBMC_COMMAND>                                  -->
+<!--                                                                              -->
+<!-- For a list of XBMC_COMMAND's check out the <remote> sections of keymap.xml   -->
+
+<lircmap>
+	<remote device="mceusb">
+		<pause>Pause</pause>
+		<stop>Stop</stop>
+		<forward>Forward</forward>
+		<reverse>Rewind</reverse>
+		<left>Left</left>
+		<right>Right</right>
+		<up>Up</up>
+		<down>Down</down>
+		<select>OK</select>
+		<pageplus>ChanUp</pageplus>
+		<pageminus>ChanDown</pageminus>
+		<back>Back</back>
+		<menu>PreviousMenu</menu>
+		<title>Play</title>
+		<info>More</info>
+		<skipplus>Skip</skipplus>
+		<skipminus>Replay</skipminus>
+		<display>Teletext</display>
+		<start>Home</start>
+		<record>Record</record>
+		<volumeplus>VolUp</volumeplus>
+		<volumeminus>VolDown</volumeminus>
+		<mute>Mute</mute>
+		<power>Power</power>
+		<myvideo>Videos</myvideo>
+		<mymusic>Music</mymusic>
+		<mypictures>Pictures</mypictures>
+		<mytv>TV</mytv>
+		<one>One</one>
+		<two>Two</two>
+		<three>Three</three>
+		<four>Four</four>
+		<five>Five</five>
+		<six>Six</six>
+		<seven>Seven</seven>
+		<eight>Eight</eight>
+		<nine>Nine</nine>
+		<zero>Zero</zero>
+		<mytv>Red</mytv>
+		<mymusic>Green</mymusic>
+		<mypictures>Yellow</mypictures>
+		<myvideo>Blue</myvideo>
+	</remote>
+	
+	<remote device="mceusb2">
+		<pause>Pause</pause>
+		<stop>Stop</stop>
+		<forward>Forward</forward>
+		<reverse>Rewind</reverse>
+		<left>Left</left>
+		<right>Right</right>
+		<up>Up</up>
+		<down>Down</down>
+		<select>OK</select>
+		<pageplus>ChanUp</pageplus>
+		<pageminus>ChanDown</pageminus>
+		<back>Back</back>
+		<menu>PreviousMenu</menu>
+		<title>Play</title>
+		<info>More</info>
+		<skipplus>Skip</skipplus>
+		<skipminus>Replay</skipminus>
+		<display>Teletext</display>
+		<start>Home</start>
+		<record>Record</record>
+		<volumeplus>VolUp</volumeplus>
+		<volumeminus>VolDown</volumeminus>
+		<mute>Mute</mute>
+		<power>Power</power>
+		<myvideo>Videos</myvideo>
+		<mymusic>Music</mymusic>
+		<mypictures>Pictures</mypictures>
+		<mytv>TV</mytv>
+		<one>One</one>
+		<two>Two</two>
+		<three>Three</three>
+		<four>Four</four>
+		<five>Five</five>
+		<six>Six</six>
+		<seven>Seven</seven>
+		<eight>Eight</eight>
+		<nine>Nine</nine>
+		<zero>Zero</zero>
+		<mytv>Red</mytv>
+		<mymusic>Green</mymusic>
+		<mypictures>Yellow</mypictures>
+		<myvideo>Blue</myvideo>
+	</remote>
+	
+	<remote device="XboxDVDDongle">
+		<play>PLAY</play>
+		<pause>PAUSE</pause>
+		<stop>STOP</stop>
+		<forward>FORWARD</forward>
+		<reverse>REVERSE</reverse>
+		<left>LEFT</left>
+		<right>RIGHT</right>
+		<up>UP</up>
+		<down>DOWN</down>
+		<select>SELECT</select>
+		<back>BACK</back>
+		<menu>MENU</menu>
+		<title>TITLE</title>
+		<info>INFO</info>
+		<skipplus>SKIP+</skipplus>
+		<skipminus>SKIP-</skipminus>
+		<display>DISPLAY</display>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+
+	<remote device="Microsoft_Xbox">
+		<play>PLAY</play>
+		<pause>PAUSE</pause>
+		<stop>STOP</stop>
+		<forward>FORWARD</forward>
+		<reverse>REVERSE</reverse>
+		<left>LEFT</left>
+		<right>RIGHT</right>
+		<up>UP</up>
+		<down>DOWN</down>
+		<select>SELECT</select>
+		<back>BACK</back>
+		<menu>MENU</menu>
+		<title>TITLE</title>
+		<info>INFO</info>
+		<skipplus>SKIP+</skipplus>
+		<skipminus>SKIP-</skipminus>
+		<display>DISPLAY</display>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+
+	<remote device="PinnacleSysPCTVRemote">
+		<play>Play</play>
+		<pause>pause</pause>
+		<stop>Stop</stop>
+		<forward>FForward</forward>
+		<reverse>Rewind</reverse>
+		<left>Vol-Rew</left>
+		<right>Vol+FF</right>
+		<up>Chan+Play</up>
+		<down>Chan-Stop</down>
+		<pageplus>channel+</pageplus>
+		<pageminus>channel-</pageminus>
+		<select>middle</select>
+		<back>undo</back>
+		<menu>Menu</menu>
+		<title>L</title>
+		<info>Info</info>
+		<skipplus>next</skipplus>
+		<display>Fullscreen</display>
+		<record>Record</record>
+		<volumeplus>vol+</volumeplus>
+		<volumeminus>vol-</volumeminus>
+		<mute>Mute</mute>
+		<power>Power</power>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+
+        <remote device="Streamzap_PC_Remote">
+                <play>PLAY</play>
+                <pause>PAUSE</pause>
+                <stop>STOP</stop>
+                <forward>&gt;&gt;</forward>
+                <reverse>&lt;&lt;</reverse>
+                <left>LEFT</left>
+                <right>RIGHT</right>
+                <up>UP</up>
+                <down>DOWN</down>
+                <pageplus>CH_UP</pageplus>
+                <pageminus>CH_DOWN</pageminus>
+                <select>OK</select>
+                <back>EXIT</back>
+                <menu>MENU</menu>
+                <title>RED</title>
+                <info>GREEN</info>
+                <skipplus>&gt;&gt;|</skipplus>
+                <display>YELLOW</display>
+                <record>RECORD</record>
+                <volumeplus>VOL_UP</volumeplus>
+                <volumeminus>VOL_DOWN</volumeminus>
+                <mute>MUTE</mute>
+                <power>POWER</power>
+                <one>1</one>
+                <two>2</two>
+                <three>3</three>
+                <four>4</four>
+                <five>5</five>
+                <six>6</six>
+                <seven>7</seven>
+                <eight>8</eight>
+                <nine>9</nine>
+                <zero>0</zero>
+        </remote>
+</lircmap>
diff --git a/abs/extra-testing/community/xbmc-svn/PKGBUILD b/abs/extra-testing/community/xbmc-svn/PKGBUILD
new file mode 100644
index 0000000..e583600
--- /dev/null
+++ b/abs/extra-testing/community/xbmc-svn/PKGBUILD
@@ -0,0 +1,131 @@
+# Contributors : Richard Atkinson atkinsonr-at-gmail 
+#                Ralf Barth <archlinux dot org at haggy dot org>
+#
+# Original credits go to Edgar Hucek <gimli at dark-green dot com>
+# for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD
+
+pkgname=xbmc-svn
+pkgver=20449
+pkgrel=1
+pkgdesc="XBMC Media Center from SVN (linuxport branch)"
+provides=('xbmc')
+conflicts=('xbmc' 'xbmc-smoothvideo' 'xbmc-vdpau')
+arch=('i686' 'x86_64')
+url="http://xbmc.org"
+license=('GPL' 'LGPL')
+depends=('alsa-lib' 'curl' 'enca' 'faac' 'freetype2' 'fribidi' 'gawk' 'glew' \
+         'hal' 'jasper' 'libgl' 'libjpeg>=6b-5' 'libmad' 'libmysqlclient' \
+         'libxinerama' 'libxrandr' 'lzo2' 'sdl_image' 'sdl_mixer' 'sqlite3' \
+         'tre' 'unzip' 'libcdio' 'libsamplerate' 'python')
+makedepends=('subversion' 'autoconf' 'automake' 'boost' 'cmake' 'gcc' 'gperf' 
+             'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip' 'flex' 'bison')
+optdepends=('lirc: remote controller support'
+            'pmount: mount removable devices as normal user'
+            'smbclient: access windows shares'
+            'unrar: access compressed files without unpacking them')
+install=("${pkgname}.install")
+source=('libcurl-not-in-lib64.patch' \
+        'libfaad2-enable-AC_PROG_CXX.patch' \
+        'xbmc-safe-fullscreen.patch'
+	'Lircmap.xml')
+noextract=('libcurl-not-in-lib64.patch' \
+           'libfaad2-enable-AC_PROG_CXX.patch' \
+           'xbmc-safe-fullscreen.patch')
+
+md5sums=('96636ee964e37b78ca62235eb10d29c1'
+         '6864778d6adc3ccc79130c294f2fffd9'
+         'c4d53522773846d8670884cc38f94aa0'
+	 '3f93186f1ea4aad73011d00754c7265a')
+
+options=(!makeflags)
+
+build() {
+	
+    _svntrunk=http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC
+    _svnmod=XBMC
+    _prefix=/usr
+
+    cd ${srcdir}/
+    if [ -d $_svnmod/.svn ]; then
+        msg "SVN tree found, reverting changes and updating to -r$pkgver"
+        (cd $_svnmod && svn revert -R . && svn up -r $pkgver) || return 1
+    else
+        msg "Checking out SVN tree of -r$pkgver"
+        svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod || return 1
+    fi
+    msg "Done. Starting make..."
+
+    # Apply patches
+    cd "$srcdir/$_svnmod"
+
+    # Experimental safe fullscreen patch from the forums (by motd2k)
+    msg "Patching with xbmc-safe-fullscreen.patch"
+    patch --quiet -p0 < "$srcdir/xbmc-safe-fullscreen.patch" || return 1
+
+    # Arch's libcurl lives in /usr/lib, not /usr/lib64 - fix the path:
+    msg "Patching with libcurl-not-in-lib64.patch" 
+    patch --quiet -p0 < "$srcdir/libcurl-not-in-lib64.patch" || return 1
+
+    # libfaad2 complains about a missing AC_PROG_CXX - add it and bootstrap:
+    msg "Patching with libfaad2-enable-AC_PROG_CXX.patch" 
+    patch --quiet -p0 < "$srcdir/libfaad2-enable-AC_PROG_CXX.patch" || return 1
+    autoreconf -vif xbmc/cores/dvdplayer/Codecs/libfaad2
+
+    # libass needs a bootstrap due to newer autotools in Arch Linux
+    autoreconf -vif xbmc/lib/libass
+
+    # Another autotools mismatch between Arch and Ubuntu (xbmc-linuxport is developed against Ubuntu)
+    autoreconf -vif "$srcdir/$_svnmod/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss"
+
+    # Goom also needs a fixup due to newer autotools
+    cd "$srcdir/$_svnmod/xbmc/visualizations/Goom/goom2k4-0"
+    aclocal
+    libtoolize --copy --force
+    ./autogen.sh --enable-static --with-pic
+    
+    # Configure XBMC
+    cd "$srcdir/$_svnmod"
+    make distclean
+    ./configure --prefix=${_prefix} \
+                --disable-debug || return 1
+    
+    # Fix false negative detections of realloc that happens some times
+    if grep -q 'HAVE_REALLOC 0' config.h; then
+      sed -e 's|#define HAVE_REALLOC 0|#define HAVE_REALLOC 1|' \
+          -e 's|#define realloc rpl_realloc|/* #define realloc rpl_realloc */|' \
+          -i config.h || return 1
+    fi
+
+    # XBMCTex will segfault on systems with nvidia installed if linked to OpenGL
+    sed -e 's/-lGLU -lGLEW -lGL//' \
+        -i ${srcdir}/$_svnmod/tools/XBMCTex/Makefile
+
+    # Now (finally) build
+    make || return 1
+    make prefix=${pkgdir}${_prefix} install || return 1
+
+    # Install 
+    install -Dm755 ${srcdir}/$_svnmod/xbmc-xrandr \
+                   ${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr || return 1
+
+    install -Dm644 ${srcdir}/$_svnmod/tools/Linux/xbmc.desktop \
+                   ${pkgdir}${_prefix}/share/applications/xbmc.desktop || return 1
+
+    install -Dm644 ${srcdir}/$_svnmod/tools/Linux/xbmc.png \
+                   ${pkgdir}${_prefix}/share/pixmaps/xbmc.png || return 1
+
+    install -Dm755 ${srcdir}/$_svnmod/tools/XBMCTex/XBMCTex \
+                   ${pkgdir}${_prefix}/share/xbmc/tools/xbmctex || return 1
+
+    # Skins often use build.sh that looks for /usr/bin/XBMCTex
+    ln -s "${_prefix}/share/xbmc/tools/xbmctex" "$pkgdir/usr/bin/XBMCTex"
+
+    install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
+    for licensef in LICENSE.GPL README.linux copying.txt; do
+        mv ${pkgdir}${_prefix}/share/xbmc/${licensef} \
+           ${pkgdir}${_prefix}/share/licenses/${pkgname} || return 1
+    done
+
+    # Use custom Lircmap to support StreamZap remote
+    cp $srcdir/Lircmap.xml ${pkgdir}${_prefix}/share/xbmc/system/Lircmap.xml
+}
diff --git a/abs/extra-testing/community/xbmc-svn/__changelog b/abs/extra-testing/community/xbmc-svn/__changelog
new file mode 100644
index 0000000..bbf1705
--- /dev/null
+++ b/abs/extra-testing/community/xbmc-svn/__changelog
@@ -0,0 +1 @@
+Added Lircmap.xml to PKGBUILD to support MCE2 and StreamZap remotes
diff --git a/abs/extra-testing/community/xbmc-svn/libcurl-not-in-lib64.patch b/abs/extra-testing/community/xbmc-svn/libcurl-not-in-lib64.patch
new file mode 100644
index 0000000..b89db5a
--- /dev/null
+++ b/abs/extra-testing/community/xbmc-svn/libcurl-not-in-lib64.patch
@@ -0,0 +1,13 @@
+Index: Makefile.include.in
+===================================================================
+--- Makefile.include.in	(revision 20149)
++++ Makefile.include.in	(working copy)
+@@ -24,7 +24,7 @@
+ 
+ ifeq (linux,$(findstring linux, $(ARCH)))
+ ifeq ($(ARCH), x86_64-linux)
+-	DEFINES+=-DDLL_PATH_LIBCURL="\"/usr/lib64/libcurl.so.4\""
++	DEFINES+=-DDLL_PATH_LIBCURL="\"/usr/lib/libcurl.so.4\""
+ else
+ 	DEFINES+=-DDLL_PATH_LIBCURL="\"/usr/lib/libcurl.so.4\""
+ endif
diff --git a/abs/extra-testing/community/xbmc-svn/libfaad2-enable-AC_PROG_CXX.patch b/abs/extra-testing/community/xbmc-svn/libfaad2-enable-AC_PROG_CXX.patch
new file mode 100644
index 0000000..89d7497
--- /dev/null
+++ b/abs/extra-testing/community/xbmc-svn/libfaad2-enable-AC_PROG_CXX.patch
@@ -0,0 +1,13 @@
+Index: xbmc/cores/dvdplayer/Codecs/libfaad2/configure.in
+===================================================================
+--- xbmc/cores/dvdplayer/Codecs/libfaad2/configure.in	(revision 19486)
++++ xbmc/cores/dvdplayer/Codecs/libfaad2/configure.in	(working copy)
+@@ -18,7 +18,7 @@
+ AC_PROG_CC
+ AC_PROG_CPP
+ dnl disable for mpeg4ip plugin
+-dnl AC_PROG_CXX
++AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
diff --git a/abs/extra-testing/community/xbmc-svn/xbmc-safe-fullscreen.patch b/abs/extra-testing/community/xbmc-svn/xbmc-safe-fullscreen.patch
new file mode 100644
index 0000000..d112e52
--- /dev/null
+++ b/abs/extra-testing/community/xbmc-svn/xbmc-safe-fullscreen.patch
@@ -0,0 +1,23 @@
+Index: xbmc/Application.cpp
+===================================================================
+--- xbmc/Application.cpp	(revision 20059)
++++ xbmc/Application.cpp	(working copy)
+@@ -873,6 +873,8 @@
+ #endif
+ 
+   // set GUI res and force the clear of the screen
++  if (g_guiSettings.GetBool("videoscreen.safefull"))
++    g_guiSettings.m_LookAndFeelResolution = AUTORES;
+   g_graphicsContext.SetVideoResolution(g_guiSettings.m_LookAndFeelResolution, TRUE, true);
+ 
+ #ifdef _WIN32PC
+@@ -949,6 +951,9 @@
+   time(&seconds);
+   srand((unsigned int)seconds);
+ 
++  if (g_guiSettings.GetBool("videoscreen.safefull"))
++    g_graphicsContext.ToggleFullScreenRoot();
++
+   return CXBApplicationEx::Create(hWnd);
+ }
+ 
diff --git a/abs/extra-testing/community/xbmc-svn/xbmc-svn.install b/abs/extra-testing/community/xbmc-svn/xbmc-svn.install
new file mode 100644
index 0000000..9316bc8
--- /dev/null
+++ b/abs/extra-testing/community/xbmc-svn/xbmc-svn.install
@@ -0,0 +1,9 @@
+post_install() {
+  echo ">> If XBMC won't start, but just segfaults, double check your X.Org config"
+  echo ">> so that your display depth is at least 24-bit. Eg: change "
+  echo ">> \"DefaultDepth 16\" under the \"Screen\" section so it says 24 instead"
+  echo ">> of 16."
+  /bin/true
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra-testing/fakeroot/PKGBUILD b/abs/extra-testing/fakeroot/PKGBUILD
new file mode 100644
index 0000000..f8dd4b2
--- /dev/null
+++ b/abs/extra-testing/fakeroot/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 29508 2009-03-09 17:06:43Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Jochem Kossen <j.kossen@home.nl>
+
+pkgname=fakeroot
+pkgver=1.12.2
+pkgrel=2
+pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://packages.debian.org/fakeroot"
+groups=('base-devel')
+install=fakeroot.install
+depends=('glibc' 'filesystem' 'grep' 'sed')
+options=('!libtool')
+source=(http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.tar.gz)
+md5sums=('1eb7d972a19159035892e7d132602726')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+  ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \
+	 --disable-static --with-ipc=sysv
+	# --with-ipc=tcp is currently broken and no option on smp systems
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
+  # install README for sysv/tcp usage
+  install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
+}
diff --git a/abs/extra-testing/fakeroot/fakeroot.install b/abs/extra-testing/fakeroot/fakeroot.install
new file mode 100644
index 0000000..c2f62a7
--- /dev/null
+++ b/abs/extra-testing/fakeroot/fakeroot.install
@@ -0,0 +1,30 @@
+# arg 1: the new package version
+post_install() {
+	if [ ! "`grep /usr/lib/libfakeroot etc/ld.so.conf`" ]; then
+		echo -n "updating /etc/ld.so.conf... "
+		echo "/usr/lib/libfakeroot" >>etc/ld.so.conf
+		sbin/ldconfig -r .
+		echo "done."
+	fi
+echo "The package is built using sysv ipc. If this causes segfaults"
+echo "see included README file and rebuild the pkg --with-ipc=tcp"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+	post_install $1
+}
+
+# arg 1: the old package version
+pre_remove() {
+	echo -ne "\nupdating /etc/ld.so.conf... "
+	sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf
+	sbin/ldconfig -r .
+	echo "done."
+}
+
+op=$1
+shift
+
+$op $*
diff --git a/abs/extra-testing/irqbalance/Makefile.irqbalance b/abs/extra-testing/irqbalance/Makefile.irqbalance
new file mode 100644
index 0000000..fe08dc0
--- /dev/null
+++ b/abs/extra-testing/irqbalance/Makefile.irqbalance
@@ -0,0 +1,13 @@
+CFLAGS := $(CFLAGS) -D_FORTIFY_SOURCE=2 -Wall -W $(shell pkg-config --cflags glib-2.0)
+LDFLAGS := $(shell pkg-config --libs glib-2.0)
+
+OBJS = bitmap.o irqbalance.o cputree.o procinterrupts.o irqlist.o \
+	placement.o activate.o network.o powermode.o numa.o classify.o
+
+all: irqbalance
+
+irqbalance: $(OBJS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+clean:
+	rm -f irqbalance *~ *.o
diff --git a/abs/extra-testing/irqbalance/PKGBUILD b/abs/extra-testing/irqbalance/PKGBUILD
new file mode 100644
index 0000000..5d823cd
--- /dev/null
+++ b/abs/extra-testing/irqbalance/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Contributor: Martin Striz <ms@poruba.net>
+
+pkgname=irqbalance
+pkgver=0.55
+pkgrel=3
+pkgdesc="IRQ balancing daemon for SMP systems"
+arch=('i686' 'x86_64')
+url="http://www.irqbalance.org/"
+license=('GPL')
+depends=(glib2)
+makedepends=(pkgconfig)
+backup=(etc/conf.d/irqbalance)
+source=(http://www.irqbalance.org/releases/$pkgname-$pkgver.tar.gz
+        Makefile.irqbalance
+        irqbalance.conf.d
+        irqbalance.rc.d)
+md5sums=('9f6b314ff1fdc14173abeb40592d4edf'
+         '45bc9e1d041d8547f2dbf12f887216df'
+         '336c1ee99818f9ecda1687e34c69fd6b'
+         '96efae052553711f74a61760cefa93b5')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  # use our Makefile instead of one provided which is not quite right
+  cp ../Makefile.irqbalance Makefile
+  make || return 1
+
+  install -D -m755 irqbalance $pkgdir/usr/sbin/irqbalance
+  install -D -m644 ../irqbalance.conf.d $pkgdir/etc/conf.d/irqbalance
+  install -D -m755 ../irqbalance.rc.d $pkgdir/etc/rc.d/irqbalance
+}
diff --git a/abs/extra-testing/irqbalance/irqbalance.conf.d b/abs/extra-testing/irqbalance/irqbalance.conf.d
new file mode 100644
index 0000000..ef1bdfd
--- /dev/null
+++ b/abs/extra-testing/irqbalance/irqbalance.conf.d
@@ -0,0 +1,6 @@
+#
+# Settings for irqbalance daemon
+#
+
+# one shot mode - set to 1 if you have Pentium 4 with HT
+ONESHOT=0
diff --git a/abs/extra-testing/irqbalance/irqbalance.rc.d b/abs/extra-testing/irqbalance/irqbalance.rc.d
new file mode 100644
index 0000000..c8d197f
--- /dev/null
+++ b/abs/extra-testing/irqbalance/irqbalance.rc.d
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# source application-specific settings
+ONESHOT=0
+[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance
+
+if [ "$ONESHOT" -ne 0 ]; then
+	ONESHOT_CMD="oneshot"
+fi
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/irqbalance`
+case "$1" in
+  start)
+    stat_busy "Starting IRQ balancing"
+    [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      if [ "$ONESHOT" -eq 0 ]; then
+        add_daemon irqbalance
+      fi
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping IRQ balancing"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon irqbalance
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/abs/extra-testing/libsamplerate/PKGBUILD b/abs/extra-testing/libsamplerate/PKGBUILD
new file mode 100644
index 0000000..1537675
--- /dev/null
+++ b/abs/extra-testing/libsamplerate/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id$
+# Maintainer: Eric Belanger <eric@archlinux.org>
+# Contributor: Jason Chu <jchu@xentac.net>
+
+pkgname=libsamplerate
+pkgver=0.1.7
+pkgrel=1
+pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
+arch=('i686' 'x86_64')
+url="http://www.mega-nerd.com/SRC/index.html"
+license=('GPL')
+depends=('libsndfile' 'flac>=1.1.4')
+options=('!libtool')
+source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz)
+md5sums=('ad093e60ec44f0a60de8e29983ddbc0f')
+sha1sums=('98a52392eb97f9ba724ca024b3af29a8a0cc0206')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr || return 1
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
+}