Added tcltk-8.5 support (fixes bug #212936).

(Portage version: 2.1.4.4)

4 files changed, 84 insertions, 19 deletions

diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index e9842e40110a..52271bcd1aff 100644
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/vmd
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.17 2007/09/20 21:44:50 markusle Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.18 2008/03/13 14:02:39 markusle Exp $
+
+  13 Mar 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/vmd-1.8.6-tcltk8.5.patch, vmd-1.8.6.ebuild:
+  Added tcltk-8.5 support (fixes bug #212936).
 
   20 Sep 2007; Markus Dittrich <markusle@gentoo.org>
   +files/vmd-1.8.6-python-2.5.patch, vmd-1.8.6.ebuild:
diff --git a/sci-chemistry/vmd/files/vmd-1.8.6-tcltk8.5.patch b/sci-chemistry/vmd/files/vmd-1.8.6-tcltk8.5.patch
new file mode 100644
index 000000000000..abb9be3e3431
--- /dev/null
+++ b/sci-chemistry/vmd/files/vmd-1.8.6-tcltk8.5.patch
@@ -0,0 +1,50 @@
+diff -Naur vmd-1.8.6/configure vmd-1.8.6.new/configure
+--- vmd-1.8.6/configure	2007-04-08 01:03:49.000000000 -0400
++++ vmd-1.8.6.new/configure	2008-03-11 09:53:43.000000000 -0400
+@@ -591,8 +591,8 @@
+ if ($config_tk) { $tcl_include .= " -I$stock_tk_include_dir"; }
+ $tcl_library      = "-L$stock_tcl_library_dir";
+ if ($config_tk) { $tcl_library .= " -L$stock_tk_library_dir"; }
+-$tcl_libs         = "-ltcl8.4";  
+-if ($config_tk) { $tcl_libs = "-ltk8.4 -lX11 " . $tcl_libs; }
++$tcl_libs         = "-ltcl";  
++if ($config_tk) { $tcl_libs = "-ltk -lX11 " . $tcl_libs; }
+ 
+ @tcl_cc           = ();
+ @tcl_cu           = ();
+@@ -1843,8 +1843,8 @@
+       $fltk_libs        = "-lfltk-x11 -lX11";
+       $opengl_include   = $opengl_include . " -I/usr/X11R6/include";
+       $opengl_libs      = "-L/usr/X11R6/lib -lGLU -lGL -framework Carbon -lXext -lX11";
+-      $tcl_libs         = "-ltcl8.4-x11";
+-      if ($config_tk) { $tcl_libs = "-ltk8.4-x11 -lX11 " . $tcl_libs; }
++      $tcl_libs         = "-ltcl-x11";
++      if ($config_tk) { $tcl_libs = "-ltk-x11 -lX11 " . $tcl_libs; }
+       $vmd_libs          = "$tcl_libs";
+     } else {
+       ##
+@@ -1936,8 +1936,8 @@
+       $fltk_libs        = "-lfltk-x11 -lX11";
+       $opengl_include   = $opengl_include . " -I/usr/X11R6/include";
+       $opengl_libs      = "-L/usr/X11R6/lib -lGLU -lGL -framework Carbon -lXext -lX11";
+-      $tcl_libs         = "-ltcl8.4-x11";
+-      if ($config_tk) { $tcl_libs = "-ltk8.4-x11 -lX11 " . $tcl_libs; }
++      $tcl_libs         = "-ltcl-x11";
++      if ($config_tk) { $tcl_libs = "-ltk-x11 -lX11 " . $tcl_libs; }
+       $vmd_libs          = "$tcl_libs";
+     } else {
+       ##
+diff -Naur vmd-1.8.6/src/cmd_render.C vmd-1.8.6.new/src/cmd_render.C
+--- vmd-1.8.6/src/cmd_render.C	2007-04-08 01:04:03.000000000 -0400
++++ vmd-1.8.6.new/src/cmd_render.C	2008-03-11 09:53:12.000000000 -0400
+@@ -211,8 +211,8 @@
+   // likely to lead to memory leaks in various scripts.  There's also currently
+   // no way to read out the size of the display in VMD (sad, I know), so
+   // it's just easier to set it here.
+-  Tk_PhotoSetSize(handle, xs, ys);
+-  Tk_PhotoPutBlock(handle, &blk, 0, 0, xs, ys, TK_PHOTO_COMPOSITE_SET);
++  Tk_PhotoSetSize(interp, handle, xs, ys);
++  Tk_PhotoPutBlock(interp, handle, &blk, 0, 0, xs, ys, TK_PHOTO_COMPOSITE_SET);
+   free(img);
+   return TCL_OK;
+ }
diff --git a/sci-chemistry/vmd/vmd-1.8.5.ebuild b/sci-chemistry/vmd/vmd-1.8.5.ebuild
index 1d88235fe644..34b6bb0e727f 100644
--- a/sci-chemistry/vmd/vmd-1.8.5.ebuild
+++ b/sci-chemistry/vmd/vmd-1.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.5.ebuild,v 1.9 2007/07/22 07:20:11 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.5.ebuild,v 1.10 2008/03/13 14:02:39 markusle Exp $
 
 inherit eutils toolchain-funcs python
 
@@ -92,7 +92,7 @@ src_unpack() {
 	sed -e "s:LINUXPPC:LINUX:g" \
 		-e "s:LINUXALPHA:LINUX:g" \
 		-e "s:LINUXAMD64:LINUX:g" \
-		-i ${S}/bin/vmd || die "failed setting up vmd wrapper script"
+		-i "${S}"/bin/vmd || die "failed setting up vmd wrapper script"
 
 	local myconfig="LINUX OPENGL FLTK TK TCL PTHREADS PYTHON IMD NETCDF"
 
@@ -125,9 +125,9 @@ src_install() {
 	make install || die "failed to install vmd"
 
 	# export STRIDE_BIN so VMD find stride
-	echo "STRIDE_BIN=/usr/bin/stride" > ${T}/99${PN} || \
+	echo "STRIDE_BIN=/usr/bin/stride" > "${T}"/99${PN} || \
 		die "Failed to create vmd env file"
-	doenvd ${T}/99${PN} || die "Failed to install vmd env file"
+	doenvd "${T}"/99${PN} || die "Failed to install vmd env file"
 
 	# install docs
 	cd "${S}"
@@ -145,6 +145,6 @@ src_install() {
 
 	# adjust paxctl settings on hardened systems
 	if use hardened; then
-		/sbin/paxctl -pemrxs ${D}/usr/$(get_libdir)/${PN}/${PN}_LINUX
+		/sbin/paxctl -pemrxs "${D}"/usr/$(get_libdir)/${PN}/${PN}_LINUX
 	fi
 }
diff --git a/sci-chemistry/vmd/vmd-1.8.6.ebuild b/sci-chemistry/vmd/vmd-1.8.6.ebuild
index 79718275dac0..de6848102ced 100644
--- a/sci-chemistry/vmd/vmd-1.8.6.ebuild
+++ b/sci-chemistry/vmd/vmd-1.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.6.ebuild,v 1.5 2007/09/20 21:44:50 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.6.ebuild,v 1.6 2008/03/13 14:02:39 markusle Exp $
 
 inherit eutils toolchain-funcs python
 
@@ -19,8 +19,8 @@ DEPEND="app-shells/tcsh
 	x11-libs/libXft
 	virtual/opengl
 	x11-libs/fltk
-	=dev-lang/tcl-8.4*
-	=dev-lang/tk-8.4*
+	>=dev-lang/tcl-8.4
+	>=dev-lang/tk-8.4
 	>=dev-lang/python-2.3
 	sci-biology/stride
 	sci-libs/netcdf"
@@ -38,11 +38,18 @@ pkg_nofetch() {
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
 	# apply LINUX-arch patches to vmd configure
 	epatch "${FILESDIR}"/${P}-config-gentoo.patch
 	epatch "${FILESDIR}"/${P}-python-2.5.patch
 
+	TCL_LIB_PATH="/usr/$(get_libdir)/tcl8.4"
+	if has_version =dev-lang/tcl-8.5*; then
+		epatch "${FILESDIR}"/${P}-tcltk8.5.patch
+		TCL_LIB_PATH="/usr/$(get_libdir)/tcl8.5"
+	fi
+
 	# prepare the plugins
 
 	cd "${WORKDIR}"/plugins
@@ -54,8 +61,12 @@ src_unpack() {
 		-e "s:CCFLAGS = -O2 -Wall:CCFLAGS = ${CFLAGS}:" \
 		-e "s:CXXFLAGS = -O2 -Wall:CXXFLAGS = ${CXXFLAGS}:" \
 		-e "s:SHLD = gcc:SHLD = $(tc-getCC):" \
+		-e "s:-ltcl8.4:-ltcl:" \
 	    -i Make-arch || die "Failed to set up plugins Makefile"
 
+	sed -e "s:1.0:1.2:" -i vdna/pkgIndex.tcl \
+		|| die "Failed to fix vdna plugin"
+
 	# prepare vmd itself
 
 	cd "${S}"
@@ -92,26 +103,26 @@ src_unpack() {
 	sed -e "s:LINUXPPC:LINUX:g" \
 		-e "s:LINUXALPHA:LINUX:g" \
 		-e "s:LINUXAMD64:LINUX:g" \
-		-i ${S}/bin/vmd || die "failed setting up vmd wrapper script"
+		-i "${S}"/bin/vmd || die "failed setting up vmd wrapper script"
 
 	local myconfig="LINUX OPENGL FLTK TK TCL PTHREADS PYTHON IMD NETCDF"
 
 	rm -f configure.options && echo $myconfig >> configure.options
 
 	./configure &> /dev/null || die "failed to configure"
-
 }
 
 src_compile() {
 	# build plugins
 	cd "${WORKDIR}"/plugins
+
 	make LINUX TCLINC="-I/usr/include" \
-		TCLLIB="-L/usr/$(get_libdir)/tcl8.4" || \
-		die "failed to build plugins"
+		TCLLIB=-L/"${TCL_LIB_PATH}" \
+		|| die "failed to build plugins"
 
 	# build vmd
 	cd "${S}"/src
-	make || die "failed to build vmd"
+	emake || die "failed to build vmd"
 }
 
 src_install() {
@@ -125,9 +136,9 @@ src_install() {
 	make install || die "failed to install vmd"
 
 	# export STRIDE_BIN so VMD knows where to find stride
-	echo "STRIDE_BIN=/usr/bin/stride" > ${T}/99${PN} || \
+	echo "STRIDE_BIN=/usr/bin/stride" > "${T}"/99${PN} || \
 		die "Failed to create vmd env file"
-	doenvd ${T}/99${PN} || die "Failed to install vmd env file"
+	doenvd "${T}"/99${PN} || die "Failed to install vmd env file"
 
 	# install docs
 	cd "${S}"