[media-gfx/digikam] Version bump

(Portage version: 2.1.9.45/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)

4 files changed, 197 insertions, 15 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index b13c129..1152e15 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*digikam-2.0.0_beta4 (01 Apr 2011)
+
+  01 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +digikam-2.0.0_beta4.ebuild, +files/digikam-2.0.0_beta4-docs.patch:
+  Version bump
+
   01 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-2.0.0_beta2.ebuild, digikam-2.0.0_beta3.ebuild:
   Readd ~ppc in line with digikam-1.9.0
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index da3d180..d89bb83 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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
@@ -19,33 +19,36 @@ AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbb
 AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
 AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af
 AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
+AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
 DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
 DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
 DIST digikam-2.0.0-beta2.tar.bz2 23685947 RMD160 0370c304af9dfcc380d97747f698ab449e0d0beb SHA1 dbc62eed97c54dbdfff97690d4eb218d361e0d25 SHA256 15f49e18fefdf7bcce8b31bb77b4fe31368f16d88c039842c58e7cbafa58fd49
 DIST digikam-2.0.0-beta3.tar.bz2 24063835 RMD160 61871d8f1f28acd7f3b83f261a94715d97bf71ea SHA1 7688ef4eec77b55e36ecd8f55d92635c36f38349 SHA256 60c9f050b07a787e1512173b7b871dbf9babc730804f98829dae53229e16b97e
+DIST digikam-2.0.0-beta4.tar.bz2 43322316 RMD160 6af7f9ad6b757e97081391c5972abd744d45cfa6 SHA1 a5aef57a8be66b033e88d78f838c318ffe8df235 SHA256 aa85678e2a83cdb41ef70584e2a691c457759f50aadc0cc7019a33513ee16b63
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
 EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
 EBUILD digikam-1.9.0.ebuild 3245 RMD160 7595b6ce1967bafa99dd8ecf19257838aef23753 SHA1 6c144376c2ed7058111505fc265fcee15f6f5462 SHA256 a410fe8542a23f6f1a47b6fac8e4ec0980f84518da06c90f2c9532292818fd06
 EBUILD digikam-2.0.0_beta2.ebuild 3339 RMD160 b930008d6fe94d757ecd23eb80949114e62b835b SHA1 10351caff0808bee413c99160b227cffd1b84473 SHA256 23872b2b307c1021af88bf994bcc0553eb01e330585d706067dfe2b8dea56d3e
 EBUILD digikam-2.0.0_beta3.ebuild 3339 RMD160 e931dff9b3dc632d586c27323c1b6ae96cfa74d8 SHA1 78481f6fb42060e4d240c568069e4fb48afc3bdb SHA256 311d6f8f1b22c8b40da470c07e1813db3c6cbeab64ded51c3a37a46dda747e60
-MISC ChangeLog 9314 RMD160 fb78bdac49ed92cffa01506c6171562b9de66579 SHA1 1805d0e98574783a730c1182921c45f7da6957d0 SHA256 71fe0c16d64514519048b5821742d86b985360809f8969e9176cfc45cd1551a8
+EBUILD digikam-2.0.0_beta4.ebuild 3304 RMD160 95cbc46cf0a56f31491130160b9908f08f34387a SHA1 90f3a2a7760e4d7bfc1d6dbd3853960179032f22 SHA256 1f5f2aa311fcb9d7243a54cdf7fe01ad5548a33d7c1bcb98f057c4de1a082143
+MISC ChangeLog 9493 RMD160 259ef9439a426cd9d3228c25ecc83128ffe3ef74 SHA1 cb6db46747ec5cd4b3a770993c408eeb187f43f5 SHA256 5a4166ace25d0c40f401f03cd831b6b315e550c23d39df245a6abadd3544e0d9
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIbBAEBAgAGBQJNbJ93AAoJENwGBM22xffeUrYP+O1aWG877uDUf55l7Xc4/rq/
-lEk+E6NNdmo4aeg0Wf+d+vfRijqSVVJX3p1ur6uKcdvJm3QrlsEu1zsdn09Zm2e1
-sr7NWhRHqfVg7Z2aXQzkIyaXG2Xgm16XYxHe5miGT9Gv4l+oBckd6G3VV+In3eCL
-yFLWVkx563ECm4XbVR/Taawr2ofhaUsudDt7P/S83yFc/t3OAJoQJ+Dqq6WgKr4e
-iGP12xaxSgHBDVgONObrfPs30bpfS2FomnEHsF929HvGJRTI1QW3+FgP0D4ft2HC
-/jkjig3S+NoHGw3tuF0hQXm5vSKeXhNw8b27cwFxOTu44s5nAXp9YGHtHTTkecQT
-8WxrrD1pEJv8Jf1obS1zeo2VUMinJuUidz8VvKfMTgB202d7Wnznb0PO4c1mHdi6
-9omiaCVjNfTvCAwTVc0U4XxXO3v4ds3TRg82jcDY0+hk9LeVkKH3myhc2kZRD7VZ
-Yo+i8eeg4TLcVNxkF054u53nc5vpgyG5VIhN95KcP2Xv4dRG+/kBQUJko2the2FZ
-Q+/4Jd3KoELHNc5vnExnKkMEAVjSvIZGfLXgTd0Pjk+h800L0OivTTPUVdhpsGKO
-jmU0jHssV815bBd8P3fWaGgpFTgr6KC3CSBTnzZhUDD04YY+As3G8lZu6w4m+3JX
-4EHm73ti9zMvxaSkMag=
-=Q3tZ
+iQIcBAEBCgAGBQJNlmXaAAoJENwGBM22xffePCAQAIjJXWHnZ9DF/UPtPhmUmy0R
+KrQ1SkttTQfB+4MUICdewu/z6p41gKkP4tP5mCGqQaDEYbHT6OmOKP0o894wDNL6
+JA5AODmvBU4bfto87kzWRYx4rC1PKm3JKWg9LqVox5hA59KF/C2iQg/Oi95+sBA5
++lAbmVMaJGTq+++nbITRB8tzQsRpKR9dTLk5hZIvjPEd1zNpBWviKm+zP0nrh+Tn
+PIwm112/Z9I298k9LFLDCbyiIVaMu69Wg9Ba8Fudy/1l0vXHixOR6OSr9+AE6K8n
+aD+vwGyrh4S22uVXIZP6t2OzhLI9rxf0ul4CFBr3pdNVu16FBIha4Cay4mIcOLcy
+nQe9Keod73yAQOpRda4/Kr+eME0aUZPNWS9uD3EeZwUcmodtzHLWgwscoOBnC3X3
+xyIt9jKyDuOmxBljLafJpRbzsIKRcYsa2rFaSZCRQ7fZLU7rzhhtWivB6E16E5Yh
+AIsrMDcgZhU2lxhowN6ysccIVUZz2FhfVHyJnIjj/W60vnbM2wE2Y8Z49TGTrAfa
+033EXaNPauslRIJkFrzz4zeNwRhpoG27RiYZQlg7btZBJ/MtvJcGiv4NcjSboEYk
+3yL2MfEUBcT62SHcc+1D0+cZH4xY5IGw1kpLxTo5ivhCLFfv5Byn/ooLWr4tMX6i
+EBTc+Rk2LiyeEiHxpdV2
+=CJ+Y
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta4.ebuild b/media-gfx/digikam/digikam-2.0.0_beta4.ebuild
new file mode 100644
index 0000000..0c53724
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.0.0_beta4.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.6.0.ebuild,v 1.1 2010/11/25 20:30:29 dilfridge Exp $
+
+EAPI=3
+
+if [ "${PV}" != "9999" ]; then
+	KDE_LINGUAS=""
+#	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"
+else
+	KMNAME="extragear/graphics"
+fi
+
+CMAKE_MIN_VERSION=2.8
+
+KDE_MINIMAL="4.6"
+KDEGRAPHICS_MINIMAL="4.6.28"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="4"
+IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+	$(add_kdebase_dep kdelibs semantic-desktop)
+	$(add_kdebase_dep marble plasma)
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep libkexiv2)
+	>=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
+	>=media-libs/libkface-${PV}
+	>=media-libs/libkmap-${PV}
+	$(add_kdebase_dep solid)
+	media-libs/jasper
+	virtual/jpeg
+	media-libs/lcms:0
+	>=media-libs/lensfun-0.2.5
+	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
+	virtual/mysql
+	x11-libs/qt-gui[qt3support]
+	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+	gphoto2? ( media-libs/libgphoto2 )
+"
+RDEPEND="${CDEPEND}
+	>=kde-base/kreadconfig-${KDE_MINIMAL}
+	video? (
+		|| (
+			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
+			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+		)
+	)
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}/${PN}"-2.0.0_beta4-docs.patch )
+
+S="${WORKDIR}/${MY_P}/core"
+
+src_prepare() {
+	# just to make absolutely sure
+	rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+	mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
+	echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
+	echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+
+	kde4-base_src_prepare
+
+	if use handbook; then
+		echo "add_subdirectory( doc )" >> CMakeLists.txt
+	fi
+}
+
+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
+		-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)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_enable themedesigner)
+		$(cmake-utils_use_enable thumbnails THUMBS_DB)
+	)
+
+	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
+}
+
+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-2.0.0_beta4-docs.patch b/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch
new file mode 100644
index 0000000..4abadd6
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0_beta4-docs.patch
@@ -0,0 +1,41 @@
+diff -ruN digikam-2.0.0-beta4.orig/core/CMakeLists.txt digikam-2.0.0-beta4/core/CMakeLists.txt
+--- digikam-2.0.0-beta4.orig/core/CMakeLists.txt	2011-03-28 10:54:32.000000000 +0200
++++ digikam-2.0.0-beta4/core/CMakeLists.txt	2011-04-02 00:51:08.000000000 +0200
+@@ -1558,8 +1558,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)
+@@ -1567,6 +1574,20 @@
+ 
+     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)