summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-12-04 19:54:31 +0000
committerMichał Górny <mgorny@gentoo.org>2014-12-04 19:54:31 +0000
commit64a7c04da1ed9e58d41bb390cd2b990575a594a7 (patch)
treea72a7204c6917f761239a49cc521c716181a99aa /media-sound/apulse
parentQA: Replace unnecessary, blocker-causing alsa-plugins[pulseaudio] dependency ... (diff)
downloadgentoo-2-64a7c04da1ed9e58d41bb390cd2b990575a594a7.tar.gz
gentoo-2-64a7c04da1ed9e58d41bb390cd2b990575a594a7.tar.bz2
gentoo-2-64a7c04da1ed9e58d41bb390cd2b990575a594a7.zip
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.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'media-sound/apulse')
-rw-r--r--media-sound/apulse/ChangeLog10
-rw-r--r--media-sound/apulse/apulse-0.1.4.ebuild6
2 files changed, 11 insertions, 5 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 <mgorny@gentoo.org> 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/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(-)]