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!

8 files changed, 60 insertions, 51 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index f15a1d863954..3af06ff55b46 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.102 2014/04/15 23:15:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.103 2014/04/28 17:53:15 mgorny Exp $
+
+  28 Apr 2014; Michał Górny <mgorny@gentoo.org> eudev-1.3.ebuild,
+  eudev-1.4-r1.ebuild, eudev-1.5.3-r1.ebuild, eudev-1.5.3.ebuild,
+  eudev-1.6.ebuild, eudev-9999.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.
 
   15 Apr 2014; Anthony G. Basile <blueness@gentoo.org> eudev-1.6.ebuild,
   eudev-9999.ebuild:
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 1d7daabb44a0..6106fcbddd68 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -10,28 +10,30 @@ DIST eudev-1.3.tar.gz 1679385 SHA256 6f1f0b15971a53c7070a44c902c7c1303f952927aa6
 DIST eudev-1.4.tar.gz 1712371 SHA256 66da90fdd228444b7ac1868d36f1c0fe52476b966e766398bac7448e105c9f53 SHA512 5be490b3c29ae26c22f9dcf60df26e599ab4dd2841cccadd8bf204f6e6d8103e689708ab0ad484c30ba656c3a693f594fb38cd2eef3b4ece8727bdbeaf8dd4d4 WHIRLPOOL 3f448d1b87253f17c35c9268739fa3d01660192956d70d23c5ed3bbb983ecefb39cf193f8658019ecefce81706667022eaa0170cc6ba3a624fbeca9e148ac839
 DIST eudev-1.5.3.tar.gz 1724415 SHA256 8e4362979572719562f600bfd7decd42d4e21506db5483e3d2e88f725396c57b SHA512 c00f34d76d76ebd5c2862310a2ba3d7bf2f8d348a96e0120ed02aa9014857df736e3a2280a4478e50f2537cabc9082b8f5f5e57ef7b3cf925fae6dc3a4688ddb WHIRLPOOL b3fc943f6c3eaeba92aed72dee417738a840f4176182e08f7564a1fd34baa3cf2a52787ac8e936f74f6c13b7896eb929a2f83cf087b8b09e5b8c7d7858471dd5
 DIST eudev-1.6.tar.gz 1729499 SHA256 9d00d6925ccc7763be89472c5058012bd45ce13f14297e40e4cf3a02244a6a47 SHA512 036cb1f43447fd938f0ee93b03cb4cf2ff1e1e5adab6aeb042ef99b791d887165d15206fdb3a11f3b71ce0e3affaa446193da1574c3fc3d3495f6bc057c37927 WHIRLPOOL 31a106e57060987a1f67aebb35a459ef103743365265e973f306868b72f7a7ff024b0ab6af684e2495a90e41e87147b2a0ccfaa12a09e9e21d0aefa6068e0a63
-EBUILD eudev-1.3.ebuild 7914 SHA256 f57d07aba9f1a7bc84a0b76ac688761ceb2632c4b930d3fb98d808e121efeeec SHA512 865c91af87f2b3c91c0963a5c6bc1da6f6b9b3e519b5dea6a3170fe5f4d4f5dc44a5c84d19f05383f802a91dc249c65650c2051014d73fe86c7eedcc7b9695da WHIRLPOOL ac0c66c725665c4958f1ec34602f4ecc347cc5130d4ec3640b5098e3ffa28c44f72fa359a507e7b7a292b71901bbf0ca3dcb01b2aef491d2e76daec51b192219
-EBUILD eudev-1.4-r1.ebuild 7926 SHA256 dc5527b9ec52225551440eecb22951a4297b234c3b9e0903697f3c142773d8ec SHA512 797ff003314fd1c7488443f8207bae905ba92f0220fa470f23abf0dac50324935e855df9cc384d27aaf420cf69b59c64b0fff36bd6c42b2f4c164fc4780cad57 WHIRLPOOL e112de4793a9fe7084df9f10ab2084466bbbd13c7493ddfc2d2b802b0bbf5853fb176c7ba9e727b4b55c91dd5809096b9de6611c68d8b7fc87811bdd6e0d7da1
-EBUILD eudev-1.5.3-r1.ebuild 8116 SHA256 fe9c7ca7eb85ba9d5fecdf2f9c18485c4ee394cab36b1ea1762af4c6bea1ffaa SHA512 48600d9732c6b69bf85ad2a45ec4174280fc871bd4cfb0b735773ead3236bd62c28ee207de94b97e1cf7c122de14f290eff1d7e3670ba843b50fd3265d1f3f3e WHIRLPOOL 4ac5d4e56a714a2b8507b396920b77689dfd8d3a8bb1f8ed89c0590781ed9bf697929abaf195942d1415892d4c354ff50ce666113d309df62ced748672ea6874
-EBUILD eudev-1.5.3.ebuild 7925 SHA256 1815a64d8c7423e1b55bc1d4ed86f1c8d3c7e043370d567d19380b1af19d3d0a SHA512 c6c9bb9beab7a24b5e1ae6409fa4d4c355efade9d3964761f7a65aeac40b913996e32f644b68ab2d254ce7980f17304392595f6864647ce33f9f3f35d48a63fc WHIRLPOOL f2ef7d595214dc2de2408631602696e7a098e5d05d2f5f6286cce0140077829ad67b40cf806f46d263cb5bbc830d8d4f70ff6261934075e4fb3dd5ebb63b2bec
-EBUILD eudev-1.6.ebuild 8261 SHA256 22b6753fe0e163df57e3bdcab4a19805f546ac94399ad448f6a9c57b74420bd3 SHA512 8d3de570f952aa80fbe0b03107d2eeba1eebd43f0541c9acfe93db24f3a87c221be2ff0fa71334b80aba43309fbcacd3de3ffd6a420e0ca0ed1313e8a6c05fcb WHIRLPOOL 6a83b5fe1f2a035830b30ed413fc83e50d633a222f2e4dd4d70ba591e5bc578f8eef6da3671bf6b048f057da790ad257e40913a617943e85a39951bf31d3220c
-EBUILD eudev-9999.ebuild 8263 SHA256 7170d1fac6292547a1d65dc0df22196a728aac11e833c9d96db50769fd3218f8 SHA512 280e5892a58c830ec8d66768d7ae495b8916098d22c5144156436870511521d125111959448b4fc7e96ec245cdb32ab8ed30ffaf0ebb652542bbc1c825e833f2 WHIRLPOOL 062c6f5ab54cbf02b2dce171c711c92b5aa2517061272f72317ec694c21055886d32acdd08278dbf94cd6164bcc94f7b7833eaff97bcc926757ec928e458c6d0
-MISC ChangeLog 15604 SHA256 fac943c6598d3c2e7832632744d7b2d8afa22b788f76aa1884e9bd5bd7148a50 SHA512 8b08cb59cc33fa2520078f4e46c2b83ff39118a727d3fdbad7adc60b0bbeb7501b1b41d9078caa689b7d134d01d58bfab6635af2eabc2013e9c626fe70d012aa WHIRLPOOL 8aeb1fd0f4b39612caefb4f3b4921f251067a2e2051c6d93bfba2996e6d1caf046e0d880e387a7540bc0f652079734c9f74350c3ed8b2d1e8b94fa3855b44630
+EBUILD eudev-1.3.ebuild 7910 SHA256 c859ec0746f5dcd792ec12a0c9403ea04450b775c210f2c9f57d7d350f094fcc SHA512 3017a5fa2e1af8f242aee15989615f8f50bf88060353092ccef02d2b3135d5848c8efc89dc9a89914e801a3442d06b0e0a3219be5407623e39073c81571f1d4c WHIRLPOOL 4ec4ba4da39a55e4c59085b69278bdba395c46044ca3dd6cd618f8f07bbb047d41dc72f20c459a95625dbd8a6811985bed248c6dfa76a9d1825ecd133d4f7799
+EBUILD eudev-1.4-r1.ebuild 7922 SHA256 ec3bbb695fc2fa5f776eba5d1fc1e68d5e3267794d9503fd7a54511eeb36eb1e SHA512 460d4ff06f996b129e5007401edd3a97fb47ca7cb02741127b724bcafc97ab7c9eb7833e9c75cafbeb3fd785e333f74bd311295a945e13fde78cc5c0e9ee5703 WHIRLPOOL 333d1b3cd1d5e18c9828327362d2578462019010f039fc7c8655647dd1f1b9c3b16464661c55d16f8023f29e0dd123c12ecacf9cca6a718ef744848e3686a3a2
+EBUILD eudev-1.5.3-r1.ebuild 8115 SHA256 cc6f739fe1f86383528fd0411f0e4c3bc7193299dc76984402459ab9f61a7c6e SHA512 6f882fd98419914c4878cd85e35ab0af038dc9fb9393d8142b0fa2970df968cc7cb9939851e243a50e5f8478447f9bb72a4974c2d33fbc7730426a8ee817b99b WHIRLPOOL 43f34f4b65feac8690efa06ada02596a2386daafc280b2f1635f91fba37c60bb7f7c2017bd2b371adfa5471676637437d6d4fa0e97d9049825194a2b5aa59a6e
+EBUILD eudev-1.5.3.ebuild 7921 SHA256 87fec8fcabc597df1f31f1373521c4c08704ca0d33cc1aa93cf1377dfd04909d SHA512 13522474dcc411dd7281d219d870065f327bff0ba78b480dce06e99820789960898c2a06610059c405fbd991b97d28a35d400e8d6a0e5ca10b216524555f63bc WHIRLPOOL 47bacb467bcede11b25fed728357fd3bbc1fb9d1eb2fcd2ffd97b6ebe403639e571be99d33e23d06d4eae037e925287a377b046f292a8fcf3d7e18ff0550a7e7
+EBUILD eudev-1.6.ebuild 8255 SHA256 b18db6bdbab339260de7804f266ea1c2a292c6b986a90987ed7d4237efcdc9fe SHA512 34b17ee4b7fdf1fbe630b13b0f9ffec2c35570c34b98bb420f51ab471aba2a84695e8a72480c688c4e6d6551a3f0919f970be31092a9975c9ce33511d5633930 WHIRLPOOL ccda5efe84d89edc11e1d8045d424700f91311dcccd1e2e862bfc873727eeec403e5ec55350d053bf8ed1a6dd8fd6781113ea27335ae3ef1a9c4d6ec595c9684
+EBUILD eudev-9999.ebuild 8257 SHA256 2e7203b96f457ab74e9b16664386376e30f36479bad3eb707032b2a6baf525c0 SHA512 17b4610c392e13de7a1cf5da7e2a59b9deb798cc8dad9cfa9847bb509a54d1eeca323368960d6f462c63025f94fe582bb06e9f1de0dd74e3ca00a3647e7cfc0e WHIRLPOOL 96ed28de290e8b2ae12f86b73e54e0748525a24ab1740dddfa8c53c64564a7a5ef54005b5c7080f60339dba9743a9845f985fb791be06ddb1b9578ac68d0fc64
+MISC ChangeLog 15970 SHA256 c5090aa6b04480e1eb648afd0ae969d6e0723d8ec72d80dbaffc82d981cc4559 SHA512 ddc5b0125a324efaa46cc2f391b32b9197ebfc8526b07bd8a5d79554573497c38eb9a4f4ec1c4e7f581d3bd872b699d2bf9497b3db9967507863ebe854f23bb1 WHIRLPOOL 5d9883734ccc3c70d4f9f7b0d2557da9e911f888b96f3cda1efe6bb35354135119f230ca1d607f80275e319c4046b52b32b5b4e212a0762a1f3e5912a9d486d5
 MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTTb2/AAoJEJOE+m71LUu647wP/3ei2jQpIZY3VWRCy3+l4jOk
-sqpPnsqetYGEJVMx04r7lVtp1FeEOfRbAenEu7PIc5ZOCcJWav3qim3VfbjQKg/U
-YVulKO/7VWxGNQ6crNNrkIHif7zD3NrOQ6YxVAWNJCFRDHhTmrcZkwlw+EXEmHxJ
-DFhLm+jofTkKXz4pu8S9una8QLGsOQE2GGsf0oid3Pn4BP594eY+j0/kqZIUq+iv
-wsjtUpUHrgN3UhHEu1MegmVzTrBe1v2DiEtW9BTpTNNtfisvi1HLSq6lUfh5jE9N
-rPCajG3NSkideizbbR2JtACnVU/f/kO58U6IyIC+WP3I3jjaI+78H//HHaTGVjky
-xGksObUfygZccT/ctmPmQu0HHRPXiht8VZdLfENSICpGkhXKWTwXI+E1S0aecXxm
-x3K967+2ST8+BfngduoSQgtdBrvMCYR/th8PD2BiGJeQFaoizEvo5n6m672KrW3e
-HHwrlqkvIiHnN9JKu/yNrDnj05DV/LzKK0A49ZXL90MOwjUANHI4aHTb24p8R4Us
-xsv04KKcIwygum+KXRK+VWUm8fd34SzzoCZJes/cBb86TRznANVEjKsdIm1rnORN
-0ejMVEOHtLPPv3hldIYBI2kwTCtu0ide57UrbnrxaX/XIZ4xZmRngTFNKMug/4wX
-eBWc8pJOdbxdxcEYMqRH
-=rB7x
+iQJ8BAEBCABmBQJTXpWQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOzLEP/1KUMH+RYAFQEsJuqC9/FlI3
+BqXCyDNkmyI6IE8KiwN0UIWka1jRqjH9bA3W+C+sYIEEvu7DRGqSyjdZED7j62Xq
+oy7UOdFFYWmpylEHvA0Zl4iIyzzNz5Gea8bQMkh2OGzfIPWkFMA0ROK24HWnjF4F
+UynP71Hjb7a3n5YFlUOAkcFjFwbWS+yS/AYHu8FkNdF0Em7hZA8Hs4Nr6uKxHabH
++wyAxE1Hj+r4gsr9aoAftMxIRJg6Pb5ePhCT1qqu677SbAy+eFuzb4wwPZkFb1Iw
+9VEXPoHrnn0mhJ4q1PfRJqqAnWiHkrHDh2y9plD0NB8SkNO+q/9c3l4GailJRPgx
+kZqhEUlyaGunEXwRcfH1sx1MMnTUrUy0kBvnIsDbuENI/bt3t0tT6d8jEEliz9DY
+oVS9tqbfa2VZpFiJy58Xm4JwPPSIJcJHV/1BjXKxhliEXBnDihnUAhcfSAyRryYK
+1qC7y/vIbfoZIgK1I2hCv41iQq11q/7AmQgEy73C30ylI47tC1vU8gRpg5jEa9jw
+kMyPzgbegila9/LmCL4ssmR6bK0hCO2Lrbd78cpAOn5i1W6RkXlMd91Gls+OU84t
+xDJ3EHBFcfqyMQ2aIXbUvhwpZVSvUoiaYnYmLs/nSPui4a9CFgs1LvOcUBVujsl3
+HUox1ZCwZEjQ3KR0PCRJ
+=SjpF
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1.3.ebuild b/sys-fs/eudev/eudev-1.3.ebuild
index 55df8d44f2a5..af5418c7d2a0 100644
--- a/sys-fs/eudev/eudev-1.3.ebuild
+++ b/sys-fs/eudev/eudev-1.3.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-fs/eudev/eudev-1.3.ebuild,v 1.16 2014/03/28 18:28:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.3.ebuild,v 1.17 2014/04/28 17:53:15 mgorny Exp $
 
 EAPI="5"
 
@@ -140,7 +140,7 @@ multilib_src_configure()
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
 	# that means all options only apply to native_abi
-	if multilib_build_binaries; then econf_args+=(
+	if multilib_is_native_abi; then econf_args+=(
 		--with-rootlibdir=/$(get_libdir)
 		$(use_enable doc gtk-doc)
 		$(use_enable gudev)
@@ -161,7 +161,7 @@ multilib_src_configure()
 
 multilib_src_compile()
 {
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		cd src/libudev || die "Could not change directory"
 	fi
 	emake
@@ -169,7 +169,7 @@ multilib_src_compile()
 
 multilib_src_install()
 {
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		cd src/libudev || die "Could not change directory"
 	fi
 	emake DESTDIR="${D}" install
@@ -182,7 +182,7 @@ multilib_src_test()
 	# but sandbox seems to evaluate the paths of the test i/o instead of the
 	# paths of the actual i/o that results.
 	# also only test for native abi
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		addread /sys
 		addwrite /dev
 		addwrite /run
diff --git a/sys-fs/eudev/eudev-1.4-r1.ebuild b/sys-fs/eudev/eudev-1.4-r1.ebuild
index 4fa1d6f9dbf0..1f17db70a885 100644
--- a/sys-fs/eudev/eudev-1.4-r1.ebuild
+++ b/sys-fs/eudev/eudev-1.4-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-fs/eudev/eudev-1.4-r1.ebuild,v 1.2 2014/03/28 18:28:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.4-r1.ebuild,v 1.3 2014/04/28 17:53:15 mgorny Exp $
 
 EAPI="5"
 
@@ -138,7 +138,7 @@ multilib_src_configure()
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
 	# that means all options only apply to native_abi
-	if multilib_build_binaries; then econf_args+=(
+	if multilib_is_native_abi; then econf_args+=(
 		--with-rootlibdir=/$(get_libdir)
 		$(use_enable doc gtk-doc)
 		$(use_enable gudev)
@@ -159,7 +159,7 @@ multilib_src_configure()
 
 multilib_src_compile()
 {
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		cd src/libudev || die "Could not change directory"
 	fi
 	emake
@@ -167,7 +167,7 @@ multilib_src_compile()
 
 multilib_src_install()
 {
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		cd src/libudev || die "Could not change directory"
 	fi
 	emake DESTDIR="${D}" install
@@ -180,7 +180,7 @@ multilib_src_test()
 	# but sandbox seems to evaluate the paths of the test i/o instead of the
 	# paths of the actual i/o that results.
 	# also only test for native abi
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		addread /sys
 		addwrite /dev
 		addwrite /run
diff --git a/sys-fs/eudev/eudev-1.5.3-r1.ebuild b/sys-fs/eudev/eudev-1.5.3-r1.ebuild
index 6716963b201d..2c997903de0f 100644
--- a/sys-fs/eudev/eudev-1.5.3-r1.ebuild
+++ b/sys-fs/eudev/eudev-1.5.3-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-fs/eudev/eudev-1.5.3-r1.ebuild,v 1.5 2014/04/05 20:28:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.5.3-r1.ebuild,v 1.6 2014/04/28 17:53:15 mgorny Exp $
 
 EAPI="5"
 
@@ -140,7 +140,7 @@ multilib_src_configure()
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
 	# that means all options only apply to native_abi
-	if multilib_build_binaries; then econf_args+=(
+	if multilib_is_native_abi; then econf_args+=(
 		--with-rootlibdir=/$(get_libdir)
 		$(use_enable doc gtk-doc)
 		$(use_enable introspection)
@@ -160,7 +160,7 @@ multilib_src_configure()
 
 multilib_src_compile()
 {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake
 	else
 		emake -C src/libudev
@@ -170,7 +170,7 @@ multilib_src_compile()
 
 multilib_src_install()
 {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake DESTDIR="${D}" install
 	else
 		emake -C src/libudev DESTDIR="${D}" install
@@ -185,7 +185,7 @@ multilib_src_test()
 	# but sandbox seems to evaluate the paths of the test i/o instead of the
 	# paths of the actual i/o that results.
 	# also only test for native abi
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		addread /sys
 		addwrite /dev
 		addwrite /run
diff --git a/sys-fs/eudev/eudev-1.5.3.ebuild b/sys-fs/eudev/eudev-1.5.3.ebuild
index 0dfd6198c385..da6f44d1f627 100644
--- a/sys-fs/eudev/eudev-1.5.3.ebuild
+++ b/sys-fs/eudev/eudev-1.5.3.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-fs/eudev/eudev-1.5.3.ebuild,v 1.2 2014/03/28 18:28:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.5.3.ebuild,v 1.3 2014/04/28 17:53:15 mgorny Exp $
 
 EAPI="5"
 
@@ -138,7 +138,7 @@ multilib_src_configure()
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
 	# that means all options only apply to native_abi
-	if multilib_build_binaries; then econf_args+=(
+	if multilib_is_native_abi; then econf_args+=(
 		--with-rootlibdir=/$(get_libdir)
 		$(use_enable doc gtk-doc)
 		$(use_enable gudev)
@@ -159,7 +159,7 @@ multilib_src_configure()
 
 multilib_src_compile()
 {
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		cd src/libudev || die "Could not change directory"
 	fi
 	emake
@@ -167,7 +167,7 @@ multilib_src_compile()
 
 multilib_src_install()
 {
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		cd src/libudev || die "Could not change directory"
 	fi
 	emake DESTDIR="${D}" install
@@ -180,7 +180,7 @@ multilib_src_test()
 	# but sandbox seems to evaluate the paths of the test i/o instead of the
 	# paths of the actual i/o that results.
 	# also only test for native abi
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		addread /sys
 		addwrite /dev
 		addwrite /run
diff --git a/sys-fs/eudev/eudev-1.6.ebuild b/sys-fs/eudev/eudev-1.6.ebuild
index f5d0008bb255..637ab149c902 100644
--- a/sys-fs/eudev/eudev-1.6.ebuild
+++ b/sys-fs/eudev/eudev-1.6.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-fs/eudev/eudev-1.6.ebuild,v 1.2 2014/04/15 23:15:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.6.ebuild,v 1.3 2014/04/28 17:53:15 mgorny Exp $
 
 EAPI="5"
 
@@ -145,7 +145,7 @@ multilib_src_configure() {
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
 	# that means all options only apply to native_abi
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		econf_args+=(
 			--with-rootlibdir=/$(get_libdir)
 			$(use_enable doc gtk-doc)
@@ -165,7 +165,7 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake
 	else
 		emake -C src/libudev
@@ -174,7 +174,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake DESTDIR="${D}" install
 	else
 		emake -C src/libudev DESTDIR="${D}" install
@@ -188,7 +188,7 @@ multilib_src_test() {
 	# but sandbox seems to evaluate the paths of the test i/o instead of the
 	# paths of the actual i/o that results.
 	# also only test for native abi
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		addread /sys
 		addwrite /dev
 		addwrite /run
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 549242318146..83385a950fcb 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.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-fs/eudev/eudev-9999.ebuild,v 1.49 2014/04/15 23:15:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.50 2014/04/28 17:53:15 mgorny Exp $
 
 EAPI="5"
 
@@ -145,7 +145,7 @@ multilib_src_configure() {
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
 	# that means all options only apply to native_abi
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		econf_args+=(
 			--with-rootlibdir=/$(get_libdir)
 			$(use_enable doc gtk-doc)
@@ -165,7 +165,7 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake
 	else
 		emake -C src/libudev
@@ -174,7 +174,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake DESTDIR="${D}" install
 	else
 		emake -C src/libudev DESTDIR="${D}" install
@@ -188,7 +188,7 @@ multilib_src_test() {
 	# but sandbox seems to evaluate the paths of the test i/o instead of the
 	# paths of the actual i/o that results.
 	# also only test for native abi
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		addread /sys
 		addwrite /dev
 		addwrite /run