Working on bug 28895, see ChangeLog

6 files changed, 92 insertions, 11 deletions

diff --git a/app-sci/setiathome/ChangeLog b/app-sci/setiathome/ChangeLog
index c50cc5522fa0..1c6f548cd3bf 100644
--- a/app-sci/setiathome/ChangeLog
+++ b/app-sci/setiathome/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-sci/setiathome
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/setiathome/ChangeLog,v 1.16 2004/02/26 22:44:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/setiathome/ChangeLog,v 1.17 2004/03/01 11:23:40 phosphan Exp $
+
+*setiathome-3.08-r2 (01 Mar 2004)
+
+  01 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
+  setiathome-3.08-r2.ebuild, files/seti-init.d-r1:
+  Adding wrapper to 3.08 aswell. Will not try to login any more if run for the
+  first time, but give an error message.
 
   26 Feb 2004; Aron Griffis <agriffis@gentoo.org> setiathome-3.03-r1.ebuild:
   Remove alpha from the SRC_URI to keep from cluttering digest and causing
diff --git a/app-sci/setiathome/Manifest b/app-sci/setiathome/Manifest
index c9fe9d4ab246..e54a8e527a00 100644
--- a/app-sci/setiathome/Manifest
+++ b/app-sci/setiathome/Manifest
@@ -1,9 +1,11 @@
-MD5 1b7b3d635a8c8b8a0206a97b20eccb79 ChangeLog 2807
-MD5 5b8dee1e4ec5a24a0fb02233453817e4 setiathome-3.03-r1.ebuild 2203
 MD5 abd3e6bda9646b2774b620a3fec9d148 setiathome-3.08-r1.ebuild 2406
+MD5 5b8dee1e4ec5a24a0fb02233453817e4 setiathome-3.03-r1.ebuild 2203
+MD5 0a2670f08e0d438cd80aee05f95335e3 setiathome-3.08-r2.ebuild 2429
+MD5 1b7b3d635a8c8b8a0206a97b20eccb79 ChangeLog 2807
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 80ab09afbe663730ea29b5bb8573a6dc files/digest-setiathome-3.03-r1 430
+MD5 369ac9e1c5e56f7af53abe0f2ffbb594 files/seti-init.d-r1 1405
+MD5 9a7e850d8e364823f360c347d3a37ff8 files/digest-setiathome-3.03-r1 342
+MD5 4383e568b5b768f6fa2f27b3d9a713b9 files/digest-setiathome-3.08-r1 166
+MD5 4383e568b5b768f6fa2f27b3d9a713b9 files/digest-setiathome-3.08-r2 166
 MD5 2d83ded4bcd8e9b28eb91fc883aec602 files/seti-conf.d-r1 349
-MD5 6430f15a8982b38ff6ebcb8cc269cf75 files/seti-init.d-r1 1302
 MD5 55dbc721d10de13427eab449d82ed5e9 files/setiathome-wrapper 94
-MD5 4383e568b5b768f6fa2f27b3d9a713b9 files/digest-setiathome-3.08-r1 166
diff --git a/app-sci/setiathome/files/digest-setiathome-3.03-r1 b/app-sci/setiathome/files/digest-setiathome-3.03-r1
index 080b93e94e37..8b4a205dcd92 100644
--- a/app-sci/setiathome/files/digest-setiathome-3.03-r1
+++ b/app-sci/setiathome/files/digest-setiathome-3.03-r1
@@ -1,5 +1,4 @@
 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-r2 b/app-sci/setiathome/files/digest-setiathome-3.08-r2
new file mode 100644
index 000000000000..759f4e99e3c6
--- /dev/null
+++ b/app-sci/setiathome/files/digest-setiathome-3.08-r2
@@ -0,0 +1,2 @@
+MD5 01d05178bd22c36b2e411dd12f23661a setiathome-3.08.i686-pc-linux-gnu.tar 247808
+MD5 2e2f81600a0a427a759bf3459b068995 setiathome-3.08.x86_64-pc-linux-gnu.tar 224768
diff --git a/app-sci/setiathome/files/seti-init.d-r1 b/app-sci/setiathome/files/seti-init.d-r1
index f7391dde5d3b..412566584588 100644
--- a/app-sci/setiathome/files/seti-init.d-r1
+++ b/app-sci/setiathome/files/seti-init.d-r1
@@ -9,15 +9,17 @@ depend() {
 }
 
 checkconfig() {
+	SETIBINDIR="/opt/setiathome"
 	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}
+		eerror "Please setup SETI@home first by running the following commands:"
+		eerror cd "${SETIATHOME_DIR}"
+		eerror ${SETIATHOME_DIR}/setiathome -login ${SETIATHOME_OPTIONS}
+		return 1
 	fi
 
 	if [ "${SETIATHOME_THREADS}" != '1' ] ; then
@@ -29,10 +31,11 @@ checkconfig() {
 			fi
 		done
 	fi
+	return 0
 }
 
 start() {
-	checkconfig
+	checkconfig || return 1;
 
 	if [ "${SETIATHOME_THREADS}" = '1' ] ; then
 		ebegin "Starting SETI@home"
diff --git a/app-sci/setiathome/setiathome-3.08-r2.ebuild b/app-sci/setiathome/setiathome-3.08-r2.ebuild
new file mode 100644
index 000000000000..70f41653739e
--- /dev/null
+++ b/app-sci/setiathome/setiathome-3.08-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2004 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-r2.ebuild,v 1.1 2004/03/01 11:23:40 phosphan 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.
+DESCRIPTION="Search for Extraterrestrial Intelligence (SETI) @ home"
+HOMEPAGE="http://setiathome.ssl.berkeley.edu"
+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 )"
+
+LICENSE="as-is"
+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 () {
+	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} /var/lib/setiathome
+	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
+
+	exeinto /var/lib/setiathome
+	newexe ${FILESDIR}/setiathome-wrapper setiwrapper
+}
+
+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 /var/lib/setiathome && ${I}/setiathome"
+	einfo ""
+	einfo "As of 3.08-r1 data files has moved to /var/lib/setiathome"
+}
+
+pkg_postrm () {
+	einfo "SETI@home data files were not removed."
+	einfo " Remove them manually from /var/lib/setiathome"
+}