[media-gfx/digikam] Version bump

(Portage version: 2.1.9.50/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

4 files changed, 26 insertions, 123 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 9031954d4d..4e7270e038 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,25 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d842b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc
-AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
-DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394
-EBUILD digikam-2.0.0_beta5.ebuild 3234 RMD160 78517e71ce1dc152df3a633ba18eab0ea80c0271 SHA1 194c1bc660e409e81b2492b75810ad743ca67cfb SHA256 7b081c7266b164fef3d3e363cf47792cb8d89957265e4db1284788e943ee488b
+DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea
+EBUILD digikam-2.0.0_beta6.ebuild 3280 RMD160 747fb3aafb75333195dedb85c6197b636db41a57 SHA1 3feecbd0f9a18581377e2fcce58cf9dba6110d2c SHA256 2f93b87ea468d38f44d458de53b4a9ea38e8357757d84ce4e3e728ab45082f09
 MISC metadata.xml 497 RMD160 73141e1fd45de59b199e7c4a2a1622f6c9dac130 SHA1 664d9d8b9b1953e0f6aa3130f61138cbc207a2bf SHA256 1ec09a52e4d5c3a6bd12993b7903663c10f57c8549686189a6a7b5d297bc7d24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN1vYFAAoJENwGBM22xffe8EAP/0wyd00RhMsOPi89WX0Snch5
-NEaE332NUEETGJhFpeWyFnGHOoICOj/4ijEk9rX8WqcK5bb2MD2AaPa5PGMYNTFc
-sYwTHxHBASvSIQwwfK62j8WSoBtrxTlq62+/VHQYC8psJWZlAOcbfCDT+Emrux7w
-p6ybrU7jgkslcMYQ3no4ong7LtBlL5zEmKkN7P81OVC7b+YtZVucd+M68gpSrlNE
-iM24MXW/XTZWDuuS3Mb4aLXIv/X3+qreLmYsZBsK8vMT4+AKO2RehoJ9JmX4tghG
-ypZiLemlYlHcgPqNqs9h0SJr3hfmY86yR6q9u0cweTsp+a+51jtF7idyxOK8zwhn
-CwwUiESQkdPECdJtkUp2VLUaZAizZsKhYcZx+GVQxQPJ7530y0NAVFZQ50rlSEsU
-mV+S3HEje7vmL1rDecMThMonhiYc91QRTHVPumdY2sIUcZWni+kk2XT9BCjUTZaW
-rdVf4gBOMISPRdVOTTiKPb7U8FP++OyLf6koMyPDH1N4P9ojSAQI7hc+/A/PBGR9
-4ttItDVykcMX7UuvqD1ceNeLPXppQwxgcrpGP/92iTow1fNGOBoFW7JiJtDdlq5u
-W/ZfQBktTHl10Q3xauXYssOkznhcbBFFSvsBn3Ag4/WedDJ+OWLT5Jdhat7QsNuN
-vIdY8Nvd/Z5vqK8i6919
-=0lJd
+iQIcBAEBCgAGBQJN6U+HAAoJENwGBM22xffeTycP+gOAoMWuxV0gN7XmJbadppF9
+7r4fzRtnl8oCLAZYYRMnxYvA7rMhUEQA37IdgfnoSaFy9q0QocYw1e3VDNYnyGO8
+T15or3hemuU/2b1EAeGrfZ9cwHUgupqcR9yFIaM2EsIKWTOQg0ZVlys0/me4xnO2
+ekWUhpVzf4I5aY7ow80t/3F6+VOVKCzc83iLyuAvst8iUWDhhlD4Q75y4SfyA8bh
+EFCCVa4TxMJ+UulBPW9y11bISpS2zC9GsYlg3rwBNvSVrhVjaSIwX1KlQCesbbTX
+ev5zLbF2tU68Z4f9L3xggazLUmZ1Z5qRd2m8oC/oorXXQvxbfLtp2MRg5RKvi9H5
+bpHi87ZtA/HBkjyDyrRjL2163JAU/eftG1MCpc6XDlD15+7T5kspVbndm8ayh2uQ
+n0CvM/FTIPcCM+/6Gz0iKhooMg4ucoT0FfapjRoIBIIUM0p23wGL+YvchtwQPa2Q
+oXvtxWwU1DOIA2cDb9bx/9YtUXSPaHOen+mfANTTcM3YfnupEc2YTZJfoH5EhnXo
+qWwR5Q1+IzauSzZdsfEdpUdXZKNC/JW6gJVk0cKCC0NtDdnRns6LoPcwSIGvmGtN
+Baamy+cTQM+uf4ExO7bzNL8+QOQM4LEVr4qjmv8988DX/fn7UVKIeOgfNeWA0H7j
+oaFbnE2zvlwFlGC415Az
+=ehMD
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild b/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
index 9a8f9e20da..8e7c732a14 100644
--- a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
@@ -13,7 +13,9 @@ KDE_HANDBOOK="optional"
 CMAKE_MIN_VERSION=2.8
 
 KDE_MINIMAL="4.6"
-KDEGRAPHICS_MINIMAL="4.6.29"
+
+KDEGRAPHICS_MINIMAL="4.6.30"
+# please leave the weird number here for the moment
 
 inherit kde4-base
 
@@ -25,7 +27,7 @@ HOMEPAGE="http://www.digikam.org/"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 SLOT="4"
 IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video"
 
@@ -68,11 +70,6 @@ DEPEND="${CDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}"-2.0.0_beta5-docs.patch
-	"${FILESDIR}/${PN}"-1.9.0-turbo.patch
-)
-
 S="${WORKDIR}/${MY_P}/core"
 
 src_prepare() {
@@ -101,7 +98,6 @@ src_configure() {
 		-DWITH_LENSFUN=ON
 		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
 		$(cmake-utils_use_with addressbook KdepimLibs)
-		$(cmake-utils_use_build doc)
 		-DWITH_MarbleWidget=ON
 		$(cmake-utils_use_enable gphoto2 GPHOTO2)
 		$(cmake-utils_use_with gphoto2)
@@ -113,6 +109,13 @@ src_configure() {
 	kde4-base_src_configure
 }
 
+src_compile() {
+	local mytargets="all"
+	use doc && mytargets+=" doc"
+
+	kde4-base_src_compile ${mytargets}
+}
+
 src_install() {
 	kde4-base_src_install
 
diff --git a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch b/media-gfx/digikam/files/digikam-1.9.0-turbo.patch
deleted file mode 100644
index bd105529b0..0000000000
--- a/media-gfx/digikam/files/digikam-1.9.0-turbo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 1ad9ae102ea1a82a72e31401fe840954a791219f Mon Sep 17 00:00:00 2001
-From: Riccardo Iaconelli <riccardo@kde.org>
-Date: Sun, 15 May 2011 16:18:44 +0200
-Subject: [PATCH] Don't fail CMake check: compile with libjpeg-turbo
-
-Patch by Rex Dieter
-
-BUG: 265431
-
-Signed-off-by: Riccardo Iaconelli <riccardo@kde.org>
----
- CMakeLists.txt |   28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43293ef..63402e9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -166,17 +166,23 @@ ELSE(NOT APPLE)
-     SET(CLAPACK_FOUND FALSE)
- ENDIF(NOT APPLE)
- 
--# Extract version of libjpeg so that we can use the appropriate dir
--# See bug #227313, #228483
--FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
--STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
--MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}")
--
--IF ("${jpeglib_version}" LESS 80)
--    SET(DIGIKAM_LIBJPEG_DIR libjpeg-62)
--ELSE ("${jpeglib_version}" LESS 80)
--    SET(DIGIKAM_LIBJPEG_DIR libjpeg-80)
--ENDIF ("${jpeglib_version}" LESS 80)
-+# check version of libjpeg so that we can use the appropriate dir
-+# See bug #227313
-+set(_jpeglib_version_source "#include <stddef.h>\n#include<stdio.h>\n#include <jpeglib.h>\n int main()\n {\n #if (JPEG_LIB_VERSION >= 80) \n #error JPEG_LIB_VERSION >= 80 found \n #endif \n }\n")
-+set(_jpeglib_version_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/cmake_jpeglib_version_check.cpp)
-+file(WRITE "${_jpeglib_version_source_file}" "${_jpeglib_version_source}")
-+set(_jpeglib_version_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${JPEG_INCLUDE_DIR}")
-+
-+try_compile(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeglib_version_source_file} CMAKE_FLAGS "${_jpeglib_version_include_dirs}" COMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var)
-+
-+if(_jpeglib_version_compile_result)
-+MESSAGE(STATUS "Identified libjpeg version: 62")
-+set(DIGIKAM_LIBJPEG_DIR libjpeg-62)
-+else(_jpeglib_version_compile_result)
-+MESSAGE(STATUS "Identified libjpeg version: 80+")
-+set(DIGIKAM_LIBJPEG_DIR libjpeg-80)
-+endif(_jpeglib_version_compile_result)
-+
- 
- IF (ENABLE_INTERNALMYSQL)
- # Check MySQL executables
--- 
-1.7.3.4
-
diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch
deleted file mode 100644
index a5bc184531..0000000000
--- a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ruN digikam-2.0.0-beta5.orig/core/CMakeLists.txt digikam-2.0.0-beta5/core/CMakeLists.txt
---- digikam-2.0.0-beta5.orig/core/CMakeLists.txt	2011-05-04 10:52:35.000000000 +0200
-+++ digikam-2.0.0-beta5/core/CMakeLists.txt	2011-05-11 22:40:30.000000000 +0200
-@@ -1560,8 +1560,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)
-@@ -1569,7 +1576,21 @@
- 
-     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, because")
-+    MESSAGE(STATUS "the option -DBUILD_DOC=ON wasn't passed to cmake")
-+    MESSAGE(STATUS "")
-+
-+ENDIF(BUILD_DOC)