Version bump, remove old. This time 6.8 works with the latest c-icap.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 8 insertions, 65 deletions

diff --git a/net-proxy/squidclamav/ChangeLog b/net-proxy/squidclamav/ChangeLog
index 323a8876d39d..105614dca88e 100644
--- a/net-proxy/squidclamav/ChangeLog
+++ b/net-proxy/squidclamav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squidclamav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.22 2012/07/24 19:10:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.23 2012/07/26 19:48:35 flameeyes Exp $
+
+*squidclamav-6.8 (26 Jul 2012)
+
+  26 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +squidclamav-6.8.ebuild,
+  -squidclamav-6.5.ebuild, -squidclamav-6.7.ebuild:
+  Version bump, remove old. This time 6.8 works with the latest c-icap.
 
 *squidclamav-6.7 (24 Jul 2012)
 
diff --git a/net-proxy/squidclamav/squidclamav-6.7.ebuild b/net-proxy/squidclamav/squidclamav-6.7.ebuild
deleted file mode 100644
index ad0e5125844e..000000000000
--- a/net-proxy/squidclamav/squidclamav-6.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-6.7.ebuild,v 1.1 2012/07/24 19:10:40 flameeyes Exp $
-
-EAPI=4
-
-inherit libtool autotools
-
-DESCRIPTION="HTTP Antivirus for Squid based on ClamAv and ICAP"
-HOMEPAGE="http://squidclamav.darold.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-proxy/c-icap"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# version 6.3 causes maintainer-mode rebuild from tarball, and
-	# contains acinclude.m4 with libtool macros which cause trouble.
-	rm acinclude.m4 || die
-	eautoreconf
-	elibtoolize
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-
-	# delete its own documentation installed
-	rm -r "${D}"/usr/share/${PN} || die
-
-	dodoc README AUTHORS ChangeLog
-
-	# Fix configuration file to adapt to the Gentoo configuration
-	sed -i \
-		-e '/clamd_local/s:\.ctl:.sock:' \
-		"${D}"/etc/squidclamav.conf || die
-}
-
-pkg_postinst() {
-	elog "Starting from version 6, Squid Clamav is now a module for the c-icap"
-	elog "server, which is called from squid, rather than being a redirector"
-	elog "directly."
-	elog ""
-	elog "To enable the service, you should add this to your c-icap.conf file:"
-	elog ""
-	elog "    Service clamav squidclamav.so"
-	elog ""
-	elog "And then this to squid.conf (for a local ICAP server):"
-	elog ""
-	elog "    icap_enable on"
-	elog ""
-	elog "    # not strictly needed, but useful for special access"
-	elog "    icap_send_client_ip on"
-	elog "    icap_send_client_username on"
-	elog ""
-	elog "    icap_service clamav respmod_precache bypass=0 icap://localhost:1344/clamav"
-	elog "    adaptation_access clamav allow all"
-}
diff --git a/net-proxy/squidclamav/squidclamav-6.5.ebuild b/net-proxy/squidclamav/squidclamav-6.8.ebuild
index 5d65aec64ef4..aa8bc87fc679 100644
--- a/net-proxy/squidclamav/squidclamav-6.5.ebuild
+++ b/net-proxy/squidclamav/squidclamav-6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-6.5.ebuild,v 1.1 2012/01/15 22:03:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-6.8.ebuild,v 1.1 2012/07/26 19:48:35 flameeyes Exp $
 
 EAPI=4