Remove old. Specify slot dependency for virtual/jpeg

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

3 files changed, 7 insertions, 88 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 74459b820276..868197b7cc77 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.230 2015/05/01 19:16:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.231 2015/05/05 17:02:27 billie Exp $
+
+  05 May 2015; Daniel Pielmeier <billie@gentoo.org>
+  -mjpegtools-2.1.0-r1.ebuild, mjpegtools-2.1.0-r2.ebuild:
+  Remove old. Specify slot dependency for virtual/jpeg
 
   01 May 2015; Jeroen Roovers <jer@gentoo.org> mjpegtools-2.1.0-r2.ebuild:
   Stable for PPC64 (bug #525770).
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild
deleted file mode 100644
index fd165634bc29..000000000000
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 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-r1.ebuild,v 1.11 2015/01/29 19:15:57 mgorny Exp $
-
-EAPI=5
-
-inherit autotools eutils 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 cpu_flags_x86_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}
-	cpu_flags_x86_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() {
-	epatch "${FILESDIR}"/${P}-pic.patch
-	eautoreconf
-	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-src_configure() {
-	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-	econf \
-		--enable-compile-warnings \
-		$(use_enable cpu_flags_x86_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
-}
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
index 37b8d4919ee9..e7e83f07b6b3 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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-r2.ebuild,v 1.14 2015/05/01 19:16:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild,v 1.15 2015/05/05 17:02:27 billie Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 
-RDEPEND=">=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]
+RDEPEND="virtual/jpeg:0=[${MULTILIB_USEDEP}]
 	quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
 	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
 	png? ( media-libs/libpng:0= )