Bumping for init script fix and add back ~x86.

(Portage version: 2.2_rc15/cvs/Linux 2.6.27-gentoo-r3 x86_64)

5 files changed, 21 insertions, 22 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/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() {