Revert previous commit, multilib_is_native_abi now includes multilib_build_binaries functionality

Package-Manager: portage-2.2.6-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x35899067

4 files changed, 21 insertions, 15 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 952b9c45d069..bb5f2555a465 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.374 2014/05/02 09:46:46 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.375 2014/05/02 09:51:49 tommy Exp $
+
+  02 May 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  cairo-1.10.2-r3.ebuild, cairo-1.12.14-r4.ebuild, cairo-1.12.16-r2.ebuild,
+  cairo-1.12.16.ebuild, cairo-9999.ebuild:
+  Revert previous commit, multilib_is_native_abi now includes
+  multilib_build_binaries functionality
 
   02 May 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   cairo-1.10.2-r3.ebuild, cairo-1.12.14-r4.ebuild, cairo-1.12.16-r2.ebuild,
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 837f1ddc2318..0b6d695a6c95 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -17,17 +17,17 @@ DIST cairo-1.12.14.tar.xz 42132464 SHA256 96d0d1e3f9b74d2ca3469ff187c5e5f25649b1
 DIST cairo-1.12.16.tar.xz 35889824 SHA256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846 SHA512 35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f WHIRLPOOL 00c5e237ac67c2287f90f204456178dcd123126c42669fa63e3dc04fbf9b46d867c554b8f2ecaf803a2553c388661fda5efc4803d6c1f30d7d8fc75fff06cde0
 EBUILD cairo-1.10.2-r3.ebuild 4381 SHA256 1780bb903d52e084bde89324d1ddf65b3484ff3697be976af0ca69e5159ed01c SHA512 a5867da983f05a785200d6b092df79a63440d31a2221d33647e148237f688ecf0a450442d29c4d28f40859a5e384acac8144cb2fb3b1afd8daa39e65f87a0bb1 WHIRLPOOL 2d0f5b20d09d17948f1ef3f963654372a0c9e8d4a248274f11e8d5d09c4f9cb34aa82b3fb2b3ccf30a733c17bb70530438b372d470d022f7cfa0bc4f198645ad
 EBUILD cairo-1.12.14-r4.ebuild 4232 SHA256 f83317c97cd971a6f2fa4901072dc7636463147731224dae79a883b2c3f44e03 SHA512 412b4a5faf0a6b4afdda3693352c38d922e764ff3dd75db1df5ebfd44647f213b4010f21586fbe2296dd382a152bb98dd4353a97b5f19d87c94aa2144bd058d0 WHIRLPOOL f47d638f92bb6647951ac21eebca5c3e576f2906ee35fc2d70242bbd91d35748c672ce3b7274723819eeaef1a2ba35e41078e14ca9aa980b56149373df052871
-EBUILD cairo-1.12.16-r2.ebuild 5352 SHA256 6c9f5dfd5d942957770af032ff7de32d8af8be379d733296c928a3461e96156e SHA512 2c20cba27aeaa30087c2c093d2f1004e474a616d962f5c0cad299901f9f18624f6b10d37c4f12befdcfdfe4788a8ce5f6b8782257f27be65e7e24abc8864c5d8 WHIRLPOOL f25e1eb63316743f7a80df4f01e4910b7f5b170813aa1585786ae01811bbe8438dcf9b70a940b5c568139fea84be7f3e1905539eab6e1be6ba23c4b40f097ed3
+EBUILD cairo-1.12.16-r2.ebuild 5350 SHA256 aafcb0076362cfb0965ba7af00416a9fa8f26e0f726d30ca71ada880e5107f2e SHA512 db2a73feec5b1de6d1e1ce33292718a4b9bbf422c38c2c1a04d36de87363e4fffcc297137b70cb1085a772d1f39733c2a870ee00701c6b62ff17c1e170279a05 WHIRLPOOL 640dc668c3793a0385118de4cfe61b9559741cd208766a28ce65711b7407044a815333bd03ff8d0a89db75dbe6a81a00e889080cee7fa21687ca9cc161fc5901
 EBUILD cairo-1.12.16.ebuild 4156 SHA256 2467f8b13e26d0287226a2d6866fb48abfb4f8c44e6395155e6d62387d7d5a04 SHA512 edf6c4ce8dab8d226fb8fbba851edb38e53bbfe70b775c050f2a91f02a2c4c17fffae1491319c6e43066e05b9918b0565d66af9067851eba497388c312c724c8 WHIRLPOOL 3d2d8ddfa28adce55f0e177f5c6c18b455a95f335a6b817a48b8efef67186910d9306092ef703ac37a2105fea0c15af5b6faebb074f68ec354ac327e69736412
-EBUILD cairo-9999.ebuild 5347 SHA256 d8c86f2efff818985610a3807585d9b7afe722988e7517fa8d1890f0f9f7cfae SHA512 e1867bd4820348bf8c53db816119c8f822278ebcbe9c348d7aafa1e3c35744a5285dbb72cd5703bb7a57c0113e20fe35731e1c7886e466dbcfecbc9a616bc92a WHIRLPOOL 3c98100390df0b4c5d5b732a8fe810e7148c008085337cd08df49038923edb962d18b1c6ce9eb4227eed426cfb6b00df8ac79caf79a2c42e375e26e836643bb6
-MISC ChangeLog 54968 SHA256 408b2ef26e2fa7349d3de0a3d688fdfb48853ec1d4a6e81c41244dc9424d5d94 SHA512 128f2e59f0aaa0487d1f3bcb3bb5b26ba5e7046f5ffd7a641770724b9103dcd401bbd83577acfe7dc8447a0d7df0e3e13b0433dc0c89f190bae42fed61915b41 WHIRLPOOL f0e502b1d99e4402bda9888d83afc0c3bc15df6bb51b606e1cf4e3dbdcdaf5ad8d667b64310614b4d96f32e5c2216b050c17c70cb3822044d2b4948d0bd191e5
+EBUILD cairo-9999.ebuild 5345 SHA256 230dbef9f199e2a94fa89344978065f200bfa814b63470a356fc0991f5f0baab SHA512 40ecb46f102e4e4f15e599461ef0fceff200b18a42c9b4e9a501e1f91ec380e4d0f28ce2b7c3ae1abe952f9c24ca86295137668e76b8c0327a266db52ca6ce94 WHIRLPOOL dc37bc7d5da60157d0937f931f449e240f06537918b0fa143a0931ee522f1c4f9d14cee83b3c651e4f0e54002788f59e555d1e0facc6851f5343a4576b747f24
+MISC ChangeLog 55249 SHA256 463b971da4ea6d2eb4a1119274c46dd144de12e770ad183fe0b071e6e9a8fcff SHA512 eec3d1344ee2dde6d86dcc923c221cf2925524fcc508395f6a8e663333e855c1de190008eae97ebfcf1abc3f7b1ac407d6ef07e4f65e3a141fda0986cb7106cb WHIRLPOOL 2997b7d14b08b97cffa9ed0f77d0228ccbbb5a23f4342ee821aa9d30fc48ced11b6540b1eb4d25cff625cdaa6503b51f4cf2db6d275887a9512962bbe2e443ff
 MISC metadata.xml 1294 SHA256 988ed8eceb7738628f10a041a322482997d26a5fed1fd42eb86bd742a6e3602c SHA512 7d333210abf19ed97a1210d37d77a1cbe944220f16757a0c652c1a329d00cc387ebf2ca174db6dc7f79a892ab068c66d773c364da0321fcfeec0a05d84946bcf WHIRLPOOL b0d67117667918643b4d889b74207b995d8fa1c851786fc89bb81cecc5c46e89714533eb2f8cd005e1175ac8c79eb5d3912826e87cf1c34886103b5a4d7e06a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNjaY0ACgkQG7kqcTWJkGcRFwQA04jUbQ0eHdOxQB4NC8prV2DD
-o10YGrXwM8MS5nJt+5paHsRWcnbS5IwvcysQqZEAKvMnhved0Rq773FZ8qI+F1Qy
-MMZuq9dKIFS4GNmpLf0voE8MbyxlKnyLQiblg2fcnTog34JO/2PF/Ets5buwrn7s
-VxMwIBsD58SLCs4pzBc=
-=NQYz
+iJwEAQEIAAYFAlNjarwACgkQG7kqcTWJkGc8ZwP/QskJLzI99DE9rILJwo3p7+Mw
+eJESKB/Hcxb5jZpCePsreJYzkasnw6eYBKWTlxFuiaNH639lRBbTlU0jRVtBusKy
+qLecoPpzStuJFQ44DU+ui+uIXujF0775N3hZbXkGcbAHiyNAXDqv4JSFps7jsbh2
+LKNTLBdooRh5x3kdmsk=
+=4a25
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.16-r2.ebuild b/x11-libs/cairo/cairo-1.12.16-r2.ebuild
index 3549df319435..4d8aec75e079 100644
--- a/x11-libs/cairo/cairo-1.12.16-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.12.16-r2.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/x11-libs/cairo/cairo-1.12.16-r2.ebuild,v 1.3 2014/05/02 09:46:46 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild,v 1.4 2014/05/02 09:51:49 tommy Exp $
 
 EAPI=5
 
@@ -113,12 +113,12 @@ multilib_src_configure() {
 
 	# TODO: remove this (and add USE-dep) when DirectFB is converted,
 	# bug #484248 -- but beware of the circular dep.
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		myopts+=" --disable-directfb"
 	fi
 
 	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		myopts+=" --disable-qt"
 	fi
 
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 78459a58c950..d5531b58f83b 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.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/x11-libs/cairo/cairo-9999.ebuild,v 1.40 2014/05/02 09:46:46 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.41 2014/05/02 09:51:49 tommy Exp $
 
 EAPI=5
 
@@ -113,12 +113,12 @@ multilib_src_configure() {
 
 	# TODO: remove this (and add USE-dep) when DirectFB is converted,
 	# bug #484248 -- but beware of the circular dep.
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		myopts+=" --disable-directfb"
 	fi
 
 	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
-	if ! multilib_build_binaries; then
+	if ! multilib_is_native_abi; then
 		myopts+=" --disable-qt"
 	fi