summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-08-05 22:01:05 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-08-05 22:01:05 +0000
commitaa94dee9d1457094e4d358db03cc44923dab4f25 (patch)
treecb5346957575296a6284a8837751f61bf596159b /games-engines
parentx86 stable, bug #279511 (diff)
downloadgentoo-2-aa94dee9d1457094e4d358db03cc44923dab4f25.tar.gz
gentoo-2-aa94dee9d1457094e4d358db03cc44923dab4f25.tar.bz2
gentoo-2-aa94dee9d1457094e4d358db03cc44923dab4f25.zip
build against glibc210 with sed patch from Arttu Valo via bug #273530
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-engines')
-rw-r--r--games-engines/gargoyle/ChangeLog8
-rw-r--r--games-engines/gargoyle/gargoyle-20060917-r1.ebuild22
2 files changed, 19 insertions, 11 deletions
diff --git a/games-engines/gargoyle/ChangeLog b/games-engines/gargoyle/ChangeLog
index ed428387dcf0..8f56230f26f4 100644
--- a/games-engines/gargoyle/ChangeLog
+++ b/games-engines/gargoyle/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-engines/gargoyle
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.8 2007/11/21 03:42:37 dirtyepic Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.9 2009/08/05 22:01:05 mr_bones_ Exp $
+
+ 05 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
+ gargoyle-20060917-r1.ebuild:
+ build against glibc210 with sed patch from Arttu Valo via bug #273530
21 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> gargoyle-20060917-r1.ebuild:
Allow building with ftjam for bug #188194
diff --git a/games-engines/gargoyle/gargoyle-20060917-r1.ebuild b/games-engines/gargoyle/gargoyle-20060917-r1.ebuild
index 6377996e9440..b14a1bebceac 100644
--- a/games-engines/gargoyle/gargoyle-20060917-r1.ebuild
+++ b/games-engines/gargoyle/gargoyle-20060917-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-20060917-r1.ebuild,v 1.5 2009/06/04 13:31:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-20060917-r1.ebuild,v 1.6 2009/08/05 22:01:05 mr_bones_ Exp $
+EAPI=2
inherit eutils
MY_PV="2006-09-17"
@@ -31,21 +32,24 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${PN}
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
#Fix file named
- epatch "${FILESDIR}"/filename-friendliness-${PV}.patch
-
#Fix level9 compilation
- epatch "${FILESDIR}"/level9-compilation-fix-${PV}.patch
+ epatch \
+ "${FILESDIR}"/filename-friendliness-${PV}.patch \
+ "${FILESDIR}"/level9-compilation-fix-${PV}.patch
#Fix gtk+ detection
sed -i \
-e 's/"pkg-config freetype2 gtk+"/"pkg-config freetype2 gtk+-2.0"/' \
Jamrules \
|| die "sed failed"
+
+ #Fix getline function name conflict with glibc
+ sed -i \
+ -e "s/getline/${PN}_getline/" \
+ terps/alan3/parse.c terps/alan2/parse.c \
+ || die "sed failed"
}
src_compile() {