Version bump; remove old

(Portage version: 2.1.9.26/cvs/Linux i686)

5 files changed, 62 insertions, 357 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index be3b47daa903..ff8ee85f5e51 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.167 2010/11/25 20:30:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.168 2010/12/28 17:07:56 dilfridge Exp $
+
+*digikam-1.7.0 (28 Dec 2010)
+
+  28 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/digikam-1.4.0-docs.patch, -digikam-1.5.0.ebuild,
+  -files/digikam-1.5.0-unbundle.patch, +digikam-1.7.0.ebuild,
+  +files/digikam-1.7.0-docs.patch:
+  Version bump; remove old
 
 *digikam-1.6.0 (25 Nov 2010)
 
diff --git a/media-gfx/digikam/digikam-1.5.0.ebuild b/media-gfx/digikam/digikam-1.7.0.ebuild
index 90b4a73184a5..3966dbe9bd33 100644
--- a/media-gfx/digikam/digikam-1.5.0.ebuild
+++ b/media-gfx/digikam/digikam-1.7.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.5.0.ebuild,v 1.4 2010/11/08 21:29:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.7.0.ebuild,v 1.1 2010/12/28 17:07:56 dilfridge Exp $
 
 EAPI="2"
 
-KDE_LINGUAS="ar bg ca cs da de eo et eu fi fr ga gl he hi hne hr hu is it ja km
-ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_TW"
+KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
+ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
 KMNAME="extragear/graphics"
 
 CMAKE_MIN_VERSION=2.8
@@ -66,7 +66,7 @@ DEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}"-1.4.0-docs.patch "${FILESDIR}/${P}"-unbundle.patch )
+PATCHES=( "${FILESDIR}/${P}"-docs.patch )
 
 src_prepare() {
 	if use handbook; then
diff --git a/media-gfx/digikam/files/digikam-1.4.0-docs.patch b/media-gfx/digikam/files/digikam-1.4.0-docs.patch
deleted file mode 100644
index 2cc2791a8704..000000000000
--- a/media-gfx/digikam/files/digikam-1.4.0-docs.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -r -u digikam-1.4.0.orig/CMakeLists.txt digikam-1.4.0/CMakeLists.txt
---- digikam-1.4.0.orig/CMakeLists.txt	2010-08-22 10:59:50.000000000 +0200
-+++ digikam-1.4.0/CMakeLists.txt	2010-09-24 23:48:11.557561663 +0200
-@@ -1340,18 +1340,45 @@
- # ==================================================================================================
- # API documentation generation
- 
--IF(DOXYGEN_FOUND)
-+# Checks if user ask to build documentation.
-+IF(BUILD_DOC)
-+    IF(DOXYGEN_FOUND)
- 
--    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)
-+        MESSAGE(STATUS "")
-+        MESSAGE(STATUS "Documentation will be installed")
-+	MESSAGE(STATUS "")
- 
--    CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
-+        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)
- 
--    ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
--                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-+        CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
-+
-+        ADD_CUSTOM_TARGET(doc ALL ${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 )
-+
-+# Build the handbook
-+add_subdirectory( doc )
-+
diff --git a/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch b/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch
deleted file mode 100644
index 6d1470bb8a97..000000000000
--- a/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-diff -r -u -N digikam-1.5.0-1-docs/CMakeLists.txt digikam-1.5.0/CMakeLists.txt
---- digikam-1.5.0-1-docs/CMakeLists.txt	2010-10-12 21:14:36.000000000 +0200
-+++ digikam-1.5.0/CMakeLists.txt	2010-10-15 23:07:49.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,10 +136,12 @@
- FIND_PACKAGE(JPEG)
- FIND_PACKAGE(PNG)
- FIND_PACKAGE(TIFF)
-+FIND_PACKAGE(PGF)
- FIND_PACKAGE(Jasper)
- 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
-@@ -273,6 +278,19 @@
- 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(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)
-+
-+
- # ================================================================
- 
- IF(GPHOTO2_FOUND)
-@@ -367,13 +385,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) OR (NOT LENSFUN_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) OR (NOT LENSFUN_FOUND)))
-+
- MESSAGE(STATUS "----------------------------------------------------------------------------------")
- MESSAGE(STATUS "")
- 
-@@ -585,7 +609,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
-@@ -618,6 +643,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}
-@@ -1076,14 +1102,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 -r -u -N digikam-1.5.0-1-docs/cmake/modules/FindCLAPACK.cmake digikam-1.5.0/cmake/modules/FindCLAPACK.cmake
---- digikam-1.5.0-1-docs/cmake/modules/FindCLAPACK.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ digikam-1.5.0/cmake/modules/FindCLAPACK.cmake	2010-10-15 23:06:08.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.5.0-1-docs/cmake/modules/FindPGF.cmake digikam-1.5.0/cmake/modules/FindPGF.cmake
---- digikam-1.5.0-1-docs/cmake/modules/FindPGF.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ digikam-1.5.0/cmake/modules/FindPGF.cmake	2010-10-15 23:05:52.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 -r -u -N digikam-1.5.0-1-docs/digikam/CMakeLists.txt digikam-1.5.0/digikam/CMakeLists.txt
---- digikam-1.5.0-1-docs/digikam/CMakeLists.txt	2010-10-10 21:37:09.000000000 +0200
-+++ digikam-1.5.0/digikam/CMakeLists.txt	2010-10-15 23:06:08.000000000 +0200
-@@ -53,8 +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
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/kipiiface
-@@ -94,13 +92,29 @@
-                      ${TIFF_INCLUDE_DIR}
-                    )
- 
--# Shared libdigikamcore ################################################################
-+IF(PGF_FOUND)
-+   INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
-+ELSE(PGF_FOUND)
-+   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf)
-+ENDIF(PGF_FOUND)
-+
-+IF(CLAPACK_FOUND)
-+   INCLUDE_DIRECTORIES(${CLAPACK_INCLUDE_DIR})
-+ELSE(CLAPACK_FOUND)
-+   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack)
-+ENDIF(CLAPACK_FOUND)
- 
--# Disable Clapack C code warnings.
--SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
-+# Shared libdigikamcore ################################################################
- 
--# Disable libpgf warnings.
--SET_SOURCE_FILES_PROPERTIES(${libpgf_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.
-+   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")
-@@ -187,10 +201,18 @@
-                       ${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)
- 
-+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)
-@@ -241,6 +263,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} )
- 
-@@ -339,6 +365,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.5.0-1-docs/libs/CMakeLists.txt digikam-1.5.0/libs/CMakeLists.txt
---- digikam-1.5.0-1-docs/libs/CMakeLists.txt	2010-10-10 21:36:54.000000000 +0200
-+++ digikam-1.5.0/libs/CMakeLists.txt	2010-10-15 23:05:52.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 -r -u -N digikam-1.5.0-1-docs/showfoto/CMakeLists.txt digikam-1.5.0/showfoto/CMakeLists.txt
---- digikam-1.5.0-1-docs/showfoto/CMakeLists.txt	2010-10-10 21:37:10.000000000 +0200
-+++ digikam-1.5.0/showfoto/CMakeLists.txt	2010-10-15 23:06:09.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.7.0-docs.patch b/media-gfx/digikam/files/digikam-1.7.0-docs.patch
new file mode 100644
index 000000000000..4d4edeaa7de2
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.7.0-docs.patch
@@ -0,0 +1,49 @@
+diff -ruN digikam-1.7.0.orig/CMakeLists.txt digikam-1.7.0/CMakeLists.txt
+--- digikam-1.7.0.orig/CMakeLists.txt	2010-12-19 11:31:26.000000000 +0100
++++ digikam-1.7.0/CMakeLists.txt	2010-12-26 18:57:13.000000000 +0100
+@@ -1423,8 +1423,15 @@
+ # ==================================================================================================
+ # API documentation generation
+ 
++# Checks if user ask to build documentation.
++IF(BUILD_DOC)
++
+ IF(DOXYGEN_FOUND)
+ 
++    MESSAGE(STATUS "")
++    MESSAGE(STATUS "API 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)
+@@ -1432,9 +1439,28 @@
+ 
+     CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
+ 
+-    ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
++    ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
+                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
++
++ELSE(DOXYGEN_FOUND)
++
++    MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found")
++
+ 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)
++
+ find_package(Msgfmt REQUIRED)
+ find_package(Gettext REQUIRED)
+ add_subdirectory( po )
++
++# Build the handbook
++add_subdirectory( doc )
++