1 files changed, 32 insertions, 16 deletions

diff --git a/media-libs/gegl/gegl-0.0.20.ebuild b/media-libs/gegl/gegl-0.0.20.ebuild
index a6fee4770f22..90113bae31e0 100644
--- a/media-libs/gegl/gegl-0.0.20.ebuild
+++ b/media-libs/gegl/gegl-0.0.20.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.0.20.ebuild,v 1.6 2008/10/09 21:10:36 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.0.20.ebuild,v 1.7 2008/10/13 10:35:44 hanno Exp $
+
+WANT_AUTOCONF=latest
 
 inherit eutils autotools
 
@@ -12,50 +14,64 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="cairo debug doc ffmpeg gtk jpeg mmx openexr sdl sse svg"
+IUSE="cairo debug doc ffmpeg jpeg mmx openexr png raw sdl sse svg v4l"
 
 DEPEND=">=media-libs/babl-0.0.20
 	>=dev-libs/glib-2.18.0
 	media-libs/libpng
+	>=x11-libs/gtk+-2.14.0
+	x11-libs/pango
 	cairo? ( x11-libs/cairo )
 	doc? ( app-text/asciidoc
+		dev-lang/ruby
 		>=dev-lang/lua-5.1.0
 		app-text/enscript
 		media-gfx/graphviz )
 	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
-	gtk? ( >=x11-libs/gtk+-2.14.0
-		x11-libs/pango )
 	jpeg? ( media-libs/jpeg )
 	openexr? ( media-libs/openexr )
+	raw? ( >=media-libs/libopenraw-0.0.5 )
 	sdl? ( media-libs/libsdl )
 	svg? ( >=gnome-base/librsvg-2.14.0 )"
 
+pkg_setup() {
+	if ! built_with_use 'media-gfx/imagemagick' 'png'; then
+		eerror "You must build imagemagick with png support"
+		die "media-gfx/imagemagick built without png"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/gegl-18-configure-ac.patch" || die
+	epatch "${FILESDIR}/gegl-20-configure-ac.patch" || die
 	epatch "${FILESDIR}/gegl-0.0.18-newffmpeg.diff" || die
 
 	eautoreconf
 }
 
 src_compile() {
-	econf $(use_enable debug) \
-		$(use_enable cairo) \
-		$(use_enable doc) \
-		$(use_enable doc asciidoc) \
-		$(use_enable doc enscript) \
-		$(use_enable doc graphviz) \
+	econf --enable-gtk --enable-pango --enable-gdkpixbuf \
+		$(use_enable debug) \
+		$(use_with cairo) \
+		$(use_with v4l) \
+		$(use_enable doc docs) \
+		$(use_with doc asciidoc) \
+		$(use_with doc enscript) \
+		$(use_with doc graphviz) \
+		$(use_with doc lua) \
+		$(use_with doc ruby) \
 		$(use_enable doc workshop) \
 		$(use_with ffmpeg libavcodec) \
-		$(use_enable gtk) \
-		$(use_enable gtk pango) \
+		$(use_with ffmpeg libavformat) \
 		$(use_with jpeg libjpeg) \
 		$(use_enable mmx) \
-		$(use_enable openexr) \
-		$(use_enable sdl) \
+		$(use_with openexr) \
+		$(use_with png libpng) \
+		$(use_with raw libopenraw) \
+		$(use_with sdl libsdl) \
+		$(use_with svg librsvg) \
 		$(use_enable sse) \
-		$(use_enable svg) \
 		|| die "econf failed"
 	env GEGL_SWAP="${WORKDIR}" emake || die "emake failed"
 }