From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QKGJ3-00016y-F1 for garchives@archives.gentoo.org; Wed, 11 May 2011 20:46:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59ECE1C002; Wed, 11 May 2011 20:46:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F2FE51C002 for ; Wed, 11 May 2011 20:46:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57A592AC00F for ; Wed, 11 May 2011 20:46:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C9F7280504 for ; Wed, 11 May 2011 20:46:42 +0000 (UTC) From: "Andreas K. Huettel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Huettel" Message-ID: <5046adc4c31cc539b6563f2a7c90eaa79be3f5f4.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ X-VCS-Repository: dev/dilfridge X-VCS-Files: media-gfx/digikam/ChangeLog media-gfx/digikam/Manifest media-gfx/digikam/digikam-2.0.0_beta5.ebuild media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch X-VCS-Directories: media-gfx/digikam/ media-gfx/digikam/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Huettel X-VCS-Revision: 5046adc4c31cc539b6563f2a7c90eaa79be3f5f4 Date: Wed, 11 May 2011 20:46:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 6f4397ec1198832a905c2efe40455099 commit: 5046adc4c31cc539b6563f2a7c90eaa79be3f5f4 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Wed May 11 20:57:10 2011 +0000 Commit: Andreas K. Huettel gentoo org> CommitDate: Wed May 11 20:57:10 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3D5046adc4 [media-gfx/digikam] Version bump (Portage version: 2.1.9.48/git/Linux x86_64, RepoMan options: --force, si= gned Manifest commit with key B6C5F7DE) --- media-gfx/digikam/ChangeLog | 6 + media-gfx/digikam/Manifest | 31 +++-- media-gfx/digikam/digikam-2.0.0_beta5.ebuild | 132 ++++++++++++++= ++++++ .../digikam/files/digikam-2.0.0_beta5-docs.patch | 42 ++++++ 4 files changed, 197 insertions(+), 14 deletions(-) diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index cb7f9bb..aeba729 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: $ =20 +*digikam-2.0.0_beta5 (11 May 2011) + + 11 May 2011; Andreas K. Huettel + +digikam-2.0.0_beta5.ebuild, +files/digikam-2.0.0_beta5-docs.patch: + Version bump + 11 Apr 2011; Andreas K. Huettel digikam-2.0.0_beta4.ebuild: Allow sci-libs/lapack-atlas as alternative to clapack diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index c2e0d31..e556ebf 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -20,12 +20,14 @@ AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb10= 80549a0c3f5c67fc51d36bb19b1 AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da95476364115= 7a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a93= 1af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec47= 23860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8b= f8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242= c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902= 322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac +AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41= e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113= cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964 DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cb= d2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5= bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206 DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa= 59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d9= 49265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0= bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18= 971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5 DIST digikam-2.0.0-beta2.tar.bz2 23685947 RMD160 0370c304af9dfcc380d9774= 7f698ab449e0d0beb SHA1 dbc62eed97c54dbdfff97690d4eb218d361e0d25 SHA256 15= f49e18fefdf7bcce8b31bb77b4fe31368f16d88c039842c58e7cbafa58fd49 DIST digikam-2.0.0-beta3.tar.bz2 24063835 RMD160 61871d8f1f28acd7f3b83f2= 61a94715d97bf71ea SHA1 7688ef4eec77b55e36ecd8f55d92635c36f38349 SHA256 60= c9f050b07a787e1512173b7b871dbf9babc730804f98829dae53229e16b97e DIST digikam-2.0.0-beta4.tar.bz2 43322316 RMD160 6af7f9ad6b757e97081391c= 5972abd744d45cfa6 SHA1 a5aef57a8be66b033e88d78f838c318ffe8df235 SHA256 aa= 85678e2a83cdb41ef70584e2a691c457759f50aadc0cc7019a33513ee16b63 +DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb= 9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 11= 8ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10= cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65= b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467 EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44a= bcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04= c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48 EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b= 2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f9= 73e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4 @@ -33,22 +35,23 @@ EBUILD digikam-1.9.0.ebuild 3245 RMD160 7595b6ce1967b= afa99dd8ecf19257838aef23753 EBUILD digikam-2.0.0_beta2.ebuild 3339 RMD160 b930008d6fe94d757ecd23eb80= 949114e62b835b SHA1 10351caff0808bee413c99160b227cffd1b84473 SHA256 23872= b2b307c1021af88bf994bcc0553eb01e330585d706067dfe2b8dea56d3e EBUILD digikam-2.0.0_beta3.ebuild 3339 RMD160 e931dff9b3dc632d586c27323c= 1b6ae96cfa74d8 SHA1 78481f6fb42060e4d240c568069e4fb48afc3bdb SHA256 311d6= f8f1b22c8b40da470c07e1813db3c6cbeab64ded51c3a37a46dda747e60 EBUILD digikam-2.0.0_beta4.ebuild 3333 RMD160 f233ebb7788ec8caa3a2bca7d3= 41f635d685b1da SHA1 806b4fc1347782c1f59c3d57f68eb83396389460 SHA256 1968e= 6f68542a68c796307a67a0804349f9b46123b6b7369c59a8e5496189ebd -MISC ChangeLog 9637 RMD160 740296efcdc4b3c64822bc5d2ddd6d858f3f7368 SHA1= f640f0ef752043bf61c7a0b09bc5f639e2873f41 SHA256 c2ce99b71d15e1f9588d4225= d66577d3dd406dfbfc346dc2eb3d4d7ea58b612c +EBUILD digikam-2.0.0_beta5.ebuild 3333 RMD160 295b6cec8ae5af7b42b2b4e5ed= 801fc9806d627b SHA1 cbaeae4a388b4c6955b6e5faabbfcb79117379a7 SHA256 c602b= ab5a10e4f451e1c3194310f1c36cc1b0f81d788bc1929d70f1d0732d595 +MISC ChangeLog 9816 RMD160 d5a9a8e84120f9e7598b598ae52c3a0487686f29 SHA1= 38c70134dfae867ec97c26dec702eff22d3c7919 SHA256 60d80cbb465d6440e023bf88= 989034bcad0bd1baa31d9766059c3ff222d887d7 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SH= A1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6= a4fe9b65422091a375d1ee9cc0490e7776f8f925a6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iQIcBAEBCgAGBQJNo30+AAoJENwGBM22xffeiSUP/0eDP6t/FNO0g2LvbzVRtjqQ -ASQnWcyQZC40pZfJzRv7dZ5OLMpYdmmZ6ndIAh7kKi35+XPtU5yj9Lco6Q/8UlNg -4/xHdchQA7leHsIpskvDLfp2EDyqyNZ2phG1gTk6sdGQCTHr8HJ+VMc5Q815ozau -QVJcSr7YQTHrFehiEZ3H9aCtiNZzVF1lzVh8KTnrw6jwrOxPnvOkqcFODavcCO9Y -r+ygj9Vr4V4b8rwRPw79wiU5caPwXhQe9xthls6sO8b1IMB3YKx6ODdhN4M2TmdD -0J8qylUiO+gYGOQ70+QGeqqFFgtYXNE9sYUKURp1FTYdA+tGwNYg1IwKLsHME+c6 -LEnxcvfIrfZ+oBf8DgeXUWeAUCc74Hc6JymYCnkpFsk4z/lnZAwy0YzrYb4dS9E5 -mfTF45J538O7KvJklOGK66ZQqP16zBEqz3RHBojXsqarTCS55fDOmHsnPH2hFXov -NOBQOmSorOnnw9OMwmSvCa1T0d0w6LlK+IbxvzuDwNW7kOfFkuMY514hMQSZQJo+ -YEJQaUptL5/ex+eDQoHcVb4iIrDFulxFKR8eeUCHFLQzO11lxVmSwmnovp+m9pMN -WuCQqh2V0bFRj9+LLEiIQQvJn/Ubbi6QF0eeeB43Mb8Y02jCbz0GxSKf5vxTIaXT -HXbgOv6BPXzbu7zLkLeF -=3DGm9n +iQIcBAEBCgAGBQJNyvglAAoJENwGBM22xffeOSoP/iWHJf63IoPTdAzOfFZd73AQ +wySiJXvlrWtDCqZwfqmCICyKkzEpZaEWwBC2xMheNWuk0GhyeNaHl6H7o9w6+ig/ +on9t4dGtLhk3dGI2XG8KTxPQ4pgtsf/5ammYMkHdsTBgOIMrAH9mew80BF5DFFDX +XEwZ02k/uizvyj4+dy6jyUXR+EhXAOCkXfNGYo38AuB5swX3ZMg1JXrQl5Jwaa4x +AU1NuLnQpJwpzzPGFk3mtgZT1aggoG4V6SQFzl7I9aS1tWsaKMkp6YIy7F7R4Xhf +mDrChPRwotM77zxG4+4zWM8tUfLSe8CNAHGaLtUwpiL8iOL2H/585MTGhJF1q3fm +ZabYiQsqURkDdEentJr3Lu27IaK//ECihbjGxpJoB4kZrtkAzS91uCZsfhQb/wXk +V7hRGlKfz4wnp17V23+EPoKYBpKkrqBm91uaYdp/fo5pIjaVp8OdggZ5EoBA0ep1 +WSVJMMWemGd7e+7svZKWc8D1E2WpE6CCcX4gkYu3Xt33M7fF8B2xoKerKOmuye8H +rzbADIKA2O+GCmxSrIBpfG9WYsbCWN9hfqbB+HL26nkWOyuJ+rmWsyzXRmkVijaK +kzFVll+PrV8PD4aVru5glmbctqQQePWny59p8XuWBqYnpsBYZhG80I6Oog+r+Yvl +fuJxkCXejsr/QtGfjYnr +=3D8+Jj -----END PGP SIGNATURE----- diff --git a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild b/media-gfx/dig= ikam/digikam-2.0.0_beta5.ebuild new file mode 100644 index 0000000..398ba15 --- /dev/null +++ b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2011 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.ebuil= d,v 1.1 2010/11/25 20:30:29 dilfridge Exp $ + +EAPI=3D4 + +if [ "${PV}" !=3D "9999" ]; then + KDE_LINGUAS=3D"" +# KDE_LINGUAS=3D"be ca ca@valencia de el en_GB eo es et eu fi fr he hi h= ne 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" +else + KMNAME=3D"extragear/graphics" +fi + +CMAKE_MIN_VERSION=3D2.8 + +KDE_MINIMAL=3D"4.6" +KDEGRAPHICS_MINIMAL=3D"4.6.29" + +inherit kde4-base + +MY_P=3D"${PN}-${PV/_/-}" + +DESCRIPTION=3D"A digital photo management application for KDE." +HOMEPAGE=3D"http://www.digikam.org/" +[[ ${PV} !=3D *9999* ]] && SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}= .tar.bz2" + +LICENSE=3D"GPL-2 + handbook? ( FDL-1.2 )" +KEYWORDS=3D"~amd64 ~ppc ~x86" +SLOT=3D"4" +IUSE=3D"addressbook debug doc gphoto2 handbook semantic-desktop themedes= igner +thumbnails video" + +CDEPEND=3D" + $(add_kdebase_dep kdelibs semantic-desktop) + $(add_kdebase_dep marble plasma) + $(add_kdebase_dep libkipi) + $(add_kdebase_dep libkexiv2) + >=3Dkde-base/libkdcraw-${KDEGRAPHICS_MINIMAL} + >=3Dmedia-libs/libkface-${PV} + >=3Dmedia-libs/libkmap-${PV} + $(add_kdebase_dep solid) + media-libs/jasper + virtual/jpeg + media-libs/lcms:0 + >=3Dmedia-libs/lensfun-0.2.5 + media-libs/liblqr + media-libs/libpng + media-libs/tiff + media-libs/libpgf + >=3Dmedia-plugins/kipi-plugins-1.2.0-r1 + || ( >=3Dsci-libs/clapack-3.2.1-r3 sci-libs/lapack-atlas ) + virtual/mysql + x11-libs/qt-gui[qt3support] + || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) + addressbook? ( >=3Dkde-base/kdepimlibs-${KDE_MINIMAL} ) + gphoto2? ( media-libs/libgphoto2 ) +" +RDEPEND=3D"${CDEPEND} + >=3Dkde-base/kreadconfig-${KDE_MINIMAL} + video? ( + || ( + >=3Dkde-base/mplayerthumbs-${KDE_MINIMAL} + >=3Dkde-base/ffmpegthumbs-${KDE_MINIMAL} + ) + ) +" +DEPEND=3D"${CDEPEND} + sys-devel/gettext + doc? ( app-doc/doxygen ) +" + +PATCHES=3D( "${FILESDIR}/${PN}"-2.0.0_beta5-docs.patch ) + +S=3D"${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=3D"Nepomuk" || backend=3D"None" + # LQR =3D only allows to choose between bundled/external + mycmakeargs=3D( + -DFORCED_UNBUNDLE=3DON + -DWITH_LQR=3DON + -DWITH_LENSFUN=3DON + -DGWENVIEW_SEMANTICINFO_BACKEND=3D${backend} + $(cmake-utils_use_with addressbook KdepimLibs) + $(cmake-utils_use_build doc) + -DWITH_MarbleWidget=3DON + $(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 +} + +pkg_postinst() { + kde4-base_pkg_postinst + + if use doc; then + elog The digikam api documentation has been installed at /usr/share/do= c/${PF}/html + fi +} diff --git a/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch b/med= ia-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch new file mode 100644 index 0000000..a5bc184 --- /dev/null +++ b/media-gfx/digikam/files/digikam-2.0.0_beta5-docs.patch @@ -0,0 +1,42 @@ +diff -ruN digikam-2.0.0-beta5.orig/core/CMakeLists.txt digikam-2.0.0-bet= a5/core/CMakeLists.txt +--- digikam-2.0.0-beta5.orig/core/CMakeLists.txt 2011-05-04 10:52:35.000= 000000 +0200 ++++ digikam-2.0.0-beta5/core/CMakeLists.txt 2011-05-11 22:40:30.00000000= 0 +0200 +@@ -1560,8 +1560,15 @@ + # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + # API documentation generation +=20 ++# Checks if user ask to build documentation. ++IF(BUILD_DOC) ++ + IF(DOXYGEN_FOUND) +=20 ++ MESSAGE(STATUS "") ++ MESSAGE(STATUS "API documentation will be installed") ++ MESSAGE(STATUS "") ++ + SET(API_DIR ${CMAKE_BINARY_DIR}/api) + SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) + SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile) +@@ -1569,7 +1576,21 @@ +=20 + CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE}) +=20 +- ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE} ++ ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) ++ ++ELSE(DOXYGEN_FOUND) ++ ++ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not fo= und") ++ + ENDIF(DOXYGEN_FOUND) +=20 ++ELSE(BUILD_DOC) ++ ++ ++ MESSAGE(STATUS "") ++ MESSAGE(STATUS "Documentation will NOT be installed, because") ++ MESSAGE(STATUS "the option -DBUILD_DOC=3DON wasn't passed to cmake"= ) ++ MESSAGE(STATUS "") ++ ++ENDIF(BUILD_DOC)