New version, fixes issues that prevented running FAH on newer GNU/Linux systems.

Package-Manager: portage-2.1.10.2/cvs/Linux x86_64

6 files changed, 138 insertions, 13 deletions

diff --git a/sci-biology/foldingathome/ChangeLog b/sci-biology/foldingathome/ChangeLog
index 71026fcf5adf..ea689c7a018a 100644
--- a/sci-biology/foldingathome/ChangeLog
+++ b/sci-biology/foldingathome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-biology/foldingathome
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.30 2010/06/24 11:47:44 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.31 2011/06/15 17:26:03 je_fro Exp $
+
+*foldingathome-6.34 (15 Jun 2011)
+
+  15 Jun 2011; Jeff Gardner <je_fro@gentoo.org> +files/6.34/fah-init,
+  +files/6.34/folding-conf.d, +files/6.34/initfolding,
+  +foldingathome-6.34.ebuild:
+  New version, fixes issues that prevented running FAH on newer GNU/Linux
+  systems.
 
   24 Jun 2010; Justin Lecher <jlec@gentoo.org>
   -foldingathome-5.0.2-r3.ebuild:
diff --git a/sci-biology/foldingathome/Manifest b/sci-biology/foldingathome/Manifest
index d2c0c9470664..be5e31c83dfe 100644
--- a/sci-biology/foldingathome/Manifest
+++ b/sci-biology/foldingathome/Manifest
@@ -1,12 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 6.02/fah-init 802 RMD160 7c15544374e4adb9d8351a478f3551bcebd665ab SHA1 af814b258f67fcaf6bc6a5519c886895c31208fe SHA256 94e35a7aabfb0b2f10f5c8a6f28adca543dedaa51d4e737f4abffeef46a09323
 AUX 6.02/folding-conf.d 854 RMD160 c705e87e36b32b764eba185c2916a81a929e8c16 SHA1 6b29cac64993d9518fbefa8a61f09e07e6d44562 SHA256 815559a3c30858d47836dcb9244f8a42799630c88ac013e50f19fd74cca33c8c
 AUX 6.02/initfolding 125 RMD160 70e92fa4aa493fdf362e98c88850008a2d9aa226 SHA1 27838b24f2f12b51212fa1845c210a1443911dfc SHA256 8bada0baf3b0835774c472e0e2e05e7cebfa675a77c15ebdf75fee6d80a95f8b
 AUX 6.29/fah-init 823 RMD160 1f881b56e0d1bdaada4657cb081db29e32bd8969 SHA1 a144c88c51deb0def18cdc0c85a7d781cffda0ab SHA256 b4daadc5a726af9a780ad6aef1cb01ca56b5cb5229c17436a824c24c1bc704c9
 AUX 6.29/folding-conf.d 890 RMD160 aae1806917e61233ab0a0b717e144aa3a4d88697 SHA1 2a6f986aecb4d872e0b8098c826e2862b4d56831 SHA256 a74b555e4e4e75100a0332ef2663d200378197a77d6b8333bc1f8ccb826831ab
 AUX 6.29/initfolding 125 RMD160 70e92fa4aa493fdf362e98c88850008a2d9aa226 SHA1 27838b24f2f12b51212fa1845c210a1443911dfc SHA256 8bada0baf3b0835774c472e0e2e05e7cebfa675a77c15ebdf75fee6d80a95f8b
+AUX 6.34/fah-init 825 RMD160 2dbfb38dda553abfd08b19ac4220cf8727a204bf SHA1 d5fdea19bd344c29643eb41d19c966f6857fcf93 SHA256 64fc719a5a2b5f90bb9040cf83c3b996f702ed85121ca574633023d4e0a7a18a
+AUX 6.34/folding-conf.d 1331 RMD160 eeed187cf564508ac31d8d2dcd4d490f596986e5 SHA1 0e96b9a2eeff137f5623b614d64882cf6777843a SHA256 7809715e0fb6f6ce1437428bb376236a0b7b49993e6dd0f1046f839cc5ad7d8d
+AUX 6.34/initfolding 125 RMD160 70e92fa4aa493fdf362e98c88850008a2d9aa226 SHA1 27838b24f2f12b51212fa1845c210a1443911dfc SHA256 8bada0baf3b0835774c472e0e2e05e7cebfa675a77c15ebdf75fee6d80a95f8b
 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
@@ -15,15 +15,10 @@ AUX initfolding-r2 150 RMD160 160f6f4c8e15b5e5694cdbe53f08adcfd51c4f20 SHA1 8a57
 DIST FAH502-Linux.exe 249236 RMD160 e63be66c70447095eb7054d855316f42e0364971 SHA1 eb480011f3aaf1cea92b001ff15634670142674c SHA256 02e2d3665a6e8f8fc89c7751b8faadff6885d34860643bdd4107d92825754d33
 DIST FAH6.02-Linux.tgz 139883 RMD160 a543bdb0e385281c064880ca55a92388a22372a6 SHA1 40d1010bbf36e5a35ad8477fdbd66ce53124fde3 SHA256 20a401bec46fc5c0f763a54a70e8520f975ddc72221230c9eb606fb22888dc06
 DIST FAH6.29-Linux.tgz 568939 RMD160 481edf16b8b8c8c80e4fdd0eee48fcf755646c3d SHA1 5eb6b40e8c6f65033f4d5b69f0e5e94b2808d603 SHA256 86af1ad84b9ec5b228ea550d9f1f88e53686937db5d1357f7e421ca7d8a45f45
+DIST FAH6.34-Linux64.tgz 146345 RMD160 0de9632aa7fe09734642af512e028ac31d97dcdf SHA1 9150b81381a180fde2d81a27784bbb511bf66ea5 SHA256 8b4d47f2ac711bd487235c7f015df7420d9581d199b26479ef312b45e52c8a95
 EBUILD foldingathome-5.0.2-r5.ebuild 1998 RMD160 3aef065261ff2671a3116ad064a81e82f2279fb6 SHA1 82a6f896a77a34c111de154922b144bc39781deb SHA256 6f23ec58995581abc800b08c5ce9744f5dd36de895795853db9d04257ebe03ec
 EBUILD foldingathome-6.02-r1.ebuild 1596 RMD160 317d3b5722c518b70a4f38ae5cd398785047b65a SHA1 c164a8d52ce726804b8f84f0f71de28396443639 SHA256 2b7b47607d1b40c65372089a2f226a3945b6fea88332a11d9cd816c9870fd686
 EBUILD foldingathome-6.29.ebuild 1620 RMD160 4e9e8a67de486a5a9c4bf395cebc042434b85dec SHA1 d25bd7d64604c1ef170fa72ea4bc7cb453a43417 SHA256 5adf1e43a566fcbe64bf4279748f53215f3c2ca6287b6e32fb22cc2f29175df8
-MISC ChangeLog 9477 RMD160 ede14b11a236de115dee926031a4485b6ca69eed SHA1 a0784b391215455b5498a8477ae3f6253e8f4353 SHA256 52b6b66d1a017eb05eb97debc3df90200c3ffa3e3d7e4ac547704f97166e4a31
+EBUILD foldingathome-6.34.ebuild 1619 RMD160 cdce87e9ee35ccab4863381564691a91a0befeb0 SHA1 b13315ddee4e13dd26726704cda6026434e738c7 SHA256 539903e63214bcad7a68af9bef916fae5dcd0d26267531484564f196258b0312
+MISC ChangeLog 9755 RMD160 c68c9c3c80462e974642593c9af80363e2ff8501 SHA1 75d0f1ae5948380fba3d12fc060c931978c7f08c SHA256 823051d39464e7ad0e55eddcbe44ffcfa86cf1748546847672ee164a288f2fdf
 MISC metadata.xml 164 RMD160 2f441200f2672ab5f1efae7cbdb08b284603903c SHA1 61a50baedfd041e663d6c2a41a28b57e22dbb6de SHA256 f0897b09e661dc603041dab249d73253034659189becf1a34cca37a7d51ef72f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwjReUACgkQgAnW8HDreRYz6gCcClxQUO1m/3ku6u7H0HJtaKXa
-jfMAnRePNEQwG1nGMuBzmj1FI8HxUgfx
-=sKbP
------END PGP SIGNATURE-----
diff --git a/sci-biology/foldingathome/files/6.34/fah-init b/sci-biology/foldingathome/files/6.34/fah-init
new file mode 100644
index 000000000000..17c71218df6b
--- /dev/null
+++ b/sci-biology/foldingathome/files/6.34/fah-init
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/files/6.34/fah-init,v 1.1 2011/06/15 17:26:03 je_fro Exp $
+
+opts="${opts} unitinfo"
+
+unitinfo() {
+	einfo "$(head -n1 /opt/foldingathome/unitinfo.txt):"
+	sed -e '1,2d' /opt/foldingathome/unitinfo.txt
+}
+
+start() {
+	ebegin "Starting Folding@Home"
+	cd /opt/foldingathome
+	start-stop-daemon --chdir ${PWD} --chuid foldingathome --nicelevel 19 \
+		--make-pidfile --pidfile "${PIDFILE}" \
+		--start --background --exec ./fah6 -- ${FOLD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Folding@Home"
+	start-stop-daemon --stop --user foldingathome --pidfile "${PIDFILE}"
+	eend $?
+	[[ -f ${PIDFILE} ]] && killall --user foldingathome --signal SIGKILL
+}
diff --git a/sci-biology/foldingathome/files/6.34/folding-conf.d b/sci-biology/foldingathome/files/6.34/folding-conf.d
new file mode 100644
index 000000000000..f35df986ed64
--- /dev/null
+++ b/sci-biology/foldingathome/files/6.34/folding-conf.d
@@ -0,0 +1,30 @@
+# Config file for /etc/init.d/foldingathome
+#
+# The f@h client configuration can be found in /opt/foldingathome/client.cfg
+# Run /opt/foldingathome/initfolding to reconfigure that.
+#
+# The options may be passed to the Folding client:
+#
+#  -config      Configure user information
+#  -configonly  Configure user information, then exit
+#  -help        Display this usage screen
+#  -queueinfo   Get information on queued work units
+#  -delete x    Delete item #x from work queue
+#  -send x      Send result #x to server then exit. Use x=all to send all results
+#  -verbosity x Sets the output level, from 1 to 9 (max). The default is 3
+#  -pause       Pause after finishing & trying to send current unit
+#  -oneunit     Exit after completing one unit
+#  -forceasm    Force core assembly optimizations to be used if available
+#  -advmethods  Use new advanced scientific cores and/or work units if available
+#  -freeBSD     Make brandelf system call on downloaded cores.
+#  -openBSD     Make elf2olf system call on downloaded cores.
+#  -smp         Use symmetric multiprocessing.
+#
+# A full listing of options can be found here:
+# http://www.stanford.edu/group/pandegroup/folding/console-userguide.html
+# But use of other options are not recommended when using the Folding client
+# as a service.
+#
+FOLD_OPTS=""
+PIDFILE=/var/run/folding
+
diff --git a/sci-biology/foldingathome/files/6.34/initfolding b/sci-biology/foldingathome/files/6.34/initfolding
new file mode 100644
index 000000000000..3f760a1e6117
--- /dev/null
+++ b/sci-biology/foldingathome/files/6.34/initfolding
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd /opt/foldingathome
+/opt/foldingathome/fah6 -configonly
+/bin/chown -R foldingathome:nogroup /opt/foldingathome
+
diff --git a/sci-biology/foldingathome/foldingathome-6.34.ebuild b/sci-biology/foldingathome/foldingathome-6.34.ebuild
new file mode 100644
index 000000000000..11fee0924b84
--- /dev/null
+++ b/sci-biology/foldingathome/foldingathome-6.34.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/foldingathome-6.34.ebuild,v 1.1 2011/06/15 17:26:03 je_fro Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="Folding@Home is a distributed computing project for protein folding."
+HOMEPAGE="http://folding.stanford.edu/FAQ-SMP.html"
+SRC_URI="http://www.stanford.edu/group/pandegroup/folding/release/FAH${PV}-Linux64.tgz"
+
+LICENSE="folding-at-home"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+S="${WORKDIR}"
+
+I="opt/foldingathome"
+
+QA_DT_HASH="${I}/.*"
+QA_PRESTRIPPED="${I}/fah6"
+
+pkg_setup() {
+	I="${EPREFIX}/${I}"
+}
+
+src_install() {
+	exeinto ${I}
+	doexe "${FILESDIR}"/${PV}/initfolding || die
+	doexe fah6 || die
+	newconfd "${FILESDIR}"/${PV}/folding-conf.d foldingathome || die
+	newinitd "${FILESDIR}"/${PV}/fah-init foldingathome || die
+}
+
+pkg_preinst() {
+	# the bash shell is important for "su -c" in init script
+	enewuser foldingathome -1 /bin/bash /opt/foldingathome
+}
+
+pkg_postinst() {
+	chown -R foldingathome:nogroup "${EPREFIX}"/opt/foldingathome
+	einfo "To run Folding@home in the background at boot:"
+	einfo " rc-update add foldingathome default"
+	einfo ""
+	einfo "Please run ${I}/initfolding to configure your client"
+	einfo "and edit ${EPREFIX}/etc/conf.d/foldingathome for options"
+	einfo ""
+	einfo "I encourage you to acquire a username and join team 36480."
+	einfo "http://folding.stanford.edu/English/Download#ntoc2"
+	einfo ""
+}
+
+pkg_postrm() {
+	einfo "Folding@home data files were not removed."
+	einfo " Remove them manually from ${I}"
+	einfo ""
+}