Revert libpostproc entirely from the virtual wrt http://bugs.gentoo.org/show_bug.cgi?id=416411#c16

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 18 insertions, 22 deletions

diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index d3473501882d..ee067749b842 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for virtual/ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.38 2012/05/17 21:12:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.39 2012/05/18 00:21:34 ssuominen Exp $
+
+  18 May 2012; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.10.2-r1.ebuild,
+  ffmpeg-0.10.3.ebuild:
+  Revert libpostproc entirely from the virtual wrt
+  http://bugs.gentoo.org/show_bug.cgi?id=416411#c16
 
   17 May 2012; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.10.2-r1.ebuild:
   || ( ) block for allowing media-video/ffmpeg, media-libs/libpostproc and
diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
index 9181881b565f..dbc6e3b6bc18 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD ffmpeg-0.10.2-r1.ebuild 821 RMD160 f311d11b7fb8163793886029f31a957ea438e2c5 SHA1 d0ae50d9809f45935b01cefd2fb846f185006c9f SHA256 57a48db667dec8ecb37e206a69757475621e64d8d831143a7d9c053ca4d41b74
-EBUILD ffmpeg-0.10.3.ebuild 800 RMD160 4a1f0f198dafb9fd827fc5a64c7233d71bc3cdc9 SHA1 dee225298f1bb13dd99ac7b821ce3a4840c72ad5 SHA256 570cc782f09d1fe6f848793076ac09fbaac7af27f71f9c2050059b3b28422695
-MISC ChangeLog 5899 RMD160 092f80b79052d08ede011468e1ae4db622fcc37d SHA1 e24108542e2c8464c24b4db446fa4711e0ab247c SHA256 0904ddc6810e32a78dd9b52163e6a9bd0a6d3d2c9d21ea0eb40dbbca885971cf
+EBUILD ffmpeg-0.10.2-r1.ebuild 729 RMD160 6f5cb0a1f3e09df787c29d90845e4794b6a81eb9 SHA1 ef9576ddc850725156e63ad91a112a21f367ed6e SHA256 72f4f73919922d858dc0c80b34ad6a077f097d0a09868e81d276bbd2cfbec56c
+EBUILD ffmpeg-0.10.3.ebuild 737 RMD160 964780433dfa1930af02b24cd76f4e7cbdd216e2 SHA1 d2e5b2f0533268e409358148c9f8a66217f16428 SHA256 b5ddd924ee21d3cc129663ad344ee8a0824fd7a1ec5cc26d14805401c5f1f15f
+MISC ChangeLog 6106 RMD160 7c8d1f2aa64232a33c369672578c6874bcf43b1d SHA1 b13037776729569a837144e89823939dcd67a372 SHA256 ed944f377100e243fb68e071360985ba7247714d2e48515d3f01261cc4d0596a
 MISC metadata.xml 444 RMD160 fc60036f4c1ac0da29830090aa021ccc2e9cbe98 SHA1 82f158dc39f1300bf473282a3ce916534f0e44f1 SHA256 cef0fff52fc751969934693172e0c5f23fea1bddb44b0dc0ed68cb7bc00d1770
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPtWnJAAoJEEdUh39IaPFNs3QIAJfL46Me9qiN2KqJ1yvCvTcu
-DkGTxmmmE3UQDiZoc01Sql+uz7nV8618rNfA9GkYRzhCJ/XnQKXW8psmX69TQpbW
-wAk1um13O4t4V0N5p5QuTJ06ltNyRuMWRNRqX7bTfaddcMwDS7UIc6kYEq2VkauG
-9bdIhaf3ZWxeGfZAD2jL0j5q/hUshyklHjedlXc/FK2GTB36rglpCtUj5eETh8IB
-K31TeyzUKqPNBgeVt+cRRFb0mZUcgN+qbM5n6rx3h+hsMhnj0kXKYKfjST5rEk/l
-FIRXO8yfMmg6v6+WHeDyiwXK8Sv3dAHDdxawpi6wydlJw35NUhW6vJXryr25Nww=
-=MQx6
+iQEcBAEBAgAGBQJPtZYLAAoJEEdUh39IaPFN6mIIAIlxGBnOmd5y2fatC1yzw78P
+JL86kigq2I96w4lMFB67bJn5OfETJFU3e7vTuZLytnoyUB2/z5yCqcDuca7P8HvH
+LJ6gqA11zwr9Az6prONpasnqB+rU80Zmrg/py7uTBxNq9NPbTOG2ZyKxMo8WH1ii
+QmH+tHRvm6q0M+JHwA6wgaPPVZ5LJjNGrzai6VymM/+Wb7j/k58ZvDrBEHGWyIsE
+mfVjYjbobbQ2aBdAv29nMf0JIqpLg+KM6OqfCuhU0jD/crCDZAGAV1Lb9sLBAVLl
+18zBIaMlLxBtISoWP5ONKcJX7mVEbTP+3Q/64+1SxkZIeODp21SC43sUtfSvrM0=
+=0JWC
 -----END PGP SIGNATURE-----
diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
index d94543a50b48..914e8ed83f5d 100644
--- a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.10 2012/05/17 21:12:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.11 2012/05/18 00:21:34 ssuominen Exp $
 
 EAPI=4
 
@@ -18,10 +18,5 @@ RDEPEND="
 		>=media-video/ffmpeg-0.10.2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=]
 		>=media-video/libav-0.8.2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=]
 	)
-	|| (
-		>=media-video/ffmpeg-0.10.2
-		media-libs/libpostproc
-		<=media-video/libav-0.8.2
-	)
 "
 DEPEND=""
diff --git a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
index 8d80c23fa581..873adf5e3a4e 100644
--- a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.2 2012/05/17 20:45:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.3 2012/05/18 00:21:34 ssuominen Exp $
 
 EAPI=4
 
@@ -18,9 +18,5 @@ RDEPEND="
 		>=media-video/ffmpeg-0.10.3[X?,encode?,jpeg2k?,mp3?,sdl?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
 		>=media-video/libav-0.8.2-r2[X?,encode?,jpeg2k?,mp3?,sdl?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
 	)
-	|| (
-		>=media-video/ffmpeg-0.10.3
-		media-libs/libpostproc
-	)
 "
 DEPEND=""