Fixed bugs #95697, #90247 and #93047

(Portage version: 2.0.51.22-r2)

5 files changed, 156 insertions, 14 deletions

diff --git a/sci-biology/foldingathome/ChangeLog b/sci-biology/foldingathome/ChangeLog
index da5900a9bb48..e01b6217a70b 100644
--- a/sci-biology/foldingathome/ChangeLog
+++ b/sci-biology/foldingathome/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-biology/foldingathome
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.9 2005/04/22 13:47:18 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.10 2005/08/14 02:31:39 ribosome Exp $
+
+*foldingathome-5.0.2-r4 (14 Aug 2005)
+
+  14 Aug 2005; Olivier Fisette <ribosome@gentoo.org> +files/init-5.0.2-r4,
+  +foldingathome-5.0.2-r4.ebuild:
+  Fixed bug #95697: license is now correct and the binaries are no longer
+  stripped since we are not allowed to modify them. Thanks to Ian Kelly
+  <kellyia@udel.edu>. Fixed bugs #90247 and #93047: Foldingathome init script
+  now uses start-stop-daemon. Thanks to James Lademann
+  <jwlademann@myrealbox.com>.
 
   22 Apr 2005; Danny van Dyk <kugelfang@gentoo.org>
   foldingathome-5.0.2-r3.ebuild:
diff --git a/sci-biology/foldingathome/Manifest b/sci-biology/foldingathome/Manifest
index 65de7bdb75c7..6af1690a5afd 100644
--- a/sci-biology/foldingathome/Manifest
+++ b/sci-biology/foldingathome/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ca39e5ad54370bbd778c6905496b932b ChangeLog 5464
+MD5 d0cac7267843f2a124298fac8c4ddd03 foldingathome-5.0.2-r4.ebuild 2036
 MD5 f2bac6b14a4b471449216800a9bedbe4 foldingathome-5.0.2-r3.ebuild 2018
+MD5 ca39e5ad54370bbd778c6905496b932b ChangeLog 5464
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 2f181dd626be0626fc9000536fd0d4c4 files/digest-foldingathome-5.0.2-r3 61
-MD5 b695ee5884feb42cd5678eb977d862cc files/init-5.0.2-r3 1478
-MD5 3174784abb8ed1da2fc846d722aeffe5 files/folding-conf.d-r1 1172
+MD5 2f181dd626be0626fc9000536fd0d4c4 files/digest-foldingathome-5.0.2-r4 61
 MD5 f3a9e0a439c14bd3d328cea6e3af1540 files/initfolding-r2 150
+MD5 3174784abb8ed1da2fc846d722aeffe5 files/folding-conf.d-r1 1172
+MD5 b695ee5884feb42cd5678eb977d862cc files/init-5.0.2-r3 1478
+MD5 d3f62d5bf033c747d55dce3cfc78501f files/init-5.0.2-r4 1618
 MD5 71ad6348b9f8b367f2417eddf75417c7 files/copy_client_config-5.0.2-r1 393
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCaQDw5mJXAu5GbtIRAmXFAJwP/AJ2w2GxOWxRZ8kEssW1dUDMygCfUtk0
-WEEtiNe1ipfTT0SV0n70VRc=
-=Yr0i
------END PGP SIGNATURE-----
diff --git a/sci-biology/foldingathome/files/digest-foldingathome-5.0.2-r4 b/sci-biology/foldingathome/files/digest-foldingathome-5.0.2-r4
new file mode 100644
index 000000000000..44de62a3f7fd
--- /dev/null
+++ b/sci-biology/foldingathome/files/digest-foldingathome-5.0.2-r4
@@ -0,0 +1 @@
+MD5 4855e808fb94e6d2c5fde345aea0cdc3 FAH502-Linux.exe 249236
diff --git a/sci-biology/foldingathome/files/init-5.0.2-r4 b/sci-biology/foldingathome/files/init-5.0.2-r4
new file mode 100644
index 000000000000..75bb3f5ff197
--- /dev/null
+++ b/sci-biology/foldingathome/files/init-5.0.2-r4
@@ -0,0 +1,59 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/files/init-5.0.2-r4,v 1.1 2005/08/14 02:31:39 ribosome Exp $
+
+opts="${opts} unitinfo"
+
+do_config() {
+	if [ -z "${CPU}" ] || [ "${CPU}" == "0" ]; then
+		if [ -r /proc/cpuinfo ]; then
+			CPU=`grep "^processor[[:space:]]*:" /proc/cpuinfo | wc -l`
+			if (( $CPU > 8 )); then
+				CPU=8
+			fi
+		else
+			CPU=1
+		fi
+	fi
+}
+
+unitinfo() {
+	do_config
+	for (($CPU; CPU > 0; CPU--)); do
+		einfo "CPU ${CPU} $(head -n1 /opt/foldingathome/client${CPU}/unitinfo.txt):"
+		sed -e '1,2d' /opt/foldingathome/client${CPU}/unitinfo.txt
+	done
+}
+
+start() {
+	do_config
+	su foldingathome -c /opt/foldingathome/copy_client_config
+	for (($CPU; CPU > 0; CPU--)); do
+		ebegin "Starting Folding@Home on CPU ${CPU}"
+		cd /opt/foldingathome/client${CPU}/
+		start-stop-daemon --chuid foldingathome --nicelevel 19 --start --background --exec /opt/foldingathome/client${CPU}/foldingathome -- ${FOLD_OPTS}
+		eend $?
+	done
+}
+
+stop() {
+	do_config
+	for (($CPU; CPU > 0; CPU--)); do
+		ebegin "Stopping Folding@Home on CPU ${CPU}"
+		start-stop-daemon --stop --user foldingathome --exec /opt/foldingathome/client${CPU}/foldingathome
+		cd /opt/foldingathome/client${CPU}/
+                for I in FahCore*.exe; do
+                        if ps ax|grep $I > /dev/null 2>&1; then
+				killall -q $I > /dev/null 2>&1
+			fi
+                done
+		sleep 1
+		if ps ax|grep '[/]opt[/]foldingathome/client${CPU}/' > /dev/null 2>&1; then
+			eend 1
+		else
+			eend 0
+		fi
+        done
+}
+
diff --git a/sci-biology/foldingathome/foldingathome-5.0.2-r4.ebuild b/sci-biology/foldingathome/foldingathome-5.0.2-r4.ebuild
new file mode 100644
index 000000000000..eb78db84dae3
--- /dev/null
+++ b/sci-biology/foldingathome/foldingathome-5.0.2-r4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2005 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-r4.ebuild,v 1.1 2005/08/14 02:31:39 ribosome Exp $
+
+# no version number on this install dir since upgrades will be using same dir
+# (data will be stored here too)
+I="/opt/foldingathome"
+
+inherit eutils
+
+DESCRIPTION="Help simulate protein folding at home"
+HOMEPAGE="http://folding.stanford.edu/"
+SRC_URI="http://www.stanford.edu/group/pandegroup/release/FAH502-Linux.exe"
+RESTRICT="nomirror nostrip"
+
+SLOT="0"
+IUSE=""
+LICENSE="folding-at-home"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND=">=sys-apps/baselayout-1.8.0
+	>=sys-libs/glibc-2.3.0
+	amd64? ( app-emulation/emul-linux-x86-baselibs )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+		cp "${DISTDIR}/${A}" ${PN}
+}
+
+src_install() {
+	exeinto ${I}
+	newexe ${FILESDIR}/initfolding-r2 initfolding
+	newexe ${FILESDIR}/copy_client_config-${PV}-r1 copy_client_config
+
+	# Clients
+	exeinto ${I}/client1
+	doexe foldingathome
+	exeinto ${I}/client2
+	doexe foldingathome
+	exeinto ${I}/client3
+	doexe foldingathome
+	exeinto ${I}/client4
+	doexe foldingathome
+	exeinto ${I}/client5
+	doexe foldingathome
+	exeinto ${I}/client6
+	doexe foldingathome
+	exeinto ${I}/client7
+	doexe foldingathome
+	exeinto ${I}/client8
+	doexe foldingathome
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/init-${PVR} foldingathome
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/folding-conf.d-r1 foldingathome
+}
+
+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 /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 /etc/conf.d/foldingathome for options"
+	einfo ""
+}
+
+pkg_postrm() {
+	einfo "Folding@home data files were not removed."
+	einfo " Remove them manually from ${I}"
+	einfo ""
+}