[gentoo-commits] gentoo-x86 commit in sci-chemistry/namd: ChangeLog namd-2.7_beta2-r1.ebuild namd-2.7_beta2.ebuild namd-2.6.ebuild

[Justin Lecher (jlec)]

jlec        12/11/29 13:41:42

  Modified:             ChangeLog namd-2.7_beta2-r1.ebuild
  Removed:              namd-2.7_beta2.ebuild namd-2.6.ebuild
  Log:
  sci-chemistry/namd: Drop old
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

Revision  Changes    Path
1.15                 sci-chemistry/namd/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/namd/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	20 Jul 2011 16:57:24 -0000	1.14
+++ ChangeLog	29 Nov 2012 13:41:41 -0000	1.15
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/namd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/ChangeLog,v 1.14 2011/07/20 16:57:24 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/ChangeLog,v 1.15 2012/11/29 13:41:41 jlec Exp $
+
+  29 Nov 2012; Justin Lecher <jlec@g.o> -namd-2.6.ebuild,
+  -namd-2.7_beta2.ebuild, namd-2.7_beta2-r1.ebuild:
+  Drop old
 
   20 Jul 2011; Pacho Ramos <pacho@g.o> metadata.xml:
   Drop maintainer due retirement, bug #105599



1.2                  sci-chemistry/namd/namd-2.7_beta2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/namd-2.7_beta2-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/namd-2.7_beta2-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/namd-2.7_beta2-r1.ebuild?r1=1.1&r2=1.2

Index: namd-2.7_beta2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/namd/namd-2.7_beta2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- namd-2.7_beta2-r1.ebuild	24 Jun 2010 20:37:03 -0000	1.1
+++ namd-2.7_beta2-r1.ebuild	29 Nov 2012 13:41:41 -0000	1.2
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2010/06/24 20:37:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/namd-2.7_beta2-r1.ebuild,v 1.2 2012/11/29 13:41:41 jlec Exp $
 
-inherit eutils toolchain-funcs flag-o-matic
+EAPI=4
+
+inherit eutils multilib toolchain-funcs flag-o-matic
 
 DESCRIPTION="A powerful and highly parallelized molecular dynamics code"
 LICENSE="namd"
@@ -22,7 +24,7 @@
 DEPEND="
 	app-shells/tcsh
 	sys-cluster/charm
-	=sci-libs/fftw-2*
+	sci-libs/fftw:2.1
 	dev-lang/tcl"
 
 RDEPEND=${DEPEND}
@@ -43,61 +45,54 @@
 	echo
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	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
-	epatch "${FILESDIR}"/namd-2.7-ldflags.patch
-	epatch "${FILESDIR}"/namd-2.7-iml-dec.patch
-	sed -e "s:charm-6.1.3:charm-${CHARM_VERSION}:" \
-		Make.charm || \
-		die
+	epatch \
+		"${FILESDIR}"/namd-2.7_beta2-gentoo.patch \
+		"${FILESDIR}"/namd-2.7-ldflags.patch \
+		"${FILESDIR}"/namd-2.7-iml-dec.patch
+	sed \
+		-e "s:charm-6.1.3:charm-${CHARM_VERSION}:" \
+		-i Make.charm || die
 
 	rm -f charm-6.1.3.tar || die
 
 	# proper compiler and cflags
-	sed -e "s/g++/$(tc-getCXX)/" \
+	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"
+		-i arch/${NAMD_ARCH}.arch || die
 
-	sed -e "s/gentoo-libdir/$(get_libdir)/g" \
+	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."
+	sed -e "s/gentoo-libdir/$(get_libdir)/g" -i arch/Linux-x86_64.fftw || die
+	sed -e "s/gentoo-libdir/$(get_libdir)/g" -i arch/Linux-x86_64.tcl || die
+}
 
+src_configure() {
 	# configure
-	./config ${NAMD_ARCH}
+	./config ${NAMD_ARCH} || die
 }
 
 src_compile() {
 	# build namd
 	cd "${S}/${NAMD_ARCH}"
-	emake || die "Failed to build namd"
+	emake
 }
 
 src_install() {
+	dodoc announce.txt license.txt notes.txt
 	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"
+	dobin ${PN}2 psfgen flipbinpdb flipdcd
 }
 
 pkg_postinst() {