Remove old.

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

3 files changed, 8 insertions, 87 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/Manifest b/media-video/mjpegtools/Manifest
index 3860a9c615cb..c385894471a2 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -8,15 +8,12 @@ DIST mjpegtools-1.9.0.tar.gz 1718063 RMD160 79e0eb4bce468bb8f12da336e29abe8fab39
 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 2093 RMD160 f7a5be9720d8fd88ec897c84474b6eded519a136 SHA1 a86bdc575667acf10f3367ed5354fae6d5b973ab SHA256 c21ca77605545c70512baed1d483b23082d512a3a7f4facd94a231aaac8ef8fa
-EBUILD mjpegtools-2.0.0.ebuild 1923 RMD160 584095be8a0e4ccde0127f914f6ce80b6fbc8230 SHA1 a4abeee72b0099e28fd2f51264db248ea816bd5a SHA256 f757c0820fcd8235dc69ff06537bc89bb7aa97bb023534066c00968dea1caeba
-MISC ChangeLog 28538 RMD160 40a955f4ef6276a81e26a40b48c8aea2c32d3413 SHA1 04637df053321c2e334281f3ab2d52157cbc05d6 SHA256 f28437767e5e05696d618bb4f50ea0986620fbbb11fbbe6b6bffb6b2693c2af9
+MISC ChangeLog 28627 RMD160 bdfcf885be8bd0cc6c4e9950e2f6d74f900a7407 SHA1 347084407b54295cb739bb9d7e01a266f8c9f836 SHA256 5db50e5d93c954742ce93bc0e4bdfca69f389c529634d2cbc6f7b08ac6a420d5
 MISC metadata.xml 441 RMD160 882586a1e1317f483541d38d3ea933250a154f38 SHA1 09ce5febb5925409e9779c91fd9b780b75a1ae51 SHA256 3657ffbe76610b6de6e72fc1ff1ce479a7200e17cf4734548cd4a62d2b6884f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk3vnxUACgkQIiMqcbOVdxQVqQP/Yfmn7XHgarQSPpgkwZbuZj5V
-hEZMQ0yIc+uwlIsGyZPZpCeE2yWLnXx8CirtUAZfBAwOTJwu5XGNUNDDlzxCpiLW
-x8Rq2lNGIEMl4NAnwB6Umqj/knJ9qOGbvB3rSRajam63fXKUtjYDnQfn0xswPfGP
-TfZhJfxdYy2tn9iOI1Q=
-=COe6
+iEYEARECAAYFAk3xGe4ACgkQlcuUeyFa0U3JqgCeJ3s5dq5GokjUVSyo3+eKI1HI
+L68AoLYPXbUarSKuUNRBWOuw6DwDA7hZ
+=VCiq
 -----END PGP SIGNATURE-----
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"
-}