[media-gfx/digikam] Link against clapack instead of lapack. No fortran required anymore. Clean up patches to make them upstream-worthy.

(Portage version: 2.1.8.3/git/Linux x86_64, RepoMan options: --force)
 (Signed Manifest commit)

7 files changed, 399 insertions, 344 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index d2c8c8465a..b0618c891b 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,27 @@
-AUX digikam-1.3.0-lapack.patch 6328 RMD160 83e23b30997bf8daf3666a1ff5ea3d9d5868b34b SHA1 9bcf99ca5f6358c8cd548497ec082d9b989c147f SHA256 f6c528835edb0778bcff726658145c1e6318b7526cbcaabf4cfe4ad7a7b85b8e
-AUX digikam-1.3.0-libpgf.patch 8816 RMD160 5c20af5bc50799a1184ff9e6ffc3a1c187bb3e03 SHA1 4f5a53dd955ac8ced1b565cd7b8193fd489715a0 SHA256 ee7f5b36d98f0c674d01fb123f5e9fea5586633d7963c212dd46c48a148bb0d9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX digikam-1.3.0-clapack.patch 6414 RMD160 44450d0b1bddb6f7e1a525eb81a886cbf67ac5f5 SHA1 c22bccaf05260f1a003e86c50d838e81c128b66a SHA256 5146689c576a559946ffde163a6456d6e4bed0ad6512453e3f24d50a05663ecc
+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
 DIST digikam-1.3.0.tar.bz2 14990462 RMD160 45f6bc4ee80df278eb85f3de9eab9b221ee94377 SHA1 99ab242f075d7d5368b66996fffeed5dfd738cbe SHA256 76184c5e193b8338894db6a8c4af4bc773beb819856a83ae163529aefcc10321
-EBUILD digikam-1.3.0.ebuild 2587 RMD160 1f16f1eb93fc3f64c5b0e472bfe77fb3c5424c54 SHA1 7cf8ca420c20da42ff7bddc001738415906dd5c1 SHA256 9d77e97d1e6f593df19ca2d2ea99e7ab28c458e4417fb344606352eb500bedfc
+EBUILD digikam-1.3.0-r2.ebuild 2461 RMD160 5441e2cbdae105b4597be3f590bcad8d2cf89a97 SHA1 edfbdd154fac351ecddae28147202a97f7c082a3 SHA256 3ffc4d55dd1e9daa52202bfbad9b6e83a3936f8d69cd4c59f1c82ca4f4ea4515
 EBUILD digikam-9999.ebuild 2541 RMD160 b4598d1d007202ff5dcdd4a8dbba5d56811685bf SHA1 0f869d851077028fc46d102cce27fef38ad6b712 SHA256 68b9fcf5654af895d9c9edda84900e438a762d7d729a3f5a2afec07e447988ed
 MISC metadata.xml 561 RMD160 4cd500a827d9f01fb799b34f126312c0462f0e7b SHA1 91432be778e43c9381a7bcdd602b3bc7d773b472 SHA256 002c1784fab700752d25b556bc16caec89d8c764e19fb1d950006a8adc4af939
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJMeS2zAAoJENwGBM22xffeVKEP/3fIVLobT0ybpXy1yWX5L3XU
+2F/gjG+3ZOaqZIfCuX9ia7ky+yjhcASZSZZpnmUu4IB+BNQKwAEvLcGSsZWSL38K
+mc8mNUb3TbChSmaJtD7uI2lxu3FoUXuJq0EoIFE5J8p8moc7xeBV9dhFMpCHKFz2
+NfXROEWHeil92MwX0ZLi4/b2e6vQMIhzhQhvsQThoz0tzjdGiODuE8OdAgvyKgP2
+Dca3s0LTgJxJzAxQ/hWufL8LZK5S3ljsJMrn5HgZwwlYYDKj/S+yxpZxwYghnmJ+
+leOguU6ZbhSlHwsJ4mDu7X4wmlCCqEARKAxfxMAlIS5ErD7EWut4vz9rBek2/B0Y
+WOTJsy+OW6a20GjDIDA9fP6XY7zSCfk9etwJTtiLXNKYue8IPxV5jLXISq60OawD
+XS1ZbMakWdQNdOLTnLDgZpkwJpbPMLqRuXPTsT9VHqMgeet4VUdSwXbIeUAwlAHN
+jDlh6+gBqa1fTiK7ggfwqle+dA8dYAadQn7p5g+ptJqqfHDyNBMyIzHrx+jteneg
+nyvA59xcoo24HEnP7krQmG/cAnfOTDvY1Ya21ApqfYA+wTDggtkHG8FoqZlS7r4N
+7i7Nqb5mTALSB3kjD9rzP/sL+nvig6YgQN6ePCZ6gTjilYzS+5SK2Vj/rMZg6CXA
+MBazzmnIyuFLe/CHQLDD
+=pG/N
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.3.0.ebuild b/media-gfx/digikam/digikam-1.3.0-r2.ebuild
index 362cded889..9e50b3c063 100644
--- a/media-gfx/digikam/digikam-1.3.0.ebuild
+++ b/media-gfx/digikam/digikam-1.3.0-r2.ebuild
@@ -37,7 +37,7 @@ CDEPEND="
 	media-libs/tiff
 	media-libs/libpgf
 	>=media-plugins/kipi-plugins-1.2.0-r1
-	virtual/lapack
+	>=sci-libs/clapack-3.2.1-r3
 	x11-libs/qt-gui[qt3support]
 	x11-libs/qt-sql[sqlite]
 	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
@@ -63,14 +63,7 @@ DEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	# Patch to unbundled libpgf.
-	epatch "${FILESDIR}/${PN}-1.3.0-libpgf.patch"
-	# Patch to unbundle lapack.
-	epatch "${FILESDIR}/${PN}-1.3.0-lapack.patch"
-
-	kde4-base_src_prepare
-}
+PATCHES=( "${FILESDIR}/${P}"-{docs,pgf,clapack}.patch )
 
 src_configure() {
 	local backend
diff --git a/media-gfx/digikam/files/digikam-1.3.0-clapack.patch b/media-gfx/digikam/files/digikam-1.3.0-clapack.patch
new file mode 100644
index 0000000000..accd4e35ab
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.3.0-clapack.patch
@@ -0,0 +1,166 @@
+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 16:37:17.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)
+ 
+ 
+ # ================================================================
+@@ -538,7 +545,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 +579,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 16:40:18.000000000 +0200
+@@ -0,0 +1,50 @@
++# - 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)
++
++  find_library(CLAPACK_F2C_LIBRARY f2c)
++  if(CLAPACK_F2C_LIBRARY)
++      message(STATUS "Found f2c library: ${CLAPACK_F2C_LIBRARY}")
++  endif(CLAPACK_F2C_LIBRARY)
++
++  find_library(CLAPACK_BLAS_LIBRARY blas)
++  if(CLAPACK_BLAS_LIBRARY)
++      message(STATUS "Found blas library: ${CLAPACK_BLAS_LIBRARY}")
++  endif(CLAPACK_BLAS_LIBRARY)
++
++  if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY AND CLAPACK_F2C_LIBRARY AND CLAPACK_BLAS_LIBRARY)
++    set(CLAPACK_FOUND TRUE)
++    set(CLAPACK_LIBRARY ${CLAPACK_BLAS_LIBRARY} ${CLAPACK_F2C_LIBRARY} ${CLAPACK_LIBRARY})
++  endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY AND CLAPACK_F2C_LIBRARY AND CLAPACK_BLAS_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}
diff --git a/media-gfx/digikam/files/digikam-1.3.0-docs.patch b/media-gfx/digikam/files/digikam-1.3.0-docs.patch
new file mode 100644
index 0000000000..63af639597
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.3.0-docs.patch
@@ -0,0 +1,54 @@
+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-lapack.patch b/media-gfx/digikam/files/digikam-1.3.0-lapack.patch
deleted file mode 100644
index 3ec0fc911b..0000000000
--- a/media-gfx/digikam/files/digikam-1.3.0-lapack.patch
+++ /dev/null
@@ -1,124 +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-07-06 21:26:53.163356449 +0200
-+++ digikam-1.3.0/CMakeLists.txt	2010-07-06 21:35:16.400202160 +0200
-@@ -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)
-@@ -371,13 +376,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 "")
-@@ -536,39 +541,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 -r -u -N digikam-1.3.0.orig/digikam/CMakeLists.txt digikam-1.3.0/digikam/CMakeLists.txt
---- digikam-1.3.0.orig/digikam/CMakeLists.txt	2010-07-06 21:24:17.046352568 +0200
-+++ digikam-1.3.0/digikam/CMakeLists.txt	2010-07-06 21:32:30.210282636 +0200
-@@ -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 -r -u -N digikam-1.3.0.orig/libs/CMakeLists.txt digikam-1.3.0/libs/CMakeLists.txt
---- digikam-1.3.0.orig/libs/CMakeLists.txt	2010-07-06 21:24:17.047268086 +0200
-+++ digikam-1.3.0/libs/CMakeLists.txt	2010-07-06 21:32:30.211359853 +0200
-@@ -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 )
diff --git a/media-gfx/digikam/files/digikam-1.3.0-libpgf.patch b/media-gfx/digikam/files/digikam-1.3.0-libpgf.patch
deleted file mode 100644
index ad7f4ee90e..0000000000
--- a/media-gfx/digikam/files/digikam-1.3.0-libpgf.patch
+++ /dev/null
@@ -1,208 +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
-@@ -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)
-@@ -260,6 +268,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)
-@@ -362,13 +371,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 "")
-@@ -1018,14 +1027,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
-@@ -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 -r -u -N digikam-1.3.0.orig/cmake/modules/FindPGF.cmake digikam-1.3.0/cmake/modules/FindPGF.cmake
---- digikam-1.3.0.orig/cmake/modules/FindPGF.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ digikam-1.3.0/cmake/modules/FindPGF.cmake	2010-07-06 21:24:17.044199059 +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 -r -u -N digikam-1.3.0.orig/digikam/CMakeLists.txt digikam-1.3.0/digikam/CMakeLists.txt
---- digikam-1.3.0.orig/digikam/CMakeLists.txt	2010-06-07 23:16:45.000000000 +0200
-+++ digikam-1.3.0/digikam/CMakeLists.txt	2010-07-06 21:24:17.046352568 +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
-@@ -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 -r -u -N digikam-1.3.0.orig/libs/CMakeLists.txt digikam-1.3.0/libs/CMakeLists.txt
---- digikam-1.3.0.orig/libs/CMakeLists.txt	2010-06-07 23:16:40.000000000 +0200
-+++ digikam-1.3.0/libs/CMakeLists.txt	2010-07-06 21:24:17.047268086 +0200
-@@ -18,6 +18,7 @@
-                      ${JPEG_INCLUDE_DIR}
-                      ${TIFF_INCLUDE_DIR}
-                      ${PNG_INCLUDE_DIR}
-+                     ${PGF_INCLUDE_DIRS}
-                      ${JASPER_INCLUDE_DIR}
-                    )
- 
diff --git a/media-gfx/digikam/files/digikam-1.3.0-pgf.patch b/media-gfx/digikam/files/digikam-1.3.0-pgf.patch
new file mode 100644
index 0000000000..c965a8449d
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.3.0-pgf.patch
@@ -0,0 +1,153 @@
+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 )