Removed older ebuild.

Package-Manager: portage-2.0.53_rc7

8 files changed, 31 insertions, 208 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 09e598259e78..23a645a9c7dc 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.121 2005/11/06 11:06:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.122 2005/11/09 16:40:05 ticho Exp $
+
+  09 Nov 2005; Andrej Kacian <ticho@gentoo.org> files/clamd.rc,
+  -files/clamd.rc.new, -clamav-0.86.2.ebuild, clamav-0.87.ebuild,
+  clamav-0.87.1.ebuild:
+  Removed older ebuild.
 
   06 Nov 2005; Simon Stelling <blubb@gentoo.org> clamav-0.87.1.ebuild:
   stable on amd64 wrt bug 109213
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index d85b87d4fe31..83116836c2e0 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,12 +1,19 @@
-MD5 5ac16a6c38105c9c6835ca92b4a42845 ChangeLog 21070
-MD5 9845a5e672942a8134ad748b3862221e clamav-0.87.ebuild 3689
-MD5 7304aae2b2d84ee37b4a4a905839f58a clamav-0.87.1.ebuild 3689
-MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
-MD5 61c732b815d6224b12e0ce8d9b61278f clamav-0.86.2.ebuild 3685
-MD5 17e487f0452933ea8ab559a404329cf2 files/digest-clamav-0.87 64
-MD5 25387621d9eaf247726bf74459264749 files/digest-clamav-0.87.1 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3614ce5863cd4ca5b5ebf0e16e661dfd ChangeLog 21249
+MD5 c6afe12050619c04aa8c3d37eb3b4cbc clamav-0.87.1.ebuild 3685
+MD5 ee939a755f330044fd5d41d798a896dc clamav-0.87.ebuild 3682
 MD5 08f7b320461c04bbb88555e389c2e544 files/clamav-milter.README.gentoo 1124
 MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193
-MD5 57ccf69fd65dfbb62e50aa0b27b29754 files/clamd.rc 2028
-MD5 9b6f44bf151d0091e67a26007bf08255 files/clamd.rc.new 2037
-MD5 8365b1166d97452566de3f0f5140ab43 files/digest-clamav-0.86.2 66
+MD5 1906bcd8209370d0a03fb066161f6d59 files/clamd.rc 2033
+MD5 17e487f0452933ea8ab559a404329cf2 files/digest-clamav-0.87 64
+MD5 25387621d9eaf247726bf74459264749 files/digest-clamav-0.87.1 66
+MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDciZ2QlM6RnzZP+IRAvOzAJ9iN15X8naKqGE6OVW/BUsKqSrU7ACfU+pA
+R6zaJgX5rGx0Cd+2EdIbbno=
+=DO0f
+-----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.86.2.ebuild b/app-antivirus/clamav/clamav-0.86.2.ebuild
deleted file mode 100644
index a2b01c1ad31f..000000000000
--- a/app-antivirus/clamav/clamav-0.86.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.86.2.ebuild,v 1.13 2005/09/29 11:54:42 ticho Exp $
-
-inherit eutils flag-o-matic fixheadtails
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="crypt milter selinux mailwrapper"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( mail-mta/sendmail )
-	>=sys-libs/zlib-1.2.1-r3
-	>=net-misc/curl-7.10.0
-	net-dns/libidn
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-clamav )
-	sys-apps/grep"
-PROVIDE="virtual/antivirus"
-
-pkg_setup() {
-	if use milter; then
-		if [ ! -e /usr/lib/libmilter.a ] ; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag. Either recompile sendmail with milter USE flag enabled, or disable"
-			ewarn "this flag for clamav as well to disable milter support."
-			die "need milter-enabled sendmail"
-		fi
-	fi
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_compile() {
-	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
-
-	local myconf
-
-	# we depend on fixed zlib, so we can disable this check to prevent redundant
-	# warning (bug #61749)
-	myconf="${myconf} --disable-zlib-vcheck"
-	# use id utility instead of /etc/passwd parsing (bug #72540)
-	myconf="${myconf} --enable-id-check"
-	use milter && {
-		myconf="${myconf} --enable-milter"
-		use mailwrapper && \
-			myconf="${myconf} --with-sendmail=/usr/sbin/sendmail.sendmail"
-	}
-
-	ht_fix_file configure
-	econf ${myconf} --with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ INSTALL
-	newconfd ${FILESDIR}/clamd.conf clamd
-	newinitd ${FILESDIR}/clamd.rc clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-
-	dodir /var/run/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/clamav
-	dodir /var/log/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	# Change /etc/clamd.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/clamd.conf
-
-	# Do the same for /etc/freshclam.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/freshclam.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/freshclam.conf
-
-	if use milter ; then
-		echo "START_MILTER=no" \
-			>> ${D}/etc/conf.d/clamd
-		echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \
-			>>${D}/etc/conf.d/clamd
-		echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \
-			>>${D}/etc/conf.d/clamd
-	fi
-}
-
-pkg_postinst() {
-	echo
-	ewarn "As of 0.85-r1, all settings from /etc/conf.d/clamd are ignored, except for"
-	ewarn "START_CLAMD, START_FRESHCLAM and MILTER related options. All settings are"
-	ewarn "read from /etc/clamd.conf and /etc/freshclam.conf, so double-check these two files."
-	echo
-	ewarn "Warning: clamd and/or freshclam have not been restarted."
-	ewarn "You should restart them with: /etc/init.d/clamd restart"
-	echo
-	if use milter ; then
-		einfo "For simple instructions how to setup the clamav-milter type:"
-		echo "  zless /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.87.1.ebuild b/app-antivirus/clamav/clamav-0.87.1.ebuild
index 78fb782bf2ae..a8f28b317b35 100644
--- a/app-antivirus/clamav/clamav-0.87.1.ebuild
+++ b/app-antivirus/clamav/clamav-0.87.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.87.1.ebuild,v 1.7 2005/11/06 11:06:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.87.1.ebuild,v 1.8 2005/11/09 16:40:05 ticho Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
@@ -63,7 +63,7 @@ src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ INSTALL
 	newconfd ${FILESDIR}/clamd.conf clamd
-	newinitd ${FILESDIR}/clamd.rc.new clamd
+	newinitd ${FILESDIR}/clamd.rc clamd
 	dodoc ${FILESDIR}/clamav-milter.README.gentoo
 
 	dodir /var/run/clamav
diff --git a/app-antivirus/clamav/clamav-0.87.ebuild b/app-antivirus/clamav/clamav-0.87.ebuild
index df53b359bce8..16c3bbff57ac 100644
--- a/app-antivirus/clamav/clamav-0.87.ebuild
+++ b/app-antivirus/clamav/clamav-0.87.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.87.ebuild,v 1.7 2005/10/02 11:06:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.87.ebuild,v 1.8 2005/11/09 16:40:05 ticho Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
@@ -63,7 +63,7 @@ src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ INSTALL
 	newconfd ${FILESDIR}/clamd.conf clamd
-	newinitd ${FILESDIR}/clamd.rc.new clamd
+	newinitd ${FILESDIR}/clamd.rc clamd
 	dodoc ${FILESDIR}/clamav-milter.README.gentoo
 
 	dodir /var/run/clamav
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