diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-06-29 13:14:00 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-06-29 13:14:00 +0000 |
| commit | 15e73432e2adddcd182ce6f3b0d5819c132375b3 (patch) | |
| tree | 4a07469226326f079a8a4d4901c2b1d90720da91 | |
| parent | Unmask xorg-drivers-1.11 (diff) | |
| download | gentoo-2-15e73432e2adddcd182ce6f3b0d5819c132375b3.tar.gz gentoo-2-15e73432e2adddcd182ce6f3b0d5819c132375b3.tar.bz2 gentoo-2-15e73432e2adddcd182ce6f3b0d5819c132375b3.zip | |
Fixed deps and test
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
| -rw-r--r-- | sci-chemistry/coot/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/coot/coot-0.6.2.ebuild | 12 | ||||
| -rw-r--r-- | sci-chemistry/coot/files/0.6.2-test.patch | 16 |
3 files changed, 28 insertions, 6 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/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) { |