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

Package-Manager: portage-2.1.4.4

5 files changed, 88 insertions, 22 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/Manifest b/sci-chemistry/vmd/Manifest
index 9e494e45593a..1d6cadad94fc 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,9 +1,10 @@
 AUX vmd-1.8.5-config-gentoo.patch 4714 RMD160 192224a4a05e249c357f08e13d0811dcfb60f7ea SHA1 9b008b3313c969517dacf1c721e894151d0771f7 SHA256 8e7ac5124de52dbef9469c8416b1f011ffe3420043c5a58c2183b67dd66a6be9
 AUX vmd-1.8.6-config-gentoo.patch 4666 RMD160 1fb149ab58292f42abbe4d658aff0334d3fe73f9 SHA1 27a7ea51772e93e858ef23bf09d819e75d6418b5 SHA256 6dc232ee1c01a56bb94bdf193f024e868f957a22b6c1c8666d2d443801a36f03
 AUX vmd-1.8.6-python-2.5.patch 860 RMD160 4f9f83800e0f5083fcd32a016404c909da4042a6 SHA1 bb401cccbb18428cc0fdce5cf4b5fd3a910a9cea SHA256 652e5dbb44d2c14c13886e9e7bc2677287bfdd520e7489547cffc2331b39d7ec
+AUX vmd-1.8.6-tcltk8.5.patch 2348 RMD160 d1661e1effd1ab35def56cbd53601801427f96a0 SHA1 b7b7fd68cb6e9c8fea12c4544179daaada5dd36b SHA256 d1e39f5d67af22281ccf1bf56e1360778e03d1b1ea6c6c184a0d269f49edee2c
 DIST vmd-1.8.5.src.tar.gz 17106456 RMD160 70087a42ae20180f2ed18cc4492764ed24b19aa4 SHA1 c3da36d75262b75423ddd2a07c17415b9859504a SHA256 208d7829e4fc2744e30c778e1485b96d35018b1e0dbc02388630ce4a2733c30b
 DIST vmd-1.8.6.src.tar.gz 18045341 RMD160 66f8ee5a0313000ea8dd3cb79881fd26a2836a79 SHA1 62ceaab06c7fec7c2c8e9a2d7f08c83ba662679d SHA256 fe2bcf7ffea1ed6b3a7f2402d6e1cb1d6def588a8b09a5d0943c0a9f3426ead2
-EBUILD vmd-1.8.5.ebuild 4093 RMD160 b1a9eab2a380ae1b98d03fd8eea86821e0e55cde SHA1 5a0103ad70e513c7b0c87d2fc4a0f38d80ef589f SHA256 2d3773665703ac9dda1b8d51c9ab37f6e8baf48328a300d5e19c23a8dd7c0347
-EBUILD vmd-1.8.6.ebuild 3974 RMD160 5f2b5f7352ea1f10e0e20d6012c635da021fb107 SHA1 c8c194384933492950f08b8b8e7725ce5689629d SHA256 1fc52ba568296d1d5e6a6f9b643fd61a28349802c5fc81833a0d492c563f2a87
-MISC ChangeLog 3266 RMD160 a1b90a1a91b9ef92d0b63aa0efcf32b3ebcd2900 SHA1 c7008e765c09183020919c9ae29e2d8fcb9d8f62 SHA256 262483c189777096c46bae90fdf6ec4c04699f5cbb572d21040a8db1b1876a73
+EBUILD vmd-1.8.5.ebuild 4101 RMD160 48516a8077ffe491f4b1f6a1b8448400aa616422 SHA1 7a50b50917d9d830c4a7b87841a7727bdc598334 SHA256 a0338ea1cf5c87c1fcd90f7c687c6ab4d3ac6463b95b1646a9360488aa74bd6f
+EBUILD vmd-1.8.6.ebuild 4266 RMD160 6dc88a95015a0443df57542b6afca18957916ed5 SHA1 717a4f82689515d01f493d38096b126ea7ab025f SHA256 3dd5571f4941d0a86479e2181692049e13cc315733003862d2f264d09c77e036
+MISC ChangeLog 3420 RMD160 4b78454079e1d954970e2910826f5fa7f4178445 SHA1 7d0c570b18fd9d3389fb51bcf0893420d76e16ca SHA256 918823573b0aa3e235ff2a5f9c57fed9badb54f40c4a6361fa66f43379b06b9b
 MISC metadata.xml 282 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 SHA1 7f42dcea44641b8a77ab9644791344ec6ed6c327 SHA256 3c1785eb4ab63774ed3a6b1bddd602ef24cd6795f690bb3289d5a980bca06349
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}"