Version bump

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

4 files changed, 199 insertions, 15 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 927b0df0e9b6..c647b16aeee6 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.177 2011/02/27 11:55:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.178 2011/03/01 07:18:32 dilfridge Exp $
+
+*digikam-1.9.0 (01 Mar 2011)
+
+  01 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +digikam-1.9.0.ebuild, +files/digikam-1.9.0-docs.patch:
+  Version bump
 
   27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   digikam-1.2.0-r4.ebuild:
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 8771f32128a3..52adf5eefa4f 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -9,27 +9,30 @@ AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90c500c332
 AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6
 AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbba SHA1 e3682e8af28233609c12817ec13a120c95a169be SHA256 088709ad10f71266957d237fabba9ee6f1de0f43ba2c5f63badbeb974d140241
 AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
+AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af
 DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
 DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
+DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
 EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
-MISC ChangeLog 29642 RMD160 cd5f3ed898a0b18566718bd759a04c450425a44d SHA1 352529e2ccac4d163acb9cd733be8598a9ddad3e SHA256 2bb721a58fca40a729bc7ab1f5c2b39db6e7057fca3a44a06e7f5d53749e40e7
+EBUILD digikam-1.9.0.ebuild 3240 RMD160 bc0d54a6b265052f8ebafb338a8959360c99d3fa SHA1 157ecea67594c8cb4976ce6917778edf0b3b11c6 SHA256 6597ad15a27315b77151c0614d249c7bcd69b3c3718ec867ea647ff811d42974
+MISC ChangeLog 29803 RMD160 bc72e6a4b363a4a8c19e02d5a722fbbb4c100f33 SHA1 dfd8314900e097855491f4ef455391ac0594d221 SHA256 cb83c93ce0257d6423358ba095559defb5480b7e72c8d92d23451337a6ff78c6
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNajvhAAoJENwGBM22xffeOakP/1MRfmFOUHdvYpcTR6luhV/n
-Q786vegjIiIr6ZqbI2B7jNY/H4wcIduuuS5FR9dzSvupmOz940ZQO8T93811jGXo
-+O0urK2yExUGqC/++Gloflv4wNRqLWogkXSeA4SzVaYKfln2MdGHuDCpVVvJ/Y2O
-OllUMgFmTAoQmgdzOSE4kRG7I14BNbq77lriHqnWRBx1hkZAGkHxYsOBVu6VKN8K
-zLVrealmz8TSVEIZ+YxR9SmkKr55jyl1rpT1yT5Dj9l28wP0cmtkR4MzIEv8zipT
-x1y6FrcORisUhXBzhGBKTUnlUwcWkB5PeyyyCW+yUmDVQbpINOsijA6CUEVvp2yr
-oZjJx067wgCbthC/62+KZZnddBS8frsjEavxkhhyq+9HvA1v3BiSl0LftV6GTh3C
-JNgKxAMlvuqIvqxHwL5B9xgZtb3x/OEbhSJcTWIH3N3tLjQHhSdWXO/J6kW5F7Tj
-LQ7wLVhuVLApOHf6YvnnoyitP87lszHjWL5OLivqjZT93KSEAtz2/sj5MuwsI4De
-bg97I0RJRt8bNHzU+gTtymAOLODQZjwXAaJ3IdhFwJCERtvrqXFtkNteEQSLA1tp
-2dF65OzLb+TeedfkAllQ4mprKb6jRkF2+hOqXLGNpBKgcEME/240JgsYL4NcLiap
-z65Bo6CFCmZt5BrXN+1p
-=zLOc
+iQIcBAEBAgAGBQJNbJ4fAAoJENwGBM22xffegkgQAJ9CsqY657lE5C3Bixf5UVQM
+INWMovSVSADegpw4BsKJz12Xblrz6BtbHeVF1RXbakMLE/l4uIyXcH4o2JmpbVYM
+SLsmZZ6INYgOWVYKaXA+g4Qk9dYLyBmRl48m1VVQeq0aVo85wHYFFAO7IhMLtlBA
+agD/qv3NhCkiOmH4ykexbi7xDd6I9i439X27rTBQGV/BiXPerbiYBmApS9ACr7s6
+TwyfjeXMEhJWqiRELQmeSuxdrmnEnMXTOgfE2wQUbNIaVlWBZBKtD0bCS4WV4OmL
+BEy8qau+dj70i7h+3/Yr8C5KcI4xNbUzMpvoJVdEeDMwq8KRNQV0QquYGQSldxBh
+aO6xs4YOuqCGgSwXNBjFZZyhM+KqiW1uY63fC4m3l3i9xXX/nQWp6PCMPMrwl0jx
+7rXvdrua6R9YJ07XK8KOSqU5YUbPSEYRB5b1Kjtrqo//726lky+YOmaxaF5MAEiY
+PENYZC0z3AV0sTkVv7urQu61fXnW3+6UQwfFhrM91J1KhMC51XQ1az4IkZhIhDDt
+kNaY5GghothMGkNgqEcxXmwZq9MldMCC9XflFUDPfIbRKV833P8NRZZKFRAVEG1T
+/XToJAPkyUq4x/QrhNEgyG5ccLiuqtLRdDuz6L8YlVH92fURzKUUQ1cxhqeHDbPa
+S4eyTcjEh1sxPBIT+IQj
+=WFDO
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/digikam-1.9.0.ebuild
new file mode 100644
index 000000000000..a1aef015e08c
--- /dev/null
+++ b/media-gfx/digikam/digikam-1.9.0.ebuild
@@ -0,0 +1,125 @@
+# 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.9.0.ebuild,v 1.1 2011/03/01 07:18:33 dilfridge Exp $
+
+EAPI=3
+
+KDE_LINGUAS="ar be bg ca ca@valencia 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 ms 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"
+
+# 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}/${PN}"-1.9.0-docs.patch
+	"${FILESDIR}/${PN}"-1.8.0-tests.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.9.0-docs.patch b/media-gfx/digikam/files/digikam-1.9.0-docs.patch
new file mode 100644
index 000000000000..588cfb907031
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.9.0-docs.patch
@@ -0,0 +1,50 @@
+diff -ruN digikam-1.9.0-vanilla/CMakeLists.txt digikam-1.9.0/CMakeLists.txt
+--- digikam-1.9.0-vanilla/CMakeLists.txt	2011-02-27 21:16:18.000000000 +0100
++++ digikam-1.9.0/CMakeLists.txt	2011-02-28 18:56:39.000000000 +0100
+@@ -1421,8 +1421,15 @@
+ # ==================================================================================================
+ # API documentation generation
+ 
++# 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})
+     SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
+@@ -1430,10 +1437,29 @@
+ 
+     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})
++
++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)
++
+ find_package(Msgfmt REQUIRED)
+ find_package(Gettext REQUIRED)
+ add_subdirectory( po )
+ 
++# Build the handbook
++add_subdirectory( doc )
++
++