Remove old version. Version bump.

(Portage version: 2.1.3.19)

8 files changed, 33 insertions, 117 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 09a823cd34ff..a44ba2a1630e 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.31 2007/09/09 19:58:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.32 2007/12/30 11:35:14 mrness Exp $
+
+*dansguardian-2.9.9.2_beta (30 Dec 2007)
+
+  30 Dec 2007; Alin Năstac <mrness@gentoo.org>
+  -files/dansguardian-2.9.9.0-gentoo.patch,
+  -files/dansguardian-2.9.9.0-no-default-lists.patch,
+  -files/dansguardian-2.9.9.0-uclibc++.patch,
+  +files/dansguardian-2.9.9.2-gentoo.patch,
+  -dansguardian-2.9.9.0_beta.ebuild, +dansguardian-2.9.9.2_beta.ebuild:
+  Remove old version. Version bump.
 
 *dansguardian-2.9.9.1_beta (09 Sep 2007)
 
diff --git a/net-proxy/dansguardian/dansguardian-2.9.9.0_beta.ebuild b/net-proxy/dansguardian/dansguardian-2.9.9.2_beta.ebuild
index 1c315490864b..cdf9a62ea084 100644
--- a/net-proxy/dansguardian/dansguardian-2.9.9.0_beta.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.9.9.2_beta.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.9.9.0_beta.ebuild,v 1.1 2007/08/18 14:34:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.9.9.2_beta.ebuild,v 1.1 2007/12/30 11:35:14 mrness Exp $
 
-inherit eutils autotools
+inherit eutils
 
 MY_P=${P/_beta/}
 
@@ -44,11 +44,6 @@ src_unpack() {
 	unpack ${A}
 
 	epatch "${FILESDIR}/${P%_beta}-gentoo.patch"
-	epatch "${FILESDIR}/${P%_beta}-uclibc++.patch"
-	epatch "${FILESDIR}/${P%_beta}-no-default-lists.patch"
-
-	cd "${S}"
-	eautoreconf
 }
 
 src_compile() {
@@ -101,7 +96,11 @@ src_install() {
 	touch "${T}"/emptyfile
 	insinto /etc/dansguardian/lists
 	for f in exceptionfileurllist bannedregexpheaderlist logsitelist logurllist headerregexplist logregexpurllist; do
-		newins "${T}"/emptyfile ${f}
+		if [ -f "${f}" ] ; then
+			einfo "${f} already exists"
+		else
+			newins "${T}"/emptyfile ${f}
+		fi
 	done
 }
 
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.9.0-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.0-gentoo.patch
deleted file mode 100644
index 757878683e20..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.9.0-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru dansguardian-2.9.9.0.orig/doc/dansguardian.8 dansguardian-2.9.9.0/doc/dansguardian.8
---- dansguardian-2.9.9.0.orig/doc/dansguardian.8	2006-10-16 19:17:10.000000000 +0300
-+++ dansguardian-2.9.9.0/doc/dansguardian.8	2007-08-18 16:33:39.000000000 +0300
-@@ -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
- An Introduction
- 
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.9.0-no-default-lists.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.0-no-default-lists.patch
deleted file mode 100644
index e069ef6bb7b9..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.9.0-no-default-lists.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nru dansguardian-2.9.9.0.orig/configs/dansguardianf1.conf.in dansguardian-2.9.9.0/configs/dansguardianf1.conf.in
---- dansguardian-2.9.9.0.orig/configs/dansguardianf1.conf.in	2007-08-18 17:19:27.000000000 +0300
-+++ dansguardian-2.9.9.0/configs/dansguardianf1.conf.in	2007-08-18 17:15:46.000000000 +0300
-@@ -71,9 +71,9 @@
- # Supply categorised lists here and the category string shall be logged against
- # matching requests, but matching these lists does not perform any filtering
- # action.
--#logsitelist = '@DGCONFDIR@/lists/logsitelist'
--#logurllist = '@DGCONFDIR@/lists/logurllist'
--#logregexpurllist = '@DGCONFDIR@/lists/logregexpurllist'
-+logsitelist = '@DGCONFDIR@/lists/logsitelist'
-+logurllist = '@DGCONFDIR@/lists/logurllist'
-+logregexpurllist = '@DGCONFDIR@/lists/logregexpurllist'
- 
- # Outgoing HTTP header rules:
- # Optional lists for blocking based on, and modification of, outgoing HTTP
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.9.0-uclibc++.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.0-uclibc++.patch
deleted file mode 100644
index fd452885b151..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.9.0-uclibc++.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nru dansguardian-2.9.9.0.orig/configure.ac dansguardian-2.9.9.0/configure.ac
---- dansguardian-2.9.9.0.orig/configure.ac	2007-07-11 11:48:21.000000000 +0300
-+++ dansguardian-2.9.9.0/configure.ac	2007-08-18 16:34:30.000000000 +0300
-@@ -104,6 +104,7 @@
- AC_CHECK_FUNCS([dup2 gettimeofday memset select])
- AC_CHECK_FUNCS([strerror strstr strtol])
- AC_CHECK_FUNCS([setuid setgid umask seteuid setreuid setlocale strdup])
-+AC_SEARCH_LIBS([floor], [m])
- AC_SEARCH_LIBS([gethostbyname], [nsl])
- AC_SEARCH_LIBS([socket], [socket], [], [
- 	AC_CHECK_LIB(
-diff -Nru dansguardian-2.9.9.0.orig/src/ConnectionHandler.cpp dansguardian-2.9.9.0/src/ConnectionHandler.cpp
---- dansguardian-2.9.9.0.orig/src/ConnectionHandler.cpp	2007-08-09 12:48:27.000000000 +0300
-+++ dansguardian-2.9.9.0/src/ConnectionHandler.cpp	2007-08-18 16:34:30.000000000 +0300
-@@ -32,6 +32,7 @@
- #include <syslog.h>
- #include <cerrno>
- #include <cstdio>
-+#include <ctime>
- #include <algorithm>
- #include <netdb.h>
- #include <cstdlib>
-diff -Nru dansguardian-2.9.9.0.orig/src/dansguardian.cpp dansguardian-2.9.9.0/src/dansguardian.cpp
---- dansguardian-2.9.9.0.orig/src/dansguardian.cpp	2007-03-27 14:33:19.000000000 +0300
-+++ dansguardian-2.9.9.0/src/dansguardian.cpp	2007-08-18 16:34:30.000000000 +0300
-@@ -27,6 +27,7 @@
- 
- #include <iostream>
- #include <cstdio>
-+#include <ctime>
- #include <unistd.h>
- #include <cerrno>
- #include <syslog.h>
-diff -Nru dansguardian-2.9.9.0.orig/src/DynamicURLList.cpp dansguardian-2.9.9.0/src/DynamicURLList.cpp
---- dansguardian-2.9.9.0.orig/src/DynamicURLList.cpp	2006-12-19 12:26:47.000000000 +0200
-+++ dansguardian-2.9.9.0/src/DynamicURLList.cpp	2007-08-18 16:34:30.000000000 +0300
-@@ -25,6 +25,7 @@
- 
- #include <syslog.h>
- #include <algorithm>
-+#include <ctime>
- #include <sys/stat.h>
- #include <sys/time.h>
- 
-diff -Nru dansguardian-2.9.9.0.orig/src/FatController.cpp dansguardian-2.9.9.0/src/FatController.cpp
---- dansguardian-2.9.9.0.orig/src/FatController.cpp	2007-07-12 12:35:02.000000000 +0300
-+++ dansguardian-2.9.9.0/src/FatController.cpp	2007-08-18 16:34:30.000000000 +0300
-@@ -33,6 +33,7 @@
- 
- #include <syslog.h>
- #include <csignal>
-+#include <ctime>
- #include <sys/stat.h>
- #include <pwd.h>
- #include <cerrno>
-diff -Nru dansguardian-2.9.9.0.orig/src/ListContainer.cpp dansguardian-2.9.9.0/src/ListContainer.cpp
---- dansguardian-2.9.9.0.orig/src/ListContainer.cpp	2007-08-09 12:41:33.000000000 +0300
-+++ dansguardian-2.9.9.0/src/ListContainer.cpp	2007-08-18 16:34:30.000000000 +0300
-@@ -29,6 +29,7 @@
- #include "RegExp.hpp"
- #include <cstdlib>
- #include <cstdio>
-+#include <ctime>
- #include <unistd.h>
- #include "String.hpp"
- #include <iostream>
-diff -Nru dansguardian-2.9.9.0.orig/src/ListManager.cpp dansguardian-2.9.9.0/src/ListManager.cpp
---- dansguardian-2.9.9.0.orig/src/ListManager.cpp	2007-02-02 12:16:16.000000000 +0200
-+++ dansguardian-2.9.9.0/src/ListManager.cpp	2007-08-18 16:34:30.000000000 +0300
-@@ -25,6 +25,7 @@
- 
- #include <syslog.h>
- #include <sys/stat.h>
-+#include <ctime>
- 
- 
- // GLOBALS
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.9.2-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.2-gentoo.patch
new file mode 100644
index 000000000000..9025c71a2330
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.9.2-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Nru dansguardian-2.9.9.2.orig/doc/dansguardian.8 dansguardian-2.9.9.2/doc/dansguardian.8
+--- dansguardian-2.9.9.2.orig/doc/dansguardian.8	2006-10-30 13:58:08.000000000 +0200
++++ dansguardian-2.9.9.2/doc/dansguardian.8	2007-12-30 12:40:17.000000000 +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
+ An Introduction
+ 
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.9.9.0_beta b/net-proxy/dansguardian/files/digest-dansguardian-2.9.9.0_beta
deleted file mode 100644
index ba8d14a43dc8..000000000000
--- a/net-proxy/dansguardian/files/digest-dansguardian-2.9.9.0_beta
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cfde623f20809a012ac1f32232a32c9b dansguardian-2.9.9.0.tar.gz 471642
-RMD160 ba440aec5303b3900cd0382a1ac516b6bb5220e7 dansguardian-2.9.9.0.tar.gz 471642
-SHA256 a34d73dfd432af46f1a75ea0cdae495f48d537c3552684e6c5761105b0cdd294 dansguardian-2.9.9.0.tar.gz 471642
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.9.9.2_beta b/net-proxy/dansguardian/files/digest-dansguardian-2.9.9.2_beta
new file mode 100644
index 000000000000..2c48e8226c3c
--- /dev/null
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.9.2_beta
@@ -0,0 +1,3 @@
+MD5 7877ee4d34df6ac538e6522755cedaf6 dansguardian-2.9.9.2.tar.gz 498076
+RMD160 4a5070d2d401443521fb93d26c21c858e42a07f7 dansguardian-2.9.9.2.tar.gz 498076
+SHA256 21cd7fdbff041b4a2880f28a886bd867e57cf8598d13b3dc257a3c489469365b dansguardian-2.9.9.2.tar.gz 498076