Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-strategy/freeciv: freeciv-2.1.0.ebuild ChangeLog
Date: Wed, 31 Oct 2007 23:05:01
Message-Id: E1InMcC-0002co-9n@stork.gentoo.org
1 mr_bones_ 07/10/31 23:04:48
2
3 Modified: freeciv-2.1.0.ebuild ChangeLog
4 Log:
5 add sdl patch to ebuild from Andrei Slavoiu (bug #197697)
6 (Portage version: 2.1.3.16)
7
8 Revision Changes Path
9 1.2 games-strategy/freeciv/freeciv-2.1.0.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/freeciv-2.1.0.ebuild?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/freeciv-2.1.0.ebuild?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/freeciv-2.1.0.ebuild?r1=1.1&r2=1.2
14
15 Index: freeciv-2.1.0.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.1.0.ebuild,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- freeciv-2.1.0.ebuild 31 Oct 2007 16:57:47 -0000 1.1
22 +++ freeciv-2.1.0.ebuild 31 Oct 2007 23:04:47 -0000 1.2
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2007 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.1.0.ebuild,v 1.1 2007/10/31 16:57:47 mr_bones_ Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.1.0.ebuild,v 1.2 2007/10/31 23:04:47 mr_bones_ Exp $
28
29 inherit eutils games
30
31 @@ -28,10 +28,16 @@
32 nls? ( virtual/libintl )
33 gtk? ( >=x11-libs/gtk+-2 )
34 !gtk? (
35 - Xaw3d? ( x11-libs/Xaw3d )
36 - !Xaw3d? ( x11-libs/libXaw )
37 - x11-libs/libXmu
38 - x11-libs/libXpm
39 + sdl? (
40 + media-libs/libsdl
41 + media-libs/sdl-image
42 + )
43 + !sdl? (
44 + Xaw3d? ( x11-libs/Xaw3d )
45 + !Xaw3d? ( x11-libs/libXaw )
46 + x11-libs/libXmu
47 + x11-libs/libXpm
48 + )
49 )
50 alsa? (
51 media-libs/alsa-lib
52 @@ -56,6 +62,8 @@
53 elog "The Freeciv Client will be built with the GTK+-2 toolkit"
54 elif use Xaw3d ; then
55 elog "The Freeciv Client will be built with the Xaw3d toolkit"
56 + elif use sdl ; then
57 + elog "The Freeciv Client will be built with the SDL toolkit"
58 else
59 elog "The Freeciv Client will be built with the Xaw toolkit"
60 fi
61 @@ -112,6 +120,7 @@
62 myclient="no"
63 else
64 myclient="xaw"
65 + use sdl && myclient="sdl"
66 use Xaw3d && myclient="xaw3d"
67 if use gtk ; then
68 myclient="gtk-2.0"
69 @@ -141,7 +150,7 @@
70
71 if ! use dedicated ; then
72 # Install the app-defaults if Xaw/Xaw3d toolkit
73 - if ! use gtk ; then
74 + if ! use gtk && ! use sdl ; then
75 insinto /etc/X11/app-defaults
76 doins data/Freeciv || die "doins failed"
77 fi
78
79
80
81 1.63 games-strategy/freeciv/ChangeLog
82
83 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/ChangeLog?rev=1.63&view=markup
84 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/ChangeLog?rev=1.63&content-type=text/plain
85 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/ChangeLog?r1=1.62&r2=1.63
86
87 Index: ChangeLog
88 ===================================================================
89 RCS file: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v
90 retrieving revision 1.62
91 retrieving revision 1.63
92 diff -u -r1.62 -r1.63
93 --- ChangeLog 31 Oct 2007 16:57:47 -0000 1.62
94 +++ ChangeLog 31 Oct 2007 23:04:47 -0000 1.63
95 @@ -1,6 +1,9 @@
96 # ChangeLog for games-strategy/freeciv
97 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
98 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.62 2007/10/31 16:57:47 mr_bones_ Exp $
99 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.63 2007/10/31 23:04:47 mr_bones_ Exp $
100 +
101 + 31 Oct 2007; Michael Sterrett <mr_bones_@g.o> freeciv-2.1.0.ebuild:
102 + add sdl patch to ebuild from Andrei Slavoiu (bug #197697)
103
104 *freeciv-2.1.0 (31 Oct 2007)
105
106
107
108
109 --
110 gentoo-commits@g.o mailing list