summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-12-01 09:45:19 +0000
committerMichał Górny <mgorny@gentoo.org>2013-12-01 09:45:19 +0000
commit3f3d9f0a1be46574e268050f920b8b5d940a2599 (patch)
treeb2b8ccc23839f579d086f4fed918039f1b5b2642 /app-emulation/wine
parentAdd USE=pulseaudio to disable PulseAudio support on multilib variant. (diff)
downloadhistorical-3f3d9f0a1be46574e268050f920b8b5d940a2599.tar.gz
historical-3f3d9f0a1be46574e268050f920b8b5d940a2599.tar.bz2
historical-3f3d9f0a1be46574e268050f920b8b5d940a2599.zip
Support multilib pulseaudio aside of emul-linux.
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'app-emulation/wine')
-rw-r--r--app-emulation/wine/ChangeLog6
-rw-r--r--app-emulation/wine/Manifest28
-rw-r--r--app-emulation/wine/wine-1.7.4.ebuild9
-rw-r--r--app-emulation/wine/wine-9999.ebuild9
4 files changed, 37 insertions, 15 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 1fa7d6f53b8a..75c0a91ecfba 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/wine
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.485 2013/10/15 18:03:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.486 2013/12/01 09:45:09 mgorny Exp $
+
+ 01 Dec 2013; Michał Górny <mgorny@gentoo.org> wine-1.7.4.ebuild,
+ wine-9999.ebuild:
+ Support multilib pulseaudio aside of emul-linux.
15 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.6.ebuild,
wine-1.7.0.ebuild, wine-1.7.3.ebuild, wine-1.7.4.ebuild, wine-9999.ebuild:
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 28abdaae779c..4ad9262c321c 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -133,19 +133,27 @@ EBUILD wine-1.5.9.ebuild 7230 SHA256 817512124347085810db9c0528cbeffce07e2cc1ec5
EBUILD wine-1.6.ebuild 12643 SHA256 2c99b3d3ada5721969b7fc85af69b795497f96ef72ddfa4ad20e0acbacd920ec SHA512 6db088b339aa4a64f834c99deda6bf3ab599fe0aa25a70521168ecd17741f9e7168fc4e470448dd6f5dde61c22179b59649be89c04728d474ff69ef2d43d19a0 WHIRLPOOL 1d8da652577646133f26b259c8d871f414f437180ba81d5e67cf5db36dc831ba3513eced8de8bdb6447c74248decd4336e9a8e0f3ecee1dce8006f5e8d7898db
EBUILD wine-1.7.0.ebuild 12562 SHA256 b060d125bdbc4aaedb6290f5271f3eddb45970c7814a007669c3311afa2d8262 SHA512 2714e9f4ceb9225e69cc6318541fafaef91179c7f1be4d3dcfef949490b25051fca4d0992df9d8dd9796e831b65fcf46275d839e6dbc93130e2d88813db0ffff WHIRLPOOL 9d502249055bdb68e1e630b88a299bd059f1beae18ca6e46f4ba59edb12bd3009e7b393550aa8bea8231651c6a072946c8a6357d3a3ad1ae99a2bdd54e6aff73
EBUILD wine-1.7.3.ebuild 12564 SHA256 9fa4e02b7f5d5e261c042860993e875bd90355b984d47271d93a6974f7ca50ab SHA512 b9984e8fd0bd422425bdc24c9f3e3e00aa76989389a8bab9969617a472c780a693f5e1fc9537fa6cdfc9c215f6000d8308c49617a34c3f7e8e71a1b6e7ad9360 WHIRLPOOL 14f975ee68b970150ce4681db6b34fbb1c59d369d7895448fc3a7529abe35dfcb5bccc1bb357122035e3974dff217201c401262d3a0b0e333f6c5714305e2d1b
-EBUILD wine-1.7.4.ebuild 12564 SHA256 73b5e4bda4a81141f8eb2ddcb2624659d5a8c238760a6af084f6eba822f71b61 SHA512 11750a03a203a653763e612d7610ecbbd5a92ebe01a19642d1b72ebc30f37f8a78ade81f71131128c43d70287a77bb3478eb1c1222171154bca6fe58b033313a WHIRLPOOL a7e33e7fef0711d5f7b61a9f34b229bcaff395673d6e9f876d8a3d9f109a74f5b202bbbe597ef52c47652aa8dfba7b1646afd9e68cb85f436ab81a58f3ce533a
-EBUILD wine-9999.ebuild 12565 SHA256 cbdfad258062a9b15be420a1b3eab626500f1f84cbe6199e0cf66e812ed0bef3 SHA512 b8f448cc08301950f1aafaecb928630e393b6627b5546c28e1b4e6e04efa3dd3b3ae67547780469fd1f05258b06c673f2d427a626194054e364368d659d0b6da WHIRLPOOL 9ab48b1ff632ce7568d78d047c3c4906a5dd6ac321f0e961ff7298ecac558f3356d2456ef01429bdc2cdb409b95724c9c6adad81c58a07617c5cf4b8c4601798
-MISC ChangeLog 14806 SHA256 da9064201c8ddce20751e826ab8d0cc5406b43c967e0cb2d6caa43e9a99636ad SHA512 7bc26e83f393d4328e144078fc66e9f3f9c13f3a9a0e14a870031daaa61fcb25c30947109cef80735be67502d1dba4be3f4587236fdf7891d17d0ec715cf350e WHIRLPOOL f898498a727bbb7bff5a008690d4974c33129af0340d4f9df580a7bf8f0be650d6ce08f2431d345df8c14d189de453d8fd2488c5f38d5d7358b4795aae2afe54
+EBUILD wine-1.7.4.ebuild 12623 SHA256 bfd515e4c98ac0ab01106e71b0182d3e832e62feb02ee0b940c191f660969a66 SHA512 69e50cdfd5195f13ded1c3799365794b946ac80cc8f902560258851e36152d639410cf6851d455e995df487f08cfdb5022000c7b27e59eece7a7d90385f229c4 WHIRLPOOL c3b1ec3503b17a0db7dbe2f2e4ca5dc2318ee4192e250a65704d1394defc4a25a2baa5cffe5cc54888c271a4bea38451f680fd3d98bee05783133fdc6c60cd42
+EBUILD wine-9999.ebuild 12624 SHA256 6b04457d96b8689025e152c0b762c18410f04700dabab0fa0ff1607bfa1cddf1 SHA512 402daa322e2ca30d5c865b9a86cfd9436e7938f544a11675783e17497752dd9676356af8a8badf32ff3b74c295da762b118e2588a5b5447eb1f3aa36486fe925 WHIRLPOOL 0193d90d62e4cc88428b84f97ecf545d3872fffb88ffe029e80bc9ade8bc9a095fad718ccc1bf2b952000670b31636079deb50a3578dc1c90f2bd1418c78ac3e
+MISC ChangeLog 14944 SHA256 0fce9c4dacf2780e60391d7c47a2882d5eb30b2a61fd5705f098ec097e41c12f SHA512 2ada41743ae14a9d996b4d0688e4888a311a51e49649f90043a57a2f648f7aeec91e31b48fa82bac74dad48bed9f31144745e4967d3d22429646e89c0143f3f7 WHIRLPOOL 98ca7007e34135c4c6c30ab98ba6741bbfdda9d4e9703ef98bf092038dfd4791de4ffe9e5fbfc1bb0589bf04fcd97362cd8cd92570f7b672d9142bd6e432f1f3
MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
MISC metadata.xml 2121 SHA256 89e8b63b2f497296c3c9728a03afcfbc65b234d64b8109aabb6d61aa75c1534e SHA512 f08d378bded55681c85067aafa352b81f2efd269f8e061f106ab9cfa9d2698255480ee85c3ff58f58670e0b7980d4ecb2bf9ec18c4d199e915cb4cae80caf930 WHIRLPOOL 6bdd7b61d48b1aef4263ad76faf3b137aa0a9e9d4bdc803d859478cbc8215d59c11c0a907eb40832a3ec4cbb5e19f25920e39c54019c9a69dbdc4b6fadda6c64
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJSXYNeAAoJEJ0WA1zPCt1hOmgIALAabEi21V9dCd3aGg0DBxm8
-/S0vkKtBPDLNnYnZeqZ2dFT1sJpuHWi1XijU6IS0WH1pN4p9S6HUqOiXGH/eU8Mv
-je2tYyIgU57Uk8GKWqa97R5j31PO5zYWzfRWd+TXZTxN8nAUO96b2NS9zFNzmH3w
-15M6HB04Rhp1AAVtnRMQzkfhcjMjJZToeNwtZbcGOnIt030dNnM9yH/RghJcfxVi
-NqmxOHszUOBEQu7PUmxznxu2Ch6P7mg3hrXzMLddoq8IMkttHyMJlz37UEY+CFWQ
-bzrmnFqxnKD9Rz1XJO6v8VyQtTjr5sT7xaLw/5EtLDm6UyP2HPy4zldw1nWqqr4=
-=3Wmz
+iQJ8BAEBCABmBQJSmwUuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjFYQAIUxCByEY965lBjWPEFNIolT
+0MPkqFrkCnWrzGxOwoxnIq9a3zQ7vDno5liKER3yRzvIK2tAxmyIj46K0Rjergej
+Fv+qHZB8bLCIrMwc62HDdnBvjTBo0jbDT3u6UevQMCtnmOBxi32osEYRlpnGVrb4
+M5lVjiRqiDzBhmmG39tydqLeO0dMMCCbk8AvYfsdodbyAU3MKY7CHN2FkjX6nZ1G
+3nWnWZE8QevQVAso89OyTGJEuXPsh0FVztPTcnIZj6Z2Dtqf9X6P1JpLUfLqFO7i
+6VnQMwidOlO1PyxzM+tOsOxE/Hdtep07tMwc4jcCUdYF7hEuZbf6sUFy/qrcG/El
+ih8onNRvIc/W95EOmsMB8IBlJcf9zZAaVJ6BuCtBzNwiXQICZnJOxwQdb62luRrM
+nAjcXTd6X9NELJFKXVoQ9eox4DDQMuTj+dcR4Q5Iy8CsnAIuQSdOO83iUrMIJ2Ye
+Wj1l9xxnmK1/e3sLhAbJO70Vfl7+MUR0AdX1jxaRIOTLseCYplNOumZodo7fgf4O
+s9rlHzAFB6c8rcySruRXteDY6zoPjKCAWO1qgOsHHby6thEHLxuWUXsLUXuD1zmF
+wzw2a87sCnXxd2VkaIjtTfU2vLxY7o1OZlMGe1Ve7Y8AFgxbSxFR/D5oUizNY/fV
+0+VUqK9lJfNk7ZqK6wUO
+=cbfb
-----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.7.4.ebuild b/app-emulation/wine/wine-1.7.4.ebuild
index d0fc2c894a83..21444eedd679 100644
--- a/app-emulation/wine/wine-1.7.4.ebuild
+++ b/app-emulation/wine/wine-1.7.4.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/wine/wine-1.7.4.ebuild,v 1.3 2013/10/15 17:53:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v 1.4 2013/12/01 09:45:09 mgorny Exp $
EAPI="5"
@@ -189,7 +189,12 @@ COMMON_DEPEND="
)
)"
[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND}
- amd64? ( abi_x86_32? ( pulseaudio? ( app-emulation/emul-linux-x86-soundlibs[development] ) ) )"
+ amd64? ( abi_x86_32? ( pulseaudio? (
+ || (
+ app-emulation/emul-linux-x86-soundlibs[development]
+ >=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+ )
+ ) ) )"
RDEPEND="${COMMON_DEPEND}
dos? ( games-emulation/dosbox )
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 815842c26bfa..0c4711942b2b 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.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/wine/wine-9999.ebuild,v 1.157 2013/10/15 17:53:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.158 2013/12/01 09:45:09 mgorny Exp $
EAPI="5"
@@ -189,7 +189,12 @@ COMMON_DEPEND="
)
)"
[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND}
- amd64? ( abi_x86_32? ( pulseaudio? ( app-emulation/emul-linux-x86-soundlibs[development] ) ) )"
+ amd64? ( abi_x86_32? ( pulseaudio? (
+ || (
+ app-emulation/emul-linux-x86-soundlibs[development]
+ >=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+ )
+ ) ) )"
RDEPEND="${COMMON_DEPEND}
dos? ( games-emulation/dosbox )