Bumping for init script fix and add back ~x86.

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27-gentoo-r3 x86_64

6 files changed, 26 insertions, 27 deletions

diff --git a/sci-biology/foldingathome/ChangeLog b/sci-biology/foldingathome/ChangeLog
index 0ce23c3c0776..edf303d0ee02 100644
--- a/sci-biology/foldingathome/ChangeLog
+++ b/sci-biology/foldingathome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/foldingathome
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.24 2008/11/22 04:37:22 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.25 2008/11/22 21:31:26 je_fro Exp $
+
+*foldingathome-6.02-r1 (22 Nov 2008)
+
+  22 Nov 2008; Jeff Gardner <je_fro@gentoo.org> -foldingathome-6.02.ebuild,
+  +foldingathome-6.02-r1.ebuild:
+  Bumping for init script fix and add back ~x86.
 
   22 Nov 2008; Jeff Gardner <je_fro@gentoo.org> files/6.02/fah-init:
   Changing to use init script from Constantin Baranov on bug #218331
diff --git a/sci-biology/foldingathome/Manifest b/sci-biology/foldingathome/Manifest
index 94836ec0e635..79bf1c38c816 100644
--- a/sci-biology/foldingathome/Manifest
+++ b/sci-biology/foldingathome/Manifest
@@ -1,6 +1,6 @@
-AUX 6.02/fah-init 832 RMD160 30d6d59d937515e7198bf66c91e5cfcb6e7a8509 SHA1 6ebcf227a4d0d7fe6098fd1f354a98f9b0fd63af SHA256 e0042cea2d207aae5598bbdbe02337297d9e18120040665caf404e6d8c290ce6
-AUX 6.02/folding-conf.d 860 RMD160 b9a48ad7a5baaaf098c874690158cdad8bc34f18 SHA1 a5e29236f9f5241c905d584d8297860ae4380505 SHA256 f3debbdf6423abcf159a99dfe2539975a7df2c1940008921c07253dbaa5083aa
-AUX 6.02/initfolding 155 RMD160 0055bd01f02b2b4bd4b270eba238207873146ed1 SHA1 b82e2fcd080a27c2792c8e390f5cdd7717e4b3dc SHA256 e315dcbb436967d357c8ca5e8f09fe9d4624343c73848c301fff989f6e901128
+AUX 6.02/fah-init 802 RMD160 7c15544374e4adb9d8351a478f3551bcebd665ab SHA1 af814b258f67fcaf6bc6a5519c886895c31208fe SHA256 94e35a7aabfb0b2f10f5c8a6f28adca543dedaa51d4e737f4abffeef46a09323
+AUX 6.02/folding-conf.d 858 RMD160 ae902d83cba232778db41ea4663b80b331498d43 SHA1 5be05164e8455fbe7378f67bce2bf84e94a30bc2 SHA256 b9cdd4112cb80e1802cdcce76f1a88584fe296f04c9fecc098d8b1e5d49f2527
+AUX 6.02/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
@@ -10,6 +10,6 @@ DIST FAH502-Linux.exe 249236 RMD160 e63be66c70447095eb7054d855316f42e0364971 SHA
 DIST FAH6.02-Linux.tgz 139883 RMD160 a543bdb0e385281c064880ca55a92388a22372a6 SHA1 40d1010bbf36e5a35ad8477fdbd66ce53124fde3 SHA256 20a401bec46fc5c0f763a54a70e8520f975ddc72221230c9eb606fb22888dc06
 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.ebuild 1786 RMD160 7d872bbe99140c144c670eb147206d25028e35a8 SHA1 7b52182bcd3fc477d377ad70433091dc4bdd2c17 SHA256 01d3b2d7fdb414ccfab91e8f02f59f7c066b3420a66d9de9a9d55f2cf47c935c
-MISC ChangeLog 8480 RMD160 054da88dcb10d208e1be584bc45b50682ddcbe89 SHA1 448a994f1d368a677471ae354625f145be1f81a3 SHA256 a7e573b78a05ea878ef64f1bb909af4f36020c4a4c1b865ede88c51bb73f5500
+EBUILD foldingathome-6.02-r1.ebuild 1458 RMD160 9227788683a159fb1ddf2a0adebd3648721afc94 SHA1 6d8dd705d6d6cddca7f0929909b9cf5c781624aa SHA256 8079691c0ae72e38e7103c9a9ad66097d1db3640299629cc41d83b8b9805c6cc
+MISC ChangeLog 8677 RMD160 86d6c01e22a35b771d387dee03ad44145f142ba5 SHA1 5bb1f6790374d235b6ee35c01656a74c93faec9f SHA256 ee70d3ec227a502168a376ac83800a98b811946faa834efd1f5a31c7f224c4a4
 MISC metadata.xml 164 RMD160 2f441200f2672ab5f1efae7cbdb08b284603903c SHA1 61a50baedfd041e663d6c2a41a28b57e22dbb6de SHA256 f0897b09e661dc603041dab249d73253034659189becf1a34cca37a7d51ef72f
diff --git a/sci-biology/foldingathome/files/6.02/fah-init b/sci-biology/foldingathome/files/6.02/fah-init
index 1447b0910d63..70424cac11f2 100644
--- a/sci-biology/foldingathome/files/6.02/fah-init
+++ b/sci-biology/foldingathome/files/6.02/fah-init
@@ -1,18 +1,18 @@
 #!/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/6.02/fah-init,v 1.2 2008/11/22 04:37:22 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/files/6.02/fah-init,v 1.3 2008/11/22 21:31:26 je_fro Exp $
 
 opts="${opts} unitinfo"
 
 unitinfo() {
-	einfo "$(head -n1 /opt/foldingathome/amd64-smp/unitinfo.txt):"
-	sed -e '1,2d' /opt/foldingathome/amd64-smp/unitinfo.txt
+	einfo "$(head -n1 /opt/foldingathome/unitinfo.txt):"
+	sed -e '1,2d' /opt/foldingathome/unitinfo.txt
 }
 
 start() {
 	ebegin "Starting Folding@Home"
-	cd /opt/foldingathome/amd64-smp
+	cd /opt/foldingathome
 	start-stop-daemon --chdir ${PWD} --chuid foldingathome --nicelevel 19 \
 		--make-pidfile --pidfile "${PIDFILE}" \
 		--start --background --exec ./fah6 -- ${FOLD_OPTS}
diff --git a/sci-biology/foldingathome/files/6.02/folding-conf.d b/sci-biology/foldingathome/files/6.02/folding-conf.d
index 114cd144a96c..c8c6b1e22664 100644
--- a/sci-biology/foldingathome/files/6.02/folding-conf.d
+++ b/sci-biology/foldingathome/files/6.02/folding-conf.d
@@ -16,6 +16,6 @@
 # But use of other options are not recommended when using the Folding client
 # as a service.
 #
-FOLD_OPTS="-local"
+FOLD_OPTS="-smp"
 PIDFILE=/var/run/folding
 
diff --git a/sci-biology/foldingathome/files/6.02/initfolding b/sci-biology/foldingathome/files/6.02/initfolding
index e3bead5dde25..3f760a1e6117 100644
--- a/sci-biology/foldingathome/files/6.02/initfolding
+++ b/sci-biology/foldingathome/files/6.02/initfolding
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-cd /opt/foldingathome/amd64-smp
-/opt/foldingathome/amd64-smp/fah6 -configonly
-/bin/chown -R foldingathome:nogroup /opt/foldingathome/amd64-smp
+cd /opt/foldingathome
+/opt/foldingathome/fah6 -configonly
+/bin/chown -R foldingathome:nogroup /opt/foldingathome
 
diff --git a/sci-biology/foldingathome/foldingathome-6.02.ebuild b/sci-biology/foldingathome/foldingathome-6.02-r1.ebuild
index 40323bf65f2f..2ad4a8979575 100644
--- a/sci-biology/foldingathome/foldingathome-6.02.ebuild
+++ b/sci-biology/foldingathome/foldingathome-6.02-r1.ebuild
@@ -1,11 +1,8 @@
 # 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-6.02.ebuild,v 1.1 2008/08/03 03:19:58 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/foldingathome-6.02-r1.ebuild,v 1.1 2008/11/22 21:31:26 je_fro Exp $
 
-# no version number on this install dir since upgrades will be using same dir
-# (data will be stored here too)
-# The clientX files from old foldingathome will remain untouched.
-I="/opt/foldingathome/amd64-smp"
+I="/opt/foldingathome"
 
 inherit eutils
 
@@ -16,13 +13,12 @@ SRC_URI="http://www.stanford.edu/group/pandegroup/folding/release/FAH6.02-Linux.
 LICENSE="folding-at-home"
 SLOT="0"
 
-# This is for x86_64 only.
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=sys-apps/baselayout-1.8.0
-		>=sys-libs/glibc-2.3.0
-		app-emulation/emul-linux-x86-baselibs"
+DEPEND=">=sys-libs/glibc-2.3.0
+		amd64? ( app-emulation/emul-linux-x86-baselibs )"
+
 RDEPEND=""
 
 S="${WORKDIR}"
@@ -48,9 +44,6 @@ pkg_postinst() {
 	einfo "Please run ${I}/initfolding to configure your client"
 	einfo "and edit /etc/conf.d/foldingathome for options"
 	einfo ""
-	einfo "This experimental F@H package exists alongside your old data files"
-	einfo "in ${I}."
-	einfo ""
 }
 
 pkg_postrm() {