Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-action/solar2: solar2-1.10.ebuild ChangeLog
Date: Wed, 25 Jun 2014 13:22:39
Message-Id: 20140625132230.B3EE12004E@flycatcher.gentoo.org
1 mgorny 14/06/25 13:22:30
2
3 Modified: solar2-1.10.ebuild ChangeLog
4 Log:
5 Support multilib dependencies aside to emul-linux-x86.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
8
9 Revision Changes Path
10 1.7 games-action/solar2/solar2-1.10.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/solar2-1.10.ebuild?rev=1.7&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/solar2-1.10.ebuild?rev=1.7&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/solar2-1.10.ebuild?r1=1.6&r2=1.7
15
16 Index: solar2-1.10.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/games-action/solar2/solar2-1.10.ebuild,v
19 retrieving revision 1.6
20 retrieving revision 1.7
21 diff -u -r1.6 -r1.7
22 --- solar2-1.10.ebuild 15 May 2014 16:24:45 -0000 1.6
23 +++ solar2-1.10.ebuild 25 Jun 2014 13:22:30 -0000 1.7
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/games-action/solar2/solar2-1.10.ebuild,v 1.6 2014/05/15 16:24:45 ulm Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/games-action/solar2/solar2-1.10.ebuild,v 1.7 2014/06/25 13:22:30 mgorny Exp $
29
30 # TODO: - unbundle libmono for 64bit
31 # - unbundling libSDL_mixer breaks the game
32 @@ -30,9 +30,36 @@
33 RDEPEND="
34 virtual/opengl
35 amd64? (
36 - app-emulation/emul-linux-x86-medialibs
37 - app-emulation/emul-linux-x86-sdl
38 - app-emulation/emul-linux-x86-soundlibs
39 + !bundled-libs? (
40 + || (
41 + app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
42 + media-libs/libmad[abi_x86_32(-)]
43 + )
44 + )
45 + || (
46 + app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
47 + virtual/opengl[abi_x86_32(-)]
48 + )
49 + || (
50 + app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
51 + (
52 + media-libs/libsdl[X,sound,video,joystick,abi_x86_32(-)]
53 + !bundled-libs? (
54 + media-libs/openal[abi_x86_32(-)]
55 + media-libs/sdl-mixer[flac,mikmod,mad,mp3,vorbis,abi_x86_32(-)]
56 + )
57 + )
58 + )
59 + || (
60 + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
61 + (
62 + media-libs/flac[abi_x86_32(-)]
63 + media-libs/libvorbis[abi_x86_32(-)]
64 + !bundled-libs? (
65 + media-libs/libmikmod[abi_x86_32(-)]
66 + )
67 + )
68 + )
69 )
70 x86? (
71 media-libs/flac
72
73
74
75 1.6 games-action/solar2/ChangeLog
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/ChangeLog?rev=1.6&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/ChangeLog?rev=1.6&content-type=text/plain
79 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/solar2/ChangeLog?r1=1.5&r2=1.6
80
81 Index: ChangeLog
82 ===================================================================
83 RCS file: /var/cvsroot/gentoo-x86/games-action/solar2/ChangeLog,v
84 retrieving revision 1.5
85 retrieving revision 1.6
86 diff -u -r1.5 -r1.6
87 --- ChangeLog 15 May 2014 16:24:45 -0000 1.5
88 +++ ChangeLog 25 Jun 2014 13:22:30 -0000 1.6
89 @@ -1,6 +1,9 @@
90 # ChangeLog for games-action/solar2
91 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
92 -# $Header: /var/cvsroot/gentoo-x86/games-action/solar2/ChangeLog,v 1.5 2014/05/15 16:24:45 ulm Exp $
93 +# $Header: /var/cvsroot/gentoo-x86/games-action/solar2/ChangeLog,v 1.6 2014/06/25 13:22:30 mgorny Exp $
94 +
95 + 25 Jun 2014; Michał Górny <mgorny@g.o> solar2-1.10.ebuild:
96 + Support multilib dependencies aside to emul-linux-x86.
97
98 15 May 2014; Ulrich Müller <ulm@g.o> solar2-1.10.ebuild:
99 Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to