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/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 482bd12358bc..0df12362749e 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/jpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.163 2014/02/21 19:22:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.164 2014/04/28 17:56:08 mgorny Exp $
+
+  28 Apr 2014; Michał Górny <mgorny@gentoo.org> jpeg-8d-r1.ebuild,
+  jpeg-9a.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.
 
   21 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> -jpeg-6b-r11.ebuild,
   -jpeg-6b-r9.ebuild, -jpeg-8d.ebuild:
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 56cd568a000b..131c179bb14b 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -9,18 +9,26 @@ DIST jpegsrc.v8d.tar.gz 991456 SHA256 00029b1473f0f0ea72fbca3230e8cb25797fbb27e5
 DIST jpegsrc.v9a.tar.gz 1000034 SHA256 3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 SHA512 9b21cc115e22c68bea46db462263c5c7a0d10beb192a919ecccbd801a25982b518ce44d8c301dd582ecaba1850e0e0f20e322be82b0e24ae917b9949b4f10d3b WHIRLPOOL cd92fd028c8f55c653d74ee74d0c744ebded578bdc7f415a5e8321bed638300c908d08e4129ebb031a6ed19560a2610942ed23cb0a075cc1a34319b9ebaa2265
 DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
 EBUILD jpeg-6b-r12.ebuild 1355 SHA256 3acb9e9b455178fe7dffe6c775c3ebb2c77f674341478ec55cde7942a336f23d SHA512 568a54725db9d72ad1ec25fd26a933efb5fffc84ba8507cf1176b7d5cb4e7e11ade5a9d85e12e77e6ae4254e500f7de34af9a91387b7b6863734abb9ef8888e5 WHIRLPOOL 74e64f32e6be5bf6bae33df4fa19ee75078b255de5a897ed7ece2bf47813fba9f5b731333701e1809ffb0471443dfb4286e7673f341de28b2eaf990fbf19d181
-EBUILD jpeg-8d-r1.ebuild 2116 SHA256 f4ee6db5c29303df46606d4e123e95f697f2cdd24daaa607ab933c9130736bbc SHA512 9ee977990c402ce2fee2366d5f24db2aeaeeb939c8f38d1e65def34e5a0d5705aaba2d634dddd1bfbd4d4d12d2f18081f4d85272f15c4d3c37f3b7119daeffb5 WHIRLPOOL dc8948ee5bd4648b8239a5c34936da40158160ff12566a8df531f90c7fe2b370bc73733c48033e2a879630e6476dda222924a12635767a562b863f16c68c6e4a
-EBUILD jpeg-9a.ebuild 2080 SHA256 40e630c6a89ec847644f235315928f3fda9320f50dd9909855ca70f5de16ef92 SHA512 f93cdb9b871e42f5b57f8bfeda0d7bb6c3cb6724b7c780d561090c60f8523b1010834ff7565de49cedef6873ae8b0ba46517c852340b54b8cf508e6b74796c3b WHIRLPOOL 8c57033159282d0d6cccb867fbde7e9a7c2487c5640b8e82169705e5f27f6831fe4b7492fa1214332f8eca0932c60d69cd4ad17e81531f5ee36377419b898c92
-MISC ChangeLog 20155 SHA256 2a9c35cb63d4149fd70f7870cc93f5bbe1f5bd7b15133af61c8856fb6f209b94 SHA512 aa2ce7caf6847bc8b83ad311b7f594ff87af87282310095b4d3b8f88f800a1b6aa1dd3f3cc9504792703053da07736844f027eb11cfd9be1675e33a303bbcd9e WHIRLPOOL b6658952a6934a801327e6b6e3275168d81c0faa6abcd7c820c5a98820fc14e0c409df3f699da2655b8a78be249549f4f01f0fd4c53782c9d90a0c6423618d4a
+EBUILD jpeg-8d-r1.ebuild 2118 SHA256 ba09ad07d1a3d186c10c407b5c7569eabe68cb30d808476f4d5a1c6c6684c242 SHA512 cf02551f43f84bb4cda14d9b875e40b3b419f6a81e6f8f828bff1e9a97e8b5a20c37f5d66190256726e9e788a73864638d93c8970da37588e912399b89a37858 WHIRLPOOL 0e05e7394df0b169066ffbaaddea15acf6f3971bf9e24ad529f26150d1b906cb82468f045ebabb8b0ccf16abeef6c2decfc2c804fa68e1f66dedf564cdb91f4e
+EBUILD jpeg-9a.ebuild 2076 SHA256 6eed39cc983ca97a4e8c8d5af9aee1a8369aaf1030888b2c969a335918b6ce04 SHA512 1319e83372f2794b9baf47ff658ff645a05dc610f0f62a06c750744d9629883028ccf09885495b5f25978990151dfb12fe041c8dc36008a39fbbd1ff2ab2aff8 WHIRLPOOL 59514fc7ea809bd8712036197e7e23859bced1492407921479264e506a230ccf88879ed8eb9d814b558fb9a3de82fb7423064b04e0e43ff625d496671e851071
+MISC ChangeLog 20405 SHA256 98942a817650900cf77be49b8693e379ba5ebbac5c931010148f463f5d0c6380 SHA512 0d2e56c61463f1543190e6b7bf96c907cf414d99a69b5e2313c753d41e59f62e3331c3dd46816a7562659bd2723414f471d706b5939cbfe3d56e5efb61d575e4 WHIRLPOOL cfa409d107661cc67a53de47956b6bf96132fb37ac35ad092ccb5c154c55fe8a1ba4f6008a0d1c3f18ea555d62574c84402cb4d4894cf39b87cff037e419620c
 MISC metadata.xml 161 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 SHA512 425caf0160f1410ce7bf1d4639020be7f6335152c339edbce80676bff4166f1cab3ae9e13161c47b98dc00741dab3bfa45e9572a3314844476e480f5c2b58d7d WHIRLPOOL ad7cdd3352dbc12cb4181fb5d63b5aee5ce3a151b975c12a96c4a5c91f751736d27282ad22633c7e768230266bce5d17947735d33ef5c5c2341c3f9435b9ebb0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTB6bwAAoJEEdUh39IaPFNQzYIAKGhPXyQfGLoxTyIL0NcRQwi
-T88X3Gckl7TKZFGUDZrxjQ06OPKjumIhn6dakGTneL14XRtUfQwCFd00WUnxzfLy
-WVyGaRE4lUQjJgmzaBTP0gO+qP0qGsah8m+UJUnRYNcsPx9IJVz/02ioL4idiaaC
-QFWTbZKmhxZwCmQPcqg3o1pzIfVznA7ujvHV7FJTfxopHluDRrKKF4Clzx2iZbXc
-yS0K9SbnhOxmabOfeNOaX/LAMPOVKkexkDLdCS1I7Z/WHTgktG7Ah1UD+469UlnA
-AewBnbztHijduDfILhw/vZ+YeyhkXdG0LHMD4fF6S6zTUQOtLjwgRl9VPsaqChM=
-=fa8E
+iQJ8BAEBCABmBQJTXpY5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIdoQAJUEjEZqo/v2iPc3TbObLnF3
+PDWLXnpJ0VocMlumsNDn49QiKI8SYQYilxZcQrh5LtYJGnUrGbRXdLnwVYwBE+XU
+kXPF0DWuoLZfv1dChltWXl0rQy2PbaMPEj67bQ3IfiguEiS4NBf6rWji7JjluG+M
+nRu0AD0FE4DpyraXt1VUJwbTXbVVAmvJDxWN7hxi59zmidfNyKcEMIReS8e4GGyt
+SneLNFBMJX6hwPeO9ep6qeHhVVCrVB6Gr+F391azDuTtvmdF4Tf6gnOxZH5uTork
+GkxlwG9RkPDvUT2n2beCZV+2K6Dasri1v5spp/1lDHTR6HyYDY/c9autFnm+kV6/
+e7I3QilT7o/4oFbzkSH3V0T/s/TnrGubo1DZMMJG1n9OSKdF+dMqgI3CjtUugOqx
+LqRCWr3G9r0jk5+/LoQ9KUXWLmx004E1kruJIlgqsbb5yZgvh+KttDvG0j7hOHii
+vs9q8vJJGr3muoZkTYxVHZ6hIOme0rQjl8XqGbQ8KIJvnT55HjKHvNse+0o/3zX1
+ptJXFFPNHmUpJY1JvHTGpxsw1YZagwbOzhEALqbwcHu8vb/qVHfWdCOrRU+M01nu
+lsd7dqmzzQrf/v/mpKjj9AY/3wmncHfpytFtspj+qDFa/eFk5yS+u4F7Gbucbvf9
+00nCIsG5FZmbm4PrKQza
+=ZjhE
 -----END PGP SIGNATURE-----
diff --git a/media-libs/jpeg/jpeg-8d-r1.ebuild b/media-libs/jpeg/jpeg-8d-r1.ebuild
index 165dfb35d78d..254b4b874f80 100644
--- a/media-libs/jpeg/jpeg-8d-r1.ebuild
+++ b/media-libs/jpeg/jpeg-8d-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-libs/jpeg/jpeg-8d-r1.ebuild,v 1.15 2014/02/20 14:16:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild,v 1.16 2014/04/28 17:56:08 mgorny Exp $
 
 EAPI=5
 inherit eutils libtool toolchain-funcs multilib-minimal
@@ -43,7 +43,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	emake
 
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		# Build exifautotran and jpegexiforient
 		cd ../debian/extra
 		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
diff --git a/media-libs/jpeg/jpeg-9a.ebuild b/media-libs/jpeg/jpeg-9a.ebuild
index ff518885c710..859796fb0956 100644
--- a/media-libs/jpeg/jpeg-9a.ebuild
+++ b/media-libs/jpeg/jpeg-9a.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-libs/jpeg/jpeg-9a.ebuild,v 1.2 2014/01/24 14:02:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9a.ebuild,v 1.3 2014/04/28 17:56:08 mgorny Exp $
 
 EAPI=5
 inherit eutils libtool toolchain-funcs multilib-minimal
@@ -41,7 +41,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	emake
 
-	if multilib_build_binaries; then
+	if multilib_is_native_abi; then
 		# Build exifautotran and jpegexiforient
 		cd ../debian/extra
 		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"