From cab8b6052840e65fd517b79840a997525205fa5b Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Sat, 6 Aug 2011 13:44:51 +0000 Subject: QA: apply patches before sedding the Makefile, otherwise underlinking patch would fail if the flags didn't match. (Portage version: 2.2.0_alpha50/cvs/Linux x86_64) --- games-arcade/trailblazer/ChangeLog | 7 ++++++- games-arcade/trailblazer/files/trailblazer-0.9-underlink.patch | 2 +- games-arcade/trailblazer/trailblazer-0.9.ebuild | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'games-arcade') diff --git a/games-arcade/trailblazer/ChangeLog b/games-arcade/trailblazer/ChangeLog index 5e82ceed14fd..16d1cf36bc74 100644 --- a/games-arcade/trailblazer/ChangeLog +++ b/games-arcade/trailblazer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-arcade/trailblazer # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/trailblazer/ChangeLog,v 1.5 2011/06/20 18:54:31 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/trailblazer/ChangeLog,v 1.6 2011/08/06 13:44:51 flameeyes Exp $ + + 06 Aug 2011; Diego E. Pettenò trailblazer-0.9.ebuild, + files/trailblazer-0.9-underlink.patch: + QA: apply patches before sedding the Makefile, otherwise underlinking patch + would fail if the flags didn't match. 20 Jun 2011; Tupone Alfredo trailblazer-0.9.ebuild, +files/trailblazer-0.9-underlink.patch: diff --git a/games-arcade/trailblazer/files/trailblazer-0.9-underlink.patch b/games-arcade/trailblazer/files/trailblazer-0.9-underlink.patch index d723fbe2eca2..31e9a1000324 100644 --- a/games-arcade/trailblazer/files/trailblazer-0.9-underlink.patch +++ b/games-arcade/trailblazer/files/trailblazer-0.9-underlink.patch @@ -6,6 +6,6 @@ sources = game.c main.c road.c map.c gfx.c -libs = `sdl-config --libs` +libs = `sdl-config --libs` -lm - cflags = -O2 -pipe -march=athlon64 -ggdb -Wall `sdl-config --cflags` + cflags = -O2 -Wall `sdl-config --cflags` version = 0.9 bdir = /tmp/trailblazer-$(version) diff --git a/games-arcade/trailblazer/trailblazer-0.9.ebuild b/games-arcade/trailblazer/trailblazer-0.9.ebuild index e97058b65316..ee4ecdf9c58c 100644 --- a/games-arcade/trailblazer/trailblazer-0.9.ebuild +++ b/games-arcade/trailblazer/trailblazer-0.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/trailblazer/trailblazer-0.9.ebuild,v 1.5 2011/06/20 18:54:31 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/trailblazer/trailblazer-0.9.ebuild,v 1.6 2011/08/06 13:44:51 flameeyes Exp $ EAPI=2 inherit eutils games @@ -17,6 +17,9 @@ IUSE="" DEPEND=">=media-libs/libsdl-1.2.7[video]" src_prepare() { + epatch "${FILESDIR}"/${P}-ldflags.patch \ + "${FILESDIR}"/${P}-underlink.patch + sed -i \ -e "s:-O2:${CFLAGS}:" \ Makefile || die "sed Makefile failed" @@ -25,8 +28,6 @@ src_prepare() { -e "s:/usr/share/trailblazer/trail\.dat:${GAMES_DATADIR}/${PN}/trail.dat:" \ -e "s:/usr/share/trailblazer/trail\.time:${GAMES_STATEDIR}/trail.time:" \ map.c || die "sed map.c failed" - epatch "${FILESDIR}"/${P}-ldflags.patch \ - "${FILESDIR}"/${P}-underlink.patch } src_install() { -- cgit v1.2.3-65-gdbad