Cleanup + fixing #51489

9 files changed, 123 insertions, 119 deletions

diff --git a/app-sci/foldingathome/ChangeLog b/app-sci/foldingathome/ChangeLog
index 42d9d296751d..653aadf73475 100644
--- a/app-sci/foldingathome/ChangeLog
+++ b/app-sci/foldingathome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-sci/foldingathome
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/foldingathome/ChangeLog,v 1.12 2004/04/22 22:08:06 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/foldingathome/ChangeLog,v 1.13 2004/06/07 07:34:00 phosphan Exp $
+
+*foldingathome-4.0.0-r2 (07 Jun 2004)
+
+  07 Jun 2004; Patrick Kursawe <phosphan@gentoo.org>
+  foldingathome-3.24-r1.ebuild, foldingathome-3.24.ebuild,
+  foldingathome-4.0.0-r2.ebuild, files/folding-init.d-r3:
+  No longer redirecting output to a redundand log file, see bug #51489
+  Cleanup, removing 3.x versions.
 
   23 Apr 2004; David Holm <dholm@gentoo.org> foldingathome-4.0.0-r1.ebuild:
   Added to ~ppc.
diff --git a/app-sci/foldingathome/Manifest b/app-sci/foldingathome/Manifest
index ad605469393d..15c26fb303b2 100644
--- a/app-sci/foldingathome/Manifest
+++ b/app-sci/foldingathome/Manifest
@@ -1,17 +1,16 @@
-MD5 d7996d9ec342bee6bb84481d76ed061f ChangeLog 2316
-MD5 0bc716c8584830f154dd47e43646723c foldingathome-3.24.ebuild 1302
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 09a901ad29cf6a7069ef13bd064d0cb9 foldingathome-3.24-r1.ebuild 1590
-MD5 22c17dabc894de519cc509f0d710a1f8 foldingathome-4.0.0.ebuild 1456
+MD5 10692f781fba02d53e5a6f7b9a85e9d0 foldingathome-4.0.0-r2.ebuild 1905
 MD5 f5b6f780bfcfdb096166cf149c7f2701 foldingathome-4.0.0-r1.ebuild 1902
+MD5 22c17dabc894de519cc509f0d710a1f8 foldingathome-4.0.0.ebuild 1456
+MD5 63c4637416b3c7a946261f805ef97aa7 ChangeLog 2634
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 a586f7af900f3c15982e59730e7e082a files/folding-conf.d 1125
-MD5 ad7ecc18b7b0f523434d668ba40295f4 files/digest-foldingathome-3.24 143
-MD5 2ce9c3c1a96617c6caadff6e24ef32e9 files/folding-init.d 539
-MD5 ad7ecc18b7b0f523434d668ba40295f4 files/digest-foldingathome-3.24-r1 143
-MD5 6c633c6cc20e087d9da4585c5d9563dc files/digest-foldingathome-4.0.0 66
-MD5 398541541417353090c2a40cb4fe4a3b files/folding-init.d-r1 746
-MD5 aec1f2de50cf95bf1797d61ae94b3b04 files/folding.sh 88
 MD5 91f88a421f87928d798002ede77fa8f9 files/initfolding 80
+MD5 2ce9c3c1a96617c6caadff6e24ef32e9 files/folding-init.d 539
+MD5 9c93f287339458f575ee4c5d20fffdfe files/initfolding-r1 656
 MD5 6c633c6cc20e087d9da4585c5d9563dc files/digest-foldingathome-4.0.0-r1 66
+MD5 6c633c6cc20e087d9da4585c5d9563dc files/digest-foldingathome-4.0.0-r2 66
+MD5 398541541417353090c2a40cb4fe4a3b files/folding-init.d-r1 746
 MD5 4d039bbd1a912d067f9a89c4a75569d3 files/folding-init.d-r2 707
-MD5 9c93f287339458f575ee4c5d20fffdfe files/initfolding-r1 656
+MD5 8cfa75a576b2dbe4f8967ab7777d2800 files/folding-init.d-r3 645
+MD5 aec1f2de50cf95bf1797d61ae94b3b04 files/folding.sh 88
+MD5 6c633c6cc20e087d9da4585c5d9563dc files/digest-foldingathome-4.0.0 66
diff --git a/app-sci/foldingathome/files/digest-foldingathome-3.24 b/app-sci/foldingathome/files/digest-foldingathome-3.24
deleted file mode 100644
index 72b9d2b96eed..000000000000
--- a/app-sci/foldingathome/files/digest-foldingathome-3.24
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a3f27b7c6403e9a81e424bd2b7c935dd FAH3Console-v324-LinuxB.exe 245612
-MD5 df9c2a68e5a2b808daee0128d78ecde3 FAH3Console-v324-Linux.exe 613632
diff --git a/app-sci/foldingathome/files/digest-foldingathome-3.24-r1 b/app-sci/foldingathome/files/digest-foldingathome-3.24-r1
deleted file mode 100644
index 72b9d2b96eed..000000000000
--- a/app-sci/foldingathome/files/digest-foldingathome-3.24-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a3f27b7c6403e9a81e424bd2b7c935dd FAH3Console-v324-LinuxB.exe 245612
-MD5 df9c2a68e5a2b808daee0128d78ecde3 FAH3Console-v324-Linux.exe 613632
diff --git a/app-sci/foldingathome/files/digest-foldingathome-4.0.0-r2 b/app-sci/foldingathome/files/digest-foldingathome-4.0.0-r2
new file mode 100644
index 000000000000..6018adcfd4d5
--- /dev/null
+++ b/app-sci/foldingathome/files/digest-foldingathome-4.0.0-r2
@@ -0,0 +1 @@
+MD5 d8ca3f78a3fff62059b780891d4c1e06 FAH4Console-Linux.exe 246740
diff --git a/app-sci/foldingathome/files/folding-init.d-r3 b/app-sci/foldingathome/files/folding-init.d-r3
new file mode 100644
index 000000000000..9d1b2d35210d
--- /dev/null
+++ b/app-sci/foldingathome/files/folding-init.d-r3
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/foldingathome/files/folding-init.d-r3,v 1.1 2004/06/07 07:34:00 phosphan Exp $
+
+start() {
+	ebegin "Starting Folding@Home"
+	for (($CPU; CPU != 0; CPU--))
+	do
+		cd /opt/foldingathome/client${CPU}/
+		nice -n 20 su foldingathome -c "/opt/foldingathome/client${CPU}/foldingathome ${FOLD_OPTS}" &>/dev/null &
+	done
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Folding@Home"
+	for I in FahCore*.exe
+	do
+		killall -q $I >/dev/null
+	done
+	killall foldingathome >/dev/null
+	eend $?
+}
+
diff --git a/app-sci/foldingathome/foldingathome-3.24-r1.ebuild b/app-sci/foldingathome/foldingathome-3.24-r1.ebuild
deleted file mode 100644
index 32c19c91b189..000000000000
--- a/app-sci/foldingathome/foldingathome-3.24-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/foldingathome/foldingathome-3.24-r1.ebuild,v 1.2 2004/03/26 12:13:49 phosphan 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/FAH3Console-v${PV/.}-LinuxB.exe
-	http://www.stanford.edu/group/pandegroup/release/FAH3Console-v${PV/.}-Linux.exe"
-
-SLOT="0"
-IUSE=""
-LICENSE="as-is"
-KEYWORDS="~x86"
-
-DEPEND=">=sys-apps/baselayout-1.8.0"
-
-src_unpack() {
-	mkdir -p ${S} ; cd ${S}
-	if has_version \>=glibc-2.3.0; then
-		cp ${DISTDIR}/FAH3Console-v${PV/.}-LinuxB.exe ${PN}
-	else
-		cp ${DISTDIR}/FAH3Console-v${PV/.}-Linux.exe ${PN}
-	fi
-}
-
-pkg_preinst() {
-	enewuser foldingathome -1 /bin/bash /opt/foldingathome
-}
-
-src_install() {
-	exeinto ${I}
-	doexe foldingathome
-	doexe ${FILESDIR}/folding.sh
-	doexe ${FILESDIR}/initfolding
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/folding-init.d-r1 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 "For first run configuration, please run /opt/foldingathome/initfolding"
-}
-
-pkg_postrm() {
-	einfo "Folding@home data files were not removed."
-	einfo " Remove them manually from ${I}"
-	einfo ""
-}
diff --git a/app-sci/foldingathome/foldingathome-3.24.ebuild b/app-sci/foldingathome/foldingathome-3.24.ebuild
deleted file mode 100644
index 83dce1f90289..000000000000
--- a/app-sci/foldingathome/foldingathome-3.24.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/foldingathome/foldingathome-3.24.ebuild,v 1.5 2004/04/22 10:01:16 phosphan Exp $
-
-# no version number on this install dir since upgrades will be using same dir
-# (data will be stored here too)
-I="/opt/foldingathome"
-
-DESCRIPTION="Help simulate protein folding at home"
-HOMEPAGE="http://folding.stanford.edu/"
-SRC_URI="http://www.stanford.edu/group/pandegroup/release/FAH3Console-v${PV/.}-LinuxB.exe
-	http://www.stanford.edu/group/pandegroup/release/FAH3Console-v${PV/.}-Linux.exe"
-
-SLOT="0"
-IUSE=""
-LICENSE="as-is"
-KEYWORDS="x86"
-
-DEPEND=">=sys-apps/baselayout-1.8.0"
-
-src_unpack() {
-	mkdir -p ${S} ; cd ${S}
-	if has_version \>=glibc-2.3.0; then
-		cp ${DISTDIR}/FAH3Console-v${PV/.}-LinuxB.exe ${PN}
-	else
-		cp ${DISTDIR}/FAH3Console-v${PV/.}-Linux.exe ${PN}
-	fi
-}
-
-src_install() {
-	exeinto ${I} ; doexe foldingathome
-	exeinto /etc/init.d ; newexe ${FILESDIR}/folding-init.d foldingathome
-}
-
-pkg_postinst() {
-	einfo "To run Folding@home in the background at boot:"
-	einfo " rc-update add foldingathome default"
-	einfo ""
-}
-
-pkg_postrm() {
-	einfo "Folding@home data files were not removed."
-	einfo " Remove them manually from ${I}"
-	einfo ""
-}
diff --git a/app-sci/foldingathome/foldingathome-4.0.0-r2.ebuild b/app-sci/foldingathome/foldingathome-4.0.0-r2.ebuild
new file mode 100644
index 000000000000..3be0efe9119a
--- /dev/null
+++ b/app-sci/foldingathome/foldingathome-4.0.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/foldingathome/foldingathome-4.0.0-r2.ebuild,v 1.1 2004/06/07 07:34:00 phosphan 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/FAH4Console-Linux.exe"
+RESTRICT="nomirror"
+
+SLOT="0"
+IUSE=""
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc"
+
+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-r1 initfolding
+
+	# 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}/folding-init.d-r3 foldingathome
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/folding-conf.d foldingathome
+}
+
+pkg_preinst() {
+	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 ""
+}