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

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     1ad2358888b5b115b5d1c334b15a3824be7bff12
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 18:03:13 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 18:03:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=1ad23588

Resync with kde overlay

(Portage version: 2.1.10.3/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 media-gfx/digikam/ChangeLog                  |    6 +
 media-gfx/digikam/Manifest                   |   24 +----
 media-gfx/digikam/digikam-2.0.0_beta6.ebuild |  136 ++++++++++++++++++++++++++
 3 files changed, 145 insertions(+), 21 deletions(-)

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index a6f29c3..ac032cf 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_beta6 (02 Jul 2011)
+
+  02 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +digikam-2.0.0_beta6.ebuild:
+  Resync with kde overlay
+
   20 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-2.0.0_beta5.ebuild:
   Backport build fix for libjpeg-turbo

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index b4f149b..2f1e18d 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
 AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd39780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28
@@ -27,28 +24,13 @@ DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880
 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-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394
+DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea
 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-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b704f SHA1 1346318824da28a94445ebac446c737e46906dae SHA256 b73c19ab5cf8ecddec3802687b00e664e3fbc7b054a504173b540151e0c324f6
 EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
 EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
-MISC ChangeLog 10571 RMD160 84badd91d2a84ebf32771ca0899d63f95c3b2c3f SHA1 71b474cdcef865e5c875c3f3abc9b961fed72c6e SHA256 86d481083d77a32df8f1bcae90457b5aa5b3e52d34c6ea9fc13fafc9ab4903fd
+EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
+MISC ChangeLog 10722 RMD160 2f317cc3ddb3c72cb3b2baa8fa18f129efde6c40 SHA1 b79a88ce00706eac870ef4d09d1f624d91578e52 SHA256 53633f404935588552bcbe0c9c40b68cfb2ed21b7a749021fbc8aacb1002c4ca
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN1va1AAoJENwGBM22xffee9YP/1/J8FHV7oxi6CAHgEwmfIu+
-Hua3yYsOKlsdAGXy9WJhr8FilKP/QY2U/PuSeC9s3yNft5sgjxvZ8cVzYDt1gfEl
-MhI5OPgykaT5FDJGbRgtTYN5yEmqvUMC3lVgTDK8vnnasDAUIun16N7TLHHuPCwD
-cSTxU7AmvrdjRhGAidR6C/JDCI60X3d9wFdywZov/WREqdPp97Ew5H/mDe1M3Sil
-Lwr2TYdHL1fbIozjQpLalfk2XceAZHtxrJBe1dvOGCgzcy1flg/czjogC8g0ZW9k
-ISm/UYF3DVx12igyhVjCfHwOM8BvgIgZ5jTwRGpBMgisYXAMJPSRiKNpC0kyqlV8
-VUcXX7DOJVrg/3TX5kpniVTa4R/CHXGIK9EGbn5D3ViDTAl6U2GSbWa6HSwm6BJC
-WLTODEK1aaae+zb2iyp91Q1lGcbsUWsI9D1dtCfqL/BVe/q+lnzn4eLe3qHYQqjt
-+yetfbYVOLcLRxUaa6Ytv02LMKhJy0hVzmpaBYVUexOKBXdVEF+fuOiAUF+IDZQg
-ivS22ZDqsp8ZhS50ZWa77Vj4Q2XK1KTHOU0Gs+obvxry5edjpz9XgvmwVdd2rkk1
-K8sCm+blJu97OMwdJifCSIWOD4Id/9xPnmKAN2ld2c3OI38Ccex4vl7hsI5oFfcY
-cslW5F0Pi2eTd8SgqwbW
-=fKL6
------END PGP SIGNATURE-----

diff --git a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild b/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
new file mode 100644
index 0000000..be5c2a8
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+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"
+
+KDE_HANDBOOK="optional"
+
+CMAKE_MIN_VERSION=2.8
+
+KDE_MINIMAL="4.6"
+
+KDEGRAPHICS_MINIMAL="4.6.30"
+# please leave the weird number here for the moment
+
+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 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc gphoto2 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-r6 sci-libs/lapack-atlas )
+	virtual/mysql
+	x11-libs/qt-gui[qt3support]
+	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	gphoto2? ( media-libs/libgphoto2 )
+"
+RDEPEND="${CDEPEND}
+	$(add_kdebase_dep kreadconfig)
+	video? (
+		|| (
+			$(add_kdebase_dep mplayerthumbs)
+			$(add_kdebase_dep ffmpegthumbs)
+		)
+	)
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+
+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
+	local mycmakeargs=(
+		-DFORCED_UNBUNDLE=ON
+		-DWITH_LQR=ON
+		-DWITH_LENSFUN=ON
+		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
+		$(cmake-utils_use_with addressbook KdepimLibs)
+		-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)
+		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
+	)
+
+	kde4-base_src_configure
+}
+
+src_compile() {
+	local mytargets="all"
+	use doc && mytargets+=" doc"
+
+	kde4-base_src_compile ${mytargets}
+}
+
+src_install() {
+	kde4-base_src_install
+
+	if use doc; then
+		# install the api documentation
+		insinto /usr/share/doc/${PF}/html
+		doins -r ${CMAKE_BUILD_DIR}/api/html/*
+	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
+}