[arch-commits] Commit in calligra/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Thursday, September 3, 2015 @ 14:04:21
  Author: arojas
Revision: 245228

Update dependencies, drop old koffice conflicts/replaces

Modified:
  calligra/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++++-----------------------------------
 1 file changed, 7 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-03 10:11:05 UTC (rev 245227)
+++ PKGBUILD	2015-09-03 12:04:21 UTC (rev 245228)
@@ -25,9 +25,9 @@
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen' 'libmarble4'
+makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' 'libmarble4'
              'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
-             'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt' 'libkdcraw' 'libodfgen'
+             'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libkdcraw' 'libodfgen'
              'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio'
              'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2'
 groups=('calligra')
@@ -69,8 +69,6 @@
               'libwps: Microsoft Works file word processor format import'
               'libvisio: Microsoft Visio import filter'
               'libetonyek: Apple Keynote import filter')
-  conflicts=('koffice-filters')
-  replaces=('koffice-filters')
   install=calligra-filters.install
 
   cd build/filters
@@ -79,13 +77,9 @@
 
 package_calligra-libs() {
   pkgdesc="Libraries for the Calligra office suite"
-  depends=('kdepimlibs' 'kactivities' 'libkactivities4')
-  conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
-             'koffice-servicetypes' 'calligra-interfaces'
-             'calligra-pics' 'calligra-servicetypes')
-  replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
-             'koffice-servicetypes' 'calligra-interfaces'
-             'calligra-pics' 'calligra-servicetypes')
+  depends=('kdepimlibs4' 'libkactivities4')
+  conflicts=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes')
+  replaces=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes')
 
   for d in interfaces libs pics servicetypes; do
     cd "${srcdir}"/build/${d}
@@ -97,8 +91,6 @@
   pkgdesc="Plugins for the Calligra office suite"
   depends=('calligra-libs' 'calligra-filters' 'libspnav')
   optdepends=('libmarble4: map shape for Calligra')
-  conflicts=('koffice-plugins' 'koffice-kchart')
-  replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula')
   install=calligra-plugins.install
 
   cd build/plugins
@@ -113,8 +105,6 @@
   depends=('calligra-libs' 'kdebase-runtime' 'pstoedit')
   optdepends=('calligra-filters: import/export filters'
               'calligra-extras: extra calligra tools')
-  conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
-  replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
   install=calligra-karbon.install
 
   cd build/karbon
@@ -131,8 +121,6 @@
               'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
               'libmarble4: map form widget'
               'calligra-plugins: extra calligra plugins')
-  conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
-  replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
   install=calligra-kexi.install
 
   cd build/kexi
@@ -144,8 +132,6 @@
 package_calligra-plan() {
   pkgdesc="Calligra Project Management Component"
   depends=('calligra-words')
-  conflicts=('koffice-kplato' 'calligra-kplato')
-  replaces=('koffice-kplato' 'calligra-kplato')
   install=calligra-plan.install
 
   cd build/plan
@@ -158,8 +144,6 @@
 package_calligra-stage() {
   pkgdesc="Write presentation documents"
   depends=('calligra-plugins' 'kdebase-runtime')
-  conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
-  replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
   install=calligra-stage.install
 
   cd build/stage
@@ -172,8 +156,6 @@
   pkgdesc="Edit and paint images"
   depends=('calligra-plugins' 'kdebase-runtime' 'opencolorio' 'libkdcraw'
            'fftw' 'glew' 'curl' 'gsl')
-  conflicts=('koffice-krita' 'calligra-krita-doc')
-  replaces=('koffice-krita' 'calligra-krita-doc')
   install=calligra-krita.install
 
   cd build/krita
@@ -186,8 +168,6 @@
   optdepends=('calligra-filters: import/export filters'
               'calligra-plugins: extra calligra plugins'
               'calligra-extras: extra calligra tools')
-  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
-  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
   install=calligra-sheets.install
 
   cd build/sheets
@@ -200,8 +180,6 @@
   pkgdesc="Word Processor"
   depends=('kdebase-runtime' 'calligra-plugins')
   optdepends=('calligra-extras: extra calligra tools')
-  conflicts=('koffice-kword')
-  replaces=('koffice-kword')
   install=calligra-words.install
 
   cd build/words
@@ -210,8 +188,6 @@
 
 package_calligra-handbook() {
   pkgdesc="Documentation for Calligra"
-  conflicts=('koffice-handbook')
-  replaces=('koffice-handbook')
   options=('docs')
 
   cd build/doc/calligra
@@ -231,8 +207,6 @@
   pkgdesc="Flowchart & Diagram Editing"
   depends=('calligra-words')
   optdepends=('calligra-karbon: to export the charts in various formats')
-  conflicts=('calligra-flow-doc')
-  replaces=('calligra-flow-doc')
   install=calligra-flow.install
 
   cd build/flow
@@ -243,8 +217,8 @@
   pkgdesc="Calligra suite extras"
   depends=('calligra-libs')
   optdepends=('kdegraphics-okular')
-  conflicts=('calligra-tools' 'koffice-templates' 'calligra-templats')
-  replaces=('calligra-tools' 'koffice-templates' 'calligra-templats')
+  conflicts=('calligra-tools')
+  replaces=('calligra-tools')
   install=calligra-extras.install
 
   cd build/extras
@@ -273,5 +247,3 @@
   cd "${srcdir}"/build/gemini
   make DESTDIR="${pkgdir}" install
 }
-
-