From f951b4e72d10391bb4fbed865913abcba45424f7 Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Wed, 11 May 2011 22:13:25 +0000
Subject: [PATCH 01/51] kneda: bump to 0.6.2

---
 tools-pkg-appset-qt/PKGBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD
index 7fede6e8e..5a9123f0d 100644
--- a/tools-pkg-appset-qt/PKGBUILD
+++ b/tools-pkg-appset-qt/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=appset-qt
 pkgver=0.4.99
 _pkgver=0.5.0pre
-pkgrel=2
+pkgrel=3
 pkgdesc="An advanced and feature rich Package Manager Frontend"
 arch=('i686' 'x86_64')
 url="http://appset.sourceforge.net/"
@@ -18,10 +18,10 @@ source=(#http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkg
         http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz
         http://chakra-project.org/sources/$pkgname/$pkgname-0.4.99-chakra.patch
         http://chakra-project.org/sources/$pkgname/add-chinese-taiwan.patch
-        #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz
+        http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.5.0.tar.gz
         http://chakra-project.org/sources/$pkgname/appset-qt_de-0.5.0.tar.gz
         #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz
-        #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.1.tar.gz
+        http://chakra-project.org/sources/$pkgname/appset-qt_es-0.5.0.tar.gz
         http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.5.0.tar.gz
         #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz
         #http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz
@@ -31,10 +31,10 @@ md5sums=(fe36bcbe31602fab843e7b0676c5196e
          87f5f278e3fe67ed2cd6165c2835d81b
          f193b069c8ac4d392d0d1b6c9ca3469f
          7de9e3d87fb4258174af214b291b5444 # add-chinese-taiwan.patch
-         #8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz
+         c2fbac4cab7443f60ee00e48a4d537e3 # appset-qt_ca.0.5.0.tar.gz
          6a0f0a7af86b518853533d046cdba069 # appset-qt_de-0.5.0.tar.gz
          #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz
-         #033278244a74b198f386766abbb9fc50 # appset-qt_es.0.4.1.tar.gz
+         f04f8aa20631feca91bbde3519bfcf48 # appset-qt_es.0.5.0.tar.gz
          fa69077be4ac7c409df87ab256c97919 # appset-qt_fr.0.5.0.tar.gz
          #2acb9e2ac0e6d75f3d97148a621a5539 # appset-qt_nl-0.4.1.tar.gz
          #53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz

From 997776be912c0fd06ac141f0c3bdb49e8773e084 Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Fri, 13 May 2011 21:19:44 +0000
Subject: [PATCH 02/51] appset-qt: update translations

---
 tools-pkg-appset-qt/PKGBUILD | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD
index 5a9123f0d..5f9f43525 100644
--- a/tools-pkg-appset-qt/PKGBUILD
+++ b/tools-pkg-appset-qt/PKGBUILD
@@ -3,9 +3,9 @@
 # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626
 
 pkgname=appset-qt
-pkgver=0.4.99
-_pkgver=0.5.0pre
-pkgrel=3
+pkgver=0.4.99.1
+_pkgver=0.5.0rc
+pkgrel=1
 pkgdesc="An advanced and feature rich Package Manager Frontend"
 arch=('i686' 'x86_64')
 url="http://appset.sourceforge.net/"
@@ -18,27 +18,27 @@ source=(#http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkg
         http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz
         http://chakra-project.org/sources/$pkgname/$pkgname-0.4.99-chakra.patch
         http://chakra-project.org/sources/$pkgname/add-chinese-taiwan.patch
-        http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.5.0.tar.gz
-        http://chakra-project.org/sources/$pkgname/appset-qt_de-0.5.0.tar.gz
+        #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.5.0.tar.gz
+        http://chakra-project.org/sources/$pkgname/appset-qt_de-0.5.0-new.tar.gz
         #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz
-        http://chakra-project.org/sources/$pkgname/appset-qt_es-0.5.0.tar.gz
-        http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.5.0.tar.gz
+        #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.5.0.tar.gz
+        #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.5.0.tar.gz
         #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz
         #http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz
-        http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.5.0.tar.gz       
+        #http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.5.0.tar.gz       
         )
-md5sums=(fe36bcbe31602fab843e7b0676c5196e
+md5sums=(633c522feb36cb4072754a9ac7a40b4d
          87f5f278e3fe67ed2cd6165c2835d81b
          f193b069c8ac4d392d0d1b6c9ca3469f
          7de9e3d87fb4258174af214b291b5444 # add-chinese-taiwan.patch
-         c2fbac4cab7443f60ee00e48a4d537e3 # appset-qt_ca.0.5.0.tar.gz
-         6a0f0a7af86b518853533d046cdba069 # appset-qt_de-0.5.0.tar.gz
+         #c2fbac4cab7443f60ee00e48a4d537e3 # appset-qt_ca.0.5.0.tar.gz
+         e92f04ce53565ffa396251c4b044ef1c # appset-qt_de-0.5.0-new.tar.gz
          #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz
-         f04f8aa20631feca91bbde3519bfcf48 # appset-qt_es.0.5.0.tar.gz
-         fa69077be4ac7c409df87ab256c97919 # appset-qt_fr.0.5.0.tar.gz
+         #f04f8aa20631feca91bbde3519bfcf48 # appset-qt_es.0.5.0.tar.gz
+         #fa69077be4ac7c409df87ab256c97919 # appset-qt_fr.0.5.0.tar.gz
          #2acb9e2ac0e6d75f3d97148a621a5539 # appset-qt_nl-0.4.1.tar.gz
          #53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz
-         f75199ceb618cb580efcd57b89301f6b # appset-qt_zh-tw-0.5.0.tar.gz
+         #f75199ceb618cb580efcd57b89301f6b # appset-qt_zh-tw-0.5.0.tar.gz
          )
 
 build() {

From 436b8e19c3ac32e49bd5420c861cca2c34d873cc Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Sun, 15 May 2011 15:19:23 +0000
Subject: [PATCH 03/51] tribe: new tarball

---
 tools-pkg-tribe/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index 7e7d7e468..bbdb534c5 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -9,7 +9,7 @@
 #
 pkgname=tribe
 pkgver=2011.04_r0
-pkgrel=1
+pkgrel=2
 _codename=Aida
 pkgdesc="Tribe - Chakra LiveCD Installer"
 url="http://git.chakra-project.org/chakra/"
@@ -25,8 +25,8 @@ options=('!splithdr' '!splitdbg' 'sign')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
         "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104R0.html")
   
-md5sums=('28f4c2ee7f5a103bb9ab642aa1db87d4'
-         'fb75ac0ce37b6ad838f667b415f5a2e0')
+md5sums=('5e533ae74833bf129c00df8a7c36cd0b'
+         'd08dc5ae910e38c28cbdda56e90d475d')
          
 groups=('kde-uninstall')
 install=tools-tribe.install

From e1004f9b9be6081c8fdddd28e144abdc6dbfd0f6 Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Mon, 16 May 2011 22:16:09 +0000
Subject: [PATCH 04/51] tribe: new tarball

---
 tools-pkg-tribe/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index bbdb534c5..bc7b48034 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -9,7 +9,7 @@
 #
 pkgname=tribe
 pkgver=2011.04_r0
-pkgrel=2
+pkgrel=3
 _codename=Aida
 pkgdesc="Tribe - Chakra LiveCD Installer"
 url="http://git.chakra-project.org/chakra/"
@@ -25,8 +25,8 @@ options=('!splithdr' '!splitdbg' 'sign')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
         "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104R0.html")
   
-md5sums=('5e533ae74833bf129c00df8a7c36cd0b'
-         'd08dc5ae910e38c28cbdda56e90d475d')
+md5sums=('6ba1af6535ee6833fb33af345025b688'
+         '52ea0eba2b0845f86df9235a0eda560d')
          
 groups=('kde-uninstall')
 install=tools-tribe.install

From e5e4017da1c95d75aea15afacf17e3feebce5c8b Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Thu, 19 May 2011 06:25:38 +0000
Subject: [PATCH 05/51] appset: bump to 0.5

---
 tools-pkg-appset-qt/PKGBUILD | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD
index 5f9f43525..52a438db2 100644
--- a/tools-pkg-appset-qt/PKGBUILD
+++ b/tools-pkg-appset-qt/PKGBUILD
@@ -3,8 +3,7 @@
 # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626
 
 pkgname=appset-qt
-pkgver=0.4.99.1
-_pkgver=0.5.0rc
+pkgver=0.5.0
 pkgrel=1
 pkgdesc="An advanced and feature rich Package Manager Frontend"
 arch=('i686' 'x86_64')
@@ -13,13 +12,12 @@ license=('GPL2')
 depends=('qt>=4.7')
 optdepends=('ccr: For Community Repository support')
 install=${pkgname}.install
-source=(#http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz
-        http://sourceforge.net/projects/appset/files/appset-qt/0.5/0.5.0/$pkgname-$_pkgver-sources.tar.gz
+source=(http://sourceforge.net/projects/appset/files/appset-qt/0.5/$pkgver/$pkgname-$pkgver-sources.tar.gz
         http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz
         http://chakra-project.org/sources/$pkgname/$pkgname-0.4.99-chakra.patch
-        http://chakra-project.org/sources/$pkgname/add-chinese-taiwan.patch
+        #http://chakra-project.org/sources/$pkgname/add-chinese-taiwan.patch
         #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.5.0.tar.gz
-        http://chakra-project.org/sources/$pkgname/appset-qt_de-0.5.0-new.tar.gz
+        #http://chakra-project.org/sources/$pkgname/appset-qt_de-0.5.0-new.tar.gz
         #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz
         #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.5.0.tar.gz
         #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.5.0.tar.gz
@@ -27,12 +25,12 @@ source=(#http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkg
         #http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz
         #http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.5.0.tar.gz       
         )
-md5sums=(633c522feb36cb4072754a9ac7a40b4d
+md5sums=(4c7aab8d55fadeb287f52ff00d97d3e1
          87f5f278e3fe67ed2cd6165c2835d81b
          f193b069c8ac4d392d0d1b6c9ca3469f
-         7de9e3d87fb4258174af214b291b5444 # add-chinese-taiwan.patch
+         #7de9e3d87fb4258174af214b291b5444 # add-chinese-taiwan.patch
          #c2fbac4cab7443f60ee00e48a4d537e3 # appset-qt_ca.0.5.0.tar.gz
-         e92f04ce53565ffa396251c4b044ef1c # appset-qt_de-0.5.0-new.tar.gz
+         #e92f04ce53565ffa396251c4b044ef1c # appset-qt_de-0.5.0-new.tar.gz
          #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz
          #f04f8aa20631feca91bbde3519bfcf48 # appset-qt_es.0.5.0.tar.gz
          #fa69077be4ac7c409df87ab256c97919 # appset-qt_fr.0.5.0.tar.gz
@@ -42,8 +40,7 @@ md5sums=(633c522feb36cb4072754a9ac7a40b4d
          )
 
 build() {
-  #cd $srcdir/$pkgname-$pkgver-sources
-  cd $srcdir/$pkgname-$_pkgver-sources
+  cd $srcdir/$pkgname-$pkgver-sources
   # copy oxygen icons
   cp -v ../*png Qt/AppSet-Qt
 
@@ -51,9 +48,9 @@ build() {
   patch -Np1 -i ${startdir}/src/$pkgname-0.4.99-chakra.patch
 
   # add chakra translations (check upstream)
-  patch -Np1 -i ${startdir}/src/add-chinese-taiwan.patch
-  cp -v ../appsettray-qt*.ts Qt/AppSetTray-Qt
-  cp -v ../appset-qt*.ts Qt/AppSet-Qt
+  #patch -Np1 -i ${startdir}/src/add-chinese-taiwan.patch
+  #cp -v ../appsettray-qt*.ts Qt/AppSetTray-Qt
+  #cp -v ../appset-qt*.ts Qt/AppSet-Qt
 
   # check for updated strings
   cd Qt/AppSet-Qt
@@ -72,14 +69,12 @@ build() {
 }
 
 package() {
-    #cd $srcdir/$pkgname-$pkgver-sources
-    cd $srcdir/$pkgname-$_pkgver-sources
+    cd $srcdir/$pkgname-$pkgver-sources
 
     make INSTALL_ROOT="$pkgdir/" install
 
     #helper daemon
     install -m 755 -d "$pkgdir/etc/rc.d" || return 1
-    #install -m 755 "$srcdir/$pkgname-$pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper"
-    install -m 755 "$srcdir/$pkgname-$_pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper"
+    install -m 755 "$srcdir/$pkgname-$pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper"
 }
 

From 42ff2a09c93019efeff21d08ed810a28ddbd539e Mon Sep 17 00:00:00 2001
From: Manuel Tortosa <manutortosa@chakra-project.org>
Date: Sun, 22 May 2011 10:22:00 +0000
Subject: [PATCH 06/51] Update to a more recent version working again with usb
 modems

---
 tools-pkg-networkmanagement/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-pkg-networkmanagement/PKGBUILD b/tools-pkg-networkmanagement/PKGBUILD
index e6ae4bf69..0a5fda42a 100644
--- a/tools-pkg-networkmanagement/PKGBUILD
+++ b/tools-pkg-networkmanagement/PKGBUILD
@@ -14,7 +14,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 pkgname=('networkmanagement')
          
 arch=('i686' 'x86_64')
-pkgver=20110304
+pkgver=20110522
 pkgrel=1
 
 pkgdesc="KDE SC networkmanager plasmoid"
@@ -30,7 +30,7 @@ replaces=('networkmanagement-networkmanager-plasmoid' 'networkmanagement-knetwor
 
 install=${pkgname}.install
 source=("http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('efe2283dacf2b7f38a2e067ba3373b3e') # networkmanagement-20110304.tar.xz
+md5sums=('b836c6a05adf896feb42b40e0185b1f3') # networkmanagement-20110522.tar.xz
 
 # create tarball: source PKGBUILD && mksource
 

From be620e68a6aed3e5c1d2152154fa6e2a94b38d7e Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Sun, 22 May 2011 14:35:40 +0000
Subject: [PATCH 07/51] partitionmanager: revert to 2011.04.03 tribe: add fixes

---
 tools-pkg-tribe/PKGBUILD | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index bc7b48034..9dc74de94 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -8,25 +8,25 @@
 # package info
 #
 pkgname=tribe
-pkgver=2011.04_r0
-pkgrel=3
+pkgver=2011.04_20110522
+pkgrel=1
 _codename=Aida
 pkgdesc="Tribe - Chakra LiveCD Installer"
 url="http://git.chakra-project.org/chakra/"
 license="GPL"
 arch=('i686' 'x86_64')
-depends=('kdelibs' 'kdeedu-marble>=4.6.3' 'squashfs-tools' 'partitionmanager>=1216949-4'
-        'cinstall>=0.4.5' 'rsync' 'mkinitcpio-nfs-utils' 'ntfsprogs')
+depends=('kdelibs' 'kdeedu-marble>=4.6.3' 'squashfs-tools' 'partitionmanager>=1216949-6'
+        'cinstall>=0.4.5.1' 'rsync' 'mkinitcpio-nfs-utils' 'ntfsprogs')
 makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.6.3' 'kdebase-workspace' 'automoc4')
 provides=('tribe')
 replaces=('kdemod-tribe-svn' 'kdemod-tribe')
 conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager')
 options=('!splithdr' '!splitdbg' 'sign')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
-        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104R0.html")
+        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110522.html")
   
-md5sums=('6ba1af6535ee6833fb33af345025b688'
-         '52ea0eba2b0845f86df9235a0eda560d')
+md5sums=('06dff82a38a061f569af28c86cc52f91'
+         'a40d9783ba3260f7547530331a0b3cde')
          
 groups=('kde-uninstall')
 install=tools-tribe.install
@@ -85,7 +85,7 @@ package()
         cd "${srcdir}/$pkgname"
 	msg "Make successful, installing..."
 	make DESTDIR=$startdir/pkg install || return 1
-	cp -vf ${srcdir}/RELEASE_NOTES_201104R0.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
+	cp -vf ${srcdir}/RELEASE_NOTES_20110522.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
 
 	# remove nasty files
 	find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +

From 254c27bf742d0d231a6bf96f66c1461abaa13a68 Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Sun, 22 May 2011 16:16:30 +0000
Subject: [PATCH 08/51] tribe: fix networkmanager deamon

---
 tools-pkg-tribe/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index 9dc74de94..298fd71c4 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -9,7 +9,7 @@
 #
 pkgname=tribe
 pkgver=2011.04_20110522
-pkgrel=1
+pkgrel=2
 _codename=Aida
 pkgdesc="Tribe - Chakra LiveCD Installer"
 url="http://git.chakra-project.org/chakra/"
@@ -25,7 +25,7 @@ options=('!splithdr' '!splitdbg' 'sign')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
         "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110522.html")
   
-md5sums=('06dff82a38a061f569af28c86cc52f91'
+md5sums=('fe2437300667e997ab601ff85d9f0679'
          'a40d9783ba3260f7547530331a0b3cde')
          
 groups=('kde-uninstall')

From 4fd0bce24e15f0443a14eb84edbb101138ca1c16 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Sun, 22 May 2011 16:17:13 +0000
Subject: [PATCH 09/51] cinstall update to 0.4.6, temp pkgbuild switch to
 fritz_v_t branch

---
 tools-pkg-cinstall/PKGBUILD | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index 94bcbec28..e32fd3f5f 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -6,8 +6,8 @@
 # (c) 2010 Drake Justice
 
 pkgname=cinstall
-pkgver=0.4.5.1
-pkgrel=2
+pkgver=0.4.6
+pkgrel=1
 depends=('rsync' 'cbundle')
 makedepends=('kdelibs' 'qt' 'automoc4')
 pkgdesc="Bundle Creator/Launcher and Package-Manager"
@@ -16,21 +16,21 @@ license=('GPL')
 install=$pkgname.install
 url="http://chakra-project.org/"
 
-source=("http://chakra-project.org/sources/cinstall/cinstall-$pkgver.tar.xz")
-md5sums=('c7c22a279dc3f0f9e16ada74e5ebaf41')
+source=("cinstall-$pkgver.tar.xz")
+md5sums=('319cf5c7444ec78c15fade63b380a05e')
 
 # create tarball: source PKGBUILD && mksource
 
 mksource() {
-  git clone git://gitorious.org/chakra/cinstall.git
-  pushd cinstall
+  git clone git://gitorious.org/~fritzvantom/chakra/fritzvantoms-cinstall.git
+  pushd fritzvantoms-cinstall
   popd
-  tar -cvJf cinstall-${pkgver}.tar.xz cinstall/*
+  tar -cvJf cinstall-${pkgver}.tar.xz fritzvantoms-cinstall/*
   md5sum cinstall-${pkgver}.tar.xz
 }
 
 build() {
-        cd "${srcdir}/cinstall"
+        cd "${srcdir}/fritzvantoms-cinstall"
         cmake  \
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DCMAKE_BUILD_TYPE=Release

From 3567c9261a5600ca54611a66c1da0494e63e3c4a Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Sun, 22 May 2011 19:06:39 +0200
Subject: [PATCH 10/51] tribe: md5sum RE.html

---
 tools-pkg-tribe/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index 298fd71c4..dfa252466 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -26,7 +26,7 @@ source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.x
         "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110522.html")
   
 md5sums=('fe2437300667e997ab601ff85d9f0679'
-         'a40d9783ba3260f7547530331a0b3cde')
+         'adf7b3b05606a6f2d64be0f2cc4a4331')
          
 groups=('kde-uninstall')
 install=tools-tribe.install

From 60e2a1ddeff80aaa722fe0371af29f068b4a12eb Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 22 May 2011 23:31:37 +0000
Subject: [PATCH 11/51] Add sound-theme-freedesktop dependency, needed for the
 sounds used by libcanberra for testing the speakers

---
 support-pkg-libcanberra/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/support-pkg-libcanberra/PKGBUILD b/support-pkg-libcanberra/PKGBUILD
index 7ff965172..14028102f 100644
--- a/support-pkg-libcanberra/PKGBUILD
+++ b/support-pkg-libcanberra/PKGBUILD
@@ -7,11 +7,11 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.28
-pkgrel=1
+pkgrel=2
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libvorbis>=1.3.1' 'libtool' 'alsa-lib>=1.0.23' 'tdb>=1.2.1')
+depends=('libvorbis>=1.3.1' 'libtool' 'alsa-lib>=1.0.23' 'tdb>=1.2.1' 'sound-theme-freedesktop')
 makedepends=('libpulse' 'gstreamer0.10>=0.10.30')
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra

From c5eda0e3495610e96fff2cec4bc7a01375574664 Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Mon, 23 May 2011 13:54:04 +0000
Subject: [PATCH 12/51] tribe: bump to 20110523

---
 tools-pkg-tribe/PKGBUILD | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index dfa252466..11df6beb4 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -8,25 +8,25 @@
 # package info
 #
 pkgname=tribe
-pkgver=2011.04_20110522
-pkgrel=2
+pkgver=2011.04_20110523
+pkgrel=1
 _codename=Aida
 pkgdesc="Tribe - Chakra LiveCD Installer"
 url="http://git.chakra-project.org/chakra/"
 license="GPL"
 arch=('i686' 'x86_64')
-depends=('kdelibs' 'kdeedu-marble>=4.6.3' 'squashfs-tools' 'partitionmanager>=1216949-6'
-        'cinstall>=0.4.5.1' 'rsync' 'mkinitcpio-nfs-utils' 'ntfsprogs')
+depends=('kdelibs' 'kdeedu-marble>=4.6.3' 'squashfs-tools' 'partitionmanager>=1216949-5'
+        'cinstall>=0.4.6' 'rsync' 'mkinitcpio-nfs-utils' 'ntfsprogs')
 makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.6.3' 'kdebase-workspace' 'automoc4')
 provides=('tribe')
 replaces=('kdemod-tribe-svn' 'kdemod-tribe')
 conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager')
 options=('!splithdr' '!splitdbg' 'sign')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
-        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110522.html")
+        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110523.html")
   
-md5sums=('fe2437300667e997ab601ff85d9f0679'
-         'adf7b3b05606a6f2d64be0f2cc4a4331')
+md5sums=('b43dc33f88aa39e959fc5ecd5301ec17'
+         '38bf110532b4827f21138e1baa2afe64')
          
 groups=('kde-uninstall')
 install=tools-tribe.install
@@ -85,7 +85,7 @@ package()
         cd "${srcdir}/$pkgname"
 	msg "Make successful, installing..."
 	make DESTDIR=$startdir/pkg install || return 1
-	cp -vf ${srcdir}/RELEASE_NOTES_20110522.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
+	cp -vf ${srcdir}/RELEASE_NOTES_20110523.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
 
 	# remove nasty files
 	find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +

From 38c80ff6efd8d30772948800ae6ca63abd2721e1 Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Mon, 23 May 2011 22:52:10 +0000
Subject: [PATCH 13/51] appset: bump to 0.5.1 -Some minor bugs fixed for both
 tray and main GUI -Romanian translation -Serbian translation

---
 tools-pkg-appset-qt/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD
index 52a438db2..89c0746ba 100644
--- a/tools-pkg-appset-qt/PKGBUILD
+++ b/tools-pkg-appset-qt/PKGBUILD
@@ -3,7 +3,7 @@
 # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626
 
 pkgname=appset-qt
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 pkgdesc="An advanced and feature rich Package Manager Frontend"
 arch=('i686' 'x86_64')
@@ -25,7 +25,7 @@ source=(http://sourceforge.net/projects/appset/files/appset-qt/0.5/$pkgver/$pkgn
         #http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz
         #http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.5.0.tar.gz       
         )
-md5sums=(4c7aab8d55fadeb287f52ff00d97d3e1
+md5sums=(337c0cb0b05c8da59b4cfde58d18e61e
          87f5f278e3fe67ed2cd6165c2835d81b
          f193b069c8ac4d392d0d1b6c9ca3469f
          #7de9e3d87fb4258174af214b291b5444 # add-chinese-taiwan.patch

From 31ef0d561ecfdd2d431240d59654c31e59cf7bce Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Wed, 25 May 2011 22:38:36 +0000
Subject: [PATCH 14/51] tribe: bump to 20110526

---
 tools-pkg-tribe/PKGBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index 11df6beb4..5ae4c2eb2 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -8,7 +8,7 @@
 # package info
 #
 pkgname=tribe
-pkgver=2011.04_20110523
+pkgver=2011.04_20110526
 pkgrel=1
 _codename=Aida
 pkgdesc="Tribe - Chakra LiveCD Installer"
@@ -23,10 +23,10 @@ replaces=('kdemod-tribe-svn' 'kdemod-tribe')
 conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager')
 options=('!splithdr' '!splitdbg' 'sign')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
-        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110523.html")
+        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110526.html")
   
-md5sums=('b43dc33f88aa39e959fc5ecd5301ec17'
-         '38bf110532b4827f21138e1baa2afe64')
+md5sums=('5cbfa0baa2baca2d19e98ce6f87ec1d8'
+         '6763a69e543b52dc018f84826aa5f80f')
          
 groups=('kde-uninstall')
 install=tools-tribe.install
@@ -85,7 +85,7 @@ package()
         cd "${srcdir}/$pkgname"
 	msg "Make successful, installing..."
 	make DESTDIR=$startdir/pkg install || return 1
-	cp -vf ${srcdir}/RELEASE_NOTES_20110523.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
+	cp -vf ${srcdir}/RELEASE_NOTES_20110526.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
 
 	# remove nasty files
 	find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +

From 5d3dfa543f09232928984c0d943c90b565154552 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 28 May 2011 18:16:01 +0000
Subject: [PATCH 15/51] Make possible to use a provider package

---
 tools-pkg-networkmanagement/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-pkg-networkmanagement/PKGBUILD b/tools-pkg-networkmanagement/PKGBUILD
index 0a5fda42a..609f7aa86 100644
--- a/tools-pkg-networkmanagement/PKGBUILD
+++ b/tools-pkg-networkmanagement/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=('networkmanagement')
          
 arch=('i686' 'x86_64')
 pkgver=20110522
-pkgrel=1
+pkgrel=2
 
 pkgdesc="KDE SC networkmanager plasmoid"
 url="http://plasma.kde.org"
@@ -23,7 +23,7 @@ license=('GPL')
 
 options=('force')
 
-depends=("kdelibs>=${_kdever}" "kdebase-workspace>=${_kdever}" 'networkmanager>=0.8.2')
+depends=("kdelibs" "kdebase-workspace" 'networkmanager>=0.8.2')
 makedepends=('subversion' 'cmake' 'python' 'automoc4' 'mobile-broadband-provider-info')
 optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
 replaces=('networkmanagement-networkmanager-plasmoid' 'networkmanagement-knetworkmanager-kde4')

From 7f820bb958a9865ae3f54997818098ababa7e6b3 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Sun, 29 May 2011 01:36:38 +0000
Subject: [PATCH 16/51] cinstall update, showing d-l speed and Mb

---
 tools-pkg-cinstall/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index e32fd3f5f..0524dbca5 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -6,7 +6,7 @@
 # (c) 2010 Drake Justice
 
 pkgname=cinstall
-pkgver=0.4.6
+pkgver=0.4.6.1
 pkgrel=1
 depends=('rsync' 'cbundle')
 makedepends=('kdelibs' 'qt' 'automoc4')
@@ -17,7 +17,7 @@ install=$pkgname.install
 url="http://chakra-project.org/"
 
 source=("cinstall-$pkgver.tar.xz")
-md5sums=('319cf5c7444ec78c15fade63b380a05e')
+md5sums=('165756aaa3abf35f2f5cf45ce9d9a425')
 
 # create tarball: source PKGBUILD && mksource
 

From 9aa91b540ec26eef781e3cee2c606260c4fe2176 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 29 May 2011 17:29:17 +0000
Subject: [PATCH 17/51] Prepare docs for kde 4.7

---
 kdeaccessibility/PKGBUILD | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kdeaccessibility/PKGBUILD b/kdeaccessibility/PKGBUILD
index cdad998e5..b8fd73c72 100644
--- a/kdeaccessibility/PKGBUILD
+++ b/kdeaccessibility/PKGBUILD
@@ -32,7 +32,7 @@ pkgname=('kdeaccessibility-common'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -93,8 +93,6 @@ package_kdeaccessibility-common()
 package_kdeaccessibility-doc()
 {
 	pkgdesc="KDE Accessibility Aids - Documentation"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-doc")
 	groups=("${_origname}" "kde-complete" "kde-uninstall" "kde-doc")
 
 	splitdirs="doc"

From dc32f90fd442635917cfe0890d72ecc88a485a47 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 29 May 2011 17:31:27 +0000
Subject: [PATCH 18/51] Prepare docs for kde 4.7

---
 kdeadmin/PKGBUILD | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kdeadmin/PKGBUILD b/kdeadmin/PKGBUILD
index dbe42c345..a4b173d9c 100644
--- a/kdeadmin/PKGBUILD
+++ b/kdeadmin/PKGBUILD
@@ -29,7 +29,7 @@ pkgname=('kdeadmin-common'
       
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="split package"
 url="http://www.kde.org/"
@@ -101,7 +101,6 @@ package_kdeadmin-common()
 package_kdeadmin-doc()
 {
 	pkgdesc="KDE Administrative Tools - Documentation"
-	depends=("${_origname}-common>=${_kdever}")
 	groups=("${_origname}" "kde-complete" "kde-uninstall" "doc")
 
 	splitdirs="doc"

From e62b457af050a9ec034807593d6bbd1bb14021ed Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 29 May 2011 17:34:56 +0000
Subject: [PATCH 19/51] Prepare for kde 4.7

---
 kdebase/PKGBUILD | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kdebase/PKGBUILD b/kdebase/PKGBUILD
index 9b6d60cb0..00bbccf97 100644
--- a/kdebase/PKGBUILD
+++ b/kdebase/PKGBUILD
@@ -27,7 +27,7 @@ pkgname=('kdebase'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -170,7 +170,6 @@ package_kdebase()
 package_kdebase-doc()
 {
 	pkgdesc="KDE Base Applications - Documentation"
-	depends=("${_origname}>=${_kdever}")
         groups=("kde-complete" "kde-uninstall" "kde-doc")
 
 	splitdirs="doc"

From 3b8428769e5adfb3417da03c7ad8ebdb9814fde7 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 29 May 2011 17:40:01 +0000
Subject: [PATCH 20/51] Prepare for kde 4.7

---
 kdebase-runtime/PKGBUILD | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kdebase-runtime/PKGBUILD b/kdebase-runtime/PKGBUILD
index 00a23872a..de87a4f8a 100644
--- a/kdebase-runtime/PKGBUILD
+++ b/kdebase-runtime/PKGBUILD
@@ -23,7 +23,7 @@ pkgname=('kdebase-runtime'
         
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -142,7 +142,6 @@ package_kdebase-runtime()
 package_kdebase-runtime-doc()
 {
 	pkgdesc="KDE Base Runtime - Documentation"
-	depends=("${_origname}>=${_kdever}")
 	groups=("kde-complete" "kde-uninstall" "kde-doc")
 
 	splitdirs="doc"

From 7f182ebbba8edb99cc4f79e727e0493880cc47aa Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 29 May 2011 18:30:29 +0000
Subject: [PATCH 21/51] Prepare docs for kde 4.7

---
 kdebase-workspace/PKGBUILD | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD
index f8f9f0a81..265f34bed 100644
--- a/kdebase-workspace/PKGBUILD
+++ b/kdebase-workspace/PKGBUILD
@@ -26,7 +26,7 @@ pkgname=('kdebase-workspace'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -348,7 +348,6 @@ package_kdebase-workspace()
 package_kdebase-workspace-doc()
 {
 	pkgdesc="KDE Workspace - Documentation"
-	depends=("${_origname}>=${_kdever}")
 	groups=("kde" "kde-complete" "kde-uninstall" "kde-doc")
 	# keep this, the variable must be resetted
 	optdepends=()

From 7ed5e664f0efef6bc6ce8791d3d1687ca8b80294 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 29 May 2011 18:34:56 +0000
Subject: [PATCH 22/51] Prepare docs for kde 4.7

---
 kdeedu/PKGBUILD | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kdeedu/PKGBUILD b/kdeedu/PKGBUILD
index 9d134b334..c3b0e2c0e 100644
--- a/kdeedu/PKGBUILD
+++ b/kdeedu/PKGBUILD
@@ -43,7 +43,7 @@ pkgname=('kdeedu-common'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=3
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -120,8 +120,6 @@ package_kdeedu-common()
 package_kdeedu-doc()
 {
 	pkgdesc="KDE Education Programs - Documentation"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-doc")
 	groups=("kde-complete" "kdeedu" "kde-uninstall" "kde-doc")
 
 	splitdirs="doc"

From f993706cc91d56472e29484c737388c4ce2a2827 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 29 May 2011 18:51:35 +0000
Subject: [PATCH 23/51] Fix docs for 4.7

---
 kdegames/PKGBUILD | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kdegames/PKGBUILD b/kdegames/PKGBUILD
index 383c191b3..e91ea037e 100644
--- a/kdegames/PKGBUILD
+++ b/kdegames/PKGBUILD
@@ -62,7 +62,7 @@ pkgname=('kdegames-common'
         
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -135,8 +135,6 @@ package_kdegames-common()
 package_kdegames-doc()
 {
 	pkgdesc="KDE games - Documentation"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-doc")
 	groups=("kde-complete" "${_origname}" "kde-doc" "kde-uninstall")
 
 	splitdirs="doc"

From cf172d5d55bc00af20aa14bbb4839a9b415f32a2 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 29 May 2011 19:02:51 +0000
Subject: [PATCH 24/51] Fix docs for 4.7

---
 kdegraphics/PKGBUILD | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kdegraphics/PKGBUILD b/kdegraphics/PKGBUILD
index 71a3282cc..ebcf7c3a3 100644
--- a/kdegraphics/PKGBUILD
+++ b/kdegraphics/PKGBUILD
@@ -30,7 +30,7 @@ pkgname=('kdegraphics-common'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -107,8 +107,6 @@ package_kdegraphics-common()
 package_kdegraphics-doc()
 {
 	pkgdesc="KDE Graphics - Documentation"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-doc")
 	groups=("kde-complete" "${_origname}" "kde-doc" "kde-uninstall")
 
 	splitdirs="doc"

From 7392e47f6d7a65e8154feb9ffa1c9be6e1856662 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Sun, 29 May 2011 16:43:39 +0000
Subject: [PATCH 25/51] cinstall update, added tool-tip and bundle size

---
 tools-pkg-cinstall/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index 0524dbca5..d76bf58ae 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -6,7 +6,7 @@
 # (c) 2010 Drake Justice
 
 pkgname=cinstall
-pkgver=0.4.6.1
+pkgver=0.4.6.2
 pkgrel=1
 depends=('rsync' 'cbundle')
 makedepends=('kdelibs' 'qt' 'automoc4')
@@ -17,7 +17,7 @@ install=$pkgname.install
 url="http://chakra-project.org/"
 
 source=("cinstall-$pkgver.tar.xz")
-md5sums=('165756aaa3abf35f2f5cf45ce9d9a425')
+md5sums=('1988c7b9673635741ce71f4dece44e28')
 
 # create tarball: source PKGBUILD && mksource
 

From 3c35500aa42eca3c499008956a1f8f723966359d Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Tue, 31 May 2011 01:45:59 +0200
Subject: [PATCH 26/51] tribe: adopt to chakra-live

---
 tools-pkg-tribe/PKGBUILD | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index 5ae4c2eb2..536402655 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -8,7 +8,7 @@
 # package info
 #
 pkgname=tribe
-pkgver=2011.04_20110526
+pkgver=2011.04_20110530
 pkgrel=1
 _codename=Aida
 pkgdesc="Tribe - Chakra LiveCD Installer"
@@ -23,10 +23,10 @@ replaces=('kdemod-tribe-svn' 'kdemod-tribe')
 conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager')
 options=('!splithdr' '!splitdbg' 'sign')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
-        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110526.html")
+        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110530.html")
   
-md5sums=('5cbfa0baa2baca2d19e98ce6f87ec1d8'
-         '6763a69e543b52dc018f84826aa5f80f')
+md5sums=('a8e6d836665d91536b961a6af3ededcf'
+         'e7ac7749f073e6f82a40e8220ecb70f1')
          
 groups=('kde-uninstall')
 install=tools-tribe.install
@@ -60,13 +60,8 @@ build()
 	#patch -Np1 -i ${srcdir}/fake-progress.patch || return 1
 	#patch -Np1 -i ${startdir}/2011.03-1.patch || return 1
 
-	# remove unsupported pkgs for x64
-	if [ "${CARCH}" = "x86_64" ]; then
-	    rm -v ${srcdir}/$pkgname/data/appIcons/wine.png
-	    rm -v ${srcdir}/$pkgname/data/appIcons/skype.png
-	    sed -i -e '/wine/d' ${srcdir}/$pkgname/data/configPagePkgData
-	    sed -i -e '/skype/d' ${srcdir}/$pkgname/data/configPagePkgData
-	fi
+	# proper bootmnt folder
+	sed -i -e "s/@ARCH@/${CARCH}/g" config-tribe.h.cmake
 
 	# add pkgver to tribe
 	sed -i -e "s~source build/from git~Build: ${pkgver} ($_codename)~g" config-tribe.h.cmake
@@ -85,7 +80,7 @@ package()
         cd "${srcdir}/$pkgname"
 	msg "Make successful, installing..."
 	make DESTDIR=$startdir/pkg install || return 1
-	cp -vf ${srcdir}/RELEASE_NOTES_20110526.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
+	cp -vf ${srcdir}/RELEASE_NOTES_20110530.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
 
 	# remove nasty files
 	find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +

From 225c2e194589d9019020ee4cfe9eaf4eaa681048 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Wed, 1 Jun 2011 03:50:55 +0000
Subject: [PATCH 27/51] kdeedu rebuild for new r/blas/lapack, added docbook-xsl
 dep

---
 kdeedu/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kdeedu/PKGBUILD b/kdeedu/PKGBUILD
index c3b0e2c0e..6935364b7 100644
--- a/kdeedu/PKGBUILD
+++ b/kdeedu/PKGBUILD
@@ -53,7 +53,7 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
 
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'eigen' 'cfitsio' "kdelibs>=${_kdever}"
              "kdebase-runtime>=${_kdever}" 'openbabel' 'libqalculate' 'gsl' 'boost' 'indilib' 'r>=2.11.1'
-             'libspectre' 'python' 'xplanet' 'docbook-xml' 'avogadro')
+             'libspectre' 'python' 'xplanet' 'docbook-xsl' 'avogadro')
 
 source=($_mirror/${_origname}-$_kdever.tar.bz2)
 md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)

From 48228c9080912fc7c0125f88240882e92342e480 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Thu, 2 Jun 2011 16:54:18 +0000
Subject: [PATCH 28/51] cinstall rebuild for segfault with abort

---
 tools-pkg-cinstall/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index d76bf58ae..f234c9aa0 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -6,7 +6,7 @@
 # (c) 2010 Drake Justice
 
 pkgname=cinstall
-pkgver=0.4.6.2
+pkgver=0.4.6.3
 pkgrel=1
 depends=('rsync' 'cbundle')
 makedepends=('kdelibs' 'qt' 'automoc4')
@@ -17,7 +17,7 @@ install=$pkgname.install
 url="http://chakra-project.org/"
 
 source=("cinstall-$pkgver.tar.xz")
-md5sums=('1988c7b9673635741ce71f4dece44e28')
+md5sums=('47b8ef294ea1c1937961499ccdc14f25')
 
 # create tarball: source PKGBUILD && mksource
 

From 58a983ba2bc534ae17769660f32bc3ec05c188dd Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Fri, 3 Jun 2011 14:47:29 +0000
Subject: [PATCH 29/51] cinstall rebuild, for crash on delete bundle

---
 tools-pkg-cinstall/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index f234c9aa0..3cca74daf 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -6,7 +6,7 @@
 # (c) 2010 Drake Justice
 
 pkgname=cinstall
-pkgver=0.4.6.3
+pkgver=0.4.6.4
 pkgrel=1
 depends=('rsync' 'cbundle')
 makedepends=('kdelibs' 'qt' 'automoc4')
@@ -17,7 +17,7 @@ install=$pkgname.install
 url="http://chakra-project.org/"
 
 source=("cinstall-$pkgver.tar.xz")
-md5sums=('47b8ef294ea1c1937961499ccdc14f25')
+md5sums=('0130a79daa5d8225f6a4487bc474377f')
 
 # create tarball: source PKGBUILD && mksource
 

From 1ead73fab74b31a5e4ae4be73ddcb8d75ad4f7f0 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 00:00:27 +0000
Subject: [PATCH 30/51] Prepare kde 4.6.4

---
 kde-sc.md5            | 93 ++++++++++---------------------------------
 oxygen-icons/PKGBUILD | 41 +++----------------
 2 files changed, 26 insertions(+), 108 deletions(-)

diff --git a/kde-sc.md5 b/kde-sc.md5
index 5a4403f01..1a2dcb76e 100644
--- a/kde-sc.md5
+++ b/kde-sc.md5
@@ -1,74 +1,21 @@
-a29356a9322b9ed61ff369bed5a9a26d  kdeaccessibility-4.6.3.tar.bz2
-8ac0a89337a58ddec49be0ca7a4a7534  kdeadmin-4.6.3.tar.bz2
-f45a8ed91c578275056c86f7022695ee  kdeartwork-4.6.3.tar.bz2
-4f0627e33bd857beebd92be1065ed83e  kdebase-4.6.3.tar.bz2
-a6f294900d73d92cd68ea93aea297ff0  kdebase-runtime-4.6.3.tar.bz2
-1e481727c3a5c2e4b751b9c56bd56583  kdebase-workspace-4.6.3.tar.bz2
-085f6497be800adea167addc09b89ccc  kdebindings-4.6.3.tar.bz2
-d96dd69e7e54c34d9ae18a8db6aee7e3  kdegames-4.6.3.tar.bz2
-26c2eca2d707f9fc69db87c0467e5849  kdegraphics-4.6.3.tar.bz2
-521eb1cc09cc148466610bbeaea4c490  kde-l10n-ar-4.6.3.tar.bz2
-51ba77c47fe5da0b4231c4372301a833  kde-l10n-bg-4.6.3.tar.bz2
-5e95ed75bea716d7dc3f0a24aa834e8b  kde-l10n-ca-4.6.3.tar.bz2
-ce9ae8b33a6bc23d36a510dcc3e2de43  kde-l10n-ca@valencia-4.6.3.tar.bz2
-f601f2bfbc855c7c431231b18a5037a6  kde-l10n-cs-4.6.3.tar.bz2
-2c2f38e57dcc5fbb7c812dba4050fb54  kde-l10n-da-4.6.3.tar.bz2
-2e8a58b6660ccdcf4e7415b374f59e2a  kde-l10n-de-4.6.3.tar.bz2
-2f450b7ad5d61fa90b7ecac75dece724  kde-l10n-el-4.6.3.tar.bz2
-de1e529ab09c43aee344d11f362e43db  kde-l10n-en_GB-4.6.3.tar.bz2
-fb0537d04fd9985a5048b4cb7551eebe  kde-l10n-es-4.6.3.tar.bz2
-e0dd4dd166d90740076d5d30211c7d35  kde-l10n-et-4.6.3.tar.bz2
-e9b101f00cd29709e37f876baef6d0c3  kde-l10n-eu-4.6.3.tar.bz2
-a19c739a851bbe9b6dce2288c37a2d71  kde-l10n-fi-4.6.3.tar.bz2
-b46fa84651e0b4a9081f4947170ec60a  kde-l10n-fr-4.6.3.tar.bz2
-ec76e99b18f8d27ca9b8df959f1605e7  kde-l10n-ga-4.6.3.tar.bz2
-9f9cc72cf633ed0c5a9b58ee5a0281ca  kde-l10n-gl-4.6.3.tar.bz2
-fb532865f497bc133cc91f9b0c98a39a  kde-l10n-gu-4.6.3.tar.bz2
-da90b73bfa034c097b8a9fc30053f7a8  kde-l10n-he-4.6.3.tar.bz2
-ace74a0b07d0070cf28bf8adcec233d6  kde-l10n-hi-4.6.3.tar.bz2
-42ec84a3042ae0dae59a326c9d70f029  kde-l10n-hr-4.6.3.tar.bz2
-48628b153b1575c017b80e30a61403b1  kde-l10n-hu-4.6.3.tar.bz2
-a9980e9d8a4e62b830b8e7691c6a3385  kde-l10n-ia-4.6.3.tar.bz2
-2cc1dab0cdc794a409701cfba57879c2  kde-l10n-id-4.6.3.tar.bz2
-fefd6bf0989f7d98eeb0e19fc8d40072  kde-l10n-is-4.6.3.tar.bz2
-89b4ebf8bc08642cac15b43b9f2db1f0  kde-l10n-it-4.6.3.tar.bz2
-2b5c138b4da8485cdbd23840a2c6e1e2  kde-l10n-ja-4.6.3.tar.bz2
-2537b2cdfc138ddf55c0988738368a84  kde-l10n-kk-4.6.3.tar.bz2
-3dc17c22991b26f8caebba79d9364a73  kde-l10n-km-4.6.3.tar.bz2
-1342e8c0bbc969d72fd48e189e16e40c  kde-l10n-kn-4.6.3.tar.bz2
-2db2dd6cf706f01b97f8fa789a94f6c8  kde-l10n-ko-4.6.3.tar.bz2
-d66cb3b9afec95f58126800eb02990b0  kde-l10n-lt-4.6.3.tar.bz2
-f973389bcd062bad7d1531c2616779eb  kde-l10n-lv-4.6.3.tar.bz2
-68b9d2266eebcd167f81ec5b91469e3d  kde-l10n-mai-4.6.3.tar.bz2
-2e1f1b911c1ada5040febc29a4df6198  kde-l10n-nb-4.6.3.tar.bz2
-df0d8d0c68cf8c01ef9b7d096551da49  kde-l10n-nds-4.6.3.tar.bz2
-5e202ffaeaf1d6e45180eb873fbbf20f  kde-l10n-nl-4.6.3.tar.bz2
-57d2d45d23e35c8b5093589f2dbd9e0a  kde-l10n-nn-4.6.3.tar.bz2
-50c3ce506883642d8efa55a2e9bc1dc1  kde-l10n-pa-4.6.3.tar.bz2
-89057e6e4d0846c752aecabc0386e724  kde-l10n-pl-4.6.3.tar.bz2
-caf1c54964874123e1593eb0a345e1ca  kde-l10n-pt-4.6.3.tar.bz2
-fa0df7aeb16c4d454e4c94943c41cbdd  kde-l10n-pt_BR-4.6.3.tar.bz2
-66907ed3d8d37afac20aae08e4188a48  kde-l10n-ro-4.6.3.tar.bz2
-59594340a5f9f6a19ca89341533e92e7  kde-l10n-ru-4.6.3.tar.bz2
-86f1a6e190baa2cf4f496c07657fb2fa  kde-l10n-sk-4.6.3.tar.bz2
-d6ab0ccd8bc6fcf53c2f7ebedfe85f4a  kde-l10n-sl-4.6.3.tar.bz2
-96c1bb81b1fc3cc0f93cd7556e40654e  kde-l10n-sr-4.6.3.tar.bz2
-46bdd954e192f96a975947e6b4c88f8a  kde-l10n-sv-4.6.3.tar.bz2
-32d2d6e033a3f5f438d5a6990e1e3af5  kde-l10n-th-4.6.3.tar.bz2
-966f3d53c34cbdb42fd8320bc9b8e555  kde-l10n-tr-4.6.3.tar.bz2
-28a503ab78eab59cd19ecabb405db5d7  kde-l10n-uk-4.6.3.tar.bz2
-98680c2c096b26edf17de72252893032  kde-l10n-wa-4.6.3.tar.bz2
-f89c8830eb5813301e1acfa43acea519  kde-l10n-zh_CN-4.6.3.tar.bz2
-81dd406b11ea7e30972269064af47721  kde-l10n-zh_TW-4.6.3.tar.bz2
-923a7e8f89aa504647e14472b24b8c0a  kdelibs-4.6.3.tar.bz2
-fcfef0fe2ee4f216831f74efa78b554b  kdemultimedia-4.6.3.tar.bz2
-0fd1a35dd3c820d840ca2e11c51b1215  kdenetwork-4.6.3.tar.bz2
-0b0fc8d9fea0a6f26e705460a2865e18  kdepimlibs-4.6.3.tar.bz2
-c4a223067a228688c6b62a6bdd67a022  kdesdk-4.6.3.tar.bz2
-900e1d92cf35ef45eeae9a7796e5fe66  kdetoys-4.6.3.tar.bz2
-0d2911c29300d84db10948d7c196aaac  kdeutils-4.6.3.tar.bz2
-1101f7c38b745ba619be6f9665c87ddc  kdewebdev-4.6.3.tar.bz2
-3390ae73d1a0c70c121f69b556757fdd  oxygen-icons-4.6.3.tar.bz2
-259ba3e733fecd145c4389f10bee5ad1  kdeedu-4.6.3.tar.bz2
-f3033dc62fcc1988dec6a38796cb929d  kdeplasma-addons-4.6.3.tar.bz2
+e926fb2d7aac50b55bca1abfbb2ead5a  kdeaccessibility-4.6.4.tar.bz2
+63176591390ad6234c8d8c2074f9d504  kdeadmin-4.6.4.tar.bz2
+b0d226a378f793c9b8069170c401c477  kdeartwork-4.6.4.tar.bz2
+875991779d0b3f47f6c3f9d1e90add47  kdebase-4.6.4.tar.bz2
+4dac9447211e14480863b7c070fc8f1d  kdebase-runtime-4.6.4.tar.bz2
+126bfdd4abb1b2b9798d3b600031df9d  kdebase-workspace-4.6.4.tar.bz2
+928680628d9d4f63b2606e4ccc3788a0  kdebindings-4.6.4.tar.bz2
+c6db43df9324b18f00cc75a6e5303e3f  kdegames-4.6.4.tar.bz2
+91b52d9a7b5bd9874d5f947b4c196327  kdegraphics-4.6.4.tar.bz2
+d38a8bf5b2002f9014727cec4395ba2a  kdelibs-4.6.4.tar.bz2
+e575d0d8cd23060a7baec5c1aa046645  kdemultimedia-4.6.4.tar.bz2
+30d0a5df2509cea40adf369197e03bb6  kdenetwork-4.6.4.tar.bz2
+3252cd3453a9bd8a629f6a18b868cff2  kdepimlibs-4.6.4.tar.bz2
+dd7f88f57795bd44c9105f7e0c760307  kdeplasma-addons-4.6.4.tar.bz2
+fd24b467b075318ec467bd9d5d011d3a  kdesdk-4.6.4.tar.bz2
+3992f66affb9d73be8efacef45adf212  kdetoys-4.6.4.tar.bz2
+d8cf730f8443e95f53f5a1aec36de02d  kdeutils-4.6.4.tar.bz2
+f62a243125d2fb62fa30fc3d13a227e1  kdewebdev-4.6.4.tar.bz2
+4db01ee30085a421ba0e5c6e9d8ea79b  oxygen-icons-4.6.4.tar.bz2
+
 
diff --git a/oxygen-icons/PKGBUILD b/oxygen-icons/PKGBUILD
index dc054b4bd..fd00c9f0b 100644
--- a/oxygen-icons/PKGBUILD
+++ b/oxygen-icons/PKGBUILD
@@ -7,13 +7,6 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=oxygen-icons
-
-
-
 #
 # package info
 #
@@ -23,34 +16,22 @@ pkgname=('oxygen-icons'
 	 
 arch=('any')
 pkgver=${_kdever}
-pkgrel=2
-
+pkgrel=1
 pkgdesc="split package"
 url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
-
 install=oxygen-icons.install
-
 makedepends=('pkgconfig' 'cmake' 'automoc4')
 
-# source=($_mirror/${_origname}-$_kdever.tar.bz2
-source=("$_mirror/${_origname}-4.6.2.tar.bz2"
-	"http://chakra-project.org/source/icons/oxygencolors-addon.tar.gz")
-#md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
-#         'da971d7e2c862a6f77fb310a289f5529') #  ../_sources/oxygencolors-addon.tar.gz
-
-    
-md5sums=('c46e7e51c5dde641f1e4c6bba0f2852f'
-         'da971d7e2c862a6f77fb310a289f5529')
-
+source=($_mirror/${pkgbase}-$_kdever.tar.bz2)
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 
 #
 # build and install
 #
 build()
 {
-        mv -f $srcdir/$_origname-4.6.2 $srcdir/$_origname-$pkgver
-	cd $srcdir/$_origname-$pkgver
+	cd $srcdir/$pkgbase-$pkgver
 	
 	patch -Np0 -i $startdir/install_svg_icons_too.patch || return 1
 	
@@ -63,31 +44,21 @@ build()
 package_oxygen-icons()
 {
 	pkgdesc="Oxygen (Emot)Icons + Addons"
-	groups=("kde" "kde-complete" "kde-uninstall" "kde-minimal")
-	conflicts=("kdmeod-${_origname}")
-	replaces=("kdemod-kdebase-runtime-icons")
+	groups=("kde" "kde-uninstall" "kde-minimal")
 	
-	cd $srcdir/$_origname-$pkgver
+	cd $srcdir/$pkgbase-$pkgver
 	
 	make DESTDIR=$pkgdir install || return 1
 	
 	# move out some svg icons
         mkdir -p $srcdir/svg
         mv $pkgdir/usr/share/icons/oxygen/scalable $srcdir/svg
-
-	# install addons
-	cd ${srcdir}/oxygencolors-addon
-	cp -R * $pkgdir/usr/share/icons/oxygen
-	cd $pkgdir/usr/share/icons/oxygen
-	find . -name "*.png" -print|xargs chmod 644
 }
 
 package_oxygen-icons-svg()
 {
 	pkgdesc="Oxygen (Emot)Icons - SVG Sources"
 	groups=("kde-uninstall")
-	conflicts=("kdemod-${_origname}-svg")
-	depends=("${_origname}")
 	
 	mkdir -p $pkgdir/usr/share/icons/oxygen
 	mv $srcdir/svg/scalable $pkgdir/usr/share/icons/oxygen

From 00c3a34687a3745bbfb4b4fc2380387569ec5110 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 00:05:08 +0000
Subject: [PATCH 31/51] backport from 4.7

---
 kde-common/Chakra-Bugs.desktop          |  2 --
 kde-common/Chakra-ChangeLog.desktop     |  2 --
 kde-common/Chakra-Code.desktop          |  3 +--
 kde-common/Chakra-Documentation.desktop |  7 +++---
 kde-common/Chakra-Donate.desktop        | 19 +++++++++++-----
 kde-common/Chakra-Forum.desktop         |  1 -
 kde-common/Chakra-Homepage.desktop      | 19 +++++++++++-----
 kde-common/Chakra.directory             |  5 ++---
 kde-common/PKGBUILD                     | 29 +++++++++----------------
 kde-common/kde-common.install           |  2 +-
 oxygen-icons/PKGBUILD                   |  2 +-
 11 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/kde-common/Chakra-Bugs.desktop b/kde-common/Chakra-Bugs.desktop
index 7e2cd392e..be6b2f380 100644
--- a/kde-common/Chakra-Bugs.desktop
+++ b/kde-common/Chakra-Bugs.desktop
@@ -1,13 +1,11 @@
 [Desktop Entry]
 Comment=Chakra Bug Tracking System
 Comment[ca]=Sistema de seguiment d'errors de Chakra
-Comment[fr]=Système de suivi d'erreurs de Chakra
 Comment[it]=Sistema di tracciatura errori di Chakra
 Exec=xdg-open http://www.chakra-project.org/bugs/
 Icon=kbugbuster
 Name=Bugs
 Name[ca]=Errors
-Name[fr]=Erreurs
 Name[it]=Errori
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-ChangeLog.desktop b/kde-common/Chakra-ChangeLog.desktop
index b3a2e87e5..ae186e5c3 100644
--- a/kde-common/Chakra-ChangeLog.desktop
+++ b/kde-common/Chakra-ChangeLog.desktop
@@ -1,13 +1,11 @@
 [Desktop Entry]
 Comment=Chakra Package ChangeLogs
 Comment[ca]=Registre de canvis a paquets de Chakra
-Comment[fr]=Registre de changements des paquets de Chakra
 Comment[it]=Registro cambiamenti nei pacchetti di Chakra
 Exec=xdg-open http://gitorious.org/chakra-packages
 Icon=utilities-log-viewer
 Name=Package ChangeLogs
 Name[ca]=Registre de canvis a paquets
-Name[fr]=Registre de changements des paquets
 Name[it]=Registro cambiamenti nei pacchetti
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-Code.desktop b/kde-common/Chakra-Code.desktop
index 8608594a9..08d132bf5 100644
--- a/kde-common/Chakra-Code.desktop
+++ b/kde-common/Chakra-Code.desktop
@@ -1,9 +1,8 @@
 [Desktop Entry]
 Comment=Chakra Code Repository
 Comment[ca]=Repostiori de codi de Chakra
-Comment[fr]=Dépôt du code de Chakra
 Comment[it]=Repository del Codice di Chakra
-Exec=xdg-open http://www.chakra-project.org/code/
+Exec=xdg-open http://www.chakra-project.org/code.html
 Icon=preferences-system
 Name=Code
 Name[ca]=Codi
diff --git a/kde-common/Chakra-Documentation.desktop b/kde-common/Chakra-Documentation.desktop
index 1d408101e..617f2068a 100644
--- a/kde-common/Chakra-Documentation.desktop
+++ b/kde-common/Chakra-Documentation.desktop
@@ -1,14 +1,13 @@
 [Desktop Entry]
 Comment=Chakra Documentation
-Comment[ca]=Documentaci� de Chakra
+Comment[ca]=Documentació de Chakra
 Comment[it]=Documentazione di Chakra
-Comment[fr]=Documentation de Chakra
 Exec=xdg-open http://www.chakra-project.org/wiki/
 Icon=system-help
 Name=Documentation
-Name[ca]=Documentaci�
+Name[ca]=Documentació
+Name�[es]=Documentación
 Name[it]=Documentazione
-Name[fr]=Documentation
 StartupNotify=true
 Terminal=false
 Type=Application
diff --git a/kde-common/Chakra-Donate.desktop b/kde-common/Chakra-Donate.desktop
index 6fbb12b21..58559f17d 100644
--- a/kde-common/Chakra-Donate.desktop
+++ b/kde-common/Chakra-Donate.desktop
@@ -1,15 +1,22 @@
 [Desktop Entry]
-Comment=Chakra Donations
+Categories=Chakra;
 Comment[ca]=Donacions a Chakra
-Comment[fr]=Donations pour Chakra
+Comment=Donacions a Chakra
 Comment[it]=Donazioni per Chakra
 Exec=xdg-open http://www.chakra-project.org/donate.html
-Icon=applications-toys
-Name=Donate
+GenericName[ca]=
+GenericName=
+Icon=face-wink
+MimeType=
 Name[ca]=Donacions
-Name[fr]=Donations
+Name=Donacions
 Name[it]=Donazioni
+Path=
 StartupNotify=true
 Terminal=false
+TerminalOptions=
 Type=Application
-Categories=Chakra;
+X-DBUS-ServiceName=
+X-DBUS-StartupType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/kde-common/Chakra-Forum.desktop b/kde-common/Chakra-Forum.desktop
index e8c080009..73193575e 100644
--- a/kde-common/Chakra-Forum.desktop
+++ b/kde-common/Chakra-Forum.desktop
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Comment=Chakra Forums
 Comment[ca]=Forums de Chakra
-Comment[fr]=Forums de Chakra
 Comment[it]=Forum di Chakra
 Exec=xdg-open http://www.chakra-project.org/bbs/
 Icon=system-users
diff --git a/kde-common/Chakra-Homepage.desktop b/kde-common/Chakra-Homepage.desktop
index 96fce73c1..9847545ec 100644
--- a/kde-common/Chakra-Homepage.desktop
+++ b/kde-common/Chakra-Homepage.desktop
@@ -1,14 +1,21 @@
 [Desktop Entry]
-Comment=Chakra Homepage
+Categories=Chakra;
 Comment[ca]=Lloc web de Chakra
-Comment[fr]=Page web de Chakra
+Comment=Lloc web de Chakra
 Comment[it]=Homepage di Chakra
 Exec=xdg-open http://www.chakra-project.org
-Icon=chakra-flat
-Name=Homepage
+GenericName[ca]=
+GenericName=
+Icon=chakra-shiny
+MimeType=
 Name[ca]=Lloc web
-Name[fr]=Page web
+Name=Lloc web
+Path=
 StartupNotify=true
 Terminal=false
+TerminalOptions=
 Type=Application
-Categories=Chakra;
+X-DBUS-ServiceName=
+X-DBUS-StartupType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/kde-common/Chakra.directory b/kde-common/Chakra.directory
index 45a450eab..f93bfaff1 100644
--- a/kde-common/Chakra.directory
+++ b/kde-common/Chakra.directory
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Encoding=UTF-8
-Type=Directory
+Icon=chakra-shiny
 Name=Chakra
-Icon=chakra-flat
-
+Type=Directory
diff --git a/kde-common/PKGBUILD b/kde-common/PKGBUILD
index 7b436aff2..8f7da0058 100644
--- a/kde-common/PKGBUILD
+++ b/kde-common/PKGBUILD
@@ -7,13 +7,6 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=common
-
-
-
 #
 # package info
 #
@@ -28,12 +21,11 @@ license=('GPL')
 options=('!splitdbg' '!splithdr' 'strip')
 
 provides=("kde-common=${_kdever}" "kde-agent=${_kdever}")
-replaces=('kdemod-common')
 
-groups=("kde" "kde-minimal" "kde-complete" "kde-uninstall")
+groups=("kde" "kde-minimal" "kde-uninstall")
 
 # also add some obvious dependencies here, as there are users out there who dont update such stuff
-depends=("${_qtpkg}>=${_qtver}" 'pinentry' 'openssh' 'bash>=4.0.035' 'glibc>=2.11')
+depends=("${_qtpkg}>=${_qtver}" 'pinentry' 'openssh' 'bash' 'glibc')
 
 install=kde-common.install
 
@@ -68,14 +60,14 @@ md5sums=('2afd86671ad0db31718157aecd46d528'  # 48411-rootactions_servicemenu_2.4
          'a4108e264667380876ffa7e9842892f4'  # servicemenu-copy-path.desktop
          '630ffe7118eef8608a9e5e393a0b1e12'  # 102825-compressattach.desktop.bz2
          'e77e132d6da1a8d897db2ba630915b0f'  # servicemenu-rootactions.patch
-         'de4590ee75ac06bb41ea7194fa7ed21d'  # Chakra-Bugs.desktop
-         '1f278ab106fca875a4450e3abcebe381'  # Chakra-ChangeLog.desktop
-         '20aa550bd6aad8f8c32455d8ec8380b4'  # Chakra-Code.desktop
-         '69d8812aa2c2fb8cef0df341280d6ce3'  # Chakra-Documentation.desktop
-         'db40094a5b3b81fd8cad8a627876df7c'  # Chakra-Donate.desktop
-         'ec81fe863ca14a1cf6418e21a681f605'  # Chakra-Forum.desktop
-         '12d7445dbe94c1a5daa193eb4c9c10fe'  # Chakra-Homepage.desktop
-         'd314d4b658c7664efa407af3317ae0cd'  # Chakra.directory
+         '3f775e8c5626c216ac9a3e2f5c336a6b'  # Chakra-Bugs.desktop
+         '35f4bd7a1ae4f1741e056a6f5715d822'  # Chakra-ChangeLog.desktop
+         '5cefa6e9baf388ae9d86f3b17eb12035'  # Chakra-Code.desktop
+         '3a08ce7d26d6f3a1b06f5e0f3e05f0e3'  # Chakra-Documentation.desktop
+         '490d34c6cc0b0e6e2c0a7ab98ab77f89'  # Chakra-Donate.desktop
+         '1be911f58eeef76fe920b8ebe0941464'  # Chakra-Forum.desktop
+         'c664cda009a7c8ec0e9fb36d1ed74e68'  # Chakra-Homepage.desktop
+         'ad4cefe6e10e0985a89a0aea6aec530c'  # Chakra.directory
          '0688a20010ad27e35755e77c26c94d2c'  # kdm.daemon
          '535501ac9f3ad05ddd18f8cfee4a2e06'  # chakra-config-updater.sh
          '1cad70fdf0306e5590899865bbfb430b'  # chakra-fix-configs.sh
@@ -91,7 +83,6 @@ md5sums=('2afd86671ad0db31718157aecd46d528'  # 48411-rootactions_servicemenu_2.4
          '7daec96c125e1e238a35f31ea4a476f0'  # agent-startup.sh
          '18e8d01124b19f7df2937c06e177bf7f') # agent-shutdown.sh
 
-
 #
 # build and install
 #
diff --git a/kde-common/kde-common.install b/kde-common/kde-common.install
index 461df8bd5..870aa4a04 100644
--- a/kde-common/kde-common.install
+++ b/kde-common/kde-common.install
@@ -3,7 +3,7 @@
 #
 post_install() {
 		echo " "
-		echo " > KDE Software Compilation 4.6.3"
+		echo " > KDE Software Compilation 4.6.4"
 		echo " > packaged by the Chakra Project"
 		echo " "
 		echo "   Installation Prefix : /usr"
diff --git a/oxygen-icons/PKGBUILD b/oxygen-icons/PKGBUILD
index fd00c9f0b..0abb968ca 100644
--- a/oxygen-icons/PKGBUILD
+++ b/oxygen-icons/PKGBUILD
@@ -10,7 +10,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 #
 # package info
 #
-pkgbase=('oxygen-icons')
+pkgbase="oxygen-icons"
 pkgname=('oxygen-icons'
 	 'oxygen-icons-svg')
 	 

From 85541b35f1e9cb9c37e195a593c7e8c5a6581bef Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 08:59:10 +0000
Subject: [PATCH 32/51] =?UTF-8?q?Prepare=20kde=204.6.4=C3=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kdebase-runtime/PKGBUILD | 53 ++++++++++++----------------------------
 1 file changed, 16 insertions(+), 37 deletions(-)

diff --git a/kdebase-runtime/PKGBUILD b/kdebase-runtime/PKGBUILD
index de87a4f8a..ed265efcc 100644
--- a/kdebase-runtime/PKGBUILD
+++ b/kdebase-runtime/PKGBUILD
@@ -7,23 +7,16 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdebase-runtime
-
-
-
 #
 # package info
 #
-pkgbase=('kdebase-runtime')
+pkgbase="kdebase-runtime"
 pkgname=('kdebase-runtime'
          'kdebase-runtime-doc')
         
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -38,18 +31,14 @@ groups=('kde' 'kde-complete')
 
 noextract=(branding.svgz)
 
-source=($_mirror/${_origname}-$_kdever.tar.bz2
+source=($_mirror/${pkgbase}-$_kdever.tar.bz2
 	branding.svgz
-#	01_knetattach_use_sftp.patch
-#	02_oxygenify_knetattach_icon.patch
 	03_disable_logout_sound.patch
 	04_disable_nepomuk_popups.patch
 	05_add_chakra_to_drkonqui.patch)
 
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
-        '68cd8eb57db22c2f2ed554b721253bc2' #  branding.svgz
-#        '45fa12b8baf21c4fc845147afcea2bc1' #  01_knetattach_use_sftp.patch
-#        '1f0225f31d5f44e753e966fd3a032f00' #  02_oxygenify_knetattach_icon.patch
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
+        '68cd8eb57db22c2f2ed554b721253bc2'  #  branding.svgz
         'a434bf282ee391b2f857184be59a3b6f'  #  03_disable_logout_sound.patch
         'a3c844d7bbd9a31f39b1b877ae521340'  #  04_disable_nepomuk_popups.patch
         '63082e4f07e5840ae7ff3b42c015d72b') #  05_add_chakra_to_drkonqui.patch 
@@ -60,26 +49,16 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
 #
 build()
 {
-	cd ${_origname}-${pkgver}
+	cd ${pkgbase}-${pkgver}
 
-	# branch update
-	if [ "$_branchupdate" = "yes" ] ; then
-		msg "applying branch update ..."
-		patch -p0 -i $startdir/branch-update-r*.patch || return 1
-	else
-		warning "branch updates disabled ..."
-		warning "if you want to make use of it, run branch_updater.sh"
-		warning "and enable branch updates in _/buildsystem/kdemod.conf"
-	fi
-	
 	msg "applying main patchset ..."
 	patch -Np1 -i ${srcdir}/03_disable_logout_sound.patch || return 1
 	patch -Np1 -i ${srcdir}/04_disable_nepomuk_popups.patch || return 1
 	patch -Np1 -i ${srcdir}/05_add_chakra_to_drkonqui.patch || return 1
 
 	# copy our branding stuff
-	cp -f ${srcdir}/branding.svgz ${srcdir}/${_origname}-${pkgver}/desktoptheme/oxygen/widgets/
-	cp -f ${srcdir}/branding.svgz ${srcdir}/${_origname}-${pkgver}/desktoptheme/air/widgets/
+	cp -f ${srcdir}/branding.svgz ${srcdir}/${pkgbase}-${pkgver}/desktoptheme/oxygen/widgets/
+	cp -f ${srcdir}/branding.svgz ${srcdir}/${pkgbase}-${pkgver}/desktoptheme/air/widgets/
 
 	msg "starting build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -102,11 +81,11 @@ package_kdebase-runtime()
 	depends=("kdelibs>=${_kdever}" 'oxygen-icons' 'xorg-xauth' 'hicolor-icon-theme'
 		 'smbclient' 'rarian' 'libssh' 'libpulse' 'libssh' 'ntrack' 'libcanberra' 'libcanberra-pulse')
 	optdepends=('htdig: to build the search index' 'gdb: drkonq crash handler')
-	conflicts=("kdemod-${_origname}")
-	groups=("kde" "kde-minimal" "kde-complete" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "kde-minimal" "kde-uninstall")
+	provides=('kde-runtime')
+	install=${pkgbase}.install
 
-	cd ${srcdir}/${_origname}-${pkgver}/
+	cd ${srcdir}/${pkgbase}-${pkgver}/
 	make DESTDIR=${pkgdir} install || return 1
 
 	# also in kdebase-runtime-doc
@@ -125,10 +104,10 @@ package_kdebase-runtime()
 	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
 	if [ "$?" = "0" ]; then
 		warning "incuding patches into package"
-		mkdir -p ${pkgdir}/usr/share/chakra/patches/${_origname} &>/dev/null
+		mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
 		for i in ${startdir}/*.patch; do
 			msg "$i"
-			cp $i ${pkgdir}/usr/share/chakra/patches/${_origname}/ &>/dev/null
+			cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
 		done
 	else
 		warning "no patches found, skipping to include them into the package..."
@@ -142,11 +121,11 @@ package_kdebase-runtime()
 package_kdebase-runtime-doc()
 {
 	pkgdesc="KDE Base Runtime - Documentation"
-	groups=("kde-complete" "kde-uninstall" "kde-doc")
+	groups=("kde" "kde-uninstall" "kde-doc")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }

From 178bf218e0f7824c3d55aeb1e5422129ba0a8c66 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 16:39:56 +0200
Subject: [PATCH 33/51] Prepare kde 4.6.4

---
 kdemultimedia/PKGBUILD | 83 +++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 49 deletions(-)

diff --git a/kdemultimedia/PKGBUILD b/kdemultimedia/PKGBUILD
index a6bf72d91..3589cda2b 100644
--- a/kdemultimedia/PKGBUILD
+++ b/kdemultimedia/PKGBUILD
@@ -7,17 +7,10 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdemultimedia
-
-
-
 #
 # package info
 #
-pkgbase=('kdemultimedia')
+pkgbase="kdemultimedia"
 pkgname=('kdemultimedia-common'
          'kdemultimedia-doc'
          'kdemultimedia-dragonplayer'
@@ -37,9 +30,9 @@ license=('GPL' 'LGPL' 'FDL')
 options=('docs' '!splithdr' 'splitdbg' 'log')
 
 makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" "kdebase-runtime>=${_kdever}"
-             'cdparanoia' 'mplayer' 'libpulse' 'musicbrainz>=3.0.3' 'taglib')
+             'cdparanoia' 'mplayer' 'libpulse' 'musicbrainz>=3.0.3' 'taglib' 'tunepimp')
 
-source=($_mirror/${_origname}-$_kdever.tar.bz2
+source=($_mirror/${pkgbase}-$_kdever.tar.bz2
 	http://kenai.com/projects/kde-odf-thumbnail/downloads/download/1.0.0/kde-odf-thumbnail-1.0.0.tar.gz
 	http://kde-apps.org/CONTENT/content-files/107128-GimpResourcesThumbnailer-2.1.0.tar.gz
 	http://kde-apps.org/CONTENT/content-files/114885-AudioThumbs-0.1.tar.gz
@@ -48,9 +41,9 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
 	sprocket-medium.png
 	sprocket-small.png)
 
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
          'edf694939f4b5d5e97c3fe2f91e7cec3' # kde-odf-thumbnail-1.0.0.tar.gz
-         '5e3022ddcf3876e07d4b9870e1806b48' # 107128-GimpResourcesThumbnailer-2.1.0.tar.gz
+         '5e3022ddcf3876e07d4b9870e1806b48' # 107128-GimpResourcesThumbnailer-2.1.1.tar.gz
          '07c3039ddf5e88ba0ab290570f43749d' # 114885-AudioThumbs-0.1.tar.gz
          '00ff1e8a1e4c1e39e3d1146f1d08036c' # mplayerthumbs-horizontal.patch
          '6eeba61989d0e6904fe2c18bb01a3775' # sprocket-large.png
@@ -63,7 +56,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	msg "applying patches ..."
 	patch -Np1 -i ${srcdir}/mplayerthumbs-horizontal.patch || return 1
@@ -108,14 +101,13 @@ package_kdemultimedia-common()
 {
 	pkgdesc="KDE multimedia - Common files and libraries"
 	depends=("kdelibs>=${_kdever}" "kdebase-runtime>=${_kdever}" 'flac' 'musicbrainz>=3.0.3' 'cdparanoia' 'taglib')
-	conflicts=("kdemod-${_origname}-common")
-	groups=("kde" "kde-complete" "kdemultimedia" "kde-uninstall")
+	groups=("kde" "kdemultimedia" "kde-uninstall")
         optdepends=('pulseaudio: pulseaudio support')
-	install=${_origname}.install
+	install=${pkgbase}.install
 
 	splitdirs="kioslave libkcddb libkcompactdisc strigi-analyzer"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
@@ -123,10 +115,10 @@ package_kdemultimedia-common()
 	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
 	if [ "$?" = "0" ]; then
 		warning "incuding patches into package"
-		mkdir -p ${pkgdir}/usr/share/chakra/patches/${_origname} &>/dev/null
+		mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
 		for i in ${startdir}/*.patch; do
 			msg "$i"
-			cp $i ${pkgdir}/usr/share/chakra/patches/${_origname}/ &>/dev/null
+			cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
 		done
 	else
 		warning "no patches found, skipping to include them into the package..."
@@ -136,13 +128,11 @@ package_kdemultimedia-common()
 package_kdemultimedia-doc()
 {
 	pkgdesc="KDE multimedia - Documentation"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-doc")
-	groups=("kde-complete" "${_origname}" "kde-doc" "kde-uninstall")
+	groups=("kde" "${pkgbase}" "kde-doc" "kde-uninstall")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -150,14 +140,13 @@ package_kdemultimedia-doc()
 package_kdemultimedia-dragonplayer()
 {
 	pkgdesc="Simple video player"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-dragonplayer")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="dragonplayer"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -165,14 +154,13 @@ package_kdemultimedia-dragonplayer()
 package_kdemultimedia-juk()
 {
 	pkgdesc="An audio player with music database"
-	depends=("${_origname}-common>=${_kdever}") # Fixme: tunepimp 
-	conflicts=("kdmeod-${_origname}-juk")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" "tunepimp")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="juk"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -180,15 +168,14 @@ package_kdemultimedia-juk()
 package_kdemultimedia-kmix()
 {
 	pkgdesc="Audio mixer"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kmix")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
         optdepends=('pulseaudio: pulseaudio support')
-	install=${_origname}.install
+	install=${pkgbase}.install
 
 	splitdirs="kmix"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -196,14 +183,13 @@ package_kdemultimedia-kmix()
 package_kdemultimedia-kscd()
 {
 	pkgdesc="Audio CD player"
-	depends=("${_origname}-common>=${_kdever}" 'musicbrainz')
-	conflicts=("kdemod-${_origname}-kscd")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'musicbrainz' 'tunepimp')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kscd"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -211,15 +197,14 @@ package_kdemultimedia-kscd()
 package_kdemultimedia-thumbnailers()
 {
 	pkgdesc='Video Files (MPlayerThumbs)'
-	depends=("${_origname}-common>=${_kdever}" 'mplayer') 
-	provides=("${_origname}-mplayerthumbs=${_kdever}" 'mplayerthumbs')
-	conflicts=("kdemod-${_origname}-thumbnailers")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'mplayer') 
+	provides=("${pkgbase}-mplayerthumbs=${_kdever}" 'mplayerthumbs')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="mplayerthumbs"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 

From 691b3ea3bbaca5271b1adc34c5b41efe4084ed02 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 16:54:40 +0200
Subject: [PATCH 34/51] prepare kde 4.6.4

---
 kdegraphics/PKGBUILD | 124 ++++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 71 deletions(-)

diff --git a/kdegraphics/PKGBUILD b/kdegraphics/PKGBUILD
index ebcf7c3a3..4e9c13843 100644
--- a/kdegraphics/PKGBUILD
+++ b/kdegraphics/PKGBUILD
@@ -7,17 +7,10 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdegraphics
-
-
-
 #
 # package info
 #
-pkgbase=('kdegraphics')
+pkgbase="kdegraphics"
 pkgname=('kdegraphics-common'
          'kdegraphics-doc'
          'kdegraphics-gwenview'
@@ -30,7 +23,7 @@ pkgname=('kdegraphics-common'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -42,17 +35,15 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" "kdebase-runti
              'poppler-qt' 'libspectre' 'sane' 'chmlib' 'libdjvu' 'lcms' 'qca'
              'qimageblitz' 'ebook-tools' 'libxxf86vm')
 
-source=("$_mirror/${_origname}-$_kdever.tar.bz2")
-
-md5sums=("`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`")
+source=("$_mirror/${pkgbase}-$_kdever.tar.bz2")
+md5sums=("`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`")
 
 #
 # build function
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
-	#msg "apply patches ..."
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	msg "starting build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -63,8 +54,6 @@ build()
 	make || return 1
 }
 
-
-
 #
 # split-install functions
 #
@@ -76,42 +65,42 @@ package_kdegraphics-common()
 	#       but nvidia providing libgl does not depend on libxxf86vm
 	depends=("kdelibs>=${_kdever}" "kdebase-runtime>=${_kdever}" 'libxxf86vm' 'sane' 'lcms')
 	replaces=('libkexiv2' 'libkdcraw')
-	conflicts=("kdemod-${_origname}-common")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	provides=('libkexiv2' 'libkdcraw' 'ksaneplugin' 'kgamma' 'svgpart')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kgamma ksaneplugin libs strigi-analyzer svgpart thumbnailers"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
 	# WORKAROUND -> install cmake modules
-	install -D -m644 $srcdir/${_origname}-${pkgver}/cmake/modules/FindKSane.cmake \
-		$pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
+	#install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
+	#	$pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
 
-#	# include our patches into the package
-#	ls -1 ${startdir}/* | grep patch &>/dev/null 2>&1
-#	if [ "$?" = "0" ]; then
-#		warning "incuding patches into package"
-#		mkdir -p ${pkgdir}/usr/share/chakra/patches/${_origname} &>/dev/null
-#		for i in ${startdir}/*.patch; do
-#			msg "$i"
-#			cp $i ${pkgdir}/usr/share/chakra/patches/${_origname}/ &>/dev/null
-#		done
-#	else
-#		warning "no patches found, skipping to include them into the package..."
-#	fi
+	# include our patches into the package
+	ls -1 ${startdir}/* | grep patch &>/dev/null 2>&1
+	if [ "${?}" = "0" ]; then
+		warning "incuding patches into package"
+		mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
+		for i in ${startdir}/*.patch; do
+			msg "$i"
+			cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
+		done
+	else
+		warning "no patches found, skipping to include them into the package..."
+	fi
 }
 
 package_kdegraphics-doc()
 {
 	pkgdesc="KDE Graphics - Documentation"
-	groups=("kde-complete" "${_origname}" "kde-doc" "kde-uninstall")
+	groups=("kde" "${pkgbase}" "kde-doc" "kde-uninstall")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -119,14 +108,13 @@ package_kdegraphics-doc()
 package_kdegraphics-gwenview()
 {
 	pkgdesc="A full-featured picture viewer and maniplator"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-gwenview")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="gwenview"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -134,14 +122,13 @@ package_kdegraphics-gwenview()
 package_kdegraphics-kamera()
 {
 	pkgdesc="Digital camera io_slave for Konqueror"
-	depends=("${_origname}-common>=${_kdever}" 'libgphoto2')
-	conflicts=("kdemod-${_origname}-kamera")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'libgphoto2')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kamera"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
@@ -154,14 +141,13 @@ package_kdegraphics-kamera()
 package_kdegraphics-kcolorchooser()
 {
 	pkgdesc="A color value editor and a color picker"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kcolorchooser")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kcolorchooser"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -169,14 +155,13 @@ package_kdegraphics-kcolorchooser()
 package_kdegraphics-kolourpaint()
 {
 	pkgdesc="An easy-to-use paint program designed for everyday tasks like drawing simple diagrams,logos,icons and editing screenshots"
-	depends=("${_origname}-common>=${_kdever}" 'qimageblitz')
-	conflicts=("kdemod-${_origname}-kolourpaint")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'qimageblitz')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kolourpaint"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -184,14 +169,13 @@ package_kdegraphics-kolourpaint()
 package_kdegraphics-kruler()
 {
 	pkgdesc="A ruler in inch, centimeter and pixel to check distances on the screen"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kruler")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kruler"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -199,14 +183,13 @@ package_kdegraphics-kruler()
 package_kdegraphics-ksnapshot()
 {
 	pkgdesc="Make snapshots of the screen contents"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-ksnapshot")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="ksnapshot"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -214,15 +197,14 @@ package_kdegraphics-ksnapshot()
 package_kdegraphics-okular()
 {
 	pkgdesc="An all-purpose document viewer"
-	depends=("${_origname}-common>=${_kdever}" 'qimageblitz' 'poppler-qt'
+	depends=("${pkgbase}-common>=${_kdever}" 'qimageblitz' 'poppler-qt'
                  'chmlib' 'libdjvu' 'libspectre' 'ebook-tools')
-	conflicts=("kdemod-${_origname}-okular")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="okular"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }

From cb039c7f8718d634ac53afd8dfffdcd905c76d2f Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 17:28:14 +0000
Subject: [PATCH 35/51] Prepare kde 4.6.4

---
 kdebase-workspace/PKGBUILD | 66 +++++++++++-------------------
 kdebindings/PKGBUILD       | 83 +++++++++-----------------------------
 kdegraphics/PKGBUILD       | 33 ++++++++-------
 3 files changed, 60 insertions(+), 122 deletions(-)

diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD
index 265f34bed..d69d53706 100644
--- a/kdebase-workspace/PKGBUILD
+++ b/kdebase-workspace/PKGBUILD
@@ -7,26 +7,20 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-# original name (used for the source and pkgnames)
-_origname=kdebase-workspace
-
 # default wallpaper to be kept in kdebase-workspace main package
 _default_wp="Horos"
 
-
-
 #
 # package info
 #
-pkgbase=('kdebase-workspace')
+pkgbase="kdebase-workspace"
 pkgname=('kdebase-workspace'
          'kdebase-workspace-doc'
          'kdebase-workspace-wallpapers')
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -43,7 +37,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebinding
              "kdebindings-ruby>=${_kdever}" 'oxygen-icons' 'qedje' "kdebase-runtime>=${_kdever}" 'gpsd' 'samba' 
 	     'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl' 'google-gadgets-qt>=0.11.2')
 
-source=($_mirror/${_origname}-$_kdever.tar.bz2
+source=($_mirror/${pkgbase}-$_kdever.tar.bz2
 	mishaaq-kcm_touchpad-00370b5.tar.gz
 	http://www.kde-apps.org/CONTENT/content-files/114856-kcm_tablet-1.1.3.tar.gz
 	http://www.kde-apps.org/CONTENT/content-files/117639-favorites-0.1.tar.bz2
@@ -99,7 +93,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
 	sensors-fix.patch
 	)
 
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
         'f355a658d2e9267fdf4e8d8f88038bcf' # mishaaq-kcm_touchpad-00370b5.tar.gz
         'd4570491bcf9986d84aeb77c939090a9' # 114856-kcm_tablet-1.1.3.tar.gz
         'b60baabccbd302d00923e053db0dc0ae' # 117639-favorites-0.1.tar.bz2
@@ -114,20 +108,15 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
         'e2eb9d270fe0e93901b29256bdedd7e2' #  02_sane_env_and_shutdown_path.patch
         '8e623bb5608025417ff9ed061e5a03f1' #  03_plasma_menubutton_branding.patch
         '522a294c09d88d3d722de3f39fd203c3' #  04_plasma_kickoff_url.patch
-#       '0aba9287f038d66afbf545c83a46fd19' #  05_plasma_desktop_defaults.patch
         '0ee6e12bb9830b4248becb0442dc7e0c' #  06_kickoff_default_favourites.patch
         '89d96455c6a446ef59b0620d1b8606af' #  07_always_show_kickoff_subtext.patch
         '5eb9285268916492012151045bdebd26' #  09_enable_start-shutdown-scripts.patch
 
         'db2d8166f5ea80ecd291deb9c0e2bb71' #  fix_kdm-increase-xserver-timeout-bnc#462478.patch
         '814350c52c135d6f7bdada1e29223d38' #  fix_terminate-server.patch
-#        '5d752cf39a28306438bb6d82db6e1696'#  fix_ck-shutdown.patch
 	'97a5eb51e6f9d460f0d61bb322a1db5e' #  fix_kdm_configdef.patch
 	'5f963f80a026f0600edae1b1c70411e5' #  fix_root-only-kcms.patch
 
-#	'c6b58eb228d16c77d692df655046ee9f' #  trunk_powerdevil.patch
-
-
 #        '13c3203589143e9e2fc757c17375227a' #  feature_plasma-transparent-panel-v4-rb#472.patch
 #        '7361012da217f9aeeca61f0e9956e1d0' #  feature_brightness-osd.patch
 #        '894815a80f99a9a0dee1adbcda49b161' #  feature_battery-tooltip.patch
@@ -142,17 +131,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
-
-	# branch update
-	if [ "$_branchupdate" = "yes" ] ; then
-		msg "applying branch update ..."
-		patch -p0 -i $startdir/branch-update-r*.patch
-	else
-		warning "branch updates disabled ..."
-		warning "if you want to make use of it, run branch_updater.sh"
-		warning "and enable branch updates in _/buildsystem/kdemod.conf"
-	fi
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	msg "applying main patchset ..."
 
@@ -160,7 +139,6 @@ build()
 	patch -Np0 -i ${srcdir}/02_sane_env_and_shutdown_path.patch
 	patch -Np1 -i ${srcdir}/03_plasma_menubutton_branding.patch
 	patch -Np1 -i ${srcdir}/04_plasma_kickoff_url.patch
-#	patch -Np1 -i ${srcdir}/05_plasma_desktop_defaults.patch
 	patch -Np1 -i ${srcdir}/06_kickoff_default_favourites.patch
 	patch -Np1 -i ${srcdir}/07_always_show_kickoff_subtext.patch
 	patch -Np1 -i ${srcdir}/09_enable_start-shutdown-scripts.patch
@@ -169,10 +147,8 @@ build()
 	msg "applying fixes ..."
 	patch -Np0 -i ${srcdir}/fix_kdm-increase-xserver-timeout-bnc#462478.patch
 	patch -Np0 -i ${srcdir}/fix_terminate-server.patch
-#	patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch
 	patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch
         patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch
-#	patch -Np1 -i ${srcdir}/shutdown-fix.patch
 
 # FIXME: update feature patches
 #	msg "applying feature patches ..."
@@ -198,6 +174,8 @@ build()
 
 	msg "starting kcm_touchpad build ..."
 	cd ${srcdir}/mishaaq-kcm_touchpad-00370b5
+        # Fix desktop to the new layout
+	sed -i -e "s~keyboard-and-mouse~input-devices~g" touchpad.desktop
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
 		-DCMAKE_INSTALL_PREFIX=${_installprefix} \
 		-DWITH_Xmms=OFF \
@@ -206,6 +184,8 @@ build()
 
 	msg "starting kcm_tablet build ..."
 	cd ${srcdir}/kcm_tablet-1.1.3
+        # Fix desktop to the new layout
+        sed -i -e "s~keyboard-and-mouse~input-devices~g" ${srcdir}/kcm_tablet-1.1.3/src/kcm_tablet.desktop
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
 		-DCMAKE_INSTALL_PREFIX=${_installprefix} \
 		-DWITH_Xmms=OFF \
@@ -245,20 +225,20 @@ package_kdebase-workspace()
 		    "gpsd               : Plasma geolocation support"
 		    "(open)ntp          : Time/Date sync support")
 
-	provides=("${_origname}=${_kdever}" "powerdevil" 'powerdevil' 'kcm_tablet=1.1.3')
+	provides=('kde-workspace' 'powerdevil' 'kcm_tablet')
 	replaces=('guidance-power-manager')
 	
-	conflicts=("kdemod-${_origname}" "powerdevil" 'powerdevil' "kde-meta-${_origname}" 'kcm_tablet' 'guidance-power-manager')
-	groups=("kde" "kde-complete" "kde-uninstall" "kde-minimal")
+	conflicts=('powerdevil' 'kcm_tablet' 'guidance-power-manager')
+	groups=("kde" "kde-uninstall" "kde-minimal")
 
 	backup=('usr/share/config/kdm/kdmrc'
                 'etc/pam.d/kde'
                 'etc/pam.d/kde-np'
                 'etc/pam.d/kscreensaver')
 
-	install=${_origname}.install
+	install=${pkgbase}.install
 
-	cd ${srcdir}/${_origname}-${pkgver}
+	cd ${srcdir}/${pkgbase}-${pkgver}
 	make DESTDIR=${pkgdir} install
 
 	cd ${srcdir}/mishaaq-kcm_touchpad-00370b5
@@ -279,13 +259,13 @@ package_kdebase-workspace()
 	install -d -m755 ${pkgdir}/etc/kde/{env,shutdown}
 
 	# install session
-	install -D -m 644 ${srcdir}/${_origname}-${pkgver}/kdm/kfrontend/sessions/kde-plasma.desktop \
+	install -D -m 644 ${srcdir}/${pkgbase}-${pkgver}/kdm/kfrontend/sessions/kde-plasma.desktop \
 	${pkgdir}/etc/X11/sessions/kde-plasma.desktop
-	install -D -m 644 ${srcdir}/${_origname}-${pkgver}/kdm/kfrontend/sessions/kde-plasma-safe.desktop \
+	install -D -m 644 ${srcdir}/${pkgbase}-${pkgver}/kdm/kfrontend/sessions/kde-plasma-safe.desktop \
 	${pkgdir}/etc/X11/sessions/kde-plasma-safe.desktop
 
 	# also install kdm clean default config
-	cd ${srcdir}/${_origname}-${pkgver}/kdm 
+	cd ${srcdir}/${pkgbase}-${pkgver}/kdm 
 	make DESTDIR=${pkgdir} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
 
 	# povided in separate package
@@ -330,10 +310,10 @@ package_kdebase-workspace()
 	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
 	if [ "$?" = "0" ]; then
 		warning "incuding patches into package"
-		mkdir -p ${pkgdir}/usr/share/chakra/patches/${_origname} &>/dev/null
+		mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
 		for i in ${startdir}/*.patch; do
 			msg "$i"
-			cp $i ${pkgdir}/usr/share/chakra/patches/${_origname}/ &>/dev/null
+			cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
 		done
 	else
 		warning "no patches found, skipping to include them into the package..."
@@ -348,13 +328,13 @@ package_kdebase-workspace()
 package_kdebase-workspace-doc()
 {
 	pkgdesc="KDE Workspace - Documentation"
-	groups=("kde" "kde-complete" "kde-uninstall" "kde-doc")
+	groups=("kde" "kde-uninstall" "kde-doc")
 	# keep this, the variable must be resetted
 	optdepends=()
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install
 		done
 }
@@ -362,13 +342,13 @@ package_kdebase-workspace-doc()
 package_kdebase-workspace-wallpapers()
 {
 	pkgdesc="KDE Workspace - Desktop Wallpapers"
-	groups=("kde" "kde-complete" "kde-uninstall")
+	groups=("kde" "kde-uninstall")
 	# keep this, the variable must be resetted  
 	optdepends=()	
 	
 	splitdirs="wallpapers"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install
 		done
 
diff --git a/kdebindings/PKGBUILD b/kdebindings/PKGBUILD
index 33363566f..4f28a37df 100644
--- a/kdebindings/PKGBUILD
+++ b/kdebindings/PKGBUILD
@@ -7,26 +7,15 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdebindings
-_ARCHITECTURE="$_arch"
-
-
 #
 # package info
 #
-pkgbase=('kdebindings')
+pkgbase="kdebindings"
 pkgname=('kdebindings-common'
 	 'kdebindings-csharp'
          'kdebindings-python'
 	 'kdebindings-ruby')
 
-	  # disabled:
-          # kdebindings-java
-	  # kdebindings-php
-
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
 pkgrel=1
@@ -35,24 +24,21 @@ pkgdesc="split package"
 url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
 
-install=${_origname}.install
+install=${pkgbase}.install
 options=('docs' '!splithdr' 'splitdbg' 'log')
 
 makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" 'pyqt>=4.8.1' 'qwt' 'qscintilla'
              'ruby' 'mono' "kdegraphics-okular>=${_kdever}" "kdegraphics-common>=${_kdever}") # "kdepim-runtime>=${_kdever}"
 
-source=("$_mirror/${_origname}-$_kdever.tar.bz2")
-
-md5sums=("`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`")
+source=("$_mirror/${pkgbase}-$_kdever.tar.bz2")
+md5sums=("`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`")
     
 #
 # build function
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
-
-	#msg "applying upstream patches ..."
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	msg "starting build ..."
 	export MONO_SHARED_DIR="${srcdir}/build/.mono"
@@ -70,8 +56,6 @@ build()
 	make || return 1
 }
 
-
-
 #
 # split-install functions
 #
@@ -79,20 +63,19 @@ package_kdebindings-common()
 {
 	pkgdesc="KDE Bindings - Common files and libraries"
 	depends=("kdelibs>=${_kdever}" "kdepimlibs>=${_kdever}" 'qscintilla' 'qimageblitz')
-	conflicts=("kdemod-${_origname}")
-	groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
+	groups=("kde" "kde-devel" "${pkgbase}" "kde-uninstall")
 
 	splitdirs="smoke"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
-#	# include our patches into the package
+	# include our patches into the package
 #	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
 #	if [ "$?" = "0" ]; then
 #		warning "incuding patches into package"
-#		mkdir -p ${pkgdir}/usr/share/chakra/patches/${_origname} &>/dev/null
+#		mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
 #		for i in ${startdir}/*.patch; do
 #			msg "$i"
 #		done
@@ -104,55 +87,26 @@ package_kdebindings-common()
 package_kdebindings-csharp()
 {
 	pkgdesc="KDE Bindings - C#"
-	depends=("${_origname}-common>=${_kdever}" 'mono')
-	groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
-	conflicts=("kdemod-${_origname}-chsharp=${_kdever}")
+	depends=("${pkgbase}-common>=${_kdever}" 'mono')
+	groups=("kde" "kde-devel" "${pkgbase}" "kde-uninstall")
 
 	splitdirs="csharp"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
 
-package_kdebindings-java()
-{
-	pkgdesc="KDE Bindings - Java"
-	depends=("${_origname}-common>=${_kdever}")
-	groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
-	conflicts=("kdemod-${_origname}-java=${_kdever}")
-
-	splitdirs="java"
-		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
-			make DESTDIR=${pkgdir} install || return 1
-		done
-}
-
-package_kdebindings-php()
-{
-	pkgdesc="KDE Bindings - PHP"
-	depends=("${_origname}-common>=${_kdever}")
-	groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
-	conflicts=("kdemod-${_origname}-php=${_kdever}")
-
-	splitdirs="php"
-		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
-			make DESTDIR=${pkgdir} install || return 1
-		done
-}
 
 package_kdebindings-python()
 {
 	pkgdesc="KDE Bindings - Python"
-	depends=("${_origname}-common>=${_kdever}" "kdepimlibs>=${_kdever}" 'pyqt>=4.8.1' 'qscintilla') # "kdepim-runtime>=${_kdever}"
-	conflicts=("kdemod-${_origname}-python=${_kdever}")
-	groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
+	depends=("${pkgbase}-common>=${_kdever}" "kdepimlibs>=${_kdever}" 'pyqt>=4.8.1' 'qscintilla') # "kdepim-runtime>=${_kdever}"
+	groups=("kde" "kde-devel" "${pkgbase}" "kde-uninstall")
 
 	splitdirs="python"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -160,13 +114,12 @@ package_kdebindings-python()
 package_kdebindings-ruby()
 {
 	pkgdesc="KDE Bindings - Ruby"
-	depends=("${_origname}-common>=${_kdever}" 'ruby')
-	conflicts=("kdemod-${_origname}-ruby=${_kdever}")
-	groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
+	depends=("${pkgbase}-common>=${_kdever}" 'ruby')
+	groups=("kde" "kde-devel" "${pkgbase}" "kde-uninstall")
 
 	splitdirs="ruby"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
diff --git a/kdegraphics/PKGBUILD b/kdegraphics/PKGBUILD
index 4e9c13843..169d9e577 100644
--- a/kdegraphics/PKGBUILD
+++ b/kdegraphics/PKGBUILD
@@ -75,22 +75,27 @@ package_kdegraphics-common()
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
+	# Fix duplicated docs in 4.6.4
+	sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kgamma/common
+	sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kgamma/index.cache.bz2
+	sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kgamma/index.docbook
+
 	# WORKAROUND -> install cmake modules
-	#install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
-	#	$pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
+	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
+		$pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
 
 	# include our patches into the package
-	ls -1 ${startdir}/* | grep patch &>/dev/null 2>&1
-	if [ "${?}" = "0" ]; then
-		warning "incuding patches into package"
-		mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
-		for i in ${startdir}/*.patch; do
-			msg "$i"
-			cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
-		done
-	else
-		warning "no patches found, skipping to include them into the package..."
-	fi
+	# ls -1 ${startdir}/* | grep "patch" &>/dev/null 2>&1
+	# if [ "$?" = "0" ]; then
+	#	warning "incuding patches into package"
+	#	mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
+	#	for i in ${startdir}/*.patch; do
+	#		msg "$i"
+	#		cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
+	#	done
+	#else
+	#	warning "no patches found, skipping to include them into the package..."
+	#fi
 }
 
 package_kdegraphics-doc()
@@ -132,7 +137,7 @@ package_kdegraphics-kamera()
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
-	# Fix duplicated docs in 4.6.3
+	# Fix duplicated docs in 4.6.4
 	sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/common
 	sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/index.cache.bz2
 	sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/index.docbook

From d79837950738c6e27e5a6607040cfb1614460074 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 18:22:27 +0000
Subject: [PATCH 36/51] Prepare kde 4.6.4

---
 kdebase/PKGBUILD | 113 +++++++++----------------
 kdesdk/PKGBUILD  | 215 ++++++++++++++++++++---------------------------
 2 files changed, 132 insertions(+), 196 deletions(-)

diff --git a/kdebase/PKGBUILD b/kdebase/PKGBUILD
index 00bbccf97..af85cf31d 100644
--- a/kdebase/PKGBUILD
+++ b/kdebase/PKGBUILD
@@ -7,17 +7,10 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdebase
-
-
-
 #
 # package info
 #
-pkgbase=('kdebase')
+pkgbase="kdebase"
 pkgname=('kdebase'
          'kdebase-doc'
 	 'kdebase-dolphin'
@@ -27,7 +20,7 @@ pkgname=('kdebase'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -37,48 +30,27 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
 
 makedepends=("kdebase-workspace>=${_kdever}" 'pkgconfig' 'cmake' 'automoc4' 'libraw1394' 'ruby') # 'opencv'
 
-source=($_mirror/${_origname}-$_kdever.tar.bz2
-	http://kde-apps.org/CONTENT/content-files/99752-kde_cdemu-0.3.tar.gz
-#	01_dolphin_add_toolbar_buttons.patch
-	02_dolphin_properties.patch
-	03_konsole_defaults.patch)
-#	04_konq_scan_nsplugins_at_startup.patch)
+source=($_mirror/${pkgbase}-$_kdever.tar.bz2
+	"http://www.kde-apps.org/CONTENT/content-files/99752-kde_cdemu-0.3.1.tar.bz2"
+	"02_dolphin_properties.patch"
+	"03_konsole_defaults.patch")
 #	feature_user-image-from-webcam.patch)
-
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
-         'f98c26deff86b32a26e0238896d49382' # 99752-kde_cdemu-0.3.tar.gz
-#         '12d902dd5d090b146676231c5163bc4f' # 01_dolphin_add_toolbar_buttons.patch
-         '92a47ed820a541b34dd220e1da5649b7' # 02_dolphin_properties.patch
-         '8ab6f508a4e04517dd51ac3ab2eb01ef') # 03_konsole_defaults.patch
-#         'a8dc0bddce464af5846ac722007e0b59') # 04_konq_scan_nsplugins_at_startup.patch
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
+         '6b68353583ee959fb61b3c68a07606ae'   # 99752-kde_cdemu-0.3.1.tar.gz
+         '92a47ed820a541b34dd220e1da5649b7'   # 02_dolphin_properties.patch
+         '8ab6f508a4e04517dd51ac3ab2eb01ef')  # 03_konsole_defaults.patch
 #         '52cfd4456f8ec830b8d49c8aaa40b539') # feature_user-image-from-webcam.patch
 
-
 #
 # build function
 #
 build()
 {
-	cd ${_origname}-${pkgver}
-
-	# branch update
-	if [ "$_branchupdate" = "yes" ] ; then
-		msg "applying branch update ..."
-		pushd apps &>/dev/null
-		patch -p0 -i $startdir/branch-update-r*.patch || return 1
-		popd &>/dev/null
-	else
-		warning "branch updates disabled ..."
-		warning "if you want to make use of it, run branch_updater.sh"
-		warning "and enable branch updates in _/buildsystem/kdemod.conf"
-	fi
+	cd ${pkgbase}-${pkgver}
 
 	msg "applying main patchset ..."
-#	patch -Np1 -i ${srcdir}/01_dolphin_add_toolbar_buttons.patch || return 1
 	patch -Np2 -i ${srcdir}/02_dolphin_properties.patch || return 1
 	patch -Np2 -i ${srcdir}/03_konsole_defaults.patch || return 1
-#	patch -Np1 -i ${srcdir}/04_konq_scan_nsplugins_at_startup.patch || return 1
-# disabled - needs opencv which depends on gtk2
 #	patch -Np1 -i ${srcdir}/feature_user-image-from-webcam.patch || return 1
 
 	msg "starting build ..."
@@ -90,8 +62,6 @@ build()
 	make || return 1
 }
 
-
-
 #
 # split-install functions
 #
@@ -100,13 +70,13 @@ package_kdebase()
 	pkgdesc="KDE Base Applications"
 	depends=("kdebase-runtime>=${_kdever}" 'libraw1394') # 'opencv'
 	optdepends=("cdemu-client: Support transparent CD/DVD image mounting in KDE, kdebase-konqueror: To configure network for kde applications")
-	conflicts=("kdemod-${_origname}")
-	groups=("kde" "kde-minimal" "kde-complete" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "kde-minimal" "kde-uninstall")
+	provides=('kde-baseapps')
+	install=${pkgbase}.install
 
-	splitdirs="kdepasswd kdialog keditbookmarks kfind lib nsplugins plasma konqueror" #kinfocenter 
+	splitdirs="kdepasswd kdialog keditbookmarks kfind lib nsplugins plasma konqueror"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
@@ -142,14 +112,13 @@ package_kdebase()
 	rm -vR ${pkgdir}/usr/bin/konqueror
 		
 	# install cdemu frontend
-	cd ${srcdir}/kde_cdemu-0.3
+	cd ${srcdir}/kde_cdemu
 	cmake . -DCMAKE_INSTALL_PREFIX=${_installprefix} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_{SHARED,MODULE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
 	make
 	make DESTDIR=${pkgdir} install || return 1
-	
 	# we dont want the cdemu manager app. the service menu + devicenotifier is perfect already
 	rm -rf ${pkgdir}/usr/share/applications/kde4/kde_cdemu.desktop
 
@@ -157,10 +126,10 @@ package_kdebase()
 	ls -1 ${srcdir}/*.patch &>/dev/null 2>&1
 	if [ "$?" = "0" ]; then
 		warning "incuding patches into package"
-		mkdir -p ${pkgdir}/usr/share/chakra/patches/${_origname} &>/dev/null
+		mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
 		for i in ${srcdir}/*.patch; do
 			msg "$i"
-			cp $i ${pkgdir}/usr/share/chakra/patches/${_origname}/ &>/dev/null
+			cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
 		done
 	else
 		warning "no patches found, skipping to include them into the package..."
@@ -170,11 +139,11 @@ package_kdebase()
 package_kdebase-doc()
 {
 	pkgdesc="KDE Base Applications - Documentation"
-        groups=("kde-complete" "kde-uninstall" "kde-doc")
+        groups=("kde" "kde-uninstall" "kde-doc")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -182,14 +151,14 @@ package_kdebase-doc()
 package_kdebase-dolphin()
 {
 	pkgdesc="KDE Base Applications - Dolphin, the default KDE file manager"
-	depends=("${_origname}>=${_kdever}")
-	groups=("kde" "kde-minimal" "kde-complete" "kde-uninstall")
-	conflicts=("kdemod-${_origname}-dolphin")
-	install=${_origname}-dolphin.install
+	depends=("${pkgbase}>=${_kdever}")
+	groups=("kde" "kde-minimal" "kde-uninstall")
+	provides=('dolphin')
+	install=${pkgbase}-dolphin.install
 
 	splitdirs="dolphin"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -197,14 +166,14 @@ package_kdebase-dolphin()
 package_kdebase-konqueror()
 {
 	pkgdesc="KDE Base Applications - Konqueror, the default KDE web browser"
-	depends=("${_origname}>=${_kdever}" "${_origname}-dolphin>=${_kdever}")
-	groups=("kde" "kde-minimal" "kde-complete" "kde-uninstall")
-	conflicts=("kdemod-${_origname}-konqueror")
-	install=${_origname}-konqueror.install
+	depends=("${pkgbase}>=${_kdever}" "${pkgbase}-dolphin>=${_kdever}")
+	groups=("kde" "kde-minimal" "kde-uninstall")
+	provides=('konqueror')
+	install=${pkgbase}-konqueror.install
 
 	splitdirs="konqueror"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
@@ -230,14 +199,14 @@ package_kdebase-konqueror()
 package_kdebase-konsole()
 {
 	pkgdesc="KDE Base Applications - Konsole, the default KDE terminal program"
-	depends=("${_origname}>=${_kdever}")
-	groups=("${_pkgprefix}" "kde-complete" "kde-minimal" "kde-uninstall")
-	conflicts=("kdemod-${_origname}-konsole")
-	install=${_origname}-konsole.install
+	depends=("${pkgbase}>=${_kdever}")
+	groups=("${_pkgprefix}" "kde" "kde-minimal" "kde-uninstall")
+	provides=('konsole')
+	install=${pkgbase}-konsole.install
 
 	splitdirs="konsole"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -245,14 +214,14 @@ package_kdebase-konsole()
 package_kdebase-kwrite()
 {
 	pkgdesc="KDE Base Applications - KWrite, a simple text editor"
-	depends=("${_origname}>=${_kdever}")
-	groups=("kde-complete" "kde-uninstall")
-	conflicts=("kdemod-${_origname}-kwrite")
-	install=${_origname}-kwrite.install
+	depends=("${pkgbase}>=${_kdever}")
+	groups=("kde" "kde-uninstall")
+	provides=('kwrite')
+	install=${pkgbase}-kwrite.install
 
 	splitdirs="kwrite"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
diff --git a/kdesdk/PKGBUILD b/kdesdk/PKGBUILD
index e5d9f6a41..565572b58 100644
--- a/kdesdk/PKGBUILD
+++ b/kdesdk/PKGBUILD
@@ -7,24 +7,16 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdesdk
-
-
-
 #
 # package info
 #
-pkgbase=('kdesdk')
+pkgbase="kdesdk"
 pkgname=('kdesdk-common'
          'kdesdk-doc'
          'kdesdk-kate'
          'kdesdk-cervisia'
          'kdesdk-kapptemplate'
          'kdesdk-lokalize'
-#        'kdesdk-kbugbuster'
          'kdesdk-okteta'
          'kdesdk-kdeaccounts-plugin'
          'kdesdk-kcachegrind'
@@ -48,20 +40,19 @@ license=('GPL' 'LGPL' 'FDL')
 
 options=('docs' '!splithdr' 'splitdbg' 'log')
 
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' "kdebase-runtime>=${_kdever}" 'antlr2'
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' "kdebase-runtime>=${_kdever}" 'antlr2' 'openjdk6'
              "kdepimlibs>=${_kdever}" 'subversion' "kdebindings-python>=${_kdever}" "openjdk6") # "kdepim-runtime>=${_kdever}"
 
-source=("$_mirror/${_origname}-$_kdever.tar.bz2"
-	'fix-antlr2-executable.patch')
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
-         '2545efa41b5fcb5fec53c453d0f23c25')
+source=("$_mirror/${pkgbase}-$_kdever.tar.bz2")
+	#'fix-antlr2-executable.patch')
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
+         #'2545efa41b5fcb5fec53c453d0f23c25')
 #
 # build function
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
-        #patch -Np1 -i ${srcdir}/fix-antlr2-executable.patch
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	# FIXME: plugin doesnt build: https://bugs.kde.org/show_bug.cgi?id=217769
 	sed -i -e "/snippets_tng/d" kate/plugins/CMakeLists.txt || return 1
@@ -74,8 +65,6 @@ build()
 	make || return 1
 }
 
-
-
 #
 # split-install functions
 #
@@ -83,13 +72,12 @@ package_kdesdk-common()
 {
 	pkgdesc="KDE Software Development Kit - Common files and libraries"
 	depends=("kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}" 'subversion')
-	conflicts=("kdmeod-${_origname}-common")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="strigi-analyzer kioslave"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
@@ -97,10 +85,10 @@ package_kdesdk-common()
 #	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
 #	if [ "$?" = "0" ]; then
 #		warning "incuding patches into package"
-#		mkdir -p ${pkgdir}/usr/share/chakra/patches/${_origname} &>/dev/null
+#		mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
 #		for i in ${startdir}/*.patch; do
 #			msg "$i"
-#			cp $i ${pkgdir}/usr/share/chakra/patches/${_origname}/ &>/dev/null
+#			cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
 #		done
 #	else
 #		warning "no patches found, skipping to include them into the package..."
@@ -110,13 +98,11 @@ package_kdesdk-common()
 package_kdesdk-doc()
 {
 	pkgdesc="KDE Software Development Kit - Documentation"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdmeod-${_origname}-doc")
-	groups=("kde-complete" "kde-devel" "kde-doc" "kde-uninstall" "kdesdk")
+	groups=("kde" "kde-devel" "kde-doc" "kde-uninstall" "kdesdk")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -124,14 +110,14 @@ package_kdesdk-doc()
 package_kdesdk-kate()
 {
 	pkgdesc="The KDE Advanced Text Editor"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kate")
-	groups=("kde" "kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	provides=('kate')
+	install=${pkgbase}.install
 
 	splitdirs="kate"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -139,14 +125,14 @@ package_kdesdk-kate()
 package_kdesdk-cervisia()
 {
 	pkgdesc="A CVS GUI frontend for KDE"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-cervisia")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	provides=('cervisia')
+	install=${pkgbase}.install
 
 	splitdirs="cervisia"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -154,14 +140,14 @@ package_kdesdk-cervisia()
 package_kdesdk-kapptemplate()
 {
 	pkgdesc="KDE application template generator"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kapptemplate")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	provides=('kapptemplate')
+	install=${pkgbase}.install
 
 	splitdirs="kapptemplate"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -169,30 +155,15 @@ package_kdesdk-kapptemplate()
 package_kdesdk-lokalize()
 {
 	pkgdesc="Computer aided translation system"
-	depends=("${_origname}-common>=${_kdever}" "kdebindings-python>=${_kdever}")
+	depends=("${pkgbase}-common>=${_kdever}" "kdebindings-python>=${_kdever}")
 	optdepends=('translate-toolkit: enable extra python script')
-	conflicts=("kdmeod-${_origname}-lokalize")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	provides=('lokalize')
+	install=${pkgbase}.install
 
 	splitdirs="lokalize"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
-			make DESTDIR=${pkgdir} install || return 1
-		done
-}
-
-package_kdesdk-kbugbuster()
-{
-	pkgdesc="Frontend for the KDE bug tracker"
-	depends=("${_origname}-common>=${_kdever}" "kdepimlibs>=${_kdever}") # "kdepim-runtime>=${_kdever}"
-	conflicts=("kdemod-${_origname}-kbugbuster")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
-
-	splitdirs="kbugbuster"
-		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -200,16 +171,15 @@ package_kdesdk-kbugbuster()
 package_kdesdk-okteta()
 {
 	pkgdesc="Okteta is a simple editor for the raw data of files, also known as a hex editor."
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
+	depends=("${pkgbase}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
 		 "kdebase>=${_kdever}")
-	conflicts=("kdemod-${_origname}-okteta" 'kdeutils-okteta')
-	replaces=('kdeutils-okteta')
-	groups=("kde-complete" "kdesdk" "kde-uninstall")
-	install=${_origname}.install
+	provides=('okteta')
+	groups=("kde" "kdesdk" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="okteta"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -217,14 +187,13 @@ package_kdesdk-okteta()
 package_kdesdk-kdeaccounts-plugin()
 {
 	pkgdesc="Addressbook plugin that puts names/email addresses of all KDE SVN accounts into an addressbook"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kdeaccounts-plugin")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="kdeaccounts-plugin"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -232,14 +201,14 @@ package_kdesdk-kdeaccounts-plugin()
 package_kdesdk-kcachegrind()
 {
 	pkgdesc="KDE profiler visualization"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kcachegrind")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('kcachegrind')
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="kcachegrind"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -247,14 +216,14 @@ package_kdesdk-kcachegrind()
 package_kdesdk-kmtrace()
 {
 	pkgdesc="A KDE memory leak tracer"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kmtrace")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('kmtrace')
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="kmtrace"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -262,14 +231,14 @@ package_kdesdk-kmtrace()
 package_kdesdk-kompare()
 {
 	pkgdesc="A KDE visual diff viewer"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kompare")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('kompare')
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="kompare"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -277,14 +246,14 @@ package_kdesdk-kompare()
 package_kdesdk-kpartloader()
 {
 	pkgdesc="KPartloader is a very simple application to test loading of a KPart."
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kpartloader")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('kpartloader')
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="kpartloader"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -292,14 +261,14 @@ package_kdesdk-kpartloader()
 package_kdesdk-kprofilemethod()
 {
 	pkgdesc="Macros for profiling using QTime"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kprofilemethod")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('kprofilemethod')
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="kprofilemethod"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -307,14 +276,14 @@ package_kdesdk-kprofilemethod()
 package_kdesdk-kstartperf()
 {
 	pkgdesc="Measures startup time for KDE applications"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kstartperf")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('kstartperf')
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="kstartperf"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -322,14 +291,14 @@ package_kdesdk-kstartperf()
 package_kdesdk-kuiviewer()
 {
 	pkgdesc="KUIViewer is a utility to display and test .ui-files"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kuiviewer")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('kuiviewer')
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="kuiviewer"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -337,14 +306,13 @@ package_kdesdk-kuiviewer()
 package_kdesdk-poxml()
 {
 	pkgdesc="Tools for using .po-files to translate DocBook XML files"
-	depends=("${_origname}-common>=${_kdever}" 'qt' 'antlr2')
-	conflicts=("kdemod-${_origname}-poxml")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'qt' 'antlr2')
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="poxml"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -352,14 +320,13 @@ package_kdesdk-poxml()
 package_kdesdk-scripts()
 {
 	pkgdesc="Extra scripts for the KDE SDK"
-	depends=("${_origname}-common>=${_kdever}" 'python')
-	conflicts=("kdemod-${_origname}-scripts")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'python')
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="scripts"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -367,14 +334,14 @@ package_kdesdk-scripts()
 package_kdesdk-umbrello()
 {
 	pkgdesc="An UML modeling tool for KDE"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-umbrello")
-	groups=("kde-complete" "kde-devel" "kde-uninstall" "kdesdk")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('umbrello')
+	groups=("kde" "kde-devel" "kde-uninstall" "kdesdk")
+	install=${pkgbase}.install
 
 	splitdirs="umbrello"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }

From 89aaa1f00ac2e017028f4f9df29683262e0f4600 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 19:14:02 +0000
Subject: [PATCH 37/51] Prepare kde 4.6.4

---
 kdenetwork/PKGBUILD             | 78 ++++++++++++++-------------------
 kdenetwork/gcc45.patch.disabled | 11 -----
 2 files changed, 34 insertions(+), 55 deletions(-)
 delete mode 100644 kdenetwork/gcc45.patch.disabled

diff --git a/kdenetwork/PKGBUILD b/kdenetwork/PKGBUILD
index 42909c2ef..0ff134606 100644
--- a/kdenetwork/PKGBUILD
+++ b/kdenetwork/PKGBUILD
@@ -7,17 +7,10 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdenetwork
-
-
-
 #
 # package info
 #
-pkgbase=('kdenetwork')
+pkgbase="kdenetwork"
 pkgname=('kdenetwork-common'
          'kdenetwork-doc'
          'kdenetwork-kget'
@@ -42,10 +35,9 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
              'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage' 'ilbc' 'msilbc' 
              'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer>=2.7.3' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5')
 
-source=($_mirror/${_origname}-$_kdever.tar.bz2 \
+source=($_mirror/${pkgbase}-$_kdever.tar.bz2 \
         'lisa.daemon')
-
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
          '66069c83fd5fa0df5d743d4486799033')  # lisa.daemon
 
 
@@ -54,7 +46,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	msg "starting build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -76,14 +68,13 @@ package_kdenetwork-common()
 {
 	pkgdesc="KDE Network - Common files and libraries"
 	depends=("kdelibs>=${_kdever}" 'smbclient')
-	conflicts=("kdemod-${_origname}-common")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	# FIXME strigi-analyzer
 	splitdirs="filesharing kdnssd" 
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install
 
 		done
@@ -95,10 +86,10 @@ package_kdenetwork-common()
 #	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
 #	if [ "$?" = "0" ]; then
 #		warning "incuding patches into package"
-#		mkdir -p ${pkgdir}/usr/share/kdemod/patches/${_origname} &>/dev/null
+#		mkdir -p ${pkgdir}/usr/share/kdemod/patches/${pkgbase} &>/dev/null
 #		for i in ${startdir}/*.patch; do
 #			msg "$i"
-#			cp $i ${pkgdir}/usr/share/kdemod/patches/${_origname}/ &>/dev/null
+#			cp $i ${pkgdir}/usr/share/kdemod/patches/${pkgbase}/ &>/dev/null
 #		done
 #	else
 #		warning "no patches found, skipping to include them into the package..."
@@ -108,12 +99,11 @@ package_kdenetwork-common()
 package_kdenetwork-doc()
 {
 	pkgdesc="KDE Network - Documentation"
-	depends=("${_origname}-common>=${_kdever}")
-	groups=("kde-complete" "${_origname}" "kde-doc" "kde-uninstall")
+	groups=("kde" "${pkgbase}" "kde-doc" "kde-uninstall")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -121,14 +111,14 @@ package_kdenetwork-doc()
 package_kdenetwork-kget()
 {
 	pkgdesc="Download manager"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-workspace>=${_kdever}" 'qca' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.4')
-	conflicts=("kdemod-${_origname}-kget")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" "kdebase-workspace>=${_kdever}" 'qca' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.4')
+	provides=('kget')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kget"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -138,13 +128,13 @@ package_kdenetwork-kopete()
 	pkgdesc="Kopete, the instant messenger"
 	depends=("kdebase-runtime>=${_kdever}" "kdepimlibs>=${_kdever}"
 	         'qca-ossl' 'libotr' 'libmsn' 'libidn' 'qimageblitz' 'libxss' 'v4l-utils' 'libgadu' 'meanwhile' 'mediastreamer' 'msilbc')
-	conflicts=("kdemod-${_origname}-kopete")
-	groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	provides=('kopete')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kopete"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -152,14 +142,14 @@ package_kdenetwork-kopete()
 package_kdenetwork-kppp()
 {
 	pkgdesc="PPP Client"
-	depends=("${_origname}-common>=${_kdever}" 'ppp')
-	conflicts=("kdemod-${_origname}-kppp")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'ppp')
+	provides=('kppp')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kppp"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -167,14 +157,14 @@ package_kdenetwork-kppp()
 package_kdenetwork-krdc()
 {
 	pkgdesc="Desktop Sharing Client"
-	depends=("${_origname}-common>=${_kdever}" 'libvncserver' 'rdesktop' 'telepathy-qt4')
-	conflicts=("kdemod-${_origname}-krdc")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'libvncserver' 'rdesktop' 'telepathy-qt4')
+	provides=('krdc')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="krdc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -186,13 +176,13 @@ package_kdenetwork-krfb()
 	#       not detected by namcap because libgl depends on it
 	#       but nvidia providing libgl does not depend on libxdamage
 	depends=("kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}" 'libvncserver' 'libxdamage')
-	conflicts=("kdemod-${_origname}-krfb")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	provides=('krfb')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="krfb"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
diff --git a/kdenetwork/gcc45.patch.disabled b/kdenetwork/gcc45.patch.disabled
deleted file mode 100644
index 8738b2bea..000000000
--- a/kdenetwork/gcc45.patch.disabled
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdenetwork-4.4.3/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc.orig	2010-05-22 20:00:39.741750290 +0200
-+++ kdenetwork-4.4.3/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc	2010-05-22 20:02:33.485071903 +0200
-@@ -648,7 +648,7 @@ OpenSSLAdapter::SSLPostConnectionCheck(S
-     int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
- 
-     if (extension_nid == NID_subject_alt_name) {
--      X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
-+      X509V3_EXT_METHOD* meth = (X509V3_EXT_METHOD *) X509V3_EXT_get(extension);
-       if (!meth)
-         break;
- 

From 1335a52d24faa35f4debe30a4ec6ed1d0a5881ad Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 20:00:26 +0000
Subject: [PATCH 38/51] Prepare kde 4.6.4, make some package dummy for the
 transition without actually packages dependant of them

---
 kdeaccessibility/PKGBUILD | 88 +++++++++++++------------------------
 kdeadmin/PKGBUILD         | 91 +++++++++++++--------------------------
 2 files changed, 59 insertions(+), 120 deletions(-)

diff --git a/kdeaccessibility/PKGBUILD b/kdeaccessibility/PKGBUILD
index b8fd73c72..029f5e17c 100644
--- a/kdeaccessibility/PKGBUILD
+++ b/kdeaccessibility/PKGBUILD
@@ -7,17 +7,10 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdeaccessibility
-
-
-
 #
 # package info
 #
-pkgbase=('kdeaccessibility')
+pkgbase="kdeaccessibility"
 pkgname=('kdeaccessibility-common'
          'kdeaccessibility-doc'
          'kdeaccessibility-colorschemes'
@@ -27,24 +20,21 @@ pkgname=('kdeaccessibility-common'
          'kdeaccessibility-kmouth'
          'kdeaccessibility-jovie')
 
-# Disabled
-#         'kdeaccessibility-ksayit'
-
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
 
-install=${_origname}.install
+install=${pkgbase}.install
 options=('docs' '!splithdr' 'splitdbg' 'log')
 
 makedepends=('pkgconfig' 'cmake' 'automoc4' "kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}" "speech-dispatcher>=0.6.7" 'opentts')
 
-source=($_mirror/${_origname}-$_kdever.tar.bz2)
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
+source=($_mirror/${pkgbase}-$_kdever.tar.bz2)
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 
 
 
@@ -53,7 +43,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	msg "starting build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -71,33 +61,18 @@ build()
 #
 package_kdeaccessibility-common()
 {
-	pkgdesc="KDE Accessibility Aids - Common files"
-	depends=("kdebase-runtime>=${_kdever}")
-	conflicts=("kdemod-${_origname}-common")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	pkgdesc="KDE Accessibility Aids - Transition package"
 
-#	# include our patches into the package
-#	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
-#	if [ "$?" = "0" ]; then
-#		warning "incuding patches into package"
-#		mkdir -p ${pkgdir}/usr/share/kdemod/patches/${_origname} &>/dev/null
-#		for i in ${startdir}/*.patch; do
-#			msg "$i"
-#			cp $i ${pkgdir}/usr/share/kdemod/patches/${_origname}/ &>/dev/null
-#		done
-#	else
-#		warning "no patches found, skipping to include them into the package..."
-#	fi
 }
 
 package_kdeaccessibility-doc()
 {
 	pkgdesc="KDE Accessibility Aids - Documentation"
-	groups=("${_origname}" "kde-complete" "kde-uninstall" "kde-doc")
+	groups=("${pkgbase}" "kde" "kde-uninstall" "kde-doc")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install
 		done
 }
@@ -105,13 +80,12 @@ package_kdeaccessibility-doc()
 package_kdeaccessibility-colorschemes()
 {
 	pkgdesc="Accessible Color Schemes for KDE"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-colorschemes")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	depends=("kdebase-runtime>=${_kdever}")
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="ColorSchemes"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install
 		done
 }
@@ -119,13 +93,12 @@ package_kdeaccessibility-colorschemes()
 package_kdeaccessibility-iconthemes()
 {
 	pkgdesc="Accessibly Icon Themes for KDE"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-iconthemes")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	depends=("kdebase-runtime>=${_kdever}")
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="IconThemes"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install
 		done
 }
@@ -133,13 +106,12 @@ package_kdeaccessibility-iconthemes()
 package_kdeaccessibility-kmag()
 {
 	pkgdesc="Screen magnifier"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kmag")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	depends=("kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}")
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="kmag"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install
 		done
 }
@@ -147,13 +119,12 @@ package_kdeaccessibility-kmag()
 package_kdeaccessibility-kmousetool()
 {
 	pkgdesc="Automatic mouse clicker"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kmousetool")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	depends=("kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}")
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="kmousetool"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install
 		done
 }
@@ -161,13 +132,12 @@ package_kdeaccessibility-kmousetool()
 package_kdeaccessibility-kmouth()
 {
 	pkgdesc="Speech synthesizer"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kmouth")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	depends=("kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}")
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="kmouth"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install
 		done
 }
@@ -175,14 +145,14 @@ package_kdeaccessibility-kmouth()
 package_kdeaccessibility-jovie()
 {
 	pkgdesc="Text-to-speech system"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}" "speech-dispatcher>=0.6.7" 'opentts')
-	conflicts=("kdemod-${_origname}-kttsd" "kdemod-${_origname}-ksayit"" ${_origname}-kttsd" "${_origname}-ksayit")
-	replaces=("${_origname}-kttsd" "${_origname}-ksayit")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	depends=("kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}" "speech-dispatcher>=0.6.7" 'opentts')
+	conflicts=("${pkgbase}-kttsd" "${pkgbase}-ksayit")
+	replaces=("${pkgbase}-kttsd" "${pkgbase}-ksayit")
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="jovie"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install
 		done
 }
diff --git a/kdeadmin/PKGBUILD b/kdeadmin/PKGBUILD
index a4b173d9c..b48b8090e 100644
--- a/kdeadmin/PKGBUILD
+++ b/kdeadmin/PKGBUILD
@@ -7,29 +7,20 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdeadmin
-
-
-
 #
 # package info
 #
-pkgbase=('kdeadmin')
+pkgbase="kdeadmin"
 pkgname=('kdeadmin-common'
          'kdeadmin-doc'
          'kdeadmin-kcron'
          'kdeadmin-kuser'
          'kdeadmin-ksystemlog'
          'kdeadmin-system-config-printer')
-
-         # not in the tarball 'kdeadmin-lilo-config'
       
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org/"
@@ -41,19 +32,15 @@ options=('!splithdr' 'splitdbg' 'log')
 makedepends=('pkgconfig' 'cmake' 'automoc4' "kdepimlibs>=${_kdever}"  "kdebase-runtime>=${_kdever}"
 	     "kdebindings-python>=${_kdever}" 'system-config-printer-common') # "kdepim-runtime>=${_kdever}"
 
-source=($_mirror/${_origname}-$_kdever.tar.bz2)
-
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
-
-
-
+source=($_mirror/${pkgbase}-$_kdever.tar.bz2)
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 
 #
 # build function
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
+	cd ${srcdir}/${pkgbase}-${pkgver}
 	
 	msg "starting build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -66,8 +53,6 @@ build()
 	make || return 1
 }
 
-
-
 #
 # split-install functions
 #
@@ -75,12 +60,11 @@ package_kdeadmin-common()
 {
 	pkgdesc="KDE Administrative Tools - Common files and libraries"
 	depends=("kdebase-runtime>=${_kdever}")
-	conflicts=("kdemod-${_origname}" )
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="strigi-analyzer"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
@@ -88,10 +72,10 @@ package_kdeadmin-common()
 #	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
 #	if [ "$?" = "0" ]; then
 #		warning "incuding patches into package"
-#		mkdir -p ${pkgdir}/usr/share/chakra/patches/${_origname} &>/dev/null
+#		mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
 #		for i in ${startdir}/*.patch; do
 #			msg "$i"
-#			cp $i ${pkgdir}/usr/share/chakra/patches/${_origname}/ &>/dev/null
+#			cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
 #		done
 #	else
 #		warning "no patches found, skipping to include them into the package..."
@@ -101,11 +85,11 @@ package_kdeadmin-common()
 package_kdeadmin-doc()
 {
 	pkgdesc="KDE Administrative Tools - Documentation"
-	groups=("${_origname}" "kde-complete" "kde-uninstall" "doc")
+	groups=("${pkgbase}" "kde" "kde-uninstall" "doc")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -113,13 +97,13 @@ package_kdeadmin-doc()
 package_kdeadmin-kcron()
 {
 	pkgdesc="Crontab editor"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kcron")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('kcron')
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="kcron"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -127,13 +111,13 @@ package_kdeadmin-kcron()
 package_kdeadmin-kdat()
 {
 	pkgdesc="Tar-based tape archiver"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kdat")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('kdat')
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="kdat"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -141,13 +125,13 @@ package_kdeadmin-kdat()
 package_kdeadmin-ksystemlog()
 {
 	pkgdesc="Log viewer"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-ksystemlog")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('ksystemlog')
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="ksystemlog"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -155,27 +139,13 @@ package_kdeadmin-ksystemlog()
 package_kdeadmin-kuser()
 {
 	pkgdesc="Manage users and groups"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("${_origname}-kuser")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	depends=("${pkgbase}-common>=${_kdever}")
+	provides=('kuser')
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="kuser"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
-			make DESTDIR=${pkgdir} install || return 1
-		done
-}
-
-package_kdeadmin-lilo-config()
-{
-	pkgdesc="Configure the LILO bootloader"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-lilo-config")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
-
-	splitdirs="lilo-config"
-		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -183,13 +153,12 @@ package_kdeadmin-lilo-config()
 package_kdeadmin-system-config-printer()
 {
 	pkgdesc="Printer configuration"
-	depends=("${_origname}-common>=${_kdever}" "system-config-printer" "kdebindings-python")
-	conflicts=("kdemod-${_origname}-system-config-printer-kde")
-	groups=("${_origname}" "kde-complete" "kde-uninstall")
+	depends=("${pkgbase}-common>=${_kdever}" "system-config-printer" "kdebindings-python")
+	groups=("${pkgbase}" "kde" "kde-uninstall")
 
 	splitdirs="system-config-printer-kde"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 

From 9ab43eb28c31f58895e7ee2b95f873faf30db3ab Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 20:14:22 +0000
Subject: [PATCH 39/51] Make common dummy for 4.6.4

---
 kdeutils/PKGBUILD | 173 ++++++++++++++++------------------------------
 1 file changed, 60 insertions(+), 113 deletions(-)

diff --git a/kdeutils/PKGBUILD b/kdeutils/PKGBUILD
index 43dfd90dc..d539498ed 100644
--- a/kdeutils/PKGBUILD
+++ b/kdeutils/PKGBUILD
@@ -7,23 +7,15 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdeutils
-
-
-
 #
 # package info
 #
-pkgbase=('kdeutils')
+pkgbase="kdeutils"
 pkgname=('kdeutils-common'
          'kdeutils-doc'
          'kdeutils-ark'
          'kdeutils-kcalc'
          'kdeutils-kcharselect'
-#	 'kdeutils-kdelirc'
          'kdeutils-kdf'
          'kdeutils-kfloppy'
          'kdeutils-kgpg'
@@ -49,8 +41,8 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}"
              'system-config-printer-common' 'libarchive' 'qimageblitz'
              'p7zip' 'zip' 'unzip' 'unrar') # "kdepim-runtime>=${_kdever}"
 
-source=($_mirror/${_origname}-$_kdever.tar.bz2)
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
+source=($_mirror/${pkgbase}-$_kdever.tar.bz2)
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 
 
 #
@@ -58,7 +50,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	msg "starting build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -77,36 +69,18 @@ build()
 #
 package_kdeutils-common()
 {
-	pkgdesc="KDE Utilities - Common files and libraries"
-	provides=("${_origname}=${_kdever}")
-	conflicts=("kdemod-${_origname}-common")
-	groups=("kde" "kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	pkgdesc="KDE Utilities - Transition package"
 
-#	# include our patches into the package
-#	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
-#	if [ "$?" = "0" ]; then
-#		warning "incuding patches into package"
-#		mkdir -p ${pkgdir}/usr/share/kdemod/patches/${_origname} &>/dev/null
-#		for i in ${startdir}/*.patch; do
-#			msg "$i"
-#			cp $i ${pkgdir}/usr/share/kdemod/patches/${_origname}/ &>/dev/null
-#		done
-#	else
-#		warning "no patches found, skipping to include them into the package..."
-#	fi
 }
 
 package_kdeutils-doc()
 {
 	pkgdesc="KDE Utilities - Documentation"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-doc")
-	groups=("kde-complete" "kdeutils" "kde-doc" "kde-uninstall")
+	groups=("kde" "kdeutils" "kde-doc" "kde-uninstall")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -114,16 +88,14 @@ package_kdeutils-doc()
 package_kdeutils-ark()
 {
 	pkgdesc="Archiver for various compression formats"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		 "kdebase>=${_kdever}" 'libarchive')
+	depends=("kdebase-runtime>=${_kdever}" "kdebase>=${_kdever}" 'libarchive')
 	optdepends=('p7zip' 'zip' 'unzip' 'unrar')
-	conflicts=("kdemod-${_origname}-ark")
-	groups=("kde" "kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="ark"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -131,15 +103,13 @@ package_kdeutils-ark()
 package_kdeutils-kcalc()
 {
 	pkgdesc="Scientific calculator"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		 "kdebase>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kcalc")
-	groups=("kde" "kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=("kdebase-runtime>=${_kdever}" "kdebase>=${_kdever}")
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kcalc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -147,15 +117,13 @@ package_kdeutils-kcalc()
 package_kdeutils-kcharselect()
 {
 	pkgdesc="Character selector"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		 "kdebase>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kcharselect")
-	groups=("kde" "kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=("kdebase-runtime>=${_kdever}" "kdebase>=${_kdever}")
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kcharselect"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -163,15 +131,13 @@ package_kdeutils-kcharselect()
 package_kdeutils-kdelirc()
 {
 	pkgdesc="KDE Linux infrared remote control server."
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		 "kdebase>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kdelirc")
-	groups=("kde" "kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=("kdebase-runtime>=${_kdever}" "kdebase>=${_kdever}")
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kdelirc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
@@ -183,15 +149,13 @@ package_kdeutils-kdelirc()
 package_kdeutils-kdessh()
 {
 	pkgdesc="A KDE frontend to SSH"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		 "kdebase>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kdessh")
-	groups=("kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=("kdebase-runtime>=${_kdever}" "kdebase>=${_kdever}")
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kdessh"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -199,15 +163,13 @@ package_kdeutils-kdessh()
 package_kdeutils-kdf()
 {
 	pkgdesc="KDE diskfree"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		 "kdebase>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kdf")
-	groups=("kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=("kdebase-runtime>=${_kdever}" "kdebase>=${_kdever}")
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kdf"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -215,15 +177,13 @@ package_kdeutils-kdf()
 package_kdeutils-kfloppy()
 {
 	pkgdesc="Floppy formatter"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		 "kdebase>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kfloppy")
-	groups=("kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=("kdebase-runtime>=${_kdever}" "kdebase>=${_kdever}")
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kfloppy"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -231,16 +191,13 @@ package_kdeutils-kfloppy()
 package_kdeutils-kgpg()
 {
 	pkgdesc="GPG encryption and key management"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		 "kdelibs>=${_kdever}" "kdepimlibs>=${_kdever}" 'kde-agent'
-		 ) # "kdepim-runtime>=${_kdever}"
-	conflicts=("kdemod-${_origname}-kgpg")
-	groups=("kde" "kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=("kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}" "kdepimlibs>=${_kdever}" 'kde-agent') # "kdepim-runtime>=${_kdever}"
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kgpg"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -248,15 +205,13 @@ package_kdeutils-kgpg()
 package_kdeutils-ktimer()
 {
 	pkgdesc="Timer application"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		 "kdebase>=${_kdever}")
-	conflicts=("kdemod-${_origname}-ktimer")
-	groups=("kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=("kdebase-runtime>=${_kdever}" "kdebase>=${_kdever}")
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="ktimer"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -264,15 +219,13 @@ package_kdeutils-ktimer()
 package_kdeutils-kwallet()
 {
 	pkgdesc="The KDE wallet system"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		 "kdebase>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kwallet")
-	groups=("kde" "kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=("kdebase-runtime>=${_kdever}" "kdebase>=${_kdever}")
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kwallet"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -280,15 +233,14 @@ package_kdeutils-kwallet()
 package_kdeutils-printer-applet()
 {
 	pkgdesc="A system tray utility that shows current print jobs, printer warnings and errors"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		 "kdebase>=${_kdever}" "kdebindings-python>=${_kdever}" 'system-config-printer-common')
-	conflicts=("kdemod-${_origname}-printer-applet")
-	groups=("kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=("kdebase-runtime>=${_kdever}" "kdebase>=${_kdever}" 
+		 "kdebindings-python>=${_kdever}" 'system-config-printer-common')
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="printer-applet"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -296,14 +248,13 @@ package_kdeutils-printer-applet()
 package_kdeutils-superkaramba()
 {
 	pkgdesc="Desktop widgets"
-	depends=("${_origname}-common>=${_kdever}" 'qimageblitz')
-	conflicts=("kdemod-${_origname}-superkaramba")
-	groups=("kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=('qimageblitz')
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="superkaramba"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -311,17 +262,13 @@ package_kdeutils-superkaramba()
 package_kdeutils-sweeper()
 {
 	pkgdesc="Clean unwanted traces the user leaves on the system"
-	depends=("${_origname}-common>=${_kdever}" "kdebase-runtime>=${_kdever}"
-		  "kdebase>=${_kdever}")
-	conflicts=("kdemod-${_origname}-sweeper")
-	groups=("kde-complete" "kdeutils" "kde-uninstall")
-	install=${_origname}.install
+	depends=("kdebase-runtime>=${_kdever}" "kdebase>=${_kdever}")
+	groups=("kde" "kdeutils" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="sweeper"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
-
-

From 9f4024d7ec9a75f8a15648bcb6e032c50a043b5b Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 21:12:32 +0000
Subject: [PATCH 40/51] Prepare kde 4.6.4

---
 kdegames/PKGBUILD | 378 ++++++++++++++++++++--------------------------
 kdetoys/PKGBUILD  |  93 +++---------
 2 files changed, 186 insertions(+), 285 deletions(-)

diff --git a/kdegames/PKGBUILD b/kdegames/PKGBUILD
index e91ea037e..a878202c2 100644
--- a/kdegames/PKGBUILD
+++ b/kdegames/PKGBUILD
@@ -7,17 +7,10 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdegames
-
-
-
 #
 # package info
 #
-pkgbase=('kdegames')
+pkgbase="kdegames"
 pkgname=('kdegames-common'
          'kdegames-doc'
          'kdegames-bomber'
@@ -73,8 +66,8 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
 makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" "kdebase-runtime>=${_kdever}" 'qca' 'ggz-client-libs' 'gnugo' 'twisted' 'openal' 'qhull' 'pyqt' 
 "kdebindings-python>=${_kdever}")
 
-source=("$_mirror/${_origname}-$_kdever.tar.bz2")
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
+source=("$_mirror/${pkgbase}-$_kdever.tar.bz2")
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 
 
 
@@ -83,7 +76,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	msg "starting build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -103,18 +96,17 @@ package_kdegames-common()
 {
 	pkgdesc="KDE games - Common files and libraries"
 	depends=("kdelibs>=${_kdever}")
-	conflicts=("kdemod-${_origname}-common")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="libkdegames libkmahjongg"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
 	# WORKAROUND, install cmake modules
-	for i in $srcdir/${_origname}-${pkgver}/cmake/modules/*.cmake; do
+	for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do
 		install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i)
 	done
 
@@ -122,10 +114,10 @@ package_kdegames-common()
 #	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
 #	if [ "$?" = "0" ]; then
 #		warning "incuding patches into package"
-#		mkdir -p ${pkgdir}/usr/share/kdemod/patches/${_origname} &>/dev/null
+#		mkdir -p ${pkgdir}/usr/share/kdemod/patches/${pkgbase} &>/dev/null
 #		for i in ${startdir}/*.patch; do
 #			msg "$i"
-#			cp $i ${pkgdir}/usr/share/kdemod/patches/${_origname}/ &>/dev/null
+#			cp $i ${pkgdir}/usr/share/kdemod/patches/${pkgbase}/ &>/dev/null
 #		done
 #	else
 #		warning "no patches found, skipping to include them into the package..."
@@ -135,11 +127,11 @@ package_kdegames-common()
 package_kdegames-doc()
 {
 	pkgdesc="KDE games - Documentation"
-	groups=("kde-complete" "${_origname}" "kde-doc" "kde-uninstall")
+	groups=("kde" "${pkgbase}" "kde-doc" "kde-uninstall")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -147,14 +139,13 @@ package_kdegames-doc()
 package_kdegames-bomber()
 {
 	pkgdesc="Destroy the buildings below, before you crash into them"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-bomber")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="bomber"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -162,14 +153,13 @@ package_kdegames-bomber()
 package_kdegames-bovo()
 {
 	pkgdesc="Client for playing Monopoly-like games on the monopd network"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-bovo")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="bovo"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -177,14 +167,13 @@ package_kdegames-bovo()
 package_kdegames-granatier()
 {
 	pkgdesc="Granatier is a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone."
-	depends=("${_origname}-common>=${_kdever}" 'openal')
-	conflicts=("kdemod-${_origname}-granatier")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'openal')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="granatier"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -192,13 +181,13 @@ package_kdegames-granatier()
 package_kdegames-kajongg()
 {
 	pkgdesc="The ancient Chinese board game for 4 players."
-	depends=("${_origname}-common>=${_kdever}" 'twisted' 'pyqt' "kdebindings-python>=${_kdever}")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'twisted' 'pyqt' "kdebindings-python>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kajongg"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -206,14 +195,13 @@ package_kdegames-kajongg()
 package_kdegames-kapman()
 {
 	pkgdesc="A clone of the classic Pacman game"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kapman")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kapman"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -221,14 +209,13 @@ package_kdegames-kapman()
 package_kdegames-katomic()
 {
 	pkgdesc="Thinking game where you have to form chemical molecules out of atoms"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-katomic")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="katomic"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -236,33 +223,31 @@ package_kdegames-katomic()
 package_kdegames-kbattleship()
 {
 	pkgdesc="Implentation of the popular game Battleship where you have to try to sink the opponents ships"
-	depends=("${_origname}-common>=${_kdever}" 'ggz-client-libs')
-	conflicts=("kdemod-${_origname}-kbattleship")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}-kbattleship.install
+	depends=("${pkgbase}-common>=${_kdever}" 'ggz-client-libs')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}-kbattleship.install
 
 	splitdirs="kbattleship"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
 	# will be generated during install
 	rm -rf ${pkgdir}/etc
-	install -D -m644 ${srcdir}/${_origname}-${pkgver}/kbattleship/src/module.dsc ${pkgdir}/usr/share/ggz/kbattleship.dsc
+	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/kbattleship/src/module.dsc ${pkgdir}/usr/share/ggz/kbattleship.dsc
 }
 
 package_kdegames-kblackbox()
 {
 	pkgdesc="Graphical logical game, inspired by emacs blackbox"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kblackbox")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kblackbox"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -270,14 +255,13 @@ package_kdegames-kblackbox()
 package_kdegames-kblocks()
 {
 	pkgdesc="KBlocks is a single player falling blocks puzzle game, a Tetris-like replacement for KSirtet"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kblocks")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kblocks"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -285,14 +269,13 @@ package_kdegames-kblocks()
 package_kdegames-kbounce()
 {
 	pkgdesc="Catch several moving balls in a rectangular game field by building walls"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kbounce")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kbounce"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -300,14 +283,13 @@ package_kdegames-kbounce()
 package_kdegames-kbreakout()
 {
 	pkgdesc="A clone of the classic breakout game"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kbreakout")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kbreakout"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -315,14 +297,13 @@ package_kdegames-kbreakout()
 package_kdegames-kdiamond()
 {
 	pkgdesc="KDiamond is a three-in-a-row game (much like Bejeweled)"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kdiamond")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kdiamond"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -330,14 +311,13 @@ package_kdegames-kdiamond()
 package_kdegames-kfourinline()
 {
 	pkgdesc="A board game for two players based on the Connect-Four game"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kfourinline")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kfourinline"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -345,14 +325,13 @@ package_kdegames-kfourinline()
 package_kdegames-kgoldrunner()
 {
 	pkgdesc="Action game, akin to the C64s LodeRunner"
-	depends=("${_origname}-common>=${_kdever}" "${_origname}-doc>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kgoldrunner")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" "${pkgbase}-doc>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kgoldrunner"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -360,14 +339,13 @@ package_kdegames-kgoldrunner()
 package_kdegames-kigo()
 {
 	pkgdesc="A go board game for KDE"
-	depends=("${_origname}-common>=${_kdever}" 'gnugo')
-	conflicts=("kdemod-${_origname}-kigo")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'gnugo')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kigo"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -375,14 +353,13 @@ package_kdegames-kigo()
 package_kdegames-killbots()
 {
 	pkgdesc="A classic turn-based game in which the player tries to avoid being killed by attacking robots"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-killbots")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="killbots"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -390,14 +367,13 @@ package_kdegames-killbots()
 package_kdegames-kiriki()
 {
 	pkgdesc="Kiriki is a clone of Yahtzee"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kiriki")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kiriki"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -405,14 +381,13 @@ package_kdegames-kiriki()
 package_kdegames-kjumpingcube()
 {
 	pkgdesc="Tactical one or two-player game. The playing field consists of squares that contains points which can be increased"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kjumpingcube")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kjumpingcube"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -420,14 +395,13 @@ package_kdegames-kjumpingcube()
 package_kdegames-klines()
 {
 	pkgdesc="A version of the russian game Lines"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-klines")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="klines"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -435,14 +409,13 @@ package_kdegames-klines()
 package_kdegames-kmahjongg()
 {
 	pkgdesc="Clone of the well known tile based patience game of the same name"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kmahjongg")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kmahjongg"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -450,14 +423,13 @@ package_kdegames-kmahjongg()
 package_kdegames-kmines()
 {
 	pkgdesc="Classical Minesweeper game where you have to find mines by logical deduction"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kmines")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kmines"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -465,14 +437,13 @@ package_kdegames-kmines()
 package_kdegames-knetwalk()
 {
 	pkgdesc="Connect all computers to a messed up network"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-knetwalk")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="knetwalk"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -480,14 +451,13 @@ package_kdegames-knetwalk()
 package_kdegames-kolf()
 {
 	pkgdesc="Miniature golf simulator"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kolf")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kolf"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -495,14 +465,13 @@ package_kdegames-kolf()
 package_kdegames-kollision()
 {
 	pkgdesc="A simple ball dodging game"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kollision")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kollision"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -510,14 +479,13 @@ package_kdegames-kollision()
 package_kdegames-konquest()
 {
 	pkgdesc="Version of Gnu-Lactic Konquest, a multi-player strategy game"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-konquest")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="konquest"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -525,14 +493,13 @@ package_kdegames-konquest()
 package_kdegames-kpat()
 {
 	pkgdesc="Collection of various patience games known all over the world"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kpat")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kpat"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -540,34 +507,31 @@ package_kdegames-kpat()
 package_kdegames-kreversi()
 {
 	pkgdesc="Board game game where two players have to gain the majority of pieces on the board"
-	depends=("${_origname}-common>=${_kdever}" 'ggz-client-libs')
-	conflicts=("kdemod-${_origname}-kreversi")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}-kreversi.install
+	depends=("${pkgbase}-common>=${_kdever}" 'ggz-client-libs')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}-kreversi.install
 
 	splitdirs="kreversi"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
 	# will be generated during install
 	rm -rf ${pkgdir}/etc
-	install -D -m644 ${srcdir}/${_origname}-${pkgver}/kreversi/module.dsc ${pkgdir}/usr/share/ggz/kreversi.dsc
+	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/kreversi/module.dsc ${pkgdir}/usr/share/ggz/kreversi.dsc
 }
 
 package_kdegames-klickety()
 {
 	pkgdesc="Klickety is an adaptation of the clickomania game"
-        depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdegames-${_origname}-ksame")
-        replaces=("kdegames-${_origname}-ksame")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+        depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="klickety"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -575,14 +539,13 @@ package_kdegames-klickety()
 package_kdegames-kshisen()
 {
 	pkgdesc="A game similiar to Mahjongg"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kshisen")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kshisen"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -590,14 +553,13 @@ package_kdegames-kshisen()
 package_kdegames-ksirk()
 {
 	pkgdesc="A game similiar to Risk"
-	depends=("${_origname}-common>=${_kdever}" 'qca')
-	conflicts=("kdemod-${_origname}-ksirk")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'qca')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="ksirk"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -605,14 +567,13 @@ package_kdegames-ksirk()
 package_kdegames-kspaceduel()
 {
 	pkgdesc="Space arcade game for two players"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kspaceduel")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kspaceduel"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -620,33 +581,31 @@ package_kdegames-kspaceduel()
 package_kdegames-ksquares()
 {
 	pkgdesc="A game modeled after the well known pen and paper based game of Dots and Boxes"
-	depends=("${_origname}-common>=${_kdever}" 'ggz-client-libs')
-	conflicts=("kdemod-${_origname}-ksquares")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}-ksquares.install
+	depends=("${pkgbase}-common>=${_kdever}" 'ggz-client-libs')
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}-ksquares.install
 
 	splitdirs="ksquares"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
 	# will be generated during install
 	rm -rf ${pkgdir}/etc
-	install -D -m644 ${srcdir}/${_origname}-${pkgver}/ksquares/src/module.dsc ${pkgdir}/usr/share/ggz/ksquares.dsc
+	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/ksquares/src/module.dsc ${pkgdir}/usr/share/ggz/ksquares.dsc
 }
 
 package_kdegames-ksudoku()
 {
 	pkgdesc="Sudoku game"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-ksudoku")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="ksudoku"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -654,14 +613,13 @@ package_kdegames-ksudoku()
 package_kdegames-ktron()
 {
 	pkgdesc="Well known from the famous movie, KTron is a popular computer game for two players."
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-ktron")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="ktron"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -669,14 +627,13 @@ package_kdegames-ktron()
 package_kdegames-ktuberling()
 {
 	pkgdesc="Nice potato editor for kids"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-ktuberling")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="ktuberling"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -684,14 +641,13 @@ package_kdegames-ktuberling()
 package_kdegames-kubrick()
 {
 	pkgdesc="Kubrick is a game based on Rubik's Cube (TM)"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kubrick")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kubrick"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -699,14 +655,13 @@ package_kdegames-kubrick()
 package_kdegames-lskat()
 {
 	pkgdesc="Two player card game which follows the rules for the German game Offiziers-Skat"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-lskat")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="lskat"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -714,13 +669,12 @@ package_kdegames-lskat()
 package_kdegames-palapeli()
 {
 	pkgdesc="Palapeli is a jigsaw puzzle game."
-	depends=("${_origname}-common>=${_kdever}" "qhull")
-	conflicts=("kdemod-${_origname}-palapeli")
-	groups=("kde-complete" "${_origname}" "kde-uninstall")
+	depends=("${pkgbase}-common>=${_kdever}" "qhull")
+	groups=("kde" "${pkgbase}" "kde-uninstall")
 
 	splitdirs="palapeli"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
diff --git a/kdetoys/PKGBUILD b/kdetoys/PKGBUILD
index 4308c6cb2..ed56d23cf 100644
--- a/kdetoys/PKGBUILD
+++ b/kdetoys/PKGBUILD
@@ -7,23 +7,15 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdetoys
-
-
-
 #
 # package info
 #
-pkgbase=('kdetoys')
+pkgbase="kdetoys"
 pkgname=('kdetoys-common'
          'kdetoys-doc'
          'kdetoys-amor'
          'kdetoys-kteatime'
          'kdetoys-ktux')
-#         'kdetoys-kweather')
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
@@ -37,8 +29,8 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
 
 makedepends=('pkgconfig' 'cmake' 'automoc4' "kdebase-workspace>=${_kdever}")
 
-source=($_mirror/${_origname}-$_kdever.tar.bz2)
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
+source=($_mirror/${pkgbase}-$_kdever.tar.bz2)
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 
 
 #
@@ -46,7 +38,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
         # build it
 	msg "starting build ..."
@@ -65,36 +57,17 @@ build()
 #
 package_kdetoys-common()
 {
-	pkgdesc="${_origname} - Common files and libraries"
-	depends=("kdebase-workspace>=${_kdever}")
-	conflicts=("kdemod-${_origname}-common")
-	groups=("kde-complete" "kdetoys" "kde-uninstall")
-	install=${_origname}.install
-
-#	# include our patches into the package
-#	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
-#	if [ "$?" = "0" ]; then
-#		warning "incuding patches into package"
-#		mkdir -p ${pkgdir}/usr/share/kdemod/patches/${_origname} &>/dev/null
-#		for i in ${startdir}/*.patch; do
-#			msg "$i"
-#			cp $i ${pkgdir}/usr/share/kdemod/patches/${_origname}/ &>/dev/null
-#		done
-#	else
-#		warning "no patches found, skipping to include them into the package..."
-#	fi
+	pkgdesc="${pkgbase} - Transitional package"
 }
 
 package_kdetoys-doc()
 {
-	pkgdesc="${_origname} - Documentation"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-doc")
-	groups=("kde-complete" "kdetoys" "kde-doc" "kde-uninstall")
+	pkgdesc="${pkgbase} - Documentation"
+	groups=("kde" "kdetoys" "kde-doc" "kde-uninstall")
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -102,14 +75,12 @@ package_kdetoys-doc()
 package_kdetoys-amor()
 {
 	pkgdesc="Amusing Misuse Of Resources puts comic figures above your windows"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-amor")
-	groups=("kde-complete" "kdetoys" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "kdetoys" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="amor"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -117,14 +88,12 @@ package_kdetoys-amor()
 package_kdetoys-eyesapplet()
 {
 	pkgdesc="An applet similar to XEyes"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-eyesapplet")
-	groups=("kde-complete" "kdetoys" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "kdetoys" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="eyesapplet"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -132,14 +101,12 @@ package_kdetoys-eyesapplet()
 package_kdetoys-kteatime()
 {
 	pkgdesc="System tray applet that makes sure your tea doesn't get too strong"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kteatime")
-	groups=("kde-complete" "kdetoys" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "kdetoys" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kteatime"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -147,32 +114,12 @@ package_kdetoys-kteatime()
 package_kdetoys-ktux()
 {
 	pkgdesc="Tux-in-a-Spaceship screen saver"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-ktux")
-	groups=("kde-complete" "kdetoys" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "kdetoys" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="ktux"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
-
-package_kdetoys-kweather()
-{
-	pkgdesc="Kicker applet that will display the current weather outside"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kweather")
-	groups=("kde-complete" "kdetoys" "kde-uninstall")
-	install=${_origname}.install
-
-	splitdirs="kweather"
-		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
-			make DESTDIR=${pkgdir} install || return 1
-		done
-}
-
-
-

From 935b2e3f974e497b5bcb29b273650327a3aef5d7 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 5 Jun 2011 00:28:30 +0200
Subject: [PATCH 41/51] Hack for get the modules

---
 kde-sc.md5      |   2 +
 kdeedu/PKGBUILD | 237 ++++++++++++++++++++----------------------------
 2 files changed, 100 insertions(+), 139 deletions(-)

diff --git a/kde-sc.md5 b/kde-sc.md5
index 1a2dcb76e..0260a7e00 100644
--- a/kde-sc.md5
+++ b/kde-sc.md5
@@ -17,5 +17,7 @@ fd24b467b075318ec467bd9d5d011d3a  kdesdk-4.6.4.tar.bz2
 d8cf730f8443e95f53f5a1aec36de02d  kdeutils-4.6.4.tar.bz2
 f62a243125d2fb62fa30fc3d13a227e1  kdewebdev-4.6.4.tar.bz2
 4db01ee30085a421ba0e5c6e9d8ea79b  oxygen-icons-4.6.4.tar.bz2
+ea79251d6f9742ae18ee524c975e703d  kdeedu-4.6.4.tar.bz2
+
 
 
diff --git a/kdeedu/PKGBUILD b/kdeedu/PKGBUILD
index 6935364b7..d5048b383 100644
--- a/kdeedu/PKGBUILD
+++ b/kdeedu/PKGBUILD
@@ -7,19 +7,11 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-
-
-# original name (used for the source and pkgnames)
-_origname=kdeedu
-
-# FIXME: check if python-bindings build again
-
 #
 # package info
 #
-pkgbase=('kdeedu')
+pkgbase="kdeedu"
 pkgname=('kdeedu-common'
-         'kdeedu-doc'
          'kdeedu-blinken'
 	 'kdeedu-cantor'
          'kdeedu-kalgebra'
@@ -43,20 +35,20 @@ pkgname=('kdeedu-common'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=3
-
+pkgrel=1
 pkgdesc="split package"
 url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
-
-options=('docs' '!splithdr' 'splitdbg' 'log')
+options=('!splithdr' 'splitdbg' 'log')
 
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'eigen' 'cfitsio' "kdelibs>=${_kdever}"
              "kdebase-runtime>=${_kdever}" 'openbabel' 'libqalculate' 'gsl' 'boost' 'indilib' 'r>=2.11.1'
              'libspectre' 'python' 'xplanet' 'docbook-xsl' 'avogadro')
 
-source=($_mirror/${_origname}-$_kdever.tar.bz2)
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
+source=("$_mirror/${pkgbase}-$_kdever.tar.bz2"
+	"$_mirror/${pkgbase}-4.6.3.tar.bz2")
+md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
+         '259ba3e733fecd145c4389f10bee5ad1')
 
 
 #
@@ -64,13 +56,12 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
 #
 build()
 {
-	cd ${srcdir}/${_origname}-${pkgver}
+	cd ${srcdir}/${pkgbase}-${pkgver}
 
         # parallel build breaks kalzium
 	export MAKEFLAGS="-j1"
 
 	msg "starting build ..."
-	# rpath is needed for cantor to find R
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
 		-DCMAKE_INSTALL_PREFIX=${_installprefix} \
                 -DCMAKE_BUILD_TYPE=Release \
@@ -89,57 +80,44 @@ package_kdeedu-common()
 {
 	pkgdesc="KDE Education Programs - Common files and libraries"
 	depends=("kdebase-runtime>=${_kdever}" "kdelibs>=${_kdever}")
-	conflicts=("kdemod-${_origname}")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	groups=("kde" "kdeedu" "kde-uninstall")
+	conflicts=('kdeedu-doc')
+	install=${pkgbase}.install
 
-	splitdirs="libkdeedu data"
+	splitdirs="libkdeedu"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
 	# WORKAROUND -> install cmake modules
-	install -D -m644 $srcdir/${_origname}-${pkgver}/cmake/modules/FindKDEEdu.cmake \
+	install -D -m644 $srcdir/${pkgbase}-4.6.3/cmake/modules/FindKDEEdu.cmake \
 		$pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake
 
-#	# include our patches into the package
+	# include our patches into the package
 #	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
 #	if [ "$?" = "0" ]; then
 #		warning "incuding patches into package"
-#		mkdir -p ${pkgdir}/usr/share/kdemod/patches/${_origname} &>/dev/null
+#		mkdir -p ${pkgdir}/usr/share/kdemod/patches/${pkgbase} &>/dev/null
 #		for i in ${startdir}/*.patch; do
 #			msg "$i"
-#			cp $i ${pkgdir}/usr/share/kdemod/patches/${_origname}/ &>/dev/null
+#			cp $i ${pkgdir}/usr/share/kdemod/patches/${pkgbase}/ &>/dev/null
 #		done
 #	else
 #		warning "no patches found, skipping to include them into the package..."
 #	fi
 }
 
-package_kdeedu-doc()
-{
-	pkgdesc="KDE Education Programs - Documentation"
-	groups=("kde-complete" "kdeedu" "kde-uninstall" "kde-doc")
-
-	splitdirs="doc"
-		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
-			make DESTDIR=${pkgdir} install || return 1
-		done
-}
-
 package_kdeedu-blinken()
 {
 	pkgdesc="BlinKen is the KDE version of the well-known game Simon Says"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-blinken")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="blinken"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -147,14 +125,13 @@ package_kdeedu-blinken()
 package_kdeedu-cantor()
 {
 	pkgdesc="Cantor is a KDE Application aimed to provide a nice Interface for doing Mathematics and Scientific Computing."
-	depends=("${_origname}-common>=${_kdever}" 'r>=2.11.1')
-	conflicts=("kdemod-${_origname}-cantor")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'r>=2.11.1')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="cantor"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -162,14 +139,13 @@ package_kdeedu-cantor()
 package_kdeedu-kalgebra()
 {
 	pkgdesc="KAlgebra is a mathematical calculator based on the content markup MathML language"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kalgebra")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kalgebra"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -177,14 +153,13 @@ package_kdeedu-kalgebra()
 package_kdeedu-kalzium()
 {
 	pkgdesc="Kalzium is an application which will show you some information about the periodic system of the elements"
-	depends=("${_origname}-common>=${_kdever}" 'openbabel' 'avogadro')
-	conflicts=("kdemod-${_origname}-kalzium")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'openbabel' 'avogadro')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kalzium"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -192,14 +167,13 @@ package_kdeedu-kalzium()
 package_kdeedu-kanagram()
 {
 	pkgdesc="Kanagram mixes up the letters of a word (creating an anagram), and you have to guess what the mixed up word is"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kanagram")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kanagram"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -207,14 +181,13 @@ package_kdeedu-kanagram()
 package_kdeedu-kbruch()
 {
 	pkgdesc="KBruch is a small program to practice calculating with fractions"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kbruch")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kbruch"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -222,14 +195,13 @@ package_kdeedu-kbruch()
 package_kdeedu-kgeography()
 {
 	pkgdesc="KGeography is a geography learning program"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}kgeography")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kgeography"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -237,14 +209,13 @@ package_kdeedu-kgeography()
 package_kdeedu-khangman()
 {
 	pkgdesc="KHangman is the classical hangman game"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-khangman")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="khangman"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -252,14 +223,13 @@ package_kdeedu-khangman()
 package_kdeedu-kig()
 {
 	pkgdesc="Kig is a program for exploring geometric constructions"
-	depends=("${_origname}-common>=${_kdever}" 'boost' 'python')
-	conflicts=("kdemod-${_origname}-kig")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'boost' 'python')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kig"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -267,14 +237,13 @@ package_kdeedu-kig()
 package_kdeedu-kiten()
 {
 	pkgdesc="Kiten is a Japanese reference and learning tool"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kiten")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kiten"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -282,14 +251,13 @@ package_kdeedu-kiten()
 package_kdeedu-klettres()
 {
 	pkgdesc="KLettres aims to help to learn the alphabet and then to read some syllables in different languages"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-klettres")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="klettres"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -297,14 +265,13 @@ package_kdeedu-klettres()
 package_kdeedu-kmplot()
 {
 	pkgdesc="KmPlot is a mathematical function plotter for the KDE-Desktop"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kmplot")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kmplot"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -312,14 +279,13 @@ package_kdeedu-kmplot()
 package_kdeedu-kstars()
 {
 	pkgdesc="A complete Desktop Planetarium application"
-	depends=("${_origname}-common>=${_kdever}" 'indilib' 'xplanet')
-	conflicts=("kdemod-${_origname}-kstars")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'indilib' 'xplanet')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kstars"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
@@ -330,14 +296,13 @@ package_kdeedu-kstars()
 package_kdeedu-ktouch()
 {
 	pkgdesc="KTouch is a program for learning touch typing"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-ktouch")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="ktouch"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -345,14 +310,13 @@ package_kdeedu-ktouch()
 package_kdeedu-kturtle()
 {
 	pkgdesc="KTurtle is an educational programming environment"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kturtle")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kturtle"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -360,14 +324,13 @@ package_kdeedu-kturtle()
 package_kdeedu-kwordquiz()
 {
 	pkgdesc="KWordQuiz is a general purpose flash card program"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-kwordquiz")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="kwordquiz"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -375,33 +338,31 @@ package_kdeedu-kwordquiz()
 package_kdeedu-marble()
 {
 	pkgdesc="Marble is a generic geographical map widget that is meant to be used by KDE applications"
-	depends=("${_origname}-common>=${_kdever}" "kdebindings-python>=${_kdever}" 'python')
-	conflicts=("kdemod-${_origname}-marble")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" "kdebindings-python>=${_kdever}" 'python')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="marble"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 
 	# WORKAROUND -> install cmake modules
-	install -D -m644 $srcdir/${_origname}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \
+	install -D -m644 $srcdir/${pkgbase}-4.6.3/cmake/modules/FindMarbleWidget.cmake \
 		$pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake
 }
 
 package_kdeedu-parley()
 {
 	pkgdesc="Parley is a vocabulary trainer"
-	depends=("${_origname}-common>=${_kdever}" "kdebindings-python>=${_kdever}" 'python')
-	conflicts=("kdemod-${_origname}-parley")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" "kdebindings-python>=${_kdever}" 'python')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="parley"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -409,14 +370,13 @@ package_kdeedu-parley()
 package_kdeedu-rocs()
 {
 	pkgdesc="Rocs aims to be a full featured Graph Editor and Programming Enviroment"
-	depends=("${_origname}-common>=${_kdever}")
-	conflicts=("kdemod-${_origname}-rocs")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}")
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="rocs"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -424,14 +384,13 @@ package_kdeedu-rocs()
 package_kdeedu-step()
 {
 	pkgdesc="Step is an interactive physics simulator"
-	depends=("${_origname}-common>=${_kdever}" 'gsl' 'libqalculate')
-	conflicts=("kdemod-${_origname}-step")
-	groups=("kde-complete" "kdeedu" "kde-uninstall")
-	install=${_origname}.install
+	depends=("${pkgbase}-common>=${_kdever}" 'gsl' 'libqalculate')
+	groups=("kde" "kdeedu" "kde-uninstall")
+	install=${pkgbase}.install
 
 	splitdirs="step"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/${i}
+			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 

From 498636a87187fe8c935f833409edf13a65833474 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 23:14:43 +0000
Subject: [PATCH 42/51] fix duplicated files

---
 kde-sc.md5      |  3 +--
 kdeedu/PKGBUILD | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/kde-sc.md5 b/kde-sc.md5
index 0260a7e00..c163dd436 100644
--- a/kde-sc.md5
+++ b/kde-sc.md5
@@ -16,8 +16,7 @@ fd24b467b075318ec467bd9d5d011d3a  kdesdk-4.6.4.tar.bz2
 3992f66affb9d73be8efacef45adf212  kdetoys-4.6.4.tar.bz2
 d8cf730f8443e95f53f5a1aec36de02d  kdeutils-4.6.4.tar.bz2
 f62a243125d2fb62fa30fc3d13a227e1  kdewebdev-4.6.4.tar.bz2
-4db01ee30085a421ba0e5c6e9d8ea79b  oxygen-icons-4.6.4.tar.bz2
 ea79251d6f9742ae18ee524c975e703d  kdeedu-4.6.4.tar.bz2
-
+9be84aced456e05d8cb3ba5ef8603533  oxygen-icons-4.6.4.tar.bz2
 
 
diff --git a/kdeedu/PKGBUILD b/kdeedu/PKGBUILD
index d5048b383..4141b6d61 100644
--- a/kdeedu/PKGBUILD
+++ b/kdeedu/PKGBUILD
@@ -162,6 +162,30 @@ package_kdeedu-kalzium()
 			cd ${srcdir}/${pkgbase}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
+
+	# Rempve duplicated files in kalzium
+	msg "Fixing duplicated files in Kalzium and Common"
+	rm -rv ${pkgdir}/usr/include/libkdeedu/chemicaldataobject.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/element.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/elementparser.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/isotope.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/isotopeparser.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/libkdeedu_science_export.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/moleculeparser.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/parser.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/psetables.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/spectrum.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/spectrumparser.h
+	rm -rv ${pkgdir}/usr/include/libkdeedu/tempunit.h
+	rm -rv ${pkgdir}/usr/lib/libscience.so
+	rm -rv ${pkgdir}/usr/lib/libscience.so.4
+	rm -rv ${pkgdir}/usr/lib/libscience.so.4.6.0
+	rm -rv ${pkgdir}/usr/share/apps/libkdeedu/data/elements.xml
+	rm -rv ${pkgdir}/usr/share/apps/libkdeedu/data/isotopes.xml
+	rm -rv ${pkgdir}/usr/share/apps/libkdeedu/data/spectra.xml 
+	rm -rv ${pkgdir}/usr/share/apps/libkdeedu/data/symbols.csv 
+	rm -rv ${pkgdir}/usr/share/apps/libkdeedu/data/symbols2.csv
+
 }
 
 package_kdeedu-kanagram()

From 30be1058a2afa629cf332fdd98d7fb0d4935c91b Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sat, 4 Jun 2011 23:17:10 +0000
Subject: [PATCH 43/51] Add l10n md5sums

---
 kde-sc.md5 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/kde-sc.md5 b/kde-sc.md5
index c163dd436..0df2237e2 100644
--- a/kde-sc.md5
+++ b/kde-sc.md5
@@ -18,5 +18,58 @@ d8cf730f8443e95f53f5a1aec36de02d  kdeutils-4.6.4.tar.bz2
 f62a243125d2fb62fa30fc3d13a227e1  kdewebdev-4.6.4.tar.bz2
 ea79251d6f9742ae18ee524c975e703d  kdeedu-4.6.4.tar.bz2
 9be84aced456e05d8cb3ba5ef8603533  oxygen-icons-4.6.4.tar.bz2
+ff41793879f5fa07cf965887bcd76789  kde-l10n-ar-4.6.4.tar.bz2
+af02dbcdaf0cdb04cf3c733fe6f0221d  kde-l10n-bg-4.6.4.tar.bz2
+f68125b58c1952437a6a612f6728dea2  kde-l10n-ca-4.6.4.tar.bz2
+b3dd176b275785e487291a4093f1f236  kde-l10n-ca@valencia-4.6.4.tar.bz2
+da92779d7b3116336222a56348fe86e1  kde-l10n-cs-4.6.4.tar.bz2
+ca718e241d45becd64a1c6c36c06807b  kde-l10n-da-4.6.4.tar.bz2
+a6a7c4ff6f1a99c1414aaa7f5de69d94  kde-l10n-de-4.6.4.tar.bz2
+0cbf5b1879d82a61804c6bd4d99b8b89  kde-l10n-el-4.6.4.tar.bz2
+8395f950e2535601f5e66578b217a32b  kde-l10n-en_GB-4.6.4.tar.bz2
+593c506509eeb0d3068eb41f7e227761  kde-l10n-es-4.6.4.tar.bz2
+fd61b3f6ca38ba67cb7b7e1cf6359b69  kde-l10n-et-4.6.4.tar.bz2
+733125e2c55401c54f9a43cce2435375  kde-l10n-eu-4.6.4.tar.bz2
+a254f1a4aac2c04a24d189bad6084567  kde-l10n-fi-4.6.4.tar.bz2
+b611478ec3f9d40c2b0899a895d31fe3  kde-l10n-fr-4.6.4.tar.bz2
+1bfdd0d00ded20b07b786808049bd03c  kde-l10n-ga-4.6.4.tar.bz2
+f99262e68ad9630feda53521b5003b92  kde-l10n-gl-4.6.4.tar.bz2
+6bbcaf30d8a08dbec24bb6cf0fa6cde2  kde-l10n-gu-4.6.4.tar.bz2
+f5099b4dc1c72f6e399a426f1e2da53b  kde-l10n-he-4.6.4.tar.bz2
+4702d0490d1957da28ed17b543544b5a  kde-l10n-hi-4.6.4.tar.bz2
+cf9f6b1249c8356c335b988c206c493c  kde-l10n-hr-4.6.4.tar.bz2
+fe8b60651cac3a1a4d8e2f078eb4f181  kde-l10n-hu-4.6.4.tar.bz2
+f1d51e1bc46670b90364cd13ac520d99  kde-l10n-ia-4.6.4.tar.bz2
+235e6ef9b83a33f6fca023dd74008b79  kde-l10n-id-4.6.4.tar.bz2
+19e878444756716818302e1ae2e2bdbc  kde-l10n-is-4.6.4.tar.bz2
+258b6caccfc575bac68693afe22b986f  kde-l10n-it-4.6.4.tar.bz2
+1a6170b319d84c8ca3d14ff65112e77a  kde-l10n-ja-4.6.4.tar.bz2
+2d045c93855aea687b2a0ddbcdc806cf  kde-l10n-kk-4.6.4.tar.bz2
+dda97eedc2363ee9caaf2d628f9d2f1a  kde-l10n-km-4.6.4.tar.bz2
+8722b553f502039544fd9d556c728934  kde-l10n-kn-4.6.4.tar.bz2
+a8a8a6c6068062fdfbf59721dbaf9f0e  kde-l10n-ko-4.6.4.tar.bz2
+c1ce47caddfd7e8fd21aff7ab4b9de9a  kde-l10n-lt-4.6.4.tar.bz2
+bc67d3371511bb0213f5ebc84fed4bbc  kde-l10n-lv-4.6.4.tar.bz2
+918ca91561709b2eb2da86ba08bf0343  kde-l10n-mai-4.6.4.tar.bz2
+1f0e875c631cbe9b537d6b2dacb90d64  kde-l10n-nb-4.6.4.tar.bz2
+5ace4fcf551ef283bce5648036746716  kde-l10n-nds-4.6.4.tar.bz2
+9e30660f0479a8fe74faa18ac83def5c  kde-l10n-nl-4.6.4.tar.bz2
+9e706395671bb62186089103a0a16afd  kde-l10n-nn-4.6.4.tar.bz2
+abe4a10fc5ea51df4f05fa42fe0e985a  kde-l10n-pa-4.6.4.tar.bz2
+a551c008984f3adb54586a7468bbed2a  kde-l10n-pl-4.6.4.tar.bz2
+791c9f71f96dd22ed1b446ed54327702  kde-l10n-pt-4.6.4.tar.bz2
+b8321957626d1ef9a0ed80f03a88c390  kde-l10n-pt_BR-4.6.4.tar.bz2
+a9832addaea06b18aeb0cb6af0bc9f2d  kde-l10n-ro-4.6.4.tar.bz2
+eda4b22bba1560ff67d27aa436bbdd8f  kde-l10n-ru-4.6.4.tar.bz2
+19411bbab30be669eba2347b575113e7  kde-l10n-sk-4.6.4.tar.bz2
+3799293f853d27b3f7075f262a5576b0  kde-l10n-sl-4.6.4.tar.bz2
+b0ea24e21e5968e05f5856170f731d3a  kde-l10n-sr-4.6.4.tar.bz2
+f716554607ac17bd5ce4e6800f649f47  kde-l10n-sv-4.6.4.tar.bz2
+48f945c583380ac767f13ae93445bb0f  kde-l10n-th-4.6.4.tar.bz2
+f11a177f0083bfa6ca3b9b7dd35b2cc9  kde-l10n-tr-4.6.4.tar.bz2
+12fa4226efeb245ed657d618860bed45  kde-l10n-uk-4.6.4.tar.bz2
+6ee71adb7b3e6d7e4b8a70b4b87a1433  kde-l10n-wa-4.6.4.tar.bz2
+14eb6cb1dc37e96077edbfab8d1b0068  kde-l10n-zh_CN-4.6.4.tar.bz2
+dc6e97f2bb1d4ce67033620b9bd26be7  kde-l10n-zh_TW-4.6.4.tar.bz2
 
 

From 400c58d46ccb6f5bb01b5044fcfc3bcdda12c112 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 5 Jun 2011 01:09:20 +0000
Subject: [PATCH 44/51] Add french, fix stuff

---
 kde-common/Chakra-Bugs.desktop          |  4 ++
 kde-common/Chakra-ChangeLog.desktop     |  4 ++
 kde-common/Chakra-Code.desktop          |  4 ++
 kde-common/Chakra-Documentation.desktop |  7 +++-
 kde-common/Chakra-Donate.desktop        |  9 +++--
 kde-common/Chakra-Homepage.desktop      |  8 +++-
 kde-common/Chakra-backup.desktop        |  3 +-
 kde-common/PKGBUILD                     | 53 +++++++++++++------------
 8 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/kde-common/Chakra-Bugs.desktop b/kde-common/Chakra-Bugs.desktop
index be6b2f380..a92825515 100644
--- a/kde-common/Chakra-Bugs.desktop
+++ b/kde-common/Chakra-Bugs.desktop
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Comment=Chakra Bug Tracking System
 Comment[ca]=Sistema de seguiment d'errors de Chakra
+Comment[fr]=Système de suivi d'erreurs de Chakra
+Comment[es]=Sistema de seguimiento de errores de Chakra
 Comment[it]=Sistema di tracciatura errori di Chakra
 Exec=xdg-open http://www.chakra-project.org/bugs/
 Icon=kbugbuster
 Name=Bugs
 Name[ca]=Errors
+Name[fr]=Erreurs
+Name[es]=Errores
 Name[it]=Errori
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-ChangeLog.desktop b/kde-common/Chakra-ChangeLog.desktop
index ae186e5c3..c2e40b283 100644
--- a/kde-common/Chakra-ChangeLog.desktop
+++ b/kde-common/Chakra-ChangeLog.desktop
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Comment=Chakra Package ChangeLogs
 Comment[ca]=Registre de canvis a paquets de Chakra
+Comment[es]=Registro de cambios a paquetes de Chakra
+Comment[fr]=Registre de changements des paquets de Chakra
 Comment[it]=Registro cambiamenti nei pacchetti di Chakra
 Exec=xdg-open http://gitorious.org/chakra-packages
 Icon=utilities-log-viewer
 Name=Package ChangeLogs
 Name[ca]=Registre de canvis a paquets
+Name[es]=Registro de cambios a paquetes
+Name[fr]=Registre de changements des paquets
 Name[it]=Registro cambiamenti nei pacchetti
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-Code.desktop b/kde-common/Chakra-Code.desktop
index 08d132bf5..8838d3e97 100644
--- a/kde-common/Chakra-Code.desktop
+++ b/kde-common/Chakra-Code.desktop
@@ -1,11 +1,15 @@
 [Desktop Entry]
 Comment=Chakra Code Repository
 Comment[ca]=Repostiori de codi de Chakra
+Comment[es]=Repostiorio de codigo de Chakra
+Comment[fr]=Dépôt du code de Chakra
 Comment[it]=Repository del Codice di Chakra
 Exec=xdg-open http://www.chakra-project.org/code.html
 Icon=preferences-system
 Name=Code
 Name[ca]=Codi
+Name[es]=Codigo
+Name[fr]=Code
 Name[it]=Codice
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-Documentation.desktop b/kde-common/Chakra-Documentation.desktop
index 617f2068a..2a3461970 100644
--- a/kde-common/Chakra-Documentation.desktop
+++ b/kde-common/Chakra-Documentation.desktop
@@ -1,12 +1,15 @@
 [Desktop Entry]
 Comment=Chakra Documentation
 Comment[ca]=Documentació de Chakra
+Comment[es]=Documentación de Chakra
+Comment[fr]=Documentation de Chakra
 Comment[it]=Documentazione di Chakra
 Exec=xdg-open http://www.chakra-project.org/wiki/
 Icon=system-help
 Name=Documentation
-Name[ca]=Documentació
-Name�[es]=Documentación
+Name[ca]=Documentaci��
+Name[es]=Documentaci��n
+Name[fr]=Documentation
 Name[it]=Documentazione
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-Donate.desktop b/kde-common/Chakra-Donate.desktop
index 58559f17d..61933042f 100644
--- a/kde-common/Chakra-Donate.desktop
+++ b/kde-common/Chakra-Donate.desktop
@@ -1,15 +1,18 @@
 [Desktop Entry]
 Categories=Chakra;
+Comment=Chalra Donations
 Comment[ca]=Donacions a Chakra
-Comment=Donacions a Chakra
+Comment[es]=Donaciones a Chakra
+Comment[fr]=Donations pour Chakra
 Comment[it]=Donazioni per Chakra
 Exec=xdg-open http://www.chakra-project.org/donate.html
-GenericName[ca]=
 GenericName=
 Icon=face-wink
 MimeType=
+Name=Donations
 Name[ca]=Donacions
-Name=Donacions
+Name[es]=Donaciones
+Name[fr]=Donations
 Name[it]=Donazioni
 Path=
 StartupNotify=true
diff --git a/kde-common/Chakra-Homepage.desktop b/kde-common/Chakra-Homepage.desktop
index 9847545ec..58a85b5ca 100644
--- a/kde-common/Chakra-Homepage.desktop
+++ b/kde-common/Chakra-Homepage.desktop
@@ -1,15 +1,19 @@
 [Desktop Entry]
 Categories=Chakra;
+Comment=Chakra Homepage
 Comment[ca]=Lloc web de Chakra
-Comment=Lloc web de Chakra
+Comment[es]=Página web de Chakra
+Comment[fr]=Page web de Chakra
 Comment[it]=Homepage di Chakra
 Exec=xdg-open http://www.chakra-project.org
 GenericName[ca]=
 GenericName=
 Icon=chakra-shiny
 MimeType=
+Name=Homepage
 Name[ca]=Lloc web
-Name=Lloc web
+Name[es]=Página web
+Name[fr]=Page web
 Path=
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-backup.desktop b/kde-common/Chakra-backup.desktop
index 81a685ef1..3c50018b9 100644
--- a/kde-common/Chakra-backup.desktop
+++ b/kde-common/Chakra-backup.desktop
@@ -3,7 +3,8 @@ Encoding=UTF-8
 Exec=/usr/bin/chakra-backup
 Name=miniBackup
 GenericName=Backup your most important KDE files
-GenericName[ca]=Còpia de seguretad dels fitxers més importants
+GenericName[es]=Copia de seguridad de los archivos más importantes
+GenericName[ca]=Còpia de seguretat dels fitxers més importants
 GenericName[it]=Copia di sicurezza dei file più importanti di KDE
 X-KDE-StartupNotify=false
 Icon=application-x-tarz
diff --git a/kde-common/PKGBUILD b/kde-common/PKGBUILD
index 8f7da0058..13938795e 100644
--- a/kde-common/PKGBUILD
+++ b/kde-common/PKGBUILD
@@ -56,32 +56,33 @@ source=(http://www.kde-apps.org/CONTENT/content-files/48411-rootactions_servicem
 	agent-startup.sh
 	agent-shutdown.sh)
 
-md5sums=('2afd86671ad0db31718157aecd46d528'  # 48411-rootactions_servicemenu_2.4.10.tar.gz
-         'a4108e264667380876ffa7e9842892f4'  # servicemenu-copy-path.desktop
-         '630ffe7118eef8608a9e5e393a0b1e12'  # 102825-compressattach.desktop.bz2
-         'e77e132d6da1a8d897db2ba630915b0f'  # servicemenu-rootactions.patch
-         '3f775e8c5626c216ac9a3e2f5c336a6b'  # Chakra-Bugs.desktop
-         '35f4bd7a1ae4f1741e056a6f5715d822'  # Chakra-ChangeLog.desktop
-         '5cefa6e9baf388ae9d86f3b17eb12035'  # Chakra-Code.desktop
-         '3a08ce7d26d6f3a1b06f5e0f3e05f0e3'  # Chakra-Documentation.desktop
-         '490d34c6cc0b0e6e2c0a7ab98ab77f89'  # Chakra-Donate.desktop
-         '1be911f58eeef76fe920b8ebe0941464'  # Chakra-Forum.desktop
-         'c664cda009a7c8ec0e9fb36d1ed74e68'  # Chakra-Homepage.desktop
-         'ad4cefe6e10e0985a89a0aea6aec530c'  # Chakra.directory
-         '0688a20010ad27e35755e77c26c94d2c'  # kdm.daemon
-         '535501ac9f3ad05ddd18f8cfee4a2e06'  # chakra-config-updater.sh
-         '1cad70fdf0306e5590899865bbfb430b'  # chakra-fix-configs.sh
-         '78a20a4ccaf943f5a2089f4d436fdf32'  # chakra-update-icons.sh
-         'd3fcef1c7affa098683a09f26415d8ef'  # chakra-update-mime.sh
-         'aaa1958b14518e9b0193afe497da830e'  # chakra-update-sycoca.sh
-         '4e974016ca509f187b4549d95877bacc'  # chakra-update-user-sycoca.sh  
-         '2b0aaf209d35e1e8c660db66e61d13c7'  # chakra-sysinfo.sh
-         '660a7650478e5b7115fbb71811b5d9ee'  # chakra-backup.sh
-         'f2ab6538277002028f1263fa7841e2e6'  # Chakra-backup.desktop
-         '466d7fc7cab5738d674df45fdeee4eb0'  # updates.conf
-         '1c85260174e58fc6efaa8d2cac947761'  # chakra-icons.tar.gz
-         '7daec96c125e1e238a35f31ea4a476f0'  # agent-startup.sh
-         '18e8d01124b19f7df2937c06e177bf7f') # agent-shutdown.sh
+md5sums=('2afd86671ad0db31718157aecd46d528'
+         'a4108e264667380876ffa7e9842892f4'
+         '630ffe7118eef8608a9e5e393a0b1e12'
+         'e77e132d6da1a8d897db2ba630915b0f'
+         '71128ee72a68bdfd358d2f1903151bac'
+         '2c2e66057af70435fd355e8c8d6f80e7'
+         '66bab15bf8416c1feade9f854e0a1896'
+         '9d69a273a94ad0cb2624d21c599b7291'
+         'eddb7ebe5b261ee6591c678dc27f1e65'
+         '1be911f58eeef76fe920b8ebe0941464'
+         'fefbd623e75fe558ceaa0ca372f41d04'
+         'ad4cefe6e10e0985a89a0aea6aec530c'
+         '0688a20010ad27e35755e77c26c94d2c'
+         '535501ac9f3ad05ddd18f8cfee4a2e06'
+         '1cad70fdf0306e5590899865bbfb430b'
+         '78a20a4ccaf943f5a2089f4d436fdf32'
+         'd3fcef1c7affa098683a09f26415d8ef'
+         'aaa1958b14518e9b0193afe497da830e'
+         '4e974016ca509f187b4549d95877bacc'
+         '2b0aaf209d35e1e8c660db66e61d13c7'
+         '660a7650478e5b7115fbb71811b5d9ee'
+         '98ce1a5e9676c056e030264557b053e5'
+         '466d7fc7cab5738d674df45fdeee4eb0'
+         '1c85260174e58fc6efaa8d2cac947761'
+         '7daec96c125e1e238a35f31ea4a476f0'
+         '18e8d01124b19f7df2937c06e177bf7f')
+
 
 #
 # build and install

From c5ce6ad07c50098440d5aace4a560e1a231462b5 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 5 Jun 2011 01:11:03 +0000
Subject: [PATCH 45/51] Should be done with nano

---
 kde-common/Chakra-Documentation.desktop | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-common/Chakra-Documentation.desktop b/kde-common/Chakra-Documentation.desktop
index 2a3461970..b681ddb90 100644
--- a/kde-common/Chakra-Documentation.desktop
+++ b/kde-common/Chakra-Documentation.desktop
@@ -7,8 +7,8 @@ Comment[it]=Documentazione di Chakra
 Exec=xdg-open http://www.chakra-project.org/wiki/
 Icon=system-help
 Name=Documentation
-Name[ca]=Documentaci��
-Name[es]=Documentaci��n
+Name[ca]=Documentació
+Name[es]=Documentaci�ón
 Name[fr]=Documentation
 Name[it]=Documentazione
 StartupNotify=true

From 045163f2f268cc2cc1cafa291a84c28649789d60 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 5 Jun 2011 01:13:11 +0000
Subject: [PATCH 46/51] Should be done with nano

---
 kde-common/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-common/PKGBUILD b/kde-common/PKGBUILD
index 13938795e..c13596fb7 100644
--- a/kde-common/PKGBUILD
+++ b/kde-common/PKGBUILD
@@ -63,7 +63,7 @@ md5sums=('2afd86671ad0db31718157aecd46d528'
          '71128ee72a68bdfd358d2f1903151bac'
          '2c2e66057af70435fd355e8c8d6f80e7'
          '66bab15bf8416c1feade9f854e0a1896'
-         '9d69a273a94ad0cb2624d21c599b7291'
+         '59181b5bbed8707101951ea9b304ac0d'
          'eddb7ebe5b261ee6591c678dc27f1e65'
          '1be911f58eeef76fe920b8ebe0941464'
          'fefbd623e75fe558ceaa0ca372f41d04'

From 86173671e2193df0efc53b5945f893487c065ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Chaves=20Fern=C3=A1ndez=20=28Gallaecio=29?=
 <adriyetichaves@gmail.com>
Date: Sun, 5 Jun 2011 03:32:52 +0200
Subject: [PATCH 47/51] Added Galician translation.

---
 kde-common/Chakra-Bugs.desktop           | 6 ++++--
 kde-common/Chakra-ChangeLog.desktop      | 2 ++
 kde-common/Chakra-Code.desktop           | 2 ++
 kde-common/Chakra-Documentation.desktop  | 2 ++
 kde-common/Chakra-Donate.desktop         | 2 ++
 kde-common/Chakra-Forum.desktop          | 2 ++
 kde-common/Chakra-Homepage.desktop       | 2 ++
 kde-common/Chakra-backup.desktop         | 3 ++-
 kde-common/servicemenu-copy-path.desktop | 3 +++
 9 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/kde-common/Chakra-Bugs.desktop b/kde-common/Chakra-Bugs.desktop
index a92825515..601ec333a 100644
--- a/kde-common/Chakra-Bugs.desktop
+++ b/kde-common/Chakra-Bugs.desktop
@@ -1,15 +1,17 @@
 [Desktop Entry]
 Comment=Chakra Bug Tracking System
 Comment[ca]=Sistema de seguiment d'errors de Chakra
-Comment[fr]=Système de suivi d'erreurs de Chakra
 Comment[es]=Sistema de seguimiento de errores de Chakra
+Comment[fr]=Système de suivi d'erreurs de Chakra
+Comment[gl]=Sistema de control de erros de Chakra
 Comment[it]=Sistema di tracciatura errori di Chakra
 Exec=xdg-open http://www.chakra-project.org/bugs/
 Icon=kbugbuster
 Name=Bugs
 Name[ca]=Errors
-Name[fr]=Erreurs
 Name[es]=Errores
+Name[fr]=Erreurs
+Name[gl]=Erros
 Name[it]=Errori
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-ChangeLog.desktop b/kde-common/Chakra-ChangeLog.desktop
index c2e40b283..e41c9aed4 100644
--- a/kde-common/Chakra-ChangeLog.desktop
+++ b/kde-common/Chakra-ChangeLog.desktop
@@ -3,6 +3,7 @@ Comment=Chakra Package ChangeLogs
 Comment[ca]=Registre de canvis a paquets de Chakra
 Comment[es]=Registro de cambios a paquetes de Chakra
 Comment[fr]=Registre de changements des paquets de Chakra
+Comment[gl]=Historial de cambios dos paquetes de Chakra
 Comment[it]=Registro cambiamenti nei pacchetti di Chakra
 Exec=xdg-open http://gitorious.org/chakra-packages
 Icon=utilities-log-viewer
@@ -10,6 +11,7 @@ Name=Package ChangeLogs
 Name[ca]=Registre de canvis a paquets
 Name[es]=Registro de cambios a paquetes
 Name[fr]=Registre de changements des paquets
+Name[gl]=Historial de cambios dos paquetes
 Name[it]=Registro cambiamenti nei pacchetti
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-Code.desktop b/kde-common/Chakra-Code.desktop
index 8838d3e97..324dc15cb 100644
--- a/kde-common/Chakra-Code.desktop
+++ b/kde-common/Chakra-Code.desktop
@@ -3,6 +3,7 @@ Comment=Chakra Code Repository
 Comment[ca]=Repostiori de codi de Chakra
 Comment[es]=Repostiorio de codigo de Chakra
 Comment[fr]=Dépôt du code de Chakra
+Comment[gl]=Repositorio de código de Chakra
 Comment[it]=Repository del Codice di Chakra
 Exec=xdg-open http://www.chakra-project.org/code.html
 Icon=preferences-system
@@ -10,6 +11,7 @@ Name=Code
 Name[ca]=Codi
 Name[es]=Codigo
 Name[fr]=Code
+Name[gl]=Código
 Name[it]=Codice
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-Documentation.desktop b/kde-common/Chakra-Documentation.desktop
index b681ddb90..b1359b3d2 100644
--- a/kde-common/Chakra-Documentation.desktop
+++ b/kde-common/Chakra-Documentation.desktop
@@ -3,6 +3,7 @@ Comment=Chakra Documentation
 Comment[ca]=Documentació de Chakra
 Comment[es]=Documentación de Chakra
 Comment[fr]=Documentation de Chakra
+Comment[fr]=Documentaci��n de Chakra
 Comment[it]=Documentazione di Chakra
 Exec=xdg-open http://www.chakra-project.org/wiki/
 Icon=system-help
@@ -10,6 +11,7 @@ Name=Documentation
 Name[ca]=Documentació
 Name[es]=Documentaci�ón
 Name[fr]=Documentation
+Name[gl]=Documentaci��n
 Name[it]=Documentazione
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-Donate.desktop b/kde-common/Chakra-Donate.desktop
index 61933042f..87fd4728f 100644
--- a/kde-common/Chakra-Donate.desktop
+++ b/kde-common/Chakra-Donate.desktop
@@ -4,6 +4,7 @@ Comment=Chalra Donations
 Comment[ca]=Donacions a Chakra
 Comment[es]=Donaciones a Chakra
 Comment[fr]=Donations pour Chakra
+Comment[fr]=Doazóns para Chakra
 Comment[it]=Donazioni per Chakra
 Exec=xdg-open http://www.chakra-project.org/donate.html
 GenericName=
@@ -13,6 +14,7 @@ Name=Donations
 Name[ca]=Donacions
 Name[es]=Donaciones
 Name[fr]=Donations
+Name[fr]=Doazóns
 Name[it]=Donazioni
 Path=
 StartupNotify=true
diff --git a/kde-common/Chakra-Forum.desktop b/kde-common/Chakra-Forum.desktop
index 73193575e..dc7ca645c 100644
--- a/kde-common/Chakra-Forum.desktop
+++ b/kde-common/Chakra-Forum.desktop
@@ -1,10 +1,12 @@
 [Desktop Entry]
 Comment=Chakra Forums
 Comment[ca]=Forums de Chakra
+Comment[gl]=Foros de Chakra
 Comment[it]=Forum di Chakra
 Exec=xdg-open http://www.chakra-project.org/bbs/
 Icon=system-users
 Name=Forums
+Name[gl]=Foros
 Name[it]=Forum
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-Homepage.desktop b/kde-common/Chakra-Homepage.desktop
index 58a85b5ca..f38f97934 100644
--- a/kde-common/Chakra-Homepage.desktop
+++ b/kde-common/Chakra-Homepage.desktop
@@ -4,6 +4,7 @@ Comment=Chakra Homepage
 Comment[ca]=Lloc web de Chakra
 Comment[es]=Página web de Chakra
 Comment[fr]=Page web de Chakra
+Comment[gl]=Sitio web de Chakra
 Comment[it]=Homepage di Chakra
 Exec=xdg-open http://www.chakra-project.org
 GenericName[ca]=
@@ -14,6 +15,7 @@ Name=Homepage
 Name[ca]=Lloc web
 Name[es]=Página web
 Name[fr]=Page web
+Name[gl]=Sitio web
 Path=
 StartupNotify=true
 Terminal=false
diff --git a/kde-common/Chakra-backup.desktop b/kde-common/Chakra-backup.desktop
index 3c50018b9..a54f3534d 100644
--- a/kde-common/Chakra-backup.desktop
+++ b/kde-common/Chakra-backup.desktop
@@ -3,8 +3,9 @@ Encoding=UTF-8
 Exec=/usr/bin/chakra-backup
 Name=miniBackup
 GenericName=Backup your most important KDE files
-GenericName[es]=Copia de seguridad de los archivos más importantes
 GenericName[ca]=Còpia de seguretat dels fitxers més importants
+GenericName[es]=Copia de seguridad de los archivos más importantes
+GenericName[gl]=Copia de seguridade dos ficheiros máis importantes
 GenericName[it]=Copia di sicurezza dei file più importanti di KDE
 X-KDE-StartupNotify=false
 Icon=application-x-tarz
diff --git a/kde-common/servicemenu-copy-path.desktop b/kde-common/servicemenu-copy-path.desktop
index c5a784e93..f29c78b7f 100644
--- a/kde-common/servicemenu-copy-path.desktop
+++ b/kde-common/servicemenu-copy-path.desktop
@@ -12,6 +12,7 @@ X-KDE-Submenu[de]=Pfad kopieren
 X-KDE-Submenu[el]=Αντιγραφή Διαδρομής
 X-KDE-Submenu[es]=Copiar ruta
 X-KDE-Submenu[fr]=Copie de chemin
+X-KDE-Submenu[gl]=Copiar a ruta
 X-KDE-Submenu[it]=Copia Percorso
 X-KDE-Submenu[sv]=Kopiera sökv�
 
@@ -22,6 +23,7 @@ Name[de]=kopiere Pfad
 Name[el]=Αντιγραφή ολόκληρης διαδρομής
 Name[es]=Copiar ruta completa
 Name[fr]=copier le chemin complet
+Name[gl]=Copiar toda a ruta
 Name[it]=copia l'intero percorso
 Name[sv]=Kopiera hela sökvägen
 Icon=klipper
@@ -34,6 +36,7 @@ Name[de]=kmail Anhang
 Name[el]=Eπισύναψη στο kmail
 Name[es]=Adjuntar en kmail
 Name[fr]=envoyer avec kmail
+Name[gl]=Enviar por correo electrónico
 Name[it]=allega a kmail
 Name[sv]=Bifoga till KMail
 Icon=internet-mail

From e6cdf7964889b24651ac8cbc8a0a25b6147658ff Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Sun, 5 Jun 2011 08:40:56 +0000
Subject: [PATCH 48/51] kde-common: add german and update md5

---
 kde-common/Chakra-Bugs.desktop          |  2 ++
 kde-common/Chakra-ChangeLog.desktop     |  2 ++
 kde-common/Chakra-Code.desktop          |  2 ++
 kde-common/Chakra-Documentation.desktop |  2 ++
 kde-common/Chakra-Donate.desktop        |  2 ++
 kde-common/Chakra-Forum.desktop         |  2 ++
 kde-common/Chakra-Homepage.desktop      |  2 ++
 kde-common/Chakra-backup.desktop        |  1 +
 kde-common/PKGBUILD                     | 18 +++++++++---------
 tools-pkg-tribe/PKGBUILD                | 12 ++++++------
 10 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/kde-common/Chakra-Bugs.desktop b/kde-common/Chakra-Bugs.desktop
index 601ec333a..e0f7466f9 100644
--- a/kde-common/Chakra-Bugs.desktop
+++ b/kde-common/Chakra-Bugs.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Chakra Bug Tracking System
 Comment[ca]=Sistema de seguiment d'errors de Chakra
+Comment[de]=System der Fehlermeldung für Chakra
 Comment[es]=Sistema de seguimiento de errores de Chakra
 Comment[fr]=Système de suivi d'erreurs de Chakra
 Comment[gl]=Sistema de control de erros de Chakra
@@ -9,6 +10,7 @@ Exec=xdg-open http://www.chakra-project.org/bugs/
 Icon=kbugbuster
 Name=Bugs
 Name[ca]=Errors
+Name[de]=Fehler
 Name[es]=Errores
 Name[fr]=Erreurs
 Name[gl]=Erros
diff --git a/kde-common/Chakra-ChangeLog.desktop b/kde-common/Chakra-ChangeLog.desktop
index e41c9aed4..903ee6215 100644
--- a/kde-common/Chakra-ChangeLog.desktop
+++ b/kde-common/Chakra-ChangeLog.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Chakra Package ChangeLogs
 Comment[ca]=Registre de canvis a paquets de Chakra
+Comment[de]=Änderungsliste der Pakete von Chakra
 Comment[es]=Registro de cambios a paquetes de Chakra
 Comment[fr]=Registre de changements des paquets de Chakra
 Comment[gl]=Historial de cambios dos paquetes de Chakra
@@ -9,6 +10,7 @@ Exec=xdg-open http://gitorious.org/chakra-packages
 Icon=utilities-log-viewer
 Name=Package ChangeLogs
 Name[ca]=Registre de canvis a paquets
+Name[de]=Änderungsliste der Pakete
 Name[es]=Registro de cambios a paquetes
 Name[fr]=Registre de changements des paquets
 Name[gl]=Historial de cambios dos paquetes
diff --git a/kde-common/Chakra-Code.desktop b/kde-common/Chakra-Code.desktop
index 324dc15cb..a1d79a500 100644
--- a/kde-common/Chakra-Code.desktop
+++ b/kde-common/Chakra-Code.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Chakra Code Repository
 Comment[ca]=Repostiori de codi de Chakra
+Comment[de]=Quellcode-Repositorium von Chakra
 Comment[es]=Repostiorio de codigo de Chakra
 Comment[fr]=Dépôt du code de Chakra
 Comment[gl]=Repositorio de código de Chakra
@@ -9,6 +10,7 @@ Exec=xdg-open http://www.chakra-project.org/code.html
 Icon=preferences-system
 Name=Code
 Name[ca]=Codi
+Name[de]=Quellcode
 Name[es]=Codigo
 Name[fr]=Code
 Name[gl]=Código
diff --git a/kde-common/Chakra-Documentation.desktop b/kde-common/Chakra-Documentation.desktop
index b1359b3d2..2acf39321 100644
--- a/kde-common/Chakra-Documentation.desktop
+++ b/kde-common/Chakra-Documentation.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Chakra Documentation
 Comment[ca]=Documentació de Chakra
+Comment[de]=Dokumentation von Chakra
 Comment[es]=Documentación de Chakra
 Comment[fr]=Documentation de Chakra
 Comment[fr]=Documentaci��n de Chakra
@@ -9,6 +10,7 @@ Exec=xdg-open http://www.chakra-project.org/wiki/
 Icon=system-help
 Name=Documentation
 Name[ca]=Documentació
+Name[de]=Dokumentation
 Name[es]=Documentaci�ón
 Name[fr]=Documentation
 Name[gl]=Documentaci��n
diff --git a/kde-common/Chakra-Donate.desktop b/kde-common/Chakra-Donate.desktop
index 87fd4728f..d3508b68b 100644
--- a/kde-common/Chakra-Donate.desktop
+++ b/kde-common/Chakra-Donate.desktop
@@ -2,6 +2,7 @@
 Categories=Chakra;
 Comment=Chalra Donations
 Comment[ca]=Donacions a Chakra
+Comment[de]=Spenden für Chakra
 Comment[es]=Donaciones a Chakra
 Comment[fr]=Donations pour Chakra
 Comment[fr]=Doazóns para Chakra
@@ -12,6 +13,7 @@ Icon=face-wink
 MimeType=
 Name=Donations
 Name[ca]=Donacions
+Name[de]=Spenden
 Name[es]=Donaciones
 Name[fr]=Donations
 Name[fr]=Doazóns
diff --git a/kde-common/Chakra-Forum.desktop b/kde-common/Chakra-Forum.desktop
index dc7ca645c..ab32845f8 100644
--- a/kde-common/Chakra-Forum.desktop
+++ b/kde-common/Chakra-Forum.desktop
@@ -1,11 +1,13 @@
 [Desktop Entry]
 Comment=Chakra Forums
 Comment[ca]=Forums de Chakra
+Comment[de]=Chakra-Foren
 Comment[gl]=Foros de Chakra
 Comment[it]=Forum di Chakra
 Exec=xdg-open http://www.chakra-project.org/bbs/
 Icon=system-users
 Name=Forums
+Name[de]=Foren
 Name[gl]=Foros
 Name[it]=Forum
 StartupNotify=true
diff --git a/kde-common/Chakra-Homepage.desktop b/kde-common/Chakra-Homepage.desktop
index f38f97934..a174eda41 100644
--- a/kde-common/Chakra-Homepage.desktop
+++ b/kde-common/Chakra-Homepage.desktop
@@ -2,6 +2,7 @@
 Categories=Chakra;
 Comment=Chakra Homepage
 Comment[ca]=Lloc web de Chakra
+Comment[de]=Webseite von Chakra
 Comment[es]=Página web de Chakra
 Comment[fr]=Page web de Chakra
 Comment[gl]=Sitio web de Chakra
@@ -13,6 +14,7 @@ Icon=chakra-shiny
 MimeType=
 Name=Homepage
 Name[ca]=Lloc web
+Name[de]=Webseite
 Name[es]=Página web
 Name[fr]=Page web
 Name[gl]=Sitio web
diff --git a/kde-common/Chakra-backup.desktop b/kde-common/Chakra-backup.desktop
index a54f3534d..f7ba8418a 100644
--- a/kde-common/Chakra-backup.desktop
+++ b/kde-common/Chakra-backup.desktop
@@ -4,6 +4,7 @@ Exec=/usr/bin/chakra-backup
 Name=miniBackup
 GenericName=Backup your most important KDE files
 GenericName[ca]=Còpia de seguretat dels fitxers més importants
+GenericName[de]=Sicherung der meisten wichtigen KDE-Dateien
 GenericName[es]=Copia de seguridad de los archivos más importantes
 GenericName[gl]=Copia de seguridade dos ficheiros máis importantes
 GenericName[it]=Copia di sicurezza dei file più importanti di KDE
diff --git a/kde-common/PKGBUILD b/kde-common/PKGBUILD
index c13596fb7..b0f946db3 100644
--- a/kde-common/PKGBUILD
+++ b/kde-common/PKGBUILD
@@ -57,16 +57,16 @@ source=(http://www.kde-apps.org/CONTENT/content-files/48411-rootactions_servicem
 	agent-shutdown.sh)
 
 md5sums=('2afd86671ad0db31718157aecd46d528'
-         'a4108e264667380876ffa7e9842892f4'
+         'e3ab79fcd5b12adce504f73d5f4af824'
          '630ffe7118eef8608a9e5e393a0b1e12'
          'e77e132d6da1a8d897db2ba630915b0f'
-         '71128ee72a68bdfd358d2f1903151bac'
-         '2c2e66057af70435fd355e8c8d6f80e7'
-         '66bab15bf8416c1feade9f854e0a1896'
-         '59181b5bbed8707101951ea9b304ac0d'
-         'eddb7ebe5b261ee6591c678dc27f1e65'
-         '1be911f58eeef76fe920b8ebe0941464'
-         'fefbd623e75fe558ceaa0ca372f41d04'
+         '20fdfc28dff97d288c1993e5f08d240d'
+         '1b03d68f77d4281fc17a705f2ce589f5'
+         'f3cf134ad8e86eac268ce518fd5687b2'
+         'bb9c02b8e4cfbbff7aafe454fd97aa9e'
+         'f9d617087d3039c476d45f4b53d89207'
+         '62f1664f7858539508de9cbe7e692c24'
+         '8ab2d36e11d2764afaaeeab0be188b9b'
          'ad4cefe6e10e0985a89a0aea6aec530c'
          '0688a20010ad27e35755e77c26c94d2c'
          '535501ac9f3ad05ddd18f8cfee4a2e06'
@@ -77,7 +77,7 @@ md5sums=('2afd86671ad0db31718157aecd46d528'
          '4e974016ca509f187b4549d95877bacc'
          '2b0aaf209d35e1e8c660db66e61d13c7'
          '660a7650478e5b7115fbb71811b5d9ee'
-         '98ce1a5e9676c056e030264557b053e5'
+         '7469d493ee49eaef5918dd38613035e5'
          '466d7fc7cab5738d674df45fdeee4eb0'
          '1c85260174e58fc6efaa8d2cac947761'
          '7daec96c125e1e238a35f31ea4a476f0'
diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index 536402655..584a5338a 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -8,7 +8,7 @@
 # package info
 #
 pkgname=tribe
-pkgver=2011.04_20110530
+pkgver=2011.04_20110603
 pkgrel=1
 _codename=Aida
 pkgdesc="Tribe - Chakra LiveCD Installer"
@@ -16,17 +16,17 @@ url="http://git.chakra-project.org/chakra/"
 license="GPL"
 arch=('i686' 'x86_64')
 depends=('kdelibs' 'kdeedu-marble>=4.6.3' 'squashfs-tools' 'partitionmanager>=1216949-5'
-        'cinstall>=0.4.6' 'rsync' 'mkinitcpio-nfs-utils' 'ntfsprogs')
+        'cinstall>=0.4.5' 'rsync' 'mkinitcpio-nfs-utils' 'ntfsprogs')
 makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.6.3' 'kdebase-workspace' 'automoc4')
 provides=('tribe')
 replaces=('kdemod-tribe-svn' 'kdemod-tribe')
 conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager')
 options=('!splithdr' '!splitdbg' 'sign')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
-        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110530.html")
+        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110603.html")
   
-md5sums=('a8e6d836665d91536b961a6af3ededcf'
-         'e7ac7749f073e6f82a40e8220ecb70f1')
+md5sums=('dfde16097f784d3c6085ab739ca7df1c'
+         'b4bb4472cd8e190a88fbc2e27d1c7bd8')
          
 groups=('kde-uninstall')
 install=tools-tribe.install
@@ -80,7 +80,7 @@ package()
         cd "${srcdir}/$pkgname"
 	msg "Make successful, installing..."
 	make DESTDIR=$startdir/pkg install || return 1
-	cp -vf ${srcdir}/RELEASE_NOTES_20110530.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
+	cp -vf ${srcdir}/RELEASE_NOTES_20110603.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
 
 	# remove nasty files
 	find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +

From 73598a7739fa5aa1f1f14b86c5b28dbfb69f02c9 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Mon, 6 Jun 2011 03:26:33 +0000
Subject: [PATCH 49/51] cbundle update, added simplified cli call, cinstall
 rebuild

---
 tools-pkg-cbundle/PKGBUILD  | 8 ++++----
 tools-pkg-cinstall/PKGBUILD | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools-pkg-cbundle/PKGBUILD b/tools-pkg-cbundle/PKGBUILD
index 18644e197..667b183db 100644
--- a/tools-pkg-cbundle/PKGBUILD
+++ b/tools-pkg-cbundle/PKGBUILD
@@ -5,9 +5,9 @@
 # (c) 2010 Drake Justice
 
 pkgname=cbundle
-pkgver=0.4.5.1
-pkgrel=2
-depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse')
+pkgver=0.4.6.1
+pkgrel=1
+depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse' 'sh')
 makedepends=('qt' 'automoc4' 'kdebase-workspace')
 pkgdesc="A shared library for using Chakra software bundles"
 arch=("i686" "x86_64")
@@ -15,7 +15,7 @@ license=('GPL')
 url="http://chakra-project.org/"
 
 source=("http://chakra-project.org/sources/cinstall/cbundle-$pkgver.tar.xz")
-md5sums=('d4ff21cbf6293edd9f134889768d1bbc')
+md5sums=('568170fccb0455eabdac353672771575')
 
 # create tarball: source PKGBUILD && mksource
 
diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index 3cca74daf..c35b4614e 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -7,10 +7,10 @@
 
 pkgname=cinstall
 pkgver=0.4.6.4
-pkgrel=1
+pkgrel=2
 depends=('rsync' 'cbundle')
 makedepends=('kdelibs' 'qt' 'automoc4')
-pkgdesc="Bundle Creator/Launcher and Package-Manager"
+pkgdesc="Chakra's Bundle manager"
 arch=("i686" "x86_64")
 license=('GPL')
 install=$pkgname.install

From fd5ffc3e5892319fe9163af00322a0a7d3e8ebdf Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Mon, 6 Jun 2011 22:36:03 +0000
Subject: [PATCH 50/51] kdebase-workspace: revert 858927c9 cos it breaks
 autologin

---
 kdebase-workspace/PKGBUILD                  |  10 +-
 kdebase-workspace/rev_monotonic_clock.patch | 100 ++++++++++++++++++++
 2 files changed, 105 insertions(+), 5 deletions(-)
 create mode 100644 kdebase-workspace/rev_monotonic_clock.patch

diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD
index d69d53706..89d3031ee 100644
--- a/kdebase-workspace/PKGBUILD
+++ b/kdebase-workspace/PKGBUILD
@@ -20,7 +20,7 @@ pkgname=('kdebase-workspace'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -90,7 +90,7 @@ source=($_mirror/${pkgbase}-$_kdever.tar.bz2
 
 #	feature_kdm-plymouth.patch
 #	shutdown-fix.patch
-	sensors-fix.patch
+	rev_monotonic_clock.patch
 	)
 
 md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
@@ -123,7 +123,7 @@ md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
 #        '9b97ac1b4deb8d0c8ca7afffb80b4320' #  feature_history-notifications-enable-disable-kde#119207.patch
 #        '42b3b5e09372c57910c3435e63e2dfd6' #  feature_kdm-plymouth.patch
 #        'c542f58979cf9cb2299dd42f63e6fd72' #  shutdown-fix.patch
-         'ecf3a9d6af9bdd3db0189e06ddf21034' #  sensors-fix.patch
+         'db8077776b1bc6e796fe227bbc0ef63a' #  rev_monotonic_clock.patch
          )
 
 #
@@ -158,8 +158,8 @@ build()
 # 	patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch
 # 	patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch
 
-#	msg "applying upstream patches ..."
-#	patch -Np1 -i ${srcdir}/sensors-fix.patch
+	msg "applying upstream patches ..."
+	patch -Np1 -R < ${srcdir}/rev_monotonic_clock.patch
 
 
 	msg "starting workspace build ..."
diff --git a/kdebase-workspace/rev_monotonic_clock.patch b/kdebase-workspace/rev_monotonic_clock.patch
new file mode 100644
index 000000000..f7209c679
--- /dev/null
+++ b/kdebase-workspace/rev_monotonic_clock.patch
@@ -0,0 +1,100 @@
+commit 858927c9d650697e8bd74697b8815c17cc93402d
+Author: Oswald Buddenhagen <ossi@kde.org>
+Date:   Sun May 15 12:19:32 2011 +0200
+
+    use monotonic clock if available
+    
+    this avoids that clock jumps (e.g., ntp syncs) cause timeouts.
+    fixes bug 269522
+
+diff --git a/kdm/backend/CMakeLists.txt b/kdm/backend/CMakeLists.txt
+index 0fbf35e..e94a3b9 100644
+--- a/kdm/backend/CMakeLists.txt
++++ b/kdm/backend/CMakeLists.txt
+@@ -68,6 +68,9 @@ if(UTIL_LIBRARIES)
+ 	target_link_libraries( kdm ${UTIL_LIBRARIES} )
+ endif(UTIL_LIBRARIES)
+ target_link_libraries( kdm ${POSIX4_LIBRARIES} )
++if(QT_RT_LIBRARY)
++	target_link_libraries( kdm ${QT_RT_LIBRARY} )
++endif(QT_RT_LIBRARY)
+ 
+ if(KDE4_ENABLE_FINAL)
+         macro_add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/kdm_final_cpp.cpp ${confci})
+diff --git a/kdm/backend/dm.c b/kdm/backend/dm.c
+index 13d75fb..1120bd8 100644
+--- a/kdm/backend/dm.c
++++ b/kdm/backend/dm.c
+@@ -1163,7 +1163,7 @@ mainLoop(void)
+     fd_set reads;
+ 
+     debug("mainLoop\n");
+-    time(&now);
++    updateNow();
+     while (
+ #ifdef XDMCP
+            anyListenSockets() ||
+@@ -1213,7 +1213,7 @@ mainLoop(void)
+         reads = wellKnownSocketsMask;
+         nready = select(wellKnownSocketsMax + 1, &reads, 0, 0, tvp);
+         debug("select returns %d\n", nready);
+-        time(&now);
++        updateNow();
+ #ifdef NEED_ENTROPY
+         addTimerEntropy();
+ #endif
+diff --git a/kdm/backend/dm.h b/kdm/backend/dm.h
+index 5895b5f..af8ce54 100644
+--- a/kdm/backend/dm.h
++++ b/kdm/backend/dm.h
+@@ -403,6 +403,17 @@ void cancelShutdown(void);
+ int TTYtoVT(const char *tty);
+ int activateVT(int vt);
+ 
++#ifdef _POSIX_MONOTONIC_CLOCK
++# define updateNow() \
++    do { \
++        struct timespec ts; \
++        clock_gettime(CLOCK_MONOTONIC, &ts); \
++        now = ts.tv_sec; \
++    } while (0)
++#else
++# define updateNow() time(&now)
++#endif
++
+ /* in ctrl.c */
+ void openCtrl(struct display *d);
+ void closeCtrl(struct display *d);
+diff --git a/kdm/backend/session.c b/kdm/backend/session.c
+index 0cd82cf..7fbdfca 100644
+--- a/kdm/backend/session.c
++++ b/kdm/backend/session.c
+@@ -416,7 +416,8 @@ openGreeter()
+     gSet(&grttalk);
+     if (grtproc.pid > 0)
+         return;
+-    if (time(0) < lastStart + 10) /* XXX should use some readiness indicator instead */
++    updateNow();
++    if (now < lastStart + 10) /* XXX should use some readiness indicator instead */
+         sessionExit(EX_UNMANAGE_DPY);
+     ASPrintf(&name, "greeter for display %s", td->name);
+     debug("starting %s\n", name);
+@@ -446,7 +447,8 @@ openGreeter()
+         sessionExit(EX_UNMANAGE_DPY);
+     }
+     debug("%s ready\n", name);
+-    time(&lastStart);
++    updateNow();
++    lastStart = now;
+ }
+ 
+ int
+@@ -577,7 +579,7 @@ manageSession(void)
+         /* NOTREACHED */
+ #endif
+ 
+-    tdiff = time(0) - td->hstent->lastExit - td->openDelay;
++    tdiff = now - td->hstent->lastExit - td->openDelay;
+     if (autoLogon(tdiff)) {
+         if (!verify(conv_auto, False))
+             goto gcont;

From 99cfb360c8fe779f0f00a09a4952ab22f39968ab Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Tue, 7 Jun 2011 21:45:24 +0000
Subject: [PATCH 51/51] Fix kdepim for work with both kdes

---
 kdebase-workspace/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD
index 89d3031ee..7b60ca8ec 100644
--- a/kdebase-workspace/PKGBUILD
+++ b/kdebase-workspace/PKGBUILD
@@ -35,7 +35,7 @@ depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kdebase-runtime>=${_kdever
 
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-python>=${_kdever}"
              "kdebindings-ruby>=${_kdever}" 'oxygen-icons' 'qedje' "kdebase-runtime>=${_kdever}" 'gpsd' 'samba' 
-	     'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl' 'google-gadgets-qt>=0.11.2')
+	     'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl' 'google-gadgets-qt>=0.11.2' 'boost')
 
 source=($_mirror/${pkgbase}-$_kdever.tar.bz2
 	mishaaq-kcm_touchpad-00370b5.tar.gz