Latest x86_64 beta client

Package-Manager: portage-2.1.5.5

8 files changed, 47 insertions, 36 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/Manifest b/sci-biology/foldingathome/Manifest
index efe806b9b95f..4f3a63a5c1c5 100644
--- a/sci-biology/foldingathome/Manifest
+++ b/sci-biology/foldingathome/Manifest
@@ -1,15 +1,15 @@
-AUX 5.91_beta/fah-init 1027 RMD160 2599f16edf444125f75f56b0c3b8e4b54a746257 SHA1 610e7debaa2aeac944feef3a7d785a51e77f74e1 SHA256 2979b13324806322c737a7738748eb6108c3b60ac7545307febada4eb8ecf55c
-AUX 5.91_beta/folding-conf.d 779 RMD160 292c987801c5e144bf0743d10ab855d0ce2c7788 SHA1 fe49a81e3e56d9ad6522f2a2956e09a34af7e3ac SHA256 7adbe7c3604390617a12ec18fd9469ce036d34f38d37e395a539f52c7a075235
-AUX 5.91_beta/initfolding 155 RMD160 c0d81691f5081778672904758769ec305f68c1b1 SHA1 df47a4c6798737f1c6493e8572b0c15b733b254f SHA256 3e291a24a2aea147ce6d609dfa14d178aed907c05ce45636a7983a7f398eee04
+AUX 6.02_beta1/fah-init 1028 RMD160 d65999c84de0f470fb4536df170d33fe3804ba84 SHA1 5fb3e73fbafc76d8f0c0e589fcbe14cdb163a246 SHA256 cb0071e8155d7f8d95c4bbce1fae5753ebe81832dd74a03f82107d9cef763f84
+AUX 6.02_beta1/folding-conf.d 805 RMD160 f44c7885a72835285bee84c18d333f5c828f3330 SHA1 350e749a4e701105930f4be27c8c158efcee6225 SHA256 8ddd32bfc77756591f3c38c11c6c63812b1427970bdb5c970ffb18d424cfd7e1
+AUX 6.02_beta1/initfolding 155 RMD160 0055bd01f02b2b4bd4b270eba238207873146ed1 SHA1 b82e2fcd080a27c2792c8e390f5cdd7717e4b3dc SHA256 e315dcbb436967d357c8ca5e8f09fe9d4624343c73848c301fff989f6e901128
 AUX copy_client_config-5.0.2-r1 393 RMD160 530642f45d1d83612aa6a8048f6ed5fbab67176b SHA1 5a3951b4fe98f62ae3e20269dabd5cfbf3554d77 SHA256 ddfe7ace77006273d1ac64aec4280fdecf52ea0f435dacf2d1bba3de3da42abe
 AUX folding-conf.d-r1 1172 RMD160 1c76ea630aa18e1078642f198af46a46eeb5ce62 SHA1 e8940c6f63cd86f570ffebeac22a9e265dbde6dd SHA256 48e49f73fd3c5e45f6ffa99c243d0ff5068416db90d5fd3c447f0118dd8ec154
 AUX init-5.0.2-r3 1478 RMD160 06e256fa528abeb7378addbe795efb5d95c71852 SHA1 46fddec47f30e8a850c056327412c335d29a661e SHA256 646c350f9777b0a1df3901f963523d04b01d0997aae4f6b16b97bc9e7b031582
 AUX init-5.0.2-r5 1602 RMD160 4680d24496b69512d6223fb420258ad5184241fa SHA1 db3112edc993c69cd285ac0fc1bee41107c7075b SHA256 99e3eae808935333432becf04095063872e3c9c4aeb834beb88e82f3e8627c9c
 AUX initfolding-r2 150 RMD160 160f6f4c8e15b5e5694cdbe53f08adcfd51c4f20 SHA1 8a57653fe7ac194cdb72d2ed9058436408529e0b SHA256 52375ccd65d9f7cbf09e0b2915f54a882726bf7c377353747fa3ff8fc2cedacb
 DIST FAH502-Linux.exe 249236 RMD160 e63be66c70447095eb7054d855316f42e0364971 SHA1 eb480011f3aaf1cea92b001ff15634670142674c SHA256 02e2d3665a6e8f8fc89c7751b8faadff6885d34860643bdd4107d92825754d33
-DIST FAH_SMP_Linux.tgz 138220 RMD160 019bc3511a70a31bc0c67780c75be78ca2dc29b8 SHA1 b7f556b76798aefe186527b1e27c106af20ba1e6 SHA256 af4cb6f88009378788c055112a2612f0a7bf8a93b22af68888eee660fa668040
-EBUILD foldingathome-5.0.2-r3.ebuild 1973 RMD160 ee036cabe6416bf5d219e092059584c329064596 SHA1 9afa835a928dc66bf99eaa2247ba669993cdecf9 SHA256 39ea674899372f32c5b352bb89b8e1c9b52ff0f8eadefd4141ddaa3b42385dc6
-EBUILD foldingathome-5.0.2-r5.ebuild 1991 RMD160 7071cca259c14835ece57a6b68398f0f201dd30e SHA1 3af59b6238a5fc5740759789e448c44487e04d19 SHA256 e1ef574d0f1c49b5ecc2784dcd0dac1ca2f2518e68b4a7bc826233990d647907
-EBUILD foldingathome-5.91_beta.ebuild 1803 RMD160 bbd497a648e34f94b5016ef1d4ce93d215ed72b7 SHA1 af1f2ad2b15aa65ec24f945f3581a5466e1b1b26 SHA256 6468e5a8222fcfdd3483f78a9a2c4d972f94000d77ed45b52733bdc8745ca72b
-MISC ChangeLog 7368 RMD160 33771c36a13b6dd6d1896e4b8dc2684c59a60935 SHA1 e71c088e2df0ecd24bcb408f924fc1a81f38fd78 SHA256 521ee5e7e5c9b127ffa913cea9151db0a5dff56695c5c9872e8e2b4e33259faf
+DIST FAH6.02beta1-Linux.tgz 139606 RMD160 eefbf91b5d5f918a67bbbcbdc1c66a1dfcba81a4 SHA1 13ba878570428114852ce4f1bc4b84a5729fcc54 SHA256 752def0a0f4627f046721a665429b80025be5ec75a52aae65026793ec3f11be9
+EBUILD foldingathome-5.0.2-r3.ebuild 1982 RMD160 a3a8bbaf21d5d50dc50f58f7313ecfa05c619392 SHA1 de7f263dbdba60c4a94419cfbedd3b78265377f6 SHA256 a0a0a6eb97dd353fe0be39007a7c88e07d1cb52d6eaf724bc7d04a7761916de4
+EBUILD foldingathome-5.0.2-r5.ebuild 1998 RMD160 3aef065261ff2671a3116ad064a81e82f2279fb6 SHA1 82a6f896a77a34c111de154922b144bc39781deb SHA256 6f23ec58995581abc800b08c5ce9744f5dd36de895795853db9d04257ebe03ec
+EBUILD foldingathome-6.02_beta1.ebuild 1797 RMD160 c2424e42d256674671633875bd1246668d7129f5 SHA1 5b2037dcedbae6e98b3cba516e5b40489ef567b6 SHA256 cacda1b49a1877d9b8c6a988b8176539709fb0bfeb79b273f6c7399e5955b92b
+MISC ChangeLog 7736 RMD160 805b26525a0438f67d4064c705be527cbcbdf846 SHA1 05d1aa82476951fa2ce31f2b5e170f3f6398bceb SHA256 faa536f1a778e62726141571c8108656c9c9c1dd250257e9e9608a5edccc4cce
 MISC metadata.xml 164 RMD160 2f441200f2672ab5f1efae7cbdb08b284603903c SHA1 61a50baedfd041e663d6c2a41a28b57e22dbb6de SHA256 f0897b09e661dc603041dab249d73253034659189becf1a34cca37a7d51ef72f
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() {