From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 57772138010 for ; Mon, 22 Oct 2012 09:12:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0219021C020; Mon, 22 Oct 2012 09:11:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 676DB21C020 for ; Mon, 22 Oct 2012 09:11:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5ACBF33D7CC for ; Mon, 22 Oct 2012 09:11:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F2E82E5436 for ; Mon, 22 Oct 2012 09:11:53 +0000 (UTC) From: "Reinis Danne" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Reinis Danne" Message-ID: <1350896998.260e6409c2209a794657ed50a21a68d9cb895602.rei4dan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/vmd/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/vmd/ChangeLog sci-chemistry/vmd/metadata.xml sci-chemistry/vmd/vmd-1.9.1.ebuild X-VCS-Directories: sci-chemistry/vmd/ X-VCS-Committer: rei4dan X-VCS-Committer-Name: Reinis Danne X-VCS-Revision: 260e6409c2209a794657ed50a21a68d9cb895602 X-VCS-Branch: master Date: Mon, 22 Oct 2012 09:11:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 06e019ef-0fea-4b5a-84eb-9e9aec3df254 X-Archives-Hash: e68f369d2f2438f1de69e78d125a5b3d commit: 260e6409c2209a794657ed50a21a68d9cb895602 Author: Reinis Danne gmail com> AuthorDate: Mon Oct 22 09:09:58 2012 +0000 Commit: Reinis Danne gmail com> CommitDate: Mon Oct 22 09:09:58 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=260e6409 vmd: Fix netcdf config, bug #406737 --- sci-chemistry/vmd/ChangeLog | 10 ++ sci-chemistry/vmd/metadata.xml | 15 +++ sci-chemistry/vmd/vmd-1.9.1.ebuild | 215 ++++++++++++++++++++++++++++++++++++ 3 files changed, 240 insertions(+), 0 deletions(-) diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog new file mode 100644 index 0000000..764678c --- /dev/null +++ b/sci-chemistry/vmd/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for sci-chemistry/vmd +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*vmd-1.9.1 (22 Oct 2012) + + 22 Oct 2012; Reinis Danne +vmd-1.9.1.ebuild, + +metadata.xml: + Fix netcdf config, bug #406737. + diff --git a/sci-chemistry/vmd/metadata.xml b/sci-chemistry/vmd/metadata.xml new file mode 100644 index 0000000..103ce95 --- /dev/null +++ b/sci-chemistry/vmd/metadata.xml @@ -0,0 +1,15 @@ + + + + + alexxy@gentoo.org + Alexey Shvetsov + + sci-chemistry + + Add support for MSMS SAS calcualtion tool + Add support for povray raytracer for HQ images + Add support for tachyon raytracer for HQ images + Use nvidia cuda toolkit for speeding up computations + + 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 0000000..d9d2977 --- /dev/null +++ b/sci-chemistry/vmd/vmd-1.9.1.ebuild @@ -0,0 +1,215 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" + +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_FLAGS_IGNORED_amd64=" + usr/lib64/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so + usr/lib64/vmd/plugins/LINUX/tcl/volutil1.3/volutil" +QA_FLAGS_IGNORED_x86=" + usr/lib/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so + usr/lib/vmd/plugins/LINUX/tcl/volutil1.3/volutil" + +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" + + sed \ + -e "s:\$(CXXFLAGS)::g" \ + -i hesstrans/Makefile || die + + # 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) ${EPREFIX}/usr/lib64/libnetcdf.so" \ + NETCDFINC="$(pkg-config --cflags-only-I netcdf) ${EPREFIX}/usr/include" \ + NETCDFLDFLAGS="$(pkg-config --libs netcdf)" \ + LINUX + + # build vmd + cd "${S}"/src + emake +} + +src_install() { + # install plugins + cd "${WORKDIR}"/plugins + emake \ + PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \ + distrib + + # install vmd + cd "${S}"/src + emake install + + # 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 "${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 + domenu "${WORKDIR}"/vmd.desktop +}