diff options
| -rw-r--r-- | sci-chemistry/vmd/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/vmd/vmd-1.8.7-r2.ebuild | 184 | ||||
| -rw-r--r-- | sci-chemistry/vmd/vmd-1.9.1.ebuild | 33 | ||||
| -rw-r--r-- | sci-chemistry/vmd/vmd-1.9.ebuild | 205 |
4 files changed, 24 insertions, 404 deletions
diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog index c913d8bc0e1d..5e38af9075bd 100644 --- a/sci-chemistry/vmd/ChangeLog +++ b/sci-chemistry/vmd/ChangeLog @@ -1,6 +1,10 @@ # 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.46 2012/02/14 15:26:56 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.47 2012/09/05 07:00:23 jlec Exp $ + + 05 Sep 2012; Justin Lecher <jlec@gentoo.org> -vmd-1.8.7-r2.ebuild, + -vmd-1.9.ebuild, vmd-1.9.1.ebuild: + Bumped to EAPI=4; use domenu; drop old 14 Feb 2012; Alexey Shvetsov <alexxy@gentoo.org> vmd-1.9.1.ebuild: Fix plugin install diff --git a/sci-chemistry/vmd/vmd-1.8.7-r2.ebuild b/sci-chemistry/vmd/vmd-1.8.7-r2.ebuild deleted file mode 100644 index a1f7bc58c08a..000000000000 --- a/sci-chemistry/vmd/vmd-1.8.7-r2.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7-r2.ebuild,v 1.10 2011/06/15 08:29:15 jlec 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 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="msms povray tachyon" - -RESTRICT="fetch" - -# currently, tk-8.5* with USE=truetype breaks some -# tk apps such as Sequence Viewer or Timeline. -DEPEND=" - || ( - >=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" - -RDEPEND="${DEPEND} - sci-biology/stride - 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 then move it to " - elog "${DISTDIR}" - -} - -src_prepare() { - # apply LINUX-arch patches to vmd configure - cd "${WORKDIR}" && epatch "${WORKDIR}/${P}-gentoo.patch" - - # prepare the plugins - cd "${WORKDIR}"/plugins - - 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):" \ - -e "s:-ltcl8.5:-ltcl:" \ - -i Make-arch || die "Failed to set up plugins Makefile" - - # prepare vmd itself - cd "${S}" - - # PREFIX - sed \ - -e "s:/usr/include/:${EPREFIX}/usr/include:g" \ - -i configure || die - - sed -e "s:gentoo-bindir:${ED}/usr/bin:" \ - -e "s:gentoo-libdir:${ED}/usr/$(get_libdir):" \ - -i configure || die "failed to adjust install paths" - - sed -e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:" \ - -e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):" \ - -i configure || die "failed to adjust OpenGL paths" - - sed -e "s:gentoo-gcc:$(tc-getCC):" \ - -e "s:gentoo-g++:$(tc-getCXX):" \ - -e "s:gentoo-cflags:${CFLAGS}:" \ - -e "s:gentoo-cxxflags:${CXXFLAGS}:" \ - -e "s:gentoo-ldflags:${LDFLAGS}:g" \ - -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:$(fltk-config --includedir):" \ - -e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):" \ - -i configure || die "failed setting up fltk" - - sed -e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:" \ - -e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):" \ - -i configure || die "failed to set up netcdf" - - 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" - - sed -e "s:LINUXPPC:LINUX:g" \ - -e "s:LINUXALPHA:LINUX:g" \ - -e "s:LINUXAMD64:LINUX:g" \ - -i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script" -} - -src_configure() { - local myconfig="LINUX OPENGL FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT" - rm -f configure.options && echo $myconfig >> configure.options - - ./configure &> /dev/null || die "failed to configure" -} - -src_compile() { - # build plugins - cd "${WORKDIR}"/plugins - - emake -j1 \ - LINUX TCLINC="-I${EPREFIX}/usr/include" \ - TCLLIB="-L${EPREFIX}/usr/$(get_libdir)" \ - NETCDFLIB="-L${EPREFIX}/usr/$(get_libdir)" \ - NETCDFINC="-I${EPREFIX}/usr/include" \ - NETCDFLDFLAGS="-lnetcdf" \ - || die "failed to build plugins" - - # build vmd - cd "${S}"/src - emake || die "failed to build vmd" -} - -src_install() { - # install plugins - cd "${WORKDIR}"/plugins - PLUGINDIR="${ED}/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=${EPREFIX}/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 || 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" -} diff --git a/sci-chemistry/vmd/vmd-1.9.1.ebuild b/sci-chemistry/vmd/vmd-1.9.1.ebuild index 5991764ff41e..8d66004216f2 100644 --- a/sci-chemistry/vmd/vmd-1.9.1.ebuild +++ b/sci-chemistry/vmd/vmd-1.9.1.ebuild @@ -1,8 +1,8 @@ # 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.2 2012/02/14 15:26:56 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.9.1.ebuild,v 1.3 2012/09/05 07:00:23 jlec Exp $ -EAPI="3" +EAPI=4 PYTHON_DEPEND="2" @@ -51,8 +51,12 @@ VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageNa # 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" +QA_DT_HASH_amd64=" + usr/lib64/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so + usr/lib64/vmd/plugins/LINUX/tcl/volutil1.3/volutil" +QA_DT_HASH_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" @@ -69,7 +73,8 @@ src_prepare() { [[ ${SILENT} == yes ]] || sed '/^.SILENT/d' -i $(find -name Makefile) - sed -e "s:CC = gcc:CC = $(tc-getCC):" \ + 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\":" \ @@ -80,7 +85,8 @@ src_prepare() { -e "s:-ltcl8.5:-ltcl:" \ -i Make-arch || die "Failed to set up plugins Makefile" - sed -e "s:\$(CXXFLAGS)::g" \ + sed \ + -e "s:\$(CXXFLAGS)::g" \ -i hesstrans/Makefile || die # prepare vmd itself @@ -168,11 +174,11 @@ src_compile() { NETCDFLIB="$(pkg-config --libs-only-L netcdf)" \ NETCDFINC="$(pkg-config --cflags-only-I netcdf)" \ NETCDFLDFLAGS="$(pkg-config --libs netcdf)" \ - LINUX || die + LINUX # build vmd cd "${S}"/src - emake || die "failed to build vmd" + emake } src_install() { @@ -180,15 +186,15 @@ src_install() { cd "${WORKDIR}"/plugins emake \ PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \ - distrib || die "failed to install plugins" + distrib # install vmd cd "${S}"/src - emake install || die "failed to install vmd" + emake install # install docs cd "${S}" - dodoc Announcement README doc/ig.pdf doc/ug.pdf || die + dodoc Announcement README doc/ig.pdf doc/ug.pdf # remove some of the things we don't want and need in # /usr/lib @@ -204,7 +210,6 @@ src_install() { # 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" + doins "${WORKDIR}"/vmd.png + domenu "${WORKDIR}"/vmd.desktop } diff --git a/sci-chemistry/vmd/vmd-1.9.ebuild b/sci-chemistry/vmd/vmd-1.9.ebuild deleted file mode 100644 index 154e4827ce0d..000000000000 --- a/sci-chemistry/vmd/vmd-1.9.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# 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.ebuild,v 1.8 2012/01/10 14:44:42 jlec 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" - - 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 - - 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" -} |