Clean up old versions, several cleanups closing bug 103558, 109567 and 110606. Thanks to Tony Murrary <tonymurray@fastmail.fm> and Benjamin Gaillard <gentoo@powercode.net>.

(Portage version: 2.0.53_rc6)

8 files changed, 45 insertions, 120 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 166ff54558c3..3fc9eacee403 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.11 2005/08/27 23:47:08 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.12 2005/10/29 14:49:52 cryos Exp $
+
+*boinc-4.72.20050813-r1 (29 Oct 2005)
+
+  29 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> files/boinc.conf,
+  files/boinc.init, -boinc-4.32.ebuild, -boinc-4.72.20050813.ebuild,
+  +boinc-4.72.20050813-r1.ebuild:
+  Clean up old versions, several cleanups closing bug 103558, 109567 and
+  110606. Thanks to Tony Murrary <tonymurray@fastmail.fm> and Benjamin
+  Gaillard <gentoo@powercode.net>.
 
   25 Aug 2005; Aron Griffis <agriffis@gentoo.org>
   boinc-4.72.20050813.ebuild:
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index da4e65a0a3d8..c21cc3a58f0e 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3d7f6563d29f9996393d96fcffaf877a boinc-4.72.20050813.ebuild 1964
 MD5 8e6b624210c8b8e6964fc9c1c8a5f511 ChangeLog 2434
-MD5 4b2e94b92c84896e0204d9e7710f9c6a metadata.xml 420
 MD5 48022b504e387a441f48c6a28460dbad boinc-4.32.ebuild 2229
-MD5 5dc63ab398e7b399eaa9e1fdab388453 files/digest-boinc-4.32 80
-MD5 87e5c7b66fd1b782ab5b01bae9cbc94e files/boinc.conf 441
-MD5 340ac8c6dfd540d12b3491fca7ad9e8c files/boinc.init 1758
+MD5 e350d795e7219a6ec62acc06f0e07750 boinc-4.72.20050813-r1.ebuild 2255
+MD5 3d7f6563d29f9996393d96fcffaf877a boinc-4.72.20050813.ebuild 1964
 MD5 f34dc99c2f866383c11c0a3ac849baf8 files/boinc-4.32_cmdline_options.patch 2477
 MD5 25cfc5918b31da56263edfee7a5fa682 files/boinc-4.32_socket_close_fix.patch 1208
+MD5 5418cddcce4923a19fdf0c6bafea11bf files/boinc.conf 440
+MD5 3629c69dacf62b1cb3f9118e757fae00 files/boinc.init 1730
+MD5 5dc63ab398e7b399eaa9e1fdab388453 files/digest-boinc-4.32 80
 MD5 54ee39e6bbb50b705cb5fac638568d8b files/digest-boinc-4.72.20050813 80
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDEPuJntT9W3vfTuoRAo9iAJ9mEKhYwcT8G+TMy7x2+uqNSqtdhgCghugT
-c2xu7i/lbXIieOFoKaAb6DE=
-=0EmQ
------END PGP SIGNATURE-----
+MD5 54ee39e6bbb50b705cb5fac638568d8b files/digest-boinc-4.72.20050813-r1 80
+MD5 4b2e94b92c84896e0204d9e7710f9c6a metadata.xml 420
diff --git a/sci-misc/boinc/boinc-4.32.ebuild b/sci-misc/boinc/boinc-4.32.ebuild
deleted file mode 100644
index cb05ca0afb4a..000000000000
--- a/sci-misc/boinc/boinc-4.32.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-4.32.ebuild,v 1.6 2005/08/23 14:26:19 cryos Exp $
-
-inherit eutils
-
-MY_PN="boinc_public-cvs"
-MY_PV="2005-04-17"
-S=${WORKDIR}/boinc_public
-
-DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
-HOMEPAGE="http://boinc.ssl.berkeley.edu/"
-SRC_URI="http://boinc.ssl.berkeley.edu/source/nightly/${MY_PN}-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="server X"
-
-RDEPEND="X? ( virtual/x11
-		virtual/glut
-		virtual/glu
-		>=x11-libs/wxGTK-2.4.2-r2 )
-	server? ( net-www/apache
-		>=dev-db/mysql-4.0.24
-		virtual/php
-		>=dev-lang/python-2.2.3
-		dev-python/mysql-python )"
-DEPEND=">=sys-devel/gcc-3.0.4
-	>=sys-devel/autoconf-2.59
-	>=sys-devel/automake-1.9.3
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# point to a proper mouse device
-	sed -i "s:/dev/mouse:/dev/psaux:g" client/hostinfo_unix.C
-
-	epatch ${FILESDIR}/${P}_cmdline_options.patch
-	epatch ${FILESDIR}/${P}_socket_close_fix.patch
-}
-
-src_compile() {
-	# boinc does not support unicode so force wxconfig non-unicode
-	WXCONFIG=$(ls /usr/bin/wxgtk2-?.?-config)
-	if [ -e "${WXCONFIG}" ]; then
-		CONF="--with-wx-config=${WXCONFIG}"
-	fi
-
-	econf --enable-client \
-	`use_enable server` \
-	`use_with X x` \
-	${CONF} || die "could not configure"
-	emake || die "emake failed"
-}
-
-src_install() {
-#	einstall || die "install failed"
-	make install DESTDIR=${D} || die "make install failed"
-
-	newinitd ${FILESDIR}/boinc.init boinc
-	newconfd ${FILESDIR}/boinc.conf boinc
-}
-
-pkg_preinst() {
-	enewgroup boinc
-	enewuser boinc -1 -1 /var/lib/boinc boinc
-}
-
-pkg_postinst() {
-	echo
-	einfo "You need to attach to a project to do anything useful with boinc."
-	einfo "You can do this by running /etc/init.d/boinc attach"
-	einfo "BOINC The howto for configuration is located at:"
-	einfo "http://boinc.berkeley.edu/anonymous_platform.php"
-	if use server;then
-		einfo "You have chosen to enable server mode. this ebuild has installed"
-		einfo "the necessary packages to be a server, you will need to have a"
-		einfo "project. Contact BOINC directly for further information."
-	fi
-	echo
-}
diff --git a/sci-misc/boinc/boinc-4.72.20050813.ebuild b/sci-misc/boinc/boinc-4.72.20050813-r1.ebuild
index bb03604d0059..ceb960b56344 100644
--- a/sci-misc/boinc/boinc-4.72.20050813.ebuild
+++ b/sci-misc/boinc/boinc-4.72.20050813-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-4.72.20050813.ebuild,v 1.5 2005/08/25 13:52:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-4.72.20050813-r1.ebuild,v 1.1 2005/10/29 14:49:52 cryos Exp $
 
 inherit eutils
 
@@ -17,18 +17,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="server X"
 
-RDEPEND="X? ( virtual/x11
-		virtual/glut
-		virtual/glu
-		>=x11-libs/wxGTK-2.6.0 )
+RDEPEND="sys-libs/zlib
+	X? ( >=x11-libs/wxGTK-2.6.1 )
 	server? ( net-www/apache
 		>=dev-db/mysql-4.0.24
 		virtual/php
 		>=dev-lang/python-2.2.3
-		dev-python/mysql-python )"
+		>=dev-python/mysql-python-0.9.2 )"
 DEPEND=">=sys-devel/gcc-3.0.4
 	>=sys-devel/autoconf-2.59
 	>=sys-devel/automake-1.9.3
+	X? (	|| ( ( x11-libs/libXmu
+				x11-libs/libXt
+				x11-libs/libX11
+				x11-proto/xproto )
+			virtual/x11 )
+		virtual/glut
+		virtual/glu
+		media-libs/jpeg )
+	server? ( virtual/imap-c-client )
 	${RDEPEND}"
 
 src_unpack() {
@@ -45,15 +52,17 @@ src_compile() {
 		--disable-static-client \
 		--with-wx-config=$(which wx-config-2.6) \
 		$(use_enable server) \
-		$(use_with X x) || die
-	emake || die
+		$(use_with X x) || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make install DESTDIR=${D} || die "make install failed"
 
 	newinitd ${FILESDIR}/boinc.init boinc
 	newconfd ${FILESDIR}/boinc.conf boinc
+
+	make_desktop_entry boinc_gui BOINC boinc Science /var/lib/boinc
 }
 
 pkg_preinst() {
diff --git a/sci-misc/boinc/files/boinc.conf b/sci-misc/boinc/files/boinc.conf
index 20f8dfd6b87b..827025b7da20 100644
--- a/sci-misc/boinc/files/boinc.conf
+++ b/sci-misc/boinc/files/boinc.conf
@@ -14,7 +14,7 @@ BOINCBIN="/usr/bin/boinc_client"
 LOGFILE="/var/log/boinc.log"
 
 # Allow remote gui RPC yes or no
-ALLOW_REMOTE_RPC="yes"
+ALLOW_REMOTE_RPC="no"
 
 # nice level
 NICELEVEL="19"
diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index c54e0313dc2a..4e43197df5a0 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -38,7 +38,8 @@ start() {
 	fi
 
 	setsid start-stop-daemon --quiet --start --exec ${BOINCBIN} \
-		--chuid ${USER}:${GROUP} --nicelevel ${NICELEVEL} -- ${ARGS} > ${LOGFILE} 2>&1 &
+		--chuid ${USER}:${GROUP} --nicelevel ${NICELEVEL} -- ${ARGS} \
+		--chdir ${RUNTIMEDIR} > ${LOGFILE} 2>&1 &
 
 	eend $?
 }
@@ -50,16 +51,15 @@ attach() {
 	read key
 
 	RC_QUIET_STDOUT="yes" svc_status
-	if [ $? == 0 ]; then
-		ebegin "Attaching to project"
-			# boinc cmd does not return 1 when it fails currently
-			boinc_cmd --project_attach ${url} ${key} &> /dev/null
-		eend $?
-	else
-		ARGS="${ARGS} -attach_project ${url} ${key}" svc_start
+	if [ $? == 1 ]; then
+		svc_start
 	fi
+	ebegin "Attaching to project"
+		# boinc cmd does not return 1 when it fails currently
+		boinc_cmd --project_attach ${url} ${key} &> /dev/null
+	eend $?
 
-	sleep 9
+	sleep 10
 	tail ${LOGFILE}
 }
 
diff --git a/sci-misc/boinc/files/digest-boinc-4.32 b/sci-misc/boinc/files/digest-boinc-4.32
deleted file mode 100644
index 865474290bc1..000000000000
--- a/sci-misc/boinc/files/digest-boinc-4.32
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e729558125dacca3b4c6c659fd491e3e boinc_public-cvs-2005-04-17.tar.gz 5105448
diff --git a/sci-misc/boinc/files/digest-boinc-4.72.20050813 b/sci-misc/boinc/files/digest-boinc-4.72.20050813-r1
index 0a456c0d3bf4..0a456c0d3bf4 100644
--- a/sci-misc/boinc/files/digest-boinc-4.72.20050813
+++ b/sci-misc/boinc/files/digest-boinc-4.72.20050813-r1