From b1162ade9d08212ff06cb82fbcbd2933b0726075 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 4 Dec 2014 19:54:32 +0000 Subject: [PATCH] Replace pulseaudio blocker with alsa-plugins[pulseaudio] blocker. The former does not really make sense since apulse is installed in a prefix, and does not collide with pulseaudio. However, the pulseaudio ALSA plugin is definitely going to cause issues. Good news is that we do not need to block emul-linux-x86, since configuration files enabling it are installed by alsa-plugins. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- media-sound/apulse/ChangeLog | 10 +++++++- media-sound/apulse/Manifest | 32 ++++++++++++++------------ media-sound/apulse/apulse-0.1.4.ebuild | 6 ++--- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/media-sound/apulse/ChangeLog b/media-sound/apulse/ChangeLog index 0d32225d634f..c1e9fe1c6fd6 100644 --- a/media-sound/apulse/ChangeLog +++ b/media-sound/apulse/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-sound/apulse # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/ChangeLog,v 1.5 2014/12/01 15:59:48 jauhien Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/ChangeLog,v 1.6 2014/12/04 19:54:31 mgorny Exp $ + + 04 Dec 2014; Michał Górny apulse-0.1.4.ebuild: + Replace pulseaudio blocker with alsa-plugins[pulseaudio] blocker. The former + does not really make sense since apulse is installed in a prefix, and does not + collide with pulseaudio. However, the pulseaudio ALSA plugin is definitely + going to cause issues. Good news is that we do not need to block emul- + linux-x86, since configuration files enabling it are installed by alsa- + plugins. *apulse-0.1.4 (01 Dec 2014) diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest index 369dbbed9663..e0858ed805fe 100644 --- a/media-sound/apulse/Manifest +++ b/media-sound/apulse/Manifest @@ -2,23 +2,25 @@ Hash: SHA256 DIST apulse-0.1.4.tar.gz 99976 SHA256 717bc537c389af546b4db2ed7622a8896f7f0f306612c9eb6c693a70c104c86f SHA512 500abca0f6b4df35acb417744a5967e58ceff8cc2a0d640db03847d79b077295abe8888ee5d0008383349bd964345a340334f39e1f55286713db94a86c6596dc WHIRLPOOL 7fe604ed3128cb24d375f4f84ee77317fd499202d8bf46f9c68735501b35a55050852d08260b2c4ad0419ac32a3d330946c65aa402b9b66dbf6d25c3a92966bb -EBUILD apulse-0.1.4.ebuild 1023 SHA256 5044641149177714e9e4d18d216b44bebc6d9c6a8bd5fc3cd6b5b5c1db9d93d3 SHA512 04fd7aa556542e9f8f5bf17e46edbe771e0514e9f60569d314e01ec34c0ac07e0ebfed3cc185cfb90da53637990b617d430e55ca756a837b7a0b99cbb458729f WHIRLPOOL 43153a6ead7c88bc9aa581f9cfd92e453b78c096ceb4929ac3a38bc9f790ee9ebfff73def3df16592fd9c4a470370fcde96b9c070177f6dc96be9c9a9907aa9a -MISC ChangeLog 1237 SHA256 5e6dd6e6b0959ca48ec708b2ffe1ae4d90e370199a02eb4d54542c94fcd37a12 SHA512 b6eeb03d85f927646f0b7813bd1433f5bb0e7a1fcf4e652a136f43c8a682352dedd63a255d92f1e217caceecda4a6b30bee8136cc09638babf6300550d5358a9 WHIRLPOOL d747de811376598ea1a5203f7621fe2424bfe081d638758e93577cc8df511e858f8978e15b4727c589a3da3c745b8c64de42c9f31fcd074bc981cbdf667bcebc +EBUILD apulse-0.1.4.ebuild 912 SHA256 306a77331cb30cb1ec1acaa6e99ff06b79afc42de4d51df1608a774a62caf37a SHA512 baa0eb92705ee65c947c4441b573d259e18390b73d1e10b4f48275ad85dbd84784888522ce3712eae703d582d511d6e7f60f66be2875227495d94b48838c8be7 WHIRLPOOL 8d9a3ec2618c6b02c98c31aad3318eab9f8940524d020b57b92eea3e663c6cf19c35d5182f70269a2c1f03be8a89340dbcc92074f552c9790da2e823939e8570 +MISC ChangeLog 1703 SHA256 24c1656b1b959f67182beaefe699abcc38c7a7916b7da24b51c88d2fc9e5f8c2 SHA512 38218d0bfe75d77a04d041a254823c15d3e7ff560017b359b4e07c9c6a584f1994d1e1f33eb0944b7a940fae35e71e3cb2fcc6e1376eb07e4b1547a0d1b122f4 WHIRLPOOL 5e6b7bf4a2cd9c4b1b00f89bbe1a61a70e68dfa5f79af05eddf5932bba4bd74344209690e9fdb394a48e8c94a9c0b6ef10f33451e3e0e9b26f5e6f31adb6b2d5 MISC metadata.xml 202 SHA256 66924d1d7f45f552c62ec96ec663c0af1c93a721ab42ee8f13ddb36bb5d0ae35 SHA512 3f45e8572f4ebed4c3fa9cec5d0f440b0316939f57866bc245e5fe95532c5aa260debaae7fa8bbfda83fd56b609d8fb0c11717325a8f0d6abd4dd2e21c6b4f07 WHIRLPOOL 517078266cdd2f27f28acc76d2ab6620c4a9bdc018119feaf451c79fcf4ba6cceef9d95ac85e18db29503805b58c99415eec802609307221abd8635ecf200f79 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUfJB+AAoJELvuk32y76HUj4YQAIZ+sY9FcYGb52aNZXZbRlqY -VESf83B8yT7FsR+yf+/y3TwOE/2yvAG3caqLl/iq6nGzaM8j36Bd6dh59r4cepSQ -vgRvUVnMnoCWai9D7DW6DmSryKMUO5XvQDYmoUBf2YLd0wKNKl3TebasTgjFByh6 -cdMcIR6B7aOL8xC3jn2m5/Pb48uN+Ap7iwRbucR+qES7LaoJDktMAOSNlz6/2njy -JN/NCGpVXOrewcOrQiakrv97/gB5T9J5aoD1hcoxQfxr4GpBr3+8bXnQ1+t6UdWe -MnSZI/gcHX+7SOZPnKyHbhaac8+j1POqdvqFHEEY+28aO7TBMIh0VHnlZan2ci/b -Y4xo6GR5s6YitQkJnDEmk0IadeDHYkIPTr+lTN06wXrRxKY+/c5K53VqqhUPiWqc -ptfHXc74uxlfiXQX1kuhKvm6mEAtjq66zR8hUuVt4q69GHWlw27YhzAUHDLdZC/M -JIE7MrRNSYMr4uqHgdBxOHSmOEu9E8dM0TMCzG8inFWs2fi6ya+vqryxsnE5xUP9 -FlzqDPn+vKPgADwEEQOeNTcj42Vp0J8ybyMcZUnYPTWsTSHUC/s5LPlyMQpJbisH -3FOtAxCir3I0qlePLvJMQIBF0YoaicTnGExDmrWWMW0cf8aKQzWl60X7+uLYiLp/ -NBZ5wYGeExgMb0+t9jc6 -=3oqs +iQJ8BAEBCABmBQJUgLv4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOQYQQALDLPc68Y1scQ1GqF+K/r5Hw +X1eSjL5rn3wVdsH/N0wbWyACLyVPzeOnUMjvZGgAzl5mtpPPZVuKCv4NkmqI6rHB +N6YyBWWjQR4ZGDOnjd/XEdHeVVOVMjS7ZsrVYH2iLg5ZvbZJyV4zijGFjZu//+9m +VnhBd92pA3ftHw4dui8YyP4Nkuxlw+w/KJg/EgcUd49Xvb5iEqHJ/NHFaCBHYsUT +x8Zxfllei1ZHic9PMF0DERnZuhzPPhNtyj14USlQhn0fw6NPrlczBR33hka4s6DW +68s/jW98SvwKhy1YX3+Tr9hSzsUWnq7akeWs+TtGSfQP6lupQJ8Js0c3EEz3NNoP +Ey0BsXk6teXadUUIPVSeN5fXdYFrRF3+0M2qMHxtKh6GJmF3XyvjxM3X4pryZ8gm +jNuzkVX8AITdzup++zfoFhRcQ9czcfLKXiUqf5/IOn4RPNRSjZlfKb5PCu1HqHvI +DFW6+up59lkpMOTRbk8PiLRCRjAkTLBNu4zGSxNndLXGsLSZFOlQyOMGUOxBrvtq +h63EbRax+2J6TP85AEkcCgXqkaMCXQy5571FhWXsLfGpDItRO/z/lFVN3PvF3oRq +TjqwVDHwY0RG0DOdR+uSNyrz/xlwn6xZgvbh2GggReTWnj4ALJrJHBV08aHOvh3S +wsZGbChywhc9zPrrmcGs +=fZq4 -----END PGP SIGNATURE----- diff --git a/media-sound/apulse/apulse-0.1.4.ebuild b/media-sound/apulse/apulse-0.1.4.ebuild index 404eec7f5426..7fff5101d21c 100644 --- a/media-sound/apulse/apulse-0.1.4.ebuild +++ b/media-sound/apulse/apulse-0.1.4.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/media-sound/apulse/apulse-0.1.4.ebuild,v 1.1 2014/12/01 15:59:48 jauhien Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/apulse-0.1.4.ebuild,v 1.2 2014/12/04 19:54:31 mgorny Exp $ EAPI=5 @@ -17,10 +17,8 @@ KEYWORDS="~amd64 ~x86" DEPEND="media-libs/alsa-lib[${MULTILIB_USEDEP}] dev-libs/glib:2 - !media-sound/pulseaudio + !media-plugins/alsa-plugins[pulseaudio(-)] amd64? ( abi_x86_32? ( - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !app-emulation/emul-linux-x86-soundlibs[abi_x86_32(-),pulseaudio(-)] || ( dev-libs/glib:2[abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] -- 2.26.2