summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest10
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index e3a3e290d443..82e7f976bd48 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.416 2011/06/21 13:59:29 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.417 2011/06/22 18:44:50 aballier Exp $
+
+ 22 Jun 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+ use git-2.eclass
21 Jun 2011; Tobias Klausmann <klausman@gentoo.org> ffmpeg-0.7_rc1.ebuild:
Stable on alpha, bug #365273
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 112d962791ce..9b68005fe2c8 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -11,13 +11,13 @@ EBUILD ffmpeg-0.6.90_rc0-r2.ebuild 7945 RMD160 2e6f2473b90d3e74ce733797908172618
EBUILD ffmpeg-0.6.ebuild 7782 RMD160 7dcb53dfd7bed74aa95a6813cad6c55f9fc7f062 SHA1 92d32ee520b6125b1e825bb98f3731cdfb9918c8 SHA256 ba710a4af02900b36fc1ef8d4a60bfb9a216040b3974a2394c1e8e7cec5ef52c
EBUILD ffmpeg-0.6_p25767.ebuild 7911 RMD160 d573b7275c7d72baf655b3ceadf136d43d2fd5ee SHA1 5e6a9b938d283187120148095ff8621d4bd82ad7 SHA256 387073c421106fa9a2f14e71cdba1524d87eebe5b1fb4ef505908dafb0cd0bf8
EBUILD ffmpeg-0.7_rc1.ebuild 8226 RMD160 9f4e6e1bfb78c765e3a95f8037aba5cf741f8f59 SHA1 fc43f72781ebc2e373071ee98d1b6414ec5608c1 SHA256 2d11dc31a224250c07b87ee94e4603d581972611ad55c3dc37ddfdfa8f365fdd
-EBUILD ffmpeg-9999.ebuild 8238 RMD160 26123a557860016d70d1c40195648dbed26dd292 SHA1 c246860cb2f6f61e1a55c0c9e7f64ac465a81fe6 SHA256 ba0908e6b40886a37d8dc34b1877921b2ba245fa8f467f92e3a2b0525ba094d6
-MISC ChangeLog 61378 RMD160 25267a711ed3ae5b5ec5d078ce53efa9f58a6b31 SHA1 0a3d182e5ca71d02f5450eea1ebf2afc8b55a9e5 SHA256 06e41d24e2ed3d88f197d1ef9eb8f5716196326d03d97aa1b2b72c7ba9daf915
+EBUILD ffmpeg-9999.ebuild 8240 RMD160 4754278440462d0234b1faab23002b4222767f88 SHA1 0a8975dda0fa5abf8b81a6b58f6cb090915919bd SHA256 0ee732fc314c39a3f1812b690332f4d9bdbb24387cdd0208e6111c2c0f5e8d13
+MISC ChangeLog 61470 RMD160 3ccebf6c45da85455f4e0e7800bfd25602623b01 SHA1 e9caf730f59d463807a4cad56c881a22cb53c6f3 SHA256 e5df95751052cbfcfbe138eee374297012eeee15cf8e535059bc3199d7864431
MISC metadata.xml 2502 RMD160 7bae5e66cd6f15e3698d0a3cf08b5a3f653b4a25 SHA1 9d036b3eabb7a94a70a54d4c23d7efe0949817ff SHA256 fc5f64eea8d69b93f35e7c8a402d6322c46409e8cc5579a4b96f0fa50ea728ba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk4Ao8YACgkQA+4Doc5dVOh4LwCfTG7KtTwbGZM+8/H42UMumLR4
-zE0AoIauzAi4InD3kBWXQ2Zh73wAGFd7
-=ugwF
+iEUEARECAAYFAk4COCcACgkQvFcC4BYPU0oNtQCYl/kljJhHCFLSg7gXAWSNhiqF
+DACgk/lPN9fqLak+lCHjV9rmWFSQyv8=
+=JVJ+
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 412f80d55a71..9840f811e5bd 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.42 2011/04/20 14:25:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.43 2011/06/22 18:44:50 aballier Exp $
EAPI="2"
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git"
+ SCM="git-2"
EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
fi