* [gentoo-commits] gentoo-x86 commit in sci-chemistry/vmd: ChangeLog vmd-1.8.7-r1.ebuild
@ 2010-05-18 7:22 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2010-05-18 7:22 UTC (permalink / raw
To: gentoo-commits
jlec 10/05/18 07:22:51
Modified: ChangeLog
Added: vmd-1.8.7-r1.ebuild
Log:
Fix for new python ABIs, #316187; building netcdf plugin, #306893, thanks Kamil Kisiel for the patch; LDFLAGS are respected now; EAPI=3 and basic fixes for prefix, usability has to be tested
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.28 sci-chemistry/vmd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/ChangeLog?r1=1.27&r2=1.28
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog 23 Feb 2010 18:00:14 -0000 1.27
+++ ChangeLog 18 May 2010 07:22:51 -0000 1.28
@@ -1,6 +1,14 @@
# ChangeLog for sci-chemistry/vmd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.27 2010/02/23 18:00:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.28 2010/05/18 07:22:51 jlec Exp $
+
+*vmd-1.8.7-r1 (18 May 2010)
+
+ 18 May 2010; Justin Lecher <jlec@gentoo.org> +vmd-1.8.7-r1.ebuild,
+ files/vmd-1.8.7-config.patch, +files/vmd-1.8.7-gentoo.patch:
+ Fix for new python ABIs, #316187; building netcdf plugin, #306893, thanks
+ Kamil Kisiel for the patch; LDFLAGS are respected now; EAPI=3 and basic
+ fixes for prefix, usability has to be tested
23 Feb 2010; Alexey Shvetsov <alexxy@gentoo.org> vmd-1.8.6-r1.ebuild,
vmd-1.8.7.ebuild, metadata.xml:
1.1 sci-chemistry/vmd/vmd-1.8.7-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7-r1.ebuild?rev=1.1&content-type=text/plain
Index: vmd-1.8.7-r1.ebuild
===================================================================
# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/05/18 07:22:51 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="${P}.src.tar.gz"
SLOT="0"
LICENSE="vmd"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="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-biology/stride
sci-libs/netcdf
virtual/opengl
x11-libs/fltk:1.1
x11-libs/libXft"
RDEPEND="${DEPEND}
x11-terms/xterm
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 ${SRC_URI} 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 "${FILESDIR}/${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}"
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-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:${EPREFIX}/usr/include/fltk-1.1:" \
-e "s:gentoo-fltk-libs:${EPREFIX}/usr/$(get_libdir)/fltk-1.1:" \
-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:$(python_get_includedir):" \
-e "s:gentoo-python-lib:$(python_get_libdir):" \
-e "s:gentoo-python-link:$(PYTHON):" \
-e "s:gentoo-numpy-include:$(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"
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=${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=${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
# 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} \
|| die "failed to set up vmd wrapper script"
# install icon and generate desktop entry
insinto /usr/share/pixmaps
doins "${FILESDIR}"/vmd.png || die "Failed to install vmd icon"
insinto /usr/share/applications
doins "${FILESDIR}"/vmd.desktop || die "Failed to install desktop entry"
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-chemistry/vmd: ChangeLog vmd-1.8.7-r1.ebuild
@ 2010-07-24 17:27 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2010-07-24 17:27 UTC (permalink / raw
To: gentoo-commits
jlec 10/07/24 17:27:05
Modified: ChangeLog vmd-1.8.7-r1.ebuild
Log:
Added prefix changes, thanks rei4dan #327517; keyworded for ~-linux prefix
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.30 sci-chemistry/vmd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/ChangeLog?r1=1.29&r2=1.30
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog 28 May 2010 18:21:25 -0000 1.29
+++ ChangeLog 24 Jul 2010 17:27:05 -0000 1.30
@@ -1,6 +1,9 @@
# ChangeLog for sci-chemistry/vmd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.29 2010/05/28 18:21:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.30 2010/07/24 17:27:05 jlec Exp $
+
+ 24 Jul 2010; Justin Lecher <jlec@gentoo.org> vmd-1.8.7-r1.ebuild:
+ Added prefix changes, thanks rei4dan #327517; keyworded for ~-linux prefix
28 May 2010; Justin Lecher <jlec@gentoo.org> -vmd-1.8.6.ebuild,
-vmd-1.8.6-r1.ebuild, -vmd-1.8.7.ebuild:
1.3 sci-chemistry/vmd/vmd-1.8.7-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7-r1.ebuild?r1=1.2&r2=1.3
Index: vmd-1.8.7-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vmd-1.8.7-r1.ebuild 18 May 2010 08:06:48 -0000 1.2
+++ vmd-1.8.7-r1.ebuild 24 Jul 2010 17:27:05 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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-r1.ebuild,v 1.2 2010/05/18 08:06:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7-r1.ebuild,v 1.3 2010/07/24 17:27:05 jlec Exp $
EAPI="3"
@@ -14,7 +14,7 @@
SLOT="0"
LICENSE="vmd"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="tachyon"
RESTRICT="fetch"
@@ -98,10 +98,10 @@
-i configure || die "failed to set up netcdf"
local NUMPY_INCLUDE="numpy/core/include"
- sed -e "s:gentoo-python-include:$(python_get_includedir):" \
- -e "s:gentoo-python-lib:$(python_get_libdir):" \
+ 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:$(python_get_sitedir)/${NUMPY_INCLUDE}:" \
+ -e "s:gentoo-numpy-include:${EPREFIX}$(python_get_sitedir)/${NUMPY_INCLUDE}:" \
-i configure || die "failed setting up python"
sed -e "s:LINUXPPC:LINUX:g" \
@@ -137,7 +137,7 @@
src_install() {
# install plugins
cd "${WORKDIR}"/plugins
- PLUGINDIR=${D}/usr/$(get_libdir)/${PN}/plugins make distrib || \
+ PLUGINDIR=${ED}/usr/$(get_libdir)/${PN}/plugins make distrib || \
die "failed to install plugins"
# install vmd
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-24 17:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-18 7:22 [gentoo-commits] gentoo-x86 commit in sci-chemistry/vmd: ChangeLog vmd-1.8.7-r1.ebuild Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2010-07-24 17:27 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox