remove old version; quote strings containing env vars

Package-Manager: portage-2.0.54

6 files changed, 25 insertions, 91 deletions

diff --git a/net-proxy/dansguardian-dgav/ChangeLog b/net-proxy/dansguardian-dgav/ChangeLog
index e8b7f59dcb4d..3f0a288278cf 100644
--- a/net-proxy/dansguardian-dgav/ChangeLog
+++ b/net-proxy/dansguardian-dgav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/dansguardian-dgav
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/ChangeLog,v 1.6 2005/12/08 22:39:09 mrness Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/ChangeLog,v 1.7 2006/03/06 18:16:16 mrness Exp $
+
+  06 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  -dansguardian-dgav-6.4.3.ebuild, dansguardian-dgav-6.4.3-r1.ebuild:
+  Remove old version.
 
 *dansguardian-dgav-6.4.3-r1 (08 Dec 2005)
 
diff --git a/net-proxy/dansguardian-dgav/Manifest b/net-proxy/dansguardian-dgav/Manifest
index d4cc9a884ce1..39af8c754cc4 100644
--- a/net-proxy/dansguardian-dgav/Manifest
+++ b/net-proxy/dansguardian-dgav/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 17d62f8b39efe87d97c7bf185c249fdc dansguardian-dgav-6.4.3.ebuild 1764
-MD5 5a8de604a8cc28d0f930857166bc63d2 dansguardian-dgav-6.4.3-r1.ebuild 1624
-MD5 841b0f00420e42d2fdf2a694fc98add8 ChangeLog 1941
-MD5 775fe3a71382d0807bfddb0235f35f30 metadata.xml 233
-MD5 3b16f94c2f006a6d45f4221ee7b8d7d4 files/digest-dansguardian-dgav-6.4.3-r1 169
+MD5 b78f63a7dd0de8053231d8f88b753381 ChangeLog 2081
+MD5 41b1845294f494282a35de2d43a05b8a dansguardian-dgav-6.4.3-r1.ebuild 1624
 MD5 6328464c9d6747a4f054f17fb2c4844b files/dansguardian-dgav-6.4.3-gentoo.patch 1291
+MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
 MD5 40108287ed99da7e2d4f078e50288100 files/dansguardian.init 837
 MD5 046d9ee8033553a881d5ee0586bf2a3d files/dansguardian.logrotate 188
-MD5 3b16f94c2f006a6d45f4221ee7b8d7d4 files/digest-dansguardian-dgav-6.4.3 169
-MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
+MD5 f4b0b1791105f2daa56e911f08238da4 files/digest-dansguardian-dgav-6.4.3-r1 169
+MD5 775fe3a71382d0807bfddb0235f35f30 metadata.xml 233
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDmLYcNSP4Vda7IdsRAtuuAJ99130PQBaDmKv6bphS9c1CDa9jyQCeMwOM
-jPbbITc+NHNJZYvoXwvMcKU=
-=Iydh
+iD8DBQFEDHx9jG8pv1lIUX4RAvagAJ0fjmS0fKZNKTvX11L5xtV23O4BnACePXg3
+X1FUQu4a3R1UDHMWgRMWlxo=
+=uc8D
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.3-r1.ebuild b/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.3-r1.ebuild
index 26fe95316038..52ebf4cb9f97 100644
--- a/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.3-r1.ebuild
+++ b/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.3-r1.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-dgav/dansguardian-dgav-6.4.3-r1.ebuild,v 1.1 2005/12/08 22:39:09 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.3-r1.ebuild,v 1.2 2006/03/06 18:16:16 mrness Exp $
 
 inherit eutils
 
@@ -18,7 +18,6 @@ SLOT="0"
 KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 DEPEND="!net-proxy/dansguardian
-	virtual/libc
 	net-libs/libesmtp
 	app-antivirus/clamav"
 
@@ -27,16 +26,16 @@ S="${WORKDIR}/${DG_PN}-${DG_PV}"
 src_unpack() {
 	unpack ${A}
 
-	cd ${S} || die "source dir not found"
-	epatch ${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff
-	epatch ../${DG_PN}-${DG_PV}-antivirus-${PV}.patch
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	cd "${S}" || die "source dir not found"
+	epatch "${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff"
+	epatch "../${DG_PN}-${DG_PV}-antivirus-${PV}.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 }
 
 src_compile() {
 	./configure \
 		--prefix= \
-		--installprefix=${D} \
+		--installprefix="${D}" \
 		--mandir=/usr/share/man/ \
 		--cgidir=/var/www/localhost/cgi-bin/ \
 		--logrotatedir="${D}/etc/logrotate.d" \
@@ -48,10 +47,10 @@ src_compile() {
 src_install() {
 	make install || die "make install failed"
 
-	newinitd ${FILESDIR}/dansguardian.init dansguardian
+	newinitd "${FILESDIR}/dansguardian.init" dansguardian
 
 	insinto /etc/logrotate.d
-	newins ${FILESDIR}/dansguardian.logrotate dansguardian
+	newins "${FILESDIR}/dansguardian.logrotate" dansguardian
 
 	doman dansguardian.8
 	dodoc README*
diff --git a/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.3.ebuild b/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.3.ebuild
deleted file mode 100644
index f089c70e8064..000000000000
--- a/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.3.ebuild
+++ /dev/null
@@ -1,65 +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-dgav/dansguardian-dgav-6.4.3.ebuild,v 1.1 2005/10/04 21:01:07 mrness Exp $
-
-inherit eutils
-
-DG_PN=${PN/-*/}
-AV_PN=${PN/*-/}
-DG_PV=2.8.0.6
-
-DESCRIPTION="DansGuardian with Anti-Virus plugin"
-HOMEPAGE="http://sourceforge.net/projects/dgav/"
-SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${DG_PN}-${DG_PV}.source.tar.gz
-	mirror://sourceforge/${AV_PN}/${DG_PN}-${DG_PV}-antivirus-${PV}.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
-IUSE=""
-DEPEND="!net-proxy/dansguardian
-	virtual/libc
-	net-libs/libesmtp
-	app-antivirus/clamav"
-
-S="${WORKDIR}/${DG_PN}-${DG_PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S} || die "source dir not found"
-	epatch ${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff
-	epatch ../${DG_PN}-${DG_PV}-antivirus-${PV}.patch
-
-	#fix path to gentoo clamd socket
-	sed -i -e "s:clamdsocket *= *'/tmp/clamd':clamdsocket = '/var/run/clamav/clamd.sock':" configure
-}
-
-src_compile() {
-	./configure \
-		--prefix= \
-		--installprefix=${D} \
-		--mandir=/usr/share/man/ \
-		--cgidir=/var/www/localhost/cgi-bin/ \
-		--with-av-engine=clamdscan \
-		--runas_usr=clamav --runas_grp=clamav || 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
-	sed -i -e 's/rc.d\///' ${D}/etc/dansguardian/logrotation #Fixing location of initscript
-
-	dodoc README*
-
-	#Create log directory
-	diropts -m0700 -o clamav
-	keepdir /var/log/dansguardian
-}
diff --git a/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.3 b/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.3
deleted file mode 100644
index 736adbd2932d..000000000000
--- a/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 aa619607198f37a528dbb65e4a503beb dansguardian-2.8.0.6.source.tar.gz 212737
-MD5 18acbbed76c1ce76050067672847e94a dansguardian-2.8.0.6-antivirus-6.4.3.patch.bz2 47773
diff --git a/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.3-r1 b/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.3-r1
index 736adbd2932d..9193cf725a27 100644
--- a/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.3-r1
+++ b/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.3-r1
@@ -1,2 +1,2 @@
-MD5 aa619607198f37a528dbb65e4a503beb dansguardian-2.8.0.6.source.tar.gz 212737
 MD5 18acbbed76c1ce76050067672847e94a dansguardian-2.8.0.6-antivirus-6.4.3.patch.bz2 47773
+MD5 aa619607198f37a528dbb65e4a503beb dansguardian-2.8.0.6.source.tar.gz 212737