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!

13 files changed, 98 insertions, 75 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
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 8119925f4691..695f2bea53de 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1024 2014/04/08 21:01:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1025 2014/04/28 17:54:55 mgorny Exp $
+
+  28 Apr 2014; Michał Górny <mgorny@gentoo.org> udev-208.ebuild,
+  udev-212-r1.ebuild, udev-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.
 
   08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
   Finetune the 80-net-name-slot.rules migration code a bit and remove
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index f5ed8e1b0bb5..edd6722d7a0e 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -5,10 +5,10 @@ DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b
 DIST systemd-212.tar.xz 2722692 SHA256 652906b43704fe705cb47757ea9bbbf3c1ab4a1d55ea38b0013a6f2d0863f2c2 SHA512 3e6dac77785cb2f928886886f92cdd11ed00a4db1453699e0102d3ecffa03d1795f44df10239105e4b2b039f0e3e4b5d44c9f876f25c10a6dc4f7e1fbf87c333 WHIRLPOOL 31d1a967435963155c60ca5016f207aa105e9ddcb7d73e9fcde20f7e1fb66701384b81ee01134bf4d75dfa1ea0d412bb352ff11ac6f8c05e836135baf94bbe37
 DIST udev-208-patches-1.tar.xz 964 SHA256 b2df84afd8631736aceee1317d332fd9bee347df503aa55cd78bcf1b375e8f75 SHA512 6e85daaf8639255bbaa76364cda02f8b034ec5f687730a7e3ea7427b53031b4cdcbe1b8758e1474104d52e04781605ee3c1e31bbec2df33c95e606cee8eb0f28 WHIRLPOOL 054d1e954c4eacd10fcdacf130bf6cf2dd165f3da10ba5629f4bd8e488a221e8e5d7db3ab821593af8dd92011dee98daadf09e5dd726a4c99861f4abaea6aca0
 DIST udev-212-patches-1.tar.xz 600 SHA256 378b5c7d11730440dc14a8d57219924ce661695c05103f037c23bfc54ff6f28a SHA512 a57a872656852c8bc4b8df537c7fff7a94f492bcd157f1adfd2fdfa47937e96363ae5ab74788253d615e15fd871b0363f6976594949747dc25a7c32da5c853ba WHIRLPOOL b491dc0c9b416dbe7c3f476a82a8dd79bc62595bea208b1d15b046758d82db1ef1f176e2c1883d0d29c18765e7c2840a67f9ef677f24b675a8546c2dfeec6ce3
-EBUILD udev-208.ebuild 15612 SHA256 7323564c1692705da768c4d33ea1b34bd5315902c2044568dc1e6fbd4c996d21 SHA512 8b3146613e1f804c1b7a359bb75879e28ea3565dca323c96ce962992ef3f3d5dd1eb5760feed5f06398f67f77418e8e74142a2f8c6be13f451a635cd65a92518 WHIRLPOOL 25e4db80675f2ae0acdae0df2fb684ccbad5c8af95e9f762c5f6f413038bcd919705b6d8b9b6da89e01736e0b13f47f7e014711f462e1a1019b27f80569167d2
-EBUILD udev-212-r1.ebuild 15862 SHA256 3c03074ebf4698c59088ce7f2f94a69b70cd31ede4ace09f9dbee6739a655cd2 SHA512 9b588a5ddb586de04d7dfc5cef55a78df52877da38721171ae77f50e45667f852d67c5d823456fd097f94a0b2ad6de3ddbeff6b44b763458ac5344ebd445de58 WHIRLPOOL cc27adfff9866628391dbf9a6562b082c8e22f0b86b7adf5a682362c7bdea983d42d0f297abce6197594d5071118202cf8b8f31b115782456a003762acbf82c2
-EBUILD udev-9999.ebuild 15853 SHA256 03b4a5d1512daf96fe52d51f8019c33e9052b76b242fa1b52f28f30e65d26eb3 SHA512 e640d6cf37b44be8beea522d3e115313ca291bf845449167f2c831bee65f746a1ea48afc2cd906d0a5f8bc706dfdefe1b7bd8574992bcc71c3f20c64b5ceac88 WHIRLPOOL 256d5617b0601ea278e7b80e66ea7ff7ab11bf3ec11a49457def41266fb0c4a1928ff863ea445383f2e71e8ad1caad9255282c014a7635e78d62866d590537ae
-MISC ChangeLog 46468 SHA256 564444b2306caaed2ee7eb104b1b0c5805d2c5d239a432811563ab8694fcfd3e SHA512 7ee0f10c70df9a6cc991fa972658561f84060541498b74ef269356dd0ea9e744f671b83eb7752b9ae33c9f316226b5299474722636993df358b6439c7925523d WHIRLPOOL ff6fb6dd8694dfb330377f1a92e40de89f2999f291f77844f844272ebfc374bc20ce3e4b60256f39d31e8fe639583e7dfd0c4b11fa90ecd2a673be1919aed3d7
+EBUILD udev-208.ebuild 15609 SHA256 b8fbdc0e34ab742cb251df59f80ce4508c29539138b62c3cfc1c58842935d792 SHA512 9981ab683355f836219229acfb79bfc732d045e6b723111b4aafeda02915dc3de36df8da77cda777604d773610b4a2d79a7f29dfed5c0c696cffa4cb57ff2a83 WHIRLPOOL a3449ece115ff843af6cbff8c238c8269c0847d02e7302cbcdf1addd0beedf3ecc613fff08a01851e6f0f087425890dba863c983742c6bb0511cf540e386ae14
+EBUILD udev-212-r1.ebuild 15862 SHA256 9211b0df3666c005da2fbc811dbbee69d57ee546acd82641e0ad4879a90b0741 SHA512 92864bb9ee81d104368a7cf4ed7d3d75ce0d3938a7293053ed297cbf297f0b0ee22dda0ec9c58b102d9186340ba17c6e0de0a6801bb93f9f5db453030503fba5 WHIRLPOOL ce5313c6939b62e42467644f6171dd960b06e59385d604a6fb2105f0f4021c09c6a2bc5de4dca31f1b7b3265d909e9978ed491c7375bacd72e100f09ce5da780
+EBUILD udev-9999.ebuild 15847 SHA256 bdb977257d06941f2ba55f2fa590eded44f51f9f03bf86e350e863e6a32d1d8e SHA512 ae641035e8daa9a51f36d95d2b26b0cf9fdb717d3e4d16d4d594bd0fde1f3e0c1059406d889e9c33666475e513729e3df283d93ebac3c577f33cd63d555e559d WHIRLPOOL d362601d139be30dbcc1f7a23801bdb83bf92bb368fb8c7bb0bfb949bfd3c8432752f2ab73a369868df3ce5d969250d35be76364bc2dbf9e0ae58ef78d122a8d
+MISC ChangeLog 46767 SHA256 a70f8d4dae8db4149db47a752d5c7be6ca258f9346930a268994f04503d845a3 SHA512 41c2399ce36f756cdd6b529a516320c5cbcdfd967e551ffbad509391e43e38402a82b10642c036b7c9b7d1c6e16baf6bf084860cf02fcfa29b63e56eba5ca4a8 WHIRLPOOL 66cec2eccea6b7a364366d00798517730165c69314d4089a5718cf7b2dcf8671804838c02554836b004d539a111eda1dc4d689aeab4526d35a5209e88dcb93a7
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -17,11 +17,19 @@ MISC metadata.xml 671 SHA256 a08866f15d60a320bc7685fa43c319a48bfb1d68a439a08a773
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTRGJNAAoJEEdUh39IaPFNwjYH/2CDe3hyOIb/ZcemeQ9beaWj
-ZSGJwDySuoW/GuftskqfjszLq74HrNTXWQ5YwYiZPCe+6PsuRsHTCP55IUX/GwHn
-eloZVwiz7OfbEX8Wqr5XhVdQ8gsG4yZfj5VHdnkRN/UbFRHgJ2kBWwCOTHONe2hW
-6HTapRY6YZrd4jPe52vWWYsXotxeVFv4sLE/5IKDCJBPJaZ8en6scbDXrpOLjFfZ
-33yV1dIyWQLNjn4GwoKZ+KL4dzkuexbY/jrvwz79PacC6o+eYYXln6lnAYk9LbYi
-adHD52LXi8jSTRUDaGSLP6mH1ItSMlJgplzkYLLeZvnu3d7ekJgFM/JeBUH2hxw=
-=Xqa0
+iQJ8BAEBCABmBQJTXpXyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOU3wQANA7ZXeELFlGIq45HJduM6fd
+deXR03aRWcfx1NPEtlRMdMGvrs7SSp7UQ4RdANhlHpaSKrRufmYQXOzgzE/oAfzG
+Qzr814CzoHQS5sqfMNI8C2/SbV5icVIwqLrtFUsXt/36HzcvkYyJAhywFd2zXnzE
+8XCdNed3VD3h4sxMIILR3GSuZxR3i0QR3taOFXGuZYwzheJPAnMp/q3QSTDgxHWt
+AL8oetuY2w0y1DuH4f03P6zOUFAyT08aPzV7/nLWHfa/+ZFWDbo7McW3MWi2/rbk
+dkyRnu5xVwLa36ffprYK++spf9UWs7S948RlqFXmlhWgWSECk4W31jKTxnUeXK9v
+oCdRbZLycH1QZE3nBjFjZFNnRs5t11gPqnSV8PNIxuQ9hV6xzWYxPF78l42JA3og
+XJ+SyAfNz+9vBW8tlng0c4Nw5QNdVSFw7DfUuFp7EBvcOLCZt7+iGbmEO5/V1Ygy
+LIXS7d8GoEOW2m55wFSIQB6NOFDERofeTcgSoqrU7BwungqcQwSs1gK+z+QO0aQJ
+7+rWWuyRuPoiTwM0kN3b+stFthqplPZVQ0UCL0mgBJuJpkDmEIAZ+gjjbpk9eiNu
+vH9fVP83mtbWEzycgR7KTjGFBbTOTiqYbeqtCYEnoLaV7RN0br2MrLURgzVmqZOV
+4pKClV1vESaZ2ZCvL+Z9
+=UUbZ
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-208.ebuild b/sys-fs/udev/udev-208.ebuild
index 374306397d90..00dce67d93cc 100644
--- a/sys-fs/udev/udev-208.ebuild
+++ b/sys-fs/udev/udev-208.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/udev/udev-208.ebuild,v 1.17 2014/03/28 18:32:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-208.ebuild,v 1.18 2014/04/28 17:54:55 mgorny Exp $
 
 EAPI=5
 
@@ -221,7 +221,7 @@ multilib_src_configure() {
 			--disable-manpages
 		)
 	fi
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		econf_args+=(
 			--with-rootlibdir=/$(get_libdir)
 			$(use_enable acl)
@@ -258,7 +258,7 @@ multilib_src_compile() {
 	# but not everything -- separate building of the binaries as a workaround,
 	# which will force internal libraries required for the helpers to be built
 	# early enough, like eg. libsystemd-shared.la
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		local lib_targets=( libudev.la )
 		use gudev && lib_targets+=( libgudev-1.0.la )
 		emake "${lib_targets[@]}"
@@ -300,7 +300,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		local lib_LTLIBRARIES="libudev.la" \
 			pkgconfiglib_DATA="src/libudev/libudev.pc"
 
diff --git a/sys-fs/udev/udev-212-r1.ebuild b/sys-fs/udev/udev-212-r1.ebuild
index f1192d1e8171..76bd93c23c0d 100644
--- a/sys-fs/udev/udev-212-r1.ebuild
+++ b/sys-fs/udev/udev-212-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/udev/udev-212-r1.ebuild,v 1.7 2014/04/05 20:28:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-212-r1.ebuild,v 1.8 2014/04/28 17:54:55 mgorny Exp $
 
 EAPI=5
 
@@ -210,7 +210,7 @@ multilib_src_configure() {
 			--disable-manpages
 		)
 	fi
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		econf_args+=(
 			$(use_enable static-libs static)
 			$(use_enable doc gtk-doc)
@@ -245,7 +245,7 @@ multilib_src_compile() {
 	# but not everything -- separate building of the binaries as a workaround,
 	# which will force internal libraries required for the helpers to be built
 	# early enough, like eg. libsystemd-shared.la
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		local lib_targets=( libudev.la )
 		use gudev && lib_targets+=( libgudev-1.0.la )
 		emake "${lib_targets[@]}"
@@ -289,7 +289,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		local lib_LTLIBRARIES="libudev.la" \
 			pkgconfiglib_DATA="src/libudev/libudev.pc"
 
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 1b91c32b002b..72287c4630d6 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-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/udev/udev-9999.ebuild,v 1.294 2014/04/08 21:01:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.295 2014/04/28 17:54:55 mgorny Exp $
 
 EAPI=5
 
@@ -210,7 +210,7 @@ multilib_src_configure() {
 			--disable-manpages
 		)
 	fi
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		econf_args+=(
 			$(use_enable static-libs static)
 			$(use_enable doc gtk-doc)
@@ -245,7 +245,7 @@ multilib_src_compile() {
 	# but not everything -- separate building of the binaries as a workaround,
 	# which will force internal libraries required for the helpers to be built
 	# early enough, like eg. libsystemd-shared.la
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		local lib_targets=( libudev.la )
 		use gudev && lib_targets+=( libgudev-1.0.la )
 		emake "${lib_targets[@]}"
@@ -289,7 +289,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		local lib_LTLIBRARIES="libudev.la" \
 			pkgconfiglib_DATA="src/libudev/libudev.pc"