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-engines/gargoyle: ChangeLog gargoyle-20060917-r1.ebuild
Date: Wed, 05 Aug 2009 22:01:08
Message-Id: E1MYoXh-0001KY-HP@stork.gentoo.org
1 mr_bones_ 09/08/05 22:01:05
2
3 Modified: ChangeLog gargoyle-20060917-r1.ebuild
4 Log:
5 build against glibc210 with sed patch from Arttu Valo via bug #273530
6 (Portage version: 2.1.6.13/cvs/Linux i686)
7
8 Revision Changes Path
9 1.9 games-engines/gargoyle/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-engines/gargoyle/ChangeLog?rev=1.9&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-engines/gargoyle/ChangeLog?rev=1.9&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-engines/gargoyle/ChangeLog?r1=1.8&r2=1.9
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v
18 retrieving revision 1.8
19 retrieving revision 1.9
20 diff -u -r1.8 -r1.9
21 --- ChangeLog 21 Nov 2007 03:42:37 -0000 1.8
22 +++ ChangeLog 5 Aug 2009 22:01:05 -0000 1.9
23 @@ -1,6 +1,10 @@
24 # ChangeLog for games-engines/gargoyle
25 -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.8 2007/11/21 03:42:37 dirtyepic Exp $
27 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.9 2009/08/05 22:01:05 mr_bones_ Exp $
29 +
30 + 05 Aug 2009; Michael Sterrett <mr_bones_@g.o>
31 + gargoyle-20060917-r1.ebuild:
32 + build against glibc210 with sed patch from Arttu Valo via bug #273530
33
34 21 Nov 2007; Ryan Hill <dirtyepic@g.o> gargoyle-20060917-r1.ebuild:
35 Allow building with ftjam for bug #188194
36
37
38
39 1.6 games-engines/gargoyle/gargoyle-20060917-r1.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-engines/gargoyle/gargoyle-20060917-r1.ebuild?rev=1.6&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-engines/gargoyle/gargoyle-20060917-r1.ebuild?rev=1.6&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-engines/gargoyle/gargoyle-20060917-r1.ebuild?r1=1.5&r2=1.6
44
45 Index: gargoyle-20060917-r1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-20060917-r1.ebuild,v
48 retrieving revision 1.5
49 retrieving revision 1.6
50 diff -u -r1.5 -r1.6
51 --- gargoyle-20060917-r1.ebuild 4 Jun 2009 13:31:07 -0000 1.5
52 +++ gargoyle-20060917-r1.ebuild 5 Aug 2009 22:01:05 -0000 1.6
53 @@ -1,7 +1,8 @@
54 -# Copyright 1999-2007 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-engines/gargoyle/gargoyle-20060917-r1.ebuild,v 1.5 2009/06/04 13:31:07 ssuominen Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-20060917-r1.ebuild,v 1.6 2009/08/05 22:01:05 mr_bones_ Exp $
59
60 +EAPI=2
61 inherit eutils
62
63 MY_PV="2006-09-17"
64 @@ -31,21 +32,24 @@
65
66 S=${WORKDIR}/${PN}
67
68 -src_unpack() {
69 - unpack ${A}
70 - cd "${S}"
71 -
72 +src_prepare() {
73 #Fix file named
74 - epatch "${FILESDIR}"/filename-friendliness-${PV}.patch
75 -
76 #Fix level9 compilation
77 - epatch "${FILESDIR}"/level9-compilation-fix-${PV}.patch
78 + epatch \
79 + "${FILESDIR}"/filename-friendliness-${PV}.patch \
80 + "${FILESDIR}"/level9-compilation-fix-${PV}.patch
81
82 #Fix gtk+ detection
83 sed -i \
84 -e 's/"pkg-config freetype2 gtk+"/"pkg-config freetype2 gtk+-2.0"/' \
85 Jamrules \
86 || die "sed failed"
87 +
88 + #Fix getline function name conflict with glibc
89 + sed -i \
90 + -e "s/getline/${PN}_getline/" \
91 + terps/alan3/parse.c terps/alan2/parse.c \
92 + || die "sed failed"
93 }
94
95 src_compile() {