Remove old. Specify slot dependency for virtual/jpeg

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

4 files changed, 12 insertions, 94 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/Manifest b/media-video/mjpegtools/Manifest
index 9e07464b7485..6d6992be6bbb 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -5,14 +5,13 @@ AUX mjpegtools-2.1.0-no_format.patch 2800 SHA256 52e16f3fbc8181fb6da424c422dad2a
 AUX mjpegtools-2.1.0-pic.patch 2282 SHA256 1b8c08c993d01838b6fe04094c00fd07220ae543c8f115c79ffaae32edc8c5c2 SHA512 3ad9d0b488a4fcc29fab8c0cc8322d99e63c755234c02a7fe7ad7efa974f67871460f43db05ca8097c358fdf7aafcc852967959a2abc83460c258aa38a448e28 WHIRLPOOL 6986af27769fa540706e7dd575b6d42f9a5c5e817929db2c08de2842d32c9cb361f97ecadc0b00bb37563a0be12727e4e4c6719b2dacfe3a684949589314c05a
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 SHA256 fcba002f1f12f1fd864179f2c9971acab1bf298d9a719f74ceacc231e7232a99 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602 WHIRLPOOL 1eb9815a12d425acc8345a825258f7e71c2e362e79cf064484edc4dfdd67164f4935c1b9de44f8460e791340e315fd9a40127d1899a45a81b74c6a7a880e24c8
 DIST mjpegtools-2.1.0.tar.gz 1844336 SHA256 864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5 WHIRLPOOL e2e869a328e95dab22331ea1f03a669553ee01682a8e76d27d33da8b1cda46e042d252ff2b1974d08b2109ab1a664f4d5247ee92d7846876d496c7e63b472af9
-EBUILD mjpegtools-2.1.0-r1.ebuild 2402 SHA256 48ab1a137c5ec7fb29d78f89494da4916f171ba97bf0196a86c980b10766a0ac SHA512 1e3ab770066265f356dab33802f778df5eea1c659ac3831ebb551397da29873853a3e7ee692e3d76d4398e76260610ffc134153c5771b93e104274ca59d4d1cc WHIRLPOOL b7737377ae6e5e6cddd62118f3c5b29cd1f4557c4da52fdfc956753143c38bd0612e2edfdd66198f84c6f04cc6eba375a563985fddf9a656277879f23bffddf5
-EBUILD mjpegtools-2.1.0-r2.ebuild 3128 SHA256 f0fb0fa40ed023548870ebc45aece5a475723ca143551aec03c09a735db8b237 SHA512 38f333c6f6059048160c5d809008f4690e5cf8779b1a60aff3ab0efa2a20e8b37af3cddba81fe8db7891407c8296c6a4b03c9dcff200079ee83f049c43ca90b3 WHIRLPOOL f99f31fa489c4abf95aa70aabb9e4ed4cab0f00ec78574d23f84b3d25dd4bd8a6b8a60c880dca49d225cfcbb2c1730ff0b963db0e95fb6af8cc0efb861d11843
-MISC ChangeLog 38010 SHA256 e1171a5f17da934a00aee00ec7d46bac02e1fae6f2e5b222a487a51d520e0ea4 SHA512 9057b7129c5025e374cbd99daf8978490622c01d865b45c4bcea6d76eb84e12680d2e1af718ab76c313b27e04182ad485a81467313c2a35a240b69018a5273c2 WHIRLPOOL 9c4d08c9112c7bc3ff741641e4d443dfe76d9df2a9038a6027defa5b4bd9a59e1b1bdd810b285f3532c8f53da4220be4c54dc3ea56dbe6d06086b6e64ce5dc9f
+EBUILD mjpegtools-2.1.0-r2.ebuild 3127 SHA256 b506054f9b6f2940699e7d81d4cb25d191abe733c4ef2f023c4d0bc3b066f7f6 SHA512 ec511806c39a36b0e2a16d63905f56176be5fe56801e18d5878e42c7b06f4037b6f6f7504d52f4a3fb8c3090d5c47261d32de6128f69a1faa0f0d474adc4c9f4 WHIRLPOOL fda630e6f5d98b1dbb460da917b179632b34d3c46fab492112b4d1e5ae8c285ad88d21e15c8e14958ab557973a64ad7b75c05f2d81aaabbc97f0f9edd246f1c0
+MISC ChangeLog 38180 SHA256 441b93a970eba4d2bddfd53f7ffcc86b6aedd089dc151a5ebe681ae531e11949 SHA512 bfdd9db2501f604ec3d3cb82501d3a2e7baa766bb35a9130bfd68269371d227b9f8f9bfa248d27d8e6d237540fca0a08f42f6f3657d4b1aae1e1cd629e3d7398 WHIRLPOOL 56568ec9dd36575cd6092cb464c8638c7b7673c9d6bb55815037aca49033bd9b2ba5c77d8b6c6ec7c2524012d50dca2c2186a81c179706ae28c1edaaf86dc21c
 MISC metadata.xml 372 SHA256 1a22854e4e0449f6e855f21962f4af646a81eeb7cfa0de905c87ffb52a7081b7 SHA512 a1b0beff78a45667fb4095c203c59c0a63f262ac486b98858f7432fe1f4295f51e9c59c056149c1408e413c5e975abb41b971d1036179ecdea48772a04a5b222 WHIRLPOOL 90544f87533aaf15dba62efcea8ebf4039f29e6e3fef86a5a6907e2245c1f443132f967d65a6651393ad3e64ecedc1b0b73365662d2e770cb74f3abe1fa09b7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVD0SsACgkQVWmRsqeSphP0HACfRcfRcGnP5+fuaDnE6J7xRMMN
-5XoAnAkZSydj3KAEBwijX1AF6/29zeoX
-=HxIt
+iEYEAREIAAYFAlVI96cACgkQlcuUeyFa0U1x1QCgusFOFyMdmq2o741rNkROMpqj
+pFIAnRpBMA8GmyRozCU5XChGSqqb8VwM
+=g5pD
 -----END PGP SIGNATURE-----
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= )