Fixing bug #42414 and metadata.xml

16 files changed, 127 insertions, 491 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 9dcdc0454c15..08f5fb69608e 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.62 2004/05/12 13:46:27 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.63 2004/05/17 09:27:13 phosphan Exp $
+
+*mjpegtools-1.6.2-r2 (17 May 2004)
+
+  17 May 2004; Patrick Kursawe <phosphan@gentoo.org> metadata.xml,
+  mjpegtools-1.6.2-r2.ebuild,
+  Adding optional yv12 support and changing CFLAGS handling as suggested in bug
+  #42414
+  Corrected metadata syntax.
+
+  17 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mjpegtools-1.6.1.90-r1.ebuild, mjpegtools-1.6.1.91.ebuild,
+  mjpegtools-1.6.1.92.ebuild, mjpegtools-1.6.1.93.ebuild,
+  mjpegtools-1.6.1.ebuild, mjpegtools-1.6.2.ebuild:
+  Big cleanup.
 
   12 May 2004; Alexander Gabert <pappy@gentoo.org> mjpegtools-1.6.2-r1.ebuild:
   added new hardened PIE SSP switches
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index afcd91742bcd..753dbf2e9b12 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,29 +1,19 @@
-MD5 f546b4490fcb90f9a88a87f28d1ce3ec ChangeLog 11304
-MD5 5e540d7e76784978e6cb78d4950e2481 metadata.xml 284
+MD5 d23c39a0cd29b2a3cac1619c16f890b4 mjpegtools-1.6.2-r2.ebuild 2702
+MD5 a84f472af6ad5c9fea47f681b27c041b mjpegtools-1.6.2-r1.ebuild 2553
 MD5 41f7f2da5ee7f66ef90bc15f55ddf645 mjpegtools-1.6.0-r7.ebuild 2866
-MD5 b50619b6352ff8048a260ca3217657d4 mjpegtools-1.6.1.90-r1.ebuild 1639
+MD5 4696f0d9b2ba560edd53ceb3c1f1d698 ChangeLog 11544
+MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
 MD5 5c330cce16f254e14f0e972c878f0cd4 mjpegtools-1.6.1.90-r2.ebuild 1953
-MD5 7a1493622c0c5c9310de06dc62412c25 mjpegtools-1.6.1.91.ebuild 1691
-MD5 778cbf9de15a4dd12e56812f4c011bd3 mjpegtools-1.6.1.92.ebuild 1881
-MD5 6bb0c6705344138a2c809a3559331827 mjpegtools-1.6.1.93.ebuild 1891
-MD5 ec08659600465af5dba80dec81f38d15 mjpegtools-1.6.1.ebuild 2416
-MD5 a84f472af6ad5c9fea47f681b27c041b mjpegtools-1.6.2-r1.ebuild 2553
-MD5 30014fe32441f90cde4a4acead36cc67 mjpegtools-1.6.2.ebuild 1881
-MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
-MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
-MD5 4a594198579130cfe453fffb532b2aef files/digest-mjpegtools-1.6.1 147
-MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r1 72
+MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.2-fPIC.patch 555
 MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r2 72
-MD5 acf58bbe360d5fdd1242419be02ef981 files/digest-mjpegtools-1.6.1.91 72
-MD5 787b556d11610020108eae81c18d66a9 files/digest-mjpegtools-1.6.1.92 72
-MD5 f27165f55fa5a3a8f582b362a1331074 files/digest-mjpegtools-1.6.1.93 72
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2 69
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r1 69
 MD5 0d5f90e8ac4023e403bf79d2e14314cb files/mjpegtools-1.6.0-gcc3.patch 5086
+MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.91-fPIC.patch 555
+MD5 d67f97f3bd586946968fca9b8d31be85 files/mjpegtools-1.6.2-gcc34.patch 1601
 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.92-fPIC.patch 555
+MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
+MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r1 69
+MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r2 69
 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.93-fPIC.patch 555
-MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.2-fPIC.patch 555
-MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
 MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497
-MD5 d67f97f3bd586946968fca9b8d31be85 files/mjpegtools-1.6.2-gcc34.patch 1601
+MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1
deleted file mode 100644
index ab977c64929d..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fa2aeec19deafe86d22b34eda329f9f4 mjpegtools-1.6.1.tar.gz 976241
-MD5 963b168854e8f74590c71aaaaedf5177 quicktime4linux-1.4-patched.tar.gz 560533
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r1 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r1
deleted file mode 100644
index 5f401da864e9..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a903c49ee5902710b8e44bd6c0f4b38e mjpegtools-1.6.1.90.tar.gz 1168921
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.91 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.91
deleted file mode 100644
index 379e7986d66e..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.91
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ac439100233d16f8b1417aa2097c573 mjpegtools-1.6.1.91.tar.gz 1227454
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.92 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.92
deleted file mode 100644
index 7fb7eafd766a..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.92
+++ /dev/null
@@ -1 +0,0 @@
-MD5 254aaadf56b0a6ee428bd937024801a2 mjpegtools-1.6.1.92.tar.gz 1227370
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.93 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.93
deleted file mode 100644
index 2b3d7f4b6c35..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.93
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ffe048ef26d91b412c1639d9bd17b40a mjpegtools-1.6.1.93.tar.gz 1253561
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.2 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r2
index f61243bfc284..f61243bfc284 100644
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.2
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r2
diff --git a/media-video/mjpegtools/metadata.xml b/media-video/mjpegtools/metadata.xml
index f026b702cf25..ed3689728c35 100644
--- a/media-video/mjpegtools/metadata.xml
+++ b/media-video/mjpegtools/metadata.xml
@@ -5,6 +5,8 @@
 <herd>media-tv</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
+</maintainer>
+<maintainer>
   <email>media-tv@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild
deleted file mode 100644
index 6f1c2b3ba0b2..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild,v 1.11 2004/05/12 12:40:14 pappy Exp $
-
-inherit flag-o-matic gcc eutils
-
-DESCRIPTION="Tools for MJPEG video."
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="x86 -ppc ~sparc"
-IUSE="gtk avi dv quicktime sdl X 3dnow mmx sse"
-
-DEPEND="media-libs/jpeg
-	>=sys-apps/sed-4
-	=dev-libs/glib-1.2*
-	x86? ( media-libs/libmovtar
-	       sse? ( dev-lang/nasm )
-	       mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 dev-lang/nasm )
-	       3dnow? ( dev-lang/nasm ) )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	avi? ( >=media-video/avifile-0.7.38 )
-	dv? ( >=media-libs/libdv-0.99 )
-	quicktime? ( virtual/quicktime )
-	sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}/no-x11-lib.patch"
-}
-
-src_compile() {
-	local myconf
-
-	filter-flags -fPIC
-
-	[ `use x86` ] && [ `gcc-major-version` -eq 3 ] && append-flags -mno-sse2
-
-	myconf="${myconf} `use_with X x`"
-	myconf="${myconf} `use_with quicktime`"
-	myconf="${myconf} `use_enable x86 cmov-extensions`"
-
-	if [ "`use dv`" ] ; then
-		myconf="${myconf} --with-dv=/usr"
-	fi
-	if [ "`use mmx`" -o "`use 3dnow`" -o "`use sse`" ] ; then
-		myconf="${myconf} --enable-simd-accel"
-	fi
-	if [ "`use mmx`" ] ; then
-		myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
-	fi
-
-	econf ${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	einstall
-	dodoc mjpeg_howto.txt
-}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.91.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.91.ebuild
deleted file mode 100644
index d2c0a2b99f61..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.1.91.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.91.ebuild,v 1.9 2004/05/12 12:40:14 pappy Exp $
-
-inherit flag-o-matic gcc eutils
-
-DESCRIPTION="Tools for MJPEG video."
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="~x86 -ppc"
-IUSE="gtk avi dv quicktime sdl X 3dnow mmx sse"
-
-DEPEND="media-libs/jpeg
-	>=sys-apps/sed-4
-	=dev-libs/glib-1.2*
-	x86? ( media-libs/libmovtar
-		mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 dev-lang/nasm )
-		3dnow? ( dev-lang/nasm )
-		sse? ( dev-lang/nasm )
-	)
-	gtk? ( =x11-libs/gtk+-1.2* )
-	avi? ( >=media-video/avifile-0.7.38 )
-	dv? ( >=media-libs/libdv-0.99 )
-	quicktime? ( virtual/quicktime )
-	sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-fPIC.patch
-#	epatch "${FILESDIR}/no-x11-lib.patch"
-}
-
-src_compile() {
-	local myconf
-
-	filter-flags -fPIC
-
-	[ `gcc-major-version` -eq 3 ] && append-flags -mno-sse2
-
-	myconf="${myconf} `use_with X x`"
-	myconf="${myconf} `use_with quicktime`"
-	myconf="${myconf} `use_enable x86 cmov-extensions`"
-
-	if [ "`use dv`" ] ; then
-		myconf="${myconf} --with-dv=/usr"
-	fi
-
-	if [ "`use x86`" ]; then
-		if [ "`use mmx`" -o "`use 3dnow`" -o "`use sse`" ] ; then
-			myconf="${myconf} --enable-simd-accel"
-		fi
-		if [ "`use mmx`" ] ; then
-			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
-		fi
-	fi
-
-	econf ${myconf} || die "econf failed"
-
-	emake -j1 || die "compile problem"
-}
-
-src_install() {
-	einstall
-	dodoc mjpeg_howto.txt
-}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild
deleted file mode 100644
index 2f980e4a2aef..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild,v 1.6 2004/05/12 12:40:14 pappy Exp $
-
-inherit flag-o-matic gcc eutils
-
-DESCRIPTION="Tools for MJPEG video."
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="~x86 -ppc"
-IUSE="gtk avi dv quicktime sdl X 3dnow mmx sse"
-
-DEPEND="media-libs/jpeg
-	>=sys-apps/sed-4
-	=dev-libs/glib-1.2*
-	x86? ( media-libs/libmovtar
-		mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 dev-lang/nasm )
-		3dnow? ( dev-lang/nasm )
-		sse? ( dev-lang/nasm )
-	)
-	gtk? ( =x11-libs/gtk+-1.2* )
-	avi? ( >=media-video/avifile-0.7.38 )
-	dv? ( >=media-libs/libdv-0.99 )
-	quicktime? ( virtual/quicktime )
-	sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	# This breaks compilation on x86 architecture
-	# See bug #36502, comment 8
-	[ "$ARCH" != x86 ] && epatch ${FILESDIR}/${P}-fPIC.patch
-
-#	epatch "${FILESDIR}/no-x11-lib.patch"
-}
-
-src_compile() {
-	local myconf
-
-	filter-flags -fPIC
-
-	[ `gcc-major-version` -eq 3 ] && append-flags -mno-sse2
-
-	myconf="${myconf} `use_with X x`"
-	myconf="${myconf} `use_with quicktime`"
-	myconf="${myconf} `use_enable x86 cmov-extensions`"
-
-	# Fix for Via C3-1, see #30345
-	grep -q cmov /proc/cpuinfo || "${myconf} --disable-cmov"
-
-	if [ "`use dv`" ] ; then
-		myconf="${myconf} --with-dv=/usr"
-	fi
-
-	if [ "`use x86`" ]; then
-		if [ "`use mmx`" -o "`use 3dnow`" -o "`use sse`" ] ; then
-			myconf="${myconf} --enable-simd-accel"
-		fi
-		if [ "`use mmx`" ] ; then
-			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
-		fi
-	fi
-
-	econf ${myconf} || die "econf failed"
-
-	emake -j1 || die "compile problem"
-}
-
-src_install() {
-	einstall
-	dodoc mjpeg_howto.txt
-}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild
deleted file mode 100644
index 49795a0a43a5..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.93.ebuild,v 1.6 2004/05/12 12:40:14 pappy Exp $
-
-inherit flag-o-matic gcc eutils
-
-DESCRIPTION="Tools for MJPEG video."
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="~x86 -ppc"
-IUSE="gtk avi dv quicktime sdl X 3dnow mmx sse"
-
-DEPEND="media-libs/jpeg
-	>=sys-apps/sed-4
-	=dev-libs/glib-1.2*
-	x86? ( media-libs/libmovtar
-		mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 dev-lang/nasm )
-		3dnow? ( dev-lang/nasm )
-		sse? ( dev-lang/nasm )
-	)
-	gtk? ( =x11-libs/gtk+-1.2* )
-	avi? ( >=media-video/avifile-0.7.38 )
-	dv? ( >=media-libs/libdv-0.99 )
-	quicktime? ( virtual/quicktime )
-	sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	# This breaks compilation on x86 architecture
-	# See bug #36502, comment 8
-	[ "$ARCH" != x86 ] && epatch ${FILESDIR}/${P}-fPIC.patch
-
-	use X || epatch "${FILESDIR}/no-x11-lib-2.patch"
-}
-
-src_compile() {
-	local myconf
-
-	filter-flags -fPIC
-
-	[ `gcc-major-version` -eq 3 ] && append-flags -mno-sse2
-
-	myconf="${myconf} `use_with X x`"
-	myconf="${myconf} `use_with quicktime`"
-	myconf="${myconf} `use_enable x86 cmov-extensions`"
-
-	# Fix for Via C3-1, see #30345
-	grep -q cmov /proc/cpuinfo || "${myconf} --disable-cmov"
-
-	if [ "`use dv`" ] ; then
-		myconf="${myconf} --with-dv=/usr"
-	fi
-
-	if [ "`use x86`" ]; then
-		if [ "`use mmx`" -o "`use 3dnow`" -o "`use sse`" ] ; then
-			myconf="${myconf} --enable-simd-accel"
-		fi
-		if [ "`use mmx`" ] ; then
-			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
-		fi
-	fi
-
-	econf ${myconf} || die "econf failed"
-
-	emake -j1 || die "compile problem"
-}
-
-src_install() {
-	einstall
-	dodoc mjpeg_howto.txt
-}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.ebuild
deleted file mode 100644
index c64d244f73cb..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.ebuild,v 1.12 2004/03/30 04:44:11 spyderous Exp $
-
-inherit gcc libtool flag-o-matic base
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz
-	 quicktime? ( mirror://sourceforge/mjpeg/quicktime4linux-1.4-patched.tar.gz )"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="x86 -ppc"
-IUSE="sse arts gtk mmx sdl X quicktime 3dnow avi"
-
-RDEPEND="media-libs/jpeg
-	media-libs/libpng
-	gtk? ( =x11-libs/gtk+-1.2* )
-	X? ( virtual/x11 )
-	sdl? ( media-libs/libsdl )
-	media-libs/libdv
-	arts? ( kde-base/arts )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.5
-	x86? ( media-libs/libmovtar )
-	avi? ( <media-video/avifile-0.7.38 )
-	quicktime? ( virtual/quicktime )
-	mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 )
-	mmx? ( dev-lang/nasm )
-	3dnow? ( dev-lang/nasm )
-	sse? ( dev-lang/nasm )
-	media-libs/libdv
-	arts? ( kde-base/arts )"
-
-src_unpack() {
-	base_src_unpack
-
-	if [ ! -z "`use quicktime`" ]
-	then
-		cd ${WORKDIR}/quicktime4linux-1.4-patch
-		sed -i "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h
-		sed -i "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h
-
-		if [ "`gcc-major-version`" -eq "3" ] ; then
-		# Don't remove this!!!
-		# Contact phoen][x <phoenix@gentoo.org> if you have problems with it.
-		cd ${S}/lavtools
-		sed -i "s/dv_decoder_new(0,0,0)\;/dv_decoder_new()\;/" lav_common.c
-		sed -i "s/dv_decoder_new(0,0,0)\;/dv_decoder_new()\;/" lav_io.c
-		fi
-	fi
-}
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-
-	replace-flags "-march=pentium4" "-march=i686"
-	replace-flags "-march=athlon*" "-march=i686"
-	filter-flags "-mfpmath=sse"
-
-	use gtk	\
-		&& myconf="${myconf} --with-gtk-prefix=/usr"
-
-	use X	\
-		&& myconf="${myconf} --with-x"	\
-		|| myconf="${myconf} --without-x"
-
-	use mmx	\
-		&& myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx --enable-mmx-accel"
-
-	use avi	\
-		|| myconf="${myconf} --without-aviplay"
-
-	if [ ! -z "`use quicktime`" ]
-	then
-		einfo "Building quicktime4linux"
-		myconf="${myconf} --with-quicktime=${WORKDIR}/quicktime4linux-1.4-patch"
-
-		cd ${WORKDIR}/quicktime4linux-1.4-patch
-		./configure || die
-		make || die
-		cd ${S}
-	fi
-
-	einfo "Building mjpegtools"
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-
-	einstall || die
-
-	dodoc mjpeg_howto.txt
-}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild
new file mode 100644
index 000000000000..c4bb4ad311ba
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild,v 1.1 2004/05/17 09:27:13 phosphan Exp $
+
+inherit flag-o-matic gcc eutils
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="1"
+KEYWORDS="~x86"
+IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse"
+
+DEPEND="media-libs/jpeg
+	>=sys-apps/sed-4
+	x86? ( media-libs/libmovtar
+		mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1
+				dev-lang/nasm )
+		3dnow? ( dev-lang/nasm )
+		sse? ( dev-lang/nasm )
+	)
+	gtk? ( =x11-libs/gtk+-1.2*
+			=dev-libs/glib-1.2* )
+	avi? ( >=media-video/avifile-0.7.38 )
+	dv? ( >=media-libs/libdv-0.99 )
+	quicktime? ( virtual/quicktime )
+	sdl? ( media-libs/libsdl )
+	X? ( virtual/x11 )"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	# This breaks compilation on x86 architecture
+	# See bug #36502, comment 8
+	[ "$ARCH" != x86 ] && epatch ${FILESDIR}/${P}-fPIC.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
+
+	use X || epatch "${FILESDIR}/no-x11-lib-2.patch"
+}
+
+src_compile() {
+	local myconf
+
+	[ `gcc-major-version` -eq 3 ] && [ "${ARCH}" == "x86" ] && append-flags -mno-sse2
+
+	myconf="${myconf} `use_with X x`"
+	myconf="${myconf} `use_with quicktime`"
+	myconf="${myconf} `use_enable x86 cmov-extensions`"
+
+	# Fix for Via C3-1, see #30345
+	grep -q cmov /proc/cpuinfo || myconf="${myconf} --enable-cmov-extension=no"
+
+	if use dv; then
+		myconf="${myconf} --with-dv=/usr"
+		if use yv12; then
+			myconf="${myconf} --with-dv-yv12"
+		fi
+	elif use yv12; then
+		ewarn "yv12 support is only possible when \"dv\" is in your USE flags."
+	fi
+
+	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
+	fi
+
+	econf ${myconf} || die
+
+	if has_pie ; then
+		pie_magic="`test_flag -fno-pic` `test_flag -nopie`"
+		for i in `find "${S}" -name "Makefile"` ; do
+			sed -e "s:CC = gcc:CC = gcc ${pie_magic}:g" \
+				-e "s:CXX = gcc:CXX = g++ ${pie_magic}:g" \
+				-e "s:CXXCPP = gcc -E:CXX = g++ -E ${pie_magic}:g" \
+				-i "${i}" || die "sed failed"
+		done
+	fi
+
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -j1 || die "compile problem"
+	cd docs
+	local infofile
+	for infofile in mjpeg*info*; do
+		echo "INFO-DIR-SECTION Miscellaneous" >> ${infofile}
+		echo "START-INFO-DIR-ENTRY" >> ${infofile}
+		echo "* mjpeg-howto: (mjpeg-howto).                  How to use the mjpeg-tools" >> ${infofile}
+		echo "END-INFO-DIR-ENTRY" >> ${infofile}
+	done
+}
+
+src_install() {
+	einstall || die "install failed"
+	dodoc mjpeg_howto.txt
+}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2.ebuild
deleted file mode 100644
index 434ce443242d..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2.ebuild,v 1.6 2004/05/12 12:40:14 pappy Exp $
-
-inherit flag-o-matic gcc eutils
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="~x86 ~ppc amd64"
-IUSE="gtk avi dv quicktime sdl X 3dnow mmx sse"
-
-DEPEND="media-libs/jpeg
-	>=sys-apps/sed-4
-	=dev-libs/glib-1.2*
-	x86? ( media-libs/libmovtar
-		mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 dev-lang/nasm )
-		3dnow? ( dev-lang/nasm )
-		sse? ( dev-lang/nasm )
-	)
-	gtk? ( =x11-libs/gtk+-1.2* )
-	avi? ( >=media-video/avifile-0.7.38 )
-	dv? ( >=media-libs/libdv-0.99 )
-	quicktime? ( virtual/quicktime )
-	sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	# This breaks compilation on x86 architecture
-	# See bug #36502, comment 8
-	[ "$ARCH" != x86 ] && epatch ${FILESDIR}/${P}-fPIC.patch
-
-#	epatch "${FILESDIR}/no-x11-lib.patch"
-}
-
-src_compile() {
-	local myconf
-
-	filter-flags -fPIC
-
-	[ `gcc-major-version` -eq 3 ] && [ "${ARCH}" == "x86" ] && append-flags -mno-sse2
-
-	myconf="${myconf} `use_with X x`"
-	myconf="${myconf} `use_with quicktime`"
-	myconf="${myconf} `use_enable x86 cmov-extensions`"
-
-	# Fix for Via C3-1, see #30345
-	grep -q cmov /proc/cpuinfo || myconf="${myconf} --disable-cmov"
-
-	if [ "`use dv`" ] ; then
-		myconf="${myconf} --with-dv=/usr"
-	fi
-
-	if [ "`use x86`" ]; then
-		if [ "`use mmx`" -o "`use 3dnow`" -o "`use sse`" ] ; then
-			myconf="${myconf} --enable-simd-accel"
-		fi
-		if [ "`use mmx`" ] ; then
-			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
-		fi
-	fi
-
-	econf ${myconf} || die
-
-	emake -j1 || die "compile problem"
-}
-
-src_install() {
-	einstall
-	dodoc mjpeg_howto.txt
-}