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

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

3 files changed, 33 insertions, 27 deletions

diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD
index c17257010..56a5e6907 100644
--- a/extra/koffice/PKGBUILD
+++ b/extra/koffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 139889 2011-10-05 19:06:53Z andrea $
+# $Id: PKGBUILD 140575 2011-10-17 08:14:55Z jgc $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -37,17 +37,17 @@ pkgname=(
 #	'koffice-kdgantt' # still an empty package
 )
 pkgver=2.3.3
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64' 'mips64el') 
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
              'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
-             'libwpg' 'opengtl' 'libkdcraw')
+             'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons')
 [ "$CARCH" = "mips64el" ] && \
 makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
              'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
-             'libwpg' 'libkdcraw')
+             'libwpg' 'libkdcraw' 'oxygen-icons')
 groups=('koffice')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
         'kde4-koffice-libwpg02.patch' 'gcc46.patch')
@@ -59,7 +59,7 @@ build() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
 
 	patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
-    patch -p1 -i "${srcdir}"/gcc46.patch
+	patch -p1 -i "${srcdir}"/gcc46.patch
 
 	cd "${srcdir}"
 	mkdir build
@@ -75,9 +75,12 @@ build() {
 
 package_koffice-filters(){
 	pkgdesc="Filters for the KDE office suite"
-    optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
-        'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
-        'libkdcraw: support for raw images')
+	depends=('shared-mime-info')
+	optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
+                   'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
+                   'libkdcraw: support for raw images' 'poppler: support for pdf' 
+		   'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters'
+		   'koffice-kplato: Kplato filters')
 	install=filters.install
         cd "${srcdir}/build/filters"
         make DESTDIR="${pkgdir}" install
@@ -85,14 +88,14 @@ package_koffice-filters(){
 
 package_koffice-interfaces(){
 	pkgdesc="Interfaces for the KDE office suite"
-	depends=('kdelibs' 'koffice-libs')
+	depends=('koffice-libs')
 	cd "${srcdir}/build/interfaces"
 	make DESTDIR="${pkgdir}" install
 }
 
 package_koffice-libs(){
 	pkgdesc="Libs for the KDE office suite"
-	depends=('kdepimlibs' 'qca' 'lcms' 'koffice-servicetypes')
+	depends=('kdepimlibs' 'lcms' 'koffice-servicetypes')
         cd "${srcdir}/build/libs"
         make DESTDIR="${pkgdir}" install
 }
@@ -108,6 +111,7 @@ package_koffice-plugins(){
 
 package_koffice-pics(){
 	pkgdesc="Icons for the KDE office suite"
+	depends=('desktop-file-utils' 'xdg-utils')
 	install=koffice.install
         cd "${srcdir}/build/pics"
         make DESTDIR="${pkgdir}" install
@@ -127,7 +131,7 @@ package_koffice-templates(){
 
 package_koffice-tools(){
 	pkgdesc="Tools for the KDE office suite"
-	depends=('koffice-libs')
+	depends=('koffice-libs' 'oxygen-icons')
         cd "${srcdir}/build/tools"
         make DESTDIR="${pkgdir}" install
 }
@@ -138,7 +142,7 @@ package_koffice-tools(){
 
 package_koffice-karbon(){
 	pkgdesc="Vector drawing application for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates')
+	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
         optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd "${srcdir}/build/karbon"
@@ -153,7 +157,8 @@ package_koffice-karbon-doc(){
 
 package_koffice-kexi(){
         pkgdesc="Integrated data management application for the KDE office suite"
-        depends=('kdelibs' 'koffice-libs' 'koffice-kspread' 'sqlite3')
+        depends=('koffice-kspread' 'oxygen-icons')
+	install=koffice.install
         cd "${srcdir}/build/kexi"
         make DESTDIR="${pkgdir}" install
 }
@@ -166,7 +171,8 @@ package_koffice-kexi-doc(){
 
 package_koffice-kformula(){
         pkgdesc="Formula editor for the KDE office suite"
-		depends=('kdelibs' 'koffice-libs')
+	depends=('koffice-libs')
+	install=koffice.install
         cd "${srcdir}/build/kformula"
         make DESTDIR="${pkgdir}" install
 }
@@ -180,15 +186,14 @@ package_koffice-kformula-doc() {
 
 package_koffice-kounavail(){
 	pkgdesc="Kounavail for the KDE office suite"
-	depends=('kdelibs' 'koffice-libs')
+	depends=('koffice-libs')
         cd "${srcdir}/build/kounavail"
         make DESTDIR="${pkgdir}" install
 }
 
 package_koffice-kplato(){
 	pkgdesc="Project management application for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs' 'koffice-templates' \
-		'koffice-plugins' 'koffice-kword')
+	depends=('koffice-kword' 'oxygen-icons')
 	install=koffice.install
         cd "${srcdir}/build/kplato"
         make DESTDIR="${pkgdir}" install
@@ -202,7 +207,7 @@ package_koffice-kplato(){
 
 package_koffice-kpresenter(){
 	pkgdesc="Presentation tool for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates')
+	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
         optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd "${srcdir}/build/kpresenter"
@@ -217,13 +222,12 @@ package_koffice-kpresenter-doc(){
 
 package_koffice-krita(){
 	pkgdesc="Graphics editor for KDE"
-	depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \
-		'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \
-		'openexr' 'opengtl')
+	depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \
+		 'koffice-plugins' 'poppler-qt' 'opengtl')
+        optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images')
 [ "$CARCH" = "mips64el" ] && \
-	depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \
-		'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \
-		'openexr')
+	depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \
+		 'koffice-plugins' 'poppler-qt')
         optdepends=('koffice-filters: import/export filters')
 	install=krita.install
         cd "${srcdir}/build/krita"
@@ -239,7 +243,7 @@ package_koffice-krita(){
 
 package_koffice-kspread(){
 	pkgdesc="Spreadsheet application for KDE"
-	depends=('hicolor-icon-theme' 'gsl' 'koffice-libs' 'koffice-templates' 'koffice-plugins')
+	depends=('gsl' 'koffice-templates' 'koffice-plugins' 'oxygen-icons')
 	optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd "${srcdir}/build/kspread"
@@ -254,7 +258,7 @@ package_koffice-kspread-doc(){
 
 package_koffice-kword(){
 	pkgdesc="Wordprocessor for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates' 'koffice-pics' \
+	depends=('koffice-templates' 'koffice-pics' 'oxygen-icons' \
 		'koffice-kounavail' 'koffice-plugins')
         optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
diff --git a/extra/koffice/koffice.install b/extra/koffice/koffice.install
index e70c054ec..6c87527e2 100644
--- a/extra/koffice/koffice.install
+++ b/extra/koffice/koffice.install
@@ -1,5 +1,6 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/koffice/krita.install b/extra/koffice/krita.install
index ce5c32e1b..5d458de55 100644
--- a/extra/koffice/krita.install
+++ b/extra/koffice/krita.install
@@ -1,6 +1,7 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 	update-mime-database usr/share/mime &> /dev/null
+	update-desktop-database -q
 }
 
 post_upgrade() {
@@ -9,4 +10,4 @@ post_upgrade() {
 
 post_remove() {
 	post_install
-}
\ No newline at end of file
+}