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!

4 files changed, 35 insertions, 17 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index bad07b8a70ce..324609508293 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.332 2014/04/27 08:03:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.333 2014/04/28 17:55:49 mgorny Exp $
+
+  28 Apr 2014; Michał Górny <mgorny@gentoo.org> pulseaudio-5.0-r1.ebuild,
+  pulseaudio-5.0.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.
 
 *pulseaudio-5.0-r1 (27 Apr 2014)
 
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index d01841be8a4e..6a05c4d19720 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -10,14 +10,26 @@ DIST pulseaudio-4.0.tar.xz 1392072 SHA256 35ceb36bb1822fe54f0b5e4863b4f486769fdf
 DIST pulseaudio-5.0.tar.xz 1455428 SHA256 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 SHA512 f3d64bd6e03a732fd812da466b6658004600b4f3d0b9760403b7e113b6d654d54387658bf3704f45f28ab700245433e23fe517e4579130886fc58647eb97be2b WHIRLPOOL c85829c78ded3bbef234e455bfd3778f2daf50de9d7627508dbf131d0c398e35ab3ae41a4b5136f0c0da09249bc9a600ad85d848ba4e1faba74875af0a787036
 EBUILD pulseaudio-2.1-r1.ebuild 6727 SHA256 b8072bfd393f33e71bf33cde7548c898a72a89c6a274b47f249112ac55c4c0f9 SHA512 810151ae1b69d40b2f56e71afcc82b600e5b1e9ab393d23e15d16e6da9f4647fc7bb5df4074274f6efc0ea5cd31a9bbbebc1d640b203ed0e190ae03fd0dfae3b WHIRLPOOL b6e016ef10af4a105eb63837d483ce9556f997fb19d06516ee93b5f8a8fb757a4e2230b92e94881fe037c654c7b4feb6c236a9167693c68bf99dcdacdcc1c146
 EBUILD pulseaudio-4.0.ebuild 6911 SHA256 7eeca264b3506ae7655c1556c346bf660132caad41e57b36fc8ec4329c372a01 SHA512 e469e4b2aee4039b01d9e6762b4948a8905c7a8feb021d4892085bd52dc558d419bf3fb366dabd831a72826280b499802f210f11dec0d583a954c251e71180d6 WHIRLPOOL 97be855b0c8aaf3c0222214819e8b21ff366773cbb9b34fdd11826cfbc590ce2046b645aeeac32b796cdc311ffff0caf14b79f12542093d0e7a71ef1263698cf
-EBUILD pulseaudio-5.0-r1.ebuild 9799 SHA256 e077eb9f44b5b72c76a1f4049e875743139e231f39c0e41d137335cb9c402135 SHA512 755dea4b46f16bc5ceefc67ecd2d47d4fe150e57662a198ca2c5bf77051a5afbde442826c5c69d1107288cd891f8294bc777337ea14668cd7c1c775086436a26 WHIRLPOOL 3ea555efe3ddde777526fb70913d85ca1b036a3fbb9f8a7157695e4424a1200b64d3cb99697f53f975de457c8eeb9c017ca27724ae657e3fbc4435b4d7596717
-EBUILD pulseaudio-5.0.ebuild 9610 SHA256 519ad7632fcfb6f3b8b143926731ed0beeb2ee364ad7e12098dd4414eab1538d SHA512 149be2e2e20782003a05316f8f6dcde2fe3304e911387020145150f5691a2713d2861059fb8593817404b24417ad75382826bd8523b67f5b68ec62da8edac665 WHIRLPOOL 1ddf536b64fcd2b41691875fceb59c3591e94eddce82abc90076224014319ec1b77f5331b010c0cbf5f42ca834c1cff6e90aa56391c0055644423b20f02be777
-MISC ChangeLog 63702 SHA256 7be29c1d8de807840c8199cfb240b8ad05dd999768c1a277e6ac31ea951663b0 SHA512 66141004a902e0145bba905da0d4a03b8a8f569b565a7a46904f12cec5c1010ab1501ee979655df77904340241782101dfdf99f5727611f31d2da4df554382ce WHIRLPOOL 53ed45baee1a5029b9869b108114c443b8649c05585241293c53da8c9bef1f52870fa39520ca4727f37d5bf65bfc02ba6d0fa22eeac94bbc68997baf04e2177b
+EBUILD pulseaudio-5.0-r1.ebuild 9796 SHA256 ba4ded5e1203d7ab0d1e6ca68de5bd55dab3485441ce19a331846b30dcc7325d SHA512 86bef74d21a390666862340646e47b136462c50f5ff3f32d812f1cfe07a7672f1aeecedbcd8371c0b1eb4eafb9e8538b95e6544bf1ae8b00941e22d76eba852e WHIRLPOOL 423a41ab8d845dd053c1d9f99f2ca3805c1771435faf81916bfc5d09740821bb1759abf8dd836e89e63bc784cc7bebad4a7adfb36021a7d47831da9969260b3a
+EBUILD pulseaudio-5.0.ebuild 9607 SHA256 29a04b124bb9c82849663c0b42bb4cac9bffb5a31613b8be7d0f551b90575329 SHA512 ae3842ac95a8a44e17203ce10754e0973c15a512187f41e25606155e173b1a6353926b2e4db380296327f8f46bbba8c5004f3314bf3b1ef782941258b24b4ceb WHIRLPOOL 129f5089936a05a9ddc5b25c0c682c4adf131a569e35ce5973f085f76609d32c795366f10c39c6741fa3a4ac5486b5d21100ce778618050bab541466fc31fa1d
+MISC ChangeLog 63999 SHA256 7f6ce229c1749f30a6ecc4d5e61f6d207a617d8eb3ee70f689f3f25b032a8bef SHA512 278baa49e97f887cf58b2daab6e9a9f2a1d28f2195d9a5ec8e88d7bd5b36b7a7deec50f4f13171bb2cdb8cc4f6a9f3768d5ba31ba6d9ab5dae03a78315e111fb WHIRLPOOL eba1d630bb4ea39ff3390c1b295a05f4b25fb303c60c4cea6c01c404c91399be97b028361b35715731dfb11d0f095ea0ef9edfc5819b028c8890857dedbd02c9
 MISC metadata.xml 2831 SHA256 626aa770bbfbd06e872686d755d45c82f53e8b99cc82719fa7d8e69d9d9e2130 SHA512 a3b13e05bec6d3b4df89324e8caffdb8d9c4e9ed45087289e4b967269cb65ed7acbaa3896139b43a26e3fcffbe723f0579f0a438077069573eb9319ff7f179a1 WHIRLPOOL 1356c3d642361188574001f2f1d7797dfe7935c54dfcc6146389c930b69fdb89e7354f00201d99471c585b908d241b16bc8ae409c4d9852ebdcd07ffab85f1fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNcudMACgkQCaWpQKGI+9TQyACfZ/rt5cxTb08OTbDG1jIlaG+e
-H/8An0qV/x+8F2YQ6w+Uim1QcC9RPMe2
-=5vHn
+iQJ8BAEBCABmBQJTXpYnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOy+YP/3m8UO+AENqASp1EgoiPDm5+
+2IfrUtKpuQ+rAPUBTI5YguyeoMP+KDAi38qD7M0Z3TKDlwCYxsjE6aw552xJcE4D
+dTVX5hwwU7bHN13uwQcH8BHc/a7w5zfLpRMxh+6s3NR2z3IvoV5ubyHgSekkxNuT
+LckKlMnuncEv4b6P3Y4mUBK+nLJzUAU1n0/apGLeAVE+CKUijL6EfspckJU9ZUhW
+iskaHqqgovtDxwzZ7IasHUNWgqe1jHyWSuO5gbUo0ncaSEsovmUzz8MGkmbnACcs
+GcoYUJxld3Ghn5sBvjwDr5TEDMQeR6VqJ7wl/Sn3jFWfZdA+HrOF4UP6IqiCBOww
+7mWHQD/Q2mL/mRwlebScv9PwiSS8OjC2EiCXPf3YGtyAFoOo6jCzpnEbrZOHXeyV
+EDnp1QgoWiXyDOvuWI1G3QMLxlIA+FiQ6dRPLHxGZfA+gqdjS1NPy0LhfsSz2DiC
+o2oUqk/BdpN+3yOzcDRt0xHN0eQWq5sbAfISc4WaCkG2Q5HzyKanKAPUiQuoOqXu
+pqaP++QRQ/yZaGk576J81KxnanshuHOQStkyK5RBJOYiKDFIx7M/VHwuhOeDV6V2
+bf6hVQhG9OUE3fT9RdfWrIl3f22XwQn26Gi9qJLUiCB9QynFDdfq61vIGSTIyp6I
+w/vmVLW8ELfypGzIcZx2
+=NO3j
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r1.ebuild
index 604b3d60b906..11dea63236af 100644
--- a/media-sound/pulseaudio/pulseaudio-5.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-5.0-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/media-sound/pulseaudio/pulseaudio-5.0-r1.ebuild,v 1.1 2014/04/27 08:03:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r1.ebuild,v 1.2 2014/04/28 17:55:49 mgorny Exp $
 
 EAPI="5"
 inherit autotools eutils flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal
@@ -191,7 +191,7 @@ multilib_src_configure() {
 		--with-udev-rules-dir="${EPREFIX}/$(udev_get_udevdir)"/rules.d
 	)
 
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		# disable all the modules and stuff
 		myconf+=(
 			--disable-oss-output
@@ -229,7 +229,7 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake
 	else
 		emake -C src libpulse{,-simple,-mainloop-glib}.la
@@ -250,13 +250,13 @@ multilib_src_test() {
 	# We avoid running the toplevel check target because that will run
 	# po/'s tests too, and they are broken. Officially, it should work
 	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake -C src check
 	fi
 }
 
 multilib_src_install() {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake -j1 DESTDIR="${D}" install
 	else
 		emake DESTDIR="${D}" install-pkgconfigDATA
diff --git a/media-sound/pulseaudio/pulseaudio-5.0.ebuild b/media-sound/pulseaudio/pulseaudio-5.0.ebuild
index ed8d4241ad7d..7eb48866f652 100644
--- a/media-sound/pulseaudio/pulseaudio-5.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-5.0.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/media-sound/pulseaudio/pulseaudio-5.0.ebuild,v 1.8 2014/04/26 19:05:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0.ebuild,v 1.9 2014/04/28 17:55:49 mgorny Exp $
 
 EAPI="5"
 inherit autotools eutils flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal
@@ -183,7 +183,7 @@ multilib_src_configure() {
 		--with-udev-rules-dir="${EPREFIX}/$(udev_get_udevdir)"/rules.d
 	)
 
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		# disable all the modules and stuff
 		myconf+=(
 			--disable-oss-output
@@ -221,7 +221,7 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake
 	else
 		emake -C src libpulse{,-simple,-mainloop-glib}.la
@@ -242,13 +242,13 @@ multilib_src_test() {
 	# We avoid running the toplevel check target because that will run
 	# po/'s tests too, and they are broken. Officially, it should work
 	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake -C src check
 	fi
 }
 
 multilib_src_install() {
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		emake -j1 DESTDIR="${D}" install
 	else
 		emake DESTDIR="${D}" install-pkgconfigDATA