Version bump. Drop older. Fix bugs #323635 #309439 #314155.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 24 insertions, 154 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 9bc3203dfe2b..11cc4edb1c57 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.88 2010/04/02 09:48:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.89 2010/07/09 16:49:01 scarabeus Exp $
+
+*boinc-6.10.58 (09 Jul 2010)
+
+  09 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -boinc-6.10.18.ebuild, -boinc-6.10.36.ebuild, +boinc-6.10.58.ebuild,
+  files/boinc.init:
+  Version bump. Drop older. Fix bugs #323635 #309439 #314155.
 
   02 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/generate_tarball.sh:
diff --git a/sci-misc/boinc/boinc-6.10.36.ebuild b/sci-misc/boinc/boinc-6.10.36.ebuild
deleted file mode 100644
index a08ecfbce920..000000000000
--- a/sci-misc/boinc/boinc-6.10.36.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.10.36.ebuild,v 1.2 2010/03/23 03:41:05 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic depend.apache eutils wxwidgets autotools base
-
-DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
-HOMEPAGE="http://boinc.ssl.berkeley.edu/"
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X +client cuda"
-
-RDEPEND="
-	!sci-misc/boinc-bin
-	!app-admin/quickswitch
-	>=app-misc/ca-certificates-20080809
-	dev-libs/openssl
-	net-misc/curl
-	sys-apps/util-linux
-	sys-libs/zlib
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-2.1
-		>=x11-drivers/nvidia-drivers-180.22
-	)
-	X? (
-		dev-db/sqlite:3
-		media-libs/freeglut
-		media-libs/jpeg
-		x11-libs/wxGTK:2.8[X,opengl]
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/6.4.5-glibc210.patch
-)
-
-src_prepare() {
-	# use system ssl certificates
-	mkdir "${S}"/curl
-	cp /etc/ssl/certs/ca-certificates.crt "${S}"/curl/ca-bundle.crt
-
-	# prevent bad changes in compile flags, bug 286701
-	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
-
-	base_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	local wxconf=""
-	local conf=""
-
-	# define preferable CFLAGS (recommended by upstream)
-	append-flags -O3 -funroll-loops -fforce-addr -ffast-math
-
-	# look for wxGTK
-	if use X; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-		wxconf+=" --with-wx-config=${WX_CONFIG}"
-	else
-		wxconf+=" --without-wxdir"
-	fi
-
-	conf+=" --disable-server"
-	use X || conf+=" --disable-manager"
-	use client || conf+=" --disable-client"
-
-	# configure
-	econf \
-		--disable-dependency-tracking \
-		--enable-unicode \
-		--with-ssl \
-		$(use_with X x) \
-		${wxconf} \
-		${conf}
-}
-
-src_install() {
-	base_src_install
-
-	dodir /var/lib/${PN}/
-	keepdir /var/lib/${PN}/
-
-	if use X; then
-		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png || die
-		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
-	fi
-
-	# cleanup cruft
-	rm -rf "${D}"/etc/
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-	# note this works only for first install so we have to
-	# elog user about the need of being in video group
-	if use cuda; then
-		enewuser ${PN} -1 -1 /var/lib/${PN} "${PN},video"
-	else
-		enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "You are using the source compiled version of ${PN}."
-	use X && elog "The graphical manager can be found at /usr/bin/${PN}mgr"
-	elog
-	elog "You need to attach to a project to do anything useful with ${PN}."
-	elog "You can do this by running /etc/init.d/${PN} attach"
-	elog "The howto for configuration is located at:"
-	elog "http://boinc.berkeley.edu/wiki/Anonymous_platform"
-	elog
-	# Add warning about the new password for the client, bug 121896.
-	if use X; then
-		elog "If you need to use the graphical manager the password is in:"
-		elog "/var/lib/${PN}/gui_rpc_auth.cfg"
-		elog "Where /var/lib/ is default RUNTIMEDIR, that can be changed in:"
-		elog "/etc/conf.d/${PN}"
-		elog "You should change this password to something more memorable (can be even blank)."
-		elog "Remember to launch init script before using manager. Or changing the password."
-		elog
-	fi
-	if use cuda; then
-		elog "To be able to use CUDA you should add boinc user to video group."
-		elog "To do so run as root:"
-		elog "gpasswd -a boinc video"
-	fi
-}
diff --git a/sci-misc/boinc/boinc-6.10.18.ebuild b/sci-misc/boinc/boinc-6.10.58.ebuild
index 2c609d2f98d9..5faf7451aaca 100644
--- a/sci-misc/boinc/boinc-6.10.18.ebuild
+++ b/sci-misc/boinc/boinc-6.10.58.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.10.18.ebuild,v 1.5 2010/03/23 03:41:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.10.58.ebuild,v 1.1 2010/07/09 16:49:01 scarabeus Exp $
 
 EAPI="2"
 
@@ -20,7 +20,7 @@ RDEPEND="
 	!app-admin/quickswitch
 	>=app-misc/ca-certificates-20080809
 	dev-libs/openssl
-	net-misc/curl
+	net-misc/curl[ssl,-gnutls]
 	sys-apps/util-linux
 	sys-libs/zlib
 	cuda? (
diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index b8a920b5018c..1dc028eadd1a 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -57,27 +57,32 @@ start() {
 	fi
 
 	if [ "${ALLOW_REMOTE_RPC}" = "yes" ]; then
-		ARGS="${ARGS} -allow_remote_gui_rpc"
+		ARGS="${ARGS} --allow_remote_gui_rpc"
 	fi
 
 	if [ -n "${RC_UNAME}" ]; then
-		PARAMS="--background --stdout '${LOGFILE}' --stderr '${LOGFILE}' -- ${ARGS}"
+		PARAMS="--background --stdout '${LOGFILE}' --stderr '${LOGFILE}' ${ARGS}"
 	else
-		PARAMS="-- ${ARGS} >> '${LOGFILE}' 2>&1 &"
+		PARAMS="${ARGS} >> '${LOGFILE}' 2>&1"
 	fi
 
 	generate_logs
 
-	# sys-apps/util-linux
-	CHRT="/usr/bin/chrt ${SCHED_PARAM}"
+	# sys-apps/util-linux (setup scheduling policy if specified, otherwise blank out
+    if [ "${SCHED_PARAM}" = "" ]; then
+        CHRT=""
+    else
+    	CHRT="/usr/bin/chrt ${SCHED_PARAM}"
+    fi
 
 	eval ${CHRT} start-stop-daemon \
-		--quiet --start --chdir "${RUNTIMEDIR}" \
-		--pidfile "${PIDFILE}" \
+		--start --quiet --chdir "${RUNTIMEDIR}" \
+        --background \
 		--make-pidfile \
-		--exec "${BOINCBIN}" --chuid "${USER}:${GROUP}" \
+		--pidfile "${PIDFILE}" \
+        --chuid "${USER}:${GROUP}" \
 		--nicelevel "${NICELEVEL}" \
-		${PARAMS}
+		--exec "${BOINCBIN}" -- ${PARAMS}
 
 	RESULT=$?