Support multilib unixODBC ebuild.

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

4 files changed, 32 insertions, 22 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 475734c7284b..0384c867ab25 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.510 2014/05/23 22:43:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.511 2014/05/25 16:47:55 mgorny Exp $
+
+  25 May 2014; Michał Górny <mgorny@gentoo.org> wine-1.7.19-r1.ebuild,
+  wine-9999.ebuild:
+  Support multilib unixODBC ebuild.
 
   23 May 2014; Michał Górny <mgorny@gentoo.org> wine-9999.ebuild:
   Forward-port the emul-linux dependency changes to the live ebuild.
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 12dda1859ed7..90877a559fe8 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -163,31 +163,31 @@ EBUILD wine-1.7.15.ebuild 12899 SHA256 6e0a9e6ab7deb382cc2699b3344810796206c2ceb
 EBUILD wine-1.7.16.ebuild 12899 SHA256 38860f0c1d1cbd4a8c7fdb23b098d0e59273632d0783f70b787afecddde5a7e5 SHA512 1bee25cf27cfc716f730581c463505b482dd3c0a9df9401175ce5fd54c5d89ffeb49928c7cfa14c72417d9c4cce7d5f975e74716dc2b61b54dc954895f569553 WHIRLPOOL 9f29e6634194988e27b1b2eaf8f0c3873c1734cfc181afa8e20e5058b09590d5d3910866714ae465475d54ca96f6d51be6a35d6cac07d58af0cd00f0744edd01
 EBUILD wine-1.7.17.ebuild 12899 SHA256 dc110b7032383d59d4417dfa881b71b2a3777b7ae446fc2508687f596d52f2d4 SHA512 b0fe20e540fc7b2a7756d8e76a2f9eb4609e6a1b36d612029e7a407f3c39b4aefd8ac35f16973a2ee060dab58963a4b33593c3462ff067813a3391ca43af5516 WHIRLPOOL c69897371b9adb51989c741aed6e49cae5c1b626f88cfb565b6a44d52c513c5ef834cb38f83b6b11bae5bc8a4a85f97d377ac5904a481c58117ccf15ff9dedcd
 EBUILD wine-1.7.18.ebuild 12899 SHA256 2fe276899e605599e6b9d1a4ebdb7a4f91146b6b4001bd1364a18d89936768b9 SHA512 534ebf9e9d552cf84acaa6081be5505bd2ff4c7cb0eacbeb5f99b5c8f3c59c3f446cc71de2eae241581216da6ff56e06e5e5420ec18de7b7932307c6c2788db8 WHIRLPOOL 458f61c473487d1c926aaf5f67aaffb855841c52fba72aef9b4fe8f556fb0f59a2092408b8c7083d38d74442850edf0084bb3cd30b5c123854a4fed5a7736389
-EBUILD wine-1.7.19-r1.ebuild 14534 SHA256 ff69d05c90b338465a803159346469308cc6b0e1b746d32eb25d2bb8a6b0718b SHA512 99854ce5cd08ba7539d9807a1d0f76af5d88671f6d69240eb9295c792e29050f4366319f3890fdbf7c060cbb4d0b90fb064ec146f94ca73d309e22e64392324d WHIRLPOOL 74dac297a358c0d5e71f954c0b564b5c2dec1d65dbdee771c59b890c1e6711e93f385f2fb3d077b6355c421a838919fcd6b6d1ebf8e500da0ae06787d51dfe0d
+EBUILD wine-1.7.19-r1.ebuild 14582 SHA256 ce3578827e8ef7a88ec9df53f8032ea3df14f30a4a8326ed265182dfa5ae04dd SHA512 679d3975fd43e610b96d27346adaa64e8bc99f98f8cd3892bf1c8ff91c42e51a35927a431f56acb9ee54980033505cff6cc6759f94093eae61b8beb24d480bcd WHIRLPOOL 7795d15b6e16ff4c2bcfef877924b352b9a40149945cc42b0ba4b1f48eb4626be250e37f34ce0e8e23539457d471c3ee7b45a625a829ac2a048488e0e2d30265
 EBUILD wine-1.7.3.ebuild 12565 SHA256 d4d42f201a5002b4b9544387d25852cb405f07b2b3aa73eeb10a0cecb803f9fa SHA512 471623eab39c56fa146b033f11101d0146dfaf6af799c0e6bdfc25cf383ac2287a8010fa92c6d1458aa04cc5771d0da0d10d9010755061ab1220955cdaba8d43 WHIRLPOOL d90283e6f9a137b5968f8a0b3a7666442ff1d9386da0faafb78b2de6042712954ea56e802a8e4aa029de2093aca4baa42fc772da7936b5302b5cad2f09b61485
 EBUILD wine-1.7.4.ebuild 12565 SHA256 48459fa1d9211d785b6ce3665d51f619ab2f45c50449a3d6ded5df9f17464ea2 SHA512 6265037bfd2440ffe3a2c0f4f7b281c36edc3207dbd3956da9ce596aa46b3f2ddde65d2f7ab39bc5518fddc980fa8578adb0b0a6d1187cedd710f8a85c7d9432 WHIRLPOOL 27df5ace4d2decef09b780e00ab857922b0e308e912484ffd60b57450d653daf9f254d8e2b594efee223fb96467016349282b59ee6e8eeaaa159998b4d943886
 EBUILD wine-1.7.8.ebuild 12896 SHA256 84904dbdcf3ecf20b67dacf66a9e2c49f5e58bec5e1e9b68e54f1f8712a22921 SHA512 b8d99f97dd6a271b4f3e7d91c6ef44db942db9fbc1e16058235ef2ac379749e8057e18cb8ba2d8060c215015b568e8432f3c11b94e57aaba8a194edf92d570e7 WHIRLPOOL 5d7e52d8311819473b6fc0507394a04bef4cb86bdf80c77f4341d43367a1a5b27c36f93087b48df92241bb00eb93398f593d9ad52ee3cdcac7f1e7372e20ed3e
 EBUILD wine-1.7.9.ebuild 12896 SHA256 1b0432f149e9525e7fc65d97a2f9b2f2aef3b8932cb5b73aa0481936f2e5abe0 SHA512 e59c3e4d7f9a9c290ea3494f90509463e85c37bb1eab7df7706e9bcfa636d9ab3b62ee528ea91dc94b90b8ebe61fafa81b29a371c3b1e7b8da55859a20d7b03e WHIRLPOOL 0eea56d13e09dbdb145cfc798c8f5a4bc507cef5a561ee82a0868fb8ffba0caeb994685b6bc91b47558b2af5fe6ad4ed190c476fe056dece17912950efb73a30
-EBUILD wine-9999.ebuild 14531 SHA256 65bc83f68a13149da7199931b95983af796db4474b0e68d5ff1b8b3b3231f801 SHA512 9e053cf9eae25f7d769c6caadc48bfe7292100e45e55774ba48e15746c071e0b35eecb1661adae2ebc2bdf87d4638da0f8161a28c7591fdc3ed3e7b677a0f0b4 WHIRLPOOL 8069f3bef33db0c3d88bf7844f2e95cb90d4daa6188a2cf808c29e4f01777702300681958ef174aabc7ea6b8d7e0acf4de0f8d613e10291c05c023bedc0fa88b
-MISC ChangeLog 19833 SHA256 d5643b25c2a0213e85040a62eb2b5129b2242a5bd63ffaf64f02f83646c5aa2c SHA512 48cde0872bf955121eb9fd74caeaefc8bb6d52fcd88d629d0da83c19a0e7f916bfbaa41944827286a8ac9f8f05c869a6d33701d3c1aa334b81ff11b22e9cd508 WHIRLPOOL 2b2befbb10617d82698b260edcb45887a77d80bfde0bb829231008557312e2ce061fed9ee4b687b35f9b267d6f4efe4ef0344e252af5b90fecc556bd694f4048
+EBUILD wine-9999.ebuild 14579 SHA256 a21cc998b5fc850575cbd248c270b7633da8920aa1fa2e03e861e4ffd38bfbe8 SHA512 3dff961f5e5aa5de80c0cbb25f26f12ff8c9faba7347afc2d38ad7763b4d3d0e73239d9d1ea3c7dd77da81fae4d0f09c0696754a77a73ad35e5ddb71a879e5ed WHIRLPOOL 320472e0530ad28e03d40d4ad2436a1065fa9f483000629e18b83ad5aea0525ccb6ea8b45018497553830dc30b6849b1ffddb0f80958d87de513938349a1d0d3
+MISC ChangeLog 19963 SHA256 b0fd6e4216f9e418e7d2b18c6586bf1ca4674b94035dda2541ad1d2add269915 SHA512 7c5117d66a60cd975e2b659ac1c8b34438340cc6ffe7694c4f49c7252ce26f37e28cdd5cc6207388cb19fee770a5aae84f8169537fcc38a97a374b54f36c7630 WHIRLPOOL bb97875824cf9415a23414e8d25adbb03d2239c04c73a59371d3af3799bb7605c1fbceedc9dea727f713359515e17536ada74ce697fc053d4bc16f3302c25a7a
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
 MISC metadata.xml 2361 SHA256 f225b49cac75fd5819b57d69269a33580d83982224d237eed598d2b596ad8939 SHA512 30b6f5748c91dd183628a39e4f9a6e6955bc8b97a27b65bcd8b8698dccaad85f4dbc37981d8080639387d5ae5171cb7685addd686abfefc2d74a9427533c181c WHIRLPOOL 1aeac34fa080dc115d8489e7937c5e06edb5f717f72fa98c10420088a94844fa34952d16976d7af69651dcc02b73e74a589c936926c2b686ebb1a429e6111bad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTf877XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTgh6+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyxMP/1nHgmcVvWLjodisQEWrxJNf
-nN5oNvR9WIJhwSuAcv1pvE/sKcHv3DySfNQlL74+RMsdS/2EzYyfp8+AlJD+RkGN
-py/rR6AAl/CUijKmG7aEKq5BPxAFU6djLZ8HUPlaX6LWweJFk72Mq86nvTW6PjD0
-NEYr01QvJLgMqYVlS7YppfyUd7izitYB7zkFoA1Lp/qVYRvmrY5zNemEM/4+GXhb
-10XxEqdKjtWlXkiTlOCtEPA2MNhRLbDqy83VwXg6axHK97zO++hKkxLUsLsgCIBy
-jtAohOMbdVoz9WhYjAkLUiFu0FAP5Bgh4qE1d38DSddoom0jjykBsGl+NcxS0LlA
-VRRG3Y7BSyKfEFq3gA9oNnJRtrACsmlPicvRuE7/pJQrnhZ4Wf9K1rF6UNZMt8TC
-V5a4vbxKG+1OMJs/ql0jvRlbW/pQEHgQtOTW+0W4Nq99/u0lyja65xS3NguXoJ2s
-6FukNqqmUC1sph5hrz8AVvwhni6o48XPGjqYXa5c2pOqN8JbZxhBjd/E54uy/CGs
-/IWuvKm5tSlQndPqpwNmcfEIppU0iFe5HhUSYS0GtkfCdsdnN8/fhT3LxaKEuAB+
-+Iu3SHM+9+Af8VaULIj3B7XRO0ilAISep+1LJt6rcTsYKB0uso8N1UgJNNxC5z5+
-CVwOcKB39ozr+LwV29dC
-=391Z
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLWUQAMgevY42ABJgk/wLGbLWy+A5
+AQhMU0amBRARx8ZjZnJnxradYczM4nUJwxuxbmOL5kMi6MWLBMisRIKO3VGjRivh
+8wxU0UsEH8wRG6Tgoi/tds7J5LpVmEXxPArkFu/jy+Mhwndd+ur243HDKUmnMQ1h
+ACkJgDaqDGD0D/OL4EilzW4rQDKa2gkVrAIlKCibVxkFIQqy5vYJTnR/B6FdeDuU
+qfaGZf/3t5QH6ZS7Exl9s+ZOoAs74izltcB32w129YmsoMmZdumbaWVMudfT5Sgm
+5pewmH44qX871f6WHZlwzRBZzAbWNl8JLJz3M5cpG+Mzy6JkNoR0DKd0ths9TWlS
+3ceLGs+GSAcusX+3pzuuZ73+WVcOEvW+2G2xL21j/nkeRTwX0CPKo0INIIaWo0xo
+VjRbjkEJ7SxSrPBzNwvkxkKb2D4qTT5G/PLUY61gsvoO4p3iBISTsA92TDjEm1wQ
+40vNmvcSnF2pzLoyHok0JdijAd1Q6L76FXpx7CbES2umRFGiF3Q+iQ6PSqrbR/RF
+06KsVS3ATrD4tzt7yKo8qy77mF/zJWIyWayyFg6KggIGqoaVeFfD3oV+1LuGHmpp
+tERMvvKxbOZYRR6xKdDpb0Y4g/+ZPtvI4l+MmVJpzLCkrpM4SMTjBBZIQKdejUYT
+9e4ts1yeoEopMjrqXP6n
+=XeBa
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.7.19-r1.ebuild b/app-emulation/wine/wine-1.7.19-r1.ebuild
index d97cb9de5efe..579dbaa5da06 100644
--- a/app-emulation/wine/wine-1.7.19-r1.ebuild
+++ b/app-emulation/wine/wine-1.7.19-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/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.2 2014/05/21 19:37:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.3 2014/05/25 16:47:55 mgorny Exp $
 
 EAPI="5"
 
@@ -182,7 +182,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-baselibs[development]
 				sys-devel/gettext[abi_x86_32]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development]
+				dev-db/unixODBC:=[abi_x86_32]
+			) )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
 				media-libs/mesa[osmesa,abi_x86_32]
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 5b0673334df2..0e526b12b883 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-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/app-emulation/wine/wine-9999.ebuild,v 1.167 2014/05/23 22:43:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.168 2014/05/25 16:47:55 mgorny Exp $
 
 EAPI="5"
 
@@ -182,7 +182,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-baselibs[development]
 				sys-devel/gettext[abi_x86_32]
 			) )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development]
+				dev-db/unixODBC:=[abi_x86_32]
+			) )
 			osmesa? ( || (
 				>=app-emulation/emul-linux-x86-opengl-20121028[development]
 				media-libs/mesa[osmesa,abi_x86_32]