packaging: cleanup

packaging/archlinux/katana-baseapps/PKGBUILD

@@ -5,7 +5,7 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=katana-baseapps
-pkgver=4.16.0
+pkgver=4.16.0.4acfa51
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -18,9 +18,11 @@ optdepends=('katana-extraapps: thumbnailers for development, audio, video and ot
 url="http://fluxer.github.io/katana/"
 install="$pkgname.install"
 depends=("katanalibs>=4.16.0" 'qjson')
-makedepends=('cmake' 'tidyhtml')
+makedepends=('cmake' 'tidyhtml') # TODO: pykde4
 source=("git+https://github.com/fluxer/kde-baseapps.git")
 sha1sums=('SKIP')
+options=('debug')
+
 conflicts=('kdebase-dolphin'
          'kdebase-kdepasswd'
          'kdebase-kdialog'
@@ -29,9 +31,8 @@ conflicts=('kdebase-dolphin'
          'kdebase-konq-plugins'
          'kdebase-konqueror'
          'kdebase-lib'
-         'kdebase-plasma')
-options=('debug')
-
+         'kdebase-plasma'
+         'kdebase-katepart' 'katepart4')
 
 pkgver() {
     cd kde-baseapps

packaging/archlinux/katana-extraapps/PKGBUILD

@@ -3,7 +3,7 @@
 # TODO: split into small packages
 
 pkgname=katana-extraapps
-pkgver=4.16.0.cdc95cf
+pkgver=4.16.0.1c77cc4
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -20,9 +20,9 @@ depends=("katanalibs>=4.16.0" "katana-workspace>=4.16.0" "libkdcraw>=4.16.0"
 makedepends=('cmake')
 source=("git+https://github.com/fluxer/kde-extraapps.git")
 sha1sums=('SKIP')
-# TODO: conflicts=()
 options=('debug')
 
+conflicts=('kdeutils-ark')
 
 pkgver() {
     cd kde-extraapps

packaging/archlinux/katana-workspace/PKGBUILD

@@ -5,7 +5,7 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=katana-workspace
-pkgver=4.16.0
+pkgver=4.16.0.a4c9ed7
 pkgrel=1
 pkgdesc="Katana workspace interface and basic tools"
 arch=('i686' 'x86_64')
@@ -37,9 +37,10 @@ sha1sums=('SKIP'
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
           'aa9d2e5a69986c4c3d47829721ea99edb473be12')
-conflicts=('kdebase-workspace')
 options=('debug')
 
+conflicts=('kdebase-workspace' 'kdebase-runtime')
+
 pkgver() {
     cd kde-workspace
     printf "4.16.0.%s" "$(git rev-parse --short HEAD)"
@@ -88,10 +89,10 @@ package() {
     install -vd -g 135 -o 135 "${pkgdir}/var/lib/kdm"
     install -vD -m644 "${srcdir}/kdm.service" \
       "${pkgdir}/usr/lib/systemd/system/kdm.service"
-    install -vDm644 "${srcdir}"/kdm.logrotate "${pkgdir}/etc/logrotate.d/kdm"
+    install -vDm644 "${srcdir}/kdm.logrotate" "${pkgdir}/etc/logrotate.d/kdm"
 
-    ln -vsf /usr/lib/katana/libexec/kdesu "${pkgdir}/usr/bin/"
+    ln -vsf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
     # FS#36668
-    chown -v :nobody "${pkgdir}/usr/lib/katana/libexec/kdesud"
-    chmod -v g+s "${pkgdir}/usr/lib/katana/libexec/kdesud"
+    chown -v :nobody "${pkgdir}/usr/lib/kde4/libexec/kdesud"
+    chmod -v g+s "${pkgdir}/usr/lib/kde4/libexec/kdesud"
 }

packaging/archlinux/katanalibs/PKGBUILD

@@ -5,7 +5,7 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=katanalibs
-pkgver=4.16.0.9535e0c
+pkgver=4.16.0.7328e8a
 pkgrel=1
 pkgdesc="Katana core libraries"
 arch=('i686' 'x86_64')
@@ -35,7 +35,7 @@ prepare() {
     mkdir -p build
     cd kdelibs
     # avoid file conflict with gnome-menus and kservice
-    patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+    patch -p1 -i "${srcdir}/kde-applications-menu.patch"
     # add Archlinux menu entry
     patch -p1 -i "${srcdir}/archlinux-menu.patch"
 }
@@ -50,7 +50,7 @@ build() {
         -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DSYSCONF_INSTALL_DIR=/etc \
-        -DLOCALE_INSTALL_DIR=/usr/share/locale/katana \
+        -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
         -DKDE_DEFAULT_HOME='.katana' \
         -DWITH_FAM=OFF \
         -DWITH_SOLID_UDISKS2=ON

packaging/archlinux/libkdcraw/PKGBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Ivailo Monev <xakepa10@gmail.com>
 
 pkgname=libkdcraw
-pkgver=4.16.0.41bd5bc
+pkgver=4.16.0.b849505
 pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture (for use with Katana)"
 arch=('i686' 'x86_64')
@@ -12,8 +12,6 @@ groups=('katana')
 depends=('katanalibs>=4.16.0' 'libraw')
 source=("git+https://github.com/fluxer/kde-playground.git")
 sha1sums=('SKIP')
-conflicts=('libkdcraw')
-provides=('libkdcraw')
 options=('debug')
 
 pkgver() {

packaging/archlinux/libkexiv2/PKGBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Ivailo Monev <xakepa10@gmail.com>
 
 pkgname=libkexiv2
-pkgver=4.16.0.41bd5bc
+pkgver=4.16.0.b849505
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata (for use with Katana)"
 arch=('i686' 'x86_64')
@@ -12,8 +12,6 @@ groups=('katana')
 depends=('katanalibs>=4.16.0' 'exiv2')
 source=("git+https://github.com/fluxer/kde-playground.git")
 sha1sums=('SKIP')
-conflicts=('libkexiv2')
-provides=('libkexiv2')
 options=('debug')
 
 pkgver() {