Version bump

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 182 insertions, 1 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 06cad4dac167..be3b47daa903 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.166 2010/11/08 21:29:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.167 2010/11/25 20:30:29 dilfridge Exp $
+
+*digikam-1.6.0 (25 Nov 2010)
+
+  25 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +digikam-1.6.0.ebuild, +files/digikam-1.6.0-docs.patch:
+  Version bump
 
 *digikam-1.2.0-r4 (08 Nov 2010)
 
diff --git a/media-gfx/digikam/digikam-1.6.0.ebuild b/media-gfx/digikam/digikam-1.6.0.ebuild
new file mode 100644
index 000000000000..309e90c7286c
--- /dev/null
+++ b/media-gfx/digikam/digikam-1.6.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2010 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="2"
+
+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"
+KMNAME="extragear/graphics"
+
+CMAKE_MIN_VERSION=2.8
+
+# 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}/${P}"-docs.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.6.0-docs.patch b/media-gfx/digikam/files/digikam-1.6.0-docs.patch
new file mode 100644
index 000000000000..66376b027512
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.6.0-docs.patch
@@ -0,0 +1,49 @@
+diff -ru digikam-1.6.0.orig/CMakeLists.txt digikam-1.6.0/CMakeLists.txt
+--- digikam-1.6.0.orig/CMakeLists.txt	2010-11-22 18:50:48.000000000 +0100
++++ digikam-1.6.0/CMakeLists.txt	2010-11-25 00:16:54.000000000 +0100
+@@ -1423,7 +1423,14 @@
+ # ==================================================================================================
+ # API documentation generation
+ 
+-IF(DOXYGEN_FOUND)
++# 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})
+@@ -1432,8 +1439,27 @@
+ 
+     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})
+-ENDIF(DOXYGEN_FOUND)
++
++  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)
++
++
+ include(MacroOptionalAddSubdirectory)
+ macro_optional_add_subdirectory( po )
++
++# Build the handbook
++add_subdirectory( doc )