Sun Oct 21 01:55:44 PDT 2012

1 files changed, 23 insertions, 58 deletions

diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 61f297008..73b65af15 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,15 +1,11 @@
-# $Id: PKGBUILD 168545 2012-10-13 09:58:07Z andrea $
+# $Id: PKGBUILD 169384 2012-10-20 09:31:33Z andyrtr $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=calligra
 pkgname=('calligra-filters'
-         'calligra-interfaces'
          'calligra-libs'
          'calligra-plugins'
-         'calligra-pics'
-         'calligra-servicetypes'
-         'calligra-templates'
          'calligra-tools'
          'calligra-karbon'
          'calligra-kexi'
@@ -22,14 +18,14 @@ pkgname=('calligra-filters'
          'calligra-braindump'
          'calligra-flow')
 pkgver=2.5.3
-pkgrel=2
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
 makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'lcms2' 'libmysqlclient' 'libpqxx' 'freetds' 'xbase' 'libwpg'
              'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
-             'openjpeg' 'kdegraphics-okular' 'pstoedit')
+             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
 md5sums=('83e2679b7ecb923b953ace06db7ca4c2')
@@ -56,24 +52,22 @@ package_calligra-filters() {
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-interfaces() {
-  pkgdesc="Interfaces for the Calligra office suite"
-  depends=('calligra-libs')
-  conflicts=('koffice-interfaces')
-  replaces=('koffice-interfaces')
-
-  cd "${srcdir}"/build/interfaces
-  make DESTDIR="${pkgdir}" install
-}
-
 package_calligra-libs() {
   pkgdesc="Libraries for the Calligra office suite"
-  depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes')
-  conflicts=('koffice-libs')
-  replaces=('koffice-libs')
-
-  cd "${srcdir}"/build/libs
-  make DESTDIR="${pkgdir}" install
+  depends=('kdepimlibs' 'lcms2')
+  conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
+             'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
+             'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
+             'calligra-templates')
+  replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
+             'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
+             'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
+             'calligra-templates')
+
+  for d in interfaces libs pics servicetypes templates; do
+    cd "${srcdir}"/build/${d}
+    make DESTDIR="${pkgdir}" install
+  done
 }
 
 package_calligra-plugins() {
@@ -87,35 +81,6 @@ package_calligra-plugins() {
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-pics() {
-  pkgdesc="Icons for the Calligra office suite"
-  conflicts=('koffice-pics')
-  replaces=('koffice-pics')
-  install=calligra.install
-
-  cd "${srcdir}"/build/pics
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-servicetypes() {
-  pkgdesc="Servicetypes for the Calligra office suite"
-  conflicts=('koffice-servicetypes')
-  replaces=('koffice-servicetypes')
-  install=calligra.install
-
-  cd "${srcdir}"/build/servicetypes
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-templates() {
-  pkgdesc="Templates for the Calligra office suite"
-  conflicts=('koffice-templates')
-  replaces=('koffice-templates')
-
-  cd "${srcdir}"/build/templates
-  make DESTDIR="${pkgdir}" install
-}
-
 package_calligra-tools() {
   pkgdesc="Tools for the Calligra office suite"
   depends=('calligra-libs')
@@ -129,7 +94,7 @@ package_calligra-tools() {
 
 package_calligra-karbon() {
   pkgdesc="Create scalable vector drawings"
-  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime' 'pstoedit')
+  depends=('calligra-libs' 'kdebase-runtime' 'pstoedit')
   optdepends=('calligra-filters: import/export filters'
               'calligra-tools: extra calligra tools')
   conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
@@ -142,7 +107,7 @@ package_calligra-karbon() {
 
 package_calligra-kexi() {
   pkgdesc="Develop desktop database applications"
-  depends=('calligra-libs' 'calligra-templates' 'glew' 'fftw')
+  depends=('calligra-libs' 'glew' 'fftw')
   optdepends=('libmysqlclient: MySQL driver'
               'libpqxx: PostgreSQL driver'
               'freetds: Sybase & MS SQL driver'
@@ -173,7 +138,7 @@ package_calligra-plan() {
 
 package_calligra-stage() {
   pkgdesc="Write presentation documents"
-  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
+  depends=('calligra-libs' 'kdebase-runtime')
   optdepends=('calligra-plugins: extra calligra plugins')
   conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
   replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
@@ -187,7 +152,7 @@ package_calligra-stage() {
 
 package_calligra-krita() {
   pkgdesc="Edit and paint images"
-  depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime' 'eigen2'
+  depends=('calligra-plugins' 'kdebase-runtime' 'eigen2'
            'poppler-qt' 'libkdcraw' 'fftw' 'glew' 'opengtl')
   conflicts=('koffice-krita' 'calligra-krita-doc')
   replaces=('koffice-krita' 'calligra-krita-doc')
@@ -199,7 +164,7 @@ package_calligra-krita() {
 
 package_calligra-sheets() {
   pkgdesc="Write spreadsheet documents"
-  depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime')
+  depends=('calligra-libs' 'gsl' 'kdebase-runtime')
   optdepends=('calligra-filters: import/export filters'
               'calligra-plugins: extra calligra plugins'
               'calligra-tools: extra calligra tools')
@@ -215,7 +180,7 @@ package_calligra-sheets() {
 
 package_calligra-words() {
   pkgdesc="Word Processor"
-  depends=('calligra-templates' 'calligra-pics' 'calligra-plugins' 'kdegraphics-okular')
+  depends=('calligra-libs' 'kdegraphics-okular')
   optdepends=('calligra-tools: extra calligra tools')
   conflicts=('koffice-kword')
   replaces=('koffice-kword')