[media-gfx/digikam] Version bump.

* Updated translation list.
* Checked and updated patches.
* New useflag themedesigner: build digikam theme designer
* New useflag video: pull in mplayerthumbs for video thumbnails
* Set KDE_MINIMAL=4.4 because of required libkcdraw version

6 files changed, 438 insertions, 2 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 154de6a4c9..cad051a2e9 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,7 +1,11 @@
 AUX digikam-1.2.0-kde232628.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231
 AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca57f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0
+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
 AUX libpgf-unbundled-digikam-1.2.0-r0.patch 8505 RMD160 524cfb182518f45e6d2a683642486eb84a3471d3 SHA1 d86fec9b63442f472d0ce7dd0d20939fe389eadc SHA256 8c603858103f056d17d4e8d9a3cb1d6464de6d174d82ff50882611e27564f465
 DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
+DIST digikam-1.3.0.tar.bz2 14990462 RMD160 45f6bc4ee80df278eb85f3de9eab9b221ee94377 SHA1 99ab242f075d7d5368b66996fffeed5dfd738cbe SHA256 76184c5e193b8338894db6a8c4af4bc773beb819856a83ae163529aefcc10321
 EBUILD digikam-1.2.0-r1.ebuild 2374 RMD160 9c118635c282c0de641f27a4f3a680ad07731100 SHA1 fd32b728e2ede347afb8713f6555e2bb355c5a89 SHA256 6c398cea1aea96d85077690ccd62658023bdf2f2d2061ebcca602b11b3a883f2
-EBUILD digikam-9999.ebuild 2028 RMD160 be0c5e08d70e8000b6758fd828c7e6db67d5746f SHA1 b724f39cc8bf6fb3b933f9618e8a513f3c6a91da SHA256 c6b07d5e61702efc8f6455c6a4546dc163234d8601447ea9c1099ab7445dc1ef
-MISC metadata.xml 421 RMD160 e7faaa622c511d2856e8ae9a188a61b84639e58f SHA1 fabebb7806b5e50f4b19f618ace6e717a8cf0514 SHA256 b9b72a0ebfd6b9a039da1a68b3ec00e9be7ae00554195aebe6a56a15e3e6ad45
+EBUILD digikam-1.3.0.ebuild 2544 RMD160 7e90364b7793f609e2c73354810acdacacd70fac SHA1 328feaa76be052b78e08f74d8180363abd1833d0 SHA256 7250b80a3a435e37e7c6e9f3f59a51d64bec9b6f770afb5c085a9e7644f105fd
+EBUILD digikam-9999.ebuild 2150 RMD160 9ce885eb8e79546c194b8aa6e86c02c390d0b7cd SHA1 ad51c546133110e431376c5272d21348385cde0a SHA256 d412f30e0d1dd261cd0f4b928d7471cc023e1486eea0cde2cd03bff14e6644a3
+MISC metadata.xml 561 RMD160 4cd500a827d9f01fb799b34f126312c0462f0e7b SHA1 91432be778e43c9381a7bcdd602b3bc7d773b472 SHA256 002c1784fab700752d25b556bc16caec89d8c764e19fb1d950006a8adc4af939
diff --git a/media-gfx/digikam/digikam-1.3.0.ebuild b/media-gfx/digikam/digikam-1.3.0.ebuild
new file mode 100644
index 0000000000..a534fd7654
--- /dev/null
+++ b/media-gfx/digikam/digikam-1.3.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KDE_LINGUAS="ar be bg ca cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km
+ko lt lv nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
+KMNAME="extragear/graphics"
+
+# needed for sufficiently new libkdcraw
+KDE_MINIMAL="4.4"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc geolocation gphoto2 lensfun semantic-desktop themedesigner +thumbnails video"
+
+RDEPEND="
+	>=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}
+	>=kde-base/kreadconfig-${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
+	virtual/lapack
+	x11-libs/qt-gui[qt3support]
+	x11-libs/qt-sql[sqlite]
+	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+	geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
+	gphoto2? ( media-libs/libgphoto2 )
+	lensfun? ( media-libs/lensfun )
+	video? ( >=kde-base/mplayerthumbs-${KDE_MINIMAL} )
+"
+
+# gcc[fortran] is required since we cannot otherwise link to the lapack library 
+#   (the fun of unbundling)
+DEPEND="${RDEPEND}
+	sys-devel/gcc[fortran]
+	sys-devel/gettext
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Patch to unbundled libpgf.
+	epatch "${FILESDIR}/digikam-1.3.0-libpgf.patch"
+	# Patch to unbundle lapack.
+	epatch "${FILESDIR}/digikam-1.3.0-lapack.patch"
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	local backend
+
+	use semantic-desktop && backend="Nepomuk" || backend="None"
+	# LQR = only allows to choose between bundled/external
+	mycmakeargs=(
+		-DWITH_LQR=ON
+		-DENABLE_THEMEDESIGNER=OFF
+		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
+		$(cmake-utils_use_enable gphoto2 GPHOTO2)
+		$(cmake-utils_use_with gphoto2)
+		$(cmake-utils_use_enable thumbnails THUMBS_DB)
+		$(cmake-utils_use_with addressbook KdepimLibs)
+		$(cmake-utils_use_with geolocation MarbleWidget)
+		$(cmake-utils_use_with lensfun LensFun)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_enable themedesigner)
+		$(cmake-utils_use_build doc)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index e8a14e1751..7ec5542b9b 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -2,6 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+#
+# ***
+# Note that this ebuild is outdated; the changes from the latest .x.y.z still have to be ported here!!!
+# ***
+#
+
+
 EAPI="2"
 
 #KDE_LINGUAS="ar be bg ca cs da de el es et eu fa fi fr ga gl he hi is it ja km
diff --git a/media-gfx/digikam/files/digikam-1.3.0-lapack.patch b/media-gfx/digikam/files/digikam-1.3.0-lapack.patch
new file mode 100644
index 0000000000..3ec0fc911b
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.3.0-lapack.patch
@@ -0,0 +1,124 @@
+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
new file mode 100644
index 0000000000..ad7f4ee90e
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.3.0-libpgf.patch
@@ -0,0 +1,208 @@
+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/metadata.xml b/media-gfx/digikam/metadata.xml
index 1d1832aa16..912a9417c8 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -6,6 +6,8 @@
 	<flag name="addressbook">Add support for kdepim</flag>
 	<flag name="geolocation">Add support for marble</flag>
 	<flag name="lensfun">Enable support for lens-correnction library</flag>
+	<flag name="themedesigner">Build digikam theme designer</flag>
 	<flag name="thumbnails">Enable thumbnails database support</flag>
+	<flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>
 </use>
 </pkgmetadata>