redo the entire pkgbuild and updates

3 files changed, 95 insertions, 337 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 327f80d5c972..f8b8b372af7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,28 @@
 pkgbase = calligra-git
-	pkgver = r99991.d6cbb49
+	pkgver = 3.1.0.r440.g7f40c71e674
 	pkgrel = 1
 	url = http://www.calligra-suite.org/
 	arch = i686
 	arch = x86_64
-	groups = calligra-git
 	license = FDL1.2
 	license = GPL2
 	license = LGPL
+	makedepends = git
+	makedepends = vc
+	makedepends = libgit2
+	makedepends = extra-cmake-modules
+	makedepends = kdesignerplugin
+	makedepends = kdoctools
+	makedepends = kdelibs4support
+	makedepends = cmake
 	makedepends = khtml
 	makedepends = kross
-	makedepends = kreport-git
-	makedepends = kproperty-git
-	makedepends = kdiagram-git
-	makedepends = okular-frameworks-git
+	makedepends = kreport
+	makedepends = kproperty
+	makedepends = kdiagram
+	makedepends = okular
 	makedepends = kxmlgui
 	makedepends = qt5-webkit
-	makedepends = kdelibs4support
 	makedepends = poppler
 	makedepends = qca-qt5
 	makedepends = libvisio
@@ -30,144 +36,70 @@ pkgbase = calligra-git
 	makedepends = kcalcore
 	makedepends = akonadi-contacts
 	makedepends = knotifyconfig
-	makedepends = okular-frameworks-git
 	makedepends = poppler-qt5
-	makedepends = qt5-quick1
 	makedepends = libodfgen
 	makedepends = threadweaver
 	makedepends = boost
 	makedepends = eigen
-	source = calligra::git+git://anongit.kde.org/calligra
-	md5sums = SKIP
-
-pkgname = calligra-devtools-git
-	pkgdesc = Calligra developer tools
-	depends = calligra-libs-git
-	depends = calligra-words-git
-	depends = calligra-sheets-git
-	depends = poppler-qt5
-	depends = kdelibs4support
-	conflicts = calligra-devtools
-	replaces = calligra-devtools
-
-pkgname = calligra-extras-git
-	pkgdesc = Calligra suite extras
-	install = calligra.install
-	depends = calligra-libs-git
-	depends = calligra-words-git
-	depends = okular-frameworks-git
-	conflicts = calligra-tools
-	conflicts = koffice-templates
-	conflicts = calligra-templats
-	conflicts = calligra-extras
-	replaces = calligra-tools
-	replaces = koffice-templates
-	replaces = calligra-templats
-	replaces = calligra-extras
-
-pkgname = calligra-filters-git
-	pkgdesc = Filters for the Calligra office suite
-	install = calligra.install
+	depends = kcmutils
+	depends = knotifyconfig
+	depends = kross
+	depends = kactivities
+	depends = kdiagram
+	depends = libspnav
 	depends = kdelibs4support
-	depends = poppler
+	depends = gsl
+	depends = openexr
+	depends = kcontacts
 	depends = qca-qt5
-	depends = khtml
+	depends = poppler-qt5
 	depends = libodfgen
+	depends = qt5-webkit
+	depends = cauchy
+	depends = khtml
+	optdepends = libwpg: Corel WordPerfect Graphics image importer
+	optdepends = libwps: Microsoft Works file word processor format import
 	optdepends = libvisio: Microsoft Visio import filter
 	optdepends = libetonyek: Apple Keynote import filter
-	conflicts = koffice-filters
-	conflicts = calligra-filters
-	replaces = koffice-filters
+	optdepends = pstoedit: EPS to SVG filter
+	optdepends = poppler: PDF to SVG filter
+	optdepends = openjpeg: PDF to SVG filer
+	optdepends = libgit2: Calligra Gemini git plugin
+	optdepends = kirigami2: for Calligra Gemini
+	optdepends = qt5-quickcontrols: for Calligra Gemini
+	optdepends = qt5-webengine: for Calligra Gemini
+	provides = calligra
+	conflicts = calligra
+	conflicts = calligra-devtools-git
+	conflicts = calligra-extras-git
+	conflicts = calligra-filters-git
+	conflicts = calligra-karbon-git
+	conflicts = karbon
+	conflicts = calligra-libs-git
+	conflicts = calligra-plugins-git
+	conflicts = calligra-sheets-git
+	conflicts = calligra-stage-git
+	conflicts = calligra-words-git
+	conflicts = calligra-meta
+	conflicts = calligra-flow-git
+	conflicts = calligra-braindump-git
+	conflicts = calligra-gemin-git
+	conflicts = calligra-handbook-git
+	replaces = calligra
+	replaces = calligra-devtools
+	replaces = calligra-extras
 	replaces = calligra-filters
-
-pkgname = calligra-libs-git
-	pkgdesc = Libraries for the Calligra office suite
-	depends = kactivities
-	depends = qca-qt5
-	depends = ilmbase
-	conflicts = koffice-interfaces
-	conflicts = koffice-libs
-	conflicts = koffice-pics
-	conflicts = koffice-servicetypes
-	conflicts = calligra-interfaces
-	conflicts = calligra-pics
-	conflicts = calligra-servicetypes
-	conflicts = calligra-libs
-	replaces = koffice-interfaces
-	replaces = koffice-libs
-	replaces = koffice-pics
-	replaces = koffice-servicetypes
-	replaces = calligra-interfaces
-	replaces = calligra-pics
-	replaces = calligra-servicetypes
+	replaces = calligra-karbon
+	replaces = karbon
 	replaces = calligra-libs
-
-pkgname = calligra-plan-git
-	pkgdesc = Calligra Project Management Component
-	install = calligra.install
-	depends = calligra-words-git
-	depends = kcalcore
-	depends = kreport-git
-	depends = akonadi-contact
-	depends = khtml
-	depends = kdiagram-git
-	depends = kdelibs4support
-	conflicts = koffice-kplato
-	conflicts = calligra-kplato
-	conflicts = calligra-plan
-	replaces = koffice-kplato
-	replaces = calligra-kplato
-	replaces = calligra-plan
-
-pkgname = calligra-plugins-git
-	pkgdesc = Plugins for the Calligra office suite
-	install = calligra.install
-	depends = calligra-libs-git
-	depends = calligra-filters-git
-	depends = kio
-	depends = kdiagram-git
-	depends = ilmbase
-	depends = lcms2
-	depends = libspnav
-	optdepends = marble: map shape for Calligra
-	conflicts = koffice-plugins
-	conflicts = koffice-kchart
-	conflicts = calligra-plugins
-	replaces = koffice-plugins
-	replaces = koffice-kchart
-	replaces = koffice-kformula
 	replaces = calligra-plugins
-
-pkgname = calligra-sheets-git
-	pkgdesc = Write spreadsheet documents
-	install = calligra.install
-	depends = calligra-libs-git
-	depends = gsl
-	depends = kdelibs4support
-	depends = knotifyconfig
-	optdepends = calligra-filters-git: import/export filters
-	optdepends = calligra-plugins: extra calligra plugins
-	optdepends = calligra-extras: extra calligra tools
-	conflicts = koffice-kspread
-	conflicts = koffice-kspread-doc
-	conflicts = calligra-tables-doc
-	conflicts = calligra-tables
-	conflicts = calligra-sheets
-	replaces = koffice-kspread
-	replaces = koffice-kspread-doc
-	replaces = calligra-tables-doc
-	replaces = calligra-tables
 	replaces = calligra-sheets
-
-pkgname = calligra-words-git
-	pkgdesc = Word Processor
-	install = calligra.install
-	depends = calligra-plugins-git
-	depends = okular-frameworks-git
-	depends = kxmlgui
-	optdepends = calligra-extras: extra calligra tools
-	conflicts = koffice-kword
-	conflicts = calligra-words
-	replaces = koffice-kword
+	replaces = calligra-stage
 	replaces = calligra-words
+	replaces = calligra-l10n
+	replaces = calligra-meta
+	source = calligra::git+git://anongit.kde.org/calligra
+	sha256sums = SKIP
+
+pkgname = calligra-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0ae807180bf8..9ac945c12cb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,38 @@
 pkgbase=calligra-git
-pkgname=(
-#	 'calligra-braindump-git'
-         'calligra-devtools-git'
-         'calligra-extras-git'
-         'calligra-filters-git'
-#         'calligra-flow-git'
-#         'calligra-handbook-git'
-#         'calligra-karbon-git'
-         'calligra-libs-git'
-         'calligra-plan-git'
-         'calligra-plugins-git'
-         'calligra-sheets-git'
-#         'calligra-stage-git'
-         'calligra-words-git'
-#         'calligra-gemini-git'
-)
-pkgver=r99991.d6cbb49
+pkgname=('calligra-git')
+pkgver=3.1.0.r440.g7f40c71e674
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('FDL1.2' 'GPL2' 'LGPL')
 url='http://www.calligra-suite.org/'
-makedepends=('khtml' 'kross' 'kreport-git' 'kproperty-git' 'kdiagram-git' 'okular-frameworks-git' 'kxmlgui' 'qt5-webkit' 
-             'kdelibs4support' 'poppler' 'qca-qt5' 'libvisio' 'libetonyek' 'kactivities' 'kio' 'ilmbase' 'lcms2'  'kxmlgui'
-             'marble' 'kcalcore' 'akonadi-contacts' 'knotifyconfig' 'okular-frameworks-git' 'poppler-qt5' 'qt5-quick1' 'libodfgen' 'threadweaver' 'boost' 'eigen')
-groups=('calligra-git')
+makedepends=('git' 'vc' 'libgit2' 'extra-cmake-modules' 'kdesignerplugin' 'kdoctools' 'kdelibs4support' 'cmake' 'khtml' 'kross' 'kreport' 'kproperty' 'kdiagram' 'okular' 'kxmlgui' 'qt5-webkit' 'poppler' 'qca-qt5' 'libvisio' 'libetonyek' 'kactivities' 'kio' 'ilmbase' 'lcms2'  'kxmlgui'
+             'marble' 'kcalcore' 'akonadi-contacts' 'knotifyconfig' 'poppler-qt5' 'libodfgen' 'threadweaver' 'boost' 'eigen')
+depends=('kcmutils'  'knotifyconfig' 'kross' 'kactivities' 'kdiagram' 'libspnav' 'kdelibs4support'
+               'gsl' 'openexr' 'kcontacts' 'qca-qt5' 'poppler-qt5' 'libodfgen' 'qt5-webkit' 'cauchy' 'khtml')
+optdepends=('libwpg: Corel WordPerfect Graphics image importer'
+            'libwps: Microsoft Works file word processor format import'
+            'libvisio: Microsoft Visio import filter'
+            'libetonyek: Apple Keynote import filter'
+            'pstoedit: EPS to SVG filter'
+            'poppler: PDF to SVG filter'
+            'openjpeg: PDF to SVG filer'
+            'libgit2: Calligra Gemini git plugin'
+            'kirigami2: for Calligra Gemini'
+            'qt5-quickcontrols: for Calligra Gemini'
+            'qt5-webengine: for Calligra Gemini')
 source=('calligra::git+git://anongit.kde.org/calligra')
-md5sums=('SKIP')
+sha256sums=('SKIP')
+conflicts=(calligra calligra-devtools-git calligra-extras-git calligra-filters-git calligra-karbon-git karbon calligra-libs-git
+  calligra-plugins-git calligra-sheets-git calligra-stage-git calligra-words-git calligra-meta
+  calligra-flow-git calligra-braindump-git calligra-gemin-git calligra-handbook-git)
+replaces=(calligra calligra-devtools calligra-extras calligra-filters calligra-karbon karbon calligra-libs
+  calligra-plugins calligra-sheets calligra-stage calligra-words calligra-l10n calligra-meta)
+
+provides=('calligra')
 
 pkgver() {
   cd calligra
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+   git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -53,178 +56,13 @@ build() {
   cd ${srcdir}/build
   cmake  ../calligra -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release \
-      -DLIB_INSTALL_DIR=lib \
-      -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+      -DCMAKE_INSTALL_LIBDIR=lib \
       -DBUILD_TESTING=OFF  -Wno-dev
-  make    
-}
-
-package_calligra-filters-git() {
-  pkgdesc="Filters for the Calligra office suite"
-  depends=('kdelibs4support' 'poppler' 'qca-qt5' 'khtml' 'libodfgen')
-  optdepends=('libvisio: Microsoft Visio import filter'
-              'libetonyek: Apple Keynote import filter')
-  conflicts=('koffice-filters' 'calligra-filters')
-  replaces=('koffice-filters' 'calligra-filters')
-  install=calligra.install
-
-  cd build/filters
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-libs-git() {
-  pkgdesc="Libraries for the Calligra office suite"
-  depends=('kactivities' 'qca-qt5' 'ilmbase')
-  conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
-             'koffice-servicetypes' 'calligra-interfaces'
-             'calligra-pics' 'calligra-servicetypes' 'calligra-libs')
-  replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
-             'koffice-servicetypes' 'calligra-interfaces'
-             'calligra-pics' 'calligra-servicetypes' 'calligra-libs')
-
-  for d in interfaces libs pics servicetypes; do
-    cd "${srcdir}"/build/${d}
-    make DESTDIR="${pkgdir}" install
-  done
-}
-
-package_calligra-plugins-git() {
-  pkgdesc="Plugins for the Calligra office suite"
-  depends=('calligra-libs-git' 'calligra-filters-git' 'kio' 'kdiagram-git' 'ilmbase' 'lcms2' 'libspnav')
-  optdepends=('marble: map shape for Calligra')
-  conflicts=('koffice-plugins' 'koffice-kchart' 'calligra-plugins')
-  replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula' 'calligra-plugins')
-  install=calligra.install
-
-  cd build/plugins
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-karbon-git() {
-  pkgdesc="Create scalable vector drawings"
-  depends=('calligra-libs-git' 'kxmlgui')
-  optdepends=('calligra-filters-git: import/export filters'
-              'calligra-extras: extra calligra tools')
-  conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc' 'calligra-karbon')
-  replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc' 'calligra-karbon')
-  install=calligra.install
-
-  cd build/karbon
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-plan-git() {
-  pkgdesc="Calligra Project Management Component"
-  depends=('calligra-words-git' 'kcalcore' 'kreport-git' 'akonadi-contact' 'khtml' 'kdiagram-git' 'kdelibs4support')
-  conflicts=('koffice-kplato' 'calligra-kplato' 'calligra-plan')
-  replaces=('koffice-kplato' 'calligra-kplato' 'calligra-plan')
-  install=calligra.install
-
-  cd build/plan
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-stage-git() {
-  pkgdesc="Write presentation documents"
-  depends=('calligra-plugins-git' 'qt5-webkit' 'kio')
-  conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc' 'calligra-stage')
-  replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc' 'calligra-stage')
-  install=calligra.install
-
-  cd build/stage
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-sheets-git() {
-  pkgdesc="Write spreadsheet documents"
-  depends=('calligra-libs-git' 'gsl' 'kdelibs4support' 'knotifyconfig')
-  optdepends=('calligra-filters-git: import/export filters'
-              'calligra-plugins: extra calligra plugins'
-              'calligra-extras: extra calligra tools')
-  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables' 'calligra-sheets')
-  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables' 'calligra-sheets')
-  install=calligra.install
-
-  cd build/sheets
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-words-git() {
-  pkgdesc="Word Processor"
-  depends=('calligra-plugins-git' 'okular-frameworks-git' 'kxmlgui')
-  optdepends=('calligra-extras: extra calligra tools')
-  conflicts=('koffice-kword' 'calligra-words')
-  replaces=('koffice-kword' 'calligra-words')
-  install=calligra.install
-
-  cd build/words
-  make DESTDIR="${pkgdir}" install
-}
-
-# package_calligra-handbook-git() {
-#   pkgdesc="Documentation for Calligra"
-#   conflicts=('koffice-handbook' 'calligra-handbook')
-#   replaces=('koffice-handbook' 'calligra-handbook')
-#   options=('docs')
-# 
-#   cd build/doc/calligra
-#   make DESTDIR="${pkgdir}" install
-# }
-
-package_calligra-braindump-git() {
-  pkgdesc="Notes and idea gathering"
-  depends=('calligra-libs-git'  'kxmlgui' 'qt5-webkit')
-  conflicts=('calligra-braindump')
-  replaces=('calligra-braindump')
-  install=calligra.install
-
-  cd build/braindump
-  make DESTDIR="${pkgdir}" install
+  make
 }
 
-# package_calligra-flow-git() {
-#   pkgdesc="Flowchart & Diagram Editing"
-#   depends=('calligra-words-git')
-#   optdepends=('calligra-karbon: to export the charts in various formats')
-#   conflicts=('calligra-flow-doc' 'calligra-flow')
-#   replaces=('calligra-flow-doc' 'calligra-flow')
-#   install=calligra.install
-# 
-#   cd build/flow
-#   make DESTDIR="${pkgdir}" install
-# }
-
-package_calligra-extras-git() {
-  pkgdesc="Calligra suite extras"
-  depends=('calligra-libs-git' 'calligra-words-git' 'okular-frameworks-git')
-  conflicts=('calligra-tools' 'koffice-templates' 'calligra-templats' 'calligra-extras')
-  replaces=('calligra-tools' 'koffice-templates' 'calligra-templats' 'calligra-extras')
-  install=calligra.install
-
-  cd build/extras
-  make DESTDIR="${pkgdir}" install
-
-  cd ../data
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-devtools-git() {
-  pkgdesc="Calligra developer tools"
-  depends=('calligra-libs-git' 'calligra-words-git' 'calligra-sheets-git' 'poppler-qt5' 'kdelibs4support')
-  conflicts=('calligra-devtools')
-  replaces=('calligra-devtools')
-  cd build/devtools
-  make DESTDIR="${pkgdir}" install
+package() {
+  cd ${srcdir}/build
+  make DESTDIR="$pkgdir" install
 }
 
-package_calligra-gemini-git() {
-  pkgdesc="QML interface for Calligra Words and Stage"
-  depends=('calligra-words-git' 'calligra-stage-git' 'kxmlgui' 'qt5-quick1')
-  install=calligra.install
-  conflicts=('calligra-gemini')
-  replaces=('calligra-gemini')
-  cd build/qtquick
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/gemini
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/calligra.install b/calligra.install
deleted file mode 100644
index 3f06b8deb57f..000000000000
--- a/calligra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}