Fix makefile with a patch instead of sed, bug #424213

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

4 files changed, 71 insertions, 28 deletions

diff --git a/games-arcade/amphetamine/ChangeLog b/games-arcade/amphetamine/ChangeLog
index 7f3bce27327a..3f5a9d0733de 100644
--- a/games-arcade/amphetamine/ChangeLog
+++ b/games-arcade/amphetamine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/amphetamine
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/amphetamine/ChangeLog,v 1.8 2010/01/07 21:47:36 josejx Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/amphetamine/ChangeLog,v 1.9 2012/07/08 00:20:49 tristan Exp $
+
+  08 Jul 2012; Tristan Heaven <tristan@gentoo.org> amphetamine-0.8.10.ebuild,
+  +files/amphetamine-0.8.10-build.patch:
+  Fix makefile with a patch instead of sed, bug #424213
 
   07 Jan 2010; Joseph Jezak <josejx@gentoo.org> amphetamine-0.8.10.ebuild:
   Marked ppc stable for bug #294564.
diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest
index 9086b7dd89c3..31ce6a951e9a 100644
--- a/games-arcade/amphetamine/Manifest
+++ b/games-arcade/amphetamine/Manifest
@@ -1,16 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX amphetamine-0.8.10-64bit.patch 2708 RMD160 747f896a2d5e27c7f439f589ec504632df340425 SHA1 d0f5484540cdbc761197606c04033e67b1132e4a SHA256 142da2877b00422a0e7697af6c61d53d489dcddf9918241cfc51cfb7205f8495
-DIST amphetamine-0.8.10.tar.bz2 72324 RMD160 80067a1a982d7f0559481c44645661843a14fc2d SHA1 c3911ec2be55fd787bd0b852ad34420180f2ee97 SHA256 6cf7542d7a6b1c3f3cc660164961aa3fecd90fc3ebd7f9b640bf73dfca6aa677
-DIST amphetamine-data-0.8.6.tar.bz2 928775 RMD160 720c14873b3850e260dcae406bf3b29cf4e540a1 SHA1 092c4cd245d2378174f98cb9cfaa59d96e0d39d0 SHA256 b51a0edaf3271008a5e0b3061556898e3d0e27a554803d53caaaec14ecb730aa
-EBUILD amphetamine-0.8.10.ebuild 1309 RMD160 e067cff64f3f97231ab469e89e94533bd11d587e SHA1 db1e9c8d9ce450dc8db055da1022cb1e74c15c74 SHA256 a3e62d07833195ca97d5cdd9f3af903ba9499cb6e6939c9abfaf0527656624f7
-MISC ChangeLog 1451 RMD160 1679b7c2603ceb6b21e0a999bab7e794108dcc14 SHA1 86b2336312e36c4bbdbb558b84ed53b162fa37c3 SHA256 aa8a0d7ada572e4715410f1d7f45bb88216fca55fdf7c8d8de13a3f20f0801eb
-MISC metadata.xml 280 RMD160 2b09d8c1070bd0d2ce0f8fe9b8229941a442aabb SHA1 a39a0cf66b3d8baec622bc7d6038cf9e8d9220d0 SHA256 95ef8354a631de9fe1a2f30495e68866e946f90c0b1910c53cef631b1c2d6537
+AUX amphetamine-0.8.10-64bit.patch 2708 SHA256 142da2877b00422a0e7697af6c61d53d489dcddf9918241cfc51cfb7205f8495 SHA512 8216a5b59c52488f35416295256087771c82e8996787e74d03d416829b628267d17b47cc5f6d7bae2ff87b442bdb38aec4f78f14cd130fb045f5c8272f6b4c9d WHIRLPOOL 1af0a996949f707164175d6b65bc4d2105bfcea905763ad6e78d88c5353edc686af192cd5fa01e643fa813e63c720261e54666aa76aa124db432707572617d21
+AUX amphetamine-0.8.10-build.patch 696 SHA256 fd634221099a795db010efed78dd317051afc3ed1c0e29d5800667394f8d977a SHA512 cc7bfe701db5ca54a0437104217ffdad4cb0cc788b7b11db9eca3bbbfa8d2051ea3e76330046be53ec2b0f91d40d82187fd6fba3805993a724a3cf0be0ecf7d0 WHIRLPOOL 23a2f6cedc079bdc4dd6532fa2196a811a64232040b28fe4fcb15dce95628579e077643d26a98adbf02ff71e95f71e5f3b3220c02823106dd9bc788a3216742b
+DIST amphetamine-0.8.10.tar.bz2 72324 SHA256 6cf7542d7a6b1c3f3cc660164961aa3fecd90fc3ebd7f9b640bf73dfca6aa677 SHA512 eb3106df6070e207ffb3293ac4701bba8222603c0e399667505bad29b6f6433dc9ec008499b5180f713a724d3b686fead15536a20927195bc57780be16a860ef WHIRLPOOL a9b2706c0b8418d14fb87ad8451a2ea6a72c8e8ad1ecceaf72fa34458f3368b21541aaadafb24cf11f7128373679c70e9cc7e79ef420c0145896f8222ecc5c11
+DIST amphetamine-data-0.8.6.tar.bz2 928775 SHA256 b51a0edaf3271008a5e0b3061556898e3d0e27a554803d53caaaec14ecb730aa SHA512 0feb86f420b4816064594756bb30bb6e02ae5062f03ef175b3262a8f30043340933f6f1b1894e2b2cfad70befc76d3ed1e0d2777c2dc2f7461459e8a93efeaf1 WHIRLPOOL 09fab6986514a13d3341cccdc557a4110714a66bd352e9166f8c7f935aeb20eb3f2f3cac84400384cb640f9a53451845ffd6c8b653ba8f1c06c4c69bf43090f4
+EBUILD amphetamine-0.8.10.ebuild 1081 SHA256 5439871e919e7b32a3f3b606eb143083691e0c61bb05e472e75d026cb5dc58d8 SHA512 afd4c87180dcc68e3e0199ee3283f956075e735428bfa20ec8c59900159e47157475b855551621469e9ce52ff8ecd875f00ab61ab3343975213438a6b147129a WHIRLPOOL ee2531563d951299a5df8f9e09f46e7439d01f74a8782891645b6d56998d877fc4e2740822a10cdb5d11e0f823abd2f151e005a376b78c242731c8fb280462a9
+MISC ChangeLog 1628 SHA256 28af9b8f55014596a84a4882b9560bb3ad8a767c4989ffbaae000cb14b282273 SHA512 c4eaa55f5d53451c89e7e8131c36d72814f0654511a13213d30702cfdff33fe05b8296fa6126262683d6953b2f1f61b12140d1a5ab4c9025fa40c794a6037efb WHIRLPOOL c8f2dfb3dddcd61c6a4d85352c5caf4d4fe959e504fb662da3420e87e7a59e514825669fa9703de8f6b1cc55e86e40207a26e596446c8d5e2309f1d180800e32
+MISC metadata.xml 280 SHA256 95ef8354a631de9fe1a2f30495e68866e946f90c0b1910c53cef631b1c2d6537 SHA512 b4f6898681c35cec391f527a5743f3d9c876b49b78b9d4cb05e5070d8176f81eb87c8ff7ab8cf5ac0caa74537f0c5df57025e9bc0f77f6dfa1266de3d06a9300 WHIRLPOOL 53c42ff67e4ecef8c0e17dcb1ed76db2ddbb43a470127e9d58c1a9142257ddb77d4652cf94b121a0336bd552783ef5d1796d91c02fa83168debf9b99faa6e1bf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAktGVhIACgkQcsIHjyDViGQiRgCgynlA0cF6B9nr8yDLBGCFFcRk
-yOEAnRhNmxAmAsiGmR07QvSthphoCrgC
-=tCv2
+iQIcBAEBCgAGBQJP+NJmAAoJEN3Y2YlmgxDZIJkQANezqUr03eDhVX3dgN0V84GU
+JPdTowBL4/ssRuR9v0jEM2xaO1uB98fvdxag/bHfoHOGaQ8gwHpoppK/WsT/fdU6
+erZgG//dteQEtxHQtQZMUEDSIC3Lq6QaHxhyBjw7Ey+pr0430fVNg0c31c7MjGaQ
+x5sY9Pjz4ArKhEEIioL/3vImkgUcMK6vme4w7cOnR6oCuB4crS9Ot7hqxmEq8hqI
+iDcmC/uVMTDn8dpZseSx0NCrzzkSlgPNYgqyMrVclz7uNXPKi16oyQJYmDoM2hyN
+yXB+KLLIiuct5dXlfLFELctD5FmO/0SvAj8ajA/WuM0ahFoN8KkjNXM4CWa/nW/0
+YkplrfxygRuxedv6XJnjqEW6t65RGxMB1Ko8IHNyopq9vz+VJwxhV0vg8ZLianyf
+jy1gs3hQCnqgAVhgmVSb2z0gGJ2MTKMi8RiYk7iOyAHbASQe2WvEr7YdcDGdiafS
+05/On+tOj3d9Owhg5a58SDFqtLGbFQ5yO6ONgXQDqjQVDeKtLQuO7kstbDhIadoB
+Qew/bDKG5ycs6eZHViep3JXwa/CH7XoJspPhXf51PlFnwMvTfYNxhw2f1lqTw6iR
+EEDmH6hLrVSRA3fh8e8Z7w/3JGXqqZWL7PVjohVMHsyYozc60k07dFm/oJh+m7jH
+gAOB3MbB7Y5vcnPTDjv7
+=wNo9
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/amphetamine/amphetamine-0.8.10.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
index 431caf2c56e5..fd2806d02037 100644
--- a/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
+++ b/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/amphetamine/amphetamine-0.8.10.ebuild,v 1.9 2010/01/07 21:47:36 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/amphetamine/amphetamine-0.8.10.ebuild,v 1.10 2012/07/08 00:20:49 tristan Exp $
 
 EAPI=2
-inherit eutils toolchain-funcs games
+inherit eutils games
 
 DESCRIPTION="a cool Jump'n Run game offering some unique visual effects"
 HOMEPAGE="http://homepage.hispeed.ch/loehrer/amph/amph.html"
@@ -18,18 +18,13 @@ IUSE=""
 DEPEND="media-libs/libsdl[audio,video]
 	x11-libs/libXpm"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-64bit.patch
-	sed -i \
-		-e "/^INSTALL_DIR /s:=.*:= ${GAMES_DATADIR}/${PN}:" \
-		-e "/^CFLAGS /s:$: ${CFLAGS}:" \
-		-e "/^CXXFLAGS /s:-O9.*:${CXXFLAGS}:" \
-		-e "/^DEPENDFLAGS /s:-g ::" \
-		-e "/^LINKER /s:$: ${LDFLAGS}:" \
-		-e "s:gcc:$(tc-getCC):" \
-		-e "s:g++:$(tc-getCXX):" \
-		Makefile \
-		|| die "sed failed"
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-64bit.patch
+)
+
+src_compile() {
+	emake INSTALL_DIR="${GAMES_DATADIR}"/${PN} || die
 }
 
 src_install() {
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
new file mode 100644
index 000000000000..2c0185f3ff01
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
@@ -0,0 +1,33 @@
+--- Makefile
++++ Makefile
+@@ -26,8 +26,8 @@
+ 
+ # makemake variables
+ 
+-LINKER       := g++
+-DEPENDFLAGS  := -g  ${SEARCHDIRS}
++LINKER = $(CXX) $(CXXFLAGS)
++DEPENDFLAGS  := ${SEARCHDIRS}
+ TOUCHHEADERS := ${MYCODEDIR}/*.h
+ 
+ # C
+@@ -37,8 +37,8 @@
+ 
+ # C++
+ 
+-CXX      := g++
+-CXXFLAGS  = ${DEPENDFLAGS} -O9 -funroll-loops -fomit-frame-pointer -ffast-math -Wcast-align
++CXX      ?= g++
++CXXFLAGS  += ${DEPENDFLAGS}
+ 
+ %.o : %.cpp
+ 	${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS} -o $@
+@@ -66,7 +66,7 @@
+     LOADLIBES := $(LOADLIBES) -lXpm -lXt
+ endif
+ 
+-LDFLAGS   = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib 
++LDFLAGS   += -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib 
+ 
+ .PHONY : default
+ default : amph