make the nasm call more yasm friendly

Package-Manager: portage-2.1.2.9

3 files changed, 28 insertions, 30 deletions

diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog
index f836ca5792c7..4ea8de3fc7ad 100644
--- a/games-engines/scummvm/ChangeLog
+++ b/games-engines/scummvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/scummvm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.49 2007/07/06 17:47:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.50 2007/07/30 04:52:36 mr_bones_ Exp $
+
+  30 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  scummvm-0.10.0.ebuild:
+  make the nasm call more yasm friendly
 
   06 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> scummvm-0.10.0.ebuild:
   Add a pkg_setup check for midi USE flag in alsa-lib.
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index f635d1e6ff6c..ebc26563faee 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,24 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX flac-1.1.3.patch 19758 RMD160 453ccfacfe7ce9bc9a917ff5a81564fe78b4f213 SHA1 a6b06fbb13c1864ce7d21906e7ff7c0d9e00853a SHA256 b48da44ec6e37bc1a220e3f8dc88805c45aaab7ddc5e5d9d5c02ae90dca4dbc4
 MD5 6df789e547b467ce3ad5c7e2ab05ca48 files/flac-1.1.3.patch 19758
 RMD160 453ccfacfe7ce9bc9a917ff5a81564fe78b4f213 files/flac-1.1.3.patch 19758
 SHA256 b48da44ec6e37bc1a220e3f8dc88805c45aaab7ddc5e5d9d5c02ae90dca4dbc4 files/flac-1.1.3.patch 19758
 DIST scummvm-0.10.0.tar.bz2 4756977 RMD160 6de5ecbf1006f47287fd665acaf6af1fdaf27b8b SHA1 f0c4885300ea8d6a804eb4f3ece86f85bab44e6d SHA256 c9d1c68937cde4e4f2ba01c9b43bc745721fdd6c89064b3a60cf5ba2d7263126
 DIST scummvm-0.9.1.tar.bz2 4514100 RMD160 c77a7fa4251b6f6ee303dc35049671547dffed7a SHA1 6fcd00903f13fbafab65b432458e097f0e0d5d83 SHA256 5cd5d9c06281a4f81d85d9a9f9b0410045d4a764a855f06f574183b528c15d1a
-EBUILD scummvm-0.10.0.ebuild 2916 RMD160 e152f9491d9af47c7c4ebeeba58a1f06b1056231 SHA1 1977990572026836031de1643bdf318bc98f82ea SHA256 625e44e65c57ee7f3c6c736fecdfe140a8fdf8fe5bcbe5cba3fe0a7c6e16c4ae
-MD5 1cc81755e5423e429d5b7c87c05d062d scummvm-0.10.0.ebuild 2916
-RMD160 e152f9491d9af47c7c4ebeeba58a1f06b1056231 scummvm-0.10.0.ebuild 2916
-SHA256 625e44e65c57ee7f3c6c736fecdfe140a8fdf8fe5bcbe5cba3fe0a7c6e16c4ae scummvm-0.10.0.ebuild 2916
+EBUILD scummvm-0.10.0.ebuild 3001 RMD160 60a8861eb962b76a0fcce84c389bc706572dc99a SHA1 63817b0d7d176a914a5511e9e5728a233b64997e SHA256 04db9983b6606ff5d3c3deea99bfca5f84cdb1eb3a5773b20cef5a3ae5bd4b3f
+MD5 0f7aac8e838764ba33c98da56b5640ef scummvm-0.10.0.ebuild 3001
+RMD160 60a8861eb962b76a0fcce84c389bc706572dc99a scummvm-0.10.0.ebuild 3001
+SHA256 04db9983b6606ff5d3c3deea99bfca5f84cdb1eb3a5773b20cef5a3ae5bd4b3f scummvm-0.10.0.ebuild 3001
 EBUILD scummvm-0.9.1.ebuild 2619 RMD160 f3b58a6830412ad69c77cedf59dd6e6ba7301cea SHA1 65affcae6a1e941a88b27cf500c9e5ce25019a4d SHA256 52e92dc940f43f110aad2f813dfb39cb232b724406a0ce7f8ad13ddfca5fbd39
 MD5 e2b4759c6fe1a2662ad2a19fe1fef32c scummvm-0.9.1.ebuild 2619
 RMD160 f3b58a6830412ad69c77cedf59dd6e6ba7301cea scummvm-0.9.1.ebuild 2619
 SHA256 52e92dc940f43f110aad2f813dfb39cb232b724406a0ce7f8ad13ddfca5fbd39 scummvm-0.9.1.ebuild 2619
-MISC ChangeLog 8740 RMD160 89d0bcc578ac909b0ee812aac5d3aa697859e13a SHA1 dd492e938a4ad1b0b6ae418367526d2860f55618 SHA256 a7881d9769a539e9db2e013d836fa39ffe97df3b00099b4bd2aa53b59b7e33f9
-MD5 0fcec22e140afd4490b73ac461fe314f ChangeLog 8740
-RMD160 89d0bcc578ac909b0ee812aac5d3aa697859e13a ChangeLog 8740
-SHA256 a7881d9769a539e9db2e013d836fa39ffe97df3b00099b4bd2aa53b59b7e33f9 ChangeLog 8740
+MISC ChangeLog 8861 RMD160 010153aa4b357c381e4291b8c801f405962749ec SHA1 f13661ecd09e615295c59781df2b57e0358fec2d SHA256 5bfc5ed9293709794f7046d16bc68556d910f7efc8dd24a8d77da60880eacaaf
+MD5 687d61bcc8eaa2909bb3cdf34c8ee45e ChangeLog 8861
+RMD160 010153aa4b357c381e4291b8c801f405962749ec ChangeLog 8861
+SHA256 5bfc5ed9293709794f7046d16bc68556d910f7efc8dd24a8d77da60880eacaaf ChangeLog 8861
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -29,10 +26,3 @@ SHA256 ccc04ca43715ab04f0076789fd1bc46055e8b00b307452ad99cf2e6bce0fc5f2 files/di
 MD5 92a21c660ff73f3f44da16267555d7c0 files/digest-scummvm-0.9.1 247
 RMD160 3c61c63984531c494fa62bd59a8385143a142010 files/digest-scummvm-0.9.1 247
 SHA256 2e16d33743687dd58e4cf7760d1e525db223323ac32dab47808221c9f5446e0a files/digest-scummvm-0.9.1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGjoBzAiZjviIA2XgRAmg9AKC72XOGBcWd3Ej73T4XXKhFZHnlPgCdG80u
-I++J5aSG9+eLQT+xN8L7heI=
-=lnn7
------END PGP SIGNATURE-----
diff --git a/games-engines/scummvm/scummvm-0.10.0.ebuild b/games-engines/scummvm/scummvm-0.10.0.ebuild
index 079fbb155298..83151d211e90 100644
--- a/games-engines/scummvm/scummvm-0.10.0.ebuild
+++ b/games-engines/scummvm/scummvm-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-0.10.0.ebuild,v 1.3 2007/07/06 17:47:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-0.10.0.ebuild,v 1.4 2007/07/30 04:52:36 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -38,19 +38,23 @@ pkg_setup() {
 }
 
 src_unpack() {
+	local f
+
 	unpack ${A}
 	cd "${S}"
-	if use x86 ; then
-		local f
-		for f in graphics/scaler/{hq3x_i386.asm,hq2x_i386.asm}
-		do
-		cat >> $f <<EOF
-		%ifidn __OUTPUT_FORMAT__,elf
-		section .note.GNU-stack noalloc noexec nowrite progbits
-		%endif
+	# -g isn't needed for nasm here
+	sed -i \
+		-e '/NASMFLAGS/ s/-g//' \
+		./Makefile.common \
+		|| die "sed failed"
+	for f in graphics/scaler/{hq3x_i386.asm,hq2x_i386.asm}
+	do
+	cat >> $f <<EOF
+	%ifidn __OUTPUT_FORMAT__,elf
+	section .note.GNU-stack noalloc noexec nowrite progbits
+	%endif
 EOF
-		done
-	fi
+	done
 }
 
 src_compile() {