mgorny 14/12/04 20:15:04 Modified: apulse-0.1.4.ebuild ChangeLog Log: Update the dependencies to support emul-linux-x86 alongside multilib. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.3 media-sound/apulse/apulse-0.1.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/apulse/apulse-0.1.4.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/apulse/apulse-0.1.4.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/apulse/apulse-0.1.4.ebuild?r1=1.2&r2=1.3 Index: apulse-0.1.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/apulse/apulse-0.1.4.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apulse-0.1.4.ebuild 4 Dec 2014 19:54:31 -0000 1.2 +++ apulse-0.1.4.ebuild 4 Dec 2014 20:15:03 -0000 1.3 @@ -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.2 2014/12/04 19:54:31 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/apulse-0.1.4.ebuild,v 1.3 2014/12/04 20:15:03 mgorny Exp $ EAPI=5 @@ -15,17 +15,21 @@ KEYWORDS="~amd64 ~x86" -DEPEND="media-libs/alsa-lib[${MULTILIB_USEDEP}] - dev-libs/glib:2 - !media-plugins/alsa-plugins[pulseaudio(-)] - amd64? ( abi_x86_32? ( - || ( - dev-libs/glib:2[abi_x86_32(-)] - app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] +# Tricky stuff, we want to support both gx86-multilib and emul-linux-x86. +RDEPEND=" + || ( + ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - ) ) -" -RDEPEND="${DEPEND}" + amd64? ( abi_x86_32? ( !abi_x86_x32? ( + dev-libs/glib:2 + media-libs/alsa-lib + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + ) ) ) + )" +DEPEND="${RDEPEND}" MULTILIB_CHOST_TOOLS=( /usr/bin/apulse ) 1.7 media-sound/apulse/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/apulse/ChangeLog?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/apulse/ChangeLog?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/apulse/ChangeLog?r1=1.6&r2=1.7 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/apulse/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ChangeLog 4 Dec 2014 19:54:31 -0000 1.6 +++ ChangeLog 4 Dec 2014 20:15:03 -0000 1.7 @@ -1,6 +1,9 @@ # 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.6 2014/12/04 19:54:31 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/ChangeLog,v 1.7 2014/12/04 20:15:03 mgorny Exp $ + + 04 Dec 2014; Michał Górny <[email protected]> apulse-0.1.4.ebuild: + Update the dependencies to support emul-linux-x86 alongside multilib. 04 Dec 2014; Michał Górny <[email protected]> apulse-0.1.4.ebuild: Replace pulseaudio blocker with alsa-plugins[pulseaudio] blocker. The former
