summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-07-27 08:06:15 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-07-27 08:06:15 +0000
commitcebb1d050103e7ec3c748867eec74ba14891b58d (patch)
treee7d4812be5dc94f125e31b945e6efd886517eb24 /media-video
parentremove old (diff)
downloadhistorical-cebb1d050103e7ec3c748867eec74ba14891b58d.tar.gz
historical-cebb1d050103e7ec3c748867eec74ba14891b58d.tar.bz2
historical-cebb1d050103e7ec3c748867eec74ba14891b58d.zip
handle existing release notes, bug #515118
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest10
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild3
3 files changed, 11 insertions, 7 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 5dfe696b1742..dc743ec5568e 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.763 2014/07/27 07:59:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.764 2014/07/27 08:06:12 aballier Exp $
+
+ 27 Jul 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+ handle existing release notes, bug #515118
27 Jul 2014; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.10.12.ebuild,
-ffmpeg-0.10.13.ebuild, -ffmpeg-2.2.2.ebuild, -ffmpeg-2.2.3.ebuild,
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 1a538a3e3e52..1dddb5bf55cf 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -22,13 +22,13 @@ EBUILD ffmpeg-1.2.6-r1.ebuild 10975 SHA256 9bd7c3e4794077b729c2b98a3f455fccb91ae
EBUILD ffmpeg-1.2.6.ebuild 8995 SHA256 f4c2793bcf14315fbdb7a210e86cb39747a2211a9d4f8aa97a79d26e4a44ed9e SHA512 9ae6b8785d8f11d0321f6dfb034dc630f23facfca1e96ad8e89d7ea704b3e4151728edef3dc247526697cf8254c75d1860774826440b7781be465d3a970a29ca WHIRLPOOL d0f08e038fef816028792ff064d8196f61fa0a5494bed33c68a6cc33c917ade86d98bacd07c0128cb6d321c6864ba34f8a8e65b633fff396e40b6506c221971d
EBUILD ffmpeg-1.2.7.ebuild 10928 SHA256 942543b32425110f4c90639bf9a7918207486151472fbf0de3f52761ad9ed139 SHA512 5b6d9b0bc0d7557497999b0d3f4fc1f9c6390d04c77a589aa509852adb046fef740b960eb6a617efc9c9e92596dfa89a197bd323e6cc603b560c45d8058870e0 WHIRLPOOL 1544976d97947819a2b28f06fdda49bfb7b1bf3e612a0c25485d96b386287ab9bb6fd4f7c1dbdc2f49d2fb8b25177a11bf0da0d89231997efb088dd35953bc0b
EBUILD ffmpeg-2.2.5.ebuild 12544 SHA256 b9437983f6eea175538e94a3e5417f4eaa73897ca5803305b1b4ff6c927e2b45 SHA512 0587223cc3a37e5e720fcf3e9dd6a9751dcc462686e216d1bef899e2523485962af6a3b9954c0f26f3888811d1a2ddb49fc86de6680ea2e79733cdf2b5935258 WHIRLPOOL 5974af7a051c794aef79a7dec4e489e6541d1d8ea85df47d8169a8cca4df9130de6cfff376989f9f328364591d7d7dd98e200c92dc8295b82c61548562dc58fa
-EBUILD ffmpeg-9999.ebuild 12547 SHA256 e53776ad09663531b41892def6293a5db97422c0a0deb4a0dc4dc6ba2fd3534a SHA512 ff2de1fa83030c596fde32eab3472b180efb200f4778e5238a008a8a2625d0442a8f88bad497ad75dbc5c1f98419b1d87efbe13284672b1f79d901660cfc059d WHIRLPOOL cbf003f6f9bbad48fd46b8af9f8435d325aceb76136c88962290e3fa3dea96548d7488929b1d1836ed276a4ec032f8f992613ad2919ba3634631ccd820d13d7e
-MISC ChangeLog 106062 SHA256 0d4e0f639570e6c518ee2200085316c9e3ae2abae9341e9eb4bc2d0699ef04f5 SHA512 f47c6efd5219e53c98979e762d14035343c17424c0f746956c48193588c9b13e72ec719ca6c6e56039460cf7a1c19a3fb8f2983d0ea69242d697567a772972df WHIRLPOOL 5af6e20cfbc214ab8847830ef073dce13981752e9694a48998d4c28e926d29d7eca6cba69c890be6b42cddd8d316d0087089afa9aca692d493b500b23333a074
+EBUILD ffmpeg-9999.ebuild 12606 SHA256 b6457093f4aa9c08122b811f40eaa4dd20bb645981ab033b447859715aaabdbf SHA512 95c051b688bed2589931f3a0343c9586d83d6b09be33322dfbf98cb82786e47ea145acea88db40dd3f884db0aead83f9d70fe52dc729741e61253079d43697ab WHIRLPOOL 2df40249feb5a45efdd1b902bfa948531bedaf59a099e642ea6be7982952a7edf6bc1d2f5f19bf4948260ac15f7059a6b7f420b52df343aae72d44a360e74ae5
+MISC ChangeLog 106180 SHA256 9c2e3571aff3f2f1332284913945243ab4d945d408ebf47071372117df2a170e SHA512 707e42dcad9eaf8cc97f46c331461a056ae54abe3a151fa2e00ca3b1d5ffa633b24394aae1006a86237ddd3d0dfd8a24b3021d1fdc96402182c8595be1db7bd5 WHIRLPOOL a3587b6cd4293ac40b2c656301c313e7b8dbb3e0f138b4229d69b2adfdca58c607552ef1746f87fb2ee622362de229175f18ae3cdd3ed1631e821c3c2cfcee1e
MISC metadata.xml 5340 SHA256 010fe23d4fce67e3ebfdba2d3d0e4c4ecf7cb12885397c2058096955733f19a3 SHA512 8b1e55fa5896382e700ff61be266b635b2f3873ac7e29f331cc3a31be683cf9b2e24d93b52cd109149dab2d98ae58f5151dccdc8e6f48f2abe56382a11a471db WHIRLPOOL 420bfe98b7d0b58cdc56f76cdcf74fb1fe69df2ec6501d1444202786465ad63d255ca1a63340d52bb4586b19b1f14fb1ca859f8798071644c95f1d200cd281cc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlPUsXgACgkQvFcC4BYPU0oFYwCfVXFy8BN8fCGkMN9xdS9vx8mk
-z7oAoMu1GP755QzD0lbgMhVfrIfNMHRF
-=eG/l
+iEYEAREIAAYFAlPUsvUACgkQvFcC4BYPU0oragCfTCN4trTbUyVmFb1uS4Ya/D0K
+aSEAniJrwW/zgk27SHgHAq33Fvd9Jgt+
+=H4+I
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 0055c0d2df80..6b2117c89a41 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.160 2014/07/06 10:09:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.161 2014/07/27 08:06:12 aballier Exp $
EAPI="5"
@@ -363,6 +363,7 @@ multilib_src_install() {
multilib_src_install_all() {
dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+ [ -f "doc/RELEASE_NOTES" ] && dodoc "doc/RELEASE_NOTES"
use doc && dohtml -r doc/*
if use examples ; then
dodoc -r doc/examples