From ea7dd9f8fbaad1e27559871ade839d39235a2228 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Wed, 18 Feb 2015 14:36:30 +0000 Subject: [PATCH] cosmetics Signed-off-by: aballier@gentoo.org Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A --- media-video/ffmpeg/ChangeLog | 5 ++++- media-video/ffmpeg/Manifest | 10 +++++----- media-video/ffmpeg/ffmpeg-9999.ebuild | 13 +++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index aebee7c30bd2..aa371ebb18c3 100644 --- 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.835 2015/02/18 14:28:33 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.836 2015/02/18 14:36:26 aballier Exp $ + + 18 Feb 2015; Alexis Ballier ffmpeg-9999.ebuild: + cosmetics 18 Feb 2015; Alexis Ballier ffmpeg-9999.ebuild: rework a bit cpu features handling to pass only relevant options to configure diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 2d9a46b7fea6..5363cb54460d 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -22,14 +22,14 @@ EBUILD ffmpeg-1.2.6-r1.ebuild 11090 SHA256 04e0bd9aac8037358acbcbdfde2f50ec13a3d EBUILD ffmpeg-2.2.12.ebuild 12745 SHA256 b50acebb37c7d031c4b089a5321dd8b2a8e8bab93a7066bf10145b2e0aaf247a SHA512 2b421d0c856c6fcefc5b5be0ec68cc3ea32fb3d85ec1582d047a8a027bd71d903ca689f419e97e42002f8516f97b0c036212a8de18b7cf0c83884a3a2ccbf603 WHIRLPOOL edc9c1f64789606ab09c0e59bcae412568317704c2eb60e60be38eec5f011cb3bbb69849237e5979bc2fd6e30e8646feb76cafde3f0a8daf0ebe8c8c4bd06e97 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 14627 SHA256 7b1839f252c1f1e0198f5f6a01ae8aa23819dc13885786f627f4ea4b5045a363 SHA512 7dad7cbb7fe343a5fa1e26cbbf8197d4e475858a0a6219c4bdbc869ad9e8ae2971babf2c046f10df7d125a5ddca9f53f0252458f85512f2bd5684b543d9765b3 WHIRLPOOL dbd8b1f4d7a0195f75be2c0677ea3395670c1cb677e4d1cb2aefe2dc9ac6a11197c283315f6bf8dcdfea2910bf8d2d95d0e27a11bfdcb1b4ba7368287d9c243f -MISC ChangeLog 2559 SHA256 5dea717afc9300fec74da4f637410735a15ad2571356e1f43f4ebad147668cf0 SHA512 8a6b6a94bee6d5d865d8dde3be444339ee7884725d04e3fe9e6f300c7862aa26873925078f8a3fafac9d43afcac9c01474be8bace716e6e83ac969505952ae3a WHIRLPOOL 72f56e701e6d3ac3839cce88a6ae8c3d3f534525a6e3add659f6a89d11ea91ae4e77aa7fb5ad89d9a1897b221049da89bf0f3a5f9748d1ab9097d57caa218400 +EBUILD ffmpeg-9999.ebuild 14622 SHA256 362503ab542f51f221646436836fce9ad3117d03e51766fd18c7ecf0b520ef99 SHA512 03b4b9f19e909271b468cc21b08fc03248baf7530de98888c84aa4be0036ce038da536a5b239d33b7d7d682e03401ec9b307595e28d8543ae5c351c3c0151f7c WHIRLPOOL abcf2bd563988d970a6e885f405addafe84c4b09800f1cbbcb9c343c194dc6172cec07ddbd3574bb810bd4f7228f913e98c756af70cada5757f5d8a784443aba +MISC ChangeLog 2644 SHA256 2c3aa28326d3297494aabb5f0576dec441527d393da21a95a2b74a8157befcc1 SHA512 47df88ab25ef5b308b3ace7dd06166b3098398acdc2f0ad0375e99e728164d960d125da0095d1142244f32bb018f21fcaa259a79927f86b549927f73c510e17c WHIRLPOOL 93e2b76449c78e362ded0a3843b69b603446574473cab6a1fd8d0d7cf3d8bb925e2ec88d92ba9d3b979ac2c1dbb5c57936531c9e0f380a329a3ca443924df9e9 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 -iEYEAREIAAYFAlTkoZIACgkQvFcC4BYPU0rGpACeIZpnLsVnq/N62TWgh2yEQpaY -YO4AmwYQD88qhd9u5hgLwQKZ/DfSQAXJ -=/kvP +iEYEAREIAAYFAlTko2sACgkQvFcC4BYPU0r3WQCfYdCfLaXL7nFT0ihLWspcUw67 +akUAoMrYLrCvKe9FSelt9PsIxezeMlGj +=cMdu -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 67133a9bd465..7efc3318a299 100644 --- 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.184 2015/02/18 14:28:33 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.185 2015/02/18 14:36:26 aballier Exp $ EAPI="5" @@ -147,11 +147,8 @@ CPU_FEATURES_MAP=" amd64:X86 " -FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher" - -for i in ${FFTOOLS}; do - IUSE="${IUSE} +fftools_$i" -done +FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher ) +IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" RDEPEND=" alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) @@ -419,7 +416,7 @@ multilib_src_compile() { emake V=1 if multilib_is_native_abi; then - for i in ${FFTOOLS} ; do + for i in "${FFTOOLS[@]}" ; do if use fftools_${i} ; then emake V=1 tools/${i} fi @@ -431,7 +428,7 @@ multilib_src_install() { emake V=1 DESTDIR="${D}" install install-man if multilib_is_native_abi; then - for i in ${FFTOOLS} ; do + for i in "${FFTOOLS[@]}" ; do if use fftools_${i} ; then dobin tools/${i} fi -- 2.26.2