Remove old beta version. Install support for libclamav when clamav USE flag is enabled (#172302).

(Portage version: 2.1.2.2)

7 files changed, 13 insertions, 206 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 9eb3cf237696..5024dbf98cbc 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.25 2007/02/01 23:06:00 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.26 2007/03/26 21:51:41 mrness Exp $
+
+*dansguardian-2.9.8.2_beta-r1 (26 Mar 2007)
+
+  26 Mar 2007; Alin Năstac <mrness@gentoo.org>
+  -files/dansguardian-2.9.8.1-gentoo.patch,
+  -files/dansguardian-2.9.8.1-uclibc++.patch,
+  -dansguardian-2.9.8.1_beta.ebuild, -dansguardian-2.9.8.2_beta.ebuild,
+  +dansguardian-2.9.8.2_beta-r1.ebuild:
+  Remove old beta version. Install support for libclamav when clamav USE flag
+  is enabled (#172302).
 
 *dansguardian-2.9.8.2_beta (01 Feb 2007)
 
diff --git a/net-proxy/dansguardian/dansguardian-2.9.8.1_beta.ebuild b/net-proxy/dansguardian/dansguardian-2.9.8.1_beta.ebuild
deleted file mode 100644
index 0ddfd5380c4c..000000000000
--- a/net-proxy/dansguardian/dansguardian-2.9.8.1_beta.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.9.8.1_beta.ebuild,v 1.1 2006/12/19 18:22:04 mrness Exp $
-
-inherit eutils autotools
-
-MY_P=${P/_beta/}
-
-DESCRIPTION="Web content filtering via proxy"
-HOMEPAGE="http://dansguardian.org"
-SRC_URI="http://dansguardian.org/downloads/2/Beta/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clamav kaspersky debug ntlm pcre"
-
-DEPEND="!net-proxy/dansguardian-dgav
-	pcre? ( >=dev-libs/libpcre-6.0 )
-	clamav? ( app-antivirus/clamav )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if has_version "<${CATEGORY}/${PN}-2.9" ; then
-		ewarn "This version introduces brand new USE flags:"
-		ewarn "   clamav kaspersky ntlm pcre"
-		echo
-
-		local f="${ROOT}/etc/dansguardian"
-		f=${f//\/\///}
-		if [ -d "${f}" ] ; then
-			eerror "The structure of ${f} has changed in this version!"
-			eerror "For avoiding confusion, you must either move or delete the old ${f},"
-			eerror "then continue with the upgrade:"
-			eerror "   mv '${f}' '${f}.old'"
-			eerror "   emerge --resume"
-			die "Obsolete config files detected"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P%_beta}-gentoo.patch"
-	epatch "${FILESDIR}/${P%_beta}-uclibc++.patch"
-
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="--with-logdir=/var/log/dansguardian
-		--with-piddir=/var/run
-		$(use_enable pcre)
-		$(use_enable ntlm)
-		--enable-fancydm
-		--enable-email"
-	if use clamav; then
-		myconf="${myconf} --enable-clamd=yes
-			--with-proxyuser=clamav
-			--with-proxygroup=clamav"
-	fi
-	if use kaspersky; then
-		myconf="${myconf} --enable-kavd"
-	fi
-	if use debug; then
-		myconf="${myconf} --with-dgdebug=on"
-	fi
-
-	econf ${myconf} || die "configure failed"
-
-	emake OPTIMISE="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	make "DESTDIR=${D}" install || die "make install failed"
-
-	# Copying init script
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/dansguardian.init" dansguardian
-
-	if use clamav; then
-		sed -r -i -e 's/[ \t]+need net.*/& clamd/' "${D}/etc/init.d/dansguardian"
-		sed -r -i -e 's/^#( *contentscanner *=.*clamdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
-		sed -r -i -e 's/^#( *clamdudsfile *=.*)/\1/' "${D}/etc/dansguardian/contentscanners/clamdscan.conf"
-	elif use kaspersky; then
-		sed -r -i -e 's/^#( *contentscanner *=.*kavdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
-	fi
-
-	# Copying logrotation file
-	exeinto /etc/logrotate.d
-	newexe "${FILESDIR}/dansguardian.logrotate" dansguardian
-
-	keepdir /var/log/dansguardian
-	fperms o-rwx /var/log/dansguardian
-}
-
-pkg_postinst() {
-	local runas="nobody:nobody"
-	if use clamav ; then
-		runas="clamav:clamav"
-	fi
-	ewarn "The dansguardian daemon will run by default as user & group ${runas}"
-
-	if [ -d "${ROOT}/var/log/dansguardian" ] ; then
-		chown -R ${runas} "${ROOT}/var/log/dansguardian"
-		chmod o-rwx "${ROOT}/var/log/dansguardian"
-	fi
-}
diff --git a/net-proxy/dansguardian/dansguardian-2.9.8.2_beta.ebuild b/net-proxy/dansguardian/dansguardian-2.9.8.2_beta-r1.ebuild
index a76004d7165d..afa3cae041bd 100644
--- a/net-proxy/dansguardian/dansguardian-2.9.8.2_beta.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.9.8.2_beta-r1.ebuild
@@ -1,6 +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/dansguardian/dansguardian-2.9.8.2_beta.ebuild,v 1.1 2007/02/01 23:06:00 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.9.8.2_beta-r1.ebuild,v 1.1 2007/03/26 21:51:41 mrness Exp $
 
 inherit eutils autotools
 
@@ -58,7 +58,7 @@ src_compile() {
 		--enable-fancydm
 		--enable-email"
 	if use clamav; then
-		myconf="${myconf} --enable-clamd=yes
+		myconf="${myconf} --enable-clamd --enable-clamav
 			--with-proxyuser=clamav
 			--with-proxygroup=clamav"
 	fi
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.8.1-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.8.1-gentoo.patch
deleted file mode 100644
index 4bf1e176846c..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.8.1-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru dansguardian-2.9.8.1.orig/doc/dansguardian.8 dansguardian-2.9.8.1/doc/dansguardian.8
---- dansguardian-2.9.8.1.orig/doc/dansguardian.8	2006-10-16 19:17:10.000000000 +0300
-+++ dansguardian-2.9.8.1/doc/dansguardian.8	2006-12-19 19:59:02.000000000 +0200
-@@ -3,7 +3,7 @@
- .SH NAME
- DansGuardian 2
- .SH SYNOPSIS
--/etc/rc.d/init.d/dansguardian [stop|start|status|restart]
-+/etc/init.d/dansguardian [stop|start|status|restart|reload]
- .SH DESCRIPTION
- An Introduction
- 
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.8.1-uclibc++.patch b/net-proxy/dansguardian/files/dansguardian-2.9.8.1-uclibc++.patch
deleted file mode 100644
index 6338b13796be..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.8.1-uclibc++.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nru dansguardian-2.9.8.1.orig/configure.ac dansguardian-2.9.8.1/configure.ac
---- dansguardian-2.9.8.1.orig/configure.ac	2006-11-17 13:59:00.000000000 +0200
-+++ dansguardian-2.9.8.1/configure.ac	2006-12-19 19:59:56.000000000 +0200
-@@ -104,6 +104,7 @@
- AC_CHECK_FUNCS([dup2 gettimeofday memset select])
- AC_CHECK_FUNCS([strerror strstr strtol])
- AC_CHECK_FUNCS([setuid setgid umask seteuid setreuid setlocale strdup])
-+AC_SEARCH_LIBS([floor], [m])
- AC_SEARCH_LIBS([gethostbyname], [nsl])
- AC_SEARCH_LIBS([socket], [socket], [], [
- 	AC_CHECK_LIB(
-diff -Nru dansguardian-2.9.8.1.orig/src/ConnectionHandler.cpp dansguardian-2.9.8.1/src/ConnectionHandler.cpp
---- dansguardian-2.9.8.1.orig/src/ConnectionHandler.cpp	2006-11-21 18:52:31.000000000 +0200
-+++ dansguardian-2.9.8.1/src/ConnectionHandler.cpp	2006-12-19 19:59:56.000000000 +0200
-@@ -32,6 +32,7 @@
- #include <syslog.h>
- #include <cerrno>
- #include <cstdio>
-+#include <ctime>
- #include <algorithm>
- #include <netdb.h>
- #include <cstdlib>
-diff -Nru dansguardian-2.9.8.1.orig/src/dansguardian.cpp dansguardian-2.9.8.1/src/dansguardian.cpp
---- dansguardian-2.9.8.1.orig/src/dansguardian.cpp	2006-11-29 17:03:55.000000000 +0200
-+++ dansguardian-2.9.8.1/src/dansguardian.cpp	2006-12-19 19:59:56.000000000 +0200
-@@ -27,6 +27,7 @@
- 
- #include <iostream>
- #include <cstdio>
-+#include <ctime>
- #include <unistd.h>
- #include <cerrno>
- #include <syslog.h>
-diff -Nru dansguardian-2.9.8.1.orig/src/DynamicURLList.cpp dansguardian-2.9.8.1/src/DynamicURLList.cpp
---- dansguardian-2.9.8.1.orig/src/DynamicURLList.cpp	2006-08-03 13:57:46.000000000 +0300
-+++ dansguardian-2.9.8.1/src/DynamicURLList.cpp	2006-12-19 19:59:56.000000000 +0200
-@@ -25,6 +25,7 @@
- 
- #include <syslog.h>
- #include <algorithm>
-+#include <ctime>
- #include <sys/stat.h>
- #include <sys/time.h>
- 
-diff -Nru dansguardian-2.9.8.1.orig/src/FatController.cpp dansguardian-2.9.8.1/src/FatController.cpp
---- dansguardian-2.9.8.1.orig/src/FatController.cpp	2006-11-27 14:08:55.000000000 +0200
-+++ dansguardian-2.9.8.1/src/FatController.cpp	2006-12-19 19:59:56.000000000 +0200
-@@ -33,6 +33,7 @@
- 
- #include <syslog.h>
- #include <csignal>
-+#include <ctime>
- #include <sys/stat.h>
- #include <pwd.h>
- #include <cerrno>
-diff -Nru dansguardian-2.9.8.1.orig/src/ListContainer.cpp dansguardian-2.9.8.1/src/ListContainer.cpp
---- dansguardian-2.9.8.1.orig/src/ListContainer.cpp	2006-11-29 18:01:24.000000000 +0200
-+++ dansguardian-2.9.8.1/src/ListContainer.cpp	2006-12-19 19:59:56.000000000 +0200
-@@ -29,6 +29,7 @@
- #include "RegExp.hpp"
- #include <cstdlib>
- #include <cstdio>
-+#include <ctime>
- #include <unistd.h>
- #include "String.hpp"
- #include <iostream>
-diff -Nru dansguardian-2.9.8.1.orig/src/ListManager.cpp dansguardian-2.9.8.1/src/ListManager.cpp
---- dansguardian-2.9.8.1.orig/src/ListManager.cpp	2006-01-04 12:19:59.000000000 +0200
-+++ dansguardian-2.9.8.1/src/ListManager.cpp	2006-12-19 19:59:56.000000000 +0200
-@@ -25,6 +25,7 @@
- 
- #include <syslog.h>
- #include <sys/stat.h>
-+#include <ctime>
- 
- 
- // GLOBALS
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.1_beta b/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.1_beta
deleted file mode 100644
index f74efa714f89..000000000000
--- a/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.1_beta
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b2461ccc8ac48569cf4293b969169478 dansguardian-2.9.8.1.tar.gz 468288
-RMD160 91377e5fa901b10266afbaf5c0e6265d6a9e2182 dansguardian-2.9.8.1.tar.gz 468288
-SHA256 64fd54e9416b98313c7afa30f82c44d3d6fdb4c67669cf61789299539504bde4 dansguardian-2.9.8.1.tar.gz 468288
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.2_beta b/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.2_beta-r1
index 12b0665f8bdf..12b0665f8bdf 100644
--- a/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.2_beta
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.2_beta-r1