From 208367c54efa976764169e86e6669631f32b0617 Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli@archlinux.info>
Date: Tue, 10 Jan 2012 12:02:00 +0000
Subject: [PATCH] updated on Tue Jan 10 12:02:00 UTC 2012

---
 ccal/PKGBUILD                                    |  23 ++-
 cinnamon-settings-git/PKGBUILD                   |   2 +-
 cinnamon-themes-git/PKGBUILD                     |   7 +-
 clementine-git/PKGBUILD                          |  16 +-
 darkgates/PKGBUILD                               |  38 ++++
 darkgates/darkgates.install                      |   6 +
 darkgates/darkgates.sh                           |   4 +
 dfu-util-git/PKGBUILD                            |  16 +-
 django-coverage/PKGBUILD                         |   4 +-
 django-feincms/PKGBUILD                          |   4 +-
 ffmpeg-legacy/PKGBUILD                           |  20 ++
 gdal-curl/PKGBUILD                               |  21 +-
 gdal-curl/configure.1.patch                      |  19 ++
 gnome-shell-extension-kimpanel-git/PKGBUILD      |  35 ++++
 gparted-git/PKGBUILD                             |  17 +-
 gparted-git/gparted-pkexec.in                    |   3 +
 hardened-cc/PKGBUILD                             |  17 +-
 hardened-cc/hardened-cc.install                  |   5 +-
 hardened-cc/hgcc                                 | 216 +++++++++-----------
 hardening-check/PKGBUILD                         |  23 +++
 libxenserver/PKGBUILD                            |   4 +-
 munge/PKGBUILD                                   |   6 +-
 pantheon-terminal-bzr/PKGBUILD                   |  37 +++-
 parted-git/PKGBUILD                              |  25 +--
 parted-git/gnu-parted_fix_non-srcdir_build.patch | 240 +++++++++++++++++++++++
 pastescript/PKGBUILD                             |   3 +-
 python-celery/PKGBUILD                           |   4 +-
 python-creoleparser/PKGBUILD                     |   4 +-
 python-mpd-git/PKGBUILD                          |   7 +-
 python-werkzeug-docs/PKGBUILD                    |   6 +-
 scratch-bzr/PKGBUILD                             |   4 +-
 sonicsquirrel/PKGBUILD                           |  22 +++
 sonicsquirrel/sonicsquirrel.install              |  14 ++
 sorl-thumbnail/PKGBUILD                          |   4 +-
 vim-zencoding/PKGBUILD                           |   8 +-
 wotsap/PKGBUILD                                  |  29 +++
 xvp/PKGBUILD                                     |  14 +-
 37 files changed, 694 insertions(+), 233 deletions(-)
 create mode 100644 darkgates/PKGBUILD
 create mode 100644 darkgates/darkgates.install
 create mode 100755 darkgates/darkgates.sh
 create mode 100644 ffmpeg-legacy/PKGBUILD
 create mode 100644 gdal-curl/configure.1.patch
 create mode 100644 gnome-shell-extension-kimpanel-git/PKGBUILD
 create mode 100644 gparted-git/gparted-pkexec.in
 rewrite hardened-cc/hgcc (99%)
 create mode 100644 hardening-check/PKGBUILD
 create mode 100644 parted-git/gnu-parted_fix_non-srcdir_build.patch
 create mode 100644 sonicsquirrel/PKGBUILD
 create mode 100644 sonicsquirrel/sonicsquirrel.install
 create mode 100644 wotsap/PKGBUILD

diff --git a/ccal/PKGBUILD b/ccal/PKGBUILD
index 4cb3895ed..e9b6e386d 100644
--- a/ccal/PKGBUILD
+++ b/ccal/PKGBUILD
@@ -1,22 +1,29 @@
+# Maintainer: Daniel YC Lin <dlin <at> gmail.com>
 # Contributor: sssslang <xofyarg@gmail.com>
-# Temporary maintainer:  kumkee <kumkee@gmail.com>
+# Previous maintainer:  kumkee <kumkee@gmail.com>
 pkgname=ccal
 pkgver=2.5.2
-pkgrel=2
-pkgdesc="The ccal utility is a simple-to-use command line program which writes a Gregorian calendar together with Chinese calendar to standard output."
+pkgrel=3
+pkgdesc="A console program which writes a calendar together with Chinese calendar to standard output."
 arch=('i686' 'x86_64')
 url="http://ccal.chinesebay.com/ccal/ccal.htm"
 license="GPL"
-makedepends=('gcc' 'glibc')
+depends=('gcc-libs' 'bash')
+makedepends=('gcc')
 source=(http://ccal.chinesebay.com/ccal/$pkgname-$pkgver.tar.gz)
 md5sums=('e972ad9d37332f9fc6206e441563e683')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  make || return 1
-  mkdir -p ../../pkg/{usr/bin,usr/man/man1}
+  # dlin patch for gcc 4.6.2
+  sed -i '21a #include <stddef.h>' htmlmonth.h
+  make
+}
+package() {
+  cd $startdir/src/$pkgname-$pkgver
+  mkdir -p $pkgdir/{usr/bin,usr/share/man/man1}
   install -c ccal ../../pkg/usr/bin
   install -c ccalpdf ../../pkg/usr/bin
-  install -c -m 0644 ccal.1 ../../pkg/usr/man/man1
-  install -c -m 0644 ccalpdf.1 ../../pkg/usr/man/man1
+  install -c -m 0644 ccal.1 $pkgdir/usr/share/man/man1
+  install -c -m 0644 ccalpdf.1 $pkgdir/usr/share/man/man1
 }
diff --git a/cinnamon-settings-git/PKGBUILD b/cinnamon-settings-git/PKGBUILD
index f2b239ffe..edfb7cfaf 100644
--- a/cinnamon-settings-git/PKGBUILD
+++ b/cinnamon-settings-git/PKGBUILD
@@ -26,7 +26,7 @@ build() {
   msg "GIT checkout done or server timeout"
   msg "Starting build..."
 
-  cp -r cinnamon-settings/usr "$pkgdir"
+  cp -r "$srcdir/cinnamon-settings/usr" "$pkgdir"
   cd "$pkgdir"
   # Sed for Python2
   sed -e "s_env python_&2_;s_bin/python_&2_" \
diff --git a/cinnamon-themes-git/PKGBUILD b/cinnamon-themes-git/PKGBUILD
index e2ae5d08c..921c044c1 100644
--- a/cinnamon-themes-git/PKGBUILD
+++ b/cinnamon-themes-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: crazyelf5
 
 pkgname=cinnamon-themes-git
-pkgver=20120109
+pkgver=20120110
 pkgrel=1
 pkgdesc="A collection of themes for Cinnamon"
 arch=('any')
@@ -11,8 +11,8 @@ depends=('cinnamon')
 makedepends=('git')
 conflicts=('cinnamon-theme-eleganse')
 
-_gitroot="git://github.com/linuxmint/cinnamon-themes.git"
-_gitname="cinnamon-themes"
+_gitroot=git://github.com/linuxmint/cinnamon-themes.git
+_gitname=cinnamon-themes
 
 build() {
   msg "Connecting to GIT server...."
@@ -28,6 +28,7 @@ build() {
   msg "Starting build..."
 
   install -dm755 "$pkgdir/usr/share/themes"
+  cd "$srcdir/cinnamon-themes"
   find ./*/ -maxdepth 0 -type d -exec cp -r '{}' "$pkgdir/usr/share/themes" \;
 }
 
diff --git a/clementine-git/PKGBUILD b/clementine-git/PKGBUILD
index c521e5589..07930f178 100644
--- a/clementine-git/PKGBUILD
+++ b/clementine-git/PKGBUILD
@@ -42,12 +42,12 @@ build() {
   cd "${srcdir}"
   msg "Connecting to GIT server...."
 
-  if [[ -d "${_gitname}" ]]; then
-    cd "${_gitname}" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone "${_gitroot}" "${_gitname}"
-  fi
+  #if [[ -d "${_gitname}" ]]; then
+    #cd "${_gitname}" && git pull origin
+    #msg "The local files are updated."
+  #else
+    #git clone "${_gitroot}" "${_gitname}"
+  #fi
 
   msg "GIT checkout done or server timeout"
   msg "Starting build..."
@@ -57,14 +57,14 @@ build() {
   cd "${srcdir}/${_gitname}-build"
 
   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DBUILDBOT_REVISION=${pkgver} \
-    -DENABLE_REMOTE=ON
+    -DENABLE_REMOTE=ON -DENABLE_SPOTIFY=OFF -DENABLE_SPOTIFY_BLOB=OFF
   make
 }
 
 package() {
   cd "${srcdir}/${_gitname}-build"
 
-  sed -i -e '/"\/.*version[[:digit:]]*[-]*[[:digit:]]*bit/ s//"${CMAKE_INSTALL_PREFIX}\/bin/' -e '/clementine-spotifyblob/ s/$ENV{DESTDIR}//g' ext/clementine-spotifyblob/cmake_install.cmake
+  #sed -i -e '/"\/.*version[[:digit:]]*[-]*[[:digit:]]*bit/ s//"${CMAKE_INSTALL_PREFIX}\/bin/' -e '/clementine-spotifyblob/ s/$ENV{DESTDIR}//g' ext/clementine-spotifyblob/cmake_install.cmake
   make DESTDIR="${pkgdir}" install
 }
 
diff --git a/darkgates/PKGBUILD b/darkgates/PKGBUILD
new file mode 100644
index 000000000..dd3ad4d8e
--- /dev/null
+++ b/darkgates/PKGBUILD
@@ -0,0 +1,38 @@
+# vim:set ts=2 sw=2 et ft=sh tw=100: expandtab
+# Contributor: Piotr Rogoża <rogoza dot piotr at gmail dot com>
+# Created: 10/01/2012
+
+pkgname=darkgates
+_pkgname=DarkGates
+pkgver=alpha_0.1
+pkgrel=1
+pkgdesc='You lead your team of 6 heroes into dungeon where they will fight their way trough in order to destroy Dark Gates and evil mage who is the master of the dungeon'
+arch=('i686')
+url='http://darkgates.dfourgames.com/'
+license=('custom')
+groups=()
+depends=(sdl_mixer sh tk sqlite3 libjpeg-turbo sdl_ttf sdl_image)
+makedepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=(!strip)
+install=darkgates.install
+source=(http://darkgates.dfourgames.com/download/${_pkgname}_${pkgver}.tar.gz
+  darkgates.sh
+)
+noextract=()
+build(){
+  cd "$srcdir/"
+  install -dm755 $pkgdir/opt/$pkgname
+  cp -r ${_pkgname}_$pkgver/* $pkgdir/opt/$pkgname
+  install -Dm644 $pkgdir/opt/$pkgname/LICENCE.txt \
+    $pkgdir/usr/share/licenses/custom/$pkgname/LICENCE.txt
+  install -Dm755 darkgates.sh $pkgdir/usr/bin/darkgates
+  chmod a+w $pkgdir/opt/$pkgname/settings.cfg 
+}
+
+md5sums=('2d98232d22a796ff458412a5cfb25b4f'
+         'd81f6743f93509b32ed0f6adf686dd4a')
diff --git a/darkgates/darkgates.install b/darkgates/darkgates.install
new file mode 100644
index 000000000..d6d227209
--- /dev/null
+++ b/darkgates/darkgates.install
@@ -0,0 +1,6 @@
+post_install(){
+    echo "DarkGates uses the global file settings located in /opt/darkgates/settings.cfg"
+}
+post_upgrade(){
+    post_install $
+}
diff --git a/darkgates/darkgates.sh b/darkgates/darkgates.sh
new file mode 100755
index 000000000..d53003660
--- /dev/null
+++ b/darkgates/darkgates.sh
@@ -0,0 +1,4 @@
+#!/bin/bash - 
+
+cd /opt/darkgates
+./DarkGates $@
diff --git a/dfu-util-git/PKGBUILD b/dfu-util-git/PKGBUILD
index c97c6592c..6f7214961 100644
--- a/dfu-util-git/PKGBUILD
+++ b/dfu-util-git/PKGBUILD
@@ -1,7 +1,9 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
 
 pkgname=dfu-util-git
-pkgver=20101116
+pkgver=20120110
 pkgrel=1
 pkgdesc="dfu-util is a program that implements the Host (PC) side of the USB DFU protocol."
 arch=('i686' 'x86_64')
@@ -40,7 +42,15 @@ build() {
   # BUILD HERE
   #
 
-  ./autogen.sh && ./configure --prefix=/usr
+  touch NEWS AUTHORS
+  mkdir -p m4
+  ln -s /usr/share/libtool/config/missing m4/missing
+
+  libtoolize -i
+  automake --add-missing || true
+  autoreconf
+
+  ./configure --prefix=/usr
   make
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=$pkgdir install
 }
diff --git a/django-coverage/PKGBUILD b/django-coverage/PKGBUILD
index 32d01a090..f1e164513 100644
--- a/django-coverage/PKGBUILD
+++ b/django-coverage/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Fazlul Shahriar <fshahriar@gmail.com>
 pkgname=django-coverage
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="A tool for measuring code coverage of Python programs."
 arch=('any')
@@ -14,4 +14,4 @@ build() {
 	cd "$srcdir/${pkgname}-$pkgver"
 	python2 setup.py install --root=$pkgdir
 }
-md5sums=('b92b7b9db01cc2c87b06e11201559b55')
+md5sums=('71823dc6eb3327d323f089ceee84a288')
diff --git a/django-feincms/PKGBUILD b/django-feincms/PKGBUILD
index f912df88c..946f1c838 100644
--- a/django-feincms/PKGBUILD
+++ b/django-feincms/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: apkawa <apkawa@gmail.com>
 pkgname=django-feincms
 _pkgname=FeinCMS
-pkgver=1.3.0
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="Django-based Page CMS and CMS building toolkit"
 arch=('any')
@@ -17,4 +17,4 @@ build() {
     python2 setup.py install --root=$pkgdir || return 1
     install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums=('65e4087723cc1f193563faa5d9ec1782')
+md5sums=('f6d22b1a43ee52ebdd9f0151619d422d')
diff --git a/ffmpeg-legacy/PKGBUILD b/ffmpeg-legacy/PKGBUILD
new file mode 100644
index 000000000..d8dbcbaed
--- /dev/null
+++ b/ffmpeg-legacy/PKGBUILD
@@ -0,0 +1,20 @@
+# Maintainer: Joni Lapilainen <joni.lapilainen@gmail.com>
+pkgname=ffmpeg-legacy
+pkgver=0.5.7
+pkgrel=1
+pkgdesc="Legacy FFMPEG (0.5.7) for applications depending on it."
+arch=('arm' 'armv7h' 'i686' 'x86_64')
+url="http://ffmpeg.org/"
+license="nonfree"
+source=(http://ffmpeg.org/releases/ffmpeg-0.5.7.tar.gz)
+md5sums=('79bce5b9db0d94c22b0c36e71146f97a')
+depends=('alsa-lib' 'bzip2' 'faac' 'lame' 'libtheora' 'libvorbis' 'openjpeg' 'rtmpdump' 'schroedinger' 'sdl' 'speex' 'x264' 'xvidcore' 'zlib')
+provides=('ffmpeg' 'ffmpeg-legacy')
+conflicts=('ffmpeg' 'ffmpeg-git')
+
+build() {
+  cd $startdir/src/ffmpeg-0.5.7
+  ./configure --prefix=/usr --enable-shared --enable-gpl --enable-nonfree --enable-libfaac --enable-libvorbis --enable-swscale --enable-libx264 --enable-libxvid --enable-libspeex --enable-libschroedinger --enable-libopenjpeg --extra-cflags=-fPIC
+  make || return 1
+  make DESTDIR=$startdir/pkg install
+}
diff --git a/gdal-curl/PKGBUILD b/gdal-curl/PKGBUILD
index 42b568038..8b9de187b 100644
--- a/gdal-curl/PKGBUILD
+++ b/gdal-curl/PKGBUILD
@@ -2,32 +2,37 @@
 
 pkgname=gdal-curl
 _pkgname=gdal
-pkgver=1.8.1
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats with curl support"
 arch=('i686' 'x86_64')
 url="http://www.gdal.org/"
 license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf'  'python2' 'python2-numpy' 'cfitsio' 'sqlite3' 'libmysqlclient' 'postgresql-libs')
+depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf'  'python2' 'python2-numpy' 'cfitsio' 'sqlite3' 'libmysqlclient' 'postgresql-libs' 'podofo')
 makedepends=('perl' 'swig')
 optdepends=('postgresql: postgresql database support'
             'mysql: mysql database support'
-            'swig:  perl binding support')
+            'swig:  perl binding support'
+	    'poppler: pdf conversion support')
 options=('!libtool' '!makeflags')
 source=(http://download.osgeo.org/${_pkgname}/${_pkgname}-${pkgver}.tar.gz \
-	gdal-1.5.1-python-install.patch) 
+	gdal-1.5.1-python-install.patch \
+	configure.1.patch) 
+
+md5sums=('1853f3d8eb5232ae030abe007840cade'
+         '81afc1c26d29cee84aadb6924fe33861'
+	 'de4ff6d5d44d22aba64051ce4cc96a38')
 
-md5sums=('b32269893afc9dc9eced45e74e4c6bb4'
-         '81afc1c26d29cee84aadb6924fe33861')
 provides=('gdal')
 conflicts=('gdal')
 
 build() {
   export CFLAGS="$CFLAGS -fno-strict-aliasing"
-  export LDFLAGS="-Wl,--hash-style=gnu"
+  export LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
 
   cd ${srcdir}/$_pkgname-$pkgver
   patch -Np0 -i ${srcdir}/gdal-1.5.1-python-install.patch
+  patch -Np0 -i ${srcdir}/configure.1.patch
 
 # python2 fixes
   sed -i 's_python python1.5_python2 python python1.5_' configure
@@ -37,7 +42,7 @@ build() {
 
   ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \
               --with-geotiff --with-mysql --with-python --without-libtool --with-curl \
-              --with-hdf5 --with-perl --with-geos --with-png
+              --with-hdf5 --with-perl --with-geos --with-png --with-podofo
 
 # workaround for bug #13646
   sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
diff --git a/gdal-curl/configure.1.patch b/gdal-curl/configure.1.patch
new file mode 100644
index 000000000..47e8c7ade
--- /dev/null
+++ b/gdal-curl/configure.1.patch
@@ -0,0 +1,19 @@
+*** configure.orig	2012-01-10 10:32:25.487363166 +0100
+--- configure	2012-01-10 10:32:36.097363630 +0100
+***************
+*** 24332,24338 ****
+    $as_echo_n "(cached) " >&6
+  else
+    ac_check_lib_save_LIBS=$LIBS
+! LIBS="-lcurl `$LIBCURL_CONFIG --libs` $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  /* end confdefs.h.  */
+  
+--- 24332,24338 ----
+    $as_echo_n "(cached) " >&6
+  else
+    ac_check_lib_save_LIBS=$LIBS
+! LIBS="-lcurl $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  /* end confdefs.h.  */
+  
diff --git a/gnome-shell-extension-kimpanel-git/PKGBUILD b/gnome-shell-extension-kimpanel-git/PKGBUILD
new file mode 100644
index 000000000..974180a91
--- /dev/null
+++ b/gnome-shell-extension-kimpanel-git/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: BigEagle < bigeagle(at)xdlinux(dot)info >
+
+pkgname=gnome-shell-extension-kimpanel-git
+pkgver=20120110
+pkgrel=1
+pkgdesc="KDE's kimpanel implementation for GNOME Shell, now support fcitx"
+arch=("i686" "x86_64")
+license=('GPL')
+url="http://code.google.com/p/fcitx"
+depends=('fcitx' 'dbus' 'gnome-shell')
+
+_extensionname="kimpanel@kde.org"
+_gitname="kimpanel-for-gnome-shell"
+_gitroot="https://github.com/csslayer/kimpanel-for-gnome-shell.git"
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to the GIT server...."
+
+  if [[ -d $srcdir/$_gitname ]] ; then
+    cd $_gitname
+    git pull origin
+    msg "The local files are updated."
+  else
+    git clone $_gitroot $_gitname
+  fi
+}
+package(){
+  mkdir -p ${pkgdir}/usr/share/gnome-shell/extensions/${_extensionname}
+  cd ${srcdir}/$_gitname
+  install -D -m 644 extension.js ${pkgdir}/usr/share/gnome-shell/extensions/${_extensionname}/extension.js
+  install -D -m 644 stylesheet.css ${pkgdir}/usr/share/gnome-shell/extensions/${_extensionname}/stylesheet.css
+  install -D -m 644 metadata.json ${pkgdir}/usr/share/gnome-shell/extensions/${_extensionname}/metadata.json
+}
+
diff --git a/gparted-git/PKGBUILD b/gparted-git/PKGBUILD
index 3c6c01abd..1663610ba 100644
--- a/gparted-git/PKGBUILD
+++ b/gparted-git/PKGBUILD
@@ -27,8 +27,11 @@ install="${pkgname}.install"
 conflicts=("${_pkgname}")
 provides=("${_pkgname}")
 
-source=('org.archlinux.pkexec.gparted.policy')
-sha256sums=('5e0d15ae1c182dfc21c5a6a4cd5ebc010311c6c46d8bc3d67d20d55253840fe2')
+source=('org.archlinux.pkexec.gparted.policy'
+        'gparted-pkexec.in')
+
+sha256sums=('5e0d15ae1c182dfc21c5a6a4cd5ebc010311c6c46d8bc3d67d20d55253840fe2'
+            '868ad1960ee496ddf2f854a0609ee062536fa222d2f987a7f96cc4d9d6317ac3')
 
 _gitroot="git://git.gnome.org/${_pkgname}"
 _gitname="${_pkgname}"
@@ -70,13 +73,9 @@ build() {
 	mkdir -p "${srcdir}/${_gitname}_build/BUILD"
 	cd "${srcdir}/${_gitname}_build/BUILD"
 	
-	set -x -e
-	
 	CFLAGS="" LDFLAGS="" ../autogen.sh --prefix="/usr" --enable-libparted-dmraid
 	echo
 	
-	set +x +e
-	
 	msg "Starting make..."
 	CFLAGS="" LDFLAGS="" make
 	echo
@@ -94,10 +93,8 @@ package() {
 	install -D -m0644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy"
 	
 	# Install launcher script
-	mkdir -p "${pkgdir}/usr/bin"
-	echo '#!/bin/sh' > "${pkgdir}/usr/bin/gparted-pkexec"
-	echo 'pkexec "/usr/sbin/gparted" "$@"' >> "${pkgdir}/usr/bin/gparted-pkexec"
-	chmod 755 "${pkgdir}/usr/bin/gparted-pkexec"
+	install -d "${pkgdir}/usr/bin/"
+	install -D -m0755 "${srcdir}/gparted-pkexec.in" "${pkgdir}/usr/bin/gparted-pkexec"
 	
 	# Modify desktop file
 	sed -e "s/Exec=.*/Exec=gparted-pkexec/" -i "${pkgdir}/usr/share/applications/gparted.desktop"
diff --git a/gparted-git/gparted-pkexec.in b/gparted-git/gparted-pkexec.in
new file mode 100644
index 000000000..95f1b02af
--- /dev/null
+++ b/gparted-git/gparted-pkexec.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pkexec "/usr/sbin/gparted" "$@"
diff --git a/hardened-cc/PKGBUILD b/hardened-cc/PKGBUILD
index a5e0a4a09..38467752f 100644
--- a/hardened-cc/PKGBUILD
+++ b/hardened-cc/PKGBUILD
@@ -1,23 +1,20 @@
 pkgname=hardened-cc
-pkgver=1.33
+pkgver=4
 pkgrel=1
 pkgdesc="Wrapper for GCC to reliably build hardened packages. Modified hardening script as used in Ubuntu/Debian"
 arch=('any')
 license=('unknown')
 url='https://wiki.ubuntu.com/Security/HardeningWrapper'
-depends=('perl')
+depends=('dash>=0.5.7')
 source=('hgcc' "$pkgname.install")
 install="$pkgname.install"
-sha256sums=('de9bd726e67e8e81ce456868c90e2c621eb62f7bd6c746a756154baba5668f00'
-            'cea01d5a5d5fb4a640cda67fed4f00b8ebf26356ec0b606e6c6331d6ee0abf34')
-
+sha256sums=('26bf23a1f71900a60e2a15279adacdf01ceba56dfea6638c968d927b751cea79'
+            '6218c994a57207369e81e66387e429e087c3f4e658a3e5da620259ffd94e192f')
 build() {
-	cd "$srcdir"
-	sed "s|gcc|g++|g" hgcc > hg++
-	touch hg*
+	sed "s|gcc|g++|g" "$srcdir/hgcc" > "$srcdir/hg++"
 }
 
 package() {
-	mkdir -p -m 0755 "$pkgdir/usr/bin/"
-	install -v -m 0555 -o root -p "$srcdir"/hg* -t "$pkgdir/usr/bin/"
+	install -Dm0755 "$srcdir/hgcc" "$pkgdir/usr/bin/hgcc"
+	install -Dm0755 "$srcdir/hg++" "$pkgdir/usr/bin/hg++"
 }
diff --git a/hardened-cc/hardened-cc.install b/hardened-cc/hardened-cc.install
index 16e306146..7664e33d2 100644
--- a/hardened-cc/hardened-cc.install
+++ b/hardened-cc/hardened-cc.install
@@ -1,7 +1,7 @@
 post_install() {
 cat << _EOF
 
->>> By default, the wrapper enforces the following CFLAGS etc:
+>>> By default, the wrapper _enforces_ the following CFLAGS etc:
 
     -DPIC -fPIE and -pie (during linking) to generate PIE binaries effortlessy.
 
@@ -17,7 +17,8 @@ cat << _EOF
 
     The wrapper isn't too bad and will enable/disable the right flags based on conditions as documented in the script.
 
-    It should be able to build the vast (!!) majority of projects out there without breaking the build.
+    It should be able to build almost all projects out there without breaking the build.
+    You probably shouldn't try it on niche stuff like bootloaders, glibc, gcc etc. - you get the idea.
 
     Some additional options are available and disabled by default, please make sure to edit
     /usr/bin/hgcc and /usr/bin/hg++ if you want to enable them and/or disable some defaults.
diff --git a/hardened-cc/hgcc b/hardened-cc/hgcc
dissimilarity index 99%
index 4c541b915..2ebc2272a 100644
--- a/hardened-cc/hgcc
+++ b/hardened-cc/hgcc
@@ -1,122 +1,94 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-use File::Spec qw(rel2abs);
-use File::Basename;
-
-my @args = ();
-my $enabled = 1;
-
-# Refer to the GCC manual or your favourite search engine.
-# If in doubt: The defaults are a decent choice.
-
-$enabled = 1;
-my $force_stack = 1;		# Lightweight SSP.
-my $force_stack_all = 0;	# Expensive SSP. (-fstack-protector-all)
-my $force_fortify = 1;		# Fortify.
-my $force_format = 0;		# -Wformat-security and req. Breaks quite a few builds due to -Werror=..
-				# ^^ -- Warnings often erroneous.
-my $force_fPIE = 1;		# Generate Position Independent Executables, negligible overhead on 64bit.
-my $force_bindnow = 1;		# Enable -Wl,-z,now. (Also adds --hash-style=gnu just to make sure it is there.)
-				# ^^ -- According to Kees Cook overhead of the dynamic linker
-				# ^^ -- is negligible even with huge applications.
-my $force_trampolines = 0;	# -Wtrampolines -Werror=trampolines
-my $force_noexec = 0;		# Adds -Wa,--noexecstack. Required by OpenSSL etc.
-my $force_unstrict = 0;		# Use -fno-strict-aliasing/overflow. (OpenBSD default?)
-my $force_nullptr = 0;		# Available here for the sake of completeness.
-				# ^^ Typically unneeded. (Used by the Linux kernel.)
-
-
-if ($enabled) {
-	# Scan arguments
-	my $linking = 1;
-	foreach my $arg (@ARGV) {
-		if ($arg eq "-fno-PIC" ||
-			$arg eq "-fno-pic" ||
-			$arg eq "-fno-PIE" ||
-			$arg eq "-fno-pie" ||
-			$arg eq "-nopie" ||
-			$arg eq "-static" ||
-			$arg eq "-shared" ||
-			$arg eq "-D__KERNEL__" ||
-			$arg eq "-nostdlib" ||
-			$arg eq "-nostartfiles")
-		{
-			$force_fPIE = 0;
-		}
-		if ($arg eq "-fPIC" ||
-			$arg eq "-fpic")
-		{
-			$force_fPIE = 0;
-		}
-		if ($arg eq "-c") {
-			$linking = 0;
-		}
-		if ($arg =~ /^-D_FORTIFY_SOURCE(=|$)/) {
-			$force_fortify = 0;
-		}
-
-		if ($arg eq "-fno-stack-protector" ||
-			$arg eq "-fno-stack-protector-all" ||
-			$arg eq "-nostdlib" ||
-			$arg eq "-ffreestanding") {
-			$force_stack = 0;
-			$force_stack_all = 0;
-		}
-
-	}
-
-	if ($force_stack) {
-		push(@args,'-fstack-protector', '--param=ssp-buffer-size=4');
-	}
-
-	if ($force_stack_all) {
-		push(@args,'-fstack-protector-all');
-	}
-
-	if ($force_fPIE) {
-		push(@args,'-DPIC', '-fPIE');
-		if ($linking) {
-			push(@args, '-pie');
-		}
-	}
-
-	if ($linking) { # Unconditional, but I have yet to see something break.
-		push(@args,'-Wl,-z,relro');
-		if ($force_bindnow) {
-			push(@args,'-Wl,--hash-style=gnu', '-Wl,-z,now');
-		}
-	}
-
-	if ($force_fortify) {
-		push(@args,'-D_FORTIFY_SOURCE=2');
-	}
-
-	if ($force_format) {
-		push(@args,'-Wformat', '-Wformat-security', '-Werror=format-security');
-	}
-
-	if ($force_trampolines) {
-		push(@args,'-Wtrampolines', '-Werror=trampolines');
-	}
-
-	if ($force_unstrict) {
-		push(@args,'-fno-strict-aliasing', '-fno-strict-overflow');
-	}
-
-	if ($force_nullptr) {
-		push(@args,'-fno-delete-null-pointer-checks');
-	}
-
-	if ($force_noexec) {
-		push(@args,'-Wa,--noexecstack');
-	}
-
-	my $arg0 = File::Spec->rel2abs(basename($0),dirname($0));
-
-	my $tool = "/usr/bin/gcc";
-
-	my @target = ($tool, @args, @ARGV);
-
-	exec @target or die "Unable to exec $target[0]: $!\n";
-}
+#!/bin/dash
+# At least its not perl..
+
+# Enable/disable here, don't touch unless you know what you are doing.
+hcc_force_stack=1
+#hcc_force_stack_all=1
+hcc_force_fortify=1
+#hcc_force_format=1
+hcc_force_fPIE=1
+hcc_force_bindnow=1
+#hcc_force_trampolines=1
+#hcc_force_noexec=1
+#hcc_force_unstrict=1
+#hcc_force_nullptr=1
+
+# Don't touch:
+hcc_linking=1
+
+for opt; do
+  case "$opt" in
+    -fno-PIC|-fno-pic|-fno-PIE|-fno-pie|-nopie|-static|-shared|-D__KERNEL__|-nostdlib|-nostartfiles)
+      unset hcc_force_fPIE;;
+    -fPIC|-fpic)
+      unset hcc_force_fPIE;;
+    -c)
+      unset hcc_linking;;
+    -D_FORTIFY_SOURCE=[0-1])
+      unset hcc_force_fortify;;
+    -fno-stack-protector|-fno-stack-protector-all|-nostdlib|-ffreestanding)
+      unset hcc_force_stack;
+      unset hcc_force_stack_all;;
+  esac
+done
+
+# Use relro unconditionally.
+# -Wl,-z,now: This affects only the *startup* time because the dynamic linker has to do more work - 
+# but according to Kees Cook overhead of BIND_NOW is negligible nowadays even with huge applications.
+if [ $hcc_linking ]; then
+  hcc_link_relro="-Wl,-z,relro"
+  if [ $hcc_force_bindnow ]; then
+    hcc_link_bindnow="-Wl,--hash-style=gnu -Wl,-z,now"
+  fi
+  if [ $hcc_force_fPIE ]; then
+    hcc_link_pie="-pie" # See Line 86.
+  fi
+fi
+
+# Lightweight SSP is default in Arch Linux CFLAGS, useful for builds that ignore them:
+if [ $hcc_force_stack ]; then
+  hcc_ssp='-fstack-protector --param=ssp-buffer-size=4'
+  if [ $hcc_force_stack_all ]; then
+    hcc_ssp='-fstack-protector-all' # This is the heavyweight version of SSP, usually considered too costly.
+  fi
+fi
+
+# Is default in Arch Linux CFLAGS, useful for builds that ignore them:
+# XXX: Might need to disable under some conditions.
+if [ $hcc_force_fortify ]; then
+  hcc_fortify='-D_FORTIFY_SOURCE=2'
+fi
+ 
+# Warnings often erroneous, breaks quite a few builds due to -Werror. 
+if [ $hcc_force_format ]; then
+  hcc_format='-Wformat -Wformat-security -Werror=format-security'
+fi
+
+# OpenBSD default? You may or may not want this, read the description.
+if [ $hcc_force_unstrict ]; then
+  hcc_unstrict='-fno-strict-aliasing -fno-strict-overflow'
+fi
+
+# You should really know why you want to break the build when encountering trampolines.
+if [ $hcc_force_trampolines ]; then
+  hcc_trampolines='-Wtrampolines -Werror=trampolines'
+fi
+
+# Available for completeness. Don't use nless you KNOW you need this.
+if [ $hcc_force_nullptr ]; then
+  hcc_nullptr='-fno-delete-null-pointer-checks'
+fi
+
+# Required for OpenSSL etc. to work on SELinux/grsec due to assembler code not having the right progbits.
+if [ $hcc_force_noexec ]; then
+  hcc_noexec='-Wa,--noexecstack'
+fi
+
+# Automatic PIE handling is pretty much the whole purpose of this wrapper; Acceptable overhead on 64bit.
+if [ $hcc_force_fPIE ]; then
+  hcc_fpie='-DPIC -fPIE'
+fi
+
+hcc_linkerflags="$hcc_link_pie $hcc_link_relro $hcc_link_bindnow"
+
+exec /usr/bin/gcc $hcc_fpie $hcc_noexec $hcc_ssp $hcc_fortify $hcc_unstrict $hcc_format $hcc_trampolines $hcc_nullptr "${1+"$@"}" $hcc_linkerflags
diff --git a/hardening-check/PKGBUILD b/hardening-check/PKGBUILD
new file mode 100644
index 000000000..1aec16f11
--- /dev/null
+++ b/hardening-check/PKGBUILD
@@ -0,0 +1,23 @@
+pkgname=hardening-check
+_pkgname=hardening-wrapper
+pkgver=1.35
+pkgrel=1
+pkgdesc="Check binaries for security hardening features"
+arch=('any')
+url="http://wiki.debian.org/Hardening"
+license=('GPL2')
+depends=('bash' 'perl')
+source=("http://archive.ubuntu.com/ubuntu/pool/main/h/hardening-wrapper/hardening-wrapper_$pkgver.tar.gz")
+sha256sums=('52c3a9b8963981acbdfb2bf9db970b149e213fb93a5eaf6d9e38b2d6090c74f8')
+
+build() {
+  cd "$srcdir/$_pkgname"
+}
+
+package() {
+  cd "$srcdir/$_pkgname"
+  install -Dm0755 'hardening-check' "$pkgdir/usr/bin/hardening-check"
+  install -Dm0755 'hardening-check.sh' "$pkgdir/usr/bin/hardening-check.sh"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libxenserver/PKGBUILD b/libxenserver/PKGBUILD
index dbbb8b815..6f0a6d5c1 100644
--- a/libxenserver/PKGBUILD
+++ b/libxenserver/PKGBUILD
@@ -2,11 +2,11 @@
 
 pkgname=libxenserver
 pkgver=6.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The XenServer SDK for C"
 arch=(i686 x86_64)
 url="http://community.citrix.com/cdn/xs/sdks"
-license=('LGPL')
+license=('LGPL2')
 depends=(libxml2 curl)
 makedepends=(chrpath)
 source=("libxenserver-$pkgver-1-src.tar.bz2::http://community.citrix.com/download/attachments/38633496/libxenserver-$pkgver-1-src.tar.bz2?version=1")
diff --git a/munge/PKGBUILD b/munge/PKGBUILD
index d4d306248..eb9873402 100644
--- a/munge/PKGBUILD
+++ b/munge/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Fredrik Tegenfeldt <fredrik.tegenfeldt@unige.ch>
 pkgname=munge
-pkgver=0.5.9
-pkgrel=5
+pkgver=0.5.10
+pkgrel=6
 pkgdesc="Munge is an authentication service for creating and validating credentials. It is designed to be highly scalable for use in an HPC cluster environment."
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/munge/"
@@ -19,7 +19,7 @@ install=${pkgname}.install
 changelog=
 source=("http://munge.googlecode.com/files/$pkgname-$pkgver.tar.bz2" "arch_munge.init")
 noextract=()
-md5sums=('ec156c0a30b3c8f0fcd090c36e3a524c' 'bc39e885f09e256d794170df503ea98a')
+md5sums=('49ec1b1d860b37967c9b8eb1057299bf' 'bc39e885f09e256d794170df503ea98a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/pantheon-terminal-bzr/PKGBUILD b/pantheon-terminal-bzr/PKGBUILD
index d7641b485..4b717a949 100644
--- a/pantheon-terminal-bzr/PKGBUILD
+++ b/pantheon-terminal-bzr/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: crazyelf5
 
 pkgname=pantheon-terminal-bzr
-pkgver=113
+pkgver=133
 pkgrel=1
 pkgdesc="A super lightweight, beautiful, and simple terminal from the Elementary project"
 arch=('i686' 'x86_64')
@@ -9,18 +9,39 @@ url="https://launchpad.net/pantheon-terminal"
 license=('GPL3')
 depends=('gtk3' 'glib2' 'vala' 'vte3' 'granite-bzr' 'gettext' 'gconf' 'dconf' 'libnotify')
 makedepends=('bzr' 'cmake')
-install=${pkgname}.install
+install=$pkgname.install
 
-_bzrtrunk=lp:${pkgname%-*}
-_bzrmod=${pkgname%-*}
+_bzrtrunk=lp:pantheon-terminal
+_bzrmod=pantheon-terminal
 
 build() {
-  [ -d ${_bzrmod} ] && rm -rf ${_bzrmod}
-  bzr branch ${_bzrtrunk} ${_bzrmod}
-  cd ${_bzrmod}
+  cd "$srcdir"
+  msg "Connecting to Bazaar server...."
+
+  if [[ -d "$_bzrmod" ]]; then
+    cd "$_bzrmod" && bzr pull "$_bzrtrunk" -r "$pkgver"
+    msg "The local files are updated."
+  else
+    bzr branch "$_bzrtrunk" "$_bzrmod" -r "$pkgver"
+  fi
+
+  msg "Bazaar checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "$srcdir/$_bzrmod-build"
+  cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-build"
+  cd "$srcdir/$_bzrmod-build"
+
+  [ -d build ] && rm -rf build
   mkdir build
   cd build
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr
   make
-  make DESTDIR="${pkgdir}" install
 }
+
+package() {
+  cd "$srcdir/$_bzrmod-build/build"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/parted-git/PKGBUILD b/parted-git/PKGBUILD
index 86c9ef784..8a0d66c55 100644
--- a/parted-git/PKGBUILD
+++ b/parted-git/PKGBUILD
@@ -21,8 +21,9 @@ optdepends=('reiserfsprogs: for reiserfs partitions')
 conflicts=("${_pkgname}")
 provides=("${_pkgname}")
 options=(!libtool)
-source=()
-md5sums=()
+
+source=('gnu-parted_fix_non-srcdir_build.patch')
+sha256sums=('a7823d3699171737e2d81d5ae42b619519379522cc58c7024ff0f773b554488c')
 
 install="${pkgname}.install"
 
@@ -67,6 +68,10 @@ build() {
 	
 	cd "${srcdir}/${_gitname}_build/"
 	
+	## Fix out-of-srcdir build
+	patch -Np1 -i "${srcdir}/gnu-parted_fix_out-of-srcdir_build.patch"
+	echo
+	
 	install -d "${srcdir}/${_gitname}_build/build-aux/" || true
 	install -D -m0755 "/usr/share/libtool/config/ltmain.sh" "${srcdir}/${_gitname}_build/build-aux/ltmain.sh"
 	
@@ -76,12 +81,10 @@ build() {
 	./bootstrap
 	echo
 	
-	# mkdir -p "${srcdir}/${_gitname}_build/BUILD"
-	# cd "${srcdir}/${_gitname}_build/BUILD"
-	cd "${srcdir}/${_gitname}_build/"
+	mkdir -p "${srcdir}/${_gitname}_build/BUILD"
+	cd "${srcdir}/${_gitname}_build/BUILD"
 	
-	# CFLAGS="" ../configure \#
-	CFLAGS="" ./configure \
+	CFLAGS="" ../configure \
 		--host="${CARCH}-unknown-linux-gnu" \
 		--prefix="/usr" \
 		--bindir="/usr/bin" \
@@ -107,14 +110,13 @@ build() {
 
 check() {
 	
-	# cd "${srcdir}/${_gitname}_build/BUILD"
-	cd "${srcdir}/${_gitname}_build/"
+	cd "${srcdir}/${_gitname}_build/BUILD"
 	
 	## Normal test-suite for 512 byte sectors
 	make check
 	echo
 	
-	## Check whether test-suite works for 4K byte sectors - seems like already done by top command
+	## Check whether test-suite works for 4K byte sectors - seems like already done by the top "make check" command
 	# PARTED_SECTOR_SIZE="4096" CK_FORK="no" make check
 	echo
 	
@@ -122,8 +124,7 @@ check() {
 
 package() {
 	
-	# cd "${srcdir}/${_gitname}_build/BUILD"
-	cd "${srcdir}/${_gitname}_build/"
+	cd "${srcdir}/${_gitname}_build/BUILD"
 	
 	make DESTDIR="${pkgdir}/" install
 	echo
diff --git a/parted-git/gnu-parted_fix_non-srcdir_build.patch b/parted-git/gnu-parted_fix_non-srcdir_build.patch
new file mode 100644
index 000000000..cd50d8f0e
--- /dev/null
+++ b/parted-git/gnu-parted_fix_non-srcdir_build.patch
@@ -0,0 +1,240 @@
+From bd12c2a0dda8e367a917e23a0ceec48893dd381d Mon Sep 17 00:00:00 2001
+From: Keshav P R <the.ridikulus.rat@gmail.com>
+Date: Tue, 10 Jan 2012 15:19:54 +0530
+Subject: [PATCH] Add -I$(top_builddir)/include to partedincludedir in all
+ Makefile.am to fix non-srcdir build
+
+---
+ libparted/Makefile.am               |    2 +-
+ libparted/fs/Makefile.am            |    2 +-
+ libparted/fs/amiga/Makefile.am      |    2 +-
+ libparted/fs/ext2/Makefile.am       |    2 +-
+ libparted/fs/fat/Makefile.am        |    2 +-
+ libparted/fs/hfs/Makefile.am        |    2 +-
+ libparted/fs/jfs/Makefile.am        |    2 +-
+ libparted/fs/linux_swap/Makefile.am |    2 +-
+ libparted/fs/nilfs2/Makefile.am     |    2 +-
+ libparted/fs/ntfs/Makefile.am       |    2 +-
+ libparted/fs/reiserfs/Makefile.am   |    2 +-
+ libparted/fs/ufs/Makefile.am        |    2 +-
+ libparted/fs/xfs/Makefile.am        |    2 +-
+ libparted/labels/Makefile.am        |    2 +-
+ libparted/tests/Makefile.am         |    4 ++--
+ parted/Makefile.am                  |    2 +-
+ partprobe/Makefile.am               |    2 +-
+ tests/Makefile.am                   |    4 ++--
+ 18 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/libparted/Makefile.am b/libparted/Makefile.am
+index 4bc1939..85b70ae 100644
+--- a/libparted/Makefile.am
++++ b/libparted/Makefile.am
+@@ -18,7 +18,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+ SUBDIRS       = labels fs . $(SUBDIRS_CHECK)
+ 
+ 
+-partedincludedir      = -I$(top_srcdir)/lib -I$(top_srcdir)/include
++partedincludedir      = -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_srcdir)/include -I$(top_builddir)/include
+ lib_LTLIBRARIES	      =	libparted.la
+ 
+ # Set the shared library version, per Libtool's guidelines.
+diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
+index cb09ffb..e728c3b 100644
+--- a/libparted/fs/Makefile.am
++++ b/libparted/fs/Makefile.am
+@@ -6,7 +6,7 @@
+ SUBDIRS       = amiga ext2 ufs fat ntfs hfs linux_swap xfs jfs reiserfs \
+ 		nilfs2 # bfs
+ 
+-partedincludedir      =	-I$(top_srcdir)/include
++partedincludedir      =	-I$(top_srcdir)/include -I$(top_builddir)/include
+ noinst_LTLIBRARIES    =	libfs.la
+ libfs_la_LDFLAGS  = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ 			-release $(LT_RELEASE)
+diff --git a/libparted/fs/amiga/Makefile.am b/libparted/fs/amiga/Makefile.am
+index 788ecac..a9ec421 100644
+--- a/libparted/fs/amiga/Makefile.am
++++ b/libparted/fs/amiga/Makefile.am
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+-partedincludedir      =	-I$(top_srcdir)/include
++partedincludedir      =	-I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ noinst_LTLIBRARIES    =	libamigafs.la
+ libamigafs_la_SOURCES   =	amiga.h		\
+diff --git a/libparted/fs/ext2/Makefile.am b/libparted/fs/ext2/Makefile.am
+index 0acd080..15eac2a 100644
+--- a/libparted/fs/ext2/Makefile.am
++++ b/libparted/fs/ext2/Makefile.am
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+-partedincludedir      =	-I$(top_srcdir)/include
++partedincludedir      =	-I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ noinst_LTLIBRARIES    =	libext2.la
+ libext2_la_SOURCES    =	ext2.h \
+diff --git a/libparted/fs/fat/Makefile.am b/libparted/fs/fat/Makefile.am
+index 9c975d7..41fb8de 100644
+--- a/libparted/fs/fat/Makefile.am
++++ b/libparted/fs/fat/Makefile.am
+@@ -1,4 +1,4 @@
+-partedincludedir      =	-I$(top_srcdir)/include
++partedincludedir      =	-I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ noinst_LTLIBRARIES    =	libfat.la
+ libfat_la_SOURCES     = bootsector.c	\
+diff --git a/libparted/fs/hfs/Makefile.am b/libparted/fs/hfs/Makefile.am
+index f85493c..5691912 100644
+--- a/libparted/fs/hfs/Makefile.am
++++ b/libparted/fs/hfs/Makefile.am
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+-partedincludedir	= -I$(top_srcdir)/include
++partedincludedir	= -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ noinst_LTLIBRARIES	= libhfs.la
+ libhfs_la_SOURCES	= hfs.c hfs.h \
+diff --git a/libparted/fs/jfs/Makefile.am b/libparted/fs/jfs/Makefile.am
+index a477874..f55b60d 100644
+--- a/libparted/fs/jfs/Makefile.am
++++ b/libparted/fs/jfs/Makefile.am
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+-partedincludedir	= -I$(top_srcdir)/include
++partedincludedir	= -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ noinst_LTLIBRARIES	= libjfs.la
+ libjfs_la_SOURCES	= jfs.c jfs_superblock.h jfs_types.h
+diff --git a/libparted/fs/linux_swap/Makefile.am b/libparted/fs/linux_swap/Makefile.am
+index a366fc6..4a9260a 100644
+--- a/libparted/fs/linux_swap/Makefile.am
++++ b/libparted/fs/linux_swap/Makefile.am
+@@ -1,4 +1,4 @@
+-partedincludedir	= -I$(top_srcdir)/include
++partedincludedir	= -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ noinst_LTLIBRARIES	= liblinuxswap.la
+ liblinuxswap_la_SOURCES	= linux_swap.c
+diff --git a/libparted/fs/nilfs2/Makefile.am b/libparted/fs/nilfs2/Makefile.am
+index c7cfd68..4c2ed84 100644
+--- a/libparted/fs/nilfs2/Makefile.am
++++ b/libparted/fs/nilfs2/Makefile.am
+@@ -1,4 +1,4 @@
+-partedincludedir	= -I$(top_srcdir)/include
++partedincludedir	= -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+ 
+diff --git a/libparted/fs/ntfs/Makefile.am b/libparted/fs/ntfs/Makefile.am
+index 732692a..d9a370c 100644
+--- a/libparted/fs/ntfs/Makefile.am
++++ b/libparted/fs/ntfs/Makefile.am
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+-partedincludedir	= -I$(top_srcdir)/include
++partedincludedir	= -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ noinst_LTLIBRARIES	= libntfs.la
+ libntfs_la_SOURCES	= ntfs.c
+diff --git a/libparted/fs/reiserfs/Makefile.am b/libparted/fs/reiserfs/Makefile.am
+index 7df005a..16cebe0 100644
+--- a/libparted/fs/reiserfs/Makefile.am
++++ b/libparted/fs/reiserfs/Makefile.am
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+-partedincludedir	= -I$(top_srcdir)/include
++partedincludedir	= -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ noinst_LTLIBRARIES	= libreiserfs.la
+ 
+diff --git a/libparted/fs/ufs/Makefile.am b/libparted/fs/ufs/Makefile.am
+index c63e8d2..895fa55 100644
+--- a/libparted/fs/ufs/Makefile.am
++++ b/libparted/fs/ufs/Makefile.am
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+-partedincludedir	= -I$(top_srcdir)/include
++partedincludedir	= -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ noinst_LTLIBRARIES	= libufs.la
+ libufs_la_SOURCES	= ufs.c
+diff --git a/libparted/fs/xfs/Makefile.am b/libparted/fs/xfs/Makefile.am
+index 8e55052..7c7ed7f 100644
+--- a/libparted/fs/xfs/Makefile.am
++++ b/libparted/fs/xfs/Makefile.am
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+-partedincludedir	= -I$(top_srcdir)/include
++partedincludedir	= -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ noinst_LTLIBRARIES	= libxfs.la
+ libxfs_la_SOURCES	= xfs.c xfs_sb.h xfs_types.h platform_defs.h
+diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am
+index 967e537..62877b7 100644
+--- a/libparted/labels/Makefile.am
++++ b/libparted/labels/Makefile.am
+@@ -12,7 +12,7 @@ endif
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+ 
+ partedincludedir = \
+-  -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libparted
++  -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)/libparted
+ noinst_LTLIBRARIES    =	liblabels.la
+ 
+ liblabels_la_SOURCES = \
+diff --git a/libparted/tests/Makefile.am b/libparted/tests/Makefile.am
+index de8d03e..6453c07 100644
+--- a/libparted/tests/Makefile.am
++++ b/libparted/tests/Makefile.am
+@@ -14,8 +14,8 @@ LDADD = \
+ 
+ AM_CPPFLAGS = \
+   $(CHECK_CFLAGS) \
+-  -I$(top_srcdir)/lib \
+-  -I$(top_srcdir)/include
++  -I$(top_srcdir)/lib -I$(top_builddir)/lib \
++  -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ label_SOURCES = common.h common.c label.c
+ disk_SOURCES  = common.h common.c disk.c
+diff --git a/parted/Makefile.am b/parted/Makefile.am
+index 7b093c6..55be5ae 100644
+--- a/parted/Makefile.am
++++ b/parted/Makefile.am
+@@ -3,7 +3,7 @@ BUILT_SOURCES =
+ sbin_PROGRAMS = parted
+ 
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+-partedincludedir      = -I$(top_srcdir)/lib -I$(top_srcdir)/include
++partedincludedir      = -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ parted_SOURCES = command.c	\
+ 		 command.h	\
+diff --git a/partprobe/Makefile.am b/partprobe/Makefile.am
+index f140991..90d8856 100644
+--- a/partprobe/Makefile.am
++++ b/partprobe/Makefile.am
+@@ -1,4 +1,4 @@
+-partedincludedir      = -I$(top_srcdir)/lib -I$(top_srcdir)/include
++partedincludedir      = -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_srcdir)/include -I$(top_builddir)/include
+ 
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+ sbin_PROGRAMS = partprobe
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index f442204..4544bda 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -73,8 +73,8 @@ check_PROGRAMS = print-align print-max dup-clobber duplicate
+ LDADD = \
+   $(top_builddir)/libparted/libparted.la
+ AM_CPPFLAGS = \
+-  -I$(top_srcdir)/lib \
+-  -I$(top_srcdir)/include
++  -I$(top_srcdir)/lib -I$(top_builddir)/lib \
++  -I$(top_srcdir)/include -I$(top_builddir)/include
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+ 
+ parted_dir = $(abs_top_builddir)/parted
+-- 
+1.7.8.3
+
diff --git a/pastescript/PKGBUILD b/pastescript/PKGBUILD
index df3067a0f..1220ada6f 100644
--- a/pastescript/PKGBUILD
+++ b/pastescript/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=pastescript
 _pkgname=PasteScript
-pkgver=1.7.3
+pkgver=1.7.5
 pkgrel=1
 pkgdesc="A pluggable command-line frontend, including commands to setup package file layouts"
 arch=('i686' 'x86_64')
@@ -19,3 +19,4 @@ build() {
 }
 
 md5sums=('9101a3a23809d3413b39ba8b75dd0bce')
+md5sums=('4c72d78dcb6bb993f30536842c16af4d')
diff --git a/python-celery/PKGBUILD b/python-celery/PKGBUILD
index 36bc50056..c10c6a067 100644
--- a/python-celery/PKGBUILD
+++ b/python-celery/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: apkawa <apkawa@gmail.com>
 
 pkgname=python-celery
-pkgver=2.4.5
+pkgver=2.4.6
 pkgrel=1
 pkgdesc="Distributed Asynchronous Task Queue"
 arch=(any)
@@ -23,6 +23,6 @@ build() {
   install -D -m755 $srcdir/celeryd $pkgdir/etc/rc.d/celeryd
   install -D -m644 $srcdir/conf.d.celeryd $pkgdir/etc/conf.d/celeryd
 }
-md5sums=('a8648b3fa9e0cdd6b6a4be71d7f496c8'
+md5sums=('a480dd8741b0d5ed694b6a36a25a47ce'
          'dc0480163674ff3cfb33ea325ea9579f'
          'ef0a0e18e49c90c56b6c6704a91dcf89')
diff --git a/python-creoleparser/PKGBUILD b/python-creoleparser/PKGBUILD
index 3ec795f8e..8c4198fae 100644
--- a/python-creoleparser/PKGBUILD
+++ b/python-creoleparser/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor:  apkawa <apkawa@gmail.com>
 pkgname=python-creoleparser
-pkgver=0.7.3
+pkgver=0.7.4
 pkgrel=1
 pkgdesc="Parser for the Creole common wiki markup language"
 arch=('i686' 'x86_64')
@@ -16,4 +16,4 @@ build() {
     install -D -m0644 LICENSE.txt $startdir/pkg/usr/share/licenses/python-creoleparser/LICENSE
 }
 
-md5sums=('8ebc33b0e33db753d9e040d8dc5b30fe')
+md5sums=('9619057d20a53d440eb591c904d29791')
diff --git a/python-mpd-git/PKGBUILD b/python-mpd-git/PKGBUILD
index 074e142af..2cc00a67a 100644
--- a/python-mpd-git/PKGBUILD
+++ b/python-mpd-git/PKGBUILD
@@ -8,14 +8,17 @@ pkgrel=1
 pkgdesc="Python MPD client library"
 url="http://pypi.python.org/pypi/python-mpd/"
 depends=('python2')
+makedepends=('git')
 license=('GPL3')
-arch=('i686' 'x86_64')
+arch=('any')
 conflicts=('python-mpd')
 provides=('python-mpd')
 source=()
 md5sums=()
 
-_gitroot="http://git.thejat.be/python-mpd.git"
+_gitroot="git://jatreuman.indefero.net/jatreuman/python-mpd.git"
+# Original git repo:
+#_gitroot="http://git.thejat.be/python-mpd.git"
 _gitname="python-mpd"
 
 build() {
diff --git a/python-werkzeug-docs/PKGBUILD b/python-werkzeug-docs/PKGBUILD
index f7b75d9c3..3bfa13f83 100644
--- a/python-werkzeug-docs/PKGBUILD
+++ b/python-werkzeug-docs/PKGBUILD
@@ -1,8 +1,8 @@
 # Contributer: apkawa <apkawa@gmail.com>
 
 pkgname=python-werkzeug-docs
-pkgver=0.6.2
-pkgrel=2
+pkgver=0.8.2
+pkgrel=1
 pkgdesc="Documentation for The Swiss Army knife of Python web development"
 arch=(any)
 url="http://werkzeug.pocoo.org/"
@@ -10,7 +10,6 @@ license=('BSD')
 depends=('python2>=2.4')
 makedepends=('python-sphinx')
 source=(http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-$pkgver.tar.gz)
-md5sums=('519408350346a247333bb5d584371724')
 
 build() {
   cd Werkzeug-$pkgver/docs
@@ -21,3 +20,4 @@ build() {
 }
 
 
+md5sums=('d4fcc1c9c5a4c4d148b87e5b581f9dea')
diff --git a/scratch-bzr/PKGBUILD b/scratch-bzr/PKGBUILD
index 2a43d4598..dae62aa03 100644
--- a/scratch-bzr/PKGBUILD
+++ b/scratch-bzr/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: crazyelf5
 
 pkgname=scratch-bzr
-pkgver=484
+pkgver=489
 pkgrel=1
 pkgdesc="A text editor from the Elementary project"
 arch=('i686' 'x86_64')
@@ -9,7 +9,7 @@ url="https://launchpad.net/scratch"
 license=('GPL3')
 depends=('gtksourceview3' 'libgee' 'gobject-introspection' 'glib2' 'desktop-file-utils'
          'gconf' 'gtk3' 'granite-bzr' 'pango' 'dconf' 'hicolor-icon-theme')
-makedepends=('bzr' 'cmake' 'vala-git')
+makedepends=('bzr' 'cmake' 'vala')
 optdepends=('contractor-bzr: Contractor integration [AUR]')
 options=('!makeflags')
 install=$pkgname.install
diff --git a/sonicsquirrel/PKGBUILD b/sonicsquirrel/PKGBUILD
new file mode 100644
index 000000000..76ea3f0ce
--- /dev/null
+++ b/sonicsquirrel/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Red Squirrel <iam at redsquirrel dot tk>
+
+pkgname=sonicsquirrel
+pkgver=2.1
+pkgrel=1
+pkgdesc="A Filesonic.com Manager for Linux!"
+arch=('i686' 'x86_64')
+url="http://www.redsquirrel87.com/SonicSquirrel.html"
+license=('freeware')
+depends=('gambas2-runtime' 'gambas2-gb-form' 'gambas2-gb-gui' 'gambas2-gb-settings' 'curl')
+makedepends=()
+install='sonicsquirrel.install'
+source=(http://dl.dropbox.com/u/5562654/${pkgname}-AUR-${pkgver}.tar.gz)
+md5sums=('c3f1dc354a1a0b5f99d10fdda1168637')
+
+package() {
+  install -Dm755 "${srcdir}/${pkgname}-${pkgver}/sonicsquirrel.gambas" "${pkgdir}/usr/bin/sonicsquirrel"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/sonicsquirrel.desktop" "${pkgdir}/usr/share/applications/sonicsquirrel.desktop"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/sonicsquirrel48x48.png" "${pkgdir}/usr/share/icons/hicolor/48x48/apps/sonicsquirrel.png"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/sonicsquirrel32x32.png" "${pkgdir}/usr/share/icons/hicolor/32x32/apps/sonicsquirrel.png"
+}
+
diff --git a/sonicsquirrel/sonicsquirrel.install b/sonicsquirrel/sonicsquirrel.install
new file mode 100644
index 000000000..42266ab31
--- /dev/null
+++ b/sonicsquirrel/sonicsquirrel.install
@@ -0,0 +1,14 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    if [ -f update-desktop-database ]; then
+        update-desktop-database -q &> /dev/null
+    fi
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+pre_remove() {
+    post_install $1
+}
diff --git a/sorl-thumbnail/PKGBUILD b/sorl-thumbnail/PKGBUILD
index 2a333c428..71f318867 100644
--- a/sorl-thumbnail/PKGBUILD
+++ b/sorl-thumbnail/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: apkawa <apkawa@gmail.com>
 
 pkgname=sorl-thumbnail
-pkgver=11.09
+pkgver=11.12
 pkgrel=1
 pkgdesc="Thumbnails for Django"
 arch=(any)
@@ -16,4 +16,4 @@ build() {
     python2 setup.py build || return 1
     python2 setup.py install --root=$pkgdir --optimize=1 || return 1
 }
-sha1sums=('bb5b9dbbea1ce4fab90ff981a66d12b7b8a9ac5f')
+sha1sums=('abc32461924edf3a1060d059f86dc7de44b2d268')
diff --git a/vim-zencoding/PKGBUILD b/vim-zencoding/PKGBUILD
index 21240cbdc..5f12543cf 100644
--- a/vim-zencoding/PKGBUILD
+++ b/vim-zencoding/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: apkawa <apkawa@gmail.com>
 
 pkgname=vim-zencoding
-pkgver=0.55
-pkgrel=2
+pkgver=0.58
+pkgrel=1
 pkgdesc="vim plugins for HTML and CSS hi-speed coding"
 arch=(any)
 url="http://github.com/mattn/zencoding-vim"
 license=('custom')
 depends=(vim)
 groups=('vim-plugins')
-source=(zencoding.vim.zip::http://www.vim.org/scripts/download_script.php?src_id=16737)
+source=(zencoding.vim.zip::http://www.vim.org/scripts/download_script.php?src_id=16939)
 
 build() {
     install -d ${pkgdir}/usr/share/vim/vimfiles/
@@ -17,4 +17,4 @@ build() {
 
 }
 
-md5sums=('b1c7664baa56059352670de002e03632')
+md5sums=('de2cb8b6eb2df7b3e6171a04533b4063')
diff --git a/wotsap/PKGBUILD b/wotsap/PKGBUILD
new file mode 100644
index 000000000..6a7af85d9
--- /dev/null
+++ b/wotsap/PKGBUILD
@@ -0,0 +1,29 @@
+# This is an example PKGBUILD file. Use this as a start to creating your own,
+# and remove these comments. For more information, see 'man PKGBUILD'.
+# NOTE: Please fill out the license field for your package! If it is unknown,
+# then please put 'unknown'.
+
+# Maintainer: Your Name <youremail@domain.com>
+pkgname=wotsap
+pkgver=0.6
+pkgrel=1
+pkgdesc="A tool to find paths in the OpenPGP Web of Trust"
+arch=('any')
+url="http://www.lysator.liu.se/~jc/wotsap/"
+license=('GPL')
+depends=('python2' 'python-imaging')
+changelog=
+source=(http://www.lysator.liu.se/~jc/wotsap/download/$pkgname-$pkgver.tgz)
+md5sums=('347755ecab208977e880cfc3182ead03')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i "s/python$/python2/" wotsap
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -D wotsap "$pkgdir/usr/bin/wotsap"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/xvp/PKGBUILD b/xvp/PKGBUILD
index 93002277a..4df049e2c 100644
--- a/xvp/PKGBUILD
+++ b/xvp/PKGBUILD
@@ -2,16 +2,16 @@
 # Contributor: Sergej Pupykin <arch at sergej.pp.ru>
 
 pkgname=xvp
-pkgver=1.11.0
+pkgver=1.12.0
 pkgrel=1
 pkgdesc="Cross-platform VNC-based and Web-based Management for Citrix XenServer and Xen Cloud Platform"
 arch=(i686 x86_64)
 url="http://www.xvpsource.org"
-license=('GPL2')
+license=('GPL')
 depends=(libxml2 curl libxenserver php php-curl php-mcrypt)
 makedepends=(java-environment)
-backup=(srv/http/xvpweb/.htaccess)
 source=(http://www.xvpsource.org/xvp-$pkgver.tar.gz)
+md5sums=('d084b6097b0ed7fd63e8870faa67b561')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -21,12 +21,4 @@ build() {
 
   mkdir -p $pkgdir/srv/http/
   cp -r web $pkgdir/srv/http/xvpweb || return 1
-
-  cat >$pkgdir/srv/http/xvpweb/.htaccess <<EOF
-deny from all
-php_flag display_startup_errors off
-php_flag display_errors off
-php_flag html_errors off
-EOF
 }
-md5sums=('1e7a9e1cb05d0fd3f8bf3059ae4ef8f0')
-- 
2.11.4.GIT