[media-gfx/digikam] Version bump and update of live ebuild.

(Portage version: 2.1.8.3/git/Linux x86_64, RepoMan options: --force)
 (Signed Manifest commit)

3 files changed, 113 insertions, 29 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index e8a74d9a39..b79350aabc 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -5,23 +5,25 @@ AUX digikam-1.3.0-clapack.patch 7182 RMD160 f0b8bfe449091e24d69bb54de6592fddf3e5
 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
 DIST digikam-1.3.0.tar.bz2 14990462 RMD160 45f6bc4ee80df278eb85f3de9eab9b221ee94377 SHA1 99ab242f075d7d5368b66996fffeed5dfd738cbe SHA256 76184c5e193b8338894db6a8c4af4bc773beb819856a83ae163529aefcc10321
+DIST digikam-1.4.0.tar.bz2 14907229 RMD160 a78656044bcc42f21794c1c4a25dcaaf869df38d SHA1 a3370f2d2c469fa5b90966bb0141b5a8956c71df SHA256 d37afaad8808f78ecda93d7498c64b72eee3bb61911fbeff87d3a528a7247eba
 EBUILD digikam-1.3.0-r2.ebuild 2352 RMD160 b1f2bb85bd63205a26fc1b6bd800210a086f6bef SHA1 ca0b1237d2806800788825ee8507530c42d8b417 SHA256 e8fed398db4624a911e697529b7d06e8acd196410b05f5765746c7d0a2a8f5ac
-EBUILD digikam-9999.ebuild 2541 RMD160 b4598d1d007202ff5dcdd4a8dbba5d56811685bf SHA1 0f869d851077028fc46d102cce27fef38ad6b712 SHA256 68b9fcf5654af895d9c9edda84900e438a762d7d729a3f5a2afec07e447988ed
+EBUILD digikam-1.4.0.ebuild 2382 RMD160 c270d1dd1f692ae047566f5bcb40be6305f72441 SHA1 dafe8dfb4bc18b32800240febbbf5d81a1fc3bd1 SHA256 4f52edb3d32e46ee307f7b3c53e7a35fafbd23acc8d5c30093db1ef9d355ddbc
+EBUILD digikam-9999.ebuild 2374 RMD160 1ecce2ed7ccfda99c9780dec96cead7afa876264 SHA1 87a68e8f262ead54350a6ef711529dd0da366c9c SHA256 ee91ed95f7500a3dbd0ecfeb01b8ea488a568375ee6980be2e84a13622600710
 MISC metadata.xml 561 RMD160 4cd500a827d9f01fb799b34f126312c0462f0e7b SHA1 91432be778e43c9381a7bcdd602b3bc7d773b472 SHA256 002c1784fab700752d25b556bc16caec89d8c764e19fb1d950006a8adc4af939
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMeY2HAAoJENwGBM22xffebJsQAKS8bX6hITD8es70dPNVi47L
-E+oR3lWEjjs3r2PtdzMCSJwDK2z8Ovxf6vd3hucHSliy65w7InuYceHzYpMjfSVF
-SCdWFiPKnWDqTYkkLXOMwIlv/g9J7vERFQ8+ZlqAKXKxr3Era3zm8Qhal93JRXUR
-fQAefqgsCcBo+ARPBhcpFXquy2e0OB3JwZy7PiaGiBL0Ub4iBHQRL5OvYub6IE86
-IVBZG8CF/hDvtb8WatLWsnUInPDwv/oCjHY0T3nFGBbaz96RGzItatyN/7nO34yt
-GOTp70+642c4y4sIKW73E27xoUhxMY8SMAykyQXJXfjp24lgaNBRw80FE39NwCln
-qpS1j9yd0Nwlw/PjD6WkdPx5U+2mv/CnBYKvtR6+vIkOFVPYn4N7kIAthzPq0tGG
-FpfZyEPS2ea5B/rsjiTQyf9o16zX/64wbj2c1qr2PvbSAcNLIs5MLq/4HLnQpLZt
-2tAm9EPPbug+tIb33WwrbcRToaWPkIQET9sLHBELYrZ2x/xwp0lFk6sWJaKrCMlx
-LK896Hm/sJS+A2i1vXShwYCXUX+PHoLvisyznpGrmTwOjF8LtfgZN8Sn0Vko/l0v
-5UXTfVce/E8pJTJZz+U0XfqIFTDT009qPoh5s0rG42UeRmy5pPlQKMxGeZQZ3qmW
-vLcK8DHPN2ofEGNgu2+V
-=JL33
+iQIcBAEBAgAGBQJMeY4AAAoJENwGBM22xffeohwP/0Cro+aIV+GdrOlyUwhPXSgk
+tXzNErD6TufJRq15GOwYBV2N+YfAWZH6JZXjQtkWUHprzQeeDs9dX0Fszhs4ScWV
+u26tEcgsKKA6SUhwFOfao3nChOm9hCJUAs+365PrUV89VsRnx3pMbY5gwBSXNCXH
+3YunYsvDr9BbxHLs/t3Bi16imRgbGpa1TG2QJUHJx4yXoHV6OlyMkD84+TnlkJJN
+xq6DhwX15zfVU9uyfxa3Rfz71t9mLw1gG7Legx/AmOpq0FNfGuUxuLEPelmHhhKu
+miy7oIl9plmJ1pSQwlqPezkD4M5A++1taL2PCzDMU5n2I9Dob6md01/J4M28/GsU
+OqywpRohZnOS7qX4IqXLg7g+KHzttwTW9baglDOUcO1YNxPWWxtwy5fI9dM8wMjB
+NW2x1mHMj7LVUWBh4cJsNBJrLagqQr9t7zqxT55MmfXY6WO+Xb6mD7Mlq2trhqIX
+7DYgsaqfemM9tsfI/05SpVfZ4fi5P/Z8zC8o/LaxFAHJ2krHsW8cD7X0rLmDICHV
+XOK/uZ1rx3ni2gH269Q7fWFXLyB2LP3fpVhrHB1ePG6aB/l1lqbdfJj0wPLilglI
+CNUdkTe0mOhtLbQaSaoHchMej4Zq6DUepPAimAbrOVBdYLcoqlUYGGqn2fA/eaqz
+6t/qZbNAp4oVAnWBnbtf
+=hlna
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.4.0.ebuild b/media-gfx/digikam/digikam-1.4.0.ebuild
new file mode 100644
index 0000000000..f5503110ad
--- /dev/null
+++ b/media-gfx/digikam/digikam-1.4.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc geolocation gphoto2 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
+	x11-libs/qt-gui[qt3support]
+	x11-libs/qt-sql[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}/${PN}"-1.3.0-{docs,pgf,clapack}.patch )
+
+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
+}
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index 781f45c198..b0f5972d19 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -4,18 +4,21 @@
 
 EAPI="2"
 
-#KDE_LINGUAS="ar be bg ca cs da de el es et eu fa fi fr ga gl he hi is it ja km
-#ko lt lv lb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
+#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
+#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS=""
@@ -36,7 +39,7 @@ CDEPEND="
 	media-libs/tiff
 	media-libs/libpgf
 	>=media-plugins/kipi-plugins-1.2.0-r1
-	virtual/lapack
+	>=sci-libs/clapack-3.2.1-r3
 	x11-libs/qt-gui[qt3support]
 	x11-libs/qt-sql[sqlite]
 	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
@@ -53,23 +56,13 @@ RDEPEND="${CDEPEND}
 		)
 	)
 "
-# gcc[fortran] is required since we cannot otherwise link to the lapack library
-#   (the fun of unbundling)
 DEPEND="${CDEPEND}
-	sys-devel/gcc[fortran]
 	sys-devel/gettext
 "
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	# Patch to unbundled libpgf.
-	epatch "${FILESDIR}/${PN}-1.3.0-libpgf.patch"
-	# Patch to unbundle lapack.
-	epatch "${FILESDIR}/${PN}-1.3.0-lapack.patch"
-
-	kde4-base_src_prepare
-}
+PATCHES=( "${FILESDIR}/${PN}"-1.3.0-{docs,pgf,clapack}.patch )
 
 src_configure() {
 	local backend
@@ -77,6 +70,7 @@ src_configure() {
 	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)