summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-01-15 22:03:12 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-01-15 22:03:12 +0000
commit74e644e4f3c556b562ae16ea875f9545044525e2 (patch)
treee21fcfbcc44570db50f21b057ad62b8d16e9d6fa /net-proxy/squidclamav
parentmake dependency to qt-assistant[doc] optionally (diff)
downloadgentoo-2-74e644e4f3c556b562ae16ea875f9545044525e2.tar.gz
gentoo-2-74e644e4f3c556b562ae16ea875f9545044525e2.tar.bz2
gentoo-2-74e644e4f3c556b562ae16ea875f9545044525e2.zip
Version bump; remove old.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'net-proxy/squidclamav')
-rw-r--r--net-proxy/squidclamav/ChangeLog10
-rw-r--r--net-proxy/squidclamav/squidclamav-6.5.ebuild (renamed from net-proxy/squidclamav/squidclamav-6.1.ebuild)22
2 files changed, 21 insertions, 11 deletions
diff --git a/net-proxy/squidclamav/ChangeLog b/net-proxy/squidclamav/ChangeLog
index 7e108dc02b4d..28b6aa76e31d 100644
--- a/net-proxy/squidclamav/ChangeLog
+++ b/net-proxy/squidclamav/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-proxy/squidclamav
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.19 2011/10/26 15:23:23 chainsaw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.20 2012/01/15 22:03:12 flameeyes Exp $
+
+*squidclamav-6.5 (15 Jan 2012)
+
+ 15 Jan 2012; Diego E. Pettenò <flameeyes@gentoo.org> +squidclamav-6.5.ebuild,
+ -squidclamav-6.1.ebuild:
+ Version bump; remove old.
26 Oct 2011; Tony Vroon <chainsaw@gentoo.org> squidclamav-6.4.ebuild:
Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian
diff --git a/net-proxy/squidclamav/squidclamav-6.1.ebuild b/net-proxy/squidclamav/squidclamav-6.5.ebuild
index 6b185fdc7d1a..5d65aec64ef4 100644
--- a/net-proxy/squidclamav/squidclamav-6.1.ebuild
+++ b/net-proxy/squidclamav/squidclamav-6.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1.ebuild,v 1.4 2011/07/24 09:22:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-6.5.ebuild,v 1.1 2012/01/15 22:03:12 flameeyes Exp $
-EAPI=2
+EAPI=4
-inherit eutils
+inherit libtool autotools
DESCRIPTION="HTTP Antivirus for Squid based on ClamAv and ICAP"
HOMEPAGE="http://squidclamav.darold.net/"
@@ -12,28 +12,32 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="net-proxy/c-icap"
DEPEND="${RDEPEND}"
src_prepare() {
- epatch "${FILESDIR}/${P}-crash.patch"
+ # 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 || die
+ 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 || die
+ dodoc README AUTHORS ChangeLog
# Fix configuration file to adapt to the Gentoo configuration
sed -i \
- -e '/clamd_local/s:/tmp/clamd:/var/run/clamav/clamd.sock:' \
+ -e '/clamd_local/s:\.ctl:.sock:' \
"${D}"/etc/squidclamav.conf || die
}