Added missing dependency on doxygen; removed old version

(Portage version: 2.1.9.23/cvs/Linux x86_64)

6 files changed, 14 insertions, 459 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index e9342e755b41..f98898283e42 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.162 2010/10/26 19:14:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.163 2010/10/28 19:18:16 dilfridge Exp $
+
+  28 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  digikam-1.2.0-r3.ebuild, -files/digikam-1.3.0-pgf.patch,
+  -digikam-1.4.0-r1.ebuild, -files/digikam-1.4.0-clapack.patch,
+  digikam-1.5.0.ebuild:
+  Added missing dependency on doxygen; removed old version
 
   26 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-1.5.0.ebuild:
diff --git a/media-gfx/digikam/digikam-1.2.0-r3.ebuild b/media-gfx/digikam/digikam-1.2.0-r3.ebuild
index 23bfd9d80c33..cbd2f79f4c76 100644
--- a/media-gfx/digikam/digikam-1.2.0-r3.ebuild
+++ b/media-gfx/digikam/digikam-1.2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r3.ebuild,v 1.2 2010/10/22 00:07:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r3.ebuild,v 1.3 2010/10/28 19:18:16 dilfridge Exp $
 
 EAPI="2"
 
@@ -58,7 +58,10 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	sys-devel/gcc[fortran]
 	sys-devel/gettext
-	doc? ( virtual/latex-base )
+	doc? (
+		app-doc/doxygen
+		virtual/latex-base
+		)
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/digikam/digikam-1.4.0-r1.ebuild b/media-gfx/digikam/digikam-1.4.0-r1.ebuild
deleted file mode 100644
index cf6d4c7d8f12..000000000000
--- a/media-gfx/digikam/digikam-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.4.0-r1.ebuild,v 1.1 2010/09/25 14:52:35 dilfridge Exp $
-
-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
-	handbook? ( mirror://gentoo/${PN}-doc-${PV}.tar.bz2 )"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 handbook 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
-	virtual/mysql
-	x11-libs/qt-gui[qt3support]
-	x11-libs/qt-sql[mysql,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.patch "${FILESDIR}/${PN}"-1.3.0-pgf.patch "${FILESDIR}/${P}"-clapack.patch)
-
-src_prepare() {
-	mkdir -p doc
-	[ -f doc/CMakeLists.txt ] || ( echo > doc/CMakeLists.txt )
-
-	kde4-base_src_prepare
-}
-
-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
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		# install the api documentation
-		dodir /usr/share/doc/${PF}/html || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
-	fi
-
-	if use handbook; then
-		dodoc readme-handbook.txt || die
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use doc; then
-		elog The digikam api documentation has been installed at /usr/share/doc/${PF}/html
-	fi
-}
diff --git a/media-gfx/digikam/digikam-1.5.0.ebuild b/media-gfx/digikam/digikam-1.5.0.ebuild
index 23ce1a26fb60..7451a1f9adad 100644
--- a/media-gfx/digikam/digikam-1.5.0.ebuild
+++ b/media-gfx/digikam/digikam-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.5.0.ebuild,v 1.2 2010/10/26 19:14:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.5.0.ebuild,v 1.3 2010/10/28 19:18:16 dilfridge Exp $
 
 EAPI="2"
 
@@ -61,6 +61,7 @@ RDEPEND="${CDEPEND}
 "
 DEPEND="${CDEPEND}
 	sys-devel/gettext
+	doc? ( app-doc/doxygen )
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/digikam/files/digikam-1.3.0-pgf.patch b/media-gfx/digikam/files/digikam-1.3.0-pgf.patch
deleted file mode 100644
index c965a8449d73..000000000000
--- a/media-gfx/digikam/files/digikam-1.3.0-pgf.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff -u -r -N digikam-1.3.0-1-docs/CMakeLists.txt digikam-1.3.0/CMakeLists.txt
---- digikam-1.3.0-1-docs/CMakeLists.txt	2010-08-26 23:24:35.000000000 +0200
-+++ digikam-1.3.0/CMakeLists.txt	2010-08-26 23:44:46.000000000 +0200
-@@ -34,6 +34,9 @@
-     "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}"
-    )
- 
-+# Path to find FindPGF.cmake script.
-+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
-+
- # ==================================================================================================
- # Debug area codes
- # These codes will be set for every project specific path automatically, so
-@@ -133,6 +136,7 @@
- FIND_PACKAGE(JPEG)
- FIND_PACKAGE(PNG)
- FIND_PACKAGE(TIFF)
-+FIND_PACKAGE(PGF)
- FIND_PACKAGE(Jasper)
- FIND_PACKAGE(Kdcraw)
- FIND_PACKAGE(Kexiv2)
-@@ -267,6 +271,13 @@
- PRINT_LIBRARY_STATUS("libkexiv2" "http://www.digikam.org/sharedlibs" " (version >= 1.1.0)" KEXIV2_FOR_DIGIKAM)
- PRINT_LIBRARY_STATUS("libkdcraw" "http://www.digikam.org/sharedlibs" " (version >= 1.1.0)" KDCRAW_FOR_DIGIKAM)
- 
-+IF(PGF_FOUND)
-+    MESSAGE(STATUS " libpgf library found..................... YES (optional)")
-+ELSE(PGF_FOUND)
-+    MESSAGE(STATUS " libpgf library found..................... NO  (optional - internal version used instead)")
-+ENDIF(GPHOTO2_FOUND)
-+
-+
- # ================================================================
- 
- IF(GPHOTO2_FOUND)
-@@ -1018,14 +1029,18 @@
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp
-        )
- 
--    SET(libpgf_SRCS
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp
-+    IF(PGF_FOUND)
-+       INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
-+    ELSE(PGF_FOUND)
-+       SET(libpgf_SRCS
-+          ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp
-+          ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp
-+          ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp
-+          ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp
-+          ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp
-+          ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp
-        )
-+    ENDIF(PGF_FOUND)
- 
-     SET(libsqlite2_SRCS
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c
-diff -u -r -N digikam-1.3.0-1-docs/cmake/modules/FindPGF.cmake digikam-1.3.0/cmake/modules/FindPGF.cmake
---- digikam-1.3.0-1-docs/cmake/modules/FindPGF.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ digikam-1.3.0/cmake/modules/FindPGF.cmake	2010-08-26 23:25:18.000000000 +0200
-@@ -0,0 +1,15 @@
-+# - Try to find libpgf
-+# Once done this will define
-+#
-+#  PGF_FOUND - system has libgf
-+#  PGF_INCLUDE_DIRS - the libpgf include directory
-+#  PGF_LIBRARIES - Link these to use libpgf
-+
-+# PKG-CONFIG is required.
-+INCLUDE(FindPkgConfig REQUIRED)
-+
-+IF(PKG_CONFIG_FOUND)
-+	INCLUDE(FindPkgConfig)
-+
-+	PKG_CHECK_MODULES(PGF libpgf)
-+ENDIF(PKG_CONFIG_FOUND)
-diff -u -r -N digikam-1.3.0-1-docs/digikam/CMakeLists.txt digikam-1.3.0/digikam/CMakeLists.txt
---- digikam-1.3.0-1-docs/digikam/CMakeLists.txt	2010-06-07 23:16:45.000000000 +0200
-+++ digikam-1.3.0/digikam/CMakeLists.txt	2010-08-26 23:39:47.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/libpgf
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine
-@@ -94,6 +93,12 @@
-                      ${TIFF_INCLUDE_DIR}
-                    )
- 
-+IF(PGF_FOUND)
-+   INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
-+ELSE(PGF_FOUND)
-+   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf)
-+ENDIF(PGF_FOUND)
-+
- IF(LENSFUN_LIBRARY)
-    INCLUDE_DIRECTORIES(${LENSFUN_INCLUDE_DIR})
- ENDIF(LENSFUN_LIBRARY)
-@@ -103,8 +108,10 @@
- # Disable Clapack C code warnings.
- SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
- 
--# Disable libpgf warnings.
--SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-+IF(NOT PGF_FOUND)
-+   # Disable libpgf warnings.
-+   SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-+ENDIF(NOT PGF_FOUND)
- 
- # Disable liblqr C code warnings.
- SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-@@ -188,6 +195,10 @@
-                       ${KIPI_LIBRARIES}
-               )
- 
-+IF(PGF_FOUND)
-+   TARGET_LINK_LIBRARIES(digikamcore ${PGF_LIBRARIES})
-+ENDIF(PGF_FOUND)
-+
- IF(MARBLEWIDGET_FOUND)
-     TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY})
- ENDIF(MARBLEWIDGET_FOUND)
-@@ -246,6 +257,10 @@
-                       ${QT_QTSQL_LIBRARY}
-                      )
- 
-+IF(PGF_FOUND)
-+   TARGET_LINK_LIBRARIES(digikamdatabase ${PGF_LIBRARIES})
-+ENDIF(PGF_FOUND)
-+
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
- INSTALL(TARGETS digikamdatabase ${INSTALL_TARGETS_DEFAULT_ARGS} )
- 
-diff -u -r -N digikam-1.3.0-1-docs/libs/CMakeLists.txt digikam-1.3.0/libs/CMakeLists.txt
---- digikam-1.3.0-1-docs/libs/CMakeLists.txt	2010-06-07 23:16:40.000000000 +0200
-+++ digikam-1.3.0/libs/CMakeLists.txt	2010-08-26 23:43:35.000000000 +0200
-@@ -21,6 +21,10 @@
-                      ${JASPER_INCLUDE_DIR}
-                    )
- 
-+IF(PGF_FOUND)
-+   INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
-+ENDIF(PGF_FOUND)
-+
- ADD_SUBDIRECTORY( histogram )
- ADD_SUBDIRECTORY( dmetadata )
- ADD_SUBDIRECTORY( dimg )
diff --git a/media-gfx/digikam/files/digikam-1.4.0-clapack.patch b/media-gfx/digikam/files/digikam-1.4.0-clapack.patch
deleted file mode 100644
index 2fb1f5eae2a3..000000000000
--- a/media-gfx/digikam/files/digikam-1.4.0-clapack.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -r -u -N digikam-1.4.0.1pgf/CMakeLists.txt digikam-1.4.0/CMakeLists.txt
---- digikam-1.4.0.1pgf/CMakeLists.txt	2010-08-31 23:39:20.000000000 +0200
-+++ digikam-1.4.0/CMakeLists.txt	2010-08-31 23:39:47.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
-@@ -278,7 +279,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)
- 
- 
- # ================================================================
-@@ -377,13 +384,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 "")
- 
-@@ -541,7 +554,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
-@@ -574,6 +588,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.4.0.1pgf/cmake/modules/FindCLAPACK.cmake digikam-1.4.0/cmake/modules/FindCLAPACK.cmake
---- digikam-1.4.0.1pgf/cmake/modules/FindCLAPACK.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ digikam-1.4.0/cmake/modules/FindCLAPACK.cmake	2010-08-31 23:43:20.000000000 +0200
-@@ -0,0 +1,44 @@
-+# - 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 NO_DEFAULT_PATH)
-+  if(CLAPACK_INCLUDE_DIR)
-+     message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}")
-+  else(CLAPACK_INCLUDE_DIR)
-+     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)
-+  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.4.0.1pgf/digikam/CMakeLists.txt digikam-1.4.0/digikam/CMakeLists.txt
---- digikam-1.4.0.1pgf/digikam/CMakeLists.txt	2010-08-31 23:39:20.000000000 +0200
-+++ digikam-1.4.0/digikam/CMakeLists.txt	2010-08-31 23:39:47.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.4.0.1pgf/showfoto/CMakeLists.txt digikam-1.4.0/showfoto/CMakeLists.txt
---- digikam-1.4.0.1pgf/showfoto/CMakeLists.txt	2010-08-22 10:53:39.000000000 +0200
-+++ digikam-1.4.0/showfoto/CMakeLists.txt	2010-08-31 23:39:47.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}