Version bump; remove old.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 27 insertions, 17 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/Manifest b/net-proxy/squidclamav/Manifest
index 6fda2cd0a6dc..f9112d3bed5b 100644
--- a/net-proxy/squidclamav/Manifest
+++ b/net-proxy/squidclamav/Manifest
@@ -2,16 +2,16 @@
 Hash: SHA1
 
 AUX squidclamav-6.1-crash.patch 704 RMD160 5803802a5bf926876e81f99a1f268468cef75393 SHA1 56a379a00c96825f971bcb6a6f83900cca4b0a0e SHA256 d2bfb3c4894a05f9f435252b6625dd7c07c05d84f77c0cb633d8214d82b2ebad
-DIST squidclamav-6.1.tar.gz 864708 RMD160 0d05aaf1337635d534f752fef64cfa1bfd518c19 SHA1 9e63ef4b34b8934a97dd5ae61706ca9a2bab276e SHA256 7f85a45949444c56c3765092607c4d5c65ccc2f3abd168fef4ca3fe16e9270fc
 DIST squidclamav-6.4.tar.gz 840856 RMD160 5aa714479aa84db2cd959acab630998f2d46e0ac SHA1 8953c45572a08d36d2d5b86eb7cb88062c179f8a SHA256 d057ed4dc688fb0e0152dd7a6bb0541b0172451229cbd6b3819509a4a42d2f12
-EBUILD squidclamav-6.1.ebuild 1688 RMD160 af5322e9d80b53f517a86a8841f2e9e3691adde7 SHA1 1311396abb401907945d19c0b330f2bf61c66e26 SHA256 0767bd00d9f6075cd631126b9d74451a2c6b1f2fa03d855770afe2846d8eadcf
+DIST squidclamav-6.5.tar.gz 842470 RMD160 93eaa30addb70a952b2eda865bb11fe3900a7426 SHA1 e43206368c46c25bba6cdc8452af1c4b2d5dfb3b SHA256 4bf9050fe2209d6053e7fdaba9636ec3b7f0e7428f43df2faf48a579ad2e3fc4
 EBUILD squidclamav-6.4.ebuild 1800 RMD160 ffec4c1bb31170d123dabbab8de07b0be7821dfb SHA1 7338297c1677b7e402ce138c493fe290163ded22 SHA256 305dda0237bd1d7421fb35b6863cb22be434ecf5eb62a6b6c7caffbb070b580b
-MISC ChangeLog 3343 RMD160 bb8bdb7aae658966a5c3e6e4e6f8de2ca489b6d1 SHA1 c2aaa8c2ada67062b75d8777ae6b3836ce5c0693 SHA256 97f33f54c182e56379340033941fe47b4a97c8fa2bdcc226ce957e2fec4c6303
+EBUILD squidclamav-6.5.ebuild 1803 RMD160 3964ccd2ccddef9b12d8ef2f7c7da77f50fc9bb2 SHA1 c9ab65e3f3ef8543efa0fd106d5b2684c154822f SHA256 84e5a987e25493f722193080937d59a5c30b5cf08d845fc72b77616a40e59a75
+MISC ChangeLog 3513 RMD160 33a731bc7df5d8ac2ba8f872bd3719b99ee444d6 SHA1 cfe7c4f5d0ebe1d0c544fe20ef00c0b0f05500ae SHA256 c8970ee003033dfcb38c9a70b39453b74f80c27c97bc8033a10a3ff9ca253d67
 MISC metadata.xml 601 RMD160 b1d903cfa58a59a30b7927289ee7ece696dcb8a0 SHA1 e5f0e64372872f416af03774c8dc733550934663 SHA256 97bfe798448c67e1d15b82b7acf38f5ff3641a40e5f90d7cc5e57d907342a17d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6oJfwACgkQp5vW4rUFj5rlwACeIw6HbX5gu+kb5nN2A8EN3qTY
-eeMAoKau0Yc70t0WNCNStoD+tv0M+IoZ
-=X3PG
+iEYEARECAAYFAk8TTRIACgkQAiZjviIA2XhyiQCdFVe2XIxrktKYKGaRj56/b6LX
+X6EAn3mv3s/XxWhCF4eyiY1wA70mzxTb
+=GHmZ
 -----END PGP SIGNATURE-----
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
 }