6 files changed, 10 insertions, 98 deletions
diff --git a/www-proxy/dansguardian/ChangeLog b/www-proxy/dansguardian/ChangeLog
index 818ffd7a2868..a3ad727b9f3b 100644
--- a/www-proxy/dansguardian/ChangeLog
+++ b/www-proxy/dansguardian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-proxy/dansguardian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/ChangeLog,v 1.10 2005/03/08 19:47:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/ChangeLog,v 1.11 2005/03/10 22:09:23 mrness Exp $
+
+  11 Mar 2005; Alin Nastac <mrness@gentoo.org> -dansguardian-2.7.1.ebuild,
+  -dansguardian-2.7.6.ebuild, dansguardian-2.8.0.4.ebuild:
+  Remove obsolete versions and fix mode of init.d script.
 
   08 Mar 2005; Alin Nastac <mrness@gentoo.org> dansguardian-2.7.1.ebuild,
   dansguardian-2.7.6.ebuild, dansguardian-2.8.0.2.ebuild,
diff --git a/www-proxy/dansguardian/dansguardian-2.7.1.ebuild b/www-proxy/dansguardian/dansguardian-2.7.1.ebuild
deleted file mode 100644
index 9a9bcf00ffbd..000000000000
--- a/www-proxy/dansguardian/dansguardian-2.7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/dansguardian-2.7.1.ebuild,v 1.4 2005/03/08 19:47:54 mrness Exp $
-
-MY_P="DansGuardian-${PV}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Web content filtering via proxy"
-HOMEPAGE="http://dansguardian.org"
-SRC_URI="http://mirror.dansguardian.org/downloads/2/Alpha/${MY_P}-0.source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="!www-proxy/dansguardian-dgav
-	www-proxy/squid"
-
-src_compile() {
-	./configure \
-		--prefix= \
-		--installprefix=${D} \
-		--mandir=/usr/share/man/ || die "./configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	if [ -d "/etc/logrotate.d" ]; then mkdir -p ${D}/etc/logrotate.d; fi
-	make install || die "make install failed"
-
-	dodir /etc/init.d
-	cp ${FILESDIR}/dansguardian.init ${D}/etc/init.d/dansguardian
-
-	rm -rf ${D}/etc/rc.d
-
-	einfo "Fixing location of initscript"
-	sed 's/rc.d\///' ${D}/etc/dansguardian/logrotation > ${D}/etc/dansguardian/logrotation.fixed
-	mv -f ${D}/etc/dansguardian/logrotation.fixed ${D}/etc/dansguardian/logrotation
-
-	dodoc INSTALL README LICENSE
-}
diff --git a/www-proxy/dansguardian/dansguardian-2.7.6.ebuild b/www-proxy/dansguardian/dansguardian-2.7.6.ebuild
deleted file mode 100644
index fba5ae1a2aae..000000000000
--- a/www-proxy/dansguardian/dansguardian-2.7.6.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/www-proxy/dansguardian/dansguardian-2.7.6.ebuild,v 1.3 2005/03/08 19:47:54 mrness Exp $
-
-inherit eutils
-
-MY_P="DansGuardian-${PV}"
-S="${WORKDIR}/${MY_P}-1"
-DESCRIPTION="Web content filtering via proxy"
-HOMEPAGE="http://dansguardian.org"
-SRC_URI="http://mirror.dansguardian.org/downloads/2/Alpha/${MY_P}-1.source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE=""
-DEPEND="!www-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/ || die "./configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	if [ -d "/etc/logrotate.d" ]; then mkdir -p ${D}/etc/logrotate.d; fi
-	make install || die "make install failed"
-
-	dodir /etc/init.d
-	cp ${FILESDIR}/dansguardian.init ${D}/etc/init.d/dansguardian
-
-	rm -rf ${D}/etc/rc.d
-
-	einfo "Fixing location of initscript"
-	sed 's/rc.d\///' ${D}/etc/dansguardian/logrotation > ${D}/etc/dansguardian/logrotation.fixed
-	mv -f ${D}/etc/dansguardian/logrotation.fixed ${D}/etc/dansguardian/logrotation
-
-	dodoc INSTALL README LICENSE
-}
diff --git a/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild b/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild
index 2846f2c7da8f..ec6025264ca7 100644
--- a/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild
+++ b/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild,v 1.2 2005/03/08 19:47:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild,v 1.3 2005/03/10 22:09:23 mrness Exp $
 
 inherit eutils
 
@@ -34,14 +34,13 @@ src_install() {
 	if [ -d "/etc/logrotate.d" ]; then mkdir -p ${D}/etc/logrotate.d; fi
 	make install || die "make install failed"
 
-	dodir /etc/init.d
-	cp ${FILESDIR}/dansguardian.init ${D}/etc/init.d/dansguardian
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/dansguardian.init dansguardian
 
 	rm -rf ${D}/etc/rc.d
 
-	einfo "Fixing location of initscript"
-	sed 's/rc.d\///' ${D}/etc/dansguardian/logrotation > ${D}/etc/dansguardian/logrotation.fixed
-	mv -f ${D}/etc/dansguardian/logrotation.fixed ${D}/etc/dansguardian/logrotation
+	#Fixing location of initscript
+	sed -i -e 's/rc.d\///' ${D}/etc/dansguardian/logrotation
 
 	dodoc INSTALL README LICENSE
 }
diff --git a/www-proxy/dansguardian/files/digest-dansguardian-2.7.1 b/www-proxy/dansguardian/files/digest-dansguardian-2.7.1
deleted file mode 100644
index e104c480079e..000000000000
--- a/www-proxy/dansguardian/files/digest-dansguardian-2.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38dfb29f33ffe510cac1a641fa41d837 DansGuardian-2.7.1-0.source.tar.gz 159363
diff --git a/www-proxy/dansguardian/files/digest-dansguardian-2.7.6 b/www-proxy/dansguardian/files/digest-dansguardian-2.7.6
deleted file mode 100644
index 19671a0d8c9f..000000000000
--- a/www-proxy/dansguardian/files/digest-dansguardian-2.7.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e7438f09ac146caf013358df840c5cb8 DansGuardian-2.7.6-1.source.tar.gz 173295