Update digikam version since we added nev useflags. Thanks luke-jr.

3 files changed, 25 insertions, 6 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index e455d22888b..8b1625e7aac 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*digikam-0.10.0_beta2-r2 (06 Oct 2008)
+
+  06 Oct 2008; Tomáš Chvátal <tomas.chvatal@gmail.com>
+  -digikam-0.10.0_beta2-r1.ebuild, +digikam-0.10.0_beta2-r2.ebuild:
+  Update revision since we added new use flags.
+
   27 Sep 2008; Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com>
   ChangeLog:
   Move ebuild towards EAPI2 compilance
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 723d6386665..c0cbd75f419 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,4 +1,4 @@
 DIST digikam-0.10.0-beta2.tar.bz2 10304548 RMD160 a173ed5e1bc3cc61dc0b2d916659eef2dbb6556a SHA1 aaef5ffa365ef823df46f5f16b84d57e697ee95c SHA256 368b784fdc8658754bda05994c9599c50e639000877d57b7a892964a165e0fec
-EBUILD digikam-0.10.0_beta2-r1.ebuild 1598 RMD160 224dca360eb63cdd4aee5846daf0a4616f6d2942 SHA1 82895906722ac695dc4fe884e2049187a600f55e SHA256 c146012e7924f1b22a5fd8e76aa89ab716447ca30a818bde3a6e2aeb65b5e091
-MISC ChangeLog 909 RMD160 cee6fae3c9b54d2f83b8976d091b41ec3b466a3e SHA1 39476c6200872bf5d7a0ca9565fce7d24bebab7d SHA256 ca2b06fd0193a47bd39fa10b7716166f30ea36a6177d8ccf5d262ee92a605841
+EBUILD digikam-0.10.0_beta2-r2.ebuild 1959 RMD160 fbd15e3f3c6b866bfcc2c21f0f6126af1668a951 SHA1 e9bda8e898832320881a138d68f98327ba233cc3 SHA256 c6d2b5c41a5b15acf685c2ffb59cb822e97648e61e9c73aba25d2de3aee0edf3
+MISC ChangeLog 1124 RMD160 25075383a18a202c5261ffe7da30a0d757766815 SHA1 e9bf0c7aa9ba5fe1988c9cb85d4a7568fdeaa893 SHA256 dcdf2372c8623b6900b52fb3b011b491aa59a2e6982d3805108da63a3c708943
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-gfx/digikam/digikam-0.10.0_beta2-r1.ebuild b/media-gfx/digikam/digikam-0.10.0_beta2-r2.ebuild
index 55f2ec90dad..15dacbb156e 100644
--- a/media-gfx/digikam/digikam-0.10.0_beta2-r1.ebuild
+++ b/media-gfx/digikam/digikam-0.10.0_beta2-r2.ebuild
@@ -17,11 +17,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
 LICENSE="GPL-2"
 RDEPEND="${DEPEND}"
 SLOT="4.1"
-IUSE="debug"
+IUSE="addressbook debug geolocation"
 
 S="${WORKDIR}/${P/_/-}"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 # it have dynamic search for deps, so if they are in system it
 # uses them otherwise does not, so any iuse are useless
@@ -31,7 +31,12 @@ DEPEND="
 	kde-base/libkdcraw:${SLOT}
 	kde-base/libkexiv2:${SLOT}
 	kde-base/libkipi:${SLOT}
-	kde-base/marble:${SLOT}[kde]
+	geolocation? (
+		kde-base/marble:${SLOT}[kde]
+	)
+	addressbook? (
+		kde-base/kdepimlibs:${SLOT}
+	)
 	kde-base/solid:${SLOT}
 	!kdeprefix? ( !media-gfx/digikam:0 )
 	>=media-libs/jasper-1.701.0
@@ -43,7 +48,7 @@ DEPEND="
 	sys-devel/gettext
 	x11-libs/qt-core[qt3support]
 	x11-libs/qt-sql[sqlite]"
-#liblensfun when added should be also dep.
+#liblensfun when added should be also optional dep.
 RDEPEND="${DEPEND}"
 
 # we want to install into kdedir so we can keep kde3 and kde4 version along
@@ -60,3 +65,11 @@ src_unpack() {
 		data/icons/CMakeLists.txt || die "Failed to remove icon install"
 	enable_selected_linguas
 }
+
+src_configure() {
+	use addressbook || mycmakeargs="${mycmakeargs} -DWITH_KdepimLibs=OFF"
+	use geolocation || mycmakeargs="${mycmakeargs} -DWITH_MarbleWidget=OFF"
+	#use lens || mycmakeargs="${mycmakeargs} -DWITH_LensFun=OFF"
+	
+	kde4-base_src_configure
+}