[media-gfx/digikam] Cleanup

(Portage version: 2.1.9.24/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

7 files changed, 15 insertions, 735 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 62aabd27aa..65fcbf8612 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-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
-EBUILD digikam-9999.ebuild 2405 RMD160 0ae83a139da677cf5d458407f2eaef562b85d6de SHA1 10ec0b422c9224f73a2c5345e82997d4e850e0ab SHA256 d48a1f0e4d9b8b9bb7c25b8720022b9848915e9de100e3ffdb2827a376395c97
+EBUILD digikam-9999.ebuild 2352 RMD160 6b114266bfad353ff01422388057fffc697f1521 SHA1 db3bc0aeb415431f0fe37f71a19f3907dff84d3c SHA256 676bdd00f20f94d22934b9136b34e0ecf3fbf8ad2b6d1896587871ac415921f3
 MISC metadata.xml 622 RMD160 8e6ce3403bf6c8436b7e507645fc4cc48fc43bb9 SHA1 8c8d3fd52440fe33ddaf8d0813959f79fea0a4a0 SHA256 2dd0d63d4c16062e148be1db3b32bb623b981e5bdc1e8fadc3d6066af74a0658
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJM7/xwAAoJEOf+E+/4L5LmV7sP/jrDMYQJAGxnTt5cXcMDTHBo
-fGmoCm7gK8TT+nS2uhRsOwcYCgynHxOGClW/0mMyE3cczfYMnQn1RMLdxfnFVk1r
-TOAhxMiqQW5mZ4+loOZ5JGtQ1ymjPgBByWYHmyXIe20e7ooBd21h6UkFTxR882i2
-OZes36D3fxudRQ72WVc0RLJtsP0flg1bN77fpAWgx89cvNqbPuYud2vTKCC1lzsY
-0PRfeepgWpaCxsFt2lQosrn78xvBX7skdmpuDKyvzIKd76Wai7vj2C1LFPOskJoS
-Bo5n4FGP9PaH/3je9t6a4I5DMYJttKR17GW+TIXsvjroWJIgopf9ke5f/+RHuwIl
-cGpCMDXXTnz7z7McDs1WcXTHOm0pt9D3OK+yOhgAqVUQuH/u4E7dvaf/yu2/scph
-IN86PUmhdZwAKgP9Rmw9Z0jS9T+cL9/LeGZbDUBJ3fhUedTUdF4AY/IP4JXZiulS
-5Iurgbjsip7c6HnL7cGVirBJjLhHKOqjT0GWkK4CaH/tqtVRjnF0x0dnZj6DEgmd
-1/c09dPAYvimLKD2qoqK8Asw/hnz0XFV6xvkUmWufnA3fo20vAv7qTkoGieDgsR9
-U7IH76xinGU/j9/6uSI/931iSWlzdyn7UoYj3wDyzo9Mpdzz/iOwKmCbs4glWMN9
-tDmS9RiBtLmz+YzWAVaH
-=Krzn
+iQIcBAEBAgAGBQJM8BS/AAoJENwGBM22xffeXMUP/AvPjiWCBvQ1UNSStN0awpDb
+dX6zGdAuoXUouIsFMFSE60LJsiNGkew7RS/ktoZWGOv+BdBvg6d3A38iTq2YHQHH
+rzhAiFeSI7XQDqW/4VI3tG4cCP2LOVNt/PdlG/GhJZyzGfKF6hS1n/OWFwlA0usg
+O8ehrzpQPgzbDfXb7z2yHyNxm8YJxPwIkYcdMPInbkquLAb7VGyUot4nlb8LpCPx
+3rp/uzlnPhAQzJoVVoAiC6g5YHdsFelpNJNMSmIwSXoGRUQEUhyLNx2WGjRP97/Q
+0rU1FioVdGMWog6gMAk7jGb27j4aYcAbszodEcQ3mkQLbDvKFlPofhZF+5/7DGZZ
+ElBelLVvmhqVVHYQGxtoNsNWT7Z0K4x9emql7flk7Z0sqjalRjPyVZbeNVU/FZVR
+UgpIfTn0X1VpOn6/0WEnMcL03RAabiw3FkNXv39HAM/7P3WfkoLw4+Tk+JlqA3xM
+8C8NDENDT4aO4me4DOIMPEg/MPuDMLnWf6CkwatDNb4O8XFsGtTtsv09iQEKlyrg
+VakIblm0k8fkkpHzkNBdPzS+0IAaZiV6SFrXT1zl10JOvcd/hVRDSVwco3Fxorv+
+l3iYsXVyfmLDQTkNylUQPnu+oI8Ipl/nwwLXVsP3NufQsd3OQIqN3vFVGCWMsG8c
+ALW/ZhMqS/2y/zRCpr4L
+=3QVY
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index 1df497bf76..8f16d833bf 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -64,10 +64,6 @@ DEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/${P}"-{pgf,clapack}.patch
-)
-
 src_configure() {
 	local backend
 
diff --git a/media-gfx/digikam/files/digikam-1.3.0-docs.patch b/media-gfx/digikam/files/digikam-1.3.0-docs.patch
deleted file mode 100644
index 63af639597..0000000000
--- a/media-gfx/digikam/files/digikam-1.3.0-docs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -r -u -N digikam-1.3.0.orig/CMakeLists.txt digikam-1.3.0/CMakeLists.txt
---- digikam-1.3.0.orig/CMakeLists.txt   2010-06-07 23:23:08.000000000 +0200
-+++ digikam-1.3.0/CMakeLists.txt        2010-07-06 21:26:53.163356449 +0200
-@@ -1334,18 +1336,41 @@
- # ==================================================================================================
- # API documentation generation
- 
--IF(DOXYGEN_FOUND)
-+# Checks if user ask to build documentation.
-+IF(BUILD_DOC)
-+    IF(DOXYGEN_FOUND)
-+
-+        MESSAGE(STATUS "")
-+        MESSAGE(STATUS "Documentation will be installed")
-+	MESSAGE(STATUS "")
- 
--    SET(API_DIR ${CMAKE_BINARY_DIR}/api)
--    SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
--    SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
--    SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
-+        SET(API_DIR ${CMAKE_BINARY_DIR}/api)
-+        SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
-+        SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
-+        SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
- 
--    CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
-+        CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
- 
--    ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
--                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+        ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-+                          WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+
-+    ELSE(DOXYGEN_FOUND)
-+    
-+        MESSAGE(STATUS "")
-+        MESSAGE(STATUS "Documentation will NOT be installed")
-+	MESSAGE(STATUS "Doxygen wasn't found on the system")
-+	MESSAGE(STATUS "")
-+
-+    ENDIF(DOXYGEN_FOUND)
-+
-+ELSE(BUILD_DOC)
-+
-+    MESSAGE(STATUS "")
-+    MESSAGE(STATUS "Documentation will NOT be installed")
-+    MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
-+    MESSAGE(STATUS "")
-+
-+ENDIF(BUILD_DOC)
- 
--ENDIF(DOXYGEN_FOUND)
- include(MacroOptionalAddSubdirectory)
- macro_optional_add_subdirectory( po )
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 c965a8449d..0000000000
--- 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 2fb1f5eae2..0000000000
--- 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}
diff --git a/media-gfx/digikam/files/digikam-9999-clapack.patch b/media-gfx/digikam/files/digikam-9999-clapack.patch
deleted file mode 100644
index 619074a787..0000000000
--- a/media-gfx/digikam/files/digikam-9999-clapack.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff -Naur digikam-9999/CMakeLists.txt digikam-9999-fixed/CMakeLists.txt
---- digikam-9999/CMakeLists.txt	2010-08-25 01:16:09.000000000 +0700
-+++ digikam-9999-fixed/CMakeLists.txt	2010-08-25 01:12:41.000000000 +0700
-@@ -3,6 +3,8 @@
- OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF)
- OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON)
- 
-+ENABLE_LANGUAGE(Fortran)
-+
- # ==================================================================================================
- # Information to update before to release this package.
- 
-@@ -141,6 +143,9 @@
- # This function call the script cmake/modules/FindPGF.cmake
- FIND_PACKAGE(PGF)
- 
-+# Included to unbundle lapack that is in portage tree.
-+FIND_PACKAGE(LAPACK)
-+
- FIND_PACKAGE(Jasper)
- FIND_PACKAGE(Kdcraw)
- FIND_PACKAGE(Kexiv2)
-@@ -374,13 +379,13 @@
- 
- ENDIF(DOXYGEN_FOUND)
- 
--IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
-+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND AND LAPACK_FOUND)
-     MESSAGE(STATUS " digiKam will be compiled................. YES")
-     SET(DIGIKAM_CAN_BE_COMPILED true)
--ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
-+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND AND LAPACK_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 PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
-+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND AND LAPACK_FOUND)
- 
- MESSAGE(STATUS "----------------------------------------------------------------------------------")
- MESSAGE(STATUS "")
-@@ -539,39 +544,7 @@
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp
-        )
- 
--    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
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/endfile.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/idamax.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/open.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sig_die.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wref.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/close.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetf2.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dscal.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/err.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ieeeck.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_cmp.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_stop.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wrtfmt.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgemm.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrf.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dswap.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmt.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ilaenv.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_copy.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wsfe.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dger.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrs.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dtrsm.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmtlib.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/lsame.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sfe.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c
--        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c
--       )
-+    INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIRS})
- 
-     SET(libdimgfilters_SRCS
-         ${libclapack_SRCS}
-diff -Naur digikam-9999/digikam/CMakeLists.txt digikam-9999-fixed/digikam/CMakeLists.txt
---- digikam-9999/digikam/CMakeLists.txt	2010-08-25 01:16:09.000000000 +0700
-+++ digikam-9999-fixed/digikam/CMakeLists.txt	2010-08-25 01:14:32.000000000 +0700
-@@ -92,6 +92,7 @@
-                      ${PNG_PNG_INCLUDE_DIR}
-                      ${TIFF_INCLUDE_DIR}
-                      ${PGF_INCLUDE_DIRS}
-+                     ${LAPACK_INCLUDE_DIRS}
-                    )
- 
- IF(LENSFUN_LIBRARY)
-@@ -176,6 +177,7 @@
-                       ${PGF_LIBRARIES}
-                       ${LCMS_LIBRARIES}
-                       ${JASPER_LIBRARIES}
-+                      ${LAPACK_LIBRARIES}
- 
-                       # Require by CImg library which use pthread internally.
-                       ${CMAKE_THREAD_LIBS_INIT}
-@@ -241,6 +243,7 @@
-                       ${QT_QTGUI_LIBRARY}
-                       ${QT_QTSQL_LIBRARY}
-                       ${PGF_LIBRARIES}
-+                      ${LAPACK_LIBRARIES}
-                      )
- 
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
-diff -Naur digikam-9999/libs/CMakeLists.txt digikam-9999-fixed/libs/CMakeLists.txt
---- digikam-9999/libs/CMakeLists.txt	2010-08-25 01:16:09.000000000 +0700
-+++ digikam-9999-fixed/libs/CMakeLists.txt	2010-08-25 01:15:15.000000000 +0700
-@@ -14,12 +14,12 @@
-                      imageproperties
-                      dialogs
-                      3rdparty/cimg
--                     3rdparty/clapack
-                      ${JPEG_INCLUDE_DIR}
-                      ${TIFF_INCLUDE_DIR}
-                      ${PNG_INCLUDE_DIR}
-                      ${PGF_INCLUDE_DIRS}
-                      ${JASPER_INCLUDE_DIR}
-+                     ${LAPACK_INCLUDE_DIRS}
-                    )
- 
- ADD_SUBDIRECTORY( histogram )
\ No newline at end of file
diff --git a/media-gfx/digikam/files/digikam-9999-pgf.patch b/media-gfx/digikam/files/digikam-9999-pgf.patch
deleted file mode 100644
index 023317ffc5..0000000000
--- a/media-gfx/digikam/files/digikam-9999-pgf.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -Naur digikam-9999/cmake/modules/FindPGF.cmake digikam-9999-fixed/cmake/modules/FindPGF.cmake
---- digikam-9999/cmake/modules/FindPGF.cmake	1970-01-01 07:00:00.000000000 +0700
-+++ digikam-9999-fixed/cmake/modules/FindPGF.cmake	2010-08-25 01:03:32.000000000 +0700
-@@ -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 -Naur digikam-9999/CMakeLists.txt digikam-9999-fixed/CMakeLists.txt
---- digikam-9999/CMakeLists.txt	2010-08-25 01:00:50.000000000 +0700
-+++ digikam-9999-fixed/CMakeLists.txt	2010-08-25 01:04:10.000000000 +0700
-@@ -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,11 @@
- FIND_PACKAGE(JPEG)
- FIND_PACKAGE(PNG)
- FIND_PACKAGE(TIFF)
-+
-+# Included to unbundle libpgf that is on portage tree.
-+# This function call the script cmake/modules/FindPGF.cmake
-+FIND_PACKAGE(PGF)
-+
- FIND_PACKAGE(Jasper)
- FIND_PACKAGE(Kdcraw)
- FIND_PACKAGE(Kexiv2)
-@@ -263,6 +271,7 @@
-     PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
- ENDIF (NOT WIN32)
- PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)
-+PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_FOUND)
- PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND)
- PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND)
- PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND)
-@@ -365,13 +374,13 @@
- 
- 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)
-+IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
-     MESSAGE(STATUS " digiKam will 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)
-+ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND 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)
-+ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
- 
- MESSAGE(STATUS "----------------------------------------------------------------------------------")
- MESSAGE(STATUS "")
-@@ -1023,14 +1032,7 @@
-         ${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
--       )
-+    INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
- 
-     SET(libsqlite2_SRCS
-         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c
-@@ -1340,16 +1342,39 @@
- # ==================================================================================================
- # API documentation generation
- 
--IF(DOXYGEN_FOUND)
-+# Checks if user ask to build documentation.
-+IF(BUILD_DOC)
-+    IF(DOXYGEN_FOUND)
-+
-+        MESSAGE(STATUS "")
-+        MESSAGE(STATUS "Documentation will be installed")
-+       MESSAGE(STATUS "")
- 
-     SET(API_DIR ${CMAKE_BINARY_DIR}/api)
-     SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
-     SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
-     SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
- 
-+
-     CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
- 
-     ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
-                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
- 
--ENDIF(DOXYGEN_FOUND)
-+    ELSE(DOXYGEN_FOUND)
-+
-+        MESSAGE(STATUS "")
-+        MESSAGE(STATUS "Documentation will NOT be installed")
-+       MESSAGE(STATUS "Doxygen wasn't found on the system")
-+       MESSAGE(STATUS "")
-+
-+    ENDIF(DOXYGEN_FOUND)
-+
-+ELSE(BUILD_DOC)
-+
-+    MESSAGE(STATUS "")
-+    MESSAGE(STATUS "Documentation will NOT be installed")
-+    MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
-+    MESSAGE(STATUS "")
-+
-+ENDIF(BUILD_DOC)
-diff -Naur digikam-9999/digikam/CMakeLists.txt digikam-9999-fixed/digikam/CMakeLists.txt
---- digikam-9999/digikam/CMakeLists.txt	2010-08-25 01:00:51.000000000 +0700
-+++ digikam-9999-fixed/digikam/CMakeLists.txt	2010-08-25 00:58:52.000000000 +0700
-@@ -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
-@@ -92,6 +91,7 @@
-                      ${JPEG_INCLUDE_DIR}
-                      ${PNG_PNG_INCLUDE_DIR}
-                      ${TIFF_INCLUDE_DIR}
-+                     ${PGF_INCLUDE_DIRS}
-                    )
- 
- IF(LENSFUN_LIBRARY)
-@@ -103,9 +103,6 @@
- # 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")
--
- # Disable liblqr C code warnings.
- SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w")
- 
-@@ -124,7 +121,6 @@
-                         ${libjpegutils_SRCS}
-                         ${libthreadimageio_SRCS}
-                         ${libthemeengine_SRCS}
--                        ${libpgf_SRCS}
-                         ${pgfutils_SRCS}
-                         ${libdigikamhelpers_SRCS}
-                         ${libtthread_SRCS}
-@@ -177,6 +173,7 @@
-                       ${JPEG_LIBRARIES}
-                       ${TIFF_LIBRARIES}
-                       ${PNG_LIBRARIES}
-+                      ${PGF_LIBRARIES}
-                       ${LCMS_LIBRARIES}
-                       ${JASPER_LIBRARIES}
- 
-@@ -229,7 +226,6 @@
-                              ${libhaar_SRCS}
-                              ${libdatabasemodels_SRCS}
-                              ${libsqlite2_SRCS}
--                             ${libpgf_SRCS}
-                              ${pgfutils_SRCS}
-    )
- 
-@@ -244,6 +240,7 @@
-                       ${QT_QTCORE_LIBRARY}
-                       ${QT_QTGUI_LIBRARY}
-                       ${QT_QTSQL_LIBRARY}
-+                      ${PGF_LIBRARIES}
-                      )
- 
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
-diff -Naur digikam-9999/libs/CMakeLists.txt digikam-9999-fixed/libs/CMakeLists.txt
---- digikam-9999/libs/CMakeLists.txt	2010-08-25 01:00:53.000000000 +0700
-+++ digikam-9999-fixed/libs/CMakeLists.txt	2010-08-25 00:59:25.000000000 +0700
-@@ -18,6 +18,7 @@
-                      ${JPEG_INCLUDE_DIR}
-                      ${TIFF_INCLUDE_DIR}
-                      ${PNG_INCLUDE_DIR}
-+                     ${PGF_INCLUDE_DIRS}
-                      ${JASPER_INCLUDE_DIR}
-                    )
- 
\ No newline at end of file