Disable installation of header files atlas_misc.h and atlas_enum.h since they are provided by blas-atlas and otherwise lead to file collisions. This fixes bug #143947.

Package-Manager: portage-2.1.1_pre5

8 files changed, 45 insertions, 33 deletions

diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog
index 23199090027c..8e9d05bf0d29 100644
--- a/sci-libs/lapack-atlas/ChangeLog
+++ b/sci-libs/lapack-atlas/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2006/08/04 13:37:50 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.17 2006/08/17 00:45:07 markusle Exp $
+
+  16 Aug 2006; Markus Dittrich <markusle@gentoo.org>
+  lapack-atlas-3.6.0.ebuild, lapack-atlas-3.6.0-r1.ebuild, lapack-atlas-3.6.0-r2.ebuild:
+  Disable installation of header files atlas_misc.h and atlas_enum.h
+  since they are provided by blas-atlas and otherwise lead to file
+  collisions. This fixes bug #143947.
 
   04 Aug 2006; Markus Dittrich <markusle@gentoo.org>
   lapack-atlas-3.7.11.ebuild, lapack-atlas-3.7.11-r1.ebuild:
diff --git a/sci-libs/lapack-atlas/Manifest b/sci-libs/lapack-atlas/Manifest
index e65e2441596e..f4336f74cfd0 100644
--- a/sci-libs/lapack-atlas/Manifest
+++ b/sci-libs/lapack-atlas/Manifest
@@ -15,24 +15,24 @@ MD5 13d26350d75e6993f1b3ec48ca97f14e files/war 545
 RMD160 6f44c25e739703f988180959608094aa633db7bf files/war 545
 SHA256 696a8e1cc3918ce5d19f0aa41250d5f052244527a5e3804b025db7938f06ae7b files/war 545
 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
+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
 DIST atlas3.7.11.tar.bz2 2032724 RMD160 f58b8a85c097bd1bff6a53ee42bcff97240fb8ec SHA1 7806c43147535f6422bdaacb4416aa06a5de0f07 SHA256 558b9f3f0dc8f63306f99f75d6e6fa762ea3d9d0dea88053e3e8b6f0e6364109
 DIST lapack-20020531-20021004.patch.bz2 59736 RMD160 126a579d242664dce53d23cdd7bef935e81b5031 SHA1 64f0e180a296c35a8050af293a6582e48d3394ae SHA256 19bcae60fcec3742563d8b27e21da52677b18520c54cf0cb7a51537ec3dbd29c
 DIST lapack-gentoo.patch 1272 RMD160 2bc28b1c8bbc7b77d977562e3550097bdb2a379b SHA1 8bf5087aa105be61032afd50f94a31cd3c362c9f SHA256 376b738c66dbbd8b116c3a48b99c1202dbd5c1c6c94865cf9df10ed48b78fb43
 DIST lapack.tgz 4991992 RMD160 630f9d7b4b37b0d39bccd4816198271b7e9e0cce SHA1 47d85508d87d60e32b613ef0c951d0be4bf10e72 SHA256 393613641f80745e7e8445fd0f3e4f5f66a5e340c8115cd4d780b0f53e2b31a6
-EBUILD lapack-atlas-3.6.0-r1.ebuild 4938 RMD160 40c3b4c8a597d2514487384d5fc5d85a119ceca7 SHA1 e061d595701fef3f9760c08286db80c0568fedf9 SHA256 41180efa86cd520b9e52f9f73b4aba28d806c286a6054494201fb82778dca85e
-MD5 48904c12036aa045c55a1f1d87e91531 lapack-atlas-3.6.0-r1.ebuild 4938
-RMD160 40c3b4c8a597d2514487384d5fc5d85a119ceca7 lapack-atlas-3.6.0-r1.ebuild 4938
-SHA256 41180efa86cd520b9e52f9f73b4aba28d806c286a6054494201fb82778dca85e lapack-atlas-3.6.0-r1.ebuild 4938
-EBUILD lapack-atlas-3.6.0-r2.ebuild 4967 RMD160 d5997eb15126b1707a4969dbadf308ffb3551fa3 SHA1 740dd52756913edbd893bac3f8c682a26165314c SHA256 98af676387adac89780ef0a2b401c146468dccdfe103125bb667654d253f3860
-MD5 a628f46e694d141b492f29b250c9cb6d lapack-atlas-3.6.0-r2.ebuild 4967
-RMD160 d5997eb15126b1707a4969dbadf308ffb3551fa3 lapack-atlas-3.6.0-r2.ebuild 4967
-SHA256 98af676387adac89780ef0a2b401c146468dccdfe103125bb667654d253f3860 lapack-atlas-3.6.0-r2.ebuild 4967
-EBUILD lapack-atlas-3.6.0.ebuild 5049 RMD160 32f6d8d268512861d5f6927cf9534f77a895e620 SHA1 885ddb61ebe20c7a37edc1cc94952891f86981b9 SHA256 402c1c8ff91d64152594832ffdb773f24c88b685fba73107fb78821d6a735b00
-MD5 cfd4e7226fb253eeb7c2edaadb9bd9ad lapack-atlas-3.6.0.ebuild 5049
-RMD160 32f6d8d268512861d5f6927cf9534f77a895e620 lapack-atlas-3.6.0.ebuild 5049
-SHA256 402c1c8ff91d64152594832ffdb773f24c88b685fba73107fb78821d6a735b00 lapack-atlas-3.6.0.ebuild 5049
+EBUILD lapack-atlas-3.6.0-r1.ebuild 4912 RMD160 a895a38c8e5f480b5a94b9fbfd04e2a85d34a529 SHA1 a0d1e593a19a69e321a70e00474671399432f5ca SHA256 9e86e6fcf9a0c3179ae0bdec5f881942a881fd1a03be91aa6ccd00daead8c280
+MD5 695148ab3717c79515be768f627ade06 lapack-atlas-3.6.0-r1.ebuild 4912
+RMD160 a895a38c8e5f480b5a94b9fbfd04e2a85d34a529 lapack-atlas-3.6.0-r1.ebuild 4912
+SHA256 9e86e6fcf9a0c3179ae0bdec5f881942a881fd1a03be91aa6ccd00daead8c280 lapack-atlas-3.6.0-r1.ebuild 4912
+EBUILD lapack-atlas-3.6.0-r2.ebuild 4940 RMD160 c83a7d9951e5ef152baae862850ebbffaa03d6a9 SHA1 9f5a8ae3662ea1cc023f4276cab6da247ea33492 SHA256 60b5dd5c6d3daf61ee8a1c46f6e8a2944e2b2f8ddac4dea1790437aedbb491b2
+MD5 daadbd62a694dbc9961673b88e6b371c lapack-atlas-3.6.0-r2.ebuild 4940
+RMD160 c83a7d9951e5ef152baae862850ebbffaa03d6a9 lapack-atlas-3.6.0-r2.ebuild 4940
+SHA256 60b5dd5c6d3daf61ee8a1c46f6e8a2944e2b2f8ddac4dea1790437aedbb491b2 lapack-atlas-3.6.0-r2.ebuild 4940
+EBUILD lapack-atlas-3.6.0.ebuild 5061 RMD160 d6d3deab2f46c6991abd5540e6c740ba943a50d4 SHA1 4e1bd500d0dda13b67e9184144ea10e750e5910a SHA256 2c4f8588ff5d267c2e601cf6bbd9dbd15d1a03ce6fd52e8cee8d798025c45816
+MD5 56df64ffedcf5af1e71c37434f844c81 lapack-atlas-3.6.0.ebuild 5061
+RMD160 d6d3deab2f46c6991abd5540e6c740ba943a50d4 lapack-atlas-3.6.0.ebuild 5061
+SHA256 2c4f8588ff5d267c2e601cf6bbd9dbd15d1a03ce6fd52e8cee8d798025c45816 lapack-atlas-3.6.0.ebuild 5061
 EBUILD lapack-atlas-3.7.11-r1.ebuild 6439 RMD160 82b363e36f96837eb4dcc3746d41f91cf9ebfc39 SHA1 73294f46ae252fddc1283d9b1bb48b5601948bdd SHA256 df60955c31f8db29b8d968d829d2bc5c0abcf66c315ced3eb1998f290f7908b7
 MD5 2fe2e2a0acbecb6ae62197171722df79 lapack-atlas-3.7.11-r1.ebuild 6439
 RMD160 82b363e36f96837eb4dcc3746d41f91cf9ebfc39 lapack-atlas-3.7.11-r1.ebuild 6439
@@ -41,23 +41,23 @@ EBUILD lapack-atlas-3.7.11.ebuild 6408 RMD160 7aa0a09891ab8951ebd243225a2cd283b3
 MD5 d73e5b8bb76ec86baee22b7c4466462e lapack-atlas-3.7.11.ebuild 6408
 RMD160 7aa0a09891ab8951ebd243225a2cd283b3a83f5d lapack-atlas-3.7.11.ebuild 6408
 SHA256 30bde9bb83c0180b98c6a593dd49d56a9d671f81ed9a2a0116072acec19c4d2e lapack-atlas-3.7.11.ebuild 6408
-MISC ChangeLog 5400 RMD160 e0327a115e1edb4513db09f98e6346aae19270e0 SHA1 c1f569052f40769b7e11a56c37a4d1e7364059a8 SHA256 8ec9cd981617c8f8da252a7c81cca6fb7a9cfd301b04bd4c110f27bd3818be51
-MD5 a810406d91463cbf9cb26cb61dfd7519 ChangeLog 5400
-RMD160 e0327a115e1edb4513db09f98e6346aae19270e0 ChangeLog 5400
-SHA256 8ec9cd981617c8f8da252a7c81cca6fb7a9cfd301b04bd4c110f27bd3818be51 ChangeLog 5400
+MISC ChangeLog 5717 RMD160 2f00554990572026d83f5f77bd82cb62c7bf9392 SHA1 a17bbb86f811bd15b08e35d12b14ffee68f50bef SHA256 0788856148f80cbd128cfeaecc5b280dc2d06ce27911ce4b992a9a2fe336814f
+MD5 d0821df3f74a6d97cbae2551b7433617 ChangeLog 5717
+RMD160 2f00554990572026d83f5f77bd82cb62c7bf9392 ChangeLog 5717
+SHA256 0788856148f80cbd128cfeaecc5b280dc2d06ce27911ce4b992a9a2fe336814f ChangeLog 5717
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
-MD5 04c52a716204a90e4449d1274e1476fc files/digest-lapack-atlas-3.6.0 1039
-RMD160 5aca2ea416fc97092fbb13757d3fec20cc488db3 files/digest-lapack-atlas-3.6.0 1039
-SHA256 b41b2de05713bfec4a83dd6380fa11bbc0fa9774c8f4ed7ffaec3e1b7075443e files/digest-lapack-atlas-3.6.0 1039
-MD5 04c52a716204a90e4449d1274e1476fc files/digest-lapack-atlas-3.6.0-r1 1039
-RMD160 5aca2ea416fc97092fbb13757d3fec20cc488db3 files/digest-lapack-atlas-3.6.0-r1 1039
-SHA256 b41b2de05713bfec4a83dd6380fa11bbc0fa9774c8f4ed7ffaec3e1b7075443e files/digest-lapack-atlas-3.6.0-r1 1039
-MD5 04c52a716204a90e4449d1274e1476fc files/digest-lapack-atlas-3.6.0-r2 1039
-RMD160 5aca2ea416fc97092fbb13757d3fec20cc488db3 files/digest-lapack-atlas-3.6.0-r2 1039
-SHA256 b41b2de05713bfec4a83dd6380fa11bbc0fa9774c8f4ed7ffaec3e1b7075443e files/digest-lapack-atlas-3.6.0-r2 1039
+MD5 8d635ef4f9074e9b287e83ec35e00134 files/digest-lapack-atlas-3.6.0 1235
+RMD160 e6d24dfbd82cc0dcfcf276da473bbd2eff7c86d7 files/digest-lapack-atlas-3.6.0 1235
+SHA256 ad110553140070cd0a687d7c43c619c5f1c37a0a44879ded3480eae6462b46df files/digest-lapack-atlas-3.6.0 1235
+MD5 8d635ef4f9074e9b287e83ec35e00134 files/digest-lapack-atlas-3.6.0-r1 1235
+RMD160 e6d24dfbd82cc0dcfcf276da473bbd2eff7c86d7 files/digest-lapack-atlas-3.6.0-r1 1235
+SHA256 ad110553140070cd0a687d7c43c619c5f1c37a0a44879ded3480eae6462b46df files/digest-lapack-atlas-3.6.0-r1 1235
+MD5 8d635ef4f9074e9b287e83ec35e00134 files/digest-lapack-atlas-3.6.0-r2 1235
+RMD160 e6d24dfbd82cc0dcfcf276da473bbd2eff7c86d7 files/digest-lapack-atlas-3.6.0-r2 1235
+SHA256 ad110553140070cd0a687d7c43c619c5f1c37a0a44879ded3480eae6462b46df files/digest-lapack-atlas-3.6.0-r2 1235
 MD5 ce20dffc8b3b879e4067d5514d269b96 files/digest-lapack-atlas-3.7.11 1244
 RMD160 1f149774ccfe43809b7b697264c15415f3ea4682 files/digest-lapack-atlas-3.7.11 1244
 SHA256 7abbea8b0726d30986843355a91120d6ea353bf9125e2c8d594e4fbaa4454e40 files/digest-lapack-atlas-3.7.11 1244
diff --git a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0 b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0
index 44d2cedb790c..c393acfef680 100644
--- a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0
+++ b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0
@@ -1,4 +1,6 @@
 MD5 743b75ec473ab0f0edda6b649aa89060 atlas3.6.0-shared-libs.patch.bz2 5140
+RMD160 2c266377cd60b24b7710fcf1d6d4be9c32797d64 atlas3.6.0-shared-libs.patch.bz2 5140
+SHA256 6fd8281d42de14d34e4f1e25cb9f4b142f6e66c8dc1030763761f8033eb38e89 atlas3.6.0-shared-libs.patch.bz2 5140
 MD5 df2ee2eb65d1c08ee93d04370172c262 atlas3.6.0.tar.bz2 1687723
 RMD160 e7d40a6677ce7c4442df7152150aecf812020713 atlas3.6.0.tar.bz2 1687723
 SHA256 1c2ad68fe3c66e261c012788fc1b6f74eada791f713848a3a6420c50fa35c8e8 atlas3.6.0.tar.bz2 1687723
diff --git a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r1 b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r1
index 44d2cedb790c..c393acfef680 100644
--- a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r1
+++ b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r1
@@ -1,4 +1,6 @@
 MD5 743b75ec473ab0f0edda6b649aa89060 atlas3.6.0-shared-libs.patch.bz2 5140
+RMD160 2c266377cd60b24b7710fcf1d6d4be9c32797d64 atlas3.6.0-shared-libs.patch.bz2 5140
+SHA256 6fd8281d42de14d34e4f1e25cb9f4b142f6e66c8dc1030763761f8033eb38e89 atlas3.6.0-shared-libs.patch.bz2 5140
 MD5 df2ee2eb65d1c08ee93d04370172c262 atlas3.6.0.tar.bz2 1687723
 RMD160 e7d40a6677ce7c4442df7152150aecf812020713 atlas3.6.0.tar.bz2 1687723
 SHA256 1c2ad68fe3c66e261c012788fc1b6f74eada791f713848a3a6420c50fa35c8e8 atlas3.6.0.tar.bz2 1687723
diff --git a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r2 b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r2
index 44d2cedb790c..c393acfef680 100644
--- a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r2
+++ b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.6.0-r2
@@ -1,4 +1,6 @@
 MD5 743b75ec473ab0f0edda6b649aa89060 atlas3.6.0-shared-libs.patch.bz2 5140
+RMD160 2c266377cd60b24b7710fcf1d6d4be9c32797d64 atlas3.6.0-shared-libs.patch.bz2 5140
+SHA256 6fd8281d42de14d34e4f1e25cb9f4b142f6e66c8dc1030763761f8033eb38e89 atlas3.6.0-shared-libs.patch.bz2 5140
 MD5 df2ee2eb65d1c08ee93d04370172c262 atlas3.6.0.tar.bz2 1687723
 RMD160 e7d40a6677ce7c4442df7152150aecf812020713 atlas3.6.0.tar.bz2 1687723
 SHA256 1c2ad68fe3c66e261c012788fc1b6f74eada791f713848a3a6420c50fa35c8e8 atlas3.6.0.tar.bz2 1687723
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r1.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r1.ebuild
index d905457ec526..9a9156566606 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r1.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r1.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.6.0-r1.ebuild,v 1.3 2006/01/11 16:24:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r1.ebuild,v 1.4 2006/08/17 00:45:07 markusle Exp $
 
 inherit eutils flag-o-matic toolchain-funcs fortran
 
@@ -165,7 +165,7 @@ src_install () {
 
 	insinto /usr/include/atlas
 	cd "${S}"/include
-	doins clapack.h atlas_misc.h atlas_enum.h || die
+	doins clapack.h || die
 
 	cd "${S}"
 	dodoc README || die
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r2.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r2.ebuild
index 14a017bff42a..2676465811ef 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r2.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r2.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.6.0-r2.ebuild,v 1.1 2006/07/03 08:07:37 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.6.0-r2.ebuild,v 1.2 2006/08/17 00:45:07 markusle Exp $
 
 inherit eutils flag-o-matic toolchain-funcs fortran
 
@@ -163,7 +163,7 @@ src_install () {
 
 	insinto /usr/include/atlas
 	cd "${S}"/include
-	doins clapack.h atlas_misc.h atlas_enum.h || die
+	doins clapack.h || die
 
 	cd "${S}"
 	dodoc README || die
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild
index b122bd98a4a0..9a8240b59e55 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.6.0.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.6.0.ebuild,v 1.9 2006/01/11 16:24:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.6.0.ebuild,v 1.10 2006/08/17 00:45:07 markusle Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -178,7 +178,7 @@ src_install () {
 
 	insinto /usr/include/atlas
 	cd ${S}/include
-	doins clapack.h atlas_misc.h atlas_enum.h
+	doins clapack.h || die "failed to install clapack.h"
 
 	cd ${S}
 	dodoc README