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] =?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
 }