[media-gfx/digikam] Cleanup, but the last patchset is kept

(Portage version: 2.1.8.3/git/Linux x86_64)
 (Signed Manifest commit)

4 files changed, 13 insertions, 368 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index a49ebc5d63..0fb7636188 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,32 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX digikam-1.3.0-clapack.patch 7182 RMD160 f0b8bfe449091e24d69bb54de6592fddf3e54c1c SHA1 6b70ac686c9ea0d1d5cb93a5d00f49ea1227f9c9 SHA256 273723c1bcd9bab8d5c301eeebfe572d3c8a5ef82a18a69eff424cb32722807a
 AUX digikam-1.3.0-docs.patch 1910 RMD160 c4d644e91a0b492c8c9a8e53ed0ae19fa743dabc SHA1 6d3c6519e4d7351198f6275639afe448e09d92b7 SHA256 d8048791e9623fe99796d71bc835ac568786b4c5a643b3d02c6d80472e725b99
 AUX digikam-1.3.0-pgf.patch 6006 RMD160 bfda7c95a633f4967935545f66d850fd94db9566 SHA1 43295130d7a62dc27097ed9730b3b47e13f2ab3f SHA256 84c219c7238790288b90acdb255bce2e40e3c5f19476885a2d456698e2f57205
 AUX digikam-1.4.0-clapack.patch 7429 RMD160 a10cf8ff044e42cfbb3880ed543b3df0221655e6 SHA1 7cd6461ff474503124a3116b8dfd8bb264c5afb6 SHA256 1e2f1d11a612f1cff63acc46db5e5818a438d35d5aaef5b40ea6633b1f4b079e
 AUX digikam-9999-clapack.patch 6396 RMD160 9f01f1f23695d8028efb95a40d106d9a2f80b34f SHA1 9350060f5f00a61c8415852f26d1086e8216012b SHA256 7644578418050706d748473a8b754b62a1fc937211798a4cd99c0bc1927cae82
 AUX digikam-9999-pgf.patch 8403 RMD160 2d43ccab4f165c3bcc893bb8cf3ba1481ec71de0 SHA1 7fc88e4756913c3cf4e5a99feb55c050e8fffb46 SHA256 02f46df5e8280f45996ce9a854dc628aff470b982ae8d24055ec819c4450d380
-DIST digikam-1.3.0.tar.bz2 14990462 RMD160 45f6bc4ee80df278eb85f3de9eab9b221ee94377 SHA1 99ab242f075d7d5368b66996fffeed5dfd738cbe SHA256 76184c5e193b8338894db6a8c4af4bc773beb819856a83ae163529aefcc10321
-DIST digikam-1.4.0.tar.bz2 14907229 RMD160 a78656044bcc42f21794c1c4a25dcaaf869df38d SHA1 a3370f2d2c469fa5b90966bb0141b5a8956c71df SHA256 d37afaad8808f78ecda93d7498c64b72eee3bb61911fbeff87d3a528a7247eba
-EBUILD digikam-1.3.0-r2.ebuild 2352 RMD160 b1f2bb85bd63205a26fc1b6bd800210a086f6bef SHA1 ca0b1237d2806800788825ee8507530c42d8b417 SHA256 e8fed398db4624a911e697529b7d06e8acd196410b05f5765746c7d0a2a8f5ac
-EBUILD digikam-1.4.0.ebuild 2406 RMD160 79348649399a4d2d3b8da038165cffb6489612d9 SHA1 53f686c9c236db3a242718fbb1c9a9c455bc18be SHA256 309d04e14b4996738d878c745cb83f13afbf30d1795f33ec808c7c4062333063
 EBUILD digikam-9999.ebuild 2363 RMD160 540f5e6b86b01461483da5188710b6bfd39a8c38 SHA1 1dce0de4af0d1d820bf20124373ffe3c9720f623 SHA256 cd89ca3e111879fd4b61c1012803966ae4312ddc20582e5001da2e41430b6af7
 MISC metadata.xml 622 RMD160 8e6ce3403bf6c8436b7e507645fc4cc48fc43bb9 SHA1 8c8d3fd52440fe33ddaf8d0813959f79fea0a4a0 SHA256 2dd0d63d4c16062e148be1db3b32bb623b981e5bdc1e8fadc3d6066af74a0658
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMkTUPAAoJENwGBM22xffeh14P/A5ImW1SxsMZsFxFC5MaVKKH
-Kzeibz/QlLC7i1C17vz/Yp5mBekARlY02JidE7++cYyYegHtIxbptuQ+ZbwtSnVE
-c0fwHByVouAmTeL5GchP1vX+L89lIkY2iTJfZf8SAhQmsGCnM7GYmii2Nj25TfqC
-CxPVrzQirLXPWADa3rGkL45aSKpeF//aieYMzp/SI9AtckSS9QSsdtnOynxNu7Sw
-6BJD8wva5uk6/kGu7B1bqOlw4/O80mdMBwBGJVOJSk2RFA1wkjjcZS42bsQVcpDl
-ohZ1qLonHT13uKts1shO4XswQnmjnlgNh26oN/+LRsM4z7jG9Atncq6+SyfXoPaO
-CZrgQVUZPQxzda4SWkg9pdBBFflf64PtFq9H0iQ8AnDH5fdWtSdawSqcu3JVUqqj
-59yboQ2cNBz4ka7+a5auErNpOkBoZnX0uAlKmUsQkbWYjFR+xP7lvy0NGNoUyqO6
-czsm7ksnIdpOEOpz9juvQ4kZhooABX4iLwF0Mw9j2wJ0Q8o+vLwjvHrm9R7ErSVe
-4TAuZoSbxd+JnJDDRch9EZvfpTmvcH9rg8tg36Hsw+PUfSSL1mBOvbooCbIgTZIl
-ZXEkN3zwajbgQvOH2Wis8fHlyWwQKsn14Pmj//YuXtdzAQPXVV82quV+IVgeTmLA
-gTiY34bTLHPJdIbMFXfx
-=XmAE
+iQIcBAEBAgAGBQJMkoRAAAoJENwGBM22xffeFsEP/0ksnS97BN9Hp/BRW0T1zIvD
+JOsxDJAkTtAHqmlbBaheOPlnu55HHnKZkPYfLN4HetveXVBNIIWgznpIomZz2GHI
+wosExlWWzXLj5Vga/A4AVfuaJAUWu+18yBMqqY0fpi2WezGkZbbbnBztr75DrK5b
+NkkU7Lf+Bd0aIRK4XWtSpeVSJPuP/FRZ4qmYGLXejoM7OZRuc8PpMkuzmp4DdAMu
+EeBva2HfT/tDx8tdsMx3nBc+/c21gR6ustxEAkA/9x3m6nRO/W9Q2CZvTMhSazvy
+KcTjQxbG9yDs/oAoCocUAezVU/ooLE3DweCFAM/HgRbVuTce99ctb+kEKbnQAZRx
+4yUp8U+ucaJ90MiEPIALCX4I22CoK0+cWFpG4DUdF7mrrtLMH6veYvxflTDDEDYM
+WNLH1/F+OWkj6INc1lHHea6IykpGnzyfzijAOP6ZldknkE5QWF2PkFc1jJFc8MT9
+o4hHTbjgWQhP5h5ikGBtJ066i5K3OrHCedi/rgpJQPYEKrFdYUDeOZvmNHr0fnpS
+rqP9R+jkOQK/LqZvm9ClqnPkvpwJ6I1vBpqPAv2ikMYxmSXJHmtBbQJBSYh7NrFg
+EV3zMZDT1gEw3ohkQDVg0czWFwsZZV5SVFnFsWkSSBHFy35NSSkM6Zt2AxwF0cwN
+QDLaOoUUobcRjW2blTxv
+=Y9mr
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.3.0-r2.ebuild b/media-gfx/digikam/digikam-1.3.0-r2.ebuild
deleted file mode 100644
index c531808593..0000000000
--- a/media-gfx/digikam/digikam-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KDE_LINGUAS="ar be bg ca cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km
-ko lt lv nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
-KMNAME="extragear/graphics"
-
-# needed for sufficiently new libkdcraw
-KDE_MINIMAL="4.5"
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 lensfun semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	>=kde-base/solid-${KDE_MINIMAL}
-	media-libs/jasper
-	>=media-libs/jpeg-8
-	media-libs/lcms:0
-	media-libs/liblqr
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/libpgf
-	>=media-plugins/kipi-plugins-1.2.0-r1
-	>=sci-libs/clapack-3.2.1-r3
-	x11-libs/qt-gui[qt3support]
-	x11-libs/qt-sql[sqlite]
-	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
-	gphoto2? ( media-libs/libgphoto2 )
-	lensfun? ( media-libs/lensfun )
-"
-RDEPEND="${CDEPEND}
-	>=kde-base/kreadconfig-${KDE_MINIMAL}
-	video? (
-		|| (
-			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
-			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}"-{docs,pgf,clapack}.patch )
-
-src_configure() {
-	local backend
-
-	use semantic-desktop && backend="Nepomuk" || backend="None"
-	# LQR = only allows to choose between bundled/external
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-		-DWITH_LQR=ON
-		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
-		$(cmake-utils_use_with addressbook KdepimLibs)
-		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_with geolocation MarbleWidget)
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with lensfun LensFun)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable themedesigner)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-gfx/digikam/digikam-1.4.0.ebuild b/media-gfx/digikam/digikam-1.4.0.ebuild
deleted file mode 100644
index d639ab771d..0000000000
--- a/media-gfx/digikam/digikam-1.4.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KDE_LINGUAS="ar be bg ca cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km
-ko lt lv nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
-KMNAME="extragear/graphics"
-
-CMAKE_MIN_VERSION=2.8
-
-# needed for sufficiently new libkdcraw
-KDE_MINIMAL="4.5"
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 lensfun semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	>=kde-base/solid-${KDE_MINIMAL}
-	media-libs/jasper
-	>=media-libs/jpeg-8
-	media-libs/lcms:0
-	media-libs/liblqr
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/libpgf
-	>=media-plugins/kipi-plugins-1.2.0-r1
-	>=sci-libs/clapack-3.2.1-r3
-	x11-libs/qt-gui[qt3support]
-	x11-libs/qt-sql[sqlite]
-	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
-	gphoto2? ( media-libs/libgphoto2 )
-	lensfun? ( media-libs/lensfun )
-"
-RDEPEND="${CDEPEND}
-	>=kde-base/kreadconfig-${KDE_MINIMAL}
-	video? (
-		|| (
-			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
-			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}"-1.3.0-{docs,pgf}.patch "${FILESDIR}/${P}"-clapack.patch)
-
-src_configure() {
-	local backend
-
-	use semantic-desktop && backend="Nepomuk" || backend="None"
-	# LQR = only allows to choose between bundled/external
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-		-DWITH_LQR=ON
-		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
-		$(cmake-utils_use_with addressbook KdepimLibs)
-		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_with geolocation MarbleWidget)
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with lensfun LensFun)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable themedesigner)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-gfx/digikam/files/digikam-1.3.0-clapack.patch b/media-gfx/digikam/files/digikam-1.3.0-clapack.patch
deleted file mode 100644
index 6cc269891d..0000000000
--- a/media-gfx/digikam/files/digikam-1.3.0-clapack.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff -r -u -N digikam-1.3.0-2-pgf/CMakeLists.txt digikam-1.3.0/CMakeLists.txt
---- digikam-1.3.0-2-pgf/CMakeLists.txt	2010-08-26 23:44:46.000000000 +0200
-+++ digikam-1.3.0/CMakeLists.txt	2010-08-28 21:16:05.000000000 +0200
-@@ -141,6 +141,7 @@
- FIND_PACKAGE(Kdcraw)
- FIND_PACKAGE(Kexiv2)
- FIND_PACKAGE(Kipi)
-+FIND_PACKAGE(CLAPACK)
- 
- # Extract version of libjpeg so that we can use the appropriate dir
- # See bug #227313, #228483
-@@ -275,7 +276,13 @@
-     MESSAGE(STATUS " libpgf library found..................... YES (optional)")
- ELSE(PGF_FOUND)
-     MESSAGE(STATUS " libpgf library found..................... NO  (optional - internal version used instead)")
--ENDIF(GPHOTO2_FOUND)
-+ENDIF(PGF_FOUND)
-+
-+IF(CLAPACK_FOUND)
-+    MESSAGE(STATUS " libclapack library found................. YES (optional)")
-+ELSE(CLAPACK_FOUND)
-+    MESSAGE(STATUS " libclapack library found................. NO  (optional - internal version used instead)")
-+ENDIF(CLAPACK_FOUND)
- 
- 
- # ================================================================
-@@ -374,13 +381,19 @@
- ENDIF(DOXYGEN_FOUND)
- 
- IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
--    MESSAGE(STATUS " digiKam will be compiled................. YES")
-+    MESSAGE(STATUS " digiKam can be compiled.................. YES")
-     SET(DIGIKAM_CAN_BE_COMPILED true)
- ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
-     MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO  (Look README file for more details about dependencies)")
-     SET(DIGIKAM_CAN_BE_COMPILED false)
- ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
- 
-+IF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND)))
-+    MESSAGE(STATUS "")
-+    MESSAGE(FATAL_ERROR " BUNDLED LIBRARIES HAVE BEEN FORCE-DISABLED IN THIS BUILD. Aborting.")
-+    SET(DIGIKAM_CAN_BE_COMPILED false)
-+ENDIF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND)))
-+
- MESSAGE(STATUS "----------------------------------------------------------------------------------")
- MESSAGE(STATUS "")
- 
-@@ -538,7 +551,8 @@
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp
-        )
- 
--    SET(libclapack_SRCS
-+    if(NOT CLAPACK_FOUND)
-+      SET(libclapack_SRCS
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c
-@@ -571,6 +585,7 @@
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c
-        )
-+    endif(NOT CLAPACK_FOUND)
- 
-     SET(libdimgfilters_SRCS
-         ${libclapack_SRCS}
-diff -r -u -N digikam-1.3.0-2-pgf/cmake/modules/FindCLAPACK.cmake digikam-1.3.0/cmake/modules/FindCLAPACK.cmake
---- digikam-1.3.0-2-pgf/cmake/modules/FindCLAPACK.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ digikam-1.3.0/cmake/modules/FindCLAPACK.cmake	2010-08-28 18:12:16.000000000 +0200
-@@ -0,0 +1,39 @@
-+# - Try to find clapack library
-+# Once done this will define
-+#
-+#  CLAPACK_FOUND - system has CLAPACK library
-+#  CLAPACK_INCLUDE_DIR - the CLAPACK include directory
-+#  CLAPACK_LIBRARY - the marblewidget library
-+#
-+#  copyright 2008 by Patrick Spendrin <ps_ml@gmx.de>
-+#  copyright 2010 by Andreas K. Huettel <mail@akhuettel.de>
-+#  use this file as you like
-+#
-+
-+if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
-+
-+  # Already in cache
-+  set(CLAPACK_FOUND TRUE)
-+
-+else(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
-+
-+  find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack )
-+  if(CLAPACK_INCLUDE_DIR)
-+     message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}")
-+  endif(CLAPACK_INCLUDE_DIR)
-+
-+  find_library(CLAPACK_LIBRARY clapack)
-+  if(CLAPACK_LIBRARY)
-+      message(STATUS "Found clapack library: ${CLAPACK_LIBRARY}")
-+  endif(CLAPACK_LIBRARY)
-+
-+  if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
-+    set(CLAPACK_FOUND TRUE)
-+  endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
-+
-+  if(NOT CLAPACK_FOUND)
-+      message(STATUS "Could NOT find any working clapack installation")
-+  endif(NOT CLAPACK_FOUND)
-+
-+  mark_as_advanced(CLAPACK_INCLUDE_DIR CLAPACK_LIBRARY)
-+endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
-diff -r -u -N digikam-1.3.0-2-pgf/digikam/CMakeLists.txt digikam-1.3.0/digikam/CMakeLists.txt
---- digikam-1.3.0-2-pgf/digikam/CMakeLists.txt	2010-08-26 23:39:47.000000000 +0200
-+++ digikam-1.3.0/digikam/CMakeLists.txt	2010-08-28 17:09:07.000000000 +0200
-@@ -53,7 +53,6 @@
-                      # specific libs and utilities
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2
--                     ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/kipiiface
-@@ -103,10 +102,18 @@
-    INCLUDE_DIRECTORIES(${LENSFUN_INCLUDE_DIR})
- ENDIF(LENSFUN_LIBRARY)
- 
-+IF(CLAPACK_FOUND)
-+   INCLUDE_DIRECTORIES(${CLAPACK_INCLUDE_DIR})
-+ELSE(CLAPACK_FOUND)
-+   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack)
-+ENDIF(CLAPACK_FOUND)
-+
- # Shared libdigikamcore ################################################################
- 
--# Disable Clapack C code warnings.
--SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-+IF(NOT CLAPACK_FOUND)
-+   # Disable Clapack C code warnings.
-+   SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-+ENDIF(NOT CLAPACK_FOUND)
- 
- IF(NOT PGF_FOUND)
-    # Disable libpgf warnings.
-@@ -203,6 +210,10 @@
-     TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY})
- ENDIF(MARBLEWIDGET_FOUND)
- 
-+IF(CLAPACK_FOUND)
-+   TARGET_LINK_LIBRARIES(digikamcore ${CLAPACK_LIBRARY})
-+ENDIF(CLAPACK_FOUND)
-+
- IF(Q_WS_X11)
-     TARGET_LINK_LIBRARIES(digikamcore ${X11_LIBRARIES})
- ENDIF(Q_WS_X11)
-@@ -359,6 +370,10 @@
-   TARGET_LINK_LIBRARIES(digikam ${LIBMARBLEWIDGET_LIBRARY})
- ENDIF(MARBLEWIDGET_FOUND)
- 
-+IF(CLAPACK_FOUND)
-+   TARGET_LINK_LIBRARIES(digikam ${CLAPACK_LIBRARY})
-+ENDIF(CLAPACK_FOUND)
-+
- INSTALL(TARGETS digikam ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- # Others Files to install #######################################################
-diff -r -u -N digikam-1.3.0-2-pgf/showfoto/CMakeLists.txt digikam-1.3.0/showfoto/CMakeLists.txt
---- digikam-1.3.0-2-pgf/showfoto/CMakeLists.txt	2010-06-07 23:16:48.000000000 +0200
-+++ digikam-1.3.0/showfoto/CMakeLists.txt	2010-08-28 17:08:48.000000000 +0200
-@@ -65,6 +65,10 @@
- 
- KDE4_ADD_EXECUTABLE(showfoto ${showfoto_SRCS})
- 
-+IF(CLAPACK_FOUND)
-+   TARGET_LINK_LIBRARIES(showfoto ${CLAPACK_LIBRARY})
-+ENDIF(CLAPACK_FOUND)
-+
- TARGET_LINK_LIBRARIES(showfoto
-                       digikamcore
-                       ${KEXIV2_LIBRARIES}