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!

11 files changed, 91 insertions, 61 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 10729f09c94e..0795d31f06dc 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libcap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.128 2014/04/18 05:41:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.129 2014/04/28 17:42:44 mgorny Exp $
+
+  28 Apr 2014; Michał Górny <mgorny@gentoo.org> libcap-2.22-r2.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.
 
   18 Apr 2014; Markus Meier <maekke@gentoo.org> libcap-2.22-r2.ebuild:
   arm stable, bug #507144
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index b7a1dcc59644..6cf540bd6843 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -17,14 +17,26 @@ EBUILD libcap-2.19.ebuild 1241 SHA256 8334b3d70bafccfbecac938629acfe6866b5f990a9
 EBUILD libcap-2.20.ebuild 1255 SHA256 14c38763c45c488e74a49a4399b844ea6e5326e8a189feba5e2650b6e424becd SHA512 4623edc3861e947b3a9a0da631c33a6d4a08e667c03aff9c258a63ecf092cfb36db1dbc4553402ba97e6c4e8e0cc862e331a2a6232dd1982a58dd42376df4f2d WHIRLPOOL 814310ff27914937f4ca26b35b1f7e7ff66c82341ace9e8de379d83e7e9cd1bc6ef531244b66c75e6a6ef3b7aad46acdf7510801ff8229597477dc4626deaa66
 EBUILD libcap-2.21.ebuild 1299 SHA256 db3f1beac4841be548fb653eed670c7562816f3eb4b318304bb11290c4939754 SHA512 ffdf2859f2745aedc75a3f6ce09651f0c450eb1e4d049f7d5f24b21937d8a38db4e2a3a6d9b19803b4a41231756e236a18f584fe50b61f5b269011fe42a6c381 WHIRLPOOL c7789d4c0b496bbdd4f1aacf0247a24de139dd2ec909c0743308f1371afe5a4b6f764b9be295f2869fb7a2825a650844c448df1dc3b1290f530108cb338c8672
 EBUILD libcap-2.22-r1.ebuild 1491 SHA256 c4f6e82a96c0abc001b5c91dcd0e7bb6a33c6ad88fc992ab523fff7e55ea7a09 SHA512 6017d2e908b8f3cd20d80eace382855cbe7fef9ae18f35f114d8fb3d24fe64ef122435180b4d942289638f9f8d590aacc4f86d8a11adcbf6b6454e53bac86bd2 WHIRLPOOL 95887935fcd9f345b17f22bc11defc918fd80e1c5a6a597a7a3e17b446e11f65649d4aa93ccc38ed76731e7ba44f4a9ce31407fbdb2d53d01340b5a611beed25
-EBUILD libcap-2.22-r2.ebuild 1785 SHA256 796098ca19d2b118915deb473e523f361034b1930ce9ea1bd206a52432604c06 SHA512 ca68b50562763ee8fa8f25c3c3547bc61ccbe341b79c59dc12c3b5c691ccd30e7c2c2e21ded49000eec32a2449a5d0c8becb226761d83eaa2f40570ef9b0742f WHIRLPOOL 363035c93c24757d5bd0396e2a8f1084e4797ad3e0197b048c84fc19e8b06083cd6ab89627ea7c868fd486713de1d49042bbb848adf619858576ec7bd2ee54a0
+EBUILD libcap-2.22-r2.ebuild 1782 SHA256 a0619f4597e828b6327d41504d2fc60bf652c16ad9513577a4ef5dafcd08f0b5 SHA512 4c84c7fa2c01d68cd534eed09d6d7608919afc94fde56b3057890f73bec6003b636fbc979278ab40b735010f6fc32ffb924ee5ed16e652b63d535d5952dd2814 WHIRLPOOL 11438d2b66188079260e0898b04549475b7db632321530c968b33cca77ccfcaab377d947d72770972c1142eeb38e7745193aaeb475e88f7e2d2337387d178905
 EBUILD libcap-2.22.ebuild 1378 SHA256 b12f31434c4699323601597a5dd6b6d18b87c4a2e60e82e04e58ec64c8eda83b SHA512 408d78f78d9c1174fdbaddbf61f5388bbca6aa404bc1e7e1eb891120af82e376a0e50bf0cca17ab5697ae0b007f62e80a8637e1435c1d2f82bc99f941f1d29d1 WHIRLPOOL 8640b7f1887bbf4d4f8612dd68272f685d0c08596f179bc04d6565ff61ec0621ec774bcf0f3efd60c2e5c8f77428e3b36afda467f163caee5d4bb61ea0f5f46f
-MISC ChangeLog 17825 SHA256 7d8806c12fe6842aa3ebf0ee822626f9dc869b70520792c890e45eb787a6b7b0 SHA512 3a1c6da3e23a676f39038bb0b22b13ebc3c774768adc4975378728493ea3f0461ef94f90d99ee6df376d79f4c3024cc1abe5fc90a4604e1081b7eaba83231296 WHIRLPOOL a69a1f816f37d8be2f3decab9dac87174288f7f45a840f1538cbb7e409ee5b45db0ba72c5fdc3613b2035e92093fbe6fa7f0cd0cdff14ae978f3852f24ac4df1
+MISC ChangeLog 18093 SHA256 7ea1abb12df1b9aadfb73e8f30e3a5350d0f2af545b654282c8ef9a66b2c04d0 SHA512 e8b61e12c8e079ae4f4eabdf0345ada14811e8b853e065bccfbc126e467c55c75edefe0fe5939ef80a4e1b1c97be6836adb9cd9726b476889d911d4f22bec665 WHIRLPOOL 3138eb20ff690e1ac127f51a3602d6f8073e2f11a9404c430312140055e1cc6abaea4cdfc9ede7ce550416aa4fcf0e4fbd0830c21875b4fac7889e4738375968
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNQvQMACgkQkKaRLQcq0GKQAwCgj+kFeSB3Kta5y7B9pDBezRF2
-KH0An06s2K2ZdktrmO0iYhasOQWboHza
-=1bky
+iQJ8BAEBCABmBQJTXpMWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgtkQAIytGmLsWGFwhtOfk+QVySB6
+IHeF3hnV/Ray/nbPNcneGOVAE5Kkkn1IgtS01ybMlGPFjXfSJAflEE4cvNzqNcxM
+Rm1ySHGvLcfPv8J1K+1s2cLQIkEwMJGAGWwDT+r9WuI8cjRCEnCH6JA76lgb3Io8
+i6GcKKEO0/2K+RgOBP0s4qG77b9bHcMusfN3BqcSCtj1G/Zc+kVtjeMXIaeSJBjZ
+vWCykioSeZBkRTSLfVVnyv9ezEo4nO1v7xGWPyxjA1RMulRIoPGKYicHBZKkOhCj
+Q92M2/m1/0KT1Fer7SeRKMBWU3S2v2VjDTlLErNYquuDrV4dwJU2FqautrFzhyEW
+q2AJUIo5KNyf6seKhCunCmKqcsByiGNoLfCunBqTRdfC6dXy1U1Jy21UCowa+4Yd
+EzYM6Bkpr1JORR089GAilMETidXlP4yhUrjOkWnfvfi2PK34vnGJLyP5+pZNukyE
+GeiDUXUXOSQPLVkQBXcPjmAsWjf+ye3hnFESZrMZDbZEJX1qVoquyxcz9vYresMI
+tjwFmmSzKxa/kEhtwCvninvfV7lCrXfK1KhO+KjxwfWj+Ig6IQqQpRD0M4SOvWoP
+rvdH3AvRsUeYaocfEocaSTfr2TkJGpkLCXe5Wc0Z45xxZgqR/D7Me6d5zlJ6OeZS
+z8tH43reJNHQHY4CCoF3
+=/uBU
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcap/libcap-2.22-r2.ebuild b/sys-libs/libcap/libcap-2.22-r2.ebuild
index df2af498c3ae..7be02e772977 100644
--- a/sys-libs/libcap/libcap-2.22-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.22-r2.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/sys-libs/libcap/libcap-2.22-r2.ebuild,v 1.6 2014/04/18 05:41:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22-r2.ebuild,v 1.7 2014/04/28 17:42:44 mgorny Exp $
 
 EAPI="4"
 
@@ -31,7 +31,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	if multilib_build_binaries && use pam; then
+	if multilib_is_native_abi && use pam; then
 		pam=yes
 	else
 		pam=no
@@ -55,10 +55,10 @@ multilib_src_install() {
 	# no configure, needs explicit install line #444724#c3
 	emake install DESTDIR="${ED}"
 
-	multilib_build_binaries && gen_usr_ldscript -a cap
+	multilib_is_native_abi && gen_usr_ldscript -a cap
 
 	rm -rf "${ED}"/usr/$(get_libdir)/security
-	if multilib_build_binaries && use pam; then
+	if multilib_is_native_abi && use pam; then
 		dopammod pam_cap/pam_cap.so
 		dopamsecurity '' pam_cap/capability.conf
 	fi
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 3c7ec66a8d07..a96a0c5ddd83 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.221 2014/04/21 08:04:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.222 2014/04/28 17:44:40 mgorny Exp $
+
+  28 Apr 2014; Michał Górny <mgorny@gentoo.org> ncurses-5.9-r3.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.
 
   21 Apr 2014; Michał Górny <mgorny@gentoo.org> ncurses-5.9-r3.ebuild:
   Use multilib_build_binaries consistently.
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 9d444eb9bb46..b9ab85de76fc 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -19,26 +19,26 @@ DIST ncurses-5.9.tar.gz 2826473 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1
 EBUILD ncurses-5.7-r7.ebuild 5156 SHA256 3c1f3374af972166fd9418035accd4b06702aaf4de0880cba7bdfcf3083cd598 SHA512 eb7ad4c6b3e13e46c1be8453bac8e13e2073cc04c2f640e3b776388ae4c031e7f973088a47246f011329bc4a892235f3eecd73fed467f69a47709188252b22ad WHIRLPOOL bfee437aa6d657525df005b3899d4ece1046f20cd57824add4f13200ef4c0a2d0d6e96b016d631b552e3c4cc4cb6a703f4ecc18bf4cacf80cadc6107f53a4bac
 EBUILD ncurses-5.9-r1.ebuild 5278 SHA256 a0b4642b95cef0e696c65ef4ba12324fe528777a2ee249627d33ea723146928e SHA512 bdacc83bf75a318a260edc1257d473d3200f6cb62e9e5a40f1ac65073b1b2d7fad9e3501ad975d041b32425d4194bed63733eaf743d69120849069f15dc5c234 WHIRLPOOL bd821d341991d98520da5ce4b0f8d0bf2c774ac91ab4af4ff3f318c7ac552d604cfaca23ec678565eef577b254c2d1fcc22f7f00e285ca2783db626c42a729b2
 EBUILD ncurses-5.9-r2.ebuild 5661 SHA256 c18ec80f17ad898717f9c802c6692aea6a86e3f93ab2b3c4277c9cab649190b8 SHA512 aae0a8d4de674bd35c75fb42cec9e3b9094ed182fc07551b8db0db011b2d3c6d43cb1aecd9519cc6c343f17345a6ec36cdf97aca325d9c8aa9f8b5cfbaab9d51 WHIRLPOOL e53bfbd3cbfd807d4a806e61f06d422fb7eb6eb7828e5facf06946392894330933cc7d8126972817c37033dd18ed831a9f6e20e76082cc7ff3e17a32b62681f5
-EBUILD ncurses-5.9-r3.ebuild 6985 SHA256 f51f2132da39f72831583be84d4c8fb61a33362d5d93df3170f1be1083477761 SHA512 16a7b4ae04294c9c16246425d0b9a55318fab0dfd99a607426fbbac05b7e327636f0c20cbdbcaca9eb5d41aab12d337051fcb8282e3881f67af1dc9b60c05b4b WHIRLPOOL 456efaac9b6ae1172a66eeb1976784b1f3f21f03c03823f85ff631e1f3e2f58c9aeac250e5525e75ca017c1b41b17e853e352c592dbfe34da33df5d75cda767c
+EBUILD ncurses-5.9-r3.ebuild 6982 SHA256 6cca5c49f04f03783b150f907c25ce32c3a1656f4dbb9e46288b7ec774db2585 SHA512 3689d1ec0ce50763787e7a156edc6276d97c63c5d02325189cdea1e754f6eb76c1f3a2853cf870f20837f2c3ea657afc121a44acfde15c7b265229677420e973 WHIRLPOOL e76d4e1c2ce7ec4c848cfbd92f8b15345191cd3609335082d5f0179601652706f342d6526558464da9d120c8d721f737475321039ec3a4db3c4a9d5f469b9f16
 EBUILD ncurses-5.9.ebuild 4910 SHA256 0e95316b82ce63227e20f2653d239b289b527100459ab995efa370beeb798e3b SHA512 40f4db535eaa496460095a276979cda32b30d0f649bf0c2229e07c4ccd94e51d7de2021981474c112cccb1f4636d91ff27eda1599bb9d681d0d15d63dd6c401b WHIRLPOOL 79badbfdbf1b71dbceca73160c2623f97d8b472ff166d905d8a24ef50198e5668a90cf76f7eaa12d5c69a3e78d436e592cd0fe3dbbceaa6770905a1562fb75e3
-MISC ChangeLog 31951 SHA256 b201187cf996455a4fb23f2a1af0bb0272dfef49a668583d899dfd25dfb1579b SHA512 78f9304f3b6c736700e2931d93a13aab12cc54bc30995134efb14a9e6f7ac2d536e382d6855bad118c38e238b6d16b2a655bfcebac6f13bbe349e948004d76c6 WHIRLPOOL 79d4e755aadec7566dcf8737ba7411e62bad7ea15362711414f27c8ff24380547df24e8303693d71292458ae22d6d679a5930fe93b9648da8e9215c2bab3f1cb
+MISC ChangeLog 32219 SHA256 b26cf757213ce30ada06f2cab23fdc999d99bd86b57a0f9d2620e227aa5bbbb8 SHA512 e0854298ac007c61ddebc8afcb6deba5fbe376b5e3b7caaa75b32c7051611e0d1d81cb84a95b2a8920e7b3f3f023b50c00d5f974634167d93f9a617792373504 WHIRLPOOL 254fb560b99fe5970d577118a0a2d6ec959e7861e47ff7f584394d4c3bb7bd4b413564d77a58884036889e02dc2460843105c70bdbb85955d6a5ffc131e0b574
 MISC metadata.xml 530 SHA256 3a0f1bf7ab8ec067416e6535c3270113b53716b12aac504a581acf5b27f8114f SHA512 27d968272c8d184804d9764bb2ec8fb86eb5826bfe14e7f445c7c5f0b89cc7fe4271546a6994d830cb1270fa93f187ded1c96b4f4f1fe1b5c417c78a2082dfd3 WHIRLPOOL 54ff921a2a89b19d6d75830033b7d18c0f7643af248bea029b1a7ebe201eded0eff54dde04858be08903cb6607e7cbcb8ca100712d4992324dbb757184150d44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTVNEMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTXpOJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/dIQALiN5LnUZz2FuEBBffrMRyO3
-XMIBxnRwRU1Vvb4XeyuVHYFmrnTcrnd0KdUIPHkxgZ701GqjORXGHYR4CttOSbA7
-CJ2fiqLdvtG60gqHcMG50F48+WY7jW5YPbrLKqrXfeTQF3OKK1r9Tv4Va9omv3AF
-jA4n1JDkC+LYR2XrcnYgUULMIWLy2CsoCR1kbkchFUtAkUnv4/dyxjZoifp6wzd5
-iNp0MKWtkI1QTnLc7taePELCr9DQyHt0xYfY9tC1CKRrkCl82OPAHFxaZgiDUGzQ
-44rTlyBgPRYQxffvzysp2BNuHCXs+KMUGS6d9nRm8ozppvCWkAgFdUtEEXHjEmfJ
-G//hdg1OcSWv7BL8H1b8dCdeTwlfJrYmrtUO52sejR+lFQbQFrJPbK0rS/cUPksA
-rd/JlV6hTrP0/7PNQwZiEJKcesgXzZKarpF+09NthVuG76NuvfZHx79EW3j6i/Sn
-AUxxQ86UKHwpji7J3lZyxLJ50aJQwd6WgkTbkTGyxNui5VX7JxNv3rPga2fcYqHd
-Q/22dmRtPp5cf5lCbTIFfW2YBCMF55noS8TaZ9WnUbsoGhyAhl+y6NK28B42KH39
-I7vP74Nd0aOxjHtcBXKNk6s3FPXxNl1su2h1HrP715IWC9Fa5/jZ8J3rDiErb/ND
-tKVJPhhHalDRgMJtbarE
-=N/9T
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO0vEQAI44fTeyeXlvnOqMZqR6gWRh
+834t16QCmDbyKsBELyxS2R5/0mI++USsvQuJsMZm4b/z+KinrSb/lIwe6YWsG67o
+2te3T4/c4FiN5ri2YaDS8l2J4+kl5UpUX+8GthCd4gR6l6tCHfTTRP72CO2EhYLP
+sDdW47TnOyWOsCmYoGNHHcJo/GP8RQEBVNsHNw9fof62z8lfoROwoZFHr5zQKOri
+g4pUzwzzrpbtPqQOXp6bg/9N6POY8tbFo7DbSPrMd3tgnJrcMavoTaIVKHkHCtqH
+2hzLKIxPYIB4VEVuM+lP0qQ45IgHGv1EBATZ6z4y3cU2b7iBJiTC9NkR1aWcucYu
+gHGTdvZ2RLc0R5iJpOIO9EbD5Ej0r+q/ve4yS4uiQI4rlTYt09TY/pxxjXbn2jOk
+6iTBJF1ynOwhoHnkKt2KUJjI6PW9Atq0QWrU1Ciwo2fwehSLXmv3rWy0OV5kLSJz
+GrB8DzI+lvkmKDIpLrnriJQvfVRzG5T5etHFs75TrADcGP0bGgtK9mtiw6PZHrF/
+sX/yqDSc2wO0JVeq3KEUP9JGZGyL156h9qMSnO8Qdi9MIwHbOEqnw8B5LUD9xYC/
+3PKd0i6WkUYIsxlLKJRSicv3xApYloBCCc/ip47M5QSaUvj3Agxo1Zxms081sgfH
+kWd9G+x7e3G1iQpMliWb
+=DZpt
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
index 884a940c5072..e3593716bee7 100644
--- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r3.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/sys-libs/ncurses/ncurses-5.9-r3.ebuild,v 1.8 2014/04/21 08:04:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r3.ebuild,v 1.9 2014/04/28 17:44:40 mgorny Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic toolchain-funcs multilib-minimal
@@ -99,7 +99,7 @@ do_configure() {
 		$(use_with debug)
 		$(use_with profile)
 		$(use_with gpm)
-		$(multilib_build_binaries || use_with gpm gpm libgpm.so.1)
+		$(multilib_is_native_abi || use_with gpm gpm libgpm.so.1)
 		--disable-termcap
 		--enable-symlinks
 		--with-rcs-ids
@@ -142,7 +142,7 @@ src_compile() {
 
 multilib_src_compile() {
 	make_flags=""
-	multilib_build_binaries || make_flags="PROGS= "
+	multilib_is_native_abi || make_flags="PROGS= "
 	do_compile narrowc
 	use unicode && do_compile widec
 }
@@ -178,7 +178,7 @@ multilib_src_install() {
 	fi
 
 	# Move libncurses{,w} into /lib
-	multilib_build_binaries && gen_usr_ldscript -a \
+	multilib_is_native_abi && gen_usr_ldscript -a \
 		ncurses \
 		$(usex unicode 'ncursesw' '') \
 		$(use tinfo && usex unicode 'tinfow' '') \
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 9a1dc313b4a3..85be0d7a90ee 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.201 2014/04/22 06:14:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.202 2014/04/28 17:46:30 mgorny Exp $
+
+  28 Apr 2014; Michał Górny <mgorny@gentoo.org> readline-6.2_p5-r1.ebuild,
+  readline-6.3_p5-r1.ebuild, readline-6.3_p5.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.
 
 *readline-6.3_p5-r1 (22 Apr 2014)
 
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index cce7e2d69bc1..7e526adf3d81 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -42,25 +42,27 @@ DIST readline63-005 1664 SHA256 877788f9228d1a9907a4bcfe3d6dd0439c08d728949458b4
 EBUILD readline-4.3_p5.ebuild 1591 SHA256 a0f153f8c647359666a214d47647514853a17c2dde8a5a52e0ff934cebb55b4a SHA512 0fe334f4cf3e1a4b0d00bcea4bbdac0664db730462e7dfc8fc231a70795e05fa97285ae301b0b0aa01154cd9f6def741bc2e21a7b82831daa51b3f2ff552a439 WHIRLPOOL 87337d29334668dba75f965228acbd3d850059f0b0a3a34282d4c263b418ee2f99dc0eac1ccef59a09c71b4ba2ee13e5924cfdf48d3a514d7a0732b82bad261c
 EBUILD readline-5.2_p14.ebuild 1905 SHA256 170279df1909b218b3c9ff6b9cc3e315b1a72b8f1a6b5615010e903d67c65259 SHA512 1ad3ccb540e9a50c5bcc6e37689b6534371d4038db57cefb826eb112cf8a28ac1b647cead266dbf5b13a14b0da541a4a3e42343ac67461eefae5670adfec947f WHIRLPOOL 9a72cccb826deffed24f144ec1aeceb3b2c5194a0f072bffba1de42eba0708931d9eb75482847316803796ddc6afa5bd0ca1ce71edd4aef0fc0d2cecc9be1a30
 EBUILD readline-6.2_p1.ebuild 2805 SHA256 b28b3345767cee1fa6f78e2f1298ba6c823c71ffa6dc3e21cc0b21bd561b54ad SHA512 811078d180819d329a84a69b00d6c5e99871b5e15ece17aca2797672a319c8dfbdfd55048ed4d2a1993562d51945dff08bc3d5635abb5f38c2f142c41037aae6 WHIRLPOOL 4b13d886ce70682ecd4fcc46fc3a1a8750e7b6d29c945383e1cb6a3eeed2e0d71d04810adfbf58f39aa1033c5ac642035e7c3c271860022f8712914f4dfba800
-EBUILD readline-6.2_p5-r1.ebuild 4153 SHA256 348c738565c1c46c4d426fce7f905309f0459eb62f6220bd1b0c9980af9ba935 SHA512 b51c64f0941c7ec760c113fa4cf2e9d7c67f278f1ba00c4de213e830c2144d3d01a2b51e85d60ee073f2dcfb213def427e579c58a73f8b7753b77eb9a3c4f304 WHIRLPOOL c24800b8a64a73e6fe215d835b8f7062562dcb05fabd673b7f5da5a03078c69e1cd6f194bac9d7524be28cdda6bf4cb944cccb982d361fc637f7bfd594afebdb
-EBUILD readline-6.3_p5-r1.ebuild 4526 SHA256 84dc67852f9d51cc2b5fe6e9bd1e9bc4927d5ce93f07a60c49fdba26f4f38cd2 SHA512 0406f1da5e8ffc320ca649b2d45ac6ade571a28a85390a6e7e835f5830ffaa6355c2dcc167cff055d31b981d011c5a7240865c25c4f5ab45d494b513c7642c2a WHIRLPOOL b241cc0ab4d55bf4120ef78bb959f3c27b681f8af5a658f73ea1f58e871503c52dee53fe573d4549af032c9a1c24be2993f6e48dddcc1a46393a218bdb627fa3
-EBUILD readline-6.3_p5.ebuild 4464 SHA256 cddb97e13fc0dddf125074fcb35c97df1bb6998bd3c4187b3444314ccc7fd023 SHA512 8e03c7c1d409cd6e5d7e4fe4ca1ff2ff8099640d36f90262944f5d13ec045855e6c8c83e26774650d4cb10aac2f85475dbdd225c9e1e638067e941149c5b00de WHIRLPOOL 5508455e61d298fa727e6d3aac4e08cde1fbb2ee79c3a8ab8f2f1911658039b5bcaa76e88a4456ffafe88eb04de3640eda81009d22d15f6609d9aad14848a5c2
-MISC ChangeLog 26524 SHA256 c9ea66daaa8415ddcfe36176dedb0fa31208eab124e5f0ace1def47a2dbf3bd5 SHA512 a1b9bfccc9da5906138918dd9b57c66f55a8e52197c58378a44af6815ca0c83a2c723595a89e98c96f8287307ab6dc93e16ad68da802f9ca3a91fde9285e6e03 WHIRLPOOL a37dc2abd5fbffa070041b0279593ff26d0b0367d936c542dabcbcc1fc7c738253afcbed53d3b26d8aa20f94bf5848951a9ec3c9eb9f3195739945aac48e670e
+EBUILD readline-6.2_p5-r1.ebuild 4150 SHA256 99f4fde6595e96585ada8f9cc47325ca94fb888348686d7244dbede705d8b6ff SHA512 d9abf0c038ddbc409d75d2439cfcfce6d1948d2f890621539486396e2d0258398b487f73ef8c69e42b758a56ad157fbbf95f1e7f6b76a087eeb3164c58e8b4d1 WHIRLPOOL 93224791350b21559f0287b58ac1b46df8243cf4a3f24886b81e90169ccef710d7aceb46fab8ae31ba94af82c3c63e089bfb57c9eb4b6a0096b689aa8d701205
+EBUILD readline-6.3_p5-r1.ebuild 4517 SHA256 1e48ccc671ce2fb4d1a8323233ca098bed2e48ae017db51b589157ec04b91bb4 SHA512 77eac8587beea97483ea01309b86ee2e05ee4d71efa93af955e0eb5a1a3df6528cbfadd97c92333988f4394463c2429f3bc4273134be8e09adde1eb902f35d50 WHIRLPOOL d9dfa55fd0966941ccb1ad705f2b6ea3bc878877f8e911d70a8b36dc39933318f55988197f79115b197934b498147cc59911c55d30cb7062c630d95ffc255242
+EBUILD readline-6.3_p5.ebuild 4455 SHA256 2b4770d006fbb4cfbd4fed7062a32678cf44852d46047dd0fff6f29363a72805 SHA512 47a9bafd2ddae111c52bdf4b4b7ee27f4e3da9e8900ad79d3b727f1276cff0f33c2243212a19f73e9c57332951cbcf155efa1d926dd5640b4644beec58f640b9 WHIRLPOOL 2f555f85ecda009998a4666cde35b12227d45a11063e0d3b5952497541cb2b897b39d893cbadf2a2db5eb6aa0303751a909195128a44660ccfd1368ad9cfd328
+MISC ChangeLog 26843 SHA256 97a748ac81efb24bf7b2fd79e86c9388d0b2a0b14944ed166ab66233df555841 SHA512 386ed9106109034e39c619f867c010aafb1d2922e0bbb894dd8313efb0b27f3355eb527ba9ebb0c95fc3d2b0ce7ac351fcea107a9d621509470734b128c985e6 WHIRLPOOL f9da68c915abdda658324139b983d2da8da912857de063f1c173505296bcb2442b7e8a467b02a1fea76f62c86897ffd9b65eb7532c2aa2a82a61aa636748fc26
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTVgixAAoJEPiazRVxLXTFgNYQAIAC6ncWhr/yNVt/Uu3WfMN9
-GxCEDaU12XvkJ1NHLCwLirv5ofggCyYPgTthFbtuRQZ0DSmKzyhEZ0HoI6E60Jii
-kZgWWGEhTj9x3ymP+ZNkjVazqLnnax+b9gJGduyH0BU539uUAmMarebZfVsUOWfC
-cwdsY0ANwbF45gAZDhaqQsVYTBpnj+03EHg/jWrrJUaFxch6KejTNoSyottUXOt5
-92wzSyx0hZ+aF3FP8TLWls+T1bVtT/QtAcII/WS9zTTNW+fg4TcOBv6mxX83+LTq
-JvZ7NnkZSSBJSycrnxrbWFBcPe+NcmJbmo1D83lw9evghEvihiO70MI8Oe75ADDr
-jFStW2EDogDTxD5garnq5mbYbZl2hKqFvn8ruBUaaEi1DspuGsC5woKxzYOLx+dv
-h3QLxzVRZ7vi3M1yP0BsdkQOKrdCKOByy509x369zjMZDfITWrw6pRaGvaubs2uK
-MBexbiI5Ts3h3EvFNC0y51sWN6bfIRyKhLlHCNVxxGkcFMRKCs6PpvUaSpEtTmm+
-TY55c/jTdJkG3OLanRUm/jZHeSQfsVXt2N2ne5LcdunuHUraqRzDqSNd9NJErG3j
-Fp2fbIWFxJ1kUS0LmR/ir1Xwi8ztUegVaBOW+NsRukAAXP5n4vwtKr4smJlPGxsW
-ciJl2LKvuRK2vjKgotfY
-=veR0
+iQJ8BAEBCABmBQJTXpP5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5aIP/RuCGlSHCEQJIuEVto7RntH/
+F6uSpfSawlYi3rIiw+xiWr2NufiOqTGGDhriYyTLDcFZQFL/k6gISS/BeebFeCgE
+Kbby49gtbv5rkFKwKY4YICS1Tb3WuydOwh64NIG3o6fQhn455ocIyrk5+u/uGu2J
+znn1xLQFPwe2Xnhz+h5PV4JN2ca3adQ6TITdoYTJbRCNe3rQ0K1eKpyLUukkzYwd
+WrYL4rFDW1WwF7ghysW4rkaiCfXtLRuz8cYVaXDhVf540fajpjDsi+ad2Nt8hClY
+Tm4fjoHRm+OqDT8m49LR3hjnbupf9FiaWFY/EPRs6F2S/0+//elXRaxctxXXvUNl
+LnCCjIrA83I+RPRGSoQaZ9UP1+caWLJj59lg+eWEsObNJ/JVT1p7oL764dA8Nrow
+1aOTm+hedFp1vIpco68WTjKeGs4GZDvoV1NPAlnoPzjdEpkBs3dQn72zazjcZBbO
+2zHqVUDlIL8TTcUPcES867D0gWEOE99kLZjP7t3TjQPboyJ9OZq1XhtQPgS/5B60
+FZBameNm5HOthieAeNBQYTnDDtlWsugjA43Am0JdjwvEh9uC72gv+TEDNhyKK4+4
+igaeyxn6BZAUtD0w6grJ61c+cF5r3AKGQIjf7IY7Osl4zD/QAQPu2N6s36rg8m9i
+pIKcEZ+elxyXZ4c14uuJ
+=1sIB
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-6.2_p5-r1.ebuild b/sys-libs/readline/readline-6.2_p5-r1.ebuild
index 71ad4ca8e5da..c92348e0cca0 100644
--- a/sys-libs/readline/readline-6.2_p5-r1.ebuild
+++ b/sys-libs/readline/readline-6.2_p5-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/sys-libs/readline/readline-6.2_p5-r1.ebuild,v 1.6 2014/01/20 06:34:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p5-r1.ebuild,v 1.7 2014/04/28 17:46:30 mgorny Exp $
 
 EAPI="4"
 
@@ -100,7 +100,7 @@ multilib_src_configure() {
 		--with-curses \
 		$(use_enable static-libs static)
 
-	if multilib_build_binaries && ! tc-is-cross-compiler ; then
+	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
 		# code is full of AC_TRY_RUN()
 		mkdir -p examples/rlfe || die
 		cd examples/rlfe || die
@@ -112,7 +112,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	emake
 
-	if multilib_build_binaries && ! tc-is-cross-compiler ; then
+	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
 		# code is full of AC_TRY_RUN()
 		cd examples/rlfe || die
 		local l
@@ -127,7 +127,7 @@ multilib_src_compile() {
 multilib_src_install() {
 	default
 
-	if multilib_build_binaries ; then
+	if multilib_is_native_abi ; then
 		gen_usr_ldscript -a readline history #4411
 
 		if ! tc-is-cross-compiler; then
diff --git a/sys-libs/readline/readline-6.3_p5-r1.ebuild b/sys-libs/readline/readline-6.3_p5-r1.ebuild
index b5436b7aef4d..d673bad3c079 100644
--- a/sys-libs/readline/readline-6.3_p5-r1.ebuild
+++ b/sys-libs/readline/readline-6.3_p5-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/sys-libs/readline/readline-6.3_p5-r1.ebuild,v 1.1 2014/04/22 06:14:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p5-r1.ebuild,v 1.2 2014/04/28 17:46:30 mgorny Exp $
 
 EAPI=4
 
@@ -109,7 +109,7 @@ multilib_src_configure() {
 		--with-curses \
 		$(use_enable static-libs static)
 
-	if multilib_build_binaries && ! tc-is-cross-compiler ; then
+	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
 		# code is full of AC_TRY_RUN()
 		mkdir -p examples/rlfe || die
 		cd examples/rlfe || die
@@ -121,7 +121,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	emake
 
-	if multilib_build_binaries && ! tc-is-cross-compiler ; then
+	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
 		# code is full of AC_TRY_RUN()
 		cd examples/rlfe || die
 		local l
@@ -136,7 +136,7 @@ multilib_src_compile() {
 multilib_src_install() {
 	default
 
-	if multilib_build_binaries ; then
+	if multilib_is_native_abi ; then
 		gen_usr_ldscript -a readline history #4411
 
 		if ! tc-is-cross-compiler; then
diff --git a/sys-libs/readline/readline-6.3_p5.ebuild b/sys-libs/readline/readline-6.3_p5.ebuild
index 490f32c7bcdf..19ea84f58b58 100644
--- a/sys-libs/readline/readline-6.3_p5.ebuild
+++ b/sys-libs/readline/readline-6.3_p5.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/sys-libs/readline/readline-6.3_p5.ebuild,v 1.1 2014/04/16 09:15:02 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p5.ebuild,v 1.2 2014/04/28 17:46:30 mgorny Exp $
 
 EAPI=4
 
@@ -108,7 +108,7 @@ multilib_src_configure() {
 		--with-curses \
 		$(use_enable static-libs static)
 
-	if multilib_build_binaries && ! tc-is-cross-compiler ; then
+	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
 		# code is full of AC_TRY_RUN()
 		mkdir -p examples/rlfe || die
 		cd examples/rlfe || die
@@ -120,7 +120,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	emake
 
-	if multilib_build_binaries && ! tc-is-cross-compiler ; then
+	if multilib_is_native_abi && ! tc-is-cross-compiler ; then
 		# code is full of AC_TRY_RUN()
 		cd examples/rlfe || die
 		local l
@@ -135,7 +135,7 @@ multilib_src_compile() {
 multilib_src_install() {
 	default
 
-	if multilib_build_binaries ; then
+	if multilib_is_native_abi ; then
 		gen_usr_ldscript -a readline history #4411
 
 		if ! tc-is-cross-compiler; then