[media-gfx/digikam] Resync with tree

(Portage version: 2.1.9.48/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)

5 files changed, 213 insertions, 17 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index aeba729..0b2b979 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: $
 
+*digikam-1.9.0-r1 (11 May 2011)
+
+  11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-1.9.0.ebuild,
+  +digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-nomysql.patch:
+  Resync with tree
+
 *digikam-2.0.0_beta5 (11 May 2011)
 
   11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index e556ebf..dde7355 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -18,6 +18,7 @@ AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf920299690705
 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
+AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c
 AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
 AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
 AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
@@ -31,27 +32,28 @@ DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a
 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
-EBUILD digikam-1.9.0.ebuild 3245 RMD160 7595b6ce1967bafa99dd8ecf19257838aef23753 SHA1 6c144376c2ed7058111505fc265fcee15f6f5462 SHA256 a410fe8542a23f6f1a47b6fac8e4ec0980f84518da06c90f2c9532292818fd06
+EBUILD digikam-1.9.0-r1.ebuild 3260 RMD160 9a81da4a6a320bc4f86b05665654c4b7e0cbacdf SHA1 5bfc5984b6f9bdc9b724b9a6196123ec812bc703 SHA256 a4b15d1c633ad4f793471d09563a1c4ee14d3889de3cc09afed8df85e83d5a28
+EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
 EBUILD digikam-2.0.0_beta2.ebuild 3339 RMD160 b930008d6fe94d757ecd23eb80949114e62b835b SHA1 10351caff0808bee413c99160b227cffd1b84473 SHA256 23872b2b307c1021af88bf994bcc0553eb01e330585d706067dfe2b8dea56d3e
 EBUILD digikam-2.0.0_beta3.ebuild 3339 RMD160 e931dff9b3dc632d586c27323c1b6ae96cfa74d8 SHA1 78481f6fb42060e4d240c568069e4fb48afc3bdb SHA256 311d6f8f1b22c8b40da470c07e1813db3c6cbeab64ded51c3a37a46dda747e60
 EBUILD digikam-2.0.0_beta4.ebuild 3333 RMD160 f233ebb7788ec8caa3a2bca7d341f635d685b1da SHA1 806b4fc1347782c1f59c3d57f68eb83396389460 SHA256 1968e6f68542a68c796307a67a0804349f9b46123b6b7369c59a8e5496189ebd
 EBUILD digikam-2.0.0_beta5.ebuild 3333 RMD160 295b6cec8ae5af7b42b2b4e5ed801fc9806d627b SHA1 cbaeae4a388b4c6955b6e5faabbfcb79117379a7 SHA256 c602bab5a10e4f451e1c3194310f1c36cc1b0f81d788bc1929d70f1d0732d595
-MISC ChangeLog 9816 RMD160 d5a9a8e84120f9e7598b598ae52c3a0487686f29 SHA1 38c70134dfae867ec97c26dec702eff22d3c7919 SHA256 60d80cbb465d6440e023bf88989034bcad0bd1baa31d9766059c3ff222d887d7
+MISC ChangeLog 10012 RMD160 4dea1e365ef683be3673f06adffbb3a1604a8bd0 SHA1 34ad5f35a0f37858523074fddefa68647e65cc2e SHA256 a255618ef94147f3b2090cf3b1019ae2a5705f49cedceff99e30494bcf52e430
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-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
-=8+Jj
+iQIcBAEBCgAGBQJNyviTAAoJENwGBM22xffemR8P/RW2rFuybtK7A2igiHW3VGG9
+pWFSwg/nRr5a2Dgwmn2PWvDlhXxgrT/nBNKzj0/jr1pFa8PVa73deuY5UZLpjfMG
+/OI942UpjjlsJUV3WJF1HVFO4dYg4euqdn4o4f8/B6kw8kIUT1h8diQiANaxwqvG
+Q9Tl0P0CumD/1yKBrvWfhbC1Uj/+ge1UHQ5FEcvdCH9wQkBjA7XxhEdTUpp1fFsW
+BB7Rv5gueDVNn4vrj4kuUQTbGP5yMs8HbzoZv2wXIBK+LlUHnzop18lEG3nftoev
+ijQyg71R2OgJTLwPtNpSCVW5UW7EBxj4maH7HexErr9oiFVyKhcn1NOGQ8Cc636g
+v8AvEBKdsHdU6cAurbecY9t+9k2hRHXtOjlxhOZ3wlFhA2SrW46uaMqMPSEGmwMr
+c4+2quVTr9GsBGvebwoTBx1Nexw3hXPEdbGFLIF/JGC3oOQDkWFIv+vR3EnJrwvA
+8M9aRwD/vqaNtdiPVvY+WRiiL/xn7+/IpswYQxzxzMsH1NVBBw/u1pYgWijP1Mm5
+a4FXXYeAqd82LeVBKSIY3p8AXlqA+H3K4QhOi2aGXQmMGW1d4V1TfO6SOh7wUCc6
+7JfToxqj8I1mvSLudVxBN4LsCR9bk2KzbodQ2iatFNkFy9ez5Ea9yrBbqvrEoaF0
+1016CC4q2o7KCs7XHHBQ
+=LCA8
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.9.0-r1.ebuild b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
new file mode 100644
index 0000000..6e439a4
--- /dev/null
+++ b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
@@ -0,0 +1,128 @@
+# 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-r1.ebuild,v 1.2 2011/05/11 10:45:31 scarabeus Exp $
+
+EAPI=4
+
+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"
+KDE_HANDBOOK="optional"
+# 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 ~ppc ~x86"
+SLOT="4"
+IUSE="addressbook debug doc geolocation 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 solid)
+	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
+	x11-libs/qt-gui[qt3support]
+	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+	addressbook? ( $(add_kdebase_dep kdepimlibs) )
+	geolocation? ( $(add_kdebase_dep marble 'plasma') )
+	gphoto2? ( media-libs/libgphoto2 )
+	mysql? ( virtual/mysql )
+"
+RDEPEND="${CDEPEND}
+	$(add_kdebase_dep kreadconfig)
+	video? (
+		|| (
+			$(add_kdebase_dep ffmpegthumbs)
+			$(add_kdebase_dep mplayerthumbs)
+		)
+	)
+"
+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
+	"${FILESDIR}/${PN}"-1.9.0-nomysql.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
+	local 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)
+		$(cmake-utils_use_enable mysql MYSQL)
+	)
+
+	kde4-base_src_configure
+}
+
+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/* || 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/digikam-1.9.0.ebuild b/media-gfx/digikam/digikam-1.9.0.ebuild
index 61764c8..ee18dc5 100644
--- a/media-gfx/digikam/digikam-1.9.0.ebuild
+++ b/media-gfx/digikam/digikam-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2011/03/01 07:19:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0.ebuild,v 1.4 2011/05/09 23:10:48 hwoarang Exp $
 
 EAPI=3
 
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SLOT="4"
 IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
 
diff --git a/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch b/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch
new file mode 100644
index 0000000..50dec54
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.9.0-nomysql.patch
@@ -0,0 +1,60 @@
+--- digikam-1.9.0-vanilla/CMakeLists.txt	2011-02-28 02:16:18.000000000 +0600
++++ digikam-1.9.0-vanilla/CMakeLists.txt	2011-05-09 19:45:02.000000000 +0700
+@@ -2,6 +2,7 @@ 
+ 
+ OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF)
+ OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON)
++OPTION(ENABLE_MYSQL "Build digiKam with MySQL database support (default=ON)" ON)
+ 
+ # ==================================================================================================
+ # Information to update before to release this package.
+@@ -189,20 +190,22 @@ 
+     SET(KEXIV2_FOR_DIGIKAM TRUE)
+ ENDIF(NOT WIN32)
+ 
++IF (ENABLE_MYSQL)
+ # Check MySQL executables
+-FIND_PROGRAM( SERVERCMD_MYSQL mysqld
+-              PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec
+-                    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH}
+-                    ENV MYSQLD_PATH )
+-MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}")
++	FIND_PROGRAM( SERVERCMD_MYSQL mysqld
++        	      PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec
++                	    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH}
++	                    ENV MYSQLD_PATH )
++	MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}")
+ 
+ # NOTE: under windows, mysql_install_db PERL script is named "mysql_install_db.pl"
+ #       under MACOS-X, through macports project, mysql_install_db PERL script is named "mysql_install_db5"
+-FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl
+-              PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec
+-                    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH}
+-                    ENV MYSQL_TOOLS_PATH )
+-MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
++	FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl
++        	      PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec
++                	    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH}
++	                    ENV MYSQL_TOOLS_PATH )
++	MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
++ENDIF (ENABLE_MYSQL)
+ 
+ # ==================================================================================================
+ # Optional dependencies
+@@ -274,10 +277,12 @@ 
+ MESSAGE(STATUS "")
+ 
+ PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND)
+-PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL)
+-IF (NOT WIN32)
+-    PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
+-ENDIF (NOT WIN32)
++IF (ENABLE_MYSQL)
++	PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL)
++	IF (NOT WIN32)
++	    PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
++	ENDIF (NOT WIN32)
++ENDIF (ENABLE_MYSQL)
+ PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)
+ PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND)
+ PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND)