Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-gfx/digikam/ChangeLog10
-rw-r--r--media-gfx/digikam/Manifest29
-rw-r--r--media-gfx/digikam/digikam-1.4.0.ebuild88
-rw-r--r--media-gfx/digikam/files/digikam-1.3.0-docs.patch54
-rw-r--r--media-gfx/digikam/files/digikam-1.3.0-pgf.patch153
-rw-r--r--media-gfx/digikam/files/digikam-1.4.0-clapack.patch181
-rw-r--r--media-gfx/digikam/metadata.xml2
7 files changed, 514 insertions, 3 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 859c9b4b4fd7..db49fd8c5b8c 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.154 2010/07/09 23:32:27 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.155 2010/09/16 20:50:41 dilfridge Exp $
+
+*digikam-1.4.0 (16 Sep 2010)
+
+ 16 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+ +files/digikam-1.3.0-docs.patch, +files/digikam-1.3.0-pgf.patch,
+ +digikam-1.4.0.ebuild, +files/digikam-1.4.0-clapack.patch, metadata.xml:
+ Version bump. Lapack dependency is switched from (Fortran) virtual/lapack
+ to (C) sci-libs/clapack.
*digikam-1.2.0-r2 (09 Jul 2010)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 6e623bb37731..4514c7e98744 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,12 +1,37 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d
AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e279aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9
AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca57f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0
AUX digikam-1.2.0-libpgf.patch 8505 RMD160 524cfb182518f45e6d2a683642486eb84a3471d3 SHA1 d86fec9b63442f472d0ce7dd0d20939fe389eadc SHA256 8c603858103f056d17d4e8d9a3cb1d6464de6d174d82ff50882611e27564f465
AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231
+AUX digikam-1.3.0-docs.patch 1910 RMD160 c4d644e91a0b492c8c9a8e53ed0ae19fa743dabc SHA1 6d3c6519e4d7351198f6275639afe448e09d92b7 SHA256 d8048791e9623fe99796d71bc835ac568786b4c5a643b3d02c6d80472e725b99
+AUX digikam-1.3.0-pgf.patch 6006 RMD160 bfda7c95a633f4967935545f66d850fd94db9566 SHA1 43295130d7a62dc27097ed9730b3b47e13f2ab3f SHA256 84c219c7238790288b90acdb255bce2e40e3c5f19476885a2d456698e2f57205
+AUX digikam-1.4.0-clapack.patch 7429 RMD160 a10cf8ff044e42cfbb3880ed543b3df0221655e6 SHA1 7cd6461ff474503124a3116b8dfd8bb264c5afb6 SHA256 1e2f1d11a612f1cff63acc46db5e5818a438d35d5aaef5b40ea6633b1f4b079e
DIST digikam-1.1.0-libjpeg-8a.patch.bz2 14552 RMD160 8ecf249a0e4db45ccd13b7013b543483cb1a7af5 SHA1 137402f1727f8fcb76f38c33ad1ba0ae036e298e SHA256 c728940524ef7089c842319134aa3346de154e546f8dbf5f2b9d3a7096c33456
DIST digikam-1.1.0.tar.bz2 15385611 RMD160 a4bd749adf24be7cd349e7be464cf22018d21eca SHA1 5ee482ff209c0a29b898e57278d62c428b743ba5 SHA256 6d26921e83bdb85342a0455df919f33bc2f23533c96e9293e80cd79ff92bfa8f
DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
+DIST digikam-1.4.0.tar.bz2 14907229 RMD160 a78656044bcc42f21794c1c4a25dcaaf869df38d SHA1 a3370f2d2c469fa5b90966bb0141b5a8956c71df SHA256 d37afaad8808f78ecda93d7498c64b72eee3bb61911fbeff87d3a528a7247eba
EBUILD digikam-1.1.0-r1.ebuild 2145 RMD160 8ac789bca92424a4e138b5f8d5f02445bdf43532 SHA1 0cb45162c3686b51414d6e109f721834a5adb496 SHA256 a18f53845b79ada790e740ef7f638a24cf179cf8cfd82a92adccd8694baff608
EBUILD digikam-1.2.0-r2.ebuild 2687 RMD160 4f428f715f708428629579974db4055d4b030a00 SHA1 3804de030becf59b477c0ed3e93d0f06f7c5ac85 SHA256 91d415064f24e7b3f7445e1118d23a46fc38e68a07555c8987854f738a588923
-MISC ChangeLog 25337 RMD160 2143d24e4f9d63bb688900bf603f12ffa7605e32 SHA1 2f09165aca23ddaf30c444cada90463ebbdc32dc SHA256 be90ef17d56313b8a8652237f92ff7934e04e809b8d2a7f5f76481e190750790
-MISC metadata.xml 562 RMD160 188fb8388578c167401790a089e059d7a23303ae SHA1 e7882d5de84b534b1c0ebcf8afc14c1f7d137b98 SHA256 b806a8f3e029ca8593ed1966024e6e5392e3382d06a87d5dc05ee1ecac536a79
+EBUILD digikam-1.4.0.ebuild 2509 RMD160 2bd1afe161e5d1b4a0f2e30d4dc58f57482570e7 SHA1 364c7c2d8a3b1397e476ce696be224f38cd30c23 SHA256 1c66288c8a36ac985abcce33ffd0dd005c7104d3c9e4559120ed9593bc6e0b16
+MISC ChangeLog 25671 RMD160 19f86e50541d83823edffeea9404ec3486000e0d SHA1 04e8df938dcff01aaafcef2d39168508e3f7cccc SHA256 8c47b34b05fb3edb76f01189d1c28764facb421d73e09b64a07f133336c0a1e9
+MISC metadata.xml 691 RMD160 2e1c382d4682a65909cd2820a3b997a8e27f405f SHA1 42cfc8076bba5c72e6df4650694b9ddf1b5b5bb2 SHA256 ccc5ec872df963f90005d9f2330315b4c0fc3336890464cb1f3835908a381e61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJMkoMCAAoJENwGBM22xffe5uUP/AgcrdZeu8K2PENnPDX2/WP1
+5jRzKW0eyWnbmpTkXhjX6iP/7Cgpe2MMjXzSKebvFQn00AFM5yax6fyQ7jRG4sP2
+MnwB6bj9t2qeBZ/6ywrMSHkzBFbGvIE/3bcxDaFS7MHNe1ceHSFbu0TUD1UGhIzS
+AwvTbT9svuJ9i3HM/Qw6/y653W4jQLqr9M1+0w2dQlq/imv8gHgWBywS7XzVddhl
+Ec7ZTVF0lSOg+q3DQxstcQ6lsSdfhyyHmn+tXTM21g+DV1iRPxwMWPxUISupEFDG
+bfyouqaXNmeWJzqJxNPa5PZUdVa7fpff5xlunlZbLRAG/dBV2bVMm/dFL3iyexzz
+3HGNLH2gBelAP3fhBQ7a3Gvyc3qWtpQMER1+XfOlucO/nJLzWHNIRaJ6ICFzVWqI
+Ymc4TNUbFEw+Q8fVyEs9mGlbThbQwFNv7jhbTRbZWKYDxT5CvGXzs5DZ8YkLEhnp
+lBr01flG07IRLtCka+Zuj25cZVNcxdkAPe4Sbp/N2rOiPag0/abMIcwGiMjNB2vT
+I4c9W4u59PtLUUuuMvUXynLxP1Jd+7RG/bXTR3e8jOi87tPP13nh0Gk/CKSYeU6q
+tc9La6z8LPiVV+QY9wWcWVELc0qqakXcZlGOIvJBS8I0pLIkNtqGsSTiAyltKK9M
+0NZEU6xtP6ILOCJTSMOx
+=XPpF
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.4.0.ebuild b/media-gfx/digikam/digikam-1.4.0.ebuild
new file mode 100644
index 000000000000..b77512e9ae82
--- /dev/null
+++ b/media-gfx/digikam/digikam-1.4.0.ebuild
@@ -0,0 +1,88 @@
+# 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.1 2010/09/16 20:50:42 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"
+KMNAME="extragear/graphics"
+
+CMAKE_MIN_VERSION=2.8
+
+# needed for sufficiently new libkdcraw
+KDE_MINIMAL="4.5"
+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"
+
+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
+ >=sci-libs/clapack-3.2.1-r3
+ 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}
+ )
+ )
+"
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}"-1.3.0-{docs,pgf}.patch "${FILESDIR}/${P}"-clapack.patch)
+
+src_configure() {
+ local backend
+
+ use semantic-desktop && backend="Nepomuk" || backend="None"
+ # LQR = only allows to choose between bundled/external
+ mycmakeargs=(
+ -DFORCED_UNBUNDLE=ON
+ -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)
+ $(cmake-utils_use_enable themedesigner)
+ $(cmake-utils_use_enable thumbnails THUMBS_DB)
+ )
+
+ kde4-base_src_configure
+}
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 000000000000..63af639597a9
--- /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-pgf.patch b/media-gfx/digikam/files/digikam-1.3.0-pgf.patch
new file mode 100644
index 000000000000..c965a8449d73
--- /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 )
diff --git a/media-gfx/digikam/files/digikam-1.4.0-clapack.patch b/media-gfx/digikam/files/digikam-1.4.0-clapack.patch
new file mode 100644
index 000000000000..2fb1f5eae2a3
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.4.0-clapack.patch
@@ -0,0 +1,181 @@
+diff -r -u -N digikam-1.4.0.1pgf/CMakeLists.txt digikam-1.4.0/CMakeLists.txt
+--- digikam-1.4.0.1pgf/CMakeLists.txt 2010-08-31 23:39:20.000000000 +0200
++++ digikam-1.4.0/CMakeLists.txt 2010-08-31 23:39:47.000000000 +0200
+@@ -141,6 +141,7 @@
+ FIND_PACKAGE(Kdcraw)
+ FIND_PACKAGE(Kexiv2)
+ FIND_PACKAGE(Kipi)
++FIND_PACKAGE(CLAPACK)
+
+ # Extract version of libjpeg so that we can use the appropriate dir
+ # See bug #227313, #228483
+@@ -278,7 +279,13 @@
+ MESSAGE(STATUS " libpgf library found..................... YES (optional)")
+ ELSE(PGF_FOUND)
+ MESSAGE(STATUS " libpgf library found..................... NO (optional - internal version used instead)")
+-ENDIF(GPHOTO2_FOUND)
++ENDIF(PGF_FOUND)
++
++IF(CLAPACK_FOUND)
++ MESSAGE(STATUS " libclapack library found................. YES (optional)")
++ELSE(CLAPACK_FOUND)
++ MESSAGE(STATUS " libclapack library found................. NO (optional - internal version used instead)")
++ENDIF(CLAPACK_FOUND)
+
+
+ # ================================================================
+@@ -377,13 +384,19 @@
+ ENDIF(DOXYGEN_FOUND)
+
+ IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
+- MESSAGE(STATUS " digiKam will be compiled................. YES")
++ MESSAGE(STATUS " digiKam can be compiled.................. YES")
+ SET(DIGIKAM_CAN_BE_COMPILED true)
+ ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
+ MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)")
+ SET(DIGIKAM_CAN_BE_COMPILED false)
+ ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
+
++IF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND)))
++ MESSAGE(STATUS "")
++ MESSAGE(FATAL_ERROR " BUNDLED LIBRARIES HAVE BEEN FORCE-DISABLED IN THIS BUILD. Aborting.")
++ SET(DIGIKAM_CAN_BE_COMPILED false)
++ENDIF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND)))
++
+ MESSAGE(STATUS "----------------------------------------------------------------------------------")
+ MESSAGE(STATUS "")
+
+@@ -541,7 +554,8 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp
+ )
+
+- SET(libclapack_SRCS
++ if(NOT CLAPACK_FOUND)
++ SET(libclapack_SRCS
+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c
+@@ -574,6 +588,7 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c
+ )
++ endif(NOT CLAPACK_FOUND)
+
+ SET(libdimgfilters_SRCS
+ ${libclapack_SRCS}
+diff -r -u -N digikam-1.4.0.1pgf/cmake/modules/FindCLAPACK.cmake digikam-1.4.0/cmake/modules/FindCLAPACK.cmake
+--- digikam-1.4.0.1pgf/cmake/modules/FindCLAPACK.cmake 1970-01-01 01:00:00.000000000 +0100
++++ digikam-1.4.0/cmake/modules/FindCLAPACK.cmake 2010-08-31 23:43:20.000000000 +0200
+@@ -0,0 +1,44 @@
++# - Try to find clapack library
++# Once done this will define
++#
++# CLAPACK_FOUND - system has CLAPACK library
++# CLAPACK_INCLUDE_DIR - the CLAPACK include directory
++# CLAPACK_LIBRARY - the marblewidget library
++#
++# copyright 2008 by Patrick Spendrin <ps_ml@gmx.de>
++# copyright 2010 by Andreas K. Huettel <mail@akhuettel.de>
++# use this file as you like
++#
++
++if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
++
++ # Already in cache
++ set(CLAPACK_FOUND TRUE)
++
++else(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
++
++ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack NO_DEFAULT_PATH)
++ if(CLAPACK_INCLUDE_DIR)
++ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}")
++ else(CLAPACK_INCLUDE_DIR)
++ find_path(CLAPACK_INCLUDE_DIR clapack.h PATHS /usr/include/clapack)
++ if(CLAPACK_INCLUDE_DIR)
++ message(STATUS "Found clapack includes: ${CLAPACK_INCLUDE_DIR}")
++ endif(CLAPACK_INCLUDE_DIR)
++ endif(CLAPACK_INCLUDE_DIR)
++
++ find_library(CLAPACK_LIBRARY clapack)
++ if(CLAPACK_LIBRARY)
++ message(STATUS "Found clapack library: ${CLAPACK_LIBRARY}")
++ endif(CLAPACK_LIBRARY)
++
++ if(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
++ set(CLAPACK_FOUND TRUE)
++ endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
++
++ if(NOT CLAPACK_FOUND)
++ message(STATUS "Could NOT find any working clapack installation")
++ endif(NOT CLAPACK_FOUND)
++
++ mark_as_advanced(CLAPACK_INCLUDE_DIR CLAPACK_LIBRARY)
++endif(CLAPACK_INCLUDE_DIR AND CLAPACK_LIBRARY)
+diff -r -u -N digikam-1.4.0.1pgf/digikam/CMakeLists.txt digikam-1.4.0/digikam/CMakeLists.txt
+--- digikam-1.4.0.1pgf/digikam/CMakeLists.txt 2010-08-31 23:39:20.000000000 +0200
++++ digikam-1.4.0/digikam/CMakeLists.txt 2010-08-31 23:39:47.000000000 +0200
+@@ -53,7 +53,6 @@
+ # specific libs and utilities
+ ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof
+ ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2
+- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack
+ ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg
+ ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine
+ ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/kipiiface
+@@ -103,10 +102,18 @@
+ INCLUDE_DIRECTORIES(${LENSFUN_INCLUDE_DIR})
+ ENDIF(LENSFUN_LIBRARY)
+
++IF(CLAPACK_FOUND)
++ INCLUDE_DIRECTORIES(${CLAPACK_INCLUDE_DIR})
++ELSE(CLAPACK_FOUND)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack)
++ENDIF(CLAPACK_FOUND)
++
+ # Shared libdigikamcore ################################################################
+
+-# Disable Clapack C code warnings.
+-SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
++IF(NOT CLAPACK_FOUND)
++ # Disable Clapack C code warnings.
++ SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
++ENDIF(NOT CLAPACK_FOUND)
+
+ IF(NOT PGF_FOUND)
+ # Disable libpgf warnings.
+@@ -203,6 +210,10 @@
+ TARGET_LINK_LIBRARIES(digikamcore ${LIBMARBLEWIDGET_LIBRARY})
+ ENDIF(MARBLEWIDGET_FOUND)
+
++IF(CLAPACK_FOUND)
++ TARGET_LINK_LIBRARIES(digikamcore ${CLAPACK_LIBRARY})
++ENDIF(CLAPACK_FOUND)
++
+ IF(Q_WS_X11)
+ TARGET_LINK_LIBRARIES(digikamcore ${X11_LIBRARIES})
+ ENDIF(Q_WS_X11)
+@@ -359,6 +370,10 @@
+ TARGET_LINK_LIBRARIES(digikam ${LIBMARBLEWIDGET_LIBRARY})
+ ENDIF(MARBLEWIDGET_FOUND)
+
++IF(CLAPACK_FOUND)
++ TARGET_LINK_LIBRARIES(digikam ${CLAPACK_LIBRARY})
++ENDIF(CLAPACK_FOUND)
++
+ INSTALL(TARGETS digikam ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ # Others Files to install #######################################################
+diff -r -u -N digikam-1.4.0.1pgf/showfoto/CMakeLists.txt digikam-1.4.0/showfoto/CMakeLists.txt
+--- digikam-1.4.0.1pgf/showfoto/CMakeLists.txt 2010-08-22 10:53:39.000000000 +0200
++++ digikam-1.4.0/showfoto/CMakeLists.txt 2010-08-31 23:39:47.000000000 +0200
+@@ -65,6 +65,10 @@
+
+ KDE4_ADD_EXECUTABLE(showfoto ${showfoto_SRCS})
+
++IF(CLAPACK_FOUND)
++ TARGET_LINK_LIBRARIES(showfoto ${CLAPACK_LIBRARY})
++ENDIF(CLAPACK_FOUND)
++
+ TARGET_LINK_LIBRARIES(showfoto
+ digikamcore
+ ${KEXIV2_LIBRARIES}
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index dc2c07b9ae96..96e0358cde3a 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -2,11 +2,13 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
+<maintainer><email>dilfridge@gentoo.org</email></maintainer>
<use>
<flag name="addressbook">Add support for kdepim</flag>
<flag name="geolocation">Add support for marble</flag>
<flag name="glib">Enable support for liquid rescale tool</flag>
<flag name="lensfun">Enable support for lens-correnction library</flag>
+ <flag name="themedesigner">Build the digikam theme designer</flag>
<flag name="thumbnails">Enable thumbnails database support</flag>
<flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>
</use>