Fix tcl/tk slotting;drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

6 files changed, 14 insertions, 222 deletions

diff --git a/sci-chemistry/namd/ChangeLog b/sci-chemistry/namd/ChangeLog
index 5e92658dfcff..a9ad2b7b29b8 100644
--- a/sci-chemistry/namd/ChangeLog
+++ b/sci-chemistry/namd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/namd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/ChangeLog,v 1.21 2015/03/07 01:18:22 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/ChangeLog,v 1.22 2015/03/20 15:28:56 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> -namd-2.7_beta2-r1.ebuild,
+  -namd-2.9.ebuild, metadata.xml, namd-2.10.ebuild, namd-2.9-r1.ebuild:
+  Fix tcl/tk slotting;drop old
 
 *namd-2.10 (07 Mar 2015)
 
diff --git a/sci-chemistry/namd/metadata.xml b/sci-chemistry/namd/metadata.xml
index d50933506ca1..2e327cd996d3 100644
--- a/sci-chemistry/namd/metadata.xml
+++ b/sci-chemistry/namd/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<maintainer>
-		<email>nicolasbock@gentoo.org</email>
-	</maintainer>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>nicolasbock@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/namd/namd-2.10.ebuild b/sci-chemistry/namd/namd-2.10.ebuild
index e85b7f3b1ede..bf6ab31a8a90 100644
--- a/sci-chemistry/namd/namd-2.10.ebuild
+++ b/sci-chemistry/namd/namd-2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/namd-2.10.ebuild,v 1.1 2015/03/07 01:18:22 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/namd-2.10.ebuild,v 1.2 2015/03/20 15:28:56 jlec Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ RESTRICT="fetch"
 RDEPEND="
 	>=sys-cluster/charm-6.5.1-r2
 	sci-libs/fftw:3.0
-	dev-lang/tcl"
+	dev-lang/tcl:0="
 
 DEPEND="${RDEPEND}
 	app-shells/tcsh"
diff --git a/sci-chemistry/namd/namd-2.7_beta2-r1.ebuild b/sci-chemistry/namd/namd-2.7_beta2-r1.ebuild
deleted file mode 100644
index dfdd78c57814..000000000000
--- a/sci-chemistry/namd/namd-2.7_beta2-r1.ebuild
+++ /dev/null
@@ -1,107 +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/namd/namd-2.7_beta2-r1.ebuild,v 1.2 2012/11/29 13:41:41 jlec Exp $
-
-EAPI=4
-
-inherit eutils multilib 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/tcsh
-	sys-cluster/charm
-	sci-libs/fftw:2.1
-	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_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 \
-		"${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)/" \
-		-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
-
-	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
-	sed -e "s/gentoo-libdir/$(get_libdir)/g" -i arch/Linux-x86_64.tcl || die
-}
-
-src_configure() {
-	# configure
-	./config ${NAMD_ARCH} || die
-}
-
-src_compile() {
-	# build namd
-	cd "${S}/${NAMD_ARCH}"
-	emake
-}
-
-src_install() {
-	dodoc announce.txt license.txt notes.txt
-	cd "${S}/${NAMD_ARCH}"
-
-	# the binaries
-	dobin ${PN}2 psfgen flipbinpdb flipdcd
-}
-
-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
-}
diff --git a/sci-chemistry/namd/namd-2.9-r1.ebuild b/sci-chemistry/namd/namd-2.9-r1.ebuild
index 541ca1e8f37f..e13fd861103c 100644
--- a/sci-chemistry/namd/namd-2.9-r1.ebuild
+++ b/sci-chemistry/namd/namd-2.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/namd-2.9-r1.ebuild,v 1.2 2013/11/30 23:28:19 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/namd-2.9-r1.ebuild,v 1.3 2015/03/20 15:28:56 jlec Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ RESTRICT="fetch"
 RDEPEND="
 	>=sys-cluster/charm-6.5.1-r2
 	sci-libs/fftw:3.0
-	dev-lang/tcl"
+	dev-lang/tcl:0="
 
 DEPEND="${RDEPEND}
 	app-shells/tcsh"
diff --git a/sci-chemistry/namd/namd-2.9.ebuild b/sci-chemistry/namd/namd-2.9.ebuild
deleted file mode 100644
index 962f6db662c6..000000000000
--- a/sci-chemistry/namd/namd-2.9.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/namd/namd-2.9.ebuild,v 1.1 2013/10/18 16:25:04 ottxor Exp $
-
-EAPI=5
-
-inherit eutils multilib 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"
-
-SRC_URI="${MY_PN}_${PV}_Source.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="fetch"
-
-DEPEND="
-	app-shells/tcsh
-	|| ( >=sys-cluster/charm-6.5.1-r2 <=sys-cluster/charm-6.5.1-r1[static-libs] )
-	sci-libs/fftw:2.1
-	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}_${PV}_Source"
-
-pkg_nofetch() {
-	echo
-	einfo "Please download ${MY_PN}_${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 ${PV} version!"
-	echo
-}
-
-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.9-gentoo.patch
-	epatch "${FILESDIR}"/namd-2.7-iml-dec.patch
-	sed \
-		-e "s:charm-.\+:charm-${CHARM_VERSION}:" \
-		-i Make.charm || die
-
-	# Remove charm distribution. We don't need it.
-	rm -f charm-6.4.0.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
-
-	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
-	sed -e "s/gentoo-libdir/$(get_libdir)/g" -i arch/Linux-x86_64.tcl || die
-}
-
-src_configure() {
-	# configure
-	./config ${NAMD_ARCH} --charm-arch . || die
-}
-
-src_compile() {
-	# build namd
-	cd "${S}/${NAMD_ARCH}"
-	emake
-}
-
-src_install() {
-	dodoc announce.txt license.txt notes.txt
-	cd "${S}/${NAMD_ARCH}"
-
-	# the binaries
-	dobin ${PN}2 psfgen flipbinpdb flipdcd
-}
-
-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
-}