Latest x86_64 beta client

(Portage version: 2.1.5.5)

7 files changed, 39 insertions, 28 deletions

diff --git a/sci-biology/foldingathome/ChangeLog b/sci-biology/foldingathome/ChangeLog
index b350f2ffa2d8..922546137ca0 100644
--- a/sci-biology/foldingathome/ChangeLog
+++ b/sci-biology/foldingathome/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-biology/foldingathome
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.19 2007/07/12 17:19:05 angelos Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.20 2008/06/14 22:16:02 je_fro Exp $
+
+*foldingathome-6.02_beta1 (14 Jun 2008)
+
+  14 Jun 2008; Jeff Gardner <je_fro@gentoo.org> -files/5.91_beta/fah-init,
+  -files/5.91_beta/initfolding, -files/5.91_beta/folding-conf.d,
+  +files/6.02_beta1/fah-init, +files/6.02_beta1/folding-conf.d,
+  +files/6.02_beta1/initfolding, -foldingathome-5.91_beta.ebuild,
+  +foldingathome-6.02_beta1.ebuild:
+  Latest beta client
 
   12 Jul 2007; Christoph Mende <angelos@gentoo.org>
   foldingathome-5.0.2-r5.ebuild:
diff --git a/sci-biology/foldingathome/files/5.91_beta/fah-init b/sci-biology/foldingathome/files/6.02_beta1/fah-init
index 028025e9a612..68b764b1a2cd 100644
--- a/sci-biology/foldingathome/files/5.91_beta/fah-init
+++ b/sci-biology/foldingathome/files/6.02_beta1/fah-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/files/5.91_beta/fah-init,v 1.1 2007/04/10 10:37:24 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/files/6.02_beta1/fah-init,v 1.1 2008/06/14 22:16:03 je_fro Exp $
 
 opts="${opts} unitinfo"
 
@@ -13,13 +13,13 @@ unitinfo() {
 start() {
 	ebegin "Starting Folding@Home"
 	cd /opt/foldingathome/amd64-smp
-	start-stop-daemon -v --chdir ${PWD} --chuid foldingathome --nicelevel 19 --start --background --exec ./fah5 -- ${FOLD_OPTS}
+	start-stop-daemon -v --chdir ${PWD} --chuid foldingathome --nicelevel 19 --start --background --exec ./fah6 -- ${FOLD_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Folding@Home"
-	start-stop-daemon -vv --stop --user foldingathome --exec /opt/foldingathome/amd64-smp/fah5
+	start-stop-daemon -vv --stop --user foldingathome --exec /opt/foldingathome/amd64-smp/fah6
 	cd /opt/foldingathome/amd64-smp
 	for I in FahCore*.exe; do
 		if ps ax|grep $I > /dev/null 2>&1; then
@@ -27,7 +27,7 @@ stop() {
 		fi
 	done
 	sleep 1
-	if ps ax|grep '[/]opt[/]foldingathome[/]amd64-smp[/]fah5' > /dev/null 2>&1; then
+	if ps ax|grep '[/]opt[/]foldingathome[/]amd64-smp[/]fah6' > /dev/null 2>&1; then
 		eend 1
 	else
 		eend 0
diff --git a/sci-biology/foldingathome/files/5.91_beta/folding-conf.d b/sci-biology/foldingathome/files/6.02_beta1/folding-conf.d
index bae73ef785e0..3981cdcbe0aa 100644
--- a/sci-biology/foldingathome/files/5.91_beta/folding-conf.d
+++ b/sci-biology/foldingathome/files/6.02_beta1/folding-conf.d
@@ -16,3 +16,5 @@
 # as a service.
 #
 FOLD_OPTS="-local"
+PIDFILE=/var/run/folding
+
diff --git a/sci-biology/foldingathome/files/5.91_beta/initfolding b/sci-biology/foldingathome/files/6.02_beta1/initfolding
index 01e9041a5a5d..e3bead5dde25 100644
--- a/sci-biology/foldingathome/files/5.91_beta/initfolding
+++ b/sci-biology/foldingathome/files/6.02_beta1/initfolding
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 cd /opt/foldingathome/amd64-smp
-/opt/foldingathome/amd64-smp/fah5 -configonly
+/opt/foldingathome/amd64-smp/fah6 -configonly
 /bin/chown -R foldingathome:nogroup /opt/foldingathome/amd64-smp
 
diff --git a/sci-biology/foldingathome/foldingathome-5.0.2-r3.ebuild b/sci-biology/foldingathome/foldingathome-5.0.2-r3.ebuild
index 88db61a6ab46..fa6398aac141 100644
--- a/sci-biology/foldingathome/foldingathome-5.0.2-r3.ebuild
+++ b/sci-biology/foldingathome/foldingathome-5.0.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/foldingathome-5.0.2-r3.ebuild,v 1.6 2007/07/02 15:23:09 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/foldingathome-5.0.2-r3.ebuild,v 1.7 2008/06/14 22:16:02 je_fro Exp $
 
 # no version number on this install dir since upgrades will be using same dir
 # (data will be stored here too)
@@ -30,8 +30,8 @@ src_unpack() {
 
 src_install() {
 	exeinto ${I}
-	newexe ${FILESDIR}/initfolding-r2 initfolding
-	newexe ${FILESDIR}/copy_client_config-${PV}-r1 copy_client_config
+	newexe "${FILESDIR}"/initfolding-r2 initfolding
+	newexe "${FILESDIR}"/copy_client_config-${PV}-r1 copy_client_config
 
 	# Clients
 	exeinto ${I}/client1
@@ -50,8 +50,8 @@ src_install() {
 	doexe foldingathome
 	exeinto ${I}/client8
 	doexe foldingathome
-	newinitd ${FILESDIR}/init-${PVR} foldingathome
-	newconfd ${FILESDIR}/folding-conf.d-r1 foldingathome
+	newinitd "${FILESDIR}"/init-${PVR} foldingathome
+	newconfd "${FILESDIR}"/folding-conf.d-r1 foldingathome
 }
 
 pkg_preinst() {
diff --git a/sci-biology/foldingathome/foldingathome-5.0.2-r5.ebuild b/sci-biology/foldingathome/foldingathome-5.0.2-r5.ebuild
index 1f728f2af8e5..473dc016a82a 100644
--- a/sci-biology/foldingathome/foldingathome-5.0.2-r5.ebuild
+++ b/sci-biology/foldingathome/foldingathome-5.0.2-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/foldingathome-5.0.2-r5.ebuild,v 1.6 2007/07/12 17:19:05 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/foldingathome-5.0.2-r5.ebuild,v 1.7 2008/06/14 22:16:02 je_fro Exp $
 
 # no version number on this install dir since upgrades will be using same dir
 # (data will be stored here too)
@@ -30,8 +30,8 @@ src_unpack() {
 
 src_install() {
 	exeinto ${I}
-	newexe ${FILESDIR}/initfolding-r2 initfolding
-	newexe ${FILESDIR}/copy_client_config-${PV}-r1 copy_client_config
+	newexe "${FILESDIR}"/initfolding-r2 initfolding
+	newexe "${FILESDIR}"/copy_client_config-${PV}-r1 copy_client_config
 
 	# Clients
 	exeinto ${I}/client1
@@ -50,8 +50,8 @@ src_install() {
 	doexe foldingathome
 	exeinto ${I}/client8
 	doexe foldingathome
-	newinitd ${FILESDIR}/init-${PVR} foldingathome
-	newconfd ${FILESDIR}/folding-conf.d-r1 foldingathome
+	newinitd "${FILESDIR}"/init-${PVR} foldingathome
+	newconfd "${FILESDIR}"/folding-conf.d-r1 foldingathome
 }
 
 pkg_preinst() {
diff --git a/sci-biology/foldingathome/foldingathome-5.91_beta.ebuild b/sci-biology/foldingathome/foldingathome-6.02_beta1.ebuild
index 686b13ae2ae5..1ae21de50272 100644
--- a/sci-biology/foldingathome/foldingathome-5.91_beta.ebuild
+++ b/sci-biology/foldingathome/foldingathome-6.02_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/foldingathome-5.91_beta.ebuild,v 1.3 2007/07/03 04:26:15 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/foldingathome-6.02_beta1.ebuild,v 1.1 2008/06/14 22:16:02 je_fro Exp $
 
 # no version number on this install dir since upgrades will be using same dir
 # (data will be stored here too)
@@ -11,13 +11,13 @@ inherit eutils
 
 DESCRIPTION="Folding@Home is a distributed computing project for protein folding."
 HOMEPAGE="http://folding.stanford.edu/FAQ-SMP.html"
-SRC_URI="http://folding.stanford.edu/release/FAH_SMP_Linux.tgz"
+SRC_URI="http://www.stanford.edu/group/pandegroup/folding/release/FAH6.02beta1-Linux.tgz"
 
 LICENSE="folding-at-home"
 SLOT="0"
 
-# This beta just died...we're waiting on the next revision.
-KEYWORDS=""
+# This is for x86_64 only.
+KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND=">=sys-apps/baselayout-1.8.0
@@ -29,10 +29,10 @@ S="${WORKDIR}"
 
 src_install() {
 	exeinto ${I}
-	newexe ${FILESDIR}/5.91_beta/initfolding initfolding
-	doexe fah5 mpiexec
-	newconfd ${FILESDIR}/5.91_beta/folding-conf.d foldingathome
-	newinitd ${FILESDIR}/5.91_beta/fah-init foldingathome
+	newexe "${FILESDIR}"/${PV}/initfolding initfolding
+	doexe fah6 mpiexec
+	newconfd "${FILESDIR}"/${PV}/folding-conf.d foldingathome
+	newinitd "${FILESDIR}"/${PV}/fah-init foldingathome
 }
 
 pkg_preinst() {