Version bump.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 306 insertions, 4 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index df8205fcaaac..e18cb3fb8412 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.145 2009/11/15 19:20:44 scarabeus Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.146 2010/02/05 17:55:28 ssuominen Exp $
+
+*digikam-1.1.0 (05 Feb 2010)
+
+  05 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> +digikam-1.1.0.ebuild,
+  +files/digikam-1.1.0-libpgf.patch:
+  Version bump wrt #295459, thanks to Ronan Arraes Jardim Chagas and others.
 
 *digikam-1.0.0_beta6 (15 Nov 2009)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index de487b1fbfa5..5a8c60a48acd 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,7 +1,10 @@
+AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d
 DIST digikam-0.10.0.tar.bz2 11194398 RMD160 88502e170a6786576531fbc5ab045e96aea2dbbb SHA1 71449a6b1d4d7e889b45dc238957ff423c73b8fe SHA256 69dbeeba8fca87087cf845ca4581dd9197426bb1d5140d967c7b29c449523cbc
 DIST digikam-1.0.0-beta6.patch.bz2 13773 RMD160 ae39477254e47c6ad4255393e2f157440455e78e SHA1 fba185751c84e40f0be24904cd1d467e6cb0412e SHA256 93b567a2ef6da8cc67117e9d9f85940d4286d27f0ef7aa01fd8c442cfa418e35
 DIST digikam-1.0.0-beta6.tar.bz2 14482980 RMD160 9ceb4f4f8495404e4f51408a9dc595c093466994 SHA1 33dc6c99867386322aa499da1d6e5e0f1dc3d6aa SHA256 4ae6602daa1006aed245abe2c99c6d4a8d8d2b443c181635c9513c229159a09f
+DIST digikam-1.1.0.tar.bz2 15385611 RMD160 a4bd749adf24be7cd349e7be464cf22018d21eca SHA1 5ee482ff209c0a29b898e57278d62c428b743ba5 SHA256 6d26921e83bdb85342a0455df919f33bc2f23533c96e9293e80cd79ff92bfa8f
 EBUILD digikam-0.10.0-r1.ebuild 1972 RMD160 a77e0c9f800386d9bdd7d64f69ade3f36ec0dc0e SHA1 570d5da8b0acf6a31c2f6a4ee99e41c549afb284 SHA256 eac90df049facad4e292b5448a30adcfed18383a71cd02b45e13e18c784472cd
 EBUILD digikam-1.0.0_beta6.ebuild 2150 RMD160 3e260a4a66e2587f81a2e90abf76d5b059178b8b SHA1 d436735417bd898b645dac3c70540c4b577a9684 SHA256 fdf1d7485f9e17f9e16d8091dabc1cecb2d71f6d60b4d8d7035a7290d7c3b7f0
-MISC ChangeLog 23876 RMD160 2fba29712fe8f426559dd08fa1d8a8a42893feb5 SHA1 03cf73b7e002d13c79a1f9edb378c61c2fa04c52 SHA256 534e0bef2b7a74b437100529671e61b9c43eddbd8761fd580d66cdaa24d822eb
-MISC metadata.xml 429 RMD160 5781221f2d87f8b1df91da93566f9a7712c6a6a3 SHA1 f59998d5195657c1684a8f1bf2c75c5c581b919e SHA256 ee3a1a61ce244f4f3193da7754d4d02b790ee9328a26c3d52a4b03be2f0f65c8
+EBUILD digikam-1.1.0.ebuild 2028 RMD160 abc0da8582c1a2a3094d5382724d78ff7656c4c5 SHA1 6325b2603168ed9d5e8e26cabc12de6bb0e77ead SHA256 e2969defc054a60466ed53ce4cd7d0e58672f45e45a8b5c332ff3e4b6b218db3
+MISC ChangeLog 24098 RMD160 f982f61664a539296fe5b6bfde0a5983b0b3fcef SHA1 3897f5f2973419094bfc84ec22e3b574ab08f06f SHA256 d5a4dde0134e5b91e5fd29bb0471b50b604c23833a51c80ca430a7468d2c4d6e
+MISC metadata.xml 494 RMD160 6139d5c9cfa6c7c1295682cc4094b1138a3d4197 SHA1 d5d698ce43d3089bc3c9dd0a6eb989d89766062e SHA256 8fb9939a7dec954094ab4dea687e3be5a8486295e201124fc4192f32d4526de1
diff --git a/media-gfx/digikam/digikam-1.1.0.ebuild b/media-gfx/digikam/digikam-1.1.0.ebuild
new file mode 100644
index 000000000000..eec43411d430
--- /dev/null
+++ b/media-gfx/digikam/digikam-1.1.0.ebuild
@@ -0,0 +1,60 @@
+# 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.1.0.ebuild,v 1.1 2010/02/05 17:55:28 ssuominen Exp $
+
+EAPI=2
+KDE_LINGUAS="ar be bg ca ca@valencia 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"
+inherit kde4-base
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="addressbook debug doc geolocation +glib gphoto2 lensfun semantic-desktop +thumbnails"
+
+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}
+	media-libs/jasper
+	media-libs/jpeg:0
+	media-libs/lcms
+	media-libs/liblqr
+	media-libs/libpng
+	media-libs/tiff
+	>=media-libs/libpgf-6.09.44-r1
+	x11-libs/qt-sql:4[sqlite]
+	glib? ( dev-libs/glib:2 )
+	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+	geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.1-r1 )
+	lensfun? ( media-libs/lensfun )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )"
+
+DOCS="AUTHORS ChangeLog DESIGN HACKING NEWS README TODO"
+
+PATCHES=( "${FILESDIR}/${P}-libpgf.patch" )
+
+src_configure() {
+	mycmakeargs+=( "-DENABLE_THEMEDESIGNER=OFF"
+		$(cmake-utils_use_enable thumbnails THUMBS_DB)
+		$(cmake-utils_use_with doc Doxygen)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with gphoto2 Gphoto2)
+		$(cmake-utils_use_with addressbook KdepimLibs)
+		$(cmake-utils_use_with lensfun LensFun)
+		"-DWITH_Lqr-1=ON"
+		$(cmake-utils_use_with geolocation MarbleWidget)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano) )
+
+	kde4-base_src_configure
+}
diff --git a/media-gfx/digikam/files/digikam-1.1.0-libpgf.patch b/media-gfx/digikam/files/digikam-1.1.0-libpgf.patch
new file mode 100644
index 000000000000..47b2c728cef9
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.1.0-libpgf.patch
@@ -0,0 +1,232 @@
+From 0e5ebb56e3b0ca85b8ca74ae3577b06a4795cad6 Mon Sep 17 00:00:00 2001
+From: Ronan Arraes Jardim Chagas <ronisbr@gmail.com>
+Date: Thu, 4 Feb 2010 11:09:22 -0200
+Subject: [PATCH] Initial approach to unbundled libpgf from Digikam 1.1.0
+
+Changes to be committed:
+
+	modified:   CMakeLists.txt
+	new file:   cmake/modules/FindPGF.cmake
+	modified:   digikam/CMakeLists.txt
+	modified:   libs/CMakeLists.txt
+---
+ CMakeLists.txt              |   70 ++++++++++++++++++++++++++++++------------
+ cmake/modules/FindPGF.cmake |   15 +++++++++
+ digikam/CMakeLists.txt      |    8 ++---
+ libs/CMakeLists.txt         |    1 +
+ 4 files changed, 69 insertions(+), 25 deletions(-)
+ create mode 100644 cmake/modules/FindPGF.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3cf296a..329e410 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,6 +34,13 @@ SET(DIGIKAM_VERSION_STRING
+     "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}"
+    )
+ 
++# Path to find FindPGF.cmake script.
++SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
++
++# =================================================================================================
++# Project options
++OPTION(BUILD_DOC "Set ON to install documentation files" OFF)
++
+ # ==================================================================================================
+ # Debug area codes
+ # These codes will be set for every project specific path automatically, so
+@@ -115,6 +122,11 @@ FIND_PACKAGE(LCMS)
+ 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)
+@@ -197,6 +209,7 @@ MESSAGE(STATUS "")
+ 
+ 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)
+@@ -298,13 +311,13 @@ ELSE(DOXYGEN_FOUND)
+     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 "")
+@@ -889,14 +902,7 @@ IF(DIGIKAM_CAN_BE_COMPILED)
+         ${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
+@@ -1176,18 +1182,42 @@ ENDIF(DIGIKAM_CAN_BE_COMPILED)
+ # ==================================================================================================
+ # API documentation generation
+ 
+-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)
++# Checks if user ask to build documentation.
++IF(BUILD_DOC)
++    IF(DOXYGEN_FOUND)
+ 
+-    CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
++	MESSAGE(STATUS "")
++	MESSAGE(STATUS "Documentation will be installed")
++	MESSAGE(STATUS "")
+ 
+-    ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
+-                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
++        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})
++
++        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/cmake/modules/FindPGF.cmake b/cmake/modules/FindPGF.cmake
+new file mode 100644
+index 0000000..60aeacc
+--- /dev/null
++++ b/cmake/modules/FindPGF.cmake
+@@ -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 --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt
+index 445e24f..e6839f7 100644
+--- a/digikam/CMakeLists.txt
++++ b/digikam/CMakeLists.txt
+@@ -73,6 +73,7 @@ INCLUDE_DIRECTORIES(
+                      ${JPEG_INCLUDE_DIR}
+                      ${PNG_PNG_INCLUDE_DIR}
+                      ${TIFF_INCLUDE_DIR}
++		     ${PGF_INCLUDE_DIRS}
+                    )
+ 
+ 
+@@ -81,9 +82,6 @@ INCLUDE_DIRECTORIES(
+ # 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")
+-
+ SET(digikamcore_LIB_SRCS
+                         # basic libs
+                         ${libdimg_SRCS}
+@@ -100,7 +98,6 @@ SET(digikamcore_LIB_SRCS
+                         ${libgreycstoration_SRCS}
+                         ${libthreadimageio_SRCS}
+                         ${libthemeengine_SRCS}
+-                        ${libpgf_SRCS}
+                         ${pgfutils_SRCS}
+                         ${libdigikamhelpers_SRCS}
+ 
+@@ -150,6 +147,7 @@ TARGET_LINK_LIBRARIES(digikamcore
+                       ${JPEG_LIBRARIES}
+                       ${TIFF_LIBRARIES}
+                       ${PNG_LIBRARIES}
++		      ${PGF_LIBRARIES}
+                       ${LCMS_LIBRARIES}
+                       ${JASPER_LIBRARIES}
+ 
+@@ -193,7 +191,6 @@ SET(digikamdatabase_LIB_SRCS ${libdatabase_SRCS}
+                              ${libhaar_SRCS}
+                              ${libdatabasemodels_SRCS}
+                              ${libsqlite2_SRCS}
+-                             ${libpgf_SRCS}
+                              ${pgfutils_SRCS}
+    )
+ 
+@@ -208,6 +205,7 @@ TARGET_LINK_LIBRARIES(digikamdatabase
+                       ${QT_QTCORE_LIBRARY}
+                       ${QT_QTGUI_LIBRARY}
+                       ${QT_QTSQL_LIBRARY}
++		      ${PGF_LIBRARIES}
+                      )
+ 
+ SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
+index b66da1c..f0a6aab 100644
+--- a/libs/CMakeLists.txt
++++ b/libs/CMakeLists.txt
+@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES( dimg
+                      ${JPEG_INCLUDE_DIR}
+                      ${TIFF_INCLUDE_DIR}
+                      ${PNG_INCLUDE_DIR}
++		     ${PGF_INCLUDE_DIRS}
+                      ${JASPER_INCLUDE_DIR}
+                    )
+ ADD_SUBDIRECTORY( curves )
+-- 
+1.6.4.4
+
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index f8bc62462c7b..791cc0985c71 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -5,6 +5,7 @@
 <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="thumbnails">Allow thumbnail previews for images/photos</flag>
 </use>