Index: mjpegtools-1.8.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v
retrieving revision 1.19
diff -u -b -B -r1.19 mjpegtools-1.8.0-r1.ebuild
--- mjpegtools-1.8.0-r1.ebuild	6 Sep 2006 16:32:23 -0000	1.19
+++ mjpegtools-1.8.0-r1.ebuild	23 Oct 2006 15:53:33 -0000
@@ -12,7 +12,7 @@
 LICENSE="as-is"
 SLOT="1"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="gtk dv quicktime sdl X yv12 3dnow mmx sse v4l dga png"
+IUSE="gtk dv quicktime sdl X yv12 mmx v4l dga png"
 
 RDEPEND="media-libs/jpeg
 	x86? ( media-libs/libmovtar
@@ -32,10 +32,7 @@
 	)"
 
 DEPEND="${RDEPEND}
-	x86? ( mmx? ( dev-lang/nasm )
-		3dnow? ( dev-lang/nasm )
-		sse? ( dev-lang/nasm )
-		)
+	mmx? ( dev-lang/nasm )
 	>=sys-apps/sed-4"
 
 src_unpack() {
@@ -68,25 +65,9 @@
 	fi
 
 	# This could be changed to allow building on g/fbsd in the future.
-	if use x86; then
-		if use mmx || use 3dnow || use sse; then
-			myconf="${myconf} --enable-simd-accel"
-		fi
-		if use mmx; then
-			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
-		fi
-
-		if [[ ${CHOST/i686/} != ${CHOST} ]] || [[ ${CHOST/x86_64/} != ${CHOST} ]]; then
-			myconf="${myconf} --enable-cmov-extension"
-		fi
+	use mmx && myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
 
 		[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-	fi
-
-	if use amd64; then
-		myconf="${myconf} --enable-simd-accel"
-		myconf="${myconf} --enable-cmov-extension"
-	fi
 
 	append-flags -fno-strict-aliasing
 
@@ -99,6 +80,7 @@
 		$(use_with gtk) \
 		$(use_with sdl) \
 		$(use_with dv dv /usr) \
+		$(use_enable mmx simd-accel) \
 		--enable-largefile \
 		${myconf} || die "configure failed"