Added installation of the handbook and the api documentation

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

4 files changed, 204 insertions, 15 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 9ab1f57638b6..b975c09bef44 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,13 @@
 # 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.157 2010/09/18 20:17:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.158 2010/09/25 14:52:35 dilfridge Exp $
+
+*digikam-1.4.0-r1 (25 Sep 2010)
+
+  25 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +digikam-1.4.0-r1.ebuild, +files/digikam-1.4.0-docs.patch:
+  Added installation of the handbook (use-flag handbook, from a svn
+  snapshot) and the api documentation (use-flag doc)
 
   18 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-1.4.0.ebuild:
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index e7c153c1f29c..25bed10ef191 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -9,29 +9,32 @@ AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c
 AUX digikam-1.3.0-docs.patch 1910 RMD160 c4d644e91a0b492c8c9a8e53ed0ae19fa743dabc SHA1 6d3c6519e4d7351198f6275639afe448e09d92b7 SHA256 d8048791e9623fe99796d71bc835ac568786b4c5a643b3d02c6d80472e725b99
 AUX digikam-1.3.0-pgf.patch 6006 RMD160 bfda7c95a633f4967935545f66d850fd94db9566 SHA1 43295130d7a62dc27097ed9730b3b47e13f2ab3f SHA256 84c219c7238790288b90acdb255bce2e40e3c5f19476885a2d456698e2f57205
 AUX digikam-1.4.0-clapack.patch 7429 RMD160 a10cf8ff044e42cfbb3880ed543b3df0221655e6 SHA1 7cd6461ff474503124a3116b8dfd8bb264c5afb6 SHA256 1e2f1d11a612f1cff63acc46db5e5818a438d35d5aaef5b40ea6633b1f4b079e
+AUX digikam-1.4.0-docs.patch 1953 RMD160 c90ab96aea6e08bca963a22bee5f7868de22a708 SHA1 dbdb4ff0d4697006a12b18be1b5cf5f903b3cb70 SHA256 d4f439b2b6d86833b82c0101ed1f34cd1fc8611a4917db8ca4611437757cdce6
 DIST digikam-1.1.0-libjpeg-8a.patch.bz2 14552 RMD160 8ecf249a0e4db45ccd13b7013b543483cb1a7af5 SHA1 137402f1727f8fcb76f38c33ad1ba0ae036e298e SHA256 c728940524ef7089c842319134aa3346de154e546f8dbf5f2b9d3a7096c33456
 DIST digikam-1.1.0.tar.bz2 15385611 RMD160 a4bd749adf24be7cd349e7be464cf22018d21eca SHA1 5ee482ff209c0a29b898e57278d62c428b743ba5 SHA256 6d26921e83bdb85342a0455df919f33bc2f23533c96e9293e80cd79ff92bfa8f
 DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
 DIST digikam-1.4.0.tar.bz2 14907229 RMD160 a78656044bcc42f21794c1c4a25dcaaf869df38d SHA1 a3370f2d2c469fa5b90966bb0141b5a8956c71df SHA256 d37afaad8808f78ecda93d7498c64b72eee3bb61911fbeff87d3a528a7247eba
+DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.1.0-r1.ebuild 2145 RMD160 8ac789bca92424a4e138b5f8d5f02445bdf43532 SHA1 0cb45162c3686b51414d6e109f721834a5adb496 SHA256 a18f53845b79ada790e740ef7f638a24cf179cf8cfd82a92adccd8694baff608
 EBUILD digikam-1.2.0-r2.ebuild 2687 RMD160 4f428f715f708428629579974db4055d4b030a00 SHA1 3804de030becf59b477c0ed3e93d0f06f7c5ac85 SHA256 91d415064f24e7b3f7445e1118d23a46fc38e68a07555c8987854f738a588923
+EBUILD digikam-1.4.0-r1.ebuild 3199 RMD160 a1ce94d6113d6f081d26f90c6237f7ab5b77caed SHA1 5db566725a35c4502daa2716982e7ba12482c0a9 SHA256 e82636ed9b1a8d0e9bfb68b560cc14e7a66d5af3b64296ab8fd491d69185ce01
 EBUILD digikam-1.4.0.ebuild 2530 RMD160 d338b1aea041d969b71b688b698b6762ec6040de SHA1 213722eee8d70e925c634d49372db3a4c94cc95e SHA256 f23890f84bf2d7720c046e0a58471db8e06cac8ea883275df4ee86ede943c451
-MISC ChangeLog 26000 RMD160 68ee33084bd0ffde9d00585fb200deaf9df30412 SHA1 e28b71db69efa28b8f733eaa5d3d15bbc3264fe5 SHA256 5b8141f3b330ad9f909affbed004638b0c8c556bfb5d0538cc7088f01f7fbef6
+MISC ChangeLog 26273 RMD160 6a813579e04b1713aed5e5def1ce8c9e38d62a89 SHA1 37bc9942b0c7d4bf27495efba442679a9fac5e07 SHA256 c876bc87f0d7d83629d3afb07ff4e0e93b68d685d6bd07fc4fe8221f9092473b
 MISC metadata.xml 691 RMD160 2e1c382d4682a65909cd2820a3b997a8e27f405f SHA1 42cfc8076bba5c72e6df4650694b9ddf1b5b5bb2 SHA256 ccc5ec872df963f90005d9f2330315b4c0fc3336890464cb1f3835908a381e61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMlR4oAAoJENwGBM22xffenSoP/jIiVSDX8qaoaDK9ROlJFhy7
-IwU9eHPR744Fyml/epz4/s5dg4h54laOg8WsxXMcM/U/Af+66N8enP9dm5S57gt4
-MXZVvB0rAu5L2At+qobYfG9gVaFapew0SOt5UXB7UTF4Zr3OOQCfbzuvUD6mj1Ux
-XTqTfOPpew6LMbsDWrLR1mQmJ2JAtvQLo6WAi8jdM5ZU1XAiw0E1ptI2A5IOYW5o
-fz8IQbXwgm2cJ5emlxDMPurHLoSvtY+4JHAcufEB/EyzyplXhDpLPq9A5ZnAoQP8
-bpfNwLQirw+T5gcs+q6ggueCXaPBz2KVPCxwaSPTdLUWofzsIcN8JpX595Qbwhbl
-z/sFsLO6k06c1IEx/QbfFW9KgdJDvYE2tu4/PgmFN7uTv/mEZkt08Bea5KJReZpM
-AgYNr7+VYCvDDjjENmjK/6sGbotHHPD9oMt/8jdzSHMXmEaC4vMjZo11q6AMLJV5
-kYFy6H8bMRynJKASEDgRWnkfrfUO9k0aT02hcw/3bxxNciGHCiVszKIXUw1iRbvO
-KT8U2WzrMzISq497HW0wdf0dZ4qdujCmihkFV3a/pWsh/5IZaOl8j8zeXpY0Bbni
-gLSlWhuWdnaEUXua37+l1I8aLtu9h/htbqyQyrXvEUY3Lrthq+AILQnaPUXVavJA
-dXOK1NvBvAEqyaGse0S+
-=xACo
+iQIcBAEBAgAGBQJMngynAAoJENwGBM22xffeUvAQAIRt0V9W3GGTytch4L2KqmaW
+BSxCRh7LXWv2hv/gcbSgbndYjlGsrUgFt7/j+/WVydbm8S0REGQlhYw2O6A02JD4
+vJO5hJG7Zb4njA2LjJkpijgNfhYenuaKa4DSnMMHNNGWbuodDDfILhIS5S6hsvm+
+k0mphgd+bfgu4C5cNifj7A5QWfyyY1byBzT/g/KNl1omM1bkS3Cyw0dSIygDnmaT
+d+4dBZugaP4shwiE0NNUFFG6zvXp/SoBrgLCpv6r184GVUlrniRhpu75XYsCCj0U
+1y9TdXRO99VLINariiwWFjcyKDdQujSXON0sM3wlmZmPXzobrEYxCQ1jgfYwazLO
+2RukWGNFIQAXwnWsP0/If/cTjBOMr4kZ/wQ9Zv2VOjrQ4nJdHb7TUiav78sbuEQ2
+nCvXli5NuD/pmYqzB9Im2nRX2svT2i9KnZTKOP+EwOxDR5tfplkmSdl+nY2U+aaq
+9SaLtE0yQmYo0+Q5m+wF7Qi3Euuh/2RsG11oHlh2eRlhazpA/zrACCmrNJ8+P6xG
++WGn67Ofug9yCINzD4K7hwDsQfmFksecv2S8Qy671hKoxDS++1koyV52cjTQ11uy
+Qf1PEtjzGCnIggMHX3ACB79NvlDZUxpfv0g38QdYsb0stNRHXSyo5kMwwZbQwmDl
+TuITUnDdilx/3ftucX6p
+=CkXm
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.4.0-r1.ebuild b/media-gfx/digikam/digikam-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..cf6d4c7d8f12
--- /dev/null
+++ b/media-gfx/digikam/digikam-1.4.0-r1.ebuild
@@ -0,0 +1,121 @@
+# 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.4.0-r1.ebuild,v 1.1 2010/09/25 14:52:35 dilfridge Exp $
+
+EAPI="2"
+
+KDE_LINGUAS="ar be bg ca 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 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"
+
+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-${PV}.tar.bz2 )"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc geolocation gphoto2 handbook lensfun 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
+	>=media-libs/jpeg-8
+	media-libs/lcms:0
+	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,sqlite]
+	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+	geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
+	gphoto2? ( media-libs/libgphoto2 )
+	lensfun? ( media-libs/lensfun )
+"
+RDEPEND="${CDEPEND}
+	>=kde-base/kreadconfig-${KDE_MINIMAL}
+	video? (
+		|| (
+			>=kde-base/mplayerthumbs-${KDE_MINIMAL}
+			>=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+		)
+	)
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}"-docs.patch "${FILESDIR}/${PN}"-1.3.0-pgf.patch "${FILESDIR}/${P}"-clapack.patch)
+
+src_prepare() {
+	mkdir -p doc
+	[ -f doc/CMakeLists.txt ] || ( echo > doc/CMakeLists.txt )
+
+	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
+		-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 lensfun LensFun)
+		$(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.4.0-docs.patch b/media-gfx/digikam/files/digikam-1.4.0-docs.patch
new file mode 100644
index 000000000000..2cc2791a8704
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.4.0-docs.patch
@@ -0,0 +1,58 @@
+diff -r -u digikam-1.4.0.orig/CMakeLists.txt digikam-1.4.0/CMakeLists.txt
+--- digikam-1.4.0.orig/CMakeLists.txt	2010-08-22 10:59:50.000000000 +0200
++++ digikam-1.4.0/CMakeLists.txt	2010-09-24 23:48:11.557561663 +0200
+@@ -1340,18 +1340,45 @@
+ # ==================================================================================================
+ # API documentation generation
+ 
+-IF(DOXYGEN_FOUND)
++# Checks if user ask to build documentation.
++IF(BUILD_DOC)
++    IF(DOXYGEN_FOUND)
+ 
+-    SET(API_DIR ${CMAKE_BINARY_DIR}/api)
+-    SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
+-    SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
+-    SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
++        MESSAGE(STATUS "")
++        MESSAGE(STATUS "Documentation will be installed")
++	MESSAGE(STATUS "")
+ 
+-    CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
++        SET(API_DIR ${CMAKE_BINARY_DIR}/api)
++        SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
++        SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
++        SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
+ 
+-    ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
+-                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
++        CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
++
++        ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
++                          WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
++
++    ELSE(DOXYGEN_FOUND)
++    
++        MESSAGE(STATUS "")
++        MESSAGE(STATUS "Documentation will NOT be installed")
++	MESSAGE(STATUS "Doxygen wasn't found on the system")
++	MESSAGE(STATUS "")
++
++    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)
+ 
+-ENDIF(DOXYGEN_FOUND)
+ include(MacroOptionalAddSubdirectory)
+ macro_optional_add_subdirectory( po )
++
++# Build the handbook
++add_subdirectory( doc )
++