* closing bug #104527

(Portage version: 2.1_pre3-r1)

5 files changed, 141 insertions, 12 deletions

diff --git a/app-misc/dnetc/ChangeLog b/app-misc/dnetc/ChangeLog
index 78c66b4d20fc..bff0dadba4b4 100644
--- a/app-misc/dnetc/ChangeLog
+++ b/app-misc/dnetc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/dnetc
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/ChangeLog,v 1.33 2005/08/02 15:31:32 mholzer Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/ChangeLog,v 1.34 2006/01/03 22:53:48 voxus Exp $
+
+*dnetc-2.9011.496-r1 (04 Jan 2006)
+
+  04 Jan 2006; Konstantin Arkhipov <voxus@gentoo.org>
+  +dnetc-2.9011.496-r1.ebuild, +files/dnetc.init-r1:
+  Merged ebuild changes suggested by Kristaps Kaupe
+  <kristaps.kaupe@itrisinajumi.lv> in bug #104527.
+  Also init-script converted to start-stop-daemon usage.
 
 *dnetc-2.9011.496 (02 Aug 2005)
 
diff --git a/app-misc/dnetc/Manifest b/app-misc/dnetc/Manifest
index 29f2ed4469cf..d4450566ea78 100644
--- a/app-misc/dnetc/Manifest
+++ b/app-misc/dnetc/Manifest
@@ -1,18 +1,21 @@
-MD5 41ff63d1775394dc14ef29cc80794785 dnetc-2.9003.481-r1.ebuild 2037
-MD5 c14d79f055b7884e91ebebd251c40526 dnetc-2.9008.490.ebuild 1732
-MD5 d69e033d17ff48dbe483bb577e891552 dnetc-2.9011.496.ebuild 1880
+MD5 c303f740ebb642846502935516ad721a ChangeLog 4908
+MD5 d8b1b2c172a5c975cc706ddf3200544c dnetc-2.9001.478.ebuild 1390
 MD5 4fa3dd1fb6994eb53356896cc5cbd7be dnetc-2.9002.479.ebuild 1386
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 e0792d419b197c1089df3bda145854f9 ChangeLog 4626
+MD5 41ff63d1775394dc14ef29cc80794785 dnetc-2.9003.481-r1.ebuild 2037
 MD5 5d1e9f38bf29c605eee5aa05850e196b dnetc-2.9005.483.ebuild 1863
-MD5 d8b1b2c172a5c975cc706ddf3200544c dnetc-2.9001.478.ebuild 1390
+MD5 c14d79f055b7884e91ebebd251c40526 dnetc-2.9008.490.ebuild 1732
 MD5 0172a621a8ae32df97a5da8957cb7a44 dnetc-2.9009.494.ebuild 1877
+MD5 3fa9c64340176e49da08e04206566007 dnetc-2.9011.496-r1.ebuild 2167
+MD5 d69e033d17ff48dbe483bb577e891552 dnetc-2.9011.496.ebuild 1880
+MD5 043cbafd6324fd3848f2763c32e6da51 files/digest-dnetc-2.9001.478 77
 MD5 a0b9b9b76588f355da0a87fc76aba6db files/digest-dnetc-2.9002.479 73
-MD5 1ab1d2e552a641b2f3f542d8f381adef files/digest-dnetc-2.9011.496 157
-MD5 b6444acd5a6c235ffe17bb3b528f4bc4 files/dnetc.conf 54
 MD5 3c0a7355f235e3df772e08c29a7cff7b files/digest-dnetc-2.9003.481-r1 370
-MD5 d91f255c5d2573f5487c9638177208b7 files/dnetc.init 811
 MD5 b89d7982c82de8036592944c0b0dff96 files/digest-dnetc-2.9005.483 290
-MD5 043cbafd6324fd3848f2763c32e6da51 files/digest-dnetc-2.9001.478 77
 MD5 de79a9083edb7a4acdbaadf8c6f55622 files/digest-dnetc-2.9008.490 223
 MD5 c1483bfbcdb311310a4497c13ffb3d1a files/digest-dnetc-2.9009.494 157
+MD5 1ab1d2e552a641b2f3f542d8f381adef files/digest-dnetc-2.9011.496 157
+MD5 99ea87493e77ed73f2f5aebefc99dd2a files/digest-dnetc-2.9011.496-r1 157
+MD5 b6444acd5a6c235ffe17bb3b528f4bc4 files/dnetc.conf 54
+MD5 d91f255c5d2573f5487c9638177208b7 files/dnetc.init 811
+MD5 223836c761e22b978f5814662aa2e3cf files/dnetc.init-r1 939
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
diff --git a/app-misc/dnetc/dnetc-2.9011.496-r1.ebuild b/app-misc/dnetc/dnetc-2.9011.496-r1.ebuild
new file mode 100644
index 000000000000..27d0ca6d22f9
--- /dev/null
+++ b/app-misc/dnetc/dnetc-2.9011.496-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 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.1 2006/01/03 22:53:48 voxus Exp $
+
+inherit eutils
+
+MAJ_PV=${PV:0:6}
+MIN_PV=${PV:7:9}
+
+DESCRIPTION="distributed.net client"
+HOMEPAGE="http://www.distributed.net"
+SRC_URI="x86? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz )
+	amd64? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-amd64-elf.tar.gz )"
+LICENSE="distributed.net"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=""
+RDEPEND="net-dns/bind-tools"
+
+if use amd64; then
+	S="${WORKDIR}/dnetc${MIN_PV}-linux-amd64-elf"
+elif use x86; then
+	S="${WORKDIR}/dnetc${MIN_PV}-linux-x86-elf-uclibc"
+fi
+
+RESTRICT="nomirror"
+
+pkg_preinst() {
+	if [ -e /opt/distributed.net/dnetc ] && [ -e /etc/init.d/dnetc ]; then
+		einfo "flushing old buffers"
+		source /etc/conf.d/dnetc
+
+		if [ -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
+
+		einfo "removing old buffer files"
+		rm -f /opt/distributed.net/buff*
+	fi
+
+	enewgroup dnetc
+	enewuser dnetc -1 -1 /opt/distributed.net dnetc
+}
+
+src_install() {
+	exeinto /opt/distributed.net
+	doexe dnetc
+
+	doman dnetc.1
+	dodoc docs/CHANGES.txt docs/dnetc.txt docs/readme.*
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/dnetc.init-r1 dnetc
+	insinto /etc/conf.d ; newins ${FILESDIR}/dnetc.conf dnetc
+}
+
+pkg_postinst() {
+	chown -Rf dnetc:dnetc /opt/distributed.net
+	chmod 0555 /opt/distributed.net/dnetc
+
+	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"
+	fi
+}
diff --git a/app-misc/dnetc/files/digest-dnetc-2.9011.496-r1 b/app-misc/dnetc/files/digest-dnetc-2.9011.496-r1
new file mode 100644
index 000000000000..f4430978f977
--- /dev/null
+++ b/app-misc/dnetc/files/digest-dnetc-2.9011.496-r1
@@ -0,0 +1,2 @@
+MD5 593a069b6faab12316073876d147c8ba dnetc496-linux-amd64-elf.tar.gz 481070
+MD5 2e03d0463cce7362404f2254dd072640 dnetc496-linux-x86-elf-uclibc.tar.gz 255750
diff --git a/app-misc/dnetc/files/dnetc.init-r1 b/app-misc/dnetc/files/dnetc.init-r1
new file mode 100755
index 000000000000..6c34328b6f32
--- /dev/null
+++ b/app-misc/dnetc/files/dnetc.init-r1
@@ -0,0 +1,40 @@
+#!/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 ${?}
+}