Add USE=new-interface to prefer gtk2, which is still experimental. Add patches to make it work with guile 1.8 and link against guile-gtk properly. Change src_install() make to emake -j1 so other MAKEOPTS get through.

Package-Manager: portage-2.1.3_rc4

5 files changed, 89 insertions, 15 deletions

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 283f5d0093c5..280aac46b74d 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/coot
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.12 2007/05/30 22:03:44 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.13 2007/06/22 22:33:19 dberkholz Exp $
+
+  22 Jun 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0.3.1-link-against-guile-gtk-properly.patch,
+  +files/0.3.1-fix-compilation-with-guile-1.8.patch, coot-0.3.1.ebuild:
+  Add USE=new-interface to prefer gtk2, which is still experimental. Add
+  patches to make it work with guile 1.8 and link against guile-gtk properly.
+  Change src_install() make to emake -j1 so other MAKEOPTS get through.
 
   30 May 2007; Donnie Berkholz <dberkholz@gentoo.org>; coot-0.3.1.ebuild:
   Keyword ~ppc.
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index 9e49f7a7aa21..a050bc0f6dea 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -2,20 +2,28 @@ AUX 0.3.1-as-needed.patch 18766 RMD160 00b020d46457f9e335b92c2f48088cdc950fce3a
 MD5 5c1b5db01f341e29a1c366002e3cc789 files/0.3.1-as-needed.patch 18766
 RMD160 00b020d46457f9e335b92c2f48088cdc950fce3a files/0.3.1-as-needed.patch 18766
 SHA256 cb395ba53839e16aa9e3248b2cfb16794c137730e02a41ca80927538717c4d83 files/0.3.1-as-needed.patch 18766
+AUX 0.3.1-fix-compilation-with-guile-1.8.patch 968 RMD160 8c53c2bd3e78b17de447068646cba56bccf50072 SHA1 a2b74a18fa92021528b704bc95277fb77fc4ed02 SHA256 667246f46ac6324c7c346986221f68ee62922cfa3cdd2d3c9e816943719e5b71
+MD5 9505edb0e3035407ff255949dee62bae files/0.3.1-fix-compilation-with-guile-1.8.patch 968
+RMD160 8c53c2bd3e78b17de447068646cba56bccf50072 files/0.3.1-fix-compilation-with-guile-1.8.patch 968
+SHA256 667246f46ac6324c7c346986221f68ee62922cfa3cdd2d3c9e816943719e5b71 files/0.3.1-fix-compilation-with-guile-1.8.patch 968
+AUX 0.3.1-link-against-guile-gtk-properly.patch 785 RMD160 56900791f5800cfee9157697914318d35828b791 SHA1 8f9ea3ebcb1f0998cba149b67d3687970f172e19 SHA256 8e267168766be09fbda929d19c0a440ed7306320da1918e8d0ecfc55b27f827e
+MD5 8adcd042736352fd280032e9a1173dc1 files/0.3.1-link-against-guile-gtk-properly.patch 785
+RMD160 56900791f5800cfee9157697914318d35828b791 files/0.3.1-link-against-guile-gtk-properly.patch 785
+SHA256 8e267168766be09fbda929d19c0a440ed7306320da1918e8d0ecfc55b27f827e files/0.3.1-link-against-guile-gtk-properly.patch 785
 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
 EBUILD coot-0.1.2.ebuild 2308 RMD160 b59de80ec0ab129eb3d739710d9f07388e6582e0 SHA1 d534ac54efd5b2a8be66b5e23e6992d49419d625 SHA256 6ce0825594abf6d21ac17cdc715cb2c9d522b809f798a7f1d70cc6cd8c392717
 MD5 d61e130fcb36e9fbc37937d6fce495c7 coot-0.1.2.ebuild 2308
 RMD160 b59de80ec0ab129eb3d739710d9f07388e6582e0 coot-0.1.2.ebuild 2308
 SHA256 6ce0825594abf6d21ac17cdc715cb2c9d522b809f798a7f1d70cc6cd8c392717 coot-0.1.2.ebuild 2308
-EBUILD coot-0.3.1.ebuild 2524 RMD160 12462170a8f4f41ba67b71db424699ae08807dfe SHA1 52b3ee62c303c17021269f0707e937ce8f0c6269 SHA256 137a5e72d15f64645d2edaec4acfc051b53f99ca77193114ea18bce416f632af
-MD5 121a5955d20d752c2fcc92e814744d7b coot-0.3.1.ebuild 2524
-RMD160 12462170a8f4f41ba67b71db424699ae08807dfe coot-0.3.1.ebuild 2524
-SHA256 137a5e72d15f64645d2edaec4acfc051b53f99ca77193114ea18bce416f632af coot-0.3.1.ebuild 2524
-MISC ChangeLog 1941 RMD160 d38c4b187a3de9a08a7f4dfdc896e99d1bc17ce6 SHA1 8dfd0245e6093d7e08ce5dad3a7907588101bee9 SHA256 56c10f115ca4a13bf177cf09304b877f1c28cee4565d62df6ed897e0105211b6
-MD5 7fb4d35ad6afb70b1a43a5e0f6b10e84 ChangeLog 1941
-RMD160 d38c4b187a3de9a08a7f4dfdc896e99d1bc17ce6 ChangeLog 1941
-SHA256 56c10f115ca4a13bf177cf09304b877f1c28cee4565d62df6ed897e0105211b6 ChangeLog 1941
+EBUILD coot-0.3.1.ebuild 2865 RMD160 0f87fd416dad57a889caacb1670f903a16225aef SHA1 dcfff57648b243096bfbfca678e93ad4ff9cd4e6 SHA256 a08fd746af8e1856b388214db33680326a1e4fd11075d3bff15bb84e42eabd25
+MD5 2a5479616096a380adf0fe1323545531 coot-0.3.1.ebuild 2865
+RMD160 0f87fd416dad57a889caacb1670f903a16225aef coot-0.3.1.ebuild 2865
+SHA256 a08fd746af8e1856b388214db33680326a1e4fd11075d3bff15bb84e42eabd25 coot-0.3.1.ebuild 2865
+MISC ChangeLog 2346 RMD160 73512214a6b668b68bb24fbc7b9d573c71e48d96 SHA1 e87438c3755ec6c7e5e5ca8f60e0545c14a7dff3 SHA256 102d55e4906b353c49786f513ef13476cddae23dc4f148f47d733c10d4788d7f
+MD5 ad070bdf78aea8afc9edfdef917882d9 ChangeLog 2346
+RMD160 73512214a6b668b68bb24fbc7b9d573c71e48d96 ChangeLog 2346
+SHA256 102d55e4906b353c49786f513ef13476cddae23dc4f148f47d733c10d4788d7f ChangeLog 2346
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 MD5 43628e9f5743b5c3b018a82669a76bc7 metadata.xml 166
 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 metadata.xml 166
diff --git a/sci-chemistry/coot/coot-0.3.1.ebuild b/sci-chemistry/coot/coot-0.3.1.ebuild
index 4db664caf991..1611dd285c04 100644
--- a/sci-chemistry/coot/coot-0.3.1.ebuild
+++ b/sci-chemistry/coot/coot-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.3 2007/05/30 22:03:44 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.3.1.ebuild,v 1.4 2007/06/22 22:33:19 dberkholz Exp $
 
 inherit autotools eutils
 
@@ -17,10 +17,18 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE=""
+IUSE="new-interface"
 RDEPEND=">=sci-libs/gsl-1.3
-	=dev-libs/glib-1.2*
-	=x11-libs/gtkglarea-1.2*
+	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
@@ -28,7 +36,6 @@ RDEPEND=">=sci-libs/gsl-1.3
 	dev-lang/python
 	>=x11-libs/gtk-canvas-0.1.1-r2
 	dev-lang/python
-	x11-libs/guile-gtk
 	dev-scheme/guile-gui
 	dev-scheme/net-http
 	dev-scheme/goosh
@@ -42,8 +49,11 @@ 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 \
@@ -82,6 +92,8 @@ src_compile() {
 		--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
@@ -89,7 +101,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake -j1 DESTDIR="${D}" install || die "install failed"
 
 	# Install misses this
 	insinto /usr/share/coot/python
diff --git a/sci-chemistry/coot/files/0.3.1-fix-compilation-with-guile-1.8.patch b/sci-chemistry/coot/files/0.3.1-fix-compilation-with-guile-1.8.patch
new file mode 100644
index 000000000000..211376121c5b
--- /dev/null
+++ b/sci-chemistry/coot/files/0.3.1-fix-compilation-with-guile-1.8.patch
@@ -0,0 +1,32 @@
+Index: src/c-interface.h
+===================================================================
+--- src/c-interface.h	(revision 219)
++++ src/c-interface.h	(revision 220)
+@@ -57,6 +57,14 @@
+  
+ */
+ 
++/* Francois says move this up here so that things don't get wrapped
++   twice in C-declarations inside gmp library. Hmm! */
++#ifdef __cplusplus
++#ifdef USE_GUILE
++#include <libguile.h>		/* for SCM type (returned by safe_scheme_command) */
++#endif // USE_GUILE
++#endif 
++
+ #ifndef BEGIN_C_DECLS
+ 
+ #ifdef __cplusplus
+@@ -83,12 +91,6 @@
+ 
+ #define COOT_SCHEME_DIR "COOT_SCHEME_DIR"
+ 
+-#ifdef __cplusplus
+-#ifdef USE_GUILE
+-#include <libguile.h>		/* for SCM type (returned by safe_scheme_command) */
+-#endif // USE_GUILE
+-#endif 
+-
+ /*  ------------------------------------------------------------------------ */
+ /*                         File system Functions:                            */
+ /*  ------------------------------------------------------------------------ */
diff --git a/sci-chemistry/coot/files/0.3.1-link-against-guile-gtk-properly.patch b/sci-chemistry/coot/files/0.3.1-link-against-guile-gtk-properly.patch
new file mode 100644
index 000000000000..18af14a2966e
--- /dev/null
+++ b/sci-chemistry/coot/files/0.3.1-link-against-guile-gtk-properly.patch
@@ -0,0 +1,15 @@
+diff -urN coot-0.3.1.orig/macros/guile-gtk.m4 coot-0.3.1/macros/guile-gtk.m4
+--- coot-0.3.1.orig/macros/guile-gtk.m4	2007-06-21 22:48:39.000000000 -0700
++++ coot-0.3.1/macros/guile-gtk.m4	2007-06-21 22:55:17.000000000 -0700
+@@ -47,9 +47,9 @@
+    # we have the variable coot_gtk2 in configure.in, which is either TRUE or FALSE
+    # Let's use that here.  Perhaps there is a better (set by gtk macro?) variable?
+    if test $coot_gtk2 = TRUE ; then
+-	GUILE_GTK_LIBS=$guile_gtk_prefix/lib/libguilegtk-2.0.la
++	GUILE_GTK_LIBS="-L$guile_gtk_prefix/lib -lguilegtk-2.0"
+    else 
+-	GUILE_GTK_LIBS=$guile_gtk_prefix/lib/libguilegtk-1.2.la
++	GUILE_GTK_LIBS="-L$guile_gtk_prefix/lib -lguilegtk-1.2"
+    fi
+    # do we need to set this in fact?
+    GUILE_GTK_CFLAGS="-I$guile_gtk_prefix/include"