Require matching abi_x86_32 flag on dependant emul-linux packages due to potentially mis-matched library versions, reported by mrueg.

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

3 files changed, 25 insertions, 20 deletions

diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index 4e6d89d3fd2b..a3c6570728ce 100644
--- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.110 2013/11/30 17:11:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.111 2013/11/30 21:41:55 mgorny Exp $
+
+  30 Nov 2013; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-soundlibs-20131008-r2.ebuild:
+  Require matching abi_x86_32 flag on dependant emul-linux packages due to
+  potentially mis-matched library versions, reported by mrueg.
 
 *emul-linux-x86-soundlibs-20131008-r2 (30 Nov 2013)
 
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index 11e455a5a33c..339ed13cad3a 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -5,25 +5,25 @@ AUX remove-native 11241 SHA256 d9bc95d494be6c361394a628999a87e908f06b60f405a1028
 DIST emul-linux-x86-soundlibs-20130224.tar.xz 7068240 SHA256 51ee669fb864b8522cd9ffa4aa8148c20eb07c06623a8c0bd718d444867da92a SHA512 67bca8c875e17bb8e1b3057182d08c679992ce525e124162e02e8a2c01bb5413d7ab19736a9f803d8a3835e7c5d68e556de9d3aee7240fb6708d2f3528ae56e0 WHIRLPOOL 48b9583dd91d5b1dbb4dedc1c9f5bf2937a325adad20bb45adf7de96e5d1db6a3e62a617ef85300c917faf57313a00790007d12db3a6dc9261ef627c71f14d9a
 DIST emul-linux-x86-soundlibs-20131008.tar.xz 6700140 SHA256 4afbaea80a493556475abfba0f2ee72941d214bfab159097f1c3267190f3fbdf SHA512 da1e38004fee464d88051fa2c4496bf250a2b641b7c6570ae327260ea121a8cb9c9557065595c1c546185d890fedbae987daab6deb8d192e94623fd3926ded20 WHIRLPOOL af569f721be3e07334b1384f5d245ad010aa4090705dfb954b1e48b5845894ea9400f9ac9c8cfbe0168ec1954bfd4503711068218c970c7a7f4a6d33d54a022b
 EBUILD emul-linux-x86-soundlibs-20130224.ebuild 796 SHA256 820c1ff543ca0d4756ce6201ea6d92422fe86813cc0451dd8a417f55fa5789f9 SHA512 04c9297c4c1fe3e3058bb11fa15bc2088cbf3bb838a0fe6ca306b4918164beb5a0764f758391b846063ca0ab596aecc70388b3b9c0639a5a335cf5df9ae249c1 WHIRLPOOL f56fb097e6bfdccb54b664df82deb0bc1fd7e528dcfce7e6d9b486ff86bedfa3fa5a8a8038854f9af093490c958292e5bc6e0e5f200b9c01ad2877e11b187f3f
-EBUILD emul-linux-x86-soundlibs-20131008-r2.ebuild 2203 SHA256 efa9110a8686ac7b75128dd05c6a5e2eb4f7e2eb1dd7d63963991e7e9b4607b8 SHA512 cf479c6762e5b868a2882e6d4eda05a89ae2c965301d9fb6d7722c197a55259fd00c18a9b4c663d478fa2d54a3cad1b64e7dcc9717c5ad6642c960edb3142f00 WHIRLPOOL 48ce7f2065ac72e643b85d0d12daf20402a3fde8367a5b3d7705d2c528da9dac9e1803e5dc291eb9b036c4e364cd7c30947597e00ec47951c7b006bf5b78f8f7
-MISC ChangeLog 21619 SHA256 5dc9c42d210e999f92ba1df1436fc1a494eb16cd0211c2e399fffd52da2a7a7a SHA512 5b9459cc616282fdfb4a483eae593c486a33e222812c7190574df676e012a5ca3f0613ded7d8bb50f378a26c81d8e963666ccaf92a082447095f787bcb0bc6f8 WHIRLPOOL ecf29e42b6ec199470be41ac8bbf396c25be5616a147b0d2814a9cd55f17443db126199d4ce5d303711113b9adfc58f7effadad11d68550c2832e700ab23c8a4
+EBUILD emul-linux-x86-soundlibs-20131008-r2.ebuild 2229 SHA256 0bc7ce2915f63b866edc79c445382b8c413a7bfd2ae13003d098243061aaeb78 SHA512 925feda3481e16e5d7039dfc34d94499ac616c6865956617e1cfd92b91a0170c2592c21e322a93bb8acd942445612343d57a0a925e93bcf12470177cfbc9b15e WHIRLPOOL 0610d98f1c4d5cf609c8b3146d60a1c5560a21ed7c7ea8a817e295343c904dedb4b83ba0e9d42409070d157c221a312cfe8c52696a34df17e96ed903f2d0fbed
+MISC ChangeLog 21855 SHA256 a18faa11206b669d9e6a28a53061e969d00cd23473da76845581be9d7f1a5c60 SHA512 3216dba48166b21e53f2643a238e8bf8fb9f53d135534105ede8aa51ef9a7181cc25d701a1f7c6c95bd43007cec67469c77b3eb9e165859d2e7da125da2ea40f WHIRLPOOL 064fe8db4bd015a928b993bc0f782932701bc67427e093ce1d890e7b6fc1d92bcca052f2065f753b548de21a906d9e07c127950107952df176257a5915a6a3f3
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSmhxYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSmlukXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5zcP/2Z+FEkDrVCUUw/3gQYbIw7s
-/oMcKti7ovQCR/QhZQ/HA8Zq933Tj3RvN9lkhFGfA6oSauKJ6oh8W5csuqZXyyQ2
-RUcwlHuAqH/egcjwoUf2Ij/1gY8qXkK8ZZVknJ3f+u1NXw62QJpXJp5cXV1qfRTr
-1vpG1aC7ox0oBNTuTvIV5LzLvFNNcumOK1IGFp2GbsFGoGpO7eoxckcL+Qoy+5eq
-X4OalLeXm1+xQyHLKnhGTKB7acFedMW46AM3tJ4rbMpH+046DABBbl4TQya/CJoY
-B6tFudgzxH2iCmzXBm8z/fexK91FyZPH5bDQhVPeoocsA+P2LMqqCrnzf6/cPf00
-XPiEg6tRWtmzcoamCHyAFdi6ACLZinnqbsBGPNlgU91/69vozjyOBLsCpg5lq8Ee
-Vv3YXT61DiiUhX1admDx72QtBmVfBrtCr9HRoX28fljOmVxbiMskLEaCITyArKdM
-1MntJXxAXTbB0yOGrN9Se/JQFu6mVFldnskLZQDYp60Ub0MMnPWrHYDrL7/Fv9fa
-3/0sTfx1fcEYulQzaoWqbGLsiZA7d4qw+t/lwSDuo8c9M5QLSbgkIDUPdQagUk4T
-MVmzm3sHBfVq5oc2JzXaov04zsvO9A/Mhv+2TbzihpS9oz06ExlC/z+ORRY4qA58
-DAFO1BybLp/ZGVTAd7Dw
-=V7GA
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZON78QANJ9kspD+/Hm/SBmZdz66ryB
+UEobDBBsqN9IqOm5BbG9/6XPthZKwdDv/owOU/7LICg3tbzDiutH0hyqqHl75vq+
+nxSYUYkdKzXIYeNmgGGy9oWDxoe29WLW1HKFQz8FXmPhYze4CEdoaWZMdoR4qmIc
+ZlkWP2Y+1+iZQEAGrMYf0Zu5kDPbaz1OGX8n+9QEBjucbuacJ0ietxBDAzlQ1y5p
+GYkM6OXQC9BI/zW9Jhhj9nHVAOAKk7BvLrA96qr+73/V6AQWpsmrInHL6H8VMO71
+b0ytua94f18yGLlgCDOHlL8mAdwYszCbvOcNNRfjAC7JH5s8oquqa5Ldwy82LkZx
+/xJvHBgmVy912aok1qJKLoX9Y7hef/4ntkl/V5mSyhcsGEQ8iVInlU0k+vKc0GBQ
+PICwRfSl+7+cyl5LJXbqmV4Eur6G3FnOQHCQmFDlxD+o5NTEEan9/cy5EEq0p1N8
+4n4oN6wa0GJd5pGsXUIp7zXHxSfDCCA7NyzbLSoGBoskL0E8X82vTcrBHH2vnP9a
+yzHT/NCxH8OeIUuX8Bo0az27uJNP5qt/tyXFvMn7oSPVmqFXAojZ7CF3W3Ocbo1I
+tJzvjwPYCR/5t6kIlSJZq7siJS7+acx72aemd8xfq+2Khu8tERfqkWAaEpLDdhpN
+RYV+dVrmyLul312Ehpy+
+=O1na
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild
index e414586ce251..e5f0bc7541cf 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild,v 1.1 2013/11/30 17:11:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild,v 1.2 2013/11/30 21:41:55 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -9,8 +9,8 @@ LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain"
 KEYWORDS="-* amd64"
 IUSE="abi_x86_32 alsa"
 
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-medialibs-${PV}
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
+	~app-emulation/emul-linux-x86-medialibs-${PV}[abi_x86_32=]
 	!abi_x86_32? ( !>=sci-libs/fftw-3.3.3-r1[abi_x86_32]
 		!>=media-libs/libmikmod-3.2.0-r1[abi_x86_32] )
 	abi_x86_32? (