Replaced the faulty 'ASM VOLATILE' patch with a proper fix to the offending clobbered bx registers in camm_dpa.h (see bug #128178).

Package-Manager: portage-2.1.2_pre2

5 files changed, 43 insertions, 19 deletions

diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog
index fa0381d99843..2fb8aa88dada 100644
--- a/sci-libs/lapack-atlas/ChangeLog
+++ b/sci-libs/lapack-atlas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/lapack-atlas
 # Copyright 2004-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.29 2006/09/12 13:33:49 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.30 2006/10/03 19:52:50 markusle Exp $
+
+  03 Oct 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/atlas-asm-gentoo.patch, lapack-atlas-3.7.17.ebuild:
+  Replaced the faulty "ASM VOLATILE" patch with a proper fix to
+  the offending clobbered bx registers in camm_dpa.h (see
+  bug #128178). Thanks to Fabio Rossi <rossi.f@inwind.it> for his 
+  patch. 
 
 *lapack-atlas-3.7.17 (12 Sep 2006)
 
diff --git a/sci-libs/lapack-atlas/Manifest b/sci-libs/lapack-atlas/Manifest
index a1a2407936e5..d8532624c7a1 100644
--- a/sci-libs/lapack-atlas/Manifest
+++ b/sci-libs/lapack-atlas/Manifest
@@ -2,6 +2,10 @@ AUX 3.7.11-allow-any-gcc-version.patch 841 RMD160 0274d6286be0d35fb4bcc1a3b6e39b
 MD5 ba55197b98178c74b13d36833675ca88 files/3.7.11-allow-any-gcc-version.patch 841
 RMD160 0274d6286be0d35fb4bcc1a3b6e39b4a5179bbfa files/3.7.11-allow-any-gcc-version.patch 841
 SHA256 9031e6386d5e082be14d7d6e67b38a833893a404193239746e9d94162ccd7c87 files/3.7.11-allow-any-gcc-version.patch 841
+AUX atlas-asm-gentoo.patch 408 RMD160 3cea2f4a5a96ec22a4d0cfc78d691198a2d1a0da SHA1 493d066be68c66cca1f0c906d588da8983ec7afa SHA256 00f9247d422c758ef8ff43446a36a6dbb7962f94e5d01307318c87a90a78355b
+MD5 fb9ca923b595b67967a744339e7a32a6 files/atlas-asm-gentoo.patch 408
+RMD160 3cea2f4a5a96ec22a4d0cfc78d691198a2d1a0da files/atlas-asm-gentoo.patch 408
+SHA256 00f9247d422c758ef8ff43446a36a6dbb7962f94e5d01307318c87a90a78355b files/atlas-asm-gentoo.patch 408
 AUX eselect.lapack 161 RMD160 22d89925e857f8c9622612a536bff854be604312 SHA1 ee6f175ef69f74ce74e41409df4efc2594ca9d24 SHA256 89c3804539087292d41cd07c61ed4a1b3590ca1f1e1265e6820ec5b6bb0e3292
 MD5 54f1131c5c1d67c165c24efbcc3063d9 files/eselect.lapack 161
 RMD160 22d89925e857f8c9622612a536bff854be604312 files/eselect.lapack 161
@@ -22,7 +26,7 @@ AUX war 545 RMD160 6f44c25e739703f988180959608094aa633db7bf SHA1 d90a66e57395e01
 MD5 13d26350d75e6993f1b3ec48ca97f14e files/war 545
 RMD160 6f44c25e739703f988180959608094aa633db7bf files/war 545
 SHA256 696a8e1cc3918ce5d19f0aa41250d5f052244527a5e3804b025db7938f06ae7b files/war 545
-DIST atlas-3.7.15-shared-libs.patch.bz2 6769 RMD160 6c9922e4c6236a1c6bb07af3862d023678d86a31 SHA1 d28c49f7506df70320b543790f40491880422207 SHA256 6539ea2ecff0e7d84d1968fb9cf9a60e1300e505dd1882f74c386e3dd63baa6d
+DIST atlas-3.7.17-shared-libs.patch.bz2 11666 RMD160 6db89c885edb40e0fd989f434bfc5fb6ca78cca7 SHA1 342f247e43cee2bd03cbed278887b197dc8fe2e0 SHA256 79afe15964e22cc9e8fd13f660734255703e6d7cdfda7638b9226b832f733d9e
 DIST atlas3.6.0-shared-libs.3.patch.bz2 5140 RMD160 d6085b2729f2b8ed917b1d0a85339bd07f4192f9 SHA1 a9f234416bdbc1a752196f48707a066687fdfeb2 SHA256 9cd442b35c869c90b569154bf82a8f18c92fb5e0221c26c7cff23b0a7e9e2cd8
 DIST atlas3.6.0-shared-libs.patch.bz2 5140 RMD160 2c266377cd60b24b7710fcf1d6d4be9c32797d64 SHA1 ec4c87075c03133e0f1e2fe22cd9768124c758b7 SHA256 6fd8281d42de14d34e4f1e25cb9f4b142f6e66c8dc1030763761f8033eb38e89
 DIST atlas3.6.0.tar.bz2 1687723 RMD160 e7d40a6677ce7c4442df7152150aecf812020713 SHA1 61dd7ace2f43e9a10864148a71fa443a6eae2c3d SHA256 1c2ad68fe3c66e261c012788fc1b6f74eada791f713848a3a6420c50fa35c8e8
@@ -51,14 +55,14 @@ EBUILD lapack-atlas-3.7.11.ebuild 6396 RMD160 09e2f3b62ac53f2207d05b16a388eed6b8
 MD5 784041fae6d66917a49a23e59e5f1fd2 lapack-atlas-3.7.11.ebuild 6396
 RMD160 09e2f3b62ac53f2207d05b16a388eed6b8bc3519 lapack-atlas-3.7.11.ebuild 6396
 SHA256 b448b19ffaebedcaa66925bce9e5ec5d9e3d66c209fdc627d81b7a1c17a79108 lapack-atlas-3.7.11.ebuild 6396
-EBUILD lapack-atlas-3.7.17.ebuild 4246 RMD160 d2e0d55ff99c4ba006ac544bd9573d90530f3b7b SHA1 91ffad9c0531c8ce4eb286ed1b6daf758ffb067b SHA256 35db7c87281ebd0e12c095116ced63ccaf3916022261683f4d3f82959963ea6d
-MD5 c92fe1775a2d91cd68dfff92df6a1435 lapack-atlas-3.7.17.ebuild 4246
-RMD160 d2e0d55ff99c4ba006ac544bd9573d90530f3b7b lapack-atlas-3.7.17.ebuild 4246
-SHA256 35db7c87281ebd0e12c095116ced63ccaf3916022261683f4d3f82959963ea6d lapack-atlas-3.7.17.ebuild 4246
-MISC ChangeLog 7784 RMD160 c6e1618228a132d6127d6a8d21694ecc501301c5 SHA1 066af641ab8b63bafd05c4d0609ab9863391ca6d SHA256 fd70e57462dc13622742bca5cea6af92f9aa31b10be406873e3a325f0751b05e
-MD5 ed7145675ecc8e0e19ad0c425ac22bc9 ChangeLog 7784
-RMD160 c6e1618228a132d6127d6a8d21694ecc501301c5 ChangeLog 7784
-SHA256 fd70e57462dc13622742bca5cea6af92f9aa31b10be406873e3a325f0751b05e ChangeLog 7784
+EBUILD lapack-atlas-3.7.17.ebuild 4292 RMD160 a6f7bcad00b7c297868cd027d543b0b827a39cfd SHA1 2b123c8a8554c754cad54b0a345a0bde68fedb20 SHA256 e8283740d776fba0d1612d4461777f827f81e118c6b8fa85e714413e4d3b77b8
+MD5 a0066a6938989292d87ecebe072e5a7b lapack-atlas-3.7.17.ebuild 4292
+RMD160 a6f7bcad00b7c297868cd027d543b0b827a39cfd lapack-atlas-3.7.17.ebuild 4292
+SHA256 e8283740d776fba0d1612d4461777f827f81e118c6b8fa85e714413e4d3b77b8 lapack-atlas-3.7.17.ebuild 4292
+MISC ChangeLog 8098 RMD160 292cde9c79453836c4e17e04e1f2492ea4180e99 SHA1 04a727bd842620ac5ce4399e5bcacc2975b4a85f SHA256 5b5cc9d08e8b9055f97d893623e5def57b6e3455a6de8f51150a66c7b2ce8740
+MD5 d3351160106224870a93493994f0f1d8 ChangeLog 8098
+RMD160 292cde9c79453836c4e17e04e1f2492ea4180e99 ChangeLog 8098
+SHA256 5b5cc9d08e8b9055f97d893623e5def57b6e3455a6de8f51150a66c7b2ce8740 ChangeLog 8098
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -78,6 +82,6 @@ SHA256 7abbea8b0726d30986843355a91120d6ea353bf9125e2c8d594e4fbaa4454e40 files/di
 MD5 ce20dffc8b3b879e4067d5514d269b96 files/digest-lapack-atlas-3.7.11-r1 1244
 RMD160 1f149774ccfe43809b7b697264c15415f3ea4682 files/digest-lapack-atlas-3.7.11-r1 1244
 SHA256 7abbea8b0726d30986843355a91120d6ea353bf9125e2c8d594e4fbaa4454e40 files/digest-lapack-atlas-3.7.11-r1 1244
-MD5 e8ded8e1e98c9f18eafbe3de086061d6 files/digest-lapack-atlas-3.7.17 1012
-RMD160 af9764d6100c4e635850e4b88fce6f680e7bbbae files/digest-lapack-atlas-3.7.17 1012
-SHA256 a7770d5685a522b751b00533a46fe91cf890ba1484e0a9879f0ab11272ebd477 files/digest-lapack-atlas-3.7.17 1012
+MD5 741216b67d2059c825d8e07e5b3c80ec files/digest-lapack-atlas-3.7.17 1015
+RMD160 81a63b42775d4de9d4244c0e25331f6d64b69fd8 files/digest-lapack-atlas-3.7.17 1015
+SHA256 b816c9f77320a182af4380e00f01dec4474e14b5f9d5848882777ac6a4420b98 files/digest-lapack-atlas-3.7.17 1015
diff --git a/sci-libs/lapack-atlas/files/atlas-asm-gentoo.patch b/sci-libs/lapack-atlas/files/atlas-asm-gentoo.patch
new file mode 100644
index 000000000000..ca5a7a8eeb51
--- /dev/null
+++ b/sci-libs/lapack-atlas/files/atlas-asm-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Naur ATLAS/include/contrib/camm_dpa.h ATLAS-new/include/contrib/camm_dpa.h
+--- ATLAS/include/contrib/camm_dpa.h	2006-09-09 15:33:15.000000000 -0400
++++ ATLAS-new/include/contrib/camm_dpa.h	2006-09-26 10:18:24.000000000 -0400
+@@ -1619,7 +1619,7 @@
+ #if defined(SCPLX) || (defined(DCPLX) && defined(ATL_SSE2))
+ 	 ,"m" (w)
+ #endif
+-	 :"ax","bx","cx","dx","si","di");
++	 :"ax","cx","dx","si","di");
+ 
+ 
+ }
diff --git a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.17 b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.17
index 26be7364bc9a..0a6276a2dde7 100644
--- a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.17
+++ b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.17
@@ -1,6 +1,6 @@
-MD5 4d85e976f592f02afa54a82d3890ff22 atlas-3.7.15-shared-libs.patch.bz2 6769
-RMD160 6c9922e4c6236a1c6bb07af3862d023678d86a31 atlas-3.7.15-shared-libs.patch.bz2 6769
-SHA256 6539ea2ecff0e7d84d1968fb9cf9a60e1300e505dd1882f74c386e3dd63baa6d atlas-3.7.15-shared-libs.patch.bz2 6769
+MD5 101af1b5d02319c77672a5a77fecf24b atlas-3.7.17-shared-libs.patch.bz2 11666
+RMD160 6db89c885edb40e0fd989f434bfc5fb6ca78cca7 atlas-3.7.17-shared-libs.patch.bz2 11666
+SHA256 79afe15964e22cc9e8fd13f660734255703e6d7cdfda7638b9226b832f733d9e atlas-3.7.17-shared-libs.patch.bz2 11666
 MD5 00f68b5ccdc4bbbaeefa086e6d8e38ff atlas3.7.17.tar.bz2 1746646
 RMD160 6545fa2ae68667d12ec36e01adccc85607de7b5d atlas3.7.17.tar.bz2 1746646
 SHA256 35a20f7a97bf1da14030aebfed39b14cc88d241fa0da4993bb995c112fb2232c atlas3.7.17.tar.bz2 1746646
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.17.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.17.ebuild
index b4526bca8ce8..41684d0f7cf5 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.7.17.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.7.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.7.17.ebuild,v 1.1 2006/09/12 13:33:49 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.7.17.ebuild,v 1.2 2006/10/03 19:52:50 markusle Exp $
 
 inherit eutils flag-o-matic toolchain-funcs fortran
 
@@ -12,7 +12,7 @@ SRC_URI1="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2"
 SRC_URI2="http://www.netlib.org/lapack/lapack.tgz"
 SRC_URI="${SRC_URI1} ${SRC_URI2}
 	mirror://gentoo/lapack-20020531-20021004.patch.bz2
-	mirror://gentoo/${MY_PN}-3.7.15-shared-libs.patch.bz2"
+	mirror://gentoo/${MY_PN}-${PV}-shared-libs.patch.bz2"
 
 SLOT="0"
 IUSE="doc"
@@ -50,7 +50,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${WORKDIR}"
 
-	epatch "${DISTDIR}"/${MY_PN}-3.7.15-shared-libs.patch.bz2
+	epatch "${DISTDIR}"/${MY_PN}-${PV}-shared-libs.patch.bz2
+	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
 	epatch "${DISTDIR}"/lapack-20020531-20021004.patch.bz2
 	epatch "${FILESDIR}"/lapack-reference-3.0-autotool.patch