version bump, remove old; updated license and added RESTRICT as per license requirements, also added 32bit variant

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

8 files changed, 95 insertions, 183 deletions

diff --git a/sci-biology/foldingathome/ChangeLog b/sci-biology/foldingathome/ChangeLog
index f0e698e7d12f..b3a8c5295eb9 100644
--- a/sci-biology/foldingathome/ChangeLog
+++ b/sci-biology/foldingathome/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-biology/foldingathome
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.36 2012/09/24 00:47:31 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/ChangeLog,v 1.37 2013/04/16 17:18:07 axs Exp $
+
+*foldingathome-7.3.6 (16 Apr 2013)
+
+  16 Apr 2013; Ian Stakenvicius <axs@gentoo.org> +files/7.3/fah-init,
+  +files/7.3/folding-conf.d, +files/7.3/initfolding,
+  +foldingathome-7.3.6.ebuild, -files/6.34/fah-init, -files/6.34/folding-conf.d,
+  -files/6.34/initfolding, -foldingathome-6.34-r1.ebuild,
+  -foldingathome-6.34-r2.ebuild, metadata.xml:
+  version bump, remove old; updated license and added RESTRICT as per license
+  requirements, also added 32bit variant
 
   24 Sep 2012; Mike Frysinger <vapier@gentoo.org> foldingathome-6.34-r1.ebuild,
   foldingathome-6.34-r2.ebuild:
diff --git a/sci-biology/foldingathome/files/6.34/fah-init b/sci-biology/foldingathome/files/6.34/fah-init
deleted file mode 100644
index 60a5a8b51a4b..000000000000
--- a/sci-biology/foldingathome/files/6.34/fah-init
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $
-
-extra_commands="unitinfo"
-
-unitinfo() {
-	einfo "$(head -n1 /opt/foldingathome/unitinfo.txt):"
-	sed -e '1,2d' /opt/foldingathome/unitinfo.txt
-}
-
-start() {
-	ebegin "Starting Folding@Home"
-	cd /opt/foldingathome
-	start-stop-daemon --chdir ${PWD} --user foldingathome --nicelevel 19 \
-		--make-pidfile --pidfile "${PIDFILE}" \
-		--start --background --exec ./fah6 -- ${FOLD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Folding@Home"
-	start-stop-daemon --stop --user foldingathome --pidfile "${PIDFILE}"
-	eend $?
-	killall --user foldingathome --signal SIGKILL
-}
diff --git a/sci-biology/foldingathome/files/6.34/folding-conf.d b/sci-biology/foldingathome/files/6.34/folding-conf.d
deleted file mode 100644
index f35df986ed64..000000000000
--- a/sci-biology/foldingathome/files/6.34/folding-conf.d
+++ /dev/null
@@ -1,30 +0,0 @@
-# Config file for /etc/init.d/foldingathome
-#
-# The f@h client configuration can be found in /opt/foldingathome/client.cfg
-# Run /opt/foldingathome/initfolding to reconfigure that.
-#
-# The options may be passed to the Folding client:
-#
-#  -config      Configure user information
-#  -configonly  Configure user information, then exit
-#  -help        Display this usage screen
-#  -queueinfo   Get information on queued work units
-#  -delete x    Delete item #x from work queue
-#  -send x      Send result #x to server then exit. Use x=all to send all results
-#  -verbosity x Sets the output level, from 1 to 9 (max). The default is 3
-#  -pause       Pause after finishing & trying to send current unit
-#  -oneunit     Exit after completing one unit
-#  -forceasm    Force core assembly optimizations to be used if available
-#  -advmethods  Use new advanced scientific cores and/or work units if available
-#  -freeBSD     Make brandelf system call on downloaded cores.
-#  -openBSD     Make elf2olf system call on downloaded cores.
-#  -smp         Use symmetric multiprocessing.
-#
-# A full listing of options can be found here:
-# http://www.stanford.edu/group/pandegroup/folding/console-userguide.html
-# But use of other options are not recommended when using the Folding client
-# as a service.
-#
-FOLD_OPTS=""
-PIDFILE=/var/run/folding
-
diff --git a/sci-biology/foldingathome/files/6.34/initfolding b/sci-biology/foldingathome/files/6.34/initfolding
deleted file mode 100644
index 3f760a1e6117..000000000000
--- a/sci-biology/foldingathome/files/6.34/initfolding
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cd /opt/foldingathome
-/opt/foldingathome/fah6 -configonly
-/bin/chown -R foldingathome:nogroup /opt/foldingathome
-
diff --git a/sci-biology/foldingathome/foldingathome-6.34-r1.ebuild b/sci-biology/foldingathome/foldingathome-6.34-r1.ebuild
deleted file mode 100644
index b3f4fc5e85dd..000000000000
--- a/sci-biology/foldingathome/foldingathome-6.34-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/foldingathome-6.34-r1.ebuild,v 1.2 2012/09/24 00:47:31 vapier Exp $
-
-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_FLAGS_IGNORED="${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 ""
-}
diff --git a/sci-biology/foldingathome/foldingathome-6.34-r2.ebuild b/sci-biology/foldingathome/foldingathome-6.34-r2.ebuild
deleted file mode 100644
index 9fe9bebac1c7..000000000000
--- a/sci-biology/foldingathome/foldingathome-6.34-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/foldingathome-6.34-r2.ebuild,v 1.3 2012/09/24 00:47:31 vapier Exp $
-
-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_FLAGS_IGNORED="${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 ""
-}
diff --git a/sci-biology/foldingathome/foldingathome-7.3.6.ebuild b/sci-biology/foldingathome/foldingathome-7.3.6.ebuild
new file mode 100644
index 000000000000..afb38121270a
--- /dev/null
+++ b/sci-biology/foldingathome/foldingathome-7.3.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/foldingathome/foldingathome-7.3.6.ebuild,v 1.1 2013/04/16 17:18:07 axs Exp $
+
+EAPI="4"
+
+inherit versionator user
+
+MY_BASEURI="https://fah.stanford.edu/file-releases/public/release/fahclient"
+MY_64B_URI="${MY_BASEURI}/centos-5.3-64bit/v$(get_version_component_range 1-2)/fahclient_${PV}-64bit-release.tar.bz2"
+MY_32B_URI="${MY_BASEURI}/centos-5.5-32bit/v$(get_version_component_range 1-2)/fahclient_${PV}-32bit-release.tar.bz2"
+
+DESCRIPTION="Folding@Home is a distributed computing project for protein folding."
+HOMEPAGE="http://folding.stanford.edu/FAQ-SMP.html"
+SRC_URI="x86? ( ${MY_32B_URI} )
+	amd64? ( ${MY_64B_URI} )"
+
+RESTRICT="fetch bindist"
+
+LICENSE="FAH-EULA-2009"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Expressly listing all deps, as this is a binpkg and it is doubtful whether
+# i.e. uclibc or clang can provide what is necessary at runtime
+RDEPEND="app-arch/bzip2
+	sys-devel/gcc
+	sys-libs/glibc
+	sys-libs/zlib"
+
+S="${WORKDIR}"
+
+I="opt/foldingathome"
+
+QA_PREBUILT="${I}/*"
+
+pkg_setup() {
+	I="${EROOT}/${I}"
+}
+
+src_install() {
+	local myS="fahclient_${PV}-64bit-release"
+	use x86 && myS="${myS//64bit/32bit}"
+	exeinto "${I}"
+	doexe "${FILESDIR}"/$(get_version_component_range 1-2)/initfolding
+	doexe "${myS}"/{FAHClient,FAHCoreWrapper}
+	newconfd "${FILESDIR}"/$(get_version_component_range 1-2)/folding-conf.d foldingathome
+	newinitd "${FILESDIR}"/$(get_version_component_range 1-2)/fah-init 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 "${I}"
+	einfo "To run Folding@home in the background at boot:"
+	einfo "\trc-update add foldingathome default"
+	einfo ""
+	if [ ! -e "${I}"/config.xml ]; then
+		elog "No configuration found -- please run ${I}/initfolding or"
+		elog "emerge --config ${P} to configure your client and edit"
+		elog "${EROOT}/etc/conf.d/foldingathome for options"
+	fi
+	einfo ""
+	einfo "The original author encourages you to acquire a username and join team 36480."
+	einfo "http://folding.stanford.edu/English/Download#ntoc2"
+	einfo ""
+}
+
+pkg_postrm() {
+	elog "Folding@home data files were not removed."
+	elog "Remove them manually from ${I}"
+}
+
+pkg_config() {
+	"${I}"/initfolding
+}
diff --git a/sci-biology/foldingathome/metadata.xml b/sci-biology/foldingathome/metadata.xml
index 34294c65ca04..63d767b84f60 100644
--- a/sci-biology/foldingathome/metadata.xml
+++ b/sci-biology/foldingathome/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-biology</herd>
+<maintainer>
+	<email>axs@gentoo.org</email>
+	<name>Ian Stakenvicius</name>
+</maintainer>
 </pkgmetadata>