[gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/

["Andreas K. Huettel" <dilfridge@gentoo.org>]

commit:     41cce7e3c77b8885bb2f9baa17f01fdaebdf7f65
Author:     Andreas K. Huettel <andreas.huettel <AT> physik <DOT> uni-r <DOT> de>
AuthorDate: Mon Feb 28 18:36:43 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 18:36:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=41cce7e3

[media-gfx/digikam] Version bump

(Portage version: 2.1.9.39/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 media-gfx/digikam/ChangeLog                      |    6 +
 media-gfx/digikam/Manifest                       |   33 +++---
 media-gfx/digikam/digikam-1.9.0.ebuild           |  125 ++++++++++++++++++++++
 media-gfx/digikam/files/digikam-1.9.0-docs.patch |   50 +++++++++
 4 files changed, 199 insertions(+), 15 deletions(-)

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index c8b8ebd..ee34c1d 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-1.9.0 (28 Feb 2011)
+
+  28 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +digikam-1.9.0.ebuild, +files/digikam-1.9.0-docs.patch:
+  Version bump
+
   03 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-2.0.0_beta2.ebuild:
   New package locations

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 843ae2c..0662891 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
@@ -16,30 +16,33 @@ AUX digikam-1.5.0-unbundle.patch 11772 RMD160 a593a67bd5d1ea02f695dc51f6240917e4
 AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90c500c3326 SHA1 b6f477d6e6ceaef8947071a12cf07e188789fc81 SHA256 21286862bb1dc5893cec0b16cf563b75edb6fe952f6aad7add6f4f59a575d2b8
 AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6
 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
 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-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.2.0-r4.ebuild 3215 RMD160 8b65234982a07cbca031e762cca9ad9fca0af112 SHA1 ed204cc640716af1998afe46f6cb2c3395da31ba SHA256 bba559b09bdb15fa23ffc390e70c26cb111143cca6bfc280e5c5240f1052aac1
 EBUILD digikam-1.8.0.ebuild 3233 RMD160 9d246c104d4705c7be47a7496da68f663ca5012c SHA1 d5033cb9d1f909a3b0516e92bff9c5e596fad486 SHA256 cd3a989f75296645049899f45d9f6a5dc96695c44615561088b8e9d077b9e87d
+EBUILD digikam-1.9.0.ebuild 3240 RMD160 7070312f1310e0c79702c08f404c97192a826130 SHA1 b79572a1dc6a95f6735091fdd74a8cd204a4a430 SHA256 a39706489d6a16212de05a90563f5681e6634e5070f62bf6c740f167d8919aa7
 EBUILD digikam-2.0.0_beta2.ebuild 3334 RMD160 a0297ac43f4aff1d038d88236c2cfc0389fcdde4 SHA1 9c155bafa5736bfff2e150450771e26501ec82d0 SHA256 e2e1103efd5454be2ec03af814460e8578cc6a9bdd033612a15c79a9e68e665f
-MISC ChangeLog 8668 RMD160 81105865387fe93c5e47a7d007977d7b30ce5a94 SHA1 015f4d2d58afb17e5d81d0d0eaf6e74a397bae3c SHA256 de98af1a7e48d8d298f85d8b596812d0591a47f4bcf19f56b2a2e9769133ecdd
+MISC ChangeLog 8829 RMD160 5261883e23ec76c6901d23db96938426e9acacca SHA1 492849aa9478d11ed836f8bd2f41504e20913436 SHA256 ef80980c265cc13c5baab85336afa2c11514589f1926f6502942aafe68a657ed
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNSwJDAAoJENwGBM22xffefnoP+wUMWIFrcY7q/cOXKTIosMVD
-XpHBOK04ZPz6v4dNJeElA2h5EAGvfxdqikPwIXaorJLkYe9GShi8XGvSrp0DAqfw
-WSbrj8APBP2qHzd9IVQxLiHK8Qksj4DixixmLN+nb1K/DDFItbyCEV79af3yOSTr
-MK7FssW+cX294/d9C4cFeIESRk86cCUakNMCqo7Kxr6ZXitShpxTusT9jxku8A8E
-wkgPepfK2DwP6rL1fFDruQdKNOnhLKleMzdPTryJyDFDMHDZ66C/NgVf5X9//FJo
-vEw/Mb/9+F/KH/AP22XWbxNUSYdUM9TBi0ECr7pLTtjy1jikfDvTStXz3hBiIlmo
-6YGJYw70YX0v99G1zkqT9SDz6xBYd5csiVCw5paVw2JpA5iDHXWbpUnXiM11trhX
-l1o+YrKPGl6BciQgoDcxrE4yU2XTF/w8OAJLLX6SS3yanWEZG49sWXlJYUqPvg04
-/c+40MVFQnoiyJFwZXJHgQRoJwr5BwH9/E7FDRwrnZ06V40io5EqxifJfpeexCq6
-qRPxdlnqvtnllR9nx8xPXEYKN/oJ9zP9o7Fqq3SwC18bZtaT2Fd7nEs5TzxrtJIt
-mDh2js0cLT6To3ZeVUwNyB9EbTBuMk5J8onooya3qjdNmG5BfaD9Gszkopmw+hCb
-pkwFuzMkMLAAVyFLjFhe
-=ZMVi
+iQIcBAEBCgAGBQJNa+s7AAoJEEb+UGWnxTyHSbQP/3o9M5BxueUI3RisYbQMQ7Pe
+pTpZdfmzVcvPL24H/ymMZorzTtjt1Jceeo6l0cfIkCP1cl4MVd2hh7j7KceCzv5z
+uuWKPMnWUe6BRzDF4bMFL2TynbpwWQjGf/gg6uiyZkHvPVVCq4rztBDzS9nMKehy
+db581z6utmDNSH/xXABt91AmL1sB9cE5nwI74nr9WDiG7Jc/KYT6e6RGpswHeYWg
+6K3BENup9G0IA5TBFOv7ky6haN3leKjd599cX3iraMUQpyMSx7YPRIBP6erfh8+G
+zh9BNBsbiASvHNaw6Oq6DppJqaYSWC3hVZArZyiDE1JdxipETu0VBJ8vAQg5n5Sl
+DsHUTCPZ1kBiXURJQnaxUuXEvDzhFy3IEX6OluFOdEhFbIlhCmJpmNVtpAkek/GG
+2v4vUWHJmR1qVA3GHSkhzGqUBWgjlJjjqeEhmdzvK/OocWk+m0cc52PwTVjguVcR
+zyt8b+ZjEjSkS9Qop/+abPX/Etyw5p3yYAUoSDcRW8HANXCsWYUUY0zAen7QlWyC
+C43qMIQyYINT8ZlKZ7RQKUvO091qRYXf28oAC5jE/7nnEzCd4956vtKSt95Q6t/C
+M1BhWJO/JlXKVUZjO/suxscTyLadHL/MxYcMy/MpmAsAY1M9D8+tIZgOBPbOcQdG
+jasfRZbXPVlSwfXWDTLy
+=I/9u
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/digikam-1.9.0.ebuild
new file mode 100644
index 0000000..11e045c
--- /dev/null
+++ b/media-gfx/digikam/digikam-1.9.0.ebuild
@@ -0,0 +1,125 @@
+# 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.7.0.ebuild,v 1.2 2011/01/19 12:59:18 scarabeus Exp $
+
+EAPI=3
+
+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 ms 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"
+
+# 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
+	handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc geolocation gphoto2 handbook 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
+	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} )
+	geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[plasma] )
+	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 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}"-1.9.0-docs.patch
+	"${FILESDIR}/${PN}"-1.8.0-tests.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
+
+	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)
+		$(cmake-utils_use_with geolocation MarbleWidget)
+		$(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
+
+	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.9.0-docs.patch b/media-gfx/digikam/files/digikam-1.9.0-docs.patch
new file mode 100644
index 0000000..588cfb9
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.9.0-docs.patch
@@ -0,0 +1,50 @@
+diff -ruN digikam-1.9.0-vanilla/CMakeLists.txt digikam-1.9.0/CMakeLists.txt
+--- digikam-1.9.0-vanilla/CMakeLists.txt	2011-02-27 21:16:18.000000000 +0100
++++ digikam-1.9.0/CMakeLists.txt	2011-02-28 18:56:39.000000000 +0100
+@@ -1421,8 +1421,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)
+@@ -1430,10 +1437,29 @@
+ 
+     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)
++
+ find_package(Msgfmt REQUIRED)
+ find_package(Gettext REQUIRED)
+ add_subdirectory( po )
+ 
++# Build the handbook
++add_subdirectory( doc )
++
++