Closing #76178 and #68344.

5 files changed, 40 insertions, 18 deletions

diff --git a/app-misc/dnetc/ChangeLog b/app-misc/dnetc/ChangeLog
index dc71f631f51c..5e6c4f6aaf45 100644
--- a/app-misc/dnetc/ChangeLog
+++ b/app-misc/dnetc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/dnetc
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/ChangeLog,v 1.31 2004/10/05 13:34:50 pvdabeel Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/ChangeLog,v 1.32 2005/01/01 14:11:51 aliz Exp $
+
+*dnetc-2.9009.494 (01 Jan 2005)
+
+  01 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> dnetc-2.9007.489.ebuild,
+  dnetc-2.9009.494.ebuild:
+  Version bump, closing #68344.
+  Fixed buffer flushing, should close #76178."
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   dnetc-2.9008.490.ebuild:
diff --git a/app-misc/dnetc/Manifest b/app-misc/dnetc/Manifest
index d20932a80b8d..be6ca34b6a83 100644
--- a/app-misc/dnetc/Manifest
+++ b/app-misc/dnetc/Manifest
@@ -1,16 +1,16 @@
-MD5 99a56221d398bf9fbae4f37baf26891c ChangeLog 4286
-MD5 d8b1b2c172a5c975cc706ddf3200544c dnetc-2.9001.478.ebuild 1390
-MD5 4fa3dd1fb6994eb53356896cc5cbd7be dnetc-2.9002.479.ebuild 1386
 MD5 41ff63d1775394dc14ef29cc80794785 dnetc-2.9003.481-r1.ebuild 2037
+MD5 d8b1b2c172a5c975cc706ddf3200544c dnetc-2.9001.478.ebuild 1390
 MD5 5d1e9f38bf29c605eee5aa05850e196b dnetc-2.9005.483.ebuild 1863
-MD5 e7f7e830fb17c2ee89a7b863da0018e6 dnetc-2.9007.489.ebuild 1405
 MD5 c14d79f055b7884e91ebebd251c40526 dnetc-2.9008.490.ebuild 1732
+MD5 66f0711b21c48bbe62218f8069d883f4 ChangeLog 4495
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 0390697d72f0f6cd6a4c98fb47055fd7 dnetc-2.9009.494.ebuild 1879
+MD5 4fa3dd1fb6994eb53356896cc5cbd7be dnetc-2.9002.479.ebuild 1386
+MD5 b6444acd5a6c235ffe17bb3b528f4bc4 files/dnetc.conf 54
+MD5 d91f255c5d2573f5487c9638177208b7 files/dnetc.init 811
 MD5 043cbafd6324fd3848f2763c32e6da51 files/digest-dnetc-2.9001.478 77
 MD5 a0b9b9b76588f355da0a87fc76aba6db files/digest-dnetc-2.9002.479 73
-MD5 3c0a7355f235e3df772e08c29a7cff7b files/digest-dnetc-2.9003.481-r1 370
 MD5 b89d7982c82de8036592944c0b0dff96 files/digest-dnetc-2.9005.483 290
-MD5 4d6b88702235a3adf6a5730f1e10f37f files/digest-dnetc-2.9007.489 81
 MD5 de79a9083edb7a4acdbaadf8c6f55622 files/digest-dnetc-2.9008.490 223
-MD5 b6444acd5a6c235ffe17bb3b528f4bc4 files/dnetc.conf 54
-MD5 d91f255c5d2573f5487c9638177208b7 files/dnetc.init 811
+MD5 c1483bfbcdb311310a4497c13ffb3d1a files/digest-dnetc-2.9009.494 157
+MD5 3c0a7355f235e3df772e08c29a7cff7b files/digest-dnetc-2.9003.481-r1 370
diff --git a/app-misc/dnetc/dnetc-2.9007.489.ebuild b/app-misc/dnetc/dnetc-2.9009.494.ebuild
index ef74da392968..aacd2b293151 100644
--- a/app-misc/dnetc/dnetc-2.9007.489.ebuild
+++ b/app-misc/dnetc/dnetc-2.9009.494.ebuild
@@ -1,27 +1,41 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9007.489.ebuild,v 1.5 2004/07/11 02:19:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/dnetc-2.9009.494.ebuild,v 1.1 2005/01/01 14:11:51 aliz Exp $
 
 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 )"
+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="x86 -ppc -sparc -alpha -mips -hppa"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 RDEPEND="net-dns/bind-tools"
-S="${WORKDIR}/dnetc${MIN_PV}-linux-x86-elf-uclibc"
+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"
-		/opt/distributed.net/dnetc -quiet -flush
+		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
@@ -32,7 +46,7 @@ src_install() {
 	doexe dnetc
 
 	doman dnetc.1
-	dodoc CHANGES.txt dnetc.txt readme.*
+	dodoc docs/CHANGES.txt docs/dnetc.txt docs/readme.*
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/dnetc.init dnetc
 	insinto /etc/conf.d ; newins ${FILESDIR}/dnetc.conf dnetc
diff --git a/app-misc/dnetc/files/digest-dnetc-2.9007.489 b/app-misc/dnetc/files/digest-dnetc-2.9007.489
deleted file mode 100644
index 14a21467e6d0..000000000000
--- a/app-misc/dnetc/files/digest-dnetc-2.9007.489
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bccb288d483bd6ed54f29414d36e79e4 dnetc489-linux-x86-elf-uclibc.tar.gz 239694
diff --git a/app-misc/dnetc/files/digest-dnetc-2.9009.494 b/app-misc/dnetc/files/digest-dnetc-2.9009.494
new file mode 100644
index 000000000000..71a3b494c2b9
--- /dev/null
+++ b/app-misc/dnetc/files/digest-dnetc-2.9009.494
@@ -0,0 +1,2 @@
+MD5 646b8749424063f93fecac8596031a08 dnetc494-linux-x86-elf-uclibc.tar.gz 245503
+MD5 6893b9c942664b762f6509d281e257ad dnetc494-linux-amd64-elf.tar.gz 446966