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, 26 insertions, 21 deletions

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' '') \