~ification, it's not ready for stable (it will soon), see bug #164445 [+collision...

Package-Manager: portage-2.1.2-r5

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 0dd7c26ec393aa9eec38a4e7f934dbf0dc371271..42968d60916b03c6ea994b88ce75b8d1297428cf 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.178 2007/01/29 19:58:55 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.179 2007/01/29 20:44:15 lu_zero Exp $
 
   29 Jan 2007; Steve Dibb <beandog@gentoo.org>
   ffmpeg-0.4.9_p20070129.ebuild:
   Rekeyword ~
 
+  29 Jan 2007; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20070129.ebuild:
+  Put it back in ~, not the right time, closing bug #164445, thanks to
+  Sebastian <sebastian_ml@gmx.net> for notifying.
+
   29 Jan 2007; Luca Barbato <lu_zero@gentoo.org>
   files/ffmpeg-libdir-2007.patch:
   Make the patch working everywhere, thanks to Markus Trippelsdorf

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 5cb5ab9096176308510143de9362fdaf12fd27fb..45a5c9fc2c7fe499533eadfad1c1a68be302dced 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -48,12 +48,12 @@ RMD160 46f7d8e81ab42368dabb6e29dec29a02d780055b files/ffmpeg-unknown-options.pat
 SHA256 eb6f32617a42a9f55408ac64afd62c938aadb40bcf72c060a24ef5c426b4981b files/ffmpeg-unknown-options.patch 414
 DIST 26104-510.zip 291836 RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca SHA1 b22dbe895991c23fad446c3c4ff7b6db12673778 SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46
 DIST 26204-510.zip 246663 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd SHA1 9ca910295c2888fba95a98da83762a22aaf34651 SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991
-DIST ffmpeg-0.4.9-p20050226.tbz2 1501308 RMD160 904b4349fce0ea18afc6da7bd38ad350f71707cb SHA1 a3e1f9a60708fb0ed1ecfa235d0ce098c79aca86 SHA256 308ca9e70100bab109831805ae81c29efc8aee529444f886dd89e4e3f442f08b
-DIST ffmpeg-0.4.9-p20051216.tar.bz2 1719827 RMD160 7be198931c92661456148dd7ad0f3013f1973b53 SHA1 b1375c0b1dd6cad3d5dd82b1104743f68c6767be SHA256 e68579868df0fbfddd1e8400ad9a35e5f483af19c203972890bf09652b993394
-DIST ffmpeg-0.4.9-p20060302.tar.bz2 1759647 RMD160 e1e2c826c95d2eddd06d91b7df8fba1a3dc277bd SHA1 c679e2fd24737179b4009e59396d647c22adaac1 SHA256 17bd539cc1244a00e0de1d0d4ae3ea731553a8405be616bfc79858496633391d
-DIST ffmpeg-0.4.9-p20060530.tar.bz2 1807070 RMD160 84d6f692cf34bb9413d9d4934bfab478c7c14658 SHA1 6df0134d9ce939b9ae1fbd4525755502c9d227db SHA256 e24b7f84801f679be8f24fcd38e1622ab06ebb97d001be67862135e78ac599f3
-DIST ffmpeg-0.4.9-p20060816.tar.bz2 1948118 RMD160 eb8e076f75c32b7a4874009451c7cb67c32f2fc2 SHA1 3ba0b79eb7bf77895b1b9d074ec825e8ab6ec018 SHA256 20e397ed778e23ae6eebe17d7b91839591512a3146629a2fcc68e0729b2b03bb
-DIST ffmpeg-0.4.9-p20061016.tar.bz2 2009859 RMD160 b41eeb50ef91e5f7a44f725d29d3b9f8104dd62c SHA1 2e15183755378b4089264be3f8865e24eeaa39dc SHA256 99d18860b5db8f3218481c3c977ad63dcff285f193740f31ae5c8e3cac79d531
+DIST ffmpeg-0.4.9-p20050226.tbz2 1501308 RMD160 904b4349fce0ea18afc6da7bd38ad350f71707cb SHA256 308ca9e70100bab109831805ae81c29efc8aee529444f886dd89e4e3f442f08b
+DIST ffmpeg-0.4.9-p20051216.tar.bz2 1719827 RMD160 7be198931c92661456148dd7ad0f3013f1973b53 SHA256 e68579868df0fbfddd1e8400ad9a35e5f483af19c203972890bf09652b993394
+DIST ffmpeg-0.4.9-p20060302.tar.bz2 1759647 RMD160 e1e2c826c95d2eddd06d91b7df8fba1a3dc277bd SHA256 17bd539cc1244a00e0de1d0d4ae3ea731553a8405be616bfc79858496633391d
+DIST ffmpeg-0.4.9-p20060530.tar.bz2 1807070 RMD160 84d6f692cf34bb9413d9d4934bfab478c7c14658 SHA256 e24b7f84801f679be8f24fcd38e1622ab06ebb97d001be67862135e78ac599f3
+DIST ffmpeg-0.4.9-p20060816.tar.bz2 1948118 RMD160 eb8e076f75c32b7a4874009451c7cb67c32f2fc2 SHA256 20e397ed778e23ae6eebe17d7b91839591512a3146629a2fcc68e0729b2b03bb
+DIST ffmpeg-0.4.9-p20061016.tar.bz2 2009859 RMD160 b41eeb50ef91e5f7a44f725d29d3b9f8104dd62c SHA256 99d18860b5db8f3218481c3c977ad63dcff285f193740f31ae5c8e3cac79d531
 DIST ffmpeg-0.4.9-p20070129.tar.bz2 2086323 RMD160 b0895a2d3927c769b7abac1b91d66e7f78586d4f SHA1 12d9e43fd7ee222be4f5b8c58bb63c9056ab3df3 SHA256 107a9c7bfc19c2fde01465d2cbab8082a0e4c1197ff28658aa14932e1be7914f
 EBUILD ffmpeg-0.4.9_p20050226-r3.ebuild 4383 RMD160 d27a79f1f99afd17f9ff01da0c1693afd12892ee SHA1 edf3ad8060e5bd007ed6bef834fc3f9223617f97 SHA256 f96358add36c2f9dcc38cc90327f5ce1b4f1cf18b1c7810c3d149ec47162322b
 MD5 3332432b29fe1c0a8d25c9c7d1eba931 ffmpeg-0.4.9_p20050226-r3.ebuild 4383
@@ -83,10 +83,10 @@ EBUILD ffmpeg-0.4.9_p20070129.ebuild 5614 RMD160 da72a70c8fa408c0af41086e1ef79e4
 MD5 7c791f963a343ce25ee37fff762057a0 ffmpeg-0.4.9_p20070129.ebuild 5614
 RMD160 da72a70c8fa408c0af41086e1ef79e4fba3eff1e ffmpeg-0.4.9_p20070129.ebuild 5614
 SHA256 c7ffe052297af9adf0bc22e54a2d5ffa45aa510c6e01adab7286602e23f79805 ffmpeg-0.4.9_p20070129.ebuild 5614
-MISC ChangeLog 26814 RMD160 e1e20a85f63bf99a071ca44055dcaa3b2691cabf SHA1 0473f283a3f6b4f2b9599e94aacf500e34a2669c SHA256 0f6e123749b612adf53abd5743b1cd8ffb93e2524a3bdeb53df33c5e06649a97
-MD5 ee55030859cd31fd686ea7eaaa2107ea ChangeLog 26814
-RMD160 e1e20a85f63bf99a071ca44055dcaa3b2691cabf ChangeLog 26814
-SHA256 0f6e123749b612adf53abd5743b1cd8ffb93e2524a3bdeb53df33c5e06649a97 ChangeLog 26814
+MISC ChangeLog 27018 RMD160 6863b155da2d6b443cae49a6750b78be52a405ed SHA1 724562f8ceb79dc7a100cfc6aad76315fde33ade SHA256 1135e79a6f57fcedc44c091ae1e6fb704dca64dd308cf5951188b87970030226
+MD5 3790146f2b87a4d8b81e101891f7ecfd ChangeLog 27018
+RMD160 6863b155da2d6b443cae49a6750b78be52a405ed ChangeLog 27018
+SHA256 1135e79a6f57fcedc44c091ae1e6fb704dca64dd308cf5951188b87970030226 ChangeLog 27018
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223