diff options
| author |   Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-09-20 21:09:51 +0200 |
|---|---|---|
| committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-09-20 21:09:51 +0200 |
| commit | 55bc5bdb6c696953abd1abfea78c7adc5bc8bc90 (patch) | |
| tree | fcb2f9411ffd70bf79950af6fb59896855e18b93 | |
| parent | smartgit version bump (diff) | |
| download | sci-55bc5bdb6c696953abd1abfea78c7adc5bc8bc90.tar.gz sci-55bc5bdb6c696953abd1abfea78c7adc5bc8bc90.tar.bz2 sci-55bc5bdb6c696953abd1abfea78c7adc5bc8bc90.zip | |
coot -- upstream fixes COOT_TEST_DATA_DIR and included our patch for tests
| -rw-r--r-- | sci-chemistry/coot/ChangeLog | 3 | ||||
| -rw-r--r-- | sci-chemistry/coot/Manifest | 6 | ||||
| -rw-r--r-- | sci-chemistry/coot/coot-9999.ebuild | 9 |
3 files changed, 7 insertions, 11 deletions
diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog index 302d21af8..be5aaeebe 100644 --- a/sci-chemistry/coot/ChangeLog +++ b/sci-chemistry/coot/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 20 Sep 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> coot-9999.ebuild: + upstream fixes COOT_TEST_DATA_DIR and included our patch for tests + *coot-0.6_pre1-r2312 (16 Sep 2009) 16 Sep 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest index 9b139a86c..1f9d06a8c 100644 --- a/sci-chemistry/coot/Manifest +++ b/sci-chemistry/coot/Manifest @@ -16,9 +16,9 @@ AUX imlib.m4 11371 RMD160 4470d0cf2d0f8298bea6565069acda8a44e1cd9d SHA1 c983c372 AUX link-against-guile-gtk-properly.patch 800 RMD160 4215ea41c02e7db2c04dda191e0200cc1704d43c SHA1 5bd24ab8c651a147076289098956f545c6e431d6 SHA256 7805cdf4e34c532899a8c37eb19664fc95fc8bc440e770db7c87373a94e1fb2d DIST coot-0.5.2.tar.gz 10160364 RMD160 5cee5e8da6e4d2ce06016f6f8935b395e65ddbf9 SHA1 041cc947a68296701deb153c0932ee20a3437323 SHA256 6245f85dfb796ee7f3488c0790531f8d5e29a9f6ea18411ae539e3993e4ed2d6 DIST coot-0.6-pre-1-revision-2312.tar.gz 11014498 RMD160 d509629d4a4aaa042699b255270d02f19af5c1e7 SHA1 4502d18aa14eb1f0f2725e877b7ddfab8a145efd SHA256 9ac5076502c1cb0a45e3dd6c59ef9f39e2732bdfca5441bf59f0af398ca1be85 -DIST greg-data.tar.gz 7853709 RMD160 a2a78ab380eec094eec3e9132466033942b92463 SHA1 3af3eebc3d08b20ff71235c9fe6b0d5fabc04984 SHA256 335eeac63489f51c4939feed14545e0246ccee0df8a7ea153bd65a7bd26889ba +DIST greg-data.tar.gz 7853711 RMD160 3d736f3dfd0ad1a1fbe857ae3b6d412106375e6d SHA1 639db46bbd8ee5ff9764a011873ca635bc3c9351 SHA256 6ccdbec91c098b4e89666259cb93acec4dc0213e9762e5d3d3e9a8b96d9f0fcc EBUILD coot-0.5.2.ebuild 3238 RMD160 80d71146f3b11a4283494bfb95e77667a5128c1f SHA1 72f982f9a9fa8bc22688f5a5bbae9488b3e5dafb SHA256 582a0d78796e8666825befbc2fe5a4256ea5a5512cded142480f70f14bca2e74 EBUILD coot-0.6_pre1-r2312.ebuild 4318 RMD160 8164ef691b3ef718bdd0aad743789624d7021239 SHA1 e725804986286fb50de2def68b7218a2f5f8b4ee SHA256 81fef115c1b7972482bf6f578f0350abbbc68a685673bdbceb4fcde50d67a0ff -EBUILD coot-9999.ebuild 4302 RMD160 750af92cdc476479443b4fef4c3b3ee1b99b450f SHA1 ddef0fab3025b39cd706ffb6249b39dd83c10349 SHA256 b373954286b3804acdb97b3f09a6c1f43210b8da4cba674dba6fad4106af7211 -MISC ChangeLog 5893 RMD160 31b798f5a2f269a81f4f7c3ea623ff6a2b35d79e SHA1 fe0fa8952d84a428445c805854b314c0f1c9a9f7 SHA256 30d6ff5bc1c407f78231e792f2abd581d093bbd448878dfd2a9c6aaff13e17ca +EBUILD coot-9999.ebuild 4194 RMD160 025e880a348a1c856de8d1130cecb6179acffa51 SHA1 89413c8a0c9d2b516c6c0158beed5503e499f7fa SHA256 36de50557b876646276acbb7167b7ae4af291c4c662f189d7a5eef99d795e78f +MISC ChangeLog 6038 RMD160 44f05c3a14daf55c3b4f14f710790e7b83e4e83b SHA1 5c1d78bdb14cb3e748336c91d44bd746091b958f SHA256 58bb9a17e32402179e269cadb493468c519e96b5972f75a369db731ab89d9245 MISC metadata.xml 316 RMD160 845cc100ac244efa5f02595717b5da635f87d2f1 SHA1 c870d2c52c44dee3bab8623e5b6095266f400813 SHA256 64f6dbcd3bb41b26fd7897089cd60ddb93f1ea7d75f9531bca94f28b07e21b2f diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild index 3e70a7e7a..72ec9f637 100644 --- a/sci-chemistry/coot/coot-9999.ebuild +++ b/sci-chemistry/coot/coot-9999.ebuild @@ -57,12 +57,10 @@ DEPEND="${RDEPEND} dev-lang/swig test? ( dev-scheme/greg )" -#S="${WORKDIR}/${MY_P}" S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${PV}-as-needed.patch - "${FILESDIR}"/${PV}-test-rama.patch "${FILESDIR}"/link-against-guile-gtk-properly.patch "${FILESDIR}"/fix-namespace-error.patch ) @@ -152,7 +150,7 @@ src_test() { export PYTHONHOME=/usr export CCP4_SCR="${T}"/coot_test - export TESTROOT="${S}" + export COOT_TEST_DATA_DIR="${S}"/data/greg-data cat > command-line-greg.scm <<- EOF (use-modules (ice-9 greg)) @@ -165,11 +163,6 @@ src_test() { (coot-real-exit 1))) EOF - sed \ - -e "s:HOME:TESTROOT:g" \ - -i greg-tests/begin.grg \ - || die - einfo "Running test with following paths ..." einfo "COOT_STANDARD_RESIDUES $COOT_STANDARD_RESIDUES" einfo "COOT_SCHEME_DIR $COOT_SCHEME_DIR" |