Version bump

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 247 insertions, 18 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index a3b878682859..b62204f5556e 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.207 2011/12/25 22:34:59 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.208 2012/01/03 16:30:11 dilfridge Exp $
+
+*digikam-2.5.0 (03 Jan 2012)
+
+  03 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> +digikam-2.5.0.ebuild,
+  +files/digikam-2.5.0-libkipi.patch, metadata.xml:
+  Version bump
 
   25 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -files/digikam-1.8.0-tests.patch, -digikam-1.9.0.ebuild,
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 8a924c2e5500..341e6a2305ec 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX digikam-2.5.0-libkipi.patch 2670 RMD160 a82bf1c2797279ac5f195a3f296ece677a838583 SHA1 23268e63dcc39f9e4452aff6639489f16d2c462c SHA256 7652e7854998b03a6047779361801dc63aa42c1f0221ef2b5c0f0a25abf1e651
 DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
 DIST digikam-2.4.1.tar.bz2 54531119 RMD160 2a07c061927e7cec7a0128a68e60f9d7c6d1e78b SHA1 2ec3a20225462d277d5f0c3aa17b1ecfbb61f98c SHA256 aca967a4cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b
+DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
 EBUILD digikam-2.3.0.ebuild 4028 RMD160 74cce2a2938d6e61330fe95d36908151bd7d8dba SHA1 d7c7c31ac88be7d9bd87e5505809ae34e4fb7db0 SHA256 aec4ad32c59a0fd905afb7748f9ddee474ec25ad5618fa7e927fb53e104e641f
 EBUILD digikam-2.4.1.ebuild 3765 RMD160 dbe0954204a8797a0dfd65679254130bd6049b1d SHA1 5bc2fa5cb1ac62a7ec3f7b94f797ee3ec71694c0 SHA256 3b9c7a689681fe584e25a091f80208b8ad50c36a559624789abc9d16c0917442
-MISC ChangeLog 35153 RMD160 495c9dda0ee60f4685e9c1b79c76a1be6aa0986d SHA1 c09f6c96daeeda1880eb5d5356993525e1a2d9c2 SHA256 557a9c33dad3089fc055cfea4a1214a0b7d7e7a439ced8cebe32500d3775533e
-MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SHA1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acffac97119bb70862bebd51a686b32778745b407eb0cb
+EBUILD digikam-2.5.0.ebuild 3811 RMD160 1472cf4b1b724abd0cc8525ca872c4dd254e3cb4 SHA1 9cba02eede7356cecb197cf64f830438b835db60 SHA256 63d65a2f13b22620cc85d312385105069665a10810c44142d1d9e6aad534309c
+MISC ChangeLog 35331 RMD160 4aed388f585bd23b0c2ea7bc1df0cdf05e971883 SHA1 94f13233fe505a8c09d7b49a3fbbbc060ddf813a SHA256 e0c7c460db2428eaba22222f629e5847c6120311dc686418c29d138c3baf4c16
+MISC metadata.xml 695 RMD160 be0a2e9e1cac78c5baf4a0b0f542d1f53ee5a77b SHA1 7d9256d5cd6a8f8250b82f65a77816cdc66d4434 SHA256 38ad4a53bb528bcbd2f970811d9ceae59351a6e600c38e8d561970f390664d7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO96WeAAoJEEb+UGWnxTyHxgkQALejcrI6niqSVh1XdTUNaxUT
-faeDnyK+llvyPqbHno2vfH0UXyLLTPIM+/4+8feWhyVlg7ucPDxGDBT5+7uqo447
-woPAdflWhGNOySPiaJyY6HK2fhYyhJG5SU9h97mCNzTcXEVsMWy6Lpc2vtnPTfw5
-AyQqESLoKMmf9YtqvFVKX73bpSrpKxL8QIIkKM9njkRflfmRDLQARm+uCk5H/eVX
-7grAd6U2ifN1pE8PyoM1yEa7kxx2MlOmMRoXqXHb4NZkCBqsfzU4VhwBDtbp5+V7
-emsz1S6GvO1h1foE5RcQ3nk0uZwPAMVBMDBJBE6nTxwZIions8rBSTghaZ3we6mm
-5jjz1jcfJD0ctxtEk9dZmIbAVLMZuOMmKagTOWyucWEADzWxKCcuNOahHnSR9ANC
-er5YofH7gJGO/KuquqAkEcUyjaZ5k2QZT7NwZx0/ydpL47zeJaJNLMwgFQbhp8pD
-TNuWWHL5JrW16fAvuYvuGPrGMz5bxeFIT5e+QPavKISUg8yu09ytWXLxskHbo2xU
-wcu4YZaGVMkn8o/Z9pgUQXCN1aHl8ulbPDBN5u+6iA6rqIr/3tjiWdvvZfKSqMXE
-67wZq1OV3zEUH22G7GrVTljk6JzzCszFINoIHxUUBQq1b2Z29Tdh0OGGvLT72Jr2
-BksR79423ELOgXCkgNjc
-=0jon
+iQIcBAEBCgAGBQJPAy2OAAoJEEb+UGWnxTyHxnYP/0yTFtPPcQQS4FXMJZfCF+yV
+miia+b/SG8uvR2BttqoA9DBO0kiQKjYatAl5FQ92KrwIWUjOUPjik3r9o1cttZ8g
+EVaVUjKlSMgR02bAJ0ZyXbYM9WIXXr9FLcV6UNGxEtRulC3Rf5oTEdmc4o7KAWcs
+rIfmQ/UDwtoaxFDwg3jbG22/TwqOJMJcBqZoj2zxIchz8bK0Uin26GyP60yop1E6
+EYn1QiEvIi7ouYUh215YXsp6xvCWDimZ1XGAsZCrW9H1I8MWLxUW/KSNObd85Nlz
+t3kwQurF4mKs93Q7sD3+Bmaii6KHBUdwL+Q2SwjsyPAWrrARg9DlqcOSkEqrFq8Z
+nwl/uGfBhJrJRcMBnkJYbAML0wQxrsn36bDJZPl71J6QrkCxdgkaeM/dw2R+WiH5
+NlbEXSgyEdpjTCjJLmTjFwuFEEp7urQPYlVzJq+4sbE0DkXgISXCc3KGNhIn7eoJ
+Xj9PWl9ItJTUGF5m16fIET6h1oKu1IPKUjvmynrRgHAdLkM8Ya6FgRie0FVQ8Ygx
+X4rOWljF9/UhZMmkehpp44WPcTxUz7ESP2O7bDzEknNBudmcf7HBDrxijtWxb51D
+rzrgZUDnZOBvcyE+X83V3OBxo+8FMdEWE1KrBIvAZsxY1c0ImFWbqLHCIm4jJJyJ
+aEFMs316C1q8P0/kYz28
+=jqB+
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.5.0.ebuild b/media-gfx/digikam/digikam-2.5.0.ebuild
new file mode 100644
index 000000000000..2dfdbbc31c60
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.5.0.ebuild
@@ -0,0 +1,146 @@
+# 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.1 2012/01/03 16:30:11 dilfridge 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.7"
+
+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-${PV}
+	>=media-libs/libkgeomap-${PV}
+	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}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}/core"
+
+RESTRICT=test
+# bug 366505
+
+PATCHES=( "${FILESDIR}/${P}-libkipi.patch" )
+
+src_prepare() {
+	# just to make absolutely sure
+	rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+	# prepare the handbook
+	mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
+	echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
+	echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+
+	# 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 )" >> 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
+}
diff --git a/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch b/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch
new file mode 100644
index 000000000000..fbbac97a9489
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch
@@ -0,0 +1,75 @@
+From 25cc9c9876a5233bd630105d0110319892d4e18c Mon Sep 17 00:00:00 2001
+From: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Tue, 3 Jan 2012 15:16:37 +0100
+Subject: [PATCH] enable checkall and clearall buttons only with libkipi version 1.4.0
+ BUGS: 290496
+
+---
+ utilities/setup/setupplugins.cpp |   13 +++++++++++--
+ utilities/setup/setupplugins.h   |    4 ++--
+ 2 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
+index 0f4030a..b8efb35 100644
+--- a/utilities/setup/setupplugins.cpp
++++ b/utilities/setup/setupplugins.cpp
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
+@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
+ 
+     panel->setLayout(mainLayout);
+ 
++#if KIPI_VERSION < 0x010400
++    d->checkAllBtn->setVisible(false);
++    d->clearBtn->setVisible(false);
++#endif
++
+     initPlugins();
+ 
+     // --------------------------------------------------------
+@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
+ void SetupPlugins::slotCheckAll()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotCheckAll();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+ void SetupPlugins::slotClear()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotClear();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
+index 271a569..114e0fa 100644
+--- a/utilities/setup/setupplugins.h
++++ b/utilities/setup/setupplugins.h
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
+-- 
+1.7.3.4
+
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 032404f527dc..3e9d0cb0ece5 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -5,7 +5,6 @@
 <maintainer><email>dilfridge@gentoo.org</email></maintainer>
 <use>
 	<flag name="addressbook">Add support for kdepim</flag>
-	<flag name="geolocation">Add support for marble</flag>
 	<flag name="themedesigner">Build the digikam theme designer</flag>
 	<flag name="thumbnails">Enable thumbnails database support</flag>
 	<flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>