close out #33812 #24930

9 files changed, 88 insertions, 166 deletions

diff --git a/app-sci/setiathome/ChangeLog b/app-sci/setiathome/ChangeLog
index 1fb9d50570d7..294448e7f253 100644
--- a/app-sci/setiathome/ChangeLog
+++ b/app-sci/setiathome/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-sci/setiathome
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/setiathome/ChangeLog,v 1.13 2003/12/06 23:38:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/setiathome/ChangeLog,v 1.14 2004/01/27 05:19:32 vapier Exp $
+
+  27 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add wrapper script #24930 and a whole bunch more arch support #33812.
 
   06 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>;
   setiathome-3.03-r1.ebuild, setiathome-3.08-r1.ebuild,
diff --git a/app-sci/setiathome/Manifest b/app-sci/setiathome/Manifest
index ab7c38d987da..6f342f06b444 100644
--- a/app-sci/setiathome/Manifest
+++ b/app-sci/setiathome/Manifest
@@ -1,9 +1,9 @@
 MD5 50b083cae893c3fb4aa2bd2816f3ae5c ChangeLog 2213
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 f3f67ff6e11fea865cb93bfb4e88bf49 setiathome-3.03-r1.ebuild 2153
-MD5 d0ebd358daa2883551efb9d4dd7d1e4c setiathome-3.08-r1.ebuild 2934
+MD5 e29da21fc26ec93533b004015ada1053 setiathome-3.03-r1.ebuild 2160
+MD5 2615e218a008344bc4478aeca0c23cca setiathome-3.08-r1.ebuild 2425
 MD5 f906d3083388e841d56fe3824d5be510 setiathome-3.08.ebuild 2601
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-setiathome-3.03-r1 0
+MD5 80ab09afbe663730ea29b5bb8573a6dc files/digest-setiathome-3.03-r1 430
 MD5 64b90b7744efe9d67350d46ba7142d29 files/digest-setiathome-3.08 82
 MD5 4383e568b5b768f6fa2f27b3d9a713b9 files/digest-setiathome-3.08-r1 166
 MD5 2d83ded4bcd8e9b28eb91fc883aec602 files/seti-conf.d-r1 349
diff --git a/app-sci/setiathome/files/digest-setiathome-3.03-r1 b/app-sci/setiathome/files/digest-setiathome-3.03-r1
index e69de29bb2d1..080b93e94e37 100644
--- a/app-sci/setiathome/files/digest-setiathome-3.03-r1
+++ b/app-sci/setiathome/files/digest-setiathome-3.03-r1
@@ -0,0 +1,5 @@
+MD5 cb47ccfd01e6f9764edb74ce37aa216b setiathome-3.03.powerpc-unknown-linux-gnu.tar 251904
+MD5 1091488f55cbbfa4451c3f03cc9f8177 setiathome-3.03.sparc-unknown-linux-gnu.tar 165376
+MD5 b52d2b0c29b07a30c5abdb6415927506 setiathome-3.03.ia64-Linux-gnu.tar 1697280
+MD5 ddc9d38ffb5bc7c1189857fc054b7252 setiathome-3.03.alpha-unknown-linux-gnu.tar 709120
+MD5 8aaeb4f16b4703d6f9cbf91a75ebb0b4 setiathome-3.03.hppa-parisc-palinux.tar 799744
diff --git a/app-sci/setiathome/files/digest-setiathome-3.08 b/app-sci/setiathome/files/digest-setiathome-3.08
deleted file mode 100644
index 891eb15ef822..000000000000
--- a/app-sci/setiathome/files/digest-setiathome-3.08
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01d05178bd22c36b2e411dd12f23661a setiathome-3.08.i686-pc-linux-gnu.tar 247808
diff --git a/app-sci/setiathome/files/seti-init.d-r1 b/app-sci/setiathome/files/seti-init.d-r1
index c801ca3446f7..f7391dde5d3b 100644
--- a/app-sci/setiathome/files/seti-init.d-r1
+++ b/app-sci/setiathome/files/seti-init.d-r1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 
 if [ -z "${SETIATHOME_THREADS}" ]; then
-  SETIATHOME_THREADS=$( egrep -c "^bogomips" /proc/cpuinfo )
+	SETIATHOME_THREADS=$( egrep -c "^bogomips" /proc/cpuinfo )
 fi
 
 depend() { 
@@ -9,38 +9,36 @@ depend() {
 }
 
 checkconfig() {
-        if [ ! -e "${SETIATHOME_DIR}" ]
-        then
-                einfo "Creating ${SETIATHOME_DIR}"
-                mkdir "${SETIATHOME_DIR}"
-        fi
-
-        if [ ! -e "${SETIATHOME_DIR}/user_info.sah" ]
-        then
-                einfo "Setting up SETI@home for the first time"
-                cd "${SETIATHOME_DIR}"
-                /opt/setiathome/setiathome -login ${SETIATHOME_OPTIONS}
-        fi
-
-        if [ "${SETIATHOME_THREADS}" != '1' ]; then
-                cd ${SETIATHOME_DIR}
+	if [ ! -e "${SETIATHOME_DIR}" ] ; then
+		einfo "Creating ${SETIATHOME_DIR}"
+		mkdir "${SETIATHOME_DIR}"
+	fi
+
+	if [ ! -e "${SETIATHOME_DIR}/user_info.sah" ] ; then
+		einfo "Setting up SETI@home for the first time"
+		cd "${SETIATHOME_DIR}"
+		${SETIATHOME_DIR}/setiathome -login ${SETIATHOME_OPTIONS}
+	fi
+
+	if [ "${SETIATHOME_THREADS}" != '1' ] ; then
+		cd ${SETIATHOME_DIR}
 		for thread in `seq 2 "${SETIATHOME_THREADS}"`; do
 			if [ ! -e "${SETIATHOME_DIR}/thread${thread}" ]; then
 				mkdir "${SETIATHOME_DIR}/thread${thread}"
 				cp "${SETIATHOME_DIR}/user_info.sah" "${SETIATHOME_DIR}/thread${thread}"
 			fi
-                done
-        fi
+		done
+	fi
 }
 
 start() {
-        checkconfig
+	checkconfig
 
-	if [ "${SETIATHOME_THREADS}" = '1' ]; then
-                ebegin "Starting SETI@home"
-        else
+	if [ "${SETIATHOME_THREADS}" = '1' ] ; then
+		ebegin "Starting SETI@home"
+	else
 		ebegin "Starting SETI@home (${SETIATHOME_THREADS} threads)"
-        fi
+	fi
 
 	for thread in `seq 1 "${SETIATHOME_THREADS}"`; do
 		cd "${SETIATHOME_DIR}"
@@ -48,14 +46,15 @@ start() {
 			cd "thread${thread}"
 		fi
 
-		/opt/setiathome/setiathome ${SETIATHOME_OPTIONS} >&/dev/null&
-        done
+		${SETIATHOME_DIR}/setiwrapper ${SETIATHOME_DIR} ${SETIATHOME_OPTIONS} >& setiathome.log &
+	done
 
-        eend $?
+	eend $?
 }
 
 stop() {
-        ebegin "Stopping SETI@home"
-        killall setiathome
-        eend $?
+	ebegin "Stopping SETI@home"
+	killall setiwrapper
+	killall setiathome
+	eend $?
 }
diff --git a/app-sci/setiathome/files/setiathome-wrapper b/app-sci/setiathome/files/setiathome-wrapper
new file mode 100644
index 000000000000..08382b611113
--- /dev/null
+++ b/app-sci/setiathome/files/setiathome-wrapper
@@ -0,0 +1,8 @@
+#!/bin/bash
+cd $(dirname $0)
+dir=${1}
+shift
+while :; do
+	${dir}/setiathome "$@"
+	wait $?
+done
diff --git a/app-sci/setiathome/setiathome-3.03-r1.ebuild b/app-sci/setiathome/setiathome-3.03-r1.ebuild
index b5408cc34abc..bf0a6482349e 100644
--- a/app-sci/setiathome/setiathome-3.03-r1.ebuild
+++ b/app-sci/setiathome/setiathome-3.03-r1.ebuild
@@ -1,10 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/setiathome/setiathome-3.03-r1.ebuild,v 1.12 2003/12/06 23:38:00 spyderous Exp $
-
-IUSE="X"
-
-S="${WORKDIR}/${P}"
+# $Header: /var/cvsroot/gentoo-x86/app-sci/setiathome/setiathome-3.03-r1.ebuild,v 1.13 2004/01/27 05:19:32 vapier Exp $
 
 # no version number on this install dir since upgrades will be using same dir
 # (data will be stored here too)
@@ -12,51 +8,46 @@ I=/opt/setiathome
 
 DESCRIPTION="Search for Extraterrestrial Intelligence (SETI) @ home"
 HOMEPAGE="http://setiathome.ssl.berkeley.edu"
-DEPEND=">=sys-apps/baselayout-1.8.0"
-RDEPEND="X? ( x11-base/xfree )"
+SRC_URI="ppc? ( ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.powerpc-unknown-linux-gnu.tar )
+	sparc? ( ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.sparc-unknown-linux-gnu.tar )
+	ia64? ( ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.ia64-Linux-gnu.tar )
+	alpha? ( ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.alpha-unknown-linux-gnu.tar )
+	hppa? ( ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.hppa-parisc-palinux.tar )"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ppc sparc"
-
-src_unpack () {
-	if [ ! -e ${DISTDIR}/${P}.tar ] ; then
-		einfo "Please download the appropriate setiathome archive"
-		einfo "for your system's architecture from:"
-		einfo "http://setiathome.ssl.berkeley.edu/unix.html"
-		einfo ""
-		einfo "The archive should be placed into ${DISTDIR}."
-		einfo "After that, create a symbolic link:"
-		einfo ""
-		einfo "\tln -s <archive> ${DISTDIR}/${P}.tar"
+SLOT="0"
+KEYWORDS="-* ppc sparc alpha hppa ia64"
+IUSE="X"
+RESTRICT="nomirror"
 
-		die "package archive not found"
-	fi
+DEPEND=">=sys-apps/baselayout-1.8.0"
+RDEPEND="X? ( x11-base/xfree )"
 
-	cd ${WORKDIR}
-	tar xf ${DISTDIR}/${P}.tar
+src_unpack () {
+	unpack ${A}
 
 	# find real directory ...
-	dir="`find . -type d -name "${P}*" -mindepth 1 -maxdepth 1 | \
-		cut -b "3-"`"
+	dir="`find . -type d -name "${P}*" -mindepth 1 -maxdepth 1 | cut -b "3-"`"
 	# ... and rename it to our desired directory name
 	mv "${dir}" "${P}"
 }
 
 src_install () {
-	dodir ${I}
-	cp {setiathome,README} ${D}/${I}
-	use X && cp {xsetiathome,README.xsetiathome} ${D}/${I}
-	chown nobody:nogroup ${D}/${I}
-	chown nobody:nogroup ${D}/${I}/setiathome
-	chmod +s ${S}/setiathome
-
+	insinto ${I}
+	doins setiathome README
+	use X && doins xsetiathome README.xsetiathome
+	fowners nobody:nogroup ${I}
+	fowners nobody:nogroup ${I}/setiathome
+	fperms +sx ${I}/setiathome
+
+	exeinto ${I}
+	newexe ${FILESDIR}/setiathome-wrapper setiwrapper
 	exeinto /etc/init.d ; newexe ${FILESDIR}/seti-init.d-r1 setiathome
 	insinto /etc/conf.d ; newins ${FILESDIR}/seti-conf.d-r1 setiathome
 	echo "SETIATHOME_DIR=${I}">> ${D}/etc/conf.d/setiathome
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	einfo "To run SETI@home in the background at boot:"
 	einfo " Edit /etc/conf.d/setiathome to setup"
 	einfo " Then just run \`/etc/init.d/setiathome start\`"
@@ -66,7 +57,7 @@ pkg_postinst () {
 	einfo " cd ${I} && ./setiathome"
 }
 
-pkg_postrm () {
+pkg_postrm() {
 	einfo "SETI@home data files were not removed."
 	einfo " Remove them manually from ${I}"
 }
diff --git a/app-sci/setiathome/setiathome-3.08-r1.ebuild b/app-sci/setiathome/setiathome-3.08-r1.ebuild
index 8d3e41939f71..916f2bafee44 100644
--- a/app-sci/setiathome/setiathome-3.08-r1.ebuild
+++ b/app-sci/setiathome/setiathome-3.08-r1.ebuild
@@ -1,39 +1,29 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/setiathome/setiathome-3.08-r1.ebuild,v 1.5 2003/12/06 23:38:00 spyderous Exp $
-
-IUSE="X"
-
-S="${WORKDIR}/${P}"
-
-# Don't know if this is necessary, will have to check the license
-RESTRICT="nomirror"
+# $Header: /var/cvsroot/gentoo-x86/app-sci/setiathome/setiathome-3.08-r1.ebuild,v 1.6 2004/01/27 05:19:32 vapier Exp $
 
 # no version number on this install dir since upgrades will be using same dir
 # (data will be stored here too)
 I=/opt/setiathome
 
 # 3.08 has not yet been released for ppc, sparc or alpha.
-
-SRC_URI="x86? ( http://wcarchive.cdrom.com/pub/setiathome/setiathome-${PV}.i686-pc-linux-gnu.tar
-		ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.i686-pc-linux-gnu.tar )
-	 amd64? ( http://wcarchive.cdrom.com/pub/setiathome/setiathome-${PV}.x86_64-pc-linux-gnu.tar
-		  ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.x86_64-pc-linux-gnu.tar )"
-#	 ppc? ( http://wcarchive.cdrom.com/pub/setiathome/setiathome-${PV}.powerpc-unknown-linux-gnu.tar
-#		ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.powerpc-unknown-linux-gnu.tar )
-#	 sparc? ( http://wcarchive.cdrom.com/pub/setiathome/setiathome-${PV}.sparc-unknown-linux-gnu.tar
-#		  ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.sparc-unknown-linux-gnu.tar )
-#	 alpha? ( http://wcarchive.cdrom.com/pub/setiathome/setiathome-${PV}.alpha-unknown-linux-gnu.tar
-#		  ftp://alien.ssl.berkeley.edu/pub/setiathome-3.03.alpha-unknown-linux-gnu.tar )"
-
 DESCRIPTION="Search for Extraterrestrial Intelligence (SETI) @ home"
 HOMEPAGE="http://setiathome.ssl.berkeley.edu"
-DEPEND=">=sys-apps/baselayout-1.8.0"
-RDEPEND="X? ( x11-base/xfree )"
+SRC_URI="x86? ( ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.i686-pc-linux-gnu.tar )
+	amd64? ( ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.x86_64-pc-linux-gnu.tar )"
+#	ppc? ( ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.powerpc-unknown-linux-gnu.tar )
+#	sparc? ( ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.sparc-unknown-linux-gnu.tar )
+#	alpha? ( ftp://alien.ssl.berkeley.edu/pub/setiathome-3.03.alpha-unknown-linux-gnu.tar )"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 -ppc -sparc -alpha ~amd64 -ia64 -mips -hppa"
+SLOT="0"
+KEYWORDS="-* x86 amd64"
+IUSE="X"
+# Don't know if this is necessary, will have to check the license
+RESTRICT="nomirror"
+
+DEPEND=">=sys-apps/baselayout-1.8.0"
+RDEPEND="X? ( x11-base/xfree )"
 
 src_unpack () {
 	cd ${WORKDIR}
diff --git a/app-sci/setiathome/setiathome-3.08.ebuild b/app-sci/setiathome/setiathome-3.08.ebuild
deleted file mode 100644
index 52e16e6d8ca9..000000000000
--- a/app-sci/setiathome/setiathome-3.08.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/setiathome/setiathome-3.08.ebuild,v 1.2 2003/12/06 23:38:00 spyderous Exp $
-
-IUSE="X"
-
-S="${WORKDIR}/${P}"
-
-# Don't know if this is necessary, will have to check the license
-RESTRICT="nomirror"
-
-# no version number on this install dir since upgrades will be using same dir
-# (data will be stored here too)
-I=/opt/setiathome
-
-# 3.08 has not yet been released for ppc, sparc or alpha.
-
-SRC_URI="x86? ( http://wcarchive.cdrom.com/pub/setiathome/setiathome-${PV}.i686-pc-linux-gnu.tar
-		ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.i686-pc-linux-gnu.tar )"
-#	 ppc? ( http://wcarchive.cdrom.com/pub/setiathome/setiathome-${PV}.powerpc-unknown-linux-gnu.tar
-#		ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.powerpc-unknown-linux-gnu.tar )
-#	 sparc? ( http://wcarchive.cdrom.com/pub/setiathome/setiathome-${PV}.sparc-unknown-linux-gnu.tar
-#		  ftp://alien.ssl.berkeley.edu/pub/setiathome-${PV}.sparc-unknown-linux-gnu.tar )
-#	 alpha? ( http://wcarchive.cdrom.com/pub/setiathome/setiathome-${PV}.alpha-unknown-linux-gnu.tar
-#		  ftp://alien.ssl.berkeley.edu/pub/setiathome-3.03.alpha-unknown-linux-gnu.tar )"
-
-DESCRIPTION="Search for Extraterrestrial Intelligence (SETI) @ home"
-HOMEPAGE="http://setiathome.ssl.berkeley.edu"
-DEPEND=">=sys-apps/baselayout-1.8.0"
-RDEPEND="X? ( x11-base/xfree )"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 -ppc -sparc -alpha"
-
-src_unpack () {
-	cd ${WORKDIR}
-	unpack ${A}
-
-	# find real directory ...
-	dir="`find . -type d -name "${P}*" -mindepth 1 -maxdepth 1 | \
-		cut -b "3-"`"
-	# ... and rename it to our desired directory name
-	mv "${dir}" "${P}"
-}
-
-src_install () {
-	dodir ${I}
-	cp {setiathome,README} ${D}/${I}
-	use X && cp {xsetiathome,README.xsetiathome} ${D}/${I}
-	chown nobody:nogroup ${D}/${I}
-	chown nobody:nogroup ${D}/${I}/setiathome
-	chmod +s ${S}/setiathome
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/seti-init.d-r1 setiathome
-	insinto /etc/conf.d ; newins ${FILESDIR}/seti-conf.d-r1 setiathome
-	echo "SETIATHOME_DIR=${I}">> ${D}/etc/conf.d/setiathome
-}
-
-pkg_postinst () {
-	einfo "To run SETI@home in the background at boot:"
-	einfo " Edit /etc/conf.d/setiathome to setup"
-	einfo " Then just run \`/etc/init.d/setiathome start\`"
-	einfo ""
-	einfo "Otherwise remember to cd into the directory"
-	einfo "where it should keep its data files first, like so:"
-	einfo " cd ${I} && ./setiathome"
-}
-
-pkg_postrm () {
-	einfo "SETI@home data files were not removed."
-	einfo " Remove them manually from ${I}"
-}