[arch-commits] Commit in (10 files)

[Andrea Scarpino]

    Date: Tuesday, September 9, 2014 @ 13:46:42
  Author: andrea
Revision: 221272

Rename baloo 4.14 to baloo4 to fix conflicts with upcoming baloo 5

Added:
  baloo4/
  baloo4/trunk/baloo4.install
    (from rev 221271, baloo/trunk/baloo.install)
Modified:
  baloo4/trunk/PKGBUILD
Deleted:
  baloo/
  baloo4/kde-unstable/
  baloo4/repos/extra-i686/
  baloo4/repos/extra-x86_64/
  baloo4/repos/kde-unstable-i686/
  baloo4/repos/kde-unstable-x86_64/
  baloo4/trunk/baloo.install

-----------------------------+
 baloo4/trunk/baloo4.install |   11 +++++++++
 trunk/PKGBUILD              |   51 ++++++++++++++++++++++++++++++++++--------
 trunk/baloo.install         |   11 ---------
 3 files changed, 53 insertions(+), 20 deletions(-)

Modified: baloo4/trunk/PKGBUILD
===================================================================
--- baloo/trunk/PKGBUILD	2014-09-09 11:09:01 UTC (rev 221271)
+++ baloo4/trunk/PKGBUILD	2014-09-09 11:46:42 UTC (rev 221272)
@@ -1,17 +1,15 @@
 # $Id$
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
-pkgname=baloo
+pkgbase=baloo4
+pkgname=('baloo4' 'baloo4-akonadi' 'libbaloo4')
 pkgver=4.14.0
-pkgrel=1
-pkgdesc="A framework for searching and managing metadata"
+pkgrel=2
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs/baloo'
 license=('LGPL')
-depends=('kdepimlibs' 'xapian-core' 'kfilemetadata')
-makedepends=('cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'xapian-core' 'kfilemetadata')
+source=("http://download.kde.org/stable/${pkgver}/src/baloo-${pkgver}.tar.xz")
 sha1sums=('6aa998d62f9f92c08a3eedc72b050fdb00e7bad0')
 
 prepare() {
@@ -20,13 +18,48 @@
 
 build() {
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../baloo-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
-package() {
+package_baloo4() {
+  pkgdesc='A KDE4 framework for searching and managing metadata'
+  depends=('libbaloo4')
+  replaces=('baloo')
+  conflicts=('baloo<=4.14.0-1')
+  provides=('baloo')
+  install=${pkgname}.install
+
   cd build
   make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts
+  rm -r "${pkgdir}"{/usr/bin/akonadi_baloo_indexer,/usr/include,/usr/lib,/usr/share/akonadi,/usr/share/kde4}
 }
+
+package_baloo4-akonadi() {
+  pkgdesc='Baloo resource for Akonadi'
+  depends=('libbaloo4')
+  conflicts=('baloo<=4.14.0-1')
+
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts
+  rm -r "${pkgdir}"{/etc,/usr/bin/baloo*,/usr/include,/usr/lib,/usr/share/{kde4,autostart,dbus-1,icons,polkit-1}}
+}
+
+package_libbaloo4() {
+  pkgdesc='Libraries for baloo4'
+  depends=('kdepimlibs' 'xapian-core' 'kfilemetadata')
+  conflicts=('baloo<=4.14.0-1')
+
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts
+  rm -r "${pkgdir}"{/etc,/usr/bin,/usr/share/{akonadi,autostart,dbus-1,icons,polkit-1}}
+}
+

Deleted: baloo4/trunk/baloo.install
===================================================================
--- baloo/trunk/baloo.install	2014-09-09 11:09:01 UTC (rev 221271)
+++ baloo4/trunk/baloo.install	2014-09-09 11:46:42 UTC (rev 221272)
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: baloo4/trunk/baloo4.install (from rev 221271, baloo/trunk/baloo.install)
===================================================================
--- baloo4/trunk/baloo4.install	                        (rev 0)
+++ baloo4/trunk/baloo4.install	2014-09-09 11:46:42 UTC (rev 221272)
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}