Remove obsolete versions. Remove squid run-time dependency (#241212).

Package-Manager: portage-2.1.4.4

9 files changed, 11 insertions, 485 deletions

diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index 1c10197a55ab..ea5b6c1d61a1 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/squidguard
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.26 2008/07/16 21:11:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.27 2008/10/12 07:58:25 mrness Exp $
+
+  12 Oct 2008; Alin Năstac <mrness@gentoo.org>
+  -files/squidguard-1.2.1-gentoo.patch,
+  -files/squidguard-1.2.1-regexp.patch, -files/squidguard-1.2.1-tests.patch,
+  -squidguard-1.2.1-r2.ebuild, -squidguard-1.3.ebuild,
+  -squidguard-1.3-r1.ebuild, -squidguard-1.3-r2.ebuild,
+  squidguard-1.3-r3.ebuild:
+  Remove obsolete versions. Remove squid run-time dependency (#241212).
 
 *squidguard-1.3-r3 (16 Jul 2008)
 
diff --git a/net-proxy/squidguard/files/squidguard-1.2.1-gentoo.patch b/net-proxy/squidguard/files/squidguard-1.2.1-gentoo.patch
deleted file mode 100644
index 3258cb8ab4e3..000000000000
--- a/net-proxy/squidguard/files/squidguard-1.2.1-gentoo.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -Nru squidGuard-1.2.1.orig/configure.in squidGuard-1.2.1/configure.in
---- squidGuard-1.2.1.orig/configure.in	2007-06-24 13:19:45.000000000 +0300
-+++ squidGuard-1.2.1/configure.in	2007-06-24 13:17:36.000000000 +0300
-@@ -85,7 +85,7 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS(db.h regex.h unistd.h)
- 
--+AC_CHECK_HEADER(db.h,,[
-+AC_CHECK_HEADER(db.h,,[
- 	echo
- 	echo "** No db.h found"
- 	echo "   The Berkley DB library is required for squidGuard"
-@@ -110,13 +110,24 @@
- dnl
- 
- dnl Check ldap
--AC_CHECK_LIB(ldap,ldap_init,,[
--               echo
--               echo "LDAP library not found"
--               echo
--               exit 1
--       ])
--AC_RUN_IFELSE([
-+AC_ARG_WITH(ldap,
-+  AC_HELP_STRING([--with-ldap], [use ldap (default=yes)]))
-+if test "$with_ldap" = "no" -o "$with_ldap" = "false"
-+then
-+  with_ldap=no
-+else
-+  AC_CHECK_LIB( ldap, ldap_init,
-+	[
-+	with_ldap=yes
-+	LIBS="$LIBS -lldap"
-+	],[
-+	AC_MSG_WARN([Cannot find LDAP libraries. LDAP support disabled])
-+	with_ldap=no
-+	])
-+fi
-+if test "$with_ldap" = "yes"; then
-+	AC_DEFINE(HAVE_LIBLDAP)
-+	AC_RUN_IFELSE([
-        #include <ldap.h>
-        int main()
-        {
-@@ -130,6 +141,7 @@
-                echo
-                exit 1
-        ],)
-+fi
- 
- dnl Check threads... ok if it fails
- AC_CHECK_LIB(pthread,pthread_create,,[
-@@ -141,15 +153,7 @@
-        ])
- 
- dnl Check DB
--AC_CHECK_LIB(db,db_version,,[
--       echo
--       echo "** The Berkley DB library is required for squidGuard"
--       echo "   to compile. Get it from http://www.sleepycat.com"
--       echo "   use --with-db=DIR or --with-db-lib=DIR to specify"
--       echo "   its location. (default is $dbprefix/BerkeleyDB)"
--       echo
--       exit 1
--       ])
-+LIBS="$LIBS -ldb"
- AC_RUN_IFELSE([
- 	#include <db.h>
- 	int main() 
-diff -Nru squidGuard-1.2.1.orig/Makefile.in squidGuard-1.2.1/Makefile.in
---- squidGuard-1.2.1.orig/Makefile.in	2007-06-24 13:09:47.000000000 +0300
-+++ squidGuard-1.2.1/Makefile.in	2007-06-24 12:55:17.000000000 +0300
-@@ -40,7 +40,7 @@
- # Dependencies for installing
- #	
- 
--install:	install-build install-conf
-+install:	install-build
- 
- install-conf:
- 	@echo Installing configuration file 
-@@ -67,10 +67,10 @@
- 
- install-build:
- 	@echo Installing squidGuard 
--	@if [ ! -d $(bindir) ]; then \
--		$(MKINSTALLDIRS) $(bindir) ; \
-+	@if [ ! -d "$(INSTDIR)"/$(bindir) ]; then \
-+		$(MKINSTALLDIRS) "$(INSTDIR)"/$(bindir) ; \
- 	fi ; \
--	cp src/squidGuard $(bindir) || exit 1 ;  \
-+	cp src/squidGuard "$(INSTDIR)"/$(bindir) || exit 1 ;  \
- 	echo Done. ;
- 
- clean::
-diff -Nru squidGuard-1.2.1.orig/src/Makefile.in squidGuard-1.2.1/src/Makefile.in
---- squidGuard-1.2.1.orig/src/Makefile.in	2007-06-24 13:09:47.000000000 +0300
-+++ squidGuard-1.2.1/src/Makefile.in	2007-06-24 12:55:17.000000000 +0300
-@@ -103,8 +103,8 @@
- 
- install.bin:: squidGuard
- 	@echo making $@ in `basename \`pwd\``
--	@$(MKDIR) $(bindir) $(logdir) $(cfgdir)
--	$(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard
-+	@$(MKDIR) "$(INSTDIR)"/$(bindir) "$(INSTDIR)"/$(logdir) "$(INSTDIR)"/$(cfgdir)
-+	$(INSTALL_PROGRAM) squidGuard "$(INSTDIR)"/$(bindir)/squidGuard
- 
- uninstall.bin::
- 	@echo making $@ in `basename \`pwd\``
-diff -Nru squidGuard-1.2.1.orig/src/sgDb.c squidGuard-1.2.1/src/sgDb.c
---- squidGuard-1.2.1.orig/src/sgDb.c	2007-06-24 13:19:45.000000000 +0300
-+++ squidGuard-1.2.1/src/sgDb.c	2007-06-24 12:55:17.000000000 +0300
-@@ -101,13 +101,21 @@
-     if(createdb)
-       flag = flag | DB_TRUNCATE;
-     if ((ret = 
-+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-+	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
-+#else
- 	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
-+#endif
-       (void) Db->dbp->close(Db->dbp, 0);
-       sgLogFatalError("Error db_open: %s", strerror(ret));
-     }
-   } else {
-     if ((ret = 
-+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-+	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
-+#else
- 	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
-+#endif
-       sgLogFatalError("Error db_open: %s", strerror(ret));
-     }
-   }
diff --git a/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch b/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch
deleted file mode 100644
index 8bf99fe94917..000000000000
--- a/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nru squidGuard-1.2.1.orig/src/sg.y squidGuard-1.2.1/src/sg.y
---- squidGuard-1.2.1.orig/src/sg.y	2007-04-11 11:57:02.000000000 +0300
-+++ squidGuard-1.2.1/src/sg.y	2007-09-25 14:36:30.000000000 +0300
-@@ -2347,7 +2347,7 @@
- 	}
-       }
-       if(aclpass->dest->regExp != NULL && access){
--	if((result = sgRegExpMatch(aclpass->dest->regExp,req->url)) != 0){
-+	if((result = sgRegExpMatch(aclpass->dest->regExp,req->strippedurl)) != 0){
- 	  if(aclpass->access){
- 	    access++;
- 	    break;
-diff -Nru squidGuard-1.2.1.orig/src/sg.y.in squidGuard-1.2.1/src/sg.y.in
---- squidGuard-1.2.1.orig/src/sg.y.in	2007-09-25 14:36:46.000000000 +0300
-+++ squidGuard-1.2.1/src/sg.y.in	2007-09-25 14:35:04.000000000 +0300
-@@ -2347,7 +2347,7 @@
- 	}
-       }
-       if(aclpass->dest->regExp != NULL && access){
--	if((result = sgRegExpMatch(aclpass->dest->regExp,req->url)) != 0){
-+	if((result = sgRegExpMatch(aclpass->dest->regExp,req->strippedurl)) != 0){
- 	  if(aclpass->access){
- 	    access++;
- 	    break;
diff --git a/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch b/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch
deleted file mode 100644
index 07c8bf3decb2..000000000000
--- a/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nru squidGuard-1.2.1.orig/test/requests squidGuard-1.2.1/test/requests
---- squidGuard-1.2.1.orig/test/requests	1999-08-09 15:20:06.000000000 +0300
-+++ squidGuard-1.2.1/test/requests	2007-06-17 11:51:48.000000000 +0300
-@@ -954,7 +954,7 @@
- http://www.oslo-energi.no/gifs/nav5off.gif 10.0.5.15/- - GET
- http://www.oslo-energi.no/gifs/tittel_1_fade.gif 10.0.5.15/- - GET
- http://www.fotball.no/_img/toppframe_bg.gif 10.0.3.125/- gurr GET
--http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http%3a//www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
-+http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http://www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
- http://www.pornodungeon.com/pics/samp27.jpg 10.0.3.174/- foo GET
- http://www.sportnews.gr/_img/polo/image2223.jpg 10.0.2.130/- - GET
- http://www.sol.no/no/www.sol.no/graphics/partner/cnn_norge.gif 10.0.3.144/- - GET
-diff -Nru squidGuard-1.2.1.orig/test/test1.expected squidGuard-1.2.1/test/test1.expected
---- squidGuard-1.2.1.orig/test/test1.expected	2000-03-27 14:08:14.000000000 +0300
-+++ squidGuard-1.2.1/test/test1.expected	2007-06-17 11:52:40.000000000 +0300
-@@ -954,7 +954,7 @@
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.5.15&clientname=&clientuser=&clientgroup=default&targetgroup=none&url=http://www.oslo-energi.no/gifs/nav5off.gif 10.0.5.15/- - GET
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.5.15&clientname=&clientuser=&clientgroup=default&targetgroup=none&url=http://www.oslo-energi.no/gifs/tittel_1_fade.gif 10.0.5.15/- - GET
- 
--http://info.foo.bar/cgi/blocked?clientaddr=10.0.3.144&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http%3a//www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
-+http://info.foo.bar/cgi/blocked?clientaddr=10.0.3.144&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http://www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
- 
- 
- 
-diff -Nru squidGuard-1.2.1.orig/test/test2.expected squidGuard-1.2.1/test/test2.expected
---- squidGuard-1.2.1.orig/test/test2.expected	2000-03-27 14:09:17.000000000 +0300
-+++ squidGuard-1.2.1/test/test2.expected	2007-09-25 14:43:49.000000000 +0300
-@@ -954,7 +954,7 @@
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.5.15&clientname=&clientuser=&clientgroup=default&targetgroup=none&url=http://www.oslo-energi.no/gifs/nav5off.gif 10.0.5.15/- - GET
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.5.15&clientname=&clientuser=&clientgroup=default&targetgroup=none&url=http://www.oslo-energi.no/gifs/tittel_1_fade.gif 10.0.5.15/- - GET
- 
--http://info.foo.bar/cgi/blocked?clientaddr=10.0.3.144&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http%3a//www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
-+http://info.foo.bar/cgi/blocked?clientaddr=10.0.3.144&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://c1.thecounter.com/id=118474&size=800&colors=8&referer=http://www.uib.no/guide/index.html&java=true 10.0.3.144/- - GET
- 
- 
- 
diff --git a/net-proxy/squidguard/squidguard-1.2.1-r2.ebuild b/net-proxy/squidguard/squidguard-1.2.1-r2.ebuild
deleted file mode 100644
index d6b76167118f..000000000000
--- a/net-proxy/squidguard/squidguard-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.1-r2.ebuild,v 1.3 2007/09/25 11:54:57 mrness Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
-HOMEPAGE="http://www.squidguard.org"
-SRC_URI="http://www.squidguard.org/Downloads/squidGuard-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ldap"
-
-RDEPEND="net-proxy/squid
-	>=sys-libs/db-2
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/squidGuard-${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-tests.patch"
-	epatch "${FILESDIR}/${P}-regexp.patch"
-	eautoconf
-}
-
-src_compile() {
-	econf \
-		$(use_with ldap) \
-		--with-sg-config=/etc/squidGuard/squidGuard.conf \
-		--with-sg-logdir=/var/log/squidGuard \
-		|| die "configure has failed"
-
-	emake || die "make has failed"
-}
-
-src_install() {
-	emake prefix="/usr" INSTDIR="${D}" install || die "emake install has failed"
-
-	keepdir /var/log/squidGuard
-	fowners squid:squid /var/log/squidGuard
-
-	insinto /etc/squidGuard/sample
-	doins "${FILESDIR}"/squidGuard.conf.*
-	insinto /etc/squidGuard/sample/db
-	doins "${FILESDIR}"/blockedsites
-
-	dodoc ANNOUNCE CHANGELOG README
-	dohtml doc/*.html
-	docinto text
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:"
-	einfo "    url_rewrite_program /usr/bin/squidGuard"
-	einfo "    url_rewrite_children 10"
-	einfo ""
-	einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!"
-	einfo "Examples can be found in /etc/squidGuard/sample/"
-}
diff --git a/net-proxy/squidguard/squidguard-1.3-r1.ebuild b/net-proxy/squidguard/squidguard-1.3-r1.ebuild
deleted file mode 100644
index fe1447ab62d0..000000000000
--- a/net-proxy/squidguard/squidguard-1.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.3-r1.ebuild,v 1.6 2008/06/23 19:43:30 dertobi123 Exp $
-
-WANT_AUTOMAKE=none
-
-inherit eutils autotools
-
-DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
-HOMEPAGE="http://www.squidguard.org"
-SRC_URI="http://www.squidguard.org/Downloads/squidGuard-${PV}.tar.gz
-	http://www.squidguard.org/Downloads/Patches/${PV}/squidGuard-${PV}-patch-20080613.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ldap"
-
-RDEPEND="net-proxy/squid
-	>=sys-libs/db-2
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/squidGuard-${PV}"
-
-RESTRICT="test" # tests are currently broken
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	cp ../squidGuard-${PV}-patch-20080613/src/sgDiv.c.in src/ || die "failed to replace sgDiv.c.in"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-autoheader.patch"
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with ldap) \
-		--with-sg-config=/etc/squidGuard/squidGuard.conf \
-		--with-sg-logdir=/var/log/squidGuard \
-		|| die "configure has failed"
-
-	emake || die "make has failed"
-}
-
-src_install() {
-	emake prefix="/usr" INSTDIR="${D}" install || die "emake install has failed"
-
-	keepdir /var/log/squidGuard
-	fowners squid:squid /var/log/squidGuard
-
-	insinto /etc/squidGuard/sample
-	doins "${FILESDIR}"/squidGuard.conf.*
-	insinto /etc/squidGuard/sample/db
-	doins "${FILESDIR}"/blockedsites
-
-	dodoc ANNOUNCE CHANGELOG README
-	dohtml doc/*.html
-	docinto text
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:"
-	einfo "    url_rewrite_program /usr/bin/squidGuard"
-	einfo "    url_rewrite_children 10"
-	einfo ""
-	einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!"
-	einfo "Examples can be found in /etc/squidGuard/sample/"
-}
diff --git a/net-proxy/squidguard/squidguard-1.3-r2.ebuild b/net-proxy/squidguard/squidguard-1.3-r2.ebuild
deleted file mode 100644
index 8742204571f3..000000000000
--- a/net-proxy/squidguard/squidguard-1.3-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.3-r2.ebuild,v 1.1 2008/07/08 21:16:23 mrness Exp $
-
-WANT_AUTOMAKE=none
-
-inherit eutils autotools
-
-DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
-HOMEPAGE="http://www.squidguard.org"
-SRC_URI="http://www.squidguard.org/Downloads/squidGuard-${PV}.tar.gz
-	http://www.squidguard.org/Downloads/Patches/${PV}/squidGuard-${PV}-patch-20080613.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ldap"
-
-RDEPEND="net-proxy/squid
-	>=sys-libs/db-2
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/squidGuard-${PV}"
-
-RESTRICT="test" # tests are currently broken
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	cp ../squidGuard-${PV}-patch-20080613/src/sgDiv.c.in src/ || die "failed to replace sgDiv.c.in"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-autoheader.patch"
-	epatch "${FILESDIR}/${P}-bison.patch"
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with ldap) \
-		--with-sg-config=/etc/squidGuard/squidGuard.conf \
-		--with-sg-logdir=/var/log/squidGuard \
-		|| die "configure has failed"
-
-	emake || die "make has failed"
-}
-
-src_install() {
-	emake prefix="/usr" INSTDIR="${D}" install || die "emake install has failed"
-
-	keepdir /var/log/squidGuard
-	fowners squid:squid /var/log/squidGuard
-
-	insinto /etc/squidGuard/sample
-	doins "${FILESDIR}"/squidGuard.conf.*
-	insinto /etc/squidGuard/sample/db
-	doins "${FILESDIR}"/blockedsites
-
-	dodoc ANNOUNCE CHANGELOG README
-	dohtml doc/*.html
-	docinto text
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:"
-	einfo "    url_rewrite_program /usr/bin/squidGuard"
-	einfo "    url_rewrite_children 10"
-	einfo ""
-	einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!"
-	einfo "Examples can be found in /etc/squidGuard/sample/"
-}
diff --git a/net-proxy/squidguard/squidguard-1.3-r3.ebuild b/net-proxy/squidguard/squidguard-1.3-r3.ebuild
index c25c3d623cd1..a34faee29c5c 100644
--- a/net-proxy/squidguard/squidguard-1.3-r3.ebuild
+++ b/net-proxy/squidguard/squidguard-1.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.3-r3.ebuild,v 1.1 2008/07/16 21:11:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.3-r3.ebuild,v 1.2 2008/10/12 07:58:25 mrness Exp $
 
 WANT_AUTOMAKE=none
 
@@ -16,8 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="ldap"
 
-RDEPEND="net-proxy/squid
-	>=sys-libs/db-2
+RDEPEND=">=sys-libs/db-2
 	ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
diff --git a/net-proxy/squidguard/squidguard-1.3.ebuild b/net-proxy/squidguard/squidguard-1.3.ebuild
deleted file mode 100644
index a59688aa051e..000000000000
--- a/net-proxy/squidguard/squidguard-1.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.3.ebuild,v 1.1 2008/02/17 08:05:47 mrness Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
-HOMEPAGE="http://www.squidguard.org"
-SRC_URI="http://www.squidguard.org/Downloads/squidGuard-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="ldap"
-
-RDEPEND="net-proxy/squid
-	>=sys-libs/db-2
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/squidGuard-${PV}"
-
-RESTRICT="test" # tests are currently broken
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	eautoconf
-}
-
-src_compile() {
-	econf \
-		$(use_with ldap) \
-		--with-sg-config=/etc/squidGuard/squidGuard.conf \
-		--with-sg-logdir=/var/log/squidGuard \
-		|| die "configure has failed"
-
-	emake || die "make has failed"
-}
-
-src_install() {
-	emake prefix="/usr" INSTDIR="${D}" install || die "emake install has failed"
-
-	keepdir /var/log/squidGuard
-	fowners squid:squid /var/log/squidGuard
-
-	insinto /etc/squidGuard/sample
-	doins "${FILESDIR}"/squidGuard.conf.*
-	insinto /etc/squidGuard/sample/db
-	doins "${FILESDIR}"/blockedsites
-
-	dodoc ANNOUNCE CHANGELOG README
-	dohtml doc/*.html
-	docinto text
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:"
-	einfo "    url_rewrite_program /usr/bin/squidGuard"
-	einfo "    url_rewrite_children 10"
-	einfo ""
-	einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!"
-	einfo "Examples can be found in /etc/squidGuard/sample/"
-}