Fix for test, #318605

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 17 insertions, 9 deletions

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 48e64b6093fd..38c42bae8e5f 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/coot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.24 2010/05/17 10:30:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.25 2010/05/17 10:53:34 jlec Exp $
+
+  17 May 2010; Justin Lecher <jlec@gentoo.org> coot-0.6.ebuild,
+  coot-0.6.1.ebuild:
+  Fix for test, #318605
 
 *coot-0.6.1 (17 May 2010)
 
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index e5dda7e12143..a20efdd6cadf 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -16,14 +16,14 @@ DIST coot-0.6.1.tar.gz 12229005 RMD160 76cbf28320ff52f02b40164eea00e7ec8a6b6c2c
 DIST coot-0.6.tar.gz 11929700 RMD160 6485a56f1d17b103e69b07b5fc128d266e83aa27 SHA1 ec3d486eda514e36bdbc99e8796484e584e4f851 SHA256 7700e7e758934ee5b4177c7bb8e1d7d564b838966dd3c77919fa08778627353b
 DIST greg-data-0.6.1.tar.gz 7930213 RMD160 e9a17d1ef2d3f15b3792ea5c7204901e0105b76b SHA1 f4158fa440406b88d0bb72880cdee9a3653c4233 SHA256 658a557b85ee6b90fc446cb3c605556586a2a5a0575ddd11b42265e019eb74a0
 DIST greg-data-0.6.tar.gz 7929638 RMD160 d152fb3703eec8c4b3df37b24a1fa2a80a4a9d9f SHA1 5dda8e7e393e3602aa51b2ae830287f93534312f SHA256 032f223f86c0ac504ace427ac84a2bf31f9adaf4da581207526b198f4bb2d76d
-EBUILD coot-0.6.1.ebuild 3587 RMD160 d1412dcdc2c4013357dc74f7d2a14357b2b23919 SHA1 1b537217d8502623272e54248e423b90cd79285d SHA256 ea0c6f041c247b373577ff455402d4e1293514256ba1a3480170531a3779e567
-EBUILD coot-0.6.ebuild 3617 RMD160 60b4b74c57d7bf740a07a5fa815b9d5b6d5c28be SHA1 b61021525370819f4a0a0e8df5a0e608f4eca924 SHA256 96272f82f4e5b5dfebee4ae96bcbd859a84399d7d860d1cfece0c18ac665fa4a
-MISC ChangeLog 4137 RMD160 4c99efda548db3b99c7e1446fc334f0766e4408e SHA1 2b4dd9fe0e96dcf83af01f1ccb750152253fabdb SHA256 4e119f23c9f31afe6d15f07faae80d12c0572cb71fc5b1abff0313867b450ed1
+EBUILD coot-0.6.1.ebuild 3680 RMD160 10b577b73047ed8820e631819909045de4e11769 SHA1 27b6c68a5f46ed1fe5cf354a27a853d0d2ce1bfc SHA256 49f0327c98ad6667eca1e71066418e4a94ba14115fce16103a2c0cf76e5aa630
+EBUILD coot-0.6.ebuild 3706 RMD160 e2825a477d685c5edf7c02a8760383344c2455dc SHA1 bfc50689490bba5bace86a2ab60d233653083936 SHA256 4047f31c668b44933b0cd95b69a5e783114624d53b2876de31ebc8dfd95736b7
+MISC ChangeLog 4247 RMD160 c53b76f47c0eb04a6367089d194a7e21f3a96895 SHA1 78c20476c658d9c02262e1dd703f24244ec6ae78 SHA256 a4bad7995757a1cd6565f08627b6c92886c0371669394dfcf2f0c0d0018d69a9
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvxGuIACgkQgAnW8HDreRbIzgCfY0DgKypv4JpiG0LJpMKWM/Cr
-vl8An2SUi02TcVkp5LVnarphlcyXo/Yc
-=Y0TK
+iEYEARECAAYFAkvxIDQACgkQgAnW8HDreRYApgCfSRy9ZUMABOwzmzmx6mmNA3me
+x6QAn1MTaFYHws3/OmrZaHSsLXWz+Pzr
+=LHYj
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/coot/coot-0.6.1.ebuild b/sci-chemistry/coot/coot-0.6.1.ebuild
index d1c572cdc20c..8926e68b2c03 100644
--- a/sci-chemistry/coot/coot-0.6.1.ebuild
+++ b/sci-chemistry/coot/coot-0.6.1.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-chemistry/coot/coot-0.6.1.ebuild,v 1.1 2010/05/17 10:30:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.6.1.ebuild,v 1.2 2010/05/17 10:53:34 jlec Exp $
 
 EAPI="3"
 
@@ -117,6 +117,7 @@ src_test() {
 	export PYTHONPATH="${COOT_PYTHON_DIR}:${PYTHONPATH}"
 	export PYTHONHOME="${EPREFIX}"/usr
 	export CCP4_SCR="${T}"/coot_test
+	export CLIBD_MON="${EPREFIX}/usr/share/ccp4/data/monomers/"
 
 	export COOT_TEST_DATA_DIR="${WORKDIR}"/data/greg-data
 
@@ -141,6 +142,7 @@ src_test() {
 	einfo "PYTHONPATH $PYTHONPATH"
 	einfo "PYTHONHOME $PYTHONHOME"
 	einfo "CCP4_SCR ${CCP4_SCR}"
+	einfo "CLIBD_MON ${CLIBD_MON}"
 
 	"${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
 }
diff --git a/sci-chemistry/coot/coot-0.6.ebuild b/sci-chemistry/coot/coot-0.6.ebuild
index 091c0515dea4..89b36df577ac 100644
--- a/sci-chemistry/coot/coot-0.6.ebuild
+++ b/sci-chemistry/coot/coot-0.6.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-chemistry/coot/coot-0.6.ebuild,v 1.4 2010/04/22 22:55:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.6.ebuild,v 1.5 2010/05/17 10:53:34 jlec Exp $
 
 EAPI="3"
 
@@ -117,6 +117,7 @@ src_test() {
 	export PYTHONPATH="${COOT_PYTHON_DIR}:${PYTHONPATH}"
 	export PYTHONHOME="${EPREFIX}"/usr
 	export CCP4_SCR="${T}"/coot_test
+	export CLIBD_MON="${EPREFIX}/usr/share/ccp4/data/monomers/"
 
 	export COOT_TEST_DATA_DIR="${WORKDIR}"/data/greg-data
 
@@ -141,6 +142,7 @@ src_test() {
 	einfo "PYTHONPATH $PYTHONPATH"
 	einfo "PYTHONHOME $PYTHONHOME"
 	einfo "CCP4_SCR ${CCP4_SCR}"
+	einfo "CLIBD_MON ${CLIBD_MON}"
 
 	"${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
 }