version bump; fix #66177; fix CFLAGS; change herd

Package-Manager: portage-2.0.51-r15

7 files changed, 79 insertions, 11 deletions

diff --git a/www-proxy/dansguardian/ChangeLog b/www-proxy/dansguardian/ChangeLog
index 05ba78dec6ba..5df831f495a3 100644
--- a/www-proxy/dansguardian/ChangeLog
+++ b/www-proxy/dansguardian/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2005/02/06 18:33:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/ChangeLog,v 1.9 2005/02/25 22:29:55 mrness Exp $
+
+*dansguardian-2.8.0.4 (26 Feb 2005)
+
+  26 Feb 2005; Alin Nastac <mrness@gentoo.org> metadata.xml,
+  files/dansguardian.init, dansguardian-2.8.0.2.ebuild,
+  +dansguardian-2.8.0.4.ebuild:
+  Version bump. Fix bug #66177. Append user CFLAGS. Change herd to www-proxy.
 
   06 Feb 2005; Markus Rothe <corsair@gentoo.org> dansguardian-2.8.0.2.ebuild:
   Stable on ppc64
diff --git a/www-proxy/dansguardian/Manifest b/www-proxy/dansguardian/Manifest
index 7b6e2a4a0fa1..1d4288ed0e86 100644
--- a/www-proxy/dansguardian/Manifest
+++ b/www-proxy/dansguardian/Manifest
@@ -1,10 +1,22 @@
-MD5 508973cab4ff5ba86edb5048331e7ce9 ChangeLog 3156
-MD5 df94b0dc291d0cd7649c918cc18d2848 dansguardian-2.7.1.ebuild 1161
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 c3a752cf123d4bc02fbf3adb77c0dfdf dansguardian-2.7.6.ebuild 1278
-MD5 d56eaa9294061688301f73e74c6e703f dansguardian-2.8.0.2.ebuild 1277
-MD5 d8b191afbd43c921e2630e8be3e45e13 metadata.xml 567
+MD5 df94b0dc291d0cd7649c918cc18d2848 dansguardian-2.7.1.ebuild 1161
+MD5 8fb6eaf85b3ce6960c4d911b928afe48 dansguardian-2.8.0.2.ebuild 1275
+MD5 77a4db175c7a4e6695a0b3c5057d9ae6 dansguardian-2.8.0.4.ebuild 1339
+MD5 370cabbade7e0d31a3e61c9560cf03d5 ChangeLog 3420
+MD5 6e91b6caf554877adb049f011283bda3 metadata.xml 568
+MD5 2eac5634ff8ad0ba6701815c2befce6b files/digest-dansguardian-2.8.0.2 79
+MD5 579f2cac2dbebe18ff6900fd3aa87f66 files/digest-dansguardian-2.8.0.4 79
+MD5 4365b34f67519fc4539e0d1b404ae11e files/dansguardian.init 565
 MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
-MD5 5ce5f528871f5d206fbc89e2cd534ce6 files/dansguardian.init 552
 MD5 bcf1d489bd7407662079ad6eb5086868 files/digest-dansguardian-2.7.1 79
 MD5 dbb7df85d7384d34a2f0bf8defc5c03c files/digest-dansguardian-2.7.6 79
-MD5 2eac5634ff8ad0ba6701815c2befce6b files/digest-dansguardian-2.8.0.2 79
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCH6btjiC39V7gKu0RAhrpAKCqgjNVAZXUZDVUIM0jwIHMhuWT4gCeK5t4
+bVDGYaI9Kh0YCr1p2m8vzRg=
+=MCyO
+-----END PGP SIGNATURE-----
diff --git a/www-proxy/dansguardian/dansguardian-2.8.0.2.ebuild b/www-proxy/dansguardian/dansguardian-2.8.0.2.ebuild
index 52d6f3596c4a..feff32492e06 100644
--- a/www-proxy/dansguardian/dansguardian-2.8.0.2.ebuild
+++ b/www-proxy/dansguardian/dansguardian-2.8.0.2.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.2.ebuild,v 1.4 2005/02/06 18:33:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/dansguardian-2.8.0.2.ebuild,v 1.5 2005/02/25 22:29:55 mrness Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${P}.source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ppc64"
+KEYWORDS="x86 ~sparc ~ppc ppc64"
 IUSE=""
 DEPEND="virtual/libc"
 
diff --git a/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild b/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild
new file mode 100644
index 000000000000..2fe85cc14c80
--- /dev/null
+++ b/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild
@@ -0,0 +1,47 @@
+# 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.1 2005/02/25 22:29:55 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="~x86 ~sparc ~ppc ~ppc64"
+IUSE=""
+DEPEND="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"
+	sed -i -e 's/^\(CFLAGS *\)=/\1+=/' Makefile #add user CFLAGS
+	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/files/dansguardian.init b/www-proxy/dansguardian/files/dansguardian.init
index 4176d16ac9a0..697a48cba6c2 100644
--- a/www-proxy/dansguardian/files/dansguardian.init
+++ b/www-proxy/dansguardian/files/dansguardian.init
@@ -1,10 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/files/dansguardian.init,v 1.1 2004/08/15 18:47:23 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/files/dansguardian.init,v 1.2 2005/02/25 22:29:55 mrness Exp $
 
 depend() {
 	need net
+	after squid
 }
 
 start() {
diff --git a/www-proxy/dansguardian/files/digest-dansguardian-2.8.0.4 b/www-proxy/dansguardian/files/digest-dansguardian-2.8.0.4
new file mode 100644
index 000000000000..10e27cf9e6b6
--- /dev/null
+++ b/www-proxy/dansguardian/files/digest-dansguardian-2.8.0.4
@@ -0,0 +1 @@
+MD5 91d65adf4087a863ad605dddd6e18046 dansguardian-2.8.0.4.source.tar.gz 194475
diff --git a/www-proxy/dansguardian/metadata.xml b/www-proxy/dansguardian/metadata.xml
index 8ab297599996..18684ca6df93 100644
--- a/www-proxy/dansguardian/metadata.xml
+++ b/www-proxy/dansguardian/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<herd>www-proxy</herd>
 <longdescription>DansGuardian is an award winning Open Source web content filter which currently runs on Linux, FreeBSD, OpenBSD, NetBSD, Mac OS X, HP-UX, and Solaris. It filters the actual content of pages based on many methods including phrase matching, PICS filtering and URL filtering. It does not purely filter based on a banned list of sites like lesser totally commercial filters.</longdescription>
 </pkgmetadata>