From f436615b4b3432dfbe07c690f77b89c9685a3802 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Tue, 15 Feb 2011 15:22:45 +0000
Subject: [PATCH 01/21] bluedevil update/rebuild for openobex/obex update

---
 tools-pkg-bluedevil/PKGBUILD | 41 ++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 tools-pkg-bluedevil/PKGBUILD

diff --git a/tools-pkg-bluedevil/PKGBUILD b/tools-pkg-bluedevil/PKGBUILD
new file mode 100644
index 000000000..ae35cb91a
--- /dev/null
+++ b/tools-pkg-bluedevil/PKGBUILD
@@ -0,0 +1,41 @@
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
+pkgname=bluedevil
+pkgver=1.0.2
+pkgrel=1
+pkgdesc='The new bluetooth stack for KDE, it’s composed of: KCM, KDED, KIO, Library and some other small applications'
+arch=('i686' 'x86_64')
+url="http://gitorious.org/bluedevil"
+license=('GPL')
+depends=('kdelibs' 'libbluedevil>=1.0' 'obex-data-server' 'obexd-client') # kdebase-workspace
+makedepends=('cmake' 'automoc4')
+provides=(bluedevil)
+conflicts=(bluedevil-git)
+
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=("c0c814146098b865144957bc8b3bd7e7")
+
+build(){
+  cd ${srcdir}
+
+  mkdir -p build
+  cd build
+
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}

From 9852f6cb038e74c7e81a61371ae4b1c9994ad68e Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Tue, 22 Feb 2011 17:42:46 +0000
Subject: [PATCH 02/21] tribe: testbuild 110222

---
 tools-pkg-cinstall/PKGBUILD |  4 ++--
 tools-pkg-tribe/PKGBUILD    | 29 ++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index 98ff19940..e3f1d1a2b 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -7,8 +7,8 @@
 
 pkgname=cinstall
 pkgver=0.3.53
-pkgrel=1
-depends=('squashfs-tools' 'xz>=5.0.0' 'fakechroot' 'unionfs-fuse' 'cbundle')
+pkgrel=2
+depends=('cbundle-tools' 'xz>=5.0.0' 'fakechroot' 'unionfs-fuse' 'cbundle')
 makedepends=('kdelibs' 'qt')
 pkgdesc="Bundle Creator/Launcher and Package-Manager"
 arch=("i686" "x86_64")
diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index 324f42035..4544ab259 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -8,24 +8,24 @@
 # package info
 #
 pkgname=tribe
-pkgver=0.3.60
-pkgrel=1
+pkgver=2011.03
+pkgrel=0.20110222
 pkgdesc="Tribe - Chakra LiveCD Installer"
 url="http://git.chakra-project.org/chakra/"
 license="GPL"
 arch=('i686' 'x86_64')
-depends=('kdelibs' 'kdeedu-marble>=4.5.95' 'squashfs-tools' 'partitionmanager>=1196188-2'
+depends=('kdelibs' 'kdeedu-marble>=4.6.0' 'squashfs-tools' 'partitionmanager>=1196188-2'
         'cinstall>=0.3.50' 'rsync' 'mkinitcpio-nfs-utils' 'ntfsprogs')
-makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.5.95' 'kdebase-workspace')
+makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.6.0' 'kdebase-workspace')
 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')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
-        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_0360.html")
- 
-md5sums=('b2c19231af9d3c94c2512aae651d1f0b'
-         'af5133e36cb935ea526e1e47fb1bf9d8')
+        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_TB110222.html")
+  
+md5sums=('afbbb3c49af34264e6c872d52f4e99c4'
+         'a319d3fcfbe6fdf312cdeec1bfbff90b')
          
 groups=('kde-uninstall')
 install=tools-tribe.install
@@ -35,6 +35,9 @@ install=tools-tribe.install
 mksource() {
 	  rm -vRf tribe
 	  git clone git://gitorious.org/chakra/tribe.git
+	  cd ${pkgname}
+	  git checkout ${pkgver}
+	  cd ..
 	  rm -vRf tribe/.git
 	  pushd ${pkgname}
 	  popd
@@ -49,6 +52,10 @@ build()
 {
         cd "${srcdir}/$pkgname"
 
+	# patches
+	#patch -Np1 -i ${srcdir}/oops.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
@@ -58,8 +65,8 @@ build()
 	fi
 
 	# add pkgver to tribe
-	sed -i -e "s~source build/from git~Build: ${pkgver}-${pkgrel} (Chakra)~g" config-tribe.h.cmake
-	sed -i -e "s~git-checkout~${pkgver}~g" "${srcdir}/$pkgname/scripts/postinstall-functions/job-initialize-target"
+	sed -i -e "s~source build/from git~Build: ${pkgver} (Testbuild)~g" config-tribe.h.cmake
+	sed -i -e "s~git-checkout~${pkgver}-${pkgrel}~g" "${srcdir}/$pkgname/scripts/postinstall-functions/job-initialize-target"
 	cmake . -DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
@@ -74,7 +81,7 @@ package()
         cd "${srcdir}/$pkgname"
 	msg "Make successful, installing..."
 	make DESTDIR=$startdir/pkg install || return 1
-	cp -vf ${srcdir}/RELEASE_NOTES_0360.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
+	cp -vf ${srcdir}/RELEASE_NOTES_TB110222.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
 
 	# remove nasty files
 	find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +

From 9053e04523a2068b8cb396b6eac5076806a10585 Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Tue, 22 Feb 2011 17:57:59 +0000
Subject: [PATCH 03/21] new tarball

---
 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 4544ab259..55539bed7 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -24,7 +24,7 @@ options=('!splithdr' '!splitdbg')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
         "http://chakra-project.org/sources/tribe/RELEASE_NOTES_TB110222.html")
   
-md5sums=('afbbb3c49af34264e6c872d52f4e99c4'
+md5sums=('c48ee70c9c3081803cf09bed4d48ea70'
          'a319d3fcfbe6fdf312cdeec1bfbff90b')
          
 groups=('kde-uninstall')

From 9d5b43f35526ea1835eb4281030b1cc13b20a8e3 Mon Sep 17 00:00:00 2001
From: abeveritas <abveritas@chakra-project.org>
Date: Thu, 24 Feb 2011 22:19:22 +0000
Subject: [PATCH 04/21] networkmanagement update, for bug-fix upstream

---
 tools-pkg-networkmanagement/PKGBUILD          | 53 ++++++-------------
 .../networkmanagement.install                 | 11 ++++
 2 files changed, 28 insertions(+), 36 deletions(-)
 create mode 100644 tools-pkg-networkmanagement/networkmanagement.install

diff --git a/tools-pkg-networkmanagement/PKGBUILD b/tools-pkg-networkmanagement/PKGBUILD
index b42971d5f..b1f01dd5b 100644
--- a/tools-pkg-networkmanagement/PKGBUILD
+++ b/tools-pkg-networkmanagement/PKGBUILD
@@ -4,46 +4,27 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
-
-#
-# package info
-#
-pkgname=('networkmanagement')
-         
-arch=('i686' 'x86_64')
-pkgver=1193251
+pkgname=networkmanagement
+pkgver=git20110126
 pkgrel=1
-
-pkgdesc="KDE SC networkmanager plasmoid"
-url="http://plasma.kde.org"
+pkgdesc="KDE4 Network Management and plasmoid"
+arch=('i686' 'x86_64')
+url="http://www.kde.org/"
 license=('GPL')
+depends=('kdebase-workspace' 'networkmanager')
+makedepends=('cmake' 'python2' 'automoc4')
+optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
+provides=('knetworkmanagement')
+conflicts=('networkmanager-plasmoid-svn' 'kdeplasma-applets-networkmanager')
+replaces=('networkmanager-plasmoid-svn' 'kdeplasma-applets-networkmanager')
+install=${pkgname}.install
+#git clone git://anongit.kde.org/networkmanagement.git
+source=("http://chakra-project.org/sources/networkmanagement/networkmanagement-${pkgver}.tar.xz")
+md5sums=('f52a100b064527eca7b83086605dbee0')
 
-options=('force')
-
-depends=("kdelibs>=${_kdever}" "kdebase-workspace>=${_kdever}" 'networkmanager>=0.8.2')
-makedepends=('subversion' 'cmake' 'python' 'automoc4')
-replaces=('networkmanagement-networkmanager-plasmoid' 'networkmanagement-knetworkmanager-kde4')
-
-# comment out when using stable snapshot
-#_svntrunk=svn://anonsvn.kde.org/home/kde/trunk/extragear/base/networkmanagement
-#_svnmod=networkmanagement
-
-
-#
-# build function
-#
 build() {
-cd "$srcdir"
-
-	# comment out when using stable snapshot
-	#svn co $_svntrunk $_svnmod --revision $pkgver
-	svn co svn://anonsvn.kde.org/home/kde/trunk/extragear/base/networkmanagement --revision $pkgver
-	msg "SVN checkout done or server timeout"
-
-	mkdir -p $srcdir/build
+  cd ${srcdir}
+  	mkdir -p $srcdir/build
 	cd $srcdir/build
 	
 	cmake ../networkmanagement -DCMAKE_INSTALL_PREFIX=${_installprefix} \
diff --git a/tools-pkg-networkmanagement/networkmanagement.install b/tools-pkg-networkmanagement/networkmanagement.install
new file mode 100644
index 000000000..c4ef46ba8
--- /dev/null
+++ b/tools-pkg-networkmanagement/networkmanagement.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
\ No newline at end of file

From 8ba7ed820f88dd4eab2feccc3688ba0112f5501b Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Sat, 26 Feb 2011 01:36:18 +0100
Subject: [PATCH 05/21] networkmanagment: do it the chakra way

---
 tools-pkg-networkmanagement/PKGBUILD | 71 ++++++++++++++++++++--------
 tools-pkg-tribe/PKGBUILD             |  4 +-
 2 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/tools-pkg-networkmanagement/PKGBUILD b/tools-pkg-networkmanagement/PKGBUILD
index b1f01dd5b..d0fc8291e 100644
--- a/tools-pkg-networkmanagement/PKGBUILD
+++ b/tools-pkg-networkmanagement/PKGBUILD
@@ -4,36 +4,65 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-pkgname=networkmanagement
-pkgver=git20110126
-pkgrel=1
-pkgdesc="KDE4 Network Management and plasmoid"
-arch=('i686' 'x86_64')
-url="http://www.kde.org/"
-license=('GPL')
-depends=('kdebase-workspace' 'networkmanager')
-makedepends=('cmake' 'python2' 'automoc4')
-optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
-provides=('knetworkmanagement')
-conflicts=('networkmanager-plasmoid-svn' 'kdeplasma-applets-networkmanager')
-replaces=('networkmanager-plasmoid-svn' 'kdeplasma-applets-networkmanager')
-install=${pkgname}.install
-#git clone git://anongit.kde.org/networkmanagement.git
-source=("http://chakra-project.org/sources/networkmanagement/networkmanagement-${pkgver}.tar.xz")
-md5sums=('f52a100b064527eca7b83086605dbee0')
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
+
+#
+# package info
+#
+pkgname=('networkmanagement')
+         
+arch=('i686' 'x86_64')
+pkgver=20110226
+pkgrel=1
+
+pkgdesc="KDE SC networkmanager plasmoid"
+url="http://plasma.kde.org"
+license=('GPL')
+
+options=('force')
+
+depends=("kdelibs>=${_kdever}" "kdebase-workspace>=${_kdever}" 'networkmanager>=0.8.2')
+makedepends=('subversion' 'cmake' 'python' 'automoc4')
+replaces=('networkmanagement-networkmanager-plasmoid' 'networkmanagement-knetworkmanager-kde4')
+
+install=${pkgname}.install
+source=("http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+md5sums=('826923cde4d9904dd8a6750beac98e39') # networkmanagement-20110226.tar.xz
+
+# create tarball: source PKGBUILD && mksource
+
+mksource() {
+	  rm -vRf ${pkgname}
+	  git clone git://anongit.kde.org/${pkgname}
+	  cd ${pkgname}
+	  git checkout ${pkgver}
+	  cd ..
+	  rm -vRf ${pkgname}/.git
+	  pushd ${pkgname}
+	  popd
+	  tar -cvJf ${pkgname}-${pkgver}.tar.xz ${pkgname}/*
+	  md5sum ${pkgname}-${pkgver}.tar.xz
+}
+
+#
+# build function
+#
 build() {
-  cd ${srcdir}
-  	mkdir -p $srcdir/build
+	mkdir -p $srcdir/build
 	cd $srcdir/build
 	
-	cmake ../networkmanagement -DCMAKE_INSTALL_PREFIX=${_installprefix} \
+	cmake ../${pkgname} -DCMAKE_INSTALL_PREFIX=${_installprefix} \
 			  -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d \
 			  -DCMAKE_BUILD_TYPE=${_build_type} \
 			  -DCMAKE_SKIP_RPATH=ON \
 			  -DINSTALL_KNM_AUTOSTART=OFF \
 			  -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
 	make || return 1
-	
+}
+
+package() {
+	cd $srcdir/build
 	make DESTDIR=${pkgdir} install || return 1
 }
diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD
index 55539bed7..22ae07284 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -24,7 +24,7 @@ options=('!splithdr' '!splitdbg')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
         "http://chakra-project.org/sources/tribe/RELEASE_NOTES_TB110222.html")
   
-md5sums=('c48ee70c9c3081803cf09bed4d48ea70'
+md5sums=('89e6ea99c68f036a58ad2c98a6d8d36e'
          'a319d3fcfbe6fdf312cdeec1bfbff90b')
          
 groups=('kde-uninstall')
@@ -54,7 +54,7 @@ build()
 
 	# patches
 	#patch -Np1 -i ${srcdir}/oops.patch || return 1
-	#patch -Np1 -i ${startdir}/2011.03-1.patch || return 1
+	patch -Np1 -i ${startdir}/2011.03-1.patch || return 1
 
 	# remove unsupported pkgs for x64
 	if [ "${CARCH}" = "x86_64" ]; then

From a450a4b4da25e14966eace4a7a1aaf1a325da135 Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Sat, 26 Feb 2011 00:43:58 +0000
Subject: [PATCH 06/21] networkmanagement: proper pkgbuild

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

diff --git a/tools-pkg-networkmanagement/PKGBUILD b/tools-pkg-networkmanagement/PKGBUILD
index d0fc8291e..0716c6f1d 100644
--- a/tools-pkg-networkmanagement/PKGBUILD
+++ b/tools-pkg-networkmanagement/PKGBUILD
@@ -24,11 +24,12 @@ license=('GPL')
 options=('force')
 
 depends=("kdelibs>=${_kdever}" "kdebase-workspace>=${_kdever}" 'networkmanager>=0.8.2')
-makedepends=('subversion' 'cmake' 'python' 'automoc4')
+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')
 
 install=${pkgname}.install
-source=("http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+source=("http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 md5sums=('826923cde4d9904dd8a6750beac98e39') # networkmanagement-20110226.tar.xz
 
 # create tarball: source PKGBUILD && mksource

From 3e4a959471523b3a08d661489f8c34cf008987fa Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Sat, 26 Feb 2011 23:06:57 +0100
Subject: [PATCH 07/21] kde 4.6.1 try#1

---
 kde-common/kde-common.install |   2 +-
 kde-sc.md5                    | 148 +++++++++++++++++-----------------
 kdeaccessibility/PKGBUILD     |   2 +-
 kdebase-workspace/PKGBUILD    |  20 +----
 kdebindings/PKGBUILD          |   2 +-
 5 files changed, 82 insertions(+), 92 deletions(-)

diff --git a/kde-common/kde-common.install b/kde-common/kde-common.install
index cdfe7367e..5c5ecadfe 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.0"
+		echo " > KDE Software Compilation 4.6.1"
 		echo " > packaged by the Chakra Project"
 		echo " "
 		echo "   Installation Prefix : /usr"
diff --git a/kde-sc.md5 b/kde-sc.md5
index 7bf9801d8..6e6e19799 100644
--- a/kde-sc.md5
+++ b/kde-sc.md5
@@ -1,73 +1,75 @@
-95bfb46141365d7330adfacd952584e9  kdeaccessibility-4.6.0.tar.bz2
-6b7102d8907c4cd44e172e8229f00ee9  kdeadmin-4.6.0.tar.bz2
-b7e319bb4bc8c4416beed790dc2f8dea  kdeartwork-4.6.0.tar.bz2
-7d2d176c57f2e914acc89c39351ce5aa  kdebase-4.6.0.tar.bz2
-1f9d6bc64d7b84a74dd3ab06615c71ce  kdebase-runtime-4.6.0.tar.bz2
-ae1fd9f2d7db74ffb19cb7ccc9eac2d7  kdebase-workspace-4.6.0.tar.bz2
-4ec0e648b825916ee4be025a74cc6684  kdebindings-4.6.0.tar.bz2
-910301da580fb30c2d7fbb5b22b9a08c  kdeedu-4.6.0.tar.bz2
-131260cb75a7590910b8b84f18e6b35e  kdegames-4.6.0.tar.bz2
-61961e75d203e3eab6f53744f2a3d9e6  kdegraphics-4.6.0.tar.bz2
-1309fb13a33b168f4535596d0150ee80  kde-l10n-ar-4.6.0.tar.bz2
-f0c3f48138d36f6f043fd0954d984117  kde-l10n-bg-4.6.0.tar.bz2
-46284bdc471d5fe712f1a52752de944d  kde-l10n-ca-4.6.0.tar.bz2
-2702deccdc5983605f77b5bd05045bac  kde-l10n-ca@valencia-4.6.0.tar.bz2
-124180e6f6b67a618454c3e360e7f3f6  kde-l10n-cs-4.6.0.tar.bz2
-11402f7306b1881ca61fbef4596f0aeb  kde-l10n-da-4.6.0.tar.bz2
-973785f808ae7782e3e3005f1af9678a  kde-l10n-de-4.6.0.tar.bz2
-f9f7b88b3cb3a672c04f1db731ad9589  kde-l10n-el-4.6.0.tar.bz2
-397741924c9e6c25546e78b7f3524f3a  kde-l10n-en_GB-4.6.0.tar.bz2
-d0eae8c23b4c1771380d4fc9b8f8810e  kde-l10n-es-4.6.0.tar.bz2
-e12023f0a5a3f5d0c7a7924c54205a6f  kde-l10n-et-4.6.0.tar.bz2
-22b27d3450360d3f37b223fcf13a17c5  kde-l10n-eu-4.6.0.tar.bz2
-c8702b34ebe0b70f18de5496e6c27851  kde-l10n-fi-4.6.0.tar.bz2
-326af8f8312aa7a86fdff874bb2dcf4d  kde-l10n-fr-4.6.0.tar.bz2
-2964fe672d3cf607d71ff9d674441e31  kde-l10n-ga-4.6.0.tar.bz2
-45b17f227e7ae9b2f9e022606077b2fd  kde-l10n-gl-4.6.0.tar.bz2
-5010cc6ab3d4e5c06f44b40f4190e05a  kde-l10n-gu-4.6.0.tar.bz2
-404472d867259caced4b56e96bbd45f1  kde-l10n-he-4.6.0.tar.bz2
-0aa7b82203590c412ca52e7b5c874b19  kde-l10n-hi-4.6.0.tar.bz2
-19a2bf7f687127dd59c88f7f21d4ec6d  kde-l10n-hr-4.6.0.tar.bz2
-6744da4257637c8b93710bb20abb107f  kde-l10n-hu-4.6.0.tar.bz2
-b3cb10574e21503aecaf9c907c90aeb6  kde-l10n-ia-4.6.0.tar.bz2
-3f52b2b0afb5ab7ed1158f4397a2b59e  kde-l10n-id-4.6.0.tar.bz2
-78d2340442efc43fc9ec1e4b6cf16f2c  kde-l10n-is-4.6.0.tar.bz2
-d8f6f09d318c68e881c12be4b872ccc7  kde-l10n-it-4.6.0.tar.bz2
-7a114af56bad89e9987b2eedea15e46e  kde-l10n-ja-4.6.0.tar.bz2
-4be18393c8565cb50b1634aca9a457f6  kde-l10n-kk-4.6.0.tar.bz2
-f7941b57abfa39ed51f394e0db05d19f  kde-l10n-km-4.6.0.tar.bz2
-165ce7a25fcc50c65e84c8a756760e29  kde-l10n-kn-4.6.0.tar.bz2
-c10ac5492fae2f7f3553b62d2e3956ae  kde-l10n-ko-4.6.0.tar.bz2
-46426a974df1159ce8e204f88cea3a88  kde-l10n-lt-4.6.0.tar.bz2
-1f6f6c9069c299fcde8abb51d6d71bcc  kde-l10n-lv-4.6.0.tar.bz2
-b3d69fd6b5244e1031a39ed74f926c7c  kde-l10n-mai-4.6.0.tar.bz2
-8d5f998a52b404ee42bd70d63890d6f5  kde-l10n-nb-4.6.0.tar.bz2
-8526e6a3a1502ed96182482c40ba9b9e  kde-l10n-nds-4.6.0.tar.bz2
-1b49916be6f4d95423044a643baf36e5  kde-l10n-nl-4.6.0.tar.bz2
-c243b967bef30c3824f441871c0ae553  kde-l10n-nn-4.6.0.tar.bz2
-a92292744e9d14f987e83f40e78f5835  kde-l10n-pa-4.6.0.tar.bz2
-13f8e6ea1a9b0c333c447c6f174857c3  kde-l10n-pl-4.6.0.tar.bz2
-fe11fdfb43bc67a9b4ddae53264fe126  kde-l10n-pt-4.6.0.tar.bz2
-1fa91b3f8fbf3c2e9f281b94da076b0d  kde-l10n-pt_BR-4.6.0.tar.bz2
-eb3aa5b6020728896ac0afe20d1c7406  kde-l10n-ro-4.6.0.tar.bz2
-8964934da9d14acdf09a314b22466857  kde-l10n-ru-4.6.0.tar.bz2
-ca409bc1e700ffb6a93639a902d893a2  kde-l10n-sk-4.6.0.tar.bz2
-0372fcf339fea17705cd56367c5bef9c  kde-l10n-sl-4.6.0.tar.bz2
-87af7a4484dc33cf5e8774607dea25bb  kde-l10n-sr-4.6.0.tar.bz2
-adbb04da771a8ade83e98964b4e4056f  kde-l10n-sv-4.6.0.tar.bz2
-94bd56255c2b79762e95e32075a3b40b  kde-l10n-th-4.6.0.tar.bz2
-c9791ce696ed019d4889297afdb4820b  kde-l10n-tr-4.6.0.tar.bz2
-5486dae4ac8a41d0b446b8eed1a076c4  kde-l10n-uk-4.6.0.tar.bz2
-21327f5ed3ced2347940a8b88a7cfc61  kde-l10n-wa-4.6.0.tar.bz2
-1eaad893003fe7e602fe218c2b71817f  kde-l10n-zh_CN-4.6.0.tar.bz2
-11c8acc1789ebcee25606c23620ac67e  kde-l10n-zh_TW-4.6.0.tar.bz2
-9ee32f375809a42a4a8d512bd06a612b  kdelibs-4.6.0.tar.bz2
-e9e4934877ae1eafee06d09e8a95d189  kdemultimedia-4.6.0.tar.bz2
-f7611f38c3bbaab43121a64b14aceb1a  kdenetwork-4.6.0.tar.bz2
-bfcc74fff5c6d0803d43cf13033660ab  kdepimlibs-4.6.0.tar.bz2
-c7307dfa69c986fb8114505bc38e6af2  kdeplasma-addons-4.6.0.tar.bz2
-3bb8a404758e3fa9f2ca1658d175c094  kdesdk-4.6.0.tar.bz2
-2025e1931ada4d1b1d37371df9847865  kdetoys-4.6.0.tar.bz2
-d89860891451d11983d7cadc8566b4e0  kdeutils-4.6.0.tar.bz2
-9ea899175bc58d5a9333d858b12f705c  kdewebdev-4.6.0.tar.bz2
-47b943e1b8bc2c1cef10fd791ac70091  oxygen-icons-4.6.0.tar.bz2
+60cb5a87c210721155019d0ef334f8f5  kdeaccessibility-4.6.1.tar.bz2
+a3e5aae644fd6cd49de1378e37b5a0e6  kdeadmin-4.6.1.tar.bz2
+b7a96990bff6d53b2519e49dfb8daf67  kdeartwork-4.6.1.tar.bz2
+b2449df6483744eaa373bca86abc2389  kdebase-4.6.1.tar.bz2
+26ad7899eb589a8bc260749fd22186a8  kdebase-runtime-4.6.1.tar.bz2
+b56385957880f08b664b055ae978d8db  kdebase-workspace-4.6.1.tar.bz2
+bdb0180bdff41ad644155d2071c98c7a  kdebindings-4.6.1.tar.bz2
+fcd8126fe1fc16fa8b7a09baae10842e  kdeedu-4.6.1.tar.bz2
+079faf5198928e595acce2243daad39c  kdegames-4.6.1.tar.bz2
+9a0ca27211e309b57033c93c5c96268e  kdegraphics-4.6.1.tar.bz2
+ff3ba99958a13df96c1249791ee78beb  kde-l10n-ar-4.6.1.tar.bz2
+5ace305d3d81a1a33cdb2de073e2030d  kde-l10n-bg-4.6.1.tar.bz2
+4b8622573661c2f950155df654534961  kde-l10n-ca-4.6.1.tar.bz2
+58b8aa202d705934ea141dd96a2f8aaa  kde-l10n-ca@valencia-4.6.1.tar.bz2
+ae419d8574ca08ecf792036910f91557  kde-l10n-cs-4.6.1.tar.bz2
+a777268db485e47da4b7ad14db06aebb  kde-l10n-da-4.6.1.tar.bz2
+8673677af34897e1a4bf18bcc88274be  kde-l10n-de-4.6.1.tar.bz2
+b503900853ac69f1a8b4c11a31b64361  kde-l10n-el-4.6.1.tar.bz2
+ab61a106d80e5540872ef3600949e273  kde-l10n-en_GB-4.6.1.tar.bz2
+75395f769f88ccdd422756f5c5ffc436  kde-l10n-es-4.6.1.tar.bz2
+2d1e7b7d5c9315df3eefb42d4a31601f  kde-l10n-et-4.6.1.tar.bz2
+f5ccfd587904ecf7f14725f13ebfb17f  kde-l10n-eu-4.6.1.tar.bz2
+239c39402e5fcfca4ef759c99faf42ba  kde-l10n-fi-4.6.1.tar.bz2
+550b8b999d86e8ae0b9a86a51462af59  kde-l10n-fr-4.6.1.tar.bz2
+a5f57fbc9a63ff2f8749a82462521acb  kde-l10n-ga-4.6.1.tar.bz2
+1a3f06e27849c607906431fbc33793b5  kde-l10n-gl-4.6.1.tar.bz2
+bf49ec6ea9902daa2128076c808a2710  kde-l10n-gu-4.6.1.tar.bz2
+120cbc9803d1e5de18d15129d6d70c38  kde-l10n-he-4.6.1.tar.bz2
+215646ad9d40c2e34c2ddc40445e1ba0  kde-l10n-hi-4.6.1.tar.bz2
+3689da1d59b265ea2951bf0e4232302e  kde-l10n-hr-4.6.1.tar.bz2
+c15ce6d0173c21d21f8cf806194fa06e  kde-l10n-hu-4.6.1.tar.bz2
+34080734f5aad5fb2df755eefd456956  kde-l10n-ia-4.6.1.tar.bz2
+f4cc256ffea98b9faf78da785780b654  kde-l10n-id-4.6.1.tar.bz2
+d258057af994b7a61b0bd5c842c10d19  kde-l10n-is-4.6.1.tar.bz2
+e93a99f6c56f381dc24492515b6ad026  kde-l10n-it-4.6.1.tar.bz2
+e53e4a0e638c5dcfe6d540c0af87e0f1  kde-l10n-ja-4.6.1.tar.bz2
+a86e35c7bee3938aaff781f488c15213  kde-l10n-kk-4.6.1.tar.bz2
+d218648998f4802624e739c104b208c5  kde-l10n-km-4.6.1.tar.bz2
+2ededd129de85a4980ac8327a3e6eb8e  kde-l10n-kn-4.6.1.tar.bz2
+dbb8948f3baf39526225c66539e8a3ae  kde-l10n-ko-4.6.1.tar.bz2
+313dfd7881bcbd7d822ac163f67cc2a3  kde-l10n-lt-4.6.1.tar.bz2
+4c70ad25c985485db15db4ce7f5a92d4  kde-l10n-lv-4.6.1.tar.bz2
+703114060b8d4a6c305c3360fac3875e  kde-l10n-mai-4.6.1.tar.bz2
+d0f882a5baed31585211531108b60d3a  kde-l10n-nb-4.6.1.tar.bz2
+5f19668f488c4dd8f511f5ae7ca2bb3f  kde-l10n-nds-4.6.1.tar.bz2
+6925f669acc443d2a4939aebcfedb48f  kde-l10n-nl-4.6.1.tar.bz2
+6b7923a585488ece1966f7ee720bd699  kde-l10n-nn-4.6.1.tar.bz2
+5a7870eabfa76421a83c8ea88b7b9cdd  kde-l10n-pa-4.6.1.tar.bz2
+101ac29adc2dfa6d3093908f980358a2  kde-l10n-pl-4.6.1.tar.bz2
+5d6fd0349c790ac73a486273ecc2b15d  kde-l10n-pt-4.6.1.tar.bz2
+283bfc4058fde09b5f40ef47dd7e93cb  kde-l10n-pt_BR-4.6.1.tar.bz2
+d699d185d7f26dc1a13b7e2ad067a650  kde-l10n-ro-4.6.1.tar.bz2
+a306528247533e226612682d1b78aa6c  kde-l10n-ru-4.6.1.tar.bz2
+110fc8e07bd3f981a49889459a4d8c33  kde-l10n-sk-4.6.1.tar.bz2
+60bdefeffff0b41445eddcc0f5ec4010  kde-l10n-sl-4.6.1.tar.bz2
+6b6c2c829cbc930431b76e179b78d123  kde-l10n-sr-4.6.1.tar.bz2
+5d27d83ffa3aa8ed959960a2cb4e7cb5  kde-l10n-sv-4.6.1.tar.bz2
+043e9a22af557784ce10515aa3e8bc5f  kde-l10n-th-4.6.1.tar.bz2
+60b85552abc123250ba53f9379f968e6  kde-l10n-tr-4.6.1.tar.bz2
+4c164359f76720a23b048981a4ee46f7  kde-l10n-uk-4.6.1.tar.bz2
+a6cf14141167a94d3e0be31a3ddd282f  kde-l10n-wa-4.6.1.tar.bz2
+d2c98100febc94a0dbe75782636f506e  kde-l10n-zh_CN-4.6.1.tar.bz2
+6fae277af3874504e157890539565d0b  kde-l10n-zh_TW-4.6.1.tar.bz2
+0cdc56a73009c65b5ad9ba3167ebb227  kdelibs-4.6.1.tar.bz2
+6028c6e8ad41dfd32f8ae62314766f8f  kdemultimedia-4.6.1.tar.bz2
+a9b304439774fbda1b63e7114a506c1b  kdenetwork-4.6.1.tar.bz2
+250d3d448c0e2a585b38e2c75c46d07f  kdepimlibs-4.6.1.tar.bz2
+c73ba7a4a3824f4334efd333bf61a3fd  kdeplasma-addons-4.6.1.tar.bz2
+2e199d9299a562b790676cb0455b9b6f  kdesdk-4.6.1.tar.bz2
+3b06a825425fd9388f64c3e916622d5a  kdetoys-4.6.1.tar.bz2
+76b4d4fc3ff0d1d1b77742fede68589b  kdeutils-4.6.1.tar.bz2
+f4deca78e13c1bfba70f19ce56964b13  kdewebdev-4.6.1.tar.bz2
+a856835ed19dffcd4d0eeae9d7c5a3a9  oxygen-icons-4.6.1.tar.bz2
+ed8da4723f072035a1f43bd30118aa55  sage-4.6.1.tar
+2760dac31a43d452a19a3147bfde571c  wvstreams-4.6.1.tar.gz
diff --git a/kdeaccessibility/PKGBUILD b/kdeaccessibility/PKGBUILD
index 7c9fc5211..cdad998e5 100644
--- a/kdeaccessibility/PKGBUILD
+++ b/kdeaccessibility/PKGBUILD
@@ -32,7 +32,7 @@ pkgname=('kdeaccessibility-common'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org"
diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD
index 912b39908..4aa89a325 100644
--- a/kdebase-workspace/PKGBUILD
+++ b/kdebase-workspace/PKGBUILD
@@ -26,7 +26,7 @@ pkgname=('kdebase-workspace'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=3
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -78,7 +78,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
 	fix_kdm_configdef.patch
 
 	# "fix" some sytemsettings modules that need root access
-	fix_root-only-kcms.patch
+	fix_root-only-kcms.patch)
 
 	# fix powerdevil
 #	trunk_powerdevil.patch
@@ -97,11 +97,6 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
 
 #	feature_kdm-plymouth.patch
 
-	#upstream patches
-	fix-plasma-crash-on-exit.patch
-	fix-MALLOC_CHECK.patch
-	set-horos-theme.patch)
-
 md5sums=(`grep ${_origname}-$_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
@@ -135,10 +130,8 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
 #        '7361012da217f9aeeca61f0e9956e1d0' #  feature_brightness-osd.patch
 #        '894815a80f99a9a0dee1adbcda49b161' #  feature_battery-tooltip.patch
 #        '9b97ac1b4deb8d0c8ca7afffb80b4320' #  feature_history-notifications-enable-disable-kde#119207.patch
-#        '42b3b5e09372c57910c3435e63e2dfd6' #  feature_kdm-plymouth.patch
-	 '274125012429317ebda1a4923d3d5770' #  fix-plasma-crash-on-exit.patch
-	 '172ea190664f4bdadd38406caf9a7597' # fix-MALLOC_CHECK.patch
-	 '66520736dc79f5a12f0bb12502146244') # set-horos-theme.patch
+#        '42b3b5e09372c57910c3435e63e2dfd6') #  feature_kdm-plymouth.patch
+
 #
 # build function
 #
@@ -183,11 +176,6 @@ build()
 # 	patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch || return 1
 # 	patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch || return 1
 
-	msg "applying upstream patches ..."
-	patch -Np1 -i ${srcdir}/fix-plasma-crash-on-exit.patch || return 1
-	patch -Np0 -i ${srcdir}/fix-MALLOC_CHECK.patch || return 1
-	patch -Np0 -i ${srcdir}/set-horos-theme.patch || return 1
-
 #	msg "applying chakra patches ..."
 
 
diff --git a/kdebindings/PKGBUILD b/kdebindings/PKGBUILD
index 51fd84a78..ca06983be 100644
--- a/kdebindings/PKGBUILD
+++ b/kdebindings/PKGBUILD
@@ -30,7 +30,7 @@ pkgname=('kdebindings-common'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org"

From 72b150feeb6bc44db5f39e48cfdf0cc08ef2688f Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Sun, 27 Feb 2011 01:55:09 +0000
Subject: [PATCH 08/21] fix pkgbuild

---
 kdebase-workspace/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD
index 4aa89a325..efc4cc0d6 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=3
 
 pkgdesc="split package"
 url="http://www.kde.org"
@@ -121,7 +121,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
         '814350c52c135d6f7bdada1e29223d38' #  fix_terminate-server.patch
 #        '5d752cf39a28306438bb6d82db6e1696'#  fix_ck-shutdown.patch
 	'97a5eb51e6f9d460f0d61bb322a1db5e' #  fix_kdm_configdef.patch
-	'5f963f80a026f0600edae1b1c70411e5' #  fix_root-only-kcms.patch
+	'5f963f80a026f0600edae1b1c70411e5') #  fix_root-only-kcms.patch
 
 #	'c6b58eb228d16c77d692df655046ee9f' #  trunk_powerdevil.patch
 
@@ -130,7 +130,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
 #        '7361012da217f9aeeca61f0e9956e1d0' #  feature_brightness-osd.patch
 #        '894815a80f99a9a0dee1adbcda49b161' #  feature_battery-tooltip.patch
 #        '9b97ac1b4deb8d0c8ca7afffb80b4320' #  feature_history-notifications-enable-disable-kde#119207.patch
-#        '42b3b5e09372c57910c3435e63e2dfd6') #  feature_kdm-plymouth.patch
+#        '42b3b5e09372c57910c3435e63e2dfd6' #  feature_kdm-plymouth.patch
 
 #
 # build function

From d4ce9554137f4a8b7ee06e02c82de1835edbb60f Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Sun, 27 Feb 2011 02:41:08 +0000
Subject: [PATCH 09/21] fix pkgrel

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

diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD
index efc4cc0d6..83a11b870 100644
--- a/kdebase-workspace/PKGBUILD
+++ b/kdebase-workspace/PKGBUILD
@@ -26,7 +26,7 @@ pkgname=('kdebase-workspace'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=3
+pkgrel=1
 
 pkgdesc="split package"
 url="http://www.kde.org"

From 9b9da5185ea760c83069e027d62472d3f6813947 Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Sun, 27 Feb 2011 03:09:49 +0000
Subject: [PATCH 10/21] fix kdebase

---
 kdebase/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kdebase/PKGBUILD b/kdebase/PKGBUILD
index 896237e64..0c3063d7a 100644
--- a/kdebase/PKGBUILD
+++ b/kdebase/PKGBUILD
@@ -76,8 +76,8 @@ build()
 
 	msg "applying main patchset ..."
 #	patch -Np1 -i ${startdir}/01_dolphin_add_toolbar_buttons.patch || return 1
-	patch -Np1 -i ${startdir}/02_dolphin_properties.patch || return 1
-	patch -Np1 -i ${startdir}/03_konsole_defaults.patch || return 1
+	patch -Np2 -i ${startdir}/02_dolphin_properties.patch || return 1
+	patch -Np2 -i ${startdir}/03_konsole_defaults.patch || return 1
 #	patch -Np1 -i ${startdir}/04_konq_scan_nsplugins_at_startup.patch || return 1
 # disabled - needs opencv which depends on gtk2
 #	patch -Np1 -i ${startdir}/feature_user-image-from-webcam.patch || return 1

From 47ec7126d603cb3860a71e4dfc2bd95d64ebaf1f Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Sun, 27 Feb 2011 03:12:28 +0000
Subject: [PATCH 11/21] fix kdebase for real

---
 kdebase/PKGBUILD | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kdebase/PKGBUILD b/kdebase/PKGBUILD
index 0c3063d7a..cb7607c1f 100644
--- a/kdebase/PKGBUILD
+++ b/kdebase/PKGBUILD
@@ -107,7 +107,7 @@ package_kdebase()
 
 	splitdirs="kdepasswd kdialog keditbookmarks kfind lib nsplugins plasma" #kinfocenter 
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/apps/${i}
+			cd ${srcdir}/${_origname}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 		
@@ -145,7 +145,7 @@ package_kdebase-doc()
 
 	splitdirs="doc"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/apps/${i}
+			cd ${srcdir}/${_origname}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -160,7 +160,7 @@ package_kdebase-dolphin()
 
 	splitdirs="dolphin"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/apps/${i}
+			cd ${srcdir}/${_origname}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -175,7 +175,7 @@ package_kdebase-konqueror()
 
 	splitdirs="konqueror"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/apps/${i}
+			cd ${srcdir}/${_origname}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -190,7 +190,7 @@ package_kdebase-konsole()
 
 	splitdirs="konsole"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/apps/${i}
+			cd ${srcdir}/${_origname}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }
@@ -205,7 +205,7 @@ package_kdebase-kwrite()
 
 	splitdirs="kwrite"
 		for i in ${splitdirs} ; do
-			cd ${srcdir}/${_origname}-${pkgver}/apps/${i}
+			cd ${srcdir}/${_origname}-${pkgver}/${i}
 			make DESTDIR=${pkgdir} install || return 1
 		done
 }

From 03c63be6b97b3d2acfb917eb7b97b60984c300db Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Sun, 27 Feb 2011 12:05:54 +0000
Subject: [PATCH 12/21] fix konsole with temp git patch

---
 kdebase/PKGBUILD | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/kdebase/PKGBUILD b/kdebase/PKGBUILD
index cb7607c1f..0e8f21310 100644
--- a/kdebase/PKGBUILD
+++ b/kdebase/PKGBUILD
@@ -41,18 +41,19 @@ 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)
+	03_konsole_defaults.patch
 #	04_konq_scan_nsplugins_at_startup.patch)
 #	feature_user-image-from-webcam.patch)
+        http://chakra-project.org/sources/kdebase/konsole-kde46-20110227.patch.tar.gz)
 
 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
+         '8ab6f508a4e04517dd51ac3ab2eb01ef' # 03_konsole_defaults.patch
 #         'a8dc0bddce464af5846ac722007e0b59') # 04_konq_scan_nsplugins_at_startup.patch
 #         '52cfd4456f8ec830b8d49c8aaa40b539') # feature_user-image-from-webcam.patch
-
+          'eb22843058c44409ef2cf6adb381e222') # konsole-kde46-20110227.patch.tar.gz
 
 
 #
@@ -75,12 +76,15 @@ build()
 	fi
 
 	msg "applying main patchset ..."
-#	patch -Np1 -i ${startdir}/01_dolphin_add_toolbar_buttons.patch || return 1
-	patch -Np2 -i ${startdir}/02_dolphin_properties.patch || return 1
-	patch -Np2 -i ${startdir}/03_konsole_defaults.patch || return 1
-#	patch -Np1 -i ${startdir}/04_konq_scan_nsplugins_at_startup.patch || return 1
+#	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 ${startdir}/feature_user-image-from-webcam.patch || return 1
+#	patch -Np1 -i ${srcdir}/feature_user-image-from-webcam.patch || return 1
+
+        msg "applying temp git patches"
+        patch -Np0 -i ${srcdir}/konsole-kde46-20110227.patch || return 1
 
 	msg "starting build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
@@ -124,11 +128,11 @@ package_kdebase()
 	rm -rf ${pkgdir}/usr/share/applications/kde4/kde_cdemu.desktop
 
 	# include our patches into the package
-	ls -1 ${startdir}/*.patch &>/dev/null 2>&1
+	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
-		for i in ${startdir}/*.patch; do
+		for i in ${srcdir}/*.patch; do
 			msg "$i"
 			cp $i ${pkgdir}/usr/share/chakra/patches/${_origname}/ &>/dev/null
 		done

From 00a2ddd59296de6ea5eb7c378cf9af5c09875264 Mon Sep 17 00:00:00 2001
From: abeveritas <abveritas@chakra-project.org>
Date: Mon, 28 Feb 2011 01:49:07 +0000
Subject: [PATCH 13/21] koffice update to 2.3.3

---
 koffice/PKGBUILD | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/koffice/PKGBUILD b/koffice/PKGBUILD
index bbccef0fb..06cfb443f 100644
--- a/koffice/PKGBUILD
+++ b/koffice/PKGBUILD
@@ -21,7 +21,7 @@ pkgname=('koffice-common'
 	'koffice-krita'
         'koffice-doc')
 
-pkgver=2.3.0
+pkgver=2.3.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
@@ -30,15 +30,17 @@ depends=('fftw')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'eigen' 'lcms' 'lcms2' \
   'kdelibs' 'gsl' 'qca' 'glew' 'qimageblitz' 'libgsf' 'libspnav' \
   'kdepimlibs' 'pstoedit' 'wv2' 'poppler-qt' 'libwpd' 'libwpg' 'openexr' \
-  'kdegraphics-common' 'sqlite3' 'libpqxx' 'create-resources' 'freetds') # 'opengtl'
+  'kdegraphics-common' 'sqlite3' 'libpqxx' 'create-resources' 'freetds' 'docbook-xsl') # 'opengtl'
 groups=('koffice')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('4f99a44b004e4a237890e0834a09964b')
+source=("ftp://ftp.kde.org/pub/kde/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
+sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099')
 options=('docs' '!splithdr' 'splitdbg' 'log')
 	
 build() {
 	cd ${srcdir}
 
+        #patch -Np1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
+
 	mkdir -p build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \

From fb5d8178a507cd7f13d9e9bcd901526c15c75a93 Mon Sep 17 00:00:00 2001
From: abeveritas <abveritas@chakra-project.org>
Date: Mon, 28 Feb 2011 02:37:31 +0000
Subject: [PATCH 14/21] koffice-l10n update, adding hu & pl

---
 koffice-l10n/PKGBUILD | 83 ++++++++++++++++++++++++++++++-------------
 1 file changed, 58 insertions(+), 25 deletions(-)

diff --git a/koffice-l10n/PKGBUILD b/koffice-l10n/PKGBUILD
index 93f215edd..d6cec12a8 100644
--- a/koffice-l10n/PKGBUILD
+++ b/koffice-l10n/PKGBUILD
@@ -18,12 +18,14 @@ pkgname=('koffice-l10n-ca'
          'koffice-l10n-et'
          'koffice-l10n-fr'
          'koffice-l10n-gl'
+         'koffice-l10n-hu'
          'koffice-l10n-it'
          'koffice-l10n-ja'
          'koffice-l10n-kk'
          'koffice-l10n-nb'
          'koffice-l10n-nds'
          'koffice-l10n-nl'
+         'koffice-l10n-pl'
          'koffice-l10n-pt'
          'koffice-l10n-pt_br'
          'koffice-l10n-ru'
@@ -32,7 +34,7 @@ pkgname=('koffice-l10n-ca'
          'koffice-l10n-uk'
          'koffice-l10n-zh_cn'
          'koffice-l10n-zh_tw')
-pkgver=2.3.0
+pkgver=2.3.2
 pkgrel=1
 arch=('any')
 url='http://www.koffice.org'
@@ -50,12 +52,14 @@ source=("http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-et-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-fr-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-gl-${pkgver}.tar.bz2"
+        "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-hu-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-it-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-ja-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-kk-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-nb-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-nds-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-nl-${pkgver}.tar.bz2"
+        "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-pl-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-pt-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-pt_BR-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-ru-${pkgver}.tar.bz2"
@@ -65,30 +69,32 @@ source=("http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-zh_CN-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-zh_TW-${pkgver}.tar.bz2")
 
-md5sums=('bdf2eb94055f51ebe4a59c58fb8fefc2' # koffice-l10n-ca-2.3.0.tar.bz2
-         '22d62f8bae72dd0245421d8174545b85' # koffice-l10n-ca@valencia-2.3.0.tar.bz2
-         'ae6ae9ef63b0e52e0dc1813a87506890' # koffice-l10n-da-2.3.0.tar.bz2
-         '3554bb5887af3af71166ce027637273e' # koffice-l10n-de-2.3.0.tar.bz2
-         '4d7dc252a659a9fe3da59590fcb05ac8' # koffice-l10n-el-2.3.0.tar.bz2
-         'd08426e1591675831a338e2bd54be10b' # koffice-l10n-en_GB-2.3.0.tar.bz2
-         'f7ebe904ae522716dae85f117f5d08af' # koffice-l10n-es-2.3.0.tar.bz2
-         '8b32e4620dc3f314dd9ca57c22856e6c' # koffice-l10n-et-2.3.0.tar.bz2
-         'f1df28bed38e9cdb5366e18e16f094f0' # koffice-l10n-fr-2.3.0.tar.bz2
-         '7c5d43cf75eb2216bf124886d3f60d26' # koffice-l10n-gl-2.3.0.tar.bz2
-         '4871c3c1fb2658f643f743daa6dfab81' # koffice-l10n-it-2.3.0.tar.bz2
-         '21309edfc75a9be6500de31e40c36c36' # koffice-l10n-ja-2.3.0.tar.bz2
-         '0c170c2c0c91eb329d153a297d8dd6e2' # koffice-l10n-kk-2.3.0.tar.bz2
-         '876e81adaf70b8627b2aa0963bc85f61' # koffice-l10n-nb-2.3.0.tar.bz2
-         '5d5654f8744df637f9c5defb477191d4' # koffice-l10n-nds-2.3.0.tar.bz2
-         '631c3a748caa1bcf9eec72d96733e82f' # koffice-l10n-nl-2.3.0.tar.bz2
-         '9ad09a3b7d07ec17071da57647cbd751' # koffice-l10n-pt-2.3.0.tar.bz2
-         '0af6e5efaf7d8303ded3950e6c901d7d' # koffice-l10n-pt_BR-2.3.0.tar.bz2
-         '339429f52277c7b16cb47a5fba2a0332' # koffice-l10n-ru-2.3.0.tar.bz2
-         '86c409e03ef996ea533d5ab32bebda19' # koffice-l10n-sv-2.3.0.tar.bz2
-         '6ef89202523607122e4679dd6c748296' # koffice-l10n-tr-2.3.0.tar.bz2
-         '9e0b77d44a396a135366fc8a4938d6d6' # koffice-l10n-uk-2.3.0.tar.bz2
-         '1ac692eea52fd74bc4f0761947b71770' # koffice-l10n-zh_CN-2.3.0.tar.bz2
-         '47e58533f2ab1a4c4a674748087dd919') # koffice-l10n-zh_TW-2.3.0.tar.bz2
+sha1sums=('cd2ce0d719b68a762ee4a4c3f312427de9229614'
+          '87db015b8a8480955ae989cf4a17490aefabdae6'
+          '1a25131cd37e15e40fa6518146370f907abf2cfb'
+          'b7cc12c2081c01c5dd46dc7879dc55237d6ae8d2'
+          'cfc6f1c4dffec7e7094b56d70c494ef66a096fd0'
+          'a73dcbbd8263889da3cb58f496c74fc9a110b590'
+          '583bdc5ec58fbb70713030f6517ad85fa8423c62'
+          'eb8e59252aa8bcd8b6d10b1055c10927a6c2d9e9'
+          'f59118355ecb963fb234a14cfb5ab518df22f1fe'
+          '7b07e05ce1ea7f5acbbb583ebae6e9203b8f79ed'
+          '21b7959cc7a0db2354d789c782cb903ab692777c'
+          'e9ed5010461176656c34d19e4f2bc9bac2b3cfb1'
+          '0c4ae0395e2918f6c27330fe0bc544ce0d203e28'
+          '4a3d01179e94d93e14704e80f9bc3dbd002e7d51'
+          '30f6bd5bbeb73fd72cd77c349bfcfb8296df4a7a'
+          '0fa6515a49c59dcbd31ad38690757d5af9f19cdf'
+          'b05f583bb6143efeeec13ce722b91acb7a7167eb'
+          '9ab2e029f4355a6324e48a1f1c26bf67c83400d2'
+          '131782e538508b05e9d735e147792b271a100f91'
+          'b7b258f2e2271ee5314f427dd42d1b3f572321ec'
+          '5cf50feb17049580b3916ea3102a3a23ef2e9138'
+          '700252dceff2ac35e20ee7fef3c9117c40964bff'
+          '6301537a3caca81dd73ec797cedc679e8a159566'
+          '135976ae7b3ee13fe25e2ffd8282aa01cb0bfc56'
+          'cce8483c29129343d783fe9f5f82108adb6a5207'
+          '8f73db090fca711143fce296eb66bc95c7b0f513')
 
 build() {
   cd $srcdir
@@ -173,6 +179,14 @@ build() {
   make || return 1
   cd ../..
 
+  install -d build/hu
+  cd build/hu
+  cmake ${srcdir}/koffice-l10n-hu-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make || return 1
+  cd ../..
+
   install -d build/it
   cd build/it
   cmake ${srcdir}/koffice-l10n-it-${pkgver} \
@@ -221,6 +235,15 @@ build() {
   make || return 1
   cd ../..
 
+  install -d build/pl
+  cd build/pl
+  cmake ${srcdir}/koffice-l10n-pl-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make || return 1
+  cd ../..
+
+
   install -d build/pt
   cd build/pt
   cmake ${srcdir}/koffice-l10n-pt-${pkgver} \
@@ -339,6 +362,11 @@ package_koffice-l10n-gl() {
         cd $srcdir/build/gl
         make DESTDIR=$pkgdir install
 }
+package_koffice-l10n-hu() {
+        pkgdesc=('Hungarian Localization for Koffice')
+        cd $srcdir/build/gl
+        make DESTDIR=$pkgdir install
+}
 package_koffice-l10n-it() {
         pkgdesc=('Italian Localization for Koffice')
         cd $srcdir/build/it
@@ -369,6 +397,11 @@ package_koffice-l10n-nl() {
         cd $srcdir/build/nl
         make DESTDIR=$pkgdir install
 }
+package_koffice-l10n-pl() {
+        pkgdesc=('Polish Localization for Koffice')
+        cd $srcdir/build/gl
+        make DESTDIR=$pkgdir install
+}
 package_koffice-l10n-pt() {
         pkgdesc=('Portugese Localization for Koffice')
         cd $srcdir/build/pt

From c5a3f9a068edb213312f5ec5598c40daefb57fa2 Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Mon, 28 Feb 2011 23:16:16 +0000
Subject: [PATCH 15/21] see:
 http://chakra-project.org/bbs/viewtopic.php?pid=28059#p28059

---
 kdebase-workspace/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD
index 83a11b870..24744f36b 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"
@@ -37,7 +37,7 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
 # NOTE keep in sync with kdebase-workspace-depends
 depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kdebase-runtime>=${_kdever}" 'qimageblitz'
          'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' 'oxygen-icons' "xkit"
-         'libxdamage' 'xorg-utils' 'libxrandr' 'libxres') # "kdepim-runtime>=${_kdever}"
+         'libxdamage' 'xorg-utils' 'libxrandr' 'libxres' 'libdmtx' 'libqalculate') # "kdepim-runtime>=${_kdever}"
 
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-python>=${_kdever}"
              "kdebindings-ruby>=${_kdever}" 'oxygen-icons' 'qedje' "kdebase-runtime>=${_kdever}" 'gpsd' 'samba' 
@@ -229,7 +229,7 @@ package_kdebase-workspace()
 # NOTE keep in sync with depends
 	depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kdebase-runtime>=${_kdever}" 'qimageblitz'
 	         'libxxf86misc' 'libxcomposite' 'libxss' 'lm_sensors' 'libxklavier' 'libxft' 'oxygen-icons' "xkit"
-	         'libxdamage' 'xorg-utils' 'libxrandr' 'libxres' 'libdmtx') # "kdepim-runtime>=${_kdever}"
+	         'libxdamage' 'xorg-utils' 'libxrandr' 'libxres' 'libdmtx' 'libqalculate') # "kdepim-runtime>=${_kdever}"
 
 	optdepends=("kdebindings-python : Python Support for Plasma"
 		    "kdeedu-marble      : Marble Wallpaper Plugin"

From fb1652d1c06d2a2c58cacc0310ea4ec62a698d57 Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Tue, 1 Mar 2011 15:05:22 +0100
Subject: [PATCH 16/21] rebuild tribe against new partman

---
 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 22ae07284..3cad0f9f9 100644
--- a/tools-pkg-tribe/PKGBUILD
+++ b/tools-pkg-tribe/PKGBUILD
@@ -9,23 +9,23 @@
 #
 pkgname=tribe
 pkgver=2011.03
-pkgrel=0.20110222
+pkgrel=0.20110301
 pkgdesc="Tribe - Chakra LiveCD Installer"
 url="http://git.chakra-project.org/chakra/"
 license="GPL"
 arch=('i686' 'x86_64')
-depends=('kdelibs' 'kdeedu-marble>=4.6.0' 'squashfs-tools' 'partitionmanager>=1196188-2'
+depends=('kdelibs' 'kdeedu-marble>=4.6.1' 'squashfs-tools' 'partitionmanager>=1216949'
         'cinstall>=0.3.50' 'rsync' 'mkinitcpio-nfs-utils' 'ntfsprogs')
-makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.6.0' 'kdebase-workspace')
+makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.6.1' 'kdebase-workspace')
 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')
 source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
-        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_TB110222.html")
+        "http://chakra-project.org/sources/tribe/RELEASE_NOTES_TB110301.html")
   
-md5sums=('89e6ea99c68f036a58ad2c98a6d8d36e'
-         'a319d3fcfbe6fdf312cdeec1bfbff90b')
+md5sums=('72ec4aeb2a422fd13cb06c00d644e549'
+         '9edec8f7e13dc1f0a5dedb0807844eea')
          
 groups=('kde-uninstall')
 install=tools-tribe.install
@@ -54,7 +54,7 @@ build()
 
 	# patches
 	#patch -Np1 -i ${srcdir}/oops.patch || return 1
-	patch -Np1 -i ${startdir}/2011.03-1.patch || return 1
+	#patch -Np1 -i ${startdir}/2011.03-1.patch || return 1
 
 	# remove unsupported pkgs for x64
 	if [ "${CARCH}" = "x86_64" ]; then
@@ -81,7 +81,7 @@ package()
         cd "${srcdir}/$pkgname"
 	msg "Make successful, installing..."
 	make DESTDIR=$startdir/pkg install || return 1
-	cp -vf ${srcdir}/RELEASE_NOTES_TB110222.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
+	cp -vf ${srcdir}/RELEASE_NOTES_TB110301.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
 
 	# remove nasty files
 	find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +

From 32ba36adecb080b7cfad3e4760485a6b1320e694 Mon Sep 17 00:00:00 2001
From: abeveritas <abveritas@chakra-project.org>
Date: Thu, 3 Mar 2011 14:56:03 +0000
Subject: [PATCH 17/21] cbundle/cinstall rebuild with jmc branch, temp
 PKGBUILD, will revert after merge

---
 tools-pkg-cbundle/PKGBUILD  | 10 +++++-----
 tools-pkg-cinstall/PKGBUILD | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools-pkg-cbundle/PKGBUILD b/tools-pkg-cbundle/PKGBUILD
index 70eb86424..dde273a27 100644
--- a/tools-pkg-cbundle/PKGBUILD
+++ b/tools-pkg-cbundle/PKGBUILD
@@ -5,7 +5,7 @@
 # (c) 2010 Drake Justice
 
 pkgname=cbundle
-pkgver=0.3.52
+pkgver=0.3.54
 pkgrel=1
 depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse')
 makedepends=('qt')
@@ -14,13 +14,13 @@ arch=("i686" "x86_64")
 license=('GPL')
 url="http://chakra-project.org/"
 
-source=(http://chakra-project.org/sources/cinstall/cbundle-$pkgver.tar.xz)
-md5sums=('b495d63faec29e1fda6315feaa061baf')
+source=(jmc-88-jmc-88-cbundle-master.tar.gz)
+md5sums=('9bcaf638e582319f3843157dc3dac35e')
 
 # create tarball: source PKGBUILD && mksource
 
 mksource() {
-  git clone git://gitorious.org/cinstall/cbundle.git
+  git clone git://gitorious.org/~jmc-88/cinstall/jmc-88-cbundle.git
   pushd cbundle
   popd
   tar -cvJf ${pkgname}-${pkgver}.tar.xz cbundle/*
@@ -28,7 +28,7 @@ mksource() {
 }
 
 build() {
-        cd "${srcdir}/cbundle"
+        cd "${srcdir}/cinstall-jmc-88-cbundle"
 
         cmake  \
           -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index e3f1d1a2b..84a4fe540 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -6,9 +6,9 @@
 # (c) 2010 Drake Justice
 
 pkgname=cinstall
-pkgver=0.3.53
-pkgrel=2
-depends=('cbundle-tools' 'xz>=5.0.0' 'fakechroot' 'unionfs-fuse' 'cbundle')
+pkgver=0.3.54
+pkgrel=1
+depends=('squashfs-tools' 'xz>=5.0.0' 'fakechroot' 'unionfs-fuse' 'cbundle')
 makedepends=('kdelibs' 'qt')
 pkgdesc="Bundle Creator/Launcher and Package-Manager"
 arch=("i686" "x86_64")
@@ -18,8 +18,8 @@ url="http://chakra-project.org/"
 optdepends=('akabei: for akabei support'
             'pacman: for pacman support')
 
-source=("http://chakra-project.org/sources/cinstall/cinstall-$pkgver.tar.xz")
-md5sums=('c9f1d1d57866fd321fd0c6089dec6e21')
+source=("jmc-88-jmc-88-cinstall-master.tar.gz")
+md5sums=('95e92b42541eddbf93aafe64513de808')
 
 # create tarball: source PKGBUILD && mksource
 
@@ -32,7 +32,7 @@ mksource() {
 }
 
 build() {
-        cd "${srcdir}/cinstall"
+        cd "${srcdir}/cinstall-jmc-88-cinstall"
 
         cmake  \
           -DCMAKE_INSTALL_PREFIX=/usr \

From 26a5beb73f55ca184befdb5d1a414d3af361956d Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Thu, 3 Mar 2011 16:57:04 +0000
Subject: [PATCH 18/21] new tarballs

---
 kde-sc.md5          |  6 +++---
 kdebase/PKGBUILD    | 11 +++--------
 kdeedu/PKGBUILD     |  2 +-
 kdenetwork/PKGBUILD |  2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/kde-sc.md5 b/kde-sc.md5
index 6e6e19799..736a788de 100644
--- a/kde-sc.md5
+++ b/kde-sc.md5
@@ -1,11 +1,11 @@
 60cb5a87c210721155019d0ef334f8f5  kdeaccessibility-4.6.1.tar.bz2
 a3e5aae644fd6cd49de1378e37b5a0e6  kdeadmin-4.6.1.tar.bz2
 b7a96990bff6d53b2519e49dfb8daf67  kdeartwork-4.6.1.tar.bz2
-b2449df6483744eaa373bca86abc2389  kdebase-4.6.1.tar.bz2
+d032fb52e5fdf2eb0b3ab37a7a06eacf  kdebase-4.6.1.tar.bz2
 26ad7899eb589a8bc260749fd22186a8  kdebase-runtime-4.6.1.tar.bz2
 b56385957880f08b664b055ae978d8db  kdebase-workspace-4.6.1.tar.bz2
 bdb0180bdff41ad644155d2071c98c7a  kdebindings-4.6.1.tar.bz2
-fcd8126fe1fc16fa8b7a09baae10842e  kdeedu-4.6.1.tar.bz2
+48503c6bcc58c598ee48b684f662d8fe  kdeedu-4.6.1.tar.bz2
 079faf5198928e595acce2243daad39c  kdegames-4.6.1.tar.bz2
 9a0ca27211e309b57033c93c5c96268e  kdegraphics-4.6.1.tar.bz2
 ff3ba99958a13df96c1249791ee78beb  kde-l10n-ar-4.6.1.tar.bz2
@@ -63,7 +63,7 @@ d2c98100febc94a0dbe75782636f506e  kde-l10n-zh_CN-4.6.1.tar.bz2
 6fae277af3874504e157890539565d0b  kde-l10n-zh_TW-4.6.1.tar.bz2
 0cdc56a73009c65b5ad9ba3167ebb227  kdelibs-4.6.1.tar.bz2
 6028c6e8ad41dfd32f8ae62314766f8f  kdemultimedia-4.6.1.tar.bz2
-a9b304439774fbda1b63e7114a506c1b  kdenetwork-4.6.1.tar.bz2
+f8aefe5e7b5d773745af442009026951  kdenetwork-4.6.1.tar.bz2
 250d3d448c0e2a585b38e2c75c46d07f  kdepimlibs-4.6.1.tar.bz2
 c73ba7a4a3824f4334efd333bf61a3fd  kdeplasma-addons-4.6.1.tar.bz2
 2e199d9299a562b790676cb0455b9b6f  kdesdk-4.6.1.tar.bz2
diff --git a/kdebase/PKGBUILD b/kdebase/PKGBUILD
index 0e8f21310..a8dc5ddba 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"
@@ -41,19 +41,17 @@ 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
+	03_konsole_defaults.patch)
 #	04_konq_scan_nsplugins_at_startup.patch)
 #	feature_user-image-from-webcam.patch)
-        http://chakra-project.org/sources/kdebase/konsole-kde46-20110227.patch.tar.gz)
 
 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
+         '8ab6f508a4e04517dd51ac3ab2eb01ef') # 03_konsole_defaults.patch
 #         'a8dc0bddce464af5846ac722007e0b59') # 04_konq_scan_nsplugins_at_startup.patch
 #         '52cfd4456f8ec830b8d49c8aaa40b539') # feature_user-image-from-webcam.patch
-          'eb22843058c44409ef2cf6adb381e222') # konsole-kde46-20110227.patch.tar.gz
 
 
 #
@@ -83,9 +81,6 @@ build()
 # disabled - needs opencv which depends on gtk2
 #	patch -Np1 -i ${srcdir}/feature_user-image-from-webcam.patch || return 1
 
-        msg "applying temp git patches"
-        patch -Np0 -i ${srcdir}/konsole-kde46-20110227.patch || return 1
-
 	msg "starting build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
 		-DCMAKE_INSTALL_PREFIX=${_installprefix} \
diff --git a/kdeedu/PKGBUILD b/kdeedu/PKGBUILD
index c5c96620d..9d134b334 100644
--- a/kdeedu/PKGBUILD
+++ b/kdeedu/PKGBUILD
@@ -43,7 +43,7 @@ pkgname=('kdeedu-common'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="split package"
 url="http://www.kde.org"
diff --git a/kdenetwork/PKGBUILD b/kdenetwork/PKGBUILD
index 3985dccbe..7cc999cc6 100644
--- a/kdenetwork/PKGBUILD
+++ b/kdenetwork/PKGBUILD
@@ -28,7 +28,7 @@ pkgname=('kdenetwork-common'
 
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="split package"
 url="http://www.kde.org"

From 5c917ca8322cc3350e8e5f4320c9c2cf9b376acd Mon Sep 17 00:00:00 2001
From: abeveritas <abveritas@chakra-project.org>
Date: Thu, 3 Mar 2011 21:48:27 +0000
Subject: [PATCH 19/21] adding konqueror as opdepend to kdebase

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

diff --git a/kdebase/PKGBUILD b/kdebase/PKGBUILD
index a8dc5ddba..8b5534520 100644
--- a/kdebase/PKGBUILD
+++ b/kdebase/PKGBUILD
@@ -99,7 +99,7 @@ package_kdebase()
 {
 	pkgdesc="KDE Base Applications"
 	depends=("kdebase-runtime>=${_kdever}" 'libraw1394') # 'opencv'
-	optdepends=("cdemu-client: Support transparent CD/DVD image mounting in KDE")
+	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

From 02aba09b1cfc0d63f79878a0f57cf6c45cf6ab4f Mon Sep 17 00:00:00 2001
From: abeveritas <abveritas@chakra-project.org>
Date: Fri, 4 Mar 2011 23:20:56 +0000
Subject: [PATCH 20/21] cinstall/cbundle rebuild, fix move to /.cinstall/repo

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

diff --git a/tools-pkg-cbundle/PKGBUILD b/tools-pkg-cbundle/PKGBUILD
index dde273a27..e38e76962 100644
--- a/tools-pkg-cbundle/PKGBUILD
+++ b/tools-pkg-cbundle/PKGBUILD
@@ -5,7 +5,7 @@
 # (c) 2010 Drake Justice
 
 pkgname=cbundle
-pkgver=0.3.54
+pkgver=0.3.55
 pkgrel=1
 depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse')
 makedepends=('qt')
@@ -15,7 +15,7 @@ license=('GPL')
 url="http://chakra-project.org/"
 
 source=(jmc-88-jmc-88-cbundle-master.tar.gz)
-md5sums=('9bcaf638e582319f3843157dc3dac35e')
+md5sums=('e140440ec3cc830ee671767766a3e598')
 
 # create tarball: source PKGBUILD && mksource
 
diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index 84a4fe540..4629c6318 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -6,7 +6,7 @@
 # (c) 2010 Drake Justice
 
 pkgname=cinstall
-pkgver=0.3.54
+pkgver=0.3.55
 pkgrel=1
 depends=('squashfs-tools' 'xz>=5.0.0' 'fakechroot' 'unionfs-fuse' 'cbundle')
 makedepends=('kdelibs' 'qt')
@@ -19,7 +19,7 @@ optdepends=('akabei: for akabei support'
             'pacman: for pacman support')
 
 source=("jmc-88-jmc-88-cinstall-master.tar.gz")
-md5sums=('95e92b42541eddbf93aafe64513de808')
+md5sums=('37f111885e962c7c746f05f9ccf44381')
 
 # create tarball: source PKGBUILD && mksource
 

From 1710a7b6772383161554f13387f0ca1b07c92da0 Mon Sep 17 00:00:00 2001
From: abeveritas <abveritas@chakra-project.org>
Date: Sat, 5 Mar 2011 00:00:31 +0000
Subject: [PATCH 21/21] adding automoc4 to cinstall deps

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

diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index 4629c6318..ee22e15b1 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=cinstall
 pkgver=0.3.55
 pkgrel=1
 depends=('squashfs-tools' 'xz>=5.0.0' 'fakechroot' 'unionfs-fuse' 'cbundle')
-makedepends=('kdelibs' 'qt')
+makedepends=('kdelibs' 'qt' 'automoc4')
 pkgdesc="Bundle Creator/Launcher and Package-Manager"
 arch=("i686" "x86_64")
 license=('GPL')