Fixed by alexxy for tcl8.5

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 178 insertions, 6 deletions

diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index e45f8bfe26f9..3e5a97dad5d2 100644
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/vmd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.19 2008/11/12 18:41:47 markusle Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.20 2009/05/17 20:15:13 je_fro Exp $
+
+  17 May 2009; Jeff Gardner <je_fro@gentoo.org> +vmd-1.8.6-r1.ebuild:
+  Fixed by alexxy to work with tcl8.5
+
+*vmd-1.8.6-r1 (17 May 2009)
+
+  17 May 2009; Jeff Gardner <je_fro@gentoo.org> +vmd-1.8.6-r1.ebuild:
+  Fixed by alexxy to work with tcl5.8
 
   12 Nov 2008; Markus Dittrich <markusle@gentoo.org> -vmd-1.8.5.ebuild,
   vmd-1.8.6.ebuild:
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index 4fec019f61f7..5d4527238ca7 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -3,6 +3,7 @@ AUX vmd-1.8.6-config-gentoo.patch 4666 RMD160 1fb149ab58292f42abbe4d658aff0334d3
 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.6.src.tar.gz 18045341 RMD160 66f8ee5a0313000ea8dd3cb79881fd26a2836a79 SHA1 62ceaab06c7fec7c2c8e9a2d7f08c83ba662679d SHA256 fe2bcf7ffea1ed6b3a7f2402d6e1cb1d6def588a8b09a5d0943c0a9f3426ead2
-EBUILD vmd-1.8.6.ebuild 4280 RMD160 a2fa5633f91a4a9b3288e2f561e12106961a5d09 SHA1 3478e1a483346e9d9ee915c8a0ec20212bca72a3 SHA256 1a6744761369dda5ed13c884f4ad5fc87b5745d9f5c216378251f696afa881e5
-MISC ChangeLog 3613 RMD160 3d970165d6f162a707a75a8dcd9e7caa4cea085e SHA1 e0772976a6a8fd801d2cef99de8a4d4071e2741b SHA256 5ec06855c8944f73f5eab0c7fbb8beb406ed8ea3ed74a36026a8833cf2d6f2a5
+EBUILD vmd-1.8.6-r1.ebuild 4356 RMD160 7764856e43acaf975123d582811f9d6dca349cd7 SHA1 c5384f35ea85150dbee77c021365f0e38905b929 SHA256 a16e99b394bcebc3c62ecc6723fc3719d00f3e2527c1efd24cabc24de302a341
+EBUILD vmd-1.8.6.ebuild 4299 RMD160 1e4bee161856b5996bbd1b61de1d5575c030804e SHA1 1a943a032e8699ea41b7aa135a2550e05fbfc77a SHA256 d5f4d08855fc4095bfd58099aae3a3e56c1db064e06bf9569f8ef71334f4734a
+MISC ChangeLog 3858 RMD160 af881d40880bf62afbceab3ce5866c15ac497297 SHA1 f0584db61a21a523aab9bd4a4d0dd0d4e1d942cc SHA256 8e6232427198a6d50ef597363b594d19abc2367263e01d823f2dd9fee1485544
 MISC metadata.xml 282 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 SHA1 7f42dcea44641b8a77ab9644791344ec6ed6c327 SHA256 3c1785eb4ab63774ed3a6b1bddd602ef24cd6795f690bb3289d5a980bca06349
diff --git a/sci-chemistry/vmd/vmd-1.8.6-r1.ebuild b/sci-chemistry/vmd/vmd-1.8.6-r1.ebuild
new file mode 100644
index 000000000000..276830b62098
--- /dev/null
+++ b/sci-chemistry/vmd/vmd-1.8.6-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/05/17 20:15:13 je_fro Exp $
+
+EAPI="1"
+
+inherit eutils toolchain-funcs python
+
+DESCRIPTION="Visual Molecular Dynamics"
+LICENSE="vmd"
+HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/"
+SRC_URI="${P}.src.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RESTRICT="fetch"
+
+DEPEND="app-shells/tcsh
+	x11-libs/libXft
+	virtual/opengl
+	x11-libs/fltk:1.1
+	>=dev-lang/tcl-8.4
+	>=dev-lang/tk-8.4
+	>=dev-lang/python-2.3
+	sci-biology/stride
+	sci-libs/netcdf"
+
+RDEPEND="${DEPEND}"
+
+VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
+
+pkg_nofetch() {
+	echo
+	einfo "Please download ${SRC_URI} from"
+	einfo "${VMD_DOWNLOAD}"
+	einfo "after agreeing to the license and then move it to "
+	einfo "${DISTDIR}"
+	echo
+}
+
+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"
+		epatch "${FILESDIR}/${P}-fix-crash-on-tcl8.5.patch"
+		TCL_LIB_PATH="/usr/$(get_libdir)/tcl8.5"
+	fi
+
+	# prepare the plugins
+
+	cd "${WORKDIR}"/plugins
+
+	sed -e "s:CC = gcc:CC = $(tc-getCC):" \
+	    -e "s:CXX = g++:CXX = $(tc-getCXX):" \
+		-e "s:COPTO = -o :COPTO = -fPIC -o :" \
+		-e "s:LOPTO = -o :LOPTO = -fPIC -o :" \
+		-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}"
+
+	sed -e "s:gentoo-bindir:${D}/usr/bin:" \
+		-e "s:gentoo-libdir:${D}/usr/$(get_libdir):" \
+		-i configure || die "failed to adjust install paths"
+
+	sed -e "s:gentoo-gcc:$(tc-getCC):" \
+		-e "s:gentoo-g++:$(tc-getCXX):" \
+		-e "s:gentoo-cflags:${CFLAGS}:" \
+		-i configure || die "Failed to adjust C compiler/flags"
+
+	sed -e "s:gentoo-plugindir:${WORKDIR}/plugins:" \
+		-i configure || die "Failed to set up linking to plugin files"
+
+	sed -e "s:gentoo-fltk-include:/usr/include/fltk-1.1:" \
+		-e "s:gentoo-fltk-libs:/usr/$(get_libdir)/fltk-1.1:" \
+		-i configure || die "failed setting up fltk"
+
+	sed -e "s:gentoo-netcdf-include:/usr/include:" \
+		-e "s:gentoo-netcdf-libs:/usr/$(get_libdir):" \
+		-i configure || die "failed to set up netcdf"
+
+	# get installed python version
+	python_version
+	local PY="python${PYVER}"
+
+	sed -e "s:gentoo-python-include:/usr/include/${PY}:" \
+		-e "s:gentoo-python-lib:/usr/$(get_libdir)/${PY}:" \
+		-e "s:gentoo-python-link:${PY}:" \
+		-i configure || die "failed setting up python"
+
+	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"
+
+	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/"${TCL_LIB_PATH}" \
+		|| die "failed to build plugins"
+
+	# build vmd
+	cd "${S}"/src
+	emake || die "failed to build vmd"
+}
+
+src_install() {
+	# install plugins
+	cd "${WORKDIR}"/plugins
+	PLUGINDIR=${D}/usr/$(get_libdir)/${PN}/plugins make distrib || \
+		die "failed to install plugins"
+
+	# install vmd
+	cd "${S}"/src
+	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} || \
+		die "Failed to create vmd env file"
+	doenvd "${T}"/99${PN} || die "Failed to install vmd env file"
+
+	# install docs
+	cd "${S}"
+	dodoc Announcement README doc/ig.pdf doc/ug.pdf
+
+	# remove some of the things we don't want and need in
+	# /usr/lib
+	cd "${D}"/usr/$(get_libdir)/vmd
+	rm -fr doc README Announcement LICENSE || \
+		die "failed to clean up /usr/lib/vmd directory"
+
+	# adjust path in vmd wrapper
+	sed -e "s:${D}::" -i "${D}"/usr/bin/${PN} \
+		|| die "failed to set up vmd wrapper script"
+}
diff --git a/sci-chemistry/vmd/vmd-1.8.6.ebuild b/sci-chemistry/vmd/vmd-1.8.6.ebuild
index bc7ae929fd91..90680f8822da 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-2008 Gentoo Foundation
+# Copyright 1999-2009 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.7 2008/11/12 18:41:47 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.6.ebuild,v 1.8 2009/05/17 20:15:13 je_fro Exp $
 
 EAPI="1"
 
@@ -27,6 +27,8 @@ DEPEND="app-shells/tcsh
 	sci-biology/stride
 	sci-libs/netcdf"
 
+RDEPEND="${DEPEND}"
+
 VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
 
 pkg_nofetch() {