Version bump. Removed old ebuilds. Correct --with-sendmail in 0.85.1-r1.

Package-Manager: portage-2.0.51.22-r1

10 files changed, 25 insertions, 176 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index bfe23af935c1..dc30e356a9db 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,14 @@
 # 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.83 2005/06/18 20:35:18 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.84 2005/06/21 01:16:38 ticho Exp $
+
+*clamav-0.86 (21 Jun 2005)
+
+  21 Jun 2005; Andrej Kacian <ticho@gentoo.org> -clamav-0.83.ebuild,
+  -clamav-0.84.ebuild, clamav-0.85.1-r1.ebuild, -clamav-0.86_rc1.ebuild,
+  +clamav-0.86.ebuild:
+  Version bump. Backport solution for bug #96373 to 0.85.1-r1. Remove old
+  ebuilds.
 
   18 Jun 2005; Andrej Kacian <ticho@gentoo.org> clamav-0.86_rc1.ebuild:
   Point clamav to correct sendmail binary if mailwrapper USE flag is enabled.
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index abee4e191643..4ec2bb840727 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -2,21 +2,17 @@
 Hash: SHA1
 
 MD5 34a649543043b4506c5ecdca94ddad41 clamav-0.85.ebuild 2314
-MD5 bf2cf15ce5fddd93fffa28e8b0a3f50f clamav-0.84.ebuild 2314
-MD5 73c5f5661cf66137aa14ba91d833f32a clamav-0.85.1-r1.ebuild 3567
+MD5 a680e10fbd5a60b1efa6f4fe2b57f3ab clamav-0.85.1-r1.ebuild 3663
 MD5 921a56174bc3634808df37537d77ea1d clamav-0.85.1.ebuild 3326
 MD5 689c7676f16b3126b2c3f9271f7c2a1e clamav-0.85-r1.ebuild 3290
-MD5 3304ead313386e3bf10577005daf6209 clamav-0.86_rc1.ebuild 3748
-MD5 bfe6ed64b0123624511b7a82c80db793 ChangeLog 16799
+MD5 7a832f77b721edd70e3aa547dc744a60 clamav-0.86.ebuild 3705
+MD5 d0b3c64743cbd7b23ec1ac5e868efb02 ChangeLog 17078
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
-MD5 6ea55388f51845c2f815589dfed047a4 clamav-0.83.ebuild 2332
 MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85-r1 64
 MD5 08f7b320461c04bbb88555e389c2e544 files/clamav-milter.README.gentoo 1124
-MD5 9807ac686d54e104f1c86fc1b0cbf23d files/digest-clamav-0.86_rc1 67
 MD5 102cc388dbea3446ba249cfc2e80cff3 files/digest-clamav-0.85.1 66
-MD5 9bbf2754f8178fd5164875d784aa9ffa files/digest-clamav-0.83 64
-MD5 3e9877b8901f604bd65ea89ff18833b6 files/digest-clamav-0.84 64
 MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85 64
+MD5 f39518e9307018776f037f161e788d2a files/digest-clamav-0.86 64
 MD5 f6bf5b894e60e8686cb5a36ba240e1ef files/clamd.rc.new 2032
 MD5 102cc388dbea3446ba249cfc2e80cff3 files/digest-clamav-0.85.1-r1 66
 MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193
@@ -24,7 +20,7 @@ MD5 1b3268d3723e003ad99bf706e6bf4312 files/clamd.rc 1444
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD4DBQFCtIW7QlM6RnzZP+IRAjDQAJjpFSddYFePeu8A2CGuIHHLl29wAJ4rKVSR
-yN+ndda/SJGxhv9wnqHgfQ==
-=oX/I
+iD8DBQFCt2qOQlM6RnzZP+IRAueBAKCBTAluvrPsy316nKQBbk2xWOze3wCePalA
+LiNwQb2h08HUp5rZDQE+OeM=
+=QDKo
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.83.ebuild b/app-antivirus/clamav/clamav-0.83.ebuild
deleted file mode 100644
index dca38df7f0d6..000000000000
--- a/app-antivirus/clamav/clamav-0.83.ebuild
+++ /dev/null
@@ -1,78 +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.83.ebuild,v 1.11 2005/05/01 18:09:54 ticho Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/clamav/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 hppa alpha ppc64"
-IUSE="crypt milter selinux"
-
-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"
-RDEPEND="selinux? ( sec-policy/selinux-clamav )"
-PROVIDE="virtual/antivirus"
-
-#S="${WORKDIR}/${P/_/}"
-
-pkg_setup() {
-	if use milter; then
-		if ! built_with_use mail-mta/sendmail milter; 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 /bin/false /dev/null clamav
-	pwconv || die
-}
-
-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 milter && myconf="${myconf} --enable-milter"
-	econf ${myconf} --with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog TODO FAQ INSTALL
-	newinitd ${FILESDIR}/clamd.rc clamd
-	newconfd ${FILESDIR}/clamd.conf clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-}
-
-pkg_postinst() {
-	echo
-	einfo "NOTE: As of clamav-0.80, the config file for clamd is no longer"
-	einfo "      /etc/clamav.conf, but /etc/clamd.conf. Adjust your"
-	einfo "      configuration accordingly before (re)starting clamd."
-	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 howto setup the clamav-milter..."
-		einfo ""
-		einfo "less /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.84.ebuild b/app-antivirus/clamav/clamav-0.84.ebuild
deleted file mode 100644
index 907a3295df16..000000000000
--- a/app-antivirus/clamav/clamav-0.84.ebuild
+++ /dev/null
@@ -1,76 +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.84.ebuild,v 1.1 2005/05/01 18:09:54 ticho Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/clamav/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~hppa ~alpha ~ppc64 ~ia64"
-IUSE="crypt milter selinux"
-
-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"
-RDEPEND="selinux? ( sec-policy/selinux-clamav )"
-PROVIDE="virtual/antivirus"
-
-pkg_setup() {
-	if use milter; then
-		if ! built_with_use mail-mta/sendmail milter; 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 /bin/false /dev/null clamav
-	pwconv || die
-}
-
-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 milter && myconf="${myconf} --enable-milter"
-	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
-	newinitd ${FILESDIR}/clamd.rc clamd
-	newconfd ${FILESDIR}/clamd.conf clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-}
-
-pkg_postinst() {
-	echo
-	einfo "NOTE: As of clamav-0.80, the config file for clamd is no longer"
-	einfo "      /etc/clamav.conf, but /etc/clamd.conf. Adjust your"
-	einfo "      configuration accordingly before (re)starting clamd."
-	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 howto setup the clamav-milter..."
-		einfo ""
-		einfo "less /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.85.1-r1.ebuild b/app-antivirus/clamav/clamav-0.85.1-r1.ebuild
index 976e5854d4e8..c3b50b992d99 100644
--- a/app-antivirus/clamav/clamav-0.85.1-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.85.1-r1.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.85.1-r1.ebuild,v 1.9 2005/06/18 10:51:53 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.85.1-r1.ebuild,v 1.10 2005/06/21 01:16:38 ticho Exp $
 
 inherit eutils flag-o-matic
 
@@ -49,7 +49,11 @@ src_compile() {
 	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 milter && {
+		myconf="${myconf} --enable-milter"
+		use mailwrapper && \
+			myconf="${myconf} --with-sendmail=/usr/sbin/sendmail.sendmail"
+	}
 
 	econf ${myconf} --with-dbdir=/var/lib/clamav || die
 	emake || die
diff --git a/app-antivirus/clamav/clamav-0.86_rc1.ebuild b/app-antivirus/clamav/clamav-0.86.ebuild
index e80a5bcdb2d8..049a66952354 100644
--- a/app-antivirus/clamav/clamav-0.86_rc1.ebuild
+++ b/app-antivirus/clamav/clamav-0.86.ebuild
@@ -1,13 +1,12 @@
 # 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_rc1.ebuild,v 1.2 2005/06/18 20:35:18 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.86.ebuild,v 1.1 2005/06/21 01:16:38 ticho Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
-MY_P=${P/_/}
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/clamav/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,8 +25,6 @@ RDEPEND="${DEPEND}
 	sys-apps/grep"
 PROVIDE="virtual/antivirus"
 
-S=${WORKDIR}/${MY_P}
-
 pkg_setup() {
 	if use milter; then
 		if [ ! -e /usr/lib/libmilter.a ] ; then
diff --git a/app-antivirus/clamav/files/digest-clamav-0.83 b/app-antivirus/clamav/files/digest-clamav-0.83
deleted file mode 100644
index eedd2c24c2fb..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.83
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3a1b6bbda8095c5aae4eb7bc753804c clamav-0.83.tar.gz 3653658
diff --git a/app-antivirus/clamav/files/digest-clamav-0.84 b/app-antivirus/clamav/files/digest-clamav-0.84
deleted file mode 100644
index 53c23dd21f81..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.84
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c43213da01d510faf117daa9a4d5326c clamav-0.84.tar.gz 4006624
diff --git a/app-antivirus/clamav/files/digest-clamav-0.86 b/app-antivirus/clamav/files/digest-clamav-0.86
new file mode 100644
index 000000000000..a9deb3804d54
--- /dev/null
+++ b/app-antivirus/clamav/files/digest-clamav-0.86
@@ -0,0 +1 @@
+MD5 1c886e4f4f4c3e4e76250b7b52c000b4 clamav-0.86.tar.gz 3973117
diff --git a/app-antivirus/clamav/files/digest-clamav-0.86_rc1 b/app-antivirus/clamav/files/digest-clamav-0.86_rc1
deleted file mode 100644
index ba37e43b7533..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.86_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eada03e9fb2f25440b606a5c44d45db2 clamav-0.86rc1.tar.gz 4181704