--- mjpegtools-1.6.2-r3.ebuild.orig	2004-11-14 14:05:56.000000000 +0100
+++ mjpegtools-1.6.2-r3.ebuild	2004-12-02 11:38:52.829442008 +0100
@@ -12,5 +12,5 @@
 SLOT="1"
 KEYWORDS="x86 ppc amd64 ~sparc"
-IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse"
+IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse v4l"
 
 DEPEND="media-libs/jpeg
@@ -37,8 +37,8 @@
 	epatch ${FILESDIR}/${P}-gcc34.patch
 	epatch ${FILESDIR}/${P}-gcc34-altivec.patch
-
-	# remove checks for gtk in configure in
-	use gtk || epatch ${FILESDIR}/${P}-nogtk.patch
-
+      
+	epatch ${FILESDIR}/${P}-config.patch
+	autoreconf
+	
 	if use ppc; then
 		# Fix an error in the detection of the altivec-support
@@ -73,7 +73,13 @@
 			myconf="${myconf} --with-dv-yv12"
 		fi
-	elif use yv12; then
-		ewarn "yv12 support is only possible when \"dv\" is in your USE flags."
+	else
+		myconf="${myconf} --without-dv"
+		if use yv12; then
+			ewarn "yv12 support is only possible when \"dv\" is in your USE flags."
+		fi
 	fi
+	
+	use v4l || myconf="${myconf} --without-v4l"
+	use gtk || myconf="${myconf} --without-gtk"
 
 	if use x86; then