mgorny 14/06/25 13:28:12 Modified: swordandsworcery-1.02.ebuild ChangeLog Log: Support multilib dependencies aside to emul-linux-x86. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.5 games-action/swordandsworcery/swordandsworcery-1.02.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild?r1=1.4&r2=1.5 Index: swordandsworcery-1.02.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- swordandsworcery-1.02.ebuild 15 May 2014 16:25:05 -0000 1.4 +++ swordandsworcery-1.02.ebuild 25 Jun 2014 13:28:11 -0000 1.5 @@ -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/games-action/swordandsworcery/swordandsworcery-1.02.ebuild,v 1.4 2014/05/15 16:25:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild,v 1.5 2014/06/25 13:28:11 mgorny Exp $ # TODO: unbundle liblua-5.1 when available for multilib @@ -26,11 +26,54 @@ RDEPEND=" virtual/opengl amd64? ( - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-opengl - app-emulation/emul-linux-x86-sdl - app-emulation/emul-linux-x86-soundlibs[alsa] - app-emulation/emul-linux-x86-xlibs + || ( + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ( + dev-libs/openssl[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + !bundled-libs? ( + net-misc/curl[abi_x86_32(-)] + ) + ) + ) + || ( + app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] + ( + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] + ) + ) + !bundled-libs? ( + || ( + app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] + media-libs/libsdl[X,sound,video,opengl,joystick,abi_x86_32(-)] + ) + ) + || ( + app-emulation/emul-linux-x86-soundlibs[alsa,-abi_x86_32(-)] + ( + media-libs/alsa-lib[abi_x86_32(-)] + media-libs/flac[abi_x86_32(-)] + media-libs/libogg[abi_x86_32(-)] + media-libs/libsndfile[abi_x86_32(-)] + media-libs/libvorbis[abi_x86_32(-)] + media-sound/pulseaudio[abi_x86_32(-)] + ) + ) + || ( + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + ( + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXtst[abi_x86_32(-)] + ) + ) ) x86? ( dev-libs/openssl 1.4 games-action/swordandsworcery/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/ChangeLog?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/ChangeLog?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/ChangeLog?r1=1.3&r2=1.4 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ChangeLog 15 May 2014 16:25:05 -0000 1.3 +++ ChangeLog 25 Jun 2014 13:28:11 -0000 1.4 @@ -1,6 +1,9 @@ # ChangeLog for games-action/swordandsworcery # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/ChangeLog,v 1.3 2014/05/15 16:25:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/ChangeLog,v 1.4 2014/06/25 13:28:11 mgorny Exp $ + + 25 Jun 2014; Michał Górny <mgo...@gentoo.org> swordandsworcery-1.02.ebuild: + Support multilib dependencies aside to emul-linux-x86. 15 May 2014; Ulrich Müller <u...@gentoo.org> swordandsworcery-1.02.ebuild: Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to