Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bird/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/linux-tools/PKGBUILD
	community/qtcurve-kde4/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cups/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kradio/PKGBUILD
	extra/libimobiledevice/PKGBUILD
	extra/libmowgli/PKGBUILD
	extra/llvm/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/pycrypto/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/syslinux/PKGBUILD
	multilib-staging/gcc-multilib/PKGBUILD
	multilib/lib32-libldap/PKGBUILD
	staging/binutils/PKGBUILD
	staging/gcc/PKGBUILD
	staging/glibc/PKGBUILD
	testing/cronie/PKGBUILD
	testing/cryptsetup/PKGBUILD
	testing/krb5/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/net-tools/PKGBUILD
	testing/systemd/PKGBUILD

1 files changed, 29 insertions, 9 deletions

diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 5555bbf7a..2d1c1703d 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 164921 2012-08-06 23:20:54Z andrea $
+# $Id: PKGBUILD 164965 2012-08-07 16:32:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -18,9 +18,10 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-korganizer'
          'kdepim-kresources'
          'kdepim-ktimetracker'
+         'kdepim-ktnef'
          'kdepim-libkdepim')
 pkgver=4.9.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -89,6 +90,10 @@ package_kdepim-console() {
 	install='kdepim.install'
 	cd "${srcdir}"/build/console
 	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kabcclient
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/konsolekalendar
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kaddressbook() {
@@ -137,6 +142,8 @@ package_kdepim-kleopatra() {
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/kleopatra
 	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kwatchgnupg
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kmail() {
@@ -148,8 +155,9 @@ package_kdepim-kmail() {
 	           'kdepim-mimelib' 'kdepim-plugins')
 	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	          'kdepim-mimelib' 'kdepim-plugins')
-	for i in kmail doc/kmail kmailcvt importwizard ksendemail libksieve \
-        messagelist mailfilteragent mailimporter ontologies kontact/plugins/kmail; do
+	for i in kmail doc/kmail kmailcvt archivemailagent backupmail \
+	importwizard ksendemail libksieve messagelist mailfilteragent \
+	mailimporter ontologies kontact/plugins/kmail; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -164,6 +172,8 @@ package_kdepim-knode() {
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/knode
 	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kioslave/news
+	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/kontact/plugins/knode
 	make DESTDIR="${pkgdir}" install
 }
@@ -189,7 +199,7 @@ package_kdepim-kontact() {
 	conflcits=('kdepim-kontactinterfaces')
 	replaces=('kdepim-kontactinterfaces')
 	for i in kontact/src doc/kontact kontact/plugins/summary \
-		kontact/plugins/specialdates; do
+		kontact/plugins/specialdates doc/kontact-admin; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -228,6 +238,16 @@ package_kdepim-ktimetracker() {
 	make DESTDIR="${pkgdir}" install
 }
 
+package_kdepim-ktnef() {
+	pkgdesc='A viewer/extractor for TNEF files'
+	depends=('kdepim-libkdepim')
+	url="https://projects.kde.org/projects/kde/kdepim/ktnef"
+	cd "${srcdir}"/build/ktnef
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/ktnef
+	make DESTDIR="${pkgdir}" install	
+}
+
 package_kdepim-libkdepim() {
 	pkgdesc='Library for KDE PIM'
 	groups=()
@@ -238,10 +258,10 @@ package_kdepim-libkdepim() {
 	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
 	          'kdepim-strigi-analyzer' 'kdepim-akonadi')
 	for i in akonadi_next calendarsupport incidenceeditor-ng \
-		kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-		mailcommon messagecomposer messagecore messageviewer icons \
-		strigi-analyzer templateparser plugins/messageviewer \
-		plugins/ktexteditor; do
+	kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
+	mailcommon messagecomposer messagecore messageviewer icons \
+	strigi-analyzer templateparser plugins/messageviewer \
+	plugins/ktexteditor; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done