summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2008-12-07 04:46:06 +0000
committerAndrey Grozin <grozin@gentoo.org>2008-12-07 04:46:06 +0000
commit96a6f15ce3779bfc001cac2defcb7baffe55b5c1 (patch)
tree5ce14875e34e622092f7c8547ab620fd4d7e2dd9 /sci-chemistry
parentStop installing docs into a subdir of DOCDIR so DOC_SYMLINKS_DIR works (diff)
downloadhistorical-96a6f15ce3779bfc001cac2defcb7baffe55b5c1.tar.gz
historical-96a6f15ce3779bfc001cac2defcb7baffe55b5c1.tar.bz2
historical-96a6f15ce3779bfc001cac2defcb7baffe55b5c1.zip
Fixing file collision with sci-visualization/extrema, bug #249423.
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-tuxonice i686
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/psi/ChangeLog6
-rw-r--r--sci-chemistry/psi/Manifest6
-rw-r--r--sci-chemistry/psi/psi-3.2.3.ebuild8
-rw-r--r--sci-chemistry/psi/psi-3.3.0.ebuild6
4 files changed, 17 insertions, 9 deletions
diff --git a/sci-chemistry/psi/ChangeLog b/sci-chemistry/psi/ChangeLog
index fca6decd5215..0993894fb780 100644
--- a/sci-chemistry/psi/ChangeLog
+++ b/sci-chemistry/psi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/psi
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/ChangeLog,v 1.7 2008/07/07 07:17:30 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/ChangeLog,v 1.8 2008/12/07 04:46:06 grozin Exp $
+
+ 07 Dec 2008; Andrey Grozin <grozin@gentoo.org> psi-3.2.3.ebuild,
+ psi-3.3.0.ebuild:
+ Fixing file collision with sci-visualization/extrema, bug #249423.
*psi-3.3.0 (07 Jul 2008)
diff --git a/sci-chemistry/psi/Manifest b/sci-chemistry/psi/Manifest
index 8c1eb84ee94d..721a0a30e52f 100644
--- a/sci-chemistry/psi/Manifest
+++ b/sci-chemistry/psi/Manifest
@@ -6,7 +6,7 @@ AUX try-pthread-for-blas-lapack.patch 1489 RMD160 092e0613b7184b065bb5ffa2288ce3
AUX use-external-libint.patch 1359 RMD160 560598e6d7c99d901d97dd6037480bd57c82433f SHA1 4516be3df75ef4fa776655791483f6df823467a5 SHA256 41faa20ba804e98a81cb6809c789c643fd17458b6f6bc95dbe6311dd2fb16713
DIST psi-3.2.3.tar.gz 2694286 RMD160 19bc9a80380193fb3e6d6166f7aa8c98a0415222 SHA1 1f5bc6208afb2b19b5ae1dc76179b9844f863d3b SHA256 b966c33a82a930b90c1102ade52b7074dd50a9f70a3781d2408436fee68131be
DIST psi-3.3.0.tar.gz 4253039 RMD160 0f0e3b4a48a9128f1a79bcd6bf35b2133c7db535 SHA1 4e612defa6d228bcad50b6329ce2aab9821b0ee4 SHA256 e474f159c43a9568bb9539047db13c5d82ed711ea00f2d06c65f81332deb76a9
-EBUILD psi-3.2.3.ebuild 1218 RMD160 fc289060a461849fef2cb4fce69af7f840bbaf45 SHA1 39591c745a277027c368a2cd2633beab74144000 SHA256 869e9cff5109f38c1e9ec1611c0a66c1767c8c73d6a83f87ce2c41e8615cc9c2
-EBUILD psi-3.3.0.ebuild 1248 RMD160 0cddad1d377f71ba67fa971f7a3c26390fc8b598 SHA1 030e1dc7035e50f766fdf59b1300760fb0a6a5dd SHA256 95d21c600473089d41537bc06382c1533daccc13af3f94465e473b38d502bf03
-MISC ChangeLog 1444 RMD160 ed722d569ac22102664b964f5869dcc0a38c5ff3 SHA1 d5ffd8a0908ca359252a5e9373580e9b924c228e SHA256 ed8f43db912833626241c67a1c07d67be0d3fe80a115342b4bfdc4919828fefe
+EBUILD psi-3.2.3.ebuild 1277 RMD160 7ef9efe08568d8db86d3931c43f01b170a948ebf SHA1 020992ddc381d7d58ce841e17a7cc61881e981e9 SHA256 ddd455e8a015f03e9ab89be39f74befbbadadd2445e71658f016183812c08762
+EBUILD psi-3.3.0.ebuild 1306 RMD160 a4bd5403872dbf26909d0525f8d1853483c1d855 SHA1 d33a32ffbe43bfa47a5266d64d7420917058c9f5 SHA256 68413fe23eb331a1ef9a229da79931dec5c6be74754613a231b5f3bffb71e78b
+MISC ChangeLog 1598 RMD160 ea03882a81506a3d3d130d5e7bedd8f334b277d4 SHA1 9c413233fba1df51fa6d9c0a37bf5e2cd6f84438 SHA256 609d0d6a93c684342c4c26b7c3db412141ead267405f48f54a43d3d6fd1996c8
MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
diff --git a/sci-chemistry/psi/psi-3.2.3.ebuild b/sci-chemistry/psi/psi-3.2.3.ebuild
index e03e143d78eb..8c6f13cefd49 100644
--- a/sci-chemistry/psi/psi-3.2.3.ebuild
+++ b/sci-chemistry/psi/psi-3.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/psi-3.2.3.ebuild,v 1.2 2006/07/09 07:11:44 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/psi-3.2.3.ebuild,v 1.3 2008/12/07 04:46:06 grozin Exp $
inherit autotools eutils
@@ -13,7 +13,9 @@ SLOT="0"
KEYWORDS="x86"
IUSE=""
-RDEPEND="virtual/blas
+# File collision, see bug #249423
+RDEPEND="!sci-visualization/extrema
+ virtual/blas
virtual/lapack
sci-libs/libint"
DEPEND="${RDEPEND}"
diff --git a/sci-chemistry/psi/psi-3.3.0.ebuild b/sci-chemistry/psi/psi-3.3.0.ebuild
index fe00e3afdf4f..0c55ebfd013f 100644
--- a/sci-chemistry/psi/psi-3.3.0.ebuild
+++ b/sci-chemistry/psi/psi-3.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/psi-3.3.0.ebuild,v 1.2 2008/07/08 16:26:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/psi-3.3.0.ebuild,v 1.3 2008/12/07 04:46:06 grozin Exp $
inherit autotools eutils
@@ -13,7 +13,9 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-RDEPEND="virtual/blas
+# File collision, see bug #249423
+RDEPEND="sci-visualization/extrema
+ virtual/blas
virtual/lapack
>=sci-libs/libint-1.1.4"
DEPEND="${RDEPEND}