remove old versions; version bump to the latest alpha version

Package-Manager: portage-2.0.54

10 files changed, 54 insertions, 162 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 6eb17dd2bdc4..83e7fc0bdd89 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.15 2006/02/07 20:53:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.16 2006/03/06 18:07:38 mrness Exp $
+
+*dansguardian-2.9.6.1_alpha (06 Mar 2006)
+
+  06 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  +files/dansguardian-2.9.6.1_alpha-gentoo.patch,
+  -dansguardian-2.8.0.4.ebuild, -dansguardian-2.8.0.6.ebuild,
+  -dansguardian-2.9.3.1_alpha.ebuild, +dansguardian-2.9.6.1_alpha.ebuild:
+  Remove obsolete versions. Version bump.
 
   07 Feb 2006; Simon Stelling <blubb@gentoo.org>
   dansguardian-2.8.0.6-r1.ebuild:
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index 7468c36df6af..1c776fc0493a 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -1,57 +1,26 @@
-MD5 c7f8df606c745977d865139be0b6af6c ChangeLog 6575
-RMD160 ed012713bb1b3858af8e3634ae73ed001a9d5f9d ChangeLog 6575
-SHA256 40798c19cf6564a25770dc0187e9205cde1a9674cebd5b496b669744ec887903 ChangeLog 6575
-MD5 66b41ef646913a4fe63153d4e76c4193 dansguardian-2.8.0.4.ebuild 1176
-RMD160 7fde3f025da33994b224fe41d2f8a565e6333a95 dansguardian-2.8.0.4.ebuild 1176
-SHA256 8cf7e9452321e86bfecbf964a0739afdf3708f987ad1fa1d301ea161818c39fc dansguardian-2.8.0.4.ebuild 1176
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 86a4cc59056ff4ac171f0def502f3d38 ChangeLog 6895
 MD5 731f8b248c22fd1b51895c8ee7b94d4c dansguardian-2.8.0.6-r1.ebuild 1239
-RMD160 8a34bcb679ec15d17b579b03d9e6e31104f04456 dansguardian-2.8.0.6-r1.ebuild 1239
-SHA256 eb4a6f0c1f68fb7721ecc57b0521c045893c943bd9467a52a47408cc8e352456 dansguardian-2.8.0.6-r1.ebuild 1239
-MD5 887c6bdeabb27180c88519f1403b877b dansguardian-2.8.0.6.ebuild 1179
-RMD160 5ca77ed8146b572cc3913a591af040be67cf8857 dansguardian-2.8.0.6.ebuild 1179
-SHA256 ba3478ead2b9f89c7ac7b3c2fcd09db638e1357f94da237167e1c64bcdb7b004 dansguardian-2.8.0.6.ebuild 1179
-MD5 a5991f287357da0f94385aef3f748a2c dansguardian-2.9.3.1_alpha.ebuild 2734
-RMD160 bfec9589e06f99e0edf43e2cec651445239e841e dansguardian-2.9.3.1_alpha.ebuild 2734
-SHA256 244c777511873e7f5dfb55e4b6baa25daa8d612e1e1063ac768a5db1090e6a1a dansguardian-2.9.3.1_alpha.ebuild 2734
 MD5 cc1855282d075dc27803a24c89946d65 dansguardian-2.9.3.2_alpha.ebuild 2920
-RMD160 43083bc2b48dd22b226cce42b649bcf2e30e1fd1 dansguardian-2.9.3.2_alpha.ebuild 2920
-SHA256 d1d3a1ba94145812bbd0ebc95668eae5daf2f0a98872f3d0fa61e0c0902bb05f dansguardian-2.9.3.2_alpha.ebuild 2920
+MD5 ca3bf676faec04208eda8265f1269bbd dansguardian-2.9.6.1_alpha.ebuild 2886
 MD5 0cf459b33bd205ff0e5d270cf1db72e0 files/dansguardian-2.8.0.6-gentoo.patch 886
-RMD160 efe8ca9b09dd5e37eef2bcee16c49792da6d2b30 files/dansguardian-2.8.0.6-gentoo.patch 886
-SHA256 bd79ef1899467389778c259281190922c86b186b4a87988d34b02ee845b62851 files/dansguardian-2.8.0.6-gentoo.patch 886
 MD5 f249b7117148a18fcf2c596cedaa40c0 files/dansguardian-2.9.3.1_alpha-gentoo.patch 471
-RMD160 3e0ff17c0aa2780072047decb8f73cc545a98563 files/dansguardian-2.9.3.1_alpha-gentoo.patch 471
-SHA256 ba0271132f944feeb443a349b8ea2f12c45a550dc0a67bb69ef23687a12cc5f9 files/dansguardian-2.9.3.1_alpha-gentoo.patch 471
 MD5 db7897c4f2af3a8223f92a17b1841216 files/dansguardian-2.9.3.2_alpha-gentoo.patch 471
-RMD160 52432ce02326ec8a174f69ad5de9b4b933239660 files/dansguardian-2.9.3.2_alpha-gentoo.patch 471
-SHA256 cbf5d91705d723779b2e213c7807e9e9c6820e2d4ccbf1e56c1f86da42af3e77 files/dansguardian-2.9.3.2_alpha-gentoo.patch 471
 MD5 85ee439015fd590f6410ea615e8acbf0 files/dansguardian-2.9.3.2_alpha-kaspersky-response.patch 1602
-RMD160 e6074bf82a7ffe2a18cfed5eb4310d872bb61ae1 files/dansguardian-2.9.3.2_alpha-kaspersky-response.patch 1602
-SHA256 b6073c94ce0abee8ce01174257eb71b8ad06cae9b978db8c6f077d645dfa2b27 files/dansguardian-2.9.3.2_alpha-kaspersky-response.patch 1602
+MD5 62aa94fc0e7270987eefc01771d04c73 files/dansguardian-2.9.6.1_alpha-gentoo.patch 471
 MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
-RMD160 9716fa42f87adb3f27e8009d2ff1da46ebdc8fa9 files/dansguardian-xnaughty-2.7.6-1.diff 2325
-SHA256 ae438113e94d2292e85dbf9be702b002e3f1b36b853bb7a7573e11786a1db9a7 files/dansguardian-xnaughty-2.7.6-1.diff 2325
 MD5 89d1e03feed0f074cadb635f786c3f32 files/dansguardian.init 826
-RMD160 99f250a3e37b0650a1665923c976ee9e7cdd32c2 files/dansguardian.init 826
-SHA256 af4252ed5126e7ff1e289107eae1feb5165030077a93e855c575249eb121edb0 files/dansguardian.init 826
 MD5 046d9ee8033553a881d5ee0586bf2a3d files/dansguardian.logrotate 188
-RMD160 c2c433f4209518a83725382f8952141a34d58d25 files/dansguardian.logrotate 188
-SHA256 124775c1a6dd20652e7b7511bb484c654ac63cc0c0a2baf2357d8ce7086867a2 files/dansguardian.logrotate 188
-MD5 579f2cac2dbebe18ff6900fd3aa87f66 files/digest-dansguardian-2.8.0.4 79
-RMD160 6e4fb5f069c7aa71ed90a64039ea3d2cf96e8d4d files/digest-dansguardian-2.8.0.4 79
-SHA256 47d75631d5b31dcc32e263a336fe42122fee76d597e6277e67216fb3bf7c4f6a files/digest-dansguardian-2.8.0.4 79
-MD5 421e49847907b8c4d53ccc01d17656e6 files/digest-dansguardian-2.8.0.6 79
-RMD160 fc511980f2ca8c9a60b3cc7bc42d547a2cc49b82 files/digest-dansguardian-2.8.0.6 79
-SHA256 efa195df8870a9183c3fd6588fa533ecbce8d03de89ceadc5346a26c472eea51 files/digest-dansguardian-2.8.0.6 79
 MD5 421e49847907b8c4d53ccc01d17656e6 files/digest-dansguardian-2.8.0.6-r1 79
-RMD160 fc511980f2ca8c9a60b3cc7bc42d547a2cc49b82 files/digest-dansguardian-2.8.0.6-r1 79
-SHA256 efa195df8870a9183c3fd6588fa533ecbce8d03de89ceadc5346a26c472eea51 files/digest-dansguardian-2.8.0.6-r1 79
-MD5 cb02acc628e684209123dcd1252f120d files/digest-dansguardian-2.9.3.1_alpha 72
-RMD160 c174b5b6d7ca239f87ced8fbe971904a57733a7b files/digest-dansguardian-2.9.3.1_alpha 72
-SHA256 880caf2e91a120bcc49298367d6ab75102d7a100f5e901cb305531c959579d59 files/digest-dansguardian-2.9.3.1_alpha 72
 MD5 7531d831b9a98706611b0f1515888991 files/digest-dansguardian-2.9.3.2_alpha 72
-RMD160 bf3320d79993f77c907db2a95751f0ab91e4dd56 files/digest-dansguardian-2.9.3.2_alpha 72
-SHA256 c0f4bc2bac1d166af55d670aaeda0a8855298ccf6138e383dc3687ae244f8d4c files/digest-dansguardian-2.9.3.2_alpha 72
+MD5 6d1078f2be73e19af687b0976d117bc1 files/digest-dansguardian-2.9.6.1_alpha 72
 MD5 30b14eaf02c479d70f60157c1a29a294 metadata.xml 568
-RMD160 9ccaf23e0461f24434c3d8d2375b64cf195c9f4a metadata.xml 568
-SHA256 db37880b6baac7d3294b7f8432f1ca816c85356430700e7078d891d4f100ef76 metadata.xml 568
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEDHp7jG8pv1lIUX4RAmcDAKC347ykbVcZB6+iydTBnNElOchyBgCgl/fY
+203dlvR/HtFQ+CjH1kh9UcQ=
+=pD+r
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/dansguardian/dansguardian-2.8.0.4.ebuild b/net-proxy/dansguardian/dansguardian-2.8.0.4.ebuild
deleted file mode 100644
index 8c586ad8f088..000000000000
--- a/net-proxy/dansguardian/dansguardian-2.8.0.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.8.0.4.ebuild,v 1.4 2005/10/04 20:48:47 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="Web content filtering via proxy"
-HOMEPAGE="http://dansguardian.org"
-SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${P}.source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-DEPEND="!net-proxy/dansguardian-dgav
-	virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff
-}
-
-src_compile() {
-	./configure \
-		--prefix= \
-		--installprefix=${D} \
-		--mandir=/usr/share/man/ \
-		--cgidir=/var/www/localhost/cgi-bin/ || die "./configure failed"
-	emake OPTIMISE="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	if [ -d "/etc/logrotate.d" ]; then
-		dodir /etc/logrotate.d
-	fi
-	make install || die "make install failed"
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dansguardian.init dansguardian
-
-	rm -rf ${D}/etc/rc.d
-
-	#Fixing location of initscript
-	sed -i -e 's/rc.d\///' ${D}/etc/dansguardian/logrotation
-
-	dodoc README
-}
diff --git a/net-proxy/dansguardian/dansguardian-2.8.0.6.ebuild b/net-proxy/dansguardian/dansguardian-2.8.0.6.ebuild
deleted file mode 100644
index 9af6230f405d..000000000000
--- a/net-proxy/dansguardian/dansguardian-2.8.0.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.8.0.6.ebuild,v 1.3 2005/10/06 19:04:31 hansmi Exp $
-
-inherit eutils
-
-DESCRIPTION="Web content filtering via proxy"
-HOMEPAGE="http://dansguardian.org"
-SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${P}.source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~sparc x86"
-IUSE=""
-DEPEND="!net-proxy/dansguardian-dgav
-	virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff
-}
-
-src_compile() {
-	./configure \
-		--prefix= \
-		--installprefix=${D} \
-		--mandir=/usr/share/man/ \
-		--cgidir=/var/www/localhost/cgi-bin/ || die "./configure failed"
-	emake OPTIMISE="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	if [ -d "/etc/logrotate.d" ]; then
-		dodir /etc/logrotate.d
-	fi
-	make install || die "make install failed"
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dansguardian.init dansguardian
-
-	rm -rf ${D}/etc/rc.d
-
-	#Fixing location of initscript
-	sed -i -e 's/rc.d\///' ${D}/etc/dansguardian/logrotation
-
-	dodoc README
-}
diff --git a/net-proxy/dansguardian/dansguardian-2.9.3.1_alpha.ebuild b/net-proxy/dansguardian/dansguardian-2.9.6.1_alpha.ebuild
index e3d74099c945..a3039d0fa575 100644
--- a/net-proxy/dansguardian/dansguardian-2.9.3.1_alpha.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.9.6.1_alpha.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.3.1_alpha.ebuild,v 1.1 2005/12/20 13:27:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.9.6.1_alpha.ebuild,v 1.1 2006/03/06 18:07:38 mrness Exp $
 
 inherit eutils
 
@@ -13,21 +13,18 @@ SRC_URI="http://dansguardian.org/downloads/2/Alpha/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clamav debug ntlm pcre"
+IUSE="clamav kaspersky debug ntlm pcre"
 
-DEPEND="virtual/libc
-	!net-proxy/dansguardian-dgav
+DEPEND="!net-proxy/dansguardian-dgav
 	pcre? ( dev-libs/libpcre )
 	clamav? ( app-antivirus/clamav )"
 
 S=${WORKDIR}/${MY_P}
 
-MY_REFRESH_LOG_OWNER=""
-
 pkg_setup() {
 	if has_version "<${CATEGORY}/${PN}-2.9" ; then
 		ewarn "This version introduces brand new USE flags:"
-		ewarn "   clamav ntlm pcre"
+		ewarn "   clamav kaspersky ntlm pcre"
 		echo
 
 		local f="${ROOT}/etc/dansguardian"
@@ -46,7 +43,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 }
 
 src_compile() {
@@ -59,6 +56,9 @@ src_compile() {
 			--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
@@ -69,21 +69,23 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make "DESTDIR=${D}" install || die "make install failed"
 
 	# Copying init script
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/dansguardian.init dansguardian
+	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
+		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
+	newexe "${FILESDIR}/dansguardian.logrotate" dansguardian
 
 	keepdir /var/log/dansguardian
 	fperms o-rwx /var/log/dansguardian
@@ -96,7 +98,7 @@ pkg_postinst() {
 	fi
 	ewarn "The dansguardian daemon will run by default as user & group ${runas}"
 
-	if has_version "<${CATEGORY}/${PN}-2.9" && [ -d "${ROOT}/var/log/dansguardian" ] ; then
+	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/files/dansguardian-2.9.6.1_alpha-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.6.1_alpha-gentoo.patch
new file mode 100644
index 000000000000..8e0d4a134743
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.6.1_alpha-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Nru dansguardian-2.9.6.1.orig/doc/dansguardian.8 dansguardian-2.9.6.1/doc/dansguardian.8
+--- dansguardian-2.9.6.1.orig/doc/dansguardian.8	2005-02-24 12:30:16.000000000 +0200
++++ dansguardian-2.9.6.1/doc/dansguardian.8	2006-03-06 19:49:04.319219750 +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
+ A Introduction
+ 
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.4 b/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.4
deleted file mode 100644
index 10e27cf9e6b6..000000000000
--- a/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91d65adf4087a863ad605dddd6e18046 dansguardian-2.8.0.4.source.tar.gz 194475
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.6 b/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.6
deleted file mode 100644
index 5acffb70cbf4..000000000000
--- a/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa619607198f37a528dbb65e4a503beb dansguardian-2.8.0.6.source.tar.gz 212737
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.9.3.1_alpha b/net-proxy/dansguardian/files/digest-dansguardian-2.9.3.1_alpha
deleted file mode 100644
index 2ca86e63b7d6..000000000000
--- a/net-proxy/dansguardian/files/digest-dansguardian-2.9.3.1_alpha
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50d6bccebda25edb4ae3f6973775ba70 dansguardian-2.9.3.1.tar.gz 401603
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.9.6.1_alpha b/net-proxy/dansguardian/files/digest-dansguardian-2.9.6.1_alpha
new file mode 100644
index 000000000000..343f47704d13
--- /dev/null
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.6.1_alpha
@@ -0,0 +1 @@
+MD5 f71621831c588fff3d3bd9b85987ead7 dansguardian-2.9.6.1.tar.gz 418893