[media-gfx/digikam] Version bump

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

2 files changed, 166 insertions, 13 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 4a23123..7267d9f 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -4,22 +4,24 @@ Hash: SHA512
 AUX digikam-2.5.0-boost148.patch 4133 RMD160 033b19386db95818d8f1aa7ac8b1384be8ec7169 SHA1 095ea8de1e353120f47ed41c0cd15a36d468efcb SHA256 e9adb199ca4955f64275481231c6761c32b84cdcc8bfab9ddebab6864f0f4a9f
 AUX digikam-2.5.0-libkipi.patch 2670 RMD160 a82bf1c2797279ac5f195a3f296ece677a838583 SHA1 23268e63dcc39f9e4452aff6639489f16d2c462c SHA256 7652e7854998b03a6047779361801dc63aa42c1f0221ef2b5c0f0a25abf1e651
 DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
+DIST digikam-2.6.0-beta3.tar.bz2 55694232 RMD160 4337411d074a9f940270a8929293d5457cd283c9 SHA1 8ad5d6d482bbac582aaa2943c0d86272181e1565 SHA256 697ab7fdc0aff0a2a842df21608158f2abd1f7a4619cae9818749012267e6fec
 EBUILD digikam-2.5.0.ebuild 4197 RMD160 cd406b2bab0a40c52ed6a03aa36764b226406aa6 SHA1 cee756c8a06606acfd79379c085fc32e1c41789a SHA256 844f1cd90ed191aa990c483a76e8951d8968b0d3cab4c1f244ac114f861f21ac
+EBUILD digikam-2.6.0_beta3.ebuild 4100 RMD160 50b5bd3fe722057bff72fd1db3cf9e341a868b28 SHA1 7cc17bc9bed640a85fc5e1a38d83bdd3e357b16e SHA256 1b20f2998b83d1ef67b301a3e219080e578641ae74c97b4a001df09760456575
 MISC metadata.xml 648 RMD160 7694bc7a07e2b35c60e2ed22981007ba0680dd1f SHA1 15b78b8dee48c87b702a5705009b3eee46aa7ebd SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPgaeVAAoJENwGBM22xffePFkP/iluQNoOjHoArz70ryaeEfTh
-6ZztE+bh8KJlKaMQQwW/3EbewdIgZkE4cK6+lauO5KpG5jGi4IEnerjtZOpz4Qdg
-VPI9Nik/EdDlumKmPtyfeAppGK8iVjIZ87nYiVQ6fz9pVcnHUovgAhYmbXV7ju7a
-xXT3bzH5xBZfMfO/fhpT0Hir2fPnYBAKl0IgyIMUdub/pxL/l1xOOurGqpGLLU1g
-ChzCro3AdhWG//9LxajjNQnlmIU56TYYY86uZJwgTzltvjNtPoMEVHlccSrb/xJB
-G8cA7X9E9PhMcnOXmhVG+SWGfYnxmzMZbQrMArDj5G7ZY4uZkYflGit22hhrE0WJ
-HqmBLLlz16Gj9e/c+gQ1z9auPL6zk4+RN+QkMsy8bLv5N07ButcrpVeqIeivFRoR
-746dhJnOQBZxnwDwWdPRc9DHI5SbFoJo1kHki/46awoMGsS7TjlRTYYnrqQp49Ar
-CTRvygzt1ts9dO0KUY7zFq/8/y9v4DBu4Fby+ouEFR4a1i1j+rO5RW2UD/FEp6eE
-zvQvn982bgOJ4AFKzdYQx4YpsVA8BuVuD8nysRYphuHq0SSIoQ6ogk1XxPoIkICF
-JALG6P9C4oomGSIiVI7iNOF02XSqpyCrya58G2mNDfYGyFzE2jLzgIGbwwhNz7zl
-JJVeWwwOfwBdx54BcVqU
-=/1AA
+iQIcBAEBCgAGBQJPgbE4AAoJENwGBM22xffeydoQAKJMPNwlKcvC/YkpxahcUDEX
+/cBsX+9ZU1gKzjg1GRwhLSfWrtLwPmVrYaklyko/+xToTdhVfFoe9NoXNyZq8gse
+2ODP0GiitfC++BkciPQaeA7POo8dVhG1fMCKq3hsZmNvw8EdTfrwpLI4rDa+GU7Y
+5VzOMn2+7SeitmcVCB/9w5qpsKQEg+yIkoAHjeYmZAWSMhs6mPY3RUIWr8p1LCdy
+MjR4X88gEFCH8PWhe7fQFDWDAiS8m7owtTEtlgPVGahR0Q210PgjXPl4wt7YKymp
+dU8i04NCb6YrVHaSrCBg2Soi1cIVYKu3Lq2l/V733BqEU5XIUXBNOYF+w93EzJgp
+lEE6MVWT6TVkf8+eDd76WFdmKruQV6gQ9cTZonf+WgpC/CQ8XyaVnpJFUsOSgJjL
+dO944na7EQ85OcFvCAVcuLh1fOUecFLVK4a1hd/SA68MEGgcntxVRsbWi7Ss6E4o
+bmLaoADBn5leIqOfkZ21thLre/6w/VdknlMxMeKSPwclSAzh3ZAX7+qcRSB6Mqs6
+/OYJqRrXprKaTbXF9CV13ZcN+kpVctmsblndVFfkWRdFhXCqKvbnI+tue+BGwpP0
+0CvpHJhet3WeHSYNo7cAp9oS33seCSKh4K41liIrD/aJioFWFDS8MkUw492jgXlf
+p2+sdxjOd/s4oPGtEMxh
+=lhnf
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.6.0_beta3.ebuild b/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
new file mode 100644
index 0000000..f92a6d3
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.5.0.ebuild,v 1.5 2012/04/04 19:30:58 ago Exp $
+
+EAPI=4
+
+KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
+hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
+rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
+
+KDE_HANDBOOK="optional"
+CMAKE_MIN_VERSION="2.8"
+KDE_MINIMAL="4.8"
+
+KDE_DOC_DIRS="doc-digikam doc-showfoto"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Digital photo management application for KDE"
+HOMEPAGE="http://www.digikam.org/"
+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 mysql semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep marble plasma)
+	$(add_kdebase_dep solid)
+	media-libs/jasper
+	media-libs/lcms:0
+	>=media-libs/lensfun-0.2.5
+	media-libs/libkface
+	media-libs/libkgeomap
+	media-libs/liblqr
+	>=media-libs/libpgf-6.11.28
+	media-libs/libpng
+	media-libs/tiff
+	virtual/jpeg
+	x11-libs/qt-gui[qt3support]
+	>=sci-libs/clapack-3.2.1-r6
+	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	gphoto2? ( media-libs/libgphoto2 )
+	mysql? ( virtual/mysql )
+"
+RDEPEND="${CDEPEND}
+	$(add_kdebase_dep kreadconfig)
+	media-plugins/kipi-plugins
+	video? (
+		|| (
+			$(add_kdebase_dep mplayerthumbs)
+			$(add_kdebase_dep ffmpegthumbs)
+		)
+	)
+"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}/core"
+
+RESTRICT=test
+# bug 366505
+
+src_prepare() {
+	# just to make absolutely sure
+	rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+	# prepare the handbook
+	mkdir doc-digikam doc-showfoto || die
+	echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
+	mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
+	echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
+	mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
+	sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
+
+	# prepare the translations
+	mv "${WORKDIR}/${MY_P}/po" po || die
+	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
+
+	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
+	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+	echo "add_subdirectory( po )" >> CMakeLists.txt || die
+
+	kde4-base_src_prepare
+
+	if use handbook; then
+		echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
+		echo "add_subdirectory( doc-showfoto )" >> 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 mysql INTERNALMYSQL)
+		$(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
+}