Removilg older versions. Fixing avifile dependency to accept newer versions as it does compile with them.

(Portage version: 2.0.51.19)

14 files changed, 13 insertions, 442 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 7b6100e08c41..fdc97cfdbe13 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.82 2005/03/15 20:03:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.83 2005/03/26 20:21:01 eradicator Exp $
+
+  26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/1.6.0-r7-ppc.patch, -files/mjpegtools-1.6.0-gcc3.patch,
+  -files/mjpegtools-1.6.1.91-fPIC.patch,
+  -files/mjpegtools-1.6.1.92-fPIC.patch,
+  -files/mjpegtools-1.6.1.93-fPIC.patch, -files/no-x11-lib.patch,
+  -mjpegtools-1.6.0-r7.ebuild, -mjpegtools-1.6.1.90-r2.ebuild,
+  -mjpegtools-1.6.2-r1.ebuild, mjpegtools-1.6.2-r3.ebuild:
+  Removilg older versions. Fixing avifile dependency to accept newer versions
+  as it does compile with them.
 
   15 Mar 2005; Luca Barbato <lu_zero@gentoo.org> mjpegtools-1.6.2-r3.ebuild:
   yet another workaround for gcc
diff --git a/media-video/mjpegtools/files/1.6.0-r7-ppc.patch b/media-video/mjpegtools/files/1.6.0-r7-ppc.patch
deleted file mode 100644
index 3eeaec04552c..000000000000
--- a/media-video/mjpegtools/files/1.6.0-r7-ppc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur mjpegtools-1.6.0.orig/yuvdenoise/main.c mjpegtools-1.6.0/yuvdenoise/main.c
---- mjpegtools-1.6.0.orig/yuvdenoise/main.c	2002-05-06 10:13:00.000000000 +0200
-+++ mjpegtools-1.6.0/yuvdenoise/main.c	2003-02-10 16:39:25.000000000 +0100
-@@ -294,8 +294,7 @@
- void
- process_commandline(int argc, char *argv[])
- {
--  char c;
--  int i1,i2,i3,i4;
-+  int c,i1,i2,i3,i4;
- 
-   while ((c = getopt (argc, argv, "h?t:b:r:l:S:L:C:p:Ff")) != -1)
-   {
-
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r7 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r7
deleted file mode 100644
index e262f9879cee..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cb34077cc3460494bc3759e3655e5263 mjpegtools-1.6.0.tar.gz 928991
-MD5 963b168854e8f74590c71aaaaedf5177 quicktime4linux-1.4-patched.tar.gz 560533
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r2 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r2
deleted file mode 100644
index 5f401da864e9..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r2
+++ /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.2-r1 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r1
deleted file mode 100644
index f61243bfc284..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01c0120b0182de67f182ef99ad855daa mjpegtools-1.6.2.tar.gz 1256280
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.0-gcc3.patch b/media-video/mjpegtools/files/mjpegtools-1.6.0-gcc3.patch
deleted file mode 100644
index 3b614554e87a..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.6.0-gcc3.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -uNr mjpegtools-1.6.0/mplex/multplex.cc mjpegtools-1.6.0-gcc33/mplex/multplex.cc
---- mjpegtools-1.6.0/mplex/multplex.cc	2002-04-29 12:30:56.000000000 -0400
-+++ mjpegtools-1.6.0-gcc33/mplex/multplex.cc	2003-07-25 01:51:57.228994776 -0400
-@@ -2,6 +2,7 @@
- #include <config.h>
- #include <math.h>
- #include <stdlib.h>
-+#include <assert.h>
- #include <unistd.h>
- 
- #include <mjpeg_types.h>
-diff -uNr mjpegtools-1.6.0/mplex/stillsstream.cc mjpegtools-1.6.0-gcc33/mplex/stillsstream.cc
---- mjpegtools-1.6.0/mplex/stillsstream.cc	2002-04-19 11:14:17.000000000 -0400
-+++ mjpegtools-1.6.0-gcc33/mplex/stillsstream.cc	2003-07-25 01:52:12.769632240 -0400
-@@ -22,6 +22,7 @@
- 
- 
- #include <format_codes.h>
-+#include <assert.h>
- 
- #include "stillsstream.hh"
- #include "interact.hh"
-diff -uNr mjpegtools-1.6.0/mplex/systems.cc mjpegtools-1.6.0-gcc33/mplex/systems.cc
---- mjpegtools-1.6.0/mplex/systems.cc	2003-07-25 01:51:14.205535336 -0400
-+++ mjpegtools-1.6.0-gcc33/mplex/systems.cc	2003-07-25 01:51:44.020002848 -0400
-@@ -1,6 +1,7 @@
- #include <config.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <assert.h>
- #include <string.h>
- #include <sys/param.h>
- #include <sys/stat.h>
-Files mjpegtools-1.6.0/yuvdenoise/.motion.c.swp and mjpegtools-1.6.0-gcc33/yuvdenoise/.motion.c.swp differ
-diff -uNr mjpegtools-1.6.0/yuvdenoise/motion.c mjpegtools-1.6.0-gcc33/yuvdenoise/motion.c
---- mjpegtools-1.6.0/yuvdenoise/motion.c	2002-05-06 04:13:37.000000000 -0400
-+++ mjpegtools-1.6.0-gcc33/yuvdenoise/motion.c	2003-07-25 01:52:38.339744992 -0400
-@@ -251,6 +251,9 @@
-     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-     " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
-     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
-+	" shrl         $1    , %%ecx;          /* shift width to scale it in the asm.                */\n"
-+	"                                      /* why? we need an lvalue as input... gcc33...        */\n"
-+	"                                      /* (carrbc1@wfu.edu)                                  */\n"
-     "                                      /*                                                    */\n"
-     ".rept 4                    ;          /* Loop for 4 lines                                   */\n"
-     " movd        (%%eax), %%mm1;          /* 4 Pixels from filtered frame to mm1                */\n"
-@@ -270,7 +273,7 @@
-     "                                      /*                                                    */\n"
-     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
-     :"=m" (a)     
--    :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
-+    :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
-     :"%eax", "%ebx", "%ecx"
-     );
- #endif
-@@ -295,7 +298,10 @@
-     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-     " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
-     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
--    "                           ;          /*                                                    */\n"
-+	" shrl         $1    , %%ecx;          /* shift width to scale it in the asm.                */\n"
-+	"                                      /* why? we need an lvalue as input... gcc33...        */\n"
-+	"                                      /* (carrbc1@wfu.edu)                                  */\n"
-+    "                                      /*                                                    */\n"
-     " .rept 4                   ;          /*                                                    */\n"
-     " movd        (%%eax), %%mm1;          /* 4 Pixels from filtered frame to mm1                */\n"
-     " movd        (%%ebx), %%mm2;          /* 4 Pixels from filtered frame to mm2                */\n"
-@@ -307,7 +313,7 @@
-     "                                      /*                                                    */\n"
-     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
-     :"=m" (a)     
--    :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
-+    :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
-     :"%eax", "%ebx", "%ecx"
-     );
- #endif
-@@ -349,6 +355,7 @@
-   static uint32_t a;
- #ifdef HAVE_ASM_MMX
-   static uint32_t bit_mask[2] = {0x7f7f7f7f,0x7f7f7f7f};
-+  static uint32_t* bit_mask_addr = bit_mask;
- 
-   __asm__ __volatile__
-       (
-@@ -380,7 +387,7 @@
- 	  "                                      /*                                                    */"
- 	  " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */"
- 	  :"=m" (a)     
--	  :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask)
-+	  :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask_addr)
- 	  :"%eax", "%ebx", "%ecx", "%edx"
- 	  );
- #endif
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.1.91-fPIC.patch b/media-video/mjpegtools/files/mjpegtools-1.6.1.91-fPIC.patch
deleted file mode 100644
index cf8b91f0801d..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.6.1.91-fPIC.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/Makefile.in	2004-01-02 20:41:53.687970979 +0000
-+++ utils/Makefile.in	2004-01-02 20:42:03.468500179 +0000
-@@ -289,7 +289,7 @@
- @AMDEP_TRUE@	./$(DEPDIR)/mpegtimecode.Po ./$(DEPDIR)/yuv4mpeg.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/yuv4mpeg_ratio.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.1.92-fPIC.patch b/media-video/mjpegtools/files/mjpegtools-1.6.1.92-fPIC.patch
deleted file mode 100644
index cf8b91f0801d..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.6.1.92-fPIC.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/Makefile.in	2004-01-02 20:41:53.687970979 +0000
-+++ utils/Makefile.in	2004-01-02 20:42:03.468500179 +0000
-@@ -289,7 +289,7 @@
- @AMDEP_TRUE@	./$(DEPDIR)/mpegtimecode.Po ./$(DEPDIR)/yuv4mpeg.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/yuv4mpeg_ratio.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.1.93-fPIC.patch b/media-video/mjpegtools/files/mjpegtools-1.6.1.93-fPIC.patch
deleted file mode 100644
index cf8b91f0801d..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.6.1.93-fPIC.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/Makefile.in	2004-01-02 20:41:53.687970979 +0000
-+++ utils/Makefile.in	2004-01-02 20:42:03.468500179 +0000
-@@ -289,7 +289,7 @@
- @AMDEP_TRUE@	./$(DEPDIR)/mpegtimecode.Po ./$(DEPDIR)/yuv4mpeg.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/yuv4mpeg_ratio.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
diff --git a/media-video/mjpegtools/files/no-x11-lib.patch b/media-video/mjpegtools/files/no-x11-lib.patch
deleted file mode 100644
index 27089e0e2217..000000000000
--- a/media-video/mjpegtools/files/no-x11-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mjpegtools-1.6.1.90/lavtools/Makefile.in.old	2003-08-23 14:21:53.000000000 +0000
-+++ mjpegtools-1.6.1.90/lavtools/Makefile.in	2003-09-19 09:03:15.000000000 +0000
-@@ -235,7 +235,7 @@
- lavplay_SOURCES = lavplay.c ${lav_headers}
- lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \
- 	liblavplay.la liblavjpeg.la liblavfile.la \
--	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} -lX11
-+	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS}
- 
- 
- lavrec_SOURCES = lavrec.c $(lav_headers)
diff --git a/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
deleted file mode 100644
index 32e6c4ecac25..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild,v 1.23 2005/01/11 12:16:52 lu_zero Exp $
-
-inherit eutils gcc libtool flag-o-matic base
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-# Portage currently chokes on the following nested conditional.
-#	SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz
-#		quicktime? ( !alpha? (
-#			mirror://sourceforge/mjpeg/quicktime4linux-1.4-patched.tar.gz
-#		) )"
-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 alpha ~sparc"
-IUSE="sse arts gtk mmx sdl X quicktime 3dnow avi svga"
-
-RDEPEND="media-libs/jpeg
-	media-libs/libpng
-	=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
-	x86? ( media-libs/libmovtar )
-	avi? ( <media-video/avifile-0.7.38 )
-	quicktime? ( !alpha? ( 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
-	svga? ( media-libs/svgalib )
-	arts? ( kde-base/arts )"
-
-src_unpack() {
-	base_src_unpack
-
-	if use quicktime && ! use alpha; 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
-
-	if use ppc; then
-		cd ${S}
-		epatch ${FILESDIR}/1.6.0-r7-ppc.patch || die "epatch failed"
-	fi
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc3.patch
-}
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-
-	replace-flags "-march=pentium4" "-march=i686"
-	replace-flags "-march=athlon*" "-march=i686"
-	filter-flags "-fprefetch-loop-arrays"
-	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 use quicktime && ! use alpha; 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.1.90-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
deleted file mode 100644
index 264afe9565c5..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild,v 1.9 2005/01/11 12:16:52 lu_zero 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}"
-	use X || 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 || 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
-
-	econf ${myconf} || die "econf failed"
-
-	emake || 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
-	dodoc mjpeg_howto.txt
-}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
deleted file mode 100644
index ae7536c07cd8..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild,v 1.13 2005/01/11 12:16:52 lu_zero 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
-	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"
-	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
-
-	# Needed at least on amd64, BUG #55222
-	# Danny van Dyk <kugelfang@gentoo.org> 2004/06/26
-	if [ "${ARCH}" != x86 ]; then
-		sed -i -e "s/gcc\ \-fno\-pic/gcc\ \-fPIC/" utils/Makefile
-	fi
-
-	emake -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
-	dodoc mjpeg_howto.txt
-}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
index 5c1ef30bd429..97ab3489c260 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.18 2005/03/15 20:03:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.19 2005/03/26 20:21:01 eradicator Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -23,7 +23,7 @@ DEPEND="media-libs/jpeg
 	)
 	gtk? ( =x11-libs/gtk+-1.2*
 			=dev-libs/glib-1.2* )
-	avi? ( >=media-video/avifile-0.7.38 )
+	avi? ( media-video/avifile )
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )