Version bump; cleanup

(Portage version: 2.1.9.18/cvs/Linux x86_64)

6 files changed, 349 insertions, 367 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index bb30a97ae159..7b4e53d92a13 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.159 2010/09/25 16:40:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.160 2010/10/15 22:26:46 dilfridge Exp $
+
+*digikam-1.5.0 (15 Oct 2010)
+
+  15 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  -digikam-1.2.0-r2.ebuild, -files/digikam-1.2.0-libpgf.patch,
+  -files/digikam-1.3.0-docs.patch, -digikam-1.4.0.ebuild,
+  +digikam-1.5.0.ebuild, +files/digikam-1.5.0-unbundle.patch:
+  Version bump; cleanup
 
 *digikam-1.2.0-r3 (25 Sep 2010)
 
diff --git a/media-gfx/digikam/digikam-1.2.0-r2.ebuild b/media-gfx/digikam/digikam-1.2.0-r2.ebuild
deleted file mode 100644
index 79b83040fa5d..000000000000
--- a/media-gfx/digikam/digikam-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r2.ebuild,v 1.1 2010/07/09 23:32:27 reavertm Exp $
-
-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
-ko lt lv lb 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"
-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 +thumbnails video"
-
-CDEPEND="
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	>=kde-base/solid-${KDE_MINIMAL}
-	media-libs/jasper
-	>=media-libs/jpeg-8
-	media-libs/lcms:0
-	media-libs/liblqr
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/libpgf
-	>=media-plugins/kipi-plugins-1.2.0-r1
-	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 )
-"
-RDEPEND="${CDEPEND}
-	>=kde-base/kreadconfig-${KDE_MINIMAL}
-	video? (
-		|| (
-			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
-			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
-		)
-	)
-"
-# gcc[fortran] is required since we cannot otherwise link to the lapack library
-#   (the fun of unbundling)
-DEPEND="${CDEPEND}
-	sys-devel/gcc[fortran]
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Patch to prevent a crash on startup in RatingWidget (kde#232628)
-	epatch "${FILESDIR}/${P}-ratingwidget.patch"
-	# Patch to unbundled libpgf.
-	epatch "${FILESDIR}/${P}-libpgf.patch"
-	# Patch to unbundle lapack.
-	epatch "${FILESDIR}/${P}-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
-		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
-		$(cmake-utils_use_with addressbook KdepimLibs)
-		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_with geolocation MarbleWidget)
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with lensfun LensFun)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		-DENABLE_THEMEDESIGNER=OFF
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-gfx/digikam/digikam-1.4.0.ebuild b/media-gfx/digikam/digikam-1.5.0.ebuild
index e119f975d578..1be86dedad07 100644
--- a/media-gfx/digikam/digikam-1.4.0.ebuild
+++ b/media-gfx/digikam/digikam-1.5.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.4.0.ebuild,v 1.3 2010/09/18 20:17:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.5.0.ebuild,v 1.1 2010/10/15 22:26:46 dilfridge Exp $
 
 EAPI="2"
 
-KDE_LINGUAS="ar be bg ca cs da de el en_GB eo es et eu fa fi fr ga gl he hi hne hr hu is it ja km
-ko lt lv nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
+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"
 KMNAME="extragear/graphics"
 
 CMAKE_MIN_VERSION=2.8
@@ -18,12 +18,14 @@ 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"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 lensfun semantic-desktop themedesigner +thumbnails video"
+IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
 
 CDEPEND="
 	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
@@ -34,6 +36,7 @@ CDEPEND="
 	media-libs/jasper
 	>=media-libs/jpeg-8
 	media-libs/lcms:0
+	>=media-libs/lensfun-0.2.5
 	media-libs/liblqr
 	media-libs/libpng
 	media-libs/tiff
@@ -42,11 +45,10 @@ CDEPEND="
 	>=sci-libs/clapack-3.2.1-r3
 	virtual/mysql
 	x11-libs/qt-gui[qt3support]
-	x11-libs/qt-sql[mysql,sqlite]
+	|| ( x11-libs/qt-sql[mysql] 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 )
 "
 RDEPEND="${CDEPEND}
 	>=kde-base/kreadconfig-${KDE_MINIMAL}
@@ -63,7 +65,18 @@ DEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}"-1.3.0-{docs,pgf}.patch "${FILESDIR}/${P}"-clapack.patch)
+PATCHES=( "${FILESDIR}/${PN}"-1.4.0-docs.patch "${FILESDIR}/${P}"-unbundle.patch )
+
+src_prepare() {
+	if use handbook; then
+		mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die
+	else
+		mkdir doc || die
+		echo > doc/CMakeLists.txt || die
+	fi
+
+	kde4-base_src_prepare
+}
 
 src_configure() {
 	local backend
@@ -73,13 +86,13 @@ src_configure() {
 	mycmakeargs=(
 		-DFORCED_UNBUNDLE=ON
 		-DWITH_LQR=ON
+		-DWITH_LENSFUN=ON
 		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
 		$(cmake-utils_use_with addressbook KdepimLibs)
 		$(cmake-utils_use_build doc)
 		$(cmake-utils_use_with geolocation MarbleWidget)
 		$(cmake-utils_use_enable gphoto2 GPHOTO2)
 		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with lensfun LensFun)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_enable themedesigner)
 		$(cmake-utils_use_enable thumbnails THUMBS_DB)
@@ -87,3 +100,26 @@ src_configure() {
 
 	kde4-base_src_configure
 }
+
+src_install() {
+	kde4-base_src_install
+
+	if use doc; then
+		# install the api documentation
+		dodir /usr/share/doc/${PF}/html || die
+		insinto /usr/share/doc/${PF}/html
+		doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
+	fi
+
+	if use handbook; then
+		dodoc readme-handbook.txt || die
+	fi
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use doc; then
+		elog The digikam api documentation has been installed at /usr/share/doc/${PF}/html
+	fi
+}
diff --git a/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch b/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch
deleted file mode 100644
index e788cf0e0055..000000000000
--- a/media-gfx/digikam/files/digikam-1.2.0-libpgf.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff -ruN old/cmake/modules/FindPGF.cmake new/cmake/modules/FindPGF.cmake
---- old/cmake/modules/FindPGF.cmake	1969-12-31 21:00:00.000000000 -0300
-+++ new/cmake/modules/FindPGF.cmake	2010-03-30 13:54:13.520854878 -0300
-@@ -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 -ruN old/CMakeLists.txt new/CMakeLists.txt
---- old/CMakeLists.txt	2010-03-28 19:26:06.000000000 -0300
-+++ new/CMakeLists.txt	2010-03-30 19:50:55.537108644 -0300
-@@ -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
-@@ -115,6 +118,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)
-@@ -210,6 +218,7 @@
- 
- PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND)
- 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)
-@@ -311,13 +320,13 @@
-     MESSAGE(STATUS "")
- ENDIF(DOXYGEN_FOUND)
- 
--IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND 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_FOUND 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_FOUND 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_FOUND 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_FOUND 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_FOUND AND KIPI_FOUND)
- 
- MESSAGE(STATUS "----------------------------------------------------------------------------------")
- MESSAGE(STATUS "")
-@@ -952,14 +961,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
-@@ -1258,18 +1260,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 -ruN old/digikam/CMakeLists.txt new/digikam/CMakeLists.txt
---- old/digikam/CMakeLists.txt	2010-03-28 19:19:21.000000000 -0300
-+++ new/digikam/CMakeLists.txt	2010-03-30 19:44:00.296860646 -0300
-@@ -52,7 +52,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
-@@ -89,6 +88,7 @@
-                      ${JPEG_INCLUDE_DIR}
-                      ${PNG_PNG_INCLUDE_DIR}
-                      ${TIFF_INCLUDE_DIR}
-+		     ${PGF_INCLUDE_DIRS}
-                    )
- 
- IF(LENSFUN_LIBRARY)
-@@ -100,9 +100,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")
- 
-@@ -121,7 +118,6 @@
-                         ${libjpegutils_SRCS}
-                         ${libthreadimageio_SRCS}
-                         ${libthemeengine_SRCS}
--                        ${libpgf_SRCS}
-                         ${pgfutils_SRCS}
-                         ${libdigikamhelpers_SRCS}
- 
-@@ -173,6 +169,7 @@
-                       ${JPEG_LIBRARIES}
-                       ${TIFF_LIBRARIES}
-                       ${PNG_LIBRARIES}
-+		      ${PGF_LIBRARIES}
-                       ${LCMS_LIBRARIES}
-                       ${JASPER_LIBRARIES}
- 
-@@ -225,7 +222,6 @@
-                              ${libhaar_SRCS}
-                              ${libdatabasemodels_SRCS}
-                              ${libsqlite2_SRCS}
--                             ${libpgf_SRCS}
-                              ${pgfutils_SRCS}
-    )
- 
-@@ -240,6 +236,7 @@
-                       ${QT_QTCORE_LIBRARY}
-                       ${QT_QTGUI_LIBRARY}
-                       ${QT_QTSQL_LIBRARY}
-+		      ${PGF_LIBRARIES}
-                      )
- 
- SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
-diff -ruN old/libs/CMakeLists.txt new/libs/CMakeLists.txt
---- old/libs/CMakeLists.txt	2010-03-28 19:19:02.000000000 -0300
-+++ new/libs/CMakeLists.txt	2010-03-30 14:03:07.365604017 -0300
-@@ -18,6 +18,7 @@
-                      ${JPEG_INCLUDE_DIR}
-                      ${TIFF_INCLUDE_DIR}
-                      ${PNG_INCLUDE_DIR}
-+                     ${PGF_INCLUDE_DIRS}
-                      ${JASPER_INCLUDE_DIR}
-                    )
- ADD_SUBDIRECTORY( histogram )
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 63af639597a9..000000000000
--- 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.5.0-unbundle.patch b/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch
new file mode 100644
index 000000000000..6d1470bb8a97
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.5.0-unbundle.patch
@@ -0,0 +1,294 @@
+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}