Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 215AD14D)

5 files changed, 7 insertions, 158 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index aa01adbe1469..d3360b9fa7f1 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.215 2014/03/24 15:12:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.216 2014/03/24 17:15:55 billie Exp $
+
+  24 Mar 2014; Daniel Pielmeier <billie@gentoo.org> -mjpegtools-2.1.0.ebuild,
+  -files/mjpegtools-2.0.0-gcc470.patch,
+  -files/mjpegtools-2.0.0-sdlgfx-automagic.patch,
+  -files/mjpegtools-2.0.0-stream-params-include.patch:
+  Remove old.
 
   24 Mar 2014; Agostino Sarubbo <ago@gentoo.org> mjpegtools-2.1.0-r1.ebuild:
   Stable for ppc, wrt bug #503752
diff --git a/media-video/mjpegtools/files/mjpegtools-2.0.0-gcc470.patch b/media-video/mjpegtools/files/mjpegtools-2.0.0-gcc470.patch
deleted file mode 100644
index 050b33febb68..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-2.0.0-gcc470.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/y4mdenoise/MotionSearcher.hh
-+++ b/y4mdenoise/MotionSearcher.hh
-@@ -2196,7 +2196,7 @@
- 	{
- 		// This region is too small to be bothered with.
- 		// Just get rid of it.
--		DeleteRegion (a_pRegion);
-+		this->DeleteRegion (a_pRegion);
- 	}
- 	else
- 	{
diff --git a/media-video/mjpegtools/files/mjpegtools-2.0.0-sdlgfx-automagic.patch b/media-video/mjpegtools/files/mjpegtools-2.0.0-sdlgfx-automagic.patch
deleted file mode 100644
index 9ca007194766..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-2.0.0-sdlgfx-automagic.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- configure.ac.old	2011-05-21 14:30:09.000000000 +0200
-+++ configure.ac	2011-05-29 15:36:54.488792001 +0200
-@@ -64,6 +64,9 @@
- AC_ARG_WITH(libsdl,
- 	    AC_HELP_STRING([--without-libsdl], [Do not use libsdl.]),
- 	    [], [with_libsdl=yes])
-+AC_ARG_WITH(sdlgfx,
-+        AC_HELP_STRING([--without-sdlgfx], [Do not use sdlgfx.]),
-+        [], [with_sdlgfx=yes])
- AC_GNU_SOURCE
- 
- dnl Initialize libtool
-@@ -306,20 +309,24 @@
- fi
- AM_CONDITIONAL(HAVE_SDL, test x$have_sdl = xtrue)			  
- 
--dnl ***
-+dnl ********************************************************************
- dnl Check for SDL_gfx which is used by y4mhist to display a graphical 
- dnl histogram.
--dnl ***
--AC_SUBST(SDLgfx_LIBS)
--if test x$have_sdl = xtrue; then
--   OLD_LIBS="$LIBS"
--   LIBS="$LIBS -lSDL -lSDL_gfx"
--   AC_CHECK_LIB(SDL_gfx, vlineColor,
--		[SDLgfx_LIBS="-lSDL_gfx"
--		 AC_DEFINE(HAVE_SDLgfx, 1, [SDL_gfx library present])
--		 have_sdlgfx=true ],[have_sdlgfx=false])
--   LIBS="$OLD_LIBS"
-+dnl ********************************************************************
-+have_sdlgfx=false
-+if test x$with_sdlgfx != xno ; then
-+	AC_SUBST(SDLgfx_LIBS)
-+	if test x$have_sdl = xtrue; then
-+	   OLD_LIBS="$LIBS"
-+	   LIBS="$LIBS -lSDL -lSDL_gfx"
-+	   AC_CHECK_LIB(SDL_gfx, vlineColor,
-+			[SDLgfx_LIBS="-lSDL_gfx"
-+			 AC_DEFINE(HAVE_SDLgfx, 1, [SDL_gfx library present])
-+			 have_sdlgfx=true ],[have_sdlgfx=false])
-+	   LIBS="$OLD_LIBS"
-+	fi
- fi
-+AM_CONDITIONAL(HAVE_SDLgfx, test x$have_sdlgfx = xtrue)
- 
- dnl ********************************************************************
- dnl Test for MMX support if an IA32 platform.  If on a PPC then look for
diff --git a/media-video/mjpegtools/files/mjpegtools-2.0.0-stream-params-include.patch b/media-video/mjpegtools/files/mjpegtools-2.0.0-stream-params-include.patch
deleted file mode 100644
index 0e83633ce926..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-2.0.0-stream-params-include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mplex/stream_params.hpp	2010/03/13 13:05:07	1.6
-+++ mplex/stream_params.hpp	2011/06/11 14:28:39	1.7
-@@ -19,11 +19,10 @@
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  */
--
-+
- #ifndef __STREAM_PARAMS_HH__
- #define __STREAM_PARAMS_HH__
- 
--#include <config.h>
- #include <mjpeg_types.h>
- class LpcmParams
- {
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0.ebuild
deleted file mode 100644
index c273cb39fa03..000000000000
--- a/media-video/mjpegtools/mjpegtools-2.1.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0.ebuild,v 1.9 2014/01/18 19:54:40 ago Exp $
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE="dga dv gtk mmx png quicktime sdl sdlgfx static-libs v4l"
-REQUIRED_USE="sdlgfx? ( sdl )"
-
-RDEPEND="virtual/jpeg
-	quicktime? ( media-libs/libquicktime )
-	dv? ( >=media-libs/libdv-0.99 )
-	png? ( media-libs/libpng:0= )
-	dga? ( x11-libs/libXxf86dga )
-	gtk? ( x11-libs/gtk+:2 )
-	sdl? ( >=media-libs/libsdl-1.2.7-r3
-		x11-libs/libX11
-		x11-libs/libXt
-		sdlgfx? ( media-libs/sdl-gfx )
-	 )"
-
-DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )
-	>=sys-apps/sed-4
-	virtual/awk
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if has_version ">=sys-kernel/linux-headers-2.6.38" && use v4l; then
-		ewarn "Current versions of mjpegtools only support V4L1 which is not available"
-		ewarn "for kernel versions 2.6.38 and above. V4L1 will be disabled."
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-src_configure() {
-	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-	econf \
-		--enable-compile-warnings \
-		$(use_enable mmx simd-accel) \
-		$(use_enable static-libs static) \
-		--enable-largefile \
-		$(use_with quicktime libquicktime) \
-		$(use_with dv libdv) \
-		$(use_with png libpng) \
-		$(use_with dga) \
-		$(use_with gtk) \
-		$(use_with sdl libsdl) \
-		$(use_with sdlgfx) \
-		$(use_with v4l) \
-		$(use_with sdl x)
-}
-
-src_install() {
-	default
-
-	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
-
-	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "mjpegtools installs user contributed scripts which require additional"
-		elog "dependencies not pulled in by the installation."
-		elog "These have to be installed manually."
-		elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
-		elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
-	fi
-}