sci-chemistry/coot -- version bump to 0.6 and cleanup of old versions

(Portage version: 2.2_rc55/git/Linux i686)
 (Signed Manifest commit)

5 files changed, 29 insertions, 346 deletions

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 20c2e4247..d5939284c 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*coot-0.6 (04 Dec 2009)
+
+  04 Dec 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  -coot-0.6_pre1-r2312.ebuild, -coot-0.6_pre1-r2327.ebuild,
+  +coot-0.6.ebuild:
+  Version bump to 0.6
+  Removed pre versions
+
   13 Nov 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> coot-9999.ebuild:
   removed dev-scheme/goosh dep since r2487
 
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index fc0e8a10f..3dac33b90 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.5.2-as-needed.patch 19562 RMD160 7c242801251cbd11a8143df793a832a860c5aacb SHA1 a7d6552e5a3bbdf4e28ac995a31b3c3059241dab SHA256 9f5be12beb7691eb1e187923b95edc5890e385fecb2ef2ecb5eb9991858bebc1
 AUX 0.5.2-gcc-4.3.patch 260 RMD160 e6d72c24d7dc02e84c67198f3e82aa4215df9b77 SHA1 1dd99a49d35181808a9e30a1f41ab63b6077dda0 SHA256 2d215b8009449e2f234eeb6c1e08da1f2e7804fedcf5e1d69997a6d8355d37da
 AUX 0.5.2-gcc-4.4.patch 257 RMD160 d1ec251cda36ac201a8baa84d7dad542e72e0c7b SHA1 069af29c1de34e6af94ff463ca04e3fb3c19c209 SHA256 761db5b8cb4cc11050b833df1f87b9ea5d9ca8b3637d7e7b1f5b4f6b7d795177
@@ -16,13 +19,16 @@ AUX gtk.m4 8516 RMD160 3860fe211902d5b9290f0a70e7d75ebec6b0ec67 SHA1 98b93b82042
 AUX gtkgl.m4 1137 RMD160 9f9712aeaa4efaf07a8c1c483abd4098ac823ef7 SHA1 f7bb50edc64d33d0d71b0a45a1aab8e89a0c2021 SHA256 5e73d3b9721b046d03f607b16e765395dcd9822d92d754137524644116c140f1
 AUX imlib.m4 11371 RMD160 4470d0cf2d0f8298bea6565069acda8a44e1cd9d SHA1 c983c372cb6cca546bb3fd739f68199a94a741c8 SHA256 04fcea84564608fff1b8049170f4dd571e9b30723c29c46e31855fab26b84a91
 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 coot-0.6-pre-1-revision-2327.tar.gz 11022882 RMD160 e7dcfba74dc6468fd446757d595cc5087f651586 SHA1 3f69ba64ba4219ab073c5ed0838a8232e49fd3d2 SHA256 70eed4f32e41dc9d1dbca6836a4b25ee977a2e223631a8b1f0f7565f0bea258c
-DIST greg-data.tar.gz 7853708 RMD160 e5dcf76edaefd4be23a963cf47b84e13c3928962 SHA1 11cb683ce9382968a759a4adcdf307f9cc22e78f SHA256 2ebe2246cbef9ff64da39ad979a3549007776b1837a3719f98fb5b0dbf15b61d
-EBUILD coot-0.5.2.ebuild 3212 RMD160 485b95eb31d4b25fed8a4952b79a7ee9a6157bb1 SHA1 3922d0d186ccbb8e401c552742f8cd64e7ba7536 SHA256 05082d1ea84b06462833194940ba5a7c608485e16586c75727b1ce88aa94df7a
-EBUILD coot-0.6_pre1-r2312.ebuild 4292 RMD160 b23453de258ad37d9239728ee3e5a0cf35dadfe8 SHA1 6964a215118c5a5880672be6c66e9666a4bff8f0 SHA256 fad86ab9c4a36aa8c7816d9bc3a4a7fa7be2e98ce56c3175e47c418594b935bc
-EBUILD coot-0.6_pre1-r2327.ebuild 4292 RMD160 b23453de258ad37d9239728ee3e5a0cf35dadfe8 SHA1 6964a215118c5a5880672be6c66e9666a4bff8f0 SHA256 fad86ab9c4a36aa8c7816d9bc3a4a7fa7be2e98ce56c3175e47c418594b935bc
+DIST coot-0.6.tar.gz 11929700 RMD160 6485a56f1d17b103e69b07b5fc128d266e83aa27 SHA1 ec3d486eda514e36bdbc99e8796484e584e4f851 SHA256 7700e7e758934ee5b4177c7bb8e1d7d564b838966dd3c77919fa08778627353b
+DIST greg-data.tar.gz 7853711 RMD160 6da70a18af7c02139d9b9b1029bbf6624f0f1003 SHA1 2c9a336820eda69b0cca19dd8f2315b83ad96d65 SHA256 fd737f2b2337a589b849e1f6f8b3a3c422cc7650a8e3969e76d4141611621985
+EBUILD coot-0.6.ebuild 3483 RMD160 ccb7073bfe73955c85fef7d2a59f5cd2e8a9ce6f SHA1 c23507c9526ebd18353e976be4cf8090ed097733 SHA256 cf6dffd5cc517bc08de6f7235398428661ee3a993eea828c5c7dcdb178032761
 EBUILD coot-9999.ebuild 3937 RMD160 66cf094e5268b11f7689088c0d4433f79942624b SHA1 b019e1edd18108c8d212cc162f6451445f5d1682 SHA256 dc4e77f01f87fb49352525554cb21b04411219f4c92b597549db2a277aabf433
-MISC ChangeLog 6603 RMD160 48c33eb53ef4472c3dba99f75e3d7e10df36903b SHA1 202b02286ae424059ed593597fbc39e389795f08 SHA256 7446eedd40772e3605ae25c53547f843bbe0eae3a740e3bed070301aa8ad443f
+MISC ChangeLog 6811 RMD160 84ea0c17c43d5e0a5108ee9b1d90a242546acb90 SHA1 b2fb82585b8d418db1f8a37a6ea0ef973c27e802 SHA256 80eee56e45aae1f7cf195af22edbc258cbde1cb4b937cd20485685a269b6d0b5
 MISC metadata.xml 316 RMD160 845cc100ac244efa5f02595717b5da635f87d2f1 SHA1 c870d2c52c44dee3bab8623e5b6095266f400813 SHA256 64f6dbcd3bb41b26fd7897089cd60ddb93f1ea7d75f9531bca94f28b07e21b2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAksY6KIACgkQgAnW8HDreRaFkACgtSVsoYePLRhrBJWcl+sIRmPa
+JeUAn0kbx98C6txMbYfFfyMtOJ2/C/84
+=QscW
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/coot/coot-0.5.2.ebuild b/sci-chemistry/coot/coot-0.5.2.ebuild
deleted file mode 100644
index 348d1df99..000000000
--- a/sci-chemistry/coot/coot-0.5.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools eutils
-
-MY_S_PV=${PV}-${PR}
-MY_S_P=${PN}-${MY_S_PV}
-MY_PV=${PV}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
-HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
-if [[ ${MY_PV} = *pre* ]]; then
-	SRC_URI="http://www.biop.ox.ac.uk/coot/software/source/pre-releases/${MY_S_P}.tar.gz"
-else
-	SRC_URI="http://www.biop.ox.ac.uk/coot/software/source/releases/${MY_P}.tar.gz"
-fi
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=">=sci-libs/gsl-1.3
-	>=x11-libs/gtk+-2.2
-	gnome-base/libgnomecanvas
-	=x11-libs/guile-gtk-2.1
-	x11-libs/gtkglext
-	virtual/glut
-	virtual/opengl
-	dev-lang/python
-	dev-scheme/guile-gui
-	dev-scheme/net-http
-	dev-scheme/goosh
-	dev-scheme/guile-www
-	>=dev-scheme/guile-lib-0.1.6
-	sci-libs/coot-data
-	sci-chemistry/reduce
-	sci-chemistry/refmac
-	sci-chemistry/probe
-	>=sci-libs/ccp4-libs-6.1
-	>=sci-libs/clipper-20090210
-	dev-python/pygtk
-	gnome-base/librsvg
-	>=dev-libs/gmp-4.2.2-r2"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# To send upstream
-	epatch "${FILESDIR}"/${PV}-gcc-4.3.patch
-	epatch "${FILESDIR}"/${PV}-gcc-4.4.patch
-
-	epatch "${FILESDIR}"/${PV}-as-needed.patch
-	epatch "${FILESDIR}"/link-against-guile-gtk-properly.patch
-	epatch "${FILESDIR}"/fix-namespace-error.patch
-
-	# Link against single-precision fftw
-	sed -i \
-		-e "s:lfftw:lsfftw:g" \
-		-e "s:lrfftw:lsrfftw:g" \
-		"${S}"/macros/clipper.m4
-
-	# Fix where it looks for some binaries
-	sed -i \
-		-e "s:/y/people/emsley/coot/Linux/bin/probe.2.11.050121.linux.RH9:/usr/bin/probe:g" \
-		-e "s:/y/people/emsley/coot/Linux/bin/reduce.2.21.030604:/usr/bin/reduce:g" \
-		"${S}"/scheme/group-settings.scm
-
-	# Look for clipper slotted with '-2' suffix
-#	sed -i \
-#		-e "s~\(-lclipper[[:alnum:]-]*\)~\1-2~g" \
-#		"${S}"/macros/clipper.m4 \
-#		|| die "sed to find -2 slotted libraries failed"
-#	grep 'include.*clipper' -rl . \
-#		| xargs sed -i \
-#			-e "s~\(include.*clipper\)/~\1-2/~g" \
-#			|| die "sed to find -2 slotted headers failed"
-
-	# So we don't need to depend on crazy old gtk and friends
-	cp "${FILESDIR}"/*.m4 "${S}"/macros/
-
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	# All the --with's are used to activate various parts.
-	# Yes, this is broken behavior.
-	econf \
-		--includedir='${prefix}/include/coot' \
-		--with-gtkcanvas-prefix=/usr \
-		--with-clipper-prefix=/usr \
-		--with-mmdb-prefix=/usr \
-		--with-ssmlib-prefix=/usr \
-		--with-guile \
-		--with-python=/usr \
-		--with-guile-gtk \
-		--with-gtk2 \
-		--with-pygtk
-
-	# Regenerate wrappers, otherwise at least gtk-2 build fails
-	pushd src
-	rm -f coot_wrap_python.cc coot_wrap_python_pre.cc \
-		&& emake coot_wrap_python.cc \
-		|| die "failed to regenerate python wrapper"
-
-	rm -f coot_wrap_guile.cc coot_wrap_guile_pre.cc \
-		&& emake coot_wrap_guile.cc \
-		||die "failed to regenerate guile wrapper"
-	popd
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	# Install misses this
-	insinto /usr/share/coot/python
-	doins "${S}"/src/coot.py
-}
diff --git a/sci-chemistry/coot/coot-0.6_pre1-r2312.ebuild b/sci-chemistry/coot/coot-0.6.ebuild
index 3cb65f922..8a6bf7bcc 100644
--- a/sci-chemistry/coot/coot-0.6_pre1-r2312.ebuild
+++ b/sci-chemistry/coot/coot-0.6.ebuild
@@ -12,15 +12,12 @@ MY_S_P=${MY_S2_P}-${PR/r/revision-}
 MY_PV=${PV}
 MY_P=${PN}-${MY_PV}
 
+ESVN_REPO_URI="http://coot.googlecode.com/svn/trunk"
+
 DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
 HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
-if [[ ${MY_PV} = *pre* ]]; then
-	SRC_URI="http://www.biop.ox.ac.uk/coot/software/source/pre-releases/${MY_S_P}.tar.gz"
-else
-	SRC_URI="http://www.biop.ox.ac.uk/coot/software/source/releases/${MY_P}.tar.gz"
-fi
 SRC_URI="
-	${SRC_URI}
+	http://www.biop.ox.ac.uk/coot/software/source/releases/${MY_P}.tar.gz
 	test? ( http://www.biop.ox.ac.uk/coot/devel/greg-data.tar.gz  )"
 
 SLOT="0"
@@ -46,7 +43,6 @@ XDEPS="
 
 SCHEMEDEPS="
 	dev-scheme/net-http
-	dev-scheme/goosh
 	dev-scheme/guile-gui
 	>=dev-scheme/guile-lib-0.1.6
 	dev-scheme/guile-www
@@ -57,7 +53,8 @@ RDEPEND="
 	${XDEPS}
 	${SCHEMEDEPS}
 	dev-python/pygtk
-	>=dev-libs/gmp-4.2.2-r2"
+	>=dev-libs/gmp-4.2.2-r2
+	>=net-misc/curl-7.19.6"
 DEPEND="${RDEPEND}
 	dev-lang/swig
 	test? ( dev-scheme/greg )"
@@ -66,8 +63,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_S2_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-as-needed.patch
-	"${FILESDIR}"/${PV}-test-rama.patch
 	"${FILESDIR}"/link-against-guile-gtk-properly.patch
 	"${FILESDIR}"/fix-namespace-error.patch
 	)
@@ -81,12 +76,6 @@ src_prepare() {
 		-e "s:lrfftw:lsrfftw:g" \
 		"${S}"/macros/clipper.m4
 
-	# Fix where it looks for some binaries
-	sed -i \
-		-e "s:/y/people/emsley/coot/Linux/bin/probe.2.11.050121.linux.RH9:/usr/bin/probe:g" \
-		-e "s:/y/people/emsley/coot/Linux/bin/reduce.2.21.030604:/usr/bin/reduce:g" \
-		"${S}"/scheme/group-settings.scm
-
 	# So we don't need to depend on crazy old gtk and friends
 	cp "${FILESDIR}"/*.m4 "${S}"/macros/
 
@@ -111,27 +100,14 @@ src_configure() {
 }
 
 src_compile() {
-	# Regenerate wrappers, otherwise at least gtk-2 build fails
-	pushd src
-	rm -f coot_wrap_python.cc coot_wrap_python_pre.cc \
-		&& emake coot_wrap_python.cc \
-		|| die "failed to regenerate python wrapper"
-
-	rm -f coot_wrap_guile.cc coot_wrap_guile_pre.cc \
-		&& emake coot_wrap_guile.cc \
-		||die "failed to regenerate guile wrapper"
-	popd
-
 	emake || die "emake failed"
 
-	cp "${S}"/src/coot.py python/
+	cp "${S}"/src/coot_gtk2.py python/coot.py || die
 }
 
 src_test() {
 #	emake check || die
 
-	ln -sf ../data "${S}"/data
-
 	mkdir "${T}"/coot_test
 
 	export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb"
@@ -144,7 +120,7 @@ src_test() {
 	export PYTHONHOME=/usr
 	export CCP4_SCR="${T}"/coot_test
 
-	export TESTROOT="${S}"
+	export COOT_TEST_DATA_DIR="${WORKDIR}"/data/greg-data
 
 	cat > command-line-greg.scm <<- EOF
 	(use-modules (ice-9 greg))
@@ -157,11 +133,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"
diff --git a/sci-chemistry/coot/coot-0.6_pre1-r2327.ebuild b/sci-chemistry/coot/coot-0.6_pre1-r2327.ebuild
deleted file mode 100644
index 3cb65f922..000000000
--- a/sci-chemistry/coot/coot-0.6_pre1-r2327.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools base versionator
-
-MY_S2_PV=$(replace_version_separator 2 - ${PV})
-MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1}
-MY_S_P=${MY_S2_P}-${PR/r/revision-}
-MY_PV=${PV}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
-HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
-if [[ ${MY_PV} = *pre* ]]; then
-	SRC_URI="http://www.biop.ox.ac.uk/coot/software/source/pre-releases/${MY_S_P}.tar.gz"
-else
-	SRC_URI="http://www.biop.ox.ac.uk/coot/software/source/releases/${MY_P}.tar.gz"
-fi
-SRC_URI="
-	${SRC_URI}
-	test? ( http://www.biop.ox.ac.uk/coot/devel/greg-data.tar.gz  )"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-SCIDEPS="
-	>=sci-libs/ccp4-libs-6.1
-	>=sci-libs/clipper-20090520
-	>=sci-libs/coot-data-2
-	>=sci-libs/gsl-1.3
-	sci-chemistry/reduce
-	sci-chemistry/refmac
-	sci-chemistry/probe"
-
-XDEPS="
-	gnome-base/libgnomecanvas
-	gnome-base/librsvg
-	virtual/glut
-	>=x11-libs/gtk+-2.2
-	x11-libs/gtkglext"
-
-SCHEMEDEPS="
-	dev-scheme/net-http
-	dev-scheme/goosh
-	dev-scheme/guile-gui
-	>=dev-scheme/guile-lib-0.1.6
-	dev-scheme/guile-www
-	=x11-libs/guile-gtk-2.1"
-
-RDEPEND="
-	${SCIDEPS}
-	${XDEPS}
-	${SCHEMEDEPS}
-	dev-python/pygtk
-	>=dev-libs/gmp-4.2.2-r2"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	test? ( dev-scheme/greg )"
-
-#S="${WORKDIR}/${MY_P}"
-S="${WORKDIR}/${MY_S2_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-as-needed.patch
-	"${FILESDIR}"/${PV}-test-rama.patch
-	"${FILESDIR}"/link-against-guile-gtk-properly.patch
-	"${FILESDIR}"/fix-namespace-error.patch
-	)
-
-src_prepare() {
-	base_src_prepare
-
-	# Link against single-precision fftw
-	sed -i \
-		-e "s:lfftw:lsfftw:g" \
-		-e "s:lrfftw:lsrfftw:g" \
-		"${S}"/macros/clipper.m4
-
-	# Fix where it looks for some binaries
-	sed -i \
-		-e "s:/y/people/emsley/coot/Linux/bin/probe.2.11.050121.linux.RH9:/usr/bin/probe:g" \
-		-e "s:/y/people/emsley/coot/Linux/bin/reduce.2.21.030604:/usr/bin/reduce:g" \
-		"${S}"/scheme/group-settings.scm
-
-	# So we don't need to depend on crazy old gtk and friends
-	cp "${FILESDIR}"/*.m4 "${S}"/macros/
-
-	eautoreconf
-}
-
-src_configure() {
-	# All the --with's are used to activate various parts.
-	# Yes, this is broken behavior.
-	econf \
-		--includedir='${prefix}/include/coot' \
-		--with-gtkcanvas-prefix=/usr \
-		--with-clipper-prefix=/usr \
-		--with-mmdb-prefix=/usr \
-		--with-ssmlib-prefix=/usr \
-		--with-gtkgl-prefix=/usr \
-		--with-guile \
-		--with-python=/usr \
-		--with-guile-gtk \
-		--with-gtk2 \
-		--with-pygtk
-}
-
-src_compile() {
-	# Regenerate wrappers, otherwise at least gtk-2 build fails
-	pushd src
-	rm -f coot_wrap_python.cc coot_wrap_python_pre.cc \
-		&& emake coot_wrap_python.cc \
-		|| die "failed to regenerate python wrapper"
-
-	rm -f coot_wrap_guile.cc coot_wrap_guile_pre.cc \
-		&& emake coot_wrap_guile.cc \
-		||die "failed to regenerate guile wrapper"
-	popd
-
-	emake || die "emake failed"
-
-	cp "${S}"/src/coot.py python/
-}
-
-src_test() {
-#	emake check || die
-
-	ln -sf ../data "${S}"/data
-
-	mkdir "${T}"/coot_test
-
-	export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb"
-	export COOT_SCHEME_DIR="${S}/scheme/"
-	export COOT_RESOURCES_FILE="${S}/cootrc"
-	export COOT_PIXMAPS_DIR="${S}/pixmaps"
-	export COOT_DATA_DIR="${S}"
-	export COOT_PYTHON_DIR="${S}/python"
-	export PYTHONPATH="${COOT_PYTHON_DIR}:${PYTHONPATH}"
-	export PYTHONHOME=/usr
-	export CCP4_SCR="${T}"/coot_test
-
-	export TESTROOT="${S}"
-
-	cat > command-line-greg.scm <<- EOF
-	(use-modules (ice-9 greg))
-		(set! greg-tools (list "greg-tests"))
-			(set! greg-debug #t)
-			(set! greg-verbose 5)
-			(let ((r (greg-test-run)))
-				(if r
-				(coot-real-exit 0)
-				(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"
-	einfo "COOT_RESOURCES_FILE $COOT_RESOURCES_FILE"
-	einfo "COOT_PIXMAPS_DIR $COOT_PIXMAPS_DIR"
-	einfo "COOT_DATA_DIR $COOT_DATA_DIR"
-	einfo "COOT_PYTHON_DIR $COOT_PYTHON_DIR"
-	einfo "PYTHONPATH $PYTHONPATH"
-	einfo "PYTHONHOME $PYTHONHOME"
-	einfo "CCP4_SCR ${CCP4_SCR}"
-
-	"${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
-}