Remove forced -mcpu=pentium4 from cudd's Makefile. This fixes bug #327425 reported by Christopher Head <chris2k01@hotmail.com>. Also, added code to use correct Makefile for 64-bit systems.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 29 insertions, 14 deletions

diff --git a/sci-mathematics/nusmv/ChangeLog b/sci-mathematics/nusmv/ChangeLog
index 90480a1f68e7..639748f95bd4 100644
--- a/sci-mathematics/nusmv/ChangeLog
+++ b/sci-mathematics/nusmv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/nusmv
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/ChangeLog,v 1.9 2010/06/22 20:03:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/ChangeLog,v 1.10 2010/07/13 02:22:15 phajdan.jr Exp $
+
+  13 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/cudd-no-pentium4.patch, nusmv-2.5.0.ebuild:
+  Remove forced -mcpu=pentium4 from cudd's Makefile. This fixes bug #327425
+  reported by Christopher Head <chris2k01@hotmail.com>. Also, added code to
+  use correct Makefile for 64-bit systems.
 
 *nusmv-2.5.0 (22 Jun 2010)
 
diff --git a/sci-mathematics/nusmv/Manifest b/sci-mathematics/nusmv/Manifest
index 222743c5eeb9..3535f9aa90ab 100644
--- a/sci-mathematics/nusmv/Manifest
+++ b/sci-mathematics/nusmv/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX MiniSat_v1.14-optimizedlib.patch 1112 RMD160 9ae63aef1b74fac1bad9ee62049460856b5c5982 SHA1 7a2ee88eef0591690a2a728c07b68fdd882addda SHA256 21016b1ce69553c058385afa93f13248dbdc398c7968609d86dd9b707e227bfb
 AUX MiniSat_v1.14_gcc41.patch 4568 RMD160 59cccf1bfd15a4913c6026875639212859ce1ffa SHA1 532288df7231053ec41bbc11a02a1ec12ec396a4 SHA256 05179a822cca176f76340b2a5a9ffab1128d7018a1dfee743fb937abdc8233d9
+AUX cudd-no-pentium4.patch 543 RMD160 c8e515030b86b8e4015d9ced671f3e3a23198521 SHA1 dea4d453e9db55711a69a607e708bdf16359e09b SHA256 6e6818a69c111d28eb17d177e0935a065fbcdb844fcd06583cb59fe547a42edb
 DIST MiniSat_v1.14_src.zip 29428 RMD160 d5f0dc611a6116128d9a404f9045e02b185958b4 SHA1 266536cf5e5e77aa0478b98869bcd67ac1a523b6 SHA256 8e5e0ee84a770dcb3abd6fc65ed4aef938f9ffabca5ddc8a739029f7fb58a8f5
 DIST NuSMV-2.3.1.tar.gz 2590944 RMD160 74f00e1c29dabe98e04cf0d652b92d63a73b07dc SHA1 588d3b43f136273176f4a6056b474f9d872b977b SHA256 b8ba0f29afafdfdef8c30f722eead3ef6cbb17e4bfe5563240a01d8a99dbbf68
 DIST NuSMV-2.5.0.tar.gz 3792968 RMD160 aaa3b9dc1329ad3feca6c9511b144437caf83472 SHA1 4b2837b0511e9eaf0eee53395308e8eaba6be727 SHA256 59310f5f23f72cb1ad16419e40f245db7c5aa41c0f59ba5c75732bb6c4b56ff1
 EBUILD nusmv-2.3.1.ebuild 3331 RMD160 09aa89279858b6a6ac1be71adaf54545d4dffc54 SHA1 36c394fa4bbc8053059bd19be61ae8679983eb53 SHA256 43f713b4e5f21318516348f732f4129670235317724ce595d1e635aa0fbd91cd
-EBUILD nusmv-2.5.0.ebuild 3504 RMD160 5c4594ec3c14bd77fefb7346e8736c52385fd145 SHA1 feb109b871e3f50028e7511151d3392b9ba546d3 SHA256 bd2396e81e30647d88334f9cb6f71b0b75414de49eadf7d2e8b1ffe20634518e
-MISC ChangeLog 1528 RMD160 e7b6b30f32950d1c18bb9095b6e9b9758a0bf556 SHA1 10d7264837b2a1fcb4af40cdd55daf2353d98aa2 SHA256 341299d9a7043a303f8d11b39dca07557a71e348dd1504b6871d1938496262d4
+EBUILD nusmv-2.5.0.ebuild 3651 RMD160 b86a7cd49948dd97ca011b04334b512ad6e433ad SHA1 5e9e78e4fb025558f77bb5c18c68b8c16ae465a7 SHA256 f11dc1614bc52ae6b707d2adbd485e6698082b82cf325eeabd86f9ded2ffae2d
+MISC ChangeLog 1833 RMD160 e7614bbca6a08d2ccdcb2557519410478afd7eb6 SHA1 f16d318a76604b0c6767cc8b2bf28fa6e8e412bf SHA256 7ad45d973d724e4228e6c116cc8b6149456301db8eac123777941fd227496be0
 MISC metadata.xml 301 RMD160 95f4a72bad52574229901ce16d7d503b68cb22f9 SHA1 a62c653d31a41d1e11cea40d2d9366676d67d333 SHA256 b7f1f13dae0ffaaf9894bf5f5a95b351d63c630e9ccaab304b1edb8fa8f1c18c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwjlKwACgkQ1ycZbhPLE2CyPQCfbJFIhmfM4SpF+IwXFZXanAeL
-Ve8Anink3O+EtzQiYr4zkyahSb2piFv2
-=r+gd
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/nusmv/files/cudd-no-pentium4.patch b/sci-mathematics/nusmv/files/cudd-no-pentium4.patch
new file mode 100644
index 000000000000..844f7c00d638
--- /dev/null
+++ b/sci-mathematics/nusmv/files/cudd-no-pentium4.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2010-07-12 02:54:26.000000000 +0200
++++ Makefile	2010-07-12 02:54:49.000000000 +0200
+@@ -69,7 +69,7 @@
+ # Gcc 2.8.1 or higher on i686.
+ #XCFLAGS	= -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
+ # Gcc 3.2.2 or higher on i686.
+-XCFLAGS	= -mcpu=pentium4 -malign-double -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4
++XCFLAGS	= -malign-double -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4
+ # Icc on i686.
+ #XCFLAGS	= -ansi -align -ip -DHAVE_IEEE_754 -DBSD
+ # Gcc on ia64.
diff --git a/sci-mathematics/nusmv/nusmv-2.5.0.ebuild b/sci-mathematics/nusmv/nusmv-2.5.0.ebuild
index 15461364a9de..dd461fc55f7d 100644
--- a/sci-mathematics/nusmv/nusmv-2.5.0.ebuild
+++ b/sci-mathematics/nusmv/nusmv-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/nusmv-2.5.0.ebuild,v 1.1 2010/06/22 20:03:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/nusmv-2.5.0.ebuild,v 1.2 2010/07/13 02:22:15 phajdan.jr Exp $
 
 inherit eutils toolchain-funcs
 
@@ -57,6 +57,13 @@ src_unpack() {
 		epatch "${FILESDIR}"/${MINISAT_P}-optimizedlib.patch
 		epatch "${FILESDIR}"/${MINISAT_P}_gcc41.patch
 	fi
+
+	cd "${CUDD_S}"
+	epatch "${FILESDIR}"/${CUDD_PN}-no-pentium4.patch
+	if [[ "$(tc-arch)" = amd64 ]] ; then
+		mv Makefile_64bit Makefile || die
+	fi
+
 	for i in ${NUSMV_S}/doc/{user-man,tutorial}/Makefile.in ; do
 		sed -i.orig \
 			'/install_sh_DATA/s!$(datadir)!$(DESTDIR)$(datadir)!g' \