Wed Jul 18 00:01:34 UTC 2012

32 files changed, 455 insertions, 115 deletions

diff --git a/community-staging/gummi/PKGBUILD b/community-staging/gummi/PKGBUILD
index 1a4208c06..06e283e18 100644
--- a/community-staging/gummi/PKGBUILD
+++ b/community-staging/gummi/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 72840 2012-06-23 19:39:50Z arodseth $
+# $Id: PKGBUILD 73884 2012-07-16 10:46:51Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Sergio A. Morales <sergiomorales@archlinux.cl>
 # Contributor: soeren <nonick@posteo.de>
 
 pkgname=gummi
-pkgver=0.6.3
-pkgrel=3
+pkgver=0.6.4
+pkgrel=2
 pkgdesc='Simple LaTex editor for GTK users'
 arch=('x86_64' 'i686')
 url='http://gummi.midnightcoding.org/'
 license=('MIT')
 depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib' 'desktop-file-utils')
-makedepends=('glib2' 'gtk2' 'pango' 'poppler>=0.20.0' 'intltool')
+makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool')
 install=$pkgname.install
 source=("http://dev.midnightcoding.org/projects/$pkgname/latest.tar.gz")
-sha256sums=('d44196e56ed61e125bba01e5949be0928cf09919fdb80e62e6a41999a478f0ed')
+sha256sums=('ac5c1de476f8689040a185b01515544a5e53da45ff4e10a072b8944e9de8a6ff')
  
 build() {
   cd "$pkgname-$pkgver"
diff --git a/community-staging/mtpaint/PKGBUILD b/community-staging/mtpaint/PKGBUILD
index 7f984ae4b..1e0ed4c06 100644
--- a/community-staging/mtpaint/PKGBUILD
+++ b/community-staging/mtpaint/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 63821 2012-02-05 19:42:59Z arodseth $
+# $Id: PKGBUILD 73882 2012-07-16 10:28:41Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
+
 pkgname=mtpaint
 pkgver=3.40
-pkgrel=2
+pkgrel=5
 pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork"
 arch=('x86_64' 'i686')
 url="http://mtpaint.sourceforge.net/"
@@ -19,8 +20,8 @@ sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	patch -Np1 -i "$srcdir/libpng15.patch"
-	./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff
+	patch -Np1 -i ../libpng15.patch
+	./configure --prefix=/usr --mandir=/usr/share/man man intl gif jpeg tiff
   sed -i 's:-lpng:-lpng -lgif:' _conf.txt
 	make
 }
diff --git a/community-staging/mtpaint/mtpaint.install b/community-staging/mtpaint/mtpaint.install
index 99a538dea..ad97d7bab 100644
--- a/community-staging/mtpaint/mtpaint.install
+++ b/community-staging/mtpaint/mtpaint.install
@@ -1,13 +1,13 @@
 post_upgrade() {
-	update-desktop-database -q
+  update-desktop-database -q
 }
 
 post_install() {
-	post_upgrade
+  post_upgrade
 }
 
 post_remove() {
-	post_upgrade
+  post_upgrade
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD
index f566c9b71..2eddb8588 100644
--- a/community/ecryptfs-utils/PKGBUILD
+++ b/community/ecryptfs-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72650 2012-06-18 12:31:36Z tredaelli $
+# $Id: PKGBUILD 73892 2012-07-16 14:01:48Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Richard Murri <admin@richardmurri.com>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=ecryptfs-utils
-pkgver=97
+pkgver=99
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux"
@@ -14,7 +14,7 @@ makedepends=('swig' 'intltool' 'gettext')
 depends=('keyutils' 'nss' 'python2')
 source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz")
 options=(!libtool)
-md5sums=('74e8cacd5fa641075419ec02f6312421')
+md5sums=('17ef9190c6d078845e19d3e9a7d8ef7a')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/community/ming/PKGBUILD b/community/ming/PKGBUILD
new file mode 100644
index 000000000..9cffc5ea9
--- /dev/null
+++ b/community/ming/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Connor Behan <connor.behan@gmail.com>
+# Contributor: mar77i <mysatyre at gmail dot com>
+
+pkgname=ming
+pkgver=0.4.4
+pkgrel=1
+pkgdesc="SWF output library"
+arch=('i686' 'x86_64')
+url="http://www.libming.net/"
+license=('GPL' 'LGPL')
+depends=('freetype2' 'libpng' 'flex')
+makedepends=('bison' 'pkg-config' 'python2')
+options=('!libtool' '!emptydirs')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
+md5sums=('9e780f93670eaf68b1eefa6cdfc1d1e2')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver/
+  sed -i -e 's/ifndef HAVE_VASPRINTF/ifdef HAVE_VASPRINTF/' util/decompile.c util/makeswf.c
+  LDFLAGS="${LDFLAGS/ -Wl,--as-needed/}"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-python
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver/
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD
index 7fcd9d4d9..c584b82da 100644
--- a/community/perl-berkeleydb/PKGBUILD
+++ b/community/perl-berkeleydb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71751 2012-06-02 10:29:30Z bluewind $
+# $Id: PKGBUILD 73833 2012-07-16 05:37:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 # Contributor: Francois Charette <firmicus@gmx.net>
 
 pkgname=perl-berkeleydb
-pkgver=0.50
-pkgrel=4
+pkgver=0.51
+pkgrel=1
 pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/BerkeleyDB/"
@@ -13,7 +13,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl' 'db')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz)
-md5sums=('6afc8f49133c262c606d1b96e1412863')
+md5sums=('50d0d18227a6568e2557a1b1b33f8f55')
 
 build() {
   cd  $srcdir/BerkeleyDB-$pkgver
diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD
index 4bd5cf4d4..48bb3bcc8 100644
--- a/community/perl-dbd-odbc/PKGBUILD
+++ b/community/perl-dbd-odbc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71767 2012-06-02 10:30:02Z bluewind $
+# $Id: PKGBUILD 73845 2012-07-16 05:41:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-dbd-odbc
-pkgver=1.37
-pkgrel=2
+pkgver=1.39
+pkgrel=1
 pkgdesc="ODBC Driver for DBI"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/DBD-ODBC/"
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl-dbi' 'perl' 'unixodbc')
 options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz")
-md5sums=('0c294f8e3365c841dcee8a0ba4671c99')
+md5sums=('d73b16258ec13c811763eafc7813a435')
 
 build() {
   cd  DBD-ODBC-${pkgver}
diff --git a/community/pkgfile/PKGBUILD b/community/pkgfile/PKGBUILD
new file mode 100644
index 000000000..029b2347e
--- /dev/null
+++ b/community/pkgfile/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 73908 2012-07-17 01:41:42Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+
+pkgname=pkgfile
+pkgver=1
+pkgrel=1
+pkgdesc="a pacman .files metadata explorer"
+arch=('i686' 'x86_64')
+url="http://github.com/falconindy/pkgfile"
+license=('MIT')
+depends=('libarchive' 'curl' 'pcre' 'pacman')
+conflicts=('pkgtools<24-2')
+makedepends=('perl')
+source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz")
+install=pkgfile.install
+md5sums=('14e4e666fd6bfeae6fcb9313737c780d')
+
+build() {
+  make -C "$pkgname-$pkgver"
+}
+
+package() {
+  make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install
+}
+
+# vim: ft=sh syn=sh
diff --git a/community/pkgfile/pkgfile.install b/community/pkgfile/pkgfile.install
new file mode 100644
index 000000000..7653630b0
--- /dev/null
+++ b/community/pkgfile/pkgfile.install
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+post_install() {
+  printf "==> Run 'pkgfile ---update' to initialize the database\n"
+}
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index 437ee0aa5..efa5f6f66 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73587 2012-07-10 20:04:25Z dwallace $
+# $Id: PKGBUILD 73902 2012-07-16 23:37:35Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Antonio Rojas < nqn1976 @ gmail.com >
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -8,7 +8,7 @@
 
 pkgname=sage-mathematics
 pkgver=5.1
-pkgrel=1
+pkgrel=2
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
 arch=('i686' 'x86_64')
@@ -53,6 +53,11 @@ build() {
   # comment out if you're only building it for yourself
   export SAGE_FAT_BINARY='yes'
 
+  # set ATLAS_ARCH to provide the most compatibility. try fast or just leaving it black if
+  # compiling for yourself. http://trac.sagemath.org/sage_trac/ticket/10226
+  # export SAGE_ATLAS_ARCH=fast
+  export SAGE_ATLAS_ARCH=base
+
   # can't write to root in a clean chroot
   export DOT_SAGE='/build/src/'
 
diff --git a/community/sarg/PKGBUILD b/community/sarg/PKGBUILD
index f28d10479..11882d279 100644
--- a/community/sarg/PKGBUILD
+++ b/community/sarg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65425 2012-02-21 05:42:20Z spupykin $
+# $Id: PKGBUILD 73875 2012-07-16 07:53:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
 # Contributor: Tino Reichardt <milky-archlinux@mcmilk.de>
 
 pkgname=sarg
 pkgver=2.3.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Squid Analysis Report Generator"
 arch=('i686' 'x86_64')
 url="http://sarg.sourceforge.net"
@@ -21,6 +21,8 @@ md5sums=('bf637b8a820b81e2c55e815934151b4d')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
+  ./configure --prefix=/usr # po files workaround
+  rm -f Makefile
   LDFLAGS=-lm cmake -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc/sarg -DMANDIR=/usr/share/man/man1 .
   make
 }
@@ -29,6 +31,7 @@ package() {
   cd ${srcdir}/$pkgname-$pkgver
   mkdir -p $pkgdir/usr/share/sarg $pkgdir/etc
   make DESTDIR="$pkgdir" install
+  make -C po DESTDIR="$pkgdir" install
   cp -a sarg-php ${pkgdir}/usr/share/sarg/
   chmod -R o+r ${pkgdir}{/etc,/usr/share/sarg}
   chmod o+x ${pkgdir}/usr/share/sarg/sarg-php
diff --git a/community/texvc/PKGBUILD b/community/texvc/PKGBUILD
index 32dc337aa..75f7fe4f2 100644
--- a/community/texvc/PKGBUILD
+++ b/community/texvc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59805 2011-11-30 12:45:27Z spupykin $
+# $Id: PKGBUILD 73896 2012-07-16 14:22:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=texvc
-pkgver=1.18.0
-_svnrev=103240
+pkgver=1.19.1
+_svnrev=110614
 pkgrel=1
 pkgdesc="tex to HTML/MathML/png converter used by mediawiki"
 arch=(i686 x86_64)
@@ -12,8 +12,8 @@ url="http://www.mediawiki.org/wiki/Extension:Math"
 license=("GPL")
 depends=('imagemagick' 'ghostscript' 'texlive-core' 'texlive-latexextra')
 makedepends=('ocaml')
-source=(http://upload.wikimedia.org/ext-dist/Math-MW1.18-r${_svnrev}.tar.gz)
-md5sums=('bd24346536339034b29e65341683a2c1')
+source=(http://upload.wikimedia.org/ext-dist/Math-MW1.19-${_svnrev}.tar.gz)
+md5sums=('d5217e19c26bc08201f9fe6bec8722ff')
 
 build() {
   cd $srcdir/Math/math
diff --git a/extra/cscope/PKGBUILD b/extra/cscope/PKGBUILD
index 4cbfccd32..65f665d2e 100644
--- a/extra/cscope/PKGBUILD
+++ b/extra/cscope/PKGBUILD
@@ -3,15 +3,15 @@
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=cscope
-pkgver=15.7a
-pkgrel=3
+pkgver=15.8
+pkgrel=1
 pkgdesc="A developers tool for browsing program code"
 arch=('i686' 'x86_64')
 url="http://cscope.sourceforge.net/"
 license=('BSD')
 depends=('ncurses' 'sh')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('da43987622ace8c36bbf14c15a350ec1')
+md5sums=('7114b5838b3edcb3f5821efd444fff06')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD
index 2bc5449c2..191577647 100644
--- a/extra/oprofile/PKGBUILD
+++ b/extra/oprofile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141099 2011-10-23 23:25:40Z eric $
+# $Id: PKGBUILD 163607 2012-07-16 23:59:16Z eric $
 # Maintainer : Aaron Griffin <aaron@archlinux.org>
 
 pkgname=oprofile
 pkgver=0.9.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead"
 arch=('i686' 'x86_64')
 url="http://oprofile.sourceforge.net"
@@ -14,7 +14,6 @@ optdepends=('qt: for oprof_start gui')
 options=('!libtool')
 install=oprofile.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('8b5d1d9b65f84420bcc3234777ad3be3')
 sha1sums=('f5befd8aafc77d449e955f0585216f5d7b967de2')
 
 build() {
@@ -23,13 +22,21 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make check
+}
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   install -d "$pkgdir/var/lib/oprofile"
 
-# installing development libraries - FS#20089
-  install -m644 libop/op_*.h libregex/op_*.h libutil/op_*.h libutil++/op_*.h libdb/odb.h "$pkgdir/usr/include"
+# installing development libraries and headers - FS#20089
+  install -d  "$pkgdir/usr/include/oprofile"
+  install -m644 config.h libop/op_*.h libregex/op_*.h libdb/odb.h \
+    libpp/{locate_images.h,image_errors.h} libutil/op_*.h \
+    libutil++/{op_*.h,bfd_support.h,utility.h,cached_value.h} "$pkgdir/usr/include/oprofile"
   install -m644 libop/libop.a libdb/libodb.a "$pkgdir/usr/lib/"
   install -m644 libabi/libabi.a "$pkgdir/usr/lib/libopabi.a"
   install -m644 libutil/libutil.a "$pkgdir/usr/lib/liboputil.a"
diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD
index 3c156157d..450f50237 100644
--- a/extra/perl-dbd-sqlite/PKGBUILD
+++ b/extra/perl-dbd-sqlite/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 160519 2012-06-02 10:27:20Z bluewind $
+# $Id: PKGBUILD 163611 2012-07-17 02:14:42Z eric $
+# Maintainer:
 # Contributor: Tom Killian <tomk@runbox.com>
 # Contributor: francois at archlinux dot org
 
 pkgname=perl-dbd-sqlite
 _cpanname=DBD-SQLite
-pkgver=1.35
-pkgrel=2
+pkgver=1.37
+pkgrel=1
 pkgdesc="Self-contained RDBMS in a DBI driver"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/${_cpanname}"
@@ -13,7 +14,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl-dbi>=1.61' 'sqlite')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz)
-md5sums=('d9752e4a26fa54e74aa893dafd02ceda')
+md5sums=('b8ac1c584befa63cd5ffc391b2366e84')
 
 build() {
   cd "${srcdir}/${_cpanname}-${pkgver}"
diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD
index 12c602b92..678c39c3a 100644
--- a/extra/php-xcache/PKGBUILD
+++ b/extra/php-xcache/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: $
+# $Id: PKGBUILD 163591 2012-07-16 07:46:41Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-xcache
-pkgver=2.0.0
-pkgrel=3
+pkgver=2.0.1
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A PHP opcode cacher'
 url='http://xcache.lighttpd.net/'
@@ -12,7 +12,7 @@ license=('custom')
 source=("http://xcache.lighttpd.net/pub/Releases/${pkgver}/xcache-${pkgver}.tar.bz2"
         'xcache.ini')
 backup=('etc/php/conf.d/xcache.ini')
-md5sums=('0e30cdff075c635e475d70a5c37d0252'
+md5sums=('d3bc9645dc1b084c1eb45cfc4d8e9ccc'
          'bba7ead3e592a7980aa91a8600973587')
 
 build() {
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index e90fa2de2..01c2c4369 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163488 2012-07-13 10:14:32Z tpowa $
+# $Id: PKGBUILD 163599 2012-07-16 15:36:12Z tpowa $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,7 +6,7 @@
 
 pkgname=slim
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64')
 url='http://slim.berlios.de/'
@@ -55,7 +55,7 @@ package() {
 }
 md5sums=('51543533e492b41007811f7d880720fa'
          'd8ea9c4dee2811524b67f4f666311a1f'
-         'd33edc74724c6ca00445767ce38fc732'
+         '37ef35079139544d04b8316c7f66f754'
          '43da096480bf72c3ccec8ad8400f34f0'
          'a5d6bde9e63899df7d2081e1585bbe54'
          'ebcb6829028615686de7b64ceeaaf8ed'
diff --git a/extra/slim/pam.d b/extra/slim/pam.d
index 2a875d9e3..59db5a8c5 100644
--- a/extra/slim/pam.d
+++ b/extra/slim/pam.d
@@ -7,4 +7,4 @@ password        required        pam_unix.so
 session         required        pam_limits.so
 session         required        pam_unix.so
 session         optional        pam_loginuid.so
-session	        optional	pam_systemd.so
+-session	optional	pam_systemd.so
diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD
index b20220a6f..f80e5486e 100644
--- a/extra/twisted/PKGBUILD
+++ b/extra/twisted/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 150115 2012-02-12 18:51:16Z eric $
+# $Id: PKGBUILD 163609 2012-07-17 01:58:52Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=twisted
-pkgver=12.0.0
+pkgver=12.1.0
 pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python."
 arch=('i686' 'x86_64')
 url="http://twistedmatrix.com/"
 license=('MIT')
-depends=('python2' 'pycrypto' 'zope-interface')
+depends=('pycrypto' 'python2-zope-interface')
 optdepends=('python2-pyopenssl'
-            'python-soappy: for twisted.web.soap')
+            'python-soappy: for twisted.web.soap'
+	    'python2-pyasn1: for using conch'
+	    'pygtk: for using manhole'
+	    'tk: for using tkconch')
 install=twisted.install
 source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
-md5sums=('cf49a8676c21c50faf1b42b528049471')
+md5sums=('f396f1d6f5321e869c2f89b2196a9eb5')
 
 build() {
     cd "$srcdir/Twisted-$pkgver"
@@ -27,8 +30,8 @@ package() {
     python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
     install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-    sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-        -i "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
-    sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-        -i "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
+    sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
+      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \
+      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \
+      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py
 }
diff --git a/kde-unstable/akonadi/PKGBUILD b/kde-unstable/akonadi/PKGBUILD
index 3c9a18e81..243911b5d 100644
--- a/kde-unstable/akonadi/PKGBUILD
+++ b/kde-unstable/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161492 2012-06-11 21:12:03Z andrea $
+# $Id: PKGBUILD 163590 2012-07-16 07:21:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.7.90
+pkgver=1.7.95
 pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('573c1750c9ebb1f70ad39109f518c915')
+md5sums=('2fa3ad9facbe4f3c6a0f25794d5d1fe3')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kig/PKGBUILD b/kde-unstable/kdeedu-kig/PKGBUILD
index 00e3cdec8..f3ad55517 100644
--- a/kde-unstable/kdeedu-kig/PKGBUILD
+++ b/kde-unstable/kdeedu-kig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163399 2012-07-11 22:28:00Z andrea $
+# $Id: PKGBUILD 163585 2012-07-16 07:13:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
 pkgver=4.8.97
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
 arch=('i686' 'x86_64')
diff --git a/kde-unstable/kdeedu-rocs/PKGBUILD b/kde-unstable/kdeedu-rocs/PKGBUILD
index d3a83827e..86090e369 100644
--- a/kde-unstable/kdeedu-rocs/PKGBUILD
+++ b/kde-unstable/kdeedu-rocs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163409 2012-07-11 22:34:58Z andrea $
+# $Id: PKGBUILD 163587 2012-07-16 07:16:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
 pkgver=4.8.97
-pkgrel=1
+pkgrel=2
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
 arch=('i686' 'x86_64')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 17651ce1e..9793f599e 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,10 +9,10 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE-LTS k
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE-LTS
 _basekernel=3.0
-_sublevel=36
+_sublevel=37
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.36 # nearly always the same as pkgver
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'ext4-options.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '150413437fe54d4822e9e43189e37319'
+         '5fbdf641fc8962f875d1e9e8ce8f2969'
          '9cfcf3807201ce44aa720571232a10ce'
          '8bb5c5aa217202c3ac3798ba7798e07d'
          'c072b17032e80debc6a8626299245d46'
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 8a688091d..12b654f19 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.36-2-LIBRE-LTS
+KERNEL_VERSION=3.0.37-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 08a32eae0..d36ba4da2 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,10 +12,10 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE
 _basekernel=3.4
-_sublevel=4
+_sublevel=5
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '3.4.4-fix-backlight-regression.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
-         'e9bb311ab329555a61696b1a18df2d34'
+         '0882e254b12df2c8d73df29de85223a7'
          '669c3f9d5c6a2109bad8e511287826c3'
          '454231e14419e56a5281eb7bc6fde83e'
          'e49ac236dfeef709f91a3d993ea7b62c'
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 44850230f..7d7e7a1db 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.4.4-3-LIBRE
+KERNEL_VERSION=3.4.5-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/pcr/xonotic-git/PKGBUILD b/pcr/xonotic-git/PKGBUILD
new file mode 100644
index 000000000..2a032cd4a
--- /dev/null
+++ b/pcr/xonotic-git/PKGBUILD
@@ -0,0 +1,197 @@
+# Maintainer: MrBougo <bougospam at gmail dot com>
+# Contributor: wido <widomaker2k7@gmail.com>
+# Contributor: Alexander Suhoverhov <cy at ngs dot ru>
+
+pkgname=xonotic-git
+pkgver=20120718
+pkgrel=1
+pkgdesc="A free, fast-paced crossplatform first-person shooter"
+arch=('i686' 'x86_64')
+url="http://xonotic.org"
+license=('GPL')
+depends=(
+	'd0_blind_id-git'
+	'libxpm'
+	'libjpeg>=8'
+	'libpng>=1.4.0'
+	'libmodplug'
+	'libvorbis'
+	'libxxf86dga'
+	'libxxf86vm'
+	'alsa-lib'
+	'sdl'
+	'curl'
+)
+makedepends=('git' 'p7zip' 'zip' 'unzip' 'vorbis-tools' 'sdl' 'mesa' 'imagemagick')
+optdepends=(
+	'libtheora: recording in ogv'
+	#'d0_blind_id-git: crypto libraries for player authentification'
+)
+provides=('xonotic' 'xonotic-data')
+conflicts=('xonotic' 'xonotic-data')
+
+_gitroot="git://git.xonotic.org/xonotic/xonotic.git"
+_gitname="xonotic"
+_releasename="git-AUR"
+_compression=5
+
+# the jpeg and ogg variables can be modified, the function may also be skipped for raw data
+# the values here are also used in the official -low builds
+_compress() {
+	find $1 -type f -print0 |
+		git_src_repo=$2              \
+		CACHEDIR="$srcdir"/datacache \
+		do_jpeg=true                 \
+		jpeg_qual_rgb=80             \
+		jpeg_qual_a=97               \
+		do_dds=false                 \
+		do_ogg=true                  \
+		ogg_qual=1                   \
+		del_src=true                 \
+		xargs -0 "$srcdir"/$_gitname/misc/tools/cached-converter.sh
+}
+
+_git_extract() {
+	_from=$1
+	_to=$2
+	shift 2
+	{ cd "$_from"; git archive --format=tar HEAD -- "$@"; } \
+		| {
+			cd "$_to"
+			tar xvf -
+		}
+}
+
+# 7z compresses nicely but can't deal with flags and symlinks
+_mkzip() {
+	_archive=$1
+	shift
+	_ziplist=`mktemp`
+	find "$@" -xtype f \( -executable -or -type l \) -print > "$_ziplist"
+	7za a -tzip -mx=$_compression -x@"$_ziplist" "$_archive" "$@" || true
+	zip         -$_compression -y -@<"$_ziplist" "$_archive"      || true
+	rm -f "$_ziplist"
+}
+
+#credit goes to omgwizard for the shallow clone idea
+_update() {
+	cd "$srcdir"/$_gitname
+	sed 's/git clone/git clone --depth 1/g' --in-place=".PKGBUILD_BU" ./all
+	./all update
+	mv -f ./all.PKGBUILD_BU ./all
+	cd "$OLDPWD"
+}
+
+build() {
+	cd "$srcdir"
+	msg "Connecting to GIT server...."
+
+	if [ -d $_gitname ] ; then
+		#future updates might introduce new subrepos, use shallow cloning anyway
+		cd $_gitname && _update
+		msg "The local files are updated."
+	else
+		git clone --depth 1 $_gitroot $_gitname
+		cd $_gitname
+		touch d0_blind_id.no
+		touch netradiant.no
+		_update
+	fi
+
+	msg "GIT checkout done or server timeout"
+
+	# BUILD
+
+	msg "Copying sources..."
+
+	rm -rf "$srcdir"/src
+	mkdir -p "$srcdir"/src/darkplaces "$srcdir"/src/fteqcc
+	_git_extract "$srcdir"/$_gitname/fteqcc "$srcdir"/src/fteqcc
+	_git_extract "$srcdir"/$_gitname/darkplaces "$srcdir"/src/darkplaces
+	_git_extract "$srcdir"/$_gitname/data/xonotic-data.pk3dir "$srcdir"/src \
+		qcsrc Makefile check-cvars.sh
+
+	msg "Fetching map binaries..."
+	cd "$srcdir"/$_gitname
+	./all update-maps
+
+	msg "Compiling the engine..."
+	cd "$srcdir"/src/darkplaces
+	CC="${CC:-gcc} -g -DSUPPORTIPV6" make release
+
+	msg "Compiling fteqcc..."
+	cd "$srcdir"/src/fteqcc
+	make all
+
+	msg "Compiling the game code"
+	cd "$srcdir"/src/
+	make FTEQCC="../../fteqcc/fteqcc.bin" # relative to the directories containing progs.src
+
+	msg "Building data pk3's..."
+	rm -rf "$srcdir"/temp # just in case it was interrupted previously
+	mkdir "$srcdir"/temp
+	cd "$srcdir"/temp
+	for _subrepo in font-nimbussansl font-xolonium xonotic-data xonotic-music xonotic-maps; do
+		mkdir $_subrepo
+		_git_extract "$srcdir"/$_gitname/data/$_subrepo.pk3dir "$srcdir"/temp/$_subrepo
+	done
+
+	rm -rf "$srcdir"/temp/xonotic-data/qcsrc
+	mv "$srcdir"/src/progs.dat "$srcdir"/src/csprogs.dat "$srcdir"/src/menu.dat "$srcdir"/temp/xonotic-data
+
+	cd "$srcdir"/temp/xonotic-maps
+	#2x40 question marks. That's as many as eight tens. And that's terrible.
+	for X in "$srcdir"/$_gitname/data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+		if [ -f "$X" ]; then
+			unzip "$X"
+			rm -f maps/*.log maps/*.irc maps/*.lin
+		fi
+	done
+
+	msg "Compressing data..."
+	cd "$srcdir"/temp/
+	# don't compress the font files
+	for _subrepo in xonotic-data xonotic-music xonotic-maps; do
+		_compress $_subrepo "$srcdir"/$_gitname/data/$_subrepo.pk3dir
+	done
+
+	msg "Packing data..."
+	for _subrepo in font-nimbussansl font-xolonium xonotic-data xonotic-music xonotic-maps; do
+		cd "$srcdir"/temp/$_subrepo
+		_mkzip "$srcdir"/$_subrepo.pk3 * # this wildcard excludes dot files
+	done
+
+	msg "Removing temporary files..."
+	rm -rf "$srcdir"/temp
+}
+
+package() {
+	msg "Installing..."
+	mkdir -p "$pkgdir"/opt/$pkgname/
+	_git_extract "$srcdir"/$_gitname/ "$pkgdir"/opt/$pkgname \
+		Docs \
+		server \
+		xonotic-linux-glx.sh xonotic-linux-sdl.sh \
+		key_0.d0pk
+	chmod 755 "$pkgdir"/opt/$pkgname/xonotic-linux-glx.sh \
+	          "$pkgdir"/opt/$pkgname/xonotic-linux-sdl.sh
+
+	# Binaries -- those names are needed by the launcher script
+	case "$CARCH" in
+		x86_64)  _arch="linux64" ;;
+		*)       _arch="linux32" ;;
+	esac
+	install -m755 "$srcdir"/src/darkplaces/darkplaces-glx "$pkgdir"/opt/$pkgname/xonotic-$_arch-glx
+	install -m755 "$srcdir"/src/darkplaces/darkplaces-glx "$pkgdir"/opt/$pkgname/xonotic-$_arch-sdl
+	install -m755 "$srcdir"/src/darkplaces/darkplaces-dedicated "$pkgdir"/opt/$pkgname/xonotic-$_arch-dedicated
+
+	mkdir -p "$pkgdir"/opt/$pkgname/data/
+	mv -f "$srcdir"/*.pk3 "$pkgdir"/opt/$pkgname/data || true # those files are too big to be copied
+
+	# Launch scripts
+	mkdir -p "$pkgdir"/usr/bin
+	mv -f "$pkgdir"/opt/$pkgname/server/server_linux.sh "$pkgdir"/opt/$pkgname/
+	ln -sf /opt/$pkgname/xonotic-linux-glx.sh "$pkgdir"/usr/bin/xonotic-glx
+	ln -sf /opt/$pkgname/xonotic-linux-sdl.sh "$pkgdir"/usr/bin/xonotic-sdl
+	ln -sf /opt/$pkgname/server_linux.sh "$pkgdir"/usr/bin/xonotic-dedicated
+}
diff --git a/staging/pork/PKGBUILD b/staging/pork/PKGBUILD
new file mode 100644
index 000000000..f927a6f45
--- /dev/null
+++ b/staging/pork/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 71194 2012-05-24 17:29:40Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=pork
+pkgver=0.99.8.1
+pkgrel=6
+pkgdesc="Console-based AOL Instant Messenger & IRC client"
+arch=('i686' 'x86_64')
+url="http://dev.ojnk.net/"
+license=('GPL')
+depends=('ncurses' 'perl')
+source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz)
+sha256sums=('f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR=${pkgdir} install
+}
diff --git a/staging/tellico/PKGBUILD b/staging/tellico/PKGBUILD
new file mode 100644
index 000000000..c0945ceb4
--- /dev/null
+++ b/staging/tellico/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 70650 2012-05-13 20:07:17Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Maintainer: Ray Rashif <schiv@archlinux.org
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
+
+pkgname=tellico
+pkgver=2.3.5
+pkgrel=2
+pkgdesc="A collection manager for KDE"
+arch=('i686' 'x86_64')
+url="http://tellico-project.org/"
+license=('GPL')
+depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'kdemultimedia-kioslave' 'poppler-qt' 'qjson')
+makedepends=('automoc4' 'cmake')
+install=$pkgname.install
+source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c')
+
+build() {
+  cd ${srcdir}
+
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+
+  make DESTDIR=${pkgdir} install
+
+# fix python 2.7 path
+  find ${pkgdir} -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+}
diff --git a/staging/tellico/tellico.install b/staging/tellico/tellico.install
new file mode 100644
index 000000000..3b3aff7d9
--- /dev/null
+++ b/staging/tellico/tellico.install
@@ -0,0 +1,13 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD
index 6ebe5c8ab..a6cfcfbf7 100644
--- a/testing/xf86-video-intel/PKGBUILD
+++ b/testing/xf86-video-intel/PKGBUILD
@@ -1,57 +1,35 @@
-# $Id: PKGBUILD 162779 2012-06-30 11:55:07Z andyrtr $
+# $Id: PKGBUILD 163603 2012-07-16 18:25:33Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgbase=xf86-video-intel
-pkgname=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-pkgver=2.19.0
-pkgrel=5
+pkgname=xf86-video-intel
+pkgver=2.20.0
+pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
+install=$pkgname.install
+pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools')
 makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender')
+replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
+conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  mkdir build-{UXA,SNA}
-
-  pushd build-UXA
-  ../configure --prefix=/usr --enable-dri --enable-uxa
-  make
-  popd
-
-  pushd build-SNA
-  ../configure --prefix=/usr --enable-dri --enable-sna --enable-vmap
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+    --enable-dri
   make
-  popd
 }
 
-package_xf86-video-intel-uxa() {
-	
-  pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with UXA acceleration"
-  provides=('xf86-video-intel')
-  replaces=('xf86-video-intel')
-  conflicts=('xf86-video-intel-sna' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
-  
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install -C build-UXA
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
-package_xf86-video-intel-sna() {
-
-  pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with SNA acceleration"
-  provides=('xf86-video-intel')
-  conflicts=('xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install -C build-SNA
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/testing/xf86-video-intel/xf86-video-intel.install b/testing/xf86-video-intel/xf86-video-intel.install
new file mode 100644
index 000000000..e3ddb5522
--- /dev/null
+++ b/testing/xf86-video-intel/xf86-video-intel.install
@@ -0,0 +1,8 @@
+post_install() {
+  echo ">>> This driver now allows to switch"
+  echo ">>> between several acceleration methods."
+  echo ">>> Add to the device section in /etc/X11/xorg.conf"
+  echo ">>>   Option \"AccelMethod\" \"sna\""
+  echo ">>> use uxa/xaa method if you run into trouble with sna."
+}
+