Replace multilib_build_binaries with multilib_is_native_abi. The two are equivalent now, and the team has decided to use the old name as being less confusing.

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

4 files changed, 29 insertions, 15 deletions

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index 2dbf906f09f1..69d9ab96f76f 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/expat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.163 2014/02/05 14:12:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.164 2014/04/28 17:27:28 mgorny Exp $
+
+  28 Apr 2014; Michał Górny <mgorny@gentoo.org> expat-2.1.0-r3.ebuild,
+  expat-2.1.0-r4.ebuild:
+  Replace multilib_build_binaries with multilib_is_native_abi. The two are
+  equivalent now, and the team has decided to use the old name as being less
+  confusing.
 
 *expat-2.1.0-r4 (05 Feb 2014)
 
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 413d5f1a9741..02055c4f74a8 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -4,18 +4,26 @@ Hash: SHA256
 AUX expat-2.1.0-xmlwfargs.patch 478 SHA256 738a06abaafebb301a98992d686b9a55699f6dcac09663071a4e1cac283b2834 SHA512 db7e75a6d1b43f20352223ccc3703683426ce10d67e68dce4ac5faeba8bbe42270281796a9db495e98d53f6d2c7ead8bfb3e2e2668cf5dfa0bc9c1acb0170e26 WHIRLPOOL 85df93895e392c44bb5cd648aa017b2b95adddd5ec765023a7a82223c1c55b677ec3199960afb027d67372c7acc605068d089d49488225bb39aaaea6b7e3c4f9
 DIST expat-2.1.0.tar.gz 562616 SHA256 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 SHA512 2a9ad2b44b87b84087979fe4114d661838df3b03dbdcb74d590cb74096bf35ce9d5a86617b0941a2655ea441a94537bcbcd78252da92342238823be36de2d09d WHIRLPOOL 147eb383fdb79116e2215982e9741939f80249a0bb690e93b00218fa335d483d88f82d9256632b458b13592252aeb100ec4ef830c72bb8eb5df7675cd15f41e1
 EBUILD expat-2.1.0-r2.ebuild 2322 SHA256 cf8865566582aabced12c76802dab72396ab1192a7bbba288c072d5afcd80259 SHA512 14cdcfd29d89db43d28e258f8048888f7cbe2cdf37a219421dee7d28f331a79815c78591d3635b2d7e169a9762c7b51a7c0db044b291f2cbee198e4831cb24fd WHIRLPOOL a6e8ecdd76d01121ac3545e5e8dc1a0a82aac89bdda77ccbe2d94f8188c59e9244f76f4c966240bfd4fbaf82e102e6ac59eb10681580a28fa4629754c1b270ca
-EBUILD expat-2.1.0-r3.ebuild 2431 SHA256 c020ef36c668bcb3ec3cfcdc16ac0157976bea89765aa42cc9e3f57b06537d91 SHA512 014afbb1429e8d3b4e4539b1fea403e1a747bfc14fa648fc4327d678717f9d89765fcc0ba343f39b93bc39ad39aa952a498669522989d57b3e6931eabd340774 WHIRLPOOL c19118eb1308d8190f65fae415eb7ee87d1523cc480affdcfc38a24e475caa34e5868e6e4aa974d649040cd63d22d3c57bd4187c215811088014068ab32e0984
-EBUILD expat-2.1.0-r4.ebuild 2489 SHA256 2cfc23c089d1c0f607dcc82dcfa6b145e17db88fac3ea8a0c2e5e6cbbca34acf SHA512 89f877e9bd39241c6411c5cf3e56c1bb0c2e70b9c9046f4e6861543ee0e2acc91db6e3f2ab133324e521a7df23208ea0a7023ffb9a3bdb5cf6f97c987ca77b32 WHIRLPOOL 90083469eb8b9e15436ff9fb9e5f229f45405c264bf51593811110259edeb3259ef7aec2830f13426a534beff6cdaecee1a172a0533509bcfb5a779b41644baf
-MISC ChangeLog 21293 SHA256 5eaeabe176b887a3e505165bfa556afd66873d075e25fb548b08d821bc9b437d SHA512 ce3dcf6abbb79f81dc92b83e52573174431b33a11bb7362fb8c52a33f504dd8353978637a7f892044e605e6021031f61d35137b12bfebae0f366cadd8bb4b5b9 WHIRLPOOL d67bb352ba6f9b89939cd2f851666e1869ba9b957fa5cade6e539b7bfb9431569856f60ff694d327f00f7eadf986c61c782a8b7fdac5783eedf39b7ec287b9ed
+EBUILD expat-2.1.0-r3.ebuild 2430 SHA256 6f92becbd91ef00a07f30bc6146f7ee3ee54196a88e7ca8c25a5e7bbf9a79d8a SHA512 0e474abdcc85f12f9ead86becb04c1f9567b5bca96afdfa45796ecc8c6a4e8ef2414284acc4620db3c633d0b6efc6f3c1306bbd04f0262a44e282d7ce26f8b16 WHIRLPOOL b5e8b91b3c20f747d1d89208a1b31a829b179f29075a6332dc73043b46eecc37fc3f7a8b59a14c0d39f309f599a7c7efe3d4eb4d5625d7a061968ab11b90962e
+EBUILD expat-2.1.0-r4.ebuild 2485 SHA256 2328e8c11fbe9ddebbd20d90a95476f4d47476d8f9fb720a103e80c2aed22ffe SHA512 e7bd6b789b0d335901b72c35a0254753582aba3876154ba22f390f09f0cfa83b46e2a0ae7101fdb1648d651fe222d28bd22bab541ef1fe0ceca5cf6256805d47 WHIRLPOOL 61d8f7d86d45ad3137bff5e2ae7bf3304e4dc71868bc54152a418c965e6ea3a6273ac69f1317e286dfbb8d22599cc66972d43111a7dfa8f2baa9f6183739a97b
+MISC ChangeLog 21554 SHA256 77867351565710ab8ebdabcd34a2523703400b003a9fd7f5ddd791c4c659f86a SHA512 b89b9631a5e0d99c77557999553c8cb4462921aa6be7cef9178256d64906078caa02015eae71df864f039684d16e7a30b162d94cb2a93e78af3a32c7dc5c8392 WHIRLPOOL fb6d751c8a657d5aa4fce4fc5e1f6763053ea769359b31b3d28125722b4693954ea7c4ae2d8051ece74a0f711098b95a29dc4265fd9ca62a0a09ddbc29b0a876
 MISC metadata.xml 253 SHA256 100ff5eae8571b7fa427f25400fba2ba79683860ec39467180bc8c9a7c73420f SHA512 549874f0fc26095c2d80c34bd0cae74b75ffdd4a9c19c52931047857f51f7461e7b51495cbb7575a19537ddfb4d2762c1fa4b36cafe47ca8057a6bbf6e6778e5 WHIRLPOOL 7c080dd571730c2c8aea4a19fcddc9f6fb947a8b2534d44bff5aa02d85a9ca1e24de2444ed42f326f13de4b082845e68aec41397c0424ca15b6020c0f5ae704f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS8ka0AAoJEEdUh39IaPFNMrEH/1WpQJ7nbjskmFc0o2vm57VT
-rHC09b32q9xDpg00BxbmAIGR1TJ50BjpNPxr/aiYbHtBo6e3qgK4F1ARwUEtdqGi
-dle2H6E/nVIAYEJA23SClqNrFJszxLfvjaTzhTJ0A6QycmA8qpnOKcIttYYrmigN
-oOWX1QO99VywgeFuzMzEfpsIQVVrA4wC78OuHLWM952N0tancZUV++qMKITpUavj
-eU8iIBacGqRvF5TBDyz8PYiQbgvFpY+IIipF5BoEVquoDr+11fJpnytjfH1OLUIG
-l0/4ytQZ4FQPtSZOKm25Dxs9kO2JXsGEtZ8XOP8xtbI3cx6zvMhGtb0tXGRi0Ds=
-=OTed
+iQJ8BAEBCABmBQJTXo+CXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOa1IQALH7B4U63vja60CzMctYhEpP
+Oytf8aYZcxQ0iMzBMGDmLUUCx6xVh4cJykqToL2o5r9Y0GFCQ6ezhResX6hDrXmv
+/a75QxTnwK0E6xxf0842sslT1SKrhmHQZOUmK7TN3Cel/oosEUyVrMww5phRkVv3
+vURBUe1SHZ/ETsvmY+rD3tYJ5sor1WICxwZ6J+m9f9EK2XaYtySwXXJkUvBd4GIM
+chGKrHeGtA+8xJ+18wu36tU8/3vf8j941gj61dU1Fj1dBecJFriYBa0ITUxGJeYD
+fD6ou+KILpXA0haoBtlJiqP0+bpr4cP88RWMf9xW4foA+9xwWIJIznX3NQEBetS0
+PjTE7KAnQUnRub2KX8z/CPSUN5BkLGutmq/LqxuR+cZ7PFbMNh6ri1Wr0t4Dr8uo
+JUREdlRlcui+3gSahNzgpbwMGmWY0qdMPWjdMuS0OD330m8azuPqj9UB652GkRYy
+7Bp2bdYWG1e+QstOKQueegGoJt9YRtm5AZvrPaMnZxYrJNk5WC7mw95BcstzmSpZ
+pYl9b+TFPDrSkroILdjK4dWwpfnuQdVJ3vZQftkc2y7xweShlfp63avqFNR0qrDK
+t0ZUicUPi9irYmIx5ln80busKCsWUTAjdCtTJMzhpZUtWTIeutjI9f8nIVqPG9FJ
+UGN+2hkDao24SyTdD6Ck
+=0GoQ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/expat/expat-2.1.0-r3.ebuild b/dev-libs/expat/expat-2.1.0-r3.ebuild
index d65776ea6edf..961cb5da35ea 100644
--- a/dev-libs/expat/expat-2.1.0-r3.ebuild
+++ b/dev-libs/expat/expat-2.1.0-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/dev-libs/expat/expat-2.1.0-r3.ebuild,v 1.14 2014/01/18 04:35:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r3.ebuild,v 1.15 2014/04/28 17:27:28 mgorny Exp $
 
 EAPI=5
 inherit eutils libtool multilib toolchain-funcs multilib-minimal
@@ -72,7 +72,7 @@ multilib_src_install() {
 		popd >/dev/null
 	fi
 
-	if multilib_build_binaries ; then
+	if multilib_is_native_abi ; then
 		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
 		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
 		use elibc_FreeBSD && gen_usr_ldscript -a expat
diff --git a/dev-libs/expat/expat-2.1.0-r4.ebuild b/dev-libs/expat/expat-2.1.0-r4.ebuild
index 3d915b201af6..ba39404236d9 100644
--- a/dev-libs/expat/expat-2.1.0-r4.ebuild
+++ b/dev-libs/expat/expat-2.1.0-r4.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/dev-libs/expat/expat-2.1.0-r4.ebuild,v 1.1 2014/02/05 14:12:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r4.ebuild,v 1.2 2014/04/28 17:27:28 mgorny Exp $
 
 EAPI=5
 inherit eutils libtool multilib toolchain-funcs multilib-minimal
@@ -73,7 +73,7 @@ multilib_src_install() {
 		popd >/dev/null
 	fi
 
-	if multilib_build_binaries ; then
+	if multilib_is_native_abi ; then
 		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
 		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
 		use elibc_FreeBSD && gen_usr_ldscript -a expat