Fixed

60 files changed, 0 insertions, 4745 deletions

diff --git a/staging/kdeaccessibility/PKGBUILD b/staging/kdeaccessibility/PKGBUILD
deleted file mode 100644
index d342f92e5..000000000
--- a/staging/kdeaccessibility/PKGBUILD
+++ /dev/null
@@ -1,98 +0,0 @@
-# $Id: PKGBUILD 118070 2011-04-05 10:08:11Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeaccessibility
-pkgname=('kdeaccessibility-colorschemes'
-         'kdeaccessibility-iconthemes'
-         'kdeaccessibility-jovie'
-         'kdeaccessibility-kaccessible'
-         'kdeaccessibility-kmag'
-         'kdeaccessibility-kmousetool'
-         'kdeaccessibility-kmouth')
-pkgver=4.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://accessibility.kde.org'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime'
-        'speech-dispatcher' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('5e8e92a312b2c995602a66cc775009839122053d')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_Opentts=OFF
-	make
-}
-
-package_kdeaccessibility-colorschemes() {
-	pkgdesc='KDE Accessibility color schemes'
-	cd $srcdir/build/ColorSchemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-iconthemes() {
-	pkgdesc='KDE Accessibility icon themes'
-	cd $srcdir/build/IconThemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-jovie() {
-	pkgdesc='A text to speech application'
-	depends=('kdebase-runtime' 'speech-dispatcher')
-    replaces=('kdeaccessibility-kttsd')
-	install='kdeaccessibility.install'
-	cd $srcdir/build/jovie
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/jovie
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kaccessible() {
-    pkgdesc='Provides accessibility services like focus tracking and a screenreader'
-    depends=('kdebase-runtime' 'speech-dispatcher')
-	install='kdeaccessibility.install'
-    cd $srcdir/build/kaccessible
-    make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmag() {
-	pkgdesc='Screen Magnifier'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmag/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmag
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmag
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmousetool() {
-	pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmousetool/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmousetool
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmousetool
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmouth() {
-	pkgdesc='Speech Synthesizer Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmouth/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmouth
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmouth
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeaccessibility/kdeaccessibility.install b/staging/kdeaccessibility/kdeaccessibility.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeaccessibility/kdeaccessibility.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD
deleted file mode 100644
index cef42cdd0..000000000
--- a/staging/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 118071 2011-04-05 10:08:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeadmin
-pkgname=('kdeadmin-kcron'
-         'kdeadmin-ksystemlog'
-         'kdeadmin-kuser'
-         'kdeadmin-system-config-printer-kde')
-pkgver=4.6.2
-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' 'python2-qt' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'syslog-path.patch')
-sha1sums=('33d756b1cef42d272b617bfba400e9116b34f311'
-          '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
-
-build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-	patch -p1 -i ${srcdir}/syslog-path.patch
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_kpackage=OFF \
-		-DBUILD_knetworkconf=OFF \
-		-DBUILD_lilo-config=OFF \
-		-DBUILD_strigi-analyzer=OFF
-	make
-}
-
-package_kdeadmin-kcron() {
-	pkgdesc='Configure and schedule tasks'
-	depends=('kdelibs')
-	cd $srcdir/build/kcron
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcron
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-ksystemlog() {
-	pkgdesc='System log viewer tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/ksystemlog/"
-	cd $srcdir/build/ksystemlog
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksystemlog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-kuser() {
-	pkgdesc='User Manager'
-	depends=('kdepim-runtime')
-	url="http://kde.org/applications/system/kuser/"
-	install='kdeadmin.install'
-	cd $srcdir/build/kuser
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kuser
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-system-config-printer-kde() {
-	pkgdesc='Configure local and remote Printers'
-	depends=('kdebindings-python' 'system-config-printer-common' 'python2-qt')
-	url="http://kde.org/applications/system/printerapplet/"
-	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|'
-}
diff --git a/staging/kdeadmin/kdeadmin.install b/staging/kdeadmin/kdeadmin.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeadmin/kdeadmin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeadmin/syslog-path.patch b/staging/kdeadmin/syslog-path.patch
deleted file mode 100644
index 8a9142bf6..000000000
--- a/staging/kdeadmin/syslog-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~	2011-01-27 14:24:29.840000005 +0100
-+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h	2011-01-27 14:24:53.803333335 +0100
-@@ -39,7 +39,7 @@
- 		SystemConfiguration() :
- 			GenericLogModeConfiguration(
- 					QLatin1String( SYSTEM_LOG_MODE_ID ),
--					QStringList() << QLatin1String( "/var/log/syslog" ),
-+					QStringList() << QLatin1String( "/var/log/messages.log" ),
- 					QList<int>() << INFORMATION_LOG_LEVEL_ID
- 			) {
- 
diff --git a/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD
deleted file mode 100644
index 1959308a1..000000000
--- a/staging/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 118072 2011-04-05 10:08:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeartwork
-pkgname=('kdeartwork-aurorae'
-         'kdeartwork-colorschemes'
-         'kdeartwork-desktopthemes'
-         'kdeartwork-emoticons'
-         'kdeartwork-iconthemes'
-         'kdeartwork-kscreensaver'
-         'kdeartwork-sounds'
-         'kdeartwork-styles'
-         'kdeartwork-wallpapers'
-         'kdeartwork-weatherwallpapers')
-pkgver=4.6.2
-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'
-	'docbook-xsl' 'kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('2a264081e50f2d2d78d98080db8f013f3148f9b2')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeartwork-aurorae() {
-	pkgdesc='An Aurorae theme based on the Oxygen plasma theme'
-	cd $srcdir/build/aurorae
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-colorschemes() {
-	pkgdesc='KDE color schemes'
-	cd $srcdir/build/ColorSchemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-desktopthemes() {
-	pkgdesc='KDE desktop themes'
-	cd $srcdir/build/desktopthemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-emoticons() {
-	pkgdesc='KDE emoticons'
-	cd $srcdir/build/emoticons
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-iconthemes() {
-	pkgdesc='KDE icon themes'
-	cd $srcdir/build/IconThemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-kscreensaver() {
-	pkgdesc='KDE screensaver'
-	depends=('kdebase-workspace' 'kdegraphics-libs')
-	cd $srcdir/build/kscreensaver
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-sounds() {
-	pkgdesc='KDE sounds'
-	cd $srcdir/build/sounds
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-styles() {
-	pkgdesc='KDE styles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/styles
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kwin-styles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-wallpapers() {
-	pkgdesc='KDE wallpapers'
-	cd $srcdir/build/wallpapers
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/HighResolutionWallpapers
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-weatherwallpapers() {
-	pkgdesc='KDE weather wallpapers'
-	cd $srcdir/build/WeatherWallpapers
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD
deleted file mode 100644
index 654c6103f..000000000
--- a/staging/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 118064 2011-04-05 10:07:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.6.2
-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'
-        'docbook-xsl')
-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/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d939d78f82e8c9d1257552abac08e4da1ff28c51')
-
-build() {
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
-	ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-}
diff --git a/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/staging/kdebase-runtime/kdebase-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD
deleted file mode 100644
index e30f73a9a..000000000
--- a/staging/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 118067 2011-04-05 10:07:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-pkgver=4.6.2
-pkgrel=1
-pkgdesc="KDE Base Workspace"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde')
-# note on libxdamage:
-# 	not detected by namcap because libgl depends on it
-#	but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate'
-        'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez'
-        'docbook-xsl' 'python2' 'kdebindings-python')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
-        'etc/pam.d/kde'
-        'etc/pam.d/kde-np'
-        'etc/pam.d/kscreensaver')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch')
-sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7'
-          '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
-          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          'f7b38af38549242a240f1a90ab9964ca8a366129'
-          '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
-	patch -p0 -i ${srcdir}/fixpath.patch
-	patch -p0 -i ${srcdir}/terminate-server.patch
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_Xmms=OFF \
-		-DWITH_Googlegadgets=OFF \
-		-DWITH_PolkitQt=OFF
-	make
-}
-
-package() {
-	cd $srcdir/build
-	make DESTDIR=$pkgdir install
-
-	install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
-	install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
-	install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np
-	install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver
-	install -d -m755 ${pkgdir}/usr/share/xsessions/
-	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop ${pkgdir}/usr/share/xsessions/
-	install -d -m755 ${pkgdir}/etc/kde/{env,shutdown}
-
-	install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm
-}
diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/staging/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2 
- export MALLOC_CHECK_
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`$bindir/kde4-config --qt-binaries`
--  if [ -n "$qbindir" ]; then
--    case $PATH in
--      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
--      *) PATH=$qbindir:$PATH; export PATH;;
--    esac
--  fi
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam
deleted file mode 100644
index 81eeef47b..000000000
--- a/staging/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth		required	pam_nologin.so
-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
diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam
deleted file mode 100644
index 1a259390f..000000000
--- a/staging/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-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
diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index 3a1b2404a..000000000
--- a/staging/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
-	groupadd -g 135 kdm &>/dev/null
-	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-}
-
-post_upgrade() {
-	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
-	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_remove() {
-	if getent passwd kdm >/dev/null 2>&1; then
-	  userdel kdm
-	fi
-	if getent group kdm >/dev/null 2>&1; then
-	  groupdel kdm
-	fi
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/staging/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
-  start)
-    stat_busy "Starting KDE Desktop Manager"
-    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon kdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping KDE Desktop Manager"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon kdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/kdebase-workspace/kdm-zsh-profile.patch b/staging/kdebase-workspace/kdm-zsh-profile.patch
deleted file mode 100644
index 779456b39..000000000
--- a/staging/kdebase-workspace/kdm-zsh-profile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/genkdmconf.c	2008-02-13 09:40:49.000000000 +0000
-+++ kdm/kfrontend/genkdmconf.c	2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- "    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- "    zhome=${ZDOTDIR:-$HOME}\n"
- "    # zshenv is always sourced automatically.\n"
--"    [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+"    [ -f /etc/profile ] && . /etc/profile\n"
- "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/staging/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/staging/kdebase-workspace/terminate-server.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/config.def	2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def	2009-10-31 00:40:21.000000000 +0100
-@@ -1448,7 +1448,7 @@
- 
- Key: TerminateServer
- Type: bool
--Default: false
-+Default: true
- User: core
- Instance: #:*/!
- Merge: xdm
diff --git a/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD
deleted file mode 100644
index 5a04c2341..000000000
--- a/staging/kdebase/PKGBUILD
+++ /dev/null
@@ -1,129 +0,0 @@
-# $Id: PKGBUILD 118068 2011-04-05 10:08:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdebase
-pkgname=('kdebase-dolphin'
-         'kdebase-kdepasswd'
-         'kdebase-kdialog'
-         'kdebase-keditbookmarks'
-         'kdebase-kfind'
-         'kdebase-konqueror'
-         'kdebase-konsole'
-         'kdebase-kwrite'
-         'kdebase-lib'
-         'kdebase-plasma')
-pkgver=4.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('e9e46a6b4f5580996a1484da6d2ef17f418eec69')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdebase-dolphin() {
-	pkgdesc='File Manager'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	optdepends=('ruby: servicemenu installation')
-	url="http://kde.org/applications/system/dolphin/"
-	cd $srcdir/build/dolphin
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dolphin
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdepasswd() {
-	pkgdesc='Change Password'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	cd $srcdir/build/kdepasswd
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kdepasswd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdialog() {
-	pkgdesc='A utility for displaying dialog boxes from shell scripts'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kdialog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-keditbookmarks() {
-	pkgdesc='Bookmark Organizer and Editor'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/keditbookmarks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kfind() {
-	pkgdesc='Find Files/Folders'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	url="http://kde.org/applications/utilities/kfind/"
-	install='kdebase.install'
-	cd $srcdir/build/kfind
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfind
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konqueror() {
-	pkgdesc='KDE File Manager & Web Browser'
-	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
-}
-
-package_kdebase-konsole() {
-	pkgdesc='Terminal'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/konsole/"
-	cd $srcdir/build/konsole
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/konsole/doc/manual
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kwrite() {
-	pkgdesc='Text Editor'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kwrite/"
-	cd $srcdir/build/kwrite
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kwrite
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-lib() {
-	pkgdesc='KDE libraries for the basic desktop applications'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/lib
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-plasma() {
-	pkgdesc='Display the contents of folders (User´s home folder as default)'
-	depends=('kdebase-workspace' 'kdebase-lib')
-	cd $srcdir/build/plasma
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdebase/kdebase.install b/staging/kdebase/kdebase.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdebase/kdebase.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdebindings/PKGBUILD b/staging/kdebindings/PKGBUILD
deleted file mode 100644
index b2266cf92..000000000
--- a/staging/kdebindings/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 107102 2011-01-21 11:16:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdebindings
-pkgname=('kdebindings-csharp'
-         'kdebindings-python'
-         'kdebindings-ruby'
-         'kdebindings-smoke')
-pkgver=4.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'python2-qt' 'kdepim-runtime' 'mono'
-	'kdegraphics-okular' 'qwt' 'docbook-xsl' 'boost' 'qscintilla' 'ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('eff4b5785b09958fffe4e23583f5af75c796aa9e')
-
-build() {
-	export MONO_SHARED_DIR="${srcdir}/build/.mono"
-	mkdir -p "$MONO_SHARED_DIR"
-
-	cd ${srcdir}/build
-
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DRUBY_SITE_LIB_DIR="/usr/lib/ruby/site_ruby/1.9.1" \
-        -DRUBY_SITE_ARCH_DIR="/usr/lib/ruby/site_ruby/1.9.1/${CARCH}-linux" \
-		-DBUILD_falcon=OFF \
-		-DBUILD_java=OFF \
-		-DBUILD_php=OFF \
-		-DWITH_PolkitQt=OFF
-	make
-}
-
-package_kdebindings-csharp() {
-	pkgdesc='KDE bindings for mono'
-	depends=('kdebindings-smoke' 'mono')
-	export MONO_SHARED_DIR="${srcdir}/build/.mono"
-	mkdir -p "$MONO_SHARED_DIR"
-	cd $srcdir/build/csharp
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebindings-python() {
-	pkgdesc='KDE bindings for python'
-	depends=('kdepim-runtime' 'python2-qt' 'qscintilla')
-	cd $srcdir/build/python
-	make DESTDIR=$pkgdir install
-
-	# Use the python2 executable
-	find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdebindings-ruby() {
-	pkgdesc='KDE Bindings for ruby'
-	depends=('kdebindings-smoke' 'ruby')
-	cd $srcdir/build/ruby
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebindings-smoke() {
-	pkgdesc='Language independent library for Qt and KDE bindings'
-	depends=('qscintilla' 'kdegraphics-okular' 'kdepim-runtime')
-	cd $srcdir/build/smoke
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/generator/smokebase
-    make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeedu/PKGBUILD b/staging/kdeedu/PKGBUILD
deleted file mode 100644
index 4de1a090c..000000000
--- a/staging/kdeedu/PKGBUILD
+++ /dev/null
@@ -1,276 +0,0 @@
-# $Id: PKGBUILD 118069 2011-04-05 10:08:07Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeedu
-pkgname=('kdeedu-blinken'
-         'kdeedu-cantor'
-         'kdeedu-data'
-         'kdeedu-kalgebra'
-         'kdeedu-kalzium'
-         'kdeedu-kanagram'
-         'kdeedu-kbruch'
-         'kdeedu-kgeography'
-         'kdeedu-khangman'
-         'kdeedu-kig'
-         'kdeedu-kiten'
-         'kdeedu-klettres'
-         'kdeedu-kmplot'
-         'kdeedu-kstars'
-         'kdeedu-ktouch'
-         'kdeedu-kturtle'
-         'kdeedu-kwordquiz'
-         'kdeedu-libkdeedu'
-         'kdeedu-marble'
-         'kdeedu-parley'
-         'kdeedu-rocs'
-         'kdeedu-step')
-pkgver=4.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd'
-	'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre'
-	'python2' 'docbook-xsl' 'avogadro')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05')
-
-build() {
-    cd $srcdir
-	mkdir build
-	cd build
-	# rpath is needed for cantor to find R
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=OFF \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeedu-blinken() {
-	pkgdesc='A memory enhancement game'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
-	install='kdeedu.install'
-	cd $srcdir/build/blinken
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/blinken
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-cantor() {
-	pkgdesc='KDE Frontend to Mathematical Software'
-	depends=('kdeedu-libkdeedu' 'libspectre')
-	optdepends=('kdeedu-kalgebra: backend'
-		'maxima: backend'
-		'r: backend')
-	install='kdeedu.install'
-	cd $srcdir/build/cantor
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/cantor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-data() {
-	pkgdesc='Data for KDE Educational Software'
-	groups=()
-	cd $srcdir/build/data
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kalgebra() {
-	pkgdesc='Math Expression Solver and Plotter'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kalgebra
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kalgebra
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kalzium() {
-	pkgdesc='KDE Periodic Table of Elements'
-	depends=('kdebase-runtime'  'kdeedu-libkdeedu' 'avogadro')
-	install='kdeedu.install'
-	cd $srcdir/build/kalzium
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kalzium
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kanagram() {
-	pkgdesc='KDE Letter Order Game'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
-	install='kdeedu.install'
-	cd $srcdir/build/kanagram
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kanagram
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kbruch() {
-	pkgdesc='Practice exercises with fractions'
-	depends=('kdelibs' 'kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kbruch
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbruch
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kgeography() {
-	pkgdesc='A Geography Learning Program'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kgeography
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kgeography
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-khangman() {
-	pkgdesc='KDE Hangman Game'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
-	install='kdeedu.install'
-	cd $srcdir/build/khangman
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/khangman
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kig() {
-	pkgdesc='Explore Geometric Constructions'
-	depends=('kdebase-runtime' 'boost-libs' 'python2')
-	install='kdeedu.install'
-	cd $srcdir/build/kig
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kig
-	make DESTDIR=$pkgdir install
-
-	# Use the python2 executable
-	sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/bin/pykig.py
-}
-
-package_kdeedu-kiten() {
-	pkgdesc='Japanese Reference and Study Tool'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kiten
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kiten
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-klettres() {
-	pkgdesc='a KDE program to learn the alphabet'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/klettres
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klettres
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kmplot() {
-	pkgdesc='Function Plotter'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kmplot
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmplot
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kstars() {
-	pkgdesc='Desktop Planetarium'
-	depends=('kdebase-runtime' 'libindi')
-	install='kdeedu.install'
-	cd $srcdir/build/kstars
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kstars
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-ktouch() {
-	pkgdesc='Touch Typing Tutor'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/ktouch
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktouch
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kturtle() {
-	pkgdesc='Educational Programming Environment'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kturtle
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kturtle
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kwordquiz() {
-	pkgdesc='A flashcard and vocabulary learning program'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
-	install='kdeedu.install'
-	cd $srcdir/build/kwordquiz
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kwordquiz
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-libkdeedu() {
-	pkgdesc='Support library for KDE Educational Software'
-	groups=()
-	depends=('kdelibs')
-	install='kdeedu.install'
-	cd $srcdir/build/libkdeedu
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \
-		$pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake
-}
-
-package_kdeedu-marble() {
-	pkgdesc='Desktop Globe'
-	depends=('kdebase-runtime' 'gpsd')
-	install='kdeedu.install'
-	cd $srcdir/build/marble
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/marble
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \
-		$pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake
-}
-
-package_kdeedu-parley() {
-	pkgdesc='Vocabulary Trainer'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python')
-	install='kdeedu.install'
-	cd $srcdir/build/parley
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/parley
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-rocs() {
-	pkgdesc='Graph Theory Tool for Professors and Students.'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
-	install='kdeedu.install'
-	cd $srcdir/build/rocs
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/rocs
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-step() {
-	pkgdesc='Simulate physics experiments'
-	depends=('kdebase-runtime' 'gsl' 'libqalculate')
-	install='kdeedu.install'
-	cd $srcdir/build/step
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/step
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeedu/kdeedu.install b/staging/kdeedu/kdeedu.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu/kdeedu.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD
deleted file mode 100644
index c3cc8f1f9..000000000
--- a/staging/kdegames/PKGBUILD
+++ /dev/null
@@ -1,515 +0,0 @@
-# $Id: PKGBUILD 118073 2011-04-05 10:08:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdegames
-pkgname=('kdegames-bomber'
-         'kdegames-bovo'
-         'kdegames-granatier'
-         'kdegames-kajongg'
-         'kdegames-kapman'
-         'kdegames-katomic'
-         'kdegames-kbattleship'
-         'kdegames-kblackbox'
-         'kdegames-kblocks'
-         'kdegames-kbounce'
-         'kdegames-kbreakout'
-         'kdegames-kdiamond'
-         'kdegames-kfourinline'
-         'kdegames-kgoldrunner'
-         'kdegames-kigo'
-         'kdegames-killbots'
-         'kdegames-kiriki'
-         'kdegames-kjumpingcube'
-         'kdegames-klines'
-         'kdegames-klickety'
-         'kdegames-kmahjongg'
-         'kdegames-kmines'
-         'kdegames-knetwalk'
-         'kdegames-kolf'
-         'kdegames-kollision'
-         'kdegames-konquest'
-         'kdegames-kpatience'
-         'kdegames-kreversi'
-         'kdegames-kshisen'
-         'kdegames-ksirk'
-         'kdegames-kspaceduel'
-         'kdegames-ksquares'
-         'kdegames-ksudoku'
-         'kdegames-ktron'
-         'kdegames-ktuberling'
-         'kdegames-kubrick'
-         'kdegames-libkdegames'
-         'kdegames-libkmahjongg'
-         'kdegames-lskat'
-         'kdegames-palapeli')
-pkgver=4.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'ggz-client-libs'
-	'twisted' 'kdebindings-python' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('91ec7347488504931b4019182a3f2b91a60d8065')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_OpenAL=OFF
-	make
-}
-
-package_kdegames-bomber() {
-	pkgdesc='Arcade Bombing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bomber/"
-	install='kdegames.install'
-	cd $srcdir/build/bomber
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/bomber
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-bovo() {
-	pkgdesc='Five-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bovo/"
-	install='kdegames.install'
-	cd $srcdir/build/bovo
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/bovo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-granatier() {
-	pkgdesc='Granatier'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/granatier/"
-	install='kdegames.install'
-	cd $srcdir/build/granatier
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/granatier
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kajongg() {
-	pkgdesc='The ancient Chinese board game for 4 players'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdebindings-python' 'twisted')
-	install='kdegames.install'
-	cd $srcdir/build/kajongg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kajongg
-	make DESTDIR=$pkgdir install
-
-	# Use the python2 executable
-	find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdegames-kapman() {
-	pkgdesc='Eat pills escaping ghosts'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kapman/"
-	install='kdegames.install'
-	cd $srcdir/build/kapman
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kapman
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-katomic() {
-	pkgdesc='Sokoban-like Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/katomic/"
-	install='kdegames.install'
-	cd $srcdir/build/katomic
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/katomic
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbattleship() {
-	pkgdesc='Battleship Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/kbattleship/"
-	install='kdegames-kbattleship.install'
-	cd $srcdir/build/kbattleship
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbattleship
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \
-		$pkgdir/usr/share/ggz/kbattleship.dsc
-}
-
-package_kdegames-kblackbox() {
-	pkgdesc='Blackbox Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblackbox/"
-	install='kdegames.install'
-	cd $srcdir/build/kblackbox
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kblackbox
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kblocks() {
-	pkgdesc='Falling Blocks Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblocks/"
-	install='kdegames.install'
-	cd $srcdir/build/kblocks
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kblocks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbounce() {
-	pkgdesc='Ball Bouncing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbounce/"
-	install='kdegames.install'
-	cd $srcdir/build/kbounce
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbounce
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbreakout() {
-	pkgdesc='Breakout-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbreakout/"
-	install='kdegames.install'
-	cd $srcdir/build/kbreakout
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbreakout
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kdiamond() {
-	pkgdesc='Three-in-a-row game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kdiamond/"
-	install='kdegames.install'
-	cd $srcdir/build/kdiamond
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kdiamond
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kfourinline() {
-	pkgdesc='Four-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kfourinline/"
-	install='kdegames.install'
-	cd $srcdir/build/kfourinline
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfourinline
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kgoldrunner() {
-	pkgdesc='A game of action and puzzle-solving'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kgoldrunner/"
-	install='kdegames.install'
-	cd $srcdir/build/kgoldrunner
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kgoldrunner
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kigo() {
-	pkgdesc='Go Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo')
-	url="http://kde.org/applications/games/kigo/"
-	install='kdegames.install'
-	cd $srcdir/build/kigo
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kigo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-killbots() {
-	pkgdesc='Killbots'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/killbots/"
-	install='kdegames.install'
-	cd $srcdir/build/killbots
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/killbots
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kiriki() {
-	pkgdesc='Yahtzee-like Dice Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kiriki/"
-	install='kdegames.install'
-	cd $srcdir/build/kiriki
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kiriki
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kjumpingcube() {
-	pkgdesc='Territory Capture Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kjumpingcube/"
-	install='kdegames.install'
-	cd $srcdir/build/kjumpingcube
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kjumpingcube
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klickety() {
-	pkgdesc='Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	replaces=('kdegames-ksame')
-	conflicts=('kdegames-ksame')
-	url="http://kde.org/applications/games/ksame/"
-	install='kdegames.install'
-	cd $srcdir/build/klickety
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klickety
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klines() {
-	pkgdesc='Tactical Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/klines/"
-	install='kdegames.install'
-	cd $srcdir/build/klines
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmahjongg() {
-	pkgdesc='Mahjongg Solitaire'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kmahjongg/"
-	install='kdegames.install'
-	cd $srcdir/build/kmahjongg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmines() {
-	pkgdesc='Minesweeper-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kmines/"
-	install='kdegames.install'
-	cd $srcdir/build/kmines
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-knetwalk() {
-	pkgdesc='Network Construction Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/knetwalk/"
-	install='kdegames.install'
-	cd $srcdir/build/knetwalk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/knetwalk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kolf() {
-	pkgdesc='Miniature Golf'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kolf/"
-	install='kdegames.install'
-	cd $srcdir/build/kolf
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kolf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kollision() {
-	pkgdesc='A simple ball dodging game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kollision/"
-	install='kdegames.install'
-	cd $srcdir/build/kollision
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kollision
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-konquest() {
-	pkgdesc='Galactic Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/konquest/"
-	install='kdegames.install'
-	cd $srcdir/build/konquest
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/konquest
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kpatience() {
-	pkgdesc='Patience Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kpatience/"
-	install='kdegames.install'
-	replaces=('kdegames-kpat')
-	cd $srcdir/build/kpat
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kpat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kreversi() {
-	pkgdesc='Reversi Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/kreversi/"
-	install='kdegames-kreversi.install'
-	cd $srcdir/build/kreversi
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kreversi
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \
-		$pkgdir/usr/share/ggz/kreversi.dsc
-}
-
-package_kdegames-kshisen() {
-	pkgdesc='Shisen-Sho Mahjongg-like Tile Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kshisen/"
-	install='kdegames.install'
-	cd $srcdir/build/kshisen
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kshisen
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksirk() {
-	pkgdesc='World Domination Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksirk/"
-	install='kdegames.install'
-	cd $srcdir/build/ksirk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksirk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kspaceduel() {
-	pkgdesc='Space Arcade Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kspaceduel/"
-	install='kdegames.install'
-	cd $srcdir/build/kspaceduel
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kspaceduel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksquares() {
-	pkgdesc='Connect the dots to create squares'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/ksquares/"
-	install='kdegames-ksquares.install'
-	cd $srcdir/build/ksquares
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksquares
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \
-		$pkgdir/usr/share/ggz/ksquares.dsc
-}
-
-package_kdegames-ksudoku() {
-	pkgdesc='KSudoku, Sudoku game & more for KDE'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksudoku/"
-	install='kdegames.install'
-	cd $srcdir/build/ksudoku
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksudoku
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktron() {
-	pkgdesc='Tron-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktron/"
-	install='kdegames.install'
-	cd $srcdir/build/ktron
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktron
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktuberling() {
-	pkgdesc='Picture Game for Children'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktuberling/"
-	install='kdegames.install'
-	cd $srcdir/build/ktuberling
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktuberling
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kubrick() {
-	pkgdesc='A 3-D game based on Rubik´s Cube'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kubrick/"
-	install='kdegames.install'
-	cd $srcdir/build/kubrick
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kubrick
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkdegames() {
-	pkgdesc='KDE game library'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkdegames
-	make DESTDIR=$pkgdir install
-	for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do
-		install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i)
-	done
-}
-
-package_kdegames-libkmahjongg() {
-	pkgdesc='Library used for loading and rendering of Mahjongg tilesets'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-lskat() {
-	pkgdesc='Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/lskat/"
-	install='kdegames.install'
-	cd $srcdir/build/lskat
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/lskat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-palapeli() {
-	pkgdesc='Jigsaw puzzle game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/palapeli/"
-	install='kdegames-palapeli.install'
-	cd $srcdir/build/palapeli
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/palapeli
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdegames/kdegames-kbattleship.install b/staging/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index ae4e089cb..000000000
--- a/staging/kdegames/kdegames-kbattleship.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kbattleship.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-kreversi.install b/staging/kdegames/kdegames-kreversi.install
deleted file mode 100644
index 4623e6e49..000000000
--- a/staging/kdegames/kdegames-kreversi.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kreversi.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-ksquares.install b/staging/kdegames/kdegames-ksquares.install
deleted file mode 100644
index 5a619897d..000000000
--- a/staging/kdegames/kdegames-ksquares.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/ksquares.dsc ]; then
-		ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-palapeli.install b/staging/kdegames/kdegames-palapeli.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdegames/kdegames-palapeli.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/staging/kdegames/kdegames.install b/staging/kdegames/kdegames.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegames/kdegames.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegraphics/PKGBUILD b/staging/kdegraphics/PKGBUILD
deleted file mode 100644
index 1b11c9ab2..000000000
--- a/staging/kdegraphics/PKGBUILD
+++ /dev/null
@@ -1,141 +0,0 @@
-# $Id: PKGBUILD 118092 2011-04-05 12:11:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdegraphics
-pkgname=('kdegraphics-gwenview'
-         'kdegraphics-kamera'
-         'kdegraphics-kcolorchooser'
-         'kdegraphics-kgamma'
-         'kdegraphics-kolourpaint'
-         'kdegraphics-kruler'
-         'kdegraphics-ksnapshot'
-         'kdegraphics-libs'
-         'kdegraphics-okular')
-pkgver=4.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'sane' 'lcms'
-        'libxxf86vm' 'poppler-qt' 'libspectre' 'chmlib' 'djvulibre'
-        'ebook-tools' 'kdebase-runtime' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('9c9f31c88c1c9e6dcaa7fb177847402d874ffc94')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdegraphics-gwenview() {
-	pkgdesc='A simple image viewer'
-	depends=('kdebase-runtime' 'kdegraphics-libs')
-	url="http://kde.org/applications/graphics/gwenview/"
-	replaces=('gwenview' 'gwenview-i18n')
-	install='kdegraphics.install'
-	cd $srcdir/build/gwenview
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/gwenview/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kamera() {
-	pkgdesc='Configure Kamera'
-	depends=('kdelibs' 'libgphoto2')
-	cd $srcdir/build/kamera
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kamera/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kcolorchooser() {
-	pkgdesc='Color Chooser'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/graphics/kcolorchooser/"
-	install='kdegraphics.install'
-	cd $srcdir/build/kcolorchooser
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kgamma() {
-	pkgdesc='A monitor calibration tool'
-	# note on libxxf86vm:
-	#       not detected by namcap because libgl depends on it
-	#       but nvidia providing libgl does not depend on libxxf86vm
-	depends=('kdebase-runtime' 'libxxf86vm')
-	install='kdegraphics.install'
-	cd $srcdir/build/kgamma
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kgamma/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kolourpaint() {
-	pkgdesc='Paint Program'
-	depends=('kdebase-runtime' 'qimageblitz' 'kdegraphics-libs')
-	url="http://kde.org/applications/graphics/kolourpaint/"
-	install='kdegraphics.install'
-	cd $srcdir/build/kolourpaint
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kolourpaint/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kruler() {
-	pkgdesc='Screen Ruler'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/graphics/kruler/"
-	install='kdegraphics.install'
-	cd $srcdir/build/kruler
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kruler/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-ksnapshot() {
-	pkgdesc='Screen Capture Program'
-	depends=('kdebase-runtime' 'kdegraphics-libs')
-	url="http://kde.org/applications/graphics/ksnapshot/"
-	install='kdegraphics.install'
-	cd $srcdir/build/ksnapshot
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ksnapshot/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-libs() {
-	pkgdesc='Support library for KDE Graphics Software'
-	groups=()
-	depends=('kdelibs' 'sane' 'lcms')
-	conflicts=('kdegraphics-ksaneplugin' 'kdegraphics-strigi-analyzer'
-                   'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
-	replaces=('libkexiv2' 'libkdcraw' 'kdegraphics-ksaneplugin'
-                  'kdegraphics-strigi-analyzer' 'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
-	install='kdegraphics.install'
-	for i in libs ksaneplugin strigi-analyzer svgpart thumbnailers; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
-	done
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
-		$pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
-}
-
-package_kdegraphics-okular() {
-	pkgdesc='Document Viewer'
-	depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
-		'ebook-tools' 'libspectre')
-	url="http://kde.org/applications/graphics/okular/"
-	install='kdegraphics.install'
-	cd $srcdir/build/okular
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/okular
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdegraphics/kdegraphics.install b/staging/kdegraphics/kdegraphics.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegraphics/kdegraphics.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD
deleted file mode 100644
index eb84d4b50..000000000
--- a/staging/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 118061 2011-04-05 10:07:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.6.2
-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' 'heimdal'
-        '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')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
-        'hspell')
-replaces=('arts' 'kdelibs-experimental')
-install='kdelibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch')
-sha1sums=('b4794a9a69492ce4725abd9eb5d00d3a50e46603'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'd994f262356af5b9e4e9619646e471bd98c91efb')
-
-build() {
-       cd ${srcdir}/${pkgname}-${pkgver}
-
-       # avoid file conflict with gnome-menu
-       patch -p1 -i $srcdir/kde-applications-menu.patch
-       # add Archlinux menu entry
-       patch -p1 -i $srcdir/archlinux-menu.patch
-       # add syntax highlightning for PKGBUILD and .install files
-       patch -p1 -i $srcdir/abs-syntax-highlight.patch
-
-       cd ${srcdir}
-       mkdir build
-       cd build
-       cmake ../${pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF \
-               -DKAUTH_BACKEND=PolkitQt-1
-       make
-}
-
-package() {
-       cd $srcdir/build
-       make DESTDIR=$pkgdir install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/staging/kdelibs/abs-syntax-highlight.patch b/staging/kdelibs/abs-syntax-highlight.patch
deleted file mode 100644
index 477479a9b..000000000
--- a/staging/kdelibs/abs-syntax-highlight.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml kdelibs-4.3.0/kate/syntax/data/bash.xml
---- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml	2009-04-15 12:26:37.000000000 +0200
-+++ kdelibs-4.3.0/kate/syntax/data/bash.xml	2009-07-30 13:24:01.000000000 +0200
-@@ -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;*.install" 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/staging/kdelibs/archlinux-menu.patch b/staging/kdelibs/archlinux-menu.patch
deleted file mode 100644
index 546784fa2..000000000
--- a/staging/kdelibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>
diff --git a/staging/kdelibs/kde-applications-menu.patch b/staging/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/staging/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
-      if (!m_trackId.isEmpty())
-         g_vfolder->setTrackId(m_trackId);
- 
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/staging/kdelibs/kdelibs.install b/staging/kdelibs/kdelibs.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdelibs/kdelibs.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/staging/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD
deleted file mode 100644
index afdc0a8a1..000000000
--- a/staging/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,114 +0,0 @@
-# $Id: PKGBUILD 118074 2011-04-05 10:08:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdemultimedia
-pkgname=('kdemultimedia-dragonplayer'
-         'kdemultimedia-ffmpegthumbs'
-         'kdemultimedia-juk'
-         'kdemultimedia-kioslave'
-         'kdemultimedia-kmix'
-         'kdemultimedia-kscd'
-         'kdemultimedia-mplayerthumbs')
-pkgver=4.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'tunepimp'
-        'ffmpeg' 'mplayer' 'docbook-xsl' 'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'mplayerthumbs.config'
-        'kmix-locale-pulseaudio.patch')
-sha1sums=('4447d26488e3b97c43580d86ad47cee77ff98578'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
-          '5aa443ace9f4b1906c227664b4e50bace666cf99')
-
-build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-    patch -Np0 -i ${srcdir}/kmix-locale-pulseaudio.patch
-
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_Xine=OFF
-	make
-}
-
-package_kdemultimedia-dragonplayer() {
-	pkgdesc='Video Player'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/dragonplayer/"
-	install='kdemultimedia.install'
-	cd $srcdir/build/dragonplayer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dragonplayer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-ffmpegthumbs() {
-	pkgdesc='Video Files (ffmpegthumbs)'
-	depends=('kdebase-runtime' 'ffmpeg')
-	install='kdemultimedia.install'
-	cd $srcdir/build/ffmpegthumbs
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-juk() {
-	pkgdesc='Music Player'
-	depends=('kdebase-runtime' 'tunepimp')
-	url="http://kde.org/applications/multimedia/juk"
-	install='kdemultimedia.install'
-	cd $srcdir/build/juk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/juk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kioslave() {
-	pkgdesc='Audio CD Browser'
-	depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
-	conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	for i in kioslave doc/kioslave libkcddb libkcompactdisc; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
-	done
-}
-
-package_kdemultimedia-kmix() {
-	pkgdesc='Sound Mixer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/kmix"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kmix
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmix
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kscd() {
-	pkgdesc='CD Player'
-	depends=('kdebase-runtime' 'libmusicbrainz3')
-	url="http://kde.org/applications/multimedia/kscd"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kscd
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcontrol/cddbretrieval
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-mplayerthumbs() {
-	pkgdesc='Video Files (MPlayerThumbs)'
-	depends=('kdebase-runtime' 'mplayer')
-	replaces=('mplayerthumbs')
-	conflicts=('mplayerthumbs')
-	cd $srcdir/build/mplayerthumbs
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
-}
diff --git a/staging/kdemultimedia/kdemultimedia.install b/staging/kdemultimedia/kdemultimedia.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdemultimedia/kdemultimedia.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdemultimedia/kmix-locale-pulseaudio.patch b/staging/kdemultimedia/kmix-locale-pulseaudio.patch
deleted file mode 100644
index 88be8dbde..000000000
--- a/staging/kdemultimedia/kmix-locale-pulseaudio.patch
+++ /dev/null
@@ -1,1117 +0,0 @@
-Index: kmix/apps/kmix.cpp
-===================================================================
---- kmix/apps/kmix.cpp	(revision 1226955)
-+++ kmix/apps/kmix.cpp	(revision 1226956)
-@@ -78,8 +78,6 @@
-   m_dockWidget(),
-   m_dontSetDefaultCardOnStart (false)
- {
--    _cornerLabelNew = 0;
--
-     setObjectName( QLatin1String("KMixWindow" ));
-     // disable delete-on-close because KMix might just sit in the background waiting for cards to be plugged in
-     setAttribute(Qt::WA_DeleteOnClose, false);
-@@ -184,16 +182,29 @@
- 
- void KMixWindow::initActionsAfterInitMixer()
- {
-+    bool isPulseAudio = false;
-     // Add "launch_pavucontrol" to menu, if Pulseaudio backend is in use
-     foreach( Mixer* mixer, Mixer::mixers() )
-     {
--        if ( mixer->getDriverName() == "PulseAudio") {
-+        if ( mixer->getDriverName() == "PulseAudio")
-+        {
-+            isPulseAudio = true;
-             KAction* action = actionCollection()->addAction( "launch_pavucontrol" );
-             action->setText( i18n( "Audio setup (&Pulseaudio)" ) );
-             connect(action, SIGNAL(triggered(bool) ), SLOT( slotPavucontrolExec() ));
-             break;
-         }
-     }
-+
-+    if (! isPulseAudio )
-+    {
-+       QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall );
-+       QPushButton* _cornerLabelNew = new QPushButton();
-+       _cornerLabelNew->setIcon(cornerNewPM);
-+       //cornerLabelNew->setSizePolicy(QSizePolicy());
-+       m_wsMixers->setCornerWidget(_cornerLabelNew, Qt::TopLeftCorner);
-+       connect ( _cornerLabelNew, SIGNAL( clicked() ), SLOT (newView() ) );
-+    }
- }
- 
- void KMixWindow::initPrefDlg()
-@@ -210,15 +221,10 @@
-     m_wsMixers = new KTabWidget();
-     m_wsMixers->setDocumentMode(true);
-     setCentralWidget(m_wsMixers);
--    m_wsMixers->setTabsClosable(true);
-+    m_wsMixers->setTabsClosable(false);
-     connect (m_wsMixers, SIGNAL(tabCloseRequested(int)), SLOT(saveAndCloseView(int)) );
- 
-     QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall );
--    _cornerLabelNew = new QPushButton();
--    _cornerLabelNew->setIcon(cornerNewPM);
--    //cornerLabelNew->setSizePolicy(QSizePolicy());
--    m_wsMixers->setCornerWidget(_cornerLabelNew, Qt::TopLeftCorner);
--    connect ( _cornerLabelNew, SIGNAL( clicked() ), SLOT (newView() ) );
- 
-     connect( m_wsMixers, SIGNAL( currentChanged ( int ) ), SLOT( newMixerShown(int)) );
- 
-@@ -516,6 +522,7 @@
-             addMixerWidget(mixer->id(), guiprof, -1);
-         }
-         else {
-+            // did exist => remove and insert new guiprof at old position
-             int indexOfTab =  m_wsMixers->indexOf(kmw);
-             if ( indexOfTab != -1 ) m_wsMixers->removeTab(indexOfTab);
-             delete kmw;
-@@ -676,9 +683,9 @@
-         m_wsMixers->removeTab(idx);
-         delete kmw;
- 
--        if ( m_wsMixers->count() < 2 ) {
--            m_wsMixers->setTabsClosable(false);
--        }
-+        bool isPulseAudio =  kmw->mixer()->getDriverName() == "PulseAudio";
-+        m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1);
-+
-         saveViewConfig();
-     }
-     kDebug() << "Exit";
-@@ -874,9 +881,9 @@
-         if ( kmw->getGuiprof()->getId() == m_defaultCardOnStart ) {
-             m_wsMixers->setCurrentWidget(kmw);
-         }
--        if ( m_wsMixers->count() > 1 ) {
--            m_wsMixers->setTabsClosable(true);
--        }
-+
-+        bool isPulseAudio =  mixer->getDriverName() == "PulseAudio";
-+        m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1);
-         m_dontSetDefaultCardOnStart = false;
- 
- 
-Index: kmix/apps/kmix.h
-===================================================================
---- kmix/apps/kmix.h	(revision 1226955)
-+++ kmix/apps/kmix.h	(revision 1226956)
-@@ -116,7 +116,6 @@
-    Qt::Orientation m_toplevelOrientation;
- 
-    KTabWidget *m_wsMixers;
--   QPushButton* _cornerLabelNew;
- 
-    KMixPrefDlg *m_prefDlg;
-    KMixDockWidget *m_dockWidget;
-Index: kmix/gui/viewbase.cpp
-===================================================================
---- kmix/gui/viewbase.cpp	(revision 1226956)
-+++ kmix/gui/viewbase.cpp	(revision 1226957)
-@@ -226,34 +226,35 @@
- 
-         // Check the guiprofile... if it is not the fallback GUIProfile, then
-         // make sure that we add a specific entry for any devices not present.
--        if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) {
-+        if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) // TODO colin/cesken IMO calling GUIProfile::fallbackProfile(_mixer) is wrong, as it ALWAYS creates a new Object. fallbackProfile() would need to cache the created fallback profiles so this should make any sense.
-+        {
-             kDebug(67100) << "Dynamic mixer " << _mixer->id() << " is NOT using Fallback GUIProfile. Checking to see if new controls are present";
- 
-             QList<QString> new_mix_devices;
-             MixSet ms = _mixer->getMixSet();
-             for (int i=0; i < ms.count(); ++i)
-+            {
-                 new_mix_devices.append("^" + ms[i]->id() + "$");
-+                kDebug(67100) << "new_mix_devices.append => " << ms[i]->id();
-+            }
- 
-+            GUIProfile::ControlSet& ctlSet = _guiprof->getControls();
-+
- //            std::vector<ProfControl*>::const_iterator itEnd = _guiprof->_controls.end();
- //            for ( std::vector<ProfControl*>::const_iterator it = _guiprof->_controls.begin(); it != itEnd; ++it)
- //                new_mix_devices.removeAll((*it)->id);
-               // TODO Please check this change, Colin
--              foreach ( ProfControl* pctl, _guiprof->getControls() ) {
-+              foreach ( ProfControl* pctl, ctlSet ) {
-                   new_mix_devices.removeAll(pctl->id);
-               }
- 
- 
-             if ( new_mix_devices.count() > 0 ) {
-                 kDebug(67100) << "Found " << new_mix_devices.count() << " new controls. Adding to GUIProfile";
-+                QString sctlMatchAll("*");
-                 while ( new_mix_devices.count() > 0 ) {
--                    QString sctlMatchAll("*");
-                     QString new_mix_devices0 = new_mix_devices.takeAt(0);
--                    ProfControl* ctl = new ProfControl(new_mix_devices0, sctlMatchAll);
--//                    ctl->id = new_mix_devices.takeAt(0);
--//                    ctl->setSubcontrols(QString("*"));
--//                    ctl->tab  = (_guiprof->tabs())[0]->name(); // Use the first tab... not ideal but should work most of the time;
--//                    ctl->show = "simple";
--                    _guiprof->getControls().push_back(ctl);
-+                    ctlSet.push_back(new ProfControl(new_mix_devices0, sctlMatchAll));
-                 }
-                 _guiprof->setDirty();
-             }
-Index: kmix/gui/viewbase.cpp
-===================================================================
---- kmix/gui/viewbase.cpp	(revision 1226957)
-+++ kmix/gui/viewbase.cpp	(revision 1226958)
-@@ -33,6 +33,7 @@
- #include <kactioncollection.h>
- #include <ktoggleaction.h>
- #include <kstandardaction.h>
-+#include <kmessagebox.h>
- // KMix
- #include "dialogviewconfiguration.h"
- #include "gui/guiprofile.h"
-@@ -43,7 +44,7 @@
- 
- 
- ViewBase::ViewBase(QWidget* parent, const char* id, Mixer* mixer, Qt::WFlags f, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KActionCollection *actionColletion)
--    : QWidget(parent, f), _actions(actionColletion), _vflags(vflags), _guiprof(guiprof)
-+    : QWidget(parent, f), _popMenu(NULL), _actions(actionColletion), _vflags(vflags), _guiprof(guiprof)
- {
-    setObjectName(id);
-    m_viewId = id;
-@@ -73,9 +74,11 @@
-          }
-       }
-    }
--   QAction *action = _localActionColletion->addAction("toggle_channels");
--   action->setText(i18n("&Channels"));
--   connect(action, SIGNAL(triggered(bool) ), SLOT(configureView()));
-+   if ( !_mixer->isDynamic() ) {
-+      QAction *action = _localActionColletion->addAction("toggle_channels");
-+      action->setText(i18n("&Channels"));
-+      connect(action, SIGNAL(triggered(bool) ), SLOT(configureView()));
-+   }
-    connect ( _mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) );
-    connect ( _mixer, SIGNAL(controlsReconfigured(const QString&)), this, SLOT(controlsReconfigured(const QString&)) );
- }
-@@ -95,7 +98,7 @@
- 
- bool ViewBase::isValid() const
- {
--   return ( _mixSet->count() > 0 || _mixer->dynamic() );
-+   return ( _mixSet->count() > 0 || _mixer->isDynamic() );
- }
- 
- void ViewBase::setIcons (bool on) { KMixToolBox::setIcons (_mdws, on ); }
-@@ -170,6 +173,8 @@
- {
-     QAction *a;
- 
-+    if ( _popMenu )
-+        delete _popMenu;
-     _popMenu = new KMenu( this );
-     _popMenu->addTitle( KIcon( QLatin1String(  "kmix" ) ), i18n("Device Settings" ));
- 
-@@ -222,44 +227,8 @@
- 
- void ViewBase::setMixSet()
- {
--    if ( _mixer->dynamic()) {
-+    if ( _mixer->isDynamic() ) {
- 
--        // Check the guiprofile... if it is not the fallback GUIProfile, then
--        // make sure that we add a specific entry for any devices not present.
--        if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) // TODO colin/cesken IMO calling GUIProfile::fallbackProfile(_mixer) is wrong, as it ALWAYS creates a new Object. fallbackProfile() would need to cache the created fallback profiles so this should make any sense.
--        {
--            kDebug(67100) << "Dynamic mixer " << _mixer->id() << " is NOT using Fallback GUIProfile. Checking to see if new controls are present";
--
--            QList<QString> new_mix_devices;
--            MixSet ms = _mixer->getMixSet();
--            for (int i=0; i < ms.count(); ++i)
--            {
--                new_mix_devices.append("^" + ms[i]->id() + "$");
--                kDebug(67100) << "new_mix_devices.append => " << ms[i]->id();
--            }
--
--            GUIProfile::ControlSet& ctlSet = _guiprof->getControls();
--
--//            std::vector<ProfControl*>::const_iterator itEnd = _guiprof->_controls.end();
--//            for ( std::vector<ProfControl*>::const_iterator it = _guiprof->_controls.begin(); it != itEnd; ++it)
--//                new_mix_devices.removeAll((*it)->id);
--              // TODO Please check this change, Colin
--              foreach ( ProfControl* pctl, ctlSet ) {
--                  new_mix_devices.removeAll(pctl->id);
--              }
--
--
--            if ( new_mix_devices.count() > 0 ) {
--                kDebug(67100) << "Found " << new_mix_devices.count() << " new controls. Adding to GUIProfile";
--                QString sctlMatchAll("*");
--                while ( new_mix_devices.count() > 0 ) {
--                    QString new_mix_devices0 = new_mix_devices.takeAt(0);
--                    ctlSet.push_back(new ProfControl(new_mix_devices0, sctlMatchAll));
--                }
--                _guiprof->setDirty();
--            }
--        }
--
-         // We need to delete the current MixDeviceWidgets so we can redraw them
-         while (!_mdws.isEmpty()) {
-             QWidget* mdw = _mdws.last();
-@@ -280,6 +249,8 @@
-  */
- void ViewBase::configureView() {
- 
-+    Q_ASSERT( !_mixer->isDynamic() );
-+    
-     DialogViewConfiguration* dvc = new DialogViewConfiguration(0, *this);
-     dvc->show();
-     // !! The dialog is modal. Does it delete itself?
-@@ -302,6 +273,10 @@
-    kDebug(67100) << "KMixToolBox::loadView() grp=" << grp.toAscii();
- 
-    static char guiComplexity[3][20] = { "simple", "extended", "all" };
-+
-+   // Certain bits are not saved for dynamic mixers (e.g. PulseAudio)
-+   bool dynamic = _mixer->isDynamic();
-+
-    for ( int tries = 0; tries < 3; tries++ )
-    {
-    bool atLeastOneControlIsShown = false;
-@@ -315,12 +290,12 @@
-            Workaround: If found, write back correct group name.
-         */
-          MixDeviceWidget* mdw = (MixDeviceWidget*)qmdw;
--         QString devgrp;
--         devgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), mdw->mixDevice()->mixer()->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() );
-+         MixDevice* md = mdw->mixDevice();
-+
-+         QString devgrp = QString("%1.%2.%3").arg(grp).arg(md->mixer()->id()).arg(md->id());
-          KConfigGroup devcg  = config->group( devgrp );
- 
--         QString buggyDevgrp;
--         buggyDevgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), view->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() );
-+         QString buggyDevgrp = QString("%1.%2.%3").arg(grp).arg(view->id()).arg(md->id());
-          KConfigGroup buggyDevgrpCG = config->group( buggyDevgrp );
-          if ( buggyDevgrpCG.exists() ) {
-             buggyDevgrpCG.copyTo(&devcg);
-@@ -335,7 +310,7 @@
-          }
- 
-          bool mdwEnabled = false;
--         if ( devcg.hasKey("Show") )
-+         if ( !dynamic && devcg.hasKey("Show") )
-          {
-             mdwEnabled = ( true == devcg.readEntry("Show", true) );
-         //kDebug() << "Load devgrp" << devgrp << "show=" << mdwEnabled;
-@@ -382,20 +357,23 @@
-    QString grp = "View.";
-    grp += view->id();
- //   KConfigGroup cg = config->group( grp );
--   kDebug(67100) << "KMixToolBox::saveView() grp=" << grp.toAscii();
-+   kDebug(67100) << "KMixToolBox::saveView() grp=" << grp;
- 
-+   // Certain bits are not saved for dynamic mixers (e.g. PulseAudio)
-+   bool dynamic = _mixer->isDynamic();
-+
-    for (int i=0; i < view->_mdws.count(); ++i ){
-       QWidget *qmdw = view->_mdws[i];
-       if ( qmdw->inherits("MixDeviceWidget") )
-       {
-          MixDeviceWidget* mdw = (MixDeviceWidget*)qmdw;
-+         MixDevice* md = mdw->mixDevice();
- 
-          //kDebug(67100) << "  grp=" << grp.toAscii();
-          //kDebug(67100) << "  mixer=" << view->id().toAscii();
-          //kDebug(67100) << "  mdwPK=" << mdw->mixDevice()->id().toAscii();
- 
--         QString devgrp;
--         devgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), mdw->mixDevice()->mixer()->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() );
-+         QString devgrp = QString("%1.%2.%3").arg(grp).arg(md->mixer()->id()).arg(md->id());
-          KConfigGroup devcg = config->group( devgrp );
- 
-          if ( mdw->inherits("MDWSlider") )
-@@ -403,15 +381,19 @@
-             // only sliders have the ability to split apart in mutliple channels
-             devcg.writeEntry( "Split", ! mdw->isStereoLinked() );
-          }
--         devcg.writeEntry( "Show" , mdw->isVisibleTo(view) );
--kDebug() << "Save devgrp" << devgrp << "show=" << mdw->isVisibleTo(view);
-+         if ( !dynamic ) {
-+            devcg.writeEntry( "Show" , mdw->isVisibleTo(view) );
-+            kDebug() << "Save devgrp" << devgrp << "show=" << mdw->isVisibleTo(view);
-+         }
- 
-       } // inherits MixDeviceWidget
-    } // for all MDW's
- 
--   kDebug(67100) << "GUIProfile is dirty: " << guiProfile()->isDirty();
--   if ( guiProfile()->isDirty() ) {
--       guiProfile()->writeProfile();
-+   if ( !dynamic ) {
-+        // We do not save GUIProfiles (as they cannot be customised) for dynamic mixers (e.g. PulseAudio)
-+        kDebug(67100) << "GUIProfile is dirty: " << guiProfile()->isDirty();
-+        if ( guiProfile()->isDirty() )
-+            guiProfile()->writeProfile();
-    }
- }
- 
-Index: kmix/gui/mdwslider.cpp
-===================================================================
---- kmix/gui/mdwslider.cpp	(revision 1226957)
-+++ kmix/gui/mdwslider.cpp	(revision 1226958)
-@@ -86,10 +86,14 @@
-     KToggleAction *taction = _mdwActions->add<KToggleAction>( "stereo" );
-     taction->setText( i18n("&Split Channels") );
-     connect( taction, SIGNAL( triggered(bool) ), SLOT( toggleStereoLinked() ) );
--    KAction *action = _mdwActions->add<KToggleAction>( "hide" );
--    action->setText( i18n("&Hide") );
--    connect( action, SIGNAL( triggered(bool) ), SLOT( setDisabled() ) );
- 
-+    KAction *action;
-+    if ( ! m_mixdevice->mixer()->isDynamic() ) {
-+        action = _mdwActions->add<KToggleAction>( "hide" );
-+        action->setText( i18n("&Hide") );
-+        connect( action, SIGNAL( triggered(bool) ), SLOT( setDisabled() ) );
-+    }
-+
-     if( m_mixdevice->playbackVolume().hasSwitch() ) {
-         taction = _mdwActions->add<KToggleAction>( "mute" );
-         taction->setText( i18n("&Muted") );
-@@ -129,8 +133,8 @@
-     #ifdef __GNUC__
-     #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed
-     #endif
--    if ( ! mixDevice()->isEthereal() ) {
--        // virtual / ethereal controls won't get shortcuts
-+    if ( ! mixDevice()->mixer()->isDynamic() ) {
-+        // virtual / dynamic controls won't get shortcuts
-         b->setGlobalShortcut(dummyShortcut);  // -<- enableGlobalShortcut() is not there => use workaround
-         //   b->enableGlobalShortcut();
-         connect( b, SIGNAL( triggered(bool) ), SLOT( increaseVolume() ) );
-@@ -143,8 +147,8 @@
-     #ifdef __GNUC__
-     #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed
-     #endif
--    if ( ! mixDevice()->isEthereal() ) {
--        // virtual / ethereal controls won't get shortcuts
-+    if ( ! mixDevice()->mixer()->isDynamic() ) {
-+        // virtual / dynamic controls won't get shortcuts
-         b->setGlobalShortcut(dummyShortcut);  // -<- enableGlobalShortcut() is not there => use workaround
-         //   b->enableGlobalShortcut();
-         connect( b, SIGNAL( triggered(bool) ), SLOT( decreaseVolume() ) );
-@@ -157,8 +161,8 @@
-     #ifdef __GNUC__
-     #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed
-     #endif
--    if ( ! mixDevice()->isEthereal() ) {
--        // virtual / ethereal controls won't get shortcuts
-+    if ( ! mixDevice()->mixer()->isDynamic() ) {
-+        // virtual / dynamic controls won't get shortcuts
-         b->setGlobalShortcut(dummyShortcut);  // -<- enableGlobalShortcut() is not there => use workaround
-         //   b->enableGlobalShortcut();
-         connect( b, SIGNAL( triggered(bool) ), SLOT( toggleMuted() ) );
-Index: kmix/gui/viewdockareapopup.h
-===================================================================
---- kmix/gui/viewdockareapopup.h	(revision 1226957)
-+++ kmix/gui/viewdockareapopup.h	(revision 1226958)
-@@ -24,7 +24,6 @@
- #include "viewbase.h"
- 
- class QGridLayout;
--class QPushButton;
- class QWidget;
- 
- class Mixer;
-@@ -48,8 +47,6 @@
- 
- protected:
-     KMixWindow  *_dock;
--    //MixDevice       *_dockDevice;
--    QPushButton     *_showPanelBox;
- 
-     void wheelEvent ( QWheelEvent * e );
-     virtual void _setMixSet();
-Index: kmix/gui/viewsliders.cpp
-===================================================================
---- kmix/gui/viewsliders.cpp	(revision 1226957)
-+++ kmix/gui/viewsliders.cpp	(revision 1226958)
-@@ -148,7 +148,7 @@
- {
-     const MixSet& mixset = _mixer->getMixSet();
- 
--    if ( _mixer->dynamic() ) {
-+    if ( _mixer->isDynamic() ) {
-         // We will be recreating our sliders, so make sure we trash all the separators too.
-         qDeleteAll(_separators);
-         _separators.clear();
-Index: kmix/gui/guiprofile.cpp
-===================================================================
---- kmix/gui/guiprofile.cpp	(revision 1226957)
-+++ kmix/gui/guiprofile.cpp	(revision 1226958)
-@@ -158,8 +158,12 @@
- {
-     GUIProfile* guiprof = 0;
- 
--    if ( mixer == 0 || profileName.isEmpty() ) {
-+    if ( mixer == 0 || profileName.isEmpty() )
-         return 0;
-+
-+    if ( mixer->isDynamic() ) {
-+        kDebug(67100) << "GUIProfile::find() Not loading GUIProfile for Dynamic Mixer (e.g. PulseAudio)";
-+        return 0;
-     }
- 
-     QString requestedProfileName;
-Index: kmix/gui/viewbase.h
-===================================================================
---- kmix/gui/viewbase.h	(revision 1226957)
-+++ kmix/gui/viewbase.h	(revision 1226958)
-@@ -133,7 +133,7 @@
- 
-     ViewFlags _vflags;
-     GUIProfile* _guiprof;
--   KActionCollection *_localActionColletion;
-+    KActionCollection *_localActionColletion;
- 
-     virtual void _setMixSet() = 0;
- 
-Index: kmix/gui/viewdockareapopup.cpp
-===================================================================
---- kmix/gui/viewdockareapopup.cpp	(revision 1226957)
-+++ kmix/gui/viewdockareapopup.cpp	(revision 1226958)
-@@ -88,8 +88,8 @@
- {
-    // kDebug(67100) << "ViewDockAreaPopup::setMixSet()\n";
- 
--   if ( _mixer->dynamic() ) {
--      // Our _layoutMDW now should only contain spacer widgets from the QSpacerItems's in add() below.
-+   if ( _mixer->isDynamic() ) {
-+      // Our _layoutMDW now should only contain spacer widgets from the QSpacerItem's in add() below.
-       // We need to trash those too otherwise all sliders gradually migrate away from the edge :p
-       QLayoutItem *li;
-       while ( ( li = _layoutMDW->takeAt(0) ) )
-@@ -114,9 +114,9 @@
-     QString matchAllPlaybackAndTheCswitch("pvolume,pswitch,cswitch");
-     ProfControl *pctl = new ProfControl( dummyMatchAll, matchAllPlaybackAndTheCswitch);
-     MixDeviceWidget *mdw = new MDWSlider(
--      md,		  // only 1 device. This is actually _dockDevice
-+      md,           // only 1 device.
-       true,         // Show Mute LED
--      false,         // Show Record LED
-+      false,        // Show Record LED
-       false,        // Small
-       Qt::Vertical, // Direction: only 1 device, so doesn't matter
-       this,         // parent
-@@ -128,10 +128,10 @@
-    _layoutMDW->addWidget( mdw, 0, 1 );
- 
-    // Add button to show main panel
--   _showPanelBox = new QPushButton( i18n("Mixer"), this );
--   _showPanelBox->setObjectName( QLatin1String("MixerPanel" ));
--   connect ( _showPanelBox, SIGNAL( clicked() ), SLOT( showPanelSlot() ) );
--   _layoutMDW->addWidget( _showPanelBox, 1, 0, 1, 3 );
-+   QPushButton *pb = new QPushButton( i18n("Mixer"), this );
-+   pb->setObjectName( QLatin1String("MixerPanel" ));
-+   connect ( pb, SIGNAL( clicked() ), SLOT( showPanelSlot() ) );
-+   _layoutMDW->addWidget( pb, 1, 0, 1, 3 );
- 
-    return mdw;
- }
-Index: kmix/core/mixdevice.h
-===================================================================
---- kmix/core/mixdevice.h	(revision 1226957)
-+++ kmix/core/mixdevice.h	(revision 1226958)
-@@ -157,15 +157,6 @@
-        _artificial = artificial;
-    }
- 
--   bool isEthereal() const
--   {
--       return _ethereal;
--   }
--   void setEthereal(bool _ethereal)
--   {
--       this->_ethereal = _ethereal;
--   }
--
-    void setControlProfile(ProfControl* control);
-    ProfControl* controlProfile();
-    
-@@ -191,14 +182,12 @@
-    int _enumCurrentId;
-    QList<QString> _enumValues; // A MixDevice, that is an ENUM, has these _enumValues
- 
--   //bool _doNotRestore;
-    // A virtual control. It will not be saved/restored and/or doesn't get shortcuts
--   // Actually we discriminate those "virtual" controls in artificial controls and ethereal controls:
-+   // Actually we discriminate those "virtual" controls in artificial controls and dynamic controls:
-    // Type        Shortcut  Restore
-    // Artificial:    yes       no    Virtual::GlobalMaster or Virtual::CaptureGroup_3   (controls that are constructed artificially from other controls)
--   // Ethereal  :     no       no    Controls that come and go, like Pulse Stream controls
-+   // Dynamic   :     no       no    Controls that come and go, like Pulse Stream controls
-    bool _artificial;
--   bool _ethereal;
-    MixSet *_moveDestinationMixSet;
-    QString _iconName;
- 
-Index: kmix/core/mixer.cpp
-===================================================================
---- kmix/core/mixer.cpp	(revision 1226957)
-+++ kmix/core/mixer.cpp	(revision 1226958)
-@@ -748,7 +748,7 @@
-     m_dynamic = dynamic;
- }
- 
--bool Mixer::dynamic()
-+bool Mixer::isDynamic()
- {
-     return m_dynamic;
- }
-Index: kmix/core/mixer.h
-===================================================================
---- kmix/core/mixer.h	(revision 1226957)
-+++ kmix/core/mixer.h	(revision 1226958)
-@@ -164,7 +164,7 @@
- 
-     /// Says if we are dynamic (e.g. widgets can come and go)
-     virtual void setDynamic( bool dynamic = true );
--    virtual bool dynamic();
-+    virtual bool isDynamic();
- 
-     virtual bool moveStream( const QString id, const QString& destId );
- 
-Index: kmix/core/mixdevice.cpp
-===================================================================
---- kmix/core/mixdevice.cpp	(revision 1226957)
-+++ kmix/core/mixdevice.cpp	(revision 1226958)
-@@ -23,6 +23,7 @@
- #include <klocale.h>
- 
- #include "core/mixdevice.h"
-+#include "core/mixer.h"
- #include "gui/guiprofile.h"
- #include "core/volume.h"
- 
-@@ -96,14 +97,12 @@
- 
- MixDevice::MixDevice(  Mixer* mixer, const QString& id, const QString& name, const QString& iconName, MixSet* moveDestinationMixSet )
- {
--    // doNotRestore is superseded by the more generic concepts isEthereal(), isArtificial()
-     init(mixer, id, name, iconName, moveDestinationMixSet);
- }
- 
- void MixDevice::init(  Mixer* mixer, const QString& id, const QString& name, const QString& iconName, MixSet* moveDestinationMixSet )
- {
-     _artificial = false;
--    _ethereal   = false;
-     _mixer = mixer;
-     _id = id;
-     if( name.isEmpty() )
-@@ -117,9 +116,10 @@
-     _moveDestinationMixSet = moveDestinationMixSet;
-     if ( _id.contains(' ') ) {
-         // The key is used in the config file. It MUST NOT contain spaces
--        kError(67100) << "MixDevice::setId(\"" << id << "\") . Invalid key - it might not contain spaces" << endl;
-+        kError(67100) << "MixDevice::setId(\"" << id << "\") . Invalid key - it must not contain spaces" << endl;
-         _id.replace(' ', '_');
-     }
-+    kDebug(67100) << "MixDevice::init() _id=" << _id;
- }
- 
- void MixDevice::addPlaybackVolume(Volume &playbackVol)
-@@ -216,11 +216,10 @@
-  */
- void MixDevice::read( KConfig *config, const QString& grp )
- {
--    if ( isEthereal() || isArtificial() ) {
-+    if ( _mixer->isDynamic() || isArtificial() ) {
-         kDebug(67100) << "MixDevice::read(): This MixDevice does not permit volume restoration (i.e. because it is handled lower down in the audio stack). Ignoring.";
-     } else {
--        QString devgrp;
--        devgrp.sprintf( "%s.Dev%s", grp.toAscii().data(), _id.toAscii().data() );
-+        QString devgrp = QString("%1.Dev%2").arg(grp).arg(_id);
-         KConfigGroup cg = config->group( devgrp );
-         //kDebug(67100) << "MixDevice::read() of group devgrp=" << devgrp;
- 
-@@ -264,11 +263,10 @@
-  */
- void MixDevice::write( KConfig *config, const QString& grp )
- {
--    if (isEthereal() || isArtificial()) {
-+    if (_mixer->isDynamic() || isArtificial()) {
-         kDebug(67100) << "MixDevice::write(): This MixDevice does not permit volume saving (i.e. because it is handled lower down in the audio stack). Ignoring.";
-     } else {
--        QString devgrp;
--        devgrp.sprintf( "%s.Dev%s", grp.toAscii().data(), _id.toAscii().data() );
-+        QString devgrp = QString("%1.Dev%2").arg(grp).arg(_id);
-         KConfigGroup cg = config->group(devgrp);
-         // kDebug(67100) << "MixDevice::write() of group devgrp=" << devgrp;
- 
-Index: kmix/apps/kmix.cpp
-===================================================================
---- kmix/apps/kmix.cpp	(revision 1226957)
-+++ kmix/apps/kmix.cpp	(revision 1226958)
-@@ -182,21 +182,20 @@
- 
- void KMixWindow::initActionsAfterInitMixer()
- {
--    bool isPulseAudio = false;
--    // Add "launch_pavucontrol" to menu, if Pulseaudio backend is in use
-+    // Only show the new tab widget if some of the mixers are not Dynamic.
-+    // The GUI that then pops up could then make a new mixer from a dynamic one,
-+    // if mixed dynamic and non-dynamic mixers were allowed, but this is generally not the case.
-+    bool allDynamic = true;
-     foreach( Mixer* mixer, Mixer::mixers() )
-     {
--        if ( mixer->getDriverName() == "PulseAudio")
-+        if ( !mixer->isDynamic() )
-         {
--            isPulseAudio = true;
--            KAction* action = actionCollection()->addAction( "launch_pavucontrol" );
--            action->setText( i18n( "Audio setup (&Pulseaudio)" ) );
--            connect(action, SIGNAL(triggered(bool) ), SLOT( slotPavucontrolExec() ));
-+            allDynamic = false;
-             break;
-         }
-     }
- 
--    if (! isPulseAudio )
-+    if (! allDynamic )
-     {
-        QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall );
-        QPushButton* _cornerLabelNew = new QPushButton();
-@@ -339,8 +338,11 @@
-     
-     // The following loop is necessary for the case that the user has hidden all views for a Mixer instance.
-     // Otherwise we would not save the Meta information (step -2- below for that mixer.
--    foreach ( Mixer* mixer, Mixer::mixers() )
--        mixerViews[mixer->id()]; // just insert a map entry
-+    // We also do not save dynamic mixers (e.g. PulseAudio)
-+    foreach ( Mixer* mixer, Mixer::mixers() ) {
-+        if ( !mixer->isDynamic() )
-+            mixerViews[mixer->id()]; // just insert a map entry
-+    }
- 
-     // -1- Save the views themselves
-     for ( int i=0; i<m_wsMixers->count() ; ++i ) {
-@@ -351,8 +353,10 @@
-             // Otherwise the user will be confused afer re-plugging the card (as the config was not saved).
-             mw->saveConfig( KGlobal::config().data() );
-             // add the view to the corresponding mixer list, so we can save a views-per-mixer list below
--            QStringList& qsl = mixerViews[mw->mixer()->id()];
--            qsl.append(mw->getGuiprof()->getId());
-+            if ( !mw->mixer()->isDynamic() ) {
-+                QStringList& qsl = mixerViews[mw->mixer()->id()];
-+                qsl.append(mw->getGuiprof()->getId());
-+            }
-         }
-     }
- 
-@@ -539,22 +543,29 @@
-             continue;  // OK, this mixer already has a profile => skip it
-         }
-         // No TAB YET => This should mean KMix is just started, or the user has just plugged in a card
--        bool profileListHasKey = pconfig.hasKey( mixer->id() ); // <<< SHOULD be before the following line
--        QStringList profileList = pconfig.readEntry( mixer->id(), QStringList() );
-+        bool profileListHasKey = false;
-+        QStringList profileList;
-+        bool aProfileWasAddedSucesufully = false;
- 
--        bool aProfileWasAddedSucesufully = false;
--        foreach ( QString profileId, profileList)
--        {
--            // This handles the profileList form the kmixrc
--            kDebug() << "Now searching for profile: " << profileId  ;
--            GUIProfile* guiprof = GUIProfile::find(mixer, profileId, true, false); // ### Card specific profile ###
--            if ( guiprof != 0 ) {
--                addMixerWidget(mixer->id(), guiprof, -1);
--                aProfileWasAddedSucesufully = true;
-+        if ( !mixer->isDynamic() ) {
-+            // We do not support save profiles for dynamic mixers (i.e. PulseAudio)
-+
-+            profileListHasKey = pconfig.hasKey( mixer->id() ); // <<< SHOULD be before the following line
-+            profileList = pconfig.readEntry( mixer->id(), QStringList() );
-+
-+            foreach ( QString profileId, profileList)
-+            {
-+                // This handles the profileList form the kmixrc
-+                kDebug() << "Now searching for profile: " << profileId  ;
-+                GUIProfile* guiprof = GUIProfile::find(mixer, profileId, true, false); // ### Card specific profile ###
-+                if ( guiprof != 0 ) {
-+                    addMixerWidget(mixer->id(), guiprof, -1);
-+                    aProfileWasAddedSucesufully = true;
-+                }
-+                else {
-+                    kError() << "Cannot load profile " << profileId << " . It was removed by the user, or the KMix config file is defective.";
-+                }
-             }
--            else {
--                kError() << "Cannot load profile " << profileId << " . It was removed by the user, or the KMix config file is defective.";
--            }
-         }
- 
-         // The we_need_a_fallback case is a bit tricky. Please ask the author (cesken) before even considering to change the code.
-@@ -568,11 +579,17 @@
- 
-             // Lets try a bunch of fallback strategies:
-             GUIProfile* guiprof = 0;
-+            if ( !mixer->isDynamic() ) {
-+                // We know that GUIProfile::find() will return 0 if the mixer is dynamic, so don't bother checking.
-+                kDebug() << "Attempting to find a card-specific GUI Profile for the mixer " << mixer->id();
-                 guiprof = GUIProfile::find(mixer, QString("default"), false, false);  // ### Card specific profile ###
--            if ( guiprof == 0 ) {
--                guiprof = GUIProfile::find(mixer, QString("default"), false, true);  // ### Card unspecific profile ###
-+                if ( guiprof == 0 ) {
-+                    kDebug() << "Not found. Attempting to find a generic GUI Profile for the mixer " << mixer->id();
-+                    guiprof = GUIProfile::find(mixer, QString("default"), false, true);  // ### Card unspecific profile ###
-+                }
-             }
-             if ( guiprof == 0) {
-+                kDebug() << "Using fallback GUI Profile for the mixer " << mixer->id();
-                 // This means there is neither card specific nor card unspecific profile
-                 // This is the case for some backends (as they don't ship profiles).
-                 guiprof = GUIProfile::fallbackProfile(mixer);
-@@ -683,8 +700,7 @@
-         m_wsMixers->removeTab(idx);
-         delete kmw;
- 
--        bool isPulseAudio =  kmw->mixer()->getDriverName() == "PulseAudio";
--        m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1);
-+        m_wsMixers->setTabsClosable(!kmw->mixer()->isDynamic() && m_wsMixers->count() > 1);
- 
-         saveViewConfig();
-     }
-@@ -882,8 +898,7 @@
-             m_wsMixers->setCurrentWidget(kmw);
-         }
- 
--        bool isPulseAudio =  mixer->getDriverName() == "PulseAudio";
--        m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1);
-+        m_wsMixers->setTabsClosable(!mixer->isDynamic() && m_wsMixers->count() > 1);
-         m_dontSetDefaultCardOnStart = false;
- 
- 
-@@ -1071,12 +1086,6 @@
-     KMessageBox::information( 0, m_hwInfoString, i18n("Mixer Hardware Information") );
- }
- 
--void KMixWindow::slotPavucontrolExec()
--{
--    QStringList args("pavucontrol");
--    forkExec(args);
--}
--
- void KMixWindow::slotKdeAudioSetupExec()
- {
-     QStringList args;
-@@ -1133,6 +1142,12 @@
-             m_defaultCardOnStart = kmw->getGuiprof()->getId();
-         // As switching the tab does NOT mean switching the master card, we do not need to update dock icon here.
-         // It would lead to unnecesary flickering of the (complete) dock area.
-+
-+        // We only show the "Configure Channels..." menu item if the mixer is not dynamic
-+        ViewBase* view = kmw->currentView();
-+        QAction* action = actionCollection()->action( "toggle_channels_currentview" );
-+        if (view && action)
-+            action->setVisible( !view->getMixer()->isDynamic() );
-     }
- }
- 
-Index: kmix/apps/kmix.h
-===================================================================
---- kmix/apps/kmix.h	(revision 1226957)
-+++ kmix/apps/kmix.h	(revision 1226958)
-@@ -136,7 +136,6 @@
-   private slots:
-    void saveConfig();
-    void slotHWInfo();
--   void slotPavucontrolExec();
-    void slotKdeAudioSetupExec();
-    void slotConfigureCurrentView();
-    void slotSelectMaster();
-Index: kmix/kmixui.rc
-===================================================================
---- kmix/kmixui.rc	(revision 1226957)
-+++ kmix/kmixui.rc	(revision 1226958)
-@@ -17,7 +17,6 @@
-      <Action name="toggle_channels_currentview" append="save_merge"/>
-      <Action name="select_master" append="save_merge"/>
-      <Action name="launch_kdesoundsetup" append="save_merge"/>     
--     <Action name="launch_pavucontrol" append="save_merge"/>
-  </Menu>
-  <Menu name="help" append="about_merge"><text>&amp;Help</text>
-   <Action name="hwinfo"/>
-Index: kmix/backends/mixer_backend.cpp
-===================================================================
---- kmix/backends/mixer_backend.cpp	(revision 1226957)
-+++ kmix/backends/mixer_backend.cpp	(revision 1226958)
-@@ -48,7 +48,7 @@
- bool Mixer_Backend::openIfValid() {
-     bool valid = false;
-     int ret = open();
--    if ( ret == 0  && (m_mixDevices.count() > 0 || _mixer->dynamic())) {
-+    if ( ret == 0  && (m_mixDevices.count() > 0 || _mixer->isDynamic())) {
-         valid = true;
-         // A better ID is now calculated in mixertoolbox.cpp, and set via setID(),
-         // but we want a somehow usable fallback just in case.
-@@ -139,7 +139,7 @@
-       return m_mixDevices.at(0);  // Backend has NOT set a recommended master. Evil backend => lets help out.
-    } //first device (if exists)
-    else {
--      if ( !_mixer->dynamic()) {
-+      if ( !_mixer->isDynamic()) {
-          // This should never ever happen, as KMix doe NOT accept soundcards without controls
-          kError(67100) << "Mixer_Backend::recommendedMaster(): returning invalid master. This is a bug in KMix. Please file a bug report stating how you produced this." << endl;
-       }
-Index: kmix/backends/mixer_pulse.cpp
-===================================================================
---- kmix/backends/mixer_pulse.cpp	(revision 1226957)
-+++ kmix/backends/mixer_pulse.cpp	(revision 1226958)
-@@ -36,6 +36,8 @@
- #define KMIXPA_APP_CAPTURE  3
- #define KMIXPA_WIDGET_MAX KMIXPA_APP_CAPTURE
- 
-+#define KMIXPA_EVENT_KEY "sink-input-by-media-role:event"
-+
- static unsigned int refcount = 0;
- static pa_glib_mainloop *s_mainloop = NULL;
- static pa_context *s_context = NULL;
-@@ -189,7 +191,7 @@
- 
-     devinfo s;
-     s.index = s.device_index = i->index;
--    s.name = QString(i->name).replace(' ', '_');
-+    s.name = QString::fromUtf8(i->name).replace(' ', '_');
-     s.description = QString::fromUtf8(i->description);
-     s.icon_name = QString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME));
-     s.volume = i->volume;
-@@ -242,7 +244,7 @@
- 
-     devinfo s;
-     s.index = s.device_index = i->index;
--    s.name = QString(i->name).replace(' ', '_');
-+    s.name = QString::fromUtf8(i->name).replace(' ', '_');
-     s.description = QString::fromUtf8(i->description);
-     s.icon_name = QString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME));
-     s.volume = i->volume;
-@@ -307,26 +309,28 @@
- 
-     const char *t;
-     if ((t = pa_proplist_gets(i->proplist, "module-stream-restore.id"))) {
--        if (strcmp(t, "sink-input-by-media-role:event") == 0) {
-+        if (strcmp(t, KMIXPA_EVENT_KEY) == 0) {
-             kWarning(67100) << "Ignoring sink-input due to it being designated as an event and thus handled by the Event slider";
-             return;
-         }
-     }
- 
--    QString prefix = QString("%1: ").arg(i18n("Unknown Application"));
-+    QString appname = i18n("Unknown Application");
-     if (clients.contains(i->client))
--        prefix = QString("%1: ").arg(clients[i->client]);
-+        appname = clients[i->client];
- 
-+    QString prefix = QString("%1: ").arg(appname);
-+
-     devinfo s;
-     s.index = i->index;
-     s.device_index = i->sink;
-     s.description = prefix + QString::fromUtf8(i->name);
--    s.name = QString("stream:") + i->index;
-+    s.name = QString("stream:") + QString::number(i->index); //appname.replace(' ', '_').toLower();
-     s.icon_name = getIconNameFromProplist(i->proplist);
-     s.volume = i->volume;
-     s.channel_map = i->channel_map;
-     s.mute = !!i->mute;
--    s.stream_restore_rule = t;
-+    s.stream_restore_rule = QString::fromUtf8(t);
- 
-     translateMasksAndMaps(s);
- 
-@@ -370,22 +374,24 @@
-         return;
-     }
- 
--    QString prefix = QString("%1: ").arg(i18n("Unknown Application"));
-+    QString appname = i18n("Unknown Application");
-     if (clients.contains(i->client))
--        prefix = QString("%1: ").arg(clients[i->client]);
-+        appname = clients[i->client];
- 
-+    QString prefix = QString("%1: ").arg(appname);
-+
-     devinfo s;
-     s.index = i->index;
-     s.device_index = i->source;
-     s.description = prefix + QString::fromUtf8(i->name);
--    s.name = QString("stream:") + i->index;
-+    s.name = QString("stream:") + QString::number(i->index); //appname.replace(' ', '_').toLower();
-     s.icon_name = getIconNameFromProplist(i->proplist);
-     //s.volume = i->volume;
-     s.volume = captureDevices[i->source].volume;
-     s.channel_map = i->channel_map;
-     //s.mute = !!i->mute;
-     s.mute = captureDevices[i->source].mute;
--    s.stream_restore_rule = pa_proplist_gets(i->proplist, "module-stream-restore.id");
-+    s.stream_restore_rule = QString::fromUtf8(pa_proplist_gets(i->proplist, "module-stream-restore.id"));
- 
-     translateMasksAndMaps(s);
- 
-@@ -407,7 +413,7 @@
- }
- 
- 
--static devinfo create_role_devinfo(const char* name) {
-+static devinfo create_role_devinfo(QString name) {
- 
-     Q_ASSERT(s_RestoreRules.contains(name));
- 
-@@ -436,9 +442,10 @@
- 
-     if (eol > 0) {
-         dec_outstanding(c);
-+
-         // Special case: ensure that our media events exists.
-         // On first login by a new users, this wont be in our database so we should create it.
--        if (!outputRoles.contains(PA_INVALID_INDEX)) {
-+        if (!s_RestoreRules.contains(KMIXPA_EVENT_KEY)) {
-             // Create a fake rule
-             restoreRule rule;
-             rule.channel_map.channels = 1;
-@@ -447,37 +454,56 @@
-             rule.volume.values[0] = PA_VOLUME_NORM;
-             rule.mute = false;
-             rule.device = "";
--            s_RestoreRules["sink-input-by-media-role:event"] = rule;
-+            s_RestoreRules[KMIXPA_EVENT_KEY] = rule;
-+            kDebug(67100) << "Initialising restore rule for new user: " << i18n("Event Sounds");
-+        }
- 
--            devinfo s = create_role_devinfo("sink-input-by-media-role:event");
--            outputRoles[s.index] = s;
--            kDebug(67100) << "Initialising restore rule for new user: " << s.description;
-+        if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) {
-+            // If we have rules, it will be created below... but if no rules
-+            // then we add it here.
-+            if (!outputRoles.contains(PA_INVALID_INDEX)) {
-+                devinfo s = create_role_devinfo(KMIXPA_EVENT_KEY);
-+                outputRoles[s.index] = s;
- 
--            if (s_mixers.contains(KMIXPA_APP_PLAYBACK))
-                 s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index);
-+            }
-+
-+            s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate();
-         }
- 
--        if (s_mixers.contains(KMIXPA_APP_PLAYBACK))
--            s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate();
-         return;
-     }
- 
--    kDebug(67100) << "Got some info about restore rule: " << i->name << i->device;
-+
-+    QString name = QString::fromUtf8(i->name);
-+    kDebug(67100) << QString("Got some info about restore rule: '%1' (Device: %2)").arg(name).arg(i->device ? i->device : "None");
-     restoreRule rule;
-     rule.channel_map = i->channel_map;
-     rule.volume = i->volume;
-     rule.mute = !!i->mute;
-     rule.device = i->device;
--    s_RestoreRules[i->name] = rule;
- 
--    // We only want to know about Sound Events for now...
--    if (strcmp(i->name, "sink-input-by-media-role:event") == 0) {
--        devinfo s = create_role_devinfo(i->name);
--        bool is_new = !outputRoles.contains(s.index);
--        outputRoles[s.index] = s;
-+    if (rule.channel_map.channels < 1 && name == KMIXPA_EVENT_KEY) {
-+        // Stream restore rules may not have valid volumes/channel maps (as these are optional)
-+        // but we need a valid volume+channelmap for our events sounds so fix it up.
-+        rule.channel_map.channels = 1;
-+        rule.channel_map.map[0] = PA_CHANNEL_POSITION_MONO;
-+        rule.volume.channels = 1;
-+        rule.volume.values[0] = PA_VOLUME_NORM;
-+    }
- 
--        if (is_new && s_mixers.contains(KMIXPA_APP_PLAYBACK))
--            s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index);
-+    s_RestoreRules[name] = rule;
-+
-+    if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) {
-+        // We only want to know about Sound Events for now...
-+        if (name == KMIXPA_EVENT_KEY) {
-+            devinfo s = create_role_devinfo(name);
-+            bool is_new = !outputRoles.contains(s.index);
-+            outputRoles[s.index] = s;
-+
-+            if (is_new)
-+                s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index);
-+        }
-     }
- }
- 
-@@ -788,7 +814,6 @@
-         Volume v(dev.chanMask, PA_VOLUME_NORM, PA_VOLUME_MUTED, true, false);
-         setVolumeFromPulse(v, dev);
-         MixDevice* md = new MixDevice( _mixer, dev.name, dev.description, dev.icon_name, ms);
--        md->setEthereal(true);
-         md->addPlaybackVolume(v);
-         md->setMuted(dev.mute);
-         m_mixDevices.append(md);
-@@ -1095,10 +1120,10 @@
-                 {
-                     restoreRule &rule = s_RestoreRules[iter->stream_restore_rule];
-                     pa_ext_stream_restore_info info;
--                    info.name = iter->stream_restore_rule.toAscii().constData();
-+                    info.name = iter->stream_restore_rule.toUtf8().constData();
-                     info.channel_map = rule.channel_map;
-                     info.volume = genVolumeForPulse(*iter, md->playbackVolume());
--                    info.device = rule.device.isEmpty() ? NULL : rule.device.toAscii().constData();
-+                    info.device = rule.device.isEmpty() ? NULL : rule.device.toUtf8().constData();
-                     info.mute = (md->isMuted() ? 1 : 0);
- 
-                     pa_operation* o;
-@@ -1153,13 +1178,13 @@
- 
-     // Lookup the stream index.
-     uint32_t stream_index = PA_INVALID_INDEX;
--    const char* stream_restore_rule = NULL;
-+    QString stream_restore_rule = "";
-     devmap::iterator iter;
-     devmap *map = get_widget_map(m_devnum);
-     for (iter = map->begin(); iter != map->end(); ++iter) {
-         if (iter->name == id) {
-             stream_index = iter->index;
--            stream_restore_rule = iter->stream_restore_rule.isEmpty() ? NULL : iter->stream_restore_rule.toAscii().constData();
-+            stream_restore_rule = iter->stream_restore_rule;
-             break;
-         }
-     }
-@@ -1171,12 +1196,12 @@
- 
-     if (destId.isEmpty()) {
-         // We want to remove any specific device in the stream restore rule.
--        if (!stream_restore_rule || !s_RestoreRules.contains(stream_restore_rule)) {
-+        if (stream_restore_rule.isEmpty() || !s_RestoreRules.contains(stream_restore_rule)) {
-             kWarning(67100) <<  "Mixer_PULSE::moveStream(): Trying to set Automatic on a stream with no rule";
-         } else {
-             restoreRule &rule = s_RestoreRules[stream_restore_rule];
-             pa_ext_stream_restore_info info;
--            info.name = stream_restore_rule;
-+            info.name = stream_restore_rule.toUtf8().constData();
-             info.channel_map = rule.channel_map;
-             info.volume = rule.volume;
-             info.device = NULL;
-@@ -1192,12 +1217,12 @@
-     } else {
-         pa_operation* o;
-         if (KMIXPA_APP_PLAYBACK == m_devnum) {
--            if (!(o = pa_context_move_sink_input_by_name(s_context, stream_index, destId.toAscii().constData(), NULL, NULL))) {
-+            if (!(o = pa_context_move_sink_input_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) {
-                 kWarning(67100) <<  "pa_context_move_sink_input_by_name() failed";
-                 return false;
-             }
-         } else {
--            if (!(o = pa_context_move_source_output_by_name(s_context, stream_index, destId.toAscii().constData(), NULL, NULL))) {
-+            if (!(o = pa_context_move_source_output_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) {
-                 kWarning(67100) <<  "pa_context_move_source_output_by_name() failed";
-                 return false;
-             }
diff --git a/staging/kdemultimedia/mplayerthumbs.config b/staging/kdemultimedia/mplayerthumbs.config
deleted file mode 100644
index 761a17953..000000000
--- a/staging/kdemultimedia/mplayerthumbs.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0
diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD
deleted file mode 100644
index 47d24b7e4..000000000
--- a/staging/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,114 +0,0 @@
-# $Id: PKGBUILD 118075 2011-04-05 10:08:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdenetwork
-pkgname=('kdenetwork-filesharing'
-         'kdenetwork-kdnssd'
-         'kdenetwork-kget'
-         'kdenetwork-kopete'
-         'kdenetwork-kppp'
-         'kdenetwork-krdc'
-         'kdenetwork-krfb')
-pkgver=4.6.2
-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' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
-	'telepathy-qt4' 'docbook-xsl' 'libktorrent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('6865c074b87a201b876d11b86a2f14aff5f45abb')
-
-build() {
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
-        -DWITH_Xmms=OFF \
-		-DWITH_LibMeanwhile=OFF
-	make
-}
-
-package_kdenetwork-filesharing() {
-	pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
-	depends=('kdelibs' 'smbclient')
-	install='kdenetwork.install'
-	cd $srcdir/build/filesharing
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kdnssd() {
-	pkgdesc='Monitors the network for DNS-SD services'
-	depends=('kdelibs')
-	cd $srcdir/build/kdnssd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kget() {
-	pkgdesc='Download Manager'
-	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent')
-	optdepends=('python2: YouTube plugin')
-	url="http://kde.org/applications/internet/kget/"
-	install='kdenetwork.install'
-	cd $srcdir/build/kget
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kget
-	make DESTDIR=$pkgdir install
-
-        # Use the python2 executable
-        find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdenetwork-kopete() {
-	pkgdesc='Instant Messenger'
-	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
-	         'libidn' 'qimageblitz' 'v4l-utils' 'libgadu')
-	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork.install'
-	cd $srcdir/build/kopete
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kopete
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kppp() {
-	pkgdesc='Internet Dial-Up Tool'
-	depends=('kdebase-runtime' 'ppp')
-	url="http://kde.org/applications/internet/kppp/"
-	install='kdenetwork.install'
-	cd $srcdir/build/kppp
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kppp
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krdc() {
-	pkgdesc='Remote Desktop Client'
-	depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4')
-    optdepends=('kdebase-keditbookmarks: to edit bookmarks')
-	url="http://kde.org/applications/internet/krdc/"
-	cd $srcdir/build/krdc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krdc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krfb() {
-	pkgdesc='Desktop Sharing'
-	# note on libxdamage:
-	#       not detected by namcap because libgl depends on it
-	#       but nvidia providing libgl does not depend on libxdamage
-	depends=('kdebase-runtime' 'libvncserver' 'libxdamage')
-	cd $srcdir/build/krfb
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krfb
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdenetwork/kdenetwork.install b/staging/kdenetwork/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdenetwork/kdenetwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdepimlibs/PKGBUILD b/staging/kdepimlibs/PKGBUILD
deleted file mode 100644
index 67acd0465..000000000
--- a/staging/kdepimlibs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 118062 2011-04-05 10:07:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepimlibs
-pkgver=4.6.2
-pkgrel=1
-pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' )
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap'
-        'docbook-xsl')
-install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f3c78688203b90efabdd8961783e8f4d16d9c57c')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd $srcdir/build
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdepimlibs/kdepimlibs.install b/staging/kdepimlibs/kdepimlibs.install
deleted file mode 100644
index 99262607c..000000000
--- a/staging/kdepimlibs/kdepimlibs.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD
deleted file mode 100644
index df0b64ffc..000000000
--- a/staging/kdeplasma-addons/PKGBUILD
+++ /dev/null
@@ -1,603 +0,0 @@
-# $Id: PKGBUILD 118076 2011-04-05 10:08:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeplasma-addons
-pkgname=('kdeplasma-addons-applets-bball'
-         'kdeplasma-addons-applets-binary-clock'
-         'kdeplasma-addons-applets-blackboard'
-         'kdeplasma-addons-applets-bookmarks'
-         'kdeplasma-addons-applets-bubblemon'
-         'kdeplasma-addons-applets-calculator'
-         'kdeplasma-addons-applets-charselect'
-         'kdeplasma-addons-applets-comic'
-         'kdeplasma-addons-applets-community'
-         'kdeplasma-addons-applets-dict'
-         'kdeplasma-addons-applets-eyes'
-         'kdeplasma-addons-applets-fifteenpuzzle'
-         'kdeplasma-addons-applets-filewatcher'
-         'kdeplasma-addons-applets-frame'
-         'kdeplasma-addons-applets-fuzzy-clock'
-         'kdeplasma-addons-applets-incomingmsg'
-         'kdeplasma-addons-applets-kdeobservatory'
-         'kdeplasma-addons-applets-kimpanel'
-         'kdeplasma-addons-applets-knowledgebase'
-         'kdeplasma-addons-applets-kolourpicker'
-         'kdeplasma-addons-applets-konqprofiles'
-         'kdeplasma-addons-applets-konsoleprofiles'
-         'kdeplasma-addons-applets-lancelot'
-         'kdeplasma-addons-applets-leavenote'
-         'kdeplasma-addons-applets-life'
-         'kdeplasma-addons-applets-luna'
-         'kdeplasma-addons-applets-magnifique'
-         'kdeplasma-addons-applets-mediaplayer'
-         'kdeplasma-addons-applets-microblog'
-         'kdeplasma-addons-applets-news'
-         'kdeplasma-addons-applets-notes'
-         'kdeplasma-addons-applets-nowplaying'
-         'kdeplasma-addons-applets-paste'
-         'kdeplasma-addons-applets-pastebin'
-         'kdeplasma-addons-applets-plasmaboard'
-         'kdeplasma-addons-applets-previewer'
-         'kdeplasma-addons-applets-qalculate'
-         'kdeplasma-addons-applets-rememberthemilk'
-         'kdeplasma-addons-applets-rssnow'
-         'kdeplasma-addons-applets-showdashboard'
-         'kdeplasma-addons-applets-showdesktop'
-         'kdeplasma-addons-applets-social-news'
-         'kdeplasma-addons-applets-spellcheck'
-         'kdeplasma-addons-applets-systemloadviewer'
-         'kdeplasma-addons-applets-timer'
-         'kdeplasma-addons-applets-unitconverter'
-         'kdeplasma-addons-applets-weather'
-         'kdeplasma-addons-applets-weatherstation'
-         'kdeplasma-addons-applets-webslice'
-         'kdeplasma-addons-containments'
-         'kdeplasma-addons-libs'
-         'kdeplasma-addons-runners-audioplayercontrol'
-         'kdeplasma-addons-runners-browserhistory'
-         'kdeplasma-addons-runners-characters'
-         'kdeplasma-addons-runners-contacts'
-         'kdeplasma-addons-runners-converter'
-         'kdeplasma-addons-runners-datetime'
-         'kdeplasma-addons-runners-events'
-         'kdeplasma-addons-runners-katesessions'
-         'kdeplasma-addons-runners-konquerorsessions'
-         'kdeplasma-addons-runners-konsolesessions'
-         'kdeplasma-addons-runners-kopete'
-         'kdeplasma-addons-runners-mediawiki'
-         'kdeplasma-addons-runners-spellchecker'
-         'kdeplasma-addons-wallpapers-mandelbrot'
-         'kdeplasma-addons-wallpapers-marble'
-         'kdeplasma-addons-wallpapers-pattern'
-         'kdeplasma-addons-wallpapers-virus'
-         'kdeplasma-addons-wallpapers-weather')
-pkgver=4.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-groups=('kde' 'kdeplasma-addons')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs'
-	'kdeedu-marble' 'eigen' 'scim' 'qwt' 'docbook-xsl' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('f888908e937453c9799c6ad71c514a5227e13700')
-
-build() {
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeplasma-addons-applets-bball() {
-	pkgdesc='A bouncy ball for plasma'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/bball
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-binary-clock() {
-	pkgdesc='Time displayed in binary format'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/binary-clock
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-blackboard() {
-	pkgdesc='Black Board'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/blackboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bookmarks() {
-	pkgdesc='Quick Access to the Bookmarks'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/bookmarks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bubblemon() {
-	pkgdesc='A pretty bubble that monitors your system.'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/bubblemon
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-calculator() {
-	pkgdesc='Calculate simple sums'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/calculator
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-charselect() {
-	pkgdesc='View, select, and copy characters from a font collection'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/charselect
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-comic() {
-	pkgdesc='View comic strips from the Internet'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/comic
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-community() {
-	pkgdesc='Communicate using the Social Desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/community
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-dict() {
-	pkgdesc='Look up the meaning of words and their translation into different languages'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/dict
-	make DESTDIR=$pkgdir install
-	# FIXME
-	# /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz
-	rm -rf $pkgdir/usr/share/icons
-}
-
-package_kdeplasma-addons-applets-eyes() {
-	pkgdesc='XEyes clone'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/eyes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fifteenpuzzle() {
-	pkgdesc='Put the pieces in order'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/fifteenPuzzle
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-filewatcher() {
-	pkgdesc='Watch for changes in specified files'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/fileWatcher
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-frame() {
-	pkgdesc='Display your favorite pictures'
-	depends=('kdebase-workspace' 'kdegraphics-libs')
-	cd $srcdir/build/applets/frame
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fuzzy-clock() {
-	pkgdesc='Time displayed in a less precise format'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/fuzzy-clock
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-incomingmsg() {
-	pkgdesc='Notification of new messages'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/incomingmsg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kdeobservatory() {
-	pkgdesc='Visualize the KDE ecosystem'
-	depends=('kdebase-workspace' 'qwt')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/kdeobservatory
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kimpanel() {
-	pkgdesc='A generic input method panel for Oriental languages'
-	depends=('kdebase-workspace')
-	optdepends=('scim: SCIM backend'
-		'fcitx: FCITX backend')
-	cd $srcdir/build/applets/kimpanel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-knowledgebase() {
-	pkgdesc='Opendesktop Knowledgebase'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/knowledgebase
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kolourpicker() {
-	pkgdesc='Pick a color from the desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/kolourpicker
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konqprofiles() {
-	pkgdesc='List and launch Konqueror profiles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/konqprofiles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konsoleprofiles() {
-	pkgdesc='List and launch Konsole profiles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/konsoleprofiles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-lancelot() {
-	pkgdesc='Launcher to start applications'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	replaces=('lancelot')
-	provides=('lancelot')
-	conflicts=('lancelot')
-	install='kdeplasma-addons-applets-lancelot.install'
-	cd $srcdir/build/applets/lancelot
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-leavenote() {
-	pkgdesc='Leave notes for users while they are away'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/leavenote
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-life() {
-	pkgdesc='Life'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/life
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-luna() {
-	pkgdesc='Display moon phases for your location'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/luna
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-magnifique() {
-	pkgdesc='A magnification glass for the Plasma desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/magnifique
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-mediaplayer() {
-	pkgdesc='Widget that can play video and sound'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/mediaplayer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-microblog() {
-	pkgdesc='Update and view your microblog status.'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/microblog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-news() {
-	pkgdesc='Show news from various sources'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/news
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-notes() {
-	pkgdesc='Desktop sticky notes'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/notes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-nowplaying() {
-	pkgdesc='Displays currently playing audio'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/nowplaying
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-paste() {
-	pkgdesc='Paste text snippets'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/paste
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-pastebin() {
-	pkgdesc='Paste text/images to a remote server'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/pastebin
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-plasmaboard() {
-	pkgdesc='A virtual, on-screen keyboard'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/plasmaboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-previewer() {
-	pkgdesc='Preview This File'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/previewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-qalculate() {
-	pkgdesc='A powerful mathematical equation solver'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons-applets.install'
-	cd $srcdir/build/applets/qalculate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rememberthemilk() {
-	pkgdesc='Remember The Milk Todo list applet'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/rememberthemilk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rssnow() {
-	pkgdesc='Show news from various sources'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/rssnow
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdashboard() {
-	pkgdesc='Show the Plasma widget dashboard above other windows'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/showdashboard
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdesktop() {
-	pkgdesc='Show the Plasma desktop'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/showdesktop
-	make DESTDIR=$pkgdir install
-}
-
-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')
-	cd $srcdir/build/applets/social-news
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-spellcheck() {
-	pkgdesc='Fast spell checking'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/spellcheck
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-systemloadviewer() {
-	pkgdesc='Tiny CPU/RAM/Swap monitor'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/systemloadviewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-timer() {
-	pkgdesc='Countdown over a specified time period'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/applets/timer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-unitconverter() {
-	pkgdesc='Plasmoid for converting units'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/unitconverter
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weather() {
-	pkgdesc='Displays Weather information'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/weather
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weatherstation() {
-	pkgdesc='Weather reports with an LCD display style'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/weatherstation
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-webslice() {
-	pkgdesc='Show a part of a webpage'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/webslice
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-containments() {
-	pkgdesc='Activities types for Plasma shells'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/containments
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-libs() {
-	pkgdesc='Plasma Addon Library'
-	depends=('kdebase-workspace')
-	groups=()
-	replaces=('kdeplasma-addons-dataengines')
-	provides=('kdeplasma-addons-dataengines')
-	conflicts=('kdeplasma-addons-dataengines')
-	cd $srcdir/build/libs
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/dataengines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-audioplayercontrol() {
-	pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/audioplayercontrol
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-browserhistory() {
-	pkgdesc='Searches in Konqueror´s history'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/browserhistory
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-characters() {
-	pkgdesc='special Characters'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/characters
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-contacts() {
-	pkgdesc='Finds entries in your address book'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/contacts
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-converter() {
-	pkgdesc='Convert values to different units'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/runners/converter
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-datetime() {
-	pkgdesc='The current date and time, locally or in any timezone'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/datetime
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-events() {
-	pkgdesc='Calendar Events runner'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/events
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-katesessions() {
-	pkgdesc='Matches Kate Sessions'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/katesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konquerorsessions() {
-	pkgdesc='Matches Konqueror Sessions'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/konquerorsessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konsolesessions() {
-	pkgdesc='Matches Konsole Sessions'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/konsolesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-kopete() {
-	pkgdesc='Kopete Contact runner'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/kopete
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-mediawiki() {
-	pkgdesc='Search on Wikitravel'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/mediawiki
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-spellchecker() {
-	pkgdesc='Check the spelling of a word'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/spellchecker
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-mandelbrot() {
-	pkgdesc='Mandelbrot'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/mandelbrot
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-marble() {
-	pkgdesc='Globe'
-	depends=('kdebase-workspace' 'kdeedu-marble')
-	cd $srcdir/build/wallpapers/marble
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-pattern() {
-	pkgdesc='Pattern'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/pattern
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-virus() {
-	pkgdesc='Virus'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/virus
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-weather() {
-	pkgdesc='Weather'
-	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
-	cd $srcdir/build/wallpapers/weather
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets.install b/staging/kdeplasma-addons/kdeplasma-addons-applets.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/staging/kdeplasma-addons/kdeplasma-addons-applets.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/staging/kdeplasma-applets-networkmanagement/PKGBUILD b/staging/kdeplasma-applets-networkmanagement/PKGBUILD
deleted file mode 100644
index a27add6c9..000000000
--- a/staging/kdeplasma-applets-networkmanagement/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 105813 2011-01-12 00:25:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
-
-pkgname=kdeplasma-applets-networkmanagement
-pkgver=git20110405
-_commit=947e4de8b211b7c29ead108a2c3618a4af9dafe1
-pkgrel=1
-pkgdesc="KDE control panel and widget network connections"
-arch=('i686' 'x86_64')
-url="http://www.kde.org/"
-license=('GPL')
-depends=('kdebase-workspace' 'networkmanager')
-makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
-optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
-install=${pkgname}.install
-source=("${pkgname}-${_commit}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('17315e3dc3604ee59cf7b5777806f1b7')
-
-build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../networkmanagement \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install b/staging/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdesdk/PKGBUILD b/staging/kdesdk/PKGBUILD
deleted file mode 100644
index 2faafaa5a..000000000
--- a/staging/kdesdk/PKGBUILD
+++ /dev/null
@@ -1,243 +0,0 @@
-# $Id: PKGBUILD 118077 2011-04-05 10:08:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdesdk
-pkgname=('kdesdk-cervisia'
-         'kdesdk-dolphin-plugins'
-         'kdesdk-kapptemplate'
-         'kdesdk-kate'
-         'kdesdk-kcachegrind'
-         'kdesdk-kdeaccounts-plugin'
-         'kdesdk-kdepalettes'
-         'kdesdk-kioslave'
-         'kdesdk-kmtrace'
-         'kdesdk-kompare'
-         'kdesdk-kpartloader'
-         'kdesdk-kprofilemethod'
-         'kdesdk-kstartperf'
-         'kdesdk-kuiviewer'
-         'kdesdk-lokalize'
-         'kdesdk-okteta'
-         'kdesdk-poxml'
-         'kdesdk-scripts'
-         'kdesdk-strigi-analyzer'
-         'kdesdk-umbrello')
-pkgver=4.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdesdk')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'subversion'
-        'docbook-xsl' 'antlr2' 'kdebase-konqueror')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'fix-python2-path.patch')
-sha1sums=('d246f5571aa772d4a4d0538456b142799c17c146'
-          'd05ca0231869c484fd3861955d960a60aff7dcfb')
-
-build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-	# Fix python2 path
-	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
-}
-
-package_kdesdk-cervisia() {
-	pkgdesc='CVS Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/cervisia/"
-	install='kdesdk.install'
-	cd $srcdir/build/cervisia
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/cervisia
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-dolphin-plugins() {
-	pkgdesc='Extra Dolphin plugins'
-	depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare')
-	install='kdesdk.install'
-	cd $srcdir/build/dolphin-plugins/git
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/dolphin-plugins/svn
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kapptemplate() {
-	pkgdesc='KDE Template Generator'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kapptemplate/"
-	install='kdesdk.install'
-	cd $srcdir/build/kapptemplate
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kapptemplate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kate() {
-	pkgdesc='Advanced Text Editor'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kate/"
-	install='kdesdk-kate.install'
-	cd $srcdir/build/kate
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kcachegrind() {
-	pkgdesc='Visualization of Performance Profiling Data'
-	depends=('kdebase-runtime' 'python2')
-	optdepends=('php: PHP support')
-	url="http://kde.org/applications/development/kcachegrind/"
-	install='kdesdk.install'
-	cd $srcdir/build/kcachegrind
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcachegrind
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdeaccounts-plugin() {
-	pkgdesc='KDE Repository Accounts'
-	depends=('kdepim-runtime')
-	cd $srcdir/build/kdeaccounts-plugin
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdepalettes() {
-	pkgdesc='Palettes for the Gimp that match the KDE standard color palette'
-	optdepends=('gimp')
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \
-		$pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl
-}
-
-package_kdesdk-kioslave() {
-	pkgdesc='KDED Subversion Module'
-	depends=('kdebase-runtime' 'subversion')
-	cd $srcdir/build/kioslave
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kmtrace() {
-	pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kmtrace
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmtrace
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kompare() {
-	pkgdesc='Diff/Patch Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kompare/"
-	install='kdesdk.install'
-	cd $srcdir/build/kompare
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kompare
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kpartloader() {
-	pkgdesc='A test application for KParts'
-	depends=('kdebase-runtime')
-	install='kdesdk.install'
-	cd $srcdir/build/kpartloader
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kprofilemethod() {
-	pkgdesc='Macros helping to profile'
-	cd $srcdir/build/kprofilemethod
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kstartperf() {
-	pkgdesc='Startup time measurement tool for KDE applications'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kstartperf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kuiviewer() {
-	pkgdesc='Qt Designer UI File Viewer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kuiviewer/"
-	install='kdesdk.install'
-	cd $srcdir/build/kuiviewer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-lokalize() {
-	pkgdesc='Computer-Aided Translation System'
-	depends=('kdebase-runtime' 'kdebindings-python')
-	url="http://kde.org/applications/development/lokalize/"
-	optdepends=('translate-toolkit: enable extra python script')
-	install='kdesdk.install'
-	cd $srcdir/build/lokalize
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/lokalize
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-okteta() {
-	pkgdesc='Hex Editor'
-	depends=('kdebase-runtime')
-	replaces=('kdeutils-okteta')
-	conflicts=('kdeutils-okteta')
-	url="http://kde.org/applications/utilities/okteta"
-	install='kdesdk-okteta.install'
-	cd $srcdir/build/okteta
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/okteta
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-poxml() {
-	pkgdesc='Translates DocBook XML files using gettext po files'
-	depends=('qt' 'antlr2')
-	cd $srcdir/build/poxml
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/poxml
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scripts() {
-	pkgdesc='KDE SDK scripts'
-	depends=('python2')
-	cd $srcdir/build/scripts
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/scripts
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-strigi-analyzer() {
-	pkgdesc='Strigi-Analyzer for KDE SDK'
-	depends=('kdelibs')
-	cd $srcdir/build/strigi-analyzer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-umbrello() {
-	pkgdesc='UML Modeller'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/umbrello/"
-	install='kdesdk.install'
-	cd $srcdir/build/umbrello
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/umbrello
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdesdk/fix-python2-path.patch b/staging/kdesdk/fix-python2-path.patch
deleted file mode 100644
index c2c0745d1..000000000
--- a/staging/kdesdk/fix-python2-path.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- 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 @@
-         print >>sys.stderr, "Execution failed:", e
- 
-     cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname)
--    if os.name!='nt': cmd='python '+cmd
-+    if os.name!='nt': cmd='python2 '+cmd
-     else: cmd=cmd.replace('/','\\')
-     os.system(cmd)
-
---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~	2010-11-24 11:24:10.853333336 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py	2010-11-24 11:24:10.883333336 +0100
-@@ -42,7 +42,7 @@
-     xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf)
- 
-     ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0]
--    os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
-+    os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
- 
- 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 @@
- svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID
- 
- echo "Creating changelog...";
--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.
diff --git a/staging/kdesdk/kdesdk-kate.install b/staging/kdesdk/kdesdk-kate.install
deleted file mode 100644
index a60d358ce..000000000
--- a/staging/kdesdk/kdesdk-kate.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-        update-mime-database usr/share/mime  &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdesdk/kdesdk-okteta.install b/staging/kdesdk/kdesdk-okteta.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/staging/kdesdk/kdesdk-okteta.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdesdk/kdesdk.install b/staging/kdesdk/kdesdk.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdesdk/kdesdk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdetoys/PKGBUILD b/staging/kdetoys/PKGBUILD
deleted file mode 100644
index 69db214e6..000000000
--- a/staging/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 118078 2011-04-05 10:08:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdetoys
-pkgname=('kdetoys-amor'
-         'kdetoys-kteatime'
-         'kdetoys-ktux')
-pkgver=4.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdetoys')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('4619d2124abe0887ce5aca24f1333419f7cd88c5')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdetoys-amor() {
-	pkgdesc='On-Screen Creature'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/amor
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/amor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-kteatime() {
-	pkgdesc='Tea Cooker'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/kteatime
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kteatime
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-ktux() {
-	pkgdesc='KTux'
-	depends=('kdebase-workspace' )
-	install='kdetoys.install'
-	cd $srcdir/build/ktux
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdetoys/kdetoys.install b/staging/kdetoys/kdetoys.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdetoys/kdetoys.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeutils/PKGBUILD b/staging/kdeutils/PKGBUILD
deleted file mode 100644
index 983aa3156..000000000
--- a/staging/kdeutils/PKGBUILD
+++ /dev/null
@@ -1,180 +0,0 @@
-# $Id: PKGBUILD 118079 2011-04-05 10:08:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeutils
-pkgname=('kdeutils-ark'
-         'kdeutils-filelight'
-         'kdeutils-kcalc'
-         'kdeutils-kcharselect'
-         'kdeutils-kdf'
-         'kdeutils-kfloppy'
-         'kdeutils-kgpg'
-         'kdeutils-kremotecontrol'
-         'kdeutils-ktimer'
-         'kdeutils-kwallet'
-         'kdeutils-printer-applet'
-         'kdeutils-superkaramba'
-         'kdeutils-sweeper')
-pkgver=4.6.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeutils')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
-	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
-	'docbook-xsl' 'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('621d77f8f75bdd867316768f48ea257829f7def1')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeutils-ark() {
-	pkgdesc='Archiving Tool'
-	depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
-	optdepends=('p7zip' 'zip' 'unzip' 'unrar')
-	url="http://kde.org/applications/utilities/ark/"
-	cd $srcdir/build/ark
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ark
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-filelight() {
-	pkgdesc='View disk usage information'
-	depends=('kdebase-runtime' 'qimageblitz')
-	replaces=('filelight')
-	conflicts=('filelight')
-	install='kdeutils.install'
-	url="http://methylblue.com/filelight/"
-	cd $srcdir/build/filelight
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/filelight
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcalc() {
-	pkgdesc='Scientific Calculator'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kcalc/"
-	cd $srcdir/build/kcalc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcalc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcharselect() {
-	pkgdesc='Character Selector'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kcharselect/"
-	cd $srcdir/build/kcharselect
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcharselect
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kdf() {
-	pkgdesc='View Disk Usage'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/kdiskfree/"
-	install='kdeutils.install'
-	cd $srcdir/build/kdf
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kdf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kfloppy() {
-	pkgdesc='Floppy Formatter'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kfloppy/"
-	install='kdeutils.install'
-	cd $srcdir/build/kfloppy
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfloppy
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kgpg() {
-	pkgdesc='A GnuPG frontend'
-	depends=('kdepim-runtime' 'kde-agent')
-	url="http://kde.org/applications/utilities/kgpg"
-	install='kdeutils.install'
-	cd $srcdir/build/kgpg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kgpg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kremotecontrol() {
-	pkgdesc='Configure your remote controls for use with applications'
-	replaces=('kdeutils-kdelirc')
-	conflicts=('kdeutils-kdelirc')
-	depends=('kdebase-workspace')
-	url="http://kde.org/applications/utilities/kremotecontrol"
-	install='kdeutils.install'
-	cd $srcdir/build/kremotecontrol
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcontrol/kremotecontrol
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-ktimer() {
-	pkgdesc='Countdown Launcher'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/ktimer"
-	install='kdeutils.install'
-	cd $srcdir/build/ktimer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktimer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kwallet() {
-	pkgdesc='Wallet Management Tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/kwalletmanager/"
-	install='kdeutils.install'
-	cd $srcdir/build/kwallet
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kwallet
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-printer-applet() {
-	pkgdesc='System tray icon for managing print jobs'
-	depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
-	url="http://kde.org/applications/system/printerapplet/"
-	cd $srcdir/build/printer-applet
-	make DESTDIR=$pkgdir install
-
-        # Use the python2 executable
-        find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdeutils-superkaramba() {
-	pkgdesc='An engine for cool desktop eyecandy'
-	depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz')
-	url="http://kde.org/applications/utilities/superkaramba"
-	install='kdeutils.install'
-	cd $srcdir/build/superkaramba
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-sweeper() {
-	pkgdesc='System Cleaner'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/sweeper/"
-	cd $srcdir/build/sweeper
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeutils/kdeutils.install b/staging/kdeutils/kdeutils.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeutils/kdeutils.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD
deleted file mode 100644
index e0a90a5c9..000000000
--- a/staging/kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 118080 2011-04-05 10:08:44Z andrea $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdewebdev
-pkgname=('kdewebdev-kfilereplace'
-         'kdewebdev-kimagemapeditor'
-         'kdewebdev-klinkstatus'
-         'kdewebdev-kommander')
-pkgver=4.6.2
-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'
-	'docbook-xsl' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('80f709845fb871919fbb2c293d1cc8f40160509b')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdewebdev-kfilereplace() {
-	pkgdesc='Search & Replace Tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kfilereplace/"
-	install='kdewebdev.install'
-	cd $srcdir/build/kfilereplace
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfilereplace
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kimagemapeditor() {
-	pkgdesc='HTML Image Map Editor'
-	depends=('kdebase-runtime')
-	install='kdewebdev.install'
-	cd $srcdir/build/kimagemapeditor
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kimagemapeditor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-klinkstatus() {
-	pkgdesc='Link Checker'
-	depends=('kdepim-runtime' 'tidyhtml')
-	install='kdewebdev.install'
-	cd $srcdir/build/klinkstatus
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klinkstatus
-	make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kommander() {
-	pkgdesc='Executor for Kommander dialogs'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kommander
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdewebdev/kdewebdev.install b/staging/kdewebdev/kdewebdev.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdewebdev/kdewebdev.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/strigi/PKGBUILD b/staging/strigi/PKGBUILD
deleted file mode 100644
index cad570d70..000000000
--- a/staging/strigi/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 118083 2011-04-05 10:45:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=strigi
-pkgver=git20110405
-pkgrel=1
-pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
-arch=('i686' 'x86_64')
-url="http://www.vandenoever.info/software/strigi/"
-license=('GPL2')
-depends=('qt' 'clucene' 'bzip2' 'exiv2' 'libxml2')
-makedepends=('cmake' 'pkg-config')
-source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('dcc88c925c5ad264429ba841cab19b65')
-options=('!libtool')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_INOTIFY=ON \
-    -DENABLE_LOG4CXX=OFF \
-    -DENABLE_FAM=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}