QA: apply patches before sedding the Makefile, otherwise underlinking patch would fail if the flags didn't match.

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

4 files changed, 18 insertions, 12 deletions

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ò <flameeyes@gentoo.org> 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 <tupone@gentoo.org> trailblazer-0.9.ebuild,
   +files/trailblazer-0.9-underlink.patch:
diff --git a/games-arcade/trailblazer/Manifest b/games-arcade/trailblazer/Manifest
index 2e12cfb2f146..7f925e5b8a97 100644
--- a/games-arcade/trailblazer/Manifest
+++ b/games-arcade/trailblazer/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA1
 
 AUX trailblazer-0.9-ldflags.patch 317 RMD160 d949c985618c5bd32a3c1aa62104d47c8d0e818d SHA1 bfd9fb2086c525a94586c657e605942420f300b6 SHA256 c61c014de95b5ca2e7fcc2d0005479c8d2aecdd06f54e80fb94a1fcbbb40da58
-AUX trailblazer-0.9-underlink.patch 348 RMD160 5136ee240b93e51815f8e5b9b89e382bc3c1cbd5 SHA1 be8f5ec5987344be058d699083b3c541215ed62b SHA256 44c334484f78ba90c1ff067e1bf9c08f1d4e5a9434dd47b97f7c1a4d5bef6a66
+AUX trailblazer-0.9-underlink.patch 320 RMD160 d4c3b6c058ab5a7af4e6f1114ee6f475b4fa4044 SHA1 78b751ebe98100e2d3f05a2c941dc3b4140adea4 SHA256 b5a019ee1ba3898a90b709ea9ae7ebe1d3121afc3fe14957e5620c91be8ab73e
 DIST trailblazer-0.9.tgz 20753 RMD160 6841cb18016e7d4f1ce5e0d5d709d8c03cd13f07 SHA1 170870063f3ea25262ea7ab43e5db3f00b647167 SHA256 db7fdccd38fac4ec7559db33b21676525d870375da5b7c9ff15c11621b378be1
-EBUILD trailblazer-0.9.ebuild 1223 RMD160 f9e4640d9c3767b63c96a3559bf83dad03690b12 SHA1 dd88278225e16cfac30a84f9f4e8a2e316b3201e SHA256 929d42640660a66693e94081a40a33e9adc99b07997839c7edde03465c5d4429
-MISC ChangeLog 970 RMD160 fd249db61bc424bc295eb269583a51c59cb08249 SHA1 24610e812ccceb27b7a63a6df0ff681cf132ca76 SHA256 ade9aa592306cef955155b4495a86aa9a78d276d5dbcb030962401d510515d61
+EBUILD trailblazer-0.9.ebuild 1227 RMD160 adc8438811b3d2afef908591e900a1bd3976bc9a SHA1 fbd5bafb3db5414d6c9c5655226237a8f2f3d67e SHA256 2fc6d2ded11b0dd63f2dd44c827dc389d55f2f14325e5f679ece63015095b40d
+MISC ChangeLog 1213 RMD160 136d8cc49e4262ece847ed56068bd27b70a545c1 SHA1 6a9bea5de880b8532a266aa5d37582e283dec03b SHA256 b9a119a041a882d9172d75131ec20e193522f28b433f4c2ef8664d6b6459399a
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3/l20ACgkQIY77eQFFFC1S8QCeNPx0NLqvNg4ga+50vqARNAsR
-+oYAn1HlQ/i0uPoznu3m31TW4X/H8ji3
-=tDhC
+iEYEARECAAYFAk49RVgACgkQAiZjviIA2XgqHACdH5MytMVQnTkqtaB+hpiGu5Wb
+Z0wAn28yzOAFtZ3EyUkJlxBtK+2U+ru7
+=0n3n
 -----END PGP SIGNATURE-----
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() {