summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-05-17 21:12:44 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-05-17 21:12:44 +0000
commit075223a8e6d77c9f01e2e9f9afebc1a6bbb5dac2 (patch)
treec07ccc11bac9c0287bb0040f3f99ef9fc5bbcee3 /virtual
parentFix last change differently. (diff)
downloadhistorical-075223a8e6d77c9f01e2e9f9afebc1a6bbb5dac2.tar.gz
historical-075223a8e6d77c9f01e2e9f9afebc1a6bbb5dac2.tar.bz2
historical-075223a8e6d77c9f01e2e9f9afebc1a6bbb5dac2.zip
typo fixes
Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64
Diffstat (limited to 'virtual')
-rw-r--r--virtual/ffmpeg/ChangeLog4
-rw-r--r--virtual/ffmpeg/Manifest18
-rw-r--r--virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild4
3 files changed, 13 insertions, 13 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index 7c2802befb3f..d3473501882d 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,9 +1,9 @@
# ChangeLog for virtual/ffmpeg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.37 2012/05/17 21:09:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.38 2012/05/17 21:12:44 ssuominen Exp $
17 May 2012; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-0.10.2-r1.ebuild:
- || ( ) block for allowing media/video/ffmpeg, media-libs/libpostproc and
+ || ( ) block for allowing media-video/ffmpeg, media-libs/libpostproc and
<=media-video/libav-0.8.2 as providers for getting postproc wrt #416407
17 May 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.3.ebuild:
diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
index 18b175f02d64..9181881b565f 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 811 RMD160 52e71711a154a36383a19b4cfed078663eef84ff SHA1 691ede892ae85b5425c69b568cc390c4429196bb SHA256 9804b19d46c4bcd277da4e737f9abd2d8de14c2bbd767f71f3dc097232a49939
+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 48fb675facd9a6805c62eb5a21a7ba98b5e0026d SHA1 d47489c5ea35ab712cfa02da88b8a7a59671c467 SHA256 804fcd5dab5abe3faf4a255a503254f27153d759868f77ef40bf535192866e5b
+MISC ChangeLog 5899 RMD160 092f80b79052d08ede011468e1ae4db622fcc37d SHA1 e24108542e2c8464c24b4db446fa4711e0ab247c SHA256 0904ddc6810e32a78dd9b52163e6a9bd0a6d3d2c9d21ea0eb40dbbca885971cf
MISC metadata.xml 444 RMD160 fc60036f4c1ac0da29830090aa021ccc2e9cbe98 SHA1 82f158dc39f1300bf473282a3ce916534f0e44f1 SHA256 cef0fff52fc751969934693172e0c5f23fea1bddb44b0dc0ed68cb7bc00d1770
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJPtWkCAAoJEEdUh39IaPFNJrUIAIcFhPmvB1Th1LulLlf8kDKM
-dQ3gbK8dVTW0c90CRhiPE1kSpBnJOpuhrqiCWjWRo99zW99Hq7olNjNvokfM4yCV
-w9G8O6gitA6AI+EcpQ3z65AcZs7EwLa15B7AjHGT4vq7H0guNTAIYaUXFLSUYstM
-LztPU90S6lVHrAG1EgElNmY0urwYsnABTJpKr+KPPbeMSvCOxEiBZB3ECYfwyK+n
-UX2/mxlQsHpX26KqCiVCHLriMejcxpwd5rY7SDTRuIGeLmp0Yj1QvcCg5pnJsZlZ
-Zoa8xxYjsk2prgg4sEZ0jnaANBfVQNqAg+wGvwgSjWIMbthVHtI929l3qvG4b3M=
-=Qn84
+iQEcBAEBAgAGBQJPtWnJAAoJEEdUh39IaPFNs3QIAJfL46Me9qiN2KqJ1yvCvTcu
+DkGTxmmmE3UQDiZoc01Sql+uz7nV8618rNfA9GkYRzhCJ/XnQKXW8psmX69TQpbW
+wAk1um13O4t4V0N5p5QuTJ06ltNyRuMWRNRqX7bTfaddcMwDS7UIc6kYEq2VkauG
+9bdIhaf3ZWxeGfZAD2jL0j5q/hUshyklHjedlXc/FK2GTB36rglpCtUj5eETh8IB
+K31TeyzUKqPNBgeVt+cRRFb0mZUcgN+qbM5n6rx3h+hsMhnj0kXKYKfjST5rEk/l
+FIRXO8yfMmg6v6+WHeDyiwXK8Sv3dAHDdxawpi6wydlJw35NUhW6vJXryr25Nww=
+=MQx6
-----END PGP SIGNATURE-----
diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
index 13999dfc3b61..d94543a50b48 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.9 2012/05/17 21:09:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.10 2012/05/17 21:12:44 ssuominen Exp $
EAPI=4
@@ -19,7 +19,7 @@ RDEPEND="
>=media-video/libav-0.8.2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=]
)
|| (
- media-video/ffmpeg
+ >=media-video/ffmpeg-0.10.2
media-libs/libpostproc
<=media-video/libav-0.8.2
)