Replace multilib_build_binaries with multilib_is_native_abi, in order to put an end to the confusion introduced by having two functions, the proper one suggesting it is just for binaries.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 33 insertions, 6 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index eda8e75c6471..7dc741e16863 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.183 2014/03/30 19:00:19 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.184 2014/04/28 18:10:02 mgorny Exp $
+
+  28 Apr 2014; Michał Górny <mgorny@gentoo.org> libav-9.10-r1.ebuild:
+  Replace multilib_build_binaries with multilib_is_native_abi, in order to put
+  an end to the confusion introduced by having two functions, the proper one
+  suggesting it is just for binaries.
 
 *libav-10.9999 (30 Mar 2014)
 *libav-10 (30 Mar 2014)
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 6032fa56aac4..94a839c93dc4 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libav-0.8.5-support-libcdio-paranoia.patch 1477 SHA256 2e3490bba021c512828f12dfc5e6be39a5f3c53e16b2ceb99e6f6c4e71139803 SHA512 2a9847a435a32fac0b9bd904b932d20f26a6c7b0d086cda42c45f9099d87dbd4e637c7a52e5c29ad0df69a95ffed91bad2673d773c3045f03baf736796ab8332 WHIRLPOOL 77152717b72d245e4bfd5ac0cc1ed4ac3a512086be248515bc7d0c73d4840cfae7ba3bb7a668ee354803b6fba6ad90b992f80f2c335b5173741498a968b3eca2
 DIST fate-0.8.2.tar.xz 443503168 SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27c515626a536b87deb610d850 SHA512 eca7783af7afc567ed226942b1318b1874b2487c7dc65406fe2097cf2318d722bb4c45ed14363bc3653f948f7cdac5967162e1f4fbd5cbec1adc244886800bb1 WHIRLPOOL abe5faa67444c3edaf5ae9a57a701ba0fccd3e313941d0f7662b8dc2b3a8886578d7bcbd6ed4abfc62abe3b7a36ea216529710e28d1c9cff8f3bb2b9804707bf
 DIST fate-10.tar.xz 558524508 SHA256 65779319ff75a5d93f20132a7c348db2ff6f0f0275fb64a23f81fbda6e44c1cb SHA512 5e569b899961d82c579d974eb13b8a5263ae7a83dc788119d6abf923c9c133029fd861960a85c316e0b0a0bd61722cc3bcb393a65d9d2c551084c0b1103cc582 WHIRLPOOL d9e0bb01ae809ca57a566ae804b9e30ff0239e43047a7f93d07ab0d31e95c7f06cadd651dd3badc2b906f34ffa12669cff87910ffe115f34c3279615f8afaddb
@@ -14,9 +17,28 @@ EBUILD libav-0.8.9-r1.ebuild 10312 SHA256 64b75a0bdf27d77611fe295de241484e538cb7
 EBUILD libav-0.8.9999.ebuild 9178 SHA256 527bce140ec102b77d723e3dd87acdc76fae74858cc2ca17fcc2dbe2da4ffee2 SHA512 db75d7cd03b3281b3903c5c788b601aa964e214f735e89e6bf05f2b857d16d3388f876aa2e531b55de1ed7aee0b4c1de5332600e3396d3632f144aad762f4689 WHIRLPOOL d4c450d037dc9c28a49ac229c09e733744f446c42b15d9c97e87b0157e34da4de161e9e28184fc3ad81e65692186c9c67569ea682e751b1865dacccae6814792
 EBUILD libav-10.9999.ebuild 8379 SHA256 a5f6570d38ae0be5241e920190e346ee6b36f6fe2f5459e0335c318a472a9af8 SHA512 fce18e7a2e38ac1a49594639b186467883fd2f376ee32c8b8cb8ac52d037cf565802285841777ecbf7fc18a7533b50de311279e8e1bab57bfc7bbfd7adb9540a WHIRLPOOL 98733af420ac4a3a8eb9b9bd6e9df9aa6ac404514b4c58d3250ec1cbf140322038662516eb5114efefb4d09b09d6ddaaa21a68eb7f532b50b7e11ffa6f045715
 EBUILD libav-10.ebuild 8374 SHA256 8421617c8033cc57b90c17e8c779b68e7f27eddc8f2e87e1fab610a694aedc10 SHA512 dd0dc775243b3d448069f29fa3e9fa72b4c5f09a6a64924d81bc2b9dd1a1a94c5fb82ce395d046fb328de877f0f0b85576c3498f23c81597a06150b40cdad709 WHIRLPOOL 4441c006d62f55df33c6c4764adac9f67f4d32396288c5b9346b9997832cb058cf0dd9377a9debb34bd3522ace3c32c37e0177bb44e2a79b57cd14fa5af95fed
-EBUILD libav-9.10-r1.ebuild 9655 SHA256 0cbb1a5172f26fd8cad46a958d17af5c59b82cad24cfa8e4d16b1e4758b583c5 SHA512 908c65c33d67a0efa55a9bfff82ef27cea576036f794478b0ac4d8ccaf5896fd14dd1cb55fff789bc297beada9bfbe2b765cd1ae683ee36fbc45f4ae6b0a1471 WHIRLPOOL 8d6a0a8e6e2ca19d7d8087bb7c58c98c6971e95526bb5447576ee725ea3a2ef6401094f4430b37b1515fffc07805c794e4f7f34d628c3a4ee96ffd0bf1a2e991
+EBUILD libav-9.10-r1.ebuild 9652 SHA256 234895b22dac8030c273b891cfb5fa09a1644405798fb2253a35ea3d166e0e17 SHA512 a058562b065357ef34683e5d55f36a779b99da19f93f45a15ece2ec9f9ca3c718a440899332e25f3f965497f5fbeee7691b114769adfd84975ee814a10cd8000 WHIRLPOOL 18e27279cab4b08adfc13678b0e9a569d744e590508ff734fb440863f1ed15f7bcf93bf52da6b92f51f6a79fe4afd8faf1d8baac6073aad6b95a1d4fd0cc122f
 EBUILD libav-9.12.ebuild 8505 SHA256 207d15535eaa537c9f6fd3a6f0a02416685716be11deab31475e6ccfa4b01477 SHA512 29ec750c1aab1d2bef43a32de0dc82962c66630faffb7115fa1012cf28b3d0e31aa8dfd81cfd963114ed0316b8217ff5010e7b02bc2e959c0389d83b70f11ebc WHIRLPOOL 76202467cda721095cd3d5bf13b411ffbccb05402e60215d1cb490765b9a251e3a83c1957e5eac0a74e5f2c0886924b41c6ffbb6967678d874011061287d9195
 EBUILD libav-9.9999.ebuild 8508 SHA256 277c23dfa059f11ed2ffd7fa869ee98c5fdf9c26664e0b1b49c466452766198b SHA512 672b4fc0723f02b92fb5e39112a741028faa73c16399138685ce91671e394c78b87dfda86bab7442128b5733b4df9ba092970a59dc0659a71fcf21c681dddf3f WHIRLPOOL 960ed166cb20634ab38cf0d7d9be0a407316d4b6eaeeee9ef7750bb510e59574b044e5637c61557c844f002f5f924ba1b6f4f403073294c633a64f4bc87d013b
 EBUILD libav-9999.ebuild 8385 SHA256 2bda09a154ce30423ce39483bcc6d03fb7416a9321bbd1f3ab4213a0272bbb65 SHA512 7c2e5530562551cb3efc408b68e3fc764c213b1cb5efbf527a9da42f25d967265e65185eaef8019860161692425e8a8877e94f73d8fc90b2bc1047df39a40712 WHIRLPOOL 88b0d7328e3aba271867cee6aaf2e950ffabaa5b31d513fe02b00fa348458390fb0adfb648054d8d0f03f0de008cb2aa3e8ef3296f73a826bb08836f20583edb
-MISC ChangeLog 27809 SHA256 b4834864aa17e1307a1d660729ff1476329058248f2e2fa06ea7ca6ffe18708c SHA512 b1dc4a07b73fa25e4541355c52185db33098428b3548a9ea7578c78dc443d48e076534ad9b70fa3f4bc10d67ad5ff766db0cd85b4d75e4837b78f6d04f4e8eba WHIRLPOOL 4cbcdd24df31c02b4fb98bb93297301fa75d2aaeda39ed54061bc0a77ceb6c9e1a8a8bb807b85a000912dea8f600d1db7597018ebcbb053b40949b9abf3c0b57
+MISC ChangeLog 28075 SHA256 6ffc2a3b54137ce9e8b1793035fdef096695ea25a063c3c8b481b9c3d334a518 SHA512 334fb59345e62542c8a8dee37816f8744510d69fba33ccf3e117234689da44952690880532a7dd1b7950d80a04dfe52aa2015414c88650742b53dc45ebb60feb WHIRLPOOL b3b59ea424bf8400f3ed35fe476ca5497ff890a1d8d341fbf49d2b6c91f73103dd5d3351db283e1b08c6ab77eba28147ba93165a284bf3148064ae99d912f0a3
 MISC metadata.xml 3106 SHA256 968ffe2f92f6e2ae9963fe0005e78fc205ebca769d48eedd578472cef8c8cfcc SHA512 f10f99a54e1806b17d0923429c2df151e470edceefd854e63c0411b2be6fbbaf829e441dd318ff0e87d5f2d6985c52673646c20c971fba9c0d44d67edc3bb5c8 WHIRLPOOL 9004c95991227752427cf62491949845931683a9a45a7a555b98b1bf92cf7d2efad0e2c912b4a069e58e31f41062d0025b8e3a082e0cc37c5d13484969058a47
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJ8BAEBCABmBQJTXpl8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJAEP/AsVc1joTI3N73ZyHM83cruM
+kS6k+wFawPWAtEjFy0HWfmFbxgSkU4g+IQin917e5TAQM+yVRGfBUFseHR6TWUHx
+5WsrZwbGyLi3v1kdaKTfPJD6U3k78sK4CaDYA1eAWsY91eVoPjZZZqkg9Ilg7wiv
+n6UHKjjZ/BqkXfgUudUuyBMChCWKNmvNEGUXvcR8TXNDcke4aLo67cvDUjfG6SK8
+yGflPdSDb95Uza9RP3dYxXCSNwSnL3q9ZAeYaZfT+jneEkceQTxA1ogizssMKfMb
+VcOD+Bv0eGHUGqUzqWkbF3Rr0yalSZ+UvEz2cjsKnpYWNc4ExM++dLzAB3MR/0R8
+ldVmGNV7FlYsNJbql4+DBMAlKcLGew7CXKH7ILQPmgRNM17PcUvD2BPJuUzc+ydJ
+y7cIh5CzHVMZAFlTBDcYz8R3dq1XMOAkgG69Qd2mMGeA5yAAckqxQGZzEjUW5AmM
+PzpQIsLl2r1EpPQEfds0cFcBuqfKwdLxvDaFEUctRsIDwoJDIDB5am18RQ5Klx52
+vEj1/76M/nH+lXonJDEpKL9Yp7pAGVRH83FExsa5VsprwqupE2y3paPqWLC2fEz1
+dbstqEo6a6pms5ndH8Ls6V1hukXyXNfJ14HRM3kJ3lhYITlz2X6EHkg+wC2MKWlU
+XHhmTkKmvYcFZkTdWCTt
+=ojBl
+-----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-9.10-r1.ebuild b/media-video/libav/libav-9.10-r1.ebuild
index c53525180552..87f52ca03cb1 100644
--- a/media-video/libav/libav-9.10-r1.ebuild
+++ b/media-video/libav/libav-9.10-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-video/libav/libav-9.10-r1.ebuild,v 1.2 2014/03/18 15:27:10 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.10-r1.ebuild,v 1.3 2014/04/28 18:10:02 mgorny Exp $
 
 EAPI=5
 
@@ -295,7 +295,7 @@ multilib_src_compile() {
 
 	emake
 
-	if use tools && multilib_build_binaries; then
+	if use tools && multilib_is_native_abi; then
 		tc-export CC
 
 		for i in ${TOOLS}; do
@@ -308,7 +308,7 @@ multilib_src_install() {
 	local i
 
 	emake DESTDIR="${D}" install-libs install-headers
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake DESTDIR="${D}" install install-man
 		cd "${S}"
 		dodoc Changelog README INSTALL