Updated digikam - added gphoto2 IUSE, added missing [kdeprefix=], formatting

4 files changed, 40 insertions, 48 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 9d828c3e893..e233ba85f14 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Feb 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  digikam-0.10.0_rc1.ebuild, digikam-9999.ebuild:
+  Updated digikam - added gphoto2 IUSE, added missing [kdeprefix=],
+  formatting
+
 *digikam-0.10.0_rc1 (27 Jan 2009)
 
   27 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 20f086def1a..70b5462feec 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,5 @@
 DIST digikam-0.10.0-rc1.tar.bz2 10954564 RMD160 24760741578519d2405161ab9fd035deb68a6826 SHA1 c37d39a71a7b97840e8a49577d33bc8d1fdcdc6b SHA256 415ade28dc2d66fd6b993852029539118fa39ee696f89716ec8951cfc7571ebb
-EBUILD digikam-0.10.0_rc1.ebuild 1865 RMD160 bfb282f85f17e760faa359f3d73b6d918d686b00 SHA1 ee5771a47074adad495c01c9d4f92dddad2c7f0a SHA256 18cab0ba65ae566f3eb99205d46f2df03736927b39cf02a5842c887947c56ff3
-EBUILD digikam-9999.ebuild 1675 RMD160 7925731b1ff48de71dd3820d245abf02fa04b545 SHA1 534837d191064d70415a263a6137039d852d0df0 SHA256 a1d30a54ec2b690c306ac002efe7dc93b1f41188281e785eb229012014c749a3
-MISC ChangeLog 2261 RMD160 9999ed4530712ec0766690a64309595982abe874 SHA1 37047328eb87532bb9f39f1315429b288c1074e9 SHA256 b5e8dca0d82ec87aed0c50e10e143efe92e2c666a15c05afdd073fb0a2a9d13f
+EBUILD digikam-0.10.0_rc1.ebuild 1794 RMD160 facad8974387ab9086437a394fd477f11cddcba0 SHA1 ea0a766945df7aa636ebdd211dfa65fd2154c0d2 SHA256 015b59a4f7a55f5d4844eefff4f708f86a521745f99165841c8b18f249a78f38
+EBUILD digikam-9999.ebuild 1598 RMD160 ae6bdeae8f10953b65ef86eea4ae8768a0ec6bc3 SHA1 147fadadd3aced03cacc515d7996ce4a6aacf435 SHA256 7de658b00ae2051842147cf9c14d79e56876ed2802d2fecd0f6544c48b0184c1
+MISC ChangeLog 2457 RMD160 de0a19ea4f6b8619a4862172d95dcb3fa2143da5 SHA1 bcbd2b6ad2502016b86886371b075e69491847cd SHA256 d74af25c3b287ae09e4aab630e9e1dab3a044f8b2143c4e2a1b0ef5946a83e40
 MISC metadata.xml 376 RMD160 3158e2babdd75064d05a08420e0f1d2d3b318fae SHA1 bf9026c227e27333e688b7a4d639e7eaf7ba5993 SHA256 9ea05856a338312e6d9d3ebe15b935d371bd4bd21eeaa796d71db1a92b4e7231
diff --git a/media-gfx/digikam/digikam-0.10.0_rc1.ebuild b/media-gfx/digikam/digikam-0.10.0_rc1.ebuild
index f454e1163f4..6211dbeae24 100644
--- a/media-gfx/digikam/digikam-0.10.0_rc1.ebuild
+++ b/media-gfx/digikam/digikam-0.10.0_rc1.ebuild
@@ -7,7 +7,6 @@ EAPI="2"
 KDE_MINIMAL="4.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 sv th tr uk vi zh_CN zh_TW"
-
 inherit kde4-base
 
 DESCRIPTION="A digital photo management application for KDE."
@@ -15,44 +14,34 @@ HOMEPAGE="http://www.digikam.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
-RDEPEND="${DEPEND}"
-SLOT="0.10"
-IUSE="addressbook debug geolocation"
-
-S="${WORKDIR}/${P/_/-}"
-
 KEYWORDS="~amd64 ~x86"
+SLOT="0.10"
+IUSE="addressbook debug geolocation +gphoto2"
 
-# it have dynamic search for deps, so if they are in system it
-# uses them otherwise does not, so any iuse are useless
 DEPEND="
 	!kdeprefix? ( !media-gfx/digikam:0 )
 	dev-db/sqlite:3
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	>=kde-base/solid-${KDE_MINIMAL}
+	>=kde-base/libkdcraw-${KDE_MINIMAL}[kdeprefix=]
+	>=kde-base/libkexiv2-${KDE_MINIMAL}[kdeprefix=]
+	>=kde-base/libkipi-${KDE_MINIMAL}[kdeprefix=]
+	>=kde-base/solid-${KDE_MINIMAL}[kdeprefix=]
 	>=media-libs/jasper-1.701.0
 	media-libs/jpeg
 	>=media-libs/lcms-1.17
-	>=media-libs/libgphoto2-2.4.1-r1
 	>=media-libs/libpng-1.2.26-r1
 	>=media-libs/tiff-3.8.2-r3
 	sys-devel/gettext
 	x11-libs/qt-core[qt3support]
 	x11-libs/qt-sql[sqlite]
-	geolocation? (
-		>=kde-base/marble-${KDE_MINIMAL}[kde]
-	)
-	addressbook? (
-		>=kde-base/kdepimlibs-${KDE_MINIMAL}
-	)
+	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL}[kdeprefix=] )
+	geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[kde,kdeprefix=] )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.1-r1 )
 "
 #liblensfun when added should be also optional dep.
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	# fix files collision, use icon from kdebase-data rather that digikam ones
+	# Fix files collision, use icon from kdebase-data rather that digikam ones
 	sed -i \
 		-e "s:add_subdirectory:#add_subdirectory:g" \
 		data/icons/CMakeLists.txt || die "Failed to remove icon install"
@@ -61,9 +50,11 @@ src_prepare() {
 }
 
 src_configure() {
-	use addressbook || mycmakeargs="${mycmakeargs} -DWITH_KdepimLibs=OFF"
-	use geolocation || mycmakeargs="${mycmakeargs} -DWITH_MarbleWidget=OFF"
-	#use lens || mycmakeargs="${mycmakeargs} -DWITH_LensFun=OFF"
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_enable gphoto2 GPHOTO2)
+		$(cmake-utils_use_with addressbook KdepimLibs)
+		$(cmake-utils_use_with geolocation MarbleWidget)"
+	# $(cmake-utils_use_with lens LensFun)
 
 	kde4-base_src_configure
 }
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index bed76dd97e3..e796c33f1a7 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -4,48 +4,42 @@
 
 EAPI="2"
 
-KDE_MINIMAL="4.1"
+KDE_MINIMAL="4.2"
+KMNAME="extragear/graphics"
 inherit kde4-base
 
 DESCRIPTION="A digital photo management application for KDE."
 HOMEPAGE="http://www.digikam.org/"
-ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/digikam"
 
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="live"
-IUSE="addressbook debug geolocation"
+IUSE="addressbook debug geolocation +gphoto2"
 
-# it have dynamic search for deps, so if they are in system it
-# uses them otherwise does not, so any iuse are useless
-# liblensfun when added should be also optional dep.
 DEPEND="
 	!kdeprefix? ( !media-gfx/digikam:0 )
 	dev-db/sqlite:3
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	>=kde-base/solid-${KDE_MINIMAL}
+	>=kde-base/libkdcraw-${KDE_MINIMAL}[kdeprefix=]
+	>=kde-base/libkexiv2-${KDE_MINIMAL}[kdeprefix=]
+	>=kde-base/libkipi-${KDE_MINIMAL}[kdeprefix=]
+	>=kde-base/solid-${KDE_MINIMAL}[kdeprefix=]
 	>=media-libs/jasper-1.701.0
 	media-libs/jpeg
 	>=media-libs/lcms-1.17
-	>=media-libs/libgphoto2-2.4.1-r1
 	>=media-libs/libpng-1.2.26-r1
 	>=media-libs/tiff-3.8.2-r3
 	sys-devel/gettext
 	x11-libs/qt-core[qt3support]
 	x11-libs/qt-sql[sqlite]
-	addressbook? (
-		>=kde-base/kdepimlibs-${KDE_MINIMAL}
-	)
-	geolocation? (
-		>=kde-base/marble-${KDE_MINIMAL}[kde]
-	)
+	addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL}[kdeprefix=] )
+	geolocation? ( >=kde-base/marble-${KDE_MINIMAL}[kde,kdeprefix=] )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.1-r1 )
 "
+#liblensfun when added should be also optional dep.
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	# fix files collision, use icon from kdebase-data rather that digikam ones
+	# Fix files collision, use icon from kdebase-data rather that digikam ones
 	sed -i \
 		-e "s:add_subdirectory:#add_subdirectory:g" \
 		data/icons/CMakeLists.txt || die "Failed to remove icon install"
@@ -54,9 +48,11 @@ src_prepare() {
 }
 
 src_configure() {
-	use addressbook || mycmakeargs="${mycmakeargs} -DWITH_KdepimLibs=OFF"
-	use geolocation || mycmakeargs="${mycmakeargs} -DWITH_MarbleWidget=OFF"
-	#use lens || mycmakeargs="${mycmakeargs} -DWITH_LensFun=OFF"
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_enable gphoto2 GPHOTO2)
+		$(cmake-utils_use_with addressbook KdepimLibs)
+		$(cmake-utils_use_with geolocation MarbleWidget)"
+	# $(cmake-utils_use_with lens LensFun)
 
 	kde4-base_src_configure
 }