mgorny 14/06/25 13:22:30 Modified: solar2-1.10.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.7 games-action/solar2/solar2-1.10.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/solar2-1.10.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/solar2-1.10.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/solar2-1.10.ebuild?r1=1.6&r2=1.7 Index: solar2-1.10.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-action/solar2/solar2-1.10.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- solar2-1.10.ebuild 15 May 2014 16:24:45 -0000 1.6 +++ solar2-1.10.ebuild 25 Jun 2014 13:22:30 -0000 1.7 @@ -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/solar2/solar2-1.10.ebuild,v 1.6 2014/05/15 16:24:45 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/solar2/solar2-1.10.ebuild,v 1.7 2014/06/25 13:22:30 mgorny Exp $ # TODO: - unbundle libmono for 64bit # - unbundling libSDL_mixer breaks the game @@ -30,9 +30,36 @@ RDEPEND=" virtual/opengl amd64? ( - app-emulation/emul-linux-x86-medialibs - app-emulation/emul-linux-x86-sdl - app-emulation/emul-linux-x86-soundlibs + !bundled-libs? ( + || ( + app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] + media-libs/libmad[abi_x86_32(-)] + ) + ) + || ( + app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] + ) + || ( + app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] + ( + media-libs/libsdl[X,sound,video,joystick,abi_x86_32(-)] + !bundled-libs? ( + media-libs/openal[abi_x86_32(-)] + media-libs/sdl-mixer[flac,mikmod,mad,mp3,vorbis,abi_x86_32(-)] + ) + ) + ) + || ( + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + ( + media-libs/flac[abi_x86_32(-)] + media-libs/libvorbis[abi_x86_32(-)] + !bundled-libs? ( + media-libs/libmikmod[abi_x86_32(-)] + ) + ) + ) ) x86? ( media-libs/flac 1.6 games-action/solar2/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/ChangeLog?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/ChangeLog?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/ChangeLog?r1=1.5&r2=1.6 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-action/solar2/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ChangeLog 15 May 2014 16:24:45 -0000 1.5 +++ ChangeLog 25 Jun 2014 13:22:30 -0000 1.6 @@ -1,6 +1,9 @@ # ChangeLog for games-action/solar2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/solar2/ChangeLog,v 1.5 2014/05/15 16:24:45 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/solar2/ChangeLog,v 1.6 2014/06/25 13:22:30 mgorny Exp $ + + 25 Jun 2014; Michał Górny <[email protected]> solar2-1.10.ebuild: + Support multilib dependencies aside to emul-linux-x86. 15 May 2014; Ulrich Müller <[email protected]> solar2-1.10.ebuild: Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
