1 |
nyhm 08/05/01 15:53:36 |
2 |
|
3 |
Modified: tomatoes-1.55-r2.ebuild ChangeLog |
4 |
Log: |
5 |
Patch to fix building with gcc-4.3 from Martin Väth, bug #218940 |
6 |
(Portage version: 2.1.5_rc6) |
7 |
|
8 |
Revision Changes Path |
9 |
1.5 games-arcade/tomatoes/tomatoes-1.55-r2.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild?rev=1.5&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild?rev=1.5&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild?r1=1.4&r2=1.5 |
14 |
|
15 |
Index: tomatoes-1.55-r2.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v |
18 |
retrieving revision 1.4 |
19 |
retrieving revision 1.5 |
20 |
diff -u -r1.4 -r1.5 |
21 |
--- tomatoes-1.55-r2.ebuild 8 Aug 2007 21:04:45 -0000 1.4 |
22 |
+++ tomatoes-1.55-r2.ebuild 1 May 2008 15:53:35 -0000 1.5 |
23 |
@@ -1,6 +1,6 @@ |
24 |
-# Copyright 1999-2007 Gentoo Foundation |
25 |
+# Copyright 1999-2008 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v 1.4 2007/08/08 21:04:45 vapier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v 1.5 2008/05/01 15:53:35 nyhm Exp $ |
29 |
|
30 |
inherit eutils games |
31 |
|
32 |
@@ -17,8 +17,8 @@ |
33 |
|
34 |
DEPEND="virtual/opengl |
35 |
virtual/glu |
36 |
- >=media-libs/libsdl-1.2.7 |
37 |
- >=media-libs/sdl-image-1.2.2 |
38 |
+ media-libs/libsdl |
39 |
+ media-libs/sdl-image |
40 |
media-libs/sdl-mixer" |
41 |
|
42 |
pkg_setup() { |
43 |
@@ -49,26 +49,27 @@ |
44 |
makefile \ |
45 |
|| die "sed failed" |
46 |
|
47 |
- epatch "${FILESDIR}"/${P}-c_str.patch |
48 |
+ epatch \ |
49 |
+ "${FILESDIR}"/${P}-c_str.patch \ |
50 |
+ "${FILESDIR}"/${P}-gcc43.patch |
51 |
} |
52 |
|
53 |
src_install() { |
54 |
dogamesbin tomatoes || die "dogamesbin failed" |
55 |
- dodir "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}/${PN}" |
56 |
dodoc README README-src |
57 |
|
58 |
- cp -r tomatoes.mpk music/ "${D}${GAMES_DATADIR}/${PN}" \ |
59 |
- || die "failed to copy game data" |
60 |
+ insinto "${GAMES_DATADIR}"/${PN} |
61 |
+ doins -r tomatoes.mpk music || die "doins data failed" |
62 |
|
63 |
doicon ${PN}.png |
64 |
make_desktop_entry tomatoes "I Have No Tomatoes" |
65 |
|
66 |
- touch "${D}${GAMES_STATEDIR}/${PN}/hiscore.lst" || die "touch failed" |
67 |
- fperms 660 "${GAMES_STATEDIR}/${PN}/hiscore.lst" |
68 |
+ dodir "${GAMES_STATEDIR}"/${PN} |
69 |
+ touch "${D}${GAMES_STATEDIR}"/${PN}/hiscore.lst || die "touch failed" |
70 |
+ fperms 660 "${GAMES_STATEDIR}"/${PN}/hiscore.lst |
71 |
|
72 |
- insinto "${GAMES_SYSCONFDIR}/${PN}/" |
73 |
- insopts -m0640 |
74 |
- doins config.cfg || die "failed to copy game config" |
75 |
+ insinto "${GAMES_SYSCONFDIR}"/${PN} |
76 |
+ doins config.cfg || die "doins config.cfg failed" |
77 |
|
78 |
prepgamesdirs |
79 |
} |
80 |
|
81 |
|
82 |
|
83 |
1.15 games-arcade/tomatoes/ChangeLog |
84 |
|
85 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/ChangeLog?rev=1.15&view=markup |
86 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/ChangeLog?rev=1.15&content-type=text/plain |
87 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/tomatoes/ChangeLog?r1=1.14&r2=1.15 |
88 |
|
89 |
Index: ChangeLog |
90 |
=================================================================== |
91 |
RCS file: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v |
92 |
retrieving revision 1.14 |
93 |
retrieving revision 1.15 |
94 |
diff -u -r1.14 -r1.15 |
95 |
--- ChangeLog 23 Dec 2006 01:14:01 -0000 1.14 |
96 |
+++ ChangeLog 1 May 2008 15:53:35 -0000 1.15 |
97 |
@@ -1,6 +1,10 @@ |
98 |
# ChangeLog for games-arcade/tomatoes |
99 |
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 |
100 |
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v 1.14 2006/12/23 01:14:01 chainsaw Exp $ |
101 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
102 |
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v 1.15 2008/05/01 15:53:35 nyhm Exp $ |
103 |
+ |
104 |
+ 01 May 2008; Tristan Heaven <nyhm@g.o> |
105 |
+ +files/tomatoes-1.55-gcc43.patch, tomatoes-1.55-r2.ebuild: |
106 |
+ Patch to fix building with gcc-4.3 from Martin Väth, bug #218940 |
107 |
|
108 |
23 Dec 2006; Tony Vroon <chainsaw@g.o> tomatoes-1.55-r2.ebuild: |
109 |
Keyword ~ppc64 now that mikmod works. |
110 |
|
111 |
|
112 |
|
113 |
-- |
114 |
gentoo-commits@l.g.o mailing list |