Bump to 2.7_beta2. The previous 2.7 ebuild was actually 2.7 beta 1 but was not named as such, so rename it to allow people to upgrade to beta 2.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 247 insertions, 2 deletions

diff --git a/sci-chemistry/namd/ChangeLog b/sci-chemistry/namd/ChangeLog
index 5b1fd4f51222..321c3119f5a5 100644
--- a/sci-chemistry/namd/ChangeLog
+++ b/sci-chemistry/namd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-chemistry/namd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/ChangeLog,v 1.10 2010/04/23 19:38:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/ChangeLog,v 1.11 2010/04/24 00:02:02 dberkholz Exp $
+
+*namd-2.7_beta2 (24 Apr 2010)
+*namd-2.7_beta1 (24 Apr 2010)
+
+  24 Apr 2010; Donnie Berkholz <dberkholz@gentoo.org>;
+  +namd-2.7_beta1.ebuild, +namd-2.7_beta2.ebuild, -namd-2.7.ebuild,
+  +files/namd-2.7_beta2-gentoo.patch:
+  Bump to 2.7_beta2. The previous 2.7 ebuild was actually 2.7 beta 1 but was
+  not named as such, so rename it to allow people to upgrade to beta 2.
 
   23 Apr 2010; Donnie Berkholz <dberkholz@gentoo.org>; namd-2.7.ebuild:
   All tc-get* sed replacements must happen before C*FLAGS-related ones,
diff --git a/sci-chemistry/namd/files/namd-2.7_beta2-gentoo.patch b/sci-chemistry/namd/files/namd-2.7_beta2-gentoo.patch
new file mode 100644
index 000000000000..898d6b5d0980
--- /dev/null
+++ b/sci-chemistry/namd/files/namd-2.7_beta2-gentoo.patch
@@ -0,0 +1,126 @@
+diff -ur NAMD_2.7b2_Source.orig//arch/Linux-x86_64.fftw NAMD_2.7b2_Source//arch/Linux-x86_64.fftw
+--- NAMD_2.7b2_Source.orig//arch/Linux-x86_64.fftw	2010-04-23 14:40:54.566510874 -0500
++++ NAMD_2.7b2_Source//arch/Linux-x86_64.fftw	2010-04-23 14:41:08.106528893 -0500
+@@ -1,7 +1,7 @@
+ 
+-FFTDIR=/Projects/namd2/fftw/linux-x86_64
++FFTDIR=/usr
+ FFTINCL=-I$(FFTDIR)/include
+-FFTLIB=-L$(FFTDIR)/lib -lsrfftw -lsfftw
++FFTLIB=-L$(FFTDIR)/gentoo-libdir -lsrfftw -lsfftw
+ FFTFLAGS=-DNAMD_FFTW
+ FFT=$(FFTINCL) $(FFTFLAGS)
+ 
+diff -ur NAMD_2.7b2_Source.orig//arch/Linux-x86_64.tcl NAMD_2.7b2_Source//arch/Linux-x86_64.tcl
+--- NAMD_2.7b2_Source.orig//arch/Linux-x86_64.tcl	2010-04-23 14:40:54.566510874 -0500
++++ NAMD_2.7b2_Source//arch/Linux-x86_64.tcl	2010-04-23 14:41:08.106528893 -0500
+@@ -1,7 +1,7 @@
+ 
+-TCLDIR=/Projects/namd2/tcl/linux-x86_64
++TCLDIR=/usr
+ TCLINCL=-I$(TCLDIR)/include
+-TCLLIB=-L$(TCLDIR)/lib -ltcl8.3 -ldl
++TCLLIB=-L$(TCLDIR)/gentoo-libdir -ltcl8.5 -ldl
+ TCLFLAGS=-DNAMD_TCL
+ TCL=$(TCLINCL) $(TCLFLAGS)
+ 
+diff -ur NAMD_2.7b2_Source.orig//Make.charm NAMD_2.7b2_Source//Make.charm
+--- NAMD_2.7b2_Source.orig//Make.charm	2010-04-23 14:40:54.556517020 -0500
++++ NAMD_2.7b2_Source//Make.charm	2010-04-23 14:42:16.026530011 -0500
+@@ -2,5 +2,5 @@
+ # The config script will override this setting if there is a directory
+ # called charm-6.1 or charm in the NAMD base directory.
+ 
+-CHARMBASE = /Projects/namd2/charm-6.1.3
++CHARMBASE = /usr/include/charm-6.1.3
+ 
+Only in NAMD_2.7b2_Source/: Make.charm.~1~
+Only in NAMD_2.7b2_Source/: Make.charm.porig
+diff -ur NAMD_2.7b2_Source.orig//Makefile NAMD_2.7b2_Source//Makefile
+--- NAMD_2.7b2_Source.orig//Makefile	2010-04-23 14:40:54.556517020 -0500
++++ NAMD_2.7b2_Source//Makefile	2010-04-23 14:42:59.446523306 -0500
+@@ -300,10 +300,10 @@
+ 	$(DSTDIR)/stringhash.o
+ 
+ # definitions for Charm routines
+-CHARMC = $(CHARM)/bin/charmc
+-CHARMXI = $(CHARM)/bin/charmc
+-CHARMINC = $(CHARM)/include $(COPTD)CMK_OPTIMIZE=1
+-CHARMLIB = $(CHARM)/lib
++CHARMC = /usr/bin/charmc
++CHARMXI = /usr/bin/charmc
++CHARMINC = /usr/include/gentoo-charm $(COPTD)CMK_OPTIMIZE=1
++CHARMLIB = /usr/gentoo-libdir
+ 
+ # Libraries we may have changed
+ LIBS = $(CUDAOBJS) $(PLUGINLIB) $(DPMTALIBS) $(DPMELIBS) $(TCLDLL)
+@@ -323,7 +323,7 @@
+ 
+ # Add new executables here.
+ 
+-BINARIES = namd2 psfgen charmrun flipdcd flipbinpdb
++BINARIES = namd2 psfgen flipdcd flipbinpdb
+ 
+ # This should be rebuilt at every compile, but not on Win32.
+ BUILDINFO = $(DSTDIR)/buildinfo
+@@ -354,9 +354,6 @@
+ 	$(CHARMOPTS) \
+ 	-lm -o namd2
+ 
+-charmrun: $(CHARM)/bin/charmrun # XXX
+-	$(COPY) $(CHARM)/bin/charmrun $@
+-
+ $(LIBCUDARTSO):
+ 	if [ -r $(CUDADIR)/lib64/$(LIBCUDARTSO) ]; then \
+ 	  $(COPY) $(CUDADIR)/lib64/$(LIBCUDARTSO) $@; \
+@@ -364,10 +361,6 @@
+ 	  $(COPY) $(CUDADIR)/lib/$(LIBCUDARTSO) $@; \
+ 	fi
+ 
+-WINDOWSBINARIES = namd2.exe psfgen.exe
+-# WINDOWSBINARIES = namd2.exe psfgen.exe charmd.exe charmd_faceless.exe charmrun.exe
+-windowsbinaries: $(WINDOWSBINARIES)
+-
+ namd2.exe:  $(INCDIR) $(DSTDIR) $(OBJS) $(LIBS) $(TCLDLL)
+ 	$(MAKEBUILDINFO)
+ 	$(CHARMC) -verbose \
+@@ -390,9 +383,6 @@
+ charmd_faceless.exe:
+ 	$(COPY) $(CHARM)/bin/charmd_faceless.exe charmd_faceless.exe
+ 
+-charmrun.exe:
+-	$(COPY) $(CHARM)/bin/charmrun.exe charmrun.exe
+-
+ psfgen:	$(DSTDIR) $(SBOBJS) $(PLUGINOBJS)
+ 	$(CC) $(SBCFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm
+ 
+@@ -716,9 +706,7 @@
+ 
+ DOC_FILES = README.txt announce.txt license.txt notes.txt
+ 
+-RELEASE_FILES = $(LIBCUDARTSO) flipdcd flipbinpdb psfgen charmrun namd2
+-
+-WINDOWS_RELEASE_FILES = $(WINDOWSBINARIES) $(TCLDLL)
++RELEASE_FILES = $(LIBCUDARTSO) flipdcd flipbinpdb psfgen namd2
+ 
+ release: all
+ 	$(ECHO) Creating release $(RELEASE_DIR_NAME)
+@@ -727,17 +715,9 @@
+ 	for f in $(DOC_FILES); do cp .rootdir/$$f $(RELEASE_DIR_NAME); done
+ 	cp -r .rootdir/lib $(RELEASE_DIR_NAME)
+ 	/bin/rm -rf $(RELEASE_DIR_NAME)/lib/CVS $(RELEASE_DIR_NAME)/lib/*/CVS
+-	if [ -r $(CHARM)/bin/charmd ]; then \
+-	  $(COPY) $(CHARM)/bin/charmd $(RELEASE_DIR_NAME); \
+-	fi
+-	if [ -r $(CHARM)/bin/charmd_faceless ]; then \
+-	  $(COPY) $(CHARM)/bin/charmd_faceless $(RELEASE_DIR_NAME); \
+-	fi
+ 	chmod -R a+rX $(RELEASE_DIR_NAME)
+ 	tar cf $(RELEASE_DIR_NAME).tar $(RELEASE_DIR_NAME)
+ 	gzip $(RELEASE_DIR_NAME).tar
+-	echo $(CHARM)
+-	ls -l $(CHARM)/lib
+ 	-for f in $(RELEASE_FILES); do echo $$f; $(LDD) $$f; done
+ 
+ winrelease: winall
+Only in NAMD_2.7b2_Source/: Makefile.porig
diff --git a/sci-chemistry/namd/namd-2.7.ebuild b/sci-chemistry/namd/namd-2.7_beta1.ebuild
index 327d7440a8c8..997bef370e3b 100644
--- a/sci-chemistry/namd/namd-2.7.ebuild
+++ b/sci-chemistry/namd/namd-2.7_beta1.ebuild
@@ -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/namd/namd-2.7.ebuild,v 1.3 2010/04/23 19:38:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/namd-2.7_beta1.ebuild,v 1.1 2010/04/24 00:02:02 dberkholz Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
diff --git a/sci-chemistry/namd/namd-2.7_beta2.ebuild b/sci-chemistry/namd/namd-2.7_beta2.ebuild
new file mode 100644
index 000000000000..b63de6f52789
--- /dev/null
+++ b/sci-chemistry/namd/namd-2.7_beta2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/namd-2.7_beta2.ebuild,v 1.1 2010/04/24 00:02:02 dberkholz Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="A powerful and highly parallelized molecular dynamics code"
+LICENSE="namd"
+HOMEPAGE="http://www.ks.uiuc.edu/Research/namd/"
+
+MY_PN="NAMD"
+MY_PV="2.7b2"
+
+SRC_URI="${MY_PN}_${MY_PV}_Source.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="fetch"
+
+DEPEND="|| ( app-shells/csh
+			app-shells/tcsh )
+	sys-cluster/charm
+	=sci-libs/fftw-2*
+	dev-lang/tcl"
+
+RDEPEND=${DEPEND}
+
+NAMD_ARCH="Linux-x86_64-g++"
+
+NAMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=NAMD"
+
+S="${WORKDIR}/${MY_PN}_${MY_PV}_Source"
+
+pkg_nofetch() {
+	echo
+	einfo "Please download ${MY_PN}_${MY_PV}_Source.tar.gz from"
+	einfo "${NAMD_DOWNLOAD}"
+	einfo "after agreeing to the license and then move it to"
+	einfo "${DISTDIR}"
+	einfo "Be sure to select the ${MY_PV} version!"
+	echo
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	CHARM_VERSION=$(best_version sys-cluster/charm | cut -d- -f3)
+
+	# apply a few small fixes to make NAMD compile and
+	# link to the proper libraries
+	epatch "${FILESDIR}"/namd-2.7_beta2-gentoo.patch
+	sed -e "s:charm-6.1.3:charm-${CHARM_VERSION}:" \
+		Make.charm || \
+		die
+
+	rm -f charm-6.1.3.tar || die
+
+	# proper compiler and cflags
+	sed -e "s/g++/$(tc-getCXX)/" \
+		-e "s/gcc/$(tc-getCC)/" \
+		-e "s/CXXOPTS = -O3 -m64 -fexpensive-optimizations -ffast-math/CXXOPTS = ${CXXFLAGS}/" \
+		-e "s/COPTS = -O3 -m64 -fexpensive-optimizations -ffast-math/COPTS = ${CFLAGS}/" \
+		-i arch/${NAMD_ARCH}.arch || \
+		die "Failed to setup ${NAMD_ARCH}.arch"
+
+	sed -e "s/gentoo-libdir/$(get_libdir)/g" \
+		-e "s/gentoo-charm/charm-${CHARM_VERSION}/g" \
+		-i Makefile || die "Failed gentooizing Makefile."
+	sed -e "s/gentoo-libdir/$(get_libdir)/g" -i arch/Linux-x86_64.fftw || \
+		die "Failed gentooizing Linux-x86_64.fftw."
+	sed -e "s/gentoo-libdir/$(get_libdir)/g" -i arch/Linux-x86_64.tcl || \
+		die "Failed gentooizing Linux-x86_64.tcl."
+
+	# configure
+	./config ${NAMD_ARCH}
+}
+
+src_compile() {
+	# build namd
+	cd "${S}/${NAMD_ARCH}"
+	emake || die "Failed to build namd"
+}
+
+src_install() {
+	cd "${S}/${NAMD_ARCH}"
+
+	# the binaries
+	dobin ${PN}2 psfgen flipbinpdb flipdcd || \
+		die "Failed to install binaries"
+
+	cd "${S}"
+
+	# some docs
+	dodoc announce.txt license.txt notes.txt || \
+		die "Failed to install docs"
+}
+
+pkg_postinst() {
+	echo
+	einfo "For detailed instructions on how to run and configure"
+	einfo "NAMD please consults the extensive documentation at"
+	einfo "http://www.ks.uiuc.edu/Research/namd/"
+	einfo "and the NAMD tutorials available at"
+	einfo "http://www.ks.uiuc.edu/Training/Tutorials/"
+	einfo "Have fun :)"
+	echo
+}