--- media-gfx/ufraw/ufraw-0.17.ebuild	2010-04-02 16:34:28.000000000 +0200
+++ media-gfx/ufraw/ufraw-0.17.ebuild	2010-04-03 11:06:02.460702668 +0200
@@ -12,26 +12,31 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="contrast fits gimp gnome gtk openmp timezone"
+IUSE="bzip2 contrast exif fits gimp gnome gtk jpeg lensfun openmp png tiff timezone zlib"
 
 RDEPEND="
-	>=media-gfx/exiv2-0.11
-	media-libs/jpeg
-	>=media-libs/lcms-1.13
-	>=media-libs/lensfun-0.2.5
-	media-libs/tiff
+	dev-libs/glib
+	>=media-libs/lcms-1.14
+	bzip2? ( app-arch/bzip2 )
+	exif? ( >=media-gfx/exiv2-0.16 )
 	fits? ( sci-libs/cfitsio )
-	gnome? ( gnome-base/gconf )
+	gnome? ( gnome-base/gconf >=x11-misc/shared-mime-info-0.21 )
 	gtk? ( >=x11-libs/gtk+-2.6:2
-		>=media-gfx/gtkimageview-1.5.0 )
+		>=media-gfx/gtkimageview-1.6.0 )
 	gimp? ( >=x11-libs/gtk+-2.6:2
-		>=media-gfx/gtkimageview-1.5.0
-		>=media-gfx/gimp-2.0 )"
+		>=media-gfx/gtkimageview-1.6.0
+		>=media-gfx/gimp-2.0 )
+	jpeg? ( media-libs/jpeg )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cfitsio-automagic.patch
+	epatch "${FILESDIR}"/${P}-no-automagics.patch
 	eautoreconf
 }
 
@@ -41,24 +46,34 @@
 
 	econf \
 		--without-cinepaint \
+		$(use_with bzip2) \
 		$(use_enable contrast) \
+		$(use_with exif exiv2) \
 		$(use_with fits cfitsio) \
 		$(use_with gimp) \
-		$(use_enable gnome mime) \
 		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with lensfun) \
+		$(use_enable gnome mime) \
 		$(use_enable openmp) \
+		$(use_with png libpng) \
+		$(use_with tiff) \
 		$(use_enable timezone dst-correction) \
+		$(use_with zlib) \
 		${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README TODO || die
+	emake DESTDIR="${D}" schemasdir="${EPREFIX}"/etc/gconf/schemas install \
+		|| die
+	dodoc MANIFEST README TODO || die
+	if use gnome; then
+		gnome2_gconf_savelist
+	fi
 }
 
 pkg_postinst() {
 	if use gnome; then
-		fdo-mime_mime_database_update
 		fdo-mime_desktop_database_update
 		gnome2_gconf_install
 	fi
@@ -66,7 +81,7 @@
 
 pkg_postrm() {
 	if use gnome; then
+		gnome2_gconf_uninstall
 		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
 	fi
 }