convert to RESTRICT=bindist, bug #541588

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 1042e40265e617b4dbeca36a1b886fed6fed6ebb..467f443e0c21745d9a15db01eecf6b6eacb80d01 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.837 2015/02/20 11:17:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.838 2015/03/05 13:50:46 aballier Exp $
+
+  05 Mar 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+  convert to RESTRICT=bindist, bug #541588
 
 *ffmpeg-2.2.13 (20 Feb 2015)
 

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 04c10778c139b1f50c3de4c50f531e25661e12dc..21876fb98aa284d087c92ad2d820ea30f1201849 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -24,14 +24,14 @@ EBUILD ffmpeg-2.2.12.ebuild 12745 SHA256 b50acebb37c7d031c4b089a5321dd8b2a8e8bab
 EBUILD ffmpeg-2.2.13.ebuild 12745 SHA256 af8ec4961fdac80d62b54141fb3c7bd9eeaf2198daf5fe9d8a702c5b429b6286 SHA512 0b608f01152c023f3e46d46130367e5ae8026d66012eb39750e0e7e995fe81c8491eed5a3a2c225bbe0594bda61dcd7c6ef42f83f7d1f63d5dc4d626bcab8971 WHIRLPOOL 7619787889802809318aeb95466e96a0faa09af85839e11f49de28ea8c8af84df6edfdfe4ad560d2fa8880a230df72013ed713e006d38819886e35983cf2fde5
 EBUILD ffmpeg-2.5.3.ebuild 13170 SHA256 2a15f3059c17573de22426f05d4ac92816f74b58609c015bbe048713bc554a3c SHA512 e2942192a9fc9d9f56f7ee67140b68443fce54897b2a9803953d0754d186a4c743151a9dc6fca2dc829e471061caa6ecd56636e5a104399a327b054e983eef1e WHIRLPOOL b04fcb70986854c6f96c4cef296d207f49a8019c88ab5186db9ea25604c109acc0b3e565adc81a15eac7a0e9c840b15c53fca15709f0ca9991af1b20f379f22e
 EBUILD ffmpeg-2.5.4.ebuild 13172 SHA256 5d21a09da72c7105ca378a41866da07d6d16e0a31b18820c5fb64cec090839a2 SHA512 8e666d2b6c60d5c00c2756b40884212ab4956ef2eb58c52066c4e896abf63d7353ed7002b3bc12319cc1df99fb32011253b80b94209fad05eb613148b68e559d WHIRLPOOL 72bf0020aec52fd1fea88f11505845a6916f8708fbd647782c4df22df4b9d9be9dae40c0b83023aa1f8a17290a4e795d47fe7de0e78d159a48e3fda5fcee3953
-EBUILD ffmpeg-9999.ebuild 14622 SHA256 362503ab542f51f221646436836fce9ad3117d03e51766fd18c7ecf0b520ef99 SHA512 03b4b9f19e909271b468cc21b08fc03248baf7530de98888c84aa4be0036ce038da536a5b239d33b7d7d682e03401ec9b307595e28d8543ae5c351c3c0151f7c WHIRLPOOL abcf2bd563988d970a6e885f405addafe84c4b09800f1cbbcb9c343c194dc6172cec07ddbd3574bb810bd4f7228f913e98c756af70cada5757f5d8a784443aba
-MISC ChangeLog 2776 SHA256 756778c9dcc6e7300bd28ff859eac5cb9af8377a61b2ece258cc5242e43aa014 SHA512 4199b47d4eff332e3c0f0e7d7e44d27ff4f19f1ac341fdd23aa8e456965ca9021313b7b0294618fddad7a7bcad415acd4b5471f7b8e307ad9464b6af863eb3ef WHIRLPOOL 664196576640b86c219a3a1541ee300758bfffc5e49c7f8e776dfef4ea5b40e53bf7e696d0a2d2f023b75ec4f9a899960997dc2f5c7f158c197fbd07ee54be81
+EBUILD ffmpeg-9999.ebuild 14658 SHA256 dffb9fc5e822ce58c2bb8f802eb700c8db684d4cccaa29717471acc75cb9286a SHA512 805c788c25a2690c7658b13a9d8c58e180b3c223481b44ca2838b3776bf568cfe9bad72d86a1e3c63b8011a5f29626b1431d6b3a9e06fc9780c06839a83f15c4 WHIRLPOOL c4e374bc75eefc249a570aec137d6fb4b430118286fb2961e43e2c5d607fa6f817e75b594d0f4ca85391e09e7fc9391d1496f2124fffc7184765d2acd3f15647
+MISC ChangeLog 2892 SHA256 0e121daf307b97442de2f88bd2c0890bc0bb8fc378ba725e35e37d7829cdee4a SHA512 c014cc6398913c0a7cfb5e78b9d4065459c88cbe6d2d8c4ff76eb7ffee98133807fa1abe47bcda50918ece76c165e1ed1b8ce31004d0c51d9f27dc31792fba7b WHIRLPOOL 4c29c3cae4d1d7ded8d5de15dbbb8ad8d7d4c81f9edbb9fe9ef492cf40c5a2dfc1087d09e5830d583609a06c246a27936aa6c00550f9a40ebcd5f53812c2f07f
 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
 MISC metadata.xml 4422 SHA256 2284bee6bb2e082a84e31f78adc599ecd9bd560476a4d236ad5c3e4b018a0b48 SHA512 e4eab5b9d72b45de9e9d7ff201e38b9177c0ac4bb6862bc9efade3196964c24690279838cfbd7e3df6072bc82d82de262dec6a4228ae0232d79462b9f282ccee WHIRLPOOL df4b8d518bcec2f9de5f65c7e79444edb63ae700b9f36917692c20085c3b326e34d7e50a1fbefc0c0a87412e87cc7a556b3859d6f3817cd6ea1d8bbaed572ff5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTnF9EACgkQvFcC4BYPU0o/IQCfap2ecKg6Ct9i9ZYfLi22fvyF
-nvMAoI/heUavtq/M0ZA9Zz8btlAp3MMd
-=ZN+N
+iEYEAREIAAYFAlT4XzcACgkQvFcC4BYPU0rNswCcD5Hn8eGKjIecNwcBPxJ1M/YH
+NXMAoJnb7Ktwxwjfn7HUgVFaIL5KkSy2
+=xExA
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 7efc3318a299f329a274c0e8995252c6e853468f..03bbd47b45256bbbed12decfadc3af16f5e95051 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.185 2015/02/18 14:36:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.186 2015/03/05 13:50:46 aballier Exp $
 
 EAPI="5"
 
@@ -95,7 +95,7 @@ FFMPEG_ENCODER_FLAG_MAP=(
 )
 
 IUSE="
-       alsa bindist +encode examples jack oss pic static-libs test v4l
+       alsa +encode examples jack oss pic static-libs test v4l
        ${FFMPEG_FLAG_MAP[@]%:*}
        ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
 "
@@ -269,15 +269,15 @@ GPL_REQUIRED_USE="
        )
 "
 REQUIRED_USE="
-       bindist? (
-               encode? ( !faac !aacplus )
-               gpl? ( !openssl !fdk )
-       )
        libv4l? ( v4l )
        fftools_cws2fws? ( zlib )
        test? ( encode )
        ${GPL_REQUIRED_USE}
        ${CPU_REQUIRED_USE}"
+RESTRICT="
+       encode? ( faac? ( bindist ) aacplus? ( bindist ) )
+       gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
 
 S=${WORKDIR}/${P/_/-}