Removed older ebuild.

(Portage version: 2.0.53_rc7)

3 files changed, 4 insertions, 76 deletions

diff --git a/app-antivirus/clamav/files/clamd.rc b/app-antivirus/clamav/files/clamd.rc
index 305626ff7d97..f6a3fc0f0db2 100644
--- a/app-antivirus/clamav/files/clamd.rc
+++ b/app-antivirus/clamav/files/clamd.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v 1.7 2005/09/29 11:54:42 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v 1.8 2005/11/09 16:40:05 ticho Exp $
 
 depend() {
 	use net
@@ -9,7 +9,7 @@ depend() {
 }
 
 start() {
-	local clamd_socket=`grep ^LocalSocket /etc/clamd.conf | cut -d\  -f 2`
+	local clamd_socket=`awk '$1 == "LocalSocket" { print $2 }' /etc/clamd.conf`
 	if [ "${START_CLAMD}" = "yes" ]; then
 		if [ -S "${clamd_socket:-/tmp/clamd}" ]; then
 			rm -f ${clamd_socket:-/tmp/clamd}
@@ -36,8 +36,8 @@ start() {
 			rm -f ${MILTER_SOCKET}
 		fi
 
-		local logfile=`grep -e "^LogFile" /etc/clamd.conf | cut -d\  -f 2`
-		local clamav_user=`grep -e "^User" /etc/clamd.conf | cut -d\  -f 2`
+		local logfile=`awk '$1 == "LogFile" { print $2 }' /etc/clamd.conf`
+		local clamav_user=`awk '$1 == "User" { print $2 }' /etc/clamd.conf`
 		if [[ -n "${logfile}" && -n "${clamav_user}" ]]; then
 			if [ ! -f "${logfile}" ]; then
 				touch ${logfile}
diff --git a/app-antivirus/clamav/files/clamd.rc.new b/app-antivirus/clamav/files/clamd.rc.new
deleted file mode 100644
index ab8994f63d61..000000000000
--- a/app-antivirus/clamav/files/clamd.rc.new
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc.new,v 1.4 2005/09/29 11:54:42 ticho Exp $
-
-depend() {
-	use net
-	provide antivirus
-}
-
-start() {
-	local clamd_socket=`awk '$1 == "LocalSocket" { print $2 }' /etc/clamd.conf`
-	if [ "${START_CLAMD}" = "yes" ]; then
-		if [ -S "${clamd_socket:-/tmp/clamd}" ]; then
-			rm -f ${clamd_socket:-/tmp/clamd}
-		fi
-		ebegin "Starting clamd"
-		start-stop-daemon --start --quiet \
-			--exec /usr/sbin/clamd
-		eend $? "Failed to start clamd"
-	fi
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Starting freshclam"
-		start-stop-daemon --start --quiet \
-			--exec /usr/bin/freshclam -- -d
-		retcode=$?
-		if [ ${retcode} = 1 ]; then
-			eend 0
-			einfo "Virus databases are already up to date."
-		else
-			eend ${retcode} "Failed to start freshclam"
-		fi
-	fi
-	if [ "${START_MILTER}" = "yes" ]; then
-		if [ -S "${MILTER_SOCKET}" ]; then
-			rm -f ${MILTER_SOCKET}
-		fi
-
-		local logfile=`awk '$1 == "LogFile" { print $2 }' /etc/clamd.conf`
-		local clamav_user=`awk '$1 == "User" { print $2 }' /etc/clamd.conf`
-		if [[ -n "${logfile}" && -n "${clamav_user}" ]]; then
-			if [ ! -f "${logfile}" ]; then
-				touch ${logfile}
-			fi	
-		chown ${clamav_user} ${logfile}
-		fi	
-
-		ebegin "Starting clamav-milter"
-		start-stop-daemon --start --quiet \
-			--exec /usr/sbin/clamav-milter -- ${MILTER_OPTS} ${MILTER_SOCKET}
-		eend $? "Failed to start clamav-milter"
-	fi
-}
-
-stop() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		ebegin "Stopping clamd"
-		start-stop-daemon --stop --quiet --name clamd
-		eend $? "Failed to stop clamd"
-	fi
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Stopping freshclam"
-		start-stop-daemon --stop --quiet --name freshclam
-		eend $? "Failed to stop freshclam"
-	fi
-	if [ "${START_MILTER}" = "yes" ]; then
-		ebegin "Stopping clamav-milter"
-		start-stop-daemon --stop --quiet --name clamav-milter
-		eend $? "Failed to stop clamav-milter"
-	fi
-}
diff --git a/app-antivirus/clamav/files/digest-clamav-0.86.2 b/app-antivirus/clamav/files/digest-clamav-0.86.2
deleted file mode 100644
index 6e827b7d2783..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.86.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 870de14ba123d6e9cba9850498c49f5d clamav-0.86.2.tar.gz 4094829