Version bump and removed old, broken ebuilds

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
author: Justin Lecher <jlec@gentoo.org> 2010-02-06 00:15:01 +0000
committer: Justin Lecher <jlec@gentoo.org> 2010-02-06 00:15:01 +0000
commit: 2f5b721c4d0c0c91e55d2dc0e55ac3cd321143e9 (patch)
tree: 5f37c9668e3fccdc5a0a1409bea6188a0f24350f /sci-chemistry/coot
parent: New ebuild, which was wirtten by me. (diff)
download: historical-2f5b721c4d0c0c91e55d2dc0e55ac3cd321143e9.tar.gz
historical-2f5b721c4d0c0c91e55d2dc0e55ac3cd321143e9.tar.bz2
historical-2f5b721c4d0c0c91e55d2dc0e55ac3cd321143e9.zip
10 files changed, 560 insertions, 452 deletions
diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 2f2a31f023a2..e7e3ba77f51b 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/coot
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.19 2009/10/10 00:10:29 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.20 2010/02/06 00:15:00 jlec Exp $
+
+*coot-0.6 (06 Feb 2010)
+
+  06 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> -coot-0.1.2.ebuild,
+  -coot-0.3.1.ebuild, -coot-0.3.3.ebuild, -coot-0.4_pre2-r549.ebuild,
+  +coot-0.6.ebuild, +files/glib.m4, +files/gtk.m4:
+  Version BUmp, removed broken versions
 
   10 Oct 2009; Patrick Lauer <patrick@gentoo.org> coot-0.1.2.ebuild,
   coot-0.3.1.ebuild, coot-0.3.3.ebuild, coot-0.4_pre2-r549.ebuild:
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index 54ca71c3fe4a..f7e21c0f7999 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.3.1-as-needed.patch 18766 RMD160 00b020d46457f9e335b92c2f48088cdc950fce3a SHA1 bd2835ba0a974c8e01d6fa30f670827e6e72fc70 SHA256 cb395ba53839e16aa9e3248b2cfb16794c137730e02a41ca80927538717c4d83
 AUX 0.3.1-fix-compilation-with-guile-1.8.patch 968 RMD160 8c53c2bd3e78b17de447068646cba56bccf50072 SHA1 a2b74a18fa92021528b704bc95277fb77fc4ed02 SHA256 667246f46ac6324c7c346986221f68ee62922cfa3cdd2d3c9e816943719e5b71
 AUX 0.3.1-link-against-guile-gtk-properly.patch 785 RMD160 56900791f5800cfee9157697914318d35828b791 SHA1 8f9ea3ebcb1f0998cba149b67d3687970f172e19 SHA256 8e267168766be09fbda929d19c0a440ed7306320da1918e8d0ecfc55b27f827e
@@ -6,13 +9,17 @@ AUX 0.3.3-link-against-guile-gtk-properly.patch 785 RMD160 7c98e6510b484baa6a47c
 AUX 0.4_pre2-as-needed.patch 19258 RMD160 a9ad8cbc84f9c2a35edb9ea7ec8926c3c4eb9491 SHA1 b49cee7d3cb03e1c4ac4c7c65e71cde99b9fa19d SHA256 a3c3bc4ac1ba9c2f7c6bed75b99f777f568989fc39253f352000f012949e87ab
 AUX 0.4_pre2-link-against-guile-gtk-properly.patch 800 RMD160 e4a9931de152385d552542e11d9a74a548810964 SHA1 74264270682a9135af92bf40a030c008876252e4 SHA256 c7271c82bb6e9e1ba89096ef0a7416609a81b455a1633637b84952db686d5080
 AUX 0.4_pre2-r549-fix-namespace-error.patch 1081 RMD160 ebecd51b87c39dc2c37e565f18fc88b7aa837d05 SHA1 f732df5f4795e728bdf217aac9c9f53952e2890c SHA256 fd271dd22eec5725fcbd20c68b57008eed0f435d1e0ac212fbfd389a0a970beb
-DIST coot-0.1.2.tar.gz 2704638 RMD160 bb0ff46297fc7135b1bf31159bf41b18462b916c SHA1 66f4b13f37cab6537b454a0ad23050044eb4a95f SHA256 fcd2e5862ef57baffc19aa30b1bb48b5271baf0667cc72bf5ecd8a02911fe22a
-DIST coot-0.3.1.tar.gz 3708033 RMD160 8fefe5498171563d0ee660c87175b9af419f07ca SHA1 d612fde00e538682f64c4d204b27556fa742de5e SHA256 f13142b478a1bc9c94a242dd0bf18ac074707f7bd80bf72c8f0f906675099a34
-DIST coot-0.3.3.tar.gz 3870046 RMD160 b23ca227894a469456c5af0284d0bb8530c855b5 SHA1 63755615b05572b43e8f0768a5c0315191f698bf SHA256 f3a7d6f789846b1f7670d4dc3e61a430cbab811f2f22349b84f49e10aaa4a41c
-DIST coot-0.4-pre-2-revision-549.tar.gz 5732300 RMD160 20020fc02dc6e44fc12ac392a7dc35d9f9885bec SHA1 8ae8302b7d32c31860e30c625f2899dd2436cafc SHA256 01cc5ad8d5331cbcb902d40abf4219795c482c42a0ef99347f4fe97a6d7f71c4
-EBUILD coot-0.1.2.ebuild 2279 RMD160 5da6c9542283a42d08f07b5f562f5c1bbab89901 SHA1 69959521d133195a90ae9929dd9b3ce6a561aa80 SHA256 d9841e3e53dec1c449d8663386067a7bbcbfcf6bab31ba079f6ec7a8fd1bbbfd
-EBUILD coot-0.3.1.ebuild 2836 RMD160 86285bc5b283b87557fe1aead739f3aaa519b807 SHA1 17ada6b19f4324920e3db4e8caa2edd1fd56dc5b SHA256 9329082116113f17d9b5e6faebf1d682eae720fab0772503e2454a3ed0901ee0
-EBUILD coot-0.3.3.ebuild 3127 RMD160 c6f681983c49894bfe727a88130a38b0ee7e3670 SHA1 973747ebefb25df2b2ac5768f67e723f3dbfaa61 SHA256 d96c430921c044a0b3ef0017369fe5fa7b43802288d6f9a453855b73d8b376c5
-EBUILD coot-0.4_pre2-r549.ebuild 3211 RMD160 de06a0eff7f9c35af497115d077e16c23db51fbe SHA1 8a6b124d638a4afd3bf96b508faf6a3df51f36d2 SHA256 7de41831e48e6f81b6ac2241930dbbbc1726d2e0fe5e48cb58274ed98876a947
-MISC ChangeLog 3557 RMD160 798607fbb868b053a3579b3817def777da3958c5 SHA1 ca1f196fa82abf2a5f53a335126d36bce9448569 SHA256 0a912500472d023d24fcf99d6748ea1b7fce9c372202e25499e8ec40d73e3ff2
-MISC metadata.xml 282 RMD160 32a7f6f794aa453a76b624b365b65ad6e00f87ef SHA1 2ab961fadec273dc0fa50fbc3a43823157a3c4ba SHA256 55aa4cab857aab55f0b65ab8eba02e593eb729db3d33041debf8e3fc6976e7bd
+AUX glib.m4 8444 RMD160 f3f4b2987796f16d17758f2af3459279351d6f2c SHA1 201eb58c2b3f3c5395dacd3913a4fb9d950d3276 SHA256 ada4a0a46bd00eda39afe77f675b721f60cd20c0080170848f4d7e92b4ba4dc8
+AUX gtk.m4 8516 RMD160 3860fe211902d5b9290f0a70e7d75ebec6b0ec67 SHA1 98b93b820423a52ebd80e3f1822a8f2bd4b3f15d SHA256 4eb6e0bb2c6863139d1fb4ca2d1d0f0ef07e3a85fdbb5ba98d03373f610f0c37
+DIST coot-0.6.tar.gz 11929700 RMD160 6485a56f1d17b103e69b07b5fc128d266e83aa27 SHA1 ec3d486eda514e36bdbc99e8796484e584e4f851 SHA256 7700e7e758934ee5b4177c7bb8e1d7d564b838966dd3c77919fa08778627353b
+DIST greg-data-0.6.tar.gz 7929638 RMD160 d152fb3703eec8c4b3df37b24a1fa2a80a4a9d9f SHA1 5dda8e7e393e3602aa51b2ae830287f93534312f SHA256 032f223f86c0ac504ace427ac84a2bf31f9adaf4da581207526b198f4bb2d76d
+EBUILD coot-0.6.ebuild 3463 RMD160 3b8787b241199a9794833a1794884cd15bb76ef1 SHA1 51ba7d8384345cdb140d1cddfe759760c430661e SHA256 91fea7d9679243a206235bbed5bd58570b3a9d317eb78c329805c9fe79965144
+MISC ChangeLog 3815 RMD160 3898a2baca3cce46fab3053c1648bb8fc1bfb570 SHA1 f254cc541e65647c805d108a1129c7f5f81d1e06 SHA256 ba29cc33d036305409b8d5abc7b9f234588e60e8fd8419e900e4eaac0793604d
+MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktstIoACgkQgAnW8HDreRaaMACfTSxFe/A3wF9q24d2WKkuS7xh
+63kAn0ErSTsprK+3pKUJR8/gNWaYcY72
+=HT7T
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/coot/coot-0.1.2.ebuild b/sci-chemistry/coot/coot-0.1.2.ebuild
deleted file mode 100644
index aa5743249419..000000000000
--- a/sci-chemistry/coot/coot-0.1.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.1.2.ebuild,v 1.5 2009/10/10 00:10:29 patrick Exp $
-
-inherit autotools
-
-MY_PV=${PV/_pre/-pre-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
-HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
-RESTRICT="mirror"
-if [[ ${MY_PV} = *pre* ]]; then
-	SRC_URI="http://www.ysbl.york.ac.uk/~emsley/software/pre-release/${MY_P}.tar.gz"
-else
-	SRC_URI="http://www.ysbl.york.ac.uk/~emsley/software/${MY_P}.tar.gz"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-RDEPEND=">=sci-libs/gsl-1.3
-	=dev-libs/glib-1.2*
-	=x11-libs/gtkglarea-1.2*
-	x11-libs/gtkglext
-	virtual/glut
-	virtual/opengl
-	sci-chemistry/ccp4
-	dev-lang/python
-	x11-libs/gtk-canvas
-	x11-libs/guile-gtk
-	dev-scheme/guile-gui
-	dev-scheme/net-http
-	dev-scheme/goosh
-	dev-scheme/guile-www
-	sci-libs/coot-data
-	sci-chemistry/reduce
-	sci-chemistry/probe"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Link against single-precision fftw
-	sed -i \
-		-e "s:lfttw:lsfttw:g" \
-		-e "s:lrfttw:lsrfttw:g" \
-		"${S}"/macros/clipper.m4
-
-	# Don't install setup scripts, they're only needed for nonstandard prefixes
-	sed -i \
-		-e "s:^\(setup.*\):#\1:g" \
-		-e "s:.*\(bin_.*\):\1:g" \
-		"${S}"/setup/Makefile.am
-
-	# 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
-
-	cd "${S}"
-	AT_M4DIR="macros" 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=/usr \
-		--with-python=/usr \
-		|| die "econf failed"
-
-	# Parallel build's broken
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make 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.3.1.ebuild b/sci-chemistry/coot/coot-0.3.1.ebuild
deleted file mode 100644
index 5c26dca35a63..000000000000
--- a/sci-chemistry/coot/coot-0.3.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.3.1.ebuild,v 1.6 2009/10/10 00:10:29 patrick Exp $
-
-inherit autotools eutils
-
-MY_PV=${PV/_pre/-pre-}
-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.ysbl.york.ac.uk/~emsley/software/pre-release/${MY_P}.tar.gz"
-else
-	SRC_URI="http://www.ysbl.york.ac.uk/~emsley/software/${MY_P}.tar.gz"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="new-interface"
-RDEPEND=">=sci-libs/gsl-1.3
-	new-interface? (
-		>=x11-libs/gtk+-2.2
-		gnome-base/libgnomecanvas
-		=x11-libs/guile-gtk-2*
-	)
-	!new-interface? (
-		=dev-libs/glib-1.2*
-		=x11-libs/gtkglarea-1.2*
-		=x11-libs/guile-gtk-1*
-	)
-	x11-libs/gtkglext
-	virtual/glut
-	virtual/opengl
-	sci-chemistry/ccp4
-	dev-lang/python
-	>=x11-libs/gtk-canvas-0.1.1-r2
-	dev-scheme/guile-gui
-	dev-scheme/net-http
-	dev-scheme/goosh
-	dev-scheme/guile-www
-	sci-libs/coot-data
-	sci-chemistry/reduce
-	sci-chemistry/probe
-	sci-libs/clipper"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-as-needed.patch
-	epatch "${FILESDIR}"/${PV}-fix-compilation-with-guile-1.8.patch
-	epatch "${FILESDIR}"/${PV}-link-against-guile-gtk-properly.patch
-
-	# Link against single-precision fftw
-	sed -i \
-		-e "s:lfttw:lsfttw:g" \
-		-e "s:lrfttw:lsrfttw: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"
-
-	cd "${S}"
-	AT_M4DIR="macros" 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=/usr \
-		--with-python=/usr \
-		--with-guile-gtk \
-		$(use_with new-interface gtk2) \
-		|| die "econf failed"
-
-	# Parallel build's broken
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 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.3.3.ebuild b/sci-chemistry/coot/coot-0.3.3.ebuild
deleted file mode 100644
index 32fc5934009d..000000000000
--- a/sci-chemistry/coot/coot-0.3.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.3.3.ebuild,v 1.3 2009/10/10 00:10:29 patrick Exp $
-
-inherit autotools eutils
-
-MY_PV=${PV/_pre/-pre-}
-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.ysbl.york.ac.uk/~emsley/software/pre-release/${MY_P}.tar.gz"
-else
-	SRC_URI="http://www.ysbl.york.ac.uk/~emsley/software/${MY_P}.tar.gz"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="new-interface"
-RDEPEND=">=sci-libs/gsl-1.3
-	new-interface? (
-		>=x11-libs/gtk+-2.2
-		gnome-base/libgnomecanvas
-		=x11-libs/guile-gtk-2*
-	)
-	!new-interface? (
-		=dev-libs/glib-1.2*
-		=x11-libs/gtkglarea-1.2*
-		=x11-libs/guile-gtk-1*
-	)
-	x11-libs/gtkglext
-	virtual/glut
-	virtual/opengl
-	sci-chemistry/ccp4
-	dev-lang/python
-	>=x11-libs/gtk-canvas-0.1.1-r2
-	dev-scheme/guile-gui
-	dev-scheme/net-http
-	dev-scheme/goosh
-	dev-scheme/guile-www
-	sci-libs/coot-data
-	sci-chemistry/reduce
-	sci-chemistry/probe
-	sci-libs/clipper"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-as-needed.patch
-	epatch "${FILESDIR}"/${PV}-link-against-guile-gtk-properly.patch
-
-	# Link against single-precision fftw
-	sed -i \
-		-e "s:lfttw:lsfttw:g" \
-		-e "s:lrfttw:lsrfttw: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"
-
-	cd "${S}"
-	AT_M4DIR="macros" 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=/usr \
-		--with-python=/usr \
-		--with-guile-gtk \
-		$(use_with new-interface gtk2) \
-		|| die "econf failed"
-
-	# 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
-
-	# Parallel build's broken
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 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.4_pre2-r549.ebuild b/sci-chemistry/coot/coot-0.4_pre2-r549.ebuild
deleted file mode 100644
index 0de768f3aced..000000000000
--- a/sci-chemistry/coot/coot-0.4_pre2-r549.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.4_pre2-r549.ebuild,v 1.3 2009/10/10 00:10:29 patrick Exp $
-
-inherit autotools eutils
-
-MY_S_PV=${PV/_pre/-pre-}-${PR/r/revision-}
-MY_S_P=${PN}-${MY_S_PV}
-MY_PV=${PV/_pre/-pre-}
-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.ysbl.york.ac.uk/~emsley/software/pre-release/${MY_S_P}.tar.gz"
-else
-	SRC_URI="http://www.ysbl.york.ac.uk/~emsley/software/${MY_P}.tar.gz"
-fi
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-RDEPEND=">=sci-libs/gsl-1.3
-	>=x11-libs/gtk+-2.2
-	gnome-base/libgnomecanvas
-	=x11-libs/guile-gtk-2*
-	x11-libs/gtkglext
-	virtual/glut
-	virtual/opengl
-	sci-chemistry/ccp4
-	dev-lang/python
-	dev-scheme/guile-gui
-	dev-scheme/net-http
-	dev-scheme/goosh
-	dev-scheme/guile-www
-	sci-libs/coot-data
-	sci-chemistry/reduce
-	sci-chemistry/probe
-	>=sci-libs/clipper-20070907
-	<sci-libs/mmdb-1.0.10"
-# These are still required to run autoreconf
-RDEPEND="${RDEPEND}
-	=dev-libs/glib-1.2*
-	=x11-libs/gtkglarea-1.2*"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-as-needed.patch
-	epatch "${FILESDIR}"/${PV}-link-against-guile-gtk-properly.patch
-	epatch "${FILESDIR}"/${PVR}-fix-namespace-error.patch
-
-	# Link against single-precision fftw
-	sed -i \
-		-e "s:lfttw:lsfttw:g" \
-		-e "s:lrfttw:lsrfttw: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"
-
-	cd "${S}"
-	AT_M4DIR="macros" 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=/usr \
-		--with-python=/usr \
-		--with-guile-gtk \
-		--with-gtk2 \
-		|| die "econf failed"
-
-	# 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
-
-	# Parallel build's broken
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 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.ebuild b/sci-chemistry/coot/coot-0.6.ebuild
new file mode 100644
index 000000000000..55b150e0432b
--- /dev/null
+++ b/sci-chemistry/coot/coot-0.6.ebuild
@@ -0,0 +1,139 @@
+# 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.1 2010/02/06 00:15:00 jlec Exp $
+
+EAPI="3"
+
+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/"
+SRC_URI="
+	http://www.biop.ox.ac.uk/coot/software/source/releases/${MY_P}.tar.gz
+	test? ( mirror://gentoo/greg-data-${PV}.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/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
+	>=net-misc/curl-7.19.6"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	test? ( dev-scheme/greg )"
+
+#S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MY_S2_P}"
+
+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
+
+	# 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="${EPREFIX}"/usr \
+		--with-clipper-prefix="${EPREFIX}"/usr \
+		--with-mmdb-prefix="${EPREFIX}"/usr \
+		--with-ssmlib-prefix="${EPREFIX}"/usr \
+		--with-gtkgl-prefix="${EPREFIX}"/usr \
+		--with-guile \
+		--with-python="${EPREFIX}"/usr \
+		--with-guile-gtk \
+		--with-gtk2 \
+		--with-pygtk
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	cp "${S}"/src/coot_gtk2.py python/coot.py || die
+}
+
+src_test() {
+	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="${EPREFIX}"/usr
+	export CCP4_SCR="${T}"/coot_test
+
+	export COOT_TEST_DATA_DIR="${WORKDIR}"/data/greg-data
+
+	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
+
+	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
+}
diff --git a/sci-chemistry/coot/files/glib.m4 b/sci-chemistry/coot/files/glib.m4
new file mode 100644
index 000000000000..b3c632b0e19e
--- /dev/null
+++ b/sci-chemistry/coot/files/glib.m4
@@ -0,0 +1,196 @@
+# Configure paths for GLIB
+# Owen Taylor     97-11-3
+
+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
+dnl gthread is specified in MODULES, pass to glib-config
+dnl
+AC_DEFUN([AM_PATH_GLIB],
+[dnl 
+dnl Get the cflags and libraries from the glib-config script
+dnl
+AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
+            glib_config_prefix="$withval", glib_config_prefix="")
+AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
+            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
+AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
+		    , enable_glibtest=yes)
+
+  if test x$glib_config_exec_prefix != x ; then
+     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
+     if test x${GLIB_CONFIG+set} != xset ; then
+        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
+     fi
+  fi
+  if test x$glib_config_prefix != x ; then
+     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
+     if test x${GLIB_CONFIG+set} != xset ; then
+        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
+     fi
+  fi
+
+  for module in . $4
+  do
+      case "$module" in
+         gmodule) 
+             glib_config_args="$glib_config_args gmodule"
+         ;;
+         gthread) 
+             glib_config_args="$glib_config_args gthread"
+         ;;
+      esac
+  done
+
+  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
+  min_glib_version=ifelse([$1], ,0.99.7,$1)
+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+  no_glib=""
+  if test "$GLIB_CONFIG" = "no" ; then
+    no_glib=yes
+  else
+    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+dnl
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl checks the results of glib-config to some extent
+dnl
+      rm -f conf.glibtest
+      AC_TRY_RUN([
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.glibtest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_glib_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If glib-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
+      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
+        printf("*** correct copy of glib-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$GLIB_CONFIG" = "no" ; then
+       echo "*** The glib-config script installed by GLIB could not be found"
+       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
+       echo "*** full path to glib-config."
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          AC_TRY_LINK([
+#include <glib.h>
+#include <stdio.h>
+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
+          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
+          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GLIB_CFLAGS)
+  AC_SUBST(GLIB_LIBS)
+  rm -f conf.glibtest
+])
diff --git a/sci-chemistry/coot/files/gtk.m4 b/sci-chemistry/coot/files/gtk.m4
new file mode 100644
index 000000000000..beb1859e36bc
--- /dev/null
+++ b/sci-chemistry/coot/files/gtk.m4
@@ -0,0 +1,199 @@
+# Configure paths for GTK+
+# Owen Taylor     97-11-3
+AC_DEFUN([GTK_AC_DIVERT_BEFORE_HELP],
+[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
+       [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
+              [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+$1
+AC_DIVERT_POP()])])])
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+dnl
+AC_DEFUN([AM_PATH_GTK],
+[dnl 
+dnl Get the cflags and libraries from the gtk-config script
+dnl
+AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
+            gtk_config_prefix="$withval", gtk_config_prefix="")
+AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
+            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
+		    , enable_gtktest=yes)
+
+  for module in . $4
+  do
+      case "$module" in
+         gthread) 
+             gtk_config_args="$gtk_config_args gthread"
+         ;;
+      esac
+  done
+
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+     fi
+  fi
+
+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+  min_gtk_version=ifelse([$1], ,0.99.7,$1)
+  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+  no_gtk=""
+  if test "$GTK_CONFIG" = "no" ; then
+    no_gtk=yes
+  else
+    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
+dnl checks the results of gtk-config to some extent
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtktest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If gtk-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$GTK_CONFIG" = "no" ; then
+       echo "*** The gtk-config script installed by GTK could not be found"
+       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GTK_CONFIG environment variable to the"
+       echo "*** full path to gtk-config."
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK test program, checking why..."
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK or finding the wrong"
+          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
+])
diff --git a/sci-chemistry/coot/metadata.xml b/sci-chemistry/coot/metadata.xml
index c95a120dcc64..9ac9ffdb3a41 100644
--- a/sci-chemistry/coot/metadata.xml
+++ b/sci-chemistry/coot/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-chemistry</herd>
-<use>
-  <flag name='new-interface'>Build with the experimental GTK+-2 interface
-    instead of GTK+-1</flag>
-</use>
 </pkgmetadata>
author	Justin Lecher <jlec@gentoo.org>	2010-02-06 00:15:01 +0000
committer	Justin Lecher <jlec@gentoo.org>	2010-02-06 00:15:01 +0000
commit	2f5b721c4d0c0c91e55d2dc0e55ac3cd321143e9 (patch)
tree	5f37c9668e3fccdc5a0a1409bea6188a0f24350f /sci-chemistry/coot
parent	New ebuild, which was wirtten by me. (diff)
download	historical-2f5b721c4d0c0c91e55d2dc0e55ac3cd321143e9.tar.gz historical-2f5b721c4d0c0c91e55d2dc0e55ac3cd321143e9.tar.bz2 historical-2f5b721c4d0c0c91e55d2dc0e55ac3cd321143e9.zip