packaging: libkdcraw and libkexiv2 have been merged into katanalibs

packaging/archlinux/katana-extraapps/PKGBUILD

@@ -13,11 +13,11 @@ pkgdesc='Katana extra applications'
 # TODO: optdepends=()
 url="http://fluxer.github.io/katana/"
 install="$pkgname.install"
-depends=("katanalibs>=4.16.0" "katana-workspace>=4.16.0" "libkdcraw>=4.16.0"
-    "libkexiv2>=4.16.0" 'taglib' 'libmariadbclient' 'sane' 'libarchive'
-    'poppler-qt4' 'qjson' 'exiv2' 'lcms2' 'libnm-qt4' 'libvncserver' 'ffmpeg'
-    'gettext' 'libmtp' 'libgl' 'parted' 'libcanberra' 'libgpod' 'openconnect'
-    'libmms' 'libofa')
+depends=("katanalibs>=4.16.0" "katana-workspace>=4.16.0"
+        'taglib' 'libmariadbclient' 'sane' 'libarchive' 'poppler-qt4' 'qjson'
+        'exiv2' 'lcms2' 'libnm-qt4' 'libvncserver' 'ffmpeg' 'gettext' 'libmtp'
+        'libgl' 'parted' 'libcanberra' 'libgpod' 'openconnect' 'libmms'
+        'libofa')
 makedepends=('cmake')
 source=("git+https://github.com/fluxer/kde-extraapps.git")
 sha1sums=('SKIP')

packaging/archlinux/katana-workspace/PKGBUILD

@@ -15,7 +15,7 @@ groups=('katana')
 # note on libxdamage:
 # not detected by namcap because libgl depends on it
 # but nvidia providing libgl does not depend on libxdamage
-depends=("katanalibs>=4.16.0" "katana-baseapps>=4.16.0" "libkexiv2>=4.16.0"
+depends=("katanalibs>=4.16.0" "katana-baseapps>=4.16.0"
         'lm_sensors' 'libraw1394' 'qimageblitz' 'xorg-xprop' 'libxdamage'
         'libqalculate' 'libxklavier' 'xorg-xsetroot' 'libxcomposite'
         'libxinerama' 'xorg-xrdb' 'libxres' 'xorg-xrandr' 'xorg-xmessage'

packaging/archlinux/katanalibs/PKGBUILD

@@ -14,8 +14,8 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('katana')
 depends=('libxss' 'krb5' 'qca' 'libdbusmenu-qt' 'perl'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
-        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
-        'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu')
+        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4' 'libraw'
+        'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu' 'exiv2')
 makedepends=('cmake' 'avahi' 'libgl' 'hspell' 'mesa' 'grantlee-qt4')
 install=${pkgname}.install
 source=("git+https://github.com/fluxer/kdelibs.git"
@@ -23,7 +23,7 @@ source=("git+https://github.com/fluxer/kdelibs.git"
 sha1sums=('SKIP'
           '0429e766abe1a27d0e0cf8c7d0167216fc269249'
           '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
-conflicts=('kdelibs')
+conflicts=('kdelibs' 'libkdcraw' 'libkexiv2')
 options=('debug')
 
 pkgver() {

packaging/archlinux/libkdcraw/PKGBUILD

@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Ivailo Monev <xakepa10@gmail.com>
-
-pkgname=libkdcraw
-pkgver=4.16.0.b849505
-pkgrel=1
-pkgdesc="A C++ interface used to decode RAW picture (for use with Katana)"
-arch=('i686' 'x86_64')
-url='http://fluxer.github.io/katana/'
-license=('GPL')
-groups=('katana')
-depends=('katanalibs>=4.16.0' 'libraw')
-source=("git+https://github.com/fluxer/kde-playground.git")
-sha1sums=('SKIP')
-options=('debug')
-
-pkgver() {
-      cd kde-playground
-      printf "4.16.0.%s" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-       mkdir -p build
-}
-
-build() {
-       cd build
-       export PATH="/usr/lib/qt4/bin:$PATH"
-       cmake ../kde-playground/libkdcraw \
-               -DCMAKE_BUILD_TYPE=RelWithDbgInfo \
-               -DKDE4_BUILD_TESTS=OFF \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DCMAKE_INSTALL_PREFIX=/usr
-       make
-}
-
-package() {
-       cd "${srcdir}/build"
-       make DESTDIR="${pkgdir}" install
-}

packaging/archlinux/libkexiv2/PKGBUILD

@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Ivailo Monev <xakepa10@gmail.com>
-
-pkgname=libkexiv2
-pkgver=4.16.0.b849505
-pkgrel=1
-pkgdesc="A library to manipulate pictures metadata (for use with Katana)"
-arch=('i686' 'x86_64')
-url='http://fluxer.github.io/katana/'
-license=('GPL')
-groups=('katana')
-depends=('katanalibs>=4.16.0' 'exiv2')
-source=("git+https://github.com/fluxer/kde-playground.git")
-sha1sums=('SKIP')
-options=('debug')
-
-pkgver() {
-      cd kde-playground
-      printf "4.16.0.%s" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-       mkdir -p build
-}
-
-build() {
-       cd build
-       export PATH="/usr/lib/qt4/bin:$PATH"
-       cmake ../kde-playground/libkexiv2 \
-               -DCMAKE_BUILD_TYPE=RelWithDbgInfo \
-               -DKDE4_BUILD_TESTS=OFF \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DCMAKE_INSTALL_PREFIX=/usr
-       make
-}
-
-package() {
-       cd "${srcdir}/build"
-       make DESTDIR="${pkgdir}" install
-}