Sun Jan 29 23:15:02 UTC 2012

author: root <root@rshg054.dnsready.net> 2012-01-29 23:15:03 +0000
committer: root <root@rshg054.dnsready.net> 2012-01-29 23:15:03 +0000
commit: 39711f3264d3b9de2ff6392649274d6333932457 (patch)
tree: de0577b44ca853064f52a0df25ee9f22efd756bc
parent: 738e6c6d93b4c7118e49b38c610abed8b7f7d55a (diff)
193 files changed, 4777 insertions, 529 deletions
diff --git a/community-staging/gmerlin-avdecoder/PKGBUILD b/community-staging/gmerlin-avdecoder/PKGBUILD
new file mode 100644
index 000000000..5bb466ea2
--- /dev/null
+++ b/community-staging/gmerlin-avdecoder/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 62902 2012-01-29 00:35:31Z ebelanger $
+# Maintainer: Mateusz Herych <heniekk@gmail.com>
+
+pkgname=gmerlin-avdecoder
+pkgver=1.1.0
+pkgrel=4
+pkgdesc="Media decoding library"
+arch=('i686' 'x86_64')
+url="http://gmerlin.sourceforge.net/avdec_frame.html"
+license=('GPL')
+depends=('gmerlin' 'openjpeg' 'flac' 'smbclient' 'libmad' 'libmpcdec' 'speex'
+         'libdca' 'libmpeg2' 'a52dec')
+source=(http://downloads.sourceforge.net/sourceforge/gmerlin/gmerlin-avdecoder-$pkgver.tar.gz)
+md5sums=('c1ea663e9da631453eec4ac79138b6c5')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  rm -f cpuinfo.sh
+  ./configure --prefix=/usr --without-doxygen
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-staging/gmerlin/PKGBUILD b/community-staging/gmerlin/PKGBUILD
new file mode 100644
index 000000000..dc67a30bb
--- /dev/null
+++ b/community-staging/gmerlin/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 62900 2012-01-29 00:06:09Z ebelanger $
+# Maintainer: Mateusz Herych <heniekk@gmail.com>
+
+pkgname=gmerlin
+pkgver=1.0.0
+pkgrel=5
+pkgdesc="Multimedia architecture for Linux"
+arch=('i686' 'x86_64')
+url="http://openmovieeditor.sourceforge.net/HomePage"
+license=('GPL')
+depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl')
+makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa')
+optdepends=('alsa-lib: for ALSA support'
+	    'jack: for JACK support'
+	    'libquicktime: for movie encoding'
+	    'pulseaudio: for PulseAudio support'
+	    'v4l-utils: for video conversion')
+options=('!libtool' '!makeflags')
+install=gmerlin.install
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+	libpng.patch)
+md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6'
+         'c262023434246705296d97bc7337a212')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  rm -rf cpuinfo.sh
+
+  patch -p1 -i "$srcdir/libpng.patch"
+  ./configure --prefix=/usr --without-doxygen
+  sed -i 's|LIBS = -lgavl|LIBS = -lgavl -ldl -lpthread -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lX11|' {lib,tests,apps/*}/Makefile
+  sed -i 's|ln -sf $(DESTDIR)$(pkgdatadir)|ln -sf $(pkgdatadir)|' icons/Makefile
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-staging/gmerlin/gmerlin.install b/community-staging/gmerlin/gmerlin.install
new file mode 100644
index 000000000..c7625c2f1
--- /dev/null
+++ b/community-staging/gmerlin/gmerlin.install
@@ -0,0 +1,25 @@
+infodir=usr/share/info
+filelist=(gmerlin.info)
+
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+  done
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/community-staging/gmerlin/libpng.patch b/community-staging/gmerlin/libpng.patch
new file mode 100644
index 000000000..c01105e63
--- /dev/null
+++ b/community-staging/gmerlin/libpng.patch
@@ -0,0 +1,17 @@
+diff -wbBur gmerlin-1.0.0/plugins/png/ir_png.c gmerlin-1.0.0.my/plugins/png/ir_png.c
+--- gmerlin-1.0.0/plugins/png/ir_png.c	2011-01-07 18:37:06.000000000 +0300
++++ gmerlin-1.0.0.my/plugins/png/ir_png.c	2011-11-07 14:46:25.000000000 +0400
+@@ -127,13 +127,8 @@
+         bits = 16;
+         }
+       if(bit_depth < 8)
+-#if BG_MAKE_BUILD(PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE) < BG_MAKE_BUILD(1,2,9)
+-        png_set_gray_1_2_4_to_8(png->png_ptr);
+-#else
+       png_set_expand_gray_1_2_4_to_8(png->png_ptr);
+-#endif
+ 
+-        png_set_gray_1_2_4_to_8(png->png_ptr);
+       if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS))
+         {
+         png_set_tRNS_to_alpha(png->png_ptr);
diff --git a/community-staging/guake/0001-Retrieve-port-as-int.2.patch b/community-staging/guake/0001-Retrieve-port-as-int.2.patch
new file mode 100644
index 000000000..3fde26dc2
--- /dev/null
+++ b/community-staging/guake/0001-Retrieve-port-as-int.2.patch
@@ -0,0 +1,25 @@
+From efcd1d8d3cdc354f46bc2485e7e3394f8578b7ba Mon Sep 17 00:00:00 2001
+From: pingou <pingou@pingoured.fr>
+Date: Mon, 23 Aug 2010 09:54:35 +0200
+Subject: [PATCH] Retrieve port as int
+
+---
+ src/guake.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/guake.py b/src/guake.py
+index 6214fb2..40e688f 100644
+--- a/src/guake.py
++++ b/src/guake.py
+@@ -1099,7 +1099,7 @@ class Guake(SimpleGladeApp):
+                 ssl_port = port
+             else:
+                 ssl_host = self.client.get_string('/system/proxy/secure_host')
+-                ssl_port = self.client.get_string('/system/proxy/secure_port')
++                ssl_port = self.client.get_int('/system/proxy/secure_port')
+ 
+             if self.client.get_bool(proxy + 'use_authentication'):
+                 auth_user = self.client.get_string(
+-- 
+1.7.2.1
+
diff --git a/community-staging/guake/PKGBUILD b/community-staging/guake/PKGBUILD
new file mode 100644
index 000000000..f72b69bd7
--- /dev/null
+++ b/community-staging/guake/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 62909 2012-01-29 04:37:40Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org>
+pkgname=guake
+pkgver=0.4.2
+pkgrel=5
+pkgdesc='is a drop-down terminal for Gnome Desktop Environment'
+arch=('i686' 'x86_64')
+url='http://guake.org'
+license=('GPL')
+depends=('python-notify' 'vte' 'gconf' 'python2-gconf' 'dbus-python' 'notification-daemon')
+makedepends=('libx11' 'pkgconfig' 'perlxml' 'intltool')
+install=guake.install
+source=(http://guake.org/files/guake-$pkgver.tar.gz
+        http://guake.org/raw-attachment/ticket/246/0001-Retrieve-port-as-int.2.patch)
+md5sums=('1f0feff3bfc15c998147dbf07d9d8a8e'
+         '9aca6ba8e46ae1b69958cda0e03320ff')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Point Python scripts to the python2 binary
+  sed -i 's|bin/python"|bin/python2"|' src/guake{,-prefs}.in
+
+  # Patch to import proxy port setting as int (http://guake.org/ticket/246)
+  patch -Np1 -i "$srcdir/0001-Retrieve-port-as-int.2.patch"
+
+  ./configure --sysconfdir=/usr/share --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-staging/guake/guake.install b/community-staging/guake/guake.install
new file mode 100644
index 000000000..1e828c86b
--- /dev/null
+++ b/community-staging/guake/guake.install
@@ -0,0 +1,17 @@
+pkgname=guake
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
diff --git a/community-staging/mldonkey/PKGBUILD b/community-staging/mldonkey/PKGBUILD
new file mode 100644
index 000000000..88cc8860d
--- /dev/null
+++ b/community-staging/mldonkey/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 62876 2012-01-28 13:55:36Z cbrannon $
+# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
+# Contributor: Corrado Primier <bardo@aur.archlinux.org>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>   
+
+pkgname=mldonkey
+pkgver=3.1.0
+pkgrel=2
+pkgdesc="A multi-network P2P client"
+arch=('i686' 'x86_64')
+url="http://mldonkey.sourceforge.net/"
+license=('GPL')
+depends=('desktop-file-utils' 'file' 'gd' 'bzip2')
+makedepends=('lablgtk2' 'librsvg' 'ocaml')
+optdepends=('librsvg: GUI support'
+            'libx11: GUI support')
+backup=('etc/conf.d/mldonkey')
+install=mldonkey.install
+source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
+        mldonkeyd
+        mldonkey.conf
+        mldonkey.desktop)
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --enable-gui=newgui2
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/$pkgname-$pkgver/icons/rsvg/type_source_normal.svg" \
+    "$pkgdir/usr/share/icons/mldonkey.svg"
+  install -Dm644 "$srcdir/mldonkey.desktop" \
+    "$pkgdir/usr/share/applications/mldonkey.desktop"
+
+  install -Dm755 "$srcdir/mldonkeyd" "$pkgdir/etc/rc.d/mldonkey"
+  install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey"
+}
+md5sums=('072726d158ba1e936c554be341e7ceff'
+         '75e4b6c7fb282f7de15a8d5478f3bd70'
+         '1f86d92db51c62cded0e6f3833057dee'
+         '1de3266caa49f82bee73ba891eea12cf')
diff --git a/community-staging/mldonkey/mldonkey.conf b/community-staging/mldonkey/mldonkey.conf
new file mode 100644
index 000000000..24a25af74
--- /dev/null
+++ b/community-staging/mldonkey/mldonkey.conf
@@ -0,0 +1,5 @@
+# Username under which the daemon will run (mandatory)
+MLDUSER=""
+
+# Parameters to be passed to the daemon (default is empty)
+PARAMS=""
diff --git a/community-staging/mldonkey/mldonkey.desktop b/community-staging/mldonkey/mldonkey.desktop
new file mode 100644
index 000000000..b307261e1
--- /dev/null
+++ b/community-staging/mldonkey/mldonkey.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=MLDonkey GUI
+Comment=multi-protocol P2P program
+Exec=mldonkey_gui
+Icon=mldonkey
+Terminal=false
+Type=Application
+Categories=Network;P2P;
diff --git a/community-staging/mldonkey/mldonkey.install b/community-staging/mldonkey/mldonkey.install
new file mode 100644
index 000000000..dd8ea0407
--- /dev/null
+++ b/community-staging/mldonkey/mldonkey.install
@@ -0,0 +1,17 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  if [ -f /etc/mldonkey.conf ]; then
+    mv /etc/mldonkey.conf /etc/conf.d/mldonkey
+    cat << EOM
+
+==> mldonkey post upgrade message:
+==> /etc/mldonkey.conf has been moved in /etc/conf.d/mldonkey
+
+EOM
+  fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-staging/mldonkey/mldonkeyd b/community-staging/mldonkey/mldonkeyd
new file mode 100644
index 000000000..6a458d68e
--- /dev/null
+++ b/community-staging/mldonkey/mldonkeyd
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/conf.d/mldonkey
+. /etc/rc.d/functions
+
+if [ -z $MLDUSER ] ; then
+	echo "Unable to run MLDonkey. You must set a user in /etc/conf.d/mldonkey ."
+	exit 2
+fi
+
+if [ -z "$(getent passwd "$MLDUSER")" ]; then
+	# Perhaps we should create the account for the user?
+	echo "You must create the account $MLDUSER in order to run mldonkey."
+	echo "Please create the account manually, and try again."
+	exit 2
+fi
+
+MLDGROUPID=$(getent passwd "$MLDUSER" |cut -d':' -f4)
+MLDGROUP=$(getent group $MLDGROUPID |cut -d':' -f1)
+USERDIR=$(getent passwd $MLDUSER | cut -d: -f6)
+
+if [ ! -d $USERDIR ]; then
+	echo "Unable to run MLDonkey. Home directory for ${MLDUSER} does not exist."
+	exit 2
+fi
+
+PIDDIR="/var/run/mldonkey"
+PIDFILE="$PIDDIR/mlnet.pid"
+PID=$(cat $PIDFILE 2>/dev/null)
+
+case "$1" in
+    	start)
+        	stat_busy "Starting MLDonkey"
+		if [ ! -d $PIDDIR ]; then
+			install -d -m755 -o "$MLDUSER" -g "$MLDGROUP" $PIDDIR
+		fi
+		if [ "$(stat -c %U $PIDDIR)" != "$MLDUSER" ]; then
+			chown -R "$MLDUSER:$MLDGROUP" $PIDDIR
+		fi
+		[ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet -pid $PIDDIR  $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &"
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			add_daemon mldonkey
+			stat_done
+		fi
+	;;
+    	stop)
+        	stat_busy "Stopping MLDonkey"
+		[ ! -z $PID ] && kill $PID &> /dev/null
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			rm_daemon mldonkey
+			stat_done
+		fi
+	;;
+    	restart)
+        	$0 stop
+		sleep 1
+        	$0 start
+        ;;
+    	*)
+        	echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community-staging/smc/PKGBUILD b/community-staging/smc/PKGBUILD
new file mode 100644
index 000000000..cef809f8a
--- /dev/null
+++ b/community-staging/smc/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 62870 2012-01-28 06:06:11Z ebelanger $
+# Maintainer:
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Kritoke <typeolinux@yahoo.com>
+
+pkgname=smc
+pkgver=1.9
+pkgrel=14
+pkgdesc="Secret Maryo Chronicles"
+arch=('i686' 'x86_64')
+url="http://www.secretmaryo.org/"
+license=('GPL3')
+depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data')
+makedepends=('autoconf' 'automake' 'boost')
+source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2
+        smc-for-cegui-v0-7.diff
+        smc.desktop
+        smc.png)
+md5sums=('75ab7826303c49aec25b052a8b90287f'
+         '51dfea21b741ad19df14e738df52f1cf'
+         '80fe208132ff41dd7677a53ee429ecdb'
+         'efca7580e28748625eb676c9d24ee122')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # to remove when smc will be compatible with cegui-0.7.x
+  patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff"
+  # fix for boost-1.46
+  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
+
+  ./autogen.sh
+  LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make install DESTDIR="$pkgdir"
+  # install some freedesktop.org compatibility
+  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+
+  rm -rf "$pkgdir/usr/share/smc/"
+}
diff --git a/community-staging/smc/smc-for-cegui-v0-7.diff b/community-staging/smc/smc-for-cegui-v0-7.diff
new file mode 100644
index 000000000..a99cbce6c
--- /dev/null
+++ b/community-staging/smc/smc-for-cegui-v0-7.diff
@@ -0,0 +1,437 @@
+diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac
+--- smc-1.9/configure.ac	2009-08-17 15:59:00.000000000 +0200
++++ smc-1.9-b/configure.ac	2011-01-19 00:43:37.809884881 +0100
+@@ -53,7 +53,7 @@
+ 	AC_MSG_ERROR([SDL_ttf library not found]))
+ 
+ # Check for the CEGUI library
+-PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0)
++PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0)
+ CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS"
+ LIBS="$LIBS $CEGUI_LIBS"
+ 
+diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp
+--- smc-1.9/src/core/editor.cpp	2009-08-13 17:11:42.000000000 +0200
++++ smc-1.9-b/src/core/editor.cpp	2011-01-19 00:44:46.734328121 +0100
+@@ -118,16 +118,10 @@
+ 	return tmp;
+ }
+ 
+-void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
++void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
+ {
+ 	// draw text
+-	list_text->draw( position, alpha, clipper );
+-}
+-
+-void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
+-{
+-	// draw text
+-	list_text->draw( cache, targetRect, zBase, alpha, clipper );
++	list_text->draw( buffer, targetRect, alpha, clipper );
+ }
+ 
+ void cEditor_Item_Object :: Draw_Image( void )
+@@ -533,12 +527,12 @@
+ 	if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
+ 	{
+ 		// Listbox dimension
+-		float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
+-		float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
++		float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
++		float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
+ 		// Vertical ScrollBar Position
+ 		float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
+ 		// font height
+-		float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
++		float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
+ 
+ 		// draw items
+ 		for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
+diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h
+--- smc-1.9/src/core/editor.h	2009-02-18 05:21:30.000000000 +0100
++++ smc-1.9-b/src/core/editor.h	2011-01-19 00:43:37.809884881 +0100
+@@ -62,8 +62,7 @@
+ 	*/
+ 	virtual	CEGUI::Size getPixelSize( void ) const;
+ 	// draw
+-	void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
+-	void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
++	void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
+ 	// draw image
+ 	void Draw_Image( void );
+ 
+diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp
+--- smc-1.9/src/core/game_core.cpp	2009-08-16 18:44:42.000000000 +0200
++++ smc-1.9-b/src/core/game_core.cpp	2011-01-19 00:59:02.668958883 +0100
+@@ -265,7 +265,7 @@
+ 
+ 
+ 	// align text
+-	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ 	// fixme : Can't handle multiple lines of text
+ 	float text_width = font->getTextExtent( text ) * global_downscalex;
+ 
+@@ -1182,7 +1182,7 @@
+ 	text_default->setText( gui_text );
+ 
+ 	// align text
+-	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ 	float text_width = font->getTextExtent( gui_text ) * global_downscalex;
+ 
+ 	text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
+@@ -1190,7 +1190,7 @@
+ 	text_default->moveToFront();
+ 
+ 	// set window height
+-	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
++	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
+ 
+ 	while( draw )
+ 	{
+diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp
+--- smc-1.9/src/core/main.cpp	2009-05-12 10:36:04.000000000 +0200
++++ smc-1.9-b/src/core/main.cpp	2011-01-19 00:43:37.809884881 +0100
+@@ -444,13 +444,15 @@
+ 
+ 	if( pGuiSystem )
+ 	{
+-		delete pGuiSystem;
++		CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider();
++		pGuiSystem->destroy();
+ 		pGuiSystem = NULL;
++		delete rp;
+ 	}
+ 
+ 	if( pGuiRenderer )
+ 	{
+-		delete pGuiRenderer;
++		pGuiRenderer->destroy( *pGuiRenderer );
+ 		pGuiRenderer = NULL;
+ 	}
+ 
+@@ -507,7 +509,7 @@
+ 		}
+ 		case SDL_VIDEORESIZE:
+ 		{
+-			pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
++			pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
+ 			break;
+ 		}
+ 		case SDL_KEYDOWN:
+diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp
+--- smc-1.9/src/gui/hud.cpp	2009-05-01 15:00:16.000000000 +0200
++++ smc-1.9-b/src/gui/hud.cpp	2011-01-19 00:43:37.816550365 +0100
+@@ -946,7 +946,7 @@
+ 		m_text_debug_text->setVisible( 1 );
+ 
+ 		// update position
+-		CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++		CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ 		float text_width = font->getTextExtent( gui_text ) * global_downscalex;
+ 
+ 		if( text_width > 800.0f )
+diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp
+--- smc-1.9/src/input/mouse.cpp	2009-04-24 21:16:58.000000000 +0200
++++ smc-1.9-b/src/input/mouse.cpp	2011-01-19 00:43:37.813217623 +0100
+@@ -432,17 +432,12 @@
+ 
+ void cMouseCursor :: Render( void ) const
+ {
+-	if( !m_active )
+-	{
++	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
++
++	if ( m_active == mouse->isVisible() )
+ 		return;
+-	}
+ 
+-	// Render CEGUI Mouse
+-	pGuiRenderer->setQueueingEnabled( 0 );
+-	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
+-	mouse->setVisible( 1 );
+-	mouse->draw();
+-	mouse->setVisible( 0 );
++	mouse->setVisible( m_active );
+ }
+ 
+ void cMouseCursor :: Update_Position( void )
+diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp
+--- smc-1.9/src/level/level_settings.cpp	2009-08-07 03:04:28.000000000 +0200
++++ smc-1.9-b/src/level/level_settings.cpp	2011-01-19 01:06:59.064259070 +0100
+@@ -163,8 +163,8 @@
+ 	editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
+ 	// preview window
+ 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
+-	background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
+-	background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
++	background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
++	background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
+ 
+ 	Update_BG_Colors( CEGUI::EventArgs() );
+ 
+@@ -555,8 +555,8 @@
+ 
+ 	// set default rect
+ 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
+-	background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
+-	background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
++	background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
++	background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
+ 
+ 	if( !File_Exists( filename ) )
+ 	{
+diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp
+--- smc-1.9/src/objects/sprite.cpp	2009-04-18 09:55:06.000000000 +0200
++++ smc-1.9-b/src/objects/sprite.cpp	2011-01-19 00:43:37.813217623 +0100
+@@ -1663,7 +1663,7 @@
+ 	window_name->setText( name );
+ 	window_name->setTooltipText( tooltip );
+ 	// get text width
+-	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ 	float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
+ 	// all names should have the same width
+ 	if( text_width > m_editor_window_name_width )
+diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp
+--- smc-1.9/src/video/video.cpp	2009-07-04 11:46:56.000000000 +0200
++++ smc-1.9-b/src/video/video.cpp	2011-01-19 01:22:45.338524592 +0100
+@@ -103,15 +103,15 @@
+ 
+ /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
+ 
+-cFake_Renderer :: cFake_Renderer( void )
+-{
+-	d_identifierString = "Fake Renderer";
+-}
++//cFake_Renderer :: cFake_Renderer( void )
++//{
++//	d_identifierString = "Fake Renderer";
++//}
+ 
+-cFake_Renderer :: ~cFake_Renderer( void )
+-{
++//cFake_Renderer :: ~cFake_Renderer( void )
++//{
+ 
+-}
++//}
+ 
+ /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
+ 
+@@ -158,7 +158,7 @@
+ 	std::string log_dump_dir = "/dev/null";
+ #endif
+ 	// create fake system and renderer
+-	pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
++	pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
+ }
+ 
+ void cVideo :: Delete_CEGUI_Fake( void ) const
+@@ -166,7 +166,7 @@
+ 	CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
+ 	CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
+ 
+-	delete pGuiSystem;
++	pGuiSystem->destroy();
+ 	pGuiSystem = NULL;
+ 	delete renderer;
+ 	delete rp;
+@@ -177,7 +177,7 @@
+ 	// create renderer
+ 	try
+ 	{
+-		pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
++		pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
+ 	}
+ 	// catch CEGUI Exceptions
+ 	catch( CEGUI::Exception &ex )
+@@ -186,10 +186,10 @@
+ 		exit( EXIT_FAILURE );
+ 	}
+ 
+-	/* create Resource Provider
+-	 * no need to destroy it later since it is handled by the CEGUI renderer
+-	*/
+-	CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
++	pGuiRenderer->enableExtraStateSettings(true);
++
++	// create Resource Provider
++	CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
+ 
+ 	// set Resource Provider directories
+ 	rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
+@@ -215,7 +215,7 @@
+ 	// create system
+ 	try
+ 	{
+-		pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
++		pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
+ 	}
+ 	// catch CEGUI Exceptions
+ 	catch( CEGUI::Exception &ex )
+@@ -242,7 +242,7 @@
+ 	// load the scheme file, which auto-loads the imageset
+ 	try
+ 	{
+-		CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
++		CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
+ 	}
+ 	// catch CEGUI Exceptions
+ 	catch( CEGUI::Exception &ex )
+@@ -254,9 +254,7 @@
+ 	// default mouse cursor
+ 	pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
+ 	// force new mouse image
+-	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
+-	// hide CEGUI mouse always because we render it manually
+-	CEGUI::MouseCursor::getSingleton().hide();
++	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
+ 	// default tooltip
+ 	pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
+ 	// create default root window
+@@ -553,7 +551,7 @@
+ 		pFont->Restore_Textures();
+ 
+ 		// send new size to CEGUI
+-		pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
++		pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
+ 
+ 		// check if CEGUI is initialized
+ 		bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
+diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h
+--- smc-1.9/src/video/video.h	2009-07-04 10:49:50.000000000 +0200
++++ smc-1.9-b/src/video/video.h	2011-01-19 01:16:42.791283379 +0100
+@@ -23,7 +23,7 @@
+ #include "SDL_opengl.h"
+ // CEGUI
+ #include "CEGUI.h"
+-#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
++#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
+ 
+ namespace SMC
+ {
+@@ -129,31 +129,100 @@
+ 	EFFECT_IN_AMOUNT
+ };
+ 
+-/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
++/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
++// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
++class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
++{
++	void draw() const {}
++	void setTranslation(const CEGUI::Vector3&) {}
++	void setRotation(const CEGUI::Vector3&) {}
++	void setPivot(const CEGUI::Vector3&) {}
++	void setClippingRegion(const CEGUI::Rect&) {}
++	void appendVertex(const CEGUI::Vertex&) {}
++	void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
++	void setActiveTexture(CEGUI::Texture*) {}
++	void reset() {}
++	CEGUI::Texture* getActiveTexture() const { return 0; }
++	CEGUI::uint getVertexCount() const { return 0; }
++	CEGUI::uint getBatchCount() const { return 0; }
++	void setRenderEffect(CEGUI::RenderEffect*) {}
++	CEGUI::RenderEffect* getRenderEffect() { return 0; }
++};
+ 
+-class cFake_Renderer : public CEGUI::Renderer
++class cFake_Texture : public CEGUI::Texture
++{
++public:
++	cFake_Texture() :
++	  m_size(1, 1),
++	  m_scaling(1, 1) {}
++
++	const CEGUI::Size& getSize() const { return m_size; }
++	const CEGUI::Size& getOriginalDataSize() const { return m_size; }
++	const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
++	void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
++	void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
++	void saveToMemory(void*) {}
++
++private:
++	CEGUI::Size m_size;
++	CEGUI::Vector2 m_scaling;
++};
++
++class cFake_RenderTarget : public CEGUI::RenderTarget
+ {
+ public:
+-	cFake_Renderer( void );
+-	virtual ~cFake_Renderer( void );
++	cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
++	void draw(const CEGUI::GeometryBuffer&) {}
++	void draw(const CEGUI::RenderQueue&) {}
++	void setArea(const CEGUI::Rect&) {}
++	const CEGUI::Rect& getArea() const { return m_area; }
++	bool isImageryCache() const { return false; }
++	void activate() {}
++	void deactivate() {}
++	void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
++
++private:
++	CEGUI::Rect m_area;
++};
+ 
+-	virtual	void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
+-	virtual	void doRender(void) {};
+-	virtual	void clearRenderList(void) {};
+-	virtual void setQueueingEnabled(bool setting) {};
+-	virtual	CEGUI::Texture *createTexture(void) { return NULL; };
+-	virtual	CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
+-	virtual	CEGUI::Texture *createTexture(float size) { return NULL; };
+-	virtual	void destroyTexture(CEGUI::Texture* texture) {};
+-	virtual void destroyAllTextures(void) {};
+-	virtual bool isQueueingEnabled(void) const { return 0; };
+-	virtual float getWidth(void) const { return 0; };
+-	virtual float getHeight(void) const { return 0; };
+-	virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
+-	virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
+-	virtual	unsigned int getMaxTextureSize(void) const { return 0; };
+-	virtual	unsigned int getHorzScreenDPI(void) const { return 0; };
+-	virtual	unsigned int getVertScreenDPI(void) const { return 0; };
++class cFake_Renderer : public CEGUI::Renderer
++{
++public:
++	cFake_Renderer( void ) :
++	  m_size(0, 0),
++	  m_dpi(0, 0),
++	  m_identifierString("Fake Renderer"),
++	  m_root(m_target) {}
++	~cFake_Renderer( void ) {}
++
++	CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
++	CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
++	void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
++	void destroyAllGeometryBuffers() {}
++	CEGUI::TextureTarget* createTextureTarget() { return 0; }
++	void destroyTextureTarget(CEGUI::TextureTarget*) {}
++	void destroyAllTextureTargets() {}
++	CEGUI::Texture& createTexture() { return m_texture; }
++	CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
++	CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
++	void destroyTexture(CEGUI::Texture&) {}
++	void destroyAllTextures() {}
++	void beginRendering() {}
++	void endRendering() {}
++	void setDisplaySize(const CEGUI::Size&) {}
++	const CEGUI::Size& getDisplaySize() const { return m_size; }
++	const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
++	CEGUI::uint getMaxTextureSize() const { return 0; }
++	const CEGUI::String& getIdentifierString() const { return m_identifierString; }
++
++private:
++	CEGUI::Size m_size;
++	CEGUI::Vector2 m_dpi;
++	CEGUI::String m_identifierString;
++	cFake_GeometryBuffer m_geometry;
++	cFake_Texture m_texture;
++	cFake_RenderTarget m_target;
++	CEGUI::RenderingRoot m_root;
+ };
+ 
+ /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community-staging/smc/smc.desktop b/community-staging/smc/smc.desktop
new file mode 100644
index 000000000..6cfe5b018
--- /dev/null
+++ b/community-staging/smc/smc.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Secret Maryo Chronicles
+GenericName=Arcade Game
+Exec=smc
+Icon=smc.png
+Terminal=false
+Type=Application
+Categories=Game;ArcadeGame;KidsGame;
+StartupNotify=false
+\ No newline at end of file
diff --git a/community-staging/smc/smc.png b/community-staging/smc/smc.png
new file mode 100644
index 000000000..f02af1bfc
--- /dev/null
+++ b/community-staging/smc/smc.png
diff --git a/community-staging/ted/PKGBUILD b/community-staging/ted/PKGBUILD
new file mode 100644
index 000000000..2a1c79b5d
--- /dev/null
+++ b/community-staging/ted/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 62907 2012-01-29 01:30:55Z ebelanger $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=ted
+pkgver=2.21
+pkgrel=4
+pkgdesc="An easy rich text processor (with footnote support)"
+arch=('i686' 'x86_64')
+url="http://www.nllgg.nl/Ted/"
+depends=('bash' 'libtiff' 'libxmu' 'libxpm' 'libpng' 'gtk2')
+license=('GPL')
+source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz 
+        ted-2.21-libpng15.patch)
+md5sums=('34ae855938a3b364eb587cca504ba356'
+         '0c339b0fa7aec6b150e07e9027cd360c')
+
+build() {
+  cd "$srcdir/Ted-$pkgver"
+  sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile
+  patch -p0 -i ../ted-2.21-libpng15.patch
+  make compile.shared
+  make package.shared
+}
+
+package() {
+  cd "$srcdir/Ted-$pkgver"
+  mkdir -p "$pkgdir/usr/share/"
+  cd "$pkgdir/usr/share/"
+  tar -zxvf "$srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz"
+  mv bin ../
+  mkdir -p "$pkgdir/usr/share/man/man1"
+  cd "$pkgdir/usr/share/Ted/"
+  mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/
+  sed -i "s|usr/local/afm|usr/share/Ted/afm|g" gsafm.sh
+  mv *.sh "$pkgdir/usr/bin/"
+}
diff --git a/community-staging/ted/ted-2.21-libpng15.patch b/community-staging/ted/ted-2.21-libpng15.patch
new file mode 100644
index 000000000..afd30f9a4
--- /dev/null
+++ b/community-staging/ted/ted-2.21-libpng15.patch
@@ -0,0 +1,423 @@
+This patch is from netbsd pkgsrc
+
+ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/editors/ted/patches/
+
+--- bitmap/bmpng.c
++++ bitmap/bmpng.c
+@@ -20,23 +20,32 @@
+ /*									*/
+ /************************************************************************/
+ 
+-static int bpPngiToBitmap(	const png_info *		pngi,
++static int bpPngiToBitmap(	const png_structp		pngp,
++				png_info *			pngi,
+ 				BitmapDescription *		bd )
+     {
+     unsigned int	col;
++    png_uint_32		res_x, res_y;
++    int			unit_type= 0;
+ 
+-    bd->bdPixelsWide= pngi->width;
+-    bd->bdPixelsHigh= pngi->height;
++    bd->bdPixelsWide= png_get_image_width( pngp, pngi );
++    bd->bdPixelsHigh= png_get_image_height( pngp, pngi );
+     bd->bdHasAlpha= 0;
+ 
+-    switch( pngi->color_type )
++    switch( png_get_color_type( pngp, pngi ) )
+ 	{
+ 	case PNG_COLOR_TYPE_PALETTE:
++	    {
++	    int		num_palette;
++	    png_colorp	palette;
++
++	    png_get_PLTE( pngp, pngi, &palette, &num_palette );
++
+ 	    bd->bdColorEncoding= BMcoRGB8PALETTE;
+-	    bd->bdColorCount= pngi->num_palette;
++	    bd->bdColorCount= num_palette;
+ 	    bd->bdBitsPerSample= 8;
+ 	    bd->bdSamplesPerPixel= 3;
+-	    bd->bdBitsPerPixel= pngi->bit_depth;
++	    bd->bdBitsPerPixel= png_get_bit_depth( pngp, pngi );
+ 
+ 	    bd->bdRGB8Palette= (RGB8Color *)
+ 				malloc( bd->bdColorCount* sizeof(RGB8Color) );
+@@ -46,47 +55,51 @@ static int bpPngiToBitmap(	const png_inf
+ 
+ 	    for ( col= 0; col < bd->bdColorCount; col++ )
+ 		{
+-		bd->bdRGB8Palette[col].rgb8Red= pngi->palette[col].red;
+-		bd->bdRGB8Palette[col].rgb8Green= pngi->palette[col].green;
+-		bd->bdRGB8Palette[col].rgb8Blue= pngi->palette[col].blue;
++		bd->bdRGB8Palette[col].rgb8Red= palette[col].red;
++		bd->bdRGB8Palette[col].rgb8Green= palette[col].green;
++		bd->bdRGB8Palette[col].rgb8Blue= palette[col].blue;
+ 		bd->bdRGB8Palette[col].rgb8Alpha= 0;
+ 		}
++	    }
+ 	    break;
+ 
+ 	case PNG_COLOR_TYPE_RGB:
+ 	    bd->bdColorEncoding= BMcoRGB;
+-	    bd->bdBitsPerSample= pngi->bit_depth;
+-	    bd->bdSamplesPerPixel= pngi->channels;
+-	    bd->bdBitsPerPixel= pngi->pixel_depth;
++	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
++	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
++	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
+ 	    break;
+ 
+ 	case PNG_COLOR_TYPE_GRAY:
+ 	    bd->bdColorEncoding= BMcoWHITEBLACK;
+-	    bd->bdBitsPerSample= pngi->bit_depth;
+-	    bd->bdSamplesPerPixel= pngi->channels;
+-	    bd->bdBitsPerPixel= pngi->pixel_depth;
++	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
++	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
++	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
+ 	    break;
+ 
+ 	case PNG_COLOR_TYPE_RGB_ALPHA:
+ 	    bd->bdHasAlpha= 1;
+ 	    bd->bdColorEncoding= BMcoRGB;
+-	    bd->bdBitsPerSample= pngi->bit_depth;
+-	    bd->bdSamplesPerPixel= pngi->channels;
+-	    bd->bdBitsPerPixel= pngi->pixel_depth;
++	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
++	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
++	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
+ 	    break;
+ 
+ 	case PNG_COLOR_TYPE_GRAY_ALPHA:
+ 	    bd->bdHasAlpha= 1;
+-	    LDEB(pngi->color_type); return -1;
++	    LDEB(png_get_color_type( pngp, pngi )); return -1;
+ 
+ 	default:
+-	    LDEB(pngi->color_type); return -1;
++	    LDEB(png_get_color_type( pngp, pngi )); return -1;
+ 	}
+ 
+-    bd->bdBytesPerRow= pngi->rowbytes;
++    bd->bdBytesPerRow= png_get_rowbytes( pngp, pngi );
+     bd->bdBufferLength= bd->bdBytesPerRow* bd->bdPixelsHigh;
+ 
+-    switch( pngi->phys_unit_type )
++    if  ( !  png_get_pHYs( pngp, pngi, &res_x, &res_y, &unit_type ) )
++	{ unit_type= PNG_RESOLUTION_UNKNOWN;	}
++
++    switch( unit_type )
+ 	{
+ 	case PNG_RESOLUTION_UNKNOWN:
+ 	    bd->bdUnit= BMunPIXEL;
+@@ -96,12 +109,12 @@ static int bpPngiToBitmap(	const png_inf
+ 
+ 	case PNG_RESOLUTION_METER:
+ 	    bd->bdUnit= BMunM;
+-	    bd->bdXResolution= pngi->x_pixels_per_unit;
+-	    bd->bdYResolution= pngi->y_pixels_per_unit;
++	    bd->bdXResolution= res_x;
++	    bd->bdYResolution= res_y;
+ 	    break;
+ 
+ 	default:
+-	    LDEB(pngi->phys_unit_type);
++	    LDEB(unit_type);
+ 	    return -1;
+ 	}
+ 
+@@ -119,11 +132,11 @@ static int bmPngReadContents(	png_info *
+     unsigned char *		buffer;
+ 
+     numberOfPasses= 1;
+-    if  ( pngi->interlace_type )
++    if  ( png_get_interlace_type( png, pngi ) )
+ 	{ numberOfPasses= png_set_interlace_handling( png ); }
+ 
+-    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
+-	  pngi->bit_depth == 16				)
++    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
++	  png_get_bit_depth( png, pngi ) == 16			)
+ 	{
+ 	const unsigned short	one= 1;
+ 	const unsigned char *	testEndian= (const unsigned char *)&one;
+@@ -133,9 +146,6 @@ static int bmPngReadContents(	png_info *
+ 	}
+ 
+     png_start_read_image( png );
+-    /*
+-    png_read_update_info( png, pngi );
+-    */
+ 
+     buffer= (unsigned char *)malloc( bd->bdBufferLength );
+     if  ( ! buffer )
+@@ -236,9 +246,9 @@ int bmPngReadPng(	BitmapDescription *	bd
+ 
+     png_read_info( pngp, pngip );
+ 
+-    if  ( bpPngiToBitmap( pngip, bd ) )
++    if  ( bpPngiToBitmap( pngp, pngip, bd ) )
+ 	{
+-	LLLDEB(pngip->color_type,bd->bdColorCount,bd->bdRGB8Palette); 
++	LLDEB(bd->bdColorCount,bd->bdRGB8Palette); 
+ 	png_destroy_read_struct( &pngp, &pngip, (png_infop *)0 );
+ 	return -1;
+ 	}
+@@ -282,44 +292,43 @@ int bmCanWritePngFile( const BitmapDescr
+ 
+ static int bpPngiFromBitmap(	png_structp			png,
+ 				png_info *			pngi,
++				png_colorp *			pPalette,
+ 				const BitmapDescription *       bd )
+     {
+-    png_info_init( pngi );
+-    pngi->width= bd->bdPixelsWide;
+-    pngi->height= bd->bdPixelsHigh;
++    int			bit_depth;
++    int			color_type;
++    png_color_8		sig_bit;
+ 
+     switch( bd->bdUnit )
+ 	{
+ 	case BMunM:
+-	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
+-	    pngi->x_pixels_per_unit= bd->bdXResolution;
+-	    pngi->y_pixels_per_unit= bd->bdYResolution;
+-	    pngi->valid |= PNG_INFO_pHYs;
++	    png_set_pHYs( png, pngi,
++			    bd->bdXResolution,
++			    bd->bdYResolution,
++			    PNG_RESOLUTION_METER);
+ 	    break;
+ 
+ 	case BMunINCH:
+-	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
+-	    pngi->x_pixels_per_unit= (int)( 39.37* bd->bdXResolution );
+-	    pngi->y_pixels_per_unit= (int)( 39.37* bd->bdYResolution );
+-	    pngi->valid |= PNG_INFO_pHYs;
++	    png_set_pHYs( png, pngi,
++			    (int)( 39.37* bd->bdXResolution ),
++			    (int)( 39.37* bd->bdYResolution ),
++			    PNG_RESOLUTION_METER);
+ 	    break;
+ 
+ 	case BMunPOINT:
+-	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
+-	    pngi->x_pixels_per_unit= POINTS_PER_M* bd->bdXResolution;
+-	    pngi->y_pixels_per_unit= POINTS_PER_M* bd->bdYResolution;
+-	    pngi->valid |= PNG_INFO_pHYs;
++	    png_set_pHYs( png, pngi,
++			    POINTS_PER_M* bd->bdXResolution,
++			    POINTS_PER_M* bd->bdYResolution,
++			    PNG_RESOLUTION_METER);
+ 	    break;
+ 
+ 	case BMunPIXEL:
+-	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
+-	    pngi->x_pixels_per_unit= 1;
+-	    pngi->y_pixels_per_unit= 1;
++	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
+ 	    break;
+ 
+ 	default:
+ 	    LDEB(bd->bdUnit);
+-	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
++	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
+ 	    break;
+ 	}
+ 
+@@ -329,41 +338,48 @@ static int bpPngiFromBitmap(	png_structp
+ 
+ 	case BMcoBLACKWHITE:
+ 	case BMcoWHITEBLACK:
+-	    pngi->bit_depth= bd->bdBitsPerPixel;
++	    bit_depth= bd->bdBitsPerPixel;
+ 	    if  ( bd->bdHasAlpha )
+-		{ pngi->color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
+-	    else{ pngi->color_type= PNG_COLOR_TYPE_GRAY;	}
+-	    pngi->sig_bit.gray= bd->bdBitsPerSample;
++		{ color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
++	    else{ color_type= PNG_COLOR_TYPE_GRAY;		}
++	    sig_bit.gray= bd->bdBitsPerSample;
+ 	    break;
+ 
+ 	case BMcoRGB:
+-	    pngi->bit_depth= bd->bdBitsPerSample;
++	    bit_depth= bd->bdBitsPerSample;
+ 	    if  ( bd->bdHasAlpha )
+-		{ pngi->color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
+-	    else{ pngi->color_type= PNG_COLOR_TYPE_RGB;		}
+-	    pngi->sig_bit.red= bd->bdBitsPerSample;
+-	    pngi->sig_bit.green= bd->bdBitsPerSample;
+-	    pngi->sig_bit.blue= bd->bdBitsPerSample;
++		{ color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
++	    else{ color_type= PNG_COLOR_TYPE_RGB;	}
++	    sig_bit.red= bd->bdBitsPerSample;
++	    sig_bit.green= bd->bdBitsPerSample;
++	    sig_bit.blue= bd->bdBitsPerSample;
+ 	    break;
+ 
+ 	case BMcoRGB8PALETTE:
+-	    pngi->bit_depth= bd->bdBitsPerPixel;
+-	    pngi->color_type= PNG_COLOR_TYPE_PALETTE;
++	    bit_depth= bd->bdBitsPerPixel;
++	    color_type= PNG_COLOR_TYPE_PALETTE;
+ 
+-	    pngi->valid |= PNG_INFO_PLTE;
+-	    pngi->palette= (png_color *)malloc( 256* sizeof( png_color ) );
+-	    if  ( ! pngi->palette )
+-		{ XDEB(pngi->palette); return -1;	}
+-	    pngi->num_palette= bd->bdColorCount;
+-	    pngi->sig_bit.red= bd->bdBitsPerSample;
+-	    pngi->sig_bit.green= bd->bdBitsPerSample;
+-	    pngi->sig_bit.blue= bd->bdBitsPerSample;
+-	    for ( i= 0; i < pngi->num_palette; i++ )
++	    if  ( bd->bdColorCount > PNG_MAX_PALETTE_LENGTH )
+ 		{
+-		pngi->palette[i].red= bd->bdRGB8Palette[i].rgb8Red;
+-		pngi->palette[i].green= bd->bdRGB8Palette[i].rgb8Green;
+-		pngi->palette[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
++		LLDEB(bd->bdColorCount,PNG_MAX_PALETTE_LENGTH);
++		return -1;
+ 		}
++
++	    *pPalette= (png_color *)malloc( PNG_MAX_PALETTE_LENGTH*
++						    sizeof( png_color ) );
++	    if  ( ! *pPalette )
++		{ XDEB(*pPalette); return -1;	}
++	    sig_bit.red= bd->bdBitsPerSample;
++	    sig_bit.green= bd->bdBitsPerSample;
++	    sig_bit.blue= bd->bdBitsPerSample;
++	    for ( i= 0; i < bd->bdColorCount; i++ )
++		{
++		(*pPalette)[i].red= bd->bdRGB8Palette[i].rgb8Red;
++		(*pPalette)[i].green= bd->bdRGB8Palette[i].rgb8Green;
++		(*pPalette)[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
++		}
++
++	    png_set_PLTE( png, pngi, (*pPalette), bd->bdColorCount );
+ 	    break;
+ 
+ 	default:
+@@ -371,7 +387,13 @@ static int bpPngiFromBitmap(	png_structp
+ 	    return -1;
+ 	}
+ 
+-    pngi->interlace_type= 0;
++    png_set_sBIT( png, pngi, &sig_bit );
++    png_set_IHDR( png, pngi,
++			bd->bdPixelsWide, bd->bdPixelsHigh,
++			bit_depth, color_type,
++			PNG_INTERLACE_NONE,
++			PNG_COMPRESSION_TYPE_BASE,
++			PNG_FILTER_TYPE_BASE );
+ 
+     return 0;
+     }
+@@ -395,8 +417,8 @@ static void bmPngWriteContents(	png_stru
+ 	    }
+ 	}
+ 
+-    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
+-	  bd->bdBitsPerSample == 16			)
++    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
++	  bd->bdBitsPerSample == 16				)
+ 	{
+ 	const unsigned short	one= 1;
+ 	const unsigned char *	testEndian= (const unsigned char *)&one;
+@@ -431,9 +453,9 @@ static void bmPngWriteContents(	png_stru
+ 	    from= scratch;
+ 	    }
+ 
+-	if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
+-	      bd->bdBitsPerSample == 16			&&
+-	      scratch					)
++	if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
++	      bd->bdBitsPerSample == 16					&&
++	      scratch							)
+ 	    {
+ 	    int			col;
+ 	    const BmUint16 *	fr= (const BmUint16 *)from;
+@@ -453,10 +475,6 @@ static void bmPngWriteContents(	png_stru
+ 
+     png_write_end( png, pngi );
+ 
+-    if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
+-	  pngi->palette					)
+-	{ free( pngi->palette );	}
+-
+     if  ( scratch )
+ 	{ free( scratch );	}
+ 
+@@ -510,50 +528,43 @@ int bmPngWritePng(		const BitmapDescript
+ 				const unsigned char *		buffer,
+ 				SimpleOutputStream *		sos )
+     {
++    int			rval= 0;
+     png_structp		pngp= (png_structp)0;
+     png_infop		pngip= (png_infop)0;
++    png_colorp		palette= (png_colorp)0;
+ 
+     pngp = png_create_write_struct( PNG_LIBPNG_VER_STRING, (void *)0,
+ 				    (png_error_ptr)0, (png_error_ptr)0 );
+     if  ( ! pngp )
+-	{ LDEB(1); return -1;	}
++	{ XDEB(pngp); rval= -1; goto ready;	}
+ 
+     pngip = png_create_info_struct( pngp );
+     if  ( ! pngip )
+-	{
+-	LDEB(1);
+-	png_destroy_write_struct( &pngp, (png_infop *)0 );
+-	return -1;
+-	}
++	{ XDEB(pngip); rval= -1; goto ready;	}
++
++    /*
++    As the info struct is built by libpng this is not needed:
++    (The call will disappear from libpng in version 1.4)
++    png_info_init( pngi ); 
++    */
+ 
+     if  ( setjmp( png_jmpbuf( pngp ) ) )
+-	{
+-	LDEB(1);
+-	png_destroy_write_struct( &pngp, &pngip );
+-	/*  Crashes:
+-	if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
+-	      pngip->palette				)
+-	    { free( pngip->palette );	}
+-	*/
+-	return -1;
+-	}
++	{ LDEB(1); rval= -1; goto ready;	}
+ 
+     png_init_io( pngp, (FILE *)0 );
+     png_set_write_fn( pngp, (void *)sos, bmPngWriteBytes, bmPngFlushBytes );
+ 
+-    if  ( bpPngiFromBitmap( pngp, pngip, bd ) )
+-	{
+-	LDEB(bd->bdColorEncoding);
+-	png_destroy_write_struct( &pngp, &pngip );
+-	return -1;
+-	}
+-
+-    /*
+-    png_write_info( pngp, pngip );
+-    */
++    if  ( bpPngiFromBitmap( pngp, pngip, &palette, bd ) )
++	{ LDEB(bd->bdColorEncoding); rval= -1; goto ready; }
+ 
+     bmPngWriteContents( pngp, pngip, buffer, bd );
+ 
++  ready:
++
++    if  ( palette )
++	{ free( palette );	}
++
+     png_destroy_write_struct( &pngp, &pngip );
+-    return 0;
++
++    return rval;
+     }
diff --git a/community/arpack/PKGBUILD b/community/arpack/PKGBUILD
index 0f909d106..5bb45c666 100644
--- a/community/arpack/PKGBUILD
+++ b/community/arpack/PKGBUILD
@@ -1,50 +1,32 @@
-# $Id: PKGBUILD 18351 2010-06-02 21:49:21Z shusmann $
+# $Id: PKGBUILD 62905 2012-01-29 00:58:19Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer: Stefan Husmann  <stefan-husmann@t-online.de>
-
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 pkgname=arpack
-pkgver=2.1
-pkgrel=4
-pkgdesc="A collection of Fortran77 subroutines designed to solve large scale eigenvalue problems"
-arch=('i686' 'x86_64')
-url="http://www.caam.rice.edu/software/ARPACK"
-license=('custom:BSD')
-depends=('glibc' 'gcc-fortran')
-source=(http://www.caam.rice.edu/software/ARPACK/SRC/arpack96.tar.gz \
-	http://www.caam.rice.edu/software/ARPACK/SRC/patch.tar.gz \
-	arpack-2.1-redhat.patch \
-	license.txt)
-md5sums=('fffaa970198b285676f4156cebc8626e'
-         '14830d758f195f272b8594a493501fa2'
-         '95678954de317c92862bb4f9cc9d04ad'
-         '7caaa0099a5c39726f4478a1bde89495')
+pkgver=3.0.2
+pkgrel=1
+pkgdesc="Collection of Fortran77 subroutines designed to solve large scale eigenvalue problems"
+arch=('x86_64' 'i686')
+provides=('arpack-ng')
+options=(!libtool)
+url="http://forge.scilab.org/index.php/p/arpack-ng/"
+license=('BSD')
+depends=('glibc' 'gcc-fortran' 'lapack')
+source=("http://forge.scilab.org/upload/arpack-ng/files/arpack_3.0.2.tar.gz")
+sha256sums=('4add769386e0f6b0484491bcff129c6f5234190dbf58e07cc068fbd5dc7278bf')
 
 build() {
-  cd $srcdir/ARPACK
-  patch -p1 -i ../arpack-2.1-redhat.patch
-  mkdir static shared
-  cd shared
-  for dir in ../SRC ../UTIL; do
-    make -f $dir/Makefile VPATH=$dir srcdir=$dir FC=gfortran FFLAGS="-fPIC" \
-       single double complex complex16
-  done
-  gcc -shared -Wl,-soname,libarpack.so.2 -o libarpack.so.2.1 *.o
-  cd ..
-  cd static
-  for dir in ../SRC ../UTIL; do
-    make -f $dir/Makefile VPATH=$dir srcdir=$dir FC=gfortran FFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-       all
-  done
-  ar rv libarpack.a *.o
-  ranlib libarpack.a
+  cd "$srcdir/$pkgname-ng-$pkgver"
+
+  ./configure --prefix=/usr
+  make
 }
+
 package() {
-  cd $srcdir/ARPACK
-  install -d $pkgdir/usr/lib
-  install -p -m644 $srcdir/ARPACK/static/libarpack.a $pkgdir/usr/lib
-  install -p -m755 $srcdir/ARPACK/shared/libarpack.so.2.1 $pkgdir/usr/lib
-  ln -s libarpack.so.2.1 $pkgdir/usr/lib/libarpack.so.2
-  ln -s libarpack.so.2 $pkgdir/usr/lib/libarpack.so
-  install -D -m644 $srcdir/license.txt \
-    $pkgdir/usr/share/licenses/$pkgname/license.txt
+  cd "$srcdir/$pkgname-ng-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/clinica/PKGBUILD b/community/clinica/PKGBUILD
new file mode 100644
index 000000000..697d802af
--- /dev/null
+++ b/community/clinica/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 62874 2012-01-28 13:39:47Z giovanni $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Gianmarco Brocchi <gianmarcobrocchi@gmail.com>
+
+pkgname=clinica
+pkgver=0.2.1
+pkgrel=2
+pkgdesc="Simple medical records manager"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/clinica-project"
+license=('GPL3')
+depends=('libgee' 'python' 'libpeas' 'dconf')
+makedepends=('vala' 'intltool' 'pkg-config')
+optdepends=('python2-gobject: for Agenzia del Farmaco plugin')
+install=clinica.install
+source=("http://launchpad.net/clinica-project/stable/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('327ce50d20b0e56d3de57270eed2ad23')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./waf configure --prefix=/usr
+  LC_ALL=C LANG=C ./waf build 
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./waf --destdir="${pkgdir}" install
+  rm -rf ${pkgdir}/usr/share/glib-2.0/schemas/gschemas.compiled
+}
diff --git a/community/clinica/clinica.install b/community/clinica/clinica.install
new file mode 100644
index 000000000..326aa98a2
--- /dev/null
+++ b/community/clinica/clinica.install
@@ -0,0 +1,11 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/cuda-toolkit/PKGBUILD b/community/cuda-toolkit/PKGBUILD
index a37c7f8a8..1612ba93e 100644
--- a/community/cuda-toolkit/PKGBUILD
+++ b/community/cuda-toolkit/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=cuda-toolkit
-pkgver=4.1.21
-pkgrel=3
+pkgver=4.1.28
+pkgrel=1
 _fedver=14
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('i686' 'x86_64')
@@ -9,20 +9,21 @@ arch=('i686' 'x86_64')
 url="http://www.nvidia.com/object/cuda_home.html"
 license=('custom')
 depends=('gcc-libs' 'opencl-nvidia')
+optdepends=('gdb: for cuda-gdb')
 if [ "$CARCH" = "i686" ]; then
   _arch=32
-  md5sums=('930b7bfd1a162335b909f119a004f6d7'
+  md5sums=('835d403e86f4b014b348c587ffb23c0d'
            '5af5226b36cd3f9993f762f85b5d236a'
            'c0781c63e726eaf03e10135b42b85729')
 else
   _arch=64
-  md5sums=('509c795b9b79f991e045a83576e2e2f3'
+  md5sums=('c82103da07d0e96f3d65d7b308b74446'
            '5af5226b36cd3f9993f762f85b5d236a'
            'c0781c63e726eaf03e10135b42b85729')
 fi
 
 install=cuda-toolkit.install
-source=(http://developer.download.nvidia.com/compute/cuda/4_1/RC2/toolkit/cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run
+source=(http://developer.download.nvidia.com/compute/cuda/4_1/rel/toolkit/cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run
         cuda-toolkit.sh
         cuda-toolkit.conf)
 
@@ -42,12 +43,7 @@ package() {
   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
+  mkdir -p $pkgdir/usr/lib
+  cd $pkgdir/usr/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/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index 57e3065dc..034f10c36 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61211 2011-12-24 17:06:50Z ttopper $
+# $Id: PKGBUILD 62878 2012-01-28 14:15:46Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3-wm
 _pkgsourcename=i3
-pkgver=4.1.1
+pkgver=4.1.2
 pkgrel=1
 pkgdesc="An improved dynamic tiling window manager"
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ optdepends=('rxvt-unicode: The terminal emulator used in the default config.'
             'perl: To migrate your configuration to v4 format.')
 options=('docs' '!strip')
 source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2")
-md5sums=('25bc29349b65000a2b0afc0655a80035')
+md5sums=('0e81c381f9bf3ebf155aaa394e71834f')
 
 build() {
   cd "$srcdir/$_pkgsourcename-$pkgver"
diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD
index 00981bb6f..483de0ef1 100644
--- a/community/jansson/PKGBUILD
+++ b/community/jansson/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 56380 2011-10-07 02:59:03Z kkeen $
+# $Id: PKGBUILD 62893 2012-01-28 22:13:43Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Dave Reisner <d@falconindy.com>
 
 pkgname=jansson
-pkgver=2.2.1
+pkgver=2.3
 pkgrel=1
 pkgdesc='C library for encoding, decoding and manipulating JSON data'
 arch=('i686' 'x86_64')
 url='http://www.digip.org/jansson/'
+depends=('glibc')
 license=('MIT')
 options=('!libtool')
 source=("$url/releases/$pkgname-$pkgver.tar.bz2")
-md5sums=('074373f2d101c52d70659be86647e7a1')
+md5sums=('9f322b4b43b1b4f38473c52b49dabf99')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index a029909b8..bc38aa87d 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61364 2011-12-28 19:37:10Z spupykin $
+# $Id: PKGBUILD 62881 2012-01-28 14:42:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
-_pkgdata=20111023
+_pkgdata=20120120
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64')
 url="http://www.draisberghof.de/usb_modeswitch/"
@@ -15,9 +15,9 @@ backup=("etc/$pkgname.conf")
 source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2"
 	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
 	"usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
-md5sums=('d228f74e4045e1ba05d80db4fe0f4144'
-         '6e7cb67d0428bda241600b038ba11aeb'
-         '1378c0319520c817d49c7e9457c7d6e3')
+md5sums=('4f3d3b9342b59b488089a8a81abda3ae'
+         'c899cc9c71bb35f3ec600b7cd1455c65'
+         'c12e19e3992b5beac9b6c48555cff660')
 
 build() {
   cd $srcdir/usb-modeswitch-$pkgver/
diff --git a/community/yaml-cpp/PKGBUILD b/community/yaml-cpp/PKGBUILD
index 940a9cadb..c14cb52c8 100644
--- a/community/yaml-cpp/PKGBUILD
+++ b/community/yaml-cpp/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Markus Martin <markus@archwyrm.net>
 pkgname=yaml-cpp
-pkgver=0.2.7
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec"
 url="http://code.google.com/p/yaml-cpp/"
@@ -9,17 +9,17 @@ arch=('i686' 'x86_64')
 license=('MIT')
 makedepends=('cmake')
 source=(http://yaml-cpp.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('6878e14bad90c69a8f2caca273eb24c2')
+md5sums=('9aa519205a543f9372bf4179071c8ac6')
 
 build() {
-    cd $srcdir/$pkgname-$pkgver
+    cd $srcdir/$pkgname
 
     cmake . -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON
     make
 }
 
 package() {
-    cd $srcdir/$pkgname-$pkgver
+    cd $srcdir/$pkgname
 
     make DESTDIR=$pkgdir install
 }
diff --git a/extra/blas/Makefile.blas b/extra/blas/Makefile.blas
index e0d97793f..0c6cd06d6 100644
--- a/extra/blas/Makefile.blas
+++ b/extra/blas/Makefile.blas
@@ -145,4 +145,5 @@ static: $(ALLOBJ)
 	ranlib libblas.a
 
 shared: $(ALLOBJ)
-	cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.3.1 $(ALLOBJ) -lm -lgfortran -lc
+	cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.4.0 $(ALLOBJ) -lm -lgfortran -lc
+
diff --git a/extra/blas/PKGBUILD b/extra/blas/PKGBUILD
index 872e57bc7..94dd1c408 100755
--- a/extra/blas/PKGBUILD
+++ b/extra/blas/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
 
 pkgname=blas
-pkgver=3.3.1
-pkgrel=2
+pkgver=3.4.0
+pkgrel=1
 url="http://www.netlib.org/blas"
 makedepends=('gcc-fortran')
 depends=('gcc-libs')
@@ -14,18 +14,15 @@ pkgdesc="Basic Linear Algebra Subprograms"
 arch=('i686' 'x86_64')
 license=("custom")
 source=(http://www.netlib.org/lapack/lapack-${pkgver}.tgz
-        lapack-3.1.1-make.inc.patch
         Makefile.blas
         LICENSE.blas)
-sha1sums=('3ce437e05f0e9a3c8148ec41922f6efeef0ebdac'
-          '71bf7696f1c841339163e82d863dd62e484eb1cf'
-          '3dbee0a5e9a98a2ddf5a58046f5997804e9874ed'
+sha1sums=('910109a931524f8dcc2734ce23fe927b00ca199f'
+          '85996f56c13991fc69481c0e88ef905a0dcefb49'
           '2491a151a37f0162b25fc4e4e9a8ac444b574a76')
-
+	
 build() {
   cd "${srcdir}/lapack-${pkgver}"
   cp -f "${srcdir}/Makefile.blas" BLAS/SRC/Makefile 
-  patch -Np1 -i "${srcdir}/lapack-3.1.1-make.inc.patch"
   cp -f INSTALL/make.inc.gfortran make.inc
 
   export FC=gfortran
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 2f9399b4c..96a55a2f9 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146190 2012-01-05 20:00:07Z ronald $
+# $Id: PKGBUILD 147938 2012-01-28 11:06:05Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=2.5.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -55,7 +55,6 @@ package_digikam() {
 
   # these are in oxygen-icons
   rm -rf ${pkgdir}/usr/share/icons
-
 }
 
 package_libkface() {
@@ -76,7 +75,7 @@ package_libkgeomap() {
 
 package_libkvkontakte() {
   pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
-  depends=('kdelibs')
+  depends=('kdelibs' 'qjson')
 
   cd "${srcdir}"/build/extra/libkvkontakte
   make DESTDIR="${pkgdir}" install
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 40d39206d..eb71463dd 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 147271 2012-01-25 15:45:40Z ibiru $
+# $Id: PKGBUILD 147944 2012-01-28 16:25:29Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.9
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,20 +12,24 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
 options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        xid-collision-debug.patch)
+        xid-collision-debug.patch cups-custom-print.patch)
 sha256sums=('84204bf24cac739fd979943127e7b29cb46b1017684aa24dce630faa01bcb61d'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+            '9535c9df19338cbea98ec4b2b5c8e4cef718455938f05c9cf8a08a3805d6b85d')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
     patch -Np1 -i "$srcdir/xid-collision-debug.patch"
 
+    # https://bugzilla.gnome.org/show_bug.cgi?id=543520
+    patch -Rp1 -i "$srcdir/cups-custom-print.patch"
+
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
         --with-xinput=yes
 
-    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+    # https://bugzilla.gnome.org/show_bug.cgi?id=655517
     sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
     make
diff --git a/extra/gtk2/cups-custom-print.patch b/extra/gtk2/cups-custom-print.patch
new file mode 100644
index 000000000..ffc89aa32
--- /dev/null
+++ b/extra/gtk2/cups-custom-print.patch
@@ -0,0 +1,104 @@
+From 8170436e61ea68c713d75ad374d22c3261be9203 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <benjamin@sipsolutions.net>
+Date: Sat, 24 Dec 2011 16:26:32 +0000
+Subject: Set cups Custom print options correctly (bug #543520, patch by Marek Kašík)
+
+This patch fixes the cups print backend to pass Custom options with
+the "Custom." prefix to cups if neccessary.
+---
+diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
+index 14a1b5d..2751ee4 100644
+--- a/modules/printbackends/cups/gtkprintbackendcups.c
++++ b/modules/printbackends/cups/gtkprintbackendcups.c
+@@ -483,22 +483,44 @@ cups_print_cb (GtkPrintBackendCups *print_backend,
+   GDK_THREADS_LEAVE ();  
+ }
+ 
++typedef struct {
++  GtkCupsRequest *request;
++  GtkPrinterOptionSet *options;
++} CupsOptionsData;
++
+ static void
+ add_cups_options (const gchar *key,
+ 		  const gchar *value,
+ 		  gpointer     user_data)
+ {
+-  GtkCupsRequest *request = user_data;
++  CupsOptionsData *data = (CupsOptionsData *) user_data;
++  GtkCupsRequest *request = data->request;
++  GtkPrinterOptionSet *options = data->options;
++  GtkPrinterOption *option = NULL;
++  gchar *new_value = NULL;
+ 
+   if (!g_str_has_prefix (key, "cups-"))
+     return;
+ 
+   if (strcmp (value, "gtk-ignore-value") == 0)
+     return;
++
++  option = gtk_printer_option_set_lookup (options, key);
+   
+   key = key + strlen ("cups-");
+ 
+-  gtk_cups_request_encode_option (request, key, value);
++  /* Add "Custom." prefix to custom values */
++  if (value && option &&
++      !gtk_printer_option_has_choice (option, value))
++    new_value = g_strdup_printf ("Custom.%s", value);
++
++  if (new_value)
++    {
++      gtk_cups_request_encode_option (request, key, new_value);
++      g_free (new_value);
++    }
++  else
++    gtk_cups_request_encode_option (request, key, value);
+ }
+ 
+ static void
+@@ -511,8 +533,12 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend         *print_backend,
+ {
+   GtkPrinterCups *cups_printer;
+   CupsPrintStreamData *ps;
++  CupsOptionsData *options_data;
+   GtkCupsRequest *request;
+   GtkPrintSettings *settings;
++  GtkPrinterOptionSet *options;
++  GtkPrintCapabilities capabilities;
++  GtkPageSetup *page_setup;
+   const gchar *title;
+   char  printer_absolute_uri[HTTP_MAX_URI];
+ 
+@@ -521,6 +547,8 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend         *print_backend,
+ 
+   cups_printer = GTK_PRINTER_CUPS (gtk_print_job_get_printer (job));
+   settings = gtk_print_job_get_settings (job);
++  capabilities = cups_printer_get_capabilities (GTK_PRINTER (cups_printer));
++  page_setup = gtk_printer_get_default_page_size (GTK_PRINTER (cups_printer));
+ 
+   request = gtk_cups_request_new_with_username (NULL,
+                                                 GTK_CUPS_POST,
+@@ -558,8 +586,18 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend         *print_backend,
+                                      IPP_TAG_NAME, "job-name", 
+                                      NULL, title);
+ 
+-  gtk_print_settings_foreach (settings, add_cups_options, request);
+-  
++  options = cups_printer_get_options (GTK_PRINTER (cups_printer), settings, page_setup, capabilities);
++
++  options_data = g_new0 (CupsOptionsData, 1);
++  options_data->request = request;
++  options_data->options = options;
++
++  gtk_print_settings_foreach (settings, add_cups_options, options_data);
++
++  g_object_unref (page_setup);
++  g_object_unref (options);
++  g_free (options_data);
++
+   ps = g_new0 (CupsPrintStreamData, 1);
+   ps->callback = callback;
+   ps->user_data = user_data;
+--
+cgit v0.9.0.2
diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD
new file mode 100644
index 000000000..3df591879
--- /dev/null
+++ b/extra/kactivities/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 147786 2012-01-28 10:32:55Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kactivities
+pkgver=4.8.0
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='API for using and interacting with Activities'
+url='http://kde.org/'
+license=('GPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('ac64d13f767c06bfcf2040fcdf94a78410ad035d')
+
+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
+}
diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD
new file mode 100644
index 000000000..5545ff596
--- /dev/null
+++ b/extra/kdeaccessibility-jovie/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 147806 2012-01-28 10:33:25Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeaccessibility-jovie
+pkgver=4.8.0
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='A text to speech application'
+url='http://kde.org/applications/utilities/jovie/'
+license=('GPL' 'FDL')
+groups=('kde' 'kdeaccessibility')
+depends=('kdebase-runtime' 'speech-dispatcher')
+makedepends=('cmake' 'automoc4')
+replaces=('kdeaccessibility-kttsd')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.bz2")
+sha1sums=('aef47e440183323c5a62d3f45aaece7215817917')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../jovie-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeaccessibility-jovie/kdeaccessibility-jovie.install b/extra/kdeaccessibility-jovie/kdeaccessibility-jovie.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeaccessibility-jovie/kdeaccessibility-jovie.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD
new file mode 100644
index 000000000..ebff2eaf8
--- /dev/null
+++ b/extra/kdeaccessibility-kaccessible/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 147808 2012-01-28 10:33:27Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeaccessibility-kaccessible
+pkgver=4.8.0
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='Provides accessibility services like focus tracking and a screenreader'
+url='http://accessibility.kde.org/'
+license=('GPL' 'FDL')
+groups=('kde' 'kdeaccessibility')
+depends=('kdelibs' 'speech-dispatcher')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.bz2")
+sha1sums=('16451b090fe1ed345b5c1d3426bf0123eda08859')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kaccessible-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD
new file mode 100644
index 000000000..cf29f82e5
--- /dev/null
+++ b/extra/kdeaccessibility-kmag/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 147810 2012-01-28 10:33:29Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeaccessibility-kmag
+pkgver=4.8.0
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='Screen Magnifier'
+url='http://kde.org/applications/utilities/kmag/'
+license=('GPL' 'FDL')
+groups=('kde' 'kdeaccessibility')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.bz2")
+sha1sums=('7f281e2ac07aeb8d31249e6e0b27661a87f98a0c')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kmag-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeaccessibility-kmag/kdeaccessibility-kmag.install b/extra/kdeaccessibility-kmag/kdeaccessibility-kmag.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeaccessibility-kmag/kdeaccessibility-kmag.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD
new file mode 100644
index 000000000..f1c08b54c
--- /dev/null
+++ b/extra/kdeaccessibility-kmousetool/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 147812 2012-01-28 10:33:32Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeaccessibility-kmousetool
+pkgver=4.8.0
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
+url='http://kde.org/applications/utilities/kmousetool/'
+license=('GPL' 'FDL')
+groups=('kde' 'kdeaccessibility')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.bz2")
+sha1sums=('121fce8fd61772d044a48885918d2c0b500bb646')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kmousetool-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install b/extra/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD
new file mode 100644
index 000000000..07e0f3ead
--- /dev/null
+++ b/extra/kdeaccessibility-kmouth/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 147814 2012-01-28 10:33:35Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeaccessibility-kmouth
+pkgver=4.8.0
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='Speech Synthesizer Frontend'
+url='http://kde.org/applications/utilities/kmouth/'
+license=('GPL' 'FDL')
+groups=('kde' 'kdeaccessibility')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.bz2")
+sha1sums=('43ff583d0628005087c948362b1e64dc4d359d88')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kmouth-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install b/extra/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index 650be0b03..95c36529e 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145767 2011-12-30 10:33:07Z andrea $
+# $Id: PKGBUILD 147816 2012-01-28 10:33:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,17 +7,16 @@ pkgname=('kdeadmin-kcron'
          'kdeadmin-ksystemlog'
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
-pkgver=4.7.4
-pkgrel=2
+pkgver=4.8.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
-	         'system-config-printer-common')
+makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'syslog-path.patch')
-sha1sums=('1a294315645adbbff348a380196d4300a408b70d'
+sha1sums=('a7cf29130bd83615bdc01f54a465cef8c492c527'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 build() {
@@ -74,6 +73,9 @@ package_kdeadmin-system-config-printer-kde() {
 	cd $srcdir/build/system-config-printer-kde
 	make DESTDIR=$pkgdir install
 
-    # Use the python2 executable
-    find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+        # Use the python2 executable
+        sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+          "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py
+        sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+          "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py
 }
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index 085a5538d..07c84c73e 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144655 2011-12-08 09:19:19Z andrea $
+# $Id: PKGBUILD 147818 2012-01-28 10:33:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -13,16 +13,16 @@ pkgname=('kdeartwork-aurorae'
          'kdeartwork-styles'
          'kdeartwork-wallpapers'
          'kdeartwork-weatherwallpapers')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeartwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
-	         'kdebase-workspace' 'libkexiv2')
+makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace'
+             'libkexiv2')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('f397f49a73273baadabcaf45cf18c4d6a3efbe44')
+sha1sums=('08c6e127ad1931a13ea1dde25189a49de089fa89')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
index e5a13d3b6..fd33da488 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144657 2011-12-08 09:19:21Z andrea $
+# $Id: PKGBUILD 147820 2012-01-28 10:33:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://kde.org/applications/system/konsole/'
@@ -12,7 +12,7 @@ groups=('kde' 'kdebase')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
-sha1sums=('33e1bc6f1043c9bf6186190b66b21483301eac7e')
+sha1sums=('f99abc20fd0042be62e48308f334b66a6a3135d7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
index fed053273..e02bcb156 100644
--- a/extra/kdebase-runtime/PKGBUILD
+++ b/extra/kdebase-runtime/PKGBUILD
@@ -1,30 +1,26 @@
-# $Id: PKGBUILD 146420 2012-01-10 23:37:38Z eric $
+# $Id: PKGBUILD 147764 2012-01-28 10:32:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-runtime
-pkgver=4.7.4
-pkgrel=3
+pkgver=4.8.0
+pkgrel=1
 pkgdesc="KDE Base Runtime Environment"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-        'xorg-xauth' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
+        'xorg-xauth')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
+             'xine-lib')
 optdepends=('htdig: to build the search index in khelpcenter'
             'rarian: needed by khelpcenter'
             'gdb: drkonq crash handler')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2"
-        'libqzeitgeist08.patch')
-sha1sums=('bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6'
-          '164c9e4305029cb68a2101cfeeb76c7066c2fd39')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2")
+sha1sums=('5e1e98535529a67f8d20e8c76d051c81604d7064')
 
 build() {
-    cd "${srcdir}"/kde-runtime-${pkgver}
-    patch -p1 -i "${srcdir}"/libqzeitgeist08.patch
-
     cd "${srcdir}"
 	mkdir build
 	cd build
@@ -40,4 +36,8 @@ package() {
 	make DESTDIR="$pkgdir" install
 	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
 	ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
+
+    # Fix Python2 path
+    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+      "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
 }
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 04a993706..0007c1aa5 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144857 2011-12-08 16:10:09Z andrea $
+# $Id: PKGBUILD 147788 2012-01-28 10:33:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.7.4
-pkgrel=2
+pkgver=4.8.0
+pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -17,10 +17,9 @@ groups=('kde')
 depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
          'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
          'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
-         'xorg-xrdb')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python'
-             'networkmanager')
-optdepends=('kde-wallpapers: officials KDE wallapers')
+         'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst')
+makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager')
+optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
 replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
           'kdebase-kinfocenter')
 conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde'
@@ -34,10 +33,10 @@ options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
         'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
         'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('b7810ba13f6f2a1c4783b153ad9349a1dd27b495'
+sha1sums=('4c471b159315b084c65196b0c93c34981a9105c5'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          'f7b38af38549242a240f1a90ab9964ca8a366129'
-          '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
+          'e4198a443703f749b58a4fec88362fced1b45789'
+          '264e395c2c44cdda5a242c6dee649afab44cd6e5'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
@@ -45,7 +44,7 @@ sha1sums=('b7810ba13f6f2a1c4783b153ad9349a1dd27b495'
 
 build() {
 	cd "${srcdir}"/${_pkgname}-${pkgver}
-    patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
+	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
 	patch -p0 -i "${srcdir}"/fixpath.patch
 	patch -p0 -i "${srcdir}"/terminate-server.patch
 
@@ -59,8 +58,8 @@ build() {
         -DWITH_Xmms=OFF \
         -DWITH_Googlegadgets=OFF \
         -DWITH_libgps=OFF \
-        -DWITH_OpenGLES=OFF \
-        -DKWIN_BUILD_WITH_OPENGLES=OFF \
+        -DWITH_OpenGLES=ON \
+        -DKWIN_BUILD_WITH_OPENGLES=ON \
         -DPYTHON_EXECUTABLE=/usr/bin/python2
 	make
 }
diff --git a/extra/kdebase-workspace/kde-np.pam b/extra/kdebase-workspace/kde-np.pam
index 81eeef47b..dfedb8edf 100644
--- a/extra/kdebase-workspace/kde-np.pam
+++ b/extra/kdebase-workspace/kde-np.pam
@@ -4,4 +4,5 @@ auth		required	pam_permit.so
 account		required	pam_unix.so
 password	required	pam_unix.so
 session		required	pam_unix.so
-session		required	pam_limits.so
-\ No newline at end of file
+session		required	pam_limits.so
+-session    optional    pam_systemd.so
diff --git a/extra/kdebase-workspace/kde.pam b/extra/kdebase-workspace/kde.pam
index 1a259390f..9ec074d06 100644
--- a/extra/kdebase-workspace/kde.pam
+++ b/extra/kdebase-workspace/kde.pam
@@ -4,4 +4,5 @@ auth		required	pam_nologin.so
 account		required	pam_unix.so
 password	required	pam_unix.so
 session		required	pam_unix.so
-session		required	pam_limits.so
-\ No newline at end of file
+session		required	pam_limits.so
+-session    optional    pam_systemd.so
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index 5511a4524..1450eabeb 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144637 2011-12-08 09:18:50Z andrea $
+# $Id: PKGBUILD 147790 2012-01-28 10:33:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,17 +12,22 @@ pkgname=('kdebase-dolphin'
          'kdebase-konqueror'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
-makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2")
-sha1sums=('ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6')
+makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2"
+        'fix-controlclick-selection.patch')
+sha1sums=('25151b551793164c5eb1cb303d3031e63a6122e3'
+          'b29c42301b84475f95f19ff9edb22d2134df9c1c')
 
 build() {
+    cd "${srcdir}"/kde-baseapps-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-controlclick-selection.patch
+
 	cd ${srcdir}
 	mkdir build
 	cd build
@@ -40,6 +45,7 @@ package_kdebase-dolphin() {
                 'kdegraphics-thumbnailers: thumbnailers for graphics file'
                 'ruby: servicemenu installation')
 	url="http://kde.org/applications/system/dolphin/"
+        install=kdebase-dolphin.install
 	cd $srcdir/build/dolphin
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/dolphin
@@ -94,13 +100,13 @@ package_kdebase-konqueror() {
 	depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
 	optdepends=('kwebkitpart: to enable webkit engine')
 	url="http://kde.org/applications/internet/konqueror/"
-	install='kdebase.install'
-    conflicts=('kdebase-nsplugins')
-    replaces=('kdebase-nsplugins')
-    for i in konqueror doc/konqueror nsplugins; do
-        cd $srcdir/build/${i}
-        make DESTDIR=$pkgdir install
-    done
+	install='kdebase-konqueror.install'
+        conflicts=('kdebase-nsplugins')
+        replaces=('kdebase-nsplugins')
+        for i in konqueror doc/konqueror nsplugins; do
+              cd $srcdir/build/${i}
+              make DESTDIR=$pkgdir install
+        done
 }
 
 package_kdebase-lib() {
diff --git a/extra/kdebase/fix-controlclick-selection.patch b/extra/kdebase/fix-controlclick-selection.patch
new file mode 100644
index 000000000..a51161326
--- /dev/null
+++ b/extra/kdebase/fix-controlclick-selection.patch
@@ -0,0 +1,11 @@
+--- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
++++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp
+@@ -471,7 +471,7 @@ bool KItemListController::mousePressEven
+                                 (!shiftOrControlPressed && !pressedItemAlreadySelected);
+     if (clearSelection) {
+         m_selectionManager->clearSelection();
+-    } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) {
++    } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) {
+         // The user might want to start dragging multiple items, but if he clicks the item
+         // in order to trigger it instead, the other selected items must be deselected.
+         // However, we do not know yet what the user is going to do.
diff --git a/extra/kdebase/kdebase-dolphin.install b/extra/kdebase/kdebase-dolphin.install
new file mode 100644
index 000000000..660593cf5
--- /dev/null
+++ b/extra/kdebase/kdebase-dolphin.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdebase/kdebase-konqueror.install b/extra/kdebase/kdebase-konqueror.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdebase/kdebase-konqueror.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
index 4e80a6b37..7069c7569 100644
--- a/extra/kdebindings-kimono/PKGBUILD
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144659 2011-12-08 09:19:23Z andrea $
+# $Id: PKGBUILD 147822 2012-01-28 10:33:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-kimono
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the KDE libraries"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2")
-sha1sums=('8f260e09bffcf74bad18a5168016d0dad5db3656')
+sha1sums=('b46842ce2b3c1aa3620277a461c3d127843d6a4d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
index 7a0acda54..9550142fe 100644
--- a/extra/kdebindings-kross/PKGBUILD
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 144663 2011-12-08 09:19:28Z andrea $
+# $Id: PKGBUILD 147824 2012-01-28 10:33:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-kross
 pkgname=('kdebindings-kross-python'
 #         'kdebindings-kross-ruby'
          'kdebindings-kross-java')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6')
+makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
 source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2")
-sha1sums=('416e9f25ff2050d9c5518254a7cc7d4cad22b648')
+sha1sums=('2b2ac36b1597e180c1e3923c00f4ca465bd99a03')
 
 build() {
   cd "${srcdir}"
@@ -37,7 +37,7 @@ package_kdebindings-kross-python() {
 
 package_kdebindings-kross-java() {
   pkgdesc="Java language interpreters to enable in-process scripting with Kross"
-  depends=('kdelibs' 'openjdk6')
+  depends=('kdelibs' 'java-environment')
 
   cd "${srcdir}"/build/java
   make DESTDIR="${pkgdir}" install
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index 3221d387d..8bdb95ace 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144665 2011-12-08 09:19:30Z andrea $
+# $Id: PKGBUILD 147826 2012-01-28 10:33:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Perl bindings for the KDE libraries"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
             'kdegraphics-okular' 'kdesdk-kate')
 source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2")
-sha1sums=('7116668ecd5baf55734a8349a2f0b04d0e701898')
+sha1sums=('e9c46cec78f42a29befbc26dfa428d6a28027754')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
index eb2c7111a..cdb31778b 100644
--- a/extra/kdebindings-perlqt/PKGBUILD
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145672 2011-12-26 14:44:55Z andrea $
+# $Id: PKGBUILD 147778 2012-01-28 10:32:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlqt
-pkgver=4.7.4
-pkgrel=2
+pkgver=4.8.0
+pkgrel=1
 pkgdesc="Perl bindings for the Qt libraries"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'perl-list-moreutils')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2")
-sha1sums=('b4b3d8ce2b08af62202f5ae79fe57bde60dd9a85')
+sha1sums=('db11f9625d6c531d9b4cf0d50c36e405600a7717')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 09339c550..cabf80cc7 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145595 2011-12-23 10:46:04Z andrea $
+# $Id: PKGBUILD 147780 2012-01-28 10:32:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-python
-pkgver=4.7.4
-pkgrel=2
+pkgver=4.8.0
+pkgrel=1
 pkgdesc="KDE bindings for Python"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2")
-sha1sums=('cac4b94098dba73d58fb4f7d73d7c65c306517d1')
+sha1sums=('cf204efebc1eda6de7f4405dbf5037bdaffd30e9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index 94c565d6c..98da22277 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144633 2011-12-08 09:18:43Z andrea $
+# $Id: PKGBUILD 147784 2012-01-28 10:32:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Qt bindings for ruby"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2")
-sha1sums=('e49e38a59238cf6f5ec9c2d9afc06f3330369fc7')
+sha1sums=('9b8e9ab4926929909861f6557dea908d328a1dd2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
index fda759ab3..00f18981b 100644
--- a/extra/kdebindings-qyoto/PKGBUILD
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144631 2011-12-08 09:18:38Z andrea $
+# $Id: PKGBUILD 147782 2012-01-28 10:32:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qyoto
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the Qt libraries"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2")
-sha1sums=('8f2412a8bbb343bdb1e14c0fc6ef3681afe9d601')
+sha1sums=('3e5abc08b5a097e332449f15c50975402934d60a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
index f347e8860..8e09d6e3d 100644
--- a/extra/kdebindings-smokegen/PKGBUILD
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144619 2011-12-08 09:18:20Z andrea $
+# $Id: PKGBUILD 147768 2012-01-28 10:32:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokegen
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="A general purpose C++ parser with a plugin infrastructure"
 url="http://kde.org/"
@@ -11,15 +11,10 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2"
-        'fix-crash.patch')
-sha1sums=('068d37e2404311b9caa23d78ee7fa262188a8622'
-          'b209b2b7017622fea3406c5a9636e2334566af01')
+source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2")
+sha1sums=('9b4f0af954e845eecea8e7ed388e01cffb8974d2')
 
 build() {
-  cd "${srcdir}"/smokegen-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-crash.patch
-
   cd "${srcdir}"
   mkdir build
   cd build
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
index 2a2fe59d5..de1a9b045 100644
--- a/extra/kdebindings-smokekde/PKGBUILD
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145652 2011-12-26 11:44:48Z andrea $
+# $Id: PKGBUILD 147776 2012-01-28 10:32:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokekde
-pkgver=4.7.4
-pkgrel=2
+pkgver=4.8.0
+pkgrel=1
 pkgdesc="Language independent library for KDE bindings"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
              'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
-sha1sums=('c3e2bd07158c4bc6a19123d5ae8e81529b52e07b')
+sha1sums=('04f01d14cfc395fcf675b7a22202b41351f471f9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index df5496acd..2bc6fa39d 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144621 2011-12-08 09:18:24Z andrea $
+# $Id: PKGBUILD 147770 2012-01-28 10:32:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
-sha1sums=('2b1033732d166946db3096ddbf6eb9a6ddb61877')
+sha1sums=('9ad56f1441c92b6d24b7e9ec19fe62da34820731')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD
new file mode 100644
index 000000000..b61d7f774
--- /dev/null
+++ b/extra/kdeedu-analitza/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 147804 2012-01-28 10:33:23Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-analitza
+pkgver=4.8.0
+pkgrel=1
+pkgdesc="A library to add mathematical features to your program"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.bz2")
+sha1sums=('2681b114deab6f3fd215e0348e34c63116ddd31c')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../analitza-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
index 751311f91..cc16cf062 100644
--- a/extra/kdeedu-blinken/PKGBUILD
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144667 2011-12-08 09:19:33Z andrea $
+# $Id: PKGBUILD 147828 2012-01-28 10:33:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-blinken
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Memory Enhancement Game"
 url="http://kde.org/applications/education/blinken/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2")
-sha1sums=('edeb024db23da00cf896bc41c6e3efa371d9867d')
+sha1sums=('7283a49de949e15f9c9ab06dfa133012a4090a7c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
index 979f2b369..1d711115f 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 144669 2011-12-08 09:19:38Z andrea $
+# $Id: PKGBUILD 147830 2012-01-28 10:34:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libspectre')
+depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza')
 makedepends=('cmake' 'automoc4' 'r')
 optdepends=('maxima: Maxima backend'
             'octave: Octave backend'
             'r: R backend')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2")
-sha1sums=('da39832093c1ea6eb28c6b5b4f67cb24473d8fb5')
+sha1sums=('b0ef9cb3c25e4909b6855317425e9d9f12697dff')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
index 3920893f2..d0cedbe26 100644
--- a/extra/kdeedu-kalgebra/PKGBUILD
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 144671 2011-12-08 09:19:43Z andrea $
+# $Id: PKGBUILD 147832 2012-01-28 10:34:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalgebra
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Graph Calculator"
 url="http://kde.org/applications/education/kalgebra/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
+depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2")
-sha1sums=('8ef005a50316d7d86b7bc1ed306380d69ce946a0')
+sha1sums=('45903803c0c0f3e05c30e7543ee3ebc891b60e4b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index 3b6bed08b..a8b1a478c 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 144673 2011-12-08 09:19:48Z andrea $
+# $Id: PKGBUILD 147834 2012-01-28 10:34:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
-depends=('kdelibs' 'avogadro' 'ocaml')
+depends=('kdelibs' 'avogadro' 'ocaml' 'facile')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2")
-sha1sums=('6cb65b2c524f529976e4c63a75a7637a181d08d9')
+sha1sums=('0d4f9d3a148052c93068d4c2c0ed22969ac05202')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
index 9eb18e25f..58ee2539d 100644
--- a/extra/kdeedu-kanagram/PKGBUILD
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144675 2011-12-08 09:19:54Z andrea $
+# $Id: PKGBUILD 147836 2012-01-28 10:34:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kanagram
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Letter Order Game"
 url="http://kde.org/applications/education/kanagram/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2")
-sha1sums=('15fda47cd6685a7e19fb4744ec930b9a4dcfbe05')
+sha1sums=('85daff6309edf72f93fe0f692413216313c98dbd')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
index 6e2641b1e..07788466a 100644
--- a/extra/kdeedu-kbruch/PKGBUILD
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144677 2011-12-08 09:19:59Z andrea $
+# $Id: PKGBUILD 147838 2012-01-28 10:34:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kbruch
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Exercise Fractions"
 url="http://kde.org/applications/education/kbruch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2")
-sha1sums=('36165292cb9935343d1aa2572935a130b6619f00')
+sha1sums=('0f602d0dd1355dbf84c26f813458bdeb0508f4f8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
index c2acba655..62b2d2507 100644
--- a/extra/kdeedu-kgeography/PKGBUILD
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144679 2011-12-08 09:20:02Z andrea $
+# $Id: PKGBUILD 147840 2012-01-28 10:34:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kgeography
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Geography Trainer"
 url="http://kde.org/applications/education/kgeography/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2")
-sha1sums=('4a90c59928a4947c5cd970ed72e5e9cea370d8e6')
+sha1sums=('07d77cd5182e0594273aa713ad62134232868c08')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
index 6bbce0fdd..2d6bec05e 100644
--- a/extra/kdeedu-khangman/PKGBUILD
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144681 2011-12-08 09:20:04Z andrea $
+# $Id: PKGBUILD 147842 2012-01-28 10:34:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-khangman
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Hangman Game"
 url="http://kde.org/applications/education/khangman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2")
-sha1sums=('c5999ba4218cb0331b906fbcaafa7f497762221d')
+sha1sums=('2deaab70f8ed414a4ddb21aeb91627dac74986a6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index b34fd7fd2..9100be55c 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144683 2011-12-08 09:20:07Z andrea $
+# $Id: PKGBUILD 147844 2012-01-28 10:34:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2")
-sha1sums=('4c76ef89e6210f2f25e719176db4d8a2b31b6222')
+sha1sums=('141a4c9230ab134dcf7016c2880357d9e52b8f69')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
index 4f800258a..0df8d937d 100644
--- a/extra/kdeedu-kiten/PKGBUILD
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144685 2011-12-08 09:20:10Z andrea $
+# $Id: PKGBUILD 147846 2012-01-28 10:34:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kiten
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Japanese Reference/Study Tool"
 url="http://kde.org/applications/education/kiten/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2")
-sha1sums=('8ec806306a7b08cb8ca5e567a48417cd2268e501')
+sha1sums=('4068f2bcca69150a9b340a6d47ec4902d9dbacc9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
index 059453365..4550f8616 100644
--- a/extra/kdeedu-klettres/PKGBUILD
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144687 2011-12-08 09:20:12Z andrea $
+# $Id: PKGBUILD 147848 2012-01-28 10:34:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-klettres
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Learn The Alphabet"
 url="http://kde.org/applications/education/klettres/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2")
-sha1sums=('d2450f7aa24fc0118dd20d2e11d61fca68ba5461')
+sha1sums=('9d2c13dd14db79451db8afdc184f264b1ba29d81')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
index c9ddb0c5f..3b3348290 100644
--- a/extra/kdeedu-kmplot/PKGBUILD
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144689 2011-12-08 09:20:14Z andrea $
+# $Id: PKGBUILD 147850 2012-01-28 10:34:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kmplot
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Mathematical Function Plotter"
 url="http://kde.org/applications/education/kmplot/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2")
-sha1sums=('b0b2b748e4ea0f670ffe5c9be01a6997a061a75c')
+sha1sums=('914151c41fba93cb1d0cd659fb3e392c0de1b5f8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
index 80f152bb2..a4c2e8a9d 100644
--- a/extra/kdeedu-kstars/PKGBUILD
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144691 2011-12-08 09:20:17Z andrea $
+# $Id: PKGBUILD 147852 2012-01-28 10:34:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2")
-sha1sums=('d4e489093b440e4246c817821187193e4e53be66')
+sha1sums=('249f80cdd5198c5c22ce75cea4d1718d5865a3c9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
index e2defda91..6b0d2fed0 100644
--- a/extra/kdeedu-ktouch/PKGBUILD
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144693 2011-12-08 09:20:19Z andrea $
+# $Id: PKGBUILD 147854 2012-01-28 10:34:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-ktouch
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Touch Typing Tutor"
 url="http://kde.org/applications/education/ktouch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2")
-sha1sums=('92d7e446216bdfdf68e13c9f0ba39d44e02b29c9')
+sha1sums=('e1e1338e67c0c02c4573a4aa95a721c8f674f2c6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
index bcfb7bd13..49d046694 100644
--- a/extra/kdeedu-kturtle/PKGBUILD
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144695 2011-12-08 09:20:21Z andrea $
+# $Id: PKGBUILD 147856 2012-01-28 10:34:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kturtle
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Educational Programming Environment"
 url="http://kde.org/applications/education/kturtle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2")
-sha1sums=('b3baa81277417f352d4a0bdca61df75515f30c0d')
+sha1sums=('3da036991fed5840fb45d033efe0082570e804d9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
index 4520a9e90..c073ce38e 100644
--- a/extra/kdeedu-kwordquiz/PKGBUILD
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144697 2011-12-08 09:20:24Z andrea $
+# $Id: PKGBUILD 147858 2012-01-28 10:34:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kwordquiz
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Flash Card Trainer"
 url="http://kde.org/applications/education/kwordquiz/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2")
-sha1sums=('c726b0856234ce78fab0ecd61072cdb035e66513')
+sha1sums=('34eec78fe68aef8b7166ca6cca84ed58290484b9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index ab4b93f06..63a86ea2e 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144641 2011-12-08 09:18:54Z andrea $
+# $Id: PKGBUILD 147794 2012-01-28 10:33:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd')
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2")
-sha1sums=('e560c355a8d91bbb61b9f2e6c7cb11bd79eba1ab')
+sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
index 91334e9a8..afabf28a9 100644
--- a/extra/kdeedu-parley/PKGBUILD
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144699 2011-12-08 09:20:26Z andrea $
+# $Id: PKGBUILD 147860 2012-01-28 10:34:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-parley
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Vocabulary Trainer"
 url="http://kde.org/applications/education/parley/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2")
-sha1sums=('e61d0192dce0e1427ee41ff96f1bcb73c77cbcef')
+sha1sums=('800eea4d6339da608cc720b5d6186de9a43b70ce')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
index 8d98021db..74d79c2be 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144701 2011-12-08 09:20:28Z andrea $
+# $Id: PKGBUILD 147862 2012-01-28 10:35:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'boost-libs')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
-sha1sums=('f808118fcd5df59a9a808747be940a88b30cf6f3')
+sha1sums=('d29daa9633e2ba6e2d3e0c7155ade752216a8969')
 options=('!makeflags')
 
 build() {
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
index 49b41aa66..ae3b7af65 100644
--- a/extra/kdeedu-step/PKGBUILD
+++ b/extra/kdeedu-step/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144703 2011-12-08 09:20:30Z andrea $
+# $Id: PKGBUILD 147864 2012-01-28 10:35:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2")
-sha1sums=('30dba80e6f34124fd5a8ebf6688e261ab109d0d4')
+sha1sums=('08fff354effdc6f10e3b55ab011f8393a19de9fd')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
index 6d117d163..fea4280f0 100644
--- a/extra/kdegames/PKGBUILD
+++ b/extra/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144705 2011-12-08 09:20:36Z andrea $
+# $Id: PKGBUILD 147866 2012-01-28 10:35:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -43,16 +43,16 @@ pkgname=('kdegames-bomber'
          'kdegames-libkmahjongg'
          'kdegames-lskat'
          'kdegames-palapeli')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted'
-             'kdebindings-python' 'openal')
+makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python'
+             'openal')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('a1f97524f868ab9dae0439abcbf4b41f68715598')
+sha1sums=('714a775811dae11ca85ce1113d673894b0afdcdd')
 
 build() {
 	cd $srcdir
@@ -102,6 +102,7 @@ package_kdegames-granatier() {
 package_kdegames-kajongg() {
 	pkgdesc='The ancient Chinese board game for 4 players'
 	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted')
+        url="http://www.kde.org/applications/games/kajongg/"
 	install='kdegames.install'
 	cd $srcdir/build/kajongg
 	make DESTDIR=$pkgdir install
@@ -362,7 +363,7 @@ package_kdegames-kpatience() {
 	pkgdesc='Patience Card Game'
 	depends=('kdebase-runtime' 'kdegames-libkdegames')
 	url="http://kde.org/applications/games/kpatience/"
-	install='kdegames.install'
+	install='kdegames-kpatience.install'
 	replaces=('kdegames-kpat')
 	cd $srcdir/build/kpat
 	make DESTDIR=$pkgdir install
diff --git a/extra/kdegames/kdegames-kpatience.install b/extra/kdegames/kdegames-kpatience.install
new file mode 100644
index 000000000..9b20edb30
--- /dev/null
+++ b/extra/kdegames/kdegames-kpatience.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
index 79bdcde8e..57c55b946 100644
--- a/extra/kdegraphics-gwenview/PKGBUILD
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144707 2011-12-08 09:20:42Z andrea $
+# $Id: PKGBUILD 147868 2012-01-28 10:35:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-gwenview
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="A fast and easy to use image viewer for KDE"
 url="http://kde.org/applications/graphics/gwenview/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins: extra plugins to share photos')
 install=$pkgname.install
 source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
-sha1sums=('598714d18cf7adab8afd4f906070f0915e1cdc95')
+sha1sums=('ea1bc5dec79fb0810fc4629e8cf023c78f12ef0b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index 3dbb7c305..c716b2ef4 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144709 2011-12-08 09:20:46Z andrea $
+# $Id: PKGBUILD 147870 2012-01-28 10:35:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'gphoto2')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2")
-sha1sums=('098c71d7588d5163656cb07a476efbfc6755900a')
+sha1sums=('1693f435764124651d17579449aa4bfadff3701b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
index be6b6ea2e..aea8da83d 100644
--- a/extra/kdegraphics-kcolorchooser/PKGBUILD
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144711 2011-12-08 09:20:51Z andrea $
+# $Id: PKGBUILD 147872 2012-01-28 10:35:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kcolorchooser
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Color Chooser"
 url="http://kde.org/applications/graphics/kcolorchooser/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2")
-sha1sums=('bbfda234e8aec109c63226499fc72355b1c051ca')
+sha1sums=('84ab09ba2e0dbe8077a91d3496b6c65f54b636fc')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
index cfe08dea6..06e9afd93 100644
--- a/extra/kdegraphics-kgamma/PKGBUILD
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144713 2011-12-08 09:20:55Z andrea $
+# $Id: PKGBUILD 147875 2012-01-28 10:35:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kgamma
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="A monitor calibration tool"
 url="http://kde.org/applications/graphics/kgamma/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libxxf86vm')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2")
-sha1sums=('cd528839b6a9be997ed8d4a2fc87a8b5b8e8de91')
+sha1sums=('ff86fb416475aefa69d58c3c69f5426b32ea63ae')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
index 2a3240bfe..e9f400e4d 100644
--- a/extra/kdegraphics-kolourpaint/PKGBUILD
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144715 2011-12-08 09:21:00Z andrea $
+# $Id: PKGBUILD 147877 2012-01-28 10:35:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kolourpaint
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Paint Program"
 url="http://kde.org/applications/graphics/kolourpaint/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2")
-sha1sums=('31e23ab6735291ec86ebd83e2eee7afa191a4a59')
+sha1sums=('2d8c32fb16a8b4f479906557b5eb88c519e2c08e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
index 4507ae8ac..99b13aca4 100644
--- a/extra/kdegraphics-kruler/PKGBUILD
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144717 2011-12-08 09:21:05Z andrea $
+# $Id: PKGBUILD 147879 2012-01-28 10:35:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kruler
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Screen Ruler"
 url="http://kde.org/applications/graphics/kruler/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2")
-sha1sums=('a854213e5342e382d3b9c4a29d1aada654378d0f')
+sha1sums=('e453a29c327e13458c32abd86ce7b98454b859f2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
index 9ea2b4db2..e9dd957a0 100644
--- a/extra/kdegraphics-ksaneplugin/PKGBUILD
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144719 2011-12-08 09:21:08Z andrea $
+# $Id: PKGBUILD 147881 2012-01-28 10:36:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksaneplugin
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="A scan plugin that implements the scanning"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2")
-sha1sums=('15f7ca6fbabb757898cc0f18685f5e204e6b3f56')
+sha1sums=('0110854a69395bc4402caf2b91fc3cf44a4200ad')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
index a04e71180..7b218646b 100644
--- a/extra/kdegraphics-ksnapshot/PKGBUILD
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144721 2011-12-08 09:21:11Z andrea $
+# $Id: PKGBUILD 147883 2012-01-28 10:36:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksnapshot
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Screen Capture Program"
 url="http://kde.org/applications/graphics/ksnapshot/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2")
-sha1sums=('bc40ae740e3a684e47ba1b5af01aeb427bb4336e')
+sha1sums=('a95584fd44401d130815c1ec79c21532197dbef8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index 6a8dc2dce..a7386eefd 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 144723 2011-12-08 09:21:12Z andrea $
+# $Id: PKGBUILD 147885 2012-01-28 10:36:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-mobipocket
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="A collection of plugins to handle mobipocket files"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'kdegraphics-okular')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2")
-sha1sums=('db278a2ebe4680a94c4963a53c1501cf1f1d9d2a')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('86ae995f7278f14e1169335b24fe7a61069c39a2')
 
 build() {
   cd "${srcdir}"
   mkdir build
   cd build
-  cmake ../mobipocket-${pkgver} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
   make
diff --git a/extra/kdegraphics-mobipocket/kdegraphics-mobipocket.install b/extra/kdegraphics-mobipocket/kdegraphics-mobipocket.install
new file mode 100644
index 000000000..660593cf5
--- /dev/null
+++ b/extra/kdegraphics-mobipocket/kdegraphics-mobipocket.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index 0aecf056f..5f07c1c52 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144623 2011-12-08 09:18:27Z andrea $
+# $Id: PKGBUILD 147772 2012-01-28 10:32:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-okular
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc='Document Viewer'
 arch=('i686' 'x86_64')
@@ -11,11 +11,11 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
          'ebook-tools' 'libspectre')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
+makedepends=('cmake' 'automoc4')
 optdepends=('kdegraphics-mobipocket: mobipocket support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
-sha1sums=('5f02bbfeff81b55e0fd5d9e973cb927909faccb1')
+sha1sums=('c112a490cd1245041c9d81b9377838fd0de4d60c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
index a0e74cf03..0ca0ef0c0 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144725 2011-12-08 09:21:15Z andrea $
+# $Id: PKGBUILD 147887 2012-01-28 10:36:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('39b3b0312663a3ef7a68c972b39bf12fb4cabe8b')
+sha1sums=('9c607105f30c13e83fac3430649696a19e1c4d7b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
index 9ef85adb9..d5a5d7f1e 100644
--- a/extra/kdegraphics-svgpart/PKGBUILD
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144727 2011-12-08 09:21:17Z andrea $
+# $Id: PKGBUILD 147889 2012-01-28 10:36:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-svgpart
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="A KPart for viewving SVGs"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2")
-sha1sums=('38dcb3c468ca359e7b0a0027523b8156de6a06a1')
+sha1sums=('bd432a31976cb64c41035382a8133332aa184c2a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
index 0389f30ee..0f3df5c9d 100644
--- a/extra/kdegraphics-thumbnailers/PKGBUILD
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144729 2011-12-08 09:21:20Z andrea $
+# $Id: PKGBUILD 147891 2012-01-28 10:36:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-thumbnailers
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Thumbnailers for various graphics file formats"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0e1636da30c78ad2c186bcd30c0566406b920126')
+sha1sums=('acaf1e7f44c3e65619ece032b9165ade65e418b5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 019a971bf..1bfbb3a18 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,30 +1,28 @@
-# $Id: PKGBUILD 145730 2011-12-29 13:52:20Z andrea $
+# $Id: PKGBUILD 147759 2012-01-28 10:32:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
-pkgver=4.7.4
-pkgrel=5
+pkgver=4.8.0
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
-        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
-        'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
-        'docbook-xsl' 'qtwebkit')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
+depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
+        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
+        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
+        'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
-install='kdelibs.install'
+install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch')
-sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8'
+        'fix-knotify-filepath.patch')
+sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
-          '9cb83cb7f6394549354c6837977f9e9529127041')
+          '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
 
 build() {
        cd "${srcdir}"/${pkgname}-${pkgver}
@@ -37,8 +35,6 @@ build() {
        # https://bugs.kde.org/show_bug.cgi?id=285028
        patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
 
-       patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.patch
-
        cd "${srcdir}"
        mkdir build
        cd build
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
index 6ca9a9ea1..97b2f3caa 100644
--- a/extra/kdemultimedia/PKGBUILD
+++ b/extra/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144731 2011-12-08 09:21:22Z andrea $
+# $Id: PKGBUILD 147893 2012-01-28 10:36:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,17 +10,17 @@ pkgname=('kdemultimedia-dragonplayer'
          'kdemultimedia-kmix'
          'kdemultimedia-kscd'
          'kdemultimedia-mplayerthumbs')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
-            'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
+makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer'
+             'pulseaudio' 'libmusicbrainz3')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'mplayerthumbs.config')
-sha1sums=('e0001afac38e35e3ab7b919d79f74cd57e3c18dd'
+sha1sums=('210bfd435c8e6f52aa78ab46f9487a159ab2ac83'
           'ba016fa2563c14ffcba852c62506b66bfc6ee683')
 
 build() {
@@ -30,8 +30,7 @@ build() {
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_Xine=OFF
+		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 }
 
@@ -39,7 +38,7 @@ package_kdemultimedia-dragonplayer() {
 	pkgdesc='Video Player'
 	depends=('kdebase-runtime')
 	url="http://kde.org/applications/multimedia/dragonplayer/"
-	install='kdemultimedia.install'
+	install='kdemultimedia-dragonplayer.install'
 	cd $srcdir/build/dragonplayer
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/dragonplayer
diff --git a/extra/kdemultimedia/kdemultimedia-dragonplayer.install b/extra/kdemultimedia/kdemultimedia-dragonplayer.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdemultimedia/kdemultimedia-dragonplayer.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index 3d03674e9..795411af3 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144733 2011-12-08 09:21:25Z andrea $
+# $Id: PKGBUILD 147895 2012-01-28 10:36:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,18 +10,18 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp'
+makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
+	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
     'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
     'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('15d5bdcda0e05de6247b22b96c6ca4a98da8a278')
+sha1sums=('51ea55dbcbece59535af61f7450e8ac2aa1db28b')
 
 build() {
     cd "${srcdir}"
@@ -55,9 +55,8 @@ package_kdenetwork-kdnssd() {
 package_kdenetwork-kget() {
 	pkgdesc='Download Manager'
 	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
-	optdepends=('python2: YouTube plugin')
 	url="http://kde.org/applications/internet/kget/"
-	install='kdenetwork.install'
+	install='kdenetwork-kget.install'
 	cd $srcdir/build/kget
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kget
@@ -67,9 +66,9 @@ package_kdenetwork-kget() {
 package_kdenetwork-kopete() {
 	pkgdesc='Instant Messenger'
 	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
-	         'libidn' 'qimageblitz' 'v4l-utils' 'libgadu' 'mediastreamer')
+	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
 	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork.install'
+	install='kdenetwork-kopete.install'
 	cd $srcdir/build/kopete
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kopete
@@ -80,7 +79,7 @@ package_kdenetwork-kppp() {
 	pkgdesc='Internet Dial-Up Tool'
 	depends=('kdebase-runtime' 'ppp')
 	url="http://kde.org/applications/internet/kppp/"
-	install='kdenetwork.install'
+	install='kdenetwork-kppp.install'
 	cd $srcdir/build/kppp
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kppp
diff --git a/extra/kdenetwork/kdenetwork-kget.install b/extra/kdenetwork/kdenetwork-kget.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdenetwork/kdenetwork-kget.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdenetwork/kdenetwork-kopete.install b/extra/kdenetwork/kdenetwork-kopete.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdenetwork/kdenetwork-kopete.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdenetwork/kdenetwork-kppp.install b/extra/kdenetwork/kdenetwork-kppp.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdenetwork/kdenetwork-kppp.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index 894661fc2..3b610f9c5 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 144617 2011-12-08 09:18:18Z andrea $
+# $Id: PKGBUILD 147766 2012-01-28 10:32:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc='KDE PIM Runtime Environment'
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdepimlibs' 'kdebase-runtime')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
+makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('fb02f53673316aaafb65b7c4dd570f3be3b4e935')
+sha1sums=('1cf75a92ddd0c18891163cd9d7f2290afae17472')
 
 build() {
     cd "${srcdir}"
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 7854e5dd8..06b32f1a6 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144735 2011-12-08 09:21:28Z andrea $
+# $Id: PKGBUILD 147897 2012-01-28 10:36:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -18,18 +18,17 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-korganizer'
          'kdepim-kresources'
          'kdepim-ktimetracker'
-         'kdepim-libkdepim'
-         'kdepim-wizards')
-pkgver=4.7.4
+         'kdepim-libkdepim')
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
-             'pilot-link' 'kde-agent')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
+             'kde-agent')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('233f6c413eeedd4af7cf15106a2af7b8f29977bf')
+sha1sums=('61509f42a96193ae2a9b9f8560dccb73d739f356')
 
 build() {
     cd "${srcdir}"
@@ -127,6 +126,7 @@ package_kdepim-kjots() {
 package_kdepim-kleopatra() {
 	pkgdesc='Certificate Manager and Unified Crypto GUI'
 	depends=('kdepim-libkdepim')
+    install=kdepim-kleopatra.install
 	url="http://kde.org/applications/utilities/kleopatra/"
 	cd "${srcdir}"/build/kleopatra
 	make DESTDIR="${pkgdir}" install
@@ -138,13 +138,13 @@ package_kdepim-kmail() {
 	pkgdesc='Mail Client'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim.install'
+	install='kdepim-kmail.install'
 	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	           'kdepim-mimelib' 'kdepim-plugins')
 	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	          'kdepim-mimelib' 'kdepim-plugins')
 	for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
-		nepomuk_email_feeder ontologies kontact/plugins/kmail; do
+		mailfilteragent ontologies kontact/plugins/kmail; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -194,7 +194,7 @@ package_kdepim-korganizer() {
 	pkgdesc='Calendar and Scheduling Program'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/korganizer"
-	install='kdepim.install'
+	install='kdepim-korganizer.install'
 	cd "${srcdir}"/build/korganizer
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/korganizer
@@ -242,11 +242,3 @@ package_kdepim-libkdepim() {
 		make DESTDIR="${pkgdir}" install
 	done
 }
-
-package_kdepim-wizards() {
-	pkgdesc='KDE Groupware Wizard'
-	depends=('kdepim-kresources')
-	url='http://pim.kde.org'
-	cd "${srcdir}"/build/wizards
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/kdepim/kdepim-kleopatra.install b/extra/kdepim/kdepim-kleopatra.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/extra/kdepim/kdepim-kleopatra.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdepim/kdepim-kmail.install b/extra/kdepim/kdepim-kmail.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/extra/kdepim/kdepim-kmail.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdepim/kdepim-korganizer.install b/extra/kdepim/kdepim-korganizer.install
new file mode 100644
index 000000000..5787df72f
--- /dev/null
+++ b/extra/kdepim/kdepim-korganizer.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index d480ec874..2ee9dfbf3 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 144612 2011-12-08 09:18:11Z andrea $
+# $Id: PKGBUILD 147761 2012-01-28 10:32:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
+makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
 install='kdepimlibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a539e29557c0a30779e752b9349b3a0c000ffbba')
+sha1sums=('22409015a8047e3a78711093e3363775e8434fba')
 
 build() {
 	cd ${srcdir}
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index be01860fc..fe7d65fe1 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145653 2011-12-26 11:44:57Z andrea $
+# $Id: PKGBUILD 147899 2012-01-28 10:36:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -18,6 +18,7 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-applets-filewatcher'
          'kdeplasma-addons-applets-frame'
          'kdeplasma-addons-applets-fuzzy-clock'
+         'kdeplasma-addons-applets-icontasks'
          'kdeplasma-addons-applets-incomingmsg'
          'kdeplasma-addons-applets-kdeobservatory'
          'kdeplasma-addons-applets-kimpanel'
@@ -70,18 +71,19 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-mandelbrot'
          'kdeplasma-addons-wallpapers-marble'
          'kdeplasma-addons-wallpapers-pattern'
+         'kdeplasma-addons-wallpapers-potd'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.7.4
-pkgrel=2
+pkgver=4.8.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 groups=('kde' 'kdeplasma-addons')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble'
-             'eigen' 'scim' 'qwt' 'boost' 'libkexiv2')
+makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
+             'scim' 'qwt' 'boost' 'libkexiv2' 'ibus')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('2bbf77d77e809733e6a74ff5688e6ff5487bc8bf')
+sha1sums=('0049d6977cb89f303468813811f3fde2807fd8db')
 
 build() {
     cd "${srcdir}"
@@ -89,7 +91,6 @@ build() {
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 }
@@ -205,6 +206,13 @@ package_kdeplasma-addons-applets-fuzzy-clock() {
 	make DESTDIR=$pkgdir install
 }
 
+package_kdeplasma-addons-applets-icontasks() {
+        pkgdesc='Switch between running applications'
+        depends=('kdebase-workspace')
+        cd $srcdir/build/applets/icontasks
+        make DESTDIR=$pkgdir install
+}
+
 package_kdeplasma-addons-applets-incomingmsg() {
 	pkgdesc='Notification of new messages'
 	depends=('kdebase-workspace')
@@ -214,7 +222,7 @@ package_kdeplasma-addons-applets-incomingmsg() {
 
 package_kdeplasma-addons-applets-kdeobservatory() {
 	pkgdesc='Visualize the KDE ecosystem'
-	depends=('kdebase-workspace' 'qwt')
+	depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qwt')
 	install='kdeplasma-addons-applets.install'
 	cd $srcdir/build/applets/kdeobservatory
 	make DESTDIR=$pkgdir install
@@ -222,9 +230,10 @@ package_kdeplasma-addons-applets-kdeobservatory() {
 
 package_kdeplasma-addons-applets-kimpanel() {
 	pkgdesc='A generic input method panel for Oriental languages'
-	depends=('kdebase-workspace')
+	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
 	optdepends=('scim: SCIM backend'
-		'fcitx: FCITX backend')
+		        'fcitx: FCITX backend'
+                'ibus: IBUS backend')
 	cd $srcdir/build/applets/kimpanel
 	make DESTDIR=$pkgdir install
 }
@@ -307,7 +316,7 @@ package_kdeplasma-addons-applets-mediaplayer() {
 
 package_kdeplasma-addons-applets-microblog() {
 	pkgdesc='Update and view your microblog status.'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
+	depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qoauth' 'qca-ossl')
 	cd $srcdir/build/applets/microblog
 	make DESTDIR=$pkgdir install
 }
@@ -402,7 +411,7 @@ package_kdeplasma-addons-applets-social-news() {
 	pkgdesc='Stay informed with the Social Desktop'
 	replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
 	conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
-	depends=('kdebase-workspace')
+	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
 	cd $srcdir/build/applets/social-news
 	make DESTDIR=$pkgdir install
 }
@@ -430,7 +439,7 @@ package_kdeplasma-addons-applets-timer() {
 
 package_kdeplasma-addons-applets-unitconverter() {
 	pkgdesc='Plasmoid for converting units'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
+	depends=('kdebase-workspace')
 	cd $srcdir/build/applets/unitconverter
 	make DESTDIR=$pkgdir install
 }
@@ -451,7 +460,7 @@ package_kdeplasma-addons-applets-weatherstation() {
 
 package_kdeplasma-addons-applets-webslice() {
 	pkgdesc='Show a part of a webpage'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
+	depends=('kdebase-workspace')
 	cd $srcdir/build/applets/webslice
 	make DESTDIR=$pkgdir install
 }
@@ -506,7 +515,7 @@ package_kdeplasma-addons-runners-contacts() {
 
 package_kdeplasma-addons-runners-converter() {
 	pkgdesc='Convert values to different units'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
+	depends=('kdebase-workspace')
 	cd $srcdir/build/runners/converter
 	make DESTDIR=$pkgdir install
 }
@@ -588,6 +597,13 @@ package_kdeplasma-addons-wallpapers-pattern() {
 	make DESTDIR=$pkgdir install
 }
 
+package_kdeplasma-addons-wallpapers-potd() {
+        pkgdesc='Picture of the Day'
+        depends=('kdebase-workspace' 'kdeplasma-addons-libs')
+        cd $srcdir/build/wallpapers/potd
+        make DESTDIR=$pkgdir install
+}
+
 package_kdeplasma-addons-wallpapers-virus() {
 	pkgdesc='Virus'
 	depends=('kdebase-workspace')
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index d256b0c31..189c73a89 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 144748 2011-12-08 09:52:57Z andrea $
+# $Id: PKGBUILD 147774 2012-01-28 10:32:36Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
 pkgname=('kdebase-kwrite'
          'kdesdk-kate')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2"
         'pkgbuild-syntax-highlight.patch')
-sha1sums=('b808f01213e0e44607e8f2577f9d1b4f88e14388'
-          'ab0c5d2a796b0f283154799add161c99f48ffcd5')
+sha1sums=('01cfffa6e905103c1b23d4006ba5a26844cc97aa'
+          '0a928253bd2077f0264d96a6c8823c69c47b6a8d')
 
 build() {
   cd "${srcdir}"/kate-${pkgver}
@@ -32,6 +32,7 @@ package_kdebase-kwrite() {
   pkgdesc="Text Editor"
   depends=('kdebase-runtime')
   groups=('kde' 'kdebase')
+  url="http://www.kde.org/applications/utilities/kwrite/"
   install='kdebase-kwrite.install'
 
   cd "${srcdir}"/build/kwrite
@@ -48,6 +49,7 @@ package_kdesdk-kate() {
   pkgdesc="Advanced Text Editor"
   depends=('kdebase-kwrite')
   groups=('kde' 'kdesdk')
+  url="http://www.kde.org/applications/utilities/kate/"
   install='kdesdk-kate.install'
 
   cd "${srcdir}"/build/kate
diff --git a/extra/kdesdk-kate/kdesdk-kate.install b/extra/kdesdk-kate/kdesdk-kate.install
index 81ce5c4b0..0446d161b 100644
--- a/extra/kdesdk-kate/kdesdk-kate.install
+++ b/extra/kdesdk-kate/kdesdk-kate.install
@@ -1,12 +1,13 @@
 post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
     update-desktop-database -q
+    update-mime-database usr/share/mime &> /dev/null
 }
 
 post_upgrade() {
-	post_install
+    post_install
 }
 
 post_remove() {
-	post_install
+    post_install
 }
diff --git a/extra/kdesdk-kate/pkgbuild-syntax-highlight.patch b/extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
index 3c43eca0f..27729d1ad 100644
--- a/extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
+++ b/extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
@@ -1,11 +1,11 @@
---- kate-4.6.80/part/syntax/data/bash.xml~	2011-05-23 21:20:34.295137123 +0000
-+++ kate-4.6.80/part/syntax/data/bash.xml	2011-05-23 21:20:54.581993368 +0000
+--- kate-4.7.80/part/syntax/data/bash.xml~	2011-11-20 06:14:30.581097154 +0000
++++ kate-4.7.80/part/syntax/data/bash.xml	2011-11-20 06:14:45.494553146 +0000
 @@ -8,7 +8,7 @@
          <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
          <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
  ]>
--<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+-<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
++<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
  
  <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
      Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 0608eea90..024b23834 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144767 2011-12-08 10:28:41Z andrea $
+# $Id: PKGBUILD 147901 2012-01-28 10:36:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -14,44 +14,38 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-kompare'
          'kdesdk-kpartloader'
          'kdesdk-kprofilemethod'
-#         'kdesdk-kspy'
          'kdesdk-kstartperf'
          'kdesdk-kuiviewer'
          'kdesdk-lokalize'
          'kdesdk-okteta'
          'kdesdk-poxml'
-#         'kdesdk-scheck'
          'kdesdk-scripts'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
-             'kdepimlibs' 'kdebase-lib')
+makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
+             'kdebase-lib')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'fix-python2-path.patch')
-sha1sums=('3a0f61204653dc3f9f975732b6f67659c60ecaf3'
-          'd05ca0231869c484fd3861955d960a60aff7dcfb')
+sha1sums=('2c55ed17350cb5eba4213007614e4c587feb94b9'
+          '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
 
 build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
-	# Fix python2 path
+	# Fix hardcoded python2 cmd
 	patch -Np1 -i ${srcdir}/fix-python2-path.patch
-	sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-		-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-		$(find . -name '*.py')
 
 	cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 }
@@ -60,7 +54,7 @@ package_kdesdk-cervisia() {
 	pkgdesc='CVS Frontend'
 	depends=('kdebase-runtime')
 	url="http://kde.org/applications/development/cervisia/"
-	install='kdesdk.install'
+	install='kdesdk-cervisia.install'
 	cd $srcdir/build/cervisia
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/cervisia
@@ -93,11 +87,15 @@ package_kdesdk-kcachegrind() {
 	depends=('kdebase-runtime' 'python2')
 	optdepends=('php: PHP support')
 	url="http://kde.org/applications/development/kcachegrind/"
-	install='kdesdk.install'
+	install='kdesdk-kcachegrind.install'
 	cd $srcdir/build/kcachegrind
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kcachegrind
 	make DESTDIR=$pkgdir install
+
+        # Fix python 2 path
+        sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+                "${pkgdir}"/usr/bin/hotshot2calltree
 }
 
 package_kdesdk-kdeaccounts-plugin() {
@@ -117,6 +115,7 @@ package_kdesdk-kdepalettes() {
 package_kdesdk-kioslave() {
 	pkgdesc='KDED Subversion Module'
 	depends=('kdebase-runtime' 'subversion')
+        install='kdesdk.install'
 	cd $srcdir/build/kioslave
 	make DESTDIR=$pkgdir install
 }
@@ -173,7 +172,7 @@ package_kdesdk-kuiviewer() {
 	pkgdesc='Qt Designer UI File Viewer'
 	depends=('kdebase-runtime')
 	url="http://kde.org/applications/development/kuiviewer/"
-	install='kdesdk.install'
+	install='kdesdk-kuiviewer.install'
 	cd $srcdir/build/kuiviewer
 	make DESTDIR=$pkgdir install
 }
@@ -183,11 +182,15 @@ package_kdesdk-lokalize() {
 	depends=('kdebase-runtime' 'kdebindings-python')
 	url="http://kde.org/applications/development/lokalize/"
 	optdepends=('translate-toolkit: enable extra python script')
-	install='kdesdk.install'
+	install='kdesdk-lokalize.install'
 	cd $srcdir/build/lokalize
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/lokalize
 	make DESTDIR=$pkgdir install
+
+  # Fix python 2 path
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+    "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py
 }
 
 package_kdesdk-okteta() {
@@ -195,7 +198,7 @@ package_kdesdk-okteta() {
 	depends=('kdebase-runtime')
 	replaces=('kdeutils-okteta')
 	conflicts=('kdeutils-okteta')
-	url="http://kde.org/applications/utilities/okteta"
+	url="http://kde.org/applications/utilities/okteta/"
 	install='kdesdk-okteta.install'
 	cd $srcdir/build/okteta
 	make DESTDIR=$pkgdir install
@@ -226,6 +229,10 @@ package_kdesdk-scripts() {
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/scripts
 	make DESTDIR=$pkgdir install
+
+  # Fix python 2 path
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+    "${pkgdir}"/usr/bin/{{kde-systemsettings-tree,kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header}
 }
 
 package_kdesdk-strigi-analyzer() {
@@ -239,9 +246,13 @@ package_kdesdk-umbrello() {
 	pkgdesc='UML Modeller'
 	depends=('kdebase-runtime')
 	url="http://kde.org/applications/development/umbrello/"
-	install='kdesdk.install'
+	install='kdesdk-umbrello.install'
 	cd $srcdir/build/umbrello
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/umbrello
 	make DESTDIR=$pkgdir install
+
+  # Fix python 2 path
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+    "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py
 }
diff --git a/extra/kdesdk/fix-python2-path.patch b/extra/kdesdk/fix-python2-path.patch
index c2c0745d1..720487031 100644
--- a/extra/kdesdk/fix-python2-path.patch
+++ b/extra/kdesdk/fix-python2-path.patch
@@ -1,11 +1,3 @@
---- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~	2010-11-24 11:53:38.586666671 +0100
-+++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree	2010-11-24 11:53:38.623333337 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # _*_ coding: latin1 _*_
- 
- #
 --- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~	2010-11-24 11:22:42.120000002 +0100
 +++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py	2010-11-24 11:22:42.146666670 +0100
 @@ -114,7 +114,7 @@
@@ -28,14 +20,6 @@
  
  try: convert()
  except: print 'error occured'
---- kdesdk-4.5.80/scripts/rename_source_files~	2010-11-24 11:45:41.040000004 +0100
-+++ kdesdk-4.5.80/scripts/rename_source_files	2010-11-24 11:45:41.093333336 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- #
- # Copyright David Faure <faure@kde.org>, License LGPL v2
- #
 --- kdesdk-4.5.80/scripts/svn2log.sh~	2010-11-24 11:46:24.863333337 +0100
 +++ kdesdk-4.5.80/scripts/svn2log.sh	2010-11-24 11:46:24.896666669 +0100
 @@ -17,6 +17,6 @@
@@ -45,20 +29,4 @@
 -svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
 +svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
  
- rm /tmp/accounts.$PPID
---- kdesdk-4.5.80/scripts/kde_generate_export_header~	2010-11-24 11:48:49.696666669 +0100
-+++ kdesdk-4.5.80/scripts/kde_generate_export_header	2010-11-24 11:48:49.753333338 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- 
- import os, sys, string
- 
---- kdesdk-4.5.80/scripts/reviewboarddiff~	2010-11-24 11:49:37.686666670 +0100
-+++ kdesdk-4.5.80/scripts/reviewboarddiff	2010-11-24 11:49:37.740000003 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # encoding: utf-8
- #
- # Generates reviewboard compatible diffs from git-svn repositories.
+ rm /tmp/accounts.$PPID
+\ No newline at end of file
diff --git a/extra/kdesdk/kdesdk-cervisia.install b/extra/kdesdk/kdesdk-cervisia.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-cervisia.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdesdk/kdesdk-kcachegrind.install b/extra/kdesdk/kdesdk-kcachegrind.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-kcachegrind.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdesdk/kdesdk-kompare.install b/extra/kdesdk/kdesdk-kompare.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-kompare.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdesdk/kdesdk-kuiviewer.install b/extra/kdesdk/kdesdk-kuiviewer.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-kuiviewer.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdesdk/kdesdk-lokalize.install b/extra/kdesdk/kdesdk-lokalize.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-lokalize.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdesdk/kdesdk-umbrello.install b/extra/kdesdk/kdesdk-umbrello.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdesdk/kdesdk-umbrello.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD
index e87eca7b2..740147767 100644
--- a/extra/kdetoys/PKGBUILD
+++ b/extra/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144739 2011-12-08 09:21:39Z andrea $
+# $Id: PKGBUILD 147903 2012-01-28 10:36:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -6,15 +6,15 @@ pkgbase=kdetoys
 pkgname=('kdetoys-amor'
          'kdetoys-kteatime'
          'kdetoys-ktux')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace')
+makedepends=('cmake' 'automoc4' 'kdebase-workspace')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('f929e598180f420d7fc6e4642ed56af9eee5a22b')
+sha1sums=('4d583cf52d10462a71df8eba907c07453f844cb2')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD
new file mode 100644
index 000000000..7ae61758d
--- /dev/null
+++ b/extra/kdeutils-filelight/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 147907 2012-01-28 10:36:49Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-filelight
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='View disk usage information'
+url='http://kde.org/applications/utilities/filelight'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+replaces=('filelight')
+conflicts=('filelight')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.bz2")
+sha1sums=('d0e628ba95f60b7c67ad10e4f6ab14d0e24fc8f5')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../filelight-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeutils-filelight/kdeutils-filelight.install b/extra/kdeutils-filelight/kdeutils-filelight.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeutils-filelight/kdeutils-filelight.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD
new file mode 100644
index 000000000..bec0cfd8a
--- /dev/null
+++ b/extra/kdeutils-kcalc/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 147909 2012-01-28 10:36:52Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-kcalc
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='Scientific Calculator'
+url='http://kde.org/applications/utilities/kcalc/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.bz2")
+sha1sums=('b832aadd21906a7bdad323b8f1cbfb59bf1b7c63')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kcalc-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeutils-kcalc/kdeutils-kcalc.install b/extra/kdeutils-kcalc/kdeutils-kcalc.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeutils-kcalc/kdeutils-kcalc.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD
new file mode 100644
index 000000000..5aef74f1a
--- /dev/null
+++ b/extra/kdeutils-kcharselect/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 147911 2012-01-28 10:36:53Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-kcharselect
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='Character Selector'
+url="http://kde.org/applications/utilities/kcharselect/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.bz2")
+sha1sums=('0f4ffe3469c45317b7b76b66755e14df333835a3')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kcharselect-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD
new file mode 100644
index 000000000..7b6e9e79b
--- /dev/null
+++ b/extra/kdeutils-kdf/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 147913 2012-01-28 10:36:56Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-kdf
+pkgver=4.8.0
+pkgrel=1
+url="http://kde.org/applications/system/kdiskfree/"
+arch=('i686' 'x86_64')
+pkgdesc='View Disk Usage'
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.bz2")
+sha1sums=('cc7b1450624b14ca740b64edd5b8fb54faca491e')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kdf-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeutils-kdf/kdeutils-kdf.install b/extra/kdeutils-kdf/kdeutils-kdf.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeutils-kdf/kdeutils-kdf.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD
new file mode 100644
index 000000000..6ee4cf61b
--- /dev/null
+++ b/extra/kdeutils-kfloppy/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 147915 2012-01-28 10:36:58Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-kfloppy
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='Floppy Formatter'
+url='http://kde.org/applications/utilities/kfloppy/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.bz2")
+sha1sums=('5f1ea4bf5e145ce3eb8cc136ac36c57675ad489c')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kfloppy-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeutils-kfloppy/kdeutils-kfloppy.install b/extra/kdeutils-kfloppy/kdeutils-kfloppy.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeutils-kfloppy/kdeutils-kfloppy.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD
new file mode 100644
index 000000000..ae3f7c322
--- /dev/null
+++ b/extra/kdeutils-kgpg/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 147917 2012-01-28 10:37:00Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-kgpg
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='A GnuPG frontend'
+url='http://kde.org/applications/utilities/kgpg/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdepim-runtime' 'kde-agent')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.bz2")
+sha1sums=('4edbfa73c62fdd99f87b5b42dd7f1330dc8f5986')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kgpg-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeutils-kgpg/kdeutils-kgpg.install b/extra/kdeutils-kgpg/kdeutils-kgpg.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeutils-kgpg/kdeutils-kgpg.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD
new file mode 100644
index 000000000..de9443d3e
--- /dev/null
+++ b/extra/kdeutils-kremotecontrol/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-kremotecontrol
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='Configure your remote controls for use with applications'
+url='http://kde.org/applications/utilities/kremotecontrol/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-workspace')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+replaces=('kdeutils-kdelirc')
+conflicts=('kdeutils-kdelirc')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.bz2")
+sha1sums=('6a4d7eede9736aa14213db082ceec5a2132c89c5')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kremotecontrol-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install b/extra/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeutils-ksecrets/PKGBUILD b/extra/kdeutils-ksecrets/PKGBUILD
new file mode 100644
index 000000000..3e962db33
--- /dev/null
+++ b/extra/kdeutils-ksecrets/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 147921 2012-01-28 10:37:05Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-ksecrets
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='Secrets Management Infrastructure for KDE'
+url='http://techbase.kde.org/Projects/Utils/ksecretsservice'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-workspace')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/ksecrets-${pkgver}.tar.bz2")
+sha1sums=('13852c77b7aa76286f1108024650cb61fbc2d24e')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../ksecrets-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeutils-ksecrets/kdeutils-ksecrets.install b/extra/kdeutils-ksecrets/kdeutils-ksecrets.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdeutils-ksecrets/kdeutils-ksecrets.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD
new file mode 100644
index 000000000..fc406bf0e
--- /dev/null
+++ b/extra/kdeutils-ktimer/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 147923 2012-01-28 10:37:07Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-ktimer
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='Countdown Launcher'
+url='http://kde.org/applications/utilities/ktimer/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.bz2")
+sha1sums=('647cd73338d3304efbd9bd5ce79f4b9d3e094836')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../ktimer-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeutils-ktimer/kdeutils-ktimer.install b/extra/kdeutils-ktimer/kdeutils-ktimer.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeutils-ktimer/kdeutils-ktimer.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD
new file mode 100644
index 000000000..38083f52a
--- /dev/null
+++ b/extra/kdeutils-kwallet/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 147925 2012-01-28 10:37:09Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-kwallet
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='Wallet Management Tool'
+url='http://kde.org/applications/system/kwalletmanager/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.bz2")
+sha1sums=('84828abdbaa0c0719adfc3829fb9decf1ec0f87b')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kwallet-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeutils-kwallet/kdeutils-kwallet.install b/extra/kdeutils-kwallet/kdeutils-kwallet.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdeutils-kwallet/kdeutils-kwallet.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdeutils-printer-applet/PKGBUILD b/extra/kdeutils-printer-applet/PKGBUILD
new file mode 100644
index 000000000..e8b80ece4
--- /dev/null
+++ b/extra/kdeutils-printer-applet/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 147927 2012-01-28 10:37:11Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-printer-applet
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='System tray icon for managing print jobs'
+url='http://kde.org/applications/system/printerapplet/'
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+source=("http://download.kde.org/stable/${pkgver}/src/printer-applet-${pkgver}.tar.bz2")
+sha1sums=('6d6f6afb89ac43c6f1c9393592d8645480530662')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../printer-applet-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+
+  # Fix python 2 path
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+    "${pkgdir}"/usr/share/apps/printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
+}
diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD
new file mode 100644
index 000000000..88e5e6dd0
--- /dev/null
+++ b/extra/kdeutils-superkaramba/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 147929 2012-01-28 10:37:13Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-superkaramba
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='An engine for cool desktop eyecandy'
+url='http://kde.org/applications/utilities/superkaramba/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime' 'qimageblitz')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.bz2")
+sha1sums=('1b3375814012333ddbf7d9031647fc678ba1162a')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../superkaramba-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdeutils-superkaramba/kdeutils-superkaramba.install b/extra/kdeutils-superkaramba/kdeutils-superkaramba.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeutils-superkaramba/kdeutils-superkaramba.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD
new file mode 100644
index 000000000..05d12cb4c
--- /dev/null
+++ b/extra/kdeutils-sweeper/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 147931 2012-01-28 10:37:15Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeutils-sweeper
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='System Cleaner'
+url='http://kde.org/applications/utilities/sweeper'
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+groups=('kde' 'kdeutils')
+source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.bz2")
+sha1sums=('213abfd1d192acf619603e66c2f6e83e323e22e6')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../sweeper-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+  cd $srcdir/build/doc
+  make DESTDIR=$pkgdir install
+}
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index df2791948..e09b98336 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 144743 2011-12-08 09:21:45Z andrea $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# $Id: PKGBUILD 147933 2012-01-28 10:37:18Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=kdewebdev
 pkgname=('kdewebdev-kfilereplace'
          'kdewebdev-kimagemapeditor'
          'kdewebdev-klinkstatus'
          'kdewebdev-kommander')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdewebdev')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime'
-	'boost')
+makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('1e37e877d4f5ec8f6dcd05e828b4a8f0fd743d2c')
+sha1sums=('8919c3a272a954c19a4c0a742e3e686e29650aa4')
 
 build() {
 	cd $srcdir
@@ -42,7 +42,8 @@ package_kdewebdev-kfilereplace() {
 package_kdewebdev-kimagemapeditor() {
 	pkgdesc='HTML Image Map Editor'
 	depends=('kdebase-runtime')
-	install='kdewebdev.install'
+        url="http://www.kde.org/applications/development/kimagemapeditor/"
+	install='kdewebdev-kimagemapeditor.install'
 	cd $srcdir/build/kimagemapeditor
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kimagemapeditor
@@ -52,6 +53,7 @@ package_kdewebdev-kimagemapeditor() {
 package_kdewebdev-klinkstatus() {
 	pkgdesc='Link Checker'
 	depends=('kdepim-runtime' 'tidyhtml')
+        url="http://www.kde.org/applications/development/klinkstatus/"
 	install='kdewebdev.install'
 	cd $srcdir/build/klinkstatus
 	make DESTDIR=$pkgdir install
@@ -62,6 +64,7 @@ package_kdewebdev-klinkstatus() {
 package_kdewebdev-kommander() {
 	pkgdesc='Executor for Kommander dialogs'
 	depends=('kdebase-runtime')
+        url="http://www.kde.org/applications/development/kommander/"
 	cd $srcdir/build/kommander
 	make DESTDIR=$pkgdir install
 }
diff --git a/extra/kdewebdev/kdewebdev-kimagemapeditor.install b/extra/kdewebdev/kdewebdev-kimagemapeditor.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdewebdev/kdewebdev-kimagemapeditor.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/lapack/Makefile.lapack b/extra/lapack/Makefile.lapack
index 42579d43a..3443d7000 100644
--- a/extra/lapack/Makefile.lapack
+++ b/extra/lapack/Makefile.lapack
@@ -3,24 +3,30 @@ include ../make.inc
 #######################################################################
 #  This is the makefile to create a library for LAPACK.
 #  The files are organized as follows:
-#       ALLAUX -- Auxiliary routines called from all precisions
-#       ALLXAUX -- Auxiliary routines called from all precisions but
-#                  only from routines using extra precision.
-#       SCLAUX -- Auxiliary routines called from both REAL and COMPLEX
-#       DZLAUX -- Auxiliary routines called from both DOUBLE PRECISION
-#                 and COMPLEX*16
-#       SLASRC -- Single precision real LAPACK routines
+#       ALLAUX  -- Auxiliary routines called from all precisions
+#
+#       SCLAUX  -- Auxiliary routines called from both REAL and COMPLEX.
+#       DZLAUX  -- Auxiliary routines called from both DOUBLE and COMPLEX*16.
+#
+#       DSLASRC -- Double-single mixed precision real routines called from
+#                  single, single-extra and double precision real LAPACK
+#                  routines (i.e. from SLASRC, SXLASRC, DLASRC).
+#       ZCLASRC -- Double-single mixed precision complex routines called from
+#                  single, single-extra and double precision complex LAPACK
+#                  routines (i.e. from CLASRC, CXLASRC, ZLASRC).
+#
+#       SLASRC  -- Single precision real LAPACK routines
 #       SXLASRC -- Single precision real LAPACK routines using extra
 #                  precision.
-#       CLASRC -- Single precision complex LAPACK routines
+#       CLASRC  -- Single precision complex LAPACK routines
 #       CXLASRC -- Single precision complex LAPACK routines using extra
 #                  precision.
-#       DLASRC -- Double precision real LAPACK routines
+#       DLASRC  -- Double precision real LAPACK routines
 #       DXLASRC -- Double precision real LAPACK routines using extra
 #                  precision.
-#       ZLASRC -- Double precision complex LAPACK routines
+#       ZLASRC  -- Double precision complex LAPACK routines
 #       ZXLASRC -- Double precision complex LAPACK routines using extra
-#                  precision.
+#                  precision.   
 #
 #  The library can be set up to include routines for any combination
 #  of the four precisions.  To create or add to the library, enter make
@@ -52,8 +58,6 @@ ALLAUX = ilaenv.o ieeeck.o lsamen.o xerbla.o xerbla_array.o iparmq.o	\
     ilaprec.o ilatrans.o ilauplo.o iladiag.o chla_transtype.o \
     ../INSTALL/ilaver.o ../INSTALL/lsame.o ../INSTALL/slamch.o
 
-ALLXAUX =
-
 SCLAUX = \
    sbdsdc.o \
    sbdsqr.o sdisna.o slabad.o slacpy.o sladiv.o slae2.o  slaebz.o \
@@ -123,7 +127,7 @@ SLASRC = \
    sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \
    spbstf.o spbsv.o  spbsvx.o \
    spbtf2.o spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o  \
-   sposvx.o spotf2.o spotri.o  spstrf.o spstf2.o \
+   sposvx.o spotf2.o  spotri.o  spstrf.o spstf2.o \
    sppcon.o sppequ.o \
    spprfs.o sppsv.o  sppsvx.o spptrf.o spptri.o spptrs.o sptcon.o \
    spteqr.o sptrfs.o sptsv.o  sptsvx.o spttrs.o sptts2.o srscl.o  \
@@ -144,17 +148,21 @@ SLASRC = \
    stfttr.o stpttf.o stpttr.o strttf.o strttp.o \
    sgejsv.o  sgesvj.o  sgsvj0.o  sgsvj1.o \
    sgeequb.o ssyequb.o spoequb.o sgbequb.o \
-   sbbcsd.o slapmr.o sorbdb.o sorcsd.o
+   sbbcsd.o slapmr.o sorbdb.o sorcsd.o \
+   sgeqrt.o sgeqrt2.o sgeqrt3.o sgemqrt.o \
+   stpqrt.o stpqrt2.o stpmqrt.o stprfb.o
 
 DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o 
 
+ifdef USEXBLAS
 SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o		\
-   sla_gercond.o sla_rpvgrw.o ssysvxx.o ssyrfsx.o			\
+   sla_gercond.o sla_gerpvgrw.o ssysvxx.o ssyrfsx.o			\
    sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o	\
    sposvxx.o sporfsx.o sla_porfsx_extended.o sla_porcond.o		\
    sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o		\
    sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o	\
    slascl2.o sla_wwaddw.o
+endif
 
 CLASRC = \
    cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o  cgbsvx.o \
@@ -173,7 +181,8 @@ CLASRC = \
    checon.o cheev.o  cheevd.o cheevr.o cheevx.o chegs2.o chegst.o \
    chegv.o  chegvd.o chegvx.o cherfs.o chesv.o  chesvx.o chetd2.o \
    chetf2.o chetrd.o \
-   chetrf.o chetri.o chetrs.o chetrs2.o chgeqz.o chpcon.o chpev.o  chpevd.o \
+   chetrf.o chetri.o chetri2.o chetri2x.o cheswapr.o \
+   chetrs.o chetrs2.o chgeqz.o chpcon.o chpev.o  chpevd.o \
    chpevx.o chpgst.o chpgv.o  chpgvd.o chpgvx.o chprfs.o chpsv.o  \
    chpsvx.o \
    chptrd.o chptrf.o chptri.o chptrs.o chsein.o chseqr.o clabrd.o \
@@ -213,10 +222,13 @@ CLASRC = \
    chfrk.o ctfttp.o clanhf.o cpftrf.o cpftri.o cpftrs.o ctfsm.o ctftri.o \
    ctfttr.o ctpttf.o ctpttr.o ctrttf.o ctrttp.o \
    cgeequb.o cgbequb.o csyequb.o cpoequb.o cheequb.o \
-   cbbcsd.o clapmr.o cunbdb.o cuncsd.o
+   cbbcsd.o clapmr.o cunbdb.o cuncsd.o \
+   cgeqrt.o cgeqrt2.o cgeqrt3.o cgemqrt.o \
+   ctpqrt.o ctpqrt2.o ctpmqrt.o ctprfb.o
 
-CXLASRC =    cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \
-   cla_gercond_c.o cla_gercond_x.o cla_rpvgrw.o \
+ifdef USEXBLAS
+CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \
+   cla_gercond_c.o cla_gercond_x.o cla_gerpvgrw.o \
    csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o \
    cla_syrcond_c.o cla_syrcond_x.o cla_syrpvgrw.o \
    cposvxx.o cporfsx.o cla_porfsx_extended.o \
@@ -226,6 +238,7 @@ CXLASRC =    cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \
    chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o \
    cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o \
    cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
+endif
 
 ZCLASRC = cpotrs.o cgetrs.o cpotrf.o cgetrf.o 
 
@@ -285,15 +298,19 @@ DLASRC = \
    dtfttr.o dtpttf.o dtpttr.o dtrttf.o dtrttp.o \
    dgejsv.o  dgesvj.o  dgsvj0.o  dgsvj1.o \
    dgeequb.o dsyequb.o dpoequb.o dgbequb.o \
-   dbbcsd.o dlapmr.o dorbdb.o dorcsd.o
+   dbbcsd.o dlapmr.o dorbdb.o dorcsd.o \
+   dgeqrt.o dgeqrt2.o dgeqrt3.o dgemqrt.o \
+   dtpqrt.o dtpqrt2.o dtpmqrt.o dtprfb.o
 
+ifdef USEXBLAS
 DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o		\
-   dla_gercond.o dla_rpvgrw.o dsysvxx.o dsyrfsx.o			\
+   dla_gercond.o dla_gerpvgrw.o dsysvxx.o dsyrfsx.o			\
    dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o	\
    dposvxx.o dporfsx.o dla_porfsx_extended.o dla_porcond.o		\
    dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o		\
    dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o	\
    dlascl2.o dla_wwaddw.o
+endif
 
 ZLASRC = \
    zbdsqr.o zgbbrd.o zgbcon.o zgbequ.o zgbrfs.o zgbsv.o  zgbsvx.o \
@@ -312,7 +329,8 @@ ZLASRC = \
    zhecon.o zheev.o  zheevd.o zheevr.o zheevx.o zhegs2.o zhegst.o \
    zhegv.o  zhegvd.o zhegvx.o zherfs.o zhesv.o  zhesvx.o zhetd2.o \
    zhetf2.o zhetrd.o \
-   zhetrf.o zhetri.o zhetrs.o zhetrs2.o zhgeqz.o zhpcon.o zhpev.o  zhpevd.o \
+   zhetrf.o zhetri.o zhetri2.o zhetri2x.o zheswapr.o \
+   zhetrs.o zhetrs2.o zhgeqz.o zhpcon.o zhpev.o  zhpevd.o \
    zhpevx.o zhpgst.o zhpgv.o  zhpgvd.o zhpgvx.o zhprfs.o zhpsv.o  \
    zhpsvx.o \
    zhptrd.o zhptrf.o zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o \
@@ -357,10 +375,13 @@ ZLASRC = \
    zhfrk.o ztfttp.o zlanhf.o zpftrf.o zpftri.o zpftrs.o ztfsm.o ztftri.o \
    ztfttr.o ztpttf.o ztpttr.o ztrttf.o ztrttp.o \
    zgeequb.o zgbequb.o zsyequb.o zpoequb.o zheequb.o \
-   zbbcsd.o zlapmr.o zunbdb.o zuncsd.o
+   zbbcsd.o zlapmr.o zunbdb.o zuncsd.o \
+   zgeqrt.o zgeqrt2.o zgeqrt3.o zgemqrt.o \
+   ztpqrt.o ztpqrt2.o ztpmqrt.o ztprfb.o
 
+ifdef USEXBLAS
 ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o		\
-   zla_gercond_c.o zla_gercond_x.o zla_rpvgrw.o zsysvxx.o zsyrfsx.o	\
+   zla_gercond_c.o zla_gercond_x.o zla_gerpvgrw.o zsysvxx.o zsyrfsx.o	\
    zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o	\
    zla_syrpvgrw.o zposvxx.o zporfsx.o zla_porfsx_extended.o		\
    zla_porcond_c.o zla_porcond_x.o zla_porpvgrw.o zgbsvxx.o zgbrfsx.o	\
@@ -368,6 +389,7 @@ ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o		\
    zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o		\
    zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o		\
    zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
+endif
 
 all: ../$(LAPACKLIB)
 
@@ -386,5 +408,4 @@ static: $(ALLOBJ) $(ALLXOBJ)
 	ranlib liblapack.a
 
 shared: $(ALLOBJ) $(ALLXOBJ)
-	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.3.1 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc
-
+	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.4.0 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc
diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD
index ecc002737..cef5ff2f7 100644
--- a/extra/lapack/PKGBUILD
+++ b/extra/lapack/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 131048 2011-07-09 21:48:17Z ronald $
+# $Id: PKGBUILD 147948 2012-01-28 21:21:33Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
 
 pkgname=lapack
-pkgver=3.3.1
-pkgrel=2
+pkgver=3.4.0
+pkgrel=1
 url="http://www.netlib.org/lapack"
 pkgdesc="Linear Algebra PACKage"
 makedepends=('gcc-fortran')
@@ -14,12 +14,13 @@ depends=("blas=${pkgver}")
 arch=('i686' 'x86_64')
 license=("custom")
 source=(http://www.netlib.org/${pkgname}/${pkgname}-${pkgver}.tgz
-        lapack-3.1.1-make.inc.patch
-        Makefile.lapack)
+        Makefile.lapack) 
+sha1sums=('910109a931524f8dcc2734ce23fe927b00ca199f'
+          '2bedfe0d778b401b24d1fbf0eb1dc576d374be28')
+
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/lapack-3.1.1-make.inc.patch"
   cp -f INSTALL/make.inc.gfortran make.inc
   cp -f "${srcdir}/Makefile.lapack" SRC/Makefile
 
@@ -51,10 +52,3 @@ package() {
     "${pkgdir}/usr/share/licenses/lapack/"
 }
 
-sha1sums=('3ce437e05f0e9a3c8148ec41922f6efeef0ebdac'
-          '71bf7696f1c841339163e82d863dd62e484eb1cf'
-          '128a258fde1b923c0b0b958a8a8ae8aa7657e44b'
-          '2491a151a37f0162b25fc4e4e9a8ac444b574a76')
-sha1sums=('3ce437e05f0e9a3c8148ec41922f6efeef0ebdac'
-          '71bf7696f1c841339163e82d863dd62e484eb1cf'
-          'bbc51c4204cfc6a8aed1a0b61dc39f57ce801e6d')
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index 23dd6b34f..d8357b502 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144643 2011-12-08 09:18:56Z andrea $
+# $Id: PKGBUILD 147796 2012-01-28 10:33:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture"
 url="http://kde.org/"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f97516a2da26da3c15075a007bec7c8f9860379b')
+sha1sums=('4c613177ec8cfe1436e5fb7f3b61bbb306d13f71')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
index 3497133cd..69e97015c 100644
--- a/extra/libkdeedu/PKGBUILD
+++ b/extra/libkdeedu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144639 2011-12-08 09:18:52Z andrea $
+# $Id: PKGBUILD 147792 2012-01-28 10:33:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdeedu
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 replaces=('kdeedu-libkdeedu' 'kdeedu-data')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('2f508c6efa9ef9561d25578000c7d5bb5ed1c5ee')
+sha1sums=('ca40cfa3ac019ab986ca062a1c7a8be5c3b366af')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
index 91ccc2eb6..4d777befd 100644
--- a/extra/libkexiv2/PKGBUILD
+++ b/extra/libkexiv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144645 2011-12-08 09:19:00Z andrea $
+# $Id: PKGBUILD 147798 2012-01-28 10:33:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkexiv2
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('19031140c87d9d7003fef564b6927c6f69d7e3d3')
+sha1sums=('4536ffd3df63a8dcf68bf8ab221ba0c09be417c6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
index afe38ff96..18872de58 100644
--- a/extra/libkipi/PKGBUILD
+++ b/extra/libkipi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144647 2011-12-08 09:19:04Z andrea $
+# $Id: PKGBUILD 145371 2011-12-22 07:58:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkipi
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="An interface to use kipi-plugins from a KDE application"
 url="http://kde.org/"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('3225ac0c55f5e4fef71a8baee8d3c49efff6adbf')
+sha1sums=('1eccc5b6dda059eee10b2ae3e0ef6a47953eb084')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
index 11ec687ab..33d245bfb 100644
--- a/extra/libksane/PKGBUILD
+++ b/extra/libksane/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144649 2011-12-08 09:19:09Z andrea $
+# $Id: PKGBUILD 147802 2012-01-28 10:33:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libksane
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="An image scanning library"
 url="http://kde.org/"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('3c7a8d5b7fd80175684a0373fae26197e8158565')
+sha1sums=('417e0e65d3045548a29a9acdcbe1b0511a42295a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD
index a2690d93f..a360b7116 100644
--- a/extra/libqzeitgeist/PKGBUILD
+++ b/extra/libqzeitgeist/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 141345 2011-10-29 16:06:26Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 147936 2012-01-28 11:01:16Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libqzeitgeist
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Qt interface to the Zeitgeist event tracking system"
 url="https://projects.kde.org/projects/kdesupport/libqzeitgeist"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('qt')
 makedepends=('cmake' 'automoc4' 'python2' 'zeitgeist')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('97bdea6a1865db7d5f29c93e3a492f24')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+        'set-declarative-installation-dir.patch')
+md5sums=('97bdea6a1865db7d5f29c93e3a492f24'
+         '712013e582acb73296e41ad842d0da01')
 
 build() {
-  cd "${srcdir}"
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/set-declarative-installation-dir.patch
 
+  cd "${srcdir}"
   # Fix python2 path
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
     ${pkgname}-${pkgver}/scripts/onto2cpp.py
@@ -25,7 +28,8 @@ build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/usr
+	-DCMAKE_INSTALL_PREFIX=/usr \
+    -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt/imports/
   make
 }
 
diff --git a/extra/libqzeitgeist/set-declarative-installation-dir.patch b/extra/libqzeitgeist/set-declarative-installation-dir.patch
new file mode 100644
index 000000000..961c7900d
--- /dev/null
+++ b/extra/libqzeitgeist/set-declarative-installation-dir.patch
@@ -0,0 +1,14 @@
+--- libqzeitgeist-0.8.0/declarative/CMakeLists.txt~	2012-01-28 10:55:56.178972521 +0000
++++ libqzeitgeist-0.8.0/declarative/CMakeLists.txt	2012-01-28 10:57:29.601561527 +0000
+@@ -14,7 +14,9 @@
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src/)
+ automoc4_add_library(QZeitgeistDeclarativePlugin MODULE ${declarative_SRCS})
+ 
+-target_link_libraries(QZeitgeistDeclarativePlugin ${QT_LIBRARIES} qzeitgeist)
++target_link_libraries(QZeitgeistDeclarativePlugin ${QT_QTDECLARATIVE_LIBRARIES} qzeitgeist)
+ 
+-install(TARGETS QZeitgeistDeclarativePlugin DESTINATION lib${LIB_SUFFIX}/qt4/imports/org/gnome/zeitgeist)
++set(DECLARATIVE_IMPORT_PREFIX ${QT_IMPORTS_DIR} CACHE PATH "Location to install declarative bindings")
++
++install(TARGETS QZeitgeistDeclarativePlugin DESTINATION ${DECLARATIVE_IMPORT_PREFIX}/org/gnome/zeitgeist)
+ install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/org/gnome/zeitgeist)
diff --git a/extra/screen/PKGBUILD b/extra/screen/PKGBUILD
index c22d539c2..341373433 100644
--- a/extra/screen/PKGBUILD
+++ b/extra/screen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131720 2011-07-14 01:42:52Z allan $
+# $Id: PKGBUILD 147962 2012-01-29 04:41:21Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: dorphell <dorphell@gmx.net>
 
 pkgname=screen
 pkgver=4.0.3
-pkgrel=12
+pkgrel=13
 _ptygroup=5 #the UID of our PTY/TTY group
 pkgdesc="Full-screen window manager that multiplexes a physical terminal"
 arch=('i686' 'x86_64')
diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD
new file mode 100644
index 000000000..4f7c7deed
--- /dev/null
+++ b/libre/bogofilter-libre/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $
+# Maintainer: tobias <tobias@archlinux.org>
+# Contributor: Low Kian Seong <fastmail_low@speedymail.org>
+
+_pkgname=bogofilter
+pkgname=bogofilter-libre
+pkgver=1.2.2
+pkgrel=4
+pkgdesc="A fast Bayesian spam filtering tool"
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="http://bogofilter.sourceforge.net"
+depends=('db' 'perl' 'gsl')
+backup=('etc/bogofilter/bogofilter.cf')
+source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz)
+md5sums=('af9c7857c66b1884c820f54f23082701')
+
+mksource() {
+    [ -f ${_pkgname}-${pkgver}.tar.bz2 ] || wget http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2
+    tar xf ${_pkgname}-${pkgver}.tar.bz2
+    # Remove noncommercial files.
+    rm ${_pkgname}-${pkgver}/doc/bogofilter-SA-{2005-0{1,2},2010-01}
+    tar cJf ${pkgname}-${pkgver}.tar.xz ${_pkgname}-${pkgver}
+}
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc/bogofilter  \
+              --localstatedir=/var \
+              --enable-transactions
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf"
+
+  install -dm755 "${pkgdir}/usr/share/${_pkgname}/contrib"
+  install -m644 contrib/* "${pkgdir}/usr/share/${_pkgname}/contrib/"
+}
diff --git a/libre/kdenetwork-libre/PKGBUILD b/libre/kdenetwork-libre/PKGBUILD
index 14c6448e5..d8fa960e5 100644
--- a/libre/kdenetwork-libre/PKGBUILD
+++ b/libre/kdenetwork-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144733 2011-12-08 09:21:25Z andrea $
+# $Id: PKGBUILD 147895 2012-01-28 10:36:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,18 +10,18 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp'
+makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
+	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
     'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
     'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
 source=("http://repo.parabolagnulinux.org/other/${pkgbase}-libre-${pkgver}.tar.xz")
-sha1sums=('2537c5286a1464008e05974a3fd55ae00740c843')
+sha1sums=('2472128aef671e3474505cf65397dfc7ef9f79bb')
 
 # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
 mksource() {
@@ -67,9 +67,8 @@ package_kdenetwork-kdnssd() {
 package_kdenetwork-kget() {
 	pkgdesc='Download Manager'
 	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
-	optdepends=('python2: YouTube plugin')
 	url="http://kde.org/applications/internet/kget/"
-	install='kdenetwork.install'
+	install='kdenetwork-kget.install'
 	cd $srcdir/build/kget
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kget
@@ -79,12 +78,12 @@ package_kdenetwork-kget() {
 package_kdenetwork-kopete-libre() {
 	pkgdesc='Instant Messenger'
 	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
-	         'libidn' 'qimageblitz' 'v4l-utils' 'libgadu' 'mediastreamer')
+	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
         conflicts=('kdenetwork-kopete')
         provides=("kdenetwork-kopete=${pkgver}")
         replaces=('kdenetwork-kopete')
 	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork.install'
+	install='kdenetwork-kopete.install'
 	cd $srcdir/build/kopete
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kopete
@@ -95,7 +94,7 @@ package_kdenetwork-kppp() {
 	pkgdesc='Internet Dial-Up Tool'
 	depends=('kdebase-runtime' 'ppp')
 	url="http://kde.org/applications/internet/kppp/"
-	install='kdenetwork.install'
+	install='kdenetwork-kppp.install'
 	cd $srcdir/build/kppp
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/kppp
diff --git a/libre/kdenetwork-libre/kdenetwork-kget.install b/libre/kdenetwork-libre/kdenetwork-kget.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/libre/kdenetwork-libre/kdenetwork-kget.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre/kdenetwork-libre/kdenetwork-kopete.install b/libre/kdenetwork-libre/kdenetwork-kopete.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/libre/kdenetwork-libre/kdenetwork-kopete.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre/kdenetwork-libre/kdenetwork-kppp.install b/libre/kdenetwork-libre/kdenetwork-kppp.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/libre/kdenetwork-libre/kdenetwork-kppp.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index fe0e79220..57ff8cae3 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -9,7 +9,7 @@ license=('GPL3')
 groups=('base')
 install=${pkgname}.install
 source=(https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt)
-md5sums=('3f67515fda1c9b4e4d1a988d3c03bb9a')
+md5sums=('707ba4c6ba76fb3fed35c70103f269cb')
 
 build() {
     cd ${srcdir}
diff --git a/staging/capi4hylafax/PKGBUILD b/staging/capi4hylafax/PKGBUILD
new file mode 100644
index 000000000..5f5adc139
--- /dev/null
+++ b/staging/capi4hylafax/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 147956 2012-01-29 03:57:58Z eric $
+#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=capi4hylafax
+pkgver=010300
+pkgrel=5
+pkgdesc="capi plugin for hylafax to enable isdn faxing"
+arch=(i686 x86_64)
+url="ftp://ftp.avm.de/tools"
+license=('GPL')
+depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
+source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
+	config.faxCAPI capi4hylafax.rc)
+md5sums=('d37dc652ac80d1525ef8693be55ee67f'
+         '653b60695d21c128f020a86274ca9192'
+         '1fe40c58289fa3ba625ce6fe2fdb3d07')
+install=capi4hylafax.install
+backup=(var/spool/hylafax/etc/config.faxCAPI)
+
+build() {
+  cd "$srcdir"/$pkgname-01.03.00
+# fix config file
+  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in
+  autoreconf --force --install
+  ./configure
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-01.03.00
+  install -m755 -D src/faxsend/c2faxsend "$pkgdir"/usr/bin/c2faxsend
+  install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv
+  install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem
+  install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI
+  install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax
+# adding FIFO
+  mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chgrp 14 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+  chmod 0600 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
+# fix /var/spool/hylafax permission
+  chown 10 "$pkgdir"/var/spool/hylafax
+  chgrp 14 "$pkgdir"/var/spool/hylafax
+# adding udev rule
+  mkdir -p "$pkgdir"/lib/udev/rules.d
+cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules
+# CAPI devices
+SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp"
+SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp"
+
+EOF
+# fix c2faxadd
+  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem
+  echo "main_config_dialog" >>  "$pkgdir"/usr/bin/c2faxaddmodem
+}
diff --git a/staging/capi4hylafax/capi4hylafax.install b/staging/capi4hylafax/capi4hylafax.install
new file mode 100644
index 000000000..20c2d8f63
--- /dev/null
+++ b/staging/capi4hylafax/capi4hylafax.install
@@ -0,0 +1,16 @@
+post_install() {
+cat << EOF
+For more information about setting up the package, please have a look here:
+"http://wiki.archlinux.org/index.php/capi4hylafax"
+EOF
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+cat << EOF
+Please remove your additions to /var/spool/hylafax/etc/config
+EOF
+}
diff --git a/staging/capi4hylafax/capi4hylafax.rc b/staging/capi4hylafax/capi4hylafax.rc
new file mode 100755
index 000000000..51025b020
--- /dev/null
+++ b/staging/capi4hylafax/capi4hylafax.rc
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/c2faxrecv`
+case "$1" in
+  start)
+    stat_busy "Starting capi4hylafax"
+    if [ -z "$PID" ]; then
+    /usr/bin/c2faxrecv > /dev/null &
+       faxmodem faxCAPI
+    fi
+    if [ ! -f /var/run/faxq.pid ]; then
+       stat_fail
+       echo "ERROR: hylafax is not running"
+       exit 1
+    fi
+    if [ ! -f /var/run/hfaxd.pid ]; then
+    stat_fail
+    echo "ERROR: hylafax is not running"
+    exit 1
+    fi
+    if [ ! -z "$PID" -o $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon capi4hylafax
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping capi4hylafax"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon capi4hylafax
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 2
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/staging/capi4hylafax/config.faxCAPI b/staging/capi4hylafax/config.faxCAPI
new file mode 100644
index 000000000..b2137757a
--- /dev/null
+++ b/staging/capi4hylafax/config.faxCAPI
@@ -0,0 +1,397 @@
+#
+# EDIT THIS CONFIGURATION TO REFLECT YOUR SETUP
+#
+
+# Grunds�tzliches:
+# - Es gibt f�r jeden Wert einen Standardzustand (default), sodass jede Zeile
+#   der Datei oder auch das komplette Configfile ausgelassen werden kann.
+# - Es gibt ausschlie�lich ein Configfile, in dem alle n�tigen Angaben f�r
+#   "c2faxsend/-receive" eingetragen werden k�nnen.
+# - Werden f�r HylaFAX mehrere virtuelle Ger�te (devices) angelegt, muss es
+#   f�r jedes Device ein Configfile im Format config.[DeviceName] geben.
+#   Dessen Existenz wird von HylaFAX �berpr�ft. Ohne dieses File kann die
+#   Arbeit mit dem Device nicht aufgenommen werden. Die Existenz einer
+#   solchen Datei kann am einfachsten durch einen Link auf dieses ConfigFile
+#   oder ein minimales "dummy"-ConfigFile nachgewiesen werden.
+#
+# Basics:
+# - There is a default condition for each value, such that each line of the
+#   file or the complete configfile can be left out.
+# - There is only one configfile in which all information required for
+#   "c2faxsend/-receive" can be entered.
+# - If multiple virtual devices are created for HylaFAX, there must be a
+#   Configfile in the format config.[DeviceName] for each device. HylaFAX
+#   checks that this file exists. Without this file, it is not possible to
+#   start working with the device. The easiest way to establish the existence
+#   of such a file is to create a link to this ConfigFile or a minimum
+#   "dummy" ConfigFile.
+
+
+# "SpoolDir" gibt den Pfad an, unter dem im HylaFAX-kompatiblen Betrieb die
+# HylaFAX-Dateien zu finden sind oder unter dem im Stand-Alone-Betrieb die
+# empfangenen Faxe gespeichert werden sollen. Im HylaFAX-kompatiblen Betrieb
+# werden die Faxe im Verzeichnis $(SpoolDir)/recvq gespeichert.
+#
+# "SpoolDir" indicates the path in which the HylaFAX are located in HylaFAX-
+# compatible operation or in which received faxes are to be saved in
+# stand-alone operation. In HylaFAX-compatible operation, faxes are saved in
+# the directory $(SpoolDir)/recvq.
+#
+# default   /var/spool/hylafax
+#
+SpoolDir:               /var/spool/hylafax
+
+
+# "FaxRcvdCmd" gibt das Skript an, das ausgef�hrt wird, sobald ein Fax
+# empfangen wurde. Im Stand-Alone-Betrieb werden andere Parameter
+# �bergeben als f�r HylaFAX (mehr dazu im sample_faxrcvd).
+#
+# "FaxRcvdCmd" indicates the script performed whenever a fax is
+# received. Parameters other than the ones for HylaFAX are returned in
+# stand-alone operation (see sample_faxrcvd for more information).
+#
+# default   /var/spool/hylafax/bin/faxrcvd
+#
+FaxRcvdCmd:             /var/spool/hylafax/bin/faxrcvd
+
+
+# "PollRcvdCmd" gibt das Skript an, das ausgef�hrt wird, sobald ein
+# Fax per Faxabruf empfangen wurde. Im Stand-Alone-Betrieb werden
+# andereParameter �bergeben als f�r HylaFAX (mehr dazu im
+# sample_faxrcvd).
+#
+# "PollRcvdCmd" indicates the script performed whenever a fax was
+# received by fax polling. Parameters other than the ones for HylaFAX
+# are returned in stand-alone operation (see sample_faxrcvd for more
+# information).
+#
+# default   /var/spool/hylafax/bin/pollrcvd
+#
+PollRcvdCmd:             /var/spool/hylafax/bin/pollrcvd
+
+
+# "FaxReceiveUser" ist der User, als der c2faxrecv ausgef�hrt wird.
+# Die �nderung des Users kann nur vom Superuser bzw. "root" erfolgen. Sollte
+# c2faxrecv von einem anderen User gestartet werden, wird dieser Eintrag
+# ignoriert. Hier einen anderen als den Hylafax-Standardwert "uucp"
+# einzutragen ist dann sinnvoll, wenn beispielsweise die Rechte von
+# /dev/capi20 nicht ge�ndert werden sollen oder Ihre Linux-Distribution einen
+# anderen User voraussetzt.
+#
+# "FaxReceiveUser" is the user when c2faxrecv is run. This user can be
+# changed only by the Superuser or "root" user. If c2faxrecv is started by
+# another user, this entry will be ignored. Here it is a good idea to enter a
+# value other than the hylafax default value "uucp", for instance, if the
+# rights of /dev/capi20 are not to be changed or your Linux distribution
+# requires another user.
+#
+# default   ""
+#
+FaxReceiveUser:         uucp
+FaxReceiveGroup:	uucp
+
+
+# Im "LogFile" werden Informationen �ber den Faxablauf abgespeichert.
+#
+# Information about the order of events in faxing are saved in the "LogFile".
+#
+# default   ""
+#
+LogFile:                /var/spool/hylafax/log/capi4hylafax
+
+
+# Der Befehl "LogTraceLevel" gibt die Menge der Daten an, die in ein LogFile
+# geschrieben werden. Die Spanne reicht von 0 = nichts bis 4 = vieles.
+#
+# The "LogTraceLevel" command indicates the amount of data written in a
+# LogFile. The range goes from 0 = nothing to 4 = many.
+#
+# default   0
+#
+LogTraceLevel:          0
+
+
+# "LogFileMode" sind die Angaben (mode), aufgrund derer sowohl das gerade
+# erw�hnte LogFile als auch die LogFiles f�r HylaFAX angelegt werden.
+#
+# "LogFileMode" is the mode, on the basis of which both the LogFile just
+# mentioned and the LogFiles for HylaFAX are generated.
+#
+# default   0600
+#
+LogFileMode:            0600
+
+
+# Die geschweiften Klammern geben Anfang und Ende einer Section an.
+# Jede Section darf eine oder mehrere SubSections enthalten.
+# SubSubSections sind nicht erlaubt.
+# Dabei enth�lt die Section Angaben zu einem virtuellen Device;
+# die Subsection die Angaben f�r die Rufannahme jedes Controllers.
+# Es k�nnen beliebig viele Sections und, darin enthalten, jeweils beliebig
+# viele Subsections erzeugt werden.
+# Jede Section muss aber einen anderen HylafaxDeviceName erhalten;
+# zus�tzlich muss in jeder Subsection innerhalb einer Section ein anderer
+# Controller aufgef�hrt werden. Beim Stand-Alone-Betrieb ist eine Section mit
+# entsprechend vielen Subsections ausreichend, da in diesem Betriebsmodus die
+# virtuellen DeviceNamen keine Rolle spielen.
+#
+# The curved brackets indicate the beginning and end of a section.
+# Each section may contain one or more subsections.
+# SubSubSections are not permitted.
+# The section contains information about a virtual device; the subsection the
+# call acceptance information for each controller.
+# Any number of sections containing any number of subsections may be
+# generated, but each section must receive a different HylafaxDeviceName; and
+# a different controller must be listed in every subsection within a section.
+# For stand-alone operation, it is sufficient to have just one section with
+# as many subsections as required, since virtual DeviceNames do not play
+# any role in this mode of operation.
+#
+{
+
+    # "HylafaxDeviceName" ist der Name, unter dem sich C4H bei HylaFAX als
+    # "virtuelles Modem" anmeldet. Sollen f�r HylaFAX mehrere dieser "Modems"
+    # erzeugt werden, legen Sie einfach eine neue Section mit einem anderen
+    # HylafaxDeviceName an.
+    #
+    # "HylafaxDeviceName" is the name, under which C4H registers in HylaFAX as
+    # a "virtual modem". If multiple "modems" are to be generated for HylaFAX,
+    # simply create a new section with another HylafaxDeviceName.
+    #
+    # default   faxCAPI
+    #
+    HylafaxDeviceName:          faxCAPI
+
+
+    # "RecvFileMode" ist der Mode, in dem empfangene Faxe abgespeichert
+    # werden. User und Group der Datei wird durch FaxReceiveUser (s.o.)
+    # festgelegt.
+    #
+    # "RecvFileMode" is the mode, in which received faxes are saved. User and
+    # Group of the file are determined by the FaxReceiveUser (see above).
+    #
+    # default   0600
+    #
+    RecvFileMode:               0600
+
+
+    # "FAXNumber" ist die eigene Nummer des Computers und wird der Gegenseite
+    # mitgeteilt (sichtbar z. B. im Fax-Journal).
+    #
+    # "FAXNumber" is the fax number of the computer itself and is transmitted
+    # to the remote site (visible in the Fax Journal).
+    #
+    # default   ""
+    #
+    FAXNumber:                  +49.00.00000
+
+
+    # "LocalIdentifier" ist der von CAPI aus konfigurierbare Teil der
+    # Kopfzeile. Ein leerer Eintrag f�hrt dazu, dass keine Fax-Kopfzeile
+    # eingef�gt wird.
+    #
+    # "LocalIdentifier" is the part of the fax header which can be configured
+    # from CAPI. An empty entry specifies an empty header.
+    #
+    # default   ""
+    #
+    LocalIdentifier:            "AVM CAPI4HylaFAX"
+
+
+    # Die maximale Anzahl von gleichzeitig empfangbaren Faxen kann
+    # durch "MaxConcurrentRecvs" angepa�t werden. Diese Anzahl wird
+    # durch die Anzahl der durch die Hardware zur Verf�gung
+    # gestellten B-Kan�le begrenzt.
+    #
+    # The maximum number of faxes that can be received at the same
+    # time can be adjusted using "MaxConcurrentRecvs". This number
+    # is limited by the number of B channels provided by the hardware.
+    #
+    # default   2
+    #
+    MaxConcurrentRecvs:         2
+
+
+    # ----------- outgoing params -----------
+
+    # "OutgoingController" gibt den Controller an, �ber den eine externe
+    # Verbindung aufgebaut werden soll.
+    #
+    # "OutgoingController" indicates the controller which is to be used to
+    # establish an external connection.
+    #
+    # default   1
+    #
+    OutgoingController:         1
+
+
+    # Die "OutgoingMSN" ist die MSN, die f�r ausgehenden Faxe benutzt wird.
+    #
+    # The "OutgoingMSN" is the MSN used for outgoing faxes.
+    #
+    # default   ""
+    #
+    OutgoingMSN:
+
+
+    # CLIR (Rufnummernunterdr�ckung) kann �ber "SuppressMSN" und den Wert (0)
+    # abgeschaltet oder mit dem Wert (1) erneut angeschaltet werden.
+    #
+    # CLIR (Calling Line Identification Restriction) can be switched off using
+    # the value (0) or switched back on by entering the value (1).
+    #
+    # default   0
+    #
+    SuppressMSN:                0
+
+
+    # "NumberPrefix" wird vor jede Telefonnummer gestellt. Dies ist bei
+    # Nebenstellenanlagen wichtig, bei denen f�r den Aufbau einer externen
+    # Verbindung eine Ziffer vorgew�hlt werden muss.
+    #
+    # "NumberPrefix" is set to precede each telephone number. This is
+    # important for PBX systems which require that a number be dialed to
+    # obtain an outside line.
+    #
+    # default   ""
+    #
+    NumberPrefix:
+
+
+    # Wenn der Wert in "UseISDNFaxService" = 1 ist, wird ein ausgehender Ruf
+    # mit der ISDN-FAX-G3 Dienstekennung aufgebaut. Bei 0 wird eine 3.1kHz
+    # Audio-Verbindung hergestellt.
+    #
+    # When in "UseISDNFaxService" the value is = 1, an outoing call will be
+    # established using the ISDN-FAX-G3 service indicator. For 0, a 3.1kHz
+    # audio connection is established.
+    #
+    # default   0
+    #
+    UseISDNFaxService:          0
+
+
+    # Gibt die Dauer in Sekunden an, die auf eine Verbindungsannahme durch die
+    # Gegenseite gewartet wird. So wird beim Faxversand nicht automatisch die
+    # gesamte von der Telekom vorgegebene Wartezeit genutzt. Eine Angabe des
+    # Wertes 0 nutzt die gesamte Wartezeit.
+    #
+    # The duration in seconds you wait for the remote site to accept your
+    # outgoing call In this way you do not have to use the entire ringing
+    # duration preset by the telephone company. The default value 0 uses the
+    # entire ringing duration.
+    #
+    # default   0
+    #
+    RingingDuration:            0
+
+
+    # ----------- incoming params -----------
+    {
+
+        # Controller, f�r den diese Subsection gilt.
+        #
+        # Controller for which this subsection is valid.
+        #
+        # default   1
+        #
+        Controller:             1
+
+
+        # Wenn "AcceptSpeech" auf 1 steht, wird auch die Dienstekennung
+        # "Sprache" angenommen.
+        #
+        # If "AcceptSpeech" is set to 1, the service indicator "Voice" also
+        # will be accepted.
+        #
+        # default   0
+        #
+        AcceptSpeech:           1
+
+
+        # Sofern man DDI nutzen will, sollte man "UseDDI" auf 1 stellen.
+        #
+        # If DDI is to be used, "UseDDI" should be set to a value of 1.
+        #
+        # default   0
+        #
+        UseDDI:                 0
+
+
+        # Die DDI-Stammnummer wird bei "DDIOffset" eingetragen.
+        # Der Standardwert f�hrt zu keinem korrekten Ergebnis und
+        # sollte, sofern "UseDDI" auf 1 gestellt wurde, immer
+        # ver�ndert werden.
+        #
+        # "DDIOffset" indicates the DDI offset number which precedes
+        # extension number. Because the default value can't guarantee
+        # a correct result, this value should be modified whenever
+        # "UseDDI" is set to 1.
+        #
+        # default   ""
+        #
+        DDIOffset:              "12345"
+
+
+        # "DDILength" gibt die Anzahl der Durchwahlziffern an. (Diese Ziffern
+        # werden lediglich als Teil der Empf�ngernummer mitgeteilt.) Der
+        # Standardwert sollte bei Verwendung von DDI ebenfalls angepasst
+        # werden.
+        #
+        # "DDILength" indicates the number of digits in the extension. (These
+        # numbers are only used as a component of the recipient's number.) The
+        # default value should be adapted whenever DDI is used.
+        #
+        # default   0
+        #
+        DDILength:              3
+
+
+        # Bei "IncomingDDIs" k�nnen in einer durch Komma getrennten Liste alle
+        # Durchwahlziffern (DDIs) angegeben werden, f�r die Rufe angenommen
+        # werden sollen. Eine Bereichsangabe ist auch m�glich (z.B. 100-300),
+        # wobei aber keine offenen Bereiche (z.B. -100) erlaubt sind.
+        # Sofern IncommingDDIs gesetzt ist, wird DDILength ignoriert.
+        #
+        # In "IncomingDDIs", all extension numbers (DDIs) for which calls are
+        # to be accepted may be listed, separated by commas. It is also
+        # possible to specify a range (e.g. 100-300); here no open ranges are
+        # permitted (e.g. -100). When the "IncomingDDIs" switch is set, the
+        # parameters for DDILength will be ignored.
+        #
+        # default   ""
+        #
+        IncomingDDIs:
+
+
+        # Bei "IncomingMSNs" k�nnen in einer durch Komma getrennten Liste alle
+        # MSNs angegeben werden, f�r die Rufe angenommen werden sollen. Ist
+        # die Liste leer, werden alle Rufe auf ISDN FAX G3, 3,1kHz Audio und
+        # eventuell "Sprache" angenommen.
+        # Wenn "UseDDI" auf 1 gestellt ist, wird "IncomingMSNs" ignoriert.
+        #
+        # In "IncomingMSNs", all MSNs for which calls are to be accepted may
+        # be listed, separated by commas. When the list is empty, all calls
+        # are accepted for ISDN FAX G3, 3,1kHz audio and perhaps "Voice".
+        # When "UseDDI" is set to 1, "IncomingMSNs" is ignored.
+        #
+        # default   ""
+        #
+        IncomingMSNs:
+
+
+        # Wenn "AcceptGlobalCall" auf 1 steht, werden auch Calls ohne
+        # Zielrufnummer (ohne MSN) angenommen.
+        # Notwendig hinter einigen Telefonanlagen, die keine Zielrufnummer
+        # senden.
+        #
+        # If "AcceptGlobalCall" is set to 1, calls without Called Party
+        # Number also will be accepted.
+        # Needed on internal ports of some PBX.
+        #
+        # default   1
+        #
+        AcceptGlobalCall:   1
+    }
+}
+
diff --git a/staging/digikam/PKGBUILD b/staging/digikam/PKGBUILD
index 96ef60e83..2e3484667 100644
--- a/staging/digikam/PKGBUILD
+++ b/staging/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147663 2012-01-26 04:48:55Z eric $
+# $Id: PKGBUILD 147940 2012-01-28 11:36:42Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
 pkgver=2.5.0
-pkgrel=2
+pkgrel=4
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -55,7 +55,6 @@ package_digikam() {
 
   # these are in oxygen-icons
   rm -rf ${pkgdir}/usr/share/icons
-
 }
 
 package_libkface() {
diff --git a/staging/hylafax/PKGBUILD b/staging/hylafax/PKGBUILD
new file mode 100644
index 000000000..f00c0d884
--- /dev/null
+++ b/staging/hylafax/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 147950 2012-01-29 02:47:19Z eric $
+# Maintainer: Paul Mattal <paul@archlinux.org>
+pkgname=hylafax
+pkgver=6.0.5
+pkgrel=3
+pkgdesc="Fax Server"
+arch=('i686' 'x86_64')
+install='hylafax.install'
+license=('custom')
+depends=('libtiff' 'pam' 'ghostscript')
+makedepends=('smtp-server')
+url="http://www.hylafax.org/"
+backup=(var/spool/hylafax/bin/{faxrcvd,notify}
+	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules}
+	var/spool/hylafax/etc/hosts.hfaxd) 
+source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz 
+        hylafax 
+        hylafax.cron.daily 
+        config.local
+        configure-6.0.5.patch 
+        hylafax-libtiff4.patch)
+md5sums=('eb9ac942354ad708e20e4583cec6615f'
+         '6602288a405324d8c8e3c5eac2bf19fd'
+         '52beffe7dc296b4f9ce9fd0387f7804e'
+         '0d2ce24d918226a852539aebf57d3f4a'
+         '51d9f639bb76e5e39cdc8e2ac07e208d'
+         '3d239c186f24720e945508d349b069b1')
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  cp ../config.local .
+  # fix compiling
+  patch -Np0 -i ../configure-6.0.5.patch
+  patch -Np1 -i ../hylafax-libtiff4.patch
+  ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}"
+  make
+}
+
+package () {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  mkdir -p "$pkgdir"/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
+  mkdir -p "$pkgdir"/var/{spool/hylafax,lock}
+  make ROOT="$pkgdir" install
+  install -D -m 755 "$srcdir"/hylafax "$pkgdir"/etc/rc.d/hylafax
+  install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax
+  # add missing awk file for notify-4.1 script
+  install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \
+  	"$pkgdir"/var/spool/hylafax/bin/notify.awk
+  # fix permission on /var/lock
+  chmod 1777 "$pkgdir"/var/lock
+
+  install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
+}
diff --git a/staging/hylafax/config.local b/staging/hylafax/config.local
new file mode 100644
index 000000000..0d8e2bcd8
--- /dev/null
+++ b/staging/hylafax/config.local
@@ -0,0 +1,273 @@
+# $Id: config.local,v 1.1 2003/06/28 00:24:49 jproctor Exp $
+#
+# HylaFAX Facsimile Software
+#
+# Copyright (c) 1990-1996 Sam Leffler
+# Copyright (c) 1991-1996 Silicon Graphics, Inc.
+# HylaFAX is a trademark of Silicon Graphics, Inc.
+# 
+# Permission to use, copy, modify, distribute, and sell this software and 
+# its documentation for any purpose is hereby granted without fee, provided
+# that (i) the above copyright notices and this permission notice appear in
+# all copies of the software and related documentation, and (ii) the names of
+# Sam Leffler and Silicon Graphics may not be used in any advertising or
+# publicity relating to the software without the specific, prior written
+# permission of Sam Leffler and Silicon Graphics.
+# 
+# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+# 
+# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+# OF THIS SOFTWARE.
+#
+
+#
+# This file holds site-specific configuration parameters.
+#
+# Nothing is defined in here by default, the definitions
+# commented out below serve as documentation for what you
+# can set in this file or a config.local file.
+#
+# Note that you do not need to set anything here unless you
+# want to override the auto-configuration behaviour and/or
+# interactive prompting done by the configure script.
+#
+
+#
+# Package controls.
+#
+#DSO="auto"			# configure DSO support (auto|IRIX|no)
+#GETTY="auto"			# type of getty support (auto|BSD|SysV)
+#HTML="no"			# install HTML documentation (yes|no)
+#PS="auto"			# PostScript support to use (auto|gs|dps|imp)
+#SGI2FAX="auto"			# configure SGI image support (auto|yes|no)
+#DPS="no"			# install SGI DPS-based RIP (yes|no)
+#GS="no"			# install Ghostscript RIP (yes|no)
+#IMP="no"			# install SGI Impressario 2.1 support (yes|no)
+#REGEX="yes"			# use distributed regular expression package
+#UTMP="utmpx"			# type of utmp+wtmp handling (auto|utmp|utmpx)
+#DBLIB="no"			# use distributed libdb distribution
+
+#
+# Directory parameters.
+#
+DIR_BIN="/usr/bin"		# directory for client apps
+DIR_LIB="/usr/lib"
+DIR_LIBDATA="/usr/lib/fax"		# directory for client data
+DIR_LIBEXEC="/usr/lib/fax"		# directory for libraries&hidden apps
+DIR_MAN="/usr/share/man"		# directory for manual pages
+DIR_SPOOL="/var/spool/hylafax"		# directory for spooling area
+DIR_SBIN="/usr/sbin"		# directory for system apps
+DIR_LOCKS="/var/lock"		# directory for UUCP lock files
+FONTMAP="/usr/share/ghostscript/fonts"	# directorys containing Fontmap files
+DIR_LOCALE="/usr/share/locale"
+#PATH_AFM="/usr/lib/DPS/AFM"		# directorys for AFM files
+
+#
+# HTML-specific parameters; only used when the
+# HTML package is configured for installation.
+#
+# Note that ``PATH''s are the virtual pathnames used
+# in forming URLs; they are not directory pathnames
+# in the filesystem.
+#
+DIR_HTML="/usr/share/hylafax/httpd"	# directory for HTML documentation
+#DIR_CGI="/var/httpd/cgi-bin"		# directory for CGI scripts
+#HTMLPATH="/hylafax"			# virtual path to HTML materials
+#CGIPATH="/cgi-bin"			# virtual path to CGI scripts
+
+#
+# Miscellaneous parameters.
+#
+#DEFVRES="196"				# default vertical res for outbound fax
+#FILLORDER="MS2LSB"			# bit order of cpu (MSB2LSB/LSB2MSB)
+#AXGID="uucp"				# group ID for fax user
+#FAXUID="uucp"				# user ID for fax user
+#PAGESIZE="North American Letter"	# default page size
+SYSGID="root"				# group ID for system installs
+SYSUID="root"				# user ID for system installs
+#LOCKS="ascii"				# default UUCP lockfile scheme
+#
+#PATH_GETTY="/etc/getty"		# pathname of suitable getty program
+#PATH_VGETTY="/bin/vgetty"		# pathname of voice getty program
+#PATH_EGETTY="/bin/egetty"		# pathname of external getty program
+#PATH_SENDMAIL="/usr/lib/sendmail"	# pathname of suitable sendmail program
+#PATH_GSRIP="/usr/local/bin/gs"		# pathname of Ghostscript-based RIP
+#PATH_DPSRIP="/var/spool/hylafax/bin/ps2fax.exe" # pathname of DPS-based RIP
+#PATH_IMPRIP="/usr/lib/print/psrip"	# pathname of Impressario 2.1 RIP
+#MANSCHEME="sysv-source-cat-strip"	# manual page installation scheme
+#SYSVINIT="auto"		# install SysV-style init support (auto|yes|no)
+#DIR_SYSVINIT="/etc/init.d"	# location of SysV-style init script
+#DIR_SYSVINITSTART="../rc2.d"	# location of SysV-style start script
+#DIR_SYSVINITSTOP="../rc0.d"	# location of SysV-style stop script
+#NAME_SYSVINITSTART="S80fax"	# name of SysV-style start script
+#NAME_SYSVINITSTOP="K80fax"	# name of SysV-style stop script
+#FAXQ_SERVER=yes		# init script starts faxq
+#HFAXD_SERVER=yes		# init script starts hfaxd
+#HFAXD_OLD_PROTOCOL=no		# don't start old protocol
+#HFAXD_SNPP_SERVER=no		# don't start paging protocol
+
+# SVR4 packaging stuff
+#PKG_ARCH=				# ARCH variable in pkginfo file
+#PKG_EMAIL=someone@somehost.somedomain	# EMAIL variable in pkginfo file
+#PKG_VENDOR="Your Name Here"		# VENDOR variable in pkginfo file
+#
+
+#
+# Parameters used when building the software.
+#
+# Note that configure has several ENVOPTS built into it that are
+# set according to the target.  This is done to help naive folks.
+#
+# Beware of changing the INSTALL definition; you *must* have an
+# install script that emulates the Silicon Graphics install program!
+#
+#AR="/bin/ar"				# pathname of suitable ar program
+#AROPTS="rc"				# options to ar for creating archive
+#CC="gcc"				# name/pathname of C compiler
+#CXX="gcc"				# name/pathname of C++ compiler
+#CXXFILE="-x c++"			# options for proper C++ processing
+#ENVOPTS="-Aa"				# options for getting ANSI C
+#GCOPTS="-g"				# options to pass C compiler
+#GCXXOPTS="-g"				# options to pass C++ compiler
+#GENDIST="/sbin/gendist"		# pathname of SGI inst generator program
+#INSTALL='${SHELL} ${PORT}/install.sh'	# SGI install program/emulator
+#LIBMALLOC="auto"			# yes|no|auto configure -lmalloc use
+#LIBPORT='${PORT}/libport.a'		# library with emulation code
+#LIBSUN="auto"				# yes|no|auto configure -lsun use
+#LLDOPTS=""				# extra link line options
+#MACHDEPLIBS=""				# extra libraries for linking
+#PORTFUNCS=""				# non-standard functions to emulate
+#PROTOTYPES="-prototypes"		# C compiler options for checking function prototypes
+#RANLIB=":"				# pathname of suitable ranlib program
+#SHDLIBC="-lc_s"			# shared C library, if not standard
+#SIGHANDLERTYPES='(void(*)(int,...))'	# types to check for signal handler
+#STRIP="/bin/strip"			# strip program used by install.sh
+
+#
+# The source for the TIFF library is not required
+# to build this software, but the library is required
+# to link against.  If libtiff is installed in a
+# non-standard location then setup LIBTIFF accordingly.
+#
+#LIBTIFF="-L/usr/local/lib -ltiff"	# linkage convention for libtiff
+#TIFFINC="/usr/local/include"		# place to find tiffio.h
+#TIFFBIN="/usr/local/bin"		# where TIFF tools live
+
+#
+# The source for the ZLIB library is not required
+# to build this software, but the library is required
+# to link against.  If ZLIB is installed in a 
+# non-standard location then setup LIBZ accordingly.
+#
+#LIBZ="-L/usr/local/lib -lz"		# linkage convention for libz
+#ZLIBINC="-I/usr/local/include"		# place to find zlib.h
+
+#
+# The source for the POSIX regular expression package
+# is not required to build this software, but the package
+# is required to link against.  If the copy of the software
+# that is included in this distribution is not to be used
+# then set REGEX=no and supply the following definitions.
+#
+#LIBREGEX=" "				# linkage convention for regex package
+#REGEXINC="/usr/include"		# place to find regex.h
+
+#
+# The LIBDB hashed database package is (currently) used
+# only by the MLA tools that are not publicly available
+# but which are built from within this source tree.  In
+# the future the fax software may use the libdb software
+# for the remote client capabilities database (so these
+# hooks are included now).
+#
+# The source for the LIBDB hashed database package
+# is not required to build this software, but the package
+# is required to link against.  If the copy of the software
+# that is included in this distribution is not to be used
+# then set DBLIB=no and supply the following definitions.
+#
+#LIBDB=" "				# linkage convention for libdb package
+#DBLIBINC="/usr/include"		# place to find db.h
+
+#
+# Parameters to control various workarounds for system bugs.
+#
+# These parameters are normally set in configure based on
+# the target system.  If they are set here, then they will
+# override anything done by configure.
+#
+#CONFIG_OPENFIFO="O_RDONLY"		# mode to open FIFOs in server proc's
+#CONFIG_FIFOBUG="yes"			# enable workaround for FIFO select bug
+#CONFIG_TIOCMBISBYREF="yes"		# pass arg by reference to ioctl
+#CONFIG_WINSZHACK="no"			# include extra files for TIOCWINSZ use
+#CONFIG_ABORTBUG="no"			# enable workaround for abort problems
+#CONFIG_NOREOPEN="yes"			# reopen tty device after toggling DTR
+#CONFIG_NOSTDINDUP="yes"		# do not redirect stdout to stdin in ondelay
+#CONFIG_BADEXECVPROTO="no"		# system has incorrect execv func decl
+#CONFIG_BADEXECVEPROTO="no"		# system has incorrect execve func decl
+#CONFIG_BADGETOPTPROTO="no"		# system has incorrect getopt func decl
+#CONFIG_SOCKARGLENTYPE="unsigned long"	# call-by-ref arg type for socket funcs
+#CONFIG_BADSELECTPROTO="no"		# system has way old select func decl
+#CONFIG_MAXGID="5999"			# maximum permissable GID
+#CONFIG_OSFCNH="auto"			# control inclusion of <osfcn.h>
+
+#
+# Dynamic Shared Object (DSO) support.
+#
+# Beware that adding new support for DSOs may require some
+# modifications to the */Makefile.dso files.
+#
+#DSOSUF="so"				# DSO filename suffix
+#DSODELAY="-delay_load"			# DSO option for delayed loading
+#DSOOPTS="-shared -rdata_shared"	# options for building DSOs
+
+#
+# Makefile construction parameters.
+#
+# These should not normally be set; configure will
+# deduce the appropriate syntax to use for includes.
+#
+#MAKECXXOVERRIDE="=.C"			# make override stuff for SunPRO C++
+#MAKEDEPINCLUDE="include"		# make include for dependency files
+#MAKEDSOINCLUDE="#"			# make include for DSO support
+#MAKEINCLUDE=".include"			# make include syntax
+#MAKELQUOTE="<"				# make include syntax
+#MAKERQUOTE=">"				# make include syntax
+#SETMAKE='MAKE	= ${MAKE}'		# define if make does not setup $MAKE
+#MKDEPCOPTS=""				# C compiler opts to supply w/ -M
+#MKDEPCXXOPTS=""			# C++ compiler opts to supply w/ -M
+
+#
+# General system stuff used by the distribution.
+#
+# Beware of setting these as configure selects several programs
+# based on whether or not they are capable of processing scripts
+# included in the distribution (e.g AWK and SCRIPT_SH, SED).
+#
+#AWK="/bin/awk"				# pathname of suitable awk program
+#CAT="/bin/cat"				# pathname of suitable cat program
+#CHGRP="/etc/chgrp"			# pathname of suitable chgrp program
+#CHMOD="/etc/chmod"			# pathname of suitable chmod program
+#CHOWN="/etc/chown"			# pathname of suitable chown program
+#CMP="/bin/cmp"				# pathname of suitable cmp program
+#COL="/bin/col"				# pathname of suitable col program
+#CP="/bin/cp"				# pathname of suitable cp program
+#ECHO="/bin/echo"			# pathname of suitable echo program
+#GREP="/bin/grep"			# pathname of suitable grep program
+#LN="/bin/ln"				# pathname of suitable ln program
+#LN_S="-s"				# option to ${LN} to create symlink
+#MAN="/usr/bin/man"			# pathname of suitable man program
+#MKDIR="/bin/mkdir"			# pathname of suitable mkdir program
+#MKFIFO="/bin/mkfifo"			# pathname of suitable mkfifo program
+#MV="/bin/mv"				# pathname of suitable mv program
+#MV_F="-f"				# option to ${MV} to force operation
+#RMCMD="/bin/rm"			# pathname of suitable rm program
+#SED="/bin/sed"				# pathname of suitable sed program
+#SCRIPT_SH="/bin/sh"			# pathname of suitable shell
+#SORT="/bin/sort"			# pathname of suitable sort program
diff --git a/staging/hylafax/configure-6.0.5.patch b/staging/hylafax/configure-6.0.5.patch
new file mode 100644
index 000000000..e1f1126a5
--- /dev/null
+++ b/staging/hylafax/configure-6.0.5.patch
@@ -0,0 +1,11 @@
+--- configure.old	2011-08-08 10:19:37.619657223 +0200
++++ configure	2011-08-08 10:20:26.422189170 +0200
+@@ -2882,7 +2882,7 @@
+ 	echo '#define HAS_FCHMOD 1'
+ 	Note "... configure use of fchmod"
+ 	CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \
+-	    unistd.h libc.h $OSFCNH sys/stat.h
++	    unistd.h $OSFCNH sys/stat.h libc.h
+     }
+     CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \
+ 	unistd.h sys/stat.h
diff --git a/staging/hylafax/hylafax b/staging/hylafax/hylafax
new file mode 100755
index 000000000..9f949c2ac
--- /dev/null
+++ b/staging/hylafax/hylafax
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="hylafax"
+FAXQ_BIN=/usr/sbin/faxq
+FAXQ_PID=`pidof -o %PPID $FAXQ_BIN`
+HFAXD_BIN=/usr/lib/fax/hfaxd
+HFAXD_PID=`pidof -o %PPID $HFAXD_BIN`
+HFAXD_OPTS="-i hylafax"
+FAXQUIT_BIN=/usr/sbin/faxquit
+
+. /var/spool/hylafax/etc/setup.cache
+
+case "$1" in
+  start)
+    stat_busy "Starting $DAEMON_NAME"
+    [ -z "$FAXQ_PID" ] && $FAXQ_BIN
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      echo `pidof -o %PPID $FAXQ_BIN` > /var/run/faxq.pid
+    fi
+    [ -z "$HFAXD_PID" ] && $HFAXD_BIN $HFAXD_OPTS
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      echo `pidof -o %PPID $HFAXD_BIN` > /var/run/hfaxd.pid
+    fi
+    add_daemon $DAEMON_NAME
+    stat_done
+    ;;
+
+  stop)
+    stat_busy "Stopping $DAEMON_NAME"
+	 $FAXQUIT_BIN >/dev/null 2>&1
+    if [ $? -gt 0 ]; then
+      [ ! -z "$FAXQ_PID" ]  && kill $FAXQ_PID &> /dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        rm /var/run/faxq.pid &> /dev/null
+      fi
+    else
+      rm /var/run/faxq.pid &> /dev/null
+    fi
+    [ ! -z "$HFAXD_PID" ]  && kill $HFAXD_PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm /var/run/hfaxd.pid &> /dev/null
+    fi
+    rm_daemon $DAEMON_NAME
+    stat_done
+    ;;
+
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/staging/hylafax/hylafax-libtiff4.patch b/staging/hylafax/hylafax-libtiff4.patch
new file mode 100644
index 000000000..4a49511f8
--- /dev/null
+++ b/staging/hylafax/hylafax-libtiff4.patch
@@ -0,0 +1,229 @@
+--- hylafax-6.0.5/configure	2010-09-15 10:42:36.000000000 -0400
++++ hylafax-5.5.1/configure	2012-01-02 17:44:20.000000000 -0500
+@@ -2531,6 +2566,7 @@
+     Note "... checking TIFF library version"
+     tiff_runlen_t=""
+     cat>t.c<<EOF
++#include <stdlib.h>
+ #include <stdio.h>
+ #include "tiffio.h"
+ main()
+@@ -2550,8 +2586,18 @@
+ 	Note "  Found libtiff version ${lib_ver}"
+ 	if [ ${header_ver} -ge 19960307 ]; then
+ 	    case ${lib_ver} in
+-		3.4)		tiff_runlen_t="uint16" ;;
+-		3.[56789])	tiff_runlen_t="uint32" ;;
++		3.4)		tiff_runlen_t="uint16"
++				echo '#define TIFFSTRIPBYTECOUNTS uint32'
++				echo '#define TIFFVERSION TIFF_VERSION'
++				echo '#define TIFFHEADER TIFFHeader';;
++		3.[56789])	tiff_runlen_t="uint32"
++				echo '#define TIFFSTRIPBYTECOUNTS uint32'
++				echo '#define TIFFVERSION TIFF_VERSION'
++				echo '#define TIFFHEADER TIFFHeader';;
++		4.0)		tiff_runlen_t="uint32"
++				echo '#define TIFFSTRIPBYTECOUNTS uint64'
++				echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
++				echo '#define TIFFHEADER TIFFHeaderClassic';;
+ 	    esac
+ 	fi
+     else
+@@ -2588,7 +2634,7 @@
+ Incompatible TIFF Library.
+ 
+ HylaFAX ${VERSION} requires TIFF software distribution versions 3.4 through
+-3.9.  If you do not have up to date TIFF software on your system
++4.0.  If you do not have up to date TIFF software on your system
+ then you can retrieve it from the location where you obtained this software.
+ The Home Page for version 3.5 and later is http://www.remotesensing.org/libtiff/
+ EOF
+--- hylafax-6.0.5/hfaxd/FileTransfer.c++	2010-09-15 10:42:36.000000000 -0400
++++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-02 17:44:19.000000000 -0500
+@@ -164,26 +142,26 @@
+  * a single IFD/image from a TIFF file.
+  */
+ typedef struct {
+-    TIFFDirEntry	SubFileType;
+-    TIFFDirEntry	ImageWidth;
+-    TIFFDirEntry	ImageLength;
+-    TIFFDirEntry	BitsPerSample;
+-    TIFFDirEntry	Compression;
+-    TIFFDirEntry	Photometric;
+-    TIFFDirEntry	FillOrder;
+-    TIFFDirEntry	StripOffsets;
+-    TIFFDirEntry	Orientation;
+-    TIFFDirEntry	SamplesPerPixel;
+-    TIFFDirEntry	RowsPerStrip;
+-    TIFFDirEntry	StripByteCounts;
+-    TIFFDirEntry	XResolution;
+-    TIFFDirEntry	YResolution;
+-    TIFFDirEntry	Options;		// T4 or T6
+-    TIFFDirEntry	ResolutionUnit;
+-    TIFFDirEntry	PageNumber;
+-    TIFFDirEntry	BadFaxLines;
+-    TIFFDirEntry	CleanFaxData;
+-    TIFFDirEntry	ConsecutiveBadFaxLines;
++    HFClassicTIFFDirEntry	SubFileType;
++    HFClassicTIFFDirEntry	ImageWidth;
++    HFClassicTIFFDirEntry	ImageLength;
++    HFClassicTIFFDirEntry	BitsPerSample;
++    HFClassicTIFFDirEntry	Compression;
++    HFClassicTIFFDirEntry	Photometric;
++    HFClassicTIFFDirEntry	FillOrder;
++    HFClassicTIFFDirEntry	StripOffsets;
++    HFClassicTIFFDirEntry	Orientation;
++    HFClassicTIFFDirEntry	SamplesPerPixel;
++    HFClassicTIFFDirEntry	RowsPerStrip;
++    HFClassicTIFFDirEntry	StripByteCounts;
++    HFClassicTIFFDirEntry	XResolution;
++    HFClassicTIFFDirEntry	YResolution;
++    HFClassicTIFFDirEntry	Options;		// T4 or T6
++    HFClassicTIFFDirEntry	ResolutionUnit;
++    HFClassicTIFFDirEntry	PageNumber;
++    HFClassicTIFFDirEntry	BadFaxLines;
++    HFClassicTIFFDirEntry	CleanFaxData;
++    HFClassicTIFFDirEntry	ConsecutiveBadFaxLines;
+     uint32		link;			// offset to next directory
+     uint32		xres[2];		// X resolution indirect value
+     uint32		yres[2];		// Y resolution indirect value
+@@ -226,10 +204,10 @@
+ 		 * amount of image data and then adding in
+ 		 * the expected data for the TIFF headers.
+ 		 */
+-		uint32* sb;
++		TIFFSTRIPBYTECOUNTS* sb;
+ 		TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
+ 		file_size = sizeof (DirTemplate) +
+-		    sizeof (TIFFHeader) + sizeof (uint16);
++		    sizeof (TIFFHEADER) + sizeof (uint16);
+ 		for (tstrip_t s = 0, ns = TIFFNumberOfStrips(tif); s < ns; s++)
+ 		    file_size += sb[s];
+ 		reply(code, "%s for %s (%lu bytes).",
+@@ -261,10 +239,10 @@
+ 	if (fd >= 0) {
+ 	    union {
+ 		char buf[512];
+-		TIFFHeader h;
++		TIFFHEADER h;
+ 	    } b;
+ 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
+-	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION &&
++	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFFVERSION &&
+ 	      (b.h.tiff_magic == TIFF_BIGENDIAN ||
+ 	       b.h.tiff_magic == TIFF_LITTLEENDIAN)) {
+ 		(void) lseek(fd, 0L, SEEK_SET);		// rewind
+@@ -318,12 +296,12 @@
+ }
+ 
+ static void
+-getLong(TIFF* tif, TIFFDirEntry& de)
++getLong(TIFF* tif, HFClassicTIFFDirEntry& de)
+ {
+     TIFFGetField(tif, de.tdir_tag, &de.tdir_offset);
+ }
+ static void
+-getShort(TIFF* tif, TIFFDirEntry& de)
++getShort(TIFF* tif, HFClassicTIFFDirEntry& de)
+ {
+     uint16 v;
+     TIFFGetField(tif, de.tdir_tag, &v);
+@@ -343,7 +321,7 @@
+ {
+     static DirTemplate templ = {
+ #define	TIFFdiroff(v) \
+-    (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \
++    (uint32) (sizeof (TIFFHEADER) + sizeof (uint16) + \
+       (intptr_t) &(((DirTemplate*) 0)->v))
+ 	{ TIFFTAG_SUBFILETYPE,		TIFF_LONG,	1 },
+ 	{ TIFFTAG_IMAGEWIDTH,		TIFF_LONG,	1 },
+@@ -368,7 +346,7 @@
+ 	0,					// next directory
+ 	{ 0, 1 }, { 0, 1 },			// x+y resolutions
+     };
+-#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (TIFFDirEntry))
++#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (HFClassicTIFFDirEntry))
+     /*
+      * Construct the TIFF header for this IFD using
+      * the preconstructed template above.  We extract
+@@ -377,14 +355,14 @@
+      * of things about the contents of the TIFF file.
+      */
+     struct {
+-	TIFFHeader h;
++	TIFFHEADER h;
+ 	uint16	dircount;
+ 	u_char	dirstuff[sizeof (templ)];
+     } buf;
+     union { int32 i; char c[4]; } u; u.i = 1;
+     buf.h.tiff_magic = (u.c[0] == 0 ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN);
+-    buf.h.tiff_version = TIFF_VERSION;
+-    buf.h.tiff_diroff = sizeof (TIFFHeader);
++    buf.h.tiff_version = TIFFVERSION;
++    buf.h.tiff_diroff = sizeof (TIFFHEADER);
+     buf.dircount = (uint16) NTAGS;
+     getLong(tif, templ.SubFileType);
+     getLong(tif, templ.ImageWidth);
+@@ -412,7 +390,7 @@
+     getShort(tif, templ.CleanFaxData);
+     getLong(tif, templ.ConsecutiveBadFaxLines);
+     if (buf.h.tiff_magic == TIFF_BIGENDIAN) {
+-	TIFFDirEntry* dp = &templ.SubFileType;
++	HFClassicTIFFDirEntry* dp = &templ.SubFileType;
+ 	for (u_int i = 0; i < NTAGS; i++) {
+ 	    if (dp->tdir_type == TIFF_SHORT)
+ 		dp->tdir_offset <<= 16;
+@@ -441,7 +419,7 @@
+ bool
+ HylaFAXServer::sendITIFFData(TIFF* tif, int fdout)
+ {
+-    uint32* sb;
++    TIFFSTRIPBYTECOUNTS* sb;
+     (void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
+     tdata_t buf = _TIFFmalloc(sb[0]);
+     tsize_t bsize = sb[0];
+--- hylafax-6.0.5/hfaxd/FileTransfer.c++	2012-01-28 15:27:47.000000000 -0500
++++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-28 15:30:12.000000000 -0500
+@@ -69,7 +69,7 @@
+ 
+ 
+ static bool
+-isTIFF(const TIFFHeader& h)
++isTIFF(const TIFFHEADER& h)
+ {
+     if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN)
+ 	return (false);
+@@ -82,11 +82,23 @@
+     // byte swap version stamp if opposite byte order
+     if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN))
+ 	TIFFSwabShort(&version);
+-    return (version == TIFF_VERSION);
++    return (version == TIFFVERSION);
+ }
+ 
+ 
+ /*
++ * This is copied right from tiff.h in version 3.8.2.  This was necessary
++ * to localize here because it was removed from tiff.h in version 4.0.
++ * In tiff.h 3.8.2 it was known as "TIFFDirEntry".
++ */
++typedef struct {
++	uint16		tdir_tag;
++	uint16		tdir_type;	/* data type */
++	uint32		tdir_count;	/* number of items; length in spec */
++	uint32		tdir_offset;	/* byte offset to field data */
++} HFClassicTIFFDirEntry;
++ 
++/*
+  * Record a file transfer in the log file.
+  */
+ void
+@@ -957,7 +957,7 @@
+ 	if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) {
+ 	    union {
+ 		char buf[512];
+-		TIFFHeader h;
++		TIFFHEADER h;
+ 	    } b;
+ 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
+ 	    if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!')
diff --git a/staging/hylafax/hylafax.cron.daily b/staging/hylafax/hylafax.cron.daily
new file mode 100644
index 000000000..2d1a77e5c
--- /dev/null
+++ b/staging/hylafax/hylafax.cron.daily
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/sbin/faxqclean
+/usr/sbin/faxcron -rcv 30
diff --git a/staging/hylafax/hylafax.install b/staging/hylafax/hylafax.install
new file mode 100644
index 000000000..5dacf4045
--- /dev/null
+++ b/staging/hylafax/hylafax.install
@@ -0,0 +1,46 @@
+
+print_install() {
+  printf "\n"
+  echo "Add the following to /etc/inittab and run telinit q"
+  echo "  f1:2345:respawn:/usr/lib/fax/faxgetty ttyS0"
+  echo "faxgetty should now be running"
+  printf "\n"
+  echo "Run faxsetup to configure and be sure to set..."
+  echo "  The device to configure is usually ttyS0"
+  echo "  The number of pages to accept to more than 25"
+  echo "  The country code and area code"
+  echo "  The faxclass to 2.0"
+  echo "  Most other defaults are OK"
+  printf "\n"
+}
+
+print_remove() {
+  printf "\n\n"
+  echo "You may manually remove /var/spool/hylafax and /usr/lib/fax if you do not need anything."
+  echo "You may also remove any aliases added to /etc/mail/aliases."
+  printf "\n"
+}
+
+post_install() {
+  post_upgrade
+  print_install
+}
+
+post_upgrade() {
+  groupadd -g 14 uucp &>/dev/null
+  useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null
+  useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null
+  chown uucp /var/spool/hylafax/{,archive,bin,client,config,dev,docq,doneq,etc}
+  chown uucp /var/spool/hylafax/{FIFO,info,log,pollq,recvq,sendq,status,tmp}
+  chown uucp /var/spool/hylafax/etc/{hosts.hfaxd,lutRS18.pcf,xferfaxlog}
+  chown -R uucp /var/spool/hylafax/etc/templates
+  usermod -d '/' uucp &>/dev/null
+  usermod -d '/' fax &>/dev/null
+}
+
+pre_remove() {
+  userdel uucp &>/dev/null
+  groupdel uucp &>/dev/null
+  userdel fax &>/dev/null
+  print_remove
+}
diff --git a/staging/metacity/PKGBUILD b/staging/metacity/PKGBUILD
new file mode 100644
index 000000000..fcd149581
--- /dev/null
+++ b/staging/metacity/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 147952 2012-01-29 03:06:23Z eric $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=metacity
+pkgver=2.34.1
+pkgrel=2
+pkgdesc="A window manager for GNOME"
+arch=(i686 x86_64)
+license=('GPL')
+depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm')
+makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
+url="http://www.gnome.org"
+groups=('gnome')
+options=('!libtool' '!emptydirs')
+install=metacity.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/metacity \
+      --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity "${pkgdir}"/etc/gconf/schemas/*.schemas
+  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+}
diff --git a/staging/metacity/metacity.install b/staging/metacity/metacity.install
new file mode 100644
index 000000000..2eb1e5094
--- /dev/null
+++ b/staging/metacity/metacity.install
@@ -0,0 +1,17 @@
+pkgname=metacity
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
diff --git a/staging/python-notify/PKGBUILD b/staging/python-notify/PKGBUILD
new file mode 100644
index 000000000..b00e72a84
--- /dev/null
+++ b/staging/python-notify/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 147960 2012-01-29 04:17:35Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+# Contributor: Mario Danic <mario.danic@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+pkgname=python-notify
+pkgver=0.1.1
+pkgrel=11
+pkgdesc="Python bindings for libnotify"
+arch=('i686' 'x86_64')
+url="http://www.galago-project.org/"
+license=('GPL')
+depends=('pygtk>=2.22.0' 'libnotify>=0.7.1')
+makedepends=('pkgconfig' 'python2')
+options=(!libtool)
+source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz
+        libnotify07.patch
+        notify-python-0.1.1-fix-GTK-symbols.patch)
+md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4'
+         'b40c4542575d5aef559908fe60a21634'
+         'c6922028da5951e69a6a0167bdb4461c')
+
+build() {
+    cd ${srcdir}/notify-python-${pkgver}
+
+    patch -Np1 -i ${srcdir}/libnotify07.patch
+    patch -Np1 -i ${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch
+
+    ./configure --prefix=/usr
+
+    # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c
+    # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed
+    touch src/pynotify.override
+
+    make clean
+    make
+}
+
+package() {
+    cd ${srcdir}/notify-python-${pkgver}
+    make DESTDIR=${pkgdir} install
+}
diff --git a/staging/python-notify/libnotify07.patch b/staging/python-notify/libnotify07.patch
new file mode 100644
index 000000000..289573d50
--- /dev/null
+++ b/staging/python-notify/libnotify07.patch
@@ -0,0 +1,36 @@
+diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
+--- notify-python-0.1.1/src/pynotify.defs.notify070	2010-11-02 17:11:14.928179237 -0400
++++ notify-python-0.1.1/src/pynotify.defs	2010-11-02 17:11:51.153180231 -0400
+@@ -38,7 +38,6 @@
+     '("const-gchar*" "summary")
+     '("const-gchar*" "message" (null-ok) (default "NULL"))
+     '("const-gchar*" "icon" (null-ok) (default "NULL"))
+-    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
+   )
+ )
+ 
+@@ -53,24 +52,6 @@
+   )
+ )
+ 
+-(define-method attach_to_widget
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_widget")
+-  (return-type "none")
+-  (parameters
+-    '("GtkWidget*" "attach")
+-  )
+-)
+-
+-(define-method attach_to_status_icon
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_status_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GtkStatusIcon*" "attach")
+-  )
+-)
+-
+ (define-method show
+   (of-object "NotifyNotification")
+   (c-name "notify_notification_show")
diff --git a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
new file mode 100644
index 000000000..f985c0136
--- /dev/null
+++ b/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
@@ -0,0 +1,25 @@
+diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
+--- notify-python-0.1.1/src/__init__.py.BAD	2010-08-31 09:04:45.353844005 -0400
++++ notify-python-0.1.1/src/__init__.py	2010-08-31 09:04:49.281844300 -0400
+@@ -1 +1,21 @@
++"""
++Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
++was to support being linked against different parallel-installable
++GTK stacks.
++
++Unfortunately, python needs to jump through some special hoops in order
++to share symbols with extension modules, specifically, pygtk, which does
++link against GTK2.
++
++Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
++the result is:
++libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
++
++Thanks to David Malcolm for figuring out the workaround.
++"""
++import ctypes
++import sys
++sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
++import gtk
++
+ from _pynotify import *
diff --git a/staging/python-pygame/ChangeLog b/staging/python-pygame/ChangeLog
new file mode 100644
index 000000000..566be3f65
--- /dev/null
+++ b/staging/python-pygame/ChangeLog
@@ -0,0 +1,34 @@
+2012-01-24  Angel Velasquez <angvp@archlinux.org>
+
+	* Rebuilt against libpng 1.5
+
+2010-08-24  Eric Belanger  <eric@archlinux.org>
+
+	* Rebuilt for python2
+
+2009-08-06  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated to: 1.9.1
+
+2009-08-03  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Adding the examples folder
+
+2009-08-01  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for x86_64: 1.9.0
+
+2008-08-06  Eric Belanger  <eric@archlinux.org>
+
+	* python-pygame 1.8.1-2
+	* Fixed file permissions (close FS#11082)
+
+2008-07-31  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for i686: 1.8.1
+
+2008-03-31  Eric Belanger  <eric@archlinux.org>
+
+	* python-pygame 1.8.0-1
+	* Upstream update
+	* Added ChangeLog
diff --git a/staging/python-pygame/PKGBUILD b/staging/python-pygame/PKGBUILD
new file mode 100644
index 000000000..20b37e9ac
--- /dev/null
+++ b/staging/python-pygame/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 147958 2012-01-29 04:08:03Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: john(?)
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+pkgname=python-pygame
+pkgver=1.9.1
+pkgrel=4
+pkgdesc="Python game library"
+arch=('i686' 'x86_64')
+url="http://www.pygame.org/"
+license=('LGPL')
+depends=('sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg')
+makedepends=('python2' 'portmidi') 
+replaces=('pygame')
+provides=('pygame')
+changelog=ChangeLog
+source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch'
+'pygame-v4l.patch')
+md5sums=('1c4cdc708d17c8250a2d78ef997222fc'
+         'aaa668f3cd710d8604114501ea6a6f48'
+         '9915b63865c16519e80007909beed876')
+
+build() {
+	cd "${srcdir}/pygame-${pkgver}release"
+	patch -Np0 -i "${srcdir}/config.patch"
+    patch -Np1 -i "${srcdir}/pygame-v4l.patch"
+}
+
+package() {
+	cd "${srcdir}/pygame-${pkgver}release"
+	python2 config.py -auto
+	python2 setup.py install --root="${pkgdir}" --prefix=/usr
+	# Copying the examples and tests
+	cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
+	cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
+	# Fixing permissions
+	chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
+}
diff --git a/staging/python-pygame/config.patch b/staging/python-pygame/config.patch
new file mode 100644
index 000000000..b3dab162c
--- /dev/null
+++ b/staging/python-pygame/config.patch
@@ -0,0 +1,26 @@
+Index: config_unix.py
+===================================================================
+--- config_unix.py	(revision 2567)
++++ config_unix.py	(working copy)
+@@ -174,7 +174,7 @@
+ 
+     for d in DEPS[1:]:
+         if not d.found:
+-            if not confirm("""
++            if "-auto" not in sys.argv and not confirm("""
+ Warning, some of the pygame dependencies were not found. Pygame can still
+ compile and install, but games that depend on those missing dependencies
+ will not run. Would you like to continue the configuration?"""):
+Index: config_msys.py
+===================================================================
+--- config_msys.py	(revision 2567)
++++ config_msys.py	(working copy)
+@@ -283,7 +283,7 @@
+     
+     for d in DEPS[1:]:
+         if not d.found:
+-            if not confirm("""
++            if "-auto" not in sys.argv and not confirm("""
+ Warning, some of the pygame dependencies were not found. Pygame can still
+ compile and install, but games that depend on those missing dependencies
+ will not run. Would you like to continue the configuration?"""):
diff --git a/staging/python-pygame/pygame-v4l.patch b/staging/python-pygame/pygame-v4l.patch
new file mode 100644
index 000000000..3b5a2b9d2
--- /dev/null
+++ b/staging/python-pygame/pygame-v4l.patch
@@ -0,0 +1,88 @@
+diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
+*** pygame-1.9.1release/Setup.in	Thu Jul  2 06:41:56 2009
+--- pygame-1.9.1release-v4lpatch//Setup.in	Thu Mar 24 17:31:22 2011
+***************
+*** 34,40 ****
+  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
+  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+  
+  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+--- 34,40 ----
+  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
+  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+  
+  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
+*** pygame-1.9.1release/src/_camera.c	Sun Mar 15 20:30:41 2009
+--- pygame-1.9.1release-v4lpatch//src/_camera.c	Thu Mar 24 16:58:18 2011
+***************
+*** 160,179 ****
+  {
+  #if defined(__unix__)
+      if (v4l2_open_device(self) == 0) {
+!         if (v4l_open_device(self) == 0) {
+!             v4l2_close_device(self);
+!             return NULL;
+!         } else {
+!             self->camera_type = CAM_V4L;
+!             if (v4l_init_device(self) == 0) {
+!                 v4l2_close_device(self);
+!                 return NULL;
+!             }
+!             if (v4l_start_capturing(self) == 0) {
+!                 v4l2_close_device(self);
+!                 return NULL;
+!             }
+!         }
+      } else {
+          self->camera_type = CAM_V4L2;
+          if (v4l2_init_device(self) == 0) {
+--- 160,167 ----
+  {
+  #if defined(__unix__)
+      if (v4l2_open_device(self) == 0) {
+! 	v4l2_close_device(self);
+!         return NULL;
+      } else {
+          self->camera_type = CAM_V4L2;
+          if (v4l2_init_device(self) == 0) {
+diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
+*** pygame-1.9.1release/src/camera.h	Fri Oct 10 04:37:10 2008
+--- pygame-1.9.1release-v4lpatch//src/camera.h	Thu Mar 24 16:44:32 2011
+***************
+*** 39,45 ****
+  
+      #include <asm/types.h>          /* for videodev2.h */
+  
+-     #include <linux/videodev.h>
+      #include <linux/videodev2.h>
+  #endif
+  
+--- 39,44 ----
+***************
+*** 51,57 ****
+  #define RGB_OUT 1
+  #define YUV_OUT 2
+  #define HSV_OUT 4
+- #define CAM_V4L 1
+  #define CAM_V4L2 2
+  
+  struct buffer 
+--- 50,55 ----
+***************
+*** 111,118 ****
+  int v4l2_close_device (PyCameraObject* self);
+  int v4l2_open_device (PyCameraObject* self);
+  
+- /* internal functions specific to v4l */
+- int v4l_open_device (PyCameraObject* self);
+- int v4l_init_device(PyCameraObject* self);
+- int v4l_start_capturing(PyCameraObject* self);
+  #endif
+--- 109,112 ----
diff --git a/staging/pywebkitgtk/PKGBUILD b/staging/pywebkitgtk/PKGBUILD
new file mode 100644
index 000000000..792ef185c
--- /dev/null
+++ b/staging/pywebkitgtk/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 147954 2012-01-29 03:55:38Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>  
+# Contributor: kasa <biuta.jr@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=pywebkitgtk
+pkgver=1.1.8
+pkgrel=2
+pkgdesc="Python bindings to the WebKit GTK+ port"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/pywebkitgtk/"
+license=('LGPL')
+depends=('libwebkit' 'pygtk')
+options=('!libtool' '!makeflags')
+source=(http://pywebkitgtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+md5sums=('158335385354ba38090c9324b37bf225')
+
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    make DESTDIR=${pkgdir} install
+}
diff --git a/testing/curl/0001-include-headers-for-tcp-keepalives.patch b/testing/curl/0001-include-headers-for-tcp-keepalives.patch
new file mode 100644
index 000000000..780fb5b82
--- /dev/null
+++ b/testing/curl/0001-include-headers-for-tcp-keepalives.patch
@@ -0,0 +1,31 @@
+From d906981b20d41466d040e6cc2570099c8d665f7f Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Sat, 28 Jan 2012 08:05:02 -0500
+Subject: [PATCH] include headers for tcp-keepalives
+
+---
+ src/tool_cb_skt.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/src/tool_cb_skt.c b/src/tool_cb_skt.c
+index 156c110..e74d5e4 100644
+--- a/src/tool_cb_skt.c
++++ b/src/tool_cb_skt.c
+@@ -27,6 +27,14 @@
+ #  include <sys/socket.h>
+ #endif
+ 
++#ifdef HAVE_NETINET_TCP_H
++#  include <netinet/tcp.h>
++#endif
++
++#ifdef HAVE_NETINET_IN_H
++#  include <netinet/in.h>
++#endif
++
+ #define ENABLE_CURLX_PRINTF
+ /* use our own printf() functions */
+ #include "curlx.h"
+-- 
+1.7.8.4
+
diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
index 4762c277c..43ef820bc 100644
--- a/testing/curl/PKGBUILD
+++ b/testing/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147206 2012-01-24 17:51:49Z dreisner $
+# $Id: PKGBUILD 147942 2012-01-28 13:31:34Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=curl
 pkgver=7.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An URL retrival utility and library"
 arch=('i686' 'x86_64')
 url="http://curl.haxx.se"
@@ -15,11 +15,11 @@ license=('MIT')
 depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
 options=('!libtool')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        fix-J-with-O-regression.patch
+        0001-include-headers-for-tcp-keepalives.patch
         curlbuild.h)
 md5sums=('b93420f80a2baaa61a0f45214eddc2ba'
          '710242df6bc318d16eea611e7d1b1410'
-         'aa4539ec4f4a2dad1663dc22dd3ab0a1'
+         '84833972c2ff36abb2bfdd4ac065c2e5'
          '751bd433ede935c8fae727377625a8ae')
 
 ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
@@ -34,6 +34,8 @@ esac
 build() {
   cd "$pkgname-$pkgver"
 
+  patch -Np1 < "$srcdir/0001-include-headers-for-tcp-keepalives.patch"
+
   ./configure \
       --prefix=/usr \
       --mandir=/usr/share/man \
diff --git a/~mtjm/python-getmediumurl/PKGBUILD b/~mtjm/python-getmediumurl/PKGBUILD
new file mode 100644
index 000000000..bacc1c0f1
--- /dev/null
+++ b/~mtjm/python-getmediumurl/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+
+_pkgname=GetMediumURL
+pkgname=python-getmediumurl
+pkgver=0.0a5
+pkgrel=1
+pkgdesc="A package for getting URLs of media files from some websites"
+arch=("any")
+url="http://savannah.nongnu.org/projects/getmediumurl/"
+license=('AGPL')
+depends=('python' 'python3-lxml' 'python-urlreader' 'python-distribute')
+checkdepends=('python2')  # due to my laziness
+options=(!emptydirs)
+source=("http://download.savannah.gnu.org/releases/getmediumurl/${_pkgname}-${pkgver}.tar.gz")
+md5sums=("0d3660e178bd58549d7a5718f8e39de2")
+
+check() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  LANG=en_US.UTF-8 python setup.py test
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  LANG=en_US.UTF-8 python setup.py install --root="$pkgdir/" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~mtjm/python-urlreader/PKGBUILD b/~mtjm/python-urlreader/PKGBUILD
new file mode 100644
index 000000000..4ffe93c6f
--- /dev/null
+++ b/~mtjm/python-urlreader/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+
+_pkgname=URLReader
+pkgname=python-urlreader
+pkgver=0.0a1
+pkgrel=1
+pkgdesc="Simple package for cached URL fetching"
+arch=("any")
+url="http://hg.mtjm.eu/urlreader/"
+license=('AGPL')
+depends=('python' 'python-distribute')
+checkdepends=('python2')  # due to my laziness
+options=(!emptydirs)
+source=("http://pypi.python.org/packages/source/U/URLReader/URLReader-${pkgver}.tar.gz")
+md5sums=("5a96519a24099aae05fc0612d9cfd650")
+
+check() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  LANG=en_US.UTF-8 python setup.py test
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  LANG=en_US.UTF-8 python setup.py install --root="$pkgdir/" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~mtjm/python3-lxml/PKGBUILD b/~mtjm/python3-lxml/PKGBUILD
new file mode 100644
index 000000000..5d4effa47
--- /dev/null
+++ b/~mtjm/python3-lxml/PKGBUILD
@@ -0,0 +1,38 @@
+# Based on python-lxml.
+# $Id: PKGBUILD 146500 2012-01-12 05:14:02Z eric $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Guillem Rieu <guillemr@gmx.net>
+
+pkgname=python3-lxml
+pkgver=2.3.3
+pkgrel=1
+pkgdesc="Python 3 binding for the libxml2 and libxslt libraries"
+arch=('i686' 'x86_64' 'mips64el')
+license=('BSD' 'custom')
+url="http://lxml.de/"
+depends=('python' 'libxslt')
+conflicts=('lxml')
+source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
+md5sums=('a7825793c69d004f388ec6600bad7a6f'
+         '5c4b1a05f6e46a4dd7ebed8b5ad9e32e')
+
+check() {
+  cd "${srcdir}"/lxml-$pkgver
+  make test
+}
+
+package() {
+  cd "${srcdir}"/lxml-$pkgver
+
+  python setup.py install --root="${pkgdir}" --optimize=1
+
+  install -Dm644 LICENSES.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 doc/licenses/BSD.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
+  install -Dm644 doc/licenses/elementtree.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
+}
author	root <root@rshg054.dnsready.net>	2012-01-29 23:15:03 +0000
committer	root <root@rshg054.dnsready.net>	2012-01-29 23:15:03 +0000
commit	39711f3264d3b9de2ff6392649274d6333932457 (patch)
tree	de0577b44ca853064f52a0df25ee9f22efd756bc
parent	738e6c6d93b4c7118e49b38c610abed8b7f7d55a (diff)