Apply cross-compile fix (bug #521446 by James Le Cuirot).

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 ce8f2bb12196cee96ca74f0af31194577feb4197..2b581c5522b6af7aaa7db993e0ef49fd1553fb8c 100644 (file)
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,9 @@
 # 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.186 2014/12/02 20:45:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.187 2014/12/03 06:08:52 radhermit Exp $
+
+  03 Dec 2014; Tim Harder <radhermit@gentoo.org> flac-1.3.1-r1.ebuild:
+  Apply cross-compile fix (bug #521446 by James Le Cuirot).
 
   02 Dec 2014; Markus Meier <maekke@gentoo.org> flac-1.3.1-r1.ebuild:
   arm stable, bug #530288

diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 1afde39b86002f9761441b849b5ad2ad736526ae..d8015efef50217e0f4c1e3cd441405025738e2d2 100644 (file)
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -22,13 +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-r1.ebuild 1919 SHA256 34777f4aa779253d392851b9df032ccd2729e0707ba4a6618f03c5d8efc97321 SHA512 c8c3ee56ef6d0f4835a03a85ddedbf8ad9b0cb2813ce9ea9d593f28951cf39c539208a572d8f4d5ffd88c0d02bd676a23d67fc1752a438919a6a0dbb3b0cc45b WHIRLPOOL 4929c93fe9d9093055df18060d07361f059127a83494eb195099cf470bdaaf8afc9e4edd88783b655624b2c4f4dc73cd7004ac3cae783072601f1f6ca4228782
-MISC ChangeLog 26203 SHA256 bdc7463b316b2f87faac81c1d1dac1a109ee3422ebb7c821353b0709f9191ceb SHA512 5f30282a8576f3cd1161eeecf20861c1aef9c69634c60b2dc96493e76a789ba817c6a3abcbae44a241b6a4ae2a6da8320457613f482093d2eb865b293c3acce5 WHIRLPOOL 207dd00611b297fd0d2ed80ae13c258b08eb0c1abccf7e3697b7159816afbae955e0364315f6e7551530bba4477a9d42e50f678e5d222d2cffdca4737bd100c9
+EBUILD flac-1.3.1-r1.ebuild 2013 SHA256 5ecf289d5624d88169c1cf5d38dae133e3539d05ac81b62ce4aadb60b6a554d9 SHA512 b45f4bcb00ba0df55d9d969a28f80a52469a35c29ea08810f14e5b65a8644f366c81ac5f1d294bde0a512d892ac8016b87bed1cbfa7db5d97f4fa981bc3295aa WHIRLPOOL cc39caa6e24b0e1fd878800f676991fc9081e22bca2afd1a7e08eea93b0343c2e08a5598636402d80f798330ba4df4ddd6a9d875727777f0ad2e2a665edae2a9
+MISC ChangeLog 26338 SHA256 2915aab27454f5e052f85324f9ec7bd413bb9c899d0a749a461cfc901afb3b99 SHA512 65ce211ea41deb19c426c86954366ace2d992b0b879bf68bd349c5172d9f1c0ad99fbedd57089adac54f77f193d089276857e419ed365dd3fcff37b6383c5503 WHIRLPOOL 4a8ff72098716dc8ffa1372a96729e436da748804a3b8147ef6ff85fac0b4ce5073867050832655c825963e48ba90aab20021a329d13c1b3300e85c1135d06ad
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR+JQAACgkQkKaRLQcq0GL/EwCgm0pjeH64NTi/7bnn97TSjDjf
-NmAAn2w45r4r0iXiy/pU91BMCwHzTdHH
-=2/vh
+iQEcBAEBCAAGBQJUfqkAAAoJEEqz6FtPBkyjelMIAJ5KYUdEAiq/qntJ2i+bxvpX
+AzWxNjWOvSIXoeZWHv36enEAQ5RimgWZHztUx2rFR3qVvIAAZyp6wAIeRpHw3J/x
+j2jU74t1adtP4YWsnGQHOsVkBD0JbNc7rHp5DzPFUReY5eI3RuOlJauOsqyqbZ5y
+nE1aTtZABP7jmxnIfm8t85TlL1CQDlv9NxdEUxIQAP7LC0X30G7l00wTs0fCBp9H
+zdVp6K52m/tJfyp03MDLxXfAWrZ97SuxloO1DXW7m4KnxNBb+lrIpu951cZ630NW
+6jURUZIwS67+3/hiBPB9BBKkHJFJu3aIHQf/oUPZCHZoZCr7J4t8FN4PW/+lMH0=
+=hY3m
 -----END PGP SIGNATURE-----

diff --git a/media-libs/flac/flac-1.3.1-r1.ebuild b/media-libs/flac/flac-1.3.1-r1.ebuild
index 9bda9e4366590a12e1e9bccd6a08348f04aa7656..75848b91aab451065879fd8ba22610cb306c3231 100644 (file)
--- a/media-libs/flac/flac-1.3.1-r1.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-r1.ebuild,v 1.5 2014/12/02 20:45:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.1-r1.ebuild,v 1.6 2014/12/03 06:08:52 radhermit Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -50,6 +50,10 @@ src_configure() {
                $(use_enable ogg)
                --disable-examples
                $([[ ${CHOST} == *-darwin* ]] && echo "--disable-asm-optimizations")
+
+               # cross-compile fix (bug #521446)
+               # no effect if ogg support is disabled
+               --with-ogg
        )
        autotools-multilib_src_configure
 }