Remove old.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

13 files changed, 14 insertions, 611 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 9ba22cdbcf9b..a131c423f177 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.150 2011/03/15 22:32:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.151 2011/03/23 08:46:05 radhermit Exp $
+
+  23 Mar 2011; Tim Harder <radhermit@gentoo.org> -mjpegtools-1.8.0-r2.ebuild,
+  -files/mjpegtools-1.8.0-as-needed.patch,
+  -files/mjpegtools-1.8.0-fix-lav2mpeg.patch,
+  -files/mjpegtools-1.8.0-gcc41.patch,
+  -files/mjpegtools-1.8.0-glibc-2.10.patch,
+  -files/mjpegtools-1.8.0-lavrec-memleak.patch,
+  -files/mjpegtools-1.8.0-libc.patch,
+  -files/mjpegtools-1.8.0-libquicktime.patch,
+  -files/mjpegtools-1.8.0-no-jpeg-mmx.patch,
+  -files/mjpegtools-1.8.0-parallelmake.patch,
+  -files/mjpegtools-1.8.0-pkg-config.patch, -mjpegtools-1.9.0.ebuild:
+  Remove old.
 
   15 Mar 2011; Ulrich Mueller <ulm@gentoo.org> mjpegtools-1.8.0-r2.ebuild,
   mjpegtools-1.9.0.ebuild, mjpegtools-1.9.0-r1.ebuild:
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch
deleted file mode 100644
index d08ac625cbe6..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru mjpegtools-1.8.0-orig/lavtools/Makefile.am mjpegtools-1.8.0/lavtools/Makefile.am
---- mjpegtools-1.8.0-orig/lavtools/Makefile.am	2006-08-25 15:09:51.542109878 +0200
-+++ mjpegtools-1.8.0/lavtools/Makefile.am	2006-08-25 15:11:37.920337695 +0200
-@@ -51,10 +51,17 @@
- liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
- liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies
- liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
-+liblavrec_la_LIBADD = -llavfile -llavjpeg
-+liblavrec_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
- 
- liblavplay_la_SOURCES = liblavplay.c audiolib.c
- liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
- liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
-+liblavplay_la_LIBADD = -llavfile $(SDL_LIBS) -llavjpeg
-+liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
-+if HAVE_X
-+  liblavplay_la_LIBADD += $(X_LIBS) -lX11
-+endif
- 
- # *********************************************************************
- # The tools themselves
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch
deleted file mode 100644
index 14ad0855024b..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru mjpegtools-1.8.0-orig/scripts/lav2mpeg mjpegtools-1.8.0-fixed-lav2mpeg/scripts/lav2mpeg
---- mjpegtools-1.8.0-orig/scripts/lav2mpeg	2006-11-19 17:11:41.000000000 +0100
-+++ mjpegtools-1.8.0-fixed-lav2mpeg/scripts/lav2mpeg	2006-11-19 18:28:32.000000000 +0100
-@@ -253,7 +253,7 @@
-     esac
- done
- let MOPTIND=OPTIND-LAVRC_COUNT
--shift `expr $MOPTIND-1`
-+shift $((MOPTIND-1))
- 
- if [ "${QUIETLOG}" != "" ]; then
-    logfile=${QUIETLOG}
-@@ -267,7 +267,8 @@
- 
- # lavinfo should set up video_frames, video_width
- # video_height, video_inter, video_norm, audio_chans
--eval $($LAVINFO $@ | grep "=")  # grep for = to remove Warnings
-+# Add backslashes to protect contained spaces
-+eval $($LAVINFO $@ | grep "=" | sed -e 's: :\\ :g')  # grep for = to remove Warnings
- if [ "$video_frames" == "" ]; then
-    logIt "'lavinfo $@' died! exiting"
-    logIt " maybe you don't have lavinfo. or your input flags were wrong"
-@@ -401,7 +402,7 @@
-    fi
- fi
- 
--if [ $video_inter -eq 1 ]; then
-+if [[ ${video_inter/interlacing/} != ${video_inter} ]]; then
-    yuvdenoise_flags="$yuvdenoise_flags -F"
- fi
- 
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-gcc41.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-gcc41.patch
deleted file mode 100644
index 77d556f3ff07..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.8.0-gcc41.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh mjpegtools-1.8.0/y4mdenoise/Region2D.hh
---- mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh	2005-12-19 12:36:54.000000000 +0300
-+++ mjpegtools-1.8.0/y4mdenoise/Region2D.hh	2005-12-19 12:44:36.000000000 +0300
-@@ -16,7 +16,7 @@
- 
- #include "Status_t.h"
- #include <iostream>
--
-+#include <cassert>
- 
- 
- // The 2-dimensional region class.  Parameterized by the numeric type
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-glibc-2.10.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-glibc-2.10.patch
deleted file mode 100644
index 0e4388dc3376..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.8.0-glibc-2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mjpegtools-1.8.0/mplex/lpcmstrm_in.cpp.orig	2009-08-27 14:27:01.000000000 -0500
-+++ mjpegtools-1.8.0/mplex/lpcmstrm_in.cpp	2009-08-27 14:28:04.000000000 -0500
-@@ -53,7 +53,7 @@
- 
- bool LPCMStream::Probe(IBitStream &bs )
- {
--    char *last_dot = strrchr( bs.StreamName(), '.' );
-+    const char *last_dot = strrchr( bs.StreamName(), '.' );
-     return 
-         last_dot != NULL 
-         && strcmp( last_dot+1, "lpcm") == 0;
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-lavrec-memleak.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-lavrec-memleak.patch
deleted file mode 100644
index 47705044ebdb..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.8.0-lavrec-memleak.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- mjpegtools-1.8.0/lavtools/lav_io.c	2005-08-27 13:47:20.000000000 +0200
-+++ mjpegtools-1.8.0___fixed/lavtools/lav_io.c	2006-05-14 05:45:48.000000000 +0200
-@@ -540,15 +540,12 @@
- 
- int lav_write_audio(lav_file_t *lav_file, uint8_t *buff, long samps)
- {
--   int res;
-+   int res = -1;
- #ifdef HAVE_LIBQUICKTIME
-    int i, j;
--   int16_t *qt_audio = (int16_t *)buff, **qt_audion;
-+   int16_t *buff16 = (int16_t *)buff, **qt_audion;
-    int channels = lav_audio_channels(lav_file);
--
--   qt_audion = malloc(channels * sizeof (int16_t **));
--   for (i = 0; i < channels; i++)
--	qt_audion[i] = (int16_t *)malloc(samps * lav_file->bps);
-+   int bits = lav_audio_bits(lav_file);
- #endif
- 
-    video_format = lav_file->format; internal_error = 0; /* for error messages */
-@@ -557,24 +554,43 @@
-    {
-       case 'a':
-       case 'A':
--         res = AVI_write_audio( lav_file->avi_fd, buff, samps*lav_file->bps);
-+         res = AVI_write_audio(lav_file->avi_fd, buff, samps*lav_file->bps);
-          break;
- #ifdef HAVE_LIBQUICKTIME
-       case 'q':
--	/* Deinterleave the audio into the two channels. */
--	for (i = 0; i < samps; i++)
--	    {
--	    for (j = 0; j < channels; j++)
--		qt_audion[j][i] = qt_audio[(channels*i) + j];
--	    }
--	res = lqt_encode_audio_track(lav_file->qt_fd, qt_audion, NULL,samps,0);
--	for (j = 0; j < channels; j++)
--	    free(qt_audion[j]);
--	free(qt_audion);
--        break;
-+	 if (bits != 16 || channels > 1)
-+	 {
-+	    /* Deinterleave the audio into the two channels and/or convert
-+	     * bits per sample to the required format.
-+	     */
-+	    qt_audion = malloc(channels * sizeof(*qt_audion));
-+	    for (i = 0; i < channels; i++)
-+	      qt_audion[i] = malloc(samps * sizeof(**qt_audion));
-+
-+	    if (bits == 16)
-+	      for (i = 0; i < samps; i++)
-+		for (j = 0; j < channels; j++)
-+		  qt_audion[j][i] = buff16[channels * i + j];
-+	    else 
-+	      if (bits == 8)
-+		for (i = 0; i < samps; i++)
-+		  for (j = 0; j < channels; j++)
-+		    qt_audion[j][i] = ((int16_t)(buff[channels * i + j]) << 8) ^ 0x8000;
-+
-+	    if (bits == 8 || bits == 16)
-+	      res = lqt_encode_audio_track(lav_file->qt_fd, qt_audion, NULL, samps, 0);
-+
-+	    for (i = 0; i < channels; i++)
-+	      free(qt_audion[i]);
-+	    free(qt_audion);
-+	  } else {
-+	    qt_audion = &buff16;
-+	    res = lqt_encode_audio_track(lav_file->qt_fd, qt_audion, NULL, samps, 0);
-+	  }
-+	  break;
- #endif
-       default:
--         res = -1;
-+         break;
-    }
- 
-    return res;
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-libc.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-libc.patch
deleted file mode 100644
index 0a9567b7a21d..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.8.0-libc.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff -Naur mjpegtools-1.8.0.orig/mpeg2enc/encodertypes.h mjpegtools-1.8.0/mpeg2enc/encodertypes.h
---- mjpegtools-1.8.0.orig/mpeg2enc/encodertypes.h	2008-12-10 10:57:56.000000000 -0600
-+++ mjpegtools-1.8.0/mpeg2enc/encodertypes.h	2008-12-10 11:02:08.000000000 -0600
-@@ -26,7 +26,7 @@
- 
- #include "config.h"
- 
--
-+#include <stdlib.h>
- 
- class Parity
- {
-diff -Naur mjpegtools-1.8.0.orig/mpeg2enc/macroblock.cc mjpegtools-1.8.0/mpeg2enc/macroblock.cc
---- mjpegtools-1.8.0.orig/mpeg2enc/macroblock.cc	2008-12-10 10:57:56.000000000 -0600
-+++ mjpegtools-1.8.0/mpeg2enc/macroblock.cc	2008-12-10 11:02:41.000000000 -0600
-@@ -20,6 +20,7 @@
-  */
- 
- #include <stdio.h>
-+#include <limits.h>
- 
- #include "macroblock.hh"
- #include "mpeg2syntaxcodes.h"
-diff -Naur mjpegtools-1.8.0.orig/mpeg2enc/picturereader.cc mjpegtools-1.8.0/mpeg2enc/picturereader.cc
---- mjpegtools-1.8.0.orig/mpeg2enc/picturereader.cc	2008-12-10 10:57:56.000000000 -0600
-+++ mjpegtools-1.8.0/mpeg2enc/picturereader.cc	2008-12-10 11:03:04.000000000 -0600
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+#include <limits.h>
- #include <errno.h>
- #include "simd.h"
- #include "mpeg2encoder.hh"
-diff -Naur mjpegtools-1.8.0.orig/mplex/inputstrm.cpp mjpegtools-1.8.0/mplex/inputstrm.cpp
---- mjpegtools-1.8.0.orig/mplex/inputstrm.cpp	2008-12-10 10:58:55.000000000 -0600
-+++ mjpegtools-1.8.0/mplex/inputstrm.cpp	2008-12-10 11:03:36.000000000 -0600
-@@ -23,6 +23,7 @@
- 
- #include <config.h>
- #include <assert.h>
-+#include <limits.h>
- 
- #include "mjpeg_types.h"
- #include "inputstrm.hpp"
-diff -Naur mjpegtools-1.8.0.orig/mplex/padstrm.cpp mjpegtools-1.8.0/mplex/padstrm.cpp
---- mjpegtools-1.8.0.orig/mplex/padstrm.cpp	2008-12-10 10:58:55.000000000 -0600
-+++ mjpegtools-1.8.0/mplex/padstrm.cpp	2008-12-10 11:04:06.000000000 -0600
-@@ -24,6 +24,7 @@
- #include "config.h"
- #endif
- 
-+#include <string.h>
- #include "padstrm.hpp"
- 
- 
-diff -Naur mjpegtools-1.8.0.orig/mplex/multiplexor.cpp mjpegtools-1.8.0/mplex/multiplexor.cpp
---- mjpegtools-1.8.0.orig/mplex/multiplexor.cpp	2008-12-10 10:58:55.000000000 -0600
-+++ mjpegtools-1.8.0/mplex/multiplexor.cpp	2008-12-10 11:04:53.000000000 -0600
-@@ -22,6 +22,7 @@
- #include <config.h>
- #include <math.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include <mjpeg_types.h>
- #include <mjpeg_logging.h>
-diff -Naur mjpegtools-1.8.0.orig/mplex/main.cpp mjpegtools-1.8.0/mplex/main.cpp
---- mjpegtools-1.8.0.orig/mplex/main.cpp	2008-12-10 10:58:55.000000000 -0600
-+++ mjpegtools-1.8.0/mplex/main.cpp	2008-12-10 11:05:20.000000000 -0600
-@@ -31,6 +31,7 @@
- #include <getopt.h>
- #endif
- #include <string>
-+#include <string.h>
- #include <memory>
- #include <sys/stat.h>
- #ifndef _WIN32
-diff -Naur mjpegtools-1.8.0.orig/y4mdenoise/Set.hh mjpegtools-1.8.0/y4mdenoise/Set.hh
---- mjpegtools-1.8.0.orig/y4mdenoise/Set.hh	2008-12-10 11:00:49.000000000 -0600
-+++ mjpegtools-1.8.0/y4mdenoise/Set.hh	2008-12-10 11:06:30.000000000 -0600
-@@ -23,7 +23,7 @@
- 		// How we implement ourselves.
- 	
- public:
--	typedef typename Imp::Allocator Allocator;
-+	typedef typename Imp::Allocator_t Allocator;
- 		// The type of allocator to use to allocate items in the set.
- 
- 	Set (const PRED &a_rPred = PRED(),
-diff -Naur mjpegtools-1.8.0.orig/y4mdenoise/SkipList.hh mjpegtools-1.8.0/y4mdenoise/SkipList.hh
---- mjpegtools-1.8.0.orig/y4mdenoise/SkipList.hh	2008-12-10 11:00:49.000000000 -0600
-+++ mjpegtools-1.8.0/y4mdenoise/SkipList.hh	2008-12-10 11:09:34.000000000 -0600
-@@ -57,19 +57,19 @@
- 		// Will give good sorting for up to e^10 items.
- 	
- public:
--	typedef Allocator<Node,HEADERCHUNK> Allocator;
-+	typedef Allocator<Node,HEADERCHUNK> Allocator_t;
- 		// The type of node allocator to use.
- 
--	static Allocator sm_oNodeAllocator;
-+	static Allocator_t sm_oNodeAllocator;
- 		// The default node allocator.
- 
- 	SkipList (const PRED &a_rPred = PRED(),
--			Allocator &a_rAlloc = sm_oNodeAllocator);
-+			Allocator_t &a_rAlloc = sm_oNodeAllocator);
- 		// Default constructor.  Must be followed by Init().
- 
- 	SkipList (Status_t &a_reStatus, bool a_bAllowDuplicates,
- 			uint32_t a_nRandSeed, const PRED &a_rPred = PRED(),
--			Allocator &a_rAlloc = sm_oNodeAllocator);
-+			Allocator_t &a_rAlloc = sm_oNodeAllocator);
- 		// Constructor.  Specify whether or not duplicates are allowed,
- 		// and provide a random number seed.
- 
-@@ -255,7 +255,7 @@
- 
- private:
- 	
--	Allocator &m_rNodeAllocator;
-+	Allocator_t &m_rNodeAllocator;
- 		// Where we get memory to allocate nodes.
- 
- 	bool m_bAllowDuplicates;
-@@ -337,7 +337,7 @@
- 
- // The default node allocator.  Allocates 64K at a time.
- template <class KEY, class VALUE, class KEYFN, class PRED>
--typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator
-+typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator_t
- 	SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536);
- 
- 
-@@ -345,7 +345,7 @@
- // Default constructor.  Must be followed by Init().
- template <class KEY, class VALUE, class KEYFN, class PRED>
- SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (const PRED &a_rPred,
--		Allocator &a_rAlloc)
-+		Allocator_t &a_rAlloc)
- 	: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)
- {
- 	// Set up some defaults.
-@@ -371,7 +371,7 @@
- template <class KEY, class VALUE, class KEYFN, class PRED>
- SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (Status_t &a_reStatus,
- 		bool a_bAllowDuplicates, uint32_t a_nRandSeed,
--		const PRED &a_rPred, Allocator &a_rAlloc)
-+		const PRED &a_rPred, Allocator_t &a_rAlloc)
- 	: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)
- {
- 	// Make sure they didn't start us off with an error.
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-libquicktime.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-libquicktime.patch
deleted file mode 100644
index 3a44db477572..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.8.0-libquicktime.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../mjpegtools/hotfix_libquicktime.patch
-# Copyright (C) 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-diff -Nur mjpegtools-1.8.0-orig/lavtools/lav_io.c mjpegtools-1.8.0/lavtools/lav_io.c
---- mjpegtools-1.8.0-orig/lavtools/lav_io.c	2005-08-27 11:47:20.000000000 +0000
-+++ mjpegtools-1.8.0/lavtools/lav_io.c	2006-01-28 11:03:16.152857000 +0000
-@@ -1367,7 +1367,7 @@
-          break;
- #ifdef HAVE_LIBQUICKTIME
-       case 'q':
--         res = fileno(((quicktime_t *)lav_file->qt_fd)->stream);
-+         res = lqt_fileno((quicktime_t *)lav_file->qt_fd);
-          break;
- #endif
-       default:
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-no-jpeg-mmx.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-no-jpeg-mmx.patch
deleted file mode 100644
index 1f388fa5f53f..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.8.0-no-jpeg-mmx.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ru mjpegtools-1.8.0-orig/configure.ac mjpegtools-1.8.0-no-jpeg-mmx/configure.ac
---- mjpegtools-1.8.0-orig/configure.ac	2006-11-19 17:11:41.000000000 +0100
-+++ mjpegtools-1.8.0-no-jpeg-mmx/configure.ac	2006-11-20 13:56:47.000000000 +0100
-@@ -197,29 +197,32 @@
-   AC_MSG_ERROR([
- *** A directory must be specified for --with-jpeg-mmx option.])
- fi
--if test x$with_jpeg_mmx = x ; then
--  dnl Special case for building .deb's
--  if test -d ../jpeg-mmx ; then
--    with_jpeg_mmx=`pwd`/../jpeg-mmx
--  else
--    with_jpeg_mmx=/usr/local/src/jpeg-mmx
-+if test x$with_jpeg_mmx != xno ; then
-+  if test x$with_jpeg_mmx = x ; then
-+    dnl Special case for building .deb's
-+    if test -d ../jpeg-mmx ; then
-+      with_jpeg_mmx=`pwd`/../jpeg-mmx
-+    else
-+      with_jpeg_mmx=/usr/local/src/jpeg-mmx
-+    fi
-   fi
--fi
- 
- dnl
- dnl Look for the installed/specified copy
- dnl
- 
--OLD_CFLAGS="$CFLAGS"
--OLD_LIBS="$LIBS"
--LIBS="$LIBS -L$with_jpeg_mmx"
--CFLAGS="$CFLAGS -I$with_jpeg_mmx"
--AC_CHECK_LIB(jpeg-mmx, jpeg_start_compress,
--   [ JPEG_LIBS="$LIBS -ljpeg-mmx"
--     JPEG_CFLAGS="-I$with_jpeg_mmx"
--       have_jpeg=true ],,)
--  LIBS="$OLD_LIBS"
--  CFLAGS="$OLD_CFLAGS"
-+  OLD_CFLAGS="$CFLAGS"
-+  OLD_LIBS="$LIBS"
-+  LIBS="$LIBS -L$with_jpeg_mmx"
-+  CFLAGS="$CFLAGS -I$with_jpeg_mmx"
-+  AC_CHECK_LIB(jpeg-mmx, jpeg_start_compress,
-+     [ JPEG_LIBS="$LIBS -ljpeg-mmx"
-+       JPEG_CFLAGS="-I$with_jpeg_mmx"
-+         have_jpeg=true ],,)
-+    LIBS="$OLD_LIBS"
-+    CFLAGS="$OLD_CFLAGS"
-+
-+fi
- 
- dnl 
- dnl Look for _a_ jpeg lib that will work.
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch
deleted file mode 100644
index 1755f87f0525..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.8.0-parallelmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: mjpegtools-1.8.0/mpeg2enc/Makefile.am
-===================================================================
---- mjpegtools-1.8.0.orig/mpeg2enc/Makefile.am
-+++ mjpegtools-1.8.0/mpeg2enc/Makefile.am
-@@ -110,7 +110,7 @@ libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTIL
- 
- mpeg2enc_DEPENDENCIES = \
- 	$(LIBMJPEGUTILS) \
--	$(top_builddir)/mpeg2enc/libmpeg2encpp.la
-+	libmpeg2encpp.la
- 
- mpeg2enc_LDADD = \
- 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
-Index: mjpegtools-1.8.0/mplex/Makefile.am
-===================================================================
---- mjpegtools-1.8.0.orig/mplex/Makefile.am
-+++ mjpegtools-1.8.0/mplex/Makefile.am
-@@ -79,5 +79,5 @@ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
- mplex_SOURCES = main.cpp 
- 
- mplex_LDADD = \
--	$(top_builddir)/mplex/libmplex2.la \
-+	libmplex2.la \
- 	@LIBGETOPT_LIB@ $(LIBM_LIBS) 
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-pkg-config.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-pkg-config.patch
deleted file mode 100644
index dc4a0fb0898d..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.8.0-pkg-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru mjpegtools-1.8.0-orig/configure.ac mjpegtools-1.8.0/configure.ac
---- mjpegtools-1.8.0-orig/configure.ac	2006-08-20 20:39:40.719351212 +0200
-+++ mjpegtools-1.8.0/configure.ac	2006-08-20 20:20:43.652651808 +0200
-@@ -233,6 +233,8 @@
-       have_jpeg=true ],,)
- fi
- 
-+PKG_PROG_PKG_CONFIG
-+
- have_libquicktime=false
- if test x$with_libquicktime != xno ; then
-   PKG_CHECK_MODULES(LIBQUICKTIME, [libquicktime >= 0.9.4],
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
deleted file mode 100644
index f1e348c62061..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild,v 1.9 2011/03/15 22:32:44 ulm Exp $
-
-inherit flag-o-matic toolchain-funcs eutils libtool autotools
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz
-	mirror://gentoo/${PN}-m4-1.tar.bz2"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="gtk dv quicktime sdl X yv12 v4l dga png mmx"
-
-RDEPEND="virtual/jpeg
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	dv? ( >=media-libs/libdv-0.99 )
-	quicktime? ( media-libs/libquicktime )
-	png? ( media-libs/libpng )
-	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	X? ( x11-libs/libX11
-		x11-libs/libXt
-	)"
-
-DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-	epatch "${FILESDIR}/${P}-parallelmake.patch"
-	epatch "${FILESDIR}/${P}-pkg-config.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	has_version ">=media-libs/libquicktime-0.9.9" && epatch "${FILESDIR}/${P}-libquicktime.patch"
-	epatch "${FILESDIR}/${P}-fix-lav2mpeg.patch"
-	epatch "${FILESDIR}/${P}-lavrec-memleak.patch"
-	epatch "${FILESDIR}/${P}-no-jpeg-mmx.patch"
-	epatch "${FILESDIR}/${P}-libc.patch"
-	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
-
-	# eautoreconf instead of elibtoolize
-	# as pkg-config-patch changes configure.in
-	#
-	# use m4-files from additional tarball as mjpegtools the fails if
-	# package providing m4-file is not installed
-	AT_M4DIR=${WORKDIR}/m4 eautoreconf
-
-	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-src_compile() {
-	local myconf
-
-	if use yv12 && use dv; then
-		myconf="${myconf} --with-dv-yv12"
-	elif use yv12; then
-		ewarn "yv12 support is possible when 'dv' is in your USE flags."
-	fi
-
-	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-	append-flags -fno-strict-aliasing
-
-	econf \
-		$(use_with X x) \
-		$(use_enable dga xfree-ext) \
-		$(use_with quicktime libquicktime) \
-		$(use_with png libpng) \
-		$(use_with v4l) \
-		$(use_with gtk) \
-		$(use_with sdl) \
-		$(use_with dv libdv /usr) \
-		$(use_enable mmx simd-accel) \
-		--enable-largefile \
-		--without-jpeg-mmx \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-
-	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 README PLANS NEWS README.AltiVec README.avilib \
-		README.DV README.glav README.lavpipe README.transist TODO \
-		HINTS BUGS ChangeLog AUTHORS CHANGES
-}
diff --git a/media-video/mjpegtools/mjpegtools-1.9.0.ebuild b/media-video/mjpegtools/mjpegtools-1.9.0.ebuild
deleted file mode 100644
index aaddd5b4d80e..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.9.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0.ebuild,v 1.11 2011/03/15 22:32:44 ulm Exp $
-
-EAPI="1"
-
-inherit flag-o-matic toolchain-funcs eutils libtool
-
-MY_P=${P/_/}
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="gtk dv quicktime sdl X yv12 v4l dga png mmx"
-
-RDEPEND="virtual/jpeg
-	gtk? ( x11-libs/gtk+:2 )
-	dv? ( >=media-libs/libdv-0.99 )
-	quicktime? ( media-libs/libquicktime )
-	png? ( media-libs/libpng )
-	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	X? ( x11-libs/libX11
-		x11-libs/libXt )"
-
-DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
-}
-
-src_compile() {
-	local myconf
-
-	if use yv12 && use dv; then
-		myconf="${myconf} --with-dv-yv12"
-	elif use yv12; then
-		ewarn "yv12 support is possible when 'dv' is in your USE flags."
-	fi
-
-	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-	append-flags -fno-strict-aliasing
-
-	econf \
-		$(use_with X x) \
-		$(use_enable dga xfree-ext) \
-		$(use_with quicktime libquicktime) \
-		$(use_with png libpng) \
-		$(use_with v4l) \
-		$(use_with gtk) \
-		$(use_with sdl) \
-		$(use_with dv libdv /usr) \
-		$(use_enable mmx simd-accel) \
-		--enable-largefile \
-		--without-jpeg-mmx \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-
-	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 README* PLANS NEWS TODO HINTS BUGS ChangeLog \
-		AUTHORS CHANGES
-}