Use multilib_build_binaries consistently, and the new multilib_native_use* functions.

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

3 files changed, 30 insertions, 19 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index d121d03af611..641056a9d306 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.229 2014/04/05 22:07:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.230 2014/04/21 07:32:16 mgorny Exp $
+
+  21 Apr 2014; Michał Górny <mgorny@gentoo.org> libpcre-8.35.ebuild:
+  Use multilib_build_binaries consistently, and the new multilib_native_use*
+  functions.
 
 *libpcre-8.35 (05 Apr 2014)
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index b916d301ceb4..d8753ec7cd7d 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -32,17 +32,25 @@ EBUILD libpcre-8.32.ebuild 2525 SHA256 df939966377ae4b75df4fbbb2aa10417b1aac6d16
 EBUILD libpcre-8.33-r1.ebuild 3101 SHA256 94739965aaeac957259f49a74c7dc724c223d3fcc8f7e892b1f9d7e535d6394e SHA512 05e2e451bace167f2d08379977e1c3bf6b2435eb6988b1c6099566e5b8b0062cfaf1c0594cf8fefe1c807f19376b13b2eb8e0fbfcb401adfdea93be3b8b3951a WHIRLPOOL 54984d513b74315b9a9fe6e53405517674c179e64c2b99274a6a15a4130b7f894aab98ab33b477fa7e9d163f264d659c8b33bf72b9d217b8941ddec51a482443
 EBUILD libpcre-8.33.ebuild 2554 SHA256 a13e83a4aa91b59c8de211dc127eb2ce4edb2ac442cbb85eda587e43b264c3cc SHA512 c0574acc99b1ba5b9c00ba02fa0df4c1732533cd9935ca59f0469bd9d2c3e66db09601b8133e2a073829ed485e6da54c7083ccfd6dcc704cc078150f5e001992 WHIRLPOOL a687af6c7696573c634720bed5cce7aa64595e4bd8ab7514cdd71e1a6665ffd3c786f30735627740840a788299071de50af9c2fcd9011b73c34546847a7662d0
 EBUILD libpcre-8.34.ebuild 3141 SHA256 6f265d61c42d81344f6314e834b622166152ca1fbb9465c57fc359eb82c4f4ef SHA512 d1a67680cad4f42aee7064d61af1c4c01afbf581e022637863749259305b36ddb56071bcf6653aeb806d4753553a68c8aec7323bf08788b0c5dddbd6f4821d9a WHIRLPOOL fa531075ae6c8e543cd2d35b31243f52a00585a8a0d8bead6ab133dabb2be2b73a44bf6bfd487604d07af2a52a0cc5c3fbd242a7342abaf609b54276c3d10f30
-EBUILD libpcre-8.35.ebuild 3145 SHA256 d22c5f6bdcd76ab22ef35a2cd75c807e48c115fc3af6339ca586d943ec535f36 SHA512 4eb210a44502eb483fbf07981101906677a041d23624392ee9c997edfba4c8c58604edad013c634e9756ddd13d9717b82ecc029f65ff00690bde5e6c80cadb9f WHIRLPOOL 030d9a2794729634061bc796784fce6717717cf8be4b746d572fd677af1788f1d5faefd0e969710c96776b8063d52c0912b4df9575de1c3598e2d982460241bc
-MISC ChangeLog 30660 SHA256 745fd2b9f81bfb7bb8b7cb5caa4e29ee4de02555799504153de45acacf8da31f SHA512 bb5718f11f1239e5172e88a8a475a206372e61bdc25ac482530cc265e0b59343b0b6caf33a08cf8e184865d430edfd201981fa999fe1e0c20146bca85f058fa7 WHIRLPOOL fcb016667a125c4652f73e4d7867d93f3466c7e4a745057212ac1aae224a657d60dc2a71dc35152c0a7697daeeb9f55be11803e3a8ce5c397c90feac109a1a3b
+EBUILD libpcre-8.35.ebuild 3062 SHA256 2e6ff21cba855333d4f15ca2443174d00f2362b9b8549f2caed552c361f6d793 SHA512 e227627bff0fa00019c73d46d3296c710d0c1875115b8770991f386fcbef8975c21620bc68af148cf95f245bd5ff09715e378aae03114feae8eec398270ec404 WHIRLPOOL e396c33506d14801f5d833d45ae26b829a553d409fc4633c77b84cb583b2ad076f549efb5e52753a43c7cf371dae3b7d677ddbb7bccf237604d9f1d99bbfb8ed
+MISC ChangeLog 30819 SHA256 7b6044e40d75c96a5f16d14bca73deaefd4f3ef329e78ee0392fab6a694a7f4a SHA512 355aecb5c07e3e68516883046635705c4f36ba1f1fb2771bd62f00981dabe53f55f74fc11cff6ba6c566f895b67e471d183e842657ed0bd27da6c78e8eb6811a WHIRLPOOL 8fe5798cb77ac41b42b18821554e664d21fe55b6c52accf2496aac4cdc6847554b451e6d6f3fed7f22141df8a80793c4776c63ba3e62a572f9fe4175ed3647b6
 MISC metadata.xml 1026 SHA256 bb540ffc66e93c6175107c2b017a7cbd2eba63c8dc2c42507a832635b8be5c6c SHA512 fa809405351bb1ec3d2af81a637f0221e2075c406556612de3aae251b77d720a091440f6ab383177b4a09722ec1f6757754d1dd4b942d57f45bac16a8d4189b9 WHIRLPOOL d03007b73990af2c9ff5e68b65a8f997410fccc953848b73eaaf8d35ad0db7fed04b28b8767e6bb02541439796f62a8fd9eff06e9840b99fa4ed3fcacf0bc836
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTQH6OAAoJEEqz6FtPBkyjk70H/20muqlsxwkgMrAGMgqwmv8v
-fRBbcgVRrzwO5Wd2adUh8J9zd7bu8WWqST0pa+7gvX21f2YLJeMOm/D4y6RkWJnW
-vWMLho/Uq/TXTYx21TMWZ46dh28wgdciYPo7KD1ApvY+1mqRf6DbH9QNchLv7y3r
-JK/pZVkHLowL9a9bYWgkQLAcTKeWnm6HEMvxvlZswkmmNxpEqLx9zUK/VwHfnqWx
-WaJ+haVZTa6booaetedqdT4yS5A7x/VAkH1asihLOXCQq6vwzAwtIAnlt7N4F/wX
-VkkNmAz6bWS76RmEP6XjxDhN1QF10NRKsMSoNVM0obEPpXOCcZk3YyrNfBV99B8=
-=XwRe
+iQJ8BAEBCABmBQJTVMmCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOFPAQAJ+z1P0mWhdwFrRm07NxXdyD
+qFKEBn2xTwTzPvBtgQJ3MYnwe23xuqkX7tF/LeaQ/E3XnX04XVd/n1VLhQRQtciH
++GBbQX0KpXIoTIPvzsGAqkZLf/eBT+rpPST0w6x7e5zlFhw9SOw4MrAfcrzA/EVa
+Y4BN69B+JsfLjv/QZlHxrTx5HhhKuB0390daN5CDMSCf5/JLqtYDAQVasdyX2X3X
+KxEoIRt0LAUmvSFUmdcJ5mHKzyE6TFn+XAvFfZCoy667cgKi2sp+LxUq2apKC2qF
+MNveXU3xQ7yf70Xh0nUweV6GnQdGcCl0l57TP7aJcrL0lvgFgyk6ITIE3dnd13r2
+64VbAZBd+08JUjnqZKEhP4Opa62eoOOsmDwmgHZsDbrXcYQE7CqDeprGCHB9zcIV
+aHr8w1YNZsvIa20SJ3OYduoVIRekDP78C/8jwCN9Lim9raalNE0ilemzfb+0UgDs
+Xasjr11wr3ZEOrfbOTAfSHVktDvY1G9UOpVnshLZuzMkug2roWN0QpidysdTjMCo
+qphb2GVSHD8m+ScMA8kqK17pZb2Jf5Fj/XDvJ5pIYoIWmbF1OanybvMgDJItzmGT
+BvZxmE7IGKZKFoJUgF27UO/DlD9+HEpdVLuCjm4iuEO6RjyjIaJ347SmOkXVKuDs
+A1ctxKpYm6gC4CUNi6ci
+=/WuJ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpcre/libpcre-8.35.ebuild b/dev-libs/libpcre/libpcre-8.35.ebuild
index a2a61b9ee415..402766cd7455 100644
--- a/dev-libs/libpcre/libpcre-8.35.ebuild
+++ b/dev-libs/libpcre/libpcre-8.35.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/libpcre/libpcre-8.35.ebuild,v 1.1 2014/04/05 22:07:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild,v 1.2 2014/04/21 07:32:16 mgorny Exp $
 
 EAPI="4"
 
@@ -52,16 +52,16 @@ multilib_src_configure() {
 	[[ ${CHOST} == *-mint* ]] && append-cppflags -D_GNU_SOURCE
 	ECONF_SOURCE="${S}" econf \
 		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
-		$(multilib_is_native_abi && use_enable bzip2 pcregrep-libbz2) \
+		$(multilib_native_use_enable bzip2 pcregrep-libbz2) \
 		$(use_enable cxx cpp) \
 		$(use_enable jit) $(use_enable jit pcregrep-jit) \
 		$(use_enable pcre16) \
 		$(use_enable pcre32) \
-		$(multilib_build_binaries && use_enable libedit pcretest-libedit) \
-		$(multilib_build_binaries && use_enable readline pcretest-libreadline) \
+		$(multilib_native_use_enable libedit pcretest-libedit) \
+		$(multilib_native_use_enable readline pcretest-libreadline) \
 		$(use_enable static-libs static) \
 		$(use_enable unicode utf) $(use_enable unicode unicode-properties) \
-		$(multilib_is_native_abi && use_enable zlib pcregrep-libz) \
+		$(multilib_native_use_enable zlib pcregrep-libz) \
 		--enable-pcre8 \
 		--enable-shared \
 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
@@ -69,16 +69,15 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+	emake V=1 $(multilib_build_binaries || echo "bin_PROGRAMS=")
 }
 
 multilib_src_install() {
 	emake \
 		DESTDIR="${D}" \
-		$(multilib_build_binaries || echo "bin_PROGRAMS=") \
-		$(multilib_is_native_abi || echo "dist_html_DATA=") \
+		$(multilib_build_binaries || echo "bin_PROGRAMS= dist_html_DATA=") \
 		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre
+	multilib_build_binaries && gen_usr_ldscript -a pcre
 }
 
 multilib_src_install_all() {