Merge branch 'master' of ssh://gparabola/abslibre-mips64el

author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2012-01-08 15:04:28 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2012-01-08 15:04:28 -0300
commit: 38e55a4f9ca44d32cc497abdafe5bcd4df23704b (patch)
tree: fe7a66290d7144394574c31b0582e307b3be2c65
parent: 8aca2654c1403bb8cc9af1bb7d6b7a8fcfe8946e (diff)
parent: a9dea3be54150dd7aacef235d86ad62b547c718c (diff)
77 files changed, 1123 insertions, 916 deletions
diff --git a/community-testing/fpc/Makefile-mk382.diff b/community-testing/fpc/Makefile-mk382.diff
deleted file mode 100644
index 00909766d..000000000
--- a/community-testing/fpc/Makefile-mk382.diff
+++ /dev/null
@@ -1,174 +0,0 @@
---- Makefile.fpc.orig	2011-04-02 01:15:34.000000000 +0400
-+++ Makefile.fpc	2011-08-05 22:29:44.000000000 +0400
-@@ -4,7 +4,7 @@
- 
- [package]
- name=compiler
--version=2.4.4
-+version=2.5.1
- 
- [target]
- programs=pp
-@@ -32,7 +32,7 @@
- unexport FPC_VERSION FPC_COMPILERINFO
- 
- # Which platforms are ready for inclusion in the cycle
--CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb # mipsel mips
-+CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr
- 
- # All supported targets used for clean
- ALLTARGETS=$(CYCLETARGETS)
-@@ -148,6 +148,12 @@
- ifeq ($(CPC_TARGET),arm)
- CPUSUF=arm
- endif
-+ifeq ($(CPC_TARGET),mips)
-+CPUSUF=mips
-+endif
-+ifeq ($(CPC_TARGET),mipsel)
-+CPUSUF=mipsel
-+endif
- 
- # Do not define the default -d$(CPU_TARGET) because that
- # will conflict with our -d$(CPC_TARGET)
-@@ -224,12 +230,39 @@
- override LOCALOPT+=
- endif
- 
-+# mipsel specific
-+ifeq ($(PPC_TARGET),mipsel)
-+override LOCALOPT+=-Fumips
-+endif
-+
-+
-+OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo
-+OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo
-+# symbol liveness WPO requires nm, smart linking and no stripping (the latter
-+# is forced by the Makefile when necessary)
-+ifneq ($(findstring $(OS_TARGET),darwin linux freebsd solaris),)
-+ifdef LINKSMART
-+ifdef CREATESMART
-+OPTWPOCOLLECT+=-OWsymbolliveness -Xs-
-+OPTWPOPERFORM+=-Owsymbolliveness
-+endif
-+endif
-+endif
-+
-+
- [rules]
- #####################################################################
- # Setup Targets
- #####################################################################
- 
- ifeq ($(OS_TARGET),win32)
-+USE_CMP_FOR_DIFF=1
-+endif
-+ifeq ($(OS_TARGET),win64)
-+USE_CMP_FOR_DIFF=1
-+endif
-+
-+ifdef USE_CMP_FOR_DIFF
- ifdef CMP
- override DIFF:=$(CMP) -i218
- endif
-@@ -267,6 +300,8 @@
- TEMPNAME1=ppc1$(EXEEXT)
- TEMPNAME2=ppc2$(EXEEXT)
- TEMPNAME3=ppc3$(EXEEXT)
-+TEMPWPONAME1=ppcwpo1$(EXEEXT)
-+TEMPWPONAME2=ppcwpo2$(EXEEXT)
- MAKEDEP=ppdep$(EXEEXT)
- MSG2INC=./msg2inc$(EXEEXT)
- ifdef CROSSINSTALL
-@@ -327,15 +362,15 @@
-         -$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILERSOURCEDIR))
- 
- tempclean:
--        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC)
-+        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) pp1.wpo pp2.wpo
- 
- execlean :
--        -$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME)
-+        -$(DEL) ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME) $(TEMPWPONAME1) $(TEMPWPONAME2)
- 
- $(addsuffix _clean,$(ALLTARGETS)):
-         -$(DELTREE) $(addprefix $(subst _clean,,$@),/units)
-         -$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT))
--        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcppc$(EXEEXT) $(EXENAME))
-+        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME))
- 
- cycleclean: cleanall $(addsuffix _clean,$(CPC_TARGET))
-         -$(DEL) $(EXENAME)
-@@ -444,6 +479,28 @@
- # Normal cycle
- #
- 
-+ifndef NOWPOCYCLE
-+ifdef RELEASE
-+DOWPOCYCLE=1
-+# Two WPO cycles in case of RELEASE=1
-+wpocycle:
-+# don't use cycle_clean, it will delete the compiler utilities again
-+        $(RM) $(EXENAME)
-+        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOCOLLECT)' compiler
-+        $(RM) $(EXENAME)
-+        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(RTLOPT) $(OPTWPOPERFORM)' rtlclean rtl
-+        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOPERFORM) $(subst pp1.wpo,pp2.wpo,$(OPTWPOCOLLECT))' $(addsuffix _clean,$(ALLTARGETS)) compiler
-+        $(MOVE) $(EXENAME) $(TEMPWPONAME1)
-+        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(RTLOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' rtlclean rtl
-+        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(LOCALOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' $(addsuffix _clean,$(ALLTARGETS)) compiler
-+        $(COPY) $(EXENAME) $(TEMPWPONAME2)
-+endif
-+endif
-+
-+ifndef DOWPOCYCLE
-+wpocycle:
-+endif
-+
- # Used to avoid unnecessary steps
- ifdef DIFF
- ifdef OLDFPC
-@@ -490,6 +547,7 @@
-         $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OLDFPC=$(BASEDIR)/$(TEMPNAME2)' next
-         $(DIFF) $(TEMPNAME3) $(EXENAME)
-         $(MAKE) $(addsuffix _all,$(TARGET_DIRS)) 'FPC=$(BASEDIR)/$(EXENAME)'
-+        $(MAKE) wpocycle
-         $(MAKE) echotime
- 
- else
-@@ -508,8 +566,11 @@
- # ppc<ARCH> (target native)
- ifndef CROSSINSTALL
-         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl
-+# building a native compiler for embedded targets is not possible
-+ifneq ($(OS_TARGET),embedded)
-         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler
- endif
-+endif
- 
- endif
- 
-@@ -523,10 +584,10 @@
- # ppc3/ppcXXX = native (skipped for cross installation)
- #
- 
-+cycle: override FPC=
- cycle:
- # ppc (source native)
- # Clear detected compiler binary, because it can be existing crosscompiler binary, but we need native compiler here
--override FPC=
-         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 rtlclean rtl
-         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 cycleclean compiler
- # ppcross<ARCH> (source native)
-@@ -535,8 +596,11 @@
- # ppc<ARCH> (target native)
- ifndef CROSSINSTALL
-         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' rtlclean rtl
-+# building a native compiler for embedded targets is not possible
-+ifneq ($(OS_TARGET),embedded)
-         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' cycleclean compiler
- endif
-+endif
- 
- endif
- 
diff --git a/community-testing/fpc/PKGBUILD b/community-testing/fpc/PKGBUILD
deleted file mode 100644
index 16a70055a..000000000
--- a/community-testing/fpc/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 61547 2012-01-02 19:53:55Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
-# Contributor: Jan Willemson <janwil@hot.ee>
-# Contributor: Hugo Ideler <hugoideler@dse.nl>
-# Original PKGBUILD: Andre Naumann <anaumann@SPARCed.org>
-# See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc
-
-pkgname=fpc
-pkgver=2.6.0
-pkgrel=1
-pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library."
-arch=('i686' 'x86_64')
-url="http://www.freepascal.org/"
-license=('GPL' 'LGPL' 'custom')
-backup=("etc/fpc.cfg")
-depends=(ncurses)
-makedepends=(fpc)
-options=(zipman)
-source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz)
-md5sums=('17375e665a4e1311f85812fe2754f609')
-
-build() {
-  cd ${srcdir}/fpcbuild-$pkgver
-  pushd fpcsrc/compiler
-  fpcmake -Tall
-  popd
-  make NOGDB=1 build
-}
-
-package() {
-  cd ${srcdir}/fpcbuild-$pkgver
-
-  export HOME=$srcdir
-
-  make -j1 NOGDB=1 PREFIX=${pkgdir}/usr install
-
-  export PATH=$pkgdir/usr/bin:$PATH
-
-  install -Dm0644 fpcsrc/rtl/COPYING.FPC ${pkgdir}/usr/share/licenses/${pkgname}/COPYING.FPC
-
-  [ "$CARCH" = "i686" ] && ln -s /usr/lib/fpc/${pkgver}/ppc386 ${pkgdir}/usr/bin/
-  [ "$CARCH" = "x86_64" ] && ln -s /usr/lib/fpc/${pkgver}/ppcx64 ${pkgdir}/usr/bin/
-
-  mkdir -p ${pkgdir}/etc
-  ${pkgdir}/usr/lib/fpc/${pkgver}/samplecfg $pkgdir/usr/lib/fpc/${pkgver} ${pkgdir}/etc
-
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-
-  find $pkgdir/etc/ -type f -exec sed -i "s|$pkgdir||g" {} \;
-}
diff --git a/community-testing/gpac/PKGBUILD b/community-testing/gpac/PKGBUILD
deleted file mode 100644
index 8e66362d6..000000000
--- a/community-testing/gpac/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 61561 2012-01-03 00:05:30Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gpac
-pkgver=3824
-pkgrel=1
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-arch=('i686' 'x86_64')
-url="http://gpac.sourceforge.net"
-license=('LGPL')
-depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa')
-makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad')
-optdepends=('jack: for jack support' 'a52dec: for A52 support'
-            'faad2: for AAC support' 'libmad: for mp3 support')
-options=('!makeflags')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('bf7039c2585d539475babc7996851627efd7ec59')
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=$pkgver
-  _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac"
-  _svnmod="$pkgname-$pkgver"
-  mkdir ${pkgname}-$pkgver
-  pushd ${pkgname}-$pkgver
-  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
-  echo "#define GPAC_SVN_REVISION	\"$_svnver\"" > ${pkgname}-$pkgver/include/gpac/version.h
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
-  popd
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install install-lib
-}
diff --git a/community-testing/lazarus/ChangeLog b/community-testing/lazarus/ChangeLog
deleted file mode 100644
index 79ed3b287..000000000
--- a/community-testing/lazarus/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2008-01-21  JJDaNiMoTh  <jjdanimoth.aur@gmail.com>
-
-    * PKGBUILD: moved man pages to /usr/share
diff --git a/community-testing/lazarus/PKGBUILD b/community-testing/lazarus/PKGBUILD
deleted file mode 100644
index 5bba33fb7..000000000
--- a/community-testing/lazarus/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 61551 2012-01-02 20:07:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jens Adam (byte/jra) <j_adam@web.de>
-
-pkgname=lazarus
-pkgver=0.9.30.2
-pkgrel=2
-pkgdesc='Delphi-like IDE for FreePascal'
-url='http://www.lazarus.freepascal.org/'
-license=('GPL2' 'MPL' 'custom:LGPL')
-arch=('i686' 'x86_64')
-depends=('fpc' 'fpc-src' 'gtk2')
-#makedepends=(rpmextract)
-options=('!emptydirs' '!makeflags')
-source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2)
-md5sums=('0dcf54613c2f9d38a32d183431e2dfc9')
-
-build() {
-  cd $srcdir/${pkgname}
-  make FPC=/usr/bin/fpc clean bigide
-}
-
-package() {
-  cd $srcdir/${pkgname}
-
-  # skip the 'make install' mess completely and do everything manually
-  mkdir -p $pkgdir/usr/lib/lazarus $pkgdir/usr/bin $pkgdir/usr/share/man/man1 $pkgdir/usr/share/doc
-  rm -r debian
-  cp -R . $pkgdir/usr/lib/lazarus
-
-  ln -s /usr/lib/lazarus/lazarus $pkgdir/usr/bin/lazarus
-  ln -s /usr/lib/lazarus/startlazarus $pkgdir/usr/bin/startlazarus
-  ln -s /usr/lib/lazarus/lazbuild $pkgdir/usr/bin/lazbuild
-
-  cp -R install/man/man1/* $pkgdir/usr/share/man/man1/
-
-  mv $pkgdir/usr/lib/lazarus/docs $pkgdir/usr/share/doc/lazarus
-
-  # make 'desktop-file-validate' happy and fix missing .png icon
-  sed -e 's|\(Categories\).*|\1=IDE;Development;|' \
-      -e 's|\.png|\.xpm|' -i install/lazarus.desktop
-  install -Dm644 install/lazarus.desktop $pkgdir/usr/share/applications/lazarus.desktop
-  install -Dm644 images/ide_icon48x48.png $pkgdir/usr/share/pixmaps/lazarus.png
-  rm -r $pkgdir/usr/lib/lazarus/install
-
-  # license files: /usr/lib/lazarus/COPYING*
-  install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgname/COPYING.modifiedLGPL
-
-  # strip
-  find $pkgdir -perm /ugo+x -type f -exec strip {} \;
-  find $pkgdir -name \*.so -type f -exec strip {} \;
-}
diff --git a/community-testing/pkgtools/PKGBUILD b/community-testing/pkgtools/PKGBUILD
deleted file mode 100644
index 922bb5fa3..000000000
--- a/community-testing/pkgtools/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
-# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
-pkgname=pkgtools
-pkgver=23
-pkgrel=3
-pkgdesc="A collection of scripts for Arch Linux packages"
-arch=('i686' 'x86_64')
-url="http://bbs.archlinux.org/viewtopic.php?pid=384196"
-license=('GPL')
-source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver)
-backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf')
-install=pkgtools.install
-provides=(newpkg pkgfile)
-depends=('bash>=4' 'pcre' 'libarchive' 'python')
-optdepends=('cron: For pkgfile --update entry'
-            'abs: Provides proto packaging files for newpkg'
-            'python-yaml: for gem2arch'
-            'python2: for pkgconflict')
-md5sums=('5361111e31741f8d7ff8ca45c7996b6b')
-
-build() {
-  cd "$srcdir/Daenyth-$pkgname"-*
-
-  make
-}
-
-package() {
-  cd "$srcdir/Daenyth-$pkgname"-*
-
-  make DESTDIR="$pkgdir" install
-
-  # fix infinite loop in autotools configure scripts
-  sed -i '/export -f command_not_found_handle/d' "$pkgdir/usr/share/pkgtools/pkgfile-hook.bash"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/pkgtools/pkgtools.install b/community-testing/pkgtools/pkgtools.install
deleted file mode 100644
index bcbf2f85c..000000000
--- a/community-testing/pkgtools/pkgtools.install
+++ /dev/null
@@ -1,66 +0,0 @@
-_MSG_UPDATE=" - Make sure to run pkgfile --update before use"
-_MSG_CRON=" - An entry has been placed in /etc/cron.daily to run pkgfile --update
-   If you do not want this functionality, set UPDATE_CRON=0 in /etc/pkgtools/pkgfile.conf"
-_MSG_HOOK=" - pkgfile includes a \"command not found\" hook for both zsh and bash.
-   This will automatically run pkgfile whenever you run
-   a command which the shell cannot find. If you want
-   this functionality, set CMD_SEARCH_ENABLED to 1 in
-   /etc/pkgtools/pkgfile.conf (or per-user by copying
-   that file to \${XDG_CONFIG_HOME}/pkgtools/pkgfile.conf), then
-   in your current shell run:
-     source /etc/profile"
-
-is_update_from() {
-  res="`vercmp $1 $2`"
-  case $res in
-    '-1'|'0') return 0;;
-    '1') return 1;;
-  esac
-}
-
-## arg 1:  the new package version
-post_install() {
-  echo "$_MSG_UPDATE"
-  echo "$_MSG_HOOK"
-  echo "$_MSG_CRON"
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if is_update_from $2 11-1; then
-    echo " - All bugs related to pkgfile -b should be fixed in this update."
-  fi
-  if is_update_from $2 12-1; then
-    echo " - NOTE: pkgtools' \"command not found\" hook configuration has changed."
-    echo "   Please remove any old symlinks relating to it."
-    echo "$_MSG_HOOK"
-  fi
-  if is_update_from $2 15-1; then
-    echo " - pkgtools now uses \$XDG_CONFIG_HOME for all user-specific configuration."
-    echo "   run «mv ~/.pkgtools \"\$XDG_CONFIG_HOME/pkgtools\"»"
-  fi
-  if is_update_from $2 18-1; then
-    echo " - newpkg has been rewritten to be completely modular. See here for more info: http://github.com/Daenyth/pkgtools/commit/2d37197"
-  fi
-  if is_update_from $2 19-1; then
-    echo " ! This version contains an important bugfix for pkgfile. Previously, package updates would cause the pkgfile --update cron job to"
-    echo "   regain +x mode, causing updates to run even when manually disabled. This version disables the cronjob by setting UPDATE_CRON=0"
-    echo "   in /etc/pkgtools/pkgfile.conf"
-    echo " - This version of pkgtools contains a new tool called 'maintpkg'"
-    echo "   It sets the Maintainer in a PKGBUILD to your PACKAGER while preserving old Contributors"
-  fi
-  if is_update_from $2 22-1; then
-    echo " - This is the largest release in a long time. This updates all python scripts to py3k."
-    echo " - This version of pkgtools includes a new tool called gem2arch, for automating ruby gem packaging"
-  fi
-}
-
-## arg 1:  the old package version
-post_remove() {
-  cat << _EOM
- - You may want to clean /var/cache/pkgtools/lists
-_EOM
-}
-
-# vim:set ts=2 sw=2 et filetype=sh:
diff --git a/community-testing/vdrift/PKGBUILD b/community-testing/vdrift/PKGBUILD
deleted file mode 100644
index ee0fb7ffc..000000000
--- a/community-testing/vdrift/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 61624 2012-01-04 22:46:02Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Lone_Wolf lonewolf@xs4all.nl
-
-pkgname=vdrift
-pkgver=2011.10.22
-pkgrel=2
-pkgdesc="An open source driving simulation made with drift racing in mind"
-arch=('i686' 'x86_64')
-url="http://vdrift.net/"
-license=('GPL')
-depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data')
-makedepends=('scons' 'boost' 'asio')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2)
-md5sums=('6f8806ab1be303e9e1e47522c9eee890')
-install=vdrift.install
-
-build() {
-  cd "$srcdir"/$pkgname-${pkgver//./-}
-
-  # select arch
-  if [ `uname -m` = "x86_64" ]; then
-    _sconsarch="a64"
-  else
-    _sconsarch="686"
-  fi
-
-  #sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp
-  #sed -i '/types.h/d' src/http.h
-
-  # build and install
-  scons $MAKEFLAGS \
-    "destdir"="$pkgdir" \
-    "arch"=$_sconsarch \
-    "release"=1 \
-    "force_feedback"=1 \
-    "prefix"=/usr \
-    "datadir"=share/$pkgname/ \
-    "extbullet"=1
-}
-
-package() {
-  cd "$srcdir"/$pkgname-${pkgver//./-}
-
-  scons install
-
-  # install .desktop file
-  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-
-  # install icons
-  install -Dm644 data/textures/icons/vdrift-16x16.png \
-    "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-32x32.png \
-    "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png
-  install -Dm644 data/textures/icons/vdrift-64x64.png \
-    "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png
-
-  rm -r $pkgdir/usr/share/vdrift
-}
-# vim: sw=2:ts=2 et:
diff --git a/community-testing/vdrift/vdrift.desktop b/community-testing/vdrift/vdrift.desktop
deleted file mode 100644
index 7078f0d9c..000000000
--- a/community-testing/vdrift/vdrift.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=VDrift
-Version=2009-06-15
-GenericName=Racing Simulation
-Comment=An open source driving simulation made with drift racing in mind
-Exec=vdrift
-Icon=vdrift.png
-Terminal=false
-Categories=Game;Simulation;
diff --git a/community-testing/vdrift/vdrift.install b/community-testing/vdrift/vdrift.install
deleted file mode 100644
index 868f6717b..000000000
--- a/community-testing/vdrift/vdrift.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD
index de236d4cd..f05bd1f20 100644
--- a/community/aqbanking/PKGBUILD
+++ b/community/aqbanking/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59854 2011-12-01 11:32:54Z spupykin $
+# $Id: PKGBUILD 61641 2012-01-05 10:54:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Moore <davidm@sjsoft.com>
 
 pkgname=aqbanking
-pkgver=5.0.17
-_dnrel=88
+pkgver=5.0.21
+_dnrel=91
 pkgrel=1
 pkgdesc="A library for online banking and financial applications"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ license=('GPL')
 depends=('gwenhywfar' 'ktoblzcheck' 'libofx')
 options=('!makeflags' '!libtool')
 source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz")
-md5sums=('4543012286159310bdf13badf221a173')
+md5sums=('634dac2c82c583ed6643678bc214026e')
 
 build() {
   cd $srcdir/aqbanking-$pkgver
diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD
index fa2f7b8d0..516791c85 100644
--- a/community/blender/PKGBUILD
+++ b/community/blender/PKGBUILD
@@ -14,7 +14,7 @@ _svn=false
 
 pkgname=blender
 pkgver=2.61
-pkgrel=2
+pkgrel=3
 epoch=3
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
diff --git a/community/celt-0.7/PKGBUILD b/community/celt-0.7/PKGBUILD
index 4b7c5aa1c..f22201bd7 100644
--- a/community/celt-0.7/PKGBUILD
+++ b/community/celt-0.7/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 40766 2011-02-26 17:17:27Z schiv $
+# $Id: PKGBUILD 61638 2012-01-05 08:56:24Z svenstaro $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lauri Niskanen <ape@ape3000.com>
@@ -6,13 +6,13 @@
 pkgname=celt-0.7
 _realname=celt
 pkgver=0.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Low-latency audio communication codec"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.celt-codec.org"
 license=('BSD')
 depends=('libogg')
-provides=('celt=$pkgver')
+#provides=('celt=$pkgver')
 conflicts=('celt')
 options=('!libtool')
 source=(http://downloads.xiph.org/releases/celt/$_realname-$pkgver.tar.gz)
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD
index 3326b81db..f45fa00f0 100644
--- a/community/chmsee/PKGBUILD
+++ b/community/chmsee/PKGBUILD
@@ -1,34 +1,35 @@
-# $Id: PKGBUILD 59248 2011-11-21 23:02:41Z lcarlier $
+# $Id: PKGBUILD 61658 2012-01-05 20:32:51Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: dionydonny <dionydonny@gmail.com>
 # Contributor: Ermanno <erm67@yahoo.it>
 
 pkgname=chmsee
-pkgver=1.99.06
+pkgver=1.99.07
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner."
 url="http://chmsee.googlecode.com/"
 license=('GPL')
-depends=('xulrunner>=8.0' 'chmlib' 'desktop-file-utils')
+depends=('xulrunner>=9.0' 'chmlib' 'desktop-file-utils')
 makedepends=('python2')
 source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver
         chmsee)
 install=chmsee.install
-md5sums=('fb11a4492795635bda843064f5b7f261'
+md5sums=('46dc393ffde8e614b4e6e7b5926b02b1'
          '4999362b0c89c24764cbd25173610a38')
 
 build() {
-  cd ${srcdir}/jungleji-chmsee-dd9130e/src
+  cd ${srcdir}/jungleji-chmsee-ccdf6d2/src
 
   cp Makefile.arch Makefile
-  sed -i -e 's/5.0/8.0/g' Makefile
+  sed -i -e 's/python/python2/g' common.mk
+#  sed -i -e 's/5.0/9.0/g' Makefile
 
   make
 }
 
 package() {
-  cd ${srcdir}/jungleji-chmsee-dd9130e
+  cd ${srcdir}/jungleji-chmsee-ccdf6d2
 
   install -d ${pkgdir}/usr/share/chmsee
   cp -a * ${pkgdir}/usr/share/chmsee 
diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD
index e74c23219..07a24b197 100644
--- a/community/clementine/PKGBUILD
+++ b/community/clementine/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61430 2011-12-31 01:22:51Z stephane $
+# $Id: PKGBUILD 61660 2012-01-05 21:38:03Z stephane $
 #Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 #Contributor: BlackEagle <ike.devolder@gmail.com>
 #Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
 
 pkgname=clementine
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A music player and library organizer"
 url="http://www.clementine-player.org/"
 license=('GPL')
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice')
 depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
          'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice'
-         'qjson' 'libcdio' 'protobuf' 'qca')
+         'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl')
 makedepends=('cmake' 'boost')
 optdepends=('gstreamer0.10-base-plugins: for more open formats'
             'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
diff --git a/community/corkscrew/PKGBUILD b/community/corkscrew/PKGBUILD
index 207f74aec..f7a9e0291 100644
--- a/community/corkscrew/PKGBUILD
+++ b/community/corkscrew/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=corkscrew
 pkgver=2.0
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A tool for tunneling SSH through HTTP proxies"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.agroman.net/corkscrew/"
diff --git a/community/cpulimit/PKGBUILD b/community/cpulimit/PKGBUILD
index 6cebcda00..bd8d6a085 100644
--- a/community/cpulimit/PKGBUILD
+++ b/community/cpulimit/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=cpulimit
 pkgver=1.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Limit cpu usage in %. Actualy sends SIGSTOP/SIGCONT"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cpulimit.sourceforge.net/"
@@ -15,6 +15,8 @@ md5sums=('f4ff6d4bfaef1258e8f5cd2041e2e2a3')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  make
+  # The included trivial Makefile ignores CFLAGS and LDFLAGS, so
+  # running the compiler manually here.
+  ${CC:-gcc} ${LDFLAGS} ${CFLAGS} -o cpulimit cpulimit.c -lrt
   install -D -m0755 cpulimit $startdir/pkg/usr/bin/cpulimit
 }
diff --git a/community/cuda-toolkit/PKGBUILD b/community/cuda-toolkit/PKGBUILD
index 2e2b09404..2fc1d6366 100644
--- a/community/cuda-toolkit/PKGBUILD
+++ b/community/cuda-toolkit/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=cuda-toolkit
-pkgver=4.0.17
-pkgrel=3
-_fedver=13
+pkgver=4.1.21
+pkgrel=2
+_fedver=14
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('i686' 'x86_64')
 
@@ -11,18 +11,18 @@ license=('custom')
 depends=('gcc-libs')
 if [ "$CARCH" = "i686" ]; then
   _arch=32
-  md5sums=('20d69b2d5bb7043ca7c2ad679c2825ed'
+  md5sums=('930b7bfd1a162335b909f119a004f6d7'
            '5af5226b36cd3f9993f762f85b5d236a'
            'c0781c63e726eaf03e10135b42b85729')
 else
   _arch=64
-  md5sums=('152e1069f39fc8bbece875a1b9f576b6'
+  md5sums=('509c795b9b79f991e045a83576e2e2f3'
            '5af5226b36cd3f9993f762f85b5d236a'
            'c0781c63e726eaf03e10135b42b85729')
 fi
 
 install=cuda-toolkit.install
-source=(http://developer.download.nvidia.com/compute/cuda/4_0/toolkit/cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run
+source=(http://developer.download.nvidia.com/compute/cuda/4_1/RC2/toolkit/cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run
         cuda-toolkit.sh
         cuda-toolkit.conf)
 
@@ -41,4 +41,13 @@ package() {
   install -Dm755 cuda-toolkit.sh $pkgdir/etc/profile.d/cuda-toolkit.sh
   install -Dm644 cuda-toolkit.conf $pkgdir/etc/ld.so.conf.d/cuda-toolkit.conf
   install -Dm644 $pkgdir/opt/cuda-toolkit/doc/EULA.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+  # Fixes FS#27841
+  cd $pkgdir/opt/cuda-toolkit/lib
+  ln -s /usr/lib/libncurses.so.5 libtinfo.so.5
+
+  if [[ $CARCH == "x86_64" ]]; then
+    cd $pkgdir/opt/cuda-toolkit/lib64
+    ln -s /usr/lib/libncurses.so.5 libtinfo.so.5
+  fi
 }
diff --git a/community/cuetools/PKGBUILD b/community/cuetools/PKGBUILD
index e7c28db65..0b1d6dbb5 100644
--- a/community/cuetools/PKGBUILD
+++ b/community/cuetools/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=cuetools
 pkgver=1.3.1
-pkgrel=4
+pkgrel=4.1
 pkgdesc="Set of utilities for working with cue files and toc files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.berlios.de/projects/cuetools/"
diff --git a/community/curlftpfs/PKGBUILD b/community/curlftpfs/PKGBUILD
index 722cd9659..4e2d32f79 100644
--- a/community/curlftpfs/PKGBUILD
+++ b/community/curlftpfs/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=curlftpfs
 pkgver=0.9.2
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A filesystem for acessing FTP hosts based on FUSE and libcurl."
 url="http://curlftpfs.sourceforge.net/"
 license=('GPL')
diff --git a/community/cutter/PKGBUILD b/community/cutter/PKGBUILD
index 010919ae2..ee3a8cfb1 100644
--- a/community/cutter/PKGBUILD
+++ b/community/cutter/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=cutter
 pkgver=1.03
-pkgrel=3
+pkgrel=3.1
 pkgdesc="TCP/IP Connection cutting on Linux Firewalls and Routers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lowth.com/cutter/"
@@ -15,6 +15,8 @@ md5sums=('50093db9b64277643969ee75b83ebbd1')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  make || return 1
+  # The included trivial Makefile ignores CFLAGS and LDFLAGS, so
+  # running the compiler manually here.
+  ${CC:-gcc} ${LDFLAGS} ${CFLAGS} -o cutter cutter.c
   install -D -m 0755 ./cutter $startdir/pkg/usr/bin/tcp-cutter
 }
diff --git a/community/dar/PKGBUILD b/community/dar/PKGBUILD
index b139ca88b..73bca8eeb 100644
--- a/community/dar/PKGBUILD
+++ b/community/dar/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=dar
 pkgver=2.4.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc='A full featured command-line backup tool, short for Disk ARchive'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://dar.linux.free.fr/'
diff --git a/community/darkhttpd/PKGBUILD b/community/darkhttpd/PKGBUILD
index b2c3b85bb..e6759c566 100644
--- a/community/darkhttpd/PKGBUILD
+++ b/community/darkhttpd/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=darkhttpd
 pkgver=1.8
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A small, static webserver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dmr.ath.cx/net/darkhttpd/"
diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD
index bc5710cc4..864768cba 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=darkstat
 pkgver=3.0.714
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Network statistics gatherer (packet sniffer)."
 url="http://dmr.ath.cx/net/darkstat/"
 license=("GPL")
diff --git a/community/datemath/PKGBUILD b/community/datemath/PKGBUILD
index 1f8a1e0d1..157812a04 100644
--- a/community/datemath/PKGBUILD
+++ b/community/datemath/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=datemath
 pkgver=2.0.10
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Command line date and time math utility."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.unixwiz.net/tools/datemath.html"
@@ -16,6 +16,7 @@ md5sums=('2c369d70a43313b71dbe3c7cc50207de')
 
 build() {
   cd $srcdir
-  make || return 1
+  sed -ri 's/CFLAGS\s*=\s*.*/CFLAGS='"$CFLAGS $LDFLAGS"'/' Makefile
+  make
   install -D -m755 $srcdir/datemath $pkgdir/usr/bin/datemath
 }
diff --git a/community/delegate/PKGBUILD b/community/delegate/PKGBUILD
index b6dea8016..f9c34e047 100644
--- a/community/delegate/PKGBUILD
+++ b/community/delegate/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=delegate
 pkgver=9.9.7
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Caching and converting multyprotocol proxy. For example, you may use it as NNTP web interface"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.delegate.org/"
diff --git a/community/dfm/PKGBUILD b/community/dfm/PKGBUILD
index bbf143dd5..fcca5e41c 100644
--- a/community/dfm/PKGBUILD
+++ b/community/dfm/PKGBUILD
@@ -5,7 +5,7 @@
 #
 pkgname=dfm
 pkgver=0.99.9
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A graphical file manager including desktop icons"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk' 'imlib' 'libxpm')
diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD
index cc80362f8..113aec0ed 100644
--- a/community/directfb/PKGBUILD
+++ b/community/directfb/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=directfb
 pkgver=1.4.14
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.directfb.org"
diff --git a/community/discid/PKGBUILD b/community/discid/PKGBUILD
index a78f15c1a..7489c5a92 100644
--- a/community/discid/PKGBUILD
+++ b/community/discid/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=discid
 pkgver=0.1.3
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A program to calculate the disc-ID for audio compact discs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://discid.sourceforge.net"
diff --git a/community/dnstracer/PKGBUILD b/community/dnstracer/PKGBUILD
index cb5a80ae5..e2fcb7eba 100644
--- a/community/dnstracer/PKGBUILD
+++ b/community/dnstracer/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=dnstracer
 pkgver=1.9
-pkgrel=3
+pkgrel=3.1
 pkgdesc='Determines where a given DNS server gets its information from, and follows the chain of DNS servers'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mavetju.org/unix/dnstracer.php'
diff --git a/community/dopewars/PKGBUILD b/community/dopewars/PKGBUILD
index 4116a23d3..c41d3f872 100644
--- a/community/dopewars/PKGBUILD
+++ b/community/dopewars/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=dopewars
 pkgver=1.5.12
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A drug dealing game set in New York"
 url="http://dopewars.sourceforge.net/"
 license=('GPL')
diff --git a/community/driftnet/PKGBUILD b/community/driftnet/PKGBUILD
index ab64be823..711a6e5d3 100644
--- a/community/driftnet/PKGBUILD
+++ b/community/driftnet/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=driftnet
 pkgver=0.1.6
-pkgrel=5
+pkgrel=5.1
 pkgdesc="Listens to network traffic and picks out images from TCP streams it observes."
 arch=('i686' 'x86_64' 'mips64el')
 url=('http://www.ex-parrot.com/~chris/driftnet/')
@@ -16,7 +16,8 @@ md5sums=('8e11d77770452f97bb3c23f510489815')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make  LDFLAGS=""
+        sed -i 's/-lungif/-lgif/' Makefile
+	make
 }
 
 package() {
diff --git a/community/dtach/PKGBUILD b/community/dtach/PKGBUILD
index 2ea069b5c..228fc9b9b 100644
--- a/community/dtach/PKGBUILD
+++ b/community/dtach/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=dtach
 pkgver=0.8
-pkgrel=4
+pkgrel=4.1
 pkgdesc="emulates the detach feature of screen"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dtach.sourceforge.net/"
diff --git a/community/duff/PKGBUILD b/community/duff/PKGBUILD
index 304178bb1..97337edae 100644
--- a/community/duff/PKGBUILD
+++ b/community/duff/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=duff
 pkgver=0.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A command-line utility for quickly finding duplicates in a given set of files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://duff.sourceforge.net/"
diff --git a/community/dumb/PKGBUILD b/community/dumb/PKGBUILD
index ccbbbb04b..368c1cc9e 100644
--- a/community/dumb/PKGBUILD
+++ b/community/dumb/PKGBUILD
@@ -15,7 +15,7 @@ md5sums=('f48da5b990aa8aa822d3b6a951baf5c2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
+  [ "${CARCH}" != "i686" ] && export CFLAGS="${CFLAGS} -fPIC"
   # Create the directories which the Makefile somehow fails to create
   install -d lib/unix/{debug,release}
 
@@ -30,7 +30,8 @@ ALL_TARGETS := core core-examples core-headers
 ALL_TARGETS += allegro allegro-examples allegro-headers
 PREFIX := "$pkgdir/usr"
 EOF
-
+  # For some reason -lm is not linked for Allegro examples.
+  sed -ri 's/^(LINK_ALLEGRO := .+)$/\1 -lm/' make/unix.inc
   # Upstream's makefile ignores our CFLAGS.  They put -I directives in
   # their own CFLAGS, so we can't just say
   # make CFLAGS=...
diff --git a/community/dvdisaster/PKGBUILD b/community/dvdisaster/PKGBUILD
index 6a07af6e0..ef29f0595 100644
--- a/community/dvdisaster/PKGBUILD
+++ b/community/dvdisaster/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=dvdisaster
 pkgver=0.72.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.dvdisaster.com/"
diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD
index db3dee6f6..86bc51c37 100644
--- a/community/gwenhywfar/PKGBUILD
+++ b/community/gwenhywfar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57282 2011-10-25 09:59:01Z spupykin $
+# $Id: PKGBUILD 61643 2012-01-05 10:55:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=gwenhywfar
-pkgver=4.3.0
+pkgver=4.3.1
 pkgrel=1
 pkgdesc="OS abstraction functions for various projects"
 arch=(i686 x86_64 'mips64el')
@@ -13,8 +13,8 @@ license=("LGPL")
 depends=('openssl' 'gnutls' 'libgcrypt')
 makedepends=('gtk2' 'qt')
 optdepends=('gtk2' 'qt')
-source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=64&file=01&dummy=gwenhywfar-$pkgver.tar.gz")
-md5sums=('6c3647c5a9065d0126b0e2b77752527b')
+source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-$pkgver.tar.gz")
+md5sums=('63370a89befee90436720458d0c81cc5')
 
 build() {
   pacman -Q gwenhywfar && return 1
diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD
index 95a8ceaa0..9d8adc1f7 100644
--- a/community/ktoblzcheck/PKGBUILD
+++ b/community/ktoblzcheck/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 51218 2011-07-05 21:19:18Z spupykin $
+# $Id: PKGBUILD 61645 2012-01-05 10:56:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
 
 pkgname=ktoblzcheck
-pkgver=1.33
+pkgver=1.37
 pkgrel=1
 pkgdesc="A library to check account numbers and bank codes of German banks"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ depends=('gcc-libs' 'python')
 optdepends=('perl')
 source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz
         ktoblzcheck-python3.patch)
-md5sums=('e9f62a9a64ee51ab43751eadcade0433'
+md5sums=('93b540b5478bfb1b078613cbf1cc2446'
          'a81a697bb3aaeffb7fac0ad7d9166e3f')
 
 build() {
diff --git a/community/libircclient/PKGBUILD b/community/libircclient/PKGBUILD
new file mode 100644
index 000000000..50e1c02a8
--- /dev/null
+++ b/community/libircclient/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Contributor: Marcel Wysocki <maci@satgnu.net>
+# Contributor: coolkehon <coolkehon at g m a i l>
+
+pkgname=libircclient
+pkgver=1.3
+pkgrel=5
+pkgdesc="A small but powerful library, which implements client-server IRC protocol."
+arch=('i686' 'x86_64')
+url="http://libircclient.sf.net"
+depends=('glibc')
+license=("GPL2")
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+        "shared.patch")
+md5sums=('b0e80d1d6b0c1cc61660fb9d2350b32d'
+         'f2c350d140bd522990c15162645c72f0')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # add fPIC flag for x86_64
+  [ "$CARCH" = x86_64 ] && export CFLAGS="$CFLAGS -fPIC"
+
+  # shared and path patch
+  patch -p1 -i ../shared.patch
+
+  ./configure --prefix=/usr
+  cd src && make CFLAGS="$CFLAGS"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/src"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/libircclient/shared.patch b/community/libircclient/shared.patch
new file mode 100644
index 000000000..ac57fe3a8
--- /dev/null
+++ b/community/libircclient/shared.patch
@@ -0,0 +1,44 @@
+diff -aur libircclient-1.3/src/Makefile.in libircclient-1.3.patched/src/Makefile.in
+--- libircclient-1.3/src/Makefile.in	2005-03-09 22:11:53.000000000 +0100
++++ libircclient-1.3.patched/src/Makefile.in	2012-01-05 05:46:21.000000000 +0100
+@@ -4,21 +4,22 @@
+ AR=@AR@ cr
+ RANLIB=@RANLIB@
+ INCLUDES=-I../include
+-
++DESTDIR+=
+ 
+ OBJS = libircclient.o
+ 
+ all:	lib
+ 
+-lib:	libircclient.a
++lib:	libircclient.a libircclient.so
+ 
+ install: lib
+-	-mkdir @prefix@/include
+-	-mkdir @prefix@/lib
+-	cp ../include/libircclient.h @prefix@/include/libircclient.h
+-	cp ../include/libirc_errors.h @prefix@/include/libirc_errors.h
+-	cp ../include/libirc_events.h  @prefix@/include/libirc_events.h 
+-	cp libirc.a @prefix@/include/lib/libirc.a
++	mkdir -p $(DESTDIR)/usr/{lib,include/libircclient}
++	mkdir -p $(DESTDIR)/usr/share/{man,{doc,}/libircclient}
++	cp libircclient.a libircclient.so  $(DESTDIR)/usr/lib
++	cp ../include/libirc*.h  $(DESTDIR)/usr/include/libircclient
++	cp -a ../doc/{html,rfc1459.txt} $(DESTDIR)/usr/share/doc/libircclient
++	cp -a ../examples $(DESTDIR)/usr/share/libircclient
++	cp -a ../doc/man/man3 $(DESTDIR)/usr/share/man
+ 
+ $(OBJS): utils.c dcc.c errors.c portable.c sockets.c colors.c
+ 
+@@ -26,6 +27,9 @@
+ 	$(AR) libircclient.a $(OBJS)
+ 	$(RANLIB) libircclient.a
+ 
++libircclient.so: $(OBJS)
++	$(CC) -shared -Wl $(OBJS) -o libircclient.so
++
+ clean:
+ 	rm -f libircclient.a $(OBJS)
+ 
diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD
index 34165dbe9..345d8f9ad 100644
--- a/community/linux-tools/PKGBUILD
+++ b/community/linux-tools/PKGBUILD
@@ -1,9 +1,11 @@
-# $Id: PKGBUILD 59838 2011-12-01 00:13:46Z seblu $
+# $Id: PKGBUILD 61664 2012-01-06 00:12:09Z seblu $
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 
 pkgbase=linux-tools
 pkgname=('perf' 'cpupower')
-pkgver=3.1.4
+pkgver=3.2
+kernver=${pkgver}
+[[ ${kernver##*rc} != $kernver ]] && testing='testing'
 pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64')
@@ -12,53 +14,52 @@ options=('!strip')
 makedepends=('asciidoc' 'xmlto')
 # split packages need all package dependencies set manually in makedepends
 makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils')
-source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$pkgver.tar.xz"
+source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/$testing/linux-$kernver.tar.xz"
         'cpupower.rc'
         'cpupower.conf') 
-md5sums=('e48e246675a3e790062d4fecf36cd6e3'
+md5sums=('364066fa18767ec0ae5f4e4abcf9dc51'
          'd8b119eff7dc1a2d655eb71a47fa6215'
          '218fd36a7957d3170ed8bd1a0be1f62f')
 
 build() {
   msg2 'Build perf'
-  cd linux-$pkgver/tools/perf
-  make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver \
+  cd linux-$kernver/tools/perf
+  make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver-$pkgrel \
     all man
 
   msg2 'Build cpupower'
   # we cannot use --as-needed
   LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
-  cd "$srcdir/linux-$pkgver/tools/power/cpupower"
-  make
+  cd "$srcdir/linux-$kernver/tools/power/cpupower"
+  make VERSION=$pkgver-$pkgrel
 }
 
 package_perf() {
-  pkgdesc='Linux kernel perf tool'
+  pkgdesc='Linux kernel performance auditing tool'
   depends=('python2' 'libnewt' 'elfutils')
 
-  cd linux-${pkgver}/tools/perf
+  cd linux-${kernver}/tools/perf
   make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver \
     install install-man
 }
 
 package_cpupower() {
-  pkgdesc='Linux kernel power tool'
+  pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
   backup=('etc/conf.d/cpupower')
   depends=('pciutils')
   conflicts=('cpufrequtils')
-  provides=("cpufrequtils=$pkgver")
 
-  cd linux-$pkgver/tools/power/cpupower
+  # install rc.d script
+  install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
+  install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+
+  cd linux-$kernver/tools/power/cpupower
   make \
     DESTDIR="$pkgdir" \
     INSTALL='/bin/install -c' \
     mandir='/usr/share/man' \
     docdir='/usr/share/doc/cpupower' \
     install install-man
-
-  # install rc.d script
-  install -D -m 755 "$srcdir/cpupower.rc" "$pkgdir/etc/rc.d/cpupower"
-  install -D -m 644 "$srcdir/cpupower.conf" "$pkgdir/etc/conf.d/cpupower"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index ba4dca3e6..daf38691f 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,44 +1,43 @@
-# $Id: PKGBUILD 59960 2011-12-02 21:00:17Z ibiru $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 61635 2012-01-05 05:53:39Z bpiotrowski $
+# Maintainer:  Mateusz Herych <heniekk@gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Vasco Costa <vasco.costa@meiodigital.com>
 
 pkgname=pokerth
 _realname=PokerTH
-pkgver=0.8.3
-pkgrel=6
+pkgver=0.9
+pkgrel=1
 pkgdesc="Poker game written in C++/QT4"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pokerth.net/"
 license=('GPL' 'custom')
-depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls' 'qt' 'sdl_mixer')
+depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls'
+         'qt' 'sdl_mixer' 'libircclient' 'tinyxml')
 makedepends=('boost')
 source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
-md5sums=('adbe56ad5f547eb255dad91de564bf1c')
+md5sums=('849eb1a70735177c96bf4608d4637c7c')
 
 build() {
-  cd $_realname-$pkgver-src
+  cd "$srcdir/$_realname-$pkgver-src"
 
   sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro
 
-
   # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms'
   sed \
     -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \
     -i zlib_compress.pro pokerth_game.pro pokerth_server.pro
 
   qmake $pkgname.pro
-
   make
 }
 
 package() {
-  cd $_realname-$pkgver-src
+  cd "$srcdir/$_realname-$pkgver-src"
 
   make INSTALL_ROOT="$pkgdir" install
 
-  install -D $pkgname "$pkgdir/usr/bin/$pkgname"
+  install -D "$pkgname" "$pkgdir/usr/bin/$pkgname"
   install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1"
-
   install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
   rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt"
 }
diff --git a/community/tinyxml/PKGBUILD b/community/tinyxml/PKGBUILD
new file mode 100644
index 000000000..4c93beb72
--- /dev/null
+++ b/community/tinyxml/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# Contributor: Larry Hajali <larryhaja[at]gmail[dot]com>
+# Contributor: Hubert Grzeskowiak <arch at nemesis13 dot de>
+
+pkgname=tinyxml
+pkgver=2.6.2
+pkgrel=1
+pkgdesc="A simple, small, C++ XML parser that can be easily integrated into other programs."
+url='http://www.grinninglizard.com/tinyxml/'
+arch=('i686' 'x86_64')
+license=('zlib')
+depends=('gcc-libs')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_${pkgver//./_}.tar.gz"
+        'entity.patch'
+        'tinyxml-2.5.3-stl.patch')
+md5sums=('c1b864c96804a10526540c664ade67f0'
+         'b6cc2d9330707373d920f760793c6311'
+         '6db8334398e0cdad7e3c6406206ff42a')
+
+build() {
+  cd "$srcdir"/$pkgname
+
+  # Fix entity encoding.
+  patch -p0 < "$srcdir"/entity.patch
+
+  # Make TINYXML_USE_STL permanently defined in tinyxml.h
+  patch -p1 < "$srcdir"/$pkgname-2.5.3-stl.patch
+
+  # Fix Makefile
+  sed -i \
+    -e '/^TINYXML_USE_STL/ s|=.*|=YES|' \
+    -e "s|^RELEASE_CFLAGS.*|& ${CXXFLAGS} -fPIC|" Makefile
+
+  make
+  g++ -fPIC ${CXXFLAGS} -shared -o lib${pkgname}.so.0.$pkgver -Wl,-soname,lib${pkgname}.so.0 *.o
+}
+
+package()
+{
+  cd "$srcdir"/$pkgname
+  install -d -m 0755 "$pkgdir"/usr/{lib,include}
+  install -m 0755 lib${pkgname}.so.0.$pkgver "$pkgdir"/usr/lib/
+  install -m 0644 $pkgname.h tinystr.h "$pkgdir"/usr/include
+  (cd "$pkgdir"/usr/lib
+    ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so.0
+    ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so
+  )
+}
diff --git a/community/tinyxml/entity.patch b/community/tinyxml/entity.patch
new file mode 100644
index 000000000..66d89a617
--- /dev/null
+++ b/community/tinyxml/entity.patch
@@ -0,0 +1,64 @@
+? entity.patch
+Index: tinyxml.cpp
+===================================================================
+RCS file: /cvsroot/tinyxml/tinyxml/tinyxml.cpp,v
+retrieving revision 1.105
+diff -u -r1.105 tinyxml.cpp
+--- tinyxml.cpp	5 Jun 2010 19:06:57 -0000	1.105
++++ tinyxml.cpp	19 Jul 2010 21:24:16 -0000
+@@ -57,30 +57,7 @@
+ 	{
+ 		unsigned char c = (unsigned char) str[i];
+ 
+-		if (    c == '&' 
+-		     && i < ( (int)str.length() - 2 )
+-			 && str[i+1] == '#'
+-			 && str[i+2] == 'x' )
+-		{
+-			// Hexadecimal character reference.
+-			// Pass through unchanged.
+-			// &#xA9;	-- copyright symbol, for example.
+-			//
+-			// The -1 is a bug fix from Rob Laveaux. It keeps
+-			// an overflow from happening if there is no ';'.
+-			// There are actually 2 ways to exit this loop -
+-			// while fails (error case) and break (semicolon found).
+-			// However, there is no mechanism (currently) for
+-			// this function to return an error.
+-			while ( i<(int)str.length()-1 )
+-			{
+-				outString->append( str.c_str() + i, 1 );
+-				++i;
+-				if ( str[i] == ';' )
+-					break;
+-			}
+-		}
+-		else if ( c == '&' )
++		if ( c == '&' )
+ 		{
+ 			outString->append( entity[0].str, entity[0].strLength );
+ 			++i;
+Index: xmltest.cpp
+===================================================================
+RCS file: /cvsroot/tinyxml/tinyxml/xmltest.cpp,v
+retrieving revision 1.89
+diff -u -r1.89 xmltest.cpp
+--- xmltest.cpp	5 Jun 2010 17:41:52 -0000	1.89
++++ xmltest.cpp	19 Jul 2010 21:24:16 -0000
+@@ -1340,6 +1340,16 @@
+ 		}*/
+ 	}
+ 
++	#ifdef TIXML_USE_STL
++	{
++		TiXmlDocument xml;
++		xml.Parse("<foo>foo&amp;#xa+bar</foo>");
++		std::string str;
++		str << xml;
++		XmlTest( "Entity escaping", "<foo>foo&amp;#xa+bar</foo>", str.c_str() );
++	}
++	#endif
++
+ 	/*  1417717 experiment
+ 	{
+ 		TiXmlDocument xml;
diff --git a/community/tinyxml/tinyxml-2.5.3-stl.patch b/community/tinyxml/tinyxml-2.5.3-stl.patch
new file mode 100644
index 000000000..7bcde59ff
--- /dev/null
+++ b/community/tinyxml/tinyxml-2.5.3-stl.patch
@@ -0,0 +1,12 @@
+diff -up tinyxml/tinyxml.h~ tinyxml/tinyxml.h
+--- tinyxml/tinyxml.h~	2007-11-30 22:39:36.000000000 +0100
++++ tinyxml/tinyxml.h	2007-11-30 22:39:36.000000000 +0100
+@@ -26,6 +26,8 @@ distribution.
+ #ifndef TINYXML_INCLUDED
+ #define TINYXML_INCLUDED
+ 
++#define TIXML_USE_STL 1
++
+ #ifdef _MSC_VER
+ #pragma warning( push )
+ #pragma warning( disable : 4530 )
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index fb496e309..d92937e2c 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 142485 2011-11-10 18:57:46Z ronald $
-# Maintainer: Andrea Scarpino <ronald@archlinux.org>
+# $Id: PKGBUILD 146190 2012-01-05 20:00:07Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.5.0
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -14,11 +14,19 @@ url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
              'cmake' 'automoc4' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('15b8b16d7cce6ac50fb958d30166214f2f2b83ee')
-
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+	"boost148.patch" "libkipi140.patch")
+sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383'
+          '93853084905b21309c46ce7d585021e76283d429'
+          '8a8f624fd0ca768a9dcd706405eb6e4944892d87')
 build() {
   cd "${srcdir}"
+
+  pushd ${pkgname}-${pkgver}/core
+  patch -Np0 -i ${srcdir}/boost148.patch
+  patch -Np1 -i ${srcdir}/libkipi140.patch
+  popd
+
   mkdir build
   cd build
   # Use internal lensfun (FS#21816)
diff --git a/extra/digikam/boost148.patch b/extra/digikam/boost148.patch
new file mode 100644
index 000000000..6d3ff585b
--- /dev/null
+++ b/extra/digikam/boost148.patch
@@ -0,0 +1,65 @@
+diff -u libs/database/imagehistory/imagehistorygraph_boost.h ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h
+--- libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 08:32:19.837388059 -0500
++++ ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 09:17:27.798341897 -0500
+@@ -1198,7 +1198,7 @@
+             {
+                 boost::dag_shortest_paths(graph, v,
+                                           // we provide a constant weight of 1
+-                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
++                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
+                                           // Store distance and predecessors in QMaps, wrapped to serve as property maps
+                                           distance_map(VertexIntMapAdaptor(distances)).
+                                           predecessor_map(VertexVertexMapAdaptor(predecessors))
+@@ -1218,7 +1218,7 @@
+             {
+                 boost::dag_shortest_paths(graph, v,
+                                           // we provide a constant weight of 1
+-                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
++                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
+                                           // Invert the default compare method: With greater, we get the longest path
+                                           distance_compare(std::greater<int>()).
+                                           // will be returned if a node is unreachable
+@@ -1384,14 +1384,15 @@
+         template <class GraphType, typename VertexLessThan>
+         class lessThanMapEdgeToTarget
+         {
++            typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
+         public:
+             lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
+                 : g(g), vertexLessThan(vertexLessThan) {}
+             const GraphType& g;
+             VertexLessThan vertexLessThan;
+-            bool operator()(const Edge& a, const Edge& b)
++            bool operator()(const edge_descriptor& a, const edge_descriptor& b)
+             {
+-                return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
++                return vertexLessThan(boost::target(a, g), boost::target(b, g));
+             }
+         };
+ 
+@@ -1402,20 +1403,21 @@
+         {
+             typedef std::pair<Vertex, QList<Edge> > VertexInfo;
+ 
+-            QList<Edge>             outEdges;
++            typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
++            QList<edge_descriptor> outEdges;
+             std::vector<VertexInfo> stack;
+ 
+             boost::put(color, u, boost::gray_color);
+             vis.discover_vertex(u, g);
+ 
+-            outEdges = toEdgeList(boost::out_edges(u, g));
++            outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
+             // Sort edges. The lessThan we have takes vertices, so we use a lessThan which
+             // maps the given edges to their targets, and calls our vertex lessThan.
+             qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
+ 
+-            foreach(const Edge& e, outEdges)
++            foreach(const edge_descriptor& e, outEdges)
+             {
+-                Vertex v = boost::target(e.toEdge(), g);
++                Vertex v = boost::target(e, g);
+                 vis.examine_edge(e, g);
+                 boost::default_color_type v_color = boost::get(color, v);
+                 if (v_color == boost::white_color)
diff --git a/extra/digikam/libkipi140.patch b/extra/digikam/libkipi140.patch
new file mode 100644
index 000000000..a221b5847
--- /dev/null
+++ b/extra/digikam/libkipi140.patch
@@ -0,0 +1,63 @@
+diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
+index 0f4030a..b8efb35 100644
+--- a/utilities/setup/setupplugins.cpp
++++ b/utilities/setup/setupplugins.cpp
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
+@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
+ 
+     panel->setLayout(mainLayout);
+ 
++#if KIPI_VERSION < 0x010400
++    d->checkAllBtn->setVisible(false);
++    d->clearBtn->setVisible(false);
++#endif
++
+     initPlugins();
+ 
+     // --------------------------------------------------------
+@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
+ void SetupPlugins::slotCheckAll()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotCheckAll();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+ void SetupPlugins::slotClear()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotClear();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
+index 271a569..114e0fa 100644
+--- a/utilities/setup/setupplugins.h
++++ b/utilities/setup/setupplugins.h
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
+
+  
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index 4b202d372..cd3d71d73 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 137977 2011-09-13 15:26:07Z juergen $
+# $Id: PKGBUILD 146181 2012-01-05 13:48:00Z juergen $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
+
 pkgname=emacs
 _majorver=23.3
-_minorver=a
+_minorver=b
 # We want something like "23.3.a" so pacman version comparison works, but
 # upstream uses "23.3a", which is a bit silly and interpreted as alpha.
 pkgver=$_majorver.$_minorver
 _realver=$_majorver$_minorver
-pkgrel=3.1
+pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop)
-md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04'
-         '8af038d2ba4561271e935bb444ceb4e3')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz)
+md5sums=('f2bfd8eab7e3b34a0f7f09acc0667e71')
 
 build() {
   cd "$srcdir"/$pkgname-$_majorver
@@ -42,9 +42,4 @@ package() {
   chmod 775 "$pkgdir"/var/games/emacs
   chmod 664 "$pkgdir"/var/games/emacs/*
   chown -R root:games "$pkgdir"/var/games
-
-  # fix  FS#9253
-  mkdir -p "$pkgdir"/usr/share/pixmaps "$pkgdir"/usr/share/applications
-  install -D -m644 "$srcdir"/$pkgname.desktop   "$pkgdir"/usr/share/applications
-  ln -s  ../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png "$pkgdir"/usr/share/pixmaps/emacs-icon.png
 }
diff --git a/extra/expect/PKGBUILD b/extra/expect/PKGBUILD
index 57e7fe5f7..29099e923 100644
--- a/extra/expect/PKGBUILD
+++ b/extra/expect/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=expect
 pkgver=5.45
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A tool for automating interactive applications"
 arch=(i686 x86_64 'mips64el')
 url="http://www.nist.gov/el/msid/expect.cfm"
diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD
index 7e77ed5b8..61c5b9320 100644
--- a/extra/foobillard++/PKGBUILD
+++ b/extra/foobillard++/PKGBUILD
@@ -1,36 +1,38 @@
-# $Id: PKGBUILD 141931 2011-11-03 08:55:49Z eric $
+# $Id: PKGBUILD 146196 2012-01-05 21:53:59Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=foobillard++
-pkgver=3.41beta
-pkgrel=1
+pkgver=3.42beta
+pkgrel=2
 pkgdesc="An OpenGL billiard game"
 arch=(mips64el)
 url="http://foobillardplus.sourceforge.net/"
 license=('GPL2')
-depends=('bzip2' 'freetype2' 'libpng' 'mesa' 'sdl_net')
+depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer')
 replaces=('foobillard')
 source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz)
-sha1sums=('41d6db473557386ffeacd98b9a2ee26198e42c6a')
+sha1sums=('51507efab0f595cfff26149003faf669c0a42f32')
 
 build() {
   cd "${srcdir}/foobillardplus-${pkgver}"
-  sed -i 's|$prefix/foobillardplus|$prefix|' configure
-  sed -i 's|$prefix/data|$prefix/share/foobillardplus|' configure
-  sed -i 's|"/data"|"/share/foobillardplus"|' src/language.c
   sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop
   sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop
-  ./configure --prefix=/usr
+  aclocal --force
+  autoconf -f
+  autoheader -f
+  automake -a -c -f 
+  ./configure --prefix=/usr/share
   make
 }
 
 package() {
   cd "${srcdir}/foobillardplus-${pkgver}"
-  install -Dm755 src/foobillardplus "${pkgdir}/usr/bin/foobillardplus"
-  install -d "${pkgdir}/usr/share/foobillardplus"
-  cp -R data/* "${pkgdir}/usr/share/foobillardplus"
-  install -Dm644 foobillardplus.desktop "${pkgdir}/usr/share/applications/foobillardplus.desktop"
-  install -Dm644 foobillardplus.png "${pkgdir}/usr/share/pixmaps/foobillardplus.png"
-  install -Dm644 foobillardplus.xbm "${pkgdir}/usr/share/pixmaps/foobillardplus.xbm"
-  find "${pkgdir}" -depth  -type d -name .svn -exec rm -rf  {} \;
+  make DESTDIR="${pkgdir}" datadir="${pkgdir}/usr/share/foobillardplus/data" \
+    prefix="${pkgdir}/usr/share" install
+
+  install -d "${pkgdir}"/usr/{bin,share/{applications,pixmaps}}
+  mv "${pkgdir}"/usr/share/{AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO} "${pkgdir}/usr/share/foobillardplus" 
+  mv "${pkgdir}"/usr/share/foobillardplus.desktop "${pkgdir}"/usr/share/applications
+  mv "${pkgdir}"/usr/share/foobillardplus.{png,xbm} "${pkgdir}"/usr/share/pixmaps
+  ln -s /usr/share/foobillardplus/bin/foobillardplus "${pkgdir}"/usr/bin/foobillardplus
 }
diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD
index 0b999c706..a0255ea9b 100644
--- a/extra/fping/PKGBUILD
+++ b/extra/fping/PKGBUILD
@@ -1,27 +1,20 @@
-# $Id: PKGBUILD 143741 2011-11-28 19:17:54Z giovanni $
+# $Id: PKGBUILD 146192 2012-01-05 20:11:27Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=fping
-pkgver=2.4b2
-pkgrel=5
+pkgver=3.0
+pkgrel=1
 pkgdesc="A utility to ping multiple hosts at once"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://packages.qa.debian.org/"
+url="http://www.fping.org/"
 license=('custom') 
 depends=('glibc')
-source=("http://ftp.de.debian.org/debian/pool/main/f/fping/fping_2.4b2-to-ipv6.orig.tar.gz"
-        'fping_2.4b2-to-ipv6-16.1.diff'
-        'fping-2.4b2_p161-min-time.patch')
-md5sums=('3ad516765514249a40d3c5b6caab812a'
-         '4881e981971379a0948b31719e4505f5'
-         '36753d9556eba1a6159c20c8db3e2232')
+source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz")
+md5sums=('e937c9a2b1d65b6f5294fec57891645b')
 
 build() {
-  cd $srcdir/$pkgname-2.4b2_to-ipv6
-
-  patch -Np1 -i ${srcdir}/fping_2.4b2-to-ipv6-16.1.diff
-  patch -Np1 -i ${srcdir}/fping-2.4b2_p161-min-time.patch
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr \
               --mandir=/usr/share/man
@@ -29,7 +22,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-2.4b2_to-ipv6
+  cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="${pkgdir}" install
 
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 798aee88a..fd78701e2 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145025 2011-12-15 06:57:18Z andyrtr $
+# $Id: PKGBUILD 146077 2012-01-05 09:04:51Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.9
+pkgver=3.0.10
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
 [ "$CARCH" = "mips64el" ] || makedepends=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('7e5d749f28eda1c781c89a2e520913c8')
+md5sums=('6d92a1e154833a70a21e771f41e5c512')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -21,7 +21,7 @@ build() {
 	--with-zlib \
 	--disable-static \
 	--disable-guile \
-	--disable-valgrind-tests # breaks make check. errors have been reported upstream
+	--disable-valgrind-tests # x86_64 test are all passed. some fail in i686 chroot
   make
 }
 
diff --git a/extra/ltrace/PKGBUILD b/extra/ltrace/PKGBUILD
index 98b2c33fe..27d3518ac 100644
--- a/extra/ltrace/PKGBUILD
+++ b/extra/ltrace/PKGBUILD
@@ -1,28 +1,39 @@
-# $Id: PKGBUILD 87253 2010-08-11 14:16:17Z allan $
-# Maintainer:
+# $Id: PKGBUILD 146208 2012-01-06 03:36:04Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ltrace
-pkgver=0.5.3
-pkgrel=2
-pkgdesc="A debugging program which runs a specified command until it exits"
+pkgver=0.6.0
+pkgrel=1
+pkgdesc="Tracks runtime library calls in dynamically linked programs"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://packages.debian.org/sid/ltrace"
+url="http://ltrace.alioth.debian.org/"
 license=('GPL')
-depends=('glibc' 'elfutils')
+depends=('elfutils')
 backup=('etc/ltrace.conf')
-source=(http://ftp.debian.org/debian/pool/main/l/ltrace/${pkgname}_${pkgver}.orig.tar.gz)
-md5sums=('3fa7fe715ab879db08bd06d1d59fd90f')
+source=(http://dev.archlinux.org/~foutrelis/sources/ltrace/$pkgname-$pkgver.tar.xz
+        fix-crash-on-int3-after-symcall.patch)
+sha256sums=('13e4a66aa1f2ad23fd4ddd7faa79c52a68f210155eeb6490ce421f2a07fa0706'
+            'ef2c33c94b5cbfc552e5e734ac5627918ace918f48db5d3f29f1c0dcb1732d04')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's|/usr/bin/install|/bin/install|' configure
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Fix FS#27250: SIGSEGV due to int3 right after a call instruction
+  patch -Np1 -i "$srcdir/fix-crash-on-int3-after-symcall.patch"
+
+  ./autogen.sh
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc
   make
 }
 
 package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/ltrace/fix-crash-on-int3-after-symcall.patch b/extra/ltrace/fix-crash-on-int3-after-symcall.patch
new file mode 100644
index 000000000..5e0a7911c
--- /dev/null
+++ b/extra/ltrace/fix-crash-on-int3-after-symcall.patch
@@ -0,0 +1,14 @@
+diff -upr ltrace-0.6.0.orig/handle_event.c ltrace-0.6.0/handle_event.c
+--- ltrace-0.6.0.orig/handle_event.c	2011-01-07 21:29:30.000000000 +0200
++++ ltrace-0.6.0/handle_event.c	2012-01-06 05:14:04.000000000 +0200
+@@ -617,6 +617,10 @@ handle_breakpoint(Event *event) {
+ 	}
+ 
+ 	if ((sbp = address2bpstruct(event->proc, event->e_un.brk_addr))) {
++		if (sbp->libsym == NULL) {
++			continue_after_breakpoint(event->proc, sbp);
++			return;
++		}
+ 		if (strcmp(sbp->libsym->name, "") == 0) {
+ 			debug(2, "Hit _dl_debug_state breakpoint!\n");
+ 			arch_check_dbg(event->proc);
diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD
index c3af7e031..fbc77bd84 100644
--- a/extra/scummvm/PKGBUILD
+++ b/extra/scummvm/PKGBUILD
@@ -1,23 +1,21 @@
-# $Id: PKGBUILD 135987 2011-08-21 05:01:03Z eric $
-# Maintainer: juergen <juergen@hoetzel.info>
+# $Id: PKGBUILD 146120 2012-01-05 12:48:56Z juergen $
+# Maintainer: juergen <juergen@archlinux.org>
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
-pkgver=1.3.1
+pkgver=1.4.0
 pkgrel=2
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.scummvm.org/"
 depends=('libmad' 'sdl' 'fluidsynth')
-makedepends=('libmpeg2')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('87e5076e93bfa762f1c5d7f45b41d4e2')
+md5sums=('361000b78ebf0d0f449e98238d677be1')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   ./configure --backend=sdl --disable-debug \
-    --enable-mpeg2 --with-mpeg2-prefix=/usr \
     --with-flac-prefix=/usr \
     --with-fluidsynth-prefix=/usr \
     --prefix=/usr
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index 260ee2d77..78a374c66 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141613 2011-10-31 19:59:13Z andrea $
+# $Id: PKGBUILD 146186 2012-01-05 14:57:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=soprano
-pkgver=2.7.3
+pkgver=2.7.4
 pkgrel=1
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
 makedepends=('cmake' 'openjdk6' 'doxygen')
 [ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2674ab79c3ec17e4d1b7ecfc76651cd0')
+md5sums=('783fb07f9679f45e987aff7a17bef649')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/thunar-media-tags-plugin/PKGBUILD b/extra/thunar-media-tags-plugin/PKGBUILD
index 7cdda5203..18be666e0 100644
--- a/extra/thunar-media-tags-plugin/PKGBUILD
+++ b/extra/thunar-media-tags-plugin/PKGBUILD
@@ -1,36 +1,23 @@
-# $Id: PKGBUILD 108077 2011-01-29 12:18:52Z andyrtr $
+# $Id: PKGBUILD 146210 2012-01-06 03:43:06Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar-media-tags-plugin
-pkgver=0.1.2.99.git20110129
+pkgver=0.2.0
 pkgrel=1
-pkgdesc="adds special features for media files to the Thunar File Manager"
+pkgdesc="Adds special features for media files to the Thunar File Manager"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
+license=('GPL')
 url="http://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
 groups=('xfce4-goodies')
 depends=('taglib' 'thunar')
-makedepends=('intltool' 'xfce4-dev-tools')
+makedepends=('intltool')
 options=('!libtool')
-source=(#http://archive.xfce.org/src/thunar-plugins/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2
-	# broken master http://git.xfce.org/thunar-plugins/thunar-media-tags-plugin/snapshot/thunar-media-tags-plugin-8d29c1f4672f41baabc84ec02630c79793ead159.tar.bz2
-	# thunarx-2 branch 
-	#http://git.xfce.org/thunar-plugins/thunar-media-tags-plugin/snapshot/thunar-media-tags-plugin-270924abcab81275dede68d882936c14b238b3ec.tar.bz2
-	ftp://ftp.archlinux.org/other/$pkgname/thunar-media-tags-plugin-270924abcab81275dede68d882936c14b238b3ec.tar.bz2
-	0001-Switch-to-the-new-tooltip-api-in-gtk-depend-on-gtk-2.patch
-	04_fix-implicit-dso-linking.patch)
-md5sums=('faf79a2568ae7b76477ddd0d9ffe9380'
-         '199e0f657333ed1d09947b7d4fdeb493'
-         'b310ccc46752f672a1030c4e17093b77')
+source=(http://archive.xfce.org/src/thunar-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('1111b4dae10156ab91adb4eadb26586593b1b023')
 
 build() {
-#  cd ${srcdir}/${pkgname}-${pkgver}
-  cd ${srcdir}/${pkgname}*
-  # fixes for new thunar taken from http://bugzilla.xfce.org/show_bug.cgi?id=6295
-  patch -Np1 -i ${srcdir}/0001-Switch-to-the-new-tooltip-api-in-gtk-depend-on-gtk-2.patch
-  patch -Np1 -i ${srcdir}/04_fix-implicit-dso-linking.patch
-  xdt-autogen
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/xfce4 \
@@ -41,7 +28,6 @@ build() {
 }
 
 package() {
-#  cd ${srcdir}/${pkgname}-${pkgver}
-  cd ${srcdir}/${pkgname}*
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/vsftpd/PKGBUILD b/extra/vsftpd/PKGBUILD
index d1651dd39..77604f684 100644
--- a/extra/vsftpd/PKGBUILD
+++ b/extra/vsftpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131827 2011-07-15 23:59:43Z dreisner $
+# $Id: PKGBUILD 146202 2012-01-06 00:42:46Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=vsftpd
-pkgver=2.3.4
-pkgrel=2
+pkgver=2.3.5
+pkgrel=1
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://security.appspot.com/vsftpd.html"
@@ -12,12 +12,10 @@ license=('GPL2')
 depends=('openssl')
 backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
 install=vsftpd.install
-source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz"
+source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc}
         'vsftpd.xinetd' 'vsftpd.d')
-md5sums=('2ea5d19978710527bb7444d93b67767a'
-         'b07fd4609c70063c1d6b20142910c1a6'
-         '60060a6c7db3b3b7baa1561a302e6923')
-sha1sums=('b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea'
+sha1sums=('f15b39ba6d68c953ab3c3e613e6ddc2a26493755'
+          '2ddf92782f19dafc72439a2917acb1d7e124d149'
           'c87b4ce56dac15223694a6e86c01ea813b877596'
           '24f268956c24e78be0c234c6d31f41487922eafe')
 
diff --git a/extra/xfce4-genmon-plugin/PKGBUILD b/extra/xfce4-genmon-plugin/PKGBUILD
index 31c9e9cd6..724d79bb1 100644
--- a/extra/xfce4-genmon-plugin/PKGBUILD
+++ b/extra/xfce4-genmon-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 116662 2011-03-24 17:55:38Z andyrtr $
+# $Id: PKGBUILD 146212 2012-01-06 03:56:23Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-genmon-plugin
-pkgver=3.3.0
-pkgrel=1.1.1
+pkgver=3.3.1
+pkgrel=1
 pkgdesc="plugin that monitors customizable programs stdout for the Xfce4 panel"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL2.1')
@@ -13,12 +13,11 @@ groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4')
 makedepends=('gettext' 'intltool')
 options=('!libtool')
-source=("http://archive.xfce.org/src/panel-plugins/${pkgname}/3.3/${pkgname}-${pkgver}.tar.bz2" 'patch.patch')
-md5sums=('7c95234dc99efc21bbf9d2b056dd21f9' '45323dd0f93c35a36f98d61ef0e2ba5b')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/3.3/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('e0022e15d4211a87c17d9f252b68e1d3')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch panel-plugin/main.c ${srcdir}/patch.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
diff --git a/kde-unstable/kdelibs/fix-knotify-filepath.patch b/kde-unstable/kdelibs/fix-knotify-filepath.patch
deleted file mode 100644
index 2cd995e97..000000000
--- a/kde-unstable/kdelibs/fix-knotify-filepath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp
-index 88d18b6..0e76658 100644
---- a/knotify/config/knotifyconfigactionswidget.cpp
-+++ b/knotify/config/knotifyconfigactionswidget.cpp
-@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay(  )
- 	KUrl soundURL = m_ui.Sound_select->url();
- 	if ( soundURL.isRelative() )
- 	{
--		QString soundString = soundURL.toLocalFile();
-+		QString soundString = m_ui.Sound_select->text();
- 		// we need a way to get the application name in order to ba able to do this :
- 		/*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
- 		search = KGlobal::mainComponent().dirs()->findResource("data", search);
diff --git a/kde-unstable/kdemultimedia/fix-kmix-high-cpu.patch b/kde-unstable/kdemultimedia/fix-kmix-high-cpu.patch
deleted file mode 100644
index 8ff32e866..000000000
--- a/kde-unstable/kdemultimedia/fix-kmix-high-cpu.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-Index: kmix/gui/mdwslider.h
-===================================================================
---- kmix/gui/mdwslider.h	(revision 1270927)
-+++ kmix/gui/mdwslider.h	(revision 1270928)
-@@ -56,7 +56,7 @@
- 	       bool includePlayback, bool includeCapture,
- 	       bool small, Qt::Orientation,
- 	       QWidget* parent, ViewBase* view, ProfControl *pctl);
--    ~MDWSlider() { }
-+    virtual ~MDWSlider();
- 
-     enum LabelType { LT_ALL, LT_FIRST_CAPTURE, LT_NONE };
-     void addActionToPopup( KAction *action );
-Index: kmix/gui/viewbase.cpp
-===================================================================
---- kmix/gui/viewbase.cpp	(revision 1270927)
-+++ kmix/gui/viewbase.cpp	(revision 1270928)
-@@ -128,13 +128,14 @@
-     // allow view to "polish" itself
-     constructionFinished();
- 
--   kDebug() << "CONNECT ViewBase count " << _mixers.size();
--  foreach ( Mixer* mixer, _mixers )
--  {
--    kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id(); 
--   connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) );
--   connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfigured(QString)) );
--  }
-+// Moved the following up one Level to KMixerWidget
-+//   kDebug() << "CONNECT ViewBase count " << _mixers.size();
-+//  foreach ( Mixer* mixer, _mixers )
-+//  {
-+//    kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id();
-+//   connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) );
-+//   connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfigured(QString)) );
-+//  }
- 
-     
- }
-@@ -217,10 +218,6 @@
- 		setMixSet();
- 		kDebug(67100) << "ViewBase::controlsReconfigured() " << mixer_ID << ": Recreating widgets (mixset contains: " << _mixSet->count() << ")";
- 		createDeviceWidgets();
--
--		// We've done the low level stuff our selves but let elements
--		// above know what has happened so they can reload config etc.
--		emit redrawMixer(mixer_ID);
- 	}
- }
- 
-Index: kmix/gui/kmixerwidget.h
-===================================================================
---- kmix/gui/kmixerwidget.h	(revision 1270927)
-+++ kmix/gui/kmixerwidget.h	(revision 1270928)
-@@ -75,6 +75,10 @@
-    void saveConfig( KConfig *config );
-    void loadConfig( KConfig *config );
- 
-+  private slots:
-+    void controlsReconfiguredToplevel(QString mixerId);
-+    void refreshVolumeLevelsToplevel();
-+
-   private:
-    Mixer *_mixer;
-    QVBoxLayout *m_topLayout; // contains TabWidget
-@@ -82,6 +86,7 @@
-    ProfTab* _tab;
-    std::vector<ViewBase*> _views;
-    KActionCollection* _actionCollection;  // -<- applciations wide action collection
-+   QWidget* _mainWindow;
- 
-    
-    void createLayout(ViewBase::ViewFlags vflags);
-Index: kmix/gui/mixdevicewidget.h
-===================================================================
---- kmix/gui/mixdevicewidget.h	(revision 1270927)
-+++ kmix/gui/mixdevicewidget.h	(revision 1270928)
-@@ -47,7 +47,7 @@
-     MixDeviceWidget( MixDevice* md,
-                      bool small, Qt::Orientation orientation,
-                      QWidget* parent, ViewBase*, ProfControl * );
--    ~MixDeviceWidget();
-+    virtual ~MixDeviceWidget();
- 
-     void addActionToPopup( KAction *action );
- 
-Index: kmix/gui/mdwslider.cpp
-===================================================================
---- kmix/gui/mdwslider.cpp	(revision 1270927)
-+++ kmix/gui/mdwslider.cpp	(revision 1270928)
-@@ -81,6 +81,17 @@
-     update();
- }
- 
-+MDWSlider::~MDWSlider()
-+{
-+	foreach( QAbstractSlider* slider, m_slidersPlayback)
-+	{
-+		delete slider;
-+	}
-+	foreach( QAbstractSlider* slider, m_slidersCapture)
-+	{
-+		delete slider;
-+	}
-+}
- 
- void MDWSlider::createActions()
- {
-Index: kmix/gui/kmixerwidget.cpp
-===================================================================
---- kmix/gui/kmixerwidget.cpp	(revision 1270927)
-+++ kmix/gui/kmixerwidget.cpp	(revision 1270928)
-@@ -37,6 +37,7 @@
- #include <ktabwidget.h>
- 
- // KMix
-+#include "apps/kmix.h"
- #include "gui/guiprofile.h"
- #include "gui/kmixerwidget.h"
- #include "gui/kmixtoolbox.h"
-@@ -58,6 +59,8 @@
-      m_topLayout(0), _guiprof(guiprof),
-      _actionCollection(actionCollection)
- {
-+	_mainWindow = parent;
-+	//kDebug() << "kmixWindow created: parent=" << parent << ", parentWidget()=" << parentWidget();
-    if ( _mixer )
-    {
-       createLayout(vflags);
-@@ -169,13 +172,42 @@
-       connect( vbase, SIGNAL(toggleMenuBar()), parentWidget(), SLOT(toggleMenuBar()) );
-       // *this will be deleted on rebuildGUI(), so lets queue the signal
-       connect( vbase, SIGNAL(rebuildGUI())   , parentWidget(), SLOT(recreateGUIwithSavingView()), Qt::QueuedConnection );
--      connect( vbase, SIGNAL(redrawMixer(QString)), parentWidget(), SLOT(redrawMixer(QString)), Qt::QueuedConnection );
-+      //connect( vbase, SIGNAL(redrawMixer(QString)), parentWidget(), SLOT(redrawMixer(QString)), Qt::QueuedConnection );
-+
-+      kDebug() << "CONNECT ViewBase count " << vbase->getMixers().size();
-+	  foreach ( Mixer* mixer, vbase->getMixers() )
-+	  {
-+	    kDebug(67100) << "CONNECT ViewBase controlschanged" << mixer->id();
-+	   connect ( mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevelsToplevel()) );
-+	   connect ( mixer, SIGNAL(controlsReconfigured(QString)), this, SLOT(controlsReconfiguredToplevel(QString)) );
-+	  }
-       return true;
-    }
- }
- 
-+void KMixerWidget::controlsReconfiguredToplevel(QString mixerId)
-+{
-+	foreach ( ViewBase* vbase, _views)
-+	{
-+		vbase->controlsReconfigured(mixerId);
-+	}
-+	KMixWindow* kmixWindow = qobject_cast<KMixWindow*>(_mainWindow);
-+	kDebug() << "kmixWindow to redraw: " << kmixWindow << ", not-casted=" << _mainWindow;
-+	if (kmixWindow != 0)
-+	{
-+		kmixWindow->redrawMixer(mixerId);
-+	}
-+}
- 
-+void KMixerWidget::refreshVolumeLevelsToplevel()
-+{
-+	foreach ( ViewBase* vbase, _views)
-+	{
-+		vbase->refreshVolumeLevels();
-+	}
-+}
- 
-+
- /**
-  * Returns the current View. Normally we have only one View, so we always return the first view.
-  * This method is only here for one reason: We can plug in an action in the main menu, so that
-Index: kmix/gui/viewbase.h
-===================================================================
---- kmix/gui/viewbase.h	(revision 1270927)
-+++ kmix/gui/viewbase.h	(revision 1270928)
-@@ -114,6 +114,8 @@
-    GUIProfile* guiProfile() { return _guiprof; };
-    KActionCollection* actionCollection() { return _actions; };
- 
-+   QSet<Mixer*>& getMixers() { return _mixers; };
-+
-     /**
-      * Contains the widgets for the _mixSet. There is a 1:1 relationship, which means:
-      * _mdws[i] is the Widget for the MixDevice _mixSet[i] - please see ViewBase::createDeviceWidgets().
-@@ -124,7 +126,7 @@
- 
- signals:
-     void rebuildGUI();
--    void redrawMixer( const QString& mixer_ID );
-+    //void redrawMixer( const QString& mixer_ID );
- 
- 
- protected:
diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD
new file mode 100644
index 000000000..6fd9c4c96
--- /dev/null
+++ b/testing/kmod/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 146216 2012-01-06 04:24:28Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+
+pkgname=kmod
+pkgver=3
+pkgrel=3
+pkgdesc="Linux kernel module handling"
+arch=('i686' 'x86_64')
+url="http://git.profusion.mobi/cgit.cgi/kmod.git"
+license=('GPL2')
+depends=('glibc' 'zlib')
+options=('!libtool')
+provides=('module-init-tools=3.16')
+conflicts=('module-init-tools')
+replaces=('module-init-tools')
+source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz"
+        "depmod-search.conf"
+        "return-non-zero-on-fail.patch")
+md5sums=('bc0e69f75c2ac22c091f05e166e86c5d'
+         '4b8cbcbc54b9029c99fd730e257d4436'
+         '4be6f783a7fc2d1747ccaa2536d2e88f')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <"$srcdir/return-non-zero-on-fail.patch"
+
+  ./configure \
+    --with-rootprefix= \
+    --with-rootlibdir=/lib \
+    --with-zlib
+
+  make
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+  # binary directories
+  install -dm755 "$pkgdir"/{,s}bin
+
+  # configuration directories
+  install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d
+
+  # add symlinks to kmod
+  ln -s /usr/bin/kmod "$pkgdir/bin/lsmod"
+  for tool in {ins,rm,dep}mod mod{info,probe}; do
+    ln -s ../usr/bin/kmod "$pkgdir/sbin/$tool"
+  done
+
+  # install depmod.d file for search/ dir
+  install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/lib/depmod.d/search.conf"
+}
+
+# vim: ft=sh syn=sh et
diff --git a/testing/kmod/depmod-search.conf b/testing/kmod/depmod-search.conf
new file mode 100644
index 000000000..3feb67b05
--- /dev/null
+++ b/testing/kmod/depmod-search.conf
@@ -0,0 +1,5 @@
+#
+# /etc/depmod.d/depmod.conf
+#
+
+search updates extramodules built-in
diff --git a/testing/kmod/return-non-zero-on-fail.patch b/testing/kmod/return-non-zero-on-fail.patch
new file mode 100644
index 000000000..4802a825f
--- /dev/null
+++ b/testing/kmod/return-non-zero-on-fail.patch
@@ -0,0 +1,30 @@
+diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
+index b6af26f..8506193 100644
+--- a/tools/kmod-modinfo.c
++++ b/tools/kmod-modinfo.c
+@@ -279,6 +279,12 @@ static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias)
+ 		LOG("Module alias %s not found.\n", alias);
+ 		return err;
+ 	}
++
++	if (list == NULL) {
++		LOG("Module %s not found.\n", alias);
++		return -ENOENT;
++	}
++
+ 	kmod_list_foreach(l, list) {
+ 		struct kmod_module *mod = kmod_module_get_module(l);
+ 		int r = modinfo_do(mod);
+diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
+index 8286b9b..6ca94f2 100644
+--- a/tools/kmod-modprobe.c
++++ b/tools/kmod-modprobe.c
+@@ -856,7 +856,7 @@ static int insmod_alias(struct kmod_ctx *ctx, const char *alias, const char *ext
+ 
+ 	if (list == NULL) {
+ 		LOG("Module %s not found.\n", alias);
+-		return err;
++		return -ENOENT;
+ 	}
+ 
+ 	if (use_blacklist) {
diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD
new file mode 100644
index 000000000..6bcc909f1
--- /dev/null
+++ b/testing/lirc/PKGBUILD
@@ -0,0 +1,104 @@
+# $Id: PKGBUILD 146184 2012-01-05 13:52:33Z tpowa $
+# Maintainer: Paul Mattal <paul@archlinux.org>
+
+pkgbase=lirc
+pkgname=('lirc' 'lirc-utils')
+pkgver=0.9.0
+pkgrel=9
+epoch=1
+_extramodules=extramodules-3.2-ARCH
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
+arch=('i686' 'x86_64')
+url="http://www.lirc.org/"
+license=('GPL')
+makedepends=('help2man' 'linux-headers>=3.2' 'linux-headers<3.3' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+options=('!makeflags' '!strip')
+source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
+        lirc_wpc8769l.patch
+        lircd-handle-large-config.patch
+        lirc_atiusb-kfifo.patch
+        kernel-2.6.39.patch
+	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
+md5sums=('b232aef26f23fe33ea8305d276637086'
+         '1cce37e18e3f6f46044abab29016d18f'
+         'b70cc9640505205446ec47b7d4779f38'
+         '1f8b104a2365d9f93404b143f499059b'
+         '087a7d102e1c96bf1179f38db2b0b237'
+         '8d0e238dc0eda95e340fe570605da492'
+         '85f7fdac55e5256967241864049bf5e9'
+         '3deb02604b37811d41816e9b4385fcc3'
+         '5b1f8c9cd788a39a6283f93302ce5c6e'
+         'f0c0ac930326168035f0c8e24357ae55'
+         '69d099e6deedfa3c1ee2b6e82d9b8bfb')
+
+build() {
+  cd "${srcdir}/lirc-${pkgver}"
+  patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
+  patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
+  patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
+  patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
+
+  sed -i '/AC_PATH_XTRA/d' configure.ac
+  sed -e 's/@X_CFLAGS@//g' \
+      -e 's/@X_LIBS@//g' \
+      -e 's/@X_PRE_LIBS@//g' \
+      -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
+  libtoolize
+  autoreconf
+
+  PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
+      --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
+      --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
+      --with-transmitter
+
+  # Remove drivers already in kernel
+  sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
+      -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
+      -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
+      -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile 
+  make
+}
+
+package_lirc() {
+  pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
+  depends=('lirc-utils' 'linux>=3.1' 'linux<3.2')
+  replaces=('lirc+pctv')
+  install=lirc.install
+
+  cd "${srcdir}/lirc-${pkgver}/drivers"
+  make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install
+
+  # set the kernel we've built for inside the install script
+  sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
+  # gzip -9 modules
+  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+}
+
+package_lirc-utils() {
+  pkgdesc="Linux Infrared Remote Control utils"
+  depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
+  optdepends=('python2: pronto2lirc utility')
+  options=('strip' '!libtool')
+  backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
+
+  cd "${srcdir}/lirc-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
+  cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
+  cp -rp remotes "${pkgdir}/usr/share/lirc"
+  chmod -R go-w "${pkgdir}/usr/share/lirc/"
+
+  # install the logrotate config
+  install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
+    
+  # install conf.d file
+  install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
+
+  # install conf.d file
+  install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
+
+  install -d "${pkgdir}/etc/lirc"
+  
+  # remove built modules
+  rm -r "${pkgdir}/lib/"
+}
diff --git a/testing/lirc/irexec.conf b/testing/lirc/irexec.conf
new file mode 100644
index 000000000..f911c7515
--- /dev/null
+++ b/testing/lirc/irexec.conf
@@ -0,0 +1,5 @@
+#
+# Parameters for irexec daemon (path to lircrc)
+#
+
+IREXEC_OPTS=""
+\ No newline at end of file
diff --git a/testing/lirc/irexecd b/testing/lirc/irexecd
new file mode 100755
index 000000000..a64b033a5
--- /dev/null
+++ b/testing/lirc/irexecd
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/irexec.conf
+
+PID=`pidof -o %PPID /usr/bin/irexec`
+case "$1" in
+  start)
+    stat_busy "Starting IREXEC Daemon"
+    [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon irexecd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping IREXEC Daemon"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon irexecd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
diff --git a/testing/lirc/kernel-2.6.39.patch b/testing/lirc/kernel-2.6.39.patch
new file mode 100644
index 000000000..7353d61ca
--- /dev/null
+++ b/testing/lirc/kernel-2.6.39.patch
@@ -0,0 +1,54 @@
+diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
+--- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c	2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c	2011-06-07 17:02:20.356580306 +0200
+@@ -48,7 +48,6 @@
+ #include <linux/slab.h>
+ #include <linux/module.h>
+ #include <linux/kmod.h>
+-#include <linux/smp_lock.h>
+ #include <linux/completion.h>
+ #include <linux/uaccess.h>
+ #include <linux/usb.h>
+diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
+--- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c	2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c	2011-06-07 17:04:19.725933627 +0200
+@@ -555,8 +555,8 @@
+ 		kfree(ir);
+ 		return -EINVAL;
+ 	}
+-	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
+-	       adap->id, addr, ir->c.name);
++	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
++	       addr, ir->c.name);
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
+ 	/* register device */
+diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-06-07 17:07:23.984935411 +0200
+@@ -361,14 +361,14 @@
+ 		size = count << 3;
+ 
+ 		ldata = (unsigned long *) data_buf;
+-		next_one = generic_find_next_le_bit(ldata, size, 0);
++		next_one = find_next_zero_bit_le(ldata, size, 0);
+ 
+ 		if (next_one > 0)
+ 			put_pulse_bit(next_one
+ 				* WPC8769L_USECS_PER_BIT);
+ 
+ 		while (next_one < size) {
+-			next_zero = generic_find_next_zero_le_bit(ldata,
++			next_zero = find_next_zero_bit_le(ldata,
+ 				size, next_one + 1);
+ 
+ 			put_space_bit(
+@@ -376,7 +376,7 @@
+ 				* WPC8769L_USECS_PER_BIT);
+ 
+ 			if (next_zero < size) {
+-				next_one = generic_find_next_le_bit(ldata,
++				next_one = find_next_bit_le(ldata,
+ 					size, next_zero + 1);
+ 
+ 				put_pulse_bit(
diff --git a/testing/lirc/lirc.install b/testing/lirc/lirc.install
new file mode 100644
index 000000000..9bf905742
--- /dev/null
+++ b/testing/lirc/lirc.install
@@ -0,0 +1,16 @@
+EXTRAMODULES=extramodules-3.2-ARCH
+
+post_install() {
+  # updating module dependencies
+  echo ">>> Updating module dependencies. Please wait ..."
+  depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
+}
+
+post_upgrade() {
+  post_install
+}
+
+# arg 1:  the old package version
+post_remove() {
+  post_install
+}
diff --git a/testing/lirc/lirc.logrotate b/testing/lirc/lirc.logrotate
new file mode 100644
index 000000000..623c4f328
--- /dev/null
+++ b/testing/lirc/lirc.logrotate
@@ -0,0 +1,5 @@
+/var/log/lircd {
+   missingok
+   notifempty
+   delaycompress
+}
diff --git a/testing/lirc/lirc_atiusb-kfifo.patch b/testing/lirc/lirc_atiusb-kfifo.patch
new file mode 100644
index 000000000..a64984dce
--- /dev/null
+++ b/testing/lirc/lirc_atiusb-kfifo.patch
@@ -0,0 +1,31 @@
+From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
+From: Jason Martin <publicmsu@gmail.com>
+Date: Fri, 3 Jun 2011 00:12:51 -0400
+Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo
+
+I came across posts with regards to lirc_atiusb and its compatibility
+with newer kernels, and their use of kfifo.I spent a little bit of time
+this evening, and was able to correct the issues with the driver, and
+now have a functioning lirc_atiusb device under the 2.6.38 kernel.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_atiusb/lirc_atiusb.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
+index 52080de..bf2b631 100644
+--- a/drivers/lirc_atiusb/lirc_atiusb.c
++++ b/drivers/lirc_atiusb/lirc_atiusb.c
+@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
+ 		goto new_irctl_failure_check;
+ 	}
+ 
+-	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
++	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
+ 		mem_failure = 4;
+ 		goto new_irctl_failure_check;
+ 	}
+-- 
+1.7.0.1
+
diff --git a/testing/lirc/lirc_wpc8769l.patch b/testing/lirc/lirc_wpc8769l.patch
new file mode 100644
index 000000000..e4e2a049b
--- /dev/null
+++ b/testing/lirc/lirc_wpc8769l.patch
@@ -0,0 +1,88 @@
+From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com>
+Date: Wed, 30 Mar 2011 16:46:35 -0400
+Subject: [PATCH] Make lirc_wpc8769l functional again
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_wpc8769l/lirc_wpc8769l.c |   28 +++++++++++++++++-----------
+ 1 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+index f820d11..4d04063 100644
+--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
+ 	/* Reset last timeout value. */
+ 	lastus = 0;
+ 
+-	/* Init the read buffer. */
+-	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
+-		return -ENOMEM;
+-
+ 	/* Acquire the IRQ. */
+ 	result = request_irq(irq, irq_handler,
+ 			   IRQF_DISABLED | IRQF_SHARED,
+@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
+ 	/* Free the IRQ. */
+ 	free_irq(irq, THIS_MODULE);
+ 	dprintk("Freed IRQ %d\n", irq);
+-
+-	/* Free the RX buffer. */
+-	lirc_buffer_free(&rbuf);
+ }
+ 
+ static struct lirc_driver driver = {
+@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
+ 	/* Do load-time checks. */
+ 	wpc8769l_power_up_and_check_if_we_woke_us_up();
+ 
++	/* Init the read buffer. */
++	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
++		rc = -ENOMEM;
++		goto exit_platform_exit;
++	}
++
+ 	/* Configure the driver hooks. */
+ 	driver.features = LIRC_CAN_REC_MODE2;
++	driver.dev = &lirc_wpc8769l_platform_dev->dev;
+ 	driver.minor = lirc_register_driver(&driver);
+ 	if (driver.minor < 0) {
+ 		eprintk("lirc_register_driver failed!\n");
+ 		rc = -EIO;
+-		goto exit_platform_exit;
++		goto exit_release_buffer;
+ 	}
+ 
+ 	iprintk("Driver loaded.\n");
+ 
+ 	return 0; /* Everything OK. */
+ 
++exit_release_buffer:
++	lirc_buffer_free(&rbuf);
++
+ exit_platform_exit:
+ 	lirc_wpc8769l_platform_exit();
+ 
+@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
+ 
+ static void __exit lirc_wpc8769l_module_exit(void)
+ {
+-	/* Unregister the platform driver and device. */
+-	lirc_wpc8769l_platform_exit();
+-
+ 	/* Unregister the LIRC driver. */
+ 	lirc_unregister_driver(driver.minor);
+ 
++	/* Free the buffer. */
++	lirc_buffer_free(&rbuf);
++
++	/* Unregister the platform driver and device. */
++	lirc_wpc8769l_platform_exit();
++
+ 	/* Release the second range. */
+ 	if (baseport2)
+ 		release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
+-- 
+1.7.0.1
+
diff --git a/testing/lirc/lircd b/testing/lirc/lircd
new file mode 100755
index 000000000..e9739b36e
--- /dev/null
+++ b/testing/lirc/lircd
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/lircd.conf
+
+PID=$(pidof -o %PPID /usr/sbin/lircd)
+LIRCD_SYMLINKFILE=/dev/lircd
+LIRCD_SOCKET=/var/run/lirc/lircd
+case "$1" in
+  start)
+    stat_busy "Starting LIRC Daemon"
+   [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
+    rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
+    if [ $? -ne 0 ]; then
+      stat_fail
+      exit 0
+    fi
+    [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
+    [ -z "$PID" ] && 
+      if [ -n "$LIRC_DEVICE" ] ; then
+        eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+      else
+        /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+      fi
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon lircd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping LIRC Daemon"
+    rm -f $LIRCD_SYMLINKFILE
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon lircd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 start|stop|restart"
+esac
+exit 0
diff --git a/testing/lirc/lircd-handle-large-config.patch b/testing/lirc/lircd-handle-large-config.patch
new file mode 100644
index 000000000..85bc20518
--- /dev/null
+++ b/testing/lirc/lircd-handle-large-config.patch
@@ -0,0 +1,39 @@
+From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Wed, 6 Apr 2011 11:04:12 -0400
+Subject: [PATCH] lircd: handle larger config files in write_socket better
+
+Pointed out by Michael Zanetti on list, irsend LIST has issues with long
+config files, which didn't exist in maintainer mode, as we were using a
+do while loop to make sure we spit out everything. Just use that loop
+all the time.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ daemons/lircd.c |    8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index 6c21a3a..ddcca05 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
+ 	int done, todo = len;
+ 
+ 	while (todo) {
+-#ifdef SIM_REC
+ 		do {
+ 			done = write(fd, buf, todo);
+-		}
+-		while (done < 0 && errno == EAGAIN);
+-#else
+-		done = write(fd, buf, todo);
+-#endif
++		} while (done < 0 && errno == EAGAIN);
++
+ 		if (done <= 0)
+ 			return (done);
+ 		buf += done;
+-- 
+1.7.0.1
+
diff --git a/testing/lirc/lircd.conf b/testing/lirc/lircd.conf
new file mode 100644
index 000000000..760dab065
--- /dev/null
+++ b/testing/lirc/lircd.conf
@@ -0,0 +1,8 @@
+#
+# Parameters for lirc daemon
+#
+
+LIRC_DEVICE="/dev/lirc0"
+LIRC_DRIVER=""
+LIRC_EXTRAOPTS=""
+LIRC_CONFIGFILE=""
diff --git a/testing/lirc/lircmd b/testing/lirc/lircmd
new file mode 100755
index 000000000..220c47c9c
--- /dev/null
+++ b/testing/lirc/lircmd
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/lircmd`
+case "$1" in
+  start)
+    stat_busy "Starting lircmd Daemon"
+    [ -z "$PID" ] && /usr/sbin/lircmd
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon lircmd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping lircmd Daemon"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon lircmd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2012-01-08 15:04:28 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2012-01-08 15:04:28 -0300
commit	38e55a4f9ca44d32cc497abdafe5bcd4df23704b (patch)
tree	fe7a66290d7144394574c31b0582e307b3be2c65
parent	8aca2654c1403bb8cc9af1bb7d6b7a8fcfe8946e (diff)
parent	a9dea3be54150dd7aacef235d86ad62b547c718c (diff)