Secondarily pull in media-libs/libpostproc if media-video/ffmpeg isn't used as a provider for virtual/ffmpeg wrt #500464. Deploy more subslotting to dependencies.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 42 insertions, 32 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index df476a0251b9..4fc1f12ac3a8 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cinelerra
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.65 2013/08/07 02:35:20 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.66 2014/02/06 08:18:56 ssuominen Exp $
+
+  06 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> cinelerra-20120707.ebuild:
+  Secondarily pull in media-libs/libpostproc if media-video/ffmpeg isn't used as
+  a provider for virtual/ffmpeg wrt #500464. Deploy more subslotting to
+  dependencies.
 
   07 Aug 2013; Alexis Ballier <aballier@gentoo.org> cinelerra-20120707.ebuild,
   +files/cinelerra-ffmpeg2.patch:
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 595163d562d1..00e011aa88b7 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -9,13 +9,17 @@ AUX cinelerra-libav9.patch 3760 SHA256 9a29f6f8f8ea23b9f856709f4e210ef7e25ea73ab
 AUX cinelerra-std_and_str_h.patch 1647 SHA256 9774bca0b28559f85bcc2beb9f2c690899d4b7b41cc7f627e8b7cfd6d5881f0c SHA512 b8f439b03ebe3fe13eab393a467bd5098631e2861412c067309963cbc95df6fdcd063236c9c71d1af9669a4902ff71ff55da989205fa65a2451ba1b18b3042a2 WHIRLPOOL f0d8fb2428f66cd53aac7f4e3839b2910fecf418d220ebce169864d7fdcf46bab306607bcd249b25ac393cdeb65dd185bef57b03734005cfb10a56fbd8031de2
 AUX cinelerra-underlinking.patch 287 SHA256 58aaec1cee53498c9fa16f1e565e4cc98a9cfcb93ca652c3c1919b0606bb802d SHA512 f29a4f770ea137a2609d2eb90a813b0e933800c57754a999d314c8278671d41d85e87b2d962386cf7505fd99a73522014ff6c3b086b2d7c7586c16d6b12150d8 WHIRLPOOL 55e2e1c25e3a4ed9152bc347faf41996baa36ce8159fdedcd3a47f144b045bb4b74a4a77be84501dbc18fe45db9e993e889f444224fa72ec4021de8d0e7d9fdf
 DIST cinelerra-20120707.tar.xz 22542220 SHA256 b909531fd1f5a11b85463ea06a62f703f2be67cbe79cd90c035d569a3019f5ad SHA512 af5ed92c223c1e0658ea3320aeefb568b94299ec14947e422f845b72bb271e7592142ac3d119daa9ce2a1b15e708d5ae2214a051f6d4ba67bd3ec733fc607171 WHIRLPOOL add200da410aafb3ad8bd6113061ba055a57978b4f9b717275b0c22375968e7aaa6c5c5a1d0f1ce2c4da3a630b9218fe2e5ae795b30bdfbfb532a3d793fd6065
-EBUILD cinelerra-20120707.ebuild 2458 SHA256 ce0dbff439973a798cf8daaae1f201a306eaac5171fa8ae547803c3232a4912b SHA512 31313bd28407dd30158c04188aa9aca7ac802077866666d69e4c9f33b42854f99b0538103739d19e481b3ea9dd3f9c2f1596024e076992944ff23ddefc109a09 WHIRLPOOL bcf887048567d56326a3dcac810fddc740675601c87244d57171a4c10777800746eb44e38e44f593b6a1fee9df3cec44f9f693dd7969f19c1b703e9dcd40141b
-MISC ChangeLog 14162 SHA256 d8175f62f01a63ad3e23b695486fbc1bfa4a7c017c8eb971bc202c121bdb6fa9 SHA512 f076191a09602b185c149b61968afe4d10158e8e6805c3ae0ede6cd3abc474f2844d0940c8604414c1a1d14676242bc04c7561533d5596f59c34e6382368c2cc WHIRLPOOL 00e01a55df01cbe799a2eb9d5906a45f17a98998fe9888173a2196490be513fd07ee6c4b1b8f744afdc25f86b2271a55b296746ce069de5d8a49b939a803c481
+EBUILD cinelerra-20120707.ebuild 2552 SHA256 0c8f262ade977077d2beb75137e5c7fda70694ed18ad3b904c982aefdbe45bc2 SHA512 a09b77113db7133b404e783dd1664b1160c3b4a64dbce9cd3f92fcfa76ba9b7a24927776776c9dc32c353896eee40ae7c9fde30f1fe9325876bfca0bd44e34a7 WHIRLPOOL 88d838fb80e5043490e0320660879a5074904df38fd9a100589a2a41ca2883559ad5dceb5c99a1cde692059abbfc022aa7cbe69f460c97c4f20cf4aee66a9063
+MISC ChangeLog 14414 SHA256 5fe231c8cafa1229a58e0decefa57dd782324ff68edf1878a5ca5809db08a8a4 SHA512 51fbaefc8567d7669a434baaecf9f8c4d3132c8488df7c2a569357861851989bdff416a8242d361395120d3dc85217faa317a3d61a5faa7edbc270a39d98be15 WHIRLPOOL 9bece6e307126bbeb9920360835d9dd72c47f07be028c83de7bdfc86424ab8e09bca52b0b4be8a2c50b1269c0d71008cf72c3db9e6afdc6ddf7dcc2c3c6d7d52
 MISC metadata.xml 159 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb SHA512 63ef497824a91cae0ce7ca0b384ac72ac8564b9996f0f9e64a1ba2cbb943c90ebade5a8dc6345ba281d907b8c4ff0b5941bdda95e10e9c507846a9dabbc3cfcc WHIRLPOOL 22ad7e39360e181eab700c06170690a79057d328ae61793ff195104bdce14dab0dc6ff7ec8e10d8f177ee5f1aa9ea2362f579404cb3fc4fa961562c985e0ce12
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIBsmkACgkQvFcC4BYPU0rQXwCgu1agoPAhgBfazwftz3G+E17z
-zqcAnRzXPWnzlW61pp4UGHMEiAPaTV31
-=zpqz
+iQEcBAEBCAAGBQJS80U/AAoJEEdUh39IaPFNy0UH/2M9MZjIOWrUVTgAgssdsY+p
+wgdUHKZ/gNyO9rcJIo9lBpvMuFFQ+JUJ26PPde8Y1SinAHTAatMYsRejqMpSJ7Sr
+MhF+0KBp9oCALKdlFyCaEkLMYK8dFDMnyyXVb6oNihV/cvpZiHT6XpC9h90+dlRB
+yfpuzQo8tQoe9RISD6WZztGbgeZwxN2jamEnLMzzNmmiNtEXoOOMEjBryU/xW9vq
+9A01HC3txy1V4cKHVcrN53+yiZdPj/3CHIF/VDK/ki14RLEwHRdAtlx5VdMBUVhC
+rK3ke6LvUZFtJHcJmaodKMhw/UvaO27WnhbL6pOlIrBnVM1i/sG/qd3IA/SFMJA=
+=Zhfb
 -----END PGP SIGNATURE-----
diff --git a/media-video/cinelerra/cinelerra-20120707.ebuild b/media-video/cinelerra/cinelerra-20120707.ebuild
index 34cfb19013f7..64defa3c4e9c 100644
--- a/media-video/cinelerra/cinelerra-20120707.ebuild
+++ b/media-video/cinelerra/cinelerra-20120707.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20120707.ebuild,v 1.7 2013/08/07 02:35:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20120707.ebuild,v 1.8 2014/02/06 08:18:56 ssuominen Exp $
 
 EAPI=5
 inherit autotools eutils multilib flag-o-matic
@@ -14,35 +14,36 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="3dnow alsa altivec css ieee1394 mmx opengl oss"
 
-RDEPEND="media-libs/a52dec
-	media-libs/faac
-	media-libs/faad2
+RDEPEND="media-libs/a52dec:=
+	media-libs/faac:=
+	media-libs/faad2:=
 	>=media-libs/freetype-2
-	media-libs/libdv
-	>=media-libs/libogg-1.2
+	media-libs/libdv:=
+	>=media-libs/libogg-1.2:=
 	media-libs/libpng:0=
-	media-libs/libsndfile
-	>=media-libs/libtheora-1.1
-	>=media-libs/libvorbis-1.3
-	>=media-libs/openexr-1.5
-	media-libs/tiff:0
+	media-libs/libsndfile:=
+	>=media-libs/libtheora-1.1:=
+	>=media-libs/libvorbis-1.3:=
+	>=media-libs/openexr-1.5:=
+	media-libs/tiff:0=
 	media-libs/x264:=
-	media-sound/lame
+	media-sound/lame:=
 	>=media-video/mjpegtools-2
 	>=sci-libs/fftw-3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXv
-	x11-libs/libXvMC
-	x11-libs/libXxf86vm
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXft:=
+	x11-libs/libXv:=
+	x11-libs/libXvMC:=
+	x11-libs/libXxf86vm:=
 	virtual/ffmpeg
-	virtual/jpeg
-	alsa? ( media-libs/alsa-lib )
+	|| ( media-video/ffmpeg media-libs/libpostproc )
+	virtual/jpeg:0
+	alsa? ( media-libs/alsa-lib:= )
 	ieee1394? (
-		media-libs/libiec61883
-		>=sys-libs/libraw1394-1.2.0
-		>=sys-libs/libavc1394-0.5.0
+		media-libs/libiec61883:=
+		>=sys-libs/libraw1394-1.2.0:=
+		>=sys-libs/libavc1394-0.5.0:=
 		)
 	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}