5 files changed, 22 insertions, 71 deletions
diff --git a/net-proxy/havp/ChangeLog b/net-proxy/havp/ChangeLog
index 9d5155a47f55..6b2f6fa83c21 100644
--- a/net-proxy/havp/ChangeLog
+++ b/net-proxy/havp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/havp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.17 2007/04/11 15:27:28 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.18 2007/05/13 16:56:58 mrness Exp $
+
+*havp-0.86 (13 May 2007)
+
+  13 May 2007; Alin Năstac <mrness@gentoo.org>
+  -files/havp-0.84-gentoo.patch, -havp-0.84.ebuild, +havp-0.86.ebuild:
+  Version bump (#178010).
 
   11 Apr 2007; Markus Ullmann <jokey@gentoo.org> havp-0.85.ebuild:
   Stable on x86 wrt bug #174124
diff --git a/net-proxy/havp/files/digest-havp-0.84 b/net-proxy/havp/files/digest-havp-0.84
deleted file mode 100644
index ba34765ecfb5..000000000000
--- a/net-proxy/havp/files/digest-havp-0.84
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70b843c501c831a68066af8e66801a30 havp-0.84.tar.gz 101758
-RMD160 cdeab72795d766e38df1ea600420f960a89191c0 havp-0.84.tar.gz 101758
-SHA256 28e84a72c61f656531e89e82742d017418fd2b8758d21a8087ef9f9e19396d7e havp-0.84.tar.gz 101758
diff --git a/net-proxy/havp/files/digest-havp-0.86 b/net-proxy/havp/files/digest-havp-0.86
new file mode 100644
index 000000000000..03542c54f6c7
--- /dev/null
+++ b/net-proxy/havp/files/digest-havp-0.86
@@ -0,0 +1,3 @@
+MD5 c99c8da224c72844882623086e2b1618 havp-0.86.tar.gz 104928
+RMD160 fe51ca226011042dfa94de829b391ad2e90ba9ad havp-0.86.tar.gz 104928
+SHA256 1649ab227c7fd7b4af5ab602a3cdff16c038965c6673c09a239d5df35fa88da8 havp-0.86.tar.gz 104928
diff --git a/net-proxy/havp/files/havp-0.84-gentoo.patch b/net-proxy/havp/files/havp-0.84-gentoo.patch
deleted file mode 100644
index 18dd35f1ec1b..000000000000
--- a/net-proxy/havp/files/havp-0.84-gentoo.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nru havp-0.84.orig/configure havp-0.84/configure
---- havp-0.84.orig/configure	2006-11-03 00:05:45.000000000 +0200
-+++ havp-0.84/configure	2007-01-31 19:21:44.000000000 +0200
-@@ -2578,19 +2578,19 @@
- 
- test "$prefix" = "NONE" && prefix=/usr/local
- cat >>confdefs.h <<_ACEOF
--#define CONFIGFILE "$prefix/etc/havp/havp.config"
-+#define CONFIGFILE "$sysconfdir/havp/havp.config"
- _ACEOF
- 
- cat >>confdefs.h <<_ACEOF
--#define WHITELISTFILE "$prefix/etc/havp/whitelist"
-+#define WHITELISTFILE "$sysconfdir/havp/whitelist"
- _ACEOF
- 
- cat >>confdefs.h <<_ACEOF
--#define BLACKLISTFILE "$prefix/etc/havp/blacklist"
-+#define BLACKLISTFILE "$sysconfdir/havp/blacklist"
- _ACEOF
- 
- cat >>confdefs.h <<_ACEOF
--#define TEMPLATEPATH "$prefix/etc/havp/templates/en"
-+#define TEMPLATEPATH "$sysconfdir/havp/templates/en"
- _ACEOF
- 
- 
-diff -Nru havp-0.84.orig/etc/havp/havp.config havp-0.84/etc/havp/havp.config
---- havp-0.84.orig/etc/havp/havp.config	2006-12-28 15:42:03.000000000 +0200
-+++ havp-0.84/etc/havp/havp.config	2007-01-31 19:22:13.000000000 +0200
-@@ -187,7 +187,7 @@
- # Path to template files.
- #
- # Default:
--# TEMPLATEPATH /usr/local/etc/havp/templates/en
-+# TEMPLATEPATH /etc/havp/templates/en
- 
- #
- # Set to true if you want to prefer Whitelist.
-@@ -201,13 +201,13 @@
- # List of URLs not to scan.
- #
- # Default:
--# WHITELIST /usr/local/etc/havp/whitelist
-+# WHITELIST /etc/havp/whitelist
- 
- #
- # List of URLs that are denied access.
- #
- # Default:
--# BLACKLIST /usr/local/etc/havp/blacklist
-+# BLACKLIST /etc/havp/blacklist
- 
- #
- # Is scanner error fatal?
diff --git a/net-proxy/havp/havp-0.84.ebuild b/net-proxy/havp/havp-0.86.ebuild
index 65a697372830..f585284de4a1 100644
--- a/net-proxy/havp/havp-0.84.ebuild
+++ b/net-proxy/havp/havp-0.86.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.84.ebuild,v 1.4 2007/02/27 12:12:04 mrness Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.86.ebuild,v 1.1 2007/05/13 16:56:58 mrness Exp $
 
 DESCRIPTION="HTTP AntiVirus Proxy"
 HOMEPAGE="http://www.server-side.de/"
@@ -10,24 +8,19 @@ SRC_URI="http://www.server-side.de/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="clamav ssl"
 
-DEPEND="clamav? ( app-antivirus/clamav )"
+DEPEND="clamav? ( >=app-antivirus/clamav-0.90 )"
 
 pkg_setup() {
 	enewgroup havp
 	enewuser havp -1 -1 /etc/havp havp
 }
 
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
 src_compile() {
-	econf $(use_enable clamav) \
+	econf --localstatedir=/var \
+		$(use_enable clamav) \
 		$(use_enable ssl ssl-tunnel) || die "configure failed"
 	emake || die "make failed"
 }
@@ -64,4 +57,11 @@ pkg_postinst() {
 		ewarn "      It is impossible to decrypt data sent through SSL connections without knowing"
 		ewarn "      the private key of the used certificate."
 	fi
+
+	if use clamav; then
+		echo
+		ewarn "If you plan to use clamav daemon, you should make sure clamav user can read"
+		ewarn "/var/tmp/havp content. This can be accomplished by enabling AllowSupplementaryGroups"
+		ewarn "in /etc/clamd.conf and adding clamav user to the havp group."
+	fi
 }