summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-11-12 18:41:47 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-11-12 18:41:47 +0000
commit4d45a8f548d4f8ea609b6653e1a7db0a2534c23d (patch)
treea645162addc8b1b235482bf7b8607e45a65f0ec9 /sci-chemistry
parentremove old (diff)
downloadgentoo-2-4d45a8f548d4f8ea609b6653e1a7db0a2534c23d.tar.gz
gentoo-2-4d45a8f548d4f8ea609b6653e1a7db0a2534c23d.tar.bz2
gentoo-2-4d45a8f548d4f8ea609b6653e1a7db0a2534c23d.zip
Restrict fltk to 1.1 slot since vmd is not fltk-2 ready (see bug #246445). Removed old ebuild.
(Portage version: 2.2_rc13/cvs/Linux 2.6.27-SENTINEL-2 i686)
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/vmd/ChangeLog7
-rw-r--r--sci-chemistry/vmd/vmd-1.8.5.ebuild150
-rw-r--r--sci-chemistry/vmd/vmd-1.8.6.ebuild6
3 files changed, 10 insertions, 153 deletions
diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index 52271bcd1aff..e45f8bfe26f9 100644
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,11 @@
# 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.18 2008/03/13 14:02:39 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.19 2008/11/12 18:41:47 markusle Exp $
+
+ 12 Nov 2008; Markus Dittrich <markusle@gentoo.org> -vmd-1.8.5.ebuild,
+ vmd-1.8.6.ebuild:
+ Restrict fltk to 1.1 slot since vmd is not fltk-2 ready
+ (see bug #246445). Removed old ebuild.
13 Mar 2008; Markus Dittrich <markusle@gentoo.org>
+files/vmd-1.8.6-tcltk8.5.patch, vmd-1.8.6.ebuild:
diff --git a/sci-chemistry/vmd/vmd-1.8.5.ebuild b/sci-chemistry/vmd/vmd-1.8.5.ebuild
deleted file mode 100644
index 34b6bb0e727f..000000000000
--- a/sci-chemistry/vmd/vmd-1.8.5.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# 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.10 2008/03/13 14:02:39 markusle Exp $
-
-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="hardened"
-
-RESTRICT="fetch"
-
-DEPEND="app-shells/tcsh
- x11-libs/libXft
- virtual/opengl
- x11-libs/fltk
- =dev-lang/tcl-8.4*
- =dev-lang/tk-8.4*
- >=dev-lang/python-2.3
- sci-biology/stride
- sci-libs/netcdf
- hardened? ( sys-apps/paxctl )"
-
-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}
-
- # apply LINUX-arch patches to vmd configure
- epatch "${FILESDIR}"/${P}-config-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 = -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):" \
- -i Make-arch || die "Failed to set up plugins Makefile"
-
- # 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/usr/$(get_libdir)/tcl8.4" || \
- die "failed to build plugins"
-
- # build vmd
- cd "${S}"/src
- make || 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 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"
-
- # adjust paxctl settings on hardened systems
- if use hardened; then
- /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 de6848102ced..bc7ae929fd91 100644
--- a/sci-chemistry/vmd/vmd-1.8.6.ebuild
+++ b/sci-chemistry/vmd/vmd-1.8.6.ebuild
@@ -1,6 +1,8 @@
# 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.6 2008/03/13 14:02:39 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.6.ebuild,v 1.7 2008/11/12 18:41:47 markusle Exp $
+
+EAPI="1"
inherit eutils toolchain-funcs python
@@ -18,7 +20,7 @@ RESTRICT="fetch"
DEPEND="app-shells/tcsh
x11-libs/libXft
virtual/opengl
- x11-libs/fltk
+ x11-libs/fltk:1.1
>=dev-lang/tcl-8.4
>=dev-lang/tk-8.4
>=dev-lang/python-2.3