Respect CFLAGS (fixes bug #530920).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 4866470a6acbeb8561fc549a9fda499bd0350119..813b5d7a7a85847c6bb08ee739ebb7886d3dba14 100644 (file)
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/flac
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.181 2014/11/27 14:54:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.182 2014/11/28 14:01:35 radhermit Exp $
+
+*flac-1.3.1-r1 (28 Nov 2014)
+
+  28 Nov 2014; Tim Harder <radhermit@gentoo.org> -flac-1.3.1.ebuild,
+  +flac-1.3.1-r1.ebuild, +files/flac-1.3.1-cflags.patch:
+  Respect CFLAGS (fixes bug #530920).
 
   27 Nov 2014; Tim Harder <radhermit@gentoo.org> flac-1.3.1.ebuild:
   3dnow support was removed in this release.

diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 9963f5edda2cec82c316fa63f53115a228d545e2..6e24f6a602c9b6352df99bb4e1933c741f073773 100644 (file)
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -12,6 +12,7 @@ AUX flac-1.3.0-asneeded.patch 644 SHA256 cc00133b8916f29e750b7eb80b9b3180a8f7c4b
 AUX flac-1.3.0-dontbuild-examples.patch 723 SHA256 8330ab837796cf94eb5c62c8ef787018b10c6a0e27cdb51a34953faffc653b7a SHA512 f5e8414956a3aab75f512c4dd5c28fa173198d28fec93ffd289f55d5ba5f604fed116854a1347f8bbfb6c0cfc59912707869177465cde346add97e485993e5a7 WHIRLPOOL 830f991657e9c816a2a19e70a674f11e57da03cbd985729e0e7b47e57da05f008f2f90f01208b4715ced2a69024677dc18a45fc96bf730973edc439076484b61
 AUX flac-1.3.0-dontbuild-tests.patch 2111 SHA256 31d1a8bb80d623db4cbac8182e3b2027b8498f9bf77d5baf38acea9558dea970 SHA512 50329cdb766111dbda41856363cbba74dc92e7348605e086697778e7004cce514ff9452c1d5bd72e327c9d7182af218e74d82625f6cdcb977a7dad1cf3d07995 WHIRLPOOL 4ab0ea936c6d4f9e28684f806c86dbe94bd082892ecdf4c5b4917cf3a738ad544e9f2336b678f904c2614b8e8c33aadf1326583605e5a6917e7fd87f1f5f4b00
 AUX flac-1.3.0-metaflac_strcat.patch 503 SHA256 0a2efaa33e933d2fb3b8aca8cba7704e222edf68552ec283bf2c4f40e513a5a9 SHA512 461e0f11dd5e04e4ba05e535ff38fc8ae7a085686945b809715de232a1c14ff5721d6e7fb70f40025c2740789d90cda464ff008dda7880e1f147c936d0e41903 WHIRLPOOL 906503c9a8702c6e5d08efd6a0389648e4845b498e6db8fb4f7b959a53370777a2816ec85a91e008128f7bd9baafb80f9dd62b4470356fa518fc31abca3c4762
+AUX flac-1.3.1-cflags.patch 786 SHA256 077cbb1c3254218e257bcee5ae1b22b5cadd02eba085163c8bc51da2041e1862 SHA512 4c639023861b8508d7a1be2bdafd4ff33d398b2399ce97350890b25394c4ebd9745d622053305723cc85acb2391b46364caba1cdbf3b3723a9cf05971306b7b0 WHIRLPOOL 54a918b35e656568663f0abb134191d5520866811a9c37631e5d48602987e2db2f842884c4c7eb1f764da82eb6bdbb27ec1a25e7e0cffbea60b159e347796985
 DIST flac-1.2.1-embedded-m4.tar.bz2 8545 SHA256 a32bd229ba454be595e66fa257805951c4484aff9f8ec2116727ca2b8a48fea9 SHA512 e0aee18748ad5d47dd637597a30824fab81b70def18184471a61c5a6315df0b3dfdaa0e12f22b69ac88d0c52ec848e15b488e345a5e2920369b85c0666051c0f WHIRLPOOL c72b485a023c45643e13e2c640157a62140cb25dd09e7f646050073ec90e6ec74dc1ba93031dcce9552b55f5bdf6faab88bffb326babec2f2867317194b86030
 DIST flac-1.2.1.tar.gz 2009217 SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf SHA512 39b216239341fbfe210c3a2fc0d0531ecae26c425365c4b6d4fc1081e44e6dc7a9aba8d4c79cc8025386d0a7bb0d25c413c9b64cf7da9ab04ca34a56d2699787 WHIRLPOOL e38815e1c365f26a990752779bc1fb84a76d9d422cac9d66f1e55b5fcacad675006939a1d4ab72f20c36d8a80be4218a109317cc6e90f12abc9e1570dbe27319
 DIST flac-1.3.0.tar.xz 1084256 SHA256 fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc SHA512 9f62a83c2041ec6f02c0df65b796a920a0cd6ba6c2c034bb69535bca5df57ed69f96fe4bb41c0d5ccc229241d90efd2c7ec3785662b5a582a8e20e2e991e6477 WHIRLPOOL e328f41db3aa7f6404a1596ac2fddd437fefc031fc9f1ea91420104054d338029120d526ac58b2a6994811a8f2f7cc107e120789113340e48dec842ea9013196
@@ -21,17 +22,17 @@ EBUILD flac-1.2.1-r4.ebuild 1853 SHA256 410b029efcc50e0ca4a75210adaab4043408e0fd
 EBUILD flac-1.2.1-r5.ebuild 2099 SHA256 1ea1082ea6e3831f18a7c965fa5a16cb591e543c1d1318acb37eb308feecd01c SHA512 1887550da9da6e927b039bc2b8695affe526b06d72ae1ca42f38362f710a751e5b5aa0b1301b1709640e08d8d940e5691f53014bf9c30ef0a38659ec7af94e2a WHIRLPOOL 6109d2d0d6e6f85f2baf358f83ce0828e72b6bd0816d4f3d1447e23c72ef5ed965f7fd62c1515f415818c2d8c12f9662545eef7ce9b742bef5b64ebab272437e
 EBUILD flac-1.3.0-r1.ebuild 1760 SHA256 90c3097f525c69b998a3463aa92c78ba972d2b3a939a2c529786b30cb6be5d21 SHA512 8a07b8bb8ec269249ac2f35e076405b90cffddbf8fe9acc93bc0dd09c7658abb75d8a55866374562145cda59d5ec3409381cd99a5d12ab8571b36b487187eb4a WHIRLPOOL c1493ed6f539604b1691d719aed6bd326dd592b91a51e1707517baba4961508e9230c21f744a8f197af6097989f25500b8967e6c18e30d6df15f6d9e45ace6b4
 EBUILD flac-1.3.0.ebuild 1703 SHA256 594e99afaf11466a1ed44cbdceced56fd7dda08b41d216795bbe51cabe0fdb53 SHA512 d9c1dfa07702188f292aadfeb07fe7b8240494c6969c94caf0fdaf1dfeb20733338e88fb39754d9c511eed60f4502264ab65c0bdbd5faf7fd9ef50265cfcc93e WHIRLPOOL b8fbf4175ca4fec9e2ef084a28fc49493c832ac1b28d4a00b8fa51b673131bc0639bce86133975964440cb5a5eb8d70ef814bfa583da80f346300a8c0a54eecc
-EBUILD flac-1.3.1.ebuild 1790 SHA256 ddee3835bc58bfefe829d613f2b05e3442cf7f358acc8c87b50595114096bca5 SHA512 c18f5c0ea5fad2d289abd5c8a899ca77173f39754e9d63e1133ed60ac645cc8da7c7727eabefa2479aef5e7be300d014f49d575668c5d9f6a191bc589217693e WHIRLPOOL f8641d507c26889f63024c30e95e8c17bdba863cc229ec9803e5e9272f7a81b9ad10ab6b83b97182aeb0ce04c54d61a3067cb76efa5dadd14af99e4be255d9ce
-MISC ChangeLog 25602 SHA256 231a50221dd05b2f60ad4d97c442de7d6137ea49e606f1c8fa3341ae7ebcf006 SHA512 5e66aee27dfa6f224e068ed5460a5bddf6b5ebe2875d1d3ab6e9e7d230be850f2c0ccbbe883d78299cc4f16029cae8fefb644f075117f1ea2aa34a20d7eb14d0 WHIRLPOOL 7264db92656ce13b388f6331e693bbf1108f809f02e93de2b2082620f018592a5dec60bd7d30644f5e52a698c62a67fd9294e5894846c76cfe97d5e4f9999563
+EBUILD flac-1.3.1-r1.ebuild 1827 SHA256 543757fda4af06e1acf42ff2c0ce13b2d30f9d05739a7cb42e326623809e085d SHA512 22bb2450559208084ec6a1604b804eef728f36e8bd62f74f89d5a259839484b030aa90bdd4ae6e0118a8b2f5a21e394dfe92de9ae06ff32cd58b82e9b1583689 WHIRLPOOL fef8dd7f1fc9e94202f01d99c5d2cf77a7a204d32997d0c59b1b7fea47b1d7fd9b0872f101bb49af9b45b21b4f4e28e831abb01db2c7a12e2e26c2e4a5344849
+MISC ChangeLog 25797 SHA256 f215a4110c5f6881e666b0329101243fd78037738c5e342b0ae258d3c975c9cf SHA512 d28e9483e073e3aa8fee1d796b7bc57b454bb9aebf72cb32c6e0e2f4c4b23fd278f0387c03543bd98d1d43dd757a3a2eef24987200ec0491e0d16b18ce230300 WHIRLPOOL 865d7560f26f2606a6226e72563418239fe52bdd2c572376cfb5843ec57c15ff5e001646b908a428c2c5df3a0d9bc64c3996f8dfe4aabaaaab1d9a701587bfe4
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUdzs2AAoJEEqz6FtPBkyjWQEH/jrzAyY6ePW3p95/K3JPn8xx
-X5Jshbr9K6SVA6o+fHIeS+kcK0daEiNPHnIMQmALaN98xnNmYMP4X2Ufq8RK7H4t
-p5RblfJ+Hjp1mm2VimLcgsJfo/yKFz9YbSn2cPlGTtJWr2xVn9nskBsgnBbeMmSg
-pIgJQijVB2E1sRpqruY1AAbBjAsMOwHNEQDgNoSdH1Jvm3GFQ7Cf3z/6r1lcYNcb
-WNA3drYnN5xNLasdZdLXqY2sPaYuUHrh5+2uiIQ7AnBVrDltBvBgEI/c/mwECSb9
-1bwybQ59pWTfS3SXHV3T8e2ehX++1HEatS05AsjLOu3IKmVSua/E/ykSArwBvCQ=
-=12aK
+iQEcBAEBCAAGBQJUeIBKAAoJEEqz6FtPBkyjfBUH/15frmmomPdCEGov/6t95q7U
+qt5rZlT+iaDL6OJD/Ym3AVG8D6vO1II6q2jeYswlsv8U4ZZuUS0F40nsJMpvIz70
+m6V586VbA+85sxHNsQPBSevac8Uv+xugN7nZVpSjOYR2gIF1GxD9+8NjeIO95Dxw
+AYABP4ADpSwgMcmnYamNwdldbDR5jCO46hht8i6+MLWRqvvN+bMF+Pc8QM94IAbB
+1gWVBDfEI7Q2tbZvHcDfq6hAhSXNdix74sy6U69vqzovTMV8HNTzpka4a2/UrDZ5
+Rqw/3XbPa0SrEhqC5YT989lktB/aNlDKKEF+0Ec/aLGHLBfQZEOp4LU++zGR4TY=
+=+oMQ
 -----END PGP SIGNATURE-----

diff --git a/media-libs/flac/files/flac-1.3.1-cflags.patch b/media-libs/flac/files/flac-1.3.1-cflags.patch
new file mode 100644 (file)
index 0000000..758e7b3
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.1-cflags.patch
@@ -0,0 +1,23 @@
+--- flac-1.3.1/configure.ac
++++ flac-1.3.1/configure.ac
+@@ -348,12 +348,8 @@
+ 
+ if test "x$debug" = xtrue; then
+       CPPFLAGS="-DDEBUG $CPPFLAGS"
+-      CFLAGS=$(echo "$CFLAGS" | sed 's/-g//')
+-      CFLAGS="-g $CFLAGS"
+ else
+       CPPFLAGS="-DNDEBUG $CPPFLAGS"
+-      CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
+-      CFLAGS="-O3 -funroll-loops $CFLAGS"
+ fi
+ 
+ XIPH_GCC_VERSION
+@@ -363,7 +359,6 @@
+       CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef -Wunreachable-code " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations
+ 
+       XIPH_ADD_CFLAGS([-Wdeclaration-after-statement])
+-      XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2])
+ 
+       AC_LANG_PUSH([C++])
+       XIPH_ADD_CXXFLAGS([-Weffc++])

diff --git a/media-libs/flac/flac-1.3.1.ebuild b/media-libs/flac/flac-1.3.1-r1.ebuild
similarity index 91%
rename from media-libs/flac/flac-1.3.1.ebuild
rename to media-libs/flac/flac-1.3.1-r1.ebuild
index 207bba0aa50356c30152de44f84e542f89707661..803e24d131588cbac383f9cb2d4e318ca5090f21 100644 (file)
--- a/media-libs/flac/flac-1.3.1.ebuild
+++ b/media-libs/flac/flac-1.3.1-r1.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-libs/flac/flac-1.3.1.ebuild,v 1.2 2014/11/27 14:54:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.1-r1.ebuild,v 1.1 2014/11/28 14:01:35 radhermit Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
        local PATCHES=(
+               "${FILESDIR}"/${P}-cflags.patch
                "${FILESDIR}"/${PN}-1.3.0-asneeded.patch
                "${FILESDIR}"/${PN}-1.3.0-dontbuild-tests.patch
                "${FILESDIR}"/${PN}-1.3.0-dontbuild-examples.patch