Fixed deps and test

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 34 insertions, 11 deletions

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 65717a898a18..28e70d747150 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/coot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.38 2011/06/28 19:13:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.39 2011/06/29 13:13:59 jlec Exp $
+
+  29 Jun 2011; Justin Lecher <jlec@gentoo.org> +files/0.6.2-test.patch,
+  coot-0.6.2.ebuild:
+  Fixed deps and test
 
   28 Jun 2011; Justin Lecher <jlec@gentoo.org> -files/0.3.1-as-needed.patch,
   -files/0.4_pre2-as-needed.patch,
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index 1a5572f0734f..4e6fdcd0f662 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -5,18 +5,19 @@ AUX 0.6.1-libpng14.patch 950 RMD160 c2d1c298ada419272d79d49972b13e414a234cd3 SHA
 AUX 0.6.2-clipper-config.patch 431 RMD160 7a00939760bc4c062bbde1a65f53b9556b93c3bc SHA1 0d72c4c898fd29802c74d237b54f715444922956 SHA256 9ae9129e733d845ad2e4dd505bc5e0987147fc3a5e5dd2457b5857643809db2f
 AUX 0.6.2-gl.patch 383 RMD160 6460e87e4da57ff845f96f072dec1354ed117bee SHA1 00bc0bbfc7d4fb00ebc8477941469bef2ed6b670 SHA256 9d47a6cf2d0c7644b945f88acdc7af146df4f9a5a8f883a0e72e1bc8ccf8b380
 AUX 0.6.2-mmdb-config.patch 432 RMD160 8418198b08d15af9ee5d80b15ea46bb9efd2b973 SHA1 3e6f5c888b476d8d37da4effa67a8053784a7a3c SHA256 41484424f2f7f61b0555c893a51884d02f7bd471e70c4c0903c8740dcc273f77
+AUX 0.6.2-test.patch 457 RMD160 1a3e0956d8b7f051fdd964524c0ba9eabf8c2aca SHA1 a8f9584be09cc58e7cb55801115e9649b05aa910 SHA256 494ef09e407c3047145c250c70b90c7679a1c5b9f84c57a680e40580bd980397
 DIST coot-0.6.1.tar.gz 12229005 RMD160 76cbf28320ff52f02b40164eea00e7ec8a6b6c2c SHA1 cdd74e394e07dc17b99f56fce7cf180a177d53d7 SHA256 7897eb62e1add5f8deddd16d24ffd9b4c763e784714cd47fa9777beb79f56066
 DIST coot-0.6.2.tar.gz 13597123 RMD160 707eb3df47681a011f42874210b940329a748bc7 SHA1 46b663125cef4c01387330d144e49acb0b0b5709 SHA256 d2f55db4f75c721d120ea33a4ca42c1abf246dff29a75b7f189e604e32709e78
 DIST greg-data-0.6.1.tar.gz 7930213 RMD160 e9a17d1ef2d3f15b3792ea5c7204901e0105b76b SHA1 f4158fa440406b88d0bb72880cdee9a3653c4233 SHA256 658a557b85ee6b90fc446cb3c605556586a2a5a0575ddd11b42265e019eb74a0
 DIST greg-data-0.6.2.tar.gz 8044588 RMD160 065acee98384540d0c2ffaf2511dfd1aa400b11c SHA1 92cec24dab594d8024f41047af2bf6760e9e7d00 SHA256 c9fedf6e1fa60fda178753bbfb539671c274f64d4daca2b63ab49c59bd4c5856
 EBUILD coot-0.6.1.ebuild 3934 RMD160 6376495fce52056acbaaf0df862fbb502b8a7600 SHA1 0ecc3bfa5760bb663d62c67c98c6146f3f77e707 SHA256 7ac1bd7397140da0386b360ef613067a2932d381d0a85e9ad97218fac20f944d
-EBUILD coot-0.6.2.ebuild 3936 RMD160 d555c38c1d7a9abde9213d6b72055cfa7a20783d SHA1 6f9fc151a4d44cb1c92db27dd1c7b2ab57e6ea80 SHA256 13213900ae562e5f3f409627839dc3c1523d67d7d81a842bbcdab1a48d38bfe1
-MISC ChangeLog 6036 RMD160 8803e95c9ec8ad4ed738e24d609d7e89873b1148 SHA1 e89f0cd30ab30ccbee28baac4396ab6bd5c63b45 SHA256 26a56cee8568a863609a7cc1aaa8a5052b7f655118e5ca602efb15064e6b9f27
+EBUILD coot-0.6.2.ebuild 3997 RMD160 938c9f29a3581ece750da25879c7404431db381a SHA1 550dc5183c7b86819642877fe52749e873b43d14 SHA256 79f455715f1bb11d3ef31ff6ee9cbbb0c488ffa4fc877af335924cb363a9d7b8
+MISC ChangeLog 6152 RMD160 1f738f137f78baeba2f131a394c6a8653f3220ed SHA1 6090624bce83fe35c002d534ff211a8f04e97642 SHA256 854b39a6a9588007cd4bf3141e5c717834d0db87b3f8b449a363e178a90b424b
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk4KJ9wACgkQgAnW8HDreRYIQwCgzguonRui0RZqZG1hFBS8NDpm
-2EIAnjnQ4PZny8W4U4I2YjrYWvxUVXfD
-=Hu2P
+iEYEAREKAAYFAk4LJSIACgkQgAnW8HDreRYp8ACghAyqn7S4Ew8YXpVf+a3Wf9Rz
+YSsAoMn/K/P/xg6W7vl48jAPToM55vzs
+=w2S9
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/coot/coot-0.6.2.ebuild b/sci-chemistry/coot/coot-0.6.2.ebuild
index f89ddc8338e9..1fc3eb11f925 100644
--- a/sci-chemistry/coot/coot-0.6.2.ebuild
+++ b/sci-chemistry/coot/coot-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.6.2.ebuild,v 1.1 2011/06/28 17:01:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.6.2.ebuild,v 1.2 2011/06/29 13:13:59 jlec Exp $
 
 EAPI=3
 
@@ -31,8 +31,9 @@ SCIDEPS="
 	>=sci-libs/coot-data-2
 	>=sci-libs/gsl-1.3
 	sci-libs/mmdb
+	<sci-libs/monomer-db-1
 	sci-chemistry/reduce
-	sci-chemistry/refmac
+	<sci-chemistry/refmac-5.6
 	sci-chemistry/probe"
 
 XDEPS="
@@ -74,8 +75,9 @@ pkg_setup() {
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-clipper-config.patch
-	"${FILESDIR}"/${PV}-gl.patch
 	"${FILESDIR}"/${PV}-mmdb-config.patch
+	"${FILESDIR}"/${PV}-gl.patch
+	"${FILESDIR}"/${PV}-test.patch
 	)
 
 src_prepare() {
@@ -122,7 +124,7 @@ src_test() {
 	export CLIBD_MON="${EPREFIX}/usr/share/ccp4/data/monomers/"
 	export SYMINFO="${S}/syminfo.lib"
 
-	export COOT_TEST_DATA_DIR="${WORKDIR}/data/greg-data"
+	export COOT_TEST_DATA_DIR="${WORKDIR}"/data/greg-data
 
 	cat > command-line-greg.scm <<- EOF
 	(use-modules (ice-9 greg))
@@ -148,6 +150,6 @@ src_test() {
 	einfo "CLIBD_MON ${CLIBD_MON}"
 	einfo "SYMINFO ${SYMINFO}"
 
-	"${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die
 	"${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
+	"${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die
 }
diff --git a/sci-chemistry/coot/files/0.6.2-test.patch b/sci-chemistry/coot/files/0.6.2-test.patch
new file mode 100644
index 000000000000..8cb79e65d767
--- /dev/null
+++ b/sci-chemistry/coot/files/0.6.2-test.patch
@@ -0,0 +1,16 @@
+ src/testing.cc |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/testing.cc b/src/testing.cc
+index f767bf6..097b9b9 100644
+--- a/src/testing.cc
++++ b/src/testing.cc
+@@ -86,6 +86,8 @@ std::string greg_test(const std::string &file_name) {
+    const char *c = getenv("COOT_TEST_DATA_DIR");
+    if (c) {
+       dd = c;
++      dd += "/";
++      dd += file_name;
+    } else { 
+       const char *d = getenv("HOME");
+       if (d) {