patching goes in src_unpack

Package-Manager: portage-2.1.3.16

4 files changed, 38 insertions, 37 deletions

diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest
index dbfed5a092b1..f7e0f2591f0c 100644
--- a/games-arcade/amphetamine/Manifest
+++ b/games-arcade/amphetamine/Manifest
@@ -1,17 +1,16 @@
-AUX 020_assumed_sizeof_long.diff 2708 RMD160 747f896a2d5e27c7f439f589ec504632df340425 SHA1 d0f5484540cdbc761197606c04033e67b1132e4a SHA256 142da2877b00422a0e7697af6c61d53d489dcddf9918241cfc51cfb7205f8495
-MD5 1c79321320dc4131a1817d73d3c205f3 files/020_assumed_sizeof_long.diff 2708
-RMD160 747f896a2d5e27c7f439f589ec504632df340425 files/020_assumed_sizeof_long.diff 2708
-SHA256 142da2877b00422a0e7697af6c61d53d489dcddf9918241cfc51cfb7205f8495 files/020_assumed_sizeof_long.diff 2708
-AUX amphetamine-0.8.10-gentoo.patch 265 RMD160 1f28bcbb8078d770b82cd18fdf1e71968f501954 SHA1 54046d76b8a8fc972e797e853473470cbe076288 SHA256 96a0203d8e15ab8affb5646508dc0042e67553d99daba6b10fc5d11f7bfd4371
-MD5 4fc7e31cd80e4a152e076e6b978507e9 files/amphetamine-0.8.10-gentoo.patch 265
-RMD160 1f28bcbb8078d770b82cd18fdf1e71968f501954 files/amphetamine-0.8.10-gentoo.patch 265
-SHA256 96a0203d8e15ab8affb5646508dc0042e67553d99daba6b10fc5d11f7bfd4371 files/amphetamine-0.8.10-gentoo.patch 265
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX amphetamine-0.8.10-64bit.patch 2708 RMD160 747f896a2d5e27c7f439f589ec504632df340425 SHA1 d0f5484540cdbc761197606c04033e67b1132e4a SHA256 142da2877b00422a0e7697af6c61d53d489dcddf9918241cfc51cfb7205f8495
+MD5 1c79321320dc4131a1817d73d3c205f3 files/amphetamine-0.8.10-64bit.patch 2708
+RMD160 747f896a2d5e27c7f439f589ec504632df340425 files/amphetamine-0.8.10-64bit.patch 2708
+SHA256 142da2877b00422a0e7697af6c61d53d489dcddf9918241cfc51cfb7205f8495 files/amphetamine-0.8.10-64bit.patch 2708
 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 1167 RMD160 cf7f4785677904ed1e1b58f481db71853785051e SHA1 b5ec66bf80227d2ea2694966fcf0be47509090f8 SHA256 c48e84a92b3d151d18578d9c6ea201fba6908f5ecf8ff64ac6ab6b50722918c9
-MD5 f4c3291bd6236445e09a5e42d9a7dbab amphetamine-0.8.10.ebuild 1167
-RMD160 cf7f4785677904ed1e1b58f481db71853785051e amphetamine-0.8.10.ebuild 1167
-SHA256 c48e84a92b3d151d18578d9c6ea201fba6908f5ecf8ff64ac6ab6b50722918c9 amphetamine-0.8.10.ebuild 1167
+EBUILD amphetamine-0.8.10.ebuild 1310 RMD160 c2db539a84e3d2a34199b81ff87121217a63d565 SHA1 8723b729e1664d7f1855dc99db1d7702b6ed7ece SHA256 1358f3abd24a7465da805deffe41c374325426383d961deb78f1f964c7355571
+MD5 e140226cc138ece3a9b0dc42a9539971 amphetamine-0.8.10.ebuild 1310
+RMD160 c2db539a84e3d2a34199b81ff87121217a63d565 amphetamine-0.8.10.ebuild 1310
+SHA256 1358f3abd24a7465da805deffe41c374325426383d961deb78f1f964c7355571 amphetamine-0.8.10.ebuild 1310
 MISC ChangeLog 1008 RMD160 d1ba163ec8a25afb066c0e334a2413de1762e254 SHA1 85c13eef73d4847e66d64abd5cca92d23f7d2824 SHA256 8ec6e478e6fe916d3351b03e2335862b52da4b7c5f9e7234cefc04647b30f970
 MD5 b99f9fac2e17823c43ba0e46a8b94380 ChangeLog 1008
 RMD160 d1ba163ec8a25afb066c0e334a2413de1762e254 ChangeLog 1008
@@ -23,3 +22,10 @@ SHA256 95ef8354a631de9fe1a2f30495e68866e946f90c0b1910c53cef631b1c2d6537 metadata
 MD5 ee5aab18123da4278a49225af457169c files/digest-amphetamine-0.8.10 527
 RMD160 cdc35053707dec9aff01e607e45fa54e3fe7250c files/digest-amphetamine-0.8.10 527
 SHA256 1922d36c8151592fae0504b9bf93f118f5ee3e142f64d2e1796cec9b0260db76 files/digest-amphetamine-0.8.10 527
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHK50/dz7hIScOURERAh0vAJ4xTL4CSZlTRByF7NTUfpiYTbno6wCgpIdu
+vR515D10a1Omprgpc7iE68g=
+=n08x
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/amphetamine/amphetamine-0.8.10.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
index 5c236b33d470..34954beafa17 100644
--- a/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
+++ b/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 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.4 2007/11/02 21:23:52 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/amphetamine/amphetamine-0.8.10.ebuild,v 1.5 2007/11/02 21:57:14 nyhm Exp $
 
-inherit eutils games toolchain-funcs
+inherit eutils toolchain-funcs games
 
-DESCRIPTION="a cool Jump'n Run game offering some unique visual effects."
+DESCRIPTION="a cool Jump'n Run game offering some unique visual effects"
 HOMEPAGE="http://n.ethz.ch/student/loehrerl/amph/amph.html"
 SRC_URI="http://n.ethz.ch/student/loehrerl/amph/files/${P}.tar.bz2
 	http://n.ethz.ch/student/loehrerl/amph/files/${PN}-data-0.8.6.tar.bz2"
@@ -17,22 +17,28 @@ IUSE=""
 DEPEND="media-libs/libsdl
 	x11-libs/libXpm"
 
-src_compile() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/020_assumed_sizeof_long.diff
-	sed -i -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" Makefile
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed."
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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"
 }
 
 src_install() {
-	newgamesbin amph ${PN}
-
+	newgamesbin amph ${PN} || die "newgamesbin failed"
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r ../amph/* || die "doins failed."
-
-	dodoc BUGS ChangeLog NEWS README || die "dodoc failed."
+	doins -r ../amph/* || die "doins failed"
 	newicon amph.xpm ${PN}.xpm
 	make_desktop_entry ${PN} Amphetamine ${PN}
-
+	dodoc BUGS ChangeLog NEWS README
 	prepgamesdirs
 }
diff --git a/games-arcade/amphetamine/files/020_assumed_sizeof_long.diff b/games-arcade/amphetamine/files/amphetamine-0.8.10-64bit.patch
index b7588face714..b7588face714 100644
--- a/games-arcade/amphetamine/files/020_assumed_sizeof_long.diff
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-64bit.patch
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-gentoo.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-gentoo.patch
deleted file mode 100644
index ee55897a84a9..000000000000
--- a/games-arcade/amphetamine/files/amphetamine-0.8.10-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2007-02-08 21:17:12.000000000 +0100
-+++ Makefile	2007-02-08 21:22:07.000000000 +0100
-@@ -4,7 +4,7 @@
- 
- # Install Paths
- PREFIX := /usr/local
--INSTALL_DIR := ${PREFIX}/games/amph
-+INSTALL_DIR := @GENTOO_DATADIR@
- 
- # Libraries
- USE_LIB_XPM := TRUE