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-simulation/cannonsmash: ChangeLog cannonsmash-0.6.6.ebuild
Date: Wed, 04 Nov 2009 06:29:42
Message-Id: E1N5ZNE-0006Tc-9E@stork.gentoo.org
1 mr_bones_ 09/11/04 06:29:40
2
3 Modified: ChangeLog cannonsmash-0.6.6.ebuild
4 Log:
5 EAPI=2
6 (Portage version: 2.1.6.13/cvs/Linux i686)
7
8 Revision Changes Path
9 1.19 games-simulation/cannonsmash/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/cannonsmash/ChangeLog?rev=1.19&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/cannonsmash/ChangeLog?rev=1.19&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/cannonsmash/ChangeLog?r1=1.18&r2=1.19
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/ChangeLog,v
18 retrieving revision 1.18
19 retrieving revision 1.19
20 diff -u -r1.18 -r1.19
21 --- ChangeLog 8 Apr 2008 01:38:29 -0000 1.18
22 +++ ChangeLog 4 Nov 2009 06:29:39 -0000 1.19
23 @@ -1,6 +1,10 @@
24 # ChangeLog for games-simulation/cannonsmash
25 -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/ChangeLog,v 1.18 2008/04/08 01:38:29 mr_bones_ Exp $
27 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/ChangeLog,v 1.19 2009/11/04 06:29:39 mr_bones_ Exp $
29 +
30 + 04 Nov 2009; Michael Sterrett <mr_bones_@g.o>
31 + cannonsmash-0.6.6.ebuild:
32 + EAPI=2
33
34 08 Apr 2008; Michael Sterrett <mr_bones_@g.o>
35 cannonsmash-0.6.6.ebuild:
36
37
38
39 1.15 games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild?rev=1.15&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild?rev=1.15&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild?r1=1.14&r2=1.15
44
45 Index: cannonsmash-0.6.6.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v
48 retrieving revision 1.14
49 retrieving revision 1.15
50 diff -u -r1.14 -r1.15
51 --- cannonsmash-0.6.6.ebuild 8 Apr 2008 01:38:29 -0000 1.14
52 +++ cannonsmash-0.6.6.ebuild 4 Nov 2009 06:29:39 -0000 1.15
53 @@ -1,7 +1,8 @@
54 -# Copyright 1999-2008 Gentoo Foundation
55 +# Copyright 1999-2009 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.14 2008/04/08 01:38:29 mr_bones_ Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.15 2009/11/04 06:29:39 mr_bones_ Exp $
59
60 +EAPI=2
61 inherit eutils games
62
63 MY_OGG=danslatristesse2-48.ogg
64 @@ -17,10 +18,10 @@
65
66 RDEPEND="virtual/opengl
67 virtual/glu
68 - media-libs/libsdl
69 - media-libs/sdl-mixer
70 - media-libs/sdl-image
71 - =x11-libs/gtk+-2*
72 + media-libs/libsdl[audio,video]
73 + media-libs/sdl-mixer[vorbis?]
74 + media-libs/sdl-image[jpeg,png]
75 + x11-libs/gtk+:2
76 nls? ( virtual/libintl )"
77 DEPEND="${RDEPEND}
78 dev-util/pkgconfig
79 @@ -30,7 +31,9 @@
80
81 src_unpack() {
82 unpack csmash-${PV}.tar.gz
83 - cd "${S}"
84 +}
85 +
86 +src_prepare() {
87 epatch \
88 "${FILESDIR}"/${P}-x-inc.patch \
89 "${FILESDIR}"/${P}-sizeof-cast.patch \
90 @@ -42,11 +45,13 @@
91 fi
92 }
93
94 -src_compile() {
95 +src_configure() {
96 egamesconf \
97 $(use_enable nls) \
98 - --datadir="${GAMES_DATADIR_BASE}" \
99 - || die
100 + --datadir="${GAMES_DATADIR_BASE}"
101 +}
102 +
103 +src_compile() {
104 emake \
105 localedir="/usr/share" \
106 || die "emake failed"