[sci-chemistry/vmd] Version bump

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

3 files changed, 231 insertions, 6 deletions

diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index 5e64c9f3aae4..6ce89f2d508c 100644
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/vmd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.44 2012/01/10 14:44:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.45 2012/02/14 13:28:08 alexxy Exp $
+
+*vmd-1.9.1 (14 Feb 2012)
+
+  14 Feb 2012; Alexey Shvetsov <alexxy@gentoo.org> +vmd-1.9.1.ebuild:
+  Version bump =D
 
   10 Jan 2012; Justin Lecher <jlec@gentoo.org> vmd-1.9.ebuild:
   Remove USE=static-libs beacuse this breaks build, #365051
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index e3f89435c1a1..e8b2f494aff6 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,18 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST vmd-1.8.7-gentoo-patches.tar.xz 15900 RMD160 1eed2bc6eebacf846a15973e3ec3378de2890551 SHA1 5d157f9288b9552f3bc69af7283f9f83d71b69be SHA256 0a991ccfda6ffc68de930919bd76b9dba208d4ca5c21ce19d283da1c1727fcda
 DIST vmd-1.8.7.src.tar.gz 23853864 RMD160 1c4751552d7b3f376f91a4b28ee9d4a028ded01a SHA1 409b6f8959d551f581991073f98885b47c21c25c SHA256 72fe2fb7eff4c805a886ea929c7e143a3a1be57cc817b5d1719d29e591d80316
 DIST vmd-1.9-gentoo-patches.tar.xz 14508 RMD160 e10a0f24d8b87240e2555a8e26a2bd679b6274b3 SHA1 1be91a24b4c8145e0efe61bc277ceebdbfc02eb4 SHA256 c18b16704c6c186e8ac753c96f38f85413258bce786635b2635a9aa18de5c28c
+DIST vmd-1.9.1-gentoo-patches.tar.xz 79240 RMD160 7ed799583a73da20ffa642d9ab520ad883a94da2 SHA1 f1264f482c786e1a578ef613b8275600ef95024d SHA256 60fe1b017b1aed5cdd4a417d4a2dbd20f75eae24c83d1da68c504a31bfbdbcd8
+DIST vmd-1.9.1.src.tar.gz 30748110 RMD160 247db3638eed474281db944577b1b7ad6ec884f8 SHA1 c4e31b2807d9b36769fdd1740dac45435be5dcbe SHA256 54aa88e03d86d763383e7b98592a152c9d68e78383e13af0dd2aca09b002491f
 DIST vmd-1.9.src.tar.gz 28639907 RMD160 96a6cf99d34bdd264550aec334f2cd8c5cfdaceb SHA1 b555a01815a2cf16be910ef6977793f1670a62f1 SHA256 4209b06faba3af324575570bd0533258471f6c782262c0727b52cdce9de89579
 EBUILD vmd-1.8.7-r2.ebuild 5703 RMD160 aaa3c60b5200490175defd4e8c529e4d90f2e345 SHA1 372dd77066b8dde828192b18a22c476b402d92c1 SHA256 f46a8c403ab5342301d263dde31ba1a7364a681edea9c9419f7df031b8203c40
+EBUILD vmd-1.9.1.ebuild 6488 RMD160 b2f7562a453744cc0822b32645bbe1eb8e26645d SHA1 59dd4efda0553ce80cf8e1ba172c805a63dde909 SHA256 d55edc157723d55c6b64562e84fe7fe304eb8485be5bb9f990d60b507e2081dd
 EBUILD vmd-1.9.ebuild 6456 RMD160 afb20c32fc60e810ecb9f1fc12b2dd4b8a271569 SHA1 1bef50b3298a99bb36b980097226cb5cd8d55559 SHA256 9f66f177b4b48318b68f53c3bdc25ebabe7619e4d074e5886f60d36601b4ed80
-MISC ChangeLog 8259 RMD160 a7b732ea81db4c3987b5feea442b4591690f5843 SHA1 63a03575af448e9ab8dcaea3a68ad44a73b5140c SHA256 9a0bf5d2217d2a45d008cfaaac45e714c9139f335a857a9132d712e0c642a1c2
+MISC ChangeLog 8376 RMD160 01cc608260ebfa9e36400cc078905867d8ee9105 SHA1 b67299e371af1efe7e8b0d5ce7419562f06722f3 SHA256 2325b91fff48757ce882c67d783a5ecf8f0ec58aa365e497ca2bba3504637bcd
 MISC metadata.xml 580 RMD160 779283c84d225352c819fba1527b5b91d2b4e09c SHA1 2f821c2fd5afc7b321efeaa827f0d459be937aea SHA256 ed78f23bbbbf847e14f5c62b82f2ddce852381ed344a5c09f2f1722ea60d6ebe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8MTt8ACgkQgAnW8HDreRYu5gCdFLCPsT691TU3ZVFk2uVgdJ2c
-gvcAn04wG6uCnZjDqY3UmUCbibvgsEbX
-=QGgo
+iQIcBAEBCAAGBQJPOmF3AAoJEOf+E+/4L5LmIyUP/1REc0vTuwzfleySHayZ80IF
+gEvZK5R2QBX6rt/p9LrdVpgm/hGBsMDvAH6Z5zH8jN12H9AVP7USxEoZgfGprUdh
+MrzC0sSkofV9PG1x/mqUPuRO/klRD5IIs1Q7InoYQQ3ZjWnJbT3lnT090vo3hE/x
+QzF7Vs5cNF3CxdLpMyHRvQgmNa0at0cbgZBW2xxLcpPERh18AhRzG3U3AwyXTPMl
+hm93/ld8Y0r/oLkU/xRPEUlYbS89X/3NPiiexYjV7AO+bq9bKap3L0esK1b/JHOH
+xpTfUJ2GR22vTAizE53HQOgJwkm7jFFdrxNKy3GNDLS7EQoYnDkshDs5rCumEHZ1
+HQeSHcMJPdPwMzP6O2hMndpqFLW3eGTqkMbkuq5y73lfFz56jl/1/GnQXRzFEpFh
+eWPzmlftk7sl8iMyjCVfE4z/ORv3Xjkit9nKJMiSAzgvwVNtSS5CzKfPF1MKzn7p
+AudnfiP+JavS9G48o/wwPMUgPKWw8P5ED6yWAuyFoLLjyM9QlBb3EJE7h6jxPNJx
++jzTJUQH5BXDgE2tE6UJwgmRZA2BuXl9zwJW3K1OJKSeVzNzDo9+2QxP6J1bvsdk
+cZUvE/2N2B7+VvRdxBFf99Axt6AddK7KSP+yyciT3UEBj9Qigin9U8Ho+smFk94+
+vpIN5sywiLVqMktGsUp0
+=bNCA
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/vmd/vmd-1.9.1.ebuild b/sci-chemistry/vmd/vmd-1.9.1.ebuild
new file mode 100644
index 000000000000..e2c148b4da24
--- /dev/null
+++ b/sci-chemistry/vmd/vmd-1.9.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.9.1.ebuild,v 1.1 2012/02/14 13:28:08 alexxy Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+
+inherit eutils multilib python toolchain-funcs
+
+DESCRIPTION="Visual Molecular Dynamics"
+HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/"
+SRC_URI="
+	mirror://gentoo/${P}-gentoo-patches.tar.xz
+	${P}.src.tar.gz"
+
+SLOT="0"
+LICENSE="vmd"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda msms povray tachyon xinerama"
+
+RESTRICT="fetch"
+
+# currently, tk-8.5* with USE=truetype breaks some
+# tk apps such as Sequence Viewer or Timeline.
+CDEPEND="
+	|| (
+		>=dev-lang/tk-8.5[-truetype]
+		=dev-lang/tk-8.4*
+	)
+	dev-lang/perl
+	dev-python/numpy
+	sci-libs/netcdf
+	virtual/opengl
+	>=x11-libs/fltk-1.1.10-r2:1
+	x11-libs/libXft
+	x11-libs/libXi
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.1 )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${CDEPEND}
+	dev-lang/swig"
+RDEPEND="${CDEPEND}
+	sci-biology/stride
+	sci-chemistry/surf
+	x11-terms/xterm
+	msms? ( sci-chemistry/msms-bin )
+	povray? ( media-gfx/povray )
+	tachyon? ( media-gfx/tachyon )"
+
+VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
+# Binary only plugin!!
+QA_TEXTRELS="usr/lib*/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
+QA_PRESTRIPPED="usr/lib*/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
+QA_DT_HASH_amd64="usr/lib64/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
+QA_DT_HASH_x86="usr/lib/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
+
+pkg_nofetch() {
+	elog "Please download ${P}.src.tar.gz from"
+	elog "${VMD_DOWNLOAD}"
+	elog "after agreeing to the license and get"
+	elog "http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz"
+	elog "Place both in ${DISTDIR}"
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/plugins
+
+	epatch "${WORKDIR}"/${P}-gentoo-plugins.patch
+
+	[[ ${SILENT} == yes ]] || sed '/^.SILENT/d' -i $(find -name Makefile)
+
+	sed -e "s:CC = gcc:CC = $(tc-getCC):" \
+		-e "s:CXX = g++:CXX = $(tc-getCXX):" \
+		-e "s:COPTO =.*\":COPTO = -fPIC -o\":" \
+		-e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o\":" \
+		-e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \
+		-e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \
+		-e "s:SHLD = gcc:SHLD = $(tc-getCC) -shared:" \
+		-e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX) -shared:" \
+		-e "s:-ltcl8.5:-ltcl:" \
+		-i Make-arch || die "Failed to set up plugins Makefile"
+
+	# prepare vmd itself
+	cd "${S}"
+
+	epatch "${WORKDIR}"/${P}-gentoo-base.patch
+
+	# PREFIX
+	sed \
+		-e "s:/usr/include/:${EPREFIX}/usr/include:g" \
+		-i configure || die
+
+	sed \
+		-e "s:gentoo-bindir:${ED}/usr/bin:g" \
+		-e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \
+		-e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \
+		-e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:gentoo-gcc:$(tc-getCC):g" \
+		-e "s:gentoo-g++:$(tc-getCXX):g" \
+		-e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \
+		-e "s:gentoo-cflags:${CFLAGS}:g" \
+		-e "s:gentoo-cxxflags:${CXXFLAGS}:g" \
+		-e "s:gentoo-nvflags: -O3 -v:g" \
+		-e "s:gentoo-ldflags:${LDFLAGS}:g" \
+		-e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \
+		-e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \
+		-e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \
+		-e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \
+		-e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \
+		-i configure || die
+
+#	local NUMPY_INCLUDE="numpy/core/include"
+#	sed -e "s:gentoo-python-include:${EPREFIX}$(python_get_includedir):" \
+#		-e "s:gentoo-python-lib:${EPREFIX}$(python_get_libdir):" \
+#		-e "s:gentoo-python-link:$(PYTHON):" \
+#		-e "s:gentoo-numpy-include:${EPREFIX}$(python_get_sitedir)/${NUMPY_INCLUDE}:" \
+#		-i configure || die "failed setting up python"
+
+	if use cuda; then
+		local gcc44_bindir="$(ls -d ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/4.4*)"
+
+		sed \
+			-e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \
+			-e "/^\$arch_nvccflags/s:=:= \"--compiler-bindir=${gcc44_bindir} \" . \n:1" \
+			-i configure || die
+	fi
+
+	sed \
+		-e "s:LINUXPPC:LINUX:g" \
+		-e "s:LINUXALPHA:LINUX:g" \
+		-e "s:LINUXAMD64:LINUX:g" \
+		-e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \
+		-e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \
+		-e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \
+		-i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script"
+}
+
+src_configure() {
+	local myconf="OPENGL FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT"
+	rm -f configure.options && echo $myconf >> configure.options
+
+	use cuda && myconf+=" CUDA"
+#	use mpi && myconf+=" MPI"
+#	use tachion && myconf+=" LIBTACHYON"
+	use xinerama && myconf+=" XINERAMA"
+
+	export \
+		PYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" \
+		PYTHON_LIBRARY_DIR="${EPREFIX}$(python_get_libdir)" \
+		PYTHON_LIBRARY="$(python_get_library -l)" \
+		NUMPY_INCLUDE_DIR="${EPREFIX}$(python_get_sitedir)/numpy/core/include" \
+		NUMPY_LIBRARY_DIR="${EPREFIX}$(python_get_sitedir)/numpy/core/include"
+
+	./configure LINUX \
+		${myconf} || die
+}
+
+src_compile() {
+	# build plugins
+	cd "${WORKDIR}"/plugins
+
+	emake \
+		TCLINC="-I${EPREFIX}/usr/include" \
+		TCLLIB="-L${EPREFIX}/usr/$(get_libdir)" \
+		NETCDFLIB="$(pkg-config --libs-only-L netcdf)" \
+		NETCDFINC="$(pkg-config --cflags-only-I netcdf)" \
+		NETCDFLDFLAGS="$(pkg-config --libs netcdf)" \
+		LINUX || die
+
+	# build vmd
+	cd "${S}"/src
+	emake || die "failed to build vmd"
+}
+
+src_install() {
+	# install plugins
+	cd "${WORKDIR}"/plugins
+	emake \
+			PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \
+			distrib || die "failed to install plugins"
+
+	# install vmd
+	cd "${S}"/src
+	emake install || die "failed to install vmd"
+
+	# install docs
+	cd "${S}"
+	dodoc Announcement README doc/ig.pdf doc/ug.pdf || die
+
+	# remove some of the things we don't want and need in
+	# /usr/lib
+	cd "${ED}"/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:${ED}::" -i "${ED}"/usr/bin/${PN} \
+		-e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \
+		|| die "failed to set up vmd wrapper script"
+
+	# install icon and generate desktop entry
+	insinto /usr/share/pixmaps
+	doins "${WORKDIR}"/vmd.png || die "Failed to install vmd icon"
+	insinto /usr/share/applications
+	doins "${WORKDIR}"/vmd.desktop || die "Failed to install desktop entry"
+}