Fix patch to unpack and compile.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo x86_64

4 files changed, 15 insertions, 13 deletions

diff --git a/app-emulation/simh/ChangeLog b/app-emulation/simh/ChangeLog
index 157df2c639db..1a06b64b4f19 100644
--- a/app-emulation/simh/ChangeLog
+++ b/app-emulation/simh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/simh
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/ChangeLog,v 1.9 2009/01/04 14:40:35 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/ChangeLog,v 1.10 2009/01/12 22:03:01 flameeyes Exp $
+
+  12 Jan 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  files/simh-3.7.0-asneeded.patch, simh-3.7.0.ebuild:
+  Fix patch to unpack and compile.
 
   04 Jan 2009; Christoph Mende <angelos@gentoo.org>
   +files/simh-3.7.0-asneeded.patch, simh-3.7.0.ebuild:
diff --git a/app-emulation/simh/Manifest b/app-emulation/simh/Manifest
index 306c843409b3..de6e15b55a17 100644
--- a/app-emulation/simh/Manifest
+++ b/app-emulation/simh/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA1
 
 AUX makefile.patch 383 RMD160 90fc07b498c797a5b69bacfc0cb5c73b9ef2465b SHA1 d9e815a9610c8ddf8ada2826df3716a353e2d5c1 SHA256 89004ead180b37dc02a5e1121e61fd88b1c8cb9dbcc4b7ed13b72a3d1a69eb65
-AUX simh-3.7.0-asneeded.patch 5223 RMD160 666b01a2f94fa0c4251706d2659ce4d06e65da63 SHA1 ed53b47f742a762060c2cb5c73d5c649ef96c76f SHA256 53194d19c5a6eaded5262e903b85a01551c6a5d7f05f1dc61c1c29e63daae485
+AUX simh-3.7.0-asneeded.patch 5154 RMD160 bb8625b7bf9fe219b1149c2e916639ed50bf5df7 SHA1 6c1dfc14364b4c3157cbaaf3d0e54709e0ef4409 SHA256 c263c722db83e42480d5c074e1bd5cba696430941f9fd85aeaf756ce2a62d82f
 DIST simhv33-0.zip 2153444 RMD160 778cc7836b4558b57f1b9ca54427f3d2e8da94a4 SHA1 99a021afe2fd8dfb32bb479e383347e2b883e0f9 SHA256 28fcdc8443f6e2460193eb6ed8d41be95d75226490926219a0dfd5028eaf051c
 DIST simhv35-2.zip 2259795 RMD160 27d3a95689aed7f0781137dbf158ba87716d04b3 SHA1 f0a3926ee0a4d0f275df3fa092f9982bd4521479 SHA256 12c6e6290b599b7f131027a533ee12add8d68735128805e012309db46f2ab9fb
 DIST simhv37-0.zip 2362666 RMD160 7ecd3177d17c871a4b33fae13111fa0a19678511 SHA1 e24a777d98026dcb745c0a06203e9a96f4d0fc30 SHA256 23ae538b7607d231d9e64c170b7a4cc7b7c9d0c1c8bbd662c565ac0a56d15069
 EBUILD simh-3.3.0.ebuild 1113 RMD160 b074564a005039434a04bf2d2cb702b8773f9f0b SHA1 da3776b4d48ae999b081634e3426e1bf71151278 SHA256 1f86ed3ace478ad1850c161a66a3590b3d6fc30f50cb0c4845030f1b77e6baaf
 EBUILD simh-3.5.2.ebuild 1117 RMD160 6a489694541577042b09c2fdf5613104c367f84c SHA1 52195637bb51cf156d1d6f89866b626135e8e457 SHA256 bcd4137c676671a78747b67bceec611e861240b4eadc4e0061a9549b1dd4aea5
-EBUILD simh-3.7.0.ebuild 1259 RMD160 effeb5f864c8f751d0439a292090ab8a75697842 SHA1 db8b41c307d379e4b3f11646fc360f7155cc6853 SHA256 0baa35655027be8a05312d69c529970bbb62054672523d72434e1ac4c775a205
-MISC ChangeLog 1441 RMD160 2bf9d0ab350da4a0dca3de2df3b1c381f837063c SHA1 a3a67081670ab10702d2c838fc9a648acf4e207b SHA256 9b3d83566dde7c9447c2e65e8314fb7bcfcab062584e6c60e4597362bc2a24d3
+EBUILD simh-3.7.0.ebuild 1191 RMD160 54935695ae5dda9a30011f4ffc237e72acddb984 SHA1 6217286d6b7b669782affb8ccad89afae4bf78c6 SHA256 c276cd7b9323575bce2cb17f76545a69a2a4922420dbf557ac5b7926994a7d95
+MISC ChangeLog 1590 RMD160 5e7f03e3201ddf969b26614d42463c999e30296e SHA1 55ef115fe57036ad5697b25203e4b8b426a1b104 SHA256 2778a74b94ac6cea999dc09899bee683d7a3f122f4d65ab959e8aebc4b28a9ca
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklgyrQACgkQKhnDs22gwa+O0ACg/moGpKiq3wsUPouZeGnmUont
-IioAnRakKKg6cGxiEz6Ny6Nw4IvDI+GA
-=Lehv
+iEYEARECAAYFAklrvigACgkQAiZjviIA2XjK3wCfbH7uNAgkCwMPsVWVbLumrcMi
+75cAmQEkzfkOriBFpEKdolVYREpvvPjK
+=95ac
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/simh/files/simh-3.7.0-asneeded.patch b/app-emulation/simh/files/simh-3.7.0-asneeded.patch
index fd64bbbfdff5..804606a55f26 100644
--- a/app-emulation/simh/files/simh-3.7.0-asneeded.patch
+++ b/app-emulation/simh/files/simh-3.7.0-asneeded.patch
@@ -4,8 +4,8 @@
  else
  OS_CCDEFS = -D_GNU_SOURCE
  endif
--CC = x86_64-pc-linux-gnu-gcc -std=c99 -march=native -Os -pipe -U__STRICT_ANSI__ -lm -lrt $(OS_CCDEFS) -I .
-+CC = x86_64-pc-linux-gnu-gcc -std=c99 -march=native -Os -pipe -U__STRICT_ANSI__ $(OS_CCDEFS) -I .
+-CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm -lrt $(OS_CCDEFS) -I .
++CC := $(CC) -std=c99 -U__STRICT_ANSI__ $(OS_CCDEFS) -I. $(CFLAGS)
 +LIBS = -lm -lrt
  ifeq ($(USE_NETWORK),)
  else
diff --git a/app-emulation/simh/simh-3.7.0.ebuild b/app-emulation/simh/simh-3.7.0.ebuild
index 22ec46d115d4..c45d92bdeb5e 100644
--- a/app-emulation/simh/simh-3.7.0.ebuild
+++ b/app-emulation/simh/simh-3.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.7.0.ebuild,v 1.4 2009/01/04 14:40:35 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.7.0.ebuild,v 1.5 2009/01/12 22:03:01 flameeyes Exp $
 
 inherit eutils toolchain-funcs versionator
 
@@ -29,14 +29,12 @@ src_unpack() {
 	# convert makefile from dos format to unix format
 	edos2unix makefile
 
-	sed -i -e "s:gcc:$(tc-getCC):" \
-		-e "s: -g::" \
-		-e "s:-O2:${CFLAGS}:" makefile
 	epatch "${FILESDIR}/makefile.patch" \
 		"${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {
+	tc-export CC
 	emake || die "make failed"
 }