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-arcade/tomatoes: ChangeLog tomatoes-1.55-r2.ebuild
Date: Mon, 19 Jan 2009 20:20:27
Message-Id: E1LP0bf-0008VD-9h@stork.gentoo.org
1 mr_bones_ 09/01/19 20:20:23
2
3 Modified: ChangeLog tomatoes-1.55-r2.ebuild
4 Log:
5 EAPI=2; add use-based dep; build cpp files with the c++ compiler
6 (Portage version: 2.1.6.4/cvs/Linux 2.6.27.8 i686)
7
8 Revision Changes Path
9 1.16 games-arcade/tomatoes/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/ChangeLog?rev=1.16&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/ChangeLog?rev=1.16&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/ChangeLog?r1=1.15&r2=1.16
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v
18 retrieving revision 1.15
19 retrieving revision 1.16
20 diff -u -r1.15 -r1.16
21 --- ChangeLog 1 May 2008 15:53:35 -0000 1.15
22 +++ ChangeLog 19 Jan 2009 20:20:23 -0000 1.16
23 @@ -1,6 +1,10 @@
24 # ChangeLog for games-arcade/tomatoes
25 -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v 1.15 2008/05/01 15:53:35 nyhm Exp $
27 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v 1.16 2009/01/19 20:20:23 mr_bones_ Exp $
29 +
30 + 19 Jan 2009; Michael Sterrett <mr_bones_@g.o>
31 + tomatoes-1.55-r2.ebuild:
32 + EAPI=2; add use-based dep; build cpp files with the c++ compiler
33
34 01 May 2008; Tristan Heaven <nyhm@g.o>
35 +files/tomatoes-1.55-gcc43.patch, tomatoes-1.55-r2.ebuild:
36
37
38
39 1.6 games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild?rev=1.6&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild?rev=1.6&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild?r1=1.5&r2=1.6
44
45 Index: tomatoes-1.55-r2.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v
48 retrieving revision 1.5
49 retrieving revision 1.6
50 diff -u -r1.5 -r1.6
51 --- tomatoes-1.55-r2.ebuild 1 May 2008 15:53:35 -0000 1.5
52 +++ tomatoes-1.55-r2.ebuild 19 Jan 2009 20:20:23 -0000 1.6
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-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v 1.5 2008/05/01 15:53:35 nyhm Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v 1.6 2009/01/19 20:20:23 mr_bones_ Exp $
59
60 +EAPI=2
61 inherit eutils games
62
63 DATA_PV=1.5
64 @@ -19,27 +20,17 @@
65 virtual/glu
66 media-libs/libsdl
67 media-libs/sdl-image
68 - media-libs/sdl-mixer"
69 + media-libs/sdl-mixer[mikmod]"
70
71 -pkg_setup() {
72 - if ! built_with_use media-libs/sdl-mixer mikmod ; then
73 - eerror "Tomatoes doesn't work properly if sdl-mixer"
74 - eerror "is built with USE=-mikmod"
75 - die "Please emerge sdl-mixer with USE=mikmod"
76 - fi
77 - games_pkg_setup
78 -}
79 -
80 -src_unpack() {
81 - unpack ${A}
82 - cd "${S}"
83 +src_prepare() {
84 mv ../tomatoes-1.5/* . || die "mv failed"
85 mv icon.png ${PN}.png
86
87 sed -i \
88 -e '/^CC/d' \
89 -e '/^MARCH/d' \
90 - -e "/^CFLAGS/s/=.*$/= ${CFLAGS} \$(SDL_FLAGS)/" \
91 + -e "/(CFLAGS)/s/CC/CXX/" \
92 + -e "/^CFLAGS/s/=.*$/= ${CXXFLAGS} \$(SDL_FLAGS)/" \
93 -e "/^LDFLAGS/s/-s$/${LDFLAGS}/" \
94 -e "/^MPKDIR = /s:./:${GAMES_DATADIR}/${PN}/:" \
95 -e "/^MUSICDIR = /s:./music/:${GAMES_DATADIR}/${PN}/music/:" \