diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-25 13:22:30 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-25 13:22:30 +0000 |
| commit | 5c8e43042f926fbb7fca0fbd2cfc8d83ca1aa84c (patch) | |
| tree | 5396bafc674f7c81d384f43afd64dce6d432605e /games-action | |
| parent | Support multilib dependencies aside to emul-linux-x86. (diff) | |
| download | gentoo-2-5c8e43042f926fbb7fca0fbd2cfc8d83ca1aa84c.tar.gz gentoo-2-5c8e43042f926fbb7fca0fbd2cfc8d83ca1aa84c.tar.bz2 gentoo-2-5c8e43042f926fbb7fca0fbd2cfc8d83ca1aa84c.zip | |
Support multilib dependencies aside to emul-linux-x86.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'games-action')
| -rw-r--r-- | games-action/solar2/ChangeLog | 5 | ||||
| -rw-r--r-- | games-action/solar2/solar2-1.10.ebuild | 35 |
2 files changed, 35 insertions, 5 deletions
diff --git a/games-action/solar2/ChangeLog b/games-action/solar2/ChangeLog index 1187046dfba7..b20f278bc794 100644 --- a/games-action/solar2/ChangeLog +++ b/games-action/solar2/ChangeLog @@ -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 <mgorny@gentoo.org> solar2-1.10.ebuild: + Support multilib dependencies aside to emul-linux-x86. 15 May 2014; Ulrich Müller <ulm@gentoo.org> solar2-1.10.ebuild: Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to diff --git a/games-action/solar2/solar2-1.10.ebuild b/games-action/solar2/solar2-1.10.ebuild index b512fbe622eb..a6ae6c5e492e 100644 --- a/games-action/solar2/solar2-1.10.ebuild +++ b/games-action/solar2/solar2-1.10.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/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 @@ QA_PREBUILT="${MYGAMEDIR#/}/lib/* 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 |