--- kphotoalbum-4.5.ebuild
+++ kphotoalbum-4.6.1.ebuild
@@ -16,20 +16,28 @@
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug +exif +geolocation +kipi +raw"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +exif +face +geolocation +kipi +map +raw"
 
-DEPEND="
+REQUIRED_USE="map? ( exif )"
+
+COMMON_DEPEND="
 	>=dev-qt/qtsql-4.4:4[sqlite]
 	media-libs/phonon[qt4]
 	virtual/jpeg:0
 	exif? ( >=media-gfx/exiv2-0.17 )
+	face? ( >=media-libs/libkface-4.7.0 )
 	geolocation? ( $(add_kdebase_dep marble) )
 	kipi? ( $(add_kdebase_dep libkipi '' 4.9.58) )
+	map? ( >=media-libs/libkgeomap-4.7.0 )
 	raw? ( $(add_kdebase_dep libkdcraw '' 4.9.58) )
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
 	|| ( media-video/mplayer2 media-video/mplayer )
+	kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
 "
 
 DOCS=( ChangeLog README )
@@ -37,8 +45,10 @@
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with face Kface)
 		$(cmake-utils_use_with geolocation Marble)
 		$(cmake-utils_use_with kipi)
+		$(cmake-utils_use_with map KGeoMap)
 		$(cmake-utils_use_with raw Kdcraw)
 	)