13 files changed, 95 insertions, 78 deletions
diff --git a/dev-libs/angelscript/ChangeLog b/dev-libs/angelscript/ChangeLog
index cc7e20a5fd33..7877d5a789fe 100644
--- a/dev-libs/angelscript/ChangeLog
+++ b/dev-libs/angelscript/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/angelscript
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/ChangeLog,v 1.12 2014/01/04 22:46:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/ChangeLog,v 1.13 2014/01/04 22:49:31 mgorny Exp $
+
+  04 Jan 2014; Michał Górny <mgorny@gentoo.org> angelscript-2.26.3.ebuild,
+  angelscript-2.27.0.ebuild, angelscript-2.27.1.ebuild,
+  angelscript-2.28.0.ebuild:
+  Replace the explicit ABI==DEFAULT_ABI check with multilib_build_binaries
+  eclass function.
 
   04 Jan 2014; Michał Górny <mgorny@gentoo.org> angelscript-2.26.3.ebuild,
   angelscript-2.27.0.ebuild, angelscript-2.27.1.ebuild,
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index 37e09dc4c930..f2bc4853aab2 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -5,28 +5,28 @@ DIST angelscript_2.26.3.zip 1420959 SHA256 c2fd4a8ec001b78a9edc11b31e4c87d30922b
 DIST angelscript_2.27.0.zip 1442212 SHA256 5bb3b197c972dc5021da5cd05f8bf8181e5d11195e6391d2193c9d0a81a4da5a SHA512 adae1a7daad8e9b1910767e7f3dc12dd9964026812262661b8da6a50d60c47a77e9bf6835c44573520c565568167d18e7219df0df8a9d4deb24c2f4871f68f2a WHIRLPOOL c6a8b6e5ef954b9b95ac10bc13b90d84ee9be3118e1f705e75ac88cbc14dce3a87c08cfeaa1565c49e7a59cf81336f190c5a6ece31348c9ee7924aab488e4ba6
 DIST angelscript_2.27.1.zip 1448313 SHA256 125a8c4fd432f71dc3b375683d0530e88e6bb692e63d3e4efbcc2bfd9abed32d SHA512 af9a92e0a0770705ec58638dad0c5ea795fefb4ee28fabc9cda563328839d52e64ab8627c7af5d15f5f36116068747bed080ba2a87b1fd981c921177e805d670 WHIRLPOOL 68b7f8313620e49daa815f7ab57e8f7141276a0039b6583e6768fc1551a7d12e24e460d32bf56d1dc2ae1626f1b947ee287cb817b46991728e15f8d48e6f9e61
 DIST angelscript_2.28.0.zip 1476511 SHA256 ff6ebce580ece45f1fa2a3dc9cece16540670ea3b54b1acb5cafcc1a43479ede SHA512 b388c48a54d847ae0cfcbdfc1c0064e43337c4c93ea5c9d38df23ef7ecb28a05cd127000a068111afde8052b80483e15cb16c1b0abd6c35d4ff762562aeb0e8a WHIRLPOOL e87e3c589a452fe41bb6844818b067723de9a3878d5cda564eeb6eb9f11240f1077d3d3bce52fe94e0fbc01cbe42fa57aefe118fd8b7c66f1d1b787cf869926e
-EBUILD angelscript-2.26.3.ebuild 1385 SHA256 6e21c75c03d097d0411ad1ccbc1c5b9a8a2d6bd9fee3983c1948e5deb73611f7 SHA512 38d7a396c42256885102da6d94fa41f90fd7f85984d97278a1a63a9c61cb71d434c31374409a6063b75499c3819488990075d360918bbf27d51ef51ae8c0a837 WHIRLPOOL b6767a9de04c59df15720c429aa5de1ba0dbfe0665bf985a2d5a9d66da49f4e3cbb9485fc512b50c743c2f534561b17f3abfe85c8a5eba66c66dd0f57487fac8
-EBUILD angelscript-2.27.0.ebuild 1385 SHA256 38621ea7565199c071c468862b9010207d9ceb3b50d191e4045bf7d500ae2431 SHA512 a89b44b7aa6ec06720af982c0efbb3e22ba9a55e95cb68190b3ed431dd835bbe2c32a8e5316c8ed4ee449b5fee678b2c21da7453542a0a30c055e292dada27e3 WHIRLPOOL 094856c52cbb9dbffb9e0ef8dabd3137a74f79dc990579a45e1a28db6441e4ae06dd5a2bb765714126b5326b6a011aee7a4b42f709f72cde735e49d94d89595e
-EBUILD angelscript-2.27.1.ebuild 1385 SHA256 df984693461619f847c7608fbf94e58b6ae1b85e88ce8a10e24c6de3a92a262d SHA512 a56f2886fff0a0232a86270fa28f68c97794d389ec73f74f64f2ccbd56e7cb17662ca7ffe182d176fb1d2e58c884bfdfdc349ba5757e7255aa4b8a3c33a8a7d2 WHIRLPOOL a3c29d9cfa94a8334b7e1f1f911f10026439655565f34df26429c4590c53b1709d4a56d4cc76c2a4dc3c95d1b22b66556e4c63d73ae18792700d4ee3438a95f5
-EBUILD angelscript-2.28.0.ebuild 1385 SHA256 39535c8635a04c4ed58551385909d17d5c70fc760482e00e669d1cf0110b4f18 SHA512 5e425be02fa2186528111df0a12f7e8644a434ada02b6e6e6b96010f774d90f0e7157b3b5bea62acbc8ec0b634cb44b15af20f10f6bf78dc5bf4b3ab346cbeff WHIRLPOOL 22f420a246805b7b7f8d9e3a849ddb45fab0bb47d429318a213b1845ec80c0967919a265ac57336409ee065bab68542ea9312a9c49bbc11c25cdd15e03d85670
-MISC ChangeLog 2266 SHA256 a7c4de0d023e29485f0574aa64837f5d888bb30be41a7f2f08907aeeba7182e0 SHA512 7b173e5606cda423c1192bce79dfbdaaa54e866cb1f613434a7dffed964a5f25d871141310dd0fbc2d680db30d58501b84d9c05172cef72886994d37786c93b6 WHIRLPOOL 481b70f49468a2505b998bd10a3a17ef35e8a055d2454957c86b782074d66f798f63dedbd4104817adbbf5094664b63d21bc477b58fd2ce9e81c4a87e0357f41
+EBUILD angelscript-2.26.3.ebuild 1378 SHA256 60f5461523186cb1a5ddca0b0d76de5f96fcd1b2504b654d5c9a0be105cfcfa0 SHA512 b67f161a4648d94c5773a2f6009c00d1fb656adf6a92d6e094d7f9503ef5059324a8082547346aff80c6d522aab59103531809ed3564ac3cdb453767bf2bd932 WHIRLPOOL c25e2eaf6ae941dd696a6c8669e6a7b0fb7417f997953cd443d9fd37588ad6371599e218f48b7914ddbbbf8abe30d576d0642940ce366b24130dcfd437eafcdb
+EBUILD angelscript-2.27.0.ebuild 1378 SHA256 21bb46f958b7a696918f0d02e56c282b11ec589ec294c75f2bf35c8b3c8cd6ab SHA512 467488bad253716ea6d373ce127b20dabcd6b8ba2e44e6975b1cadd05d03fd0cea126569cec8372c2537019ed3ca272e9c625fc5554988450b3429fa1622ac0f WHIRLPOOL b13c04fc888f38274a2fcd0e0529285695ca6b1df99477d241d282aa1d086bafd5c88b1ec3bbfcdae73a65136ea423f2d538b646583a336a10c9983ade4cd4d1
+EBUILD angelscript-2.27.1.ebuild 1378 SHA256 8948d93f432163a3a431119b2c83db51ab7b2e76821ba9afbe4116bc9a4bc0e8 SHA512 39d1dc2132c65f520ef3c7d55c43920749b254c9cdfe11dc36ee804f31651862b7faed2f6c4105cabcf827327f7994e9a7f88e9d3c62c35b55a7b623da1e5bae WHIRLPOOL e6847a14265c9d2e3f5b17f92bdb862f246726f8441874c7c44e2e95b5aa4853bc5652acadc0128bda55cb2ecd587710003357424c00c489182235a40b5d6429
+EBUILD angelscript-2.28.0.ebuild 1378 SHA256 de367638a17ff8c1caff9fcb89318e231959ccdaf5b499a86cd7437b856bee8f SHA512 6b8b6e8472c89fecf0069d1703edcc9f2bb8080ee816c037b9676f1f36146b9ebfc2ed79065fab2a65c6414c1110d74c5c729379029266b815c1ae9d8a0b4737 WHIRLPOOL 404a639e514562ad38657a704998021fc38bb52729152874514a6c7213b929fa1b8c35fc2b50d5be14fb64d39481ec99925daac51365a25482fbea49c245af2e
+MISC ChangeLog 2523 SHA256 699a800a2f657f681710c7cb7ecf6487c47484389e57cde69b41fabecd2079a9 SHA512 e10eaea96ce9de8070d59100e05e4df2238ad8d3e3b5e76d636937b6268fa393ebae002c7797db2e074dfd7c7167289a542e5d190d1593d51154c24138fa9e21 WHIRLPOOL 000f254a5bbecf44bf276cc3caa51518610c5a7c6154a75f93daecc98a4adb59fd675ceda2d378ea664ac0fcc4627b8856f95f38345c9d9bfd1c0c9b5054e7d6
 MISC metadata.xml 235 SHA256 11ffaf6c7e9d3f8dbb48fb60cd443d87b61015bc3197206ca230f5c2b0c1e013 SHA512 8ff2114c96567a53f83cd07149d1530286182f54b3d1286b9ceccea41e85734be19d0f60876c73880d76baac48e698de91114bfda459e2ee6ade9c3237847133 WHIRLPOOL bd4bb26791fe245f1c2407aa690887524eef3e76de87b4f2b7049f436661ee78a669e4fe4415e227aa50ee404bbfbaf1822fa648792919f93cb3674fa0f55858
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSyI8tXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSyI/9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONhYP/0Rr0aa9k4saFVfQzkonJPg+
-rq9MbGTduI2R+C/pmB39dbKGgrqPJKaJ1IEPAWYhaKPkOiP+2yg8GpNikMChol/C
-fQC1LYSLNfnCIIk2Rs2s8aw0D1oshpW5y6Q+aE1IIkLknXmlVePT38556Gr4NAVw
-uewFKYE0zMNM6OcyLXGMj/NdAmBc4208asosoH57ShGWnNGBmvH5bdreTFNZNLjm
-iIksZLz+YiziGQN/AqYIUbaWjDl8PFWgpj2pKkkBFxtnZ/4juofHce1h10CjUMzp
-mpRs7RYEh+mQiQ+U8Ft+K3rUgcY4udT+733/N0sh46Bd4IRkHuvFCKjTi2jKJLy8
-jaI/FYkXDlesZzvcGOMYOXq4pWmff+exMHvuOIjO4eKxmRHf6sy/DpPTWE0iHejz
-BFT1/xOR+Grs2ZeIcgbuoQk/4mTpmR3OJ/j+Byk64jC2knzM2nRIRobQ2lmkB+Sv
-+EpHRFjKJA/nYk+KAGAnvPIlNO8D9yJ66PIqo5YtwaGVuqYwQ8TC8MotAetWC/zD
-6eIJvzEve92WfAB01QQpCeh3zMTjnXMc6rahFnA5nyzQaHi7tbw5kS0LKt1YazzK
-mkR08axltUxW5AP+eNUH8Pd2TfuMbXKYzF1GMPoHc1OUXBYUGw/P2gQHHJBJX3SU
-QyH3mPe9bqhrdYmsPmam
-=cQu5
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtOkP/ilCmCjixctvsnhkEqe00GAc
+t8eNQNebFqzJpoCFzy5jT9Qs0BLtC9q52OfeAOHKTJ66JA+9VKaMftZ0WCxS55iX
+DSKEgv2OT4t19+ITako5HN/Qh24TNIoSCcO4w591FaOYNE49qV+WBxw0953dE5Lv
+TeXJTc//1NwbvGQ8ZpLqejvzwwWHhg02xcW71qOYyrVSnEdxSlY5a4AJvqs+irYH
+mvS9BEgThpXsr58fX3r6ehYsmi3PUh9HQEOd4PIIdKtsQ8XXBFF1ERzpHJc6t7rX
+sXtstGGe+XsJ/ESn5s9oxaTKEv9qxd7Zpk5eYvRmHy+q6wOwiLOyPaHxNv/zOlT9
+8c1Cgovibwqbf1jqqE4N6x/tKI/GOIfCJrXbdTS1CBRAOkA0TT4/G0+W61HKLjcX
+z6zoVAdy+tPaRiA+xWPNwFpVE1Mof6bOqfZC+tpysADRbeJvy7xGHdJHDyfGkgMk
+toytdFlqBNZzKBpg0ZFJi03Qaps3DPgtndB8/QDnBq22lWIBv8x8YBS57m0QkuYQ
+4BugAw5Wzon6Wy+apeWfOoTS53RccqlKrpURynr4xbB5+Hcb6DesARwJK/R1HmpL
+OwZ04qTZ4vMpb0T90Q/iVNSkIiTMO5JsZNB4kWelpDV0jcjqorURPKMXE5JRaKpo
+VtcR4SJSPnlO2bTzlbDz
+=0HkB
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/angelscript/angelscript-2.26.3.ebuild b/dev-libs/angelscript/angelscript-2.26.3.ebuild
index c1031f1fa2b3..faa6e8ed7109 100644
--- a/dev-libs/angelscript/angelscript-2.26.3.ebuild
+++ b/dev-libs/angelscript/angelscript-2.26.3.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/angelscript/angelscript-2.26.3.ebuild,v 1.2 2014/01/04 22:46:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/angelscript-2.26.3.ebuild,v 1.3 2014/01/04 22:49:31 mgorny Exp $
 
 EAPI=5
 
@@ -48,7 +48,7 @@ multilib_src_install() {
 	dolib.so ${PN}/lib/libangelscript-${PV}.so
 	dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		if use static-libs ; then
 			 dolib.a "${S2}"/${PN}/lib/libangelscript.a
 		fi
diff --git a/dev-libs/angelscript/angelscript-2.27.0.ebuild b/dev-libs/angelscript/angelscript-2.27.0.ebuild
index ae754bb3207d..c8c48ed725e8 100644
--- a/dev-libs/angelscript/angelscript-2.27.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.27.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/dev-libs/angelscript/angelscript-2.27.0.ebuild,v 1.2 2014/01/04 22:46:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/angelscript-2.27.0.ebuild,v 1.3 2014/01/04 22:49:31 mgorny Exp $
 
 EAPI=5
 
@@ -48,7 +48,7 @@ multilib_src_install() {
 	dolib.so ${PN}/lib/libangelscript-${PV}.so
 	dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		if use static-libs ; then
 			 dolib.a "${S2}"/${PN}/lib/libangelscript.a
 		fi
diff --git a/dev-libs/angelscript/angelscript-2.27.1.ebuild b/dev-libs/angelscript/angelscript-2.27.1.ebuild
index a2ef29f2bb2d..69aa2ed48fcc 100644
--- a/dev-libs/angelscript/angelscript-2.27.1.ebuild
+++ b/dev-libs/angelscript/angelscript-2.27.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/angelscript/angelscript-2.27.1.ebuild,v 1.2 2014/01/04 22:46:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/angelscript-2.27.1.ebuild,v 1.3 2014/01/04 22:49:31 mgorny Exp $
 
 EAPI=5
 
@@ -48,7 +48,7 @@ multilib_src_install() {
 	dolib.so ${PN}/lib/libangelscript-${PV}.so
 	dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		if use static-libs ; then
 			 dolib.a "${S2}"/${PN}/lib/libangelscript.a
 		fi
diff --git a/dev-libs/angelscript/angelscript-2.28.0.ebuild b/dev-libs/angelscript/angelscript-2.28.0.ebuild
index 9c3248078e4d..18a25de69634 100644
--- a/dev-libs/angelscript/angelscript-2.28.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.28.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/dev-libs/angelscript/angelscript-2.28.0.ebuild,v 1.2 2014/01/04 22:46:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/angelscript-2.28.0.ebuild,v 1.3 2014/01/04 22:49:31 mgorny Exp $
 
 EAPI=5
 
@@ -48,7 +48,7 @@ multilib_src_install() {
 	dolib.so ${PN}/lib/libangelscript-${PV}.so
 	dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		if use static-libs ; then
 			 dolib.a "${S2}"/${PN}/lib/libangelscript.a
 		fi
diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index 9f7ee7dbcadc..3cb030fcbcd3 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/expat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.158 2014/01/03 04:18:02 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.159 2014/01/04 22:53:51 mgorny Exp $
+
+  04 Jan 2014; Michał Górny <mgorny@gentoo.org> expat-2.1.0-r3.ebuild:
+  Replace the explicit ABI==DEFAULT_ABI check with multilib_build_binaries
+  eclass function.
 
   03 Jan 2014; Matt Turner <mattst88@gentoo.org> expat-2.1.0-r3.ebuild:
   alpha stable, bug 492702.
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index ff8a9b747476..950e1e3275a4 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -3,23 +3,25 @@ Hash: SHA256
 
 DIST expat-2.1.0.tar.gz 562616 SHA256 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 SHA512 2a9ad2b44b87b84087979fe4114d661838df3b03dbdcb74d590cb74096bf35ce9d5a86617b0941a2655ea441a94537bcbcd78252da92342238823be36de2d09d WHIRLPOOL 147eb383fdb79116e2215982e9741939f80249a0bb690e93b00218fa335d483d88f82d9256632b458b13592252aeb100ec4ef830c72bb8eb5df7675cd15f41e1
 EBUILD expat-2.1.0-r2.ebuild 2322 SHA256 cf8865566582aabced12c76802dab72396ab1192a7bbba288c072d5afcd80259 SHA512 14cdcfd29d89db43d28e258f8048888f7cbe2cdf37a219421dee7d28f331a79815c78591d3635b2d7e169a9762c7b51a7c0db044b291f2cbee198e4831cb24fd WHIRLPOOL a6e8ecdd76d01121ac3545e5e8dc1a0a82aac89bdda77ccbe2d94f8188c59e9244f76f4c966240bfd4fbaf82e102e6ac59eb10681580a28fa4629754c1b270ca
-EBUILD expat-2.1.0-r3.ebuild 2438 SHA256 895a61f5c181cf7eba8ce6fc43c90d96394333cf1e50e21abfc4b5d8d4b15836 SHA512 1d89f2c167a287e7404fa1d5828e02f6a57d33c391d25081475eef867ad4542a64864ba7642c03e3bc8e229f573a9569b4043122e460a020afd365bcf44fcc4f WHIRLPOOL 81c3c1eab6326df10e4c87083362356426f6e90d34408c392db73f83a9bdd6c5a6f93cdeabe671be6287d07277371672713e369ec4c35755aff619bf18208941
-MISC ChangeLog 20625 SHA256 ef044e494833783745a484d2fbc1b7e3d985023a356a4addebd2b25498041d81 SHA512 7ac6887535a987b48897aff65181ace02332bede4fadd988906db65ce65fe4bfefad09f8752fcc0292853af5fcc2ca6a15784963e02dcf694de47e22b92bdcd1 WHIRLPOOL 57cf2fd27ff9e0b2c3547c54c6d1f02195802f9251b0dd2616244fc94951da5997e4648a94c470a755e42c26df36687a6dcf1bf4a815d4a3149251a0869c4c32
+EBUILD expat-2.1.0-r3.ebuild 2429 SHA256 b746754c681814f6174a2e5ff7b805500004fd327adc075cc3e29e7ab93d14f4 SHA512 3e18f547f5cb8bb99ff9dd68bcd7e7eecbbb4232fdffbcee32f247b799e8d983ed58f484dfe0be048bdfd2d0220f9603f7014fd72c20ecef2320471f03827713 WHIRLPOOL d40297f1009ada020d3e8ac56c5fb49564c761c424fb6178ae60bd2133a2fb1158432a08fb38ef04dc27fc6c47a54a12b9e200a86c5b8016daa7f162f2f0ef20
+MISC ChangeLog 20791 SHA256 ae99e65ae7e5e5f699bcf055844aa24cbc445a4b2347a54e1ae9c84bed2457a8 SHA512 4a6fe2ff3c9c7832b3cb5278f14324a16a1473b8f861f2aebbb288fdf6080526af0998919b078dceef5d3960b534f1c8a768720e5c6716977c239c0b3502b01e WHIRLPOOL eba4a506d5412faddf381b4da21d0158af4279520d00ccfc0e421475bd88a6446668e65a6e7a89410c6d847809fa7fd82e65462db2bb2b0cabb3ee6b21970a91
 MISC metadata.xml 253 SHA256 100ff5eae8571b7fa427f25400fba2ba79683860ec39467180bc8c9a7c73420f SHA512 549874f0fc26095c2d80c34bd0cae74b75ffdd4a9c19c52931047857f51f7461e7b51495cbb7575a19537ddfb4d2762c1fa4b36cafe47ca8057a6bbf6e6778e5 WHIRLPOOL 7c080dd571730c2c8aea4a19fcddc9f6fb947a8b2534d44bff5aa02d85a9ca1e24de2444ed42f326f13de4b082845e68aec41397c0424ca15b6020c0f5ae704f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSxjoRAAoJEA/daC2XTKcqJqsP/3/bKo/8ZqZ3FhCM3R/XVd3Q
-Swx5p5uooGY33Z0cgwFKNpfxJW5b+KApwXnxJ/qcWNF83JLF+udl3UTwFIQOBdAD
-SKLaFzKGRcu1N7fRxR0EXuXQA6eVz0wkw7LX0fs2asfAX/x4Mjh1nOFRecBReCT1
-rTrbqBoA/p6/103CS1BWqpIgoxTAixbNs1bL1nKrOrQWE5JAtbr0b7JHKTMd7pAZ
-DVrQgeTzKIANToX46HgrEt/9ErQO//FrlxlfRzdEUOdIsw4ZWreuhQrVwjY2JGDu
-fFIdhyI/csdp5NfuYL+7p13UJ307eR2+t9RAxCXoKiDQfW/7cSqE5FgQIzxomtFY
-ZYGEhlxtnIsyIoj+7BjeHSLKn7CB3jykBuPEROo/HfUfEAWRkSdqvz6N8fg0bz67
-b3H0KU2r2DQOgnzbdrLS7ETI0kz1W4KiezjZl2xdMY5f6YXS4kWZnBkO7OAKexWH
-EMbPivuHKnLyEyRN+xpD3vo4vsIStn4if5nr6GwLN5PavJTBmI0aV4199dp07iQ9
-yOIu4JI7Hwp0MmrnvWiqES2xmxzUL7dFWNUKaFzlFCUypt3PDgg2QzwDNWkxq+by
-+5HIpnX8jl7CZfoUsehIJl540DFpHnbeE/BMU15Zef4/ra+boNQIqpFIAT1ZuTJ3
-545iifdJukoSfqHmASLM
-=HY3q
+iQJ8BAEBCABmBQJSyJEAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6XcP/0JaJqzj4Pp+YBfx3nwYWLpL
+HSFoLoVsJW+7tvYm8UM122ol7KAMPQ8FS3Rehk+QrtEFyzg0CuMDxeNDFMyzCbUC
+sdBuPn/xLtGbjCL/8XeLC7H/zXqQJTS+H7dlnsf+dzNxdJ7Ck16u/iB3k4mJ4QT8
+shDAGDEoQxjhTaSA+I44ju6xO1RrckXT8AF33MecyW+WghJmlmjl4dZ6CIKBGDLy
+AEXYIQgMKS/OQw3V7H1p9fv4tcoRpeaQJgmvd8gCeHyA+cIMbBwzbK1s/o7W4Hri
+BZuhzhmKAIcEclJt5n4jsxhldBq3ur7g8B9Bugq1dQDiLy18fhSS+DnnF0jea0Nu
+erKPmW08v6B610b/UbZA748bM7oDQJ3S5Mrum1zSVZ7r6ZZ11YKTEniApCDEu+DE
+OqUcLUtGR49rH+ZAkv8iFqW9oDWW3gf5ki5FQATF//zHKDtVXK+e7L1t/y1ykoQm
+Vu+6MB236ILqzVbnnJ0EJ14KICpCFQWZiflLbjJw5g4qxgOnhdHwE30hNEjZ5Fmu
+LNTyfOEE8pvQh/FalrzIJbVtyogGeV75mJo0D080Ai5VQSy09Jc57uTWT8NkvjeB
+eVvMnB94PgxbVJkW9FdVfHQFRiQggJmdzCQUAKuP29EdLeOpSYFBwkTdctG+E3kI
+ZlxOrt2iQVTz8L2kVYew
+=TKw5
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/expat/expat-2.1.0-r3.ebuild b/dev-libs/expat/expat-2.1.0-r3.ebuild
index 3e8d2393a285..7af1707df904 100644
--- a/dev-libs/expat/expat-2.1.0-r3.ebuild
+++ b/dev-libs/expat/expat-2.1.0-r3.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/expat/expat-2.1.0-r3.ebuild,v 1.10 2014/01/03 04:18:02 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r3.ebuild,v 1.11 2014/01/04 22:53:51 mgorny Exp $
 
 EAPI=5
 inherit eutils libtool multilib toolchain-funcs multilib-minimal
@@ -72,7 +72,7 @@ multilib_src_install() {
 		popd >/dev/null
 	fi
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
 		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
 		use elibc_FreeBSD && gen_usr_ldscript -a expat
diff --git a/dev-libs/libRocket/ChangeLog b/dev-libs/libRocket/ChangeLog
index 5baad4d425b5..792b8d0e455b 100644
--- a/dev-libs/libRocket/ChangeLog
+++ b/dev-libs/libRocket/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libRocket
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/ChangeLog,v 1.8 2013/09/05 18:29:52 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/ChangeLog,v 1.9 2014/01/04 22:56:02 mgorny Exp $
+
+  04 Jan 2014; Michał Górny <mgorny@gentoo.org>
+  libRocket-1.2.1_p20130110-r1.ebuild, libRocket-9999.ebuild:
+  Replace the explicit ABI==DEFAULT_ABI check with multilib_build_binaries
+  eclass function.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> libRocket-1.2.1.ebuild,
   libRocket-1.2.1_p20130110-r1.ebuild, libRocket-1.2.1_p20130110.ebuild,
diff --git a/dev-libs/libRocket/Manifest b/dev-libs/libRocket/Manifest
index 7090ada20700..33d58adb179a 100644
--- a/dev-libs/libRocket/Manifest
+++ b/dev-libs/libRocket/Manifest
@@ -5,27 +5,27 @@ AUX libRocket-1.2.1-build.patch 1194 SHA256 9650d7a94fea3220c15dcdcd4002df95c025
 DIST libRocket-1.2.1.tar.gz 1796018 SHA256 05c92515031ebfa5b1e9421d88116a60f815818c97004947a16ce6b4c77563a7 SHA512 49210bf7f4867103d0149a789f020388a2ad533ee684b52d8d2ffdb38f41fe873ffc389b79a20a7020506b368394a0fde7a8ba5cb495576edc16f1b12f520e41 WHIRLPOOL f9b8f9d30c3f94028d623f22b8169a4a101fda5f52edd3a21d05b9a56c6410c94788e1226c4689361a7a8198973cf4c6819cd3733fe69d3d8a93edffad090e06
 DIST libRocket-1.2.1_p20130110.tar.xz 845572 SHA256 5661f0d1b0a3e19b9f2856b9927ed7ec4ad6939e732230832cd701bf078a732b SHA512 1c474e0cad2e13ebe6102cd5d31c3fa61370d23062c31fd7703ec431f0da56f008c9711b49b73d8a9b32af0313e2cb3aa8c46888a36044fef05c15fe1cbc23b5 WHIRLPOOL 52ef88ebc35ac762c6b50fbaed8713b2568f80bc65390e696537f4935eaf1c4182a64b414fd6bfadb3e1a6cadb0589fcb20bc12c26e3ea87edaf342b5ff09bb6
 EBUILD libRocket-1.2.1.ebuild 2013 SHA256 84378b7230ea2e43a6338592c98b6fd3d0fdba89475f7864077bd738a3e2e39c SHA512 e8c51802869d1fe53ba10491a2dad192e62e7e689e306f3c6f4ec4d07e2bb0cce8f0c3b24e82d81a881690293b4757853fd6b57ebbde357b134f1170cf43cdb7 WHIRLPOOL 51265c1a36344b349546e33a7fb0cf688e6368bdaf048fbc4826391ae23aeb9d317969bac078ef0c76a0f5eb4c78e461ccdd171b85eeaedc772811d2be4b0673
-EBUILD libRocket-1.2.1_p20130110-r1.ebuild 2343 SHA256 bc0a6eb710b78a5c41935732048fad89bcf12487094ccf3e5e0607b7fb709a03 SHA512 86c023615712d0d23a528f69673c23c83fbfb62c96705d7eada89f58359f87c6ae6cbc05a5728f24c542902ee8705bee7b89fbcaf8fbb9f7399aed2f899aad95 WHIRLPOOL d0da9571665520db560d39e740e252f0ab49a1640b5c9551cbe9f563fe7da613f4f5f4cc3c925a8aad7e23a649898c898a334f43835131dd679e792de373a060
+EBUILD libRocket-1.2.1_p20130110-r1.ebuild 2315 SHA256 ee2fb24d5288957c5111ec16f86eab5f874710a44553df132148169d765bf4c4 SHA512 f3447efae91fcf5dd3ca1e38e426b3e419dbe07c1e2b0098bccdfb37880a6b27a4d8162f5eabee2b7d77690c4de864d13fa3e22b10be9b7364ea76affb3bfecd WHIRLPOOL 102e204042b12c4ffeb45bf0c26c91e98527b1d8bde83100a51fa7d611e67ac8c5d35d4298fc19b02986a049185150a309210c714ac496cba9b1a8511deb57e8
 EBUILD libRocket-1.2.1_p20130110.ebuild 1956 SHA256 20d3b62afb3ae3de34459cbd3245eacd238773a95f5c9a55fc46107060622867 SHA512 80876b31341ed92afcc5b0ff6f32ef15680ba78b343ba54f56ee2cd5c4d1a0e24c9b1e22e6b76921be11f0647763b88f8709f1bfa00030b140035824da282de7 WHIRLPOOL 14d828e36a904f796b9b3615c2ff36bfdaba8d1b3e08c2893049856e59cc926c76fd52295526a1cbba038cb44698077a25d37c25018626551d288c343392355a
-EBUILD libRocket-9999.ebuild 2320 SHA256 4c252ee4ed6adf2ae201f36b3757d6780cee9631e3f8ecce03d8506a9b26d1d1 SHA512 37633d8a17a5b3ee97d5beb65c8434a916f78a9767b7e0ca3a20841626a2905ee01087176ee89cd4daee20fd6d6dbd0b947aaebc2057701cad6fd6dbdf037b79 WHIRLPOOL 68214cc373af9cdcf21987e2c3d47ea7603044f199dedc94f922118f9e287d9863193a421a1eeaf6154556f262fa5d318d0922d0d985d685e5d58a12dfa77ef5
-MISC ChangeLog 1660 SHA256 a74f7409a558cbbef77602a8b94715e191a58cfc4879d44ad4cad1153ef4a7e4 SHA512 532dc31d823cb6790ba2a39662c63d48295e1bbb4df4fa96e3f20a18900e0dd9b0550efc8d9b6d3bd1132ee6b5d191700be3538953a535a3a710421d1b48ea1b WHIRLPOOL 37963ccf5e8d2ec2d844bfa11f68b35e12518d3c6e1fbe33d209dd8da095a4c076de4114f138332793af21095542bad935a9951ad971b6af6be20719d2bfb2f3
+EBUILD libRocket-9999.ebuild 2292 SHA256 def373dd1f7cf9e1ecdd435e07a39ae7b0fb5f19bc282d80c8ab09e74d175121 SHA512 67f5d1159e02e9273fd8e2cf026ca7b58e9d7b131dd38f5f1834cb72dd9b8d26615e6b0db333631cbeb542e2f96d6c3710958cae1224d5127dc009f1505902b0 WHIRLPOOL 5a0f50012cbe05ffcb4cb25e3523b10abc4b828cc306cb1840c70404d1eb075b15ddfd0b2aab6cb381be2b11b74f681cfd8a8334e9025d36b2be3041974dd0b9
+MISC ChangeLog 1867 SHA256 b3403fba64494773506cc2a610745187c0b6497a8c56d9cd219b001bc03bba5e SHA512 85830df2cadc89edf5fd5563e9e07cc761756f00c7f94d7057414e43f72d39787501cd21321cdd765d692394d5021ed5c9093f463c2c8f985c191319bd5e3455 WHIRLPOOL 916803e95b9677df7b3e9792a27d6371afeeca422f05712ffbb3ca98667df753462a4179fa4915e89f5a655cdd553589626e06ec4ba314ebeb9ef1c6461b1140
 MISC metadata.xml 294 SHA256 d42b1e02c3a48eab00022cc811e6998351b7c19691fad42b10bda6f3db8aaaab SHA512 0f5486821b3585889a6c955330f2c781356e370b245ec8656111448467a59c9fdc41fd15ae633737aa46ce48b86abdc3247bffd979da00e25c756758ebb77451 WHIRLPOOL 4d8bcc430d64d761d7e134d31627d0d43ff201b990dec3da289f0fa50d33702dfd1638d6c0da7a2601ce49a130266526284d341d4d2f50e289b36079249e4231
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKM3KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSyJGEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObeUQAOFzIX7niiALZYavg1zlQS9h
-Bv3KwW5lV+u1caM+jLatdcusYtZqLSfzW4hEwc5QdmGGLTGTJBEOKnZgy3tAUPxn
-Ey4U0HNs8yTbpql9ZpZ+2KJZDqiXzXFsqe/w5dooeyMQdlsENJhUEVpCRTfh6yUO
-KzjkpjXrxBiPBwA9303QSg5MRrfJ1RoUKZUZ2wfauKUnK1UztwtTaCOxyYW3FNR9
-ScAszIBmPB2KkTcZ1ZLf07A0T4A2Kr7RTpVyue31xtZuyTyK53al4qGx/dEfOWBq
-5Ss3yjZU781Cobg0jBqJJCNm5pZt3QIVTbWsU6B3Dd9gDMKiqmWrVdhA+bhKj+NZ
-O3UK1si7AcDu3PRf6WAxFJBjX1OVUrESGcAwC7TzP0wJsrFYmdhoH7j8q2Od/ViR
-kIz9DgcEBSq1OcF7tNc1tOjH7FfUZI71CDlDQUXajn/O4jU49xNL62KVemfiSkA/
-hzo6faCg7mfDYP3oAK9D81I8qfuxWqZzRT1JC4K+ruIxPiTq4oH91naYyXKeGZWw
-q++M3EPHsQI3IeCYQezJVZRPPo+BH2Or5v+Fm7hH+pXaAmcPTtzdD6zH47eehd60
-G9iki6jRIOL7deVu3MYTcYLCX4dtAUWHW9FngBRCRL23VYzrc7mEGJlnFQhKgJEO
-XHFo2izy1vs41czpR6IY
-=6PWi
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkxUP/2R2F+vPooi4vXiiliIK3gwp
+7iyIVZKa1ilEyMbZali91zbQEhknwbRLxCEgWi2h3GxGNh/UvoKke0Orm96nWk08
+rPSTW/sdiOqYr6BQncMH/abKj7ZzErnheZ3Qohw34onOLfcwCaA40eg5KO+QToEq
+IJGCAEI5bgeYQTIHuXkKfkzO+W3jn7XsfmTSVz2hYGYiou2hFNkxo3akWWNMwT/h
+5ylimbJeIXLKEaVvTuycnPEHkDKT52Rc7NqCMBDGB7KBZHB5/aX8I7HN+OLdBZoA
+oRnyyBmBui5l4Pmlxej5YIZPpOtsgJiAHoM/16A8pdLtUxcPLK8W2AfTBvcDJVLi
+FJkl7wZqv6NkVDz6ahctsEHYR4Dw36VDizs/UDM+68F3+52cpwDLMnMZPaRtmL01
+NnavcO/ft/IHOIaeoglVR+Ngi+azKRQUhjoQQ0FUz2qmHmbL9Cf8bvpouDwhCdLE
+8KJNNAJFBhBphMIb8YBOGKsk1lsS96tXOumB4qgmzZ/9Rf4dW7av4c9au+DC7tRz
+9yJHRaVLWdfXi4hQPC579qtJZovvAU3Yq70zRrAcJOVMcaiJRQ318DyigdDSWyer
+Tj/p0CxrjJSArdUWArnhZj93p8aoOF+DVdm80dTh4E7Egwx8N6YjDQ6L8C9LNHqc
+1j/4ZildFG0axybvwnl2
+=nAps
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild b/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
index 3c7abeb1fb22..20f4049dab56 100644
--- a/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
+++ b/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.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/libRocket/libRocket-1.2.1_p20130110-r1.ebuild,v 1.3 2013/09/05 18:29:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild,v 1.4 2014/01/04 22:56:02 mgorny Exp $
 
 EAPI=5
 
@@ -41,7 +41,7 @@ multilib_src_configure() {
 		-DSAMPLES_DIR=/usr/share/${PN}/samples
 	)
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		mycmakeargs+=( $(cmake-utils_use_build samples SAMPLES) )
 	else
 		mycmakeargs+=( -DBUILD_SAMPLES=OFF )
@@ -49,7 +49,7 @@ multilib_src_configure() {
 
 	cmake-utils_src_configure
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		if use python ; then
 			cfgpybind() {
 				local mycmakeargs=(
@@ -67,7 +67,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	cmake-utils_src_compile
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		if use python ; then
 			buildpybind() {
 				cp "${S}-${ABI}"/{libRocketCore*,libRocketControls*} "${python_BUILD_DIR}-${EPYTHON}"/ || die
@@ -82,7 +82,7 @@ multilib_src_compile() {
 multilib_src_install() {
 	cmake-utils_src_install
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		if use python ; then
 			instpybind() {
 				python_domodule "${S}"/bin/rocket.py
diff --git a/dev-libs/libRocket/libRocket-9999.ebuild b/dev-libs/libRocket/libRocket-9999.ebuild
index d732102f97e3..235483a824d4 100644
--- a/dev-libs/libRocket/libRocket-9999.ebuild
+++ b/dev-libs/libRocket/libRocket-9999.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/libRocket/libRocket-9999.ebuild,v 1.5 2013/09/05 18:29:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-9999.ebuild,v 1.6 2014/01/04 22:56:02 mgorny Exp $
 
 EAPI=5
 
@@ -42,7 +42,7 @@ multilib_src_configure() {
 		-DSAMPLES_DIR=/usr/share/${PN}/samples
 	)
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		mycmakeargs+=( $(cmake-utils_use_build samples SAMPLES) )
 	else
 		mycmakeargs+=( -DBUILD_SAMPLES=OFF )
@@ -50,7 +50,7 @@ multilib_src_configure() {
 
 	cmake-utils_src_configure
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		if use python ; then
 			cfgpybind() {
 				local mycmakeargs=(
@@ -68,7 +68,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	cmake-utils_src_compile
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		if use python ; then
 			buildpybind() {
 				cp "${S}-${ABI}"/{libRocketCore*,libRocketControls*} "${python_BUILD_DIR}-${EPYTHON}"/ || die
@@ -83,7 +83,7 @@ multilib_src_compile() {
 multilib_src_install() {
 	cmake-utils_src_install
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+	if multilib_build_binaries ; then
 		if use python ; then
 			instpybind() {
 				python_domodule "${S}"/bin/rocket.py