2 files changed, 4 insertions, 80 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index ed4a4ca6898c..0e09909064b1 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,9 @@
 # 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.157 2011/06/08 16:10:55 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.158 2011/06/09 19:06:51 billie Exp $
+
+  09 Jun 2011; Daniel Pielmeier <billie@gentoo.org> -mjpegtools-2.0.0.ebuild:
+  Remove old.
 
   08 Jun 2011; Kacper Kowalik <xarthisius@gentoo.org>
   mjpegtools-2.0.0-r1.ebuild:
diff --git a/media-video/mjpegtools/mjpegtools-2.0.0.ebuild b/media-video/mjpegtools/mjpegtools-2.0.0.ebuild
deleted file mode 100644
index 7112d356a323..000000000000
--- a/media-video/mjpegtools/mjpegtools-2.0.0.ebuild
+++ /dev/null
@@ -1,79 +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-2.0.0.ebuild,v 1.2 2011/05/30 17:09:21 billie Exp $
-
-EAPI=4
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dga dv gtk mmx png quicktime sdl static-libs v4l X"
-REQUIRED_USE="!X? ( !gtk !sdl )
-	X? ( sdl )"
-
-RDEPEND="virtual/jpeg
-	quicktime? ( media-libs/libquicktime )
-	dv? ( >=media-libs/libdv-0.99 )
-	png? ( media-libs/libpng )
-	dga? ( x11-libs/libXxf86dga )
-	X? ( x11-libs/libX11
-		x11-libs/libXt
-		gtk? ( x11-libs/gtk+:2 )
-		sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	 )"
-
-DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )
-	>=sys-apps/sed-4
-	sys-apps/gawk
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${P/_rc*}"
-
-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 kernels versions 2.6.38 and above. V4L1 will be disabled."
-	fi
-}
-
-# Avoid execution of linux-info_pkg_setup()
-pkg_setup() { : ; }
-
-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 v4l) \
-		$(use_with X x)
-}
-
-src_install() {
-	default
-
-	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
-
-	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}