summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-09-09 14:28:29 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-09-09 14:28:29 +0000
commitce8fe691df9efc56a820527b9c1a4ab1916f838c (patch)
treefb940f44691ef3ec714eefbf76eb1562f2fcbcdb /games-sports
parentMarking abiword-2.8.6 ppc64 for bug 326503 (diff)
downloadhistorical-ce8fe691df9efc56a820527b9c1a4ab1916f838c.tar.gz
historical-ce8fe691df9efc56a820527b9c1a4ab1916f838c.tar.bz2
historical-ce8fe691df9efc56a820527b9c1a4ab1916f838c.zip
Respect LDFLAGS. Bug #336541
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-sports')
-rw-r--r--games-sports/race/ChangeLog8
-rw-r--r--games-sports/race/Manifest5
-rw-r--r--games-sports/race/files/race-0.5-ldflags.patch11
-rw-r--r--games-sports/race/race-0.5.ebuild16
4 files changed, 28 insertions, 12 deletions
diff --git a/games-sports/race/ChangeLog b/games-sports/race/ChangeLog
index ee5713ee4fcd..bfaeab4f0fc4 100644
--- a/games-sports/race/ChangeLog
+++ b/games-sports/race/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-sports/race
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/race/ChangeLog,v 1.8 2007/03/12 17:36:28 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/race/ChangeLog,v 1.9 2010/09/09 14:28:29 tupone Exp $
+
+ 09 Sep 2010; Tupone Alfredo <tupone@gentoo.org> race-0.5.ebuild,
+ +files/race-0.5-ldflags.patch:
+ Respect LDFLAGS. Bug #336541 by flameeyes@gentoo.org
12 Mar 2007; Tristan Heaven <nyhm@gentoo.org> race-0.5.ebuild:
Install menu entry, bug #160244
diff --git a/games-sports/race/Manifest b/games-sports/race/Manifest
index bb6a917942ff..ad50d262936b 100644
--- a/games-sports/race/Manifest
+++ b/games-sports/race/Manifest
@@ -1,5 +1,6 @@
AUX 0.5-gentoo.patch 3224 RMD160 c968b979d5f817b0235d859ac6166550795b721d SHA1 3050e22cd72f51e264fe4e9be3678eaa8f0b06a0 SHA256 49a011cfd2edf0c4a5ee9419e70a5ee7c03e6743fe72e9a450165ab951daa257
+AUX race-0.5-ldflags.patch 506 RMD160 26ccc016fdce8987c73a9ec08ac7960f1ece7d7c SHA1 acd985af9a2062817ec001a46ad4dc11b8f0898a SHA256 f7c397708d3988b31084fb679b48ae0c92fc900b11a9aca47bd1bcf3f868fda1
DIST race-0.5.tar.bz2 550872 RMD160 76b86196c974141616a1ef10662ffd25f816facf SHA1 ec10a6cf89ae90614250bd0208a012b1d76f20e0 SHA256 7c3329128f5fed9cba78638f7d2f56c62823927e9ec518fdd426dae0d108ae63
-EBUILD race-0.5.ebuild 1251 RMD160 bd60391b4ed1b5a2ab5f6d439541a40c0e0ed818 SHA1 f8f80700a630b1770b83ba65c9b9aa9d6979533f SHA256 03eba1a0aa72c7e708f94f0282bc6a177b5ca09b2732236e28dfb1b5c2458a79
-MISC ChangeLog 846 RMD160 f10bc0b4ab3b38db0663f78d56f6ebedd839189e SHA1 ddc09580d51667d54fee2c06e33f2c214a1379aa SHA256 c1cdc965c83dcdf91e8f5065b4e7184c500b6f53a39ac8071c3b13a11ba958f6
+EBUILD race-0.5.ebuild 1269 RMD160 1ff2734ed664335a0c78bc16446ffa77baa7671b SHA1 7fbf95c8be49699697c1abffe6417453faa8e83d SHA256 1c961d614182de987cb1c5d931c0552d807f5da6f61b8c20a6e4e6cdd6a9133e
+MISC ChangeLog 1004 RMD160 31957a6d828750a7f9ad7ea0dd528085787cdb96 SHA1 8f2a8cd07cb41d11355e53fb804875cb00103e58 SHA256 eaa83695e6bb69bb4b5ae84f76c906dacab28edd5da9437c7e75ba87a2ddc4b5
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-sports/race/files/race-0.5-ldflags.patch b/games-sports/race/files/race-0.5-ldflags.patch
new file mode 100644
index 000000000000..b1285a103631
--- /dev/null
+++ b/games-sports/race/files/race-0.5-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.old 2010-09-09 16:24:38.000000000 +0200
++++ Makefile 2010-09-09 16:24:58.000000000 +0200
+@@ -24,7 +24,7 @@
+ $(CC) src/messages.c -c `sdl-config --cflags`
+ $(CC) src/camera.c -c `sdl-config --cflags`
+
+- $(CC) main.o timing.o vector.o fifo.o ortho.o audio.o font.o \
++ $(CC) ${LDFLAGS} main.o timing.o vector.o fifo.o ortho.o audio.o font.o \
+ init.o textures.o terrain.o menu.o game.o hud.o messages.o \
+ camera.o \
+ -o $(BIN) -lGL -lGLU -lSDL_image -lSDL_mixer -lm `sdl-config --libs`
diff --git a/games-sports/race/race-0.5.ebuild b/games-sports/race/race-0.5.ebuild
index 7a7610af619a..d067956d4ca0 100644
--- a/games-sports/race/race-0.5.ebuild
+++ b/games-sports/race/race-0.5.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/race/race-0.5.ebuild,v 1.12 2007/03/13 23:25:53 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/race/race-0.5.ebuild,v 1.13 2010/09/09 14:28:29 tupone Exp $
+EAPI="2"
inherit eutils toolchain-funcs games
@@ -19,15 +20,14 @@ DEPEND="virtual/opengl
media-libs/sdl-image
media-libs/sdl-mixer"
-src_unpack() {
- unpack ${A}
- cd "${S}"/src
- epatch "${FILESDIR}"/${PV}-gentoo.patch
+src_prepare() {
+ epatch "${FILESDIR}"/${PV}-gentoo.patch \
+ "${FILESDIR}"/${P}-ldflags.patch
sed -i \
-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:g" \
-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}:g" \
- *.c || die "sed failed"
- find "${S}"/data/ -type d -name .xvpics -print0 | xargs -0 rm -rf
+ src/*.c || die "sed failed"
+ find data/ -type d -name .xvpics -print0 | xargs -0 rm -rf
}
src_compile() {