Remove old.

Package-Manager: portage-2.1.10.3/cvs/Linux i686

5 files changed, 11 insertions, 132 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/Manifest b/media-video/mjpegtools/Manifest
index 754c863032c4..814e8befbc92 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX mjpegtools-1.9.0-glibc-2.10.patch 429 RMD160 ef7f706aeda7ebfa04dbd43b70a5e3e6faf24610 SHA1 3029f0e835e693b144298ed9f8143c9566be26f3 SHA256 0a76b418df4daa1603c827001ede6a1b3da4457b5d3aefeda0a656cd88ad446b
-AUX mjpegtools-1.9.0-jpeg-7.patch 774 RMD160 22c50dd28617159eaa89aefb4647e21d4d9972e7 SHA1 2bdb1b3b8591cede11d4a133a758e8ead35db4dd SHA256 2c9b90a283e8e6d95bd9573cd16310107c654d0d701a7dff7e47ee1a773da7cf
 AUX mjpegtools-2.0.0-sdlgfx-automagic.patch 1620 RMD160 1eb27563b08e2f6f2e3fc014865119914a419bb2 SHA1 12043ae95416c173ee413fa774c0c6a3c69ee9ff SHA256 11f914d0f17700b8e02a4bca447fc44c7b8b73e1bef7358057ff25a0155afbd6
-DIST mjpegtools-1.9.0.tar.gz 1718063 RMD160 79e0eb4bce468bb8f12da336e29abe8fab390a5f SHA1 1701233354c7ea86b5b7808c4dd5d03a71118e48 SHA256 a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711
 DIST mjpegtools-2.0.0.tar.gz 1749671 RMD160 454e23bedb2bd592912a546d0621b5c3662c3bb2 SHA1 f411e8573d446711dbe8455a6ae9257e1afe1e70 SHA256 bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97
-EBUILD mjpegtools-1.9.0-r1.ebuild 2078 RMD160 d288a60f43f79ea5298fd860bd4e0e988c48478f SHA1 07fbcca44b05d371e7619f40b59a2ea8705e31f6 SHA256 7d303fea4b4eb8c278e07c0e1662dd9860e4b9ef5836322d5bc8d76112b947f7
 EBUILD mjpegtools-2.0.0-r1.ebuild 2084 RMD160 5628d228378953d044ded931dc5ac0ea9d93b86b SHA1 42bd7fb3022ecc99c2fa2dd5d49730245ef70ae6 SHA256 e07a80cfd1adaf608254ea05ee3ba0d2e90ebaacaf1770e8e1429d32b791ec59
-MISC ChangeLog 29084 RMD160 9c0fd9258ca07f7fa9d2afb40b5c596045685402 SHA1 8c7812e2bdd1dfbc4ccd79050d1940d863930341 SHA256 f057f1dac7ddabd9c2d64e8501efbfacdefc8ce7146b7c96ce0367f72c2f2b49
+MISC ChangeLog 29263 RMD160 75c8bc4d2ac88c8f3fcce12bde33777ca528c311 SHA1 19f108f461e9582810729d4ba0c9c9661253276a SHA256 decba0f7b993f7730184142544f07d20f3db89efa8365c2715c80dda1a3baaa4
 MISC metadata.xml 441 RMD160 882586a1e1317f483541d38d3ea933250a154f38 SHA1 09ce5febb5925409e9779c91fd9b780b75a1ae51 SHA256 3657ffbe76610b6de6e72fc1ff1ce479a7200e17cf4734548cd4a62d2b6884f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4u68MACgkQuQc30/atMkCZ3gCfQUKxE4qNdGhs44gRHQ5KUpej
-/dEAoJzuFIwShoxfCxXHgF4b6oPgoycG
-=wBxl
+iEYEAREIAAYFAk4u7VwACgkQlcuUeyFa0U1LrwCgrQzm8H47b2DuNTWnc7dUuELg
+0Y8An27+u/+uDOwDAZRs9iP5ZZzJpWyG
+=04Kn
 -----END PGP SIGNATURE-----
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
-}