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, 34 insertions, 26 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index 40baacf2cd8c..c1cd84488663 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.262 2014/01/01 21:03:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.263 2014/04/28 17:29:48 mgorny Exp $
+
+  28 Apr 2014; Michał Górny <mgorny@gentoo.org> icu-51.2-r2.ebuild,
+  icu-52.1.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.
 
 *icu-52.1 (01 Jan 2014)
 
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 9fdffc16e11d..eaeae0b2bbf9 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -5,24 +5,26 @@ AUX icu-51.1-CVE-2013-2924.patch 1443 SHA256 465798c50079c16e2c6b467f83c5ca22743
 DIST icu4c-51_2-src.tgz 21841928 SHA256 deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc SHA512 74e22b792d6812c1bf2192f2572f75ec8a14fac5e9b00850f9225279fc09da913082001bef20595f6634a5c3f3335e92906568023544516da69a775bcf5e2a1a WHIRLPOOL 098d6c77543cd6b30cc39dd79776b7dc3b0c4111af289b43dab1dc6ca1fd056bdb99363f8e0af7a2f800b95fe7a50024fa395764c9e14582a0b3c54266b25946
 DIST icu4c-52_1-src.tgz 23875368 SHA256 2f4d5e68d4698e87759dbdc1a586d053d96935787f79961d192c477b029d8092 SHA512 5300b1d97340850d3d72af220ff5cbc2ae2820aff4367b60e52f17ead9831011dcda3d4c5af57c899d47b6fc964b23c9c8922954b32d314d669eb1a479a2efb0 WHIRLPOOL fd9d0ed8f55b93349164595c79544f41791774eff5e82b043be333732104b19c4036f6a6c53784bfe4494c005b950a4e96433646be24f310a681a18db0d19bfd
 EBUILD icu-51.2-r1.ebuild 3114 SHA256 5f8e92dbed45b89a457e9f7e5707807be513b4e82167351148be3e675b81f453 SHA512 6412a12b1913d7016593819ba2228fc79926468e7a3bac0a3763b065255dd1fff973a9e6e107c7f069d5806b4103646f233d34c4bb023ef066cd451230d279e0 WHIRLPOOL b555b0d0bbc69605fede5780584c73e5d68623d0179303437da794de841a717c859e08ec2c7a88bff574086522b9a2790461eff8e0fdb0d2d759ca2ba994783d
-EBUILD icu-51.2-r2.ebuild 3487 SHA256 38153e5e6c44ea1f21092580938c477049fb90f24675fc3d09415f295f10449c SHA512 8dba68fd8b0abf49826873310a47c52e7e5d6795eb8ed13e5a2ab71550e7735f75f33dfe5cef79e2a5933bf957b49f1100d3fa5a248b9d3df2c32591d70ee917 WHIRLPOOL e6f62644feb9c26b4c96e5ac0a6e682f3e0ccad56cc9c6e23f8abb4d0b28db2610bb39a6c8303ef91f2e892b8f717e72383429211c7017e433164fa7ae3c3b1a
-EBUILD icu-52.1.ebuild 3073 SHA256 26bb5d31c5803070af3e6feb403c1b47880650b7576cda9b2b198a4727a898c6 SHA512 6194ec87ba42efcf4cd00f62f5a4d632f36aad595c21977f5bca51fa9e3f8e23e31c524efb385a797dccec2831f696185b0f9ea9600e2987f1f4aa7292158913 WHIRLPOOL 04e2dee3924e98a94dae78ce48d2f067cbd49b7bad58515b8864d5efa0895158bbdb41c9cdc4a3a00970e99ad86e6e8c44e84b48620e1a782f9ee6c36061fafd
-MISC ChangeLog 34485 SHA256 78e6bec4d063021adacc37d22a05a468fb42bb7e83c8b41ebf11c429876548a8 SHA512 d07c0ca1c55b0fb85b4fc0a4a44ea04e21297d989e743e5003d5d53d26180d454012b712590089fae3b76ba09c6a283371001f2be8befe946de8dc086283ea5d WHIRLPOOL 39a1c0a40a62d165bb4817e3247f7d22dba5146929de2f1e3d6062647bd6719c77d4624facfebfea6f9332a662951ff84305c3b6ec967eed3ea7c4b3515f4eb9
+EBUILD icu-51.2-r2.ebuild 3484 SHA256 d42abbe7243a029482c0b359b895c151084edf067280ec4307c18b0a34ba5823 SHA512 ffb738e2948477870cee309400a511430008bb0dc80e8c53da9a42a30b78d8ec799d6665aca4cceb04b0354f96ee8b76ed5b754ae4bdcdd89d09fd84e27a43da WHIRLPOOL 86a495defee10420bc26ea17533a76db6e768a5e126df5eba85b5df3ecda818d0f36e872e19cc132cd769b2a2d60d18da4e539674db67a6554d9ef2e7a1e6724
+EBUILD icu-52.1.ebuild 3067 SHA256 d1a3f41ac764f347189edd10090c0ce3e747320015c4a0ff3935303f9783d571 SHA512 c420b6c07238cd065e04dcf66dd7a13cb85d497651d7fbdcb8a8abb4462174692d6df9458b2bd1ddddd6355bf69c8c63417a81745f527f9dce3ba9fa523d4863 WHIRLPOOL 9f6a4deceac05ef25b22c8378424e493d0ba093eec6e6c927eb9989586f67f26bb3be4455bb3e9448283985fd8e55b358e57d76b7e812e19a0feac0a6fe4f0e9
+MISC ChangeLog 34737 SHA256 bc417588d4067e7a834c9839735a49d26af115fa163ec9d9428a534d8be5f58e SHA512 6806cf1d26953531e5b2b7a92f534b70d3084e2fb24c0770eeb1744c8c53255475ec74fad08336d5153956751a920c8969aa2a38fcb7ee9b5b431f3d539c7655 WHIRLPOOL 01c19e28c5c73f23b086327eb9eead86e2764b2f52856711648c31ca02d3664c523dad2bc3456b1f85a5f23df73531aa93ec4d8bded1104a4a8c481734554cf4
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSxIM+AAoJEJS/30SErRQv/J4P/3Okoz0cVacgRnZqyhmp/nD0
-EW7XwIArlHsXL4ILUnNzMutdoJE44YoHo98PehJ7hJrYxuHw5E0/ftWZcDSLRcar
-qWxJIz4vDhfklUdJg9CaNIHU7LwLxqtYj9owq9ujCTgpvrTuUFLzAMEm0B83BJbT
-wbxb4OoKciTOpVBXMeB/CVlSa/pU3P3adttVnypK7UTTTsA4P/OkLJ2VGN2YH4NT
-Gmokj3Yqjal2vddH+mQTudp5SsjXcNf3oyHOaLIlZOwxjKlQvVGunYGxaMSTZgK8
-/X1Fjw5sUTDDpjIp1s2gLsfjOc/mj/Aum5Hw/gyW4cwlNfFuhnzoTa1crXNXvtPm
-kfJRivv198i45WUmtcEk0CrgN4ZGqRGadRSUpoihsGPIYz7iLwhoEkiE2NcUF8UO
-fxFQz1dB5F8RlyaVkok3J1fp0GDR1Q/9uzV7fXBXU/fO1uUr8RNA99eSNyasW477
-nHLcJ04t6mxdUejGRwETpPvtt4pt5gvXfkrz0HJAgdohM9rRU/z8ojbl/Zt8RXzn
-n4/4GnLgEG88e1Ya5a8qLzEMsbwz09Da7PMn43WNq5hcBbb3Y1UGO3xTU+7ycaZV
-WqfUhPzlasBc3XwVPsnkeSSGUkDng3s7h112rp0etJenPM46M/NHo4EidyTNGWgp
-e8N7UlEXaC3LlTjoyDzx
-=iQqR
+iQJ8BAEBCABmBQJTXpAOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOp5sP/3/tKfCrDPULdeoz6sqnpuKr
+S84T7qWwWy57MpoXF/dJEVD6im5tDyzv69RUkHDraCw4ByE+yeGlAPYe40VMWPbg
+6bobVGrrxsZNajBzEQaY1ErrLKFQg5OBqMaBqHdaMe9Oq+4G5DGsm+asIUVp5p0F
+RSO1Y5bVKLE9T2j4KRdbGigbVKca55J0gfHaG8pUxST+XljVnw0Ki48/QXZoTt0z
+AZVhkZOzG7VdS0KDJoL6D1FqNHrFY1p/WeXos8HI7ob3x7wrIcIsIaDPEbSe4Ak+
+eSV0d8JOmrqBODCzO6vPecM6IfnCaEvYZ+3exiSOnPXh9C0rPNCOqoAXh37QlKZt
+Z8KO64hm/864fr3jvt+RPZkO0jpGrkZHWCDe86agVHZzlQpRhaj9B+qTOiEKeX9K
+qExERAag3uOhaqRPNofXpfvEhuowI7pINau6elWa2Q6QAjGA8pxTMoIiidtm+q0i
+Q+zXJlBvWr9WQIMeYx45WXgktjfa948oCm7O795jBzohJRFsixadiSTsNRBHP+Om
+3TKXuTwij8cHiTU67mJseNt7hj9fdZzq+my0uL7ePMsdJy2mzEeO2ecTyUeDWtO7
+VoGlQ4AFvTsoFI81ocK3ka/z5yT2p7QqZdNpueWCi6MKJXedFvkhECZQJl5JRXnU
+665JPw+KdtNRNKCL+hVE
+=zPoq
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/icu/icu-51.2-r2.ebuild b/dev-libs/icu/icu-51.2-r2.ebuild
index b2ead55f6c23..227453115f92 100644
--- a/dev-libs/icu/icu-51.2-r2.ebuild
+++ b/dev-libs/icu/icu-51.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-51.2-r2.ebuild,v 1.1 2013/12/26 11:12:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-51.2-r2.ebuild,v 1.2 2014/04/28 17:29:48 mgorny Exp $
 
 EAPI=5
 
@@ -91,7 +91,7 @@ multilib_src_configure() {
 		$(use_enable static-libs static)
 	)
 
-	multilib_build_binaries && myeconfargs+=(
+	multilib_is_native_abi && myeconfargs+=(
 		$(use_enable examples samples)
 	)
 	tc-is-cross-compiler && myeconfargs+=(
@@ -108,7 +108,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	default
 
-	if multilib_build_binaries && use doc; then
+	if multilib_is_native_abi && use doc; then
 		doxygen -u Doxyfile || die
 		doxygen Doxyfile || die
 	fi
@@ -131,7 +131,7 @@ multilib_src_test() {
 multilib_src_install() {
 	default
 
-	if multilib_build_binaries && use doc; then
+	if multilib_is_native_abi && use doc; then
 		dohtml -p api -r doc/html/
 	fi
 }
diff --git a/dev-libs/icu/icu-52.1.ebuild b/dev-libs/icu/icu-52.1.ebuild
index cf4351664fb4..88dcb03dbaeb 100644
--- a/dev-libs/icu/icu-52.1.ebuild
+++ b/dev-libs/icu/icu-52.1.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/icu/icu-52.1.ebuild,v 1.1 2014/01/01 21:03:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-52.1.ebuild,v 1.2 2014/04/28 17:29:48 mgorny Exp $
 
 EAPI=5
 
@@ -83,7 +83,7 @@ multilib_src_configure() {
 		$(use_enable static-libs static)
 	)
 
-	multilib_build_binaries && myeconfargs+=(
+	multilib_is_native_abi && myeconfargs+=(
 		$(use_enable examples samples)
 	)
 	tc-is-cross-compiler && myeconfargs+=(
@@ -100,7 +100,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	default
 
-	if multilib_build_binaries && use doc; then
+	if multilib_is_native_abi && use doc; then
 		doxygen -u Doxyfile || die
 		doxygen Doxyfile || die
 	fi
@@ -123,7 +123,7 @@ multilib_src_test() {
 multilib_src_install() {
 	default
 
-	if multilib_build_binaries && use doc; then
+	if multilib_is_native_abi && use doc; then
 		dohtml -p api -r doc/html/
 	fi
 }