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
commit43e24b6acd54365ba321668126eb12fba5c41aab (patch)
tree82721a2977f19c577dc84db7830645f79c70e48d /games-engines/gargoyle
parentx86 stable, bug #279511 (diff)
downloadhistorical-43e24b6acd54365ba321668126eb12fba5c41aab.tar.gz
historical-43e24b6acd54365ba321668126eb12fba5c41aab.tar.bz2
historical-43e24b6acd54365ba321668126eb12fba5c41aab.zip
build against glibc210 with sed patch from Arttu Valo via bug #273530
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-engines/gargoyle')
-rw-r--r--games-engines/gargoyle/ChangeLog8
-rw-r--r--games-engines/gargoyle/Manifest4
-rw-r--r--games-engines/gargoyle/gargoyle-20060917-r1.ebuild22
3 files changed, 21 insertions, 13 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/Manifest b/games-engines/gargoyle/Manifest
index 79ab6e353857..d1089131d416 100644
--- a/games-engines/gargoyle/Manifest
+++ b/games-engines/gargoyle/Manifest
@@ -1,6 +1,6 @@
AUX filename-friendliness-20060917.patch 6215 RMD160 dd87f7631933ee8e903e986459f6215b525c13d1 SHA1 28bc89c84b12e4a4373ba31904d3f6ed3d485c50 SHA256 ee70e785ae62e9715dd081e669099153ed764af0a9d364bbac1aa285dee27dda
AUX level9-compilation-fix-20060917.patch 1714 RMD160 268e36e6ae00a339890a5a1e0f4a904e3bb602fa SHA1 7446146c36b54997f85f29fa0f8e6e6e3fe45441 SHA256 4ea12b9e7f638e479e4a2db8353ff12fc5ff43ca25780a4c062f9f0ae9e3d054
DIST gargoyle-2006-09-17-source.zip 9714916 RMD160 86e832323f8da96004460c7fa5b1054717817884 SHA1 2a1f4fa08444761ecc32c28770f0af6d24b4eeb8 SHA256 3a39e8e8809a8d942bb5ae71b8f64e4f4f4ecbf2cd1e7de0ed40fd58ea2f7ce0
-EBUILD gargoyle-20060917-r1.ebuild 1731 RMD160 5a3e9242091ea2b7cf95a254073df588a1096df1 SHA1 7ff60ee4e45189911bbc89da9915093694470c8d SHA256 8fb0f2aa5773059b3014e8206021ef1e87f4450fca5c4a095b40c1eddc745d13
-MISC ChangeLog 1676 RMD160 aa648e9d0764dcb63ef34cdaefbc967a0c8d09ed SHA1 c142f598bdfa3279079d84c5080764d5b9606324 SHA256 3c4fca9bfac517d3b4fca4bed712cc601090c30345f7c332d5c5dc358cfdc729
+EBUILD gargoyle-20060917-r1.ebuild 1872 RMD160 b5cf883a512f9a0897a0b7763e239919bbcaf9c6 SHA1 1fc793e1914c9766481f05161b6268fa84d6d591 SHA256 b49d07eb437508686dcc1418bf7a0b8cde5d7b6b742a68b2300f0311880d5ba1
+MISC ChangeLog 1835 RMD160 dc44acddda02904956a92227e4d77081132a2c19 SHA1 1673510e573e2818b9926e6b598147ad31350e4f SHA256 5e61b5ef769072a9a8094a6ecd130c65139b8a1fb67df6af74e9760b9daf8dcf
MISC metadata.xml 252 RMD160 8ce3795bac9d4960615a67c32fb3994bfece325f SHA1 dfce1ee8158b18adf66bfee2988b2b1c796443a8 SHA256 76446769792843475165db424def28271c1aabc5d695d29ad30858e8055c7acd
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() {