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: ChangeLog freeciv-2.1.9.ebuild
Date: Tue, 02 Jun 2009 17:21:10
Message-Id: E1MBXfe-0006Cm-7Y@stork.gentoo.org
1 mr_bones_ 09/06/02 17:21:06
2
3 Modified: ChangeLog freeciv-2.1.9.ebuild
4 Log:
5 esound is going away
6 (Portage version: 2.1.6.11/cvs/Linux i686)
7
8 Revision Changes Path
9 1.94 games-strategy/freeciv/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/ChangeLog?rev=1.94&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/ChangeLog?rev=1.94&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/ChangeLog?r1=1.93&r2=1.94
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v
18 retrieving revision 1.93
19 retrieving revision 1.94
20 diff -u -r1.93 -r1.94
21 --- ChangeLog 31 May 2009 18:30:10 -0000 1.93
22 +++ ChangeLog 2 Jun 2009 17:21:06 -0000 1.94
23 @@ -1,6 +1,9 @@
24 # ChangeLog for games-strategy/freeciv
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.93 2009/05/31 18:30:10 ranger Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.94 2009/06/02 17:21:06 mr_bones_ Exp $
28 +
29 + 02 Jun 2009; Michael Sterrett <mr_bones_@g.o> freeciv-2.1.9.ebuild:
30 + esound is going away
31
32 31 May 2009; Brent Baude <ranger@g.o> freeciv-2.1.9.ebuild:
33 Marking freeciv-2.1.9 ppc64 for bug 268536
34
35
36
37 1.7 games-strategy/freeciv/freeciv-2.1.9.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/freeciv-2.1.9.ebuild?rev=1.7&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/freeciv-2.1.9.ebuild?rev=1.7&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freeciv/freeciv-2.1.9.ebuild?r1=1.6&r2=1.7
42
43 Index: freeciv-2.1.9.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.1.9.ebuild,v
46 retrieving revision 1.6
47 retrieving revision 1.7
48 diff -u -r1.6 -r1.7
49 --- freeciv-2.1.9.ebuild 31 May 2009 18:30:10 -0000 1.6
50 +++ freeciv-2.1.9.ebuild 2 Jun 2009 17:21:06 -0000 1.7
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2009 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.1.9.ebuild,v 1.6 2009/05/31 18:30:10 ranger Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.1.9.ebuild,v 1.7 2009/06/02 17:21:06 mr_bones_ Exp $
56
57 inherit eutils games
58
59 @@ -10,8 +10,6 @@
60 !dedicated? (
61 alsa? (
62 ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/stdsounds3.tar.gz )
63 - esd? (
64 - ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/stdsounds3.tar.gz )
65 sdl? (
66 ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/stdsounds3.tar.gz )
67 )"
68 @@ -19,7 +17,7 @@
69 LICENSE="GPL-2"
70 SLOT="0"
71 KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86"
72 -IUSE="alsa auth dedicated esd gtk nls readline sdl Xaw3d"
73 +IUSE="alsa auth dedicated gtk nls readline sdl Xaw3d"
74
75 RDEPEND="readline? ( sys-libs/readline )
76 !dedicated? (
77 @@ -41,7 +39,6 @@
78 media-libs/alsa-lib
79 media-libs/audiofile
80 )
81 - esd? ( media-sound/esound )
82 sdl? ( media-libs/sdl-mixer )
83 auth? ( virtual/mysql )
84 )"
85 @@ -64,10 +61,10 @@
86 else
87 einfo "The Freeciv Client will be built with the Xaw toolkit"
88 fi
89 - if ! use esd && ! use alsa && ! use sdl ; then
90 + if ! use alsa && ! use sdl ; then
91 ewarn
92 ewarn "To enable sound support in civclient, you must enable"
93 - ewarn "at least one of this USE flags: alsa, esd, sdl"
94 + ewarn "at least one of this USE flags: alsa, sdl"
95 ewarn
96 fi
97 fi
98 @@ -129,8 +126,8 @@
99 fi
100 #FIXME --enable-{alsa,esd,sdl-mixer} actually disable them...
101 #FIXME ==> use --disable-* only, and autodetect to enable.
102 + mysoundconf="${mysoundconf} --disable-esd"
103 use alsa || mysoundconf="${mysoundconf} --disable-alsa"
104 - use esd || mysoundconf="${mysoundconf} --disable-esd"
105 use sdl || mysoundconf="${mysoundconf} --disable-sdl-mixer"
106 fi
107
108 @@ -157,7 +154,7 @@
109 doins data/Freeciv || die "doins failed"
110 fi
111 # Install sounds if at least one sound plugin was built
112 - if use alsa || use esd || use sdl ; then
113 + if use alsa || use sdl ; then
114 insinto "${GAMES_DATADIR}"/${PN}
115 doins -r ../data/stdsounds* || die "doins sounds failed"
116 fi