Change opts to extra_commands in init script.

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

4 files changed, 71 insertions, 5 deletions

diff --git a/sci-biology/foldingathome/ChangeLog b/sci-biology/foldingathome/ChangeLog
index 7aa557ab6a48..b4bff35e17ed 100644
--- a/sci-biology/foldingathome/ChangeLog
+++ b/sci-biology/foldingathome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/foldingathome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.33 2011/06/28 15:14:16 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.34 2011/09/20 12:58:05 je_fro Exp $
+
+*foldingathome-6.34-r2 (20 Sep 2011)
+
+  20 Sep 2011; Jeff Gardner <je_fro@gentoo.org> files/6.34/fah-init,
+  +foldingathome-6.34-r2.ebuild:
+  Change opts to extra_commands in init script.
 
 *foldingathome-6.34-r1 (28 Jun 2011)
 
diff --git a/sci-biology/foldingathome/Manifest b/sci-biology/foldingathome/Manifest
index c75dafd1c1d3..a09945ea0d81 100644
--- a/sci-biology/foldingathome/Manifest
+++ b/sci-biology/foldingathome/Manifest
@@ -1,7 +1,8 @@
-AUX 6.34/fah-init 801 RMD160 ca39ec87991acb5d86b723de20079d4b87e904b2 SHA1 93c2759fbb6df6b1df779873bf428eed4f5f664d SHA256 124a9f7f5436526f78cb875e4612af5a2cb06fa0cdb8103a6329a5bf8744c50e
+AUX 6.34/fah-init 687 RMD160 b347b8c6e0a798314854ee781483bfec57f056e8 SHA1 a91b74301bcfafe43af8dcdc39ec552d22789223 SHA256 dae0cf6688d7d94e753c30960e63a54964fc17bb061ca33f8e393ac0447965cf
 AUX 6.34/folding-conf.d 1331 RMD160 eeed187cf564508ac31d8d2dcd4d490f596986e5 SHA1 0e96b9a2eeff137f5623b614d64882cf6777843a SHA256 7809715e0fb6f6ce1437428bb376236a0b7b49993e6dd0f1046f839cc5ad7d8d
 AUX 6.34/initfolding 125 RMD160 70e92fa4aa493fdf362e98c88850008a2d9aa226 SHA1 27838b24f2f12b51212fa1845c210a1443911dfc SHA256 8bada0baf3b0835774c472e0e2e05e7cebfa675a77c15ebdf75fee6d80a95f8b
 DIST FAH6.34-Linux64.tgz 146345 RMD160 0de9632aa7fe09734642af512e028ac31d97dcdf SHA1 9150b81381a180fde2d81a27784bbb511bf66ea5 SHA256 8b4d47f2ac711bd487235c7f015df7420d9581d199b26479ef312b45e52c8a95
 EBUILD foldingathome-6.34-r1.ebuild 1622 RMD160 3552666e04531b834cc143003d9f9072b3a62cac SHA1 764e90e2f952ddb72957151a2898d0f16f8e5ac1 SHA256 d553b27bc238a5fd18201fa6a39fe22d00f02b3986b1618ad53a9793b0a86b0a
-MISC ChangeLog 10301 RMD160 b7d9fcdbca0586500251ab41ce5853fe81334929 SHA1 88ded624d67ee3574ed8650a9080ad98a4fdc3e9 SHA256 e792aa4126c83c3432563cafaed316007190d0753721f60ad9f53ca44f542405
+EBUILD foldingathome-6.34-r2.ebuild 1497 RMD160 9a7a35c3a925a0fe1ba34318bda563ed9d4926f1 SHA1 940510acd53d3d165b4b9b9d99cdc2da828f97f4 SHA256 406742e61331c51ed4c76998afb25aeafff4cbeb6c60707d3a01a2db526a4f61
+MISC ChangeLog 10490 RMD160 b43b1eea30da4010db49e03e832613fea6d3d7a1 SHA1 77b82a3345a58b283271b81cc93f3a9746658cd0 SHA256 44610401c9c975c4640078d1693cdb9a5340249780aa7e5ee8e376f76701ceec
 MISC metadata.xml 164 RMD160 2f441200f2672ab5f1efae7cbdb08b284603903c SHA1 61a50baedfd041e663d6c2a41a28b57e22dbb6de SHA256 f0897b09e661dc603041dab249d73253034659189becf1a34cca37a7d51ef72f
diff --git a/sci-biology/foldingathome/files/6.34/fah-init b/sci-biology/foldingathome/files/6.34/fah-init
index 04a9389db0cd..60a5a8b51a4b 100644
--- a/sci-biology/foldingathome/files/6.34/fah-init
+++ b/sci-biology/foldingathome/files/6.34/fah-init
@@ -1,9 +1,9 @@
 #!/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.3 2011/06/28 15:14:16 je_fro Exp $
+# $
 
-opts="${opts} unitinfo"
+extra_commands="unitinfo"
 
 unitinfo() {
 	einfo "$(head -n1 /opt/foldingathome/unitinfo.txt):"
diff --git a/sci-biology/foldingathome/foldingathome-6.34-r2.ebuild b/sci-biology/foldingathome/foldingathome-6.34-r2.ebuild
new file mode 100644
index 000000000000..c0d123b98e8e
--- /dev/null
+++ b/sci-biology/foldingathome/foldingathome-6.34-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $
+
+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 ""
+}