set optflags to cflags, just in case

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 040174a4d9d0f735b7149789e5a394c7fa049c21..f47da60dc46d6ec4d3dc17fdbe48ebad5bb5ac7a 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.512 2011/12/15 11:46:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.513 2011/12/15 12:07:04 aballier Exp $
+
+  15 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.9.ebuild,
+  ffmpeg-9999.ebuild:
+  set optflags to cflags, just in case
 
   15 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   no need to prebuild version.h these days

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 6323b13c1e8637b999463e65f05cc71a3e8675c1..204e9a244f138591d2a7d2e13b5571f64383f5ab 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,14 +9,14 @@ DIST ffmpeg-0.9.tar.bz2 4954965 RMD160 56e1e240363d4f1bc09390f5a3893a1b6b362908
 EBUILD ffmpeg-0.7.7.ebuild 8434 RMD160 64ae02f0921dcb59c8850d102fd36be8b83d3ea4 SHA1 a04df51a15709a9b669b8e1ff8e4e7582fce6949 SHA256 2530241330f21149e401ec15fc448acfcbcd5b16b728ae0624dba422b449947f
 EBUILD ffmpeg-0.7.8.ebuild 8436 RMD160 34282efc2ce033b2015a7916975a14eb493d52e5 SHA1 27a7721fb83ee62e7a0eb36bdbe773cf442c67f1 SHA256 3f34e02690bd4f56e4562d223226375ae19eabfa4ca52a29e2d43f828b972318
 EBUILD ffmpeg-0.8.7.ebuild 8020 RMD160 7d2e2c1cf5de1f0d7e6af73d4c631705a45c47fb SHA1 02f250e6951e918eb1089a29a65c5dfade548835 SHA256 156ac6a17e91c52d8df28a2a71c77b6ad518da9a727c3416bee1df35777963e4
-EBUILD ffmpeg-0.9.ebuild 8243 RMD160 1a53d5f13da10ca48e7a366c7afa0562b26da0d1 SHA1 9962281411e6132e670640e042a5d08e0e9dc092 SHA256 3101496a71f30b51f1e8c052d62497eaf2e0ee1640c192634746c6af5f2ee3f9
-EBUILD ffmpeg-9999.ebuild 8344 RMD160 ad6db4312f32ddad00db21a6788b646ecc3642eb SHA1 14651d3c63b11f66d642445e1c338a541f913d1d SHA256 be81df3e9a71ab2fb1d55c101423db0fdaf09e956ced38ce2051c1f82bdc0c95
-MISC ChangeLog 73453 RMD160 6423d282d70179315a8daff2022bf00331170b8e SHA1 5df23626ad5d7081f51badf17ab0911b089104d3 SHA256 22a7c8b90ac270afadb175ade363183ee499de7ab15976eebc6150f890cdca1d
+EBUILD ffmpeg-0.9.ebuild 8252 RMD160 5909408cf5ca2785a6e984f0596620ea9d005572 SHA1 f9a8cf7a03409f7af7c33aedef09e5830caf4a14 SHA256 04022de0c3c8f1c296a009783bf6fc789d74bab925a8d5285873507056772bef
+EBUILD ffmpeg-9999.ebuild 8353 RMD160 f7a5014e034d26c0d6bbcb9b407959f6d646c9b0 SHA1 bbb853cb33f2a65840f758f617f33bc753096522 SHA256 03b8b954d7094d41ba699202cff43ad2c956ca169f76a47a4fe6b69ac51eb34d
+MISC ChangeLog 73586 RMD160 b9cb3ac50ec06743479e824dc995601dde7487d3 SHA1 e02e69bc83715da2e4b739145d3dd26fe11ad1a1 SHA256 a8a2fe22be84da62f612b43daeba63cb4656a45ea8e2d6c77df2ddb26965269e
 MISC metadata.xml 3263 RMD160 ed08dcb856aa893e6894af80e42a96c1d34c9480 SHA1 ac8765c4e770098d8b8fddcd1d5f5b16a780ed52 SHA256 d76cb7c21391eb41646c312c30a2ee34242ac6d00cb1d3656f2e44aa3f0f3013
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7p3f8ACgkQvFcC4BYPU0oItwCgh651PL7lM7l9PYECVrVJjD3h
-RXwAoMw4hJ1JXq0ILhWqB0gdo9/IElQm
-=WNyB
+iEYEARECAAYFAk7p4u4ACgkQvFcC4BYPU0qBEwCfcaggR22b6/1d6Hki6ZbDV12d
+QG8An15+I9An9dZ5fc+VKbs6meRQ3zVS
+=QdhC
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-0.9.ebuild b/media-video/ffmpeg/ffmpeg-0.9.ebuild
index 9d7888e572fe8d0a078361bebb81f46115ebb8c8..a49236b6c47d3260795eb1ec496b79ab2b32f761 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-0.9.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.9.ebuild
@@ -1,6 +1,6 @@
 # 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-0.9.ebuild,v 1.1 2011/12/15 11:30:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v 1.2 2011/12/15 12:07:04 aballier Exp $
 
 EAPI="4"
 
@@ -234,7 +234,7 @@ src_configure() {
                --mandir="${EPREFIX}/usr/share/man" \
                --enable-shared \
                --cc="$(tc-getCC)" \
-               --optflags="" \
+               --optflags="${CFLAGS}" \
                --extra-cflags="${CFLAGS}" \
                --extra-cxxflags="${CXXFLAGS}" \
                $(use_enable static-libs static) \

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 0e6942d567fa4b804085f6dd63458a0160c5fb66..39dae26a6184d965431eaf7d6859a3a5679dfcea 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.74 2011/12/15 11:46:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.75 2011/12/15 12:07:04 aballier Exp $
 
 EAPI="4"
 
@@ -238,7 +238,7 @@ src_configure() {
                --cc="$(tc-getCC)" \
                --cxx="$(tc-getCXX)" \
                --ar="$(tc-getAR)" \
-               --optflags="" \
+               --optflags="${CFLAGS}" \
                --extra-cflags="${CFLAGS}" \
                --extra-cxxflags="${CXXFLAGS}" \
                $(use_enable static-libs static) \