Remove old.

(Portage version: 2.1.10.3/cvs/Linux i686)

4 files changed, 6 insertions, 123 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 439c521b0391..2489b8b067b8 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.162 2011/07/26 16:29:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.163 2011/07/26 16:37:15 billie Exp $
+
+  26 Jul 2011; Daniel Pielmeier <billie@gentoo.org>
+  -mjpegtools-1.9.0-r1.ebuild, -files/mjpegtools-1.9.0-glibc-2.10.patch,
+  -files/mjpegtools-1.9.0-jpeg-7.patch:
+  Remove old.
 
   26 Jul 2011; Raúl Porcel <armin76@gentoo.org> mjpegtools-2.0.0-r1.ebuild:
   alpha/sparc stable wrt #372139
diff --git a/media-video/mjpegtools/files/mjpegtools-1.9.0-glibc-2.10.patch b/media-video/mjpegtools/files/mjpegtools-1.9.0-glibc-2.10.patch
deleted file mode 100644
index e16156046821..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.9.0-glibc-2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp.orig	2009-05-27 01:31:46.000000000 -0700
-+++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp	2009-05-27 01:33:09.000000000 -0700
-@@ -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.9.0-jpeg-7.patch b/media-video/mjpegtools/files/mjpegtools-1.9.0-jpeg-7.patch
deleted file mode 100644
index ec367318628c..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.9.0-jpeg-7.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
-
-Patch by: Salah Coronya
-
-http://bugs.gentoo.org/show_bug.cgi?id=293919
-
---- lavtools/jpegutils.c
-+++ lavtools/jpegutils.c
-@@ -502,6 +502,7 @@
- 
-    jpeg_read_header (&dinfo, TRUE);
-    dinfo.raw_data_out = TRUE;
-+   dinfo.do_fancy_upsampling = FALSE;
-    dinfo.out_color_space = JCS_YCbCr;
-    dinfo.dct_method = JDCT_IFAST;
-    guarantee_huff_tables(&dinfo);
-@@ -599,6 +600,7 @@
-       if (field > 0) {
-          jpeg_read_header (&dinfo, TRUE);
-          dinfo.raw_data_out = TRUE;
-+         dinfo.do_fancy_upsampling = FALSE;
-          dinfo.out_color_space = JCS_YCbCr;
-          dinfo.dct_method = JDCT_IFAST;
-          jpeg_start_decompress (&dinfo);
diff --git a/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild
deleted file mode 100644
index b3648f836fd9..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,87 +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-r1.ebuild,v 1.9 2011/04/01 09:48:15 ssuominen 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 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 )
-	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 \
-		"${FILESDIR}"/${P}-jpeg-7.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 \
-		--with-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}
-
-	emake || die
-
-	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
-	dodoc mjpeg_howto.txt README* PLANS NEWS TODO HINTS BUGS ChangeLog \
-		AUTHORS CHANGES
-}