From 8e701214063120b986325cf677b6b0f049f84b59 Mon Sep 17 00:00:00 2001
From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Thu, 10 Apr 2008 00:47:43 +0000
Subject: Fixed init script searching for /etc/conf.d/dnetc incorrectly. 
 Thanks to Arthur Hagen <art-gt@broomstick.com> for the fix.  Added workaround
 for Fair Group CPU Scheduler.  Thanks to Toralf Förster
 <toralf.foerster@gmx.de> for the fix.  Version bump to 2.9015.504 for x86. 
 QA cleanup: Fix quoting.  Closing bug #209037, bug #209322, and bug #215052.
 (Portage version: 2.1.4.4)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app-misc/dnetc/ChangeLog                  | 16 +++++-
 app-misc/dnetc/dnetc-2.9001.478.ebuild    | 14 ++---
 app-misc/dnetc/dnetc-2.9002.479.ebuild    | 16 +++---
 app-misc/dnetc/dnetc-2.9003.481-r1.ebuild |  8 +--
 app-misc/dnetc/dnetc-2.9011.496-r1.ebuild |  8 +--
 app-misc/dnetc/dnetc-2.9011.498.ebuild    | 10 ++--
 app-misc/dnetc/dnetc-2.9013.498.ebuild    |  8 +--
 app-misc/dnetc/dnetc-2.9015.504.ebuild    | 91 +++++++++++++++++++++++++++++++
 app-misc/dnetc/files/dnetc.conf           |  4 --
 app-misc/dnetc/files/dnetc.init           | 29 ----------
 app-misc/dnetc/files/dnetc.init-r1        | 40 --------------
 app-misc/dnetc/files/dnetc.init-r2        | 40 --------------
 app-misc/dnetc/files/dnetc.initd          | 10 +++-
 13 files changed, 143 insertions(+), 151 deletions(-)
 create mode 100644 app-misc/dnetc/dnetc-2.9015.504.ebuild
 delete mode 100644 app-misc/dnetc/files/dnetc.conf
 delete mode 100644 app-misc/dnetc/files/dnetc.init
 delete mode 100755 app-misc/dnetc/files/dnetc.init-r1
 delete mode 100644 app-misc/dnetc/files/dnetc.init-r2

(limited to 'app-misc/dnetc')

diff --git a/app-misc/dnetc/ChangeLog b/app-misc/dnetc/ChangeLog
index fb989180a4d8..dd9b23abf17c 100644
--- a/app-misc/dnetc/ChangeLog
+++ b/app-misc/dnetc/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-misc/dnetc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/ChangeLog,v 1.47 2008/02/02 14:01:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/ChangeLog,v 1.48 2008/04/10 00:47:43 wolf31o2 Exp $
+
+*dnetc-2.9015.504 (10 Apr 2008)
+
+  10 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> -files/dnetc.conf,
+  -files/dnetc.init, -files/dnetc.init-r1, -files/dnetc.init-r2,
+  files/dnetc.initd, dnetc-2.9001.478.ebuild, dnetc-2.9002.479.ebuild,
+  dnetc-2.9003.481-r1.ebuild, dnetc-2.9011.496-r1.ebuild,
+  dnetc-2.9011.498.ebuild, dnetc-2.9013.498.ebuild,
+  +dnetc-2.9015.504.ebuild:
+  Fixed init script searching for /etc/conf.d/dnetc incorrectly. Thanks to
+  Arthur Hagen <art-gt@broomstick.com> for the fix. Added workaround for Fair
+  Group CPU Scheduler. Thanks to Toralf Förster <toralf.foerster@gmx.de> for
+  the fix. Version bump to 2.9015.504 for x86. QA cleanup: Fix quoting.
+  Closing bug #209037, bug #209322, and bug #215052.
 
 *dnetc-2.9013.498 (02 Feb 2008)
 
diff --git a/app-misc/dnetc/dnetc-2.9001.478.ebuild b/app-misc/dnetc/dnetc-2.9001.478.ebuild
index f48cdaad3e86..32631133fc22 100644
--- a/app-misc/dnetc/dnetc-2.9001.478.ebuild
+++ b/app-misc/dnetc/dnetc-2.9001.478.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9001.478.ebuild,v 1.17 2007/08/23 17:59:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9001.478.ebuild,v 1.18 2008/04/10 00:47:43 wolf31o2 Exp $
 
 MAJ_PV=${PV:0:6}
 MIN_PV=${PV:7:9}
 
 DESCRIPTION="distributed.net client"
 HOMEPAGE="http://www.distributed.net"
-SRC_URI="mips? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}b-ps2linux-mipsel.tar.gz )"
+SRC_URI="http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}b-ps2linux-mipsel.tar.gz"
 
 LICENSE="distributed.net"
 SLOT="0"
@@ -18,9 +18,7 @@ RESTRICT="mirror"
 DEPEND=""
 RDEPEND="net-dns/bind-tools"
 
-if use mips; then
-	S="${WORKDIR}/dnetc${MIN_PV}-ps2linux-mipsel"
-fi
+S="${WORKDIR}/dnetc${MIN_PV}-ps2linux-mipsel"
 
 src_install() {
 	exeinto /opt/distributed.net
@@ -29,8 +27,8 @@ src_install() {
 	doman dnetc.1
 	dodoc CHANGES.txt dnetc.txt readme.*
 
-	newinitd ${FILESDIR}/dnetc.init dnetc
-	newconfd ${FILESDIR}/dnetc.conf dnetc
+	newinitd "${FILESDIR}"/dnetc.initd dnetc
+	newconfd "${FILESDIR}"/dnetc.confd dnetc
 }
 
 pkg_preinst() {
diff --git a/app-misc/dnetc/dnetc-2.9002.479.ebuild b/app-misc/dnetc/dnetc-2.9002.479.ebuild
index 7b052129d250..143a184e28dc 100644
--- a/app-misc/dnetc/dnetc-2.9002.479.ebuild
+++ b/app-misc/dnetc/dnetc-2.9002.479.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9002.479.ebuild,v 1.10 2007/08/23 17:59:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9002.479.ebuild,v 1.11 2008/04/10 00:47:43 wolf31o2 Exp $
 
 MAJ_PV=${PV:0:6}
 MIN_PV=${PV:7:9}
 
 DESCRIPTION="distributed.net client"
 HOMEPAGE="http://www.distributed.net"
-SRC_URI="hppa? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-hppa32.tar.gz )"
+SRC_URI="http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-hppa32.tar.gz"
 
 LICENSE="distributed.net"
 SLOT="0"
-KEYWORDS="~hppa -mips"
+KEYWORDS="~hppa"
 IUSE=""
 RESTRICT="mirror"
 
 DEPEND=""
 RDEPEND="net-dns/bind-tools"
 
-if use hppa; then
-	S="${WORKDIR}/dnetc${MIN_PV}-linux-hppa"
-fi
+S="${WORKDIR}/dnetc${MIN_PV}-linux-hppa"
 
 src_install() {
 	exeinto /opt/distributed.net
@@ -29,8 +27,8 @@ src_install() {
 	doman dnetc.1
 	dodoc CHANGES.txt dnetc.txt readme.*
 
-	newinitd ${FILESDIR}/dnetc.init dnetc
-	newconfd ${FILESDIR}/dnetc.conf dnetc
+	newinitd "${FILESDIR}"/dnetc.initd dnetc
+	newconfd "${FILESDIR}"/dnetc.confd dnetc
 }
 
 pkg_preinst() {
diff --git a/app-misc/dnetc/dnetc-2.9003.481-r1.ebuild b/app-misc/dnetc/dnetc-2.9003.481-r1.ebuild
index 7e7631e7198d..2bd7a1315f57 100644
--- a/app-misc/dnetc/dnetc-2.9003.481-r1.ebuild
+++ b/app-misc/dnetc/dnetc-2.9003.481-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9003.481-r1.ebuild,v 1.12 2007/08/23 17:59:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9003.481-r1.ebuild,v 1.13 2008/04/10 00:47:43 wolf31o2 Exp $
 
 MAJ_PV=${PV:0:6}
 MIN_PV=${PV:7:9}
@@ -41,8 +41,8 @@ src_install() {
 	doman dnetc.1
 	dodoc CHANGES.txt dnetc.txt readme.*
 
-	newinitd ${FILESDIR}/dnetc.init dnetc
-	newconfd ${FILESDIR}/dnetc.conf dnetc
+	newinitd "${FILESDIR}"/dnetc.initd dnetc
+	newconfd "${FILESDIR}"/dnetc.confd dnetc
 }
 
 pkg_preinst() {
diff --git a/app-misc/dnetc/dnetc-2.9011.496-r1.ebuild b/app-misc/dnetc/dnetc-2.9011.496-r1.ebuild
index 41a37834bbfc..d18580a677d7 100644
--- a/app-misc/dnetc/dnetc-2.9011.496-r1.ebuild
+++ b/app-misc/dnetc/dnetc-2.9011.496-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9011.496-r1.ebuild,v 1.7 2007/08/23 17:59:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9011.496-r1.ebuild,v 1.8 2008/04/10 00:47:43 wolf31o2 Exp $
 
 inherit eutils
 
@@ -34,8 +34,8 @@ src_install() {
 	doman dnetc.1
 	dodoc docs/CHANGES.txt docs/dnetc.txt docs/readme.*
 
-	newinitd ${FILESDIR}/dnetc.init-r1 dnetc
-	newconfd ${FILESDIR}/dnetc.conf dnetc
+	newinitd "${FILESDIR}"/dnetc.initd dnetc
+	newconfd "${FILESDIR}"/dnetc.confd dnetc
 }
 
 pkg_preinst() {
diff --git a/app-misc/dnetc/dnetc-2.9011.498.ebuild b/app-misc/dnetc/dnetc-2.9011.498.ebuild
index 6df28a317175..e662a9e04ad8 100644
--- a/app-misc/dnetc/dnetc-2.9011.498.ebuild
+++ b/app-misc/dnetc/dnetc-2.9011.498.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9011.498.ebuild,v 1.4 2007/08/23 17:59:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9011.498.ebuild,v 1.5 2008/04/10 00:47:43 wolf31o2 Exp $
 
 inherit eutils versionator
 
@@ -9,7 +9,7 @@ MIN_PV="$(get_version_component_range 3)"
 
 DESCRIPTION="distributed.net client"
 HOMEPAGE="http://www.distributed.net"
-SRC_URI="x86? ( http://http.distributed.net/pub/dcti/v2.9013/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz )"
+SRC_URI="http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz"
 
 LICENSE="distributed.net"
 SLOT="0"
@@ -28,8 +28,8 @@ pkg_setup() {
 }
 
 src_install() {
-	newinitd ${FILESDIR}/dnetc.init-r2 dnetc
-	newconfd ${FILESDIR}/dnetc.conf dnetc
+	newinitd "${FILESDIR}"/dnetc.initd dnetc
+	newconfd "${FILESDIR}"/dnetc.confd dnetc
 
 	local ownopts="--mode=0555 --group=dnetc --owner=dnetc"
 
diff --git a/app-misc/dnetc/dnetc-2.9013.498.ebuild b/app-misc/dnetc/dnetc-2.9013.498.ebuild
index 71acc15936ed..4453015dbb98 100644
--- a/app-misc/dnetc/dnetc-2.9013.498.ebuild
+++ b/app-misc/dnetc/dnetc-2.9013.498.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9013.498.ebuild,v 1.2 2008/02/14 05:39:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9013.498.ebuild,v 1.3 2008/04/10 00:47:43 wolf31o2 Exp $
 
 inherit eutils versionator linux-info
 
@@ -9,7 +9,7 @@ MIN_PV="$(get_version_component_range 3)"
 
 DESCRIPTION="distributed.net client"
 HOMEPAGE="http://www.distributed.net"
-SRC_URI="x86? ( http://http.distributed.net/pub/dcti/v2.9013/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz )"
+SRC_URI="http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz"
 
 LICENSE="distributed.net"
 SLOT="0"
@@ -56,8 +56,8 @@ pkg_preinst() {
 }
 
 src_install() {
-	newinitd ${FILESDIR}/dnetc.initd dnetc
-	newconfd ${FILESDIR}/dnetc.confd dnetc
+	newinitd "${FILESDIR}"/dnetc.initd dnetc
+	newconfd "${FILESDIR}"/dnetc.confd dnetc
 
 	local ownopts="--mode=0555 --group=dnetc --owner=dnetc"
 
diff --git a/app-misc/dnetc/dnetc-2.9015.504.ebuild b/app-misc/dnetc/dnetc-2.9015.504.ebuild
new file mode 100644
index 000000000000..5ac4b31469b8
--- /dev/null
+++ b/app-misc/dnetc/dnetc-2.9015.504.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9015.504.ebuild,v 1.1 2008/04/10 00:47:43 wolf31o2 Exp $
+
+inherit eutils versionator linux-info
+
+MAJ_PV="$(get_major_version).$(get_version_component_range 2)"
+MIN_PV="$(get_version_component_range 3)"
+
+DESCRIPTION="distributed.net client"
+HOMEPAGE="http://www.distributed.net"
+SRC_URI="http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz"
+
+LICENSE="distributed.net"
+SLOT="0"
+KEYWORDS="~x86 -*"
+RESTRICT="mirror"
+
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/dnetc${MIN_PV}-linux-x86-elf-uclibc"
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for dnetc)"
+	check_extra_config
+	echo
+}
+
+pkg_preinst() {
+	enewgroup dnetc
+	enewuser dnetc -1 -1 /opt/distributed.net dnetc
+	if [ -e /opt/distributed.net/dnetc ] && [ -e /etc/init.d/dnetc ]; then
+		ebegin "Flushing old buffers"
+		source /etc/conf.d/dnetc
+
+		if [ -e /etc/init.d/dnetc ] ; then
+			/etc/init.d/dnetc flush
+			local flushed=${?}
+		fi
+
+		if [ ${flushed} -eq 0 ] ; then
+			true
+		elif [ -e /opt/distributed.net/dnetc.ini ]; then
+			# use ini file
+			/opt/distributed.net/dnetc -quiet -ini /opt/distributed.net/dnetc.ini -flush
+		elif [ ! -e /opt/distributed.net/dnetc.ini ] && [ ! -z ${EMAIL} ]; then
+			# email adress from config
+			/opt/distributed.net/dnetc -quiet -flush -e ${EMAIL}
+		fi
+
+		eend ${?}
+	fi
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/dnetc.initd dnetc
+	newconfd "${FILESDIR}"/dnetc.confd dnetc
+
+	local ownopts="--mode=0555 --group=dnetc --owner=dnetc"
+
+	diropts ${ownopts}
+	dodir /opt/distributed.net
+
+	exeopts ${ownopts}
+	exeinto /opt/distributed.net
+	doexe dnetc
+
+	doman dnetc.1
+	dodoc docs/CHANGES.txt docs/dnetc.txt docs/readme.*
+
+	diropts ${ownopts/0555/0755}
+	dodir /var/spool/dnetc
+}
+
+pkg_postinst() {
+	einfo "To run distributed.net client in the background at boot:"
+	einfo "   rc-update add dnetc default"
+	einfo
+	einfo "Either configure your email address in /etc/conf.d/dnetc"
+	einfo "or create the configuration file /opt/distributed.net/dnetc.ini"
+}
+
+pkg_postrm() {
+	if [ -d /opt/distributed.net ]; then
+		einfo "All files has not been removed from /opt/distributed.net"
+		einfo "Probably old init file and/or buffer files"
+	fi
+}
diff --git a/app-misc/dnetc/files/dnetc.conf b/app-misc/dnetc/files/dnetc.conf
deleted file mode 100644
index 9cd923faa9ef..000000000000
--- a/app-misc/dnetc/files/dnetc.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# configuration file for dnetc
-
-# email adress
-EMAIL=
diff --git a/app-misc/dnetc/files/dnetc.init b/app-misc/dnetc/files/dnetc.init
deleted file mode 100644
index 0bf39974a545..000000000000
--- a/app-misc/dnetc/files/dnetc.init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/files/dnetc.init,v 1.7 2004/07/14 21:32:34 agriffis Exp $
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting distributed.net client"
-	if [ -e /opt/distributed.net/dnetc.ini ]; then
-		# use ini file
-		/opt/distributed.net/dnetc -quiet -ini /opt/distributed.net/dnetc.ini
-	elif [ ! -e /opt/distributed.net/dnetc.ini ] && [ ! -z ${EMAIL} ]; then
-		# email adress from config
-		/opt/distributed.net/dnetc -quiet -e ${EMAIL}
-	else
-		exit 1
-	fi
-	eend $?
-}
-
-stop() {
-	# sends SIGTERM to all running clients.
-	ebegin "Stopping distributed.net client"
-	/opt/distributed.net/dnetc -quiet -shutdown  # remove '-quiet' to see activity.
-	eend $?
-}
diff --git a/app-misc/dnetc/files/dnetc.init-r1 b/app-misc/dnetc/files/dnetc.init-r1
deleted file mode 100755
index 6c34328b6f32..000000000000
--- a/app-misc/dnetc/files/dnetc.init-r1
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/files/dnetc.init-r1,v 1.1 2006/01/03 22:53:48 voxus Exp $
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting distributed.net client"
-
-	DNETPATH="/opt/distributed.net"
-
-	STARTOPTS="--start --chuid dnetc:dnetc --quiet \
-		--exec /opt/distributed.net/dnetc"
-	
-	if [ -e ${DNETPATH}/dnetc.ini ]; then
-		# use ini file
-		start-stop-daemon ${STARTOPTS} -- \
-			-quiet -ini ${DNETPATH}/dnetc.ini
-		
-	elif [ ! -e ${DNETPATH}/dnetc.ini ] && [ ! -z ${EMAIL} ]; then
-		# email adress from config
-		start-stop-daemon ${STARTOPTS} -- \
-			-quiet -e ${EMAIL}
-
-	else
-		exit 1
-	fi
-	eend ${?}
-}
-
-stop() {
-	# sends SIGTERM to all running clients.
-	ebegin "Stopping distributed.net client"
-	start-stop-daemon --stop --quiet \
-		--exec /opt/distributed.net/dnetc -- stop
-	eend ${?}
-}
diff --git a/app-misc/dnetc/files/dnetc.init-r2 b/app-misc/dnetc/files/dnetc.init-r2
deleted file mode 100644
index c8589b7865d2..000000000000
--- a/app-misc/dnetc/files/dnetc.init-r2
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/files/dnetc.init-r2,v 1.1 2006/01/15 16:34:23 voxus Exp $
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting distributed.net client"
-
-	DNETPATH="/opt/distributed.net"
-
-	STARTOPTS="--start --chuid dnetc:dnetc --quiet \
-		--exec /opt/distributed.net/dnetc"
-	
-	if [ -e ${DNETPATH}/dnetc.ini ]; then
-		# use ini file
-		start-stop-daemon ${STARTOPTS} -- \
-			-quiet
-		
-	elif [ ! -e ${DNETPATH}/dnetc.ini ] && [ ! -z ${EMAIL} ]; then
-		# email adress from config
-		start-stop-daemon ${STARTOPTS} -- \
-			-quiet -e ${EMAIL}
-
-	else
-		exit 1
-	fi
-	eend ${?}
-}
-
-stop() {
-	# sends SIGTERM to all running clients.
-	ebegin "Stopping distributed.net client"
-	start-stop-daemon --stop --quiet \
-		--exec /opt/distributed.net/dnetc --
-	eend ${?}
-}
diff --git a/app-misc/dnetc/files/dnetc.initd b/app-misc/dnetc/files/dnetc.initd
index d3613acf3898..786a965b0df3 100644
--- a/app-misc/dnetc/files/dnetc.initd
+++ b/app-misc/dnetc/files/dnetc.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/files/dnetc.initd,v 1.1 2008/02/02 14:01:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/files/dnetc.initd,v 1.2 2008/04/10 00:47:43 wolf31o2 Exp $
 
 opts="${opts} reload fetch flush"
 
@@ -20,9 +20,9 @@ processOpts() {
 
 	DNETOPTS="-quiet"
 
-	if [ -e /etc/conf.d/dnetc ] ; then
+	if [ -e /etc/dnetc.ini ] ; then
 		retVal=0
-		DNETOPTS="${DNETOPTS} -ini /etc/conf.d/dnetc"
+		DNETOPTS="${DNETOPTS} -ini /etc/dnetc.ini"
 	elif [ -e ${DNETPATH}/dnetc.ini ]; then
 		retVal=0
 		DNETOPTS="${DNETOPTS} -ini ${DNETPATH}/dnetc.ini"
@@ -41,6 +41,10 @@ processOpts() {
 	fi
 	DNETOPTS="${DNETOPTS} ${KEYSERVER_ADDRESS:+-a ${KEYSERVER_ADDRESS}}"
 
+	# fair group cpu scheduler
+	[ -d /sys/kernel/uids/ ] && echo 2 > \
+		/sys/kernel/uids/$(grep -w dnetc /etc/passwd | cut -d: -f3)/cpu_share
+
 	if [ ${retVal} -ne 0 ] ; then
 		eerror "Need some sort of configuration.  Check /etc/conf.d/dnetc."
 	fi
-- 
cgit v1.2.3-65-gdbad