From 57a8eac956a3743a6592b10ef2e92932b41b4f7a Mon Sep 17 00:00:00 2001
From: abeveritas <abveritas@chakra-project.org>
Date: Wed, 9 Mar 2011 20:02:09 +0000
Subject: [PATCH] rebuild of cbundle/cinstall with gcala branch

---
 tools-pkg-cbundle/PKGBUILD  | 23 ++++++++++++-----------
 tools-pkg-cinstall/PKGBUILD |  9 +++++----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/tools-pkg-cbundle/PKGBUILD b/tools-pkg-cbundle/PKGBUILD
index cc0ed859f..ae3dc220a 100644
--- a/tools-pkg-cbundle/PKGBUILD
+++ b/tools-pkg-cbundle/PKGBUILD
@@ -5,30 +5,31 @@
 # (c) 2010 Drake Justice
 
 pkgname=cbundle
-pkgver=0.3.57
+pkgver=0.3.58
 pkgrel=1
 depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse')
 makedepends=('qt' 'automoc4' 'kdebase-workspace')
 pkgdesc="A shared library for using Chakra software bundles"
+conflicts="cbundle"
 arch=("i686" "x86_64")
 license=('GPL')
 url="http://chakra-project.org/"
 
-source=(jmc-88-jmc-88-cbundle-master.tar.gz)
-md5sums=('680f6f3b1c60b3fc3461db6744e6030d')
+source=(gcala-gcala-cbundle-master.tar.gz)
+md5sums=('5275a25bb9cab1ea98617bd713791fb3')
 
 # create tarball: source PKGBUILD && mksource
 
-mksource() {
-  git clone git://gitorious.org/~jmc-88/cinstall/jmc-88-cbundle.git
-  pushd cbundle
-  popd
-  tar -cvJf ${pkgname}-${pkgver}.tar.xz cbundle/*
-  md5sum ${pkgname}-${pkgver}.tar.xz
-}
+#mksource() {
+#  git clone git://gitorious.org/~jmc-88/cinstall/jmc-88-cbundle.git
+#  pushd cbundle
+#  popd
+#  tar -cvJf ${pkgname}-${pkgver}.tar.xz cbundle/*
+#  md5sum ${pkgname}-${pkgver}.tar.xz
+#}
 
 build() {
-        cd "${srcdir}/cinstall-jmc-88-cbundle"
+        cd "${srcdir}/cinstall-gcala-cbundle"
         
 
         cmake  \
diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD
index 822e03bdb..e94efd219 100644
--- a/tools-pkg-cinstall/PKGBUILD
+++ b/tools-pkg-cinstall/PKGBUILD
@@ -6,11 +6,12 @@
 # (c) 2010 Drake Justice
 
 pkgname=cinstall
-pkgver=0.3.57
+pkgver=0.3.58
 pkgrel=1
 depends=('squashfs-tools' 'xz>=5.0.0' 'fakechroot' 'unionfs-fuse' 'cbundle')
 makedepends=('kdelibs' 'qt' 'automoc4')
 pkgdesc="Bundle Creator/Launcher and Package-Manager"
+conflict="cinstall"
 arch=("i686" "x86_64")
 license=('GPL')
 install=$pkgname.install
@@ -18,8 +19,8 @@ url="http://chakra-project.org/"
 optdepends=('akabei: for akabei support'
             'pacman: for pacman support')
 
-source=("jmc-88-jmc-88-cinstall-master.tar.gz")
-md5sums=('4683a08a0181254cceb50bcfac75ffab')
+source=("gcala-gcala-cinstall-master.tar.gz")
+md5sums=('0d8d43d0c3b64d8191bbc6167e4a2ef2')
 
 # create tarball: source PKGBUILD && mksource
 
@@ -32,7 +33,7 @@ mksource() {
 }
 
 build() {
-        cd "${srcdir}/cinstall-jmc-88-cinstall"
+        cd "${srcdir}/cinstall-gcala-cinstall"
 
         cmake  \
           -DCMAKE_INSTALL_PREFIX=/usr \